equal
deleted
inserted
replaced
243 typeset -a status_files |
243 typeset -a status_files |
244 _hg_status d |
244 _hg_status d |
245 _wanted files expl 'missing files' _multi_parts / status_files |
245 _wanted files expl 'missing files' _multi_parts / status_files |
246 } |
246 } |
247 |
247 |
248 _hg_modified() { |
248 _hg_committable() { |
249 typeset -a status_files |
249 typeset -a status_files |
250 _hg_status m |
250 _hg_status mar |
251 _wanted files expl 'modified files' _multi_parts / status_files |
251 _wanted files expl 'modified, added or removed files' _multi_parts / status_files |
252 } |
252 } |
253 |
253 |
254 _hg_resolve() { |
254 _hg_resolve() { |
255 local rstate rpath |
255 local rstate rpath |
256 |
256 |
568 '(--logfile -l)'{-l+,--logfile=}'[read commit message from <file>]:log file:_files' \ |
568 '(--logfile -l)'{-l+,--logfile=}'[read commit message from <file>]:log file:_files' \ |
569 '(--date -d)'{-d+,--date=}'[record datecode as commit date]:date code:' \ |
569 '(--date -d)'{-d+,--date=}'[record datecode as commit date]:date code:' \ |
570 '(--user -u)'{-u+,--user=}'[record user as commiter]:user:' \ |
570 '(--user -u)'{-u+,--user=}'[record user as commiter]:user:' \ |
571 '--amend[amend the parent of the working dir]' \ |
571 '--amend[amend the parent of the working dir]' \ |
572 '--close-branch[mark a branch as closed]' \ |
572 '--close-branch[mark a branch as closed]' \ |
573 '*:file:_hg_files' |
573 '*:file:_hg_committable' |
574 } |
574 } |
575 |
575 |
576 _hg_cmd_copy() { |
576 _hg_cmd_copy() { |
577 _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ |
577 _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ |
578 '(--after -A)'{-A,--after}'[record a copy that has already occurred]' \ |
578 '(--after -A)'{-A,--after}'[record a copy that has already occurred]' \ |
597 then |
597 then |
598 if [[ -n $opt_args[-r] ]] |
598 if [[ -n $opt_args[-r] ]] |
599 then |
599 then |
600 _hg_files |
600 _hg_files |
601 else |
601 else |
602 _hg_modified |
602 _hg_committable |
603 fi |
603 fi |
604 fi |
604 fi |
605 } |
605 } |
606 |
606 |
607 _hg_cmd_export() { |
607 _hg_cmd_export() { |