h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-03 10:01:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Allow fish_private_mode to change at runtime

Browse Source 
Prior to this change, `fish_private_mode` worked by just suppressing
history outright. With this change, `fish_private_mode` can be toggled on
and off. Commands entered while `fish_private_mode` is set are stored but
in memory only; they are not written to disk.

Fixes #7590
Fixes #7589
This commit is contained in:
ridiculousfish
2021-01-01 13:57:45 -08:00
parent 9fdc4f903b
commit 118f710e99
6 changed files with 93 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/reader.cpp
View File

@@ -3166,16 +3166,26 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
while (!text.empty() && text.back() == L' ') {
text.pop_back();
}
if (history && !conf.in_silent_mode) {
// Remove ephemeral items.
// Note we fall into this case if the user just types a space and hits return.
history->remove_ephemeral_items();
// Mark this item as ephemeral if there is a leading space (#615).
auto mode = text.front() == L' ' ? history_persistence_mode_t::ephemeral
: history_persistence_mode_t::disk;
history_persistence_mode_t mode;
if (text.front() == L' ') {
// Leading spaces are ephemeral (#615).
mode = history_persistence_mode_t::ephemeral;
} else if (in_private_mode(vars)) {
// Private mode means in-memory only.
mode = history_persistence_mode_t::memory;
} else {
mode = history_persistence_mode_t::disk;
}
history->add_pending_with_file_detection(text, vars.get_pwd_slash(), mode);
}
rls.finished = true;
update_buff_pos(&command_line, command_line.size());
} else if (command_test_result == PARSER_TEST_INCOMPLETE) {