Show More
@@ -422,7 +422,9 b' typeset -A _hg_cmd_globals' | |||
|
422 | 422 | _hg_diff_opts=( |
|
423 | 423 | $_hg_gitlike_opts |
|
424 | 424 | '(--text -a)'{-a,--text}'[treat all files as text]' |
|
425 | '--nodates[omit dates from diff headers]') | |
|
425 | '--binary[generate binary diffs in git mode (default)]' | |
|
426 | '--nodates[omit dates from diff headers]' | |
|
427 | ) | |
|
426 | 428 | |
|
427 | 429 | _hg_mergetool_opts=( |
|
428 | 430 | '(--tool -t)'{-t+,--tool=}'[specify merge tool]:merge tool:_hg_merge_tools' |
@@ -511,8 +513,8 b' typeset -A _hg_cmd_globals' | |||
|
511 | 513 | _hg_cmd_backout() { |
|
512 | 514 | _arguments -s -S : $_hg_global_opts $_hg_mergetool_opts $_hg_pat_opts \ |
|
513 | 515 | '--merge[merge with old dirstate parent after backout]' \ |
|
516 | '--no-commit[do not commit]' \ | |
|
514 | 517 | '(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date' \ |
|
515 | '--parent[parent to choose when backing out merge]' \ | |
|
516 | 518 | '(--user -u)'{-u+,--user=}'[record the specified user as committer]:user' \ |
|
517 | 519 | '(--rev -r 1)'{-r+,--rev=}'[revision to backout]:revision:_hg_labels' \ |
|
518 | 520 | '(--message -m)'{-m+,--message=}'[use <text> as commit message]:text' \ |
@@ -612,7 +614,6 b' typeset -A _hg_cmd_globals' | |||
|
612 | 614 | '--noprefix[omit a/ and b/ prefixes from filenames]' \ |
|
613 | 615 | '(--show-function -p)'{-p,--show-function}'[show which function each change is in]' \ |
|
614 | 616 | '(--change -c)'{-c+,--change=}'[change made by revision]:revision:_hg_labels' \ |
|
615 | '(--text -a)'{-a,--text}'[treat all files as text]' \ | |
|
616 | 617 | '--reverse[produce a diff that undoes the changes]' \ |
|
617 | 618 | '(--unified -U)'{-U+,--unified=}'[number of lines of context to show]:count' \ |
|
618 | 619 | '--stat[output diffstat-style summary of changes]' \ |
@@ -634,6 +635,7 b' typeset -A _hg_cmd_globals' | |||
|
634 | 635 | |
|
635 | 636 | _hg_cmd_export() { |
|
636 | 637 | _arguments -s -S : $_hg_global_opts $_hg_diff_opts \ |
|
638 | '(--bookmark -B)'{-B+,--bookmark=}'[export changes only reachable by given bookmark]:bookmark:_hg_bookmarks' \ | |
|
637 | 639 | '(--output -o)'{-o+,--output=}'[print output to file with formatted name]:format string' \ |
|
638 | 640 | '--switch-parent[diff against the second parent]' \ |
|
639 | 641 | '*'{-r+,--rev=}'[revisions to export]:revision:_hg_labels' \ |
@@ -661,13 +663,16 b' typeset -A _hg_cmd_globals' | |||
|
661 | 663 | '(--continue -c --abort -a)'{-a,--abort}'[abort interrupted graft]' \ |
|
662 | 664 | '(--edit -e)'{-e,--edit}'[invoke editor on commit messages]' \ |
|
663 | 665 | '--log[append graft info to log message]' \ |
|
666 | "--no-commit[don't commit, just apply the changes in working directory]" \ | |
|
667 | '(--force -f)'{-f,--force}'[force graft]' \ | |
|
664 | 668 | '*:revision:_hg_labels' |
|
665 | 669 | } |
|
666 | 670 | |
|
667 | 671 | _hg_cmd_grep() { |
|
668 | 672 | _arguments -s -S : $_hg_global_opts $_hg_pat_opts \ |
|
669 | 673 | '(--print0 -0)'{-0,--print0}'[end fields with NUL]' \ |
|
670 |
'-- |
|
|
674 | '--diff[print all revisions when the term was introduced or removed]' \ | |
|
675 | '(--text -a)'{-a,--text}'[treat all files as text]' \ | |
|
671 | 676 | '(--follow -f)'{-f,--follow}'[follow changeset history, or file history across copies and renames]' \ |
|
672 | 677 | '(--ignore-case -i)'{-i,--ignore-case}'[ignore case when matching]' \ |
|
673 | 678 | '(--files-with-matches -l)'{-l,--files-with-matches}'[print only filenames and revisions that match]' \ |
@@ -691,6 +696,7 b' typeset -A _hg_cmd_globals' | |||
|
691 | 696 | '(--extension -e)'{-e,--extension}'[show only help for extensions]' \ |
|
692 | 697 | '(--command -c)'{-c,--command}'[show only help for commands]' \ |
|
693 | 698 | '(--keyword -k)'{-k,--keyword}'[show topics matching keyword]' \ |
|
699 | '*'{-s+,--system=}'[show help for specific platform(s)]:platform:(windows vms plan9 unix)' \ | |
|
694 | 700 | '*:mercurial help topic:_hg_help_topics' |
|
695 | 701 | } |
|
696 | 702 | |
@@ -707,11 +713,11 b' typeset -A _hg_cmd_globals' | |||
|
707 | 713 | _hg_cmd_import() { |
|
708 | 714 | _arguments -s -S : $_hg_global_opts $_hg_commit_opts \ |
|
709 | 715 | '(--strip -p)'{-p+,--strip=}'[directory strip option for patch (default: 1)]:count' \ |
|
710 | '(--force -f)'{-f,--force}'[skip check for outstanding uncommitted changes]' \ | |
|
711 | 716 | '--bypass[apply patch without touching the working directory]' \ |
|
712 | 717 | '--no-commit[do not commit, just update the working directory]' \ |
|
713 | 718 | '--partial[commit even if some hunks fail]' \ |
|
714 | 719 | '--exact[abort if patch would apply lossily]' \ |
|
720 | '--prefix=[apply patch to subdirectory]:directory:_files -/' \ | |
|
715 | 721 | '--import-branch[use any branch information in patch (implied by --exact)]' \ |
|
716 | 722 | '(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date' \ |
|
717 | 723 | '(--user -u)'{-u+,--user=}'[record the specified user as committer]:user' \ |
@@ -744,11 +750,11 b' typeset -A _hg_cmd_globals' | |||
|
744 | 750 | |
|
745 | 751 | _hg_cmd_log() { |
|
746 | 752 | _arguments -s -S : $_hg_log_opts $_hg_pat_opts \ |
|
747 |
'(--follow - |
|
|
748 | '(-f --follow)--follow-first[only follow the first parent of merge changesets]' \ | |
|
753 | '(--follow -f)'{-f,--follow}'[follow changeset history, or file history across copies and renames]' \ | |
|
749 | 754 | '(--copies -C)'{-C,--copies}'[show copied files]' \ |
|
750 | 755 | '*'{-k+,--keyword=}'[search for a keyword]:keyword' \ |
|
751 | 756 | '*'{-r+,--rev=}'[show the specified revision or revset]:revision:_hg_revrange' \ |
|
757 | '--removed[include revisions where files were removed]' \ | |
|
752 | 758 | '(--only-merges -m)'{-m,--only-merges}'[show only merges]' \ |
|
753 | 759 | '*'{-P+,--prune=}'[do not display revision or any of its ancestors]:revision:_hg_labels' \ |
|
754 | 760 | '*'{-b+,--branch=}'[show changesets within the given named branch]:branch:_hg_branches' \ |
@@ -766,9 +772,9 b' typeset -A _hg_cmd_globals' | |||
|
766 | 772 | |
|
767 | 773 | _hg_cmd_merge() { |
|
768 | 774 | _arguments -s -S : $_hg_global_opts $_hg_mergetool_opts \ |
|
769 | '(--force -f)'{-f,--force}'[force a merge with outstanding changes]' \ | |
|
770 | 775 | '(--rev -r 1)'{-r+,--rev=}'[revision to merge]:revision:_hg_mergerevs' \ |
|
771 | 776 | '(--preview -P)'{-P,--preview}'[review revisions to merge (no merge is performed)]' \ |
|
777 | '(- :)--abort[abort the ongoing merge]' \ | |
|
772 | 778 | ':revision:_hg_mergerevs' |
|
773 | 779 | } |
|
774 | 780 | |
@@ -1073,6 +1079,7 b' typeset -A _hg_cmd_globals' | |||
|
1073 | 1079 | _arguments -s -S : $_hg_global_opts \ |
|
1074 | 1080 | '(--force -f)'{-f,--force}'[overwrite any local changes]' \ |
|
1075 | 1081 | '--keep-changes[tolerate non-conflicting local changes]' \ |
|
1082 | '--no-backup[do not save backup copies of files]' \ | |
|
1076 | 1083 | ':patch:_hg_qseries' |
|
1077 | 1084 | } |
|
1078 | 1085 | |
@@ -1185,6 +1192,7 b' typeset -A _hg_cmd_globals' | |||
|
1185 | 1192 | '--body[send patches as inline message text (default)]' \ |
|
1186 | 1193 | '(--outgoing -o)'{-o,--outgoing}'[send changes not found in the target repository]' \ |
|
1187 | 1194 | '(--bundle -b)'{-b,--bundle}'[send changes not in target as a binary bundle]' \ |
|
1195 | '(--bookmark -B)'{-B+,--bookmark=}'[send changes only reachable by given bookmark]:bookmark:_hg_bookmarks' \ | |
|
1188 | 1196 | '--bundlename=[name of the bundle attachment file (default: bundle)]:name' \ |
|
1189 | 1197 | '*'{-r+,--rev=}'[a revision to send]:revision:_hg_revrange' \ |
|
1190 | 1198 | '--force[run even when remote repository is unrelated (with -b/--bundle)]' \ |
@@ -1194,6 +1202,7 b' typeset -A _hg_cmd_globals' | |||
|
1194 | 1202 | '(--attach -a --inline -i)'{-i,--inline}'[send patches as inline attachments]' \ |
|
1195 | 1203 | '*--bcc=[email addresses of blind carbon copy recipients]:email' \ |
|
1196 | 1204 | '*'{-c+,--cc=}'[email addresses of copy recipients]:email' \ |
|
1205 | '--confirm[ask for confirmation before sending]' \ | |
|
1197 | 1206 | '(--diffstat -d)'{-d,--diffstat}'[add diffstat output to messages]' \ |
|
1198 | 1207 | '--date=[use the given date as the sending date]:date' \ |
|
1199 | 1208 | '--desc=[use the given file as the series description]:files:_files' \ |
@@ -1260,6 +1269,8 b' typeset -A _hg_cmd_globals' | |||
|
1260 | 1269 | _arguments -s -S : $_hg_global_opts $_hg_pat_opts \ |
|
1261 | 1270 | '(--abort-on-err -a)'{-a,--abort-on-err}'[abort if an error occurs]' \ |
|
1262 | 1271 | '--all[purge ignored files too]' \ |
|
1272 | '--dirs[purge empty directories]' \ | |
|
1273 | '--files[purge files]' \ | |
|
1263 | 1274 | '(--print -p)'{-p,--print}'[print filenames instead of deleting them]' \ |
|
1264 | 1275 | '(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs (implies -p/--print)]' |
|
1265 | 1276 | } |
General Comments 0
You need to be logged in to leave comments.
Login now