# HG changeset patch # User Boris Feld # Date 1502445307 -7200 # Node ID 9fc6a4615ae571c81ae745f57285f1ca5e92883e # Parent 9688988472daf3887a3a4f031f1e9dc5471ab8fd revset: unstable volatile set was deprecated Use orphan volatile set instead. Match 5579864798c6 mercurial changeset. diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py +++ b/hgext3rd/evolve/__init__.py @@ -489,7 +489,7 @@ """ revset.getargs(x, 0, 0, 'troubled takes no arguments') troubled = set() - troubled.update(getrevs(repo, 'unstable')) + troubled.update(getrevs(repo, 'orphan')) troubled.update(getrevs(repo, 'bumped')) troubled.update(getrevs(repo, 'divergent')) troubled = revset.baseset(troubled) @@ -759,13 +759,13 @@ # part of the troubled stuff may be filtered (stash ?) # This needs a better implementation but will probably wait for core. filtered = repo.changelog.filteredrevs - priorunstables = len(set(getrevs(repo, 'unstable')) - filtered) + priorunstables = len(set(getrevs(repo, 'orphan')) - filtered) priorbumpeds = len(set(getrevs(repo, 'bumped')) - filtered) priordivergents = len(set(getrevs(repo, 'divergent')) - filtered) ret = orig(ui, repo, *args, **kwargs) filtered = repo.changelog.filteredrevs newunstables = \ - len(set(getrevs(repo, 'unstable')) - filtered) - priorunstables + len(set(getrevs(repo, 'orphan')) - filtered) - priorunstables newbumpeds = \ len(set(getrevs(repo, 'bumped')) - filtered) - priorbumpeds newdivergents = \ diff --git a/hgext3rd/evolve/compat.py b/hgext3rd/evolve/compat.py --- a/hgext3rd/evolve/compat.py +++ b/hgext3rd/evolve/compat.py @@ -152,3 +152,6 @@ return self.precursors obsolete.obsstore.predecessors = predecessors + +if not util.safehasattr(obsolete, '_computeorphanset'): + obsolete._computeorphanset = obsolete.cachefor('orphan')(obsolete._computeunstableset)