comparison 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
comparison
equal deleted inserted replaced
4203:bd9b84b9a84b 4209:dbc3846c09a1
261 parents = [parents[0]] 261 parents = [parents[0]]
262 parents = [(p, hexfunc(log.node(p))) for p in parents] 262 parents = [(p, hexfunc(log.node(p))) for p in parents]
263 263
264 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) 264 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
265 265
266 if branch: 266 # don't show the default branch name
267 if branch != 'default':
267 branch = util.tolocal(branch) 268 branch = util.tolocal(branch)
268 self.ui.write(_("branch: %s\n") % branch) 269 self.ui.write(_("branch: %s\n") % branch)
269 for tag in self.repo.nodetags(changenode): 270 for tag in self.repo.nodetags(changenode):
270 self.ui.write(_("tag: %s\n") % tag) 271 self.ui.write(_("tag: %s\n") % tag)
271 for parent in parents: 272 for parent in parents:
400 if endname in self.t: 401 if endname in self.t:
401 yield self.t(endname, **args) 402 yield self.t(endname, **args)
402 403
403 def showbranches(**args): 404 def showbranches(**args):
404 branch = changes[5].get("branch") 405 branch = changes[5].get("branch")
405 if branch: 406 if branch != 'default':
406 branch = util.tolocal(branch) 407 branch = util.tolocal(branch)
407 return showlist('branch', [branch], plural='branches', **args) 408 return showlist('branch', [branch], plural='branches', **args)
408 409
409 def showparents(**args): 410 def showparents(**args):
410 parents = [[('rev', log.rev(p)), ('node', hex(p))] 411 parents = [[('rev', log.rev(p)), ('node', hex(p))]