##// END OF EJS Templates
keyword: make kwfiles show deleted files configured for expansion
Christian Ebert -
r13079:f3a2bb1e default
parent child Browse files
Show More
@@ -103,6 +103,7 b" recordextensions = 'record'"
103
103
104 colortable = {
104 colortable = {
105 'kwfiles.enabled': 'green bold',
105 'kwfiles.enabled': 'green bold',
106 'kwfiles.deleted': 'cyan bold underline',
106 'kwfiles.enabledunknown': 'green',
107 'kwfiles.enabledunknown': 'green',
107 'kwfiles.ignored': 'bold',
108 'kwfiles.ignored': 'bold',
108 'kwfiles.ignoredunknown': 'none'
109 'kwfiles.ignoredunknown': 'none'
@@ -445,16 +446,17 b' def files(ui, repo, *pats, **opts):'
445 files = sorted(modified + added + clean)
446 files = sorted(modified + added + clean)
446 wctx = repo[None]
447 wctx = repo[None]
447 kwfiles = kwt.iskwfile(files, wctx)
448 kwfiles = kwt.iskwfile(files, wctx)
449 kwdeleted = kwt.iskwfile(deleted, wctx)
448 kwunknown = kwt.iskwfile(unknown, wctx)
450 kwunknown = kwt.iskwfile(unknown, wctx)
449 if not opts.get('ignore') or opts.get('all'):
451 if not opts.get('ignore') or opts.get('all'):
450 showfiles = kwfiles, kwunknown
452 showfiles = kwfiles, kwdeleted, kwunknown
451 else:
453 else:
452 showfiles = [], []
454 showfiles = [], [], []
453 if opts.get('all') or opts.get('ignore'):
455 if opts.get('all') or opts.get('ignore'):
454 showfiles += ([f for f in files if f not in kwfiles],
456 showfiles += ([f for f in files if f not in kwfiles],
455 [f for f in unknown if f not in kwunknown])
457 [f for f in unknown if f not in kwunknown])
456 kwlabels = 'enabled enabledunknown ignored ignoredunknown'.split()
458 kwlabels = 'enabled deleted enabledunknown ignored ignoredunknown'.split()
457 kwstates = zip('KkIi', showfiles, kwlabels)
459 kwstates = zip('K!kIi', showfiles, kwlabels)
458 for char, filenames, kwstate in kwstates:
460 for char, filenames, kwstate in kwstates:
459 fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
461 fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
460 for f in filenames:
462 for f in filenames:
General Comments 0
You need to be logged in to leave comments. Login now