[PATCH 8 of 9] unionrepo: drop `baserevdiff`
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Fri Aug 30 12:39:37 EDT 2019
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at octobus.net>
# Date 1567181443 -7200
# Fri Aug 30 18:10:43 2019 +0200
# Node ID a0d144e8ade84940455437a305e1721a1f38d171
# Parent 425be1daf1bff57f7526b74b7ed9ae07bf7ba55f
# EXP-Topic sidedata-prep
# Available At https://bitbucket.org/octobus/mercurial-devel/
# hg pull https://bitbucket.org/octobus/mercurial-devel/ -r a0d144e8ade8
unionrepo: drop `baserevdiff`
It as no caller anymore.
diff --git a/mercurial/unionrepo.py b/mercurial/unionrepo.py
--- a/mercurial/unionrepo.py
+++ b/mercurial/unionrepo.py
@@ -112,12 +112,6 @@ class unionrevlog(revlog.revlog):
def rawdata(self, nodeorrev, _df=None):
return self.revision(nodeorrev, _df=_df, raw=True)
- def baserevdiff(self, rev1, rev2):
- # Revlog subclasses may override 'revdiff' method to modify format of
- # content retrieved from revlog. To use unionrevlog with such class one
- # needs to override 'baserevdiff' and make more specific call here.
- return revlog.revlog.revdiff(self, rev1, rev2)
-
def addrevision(self, text, transaction, link, p1=None, p2=None, d=None):
raise NotImplementedError
def addgroup(self, deltas, linkmapper, transaction, addrevisioncb=None,
@@ -136,12 +130,6 @@ class unionchangelog(unionrevlog, change
unionrevlog.__init__(self, opener, self.indexfile, changelog2,
linkmapper)
- def baserevdiff(self, rev1, rev2):
- # Although changelog doesn't override 'revdiff' method, some extensions
- # may replace this class with another that does. Same story with
- # manifest and filelog classes.
- return changelog.changelog.revdiff(self, rev1, rev2)
-
class unionmanifest(unionrevlog, manifest.manifestrevlog):
def __init__(self, opener, opener2, linkmapper):
manifest.manifestrevlog.__init__(self, opener)
@@ -149,9 +137,6 @@ class unionmanifest(unionrevlog, manifes
unionrevlog.__init__(self, opener, self.indexfile, manifest2,
linkmapper)
- def baserevdiff(self, rev1, rev2):
- return manifest.manifestrevlog.revdiff(self, rev1, rev2)
-
class unionfilelog(filelog.filelog):
def __init__(self, opener, path, opener2, linkmapper, repo):
filelog.filelog.__init__(self, opener, path)
@@ -162,9 +147,6 @@ class unionfilelog(filelog.filelog):
self.repotiprev = self._revlog.repotiprev
self.revlog2 = self._revlog.revlog2
- def baserevdiff(self, rev1, rev2):
- return filelog.filelog.revdiff(self, rev1, rev2)
-
def iscensored(self, rev):
"""Check if a revision is censored."""
if rev <= self.repotiprev:
More information about the Mercurial-devel
mailing list