Show More
@@ -1650,7 +1650,7 b' def log(ui, repo, *pats, **opts):' | |||||
1650 | if miss: |
|
1650 | if miss: | |
1651 | continue |
|
1651 | continue | |
1652 |
|
1652 | |||
1653 | if opts['branch']: |
|
1653 | if opts['branches']: | |
1654 | br = repo.branchlookup([repo.changelog.node(rev)]) |
|
1654 | br = repo.branchlookup([repo.changelog.node(rev)]) | |
1655 |
|
1655 | |||
1656 | show_changeset(du, repo, rev, brinfo=br) |
|
1656 | show_changeset(du, repo, rev, brinfo=br) | |
@@ -1713,7 +1713,7 b' def outgoing(ui, repo, dest="default-pus' | |||||
1713 | dodiff(ui, ui, repo, prev, n) |
|
1713 | dodiff(ui, ui, repo, prev, n) | |
1714 | ui.write("\n") |
|
1714 | ui.write("\n") | |
1715 |
|
1715 | |||
1716 | def parents(ui, repo, rev=None, branch=None): |
|
1716 | def parents(ui, repo, rev=None, branches=None): | |
1717 | """show the parents of the working dir or revision |
|
1717 | """show the parents of the working dir or revision | |
1718 |
|
1718 | |||
1719 | Print the working directory's parent revisions. |
|
1719 | Print the working directory's parent revisions. | |
@@ -1724,7 +1724,7 b' def parents(ui, repo, rev=None, branch=N' | |||||
1724 | p = repo.dirstate.parents() |
|
1724 | p = repo.dirstate.parents() | |
1725 |
|
1725 | |||
1726 | br = None |
|
1726 | br = None | |
1727 | if branch is not None: |
|
1727 | if branches is not None: | |
1728 | br = repo.branchlookup(p) |
|
1728 | br = repo.branchlookup(p) | |
1729 | for n in p: |
|
1729 | for n in p: | |
1730 | if n != nullid: |
|
1730 | if n != nullid: | |
@@ -2226,7 +2226,7 b' def tip(ui, repo, **opts):' | |||||
2226 | """ |
|
2226 | """ | |
2227 | n = repo.changelog.tip() |
|
2227 | n = repo.changelog.tip() | |
2228 | br = None |
|
2228 | br = None | |
2229 | if opts['branch']: |
|
2229 | if opts['branches']: | |
2230 | br = repo.branchlookup([n]) |
|
2230 | br = repo.branchlookup([n]) | |
2231 | show_changeset(ui, repo, changenode=n, brinfo=br) |
|
2231 | show_changeset(ui, repo, changenode=n, brinfo=br) | |
2232 | if opts['patch']: |
|
2232 | if opts['patch']: | |
@@ -2443,7 +2443,7 b' table = {' | |||||
2443 | _('hg grep [OPTION]... PATTERN [FILE]...')), |
|
2443 | _('hg grep [OPTION]... PATTERN [FILE]...')), | |
2444 | "heads": |
|
2444 | "heads": | |
2445 | (heads, |
|
2445 | (heads, | |
2446 |
[('b', 'branches', None, _(' |
|
2446 | [('b', 'branches', None, _('show branches')), | |
2447 | ('r', 'rev', '', _('show only heads which are descendants of rev'))], |
|
2447 | ('r', 'rev', '', _('show only heads which are descendants of rev'))], | |
2448 | _('hg heads [-b] [-r <rev>]')), |
|
2448 | _('hg heads [-b] [-r <rev>]')), | |
2449 | "help": (help_, [], _('hg help [COMMAND]')), |
|
2449 | "help": (help_, [], _('hg help [COMMAND]')), | |
@@ -2477,7 +2477,7 b' table = {' | |||||
2477 | (log, |
|
2477 | (log, | |
2478 | [('I', 'include', [], _('include names matching the given patterns')), |
|
2478 | [('I', 'include', [], _('include names matching the given patterns')), | |
2479 | ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
2479 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2480 | ('b', 'branch', None, _('show branches')), |
|
2480 | ('b', 'branches', None, _('show branches')), | |
2481 | ('k', 'keyword', [], _('search for a keyword')), |
|
2481 | ('k', 'keyword', [], _('search for a keyword')), | |
2482 | ('l', 'limit', '', _('limit number of changes displayed')), |
|
2482 | ('l', 'limit', '', _('limit number of changes displayed')), | |
2483 | ('r', 'rev', [], _('show the specified revision or range')), |
|
2483 | ('r', 'rev', [], _('show the specified revision or range')), | |
@@ -2493,7 +2493,7 b' table = {' | |||||
2493 | _('hg outgoing [-p] [-n] [-M] [DEST]')), |
|
2493 | _('hg outgoing [-p] [-n] [-M] [DEST]')), | |
2494 | "^parents": |
|
2494 | "^parents": | |
2495 | (parents, |
|
2495 | (parents, | |
2496 | [('b', 'branch', None, _('show branches'))], |
|
2496 | [('b', 'branches', None, _('show branches'))], | |
2497 | _('hg parents [-b] [REV]')), |
|
2497 | _('hg parents [-b] [REV]')), | |
2498 | "paths": (paths, [], _('hg paths [NAME]')), |
|
2498 | "paths": (paths, [], _('hg paths [NAME]')), | |
2499 | "^pull": |
|
2499 | "^pull": | |
@@ -2582,7 +2582,7 b' table = {' | |||||
2582 | "tags": (tags, [], _('hg tags')), |
|
2582 | "tags": (tags, [], _('hg tags')), | |
2583 | "tip": |
|
2583 | "tip": | |
2584 | (tip, |
|
2584 | (tip, | |
2585 | [('b', 'branch', None, _('show branches')), |
|
2585 | [('b', 'branches', None, _('show branches')), | |
2586 | ('p', 'patch', None, _('show patch'))], |
|
2586 | ('p', 'patch', None, _('show patch'))], | |
2587 | _('hg [-b] [-p] tip')), |
|
2587 | _('hg [-b] [-p] tip')), | |
2588 | "unbundle": |
|
2588 | "unbundle": |
General Comments 0
You need to be logged in to leave comments.
Login now