This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4236

repository: remove candelta() from ifileindex
ClosedPublic

Authored by indygreg on Aug 9 2018, 10:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3682b49e0213: repository: remove candelta() from ifileindex
Summary

candelta() was previously called by changegroup code. With delta
generation moved to the storage API, there are no more external
consumers of this method and it can be removed from the storage
interface.

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

indygreg created this revision.Aug 9 2018, 10:52 PM
Closed by commit rHG3682b49e0213: repository: remove candelta() from ifileindex (authored by indygreg). · Explain WhyAug 22 2018, 12:37 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filelog.py (3 lines)
Mmercurial/repository.py (3 lines)
Mtests/simplestorerepo.py (4 lines)

Diff 10513

mercurial/filelog.py

return self._revlog.heads(start, stop) return self._revlog.heads(start, stop)
def children(self, node): def children(self, node):
return self._revlog.children(node) return self._revlog.children(node)
def deltaparent(self, rev): def deltaparent(self, rev):
return self._revlog.deltaparent(rev) return self._revlog.deltaparent(rev)
def candelta(self, baserev, rev):
return self._revlog.candelta(baserev, rev)
def iscensored(self, rev): def iscensored(self, rev):
return self._revlog.iscensored(rev) return self._revlog.iscensored(rev)
def rawsize(self, rev): def rawsize(self, rev):
return self._revlog.rawsize(rev) return self._revlog.rawsize(rev)
def checkhash(self, text, node, p1=None, p2=None, rev=None): def checkhash(self, text, node, p1=None, p2=None, rev=None):
return self._revlog.checkhash(text, node, p1=p1, p2=p2, rev=rev) return self._revlog.checkhash(text, node, p1=p1, p2=p2, rev=rev)

mercurial/repository.py

"""Obtain nodes that are children of a node. """Obtain nodes that are children of a node.
Returns a list of nodes. Returns a list of nodes.
""" """
def deltaparent(rev): def deltaparent(rev):
""""Return the revision that is a suitable parent to delta against.""" """"Return the revision that is a suitable parent to delta against."""
def candelta(baserev, rev):
""""Whether a delta can be generated between two revisions."""
class ifiledata(interfaceutil.Interface): class ifiledata(interfaceutil.Interface):
"""Storage interface for data storage of a specific file. """Storage interface for data storage of a specific file.
This complements ``ifileindex`` and provides an interface for accessing This complements ``ifileindex`` and provides an interface for accessing
data for a tracked file. data for a tracked file.
""" """
def rawsize(rev): def rawsize(rev):
"""The size of the fulltext data for a revision as stored.""" """The size of the fulltext data for a revision as stored."""

tests/simplestorerepo.py

return self._indexbyrev[rev][b'flags'] return self._indexbyrev[rev][b'flags']
def deltaparent(self, rev): def deltaparent(self, rev):
validaterev(rev) validaterev(rev)
p1node = self.parents(self.node(rev))[0] p1node = self.parents(self.node(rev))[0]
return self.rev(p1node) return self.rev(p1node)
def candelta(self, baserev, rev): def _candelta(self, baserev, rev):
validaterev(baserev) validaterev(baserev)
validaterev(rev) validaterev(rev)
if ((self.flags(baserev) & revlog.REVIDX_RAWTEXT_CHANGING_FLAGS) if ((self.flags(baserev) & revlog.REVIDX_RAWTEXT_CHANGING_FLAGS)
or (self.flags(rev) & revlog.REVIDX_RAWTEXT_CHANGING_FLAGS)): or (self.flags(rev) & revlog.REVIDX_RAWTEXT_CHANGING_FLAGS)):
return False return False
return True return True
baserev = nullrev baserev = nullrev
elif request.basenode is not None: elif request.basenode is not None:
baserev = self.rev(request.basenode) baserev = self.rev(request.basenode)
else: else:
# This is a test extension and we can do simple things # This is a test extension and we can do simple things
# for choosing a delta parent. # for choosing a delta parent.
baserev = self.deltaparent(rev) baserev = self.deltaparent(rev)
if baserev != nullrev and not self.candelta(baserev, rev): if baserev != nullrev and not self._candelta(baserev, rev):
baserev = nullrev baserev = nullrev
revision = None revision = None
delta = None delta = None
baserevisionsize = None baserevisionsize = None
if self.iscensored(baserev) or self.iscensored(rev): if self.iscensored(baserev) or self.iscensored(rev):
try: try: