comparison mercurial/commands.py @ 1948:ebe273a16048

merge with crew/templates
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 13 Mar 2006 23:38:14 +0100
parents fdf40c9b3306 3f6be77eda58
children d53a18f592be
comparison
equal deleted inserted replaced
1946:9fee186f7f0d 1948:ebe273a16048
437 yield self.t(startname, **args) 437 yield self.t(startname, **args)
438 vargs = args.copy() 438 vargs = args.copy()
439 def one(v, tag=name): 439 def one(v, tag=name):
440 try: 440 try:
441 vargs.update(v) 441 vargs.update(v)
442 except ValueError: 442 except (AttributeError, ValueError):
443 vargs.update([(name, v)]) 443 try:
444 for a, b in v:
445 vargs[a] = b
446 except ValueError:
447 vargs[name] = v
444 return self.t(tag, **vargs) 448 return self.t(tag, **vargs)
445 lastname = 'last_' + name 449 lastname = 'last_' + name
446 if lastname in self.t: 450 if lastname in self.t:
447 last = values.pop() 451 last = values.pop()
448 else: 452 else:
465 showbranches = '' 469 showbranches = ''
466 470
467 if self.ui.debugflag: 471 if self.ui.debugflag:
468 def showmanifest(**args): 472 def showmanifest(**args):
469 args = args.copy() 473 args = args.copy()
470 args.update(rev=self.repo.manifest.rev(changes[0]), 474 args.update(dict(rev=self.repo.manifest.rev(changes[0]),
471 node=hex(changes[0])) 475 node=hex(changes[0])))
472 yield self.t('manifest', **args) 476 yield self.t('manifest', **args)
473 else: 477 else:
474 showmanifest = '' 478 showmanifest = ''
475 479
476 def showparents(**args): 480 def showparents(**args):