Mercurial > hg-stable
changeset 13079:f3a2bb1e4255
keyword: make kwfiles show deleted files configured for expansion
| author | Christian Ebert <blacktrash@gmx.net> |
|---|---|
| date | Sat, 04 Dec 2010 14:44:05 +0100 |
| parents | 69405131c968 |
| children | bdb73eede5fb |
| files | hgext/keyword.py |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/keyword.py Sat Dec 04 14:22:12 2010 +0100 +++ b/hgext/keyword.py Sat Dec 04 14:44:05 2010 +0100 @@ -103,6 +103,7 @@ colortable = { 'kwfiles.enabled': 'green bold', + 'kwfiles.deleted': 'cyan bold underline', 'kwfiles.enabledunknown': 'green', 'kwfiles.ignored': 'bold', 'kwfiles.ignoredunknown': 'none' @@ -445,16 +446,17 @@ files = sorted(modified + added + clean) wctx = repo[None] kwfiles = kwt.iskwfile(files, wctx) + kwdeleted = kwt.iskwfile(deleted, wctx) kwunknown = kwt.iskwfile(unknown, wctx) if not opts.get('ignore') or opts.get('all'): - showfiles = kwfiles, kwunknown + showfiles = kwfiles, kwdeleted, kwunknown else: - showfiles = [], [] + showfiles = [], [], [] if opts.get('all') or opts.get('ignore'): showfiles += ([f for f in files if f not in kwfiles], [f for f in unknown if f not in kwunknown]) - kwlabels = 'enabled enabledunknown ignored ignoredunknown'.split() - kwstates = zip('KkIi', showfiles, kwlabels) + kwlabels = 'enabled deleted enabledunknown ignored ignoredunknown'.split() + kwstates = zip('K!kIi', showfiles, kwlabels) for char, filenames, kwstate in kwstates: fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n' for f in filenames: