Commits

Nikolaj Sjujskij  committed 52dc9f3

zsh: drop strange "mergetool" line in `log`, fix opts for in/out

  • Participants
  • Parent commits 1dbacee

Comments (0)

Files changed (4)

File zsh_common_opts

 # HG changeset patch
-# Parent e00231807f373a39589b9856af7ae376f045f1b0
+# Parent b0a72b4b9dc9faedea8709a6d5fa687109872bf1
 zsh completion: add new option groups for options
 
 Add clone, date/user, git-style, merge tool, ignore space, log,
  _hg_cmd_incoming() {
 -  _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
 -  '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \
-+  _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts $_hg_style_opts \
++  _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \
    '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
 -  '(--patch -p)'{-p,--patch}'[show patch]' \
    '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:_hg_tags' \
    '(--prune -P)'{-P+,--prune}'[do not display revision or any of its ancestors]:revision:_hg_labels' \
    '(--branch -b)'{-b+,--branch}'[show changesets within the given named branch]:branch:_hg_branches' \
    '*:files:_hg_files'
-@@ -674,19 +697,17 @@
+@@ -674,19 +697,16 @@
  }
  
  _hg_cmd_merge() {
  }
  
  _hg_cmd_outgoing() {
-   _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
+-  _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
 -  '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \
-+                     $_hg_branch_bmark_opts \
++  _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \
    '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
 -  '(--patch -p)'{-p,--patch}'[show patch]' \
    '(--rev -r)'{-r+,--rev}'[a specific revision you would like to push]' \
    '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
    ':destination:_hg_remote'
-@@ -714,7 +735,7 @@
+@@ -714,7 +734,7 @@
  }
  
  _hg_cmd_pull() {
    '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
    '(--update -u)'{-u,--update}'[update to new tip if changesets were pulled]' \
    '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:' \
-@@ -722,7 +743,7 @@
+@@ -722,7 +742,7 @@
  }
  
  _hg_cmd_push() {
    '(--force -f)'{-f,--force}'[force push]' \
    '(--rev -r)'{-r+,--rev}'[a specific revision you would like to push]:revision:_hg_labels' \
    ':destination:_hg_remote'
-@@ -750,7 +771,7 @@
+@@ -750,7 +770,7 @@
    local context state line
    typeset -A opt_args
  
    '(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \
    '(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \
    '(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved' \
-@@ -852,7 +873,7 @@
+@@ -852,7 +872,7 @@
  }
  
  _hg_cmd_tip() {
    '(--patch -p)'{-p,--patch}'[show patch]'
  }
  
-@@ -943,7 +964,8 @@
+@@ -943,7 +963,8 @@
  }
  
  _hg_cmd_qdiff() {
    '*:pattern:_hg_files'
  }
  
-@@ -979,7 +1001,7 @@
+@@ -979,7 +1000,7 @@
  }
  
  _hg_cmd_qimport() {
    '(--existing -e)'{-e,--existing}'[import file in patch dir]' \
    '(--name -n 2)'{-n+,--name}'[patch file name]:name:' \
    '(--force -f)'{-f,--force}'[overwrite existing files]' \
-@@ -989,6 +1011,7 @@
+@@ -989,6 +1010,7 @@
  
  _hg_cmd_qnew() {
    _arguments -s -w : $_hg_global_opts $_hg_commit_opts \
    '(--force -f)'{-f,--force}'[import uncommitted changes into patch]' \
    ':patch:'
  }
-@@ -1022,7 +1045,7 @@
+@@ -1022,7 +1044,7 @@
  }
  
  _hg_cmd_qrefresh() {
    '(--git -g)'{-g,--git}'[use git extended diff format]' \
    '(--short -s)'{-s,--short}'[short refresh]' \
    '*:files:_hg_files'
-@@ -1066,8 +1089,7 @@
+@@ -1066,8 +1088,7 @@
  
  # Patchbomb
  _hg_cmd_email() {
    '--plain[omit hg patch header]' \
    '--body[send patches as inline message text (default)]' \
    '(--outgoing -o)'{-o,--outgoing}'[send changes not found in the target repository]' \
-@@ -1097,18 +1119,14 @@
+@@ -1097,18 +1118,14 @@
  
  # Rebase
  _hg_cmd_rebase() {
 # HG changeset patch
-# Parent 941128a0603a0564e7b830f6c06520af8dcd235c
+# Parent 3144095c33034bd94f1bc538fa66f000acee857c
+
 diff --git a/contrib/zsh_completion b/contrib/zsh_completion
 --- a/contrib/zsh_completion
 +++ b/contrib/zsh_completion
 @@ -689,7 +689,7 @@
    _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \
-                      $_hg_style_opts $_hg_subrepos_opts \
+                      $_hg_subrepos_opts \
    '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
 -  '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:_hg_tags' \
 +  '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:_hg_labels' \
    '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
    '--bundle[file to store the bundles into]:bundle file:_files' \
    ':source:_hg_remote'
-@@ -742,7 +742,7 @@
-   _arguments -s -w : $_hg_global_opts $_hg_branch_bmark_opts $_hg_remote_opts \
-                      $_hg_style_opts $_hg_subrepos_opts \
+@@ -743,7 +743,7 @@
+   _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \
+                      $_hg_subrepos_opts \
    '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
 -  '(--rev -r)'{-r+,--rev}'[a specific revision you would like to push]' \
 +  '*'{-r,--rev}'[a specific revision you would like to push]:revision:_hg_revrange' \
    '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
    ':destination:_hg_remote'
  }
-@@ -1184,9 +1184,9 @@
+@@ -1185,9 +1185,9 @@
  _hg_cmd_rebase() {
    _arguments -s -w : $_hg_global_opts $_hg_commit_opts $_hg_mergetool_opts \
    '*'{-r,--rev}'[rebase these revisions]:revision:_hg_revrange' \
 # HG changeset patch
-# Parent 28a3247948439fd17c006efd496720889be4713e
+# Parent 862f4cc62c900802661fbe971f0e3cd9b1b85104
 zsh completion: add new options for existing commands
 
  * backout: add --tool;
    '*:patch:_files'
  }
  
-@@ -682,6 +709,7 @@
- }
- 
- _hg_cmd_log() {
-+  '(--tool -t)'{-t,--tool}'[specify merge tool]' \
-   _arguments -s -w : $_hg_log_opts $_hg_pat_opts \
-   '(--follow --follow-first -f)'{-f,--follow}'[follow changeset or history]' \
-   '(-f --follow)--follow-first[only follow the first parent of merge changesets]' \
-@@ -690,13 +718,17 @@
+@@ -690,13 +717,17 @@
    '*'{-r,--rev}'[show the specified revision or range]:revision:_hg_revrange' \
    '(--only-merges -m)'{-m,--only-merges}'[show only merges]' \
    '(--prune -P)'{-P+,--prune}'[do not display revision or any of its ancestors]:revision:_hg_labels' \
    ':revision:_hg_labels'
  }
  
-@@ -750,6 +782,7 @@
+@@ -750,6 +781,7 @@
    _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_branch_bmark_opts \
    '(--force -f)'{-f,--force}'[force push]' \
    '(--rev -r)'{-r+,--rev}'[a specific revision you would like to push]:revision:_hg_labels' \
    ':destination:_hg_remote'
  }
  
