diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_hg | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 462e21781..dbaa1c52a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-08-07 Peter Stephenson <p.stephenson@samsung.com> + + * Anton Shestakov: 43253: Completion/Unix/Command/_hg: hg + --style is deprecated, use --template. + 2018-08-01 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> * 43227: Src/Modules/termcap.c, Src/Modules/terminfo.c, diff --git a/Completion/Unix/Command/_hg b/Completion/Unix/Command/_hg index 8eaa457c8..50ab7132c 100644 --- a/Completion/Unix/Command/_hg +++ b/Completion/Unix/Command/_hg @@ -389,9 +389,9 @@ _hg_diff_opts=( _hg_dryrun_opts=( '(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]') -_hg_style_opts=( - '--style[display using template map file]:' - '--template[display with template]:') +_hg_template_opts=( + '--template[display with template]:template' +) _hg_commit_opts=( '(-m --message -l --logfile --edit -e)'{-e,--edit}'[edit commit message]' @@ -565,7 +565,7 @@ _hg_cmd_grep() { } _hg_cmd_heads() { - _arguments -s : $_hg_global_opts $_hg_style_opts \ + _arguments -s : $_hg_global_opts $_hg_template_opts \ '(--rev -r)'{-r+,--rev=}'[show only heads which are descendants of rev]:revision:_hg_tags' } @@ -592,7 +592,7 @@ _hg_cmd_import() { } _hg_cmd_incoming() { - _arguments -s : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \ + _arguments -s : $_hg_global_opts $_hg_remote_opts $_hg_template_opts \ '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \ '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ '(--patch -p)'{-p,--patch}'[show patch]' \ @@ -616,7 +616,7 @@ _hg_cmd_locate() { } _hg_cmd_log() { - _arguments -s : $_hg_global_opts $_hg_pat_opts $_hg_style_opts \ + _arguments -s : $_hg_global_opts $_hg_pat_opts $_hg_template_opts \ '(--follow --follow-first -f)'{-f,--follow}'[follow changeset or history]' \ '(-f --follow)--follow-first[only follow the first parent of merge changesets]' \ '(--copies -C)'{-C,--copies}'[show copied files]' \ @@ -644,7 +644,7 @@ _hg_cmd_merge() { } _hg_cmd_outgoing() { - _arguments -s : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \ + _arguments -s : $_hg_global_opts $_hg_remote_opts $_hg_template_opts \ '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \ '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ '(--patch -p)'{-p,--patch}'[show patch]' \ @@ -654,7 +654,7 @@ _hg_cmd_outgoing() { } _hg_cmd_parents() { - _arguments -s : $_hg_global_opts $_hg_style_opts \ + _arguments -s : $_hg_global_opts $_hg_template_opts \ '(--rev -r)'{-r+,--rev=}'[show parents of the specified rev]:revision:_hg_tags' \ ':last modified file:_hg_files' } @@ -785,7 +785,7 @@ _hg_cmd_tag() { } _hg_cmd_tip() { - _arguments -s : $_hg_global_opts $_hg_style_opts \ + _arguments -s : $_hg_global_opts $_hg_template_opts \ '(--patch -p)'{-p,--patch}'[show patch]' } |