Show More
@@ -358,7 +358,7 typeset -A _hg_cmd_globals | |||||
358 | _hg_diff_opts=( |
|
358 | _hg_diff_opts=( | |
359 | '(--text -a)'{-a,--text}'[treat all files as text]' |
|
359 | '(--text -a)'{-a,--text}'[treat all files as text]' | |
360 | '(--git -g)'{-g,--git}'[use git extended diff format]' |
|
360 | '(--git -g)'{-g,--git}'[use git extended diff format]' | |
361 |
"--nodates[ |
|
361 | "--nodates[omit dates from diff headers]") | |
362 |
|
362 | |||
363 | _hg_dryrun_opts=( |
|
363 | _hg_dryrun_opts=( | |
364 | '(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]') |
|
364 | '(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]') |
@@ -3330,7 +3330,7 logopts = [ | |||||
3330 | diffopts = [ |
|
3330 | diffopts = [ | |
3331 | ('a', 'text', None, _('treat all files as text')), |
|
3331 | ('a', 'text', None, _('treat all files as text')), | |
3332 | ('g', 'git', None, _('use git extended diff format')), |
|
3332 | ('g', 'git', None, _('use git extended diff format')), | |
3333 |
('', 'nodates', None, _( |
|
3333 | ('', 'nodates', None, _('omit dates from diff headers')) | |
3334 | ] |
|
3334 | ] | |
3335 |
|
3335 | |||
3336 | diffopts2 = [ |
|
3336 | diffopts2 = [ | |
@@ -3412,11 +3412,11 table = { | |||||
3412 | "bundle": |
|
3412 | "bundle": | |
3413 | (bundle, |
|
3413 | (bundle, | |
3414 | [('f', 'force', None, |
|
3414 | [('f', 'force', None, | |
3415 |
_('run even when |
|
3415 | _('run even when the destination is unrelated')), | |
3416 | ('r', 'rev', [], |
|
3416 | ('r', 'rev', [], | |
3417 | _('a changeset up to which you would like to bundle')), |
|
3417 | _('a changeset intended to be added to the destination')), | |
3418 | ('', 'base', [], |
|
3418 | ('', 'base', [], | |
3419 |
_('a base changeset |
|
3419 | _('a base changeset assumed to be available at the destination')), | |
3420 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
3420 | ('a', 'all', None, _('bundle all changesets in the repository')), | |
3421 | ('t', 'type', 'bzip2', _('bundle compression type to use')), |
|
3421 | ('t', 'type', 'bzip2', _('bundle compression type to use')), | |
3422 | ] + remoteopts, |
|
3422 | ] + remoteopts, | |
@@ -3431,11 +3431,11 table = { | |||||
3431 | "^clone": |
|
3431 | "^clone": | |
3432 | (clone, |
|
3432 | (clone, | |
3433 | [('U', 'noupdate', None, |
|
3433 | [('U', 'noupdate', None, | |
3434 |
_('the clone will |
|
3434 | _('the clone will include an empty working copy (only a repository)')), | |
3435 | ('u', 'updaterev', '', |
|
3435 | ('u', 'updaterev', '', | |
3436 | _('revision, tag or branch to check out')), |
|
3436 | _('revision, tag or branch to check out')), | |
3437 | ('r', 'rev', [], |
|
3437 | ('r', 'rev', [], | |
3438 |
_(' |
|
3438 | _('include the specified changeset')), | |
3439 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
3439 | ('', 'pull', None, _('use pull protocol to copy metadata')), | |
3440 | ('', 'uncompressed', None, |
|
3440 | ('', 'uncompressed', None, | |
3441 | _('use uncompressed transfer (fast over LAN)')), |
|
3441 | _('use uncompressed transfer (fast over LAN)')), | |
@@ -3562,11 +3562,11 table = { | |||||
3562 | "incoming|in": |
|
3562 | "incoming|in": | |
3563 | (incoming, |
|
3563 | (incoming, | |
3564 | [('f', 'force', None, |
|
3564 | [('f', 'force', None, | |
3565 |
_('run even |
|
3565 | _('run even if remote repository is unrelated')), | |
3566 | ('n', 'newest-first', None, _('show newest record first')), |
|
3566 | ('n', 'newest-first', None, _('show newest record first')), | |
3567 | ('', 'bundle', '', _('file to store the bundles into')), |
|
3567 | ('', 'bundle', '', _('file to store the bundles into')), | |
3568 | ('r', 'rev', [], |
|
3568 | ('r', 'rev', [], | |
3569 | _('a specific remote revision up to which you would like to pull')), |
|
3569 | _('a remote changeset intended to be added')), | |
3570 | ] + logopts + remoteopts, |
|
3570 | ] + logopts + remoteopts, | |
3571 | _('[-p] [-n] [-M] [-f] [-r REV]...' |
|
3571 | _('[-p] [-n] [-M] [-f] [-r REV]...' | |
3572 | ' [--bundle FILENAME] [SOURCE]')), |
|
3572 | ' [--bundle FILENAME] [SOURCE]')), | |
@@ -3576,7 +3576,7 table = { | |||||
3576 | _('[-e CMD] [--remotecmd CMD] [DEST]')), |
|
3576 | _('[-e CMD] [--remotecmd CMD] [DEST]')), | |
3577 | "locate": |
|
3577 | "locate": | |
3578 | (locate, |
|
3578 | (locate, | |
3579 |
[('r', 'rev', '', _('search the repository as it |
|
3579 | [('r', 'rev', '', _('search the repository as it is in REV')), | |
3580 | ('0', 'print0', None, |
|
3580 | ('0', 'print0', None, | |
3581 | _('end filenames with NUL, for use with xargs')), |
|
3581 | _('end filenames with NUL, for use with xargs')), | |
3582 | ('f', 'fullpath', None, |
|
3582 | ('f', 'fullpath', None, | |
@@ -3617,15 +3617,15 table = { | |||||
3617 | "outgoing|out": |
|
3617 | "outgoing|out": | |
3618 | (outgoing, |
|
3618 | (outgoing, | |
3619 | [('f', 'force', None, |
|
3619 | [('f', 'force', None, | |
3620 |
_('run even when |
|
3620 | _('run even when the destination is unrelated')), | |
3621 | ('r', 'rev', [], |
|
3621 | ('r', 'rev', [], | |
3622 | _('a specific revision up to which you would like to push')), |
|
3622 | _('a changeset intended to be included in the destination')), | |
3623 | ('n', 'newest-first', None, _('show newest record first')), |
|
3623 | ('n', 'newest-first', None, _('show newest record first')), | |
3624 | ] + logopts + remoteopts, |
|
3624 | ] + logopts + remoteopts, | |
3625 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')), |
|
3625 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')), | |
3626 | "parents": |
|
3626 | "parents": | |
3627 | (parents, |
|
3627 | (parents, | |
3628 |
[('r', 'rev', '', _('show parents |
|
3628 | [('r', 'rev', '', _('show parents of the specified revision')), | |
3629 | ] + templateopts, |
|
3629 | ] + templateopts, | |
3630 | _('[-r REV] [FILE]')), |
|
3630 | _('[-r REV] [FILE]')), | |
3631 | "paths": (paths, [], _('[NAME]')), |
|
3631 | "paths": (paths, [], _('[NAME]')), | |
@@ -3636,14 +3636,14 table = { | |||||
3636 | ('f', 'force', None, |
|
3636 | ('f', 'force', None, | |
3637 | _('run even when remote repository is unrelated')), |
|
3637 | _('run even when remote repository is unrelated')), | |
3638 | ('r', 'rev', [], |
|
3638 | ('r', 'rev', [], | |
3639 | _('a specific remote revision up to which you would like to pull')), |
|
3639 | _('a remote changeset intended to be added')), | |
3640 | ] + remoteopts, |
|
3640 | ] + remoteopts, | |
3641 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')), |
|
3641 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')), | |
3642 | "^push": |
|
3642 | "^push": | |
3643 | (push, |
|
3643 | (push, | |
3644 | [('f', 'force', None, _('force push')), |
|
3644 | [('f', 'force', None, _('force push')), | |
3645 | ('r', 'rev', [], |
|
3645 | ('r', 'rev', [], | |
3646 | _('a specific revision up to which you would like to push')), |
|
3646 | _('a changeset intended to be included in the destination')), | |
3647 | ] + remoteopts, |
|
3647 | ] + remoteopts, | |
3648 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')), |
|
3648 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')), | |
3649 | "recover": (recover, []), |
|
3649 | "recover": (recover, []), | |
@@ -3674,7 +3674,7 table = { | |||||
3674 | (revert, |
|
3674 | (revert, | |
3675 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
3675 | [('a', 'all', None, _('revert all changes when no arguments given')), | |
3676 | ('d', 'date', '', _('tipmost revision matching date')), |
|
3676 | ('d', 'date', '', _('tipmost revision matching date')), | |
3677 |
('r', 'rev', '', _('rev |
|
3677 | ('r', 'rev', '', _('revert to the specified revision')), | |
3678 | ('', 'no-backup', None, _('do not save backup copies of files')), |
|
3678 | ('', 'no-backup', None, _('do not save backup copies of files')), | |
3679 | ] + walkopts + dryrunopts, |
|
3679 | ] + walkopts + dryrunopts, | |
3680 | _('[OPTION]... [-r REV] [NAME]...')), |
|
3680 | _('[OPTION]... [-r REV] [NAME]...')), |
@@ -344,7 +344,7 options: | |||||
344 | -c --change change made by revision |
|
344 | -c --change change made by revision | |
345 | -a --text treat all files as text |
|
345 | -a --text treat all files as text | |
346 | -g --git use git extended diff format |
|
346 | -g --git use git extended diff format | |
347 |
--nodates |
|
347 | --nodates omit dates from diff headers | |
348 | -p --show-function show which function each change is in |
|
348 | -p --show-function show which function each change is in | |
349 | --reverse produce a diff that undoes the changes |
|
349 | --reverse produce a diff that undoes the changes | |
350 | -w --ignore-all-space ignore white space when comparing lines |
|
350 | -w --ignore-all-space ignore white space when comparing lines |
General Comments 0
You need to be logged in to leave comments.
Login now