-@@ -776,6 +809,8 @@
+@@ -776,6 +808,8 @@
    typeset -A opt_args
  
    _arguments -s -w : $_hg_global_opts $_hg_mergetool_opts $_hg_pat_opts \
    '(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \
    '(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \
    '(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved' \
-@@ -796,6 +831,7 @@
+@@ -796,6 +830,7 @@
    '(--all -a :)'{-a,--all}'[revert all changes when no arguments given]' \
    '(--rev -r)'{-r+,--rev}'[revision to revert to]:revision:_hg_labels' \
    '(--no-backup -C)'{-C,--no-backup}'[do not save backup copies of files]' \
    '*:file:->diff_files'
  
    if [[ $state == 'diff_files' ]]
-@@ -827,10 +863,15 @@
+@@ -827,10 +862,15 @@
    '(--daemon -d)'{-d,--daemon}'[run server in background]' \
    '(--port -p)'{-p+,--port}'[listen port]:listen port:' \
    '(--address -a)'{-a+,--address}'[interface address]:interface address:' \
    '(--ipv6 -6)'{-6,--ipv6}'[use IPv6 in addition to IPv4]'
  }
  
-@@ -854,6 +895,7 @@
+@@ -854,6 +894,7 @@
    '(--copies -C)'{-C,--copies}'[show source of copied files]' \
    '(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs]' \
    '--rev[show difference from revision]:revision:_hg_labels' \
    '*:files:_files'
  }
  
-@@ -869,6 +911,9 @@
+@@ -869,6 +910,9 @@
    '(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \
    '(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
    '(--rev -r)'{-r+,--rev}'[revision to tag]:revision:_hg_labels' \
    ':tag name:'
  }
  
-@@ -891,6 +936,8 @@
+@@ -891,6 +935,8 @@
    _arguments -s -w : $_hg_global_opts \
    '(--clean -C)'{-C,--clean}'[overwrite locally modified files]' \
    '(--rev -r)'{-r+,--rev}'[revision]:revision:_hg_labels' \

File zsh_subrepos

 # HG changeset patch
-# Parent 955a5f433d0229a717807708e327529a0f29eff5
+# Parent 5e21613100555d6ecaad20d56d83e013983682bd
 zsh completion: add subrepos options for all supporting commands
 
 diff --git a/contrib/zsh_completion b/contrib/zsh_completion
    '*'{-r,--rev}'+[revision]:revision:_hg_revrange' \
    '(--show-function -p)'{-p,--show-function}'[show which function each change is in]' \
    '*:file:->diff_files'
-@@ -656,7 +659,8 @@
- }
+@@ -657,6 +660,7 @@
  
  _hg_cmd_incoming() {
--  _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts $_hg_style_opts \
-+  _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \
-+                     $_hg_style_opts $_hg_subrepos_opts \
+   _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \
++                     $_hg_subrepos_opts \
    '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
    '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:_hg_tags' \
    '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
-@@ -706,8 +710,8 @@
- }
+@@ -706,6 +710,7 @@
  
  _hg_cmd_outgoing() {
--  _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
--                     $_hg_branch_bmark_opts \
-+  _arguments -s -w : $_hg_global_opts $_hg_branch_bmark_opts $_hg_remote_opts \
-+                     $_hg_style_opts $_hg_subrepos_opts \
+   _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \
++                     $_hg_subrepos_opts \
    '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
    '(--rev -r)'{-r+,--rev}'[a specific revision you would like to push]' \
    '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
-@@ -838,7 +842,7 @@
+@@ -836,7 +841,7 @@
  }
  
  _hg_cmd_status() {