Show More
@@ -1681,7 +1681,7 b' def outgoing(ui, repo, dest="default-pus' | |||||
1681 | dodiff(ui, ui, repo, prev, n) |
|
1681 | dodiff(ui, ui, repo, prev, n) | |
1682 | ui.write("\n") |
|
1682 | ui.write("\n") | |
1683 |
|
1683 | |||
1684 | def parents(ui, repo, rev=None): |
|
1684 | def parents(ui, repo, rev=None, branch=None): | |
1685 | """show the parents of the working dir or revision |
|
1685 | """show the parents of the working dir or revision | |
1686 |
|
1686 | |||
1687 | Print the working directory's parent revisions. |
|
1687 | Print the working directory's parent revisions. | |
@@ -1691,9 +1691,12 b' def parents(ui, repo, rev=None):' | |||||
1691 | else: |
|
1691 | else: | |
1692 | p = repo.dirstate.parents() |
|
1692 | p = repo.dirstate.parents() | |
1693 |
|
1693 | |||
|
1694 | br = None | |||
|
1695 | if branch is not None: | |||
|
1696 | br = repo.branchlookup(p) | |||
1694 | for n in p: |
|
1697 | for n in p: | |
1695 | if n != nullid: |
|
1698 | if n != nullid: | |
1696 | show_changeset(ui, repo, changenode=n) |
|
1699 | show_changeset(ui, repo, changenode=n, brinfo=br) | |
1697 |
|
1700 | |||
1698 | def paths(ui, search=None): |
|
1701 | def paths(ui, search=None): | |
1699 | """show definition of symbolic path names |
|
1702 | """show definition of symbolic path names | |
@@ -2412,7 +2415,10 b' table = {' | |||||
2412 | ('p', 'patch', None, _('show patch')), |
|
2415 | ('p', 'patch', None, _('show patch')), | |
2413 | ('n', 'newest-first', None, _('show newest record first'))], |
|
2416 | ('n', 'newest-first', None, _('show newest record first'))], | |
2414 | _('hg outgoing [-p] [-n] [-M] [DEST]')), |
|
2417 | _('hg outgoing [-p] [-n] [-M] [DEST]')), | |
2415 | "^parents": (parents, [], _('hg parents [REV]')), |
|
2418 | "^parents": | |
|
2419 | (parents, | |||
|
2420 | [('b', 'branch', None, _('show branches'))], | |||
|
2421 | _('hg parents [-b] [REV]')), | |||
2416 | "paths": (paths, [], _('hg paths [NAME]')), |
|
2422 | "paths": (paths, [], _('hg paths [NAME]')), | |
2417 | "^pull": |
|
2423 | "^pull": | |
2418 | (pull, |
|
2424 | (pull, |
General Comments 0
You need to be logged in to leave comments.
Login now