diff options
| author | Peter Stephenson <pws@zsh.org> | 2014-06-09 09:50:37 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2014-06-09 09:50:37 +0100 |
| commit | 6336347c9e02ebae565b2d62987d1052bcba5567 (patch) | |
| tree | c57790ed50fa12ab04733286bd10990d59fb13d0 /Completion/Unix/Command/_hg | |
| parent | 2ba4aa275e548ae9d4406e3bc8008bdfa1ce29eb (diff) | |
| parent | 4f4d2b8247ef08e34fe73d91c0a8d8a2eb1f18c7 (diff) | |
| download | zsh-6336347c9e02ebae565b2d62987d1052bcba5567.tar.gz zsh-6336347c9e02ebae565b2d62987d1052bcba5567.tar.xz zsh-6336347c9e02ebae565b2d62987d1052bcba5567.zip | |
fix my own merge conflict with grammar changes
Diffstat (limited to 'Completion/Unix/Command/_hg')
| -rw-r--r-- | Completion/Unix/Command/_hg | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_hg b/Completion/Unix/Command/_hg index f48598278..c18500bcb 100644 --- a/Completion/Unix/Command/_hg +++ b/Completion/Unix/Command/_hg @@ -226,6 +226,16 @@ _hg_modified() { _wanted files expl 'modified files' _multi_parts / status_files } +_hg_committable() { + typeset -a status_files + # A file is a candidate for `hg commit` if it is: + # - modified (m), or + # - added (a), or + # - removed (r) + _hg_status mar + _wanted files expl 'committable files' _multi_parts / status_files +} + _hg_resolve() { local rstate rpath @@ -476,7 +486,7 @@ _hg_cmd_commit() { '(--logfile -l)'{-l+,--logfile}'[read commit message from specified file]:log file:_files' \ '(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \ '(--user -u)'{-u+,--user}'[record user as commiter]:user:' \ - '*:file:_hg_files' + '*:file:_hg_committable' } _hg_cmd_copy() { |