mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-25 12:23:09 +00:00
Use locales preferred date format, fix up options
We don't seem to mention in the documentation that we were forcing -t for all interactive uses. If we want to do that we should apply that in the builtin. history.fish reimplementing every option and doing things kind of differently is a real pain and it's not clear if the docs are referring to the or the wrapper script or both.
This commit is contained in:
Aaron Gyes
parent
8cb560dc7e
commit
09291735e6
2 changed files with 79 additions and 70 deletions
|
|
@ -2,66 +2,72 @@
|
|||
# Wrap the builtin history command to provide additional functionality.
|
||||
#
|
||||
function history --shadow-builtin --description "display or manipulate interactive command history"
|
||||
if not set -q argv[1]
|
||||
# No arguments so execute history builtin using it's default behavior to display the entire
|
||||
# history.
|
||||
if status --is-interactive
|
||||
set -l pager less
|
||||
set -q PAGER
|
||||
and set pager $PAGER
|
||||
builtin history --with-time | eval $pager
|
||||
else
|
||||
builtin history
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
# no args or just -t? use pager if interactive.
|
||||
set -l cmd search
|
||||
set -l prefix_args ""
|
||||
set -l contains_args ""
|
||||
set -l search_mode none
|
||||
set -l time_args
|
||||
if not set -q argv[1] or string match -r -- "^-t|^--with-time" $argv[1]
|
||||
set -l show_all
|
||||
end
|
||||
if count $argv
|
||||
|
||||
for i in (seq (count $argv))
|
||||
switch $argv[$i]
|
||||
case -d --delete
|
||||
set cmd delete
|
||||
case -v --save
|
||||
set cmd save
|
||||
case -l --clear
|
||||
set cmd clear
|
||||
case -s --search
|
||||
set cmd search
|
||||
case -m --merge
|
||||
set cmd merge
|
||||
case -h --help
|
||||
set cmd help
|
||||
case -t --with-time
|
||||
set time_args --with-time
|
||||
case -p --prefix
|
||||
set search_mode prefix
|
||||
set prefix_args $argv[(math $i + 1)]
|
||||
case -c --contains
|
||||
set search_mode contains
|
||||
set contains_args $argv[(math $i + 1)]
|
||||
case --
|
||||
set -e argv[1..$i]
|
||||
break
|
||||
case "-*" "--*"
|
||||
printf ( _ "%s: invalid option -- %s\n" ) history $argv[$i] >&2
|
||||
return 1
|
||||
end
|
||||
if set -q argv[$i]
|
||||
switch $argv[$i]
|
||||
case -d --delete
|
||||
set cmd delete
|
||||
case -v --save
|
||||
set cmd save
|
||||
case -l --clear
|
||||
set cmd clear
|
||||
case -s --search
|
||||
set cmd search
|
||||
case -m --merge
|
||||
set cmd merge
|
||||
case -h --help
|
||||
set cmd help
|
||||
case -t --with-time
|
||||
set time_args --with-time
|
||||
case -p --prefix
|
||||
set search_mode prefix
|
||||
set prefix_args $argv[(math $i + 1)]
|
||||
case -c --contains
|
||||
set search_mode contains
|
||||
set contains_args $argv[(math $i + 1)]
|
||||
case --
|
||||
set -e argv[1..$i]
|
||||
break
|
||||
case "-*" "--*"
|
||||
printf ( _ "%s: invalid option -- %s\n" ) history $argv[$i] >&2
|
||||
return 1
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
switch $cmd
|
||||
case search
|
||||
builtin history $time_args --search $argv
|
||||
if set -q show_all
|
||||
begin
|
||||
if status --is-interactive
|
||||
set -l pager less
|
||||
set -q PAGER
|
||||
and set pager $PAGER
|
||||
builtin history $argv | eval $pager
|
||||
end
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
builtin history $argv
|
||||
|
||||
case delete
|
||||
# Interactively delete history
|
||||
set -l found_items ""
|
||||
switch $search_mode
|
||||
case prefix
|
||||
case prefix:
|
||||
set found_items (builtin history --search --prefix $prefix_args)
|
||||
case contains
|
||||
set found_items (builtin history --search --contains $contains_args)
|
||||
|
|
|
|||
|
|
@ -461,7 +461,7 @@ static int builtin_bind(parser_t &parser, io_streams_t &streams, wchar_t **argv)
|
|||
|
||||
while (1) {
|
||||
int opt_index = 0;
|
||||
int opt = w.wgetopt_long(argc, argv, L"aehkKfM:m:", long_options, &opt_index);
|
||||
int opt = w.wgetopt_long_only(argc, argv, L"aehkKfM:m:", long_options, &opt_index);
|
||||
|
||||
if (opt == -1) break;
|
||||
|
||||
|
|
@ -2824,12 +2824,14 @@ static bool format_history_record(const history_item_t &item, const bool with_ti
|
|||
if (!localtime_r(&seconds, ×tamp)) {
|
||||
return false;
|
||||
}
|
||||
char timestamp_string[22];
|
||||
// TODO: this should probably be formatted appropriately per the users' locale.
|
||||
if (strftime(timestamp_string, 22, "%Y-%m-%d %H:%M:%S ", ×tamp) != 21) {
|
||||
char timestamp_string[32];
|
||||
if (strftime(timestamp_string, 32, "%c ", ×tamp) != 31) {
|
||||
out->append(str2wcstring(timestamp_string));
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
out->append(str2wcstring(timestamp_string));
|
||||
|
||||
}
|
||||
out->append(item.str());
|
||||
out->append(L"\n");
|
||||
|
|
@ -2849,11 +2851,11 @@ static int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **ar
|
|||
bool with_time = false;
|
||||
|
||||
static const struct woption long_options[] = {
|
||||
{L"prefix", no_argument, 0, 'p'}, {L"delete", no_argument, 0, 'd'},
|
||||
{L"search", no_argument, 0, 's'}, {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'},
|
||||
{L"with-time", no_argument, 0, 't'}, {0, 0, 0, 0}};
|
||||
{L"delete", no_argument, 0, 'd'}, {L"search", no_argument, 0, 's'},
|
||||
{L"prefix", no_argument, 0, 'p'}, {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'},
|
||||
{L"with-time", no_argument, 0, 't'}, {0, 0, 0, 0}};
|
||||
|
||||
int opt = 0;
|
||||
int opt_index = 0;
|
||||
|
|
@ -2865,9 +2867,10 @@ static int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **ar
|
|||
// from webconfig.py.
|
||||
if (!history) history = &history_t::history_with_name(L"fish");
|
||||
|
||||
while ((opt = w.wgetopt_long(argc, argv, L"pdscvlmht", long_options, &opt_index)) != EOF) {
|
||||
while ((opt = w.wgetopt_long(argc, argv, L"dspcvlmht", long_options, &opt_index)) != EOF) {
|
||||
switch (opt) {
|
||||
case 'p': {
|
||||
search_history = true;
|
||||
search_prefix = true;
|
||||
break;
|
||||
}
|
||||
|
|
@ -2880,6 +2883,7 @@ static int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **ar
|
|||
break;
|
||||
}
|
||||
case 'c': {
|
||||
search_history = true;
|
||||
break;
|
||||
}
|
||||
case 'v': {
|
||||
|
|
@ -2917,23 +2921,13 @@ static int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **ar
|
|||
|
||||
// Everything after is an argument.
|
||||
const wcstring_list_t args(argv + w.woptind, argv + argc);
|
||||
|
||||
if (argc == 1 || with_time) {
|
||||
for (int i = 1; // 0 is the current input
|
||||
!history->item_at_index(i).empty(); ++i) {
|
||||
if (!format_history_record(history->item_at_index(i), with_time, &streams.out)) {
|
||||
return STATUS_BUILTIN_ERROR;
|
||||
}
|
||||
}
|
||||
return STATUS_BUILTIN_OK;
|
||||
}
|
||||
|
||||
|
||||
if (merge_history) {
|
||||
history->incorporate_external_changes();
|
||||
return STATUS_BUILTIN_OK;
|
||||
}
|
||||
|
||||
if (search_history) {
|
||||
else if (search_history) {
|
||||
int res = STATUS_BUILTIN_ERROR;
|
||||
for (wcstring_list_t::const_iterator iter = args.begin(); iter != args.end(); ++iter) {
|
||||
const wcstring &search_string = *iter;
|
||||
|
|
@ -2956,7 +2950,7 @@ static int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **ar
|
|||
return res;
|
||||
}
|
||||
|
||||
if (delete_item) {
|
||||
else if (delete_item) {
|
||||
for (wcstring_list_t::const_iterator iter = args.begin(); iter != args.end(); ++iter) {
|
||||
wcstring delete_string = *iter;
|
||||
if (delete_string[0] == '"' && delete_string[delete_string.length() - 1] == '"')
|
||||
|
|
@ -2967,17 +2961,26 @@ static int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **ar
|
|||
return STATUS_BUILTIN_OK;
|
||||
}
|
||||
|
||||
if (save_history) {
|
||||
else if (save_history) {
|
||||
history->save();
|
||||
return STATUS_BUILTIN_OK;
|
||||
}
|
||||
|
||||
if (clear_history) {
|
||||
else if (clear_history) {
|
||||
history->clear();
|
||||
history->save();
|
||||
return STATUS_BUILTIN_OK;
|
||||
}
|
||||
|
||||
else if (argc - w.woptind == 0) {
|
||||
for (int i = 1; !history->item_at_index(i).empty(); ++i) {
|
||||
if (!format_history_record(history->item_at_index(i), with_time, &streams.out)) {
|
||||
return STATUS_BUILTIN_ERROR;
|
||||
}
|
||||
}
|
||||
return STATUS_BUILTIN_OK;
|
||||
}
|
||||
|
||||
return STATUS_BUILTIN_ERROR;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue