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

Add support for history --merge to incorporate history changes from

Browse Source 
other sessions.

Fixes #825
This commit is contained in:
ridiculousfish
2014-07-25 10:08:21 -07:00
parent 317660c2fe
commit e9f870e25a
5 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin.cpp
View File

@@ -3512,6 +3512,7 @@ static int builtin_history(parser_t &parser, wchar_t **argv)
bool search_prefix = false;
bool save_history = false;
bool clear_history = false;
bool merge_history = false;
static const struct woption long_options[] =
{
@@ -3521,6 +3522,7 @@ static int builtin_history(parser_t &parser, wchar_t **argv)
{ L"contains", no_argument, 0, 'c' },
{ L"save", no_argument, 0, 'v' },
{ L"clear", no_argument, 0, 'l' },
{ L"merge", no_argument, 0, 'm' },
{ L"help", no_argument, 0, 'h' },
{ 0, 0, 0, 0 }
};
@@ -3555,6 +3557,9 @@ static int builtin_history(parser_t &parser, wchar_t **argv)
case 'l':
clear_history = true;
break;
case 'm':
merge_history = true;
break;
case 'h':
builtin_print_help(parser, argv[0], stdout_buffer);
return STATUS_BUILTIN_OK;
@@ -3584,6 +3589,11 @@ static int builtin_history(parser_t &parser, wchar_t **argv)
return STATUS_BUILTIN_OK;
}
if (merge_history)
{
history->incorporate_external_changes();
}
if (search_history)
{
int res = STATUS_BUILTIN_ERROR;