Show More
@@ -250,10 +250,8 b' def _status(ui, repo, kwt, *pats, **opts' | |||||
250 | '''Bails out if [keyword] configuration is not active. |
|
250 | '''Bails out if [keyword] configuration is not active. | |
251 | Returns status of working directory.''' |
|
251 | Returns status of working directory.''' | |
252 | if kwt: |
|
252 | if kwt: | |
253 | unknown = (opts.get('unknown') or opts.get('all') |
|
|||
254 | or opts.get('untracked')) |
|
|||
255 | return repo.status(match=cmdutil.match(repo, pats, opts), clean=True, |
|
253 | return repo.status(match=cmdutil.match(repo, pats, opts), clean=True, | |
256 | unknown=unknown) |
|
254 | unknown=opts.get('unknown') or opts.get('all')) | |
257 | if ui.configitems('keyword'): |
|
255 | if ui.configitems('keyword'): | |
258 | raise util.Abort(_('[keyword] patterns cannot match')) |
|
256 | raise util.Abort(_('[keyword] patterns cannot match')) | |
259 | raise util.Abort(_('no [keyword] patterns configured')) |
|
257 | raise util.Abort(_('no [keyword] patterns configured')) | |
@@ -395,7 +393,7 b' def files(ui, repo, *pats, **opts):' | |||||
395 | cwd = pats and repo.getcwd() or '' |
|
393 | cwd = pats and repo.getcwd() or '' | |
396 | modified, added, removed, deleted, unknown, ignored, clean = status |
|
394 | modified, added, removed, deleted, unknown, ignored, clean = status | |
397 | files = [] |
|
395 | files = [] | |
398 |
if not |
|
396 | if not opts.get('unknown') or opts.get('all'): | |
399 | files = sorted(modified + added + clean) |
|
397 | files = sorted(modified + added + clean) | |
400 | wctx = repo[None] |
|
398 | wctx = repo[None] | |
401 | kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)] |
|
399 | kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)] | |
@@ -532,9 +530,6 b' cmdtable = {' | |||||
532 | [('A', 'all', None, _('show keyword status flags of all files')), |
|
530 | [('A', 'all', None, _('show keyword status flags of all files')), | |
533 | ('i', 'ignore', None, _('show files excluded from expansion')), |
|
531 | ('i', 'ignore', None, _('show files excluded from expansion')), | |
534 | ('u', 'unknown', None, _('only show unknown (not tracked) files')), |
|
532 | ('u', 'unknown', None, _('only show unknown (not tracked) files')), | |
535 | ('a', 'all', None, |
|
|||
536 | _('show keyword status flags of all files (DEPRECATED)')), |
|
|||
537 | ('u', 'untracked', None, _('only show untracked files (DEPRECATED)')), |
|
|||
538 | ] + commands.walkopts, |
|
533 | ] + commands.walkopts, | |
539 | _('hg kwfiles [OPTION]... [FILE]...')), |
|
534 | _('hg kwfiles [OPTION]... [FILE]...')), | |
540 | 'kwshrink': (shrink, commands.walkopts, |
|
535 | 'kwshrink': (shrink, commands.walkopts, |
General Comments 0
You need to be logged in to leave comments.
Login now