Show More
@@ -581,7 +581,9 b' typeset -A _hg_cmd_globals' | |||||
581 | } |
|
581 | } | |
582 |
|
582 | |||
583 | _hg_cmd_diff() { |
|
583 | _hg_cmd_diff() { | |
|
584 | local context state state_descr line ret=1 | |||
584 | typeset -A opt_args |
|
585 | typeset -A opt_args | |
|
586 | ||||
585 | _arguments -s -S : $_hg_global_opts $_hg_diff_opts $_hg_ignore_space_opts \ |
|
587 | _arguments -s -S : $_hg_global_opts $_hg_diff_opts $_hg_ignore_space_opts \ | |
586 | $_hg_pat_opts $_hg_subrepos_opts \ |
|
588 | $_hg_pat_opts $_hg_subrepos_opts \ | |
587 | '*'{-r+,--rev=}'[revision]:revision:_hg_revrange' \ |
|
589 | '*'{-r+,--rev=}'[revision]:revision:_hg_revrange' \ | |
@@ -591,17 +593,19 b' typeset -A _hg_cmd_globals' | |||||
591 | '--reverse[produce a diff that undoes the changes]' \ |
|
593 | '--reverse[produce a diff that undoes the changes]' \ | |
592 | '(--unified -U)'{-U+,--unified=}'[number of lines of context to show]:' \ |
|
594 | '(--unified -U)'{-U+,--unified=}'[number of lines of context to show]:' \ | |
593 | '--stat[output diffstat-style summary of changes]' \ |
|
595 | '--stat[output diffstat-style summary of changes]' \ | |
594 | '*:file:->diff_files' |
|
596 | '*:file:->diff_files' && ret=0 | |
595 |
|
597 | |||
596 | if [[ $state == 'diff_files' ]] |
|
598 | if [[ $state == 'diff_files' ]] | |
597 | then |
|
599 | then | |
598 | if [[ -n $opt_args[-r] ]] |
|
600 | if [[ -n $opt_args[-r] ]] | |
599 | then |
|
601 | then | |
600 | _hg_files |
|
602 | _hg_files && ret=0 | |
601 | else |
|
603 | else | |
602 | _hg_committable |
|
604 | _hg_committable && ret=0 | |
603 | fi |
|
605 | fi | |
604 | fi |
|
606 | fi | |
|
607 | ||||
|
608 | return ret | |||
605 | } |
|
609 | } | |
606 |
|
610 | |||
607 | _hg_cmd_export() { |
|
611 | _hg_cmd_export() { | |
@@ -796,7 +800,7 b' typeset -A _hg_cmd_globals' | |||||
796 | } |
|
800 | } | |
797 |
|
801 | |||
798 | _hg_cmd_resolve() { |
|
802 | _hg_cmd_resolve() { | |
799 | local context state line |
|
803 | local context state state_descr line ret=1 | |
800 | typeset -A opt_args |
|
804 | typeset -A opt_args | |
801 |
|
805 | |||
802 | _arguments -s -S : $_hg_global_opts $_hg_mergetool_opts $_hg_pat_opts \ |
|
806 | _arguments -s -S : $_hg_global_opts $_hg_mergetool_opts $_hg_pat_opts \ | |
@@ -805,17 +809,19 b' typeset -A _hg_cmd_globals' | |||||
805 | '(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \ |
|
809 | '(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \ | |
806 | '(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \ |
|
810 | '(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \ | |
807 | '(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved' \ |
|
811 | '(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved' \ | |
808 | '*:file:_hg_unresolved' |
|
812 | '*:file:_hg_unresolved' && ret=0 | |
809 |
|
813 | |||
810 | if [[ $state == 'resolve_files' ]] |
|
814 | if [[ $state == 'resolve_files' ]] | |
811 | then |
|
815 | then | |
812 | _alternative 'files:resolved files:_hg_resolved' \ |
|
816 | _alternative 'files:resolved files:_hg_resolved' \ | |
813 | 'files:unresolved files:_hg_unresolved' |
|
817 | 'files:unresolved files:_hg_unresolved' && ret=0 | |
814 | fi |
|
818 | fi | |
|
819 | ||||
|
820 | return ret | |||
815 | } |
|
821 | } | |
816 |
|
822 | |||
817 | _hg_cmd_revert() { |
|
823 | _hg_cmd_revert() { | |
818 | local context state line |
|
824 | local context state state_descr line ret=1 | |
819 | typeset -A opt_args |
|
825 | typeset -A opt_args | |
820 |
|
826 | |||
821 | _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ |
|
827 | _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ | |
@@ -823,19 +829,21 b' typeset -A _hg_cmd_globals' | |||||
823 | '(--rev -r)'{-r+,--rev=}'[revision to revert to]:revision:_hg_labels' \ |
|
829 | '(--rev -r)'{-r+,--rev=}'[revision to revert to]:revision:_hg_labels' \ | |
824 | '(--no-backup -C)'{-C,--no-backup}'[do not save backup copies of files]' \ |
|
830 | '(--no-backup -C)'{-C,--no-backup}'[do not save backup copies of files]' \ | |
825 | '(--date -d)'{-d+,--date=}'[tipmost revision matching date]:date code:' \ |
|
831 | '(--date -d)'{-d+,--date=}'[tipmost revision matching date]:date code:' \ | |
826 |
'*:file:-> |
|
832 | '*:file:->revert_files' && ret=0 | |
827 |
|
833 | |||
828 |
if [[ $state == ' |
|
834 | if [[ $state == 'revert_files' ]] | |
829 | then |
|
835 | then | |
830 | if [[ -n $opt_args[-r] ]] |
|
836 | if [[ -n $opt_args[-r] ]] | |
831 | then |
|
837 | then | |
832 | _hg_files |
|
838 | _hg_files && ret=0 | |
833 | else |
|
839 | else | |
834 | typeset -a status_files |
|
840 | typeset -a status_files | |
835 | _hg_status mard |
|
841 | _hg_status mard | |
836 | _wanted files expl 'modified, added, removed or deleted file' _multi_parts / status_files |
|
842 | _wanted files expl 'modified, added, removed or deleted file' _multi_parts / status_files && ret=0 | |
837 | fi |
|
843 | fi | |
838 | fi |
|
844 | fi | |
|
845 | ||||
|
846 | return ret | |||
839 | } |
|
847 | } | |
840 |
|
848 | |||
841 | _hg_cmd_rollback() { |
|
849 | _hg_cmd_rollback() { |
General Comments 0
You need to be logged in to leave comments.
Login now