Mercurial > evolve

changeset 5807:837b9fee065e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: split revsets into its own separate revset.py
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 27 Feb 2021 18:22:12 +0800
parents 1ac158fae24e
children 53dbe425d249
files hgext3rd/evolve/__init__.py hgext3rd/evolve/revset.py tests/test-check-sdist.t
diffstat 3 files changed, 191 insertions(+), 182 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py	Sat Feb 27 18:07:27 2021 +0800
+++ b/hgext3rd/evolve/__init__.py	Sat Feb 27 18:22:12 2021 +0800
@@ -271,7 +271,6 @@
     node as nodemod,
     obsolete,
     pycompat,
-    revset,
     util,
 )
 
@@ -291,6 +290,7 @@
     obsexchange,
     obshashtree,
     obshistory,
+    revset,
     rewind,
     safeguard,
     templatekw,
@@ -341,13 +341,14 @@
 eh.merge(cmdrewrite.eh)
 eh.merge(rewind.eh)
 eh.merge(headchecking.eh)
+eh.merge(revset.eh)
 uisetup = eh.finaluisetup
 extsetup = eh.finalextsetup
 reposetup = eh.finalreposetup
 cmdtable = eh.cmdtable
 configtable = eh.configtable
+templatekeyword = eh.templatekeyword
 revsetpredicate = eh.revsetpredicate
-templatekeyword = eh.templatekeyword
 
 # Configuration
 eh.configitem(b'experimental', b'evolutioncommands', [])
@@ -408,12 +409,6 @@
             del cmdtable[disabledcmd]
 
 #####################################################################
-### experimental behavior                                         ###
-#####################################################################
-
-getrevs = obsolete.getrevs
-
-#####################################################################
 ### Additional Utilities                                          ###
 #####################################################################
 
@@ -472,179 +467,6 @@
                      b"diff --hidden --rev 'limit(predecessors(.),1)' --rev .",
                      b'evolve')
 
