Mercurial > hg
diff hgext/keyword.py @ 22918:31f34a213384
keyword: access status fields by name rather than index
author | Martin von Zweigbergk <martinvonz@gmail.com> |
---|---|
date | Fri, 03 Oct 2014 10:05:54 -0700 |
parents | 97d5aca9bb66 |
children | c4ce50a3d634 |
line wrap: on
line diff
--- a/hgext/keyword.py Fri Oct 03 09:51:39 2014 -0700 +++ b/hgext/keyword.py Fri Oct 03 10:05:54 2014 -0700 @@ -171,9 +171,8 @@ '''Retrieves modified and added files from a working directory state and returns the subset of each contained in given changed files retrieved from a change context.''' - modified, added = wstatus[:2] - modified = [f for f in modified if f in changed] - added = [f for f in added if f in changed] + modified = [f for f in wstatus.modified if f in changed] + added = [f for f in wstatus.added if f in changed] return modified, added @@ -349,10 +348,9 @@ wlock = repo.wlock() try: status = _status(ui, repo, wctx, kwt, *pats, **opts) - modified, added, removed, deleted, unknown, ignored, clean = status - if modified or added or removed or deleted: + if status.modified or status.added or status.removed or status.deleted: raise util.Abort(_('outstanding uncommitted changes')) - kwt.overwrite(wctx, clean, True, expand) + kwt.overwrite(wctx, status.clean, True, expand) finally: wlock.release() @@ -503,20 +501,19 @@ wctx = repo[None] status = _status(ui, repo, wctx, kwt, *pats, **opts) cwd = pats and repo.getcwd() or '' - modified, added, removed, deleted, unknown, ignored, clean = status files = [] if not opts.get('unknown') or opts.get('all'): - files = sorted(modified + added + clean) + files = sorted(status.modified + status.added + status.clean) kwfiles = kwt.iskwfile(files, wctx) - kwdeleted = kwt.iskwfile(deleted, wctx) - kwunknown = kwt.iskwfile(unknown, wctx) + kwdeleted = kwt.iskwfile(status.deleted, wctx) + kwunknown = kwt.iskwfile(status.unknown, wctx) if not opts.get('ignore') or opts.get('all'): showfiles = kwfiles, kwdeleted, kwunknown else: 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]) + [f for f in status.unknown if f not in kwunknown]) kwlabels = 'enabled deleted enabledunknown ignored ignoredunknown'.split() kwstates = zip(kwlabels, 'K!kIi', showfiles) fm = ui.formatter('kwfiles', opts)