Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 1238:6a4f181497c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add log -b to show the branch a specific revision lives in This can be somewhat slow on very large repositories, so I didn't want to include it in -v --- hg.orig/mercurial/commands.py 2005-09-13 14:21:57.000000000 -0500 +++ hg/mercurial/commands.py 2005-09-13 18:55:52.000000000 -0500 @@ -1161,7 +1161,10 @@ def log(ui, repo, *pats, **opts): du = dui(ui) elif st == 'add': du.bump(rev) - show_changeset(du, repo, rev) + br = None + if opts['branch']: + br = repo.branchlookup([repo.changelog.node(rev)]) + show_changeset(du, repo, rev, brinfo=br) if opts['patch']: changenode = repo.changelog.node(rev) prev, other = repo.changelog.parents(changenode) @@ -1743,6 +1746,7 @@ table = { (log, [('I', 'include', [], 'include path in search'), ('X', 'exclude', [], 'exclude path from search'), + ('b', 'branch', None, 'show branches'), ('r', 'rev', [], 'revision'), ('p', 'patch', None, 'show patch')], 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),
author mason@suse.com
date Tue, 13 Sep 2005 19:32:53 -0500
parents 5381b0d88e9e
children 3b4f05ff3130
comparison
equal deleted inserted replaced
1237:227cfbe34109 1238:6a4f181497c9
1159 for st, rev, fns in changeiter: 1159 for st, rev, fns in changeiter:
1160 if st == 'window': 1160 if st == 'window':
1161 du = dui(ui) 1161 du = dui(ui)
1162 elif st == 'add': 1162 elif st == 'add':
1163 du.bump(rev) 1163 du.bump(rev)
1164 show_changeset(du, repo, rev) 1164 br = None
1165 if opts['branch']:
1166 br = repo.branchlookup([repo.changelog.node(rev)])
1167 show_changeset(du, repo, rev, brinfo=br)
1165 if opts['patch']: 1168 if opts['patch']:
1166 changenode = repo.changelog.node(rev) 1169 changenode = repo.changelog.node(rev)
1167 prev, other = repo.changelog.parents(changenode) 1170 prev, other = repo.changelog.parents(changenode)
1168 dodiff(du, du, repo, prev, changenode, fns) 1171 dodiff(du, du, repo, prev, changenode, fns)
1169 du.write("\n\n") 1172 du.write("\n\n")
1741 'hg locate [OPTION]... [PATTERN]...'), 1744 'hg locate [OPTION]... [PATTERN]...'),
1742 "^log|history": 1745 "^log|history":
1743 (log, 1746 (log,
1744 [('I', 'include', [], 'include path in search'), 1747 [('I', 'include', [], 'include path in search'),
1745 ('X', 'exclude', [], 'exclude path from search'), 1748 ('X', 'exclude', [], 'exclude path from search'),
1749 ('b', 'branch', None, 'show branches'),
1746 ('r', 'rev', [], 'revision'), 1750 ('r', 'rev', [], 'revision'),
1747 ('p', 'patch', None, 'show patch')], 1751 ('p', 'patch', None, 'show patch')],
1748 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'), 1752 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),
1749 "manifest": (manifest, [], 'hg manifest [REV]'), 1753 "manifest": (manifest, [], 'hg manifest [REV]'),
1750 "outgoing|out": (outgoing, 1754 "outgoing|out": (outgoing,