-### Unstable revset symbol
-
-@eh.revsetpredicate(b'unstable()')
-def revsetunstable(repo, subset, x):
-    """Changesets with instabilities.
-    """
-    revset.getargs(x, 0, 0, b'unstable takes no arguments')
-    troubled = set()
-    troubled.update(getrevs(repo, b'orphan'))
-    troubled.update(getrevs(repo, b'phasedivergent'))
-    troubled.update(getrevs(repo, b'contentdivergent'))
-    troubled = revset.baseset(troubled)
-    troubled.sort() # set is non-ordered, enforce order
-    return subset & troubled
-
-@eh.revsetpredicate(b'troubled()')    # legacy name
-def revsettroubled(repo, subset, x):
-    return revsetunstable(repo, subset, x)
-
-### Obsolescence graph
-
-# XXX SOME MAJOR CLEAN UP TO DO HERE XXX
-
-def _precursors(repo, s, includeidentical=False):
-    """Precursor of a changeset"""
-    cs = set()
-    getrev = compat.getgetrev(repo.changelog)
-    markerbysubj = repo.obsstore.predecessors
-    node = repo.changelog.node
-    for r in s:
-        for p in markerbysubj.get(node(r), ()):
-            if not includeidentical and p[2] & rewind.identicalflag:
-                continue
-            pr = getrev(p[0])
-            if pr is not None:
-                cs.add(pr)
-    cs -= repo.changelog.filteredrevs # nodemap has no filtering
-    return cs
-
-def _allprecursors(repo, s):  # XXX we need a better naming
-    """transitive precursors of a subset"""
-    node = repo.changelog.node
-    toproceed = [node(r) for r in s]
-    seen = set()
-    allsubjects = repo.obsstore.predecessors
-    while toproceed:
-        nc = toproceed.pop()
-        for mark in allsubjects.get(nc, ()):
-            np = mark[0]
-            if np not in seen:
-                seen.add(np)
-                toproceed.append(np)
-    getrev = compat.getgetrev(repo.changelog)
-    cs = set()
-    for p in seen:
-        pr = getrev(p)
-        if pr is not None:
-            cs.add(pr)
-    cs -= repo.changelog.filteredrevs # nodemap has no filtering
-    return cs
-
-def _successors(repo, s):
-    """Successors of a changeset"""
-    cs = set()
-    node = repo.changelog.node
-    getrev = compat.getgetrev(repo.changelog)
-    markerbyobj = repo.obsstore.successors
-    for r in s:
-        for p in markerbyobj.get(node(r), ()):
-            for sub in p[1]:
-                sr = getrev(sub)
-                if sr is not None:
-                    cs.add(sr)
-    cs -= repo.changelog.filteredrevs # nodemap has no filtering
-    return cs
-
-def _allsuccessors(repo, s, haltonflags=0):  # XXX we need a better naming
-    """transitive successors of a subset
-
-    haltonflags allows to provide flags which prevent the evaluation of a
-    marker.  """
-    node = repo.changelog.node
-    toproceed = [node(r) for r in s]
-    seen = set()
-    allobjects = repo.obsstore.successors
-    while toproceed:
-        nc = toproceed.pop()
-        for mark in allobjects.get(nc, ()):
-            if mark[2] & haltonflags:
-                continue
-            for sub in mark[1]:
-                if sub == nullid:
-                    continue # should not be here!
-                if sub not in seen:
-                    seen.add(sub)
-                    toproceed.append(sub)
-    getrev = compat.getgetrev(repo.changelog)
-    cs = set()
-    for s in seen:
-        sr = getrev(s)
-        if sr is not None:
-            cs.add(sr)
-    cs -= repo.changelog.filteredrevs # nodemap has no filtering
-    return cs
-
-#####################################################################
-### Extending revset and template                                 ###
-#####################################################################
-
-# this section add several useful revset symbol not yet in core.
-# they are subject to changes
-
-
-### XXX I'm not sure this revset is useful
-@eh.revsetpredicate(b'suspended()')
-def revsetsuspended(repo, subset, x):
-    """Obsolete changesets with non-obsolete descendants.
-    """
-    revset.getargs(x, 0, 0, b'suspended takes no arguments')
-    suspended = revset.baseset(getrevs(repo, b'suspended'))
-    suspended.sort()
-    return subset & suspended
-
-
-@eh.revsetpredicate(b'predecessors(set)')
-def revsetpredecessors(repo, subset, x):
-    """Immediate predecessors of changesets in set.
-    """
-    s = revset.getset(repo, revset.fullreposet(repo), x)
-    s = revset.baseset(_precursors(repo, s))
-    s.sort()
-    return subset & s
-
-
-@eh.revsetpredicate(b'precursors(set)')   # legacy name for predecessors
-def revsetprecursors(repo, subset, x):
-    return revsetpredecessors(repo, subset, x)
-
-
-@eh.revsetpredicate(b'allpredecessors(set)')
-def revsetallpredecessors(repo, subset, x):
-    """Transitive predecessors of changesets in set.
-    """
-    s = revset.getset(repo, revset.fullreposet(repo), x)
-    s = revset.baseset(_allprecursors(repo, s))
-    s.sort()
-    return subset & s
-
-
-@eh.revsetpredicate(b'allprecursors(set)')   # legacy name for allpredecessors
-def revsetallprecursors(repo, subset, x):
-    return revsetallpredecessors(repo, subset, x)
-
-
-@eh.revsetpredicate(b'successors(set)')
-def revsetsuccessors(repo, subset, x):
-    """Immediate successors of changesets in set.
-    """
-    s = revset.getset(repo, revset.fullreposet(repo), x)
-    s = revset.baseset(_successors(repo, s))
-    s.sort()
-    return subset & s
-
-@eh.revsetpredicate(b'allsuccessors(set)')
-def revsetallsuccessors(repo, subset, x):
-    """Transitive successors of changesets in set.
-    """
-    s = revset.getset(repo, revset.fullreposet(repo), x)
-    s = revset.baseset(_allsuccessors(repo, s))
-    s.sort()
-    return subset & s
-
-
 #####################################################################
 ### Various trouble warning                                       ###
 #####################################################################
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hgext3rd/evolve/revset.py	Sat Feb 27 18:22:12 2021 +0800
@@ -0,0 +1,187 @@
+from __future__ import absolute_import
+
+from mercurial import (
+    node as nodemod,
+    obsolete,
+    revset,
+)
+
+from . import (
+    compat,
+    exthelper,
+    rewind,
+)
+
+eh = exthelper.exthelper()
+
+#####################################################################
+### experimental behavior                                         ###
+#####################################################################
+
+getrevs = obsolete.getrevs
+
+### Unstable revset symbol
+
+@eh.revsetpredicate(b'unstable()')
+def revsetunstable(repo, subset, x):
+    """Changesets with instabilities.
+    """
+    revset.getargs(x, 0, 0, b'unstable takes no arguments')
+    troubled = set()
+    troubled.update(getrevs(repo, b'orphan'))
+    troubled.update(getrevs(repo, b'phasedivergent'))
+    troubled.update(getrevs(repo, b'contentdivergent'))
+    troubled = revset.baseset(troubled)
+    troubled.sort() # set is non-ordered, enforce order
+    return subset & troubled
+
+@eh.revsetpredicate(b'troubled()')    # legacy name
+def revsettroubled(repo, subset, x):
+    return revsetunstable(repo, subset, x)
+
+### Obsolescence graph
+
+# XXX SOME MAJOR CLEAN UP TO DO HERE XXX
+
+def _precursors(repo, s, includeidentical=False):
+    """Precursor of a changeset"""
+    cs = set()
+    getrev = compat.getgetrev(repo.changelog)
+    markerbysubj = repo.obsstore.predecessors
+    node = repo.changelog.node
+    for r in s:
+        for p in markerbysubj.get(node(r), ()):
+            if not includeidentical and p[2] & rewind.identicalflag:
+                continue
+            pr = getrev(p[0])
+            if pr is not None:
+                cs.add(pr)
+    cs -= repo.changelog.filteredrevs # nodemap has no filtering
+    return cs
+
+def _allprecursors(repo, s):  # XXX we need a better naming
+    """transitive precursors of a subset"""
+    node = repo.changelog.node
+    toproceed = [node(r) for r in s]
+    seen = set()
+    allsubjects = repo.obsstore.predecessors
+    while toproceed:
+        nc = toproceed.pop()
+        for mark in allsubjects.get(nc, ()):
+            np = mark[0]
+            if np not in seen:
+                seen.add(np)
+                toproceed.append(np)
+    getrev = compat.getgetrev(repo.changelog)
+    cs = set()
+    for p in seen:
+        pr = getrev(p)
+        if pr is not None:
+            cs.add(pr)
+    cs -= repo.changelog.filteredrevs # nodemap has no filtering
+    return cs
+
+def _successors(repo, s):
+    """Successors of a changeset"""
+    cs = set()
+    node = repo.changelog.node
+    getrev = compat.getgetrev(repo.changelog)
+    markerbyobj = repo.obsstore.successors
+    for r in s:
+        for p in markerbyobj.get(node(r), ()):
+            for sub in p[1]:
+                sr = getrev(sub)
+                if sr is not None:
+                    cs.add(sr)
+    cs -= repo.changelog.filteredrevs # nodemap has no filtering
+    return cs
+
+def _allsuccessors(repo, s, haltonflags=0):  # XXX we need a better naming
+    """transitive successors of a subset
+
+    haltonflags allows to provide flags which prevent the evaluation of a
+    marker.  """
+    node = repo.changelog.node
+    toproceed = [node(r) for r in s]
+    seen = set()
+    allobjects = repo.obsstore.successors
+    while toproceed:
+        nc = toproceed.pop()
+        for mark in allobjects.get(nc, ()):
+            if mark[2] & haltonflags:
+                continue
+            for sub in mark[1]:
+                if sub == nodemod.nullid:
+                    continue # should not be here!
+                if sub not in seen:
+                    seen.add(sub)
+                    toproceed.append(sub)
+    getrev = compat.getgetrev(repo.changelog)
+    cs = set()
+    for s in seen:
+        sr = getrev(s)
+        if sr is not None:
+            cs.add(sr)
+    cs -= repo.changelog.filteredrevs # nodemap has no filtering
+    return cs
+
+#####################################################################
+### Extending revset and template                                 ###
+#####################################################################
+
+# this section add several useful revset symbol not yet in core.
+# they are subject to changes
+
+### XXX I'm not sure this revset is useful
+@eh.revsetpredicate(b'suspended()')
+def revsetsuspended(repo, subset, x):
+    """Obsolete changesets with non-obsolete descendants.
+    """
+    revset.getargs(x, 0, 0, b'suspended takes no arguments')
+    suspended = revset.baseset(getrevs(repo, b'suspended'))
+    suspended.sort()
+    return subset & suspended
+
+@eh.revsetpredicate(b'predecessors(set)')
+def revsetpredecessors(repo, subset, x):
+    """Immediate predecessors of changesets in set.
+    """
+    s = revset.getset(repo, revset.fullreposet(repo), x)
+    s = revset.baseset(_precursors(repo, s))
+    s.sort()
+    return subset & s
+
+@eh.revsetpredicate(b'precursors(set)')   # legacy name for predecessors
+def revsetprecursors(repo, subset, x):
+    return revsetpredecessors(repo, subset, x)
+
+@eh.revsetpredicate(b'allpredecessors(set)')
+def revsetallpredecessors(repo, subset, x):
+    """Transitive predecessors of changesets in set.
+    """
+    s = revset.getset(repo, revset.fullreposet(repo), x)
+    s = revset.baseset(_allprecursors(repo, s))
+    s.sort()
+    return subset & s
+
+@eh.revsetpredicate(b'allprecursors(set)')   # legacy name for allpredecessors
+def revsetallprecursors(repo, subset, x):
+    return revsetallpredecessors(repo, subset, x)
+
+@eh.revsetpredicate(b'successors(set)')
+def revsetsuccessors(repo, subset, x):
+    """Immediate successors of changesets in set.
+    """
+    s = revset.getset(repo, revset.fullreposet(repo), x)
+    s = revset.baseset(_successors(repo, s))
+    s.sort()
+    return subset & s
+
+@eh.revsetpredicate(b'allsuccessors(set)')
+def revsetallsuccessors(repo, subset, x):
+    """Transitive successors of changesets in set.
+    """
+    s = revset.getset(repo, revset.fullreposet(repo), x)
+    s = revset.baseset(_allsuccessors(repo, s))
+    s.sort()
+    return subset & s
--- a/tests/test-check-sdist.t	Sat Feb 27 18:07:27 2021 +0800
+++ b/tests/test-check-sdist.t	Sat Feb 27 18:22:12 2021 +0800
@@ -35,7 +35,7 @@
 
   $ tar -tzf hg-evolve-*.tar.gz | sed 's|^hg-evolve-[^/]*/||' | sort > files
   $ wc -l files
-  346 files
+  347 files
   $ fgrep debian files
   tests/test-check-debian.t
   $ fgrep __init__.py files