This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4320

dagutil: remove heads() and localsubset from revlogdag.__init__
ClosedPublic

Authored by indygreg on Aug 17 2018, 5:30 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8973fc62bfff: dagutil: remove heads() and localsubset from revlogdag.__init__
Summary

The previous commit removed the last consumer of this API.

I'm not going to mark as API incompatible because I doubt anybody
used this functionality (outside of possibly passing an argument
to revlogdag.init). I intend to remove revlogdag later in
this series and its API annotation will cover this one.

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

PathPackages
Mmercurial/dagutil.py (20 lines)
Mmercurial/setdiscovery.py (2 lines)

Diff 10441

mercurial/dagutil.py

All params are ixs unless explicitly suffixed otherwise. All params are ixs unless explicitly suffixed otherwise.
Pluralized params are lists or sets. Pluralized params are lists or sets.
''' '''
def __init__(self): def __init__(self):
self._inverse = None self._inverse = None
def heads(self):
'''list of head ixs'''
raise NotImplementedError
def parents(self, ix): def parents(self, ix):
'''list of parents ixs of ix''' '''list of parents ixs of ix'''
raise NotImplementedError raise NotImplementedError
def inverse(self): def inverse(self):
'''inverse DAG, where parents becomes children, etc.''' '''inverse DAG, where parents becomes children, etc.'''
raise NotImplementedError raise NotImplementedError
class revlogbaseddag(basedag): class revlogbaseddag(basedag):
'''generic dag interface to a revlog''' '''generic dag interface to a revlog'''
def __init__(self, revlog): def __init__(self, revlog):
basedag.__init__(self) basedag.__init__(self)
self._revlog = revlog self._revlog = revlog
self._heads = None
def heads(self):
if self._heads is None:
self._heads = self._getheads()
return self._heads
class revlogdag(revlogbaseddag): class revlogdag(revlogbaseddag):
'''dag interface to a revlog''' '''dag interface to a revlog'''
def __init__(self, revlog, localsubset=None): def __init__(self, revlog):
revlogbaseddag.__init__(self, revlog) revlogbaseddag.__init__(self, revlog)
self._heads = localsubset
def _getheads(self):
return [r for r in self._revlog.headrevs() if r != nullrev]
def parents(self, ix): def parents(self, ix):
rlog = self._revlog rlog = self._revlog
idx = rlog.index idx = rlog.index
revdata = idx[ix] revdata = idx[ix]
prev = revdata[5] prev = revdata[5]
if prev != nullrev: if prev != nullrev:
prev2 = revdata[6] prev2 = revdata[6]
if prev != nullrev: if prev != nullrev:
cs.setdefault(prev, []).append(rev) cs.setdefault(prev, []).append(rev)
isroot = False isroot = False
if isroot: if isroot:
roots.append(rev) roots.append(rev)
rev -= 1 rev -= 1
self._walkfrom = rev self._walkfrom = rev
def _getheads(self):
self._walkto(nullrev)
return self._roots
def parents(self, ix): def parents(self, ix):
if ix is None: if ix is None:
return [] return []
if ix <= self._walkfrom: if ix <= self._walkfrom:
self._walkto(ix) self._walkto(ix)
return self._children.get(ix, []) return self._children.get(ix, [])
def inverse(self): def inverse(self):
return self._orig return self._orig

mercurial/setdiscovery.py

clnode = cl.node clnode = cl.node
clrev = cl.rev clrev = cl.rev
if ancestorsof is not None: if ancestorsof is not None:
ownheads = [clrev(n) for n in ancestorsof] ownheads = [clrev(n) for n in ancestorsof]
else: else:
ownheads = [rev for rev in cl.headrevs() if rev != nullrev] ownheads = [rev for rev in cl.headrevs() if rev != nullrev]
dag = dagutil.revlogdag(cl, localsubset=ownheads) dag = dagutil.revlogdag(cl)
# early exit if we know all the specified remote heads already # early exit if we know all the specified remote heads already
ui.debug("query 1; heads\n") ui.debug("query 1; heads\n")
roundtrips += 1 roundtrips += 1
sample = _limitsample(ownheads, initialsamplesize) sample = _limitsample(ownheads, initialsamplesize)
# indices between sample and externalized version must match # indices between sample and externalized version must match
sample = list(sample) sample = list(sample)