comparison mercurial/commands.py @ 9189:c2041f80f22a

heads: more clarity for --closed
author Matt Mackall <mpm@selenic.com>
date Wed, 22 Jul 2009 18:27:23 -0500
parents 4c287332e03b
children 3f650f6aa130 d8143769e1d4 8d7d68dd91fd
comparison
equal deleted inserted replaced
9188:4c287332e03b 9189:c2041f80f22a
1379 else: 1379 else:
1380 start = None 1380 start = None
1381 closed = opts.get('closed') 1381 closed = opts.get('closed')
1382 hideinactive, _heads = opts.get('active'), None 1382 hideinactive, _heads = opts.get('active'), None
1383 if not branchrevs: 1383 if not branchrevs:
1384 if closed:
1385 raise error.Abort(_('you must specify a branch to use --closed'))
1384 # Assume we're looking repo-wide heads if no revs were specified. 1386 # Assume we're looking repo-wide heads if no revs were specified.
1385 heads = repo.heads(start) 1387 heads = repo.heads(start)
1386 else: 1388 else:
1387 if hideinactive: 1389 if hideinactive:
1388 _heads = repo.heads(start) 1390 _heads = repo.heads(start)
3208 "branches": 3210 "branches":
3209 (branches, 3211 (branches,
3210 [('a', 'active', False, 3212 [('a', 'active', False,
3211 _('show only branches that have unmerged heads')), 3213 _('show only branches that have unmerged heads')),
3212 ('c', 'closed', False, 3214 ('c', 'closed', False,
3213 _('show normal and closed heads'))], 3215 _('show normal and closed branches'))],
3214 _('[-a]')), 3216 _('[-a]')),
3215 "bundle": 3217 "bundle":
3216 (bundle, 3218 (bundle,
3217 [('f', 'force', None, 3219 [('f', 'force', None,
3218 _('run even when remote repository is unrelated')), 3220 _('run even when remote repository is unrelated')),
3325 _('[OPTION]... PATTERN [FILE]...')), 3327 _('[OPTION]... PATTERN [FILE]...')),
3326 "heads": 3328 "heads":
3327 (heads, 3329 (heads,
3328 [('r', 'rev', '', _('show only heads which are descendants of REV')), 3330 [('r', 'rev', '', _('show only heads which are descendants of REV')),
3329 ('a', 'active', False, 3331 ('a', 'active', False,
3330 _('show only the active heads from open branches')), 3332 _('show only the active branch heads from open branches')),
3331 ('c', 'closed', False, 3333 ('c', 'closed', False,
3332 _('show normal and closed heads')), 3334 _('show normal and closed branch heads')),
3333 ] + templateopts, 3335 ] + templateopts,
3334 _('[-r STARTREV] [REV]...')), 3336 _('[-r STARTREV] [REV]...')),
3335 "help": (help_, [], _('[TOPIC]')), 3337 "help": (help_, [], _('[TOPIC]')),
3336 "identify|id": 3338 "identify|id":
3337 (identify, 3339 (identify,