( )⚙ D5163 filelog: add a hasnode() method (API)

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5163

filelog: add a hasnode() method (API)
ClosedPublic

Authored by indygreg on Oct 19 2018, 1:00 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf1a39128da95: filelog: add a hasnode() method (API)
Summary

Missing in the file storage interface is the ability to query whether
a specified value is a known node.

This commit defines that interface member and implements it on the
revlog and sqlite file stores.

Storage unit tests have been added.

The revlog implementation is a bit more complicated because index lookups
don't consistently raise the same exception. For SQLite, we can simply look
for a key in a dict.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Oct 19 2018, 1:00 PM
Closed by commit rHGf1a39128da95: filelog: add a hasnode() method (API) (authored by indygreg). · Explain WhyOct 22 2018, 11:48 AM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Oct 22 2018, 12:24 PM
martinvonz added inline comments.
mercurial/filelog.py
41

node can be nullrev?

indygreg added inline comments.Oct 31 2018, 4:11 PM
mercurial/filelog.py
41

That was me possibly being a bit overzealous.

We should consider removing it.

I may have added it because revlog.rev() seems to always support nullid and nullrev, so you need to check for both explicitly at higher levels.

Revision Contents
Changeset List

Diff 12269

hgext/sqlitestore.py

# Start of ifileindex interface. # Start of ifileindex interface.
def __len__(self): def __len__(self):
return len(self._revisions) return len(self._revisions)
def __iter__(self): def __iter__(self):
return iter(pycompat.xrange(len(self._revisions))) return iter(pycompat.xrange(len(self._revisions)))
def hasnode(self, node):
if node == nullid:
return False
return node in self._nodetorev
def revs(self, start=0, stop=None): def revs(self, start=0, stop=None):
return storageutil.iterrevs(len(self._revisions), start=start, return storageutil.iterrevs(len(self._revisions), start=start,
stop=stop) stop=stop)
def parents(self, node): def parents(self, node):
if node == nullid: if node == nullid:
return nullid, nullid return nullid, nullid

mercurial/filelog.py

# filelog.py - file history class for mercurial # filelog.py - file history class for mercurial
# #
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from .node import (
nullid,
nullrev,
)
from . import ( from . import (
error, error,
repository, repository,
revlog, revlog,
) )
from .utils import ( from .utils import (
interfaceutil, interfaceutil,
storageutil, storageutil,
self._revlog.filename = path self._revlog.filename = path
def __len__(self): def __len__(self):
return len(self._revlog) return len(self._revlog)
def __iter__(self): def __iter__(self):
return self._revlog.__iter__() return self._revlog.__iter__()
def hasnode(self, node):
if node in (nullid, nullrev):
martinvonzUnsubmitted
Not Done

node can be nullrev?

martinvonz: node can be nullrev?
indygregAuthorUnsubmitted
Not Done

That was me possibly being a bit overzealous.

We should consider removing it.

I may have added it because revlog.rev() seems to always support nullid and nullrev, so you need to check for both explicitly at higher levels.

indygreg: That was me possibly being a bit overzealous. We should consider removing it. I may have…
return False
try:
self._revlog.rev(node)
return True
except (TypeError, ValueError, IndexError, error.LookupError):
return False
def revs(self, start=0, stop=None): def revs(self, start=0, stop=None):
return self._revlog.revs(start=start, stop=stop) return self._revlog.revs(start=start, stop=stop)
def parents(self, node): def parents(self, node):
return self._revlog.parents(node) return self._revlog.parents(node)
def parentrevs(self, rev): def parentrevs(self, rev):
return self._revlog.parentrevs(rev) return self._revlog.parentrevs(rev)

mercurial/repository.py

* Metadata to facilitate storage. * Metadata to facilitate storage.
""" """
def __len__(): def __len__():
"""Obtain the number of revisions stored for this file.""" """Obtain the number of revisions stored for this file."""
def __iter__(): def __iter__():
"""Iterate over revision numbers for this file.""" """Iterate over revision numbers for this file."""
def hasnode(node):
"""Returns a bool indicating if a node is known to this store.
Implementations must only return True for full, binary node values:
hex nodes, revision numbers, and partial node matches must be
rejected.
The null node is never present.
"""
def revs(start=0, stop=None): def revs(start=0, stop=None):
"""Iterate over revision numbers for this file, with control.""" """Iterate over revision numbers for this file, with control."""
def parents(node): def parents(node):
"""Returns a 2-tuple of parent nodes for a revision. """Returns a 2-tuple of parent nodes for a revision.
Values will be ``nullid`` if the parent is empty. Values will be ``nullid`` if the parent is empty.
""" """

mercurial/testing/storage.py

f = self._makefilefn() f = self._makefilefn()
self.assertEqual(len(f), 0, 'new file store has 0 length by default') self.assertEqual(len(f), 0, 'new file store has 0 length by default')
self.assertEqual(list(f), [], 'iter yields nothing by default') self.assertEqual(list(f), [], 'iter yields nothing by default')
gen = iter(f) gen = iter(f)
with self.assertRaises(StopIteration): with self.assertRaises(StopIteration):
next(gen) next(gen)
self.assertFalse(f.hasnode(None))
self.assertFalse(f.hasnode(0))
self.assertFalse(f.hasnode(nullrev))
self.assertFalse(f.hasnode(nullid))
self.assertFalse(f.hasnode(b'0'))
self.assertFalse(f.hasnode(b'a' * 20))
# revs() should evaluate to an empty list. # revs() should evaluate to an empty list.
self.assertEqual(list(f.revs()), []) self.assertEqual(list(f.revs()), [])
revs = iter(f.revs()) revs = iter(f.revs())
with self.assertRaises(StopIteration): with self.assertRaises(StopIteration):
next(revs) next(revs)
self.assertEqual(list(f.revs(start=20)), []) self.assertEqual(list(f.revs(start=20)), [])
self.assertEqual(list(f), [0]) self.assertEqual(list(f), [0])
gen = iter(f) gen = iter(f)
self.assertEqual(next(gen), 0) self.assertEqual(next(gen), 0)
with self.assertRaises(StopIteration): with self.assertRaises(StopIteration):
next(gen) next(gen)
self.assertTrue(f.hasnode(node))
self.assertFalse(f.hasnode(hex(node)))
self.assertFalse(f.hasnode(nullrev))
self.assertFalse(f.hasnode(nullid))
self.assertFalse(f.hasnode(node[0:12]))
self.assertFalse(f.hasnode(hex(node)[0:20]))
self.assertEqual(list(f.revs()), [0]) self.assertEqual(list(f.revs()), [0])
self.assertEqual(list(f.revs(start=1)), []) self.assertEqual(list(f.revs(start=1)), [])
self.assertEqual(list(f.revs(start=0)), [0]) self.assertEqual(list(f.revs(start=0)), [0])
self.assertEqual(list(f.revs(stop=0)), [0]) self.assertEqual(list(f.revs(stop=0)), [0])
self.assertEqual(list(f.revs(stop=1)), [0]) self.assertEqual(list(f.revs(stop=1)), [0])
self.assertEqual(list(f.revs(1, 1)), []) self.assertEqual(list(f.revs(1, 1)), [])
# TODO buggy # TODO buggy
self.assertEqual(list(f.revs(1, 0)), [1, 0]) self.assertEqual(list(f.revs(1, 0)), [1, 0])