This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5996

committablectx: move status-related methods closer together
ClosedPublic

Authored by martinvonz on Feb 21 2019, 11:47 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2ba96fca8528: committablectx: move status-related methods closer together
Summary

The modified()/added()/removed()/deleted() clearly belong very close
to status(). I separated them in committablectx by the new
p[12]copies() methods. This brings the close again. Sorry about the
churn.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 21 2019, 11:47 AM
Closed by commit rHG2ba96fca8528: committablectx: move status-related methods closer together (authored by martinvonz). · Explain WhyFeb 24 2019, 8:38 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (16 lines)

Diff 14232

mercurial/context.py

return self._user or self._repo.ui.username() return self._user or self._repo.ui.username()
def date(self): def date(self):
return self._date return self._date
def description(self): def description(self):
return self._text return self._text
def files(self): def files(self):
return sorted(self._status.modified + self._status.added + return sorted(self._status.modified + self._status.added +
self._status.removed) self._status.removed)
def modified(self):
return self._status.modified
def added(self):
return self._status.added
def removed(self):
return self._status.removed
def deleted(self):
return self._status.deleted
@propertycache @propertycache
def _copies(self): def _copies(self):
p1copies = {} p1copies = {}
p2copies = {} p2copies = {}
parents = self._repo.dirstate.parents() parents = self._repo.dirstate.parents()
p1manifest = self._repo[parents[0]].manifest() p1manifest = self._repo[parents[0]].manifest()
p2manifest = self._repo[parents[1]].manifest() p2manifest = self._repo[parents[1]].manifest()
narrowmatch = self._repo.narrowmatch() narrowmatch = self._repo.narrowmatch()
for dst, src in self._repo.dirstate.copies().items(): for dst, src in self._repo.dirstate.copies().items():
if not narrowmatch(dst): if not narrowmatch(dst):
continue continue
if src in p1manifest: if src in p1manifest:
p1copies[dst] = src p1copies[dst] = src
elif src in p2manifest: elif src in p2manifest:
p2copies[dst] = src p2copies[dst] = src
return p1copies, p2copies return p1copies, p2copies
def p1copies(self): def p1copies(self):
return self._copies[0] return self._copies[0]
def p2copies(self): def p2copies(self):
return self._copies[1] return self._copies[1]
def modified(self):
return self._status.modified
def added(self):
return self._status.added
def removed(self):
return self._status.removed
def deleted(self):
return self._status.deleted
def branch(self): def branch(self):
return encoding.tolocal(self._extra['branch']) return encoding.tolocal(self._extra['branch'])
def closesbranch(self): def closesbranch(self):
return 'close' in self._extra return 'close' in self._extra
def extra(self): def extra(self):
return self._extra return self._extra
def isinmemory(self): def isinmemory(self):