Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/cmdutil.py @ 4209:dbc3846c09a1
Merge with -stable, fix small test failure
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 14 Mar 2007 01:26:09 -0500 |
parents | b5d1eaade333 f9bbcebcacea |
children | 0d51eb296fb9 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -263,7 +263,8 @@ class changeset_printer(object): self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) - if branch: + # don't show the default branch name + if branch != 'default': branch = util.tolocal(branch) self.ui.write(_("branch: %s\n") % branch) for tag in self.repo.nodetags(changenode): @@ -402,7 +403,7 @@ class changeset_templater(changeset_prin def showbranches(**args): branch = changes[5].get("branch") - if branch: + if branch != 'default': branch = util.tolocal(branch) return showlist('branch', [branch], plural='branches', **args)