comparison mercurial/commands.py @ 15081:d30ec2d16c5a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 10 Sep 2011 17:56:42 -0500
parents ef43610a4cce 19071b04c9c1
children 5ca8c111e9aa
comparison
equal deleted inserted replaced
15080:574dc5d74f9b 15081:d30ec2d16c5a
3350 _('BRANCH')), 3350 _('BRANCH')),
3351 ('b', 'branch', [], 3351 ('b', 'branch', [],
3352 _('show changesets within the given named branch'), _('BRANCH')), 3352 _('show changesets within the given named branch'), _('BRANCH')),
3353 ('P', 'prune', [], 3353 ('P', 'prune', [],
3354 _('do not display revision or any of its ancestors'), _('REV')), 3354 _('do not display revision or any of its ancestors'), _('REV')),
3355 ('h', 'hidden', False, _('show hidden changesets')), 3355 ('', 'hidden', False, _('show hidden changesets')),
3356 ] + logopts + walkopts, 3356 ] + logopts + walkopts,
3357 _('[OPTION]... [FILE]')) 3357 _('[OPTION]... [FILE]'))
3358 def log(ui, repo, *pats, **opts): 3358 def log(ui, repo, *pats, **opts):
3359 """show revision history of entire repository or files 3359 """show revision history of entire repository or files
3360 3360