D4792: filelog: remove revdiff() (API)
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Wed Oct 3 15:04:51 UTC 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2f80eaf38ed4: filelog: remove revdiff() (API) (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4792?vs=11475&id=11606
REVISION DETAIL
https://phab.mercurial-scm.org/D4792
AFFECTED FILES
mercurial/filelog.py
mercurial/repository.py
mercurial/testing/storage.py
tests/simplestorerepo.py
CHANGE DETAILS
diff --git a/tests/simplestorerepo.py b/tests/simplestorerepo.py
--- a/tests/simplestorerepo.py
+++ b/tests/simplestorerepo.py
@@ -487,16 +487,6 @@
return nodes
- def revdiff(self, rev1, rev2):
- validaterev(rev1)
- validaterev(rev2)
-
- node1 = self.node(rev1)
- node2 = self.node(rev2)
-
- return mdiff.textdiff(self.revision(node1, raw=True),
- self.revision(node2, raw=True))
-
def heads(self, start=None, stop=None):
# This is copied from revlog.py.
if start is None and stop is None:
diff --git a/mercurial/testing/storage.py b/mercurial/testing/storage.py
--- a/mercurial/testing/storage.py
+++ b/mercurial/testing/storage.py
@@ -396,17 +396,6 @@
with self.assertRaises(error.LookupError):
f.cmp(b'\x01' * 20, b'irrelevant')
- self.assertEqual(f.revdiff(nullrev, nullrev), b'')
-
- with self.assertRaises(IndexError):
- f.revdiff(0, nullrev)
-
- with self.assertRaises(IndexError):
- f.revdiff(nullrev, 0)
-
- with self.assertRaises(IndexError):
- f.revdiff(0, 0)
-
# Emitting empty list is an empty generator.
gen = f.emitrevisions([])
with self.assertRaises(StopIteration):
@@ -459,14 +448,6 @@
self.assertFalse(f.cmp(node, fulltext))
self.assertTrue(f.cmp(node, fulltext + b'extra'))
- self.assertEqual(f.revdiff(0, 0), b'')
- self.assertEqual(f.revdiff(nullrev, 0),
- b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07%s' %
- fulltext)
-
- self.assertEqual(f.revdiff(0, nullrev),
- b'\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\x00')
-
# Emitting a single revision works.
gen = f.emitrevisions([node])
rev = next(gen)
@@ -577,14 +558,6 @@
with self.assertRaises(error.LookupError):
f.cmp(b'\x01' * 20, b'irrelevant')
- self.assertEqual(f.revdiff(0, 1),
- b'\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x04\x01' +
- fulltext1)
-
- self.assertEqual(f.revdiff(0, 2),
- b'\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x04\x02' +
- fulltext2)
-
# Nodes should be emitted in order.
gen = f.emitrevisions([node0, node1, node2], revisiondata=True)
diff --git a/mercurial/repository.py b/mercurial/repository.py
--- a/mercurial/repository.py
+++ b/mercurial/repository.py
@@ -586,15 +586,6 @@
TODO better document the copy metadata and censoring logic.
"""
- def revdiff(rev1, rev2):
- """Obtain a delta between two revision numbers.
-
- Operates on raw data in the store (``revision(node, raw=True)``).
-
- The returned data is the result of ``bdiff.bdiff`` on the raw
- revision data.
- """
-
def emitrevisions(nodes,
nodesorder=None,
revisiondata=False,
diff --git a/mercurial/filelog.py b/mercurial/filelog.py
--- a/mercurial/filelog.py
+++ b/mercurial/filelog.py
@@ -78,9 +78,6 @@
def revision(self, node, _df=None, raw=False):
return self._revlog.revision(node, _df=_df, raw=raw)
- def revdiff(self, rev1, rev2):
- return self._revlog.revdiff(rev1, rev2)
-
def emitrevisions(self, nodes, nodesorder=None,
revisiondata=False, assumehaveparentrevisions=False,
deltaprevious=False):
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list