Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 12166:441a74b8def1
status: recurse into subrepositories with --subrepos/-S flag
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Fri, 03 Sep 2010 12:58:51 +0200 |
parents | 8a0e5b0c0ba9 |
children | d2c5b0927c28 |
comparison
equal
deleted
inserted
replaced
12165:b7fbf24c8a93 | 12166:441a74b8def1 |
---|---|
3476 show += ui.quiet and (states[:4] + ['clean']) or states | 3476 show += ui.quiet and (states[:4] + ['clean']) or states |
3477 if not show: | 3477 if not show: |
3478 show = ui.quiet and states[:4] or states[:5] | 3478 show = ui.quiet and states[:4] or states[:5] |
3479 | 3479 |
3480 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts), | 3480 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts), |
3481 'ignored' in show, 'clean' in show, 'unknown' in show) | 3481 'ignored' in show, 'clean' in show, 'unknown' in show, |
3482 opts.get('subrepos')) | |
3482 changestates = zip(states, 'MAR!?IC', stat) | 3483 changestates = zip(states, 'MAR!?IC', stat) |
3483 | 3484 |
3484 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): | 3485 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): |
3485 ctxn = repo[nullid] | 3486 ctxn = repo[nullid] |
3486 ctx1 = repo[node1] | 3487 ctx1 = repo[node1] |
3987 ] | 3988 ] |
3988 | 3989 |
3989 similarityopts = [ | 3990 similarityopts = [ |
3990 ('s', 'similarity', '', | 3991 ('s', 'similarity', '', |
3991 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) | 3992 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) |
3993 ] | |
3994 | |
3995 subrepoopts = [ | |
3996 ('S', 'subrepos', None, | |
3997 _('recurse into subrepositories')) | |
3992 ] | 3998 ] |
3993 | 3999 |
3994 table = { | 4000 table = { |
3995 "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')), | 4001 "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')), |
3996 "addremove": | 4002 "addremove": |
4452 _('end filenames with NUL, for use with xargs')), | 4458 _('end filenames with NUL, for use with xargs')), |
4453 ('', 'rev', [], | 4459 ('', 'rev', [], |
4454 _('show difference from revision'), _('REV')), | 4460 _('show difference from revision'), _('REV')), |
4455 ('', 'change', '', | 4461 ('', 'change', '', |
4456 _('list the changed files of a revision'), _('REV')), | 4462 _('list the changed files of a revision'), _('REV')), |
4457 ] + walkopts, | 4463 ] + walkopts + subrepoopts, |
4458 _('[OPTION]... [FILE]...')), | 4464 _('[OPTION]... [FILE]...')), |
4459 "tag": | 4465 "tag": |
4460 (tag, | 4466 (tag, |
4461 [('f', 'force', None, _('replace existing tag')), | 4467 [('f', 'force', None, _('replace existing tag')), |
4462 ('l', 'local', None, _('make the tag local')), | 4468 ('l', 'local', None, _('make the tag local')), |