# HG changeset patch # User Boris Feld # Date 2017-08-02 17:49:57 # Node ID e6d8ee3c9ec3b787221365041407e36ac58db75f # Parent 0c3112f17610ccd87d984586ec0083cbfb116954 obsutil: rename allprecursors into allpredecessors Use util.nouideprecwarn because obsstore doesn't have easy access to an ui object. The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D247 diff --git a/contrib/phabricator.py b/contrib/phabricator.py --- a/contrib/phabricator.py +++ b/contrib/phabricator.py @@ -41,7 +41,7 @@ from mercurial import ( encoding, error, mdiff, - obsolete, + obsutil, patch, registrar, scmutil, @@ -167,7 +167,7 @@ def getoldnodedrevmap(repo, nodelist): for node in nodelist: ctx = unfi[node] # For tags like "D123", put them into "toconfirm" to verify later - precnodes = list(obsolete.allprecursors(unfi.obsstore, [node])) + precnodes = list(obsutil.allpredecessors(unfi.obsstore, [node])) for n in precnodes: if n in nodemap: for tag in unfi.nodetags(n): diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py --- a/mercurial/obsolete.py +++ b/mercurial/obsolete.py @@ -949,7 +949,7 @@ def _computebumpedset(repo): # We only evaluate mutable, non-obsolete revision node = ctx.node() # (future) A cache of predecessors may worth if split is very common - for pnode in obsutil.allprecursors(repo.obsstore, [node], + for pnode in obsutil.allpredecessors(repo.obsstore, [node], ignoreflags=bumpedfix): prev = torev(pnode) # unfiltered! but so is phasecache if (prev is not None) and (phase(repo, prev) <= public): diff --git a/mercurial/obsutil.py b/mercurial/obsutil.py --- a/mercurial/obsutil.py +++ b/mercurial/obsutil.py @@ -102,7 +102,16 @@ def closestpredecessors(repo, nodeid): else: stack.append(precnodeid) -def allprecursors(obsstore, nodes, ignoreflags=0): +def allprecursors(*args, **kwargs): + """ (DEPRECATED) + """ + msg = ("'obsutil.allprecursors' is deprecated, " + "use 'obsutil.allpredecessors'") + util.nouideprecwarn(msg, '4.4') + + return allpredecessors(*args, **kwargs) + +def allpredecessors(obsstore, nodes, ignoreflags=0): """Yield node for every precursors of . Some precursors may be unknown locally.