This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4751

filelog: stop proxying deltaparent() (API)
ClosedPublic

Authored by indygreg on Sep 26 2018, 2:28 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa269fa55467e: filelog: stop proxying deltaparent() (API)
Summary

deltaparent() obtains the revision number of the base revision a
delta in storage is stored against. It is highly revlog-centric and
may not apply to other storage backends. As a result, it doesn't
belong on the generic file storage interface.

This method/proxy is no longer used in core. The last consumer was
probably changegroup code and went away with the transition to
emitrevisions().

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.

Revision Contents
Changeset List

Diff 11427

mercurial/filelog.py

def heads(self, start=None, stop=None): def heads(self, start=None, stop=None):
return self._revlog.heads(start, stop) return self._revlog.heads(start, stop)
# Used by hgweb, children extension. # Used by hgweb, children extension.
def children(self, node): def children(self, node):
return self._revlog.children(node) return self._revlog.children(node)
def deltaparent(self, rev):
return self._revlog.deltaparent(rev)
def iscensored(self, rev): def iscensored(self, rev):
return self._revlog.iscensored(rev) return self._revlog.iscensored(rev)
# Might be unused. # Might be unused.
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)
def revision(self, node, _df=None, raw=False): def revision(self, node, _df=None, raw=False):

mercurial/repository.py

""" """
def children(node): def children(node):
"""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):
""""Return the revision that is a suitable parent to delta against."""
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 size(rev): def size(rev):
"""Obtain the fulltext size of file data. """Obtain the fulltext size of file data.

mercurial/testing/storage.py

self.assertEqual(f.heads(None, [nullid]), [nullid]) self.assertEqual(f.heads(None, [nullid]), [nullid])
self.assertEqual(f.heads(nullid, [nullid]), [nullid]) self.assertEqual(f.heads(nullid, [nullid]), [nullid])
self.assertEqual(f.children(nullid), []) self.assertEqual(f.children(nullid), [])
with self.assertRaises(error.LookupError): with self.assertRaises(error.LookupError):
f.children(b'\x01' * 20) f.children(b'\x01' * 20)
self.assertEqual(f.deltaparent(nullrev), nullrev)
for i in range(-5, 5):
if i == nullrev:
continue
with self.assertRaises(IndexError):
f.deltaparent(i)
def testsinglerevision(self): def testsinglerevision(self):
f = self._makefilefn() f = self._makefilefn()
with self._maketransactionfn() as tr: with self._maketransactionfn() as tr:
node = f.add(b'initial', None, tr, 0, nullid, nullid) node = f.add(b'initial', None, tr, 0, nullid, nullid)
self.assertEqual(len(f), 1) self.assertEqual(len(f), 1)
self.assertEqual(list(f), [0]) self.assertEqual(list(f), [0])
self.assertEqual(f.heads(node), [node]) self.assertEqual(f.heads(node), [node])
self.assertEqual(f.heads(stop=[node]), [node]) self.assertEqual(f.heads(stop=[node]), [node])
with self.assertRaises(error.LookupError): with self.assertRaises(error.LookupError):
f.heads(stop=[b'\x01' * 20]) f.heads(stop=[b'\x01' * 20])
self.assertEqual(f.children(node), []) self.assertEqual(f.children(node), [])
self.assertEqual(f.deltaparent(0), nullrev)
def testmultiplerevisions(self): def testmultiplerevisions(self):
fulltext0 = b'x' * 1024 fulltext0 = b'x' * 1024
fulltext1 = fulltext0 + b'y' fulltext1 = fulltext0 + b'y'
fulltext2 = b'y' + fulltext0 + b'z' fulltext2 = b'y' + fulltext0 + b'z'
f = self._makefilefn() f = self._makefilefn()
with self._maketransactionfn() as tr: with self._maketransactionfn() as tr:
node0 = f.add(fulltext0, None, tr, 0, nullid, nullid) node0 = f.add(fulltext0, None, tr, 0, nullid, nullid)
with self.assertRaises(error.LookupError): with self.assertRaises(error.LookupError):
f.heads(stop=[b'\x01' * 20]) f.heads(stop=[b'\x01' * 20])
self.assertEqual(f.children(node0), [node1]) self.assertEqual(f.children(node0), [node1])
self.assertEqual(f.children(node1), [node2]) self.assertEqual(f.children(node1), [node2])
self.assertEqual(f.children(node2), []) self.assertEqual(f.children(node2), [])
self.assertEqual(f.deltaparent(0), nullrev)
self.assertEqual(f.deltaparent(1), 0)
self.assertEqual(f.deltaparent(2), 1)
def testmultipleheads(self): def testmultipleheads(self):
f = self._makefilefn() f = self._makefilefn()
with self._maketransactionfn() as tr: with self._maketransactionfn() as tr:
node0 = f.add(b'0', None, tr, 0, nullid, nullid) node0 = f.add(b'0', None, tr, 0, nullid, nullid)
node1 = f.add(b'1', None, tr, 1, node0, nullid) node1 = f.add(b'1', None, tr, 1, node0, nullid)
node2 = f.add(b'2', None, tr, 2, node1, nullid) node2 = f.add(b'2', None, tr, 2, node1, nullid)
node3 = f.add(b'3', None, tr, 3, node0, nullid) node3 = f.add(b'3', None, tr, 3, node0, nullid)

tests/simplestorerepo.py

return self._indexbyrev[rev][b'linkrev'] return self._indexbyrev[rev][b'linkrev']
def _flags(self, rev): def _flags(self, rev):
validaterev(rev) validaterev(rev)
return self._indexbyrev[rev][b'flags'] return self._indexbyrev[rev][b'flags']
def deltaparent(self, rev):
validaterev(rev)
p1node = self.parents(self.node(rev))[0]
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