Show More
@@ -470,9 +470,9 b' def branches(ui, repo, active=False, clo' | |||||
470 | elif hn not in repo.branchheads(tag, closed=False): |
|
470 | elif hn not in repo.branchheads(tag, closed=False): | |
471 | if not closed: |
|
471 | if not closed: | |
472 | continue |
|
472 | continue | |
473 | notice = ' (closed)' |
|
473 | notice = _(' (closed)') | |
474 | else: |
|
474 | else: | |
475 | notice = ' (inactive)' |
|
475 | notice = _(' (inactive)') | |
476 | rev = str(node).rjust(31 - encoding.colwidth(encodedtag)) |
|
476 | rev = str(node).rjust(31 - encoding.colwidth(encodedtag)) | |
477 | data = encodedtag, rev, hexfunc(hn), notice |
|
477 | data = encodedtag, rev, hexfunc(hn), notice | |
478 | ui.write("%s %s:%s%s\n" % data) |
|
478 | ui.write("%s %s:%s%s\n" % data) | |
@@ -3339,7 +3339,7 b' table = {' | |||||
3339 | ('s', 'skip', False, _('skip testing changeset')), |
|
3339 | ('s', 'skip', False, _('skip testing changeset')), | |
3340 | ('c', 'command', '', _('use command to check changeset state')), |
|
3340 | ('c', 'command', '', _('use command to check changeset state')), | |
3341 | ('U', 'noupdate', False, _('do not update to target'))], |
|
3341 | ('U', 'noupdate', False, _('do not update to target'))], | |
3342 | _("[-gbsr] [-c CMD] [REV]")), |
|
3342 | _("[-gbsr] [-U] [-c CMD] [REV]")), | |
3343 | "branch": |
|
3343 | "branch": | |
3344 | (branch, |
|
3344 | (branch, | |
3345 | [('f', 'force', None, |
|
3345 | [('f', 'force', None, | |
@@ -3352,7 +3352,7 b' table = {' | |||||
3352 | _('show only branches that have unmerged heads')), |
|
3352 | _('show only branches that have unmerged heads')), | |
3353 | ('c', 'closed', False, |
|
3353 | ('c', 'closed', False, | |
3354 | _('show normal and closed branches'))], |
|
3354 | _('show normal and closed branches'))], | |
3355 | _('[-a]')), |
|
3355 | _('[-ac]')), | |
3356 | "bundle": |
|
3356 | "bundle": | |
3357 | (bundle, |
|
3357 | (bundle, | |
3358 | [('f', 'force', None, |
|
3358 | [('f', 'force', None, | |
@@ -3364,7 +3364,7 b' table = {' | |||||
3364 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
3364 | ('a', 'all', None, _('bundle all changesets in the repository')), | |
3365 | ('t', 'type', 'bzip2', _('bundle compression type to use')), |
|
3365 | ('t', 'type', 'bzip2', _('bundle compression type to use')), | |
3366 | ] + remoteopts, |
|
3366 | ] + remoteopts, | |
3367 | _('[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]')), |
|
3367 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')), | |
3368 | "cat": |
|
3368 | "cat": | |
3369 | (cat, |
|
3369 | (cat, | |
3370 | [('o', 'output', '', _('print output to file with formatted name')), |
|
3370 | [('o', 'output', '', _('print output to file with formatted name')), | |
@@ -3474,7 +3474,7 b' table = {' | |||||
3474 | ('c', 'closed', False, |
|
3474 | ('c', 'closed', False, | |
3475 | _('show normal and closed branch heads')), |
|
3475 | _('show normal and closed branch heads')), | |
3476 | ] + templateopts, |
|
3476 | ] + templateopts, | |
3477 | _('[-r STARTREV] [REV]...')), |
|
3477 | _('[-ac] [-r STARTREV] [REV]...')), | |
3478 | "help": (help_, [], _('[TOPIC]')), |
|
3478 | "help": (help_, [], _('[TOPIC]')), | |
3479 | "identify|id": |
|
3479 | "identify|id": | |
3480 | (identify, |
|
3480 | (identify, | |
@@ -3551,7 +3551,7 b' table = {' | |||||
3551 | ('r', 'rev', '', _('revision to merge')), |
|
3551 | ('r', 'rev', '', _('revision to merge')), | |
3552 | ('P', 'preview', None, |
|
3552 | ('P', 'preview', None, | |
3553 | _('review revisions to merge (no merge is performed)'))], |
|
3553 | _('review revisions to merge (no merge is performed)'))], | |
3554 | _('[-f] [[-r] REV]')), |
|
3554 | _('[-P] [-f] [[-r] REV]')), | |
3555 | "outgoing|out": |
|
3555 | "outgoing|out": | |
3556 | (outgoing, |
|
3556 | (outgoing, | |
3557 | [('f', 'force', None, |
|
3557 | [('f', 'force', None, | |
@@ -3671,14 +3671,14 b' table = {' | |||||
3671 | # -l/--local is already there, commitopts cannot be used |
|
3671 | # -l/--local is already there, commitopts cannot be used | |
3672 | ('m', 'message', '', _('use <text> as commit message')), |
|
3672 | ('m', 'message', '', _('use <text> as commit message')), | |
3673 | ] + commitopts2, |
|
3673 | ] + commitopts2, | |
3674 | _('[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')), |
|
3674 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')), | |
3675 | "tags": (tags, [], ''), |
|
3675 | "tags": (tags, [], ''), | |
3676 | "tip": |
|
3676 | "tip": | |
3677 | (tip, |
|
3677 | (tip, | |
3678 | [('p', 'patch', None, _('show patch')), |
|
3678 | [('p', 'patch', None, _('show patch')), | |
3679 | ('g', 'git', None, _('use git extended diff format')), |
|
3679 | ('g', 'git', None, _('use git extended diff format')), | |
3680 | ] + templateopts, |
|
3680 | ] + templateopts, | |
3681 | _('[-p]')), |
|
3681 | _('[-p] [-g]')), | |
3682 | "unbundle": |
|
3682 | "unbundle": | |
3683 | (unbundle, |
|
3683 | (unbundle, | |
3684 | [('u', 'update', None, |
|
3684 | [('u', 'update', None, |
General Comments 0
You need to be logged in to leave comments.
Login now