Show More
@@ -420,11 +420,10 b' def _status(ui, repo, wctx, kwt, *pats, ' | |||
|
420 | 420 | """Bails out if [keyword] configuration is not active. |
|
421 | 421 | Returns status of working directory.""" |
|
422 | 422 | if kwt: |
|
423 | opts = pycompat.byteskwargs(opts) | |
|
424 | 423 | return repo.status( |
|
425 | match=scmutil.match(wctx, pats, opts), | |
|
424 | match=scmutil.match(wctx, pats, pycompat.byteskwargs(opts)), | |
|
426 | 425 | clean=True, |
|
427 |
unknown=opts.get( |
|
|
426 | unknown=opts.get('unknown') or opts.get('all'), | |
|
428 | 427 | ) |
|
429 | 428 | if ui.configitems(b'keyword'): |
|
430 | 429 | raise error.Abort(_(b'[keyword] patterns cannot match')) |
@@ -604,26 +603,26 b' def files(ui, repo, *pats, **opts):' | |||
|
604 | 603 | else: |
|
605 | 604 | cwd = b'' |
|
606 | 605 | files = [] |
|
607 | opts = pycompat.byteskwargs(opts) | |
|
608 |
if not opts.get( |
|
|
606 | ||
|
607 | if not opts.get('unknown') or opts.get('all'): | |
|
609 | 608 | files = sorted(status.modified + status.added + status.clean) |
|
610 | 609 | kwfiles = kwt.iskwfile(files, wctx) |
|
611 | 610 | kwdeleted = kwt.iskwfile(status.deleted, wctx) |
|
612 | 611 | kwunknown = kwt.iskwfile(status.unknown, wctx) |
|
613 |
if not opts.get( |
|
|
612 | if not opts.get('ignore') or opts.get('all'): | |
|
614 | 613 | showfiles = kwfiles, kwdeleted, kwunknown |
|
615 | 614 | else: |
|
616 | 615 | showfiles = [], [], [] |
|
617 |
if opts.get( |
|
|
616 | if opts.get('all') or opts.get('ignore'): | |
|
618 | 617 | showfiles += ( |
|
619 | 618 | [f for f in files if f not in kwfiles], |
|
620 | 619 | [f for f in status.unknown if f not in kwunknown], |
|
621 | 620 | ) |
|
622 | 621 | kwlabels = b'enabled deleted enabledunknown ignored ignoredunknown'.split() |
|
623 | 622 | kwstates = zip(kwlabels, pycompat.bytestr(b'K!kIi'), showfiles) |
|
624 | fm = ui.formatter(b'kwfiles', opts) | |
|
623 | fm = ui.formatter(b'kwfiles', pycompat.byteskwargs(opts)) | |
|
625 | 624 | fmt = b'%.0s%s\n' |
|
626 |
if opts.get( |
|
|
625 | if opts.get('all') or ui.verbose: | |
|
627 | 626 | fmt = b'%s %s\n' |
|
628 | 627 | for kwstate, char, filenames in kwstates: |
|
629 | 628 | label = b'kwfiles.' + kwstate |
General Comments 0
You need to be logged in to leave comments.
Login now