This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6933

context: clarify the various mode in the _copies property cache
ClosedPublic

Authored by marmoute on Oct 1 2019, 8:32 AM.

Details

Reviewers
martinvonz
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8af909893188: context: clarify the various mode in the _copies property cache
Summary

The previous code was compact but a bit dense. The new proposed code deal with
each mode separately, there are some duplicated lines, but the meaning of each
mode stand out.

One of the benefit it to make it simpler to add further mode in the future.

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

marmoute created this revision.Oct 1 2019, 8:32 AM
pulkit accepted this revision.Oct 1 2019, 10:37 AM
This revision is now accepted and ready to land.Oct 1 2019, 10:37 AM
martinvonz added inline comments.Oct 1 2019, 12:23 PM
mercurial/context.py
502–504

This needs to be split up (the "compatibility" case is now further up)

marmoute updated this revision to Diff 16747.Oct 1 2019, 12:37 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (24 lines)

Diff 16753

mercurial/context.py

source = self._repo.ui.config('experimental', 'copies.read-from') source = self._repo.ui.config('experimental', 'copies.read-from')
p1copies = self._changeset.p1copies p1copies = self._changeset.p1copies
p2copies = self._changeset.p2copies p2copies = self._changeset.p2copies
# If config says to get copy metadata only from changeset, then return # If config says to get copy metadata only from changeset, then return
# that, defaulting to {} if there was no copy metadata. # that, defaulting to {} if there was no copy metadata.
# In compatibility mode, we return copy data from the changeset if # In compatibility mode, we return copy data from the changeset if
# it was recorded there, and otherwise we fall back to getting it from # it was recorded there, and otherwise we fall back to getting it from
# the filelogs (below). # the filelogs (below).
if (source == 'changeset-only' or if source == 'changeset-only':
(source == 'compatibility' and p1copies is not None)): if p1copies is None:
return p1copies or {}, p2copies or {} p1copies = {}
if p2copies is None:
# Otherwise (config said to read only from filelog, or we are in p2copies = {}
# compatiblity mode and there is not data in the changeset), we get elif source == 'compatibility':
# the copy metadata from the filelogs. if p1copies is None:
return super(changectx, self)._copies # we are in compatiblity mode and there is not data in the
# changeset), we get the copy metadata from the filelogs.
p1copies, p2copies = super(changectx, self)._copies
else:
# config said to read only from filelog, we get the copy metadata
martinvonzUnsubmitted
Not Done

This needs to be split up (the "compatibility" case is now further up)

martinvonz: This needs to be split up (the "compatibility" case is now further up)
# from the filelogs.
p1copies, p2copies = super(changectx, self)._copies
return p1copies, p2copies
def description(self): def description(self):
return self._changeset.description return self._changeset.description
def branch(self): def branch(self):
return encoding.tolocal(self._changeset.extra.get("branch")) return encoding.tolocal(self._changeset.extra.get("branch"))
def closesbranch(self): def closesbranch(self):
return 'close' in self._changeset.extra return 'close' in self._changeset.extra
def extra(self): def extra(self):
"""Return a dict of extra information.""" """Return a dict of extra information."""