Mercurial > hg-stable
changeset 23304:dd3f857598a0
context.status: pass status tuple into _buildstatus
By passing a status tuple (instead of the current list), we can access
the status fields by name and make it a little more readable.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 12 Nov 2014 22:20:36 -0800 |
parents | 3f269bd4826c |
children | 0cc283f44655 |
files | mercurial/context.py |
diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Wed Nov 12 22:07:31 2014 -0800 +++ b/mercurial/context.py Wed Nov 12 22:20:36 2014 -0800 @@ -108,7 +108,7 @@ mf2 = self._manifestmatches(match, s) modified, added, clean = [], [], [] - deleted, unknown, ignored = s[3], s[4], s[5] + deleted, unknown, ignored = s.deleted, s.unknown, s.ignored deletedset = set(deleted) withflags = mf1.withflags() | mf2.withflags() for fn, mf2node in mf2.iteritems(): @@ -301,7 +301,7 @@ ctx1, ctx2 = ctx2, ctx1 match = ctx2._matchstatus(ctx1, match) - r = [[], [], [], [], [], [], []] + r = scmutil.status([], [], [], [], [], [], []) r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, listunknown) @@ -1389,11 +1389,10 @@ need to build a manifest and return what matches. """ mf = self._repo['.']._manifestmatches(match, s) - modified, added, removed = s[0:3] - for f in modified + added: + for f in s.modified + s.added: mf[f] = None mf.setflag(f, self.flags(f)) - for f in removed: + for f in s.removed: if f in mf: del mf[f] return mf