[PATCH 6 of 8] obsolete: compute extinct changesets

Pierre-Yves David pierre-yves.david at ens-lyon.org
Thu Jul 5 19:27:28 CDT 2012


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1341532651 -7200
# Node ID d3e62e93711233bf43fee5ce2ea9e6cf2efccd4c
# Parent  c7470a6004a1146bdf4f47f1fd2f52fc9d54ca8f
obsolete: compute extinct changesets

`extinct` changesets are obsolete changesets with obsolete descendants only. They
are of no interrest anymore and can be:

- exclude from exchange
- hidden to the user in most situation
- safely garbage collected

This changeset just allow mercurial to detect them.

The implementation is a bit naive, as for unstable changesets. We better use a
simple revset query and a cache. But simple version goes first.

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -235,6 +235,21 @@
         return (self.node() in self._repo.obsstore.precursors
                 and self.phase() > phases.public)
 
+    def extinct(self):
+        """True if the changeset is extinct"""
+        # We should just compute a cache a check agains it.
+        # see revset implementation for details
+        #
+        # But this naive implementation does not require cache
+        if self.phase() <= phases.public:
+            return False
+        if not self.obsolete():
+            return False
+        for desc in self.descendants():
+            if not desc.obsolete():
+                return False
+        return True
+
     def unstable(self):
         """True if the changeset is not obsolete but it's ancestor are"""
         # We should just compute /(obsolete()::) - obsolete()/
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -568,6 +568,13 @@
     pc = repo._phasecache
     return [r for r in subset if pc.phase(repo, r) == phases.draft]
 
+def extinct(repo, subset, x):
+    """``extinct()``
+    obsolete changeset with obsolete descendant only."""
+    getargs(x, 0, 0, _("obsolete takes no arguments"))
+    extinctset = set(repo.revs('(obsolete()::) - (::(not obsolete()))'))
+    return [r for r in subset if r in extinctset]
+
 def extra(repo, subset, x):
     """``extra(label, [value])``
     Changesets with the given label in the extra metadata, with the given
@@ -878,7 +885,7 @@
 def obsolete(repo, subset, x):
     """``obsolete()``
     Mutable changeset with a newer version."""
-    getargs(x, 0, 0, _("merge takes no arguments"))
+    getargs(x, 0, 0, _("obsolete takes no arguments"))
     return [r for r in subset if repo[r].obsolete()]
 
 def outgoing(repo, subset, x):
@@ -1365,6 +1372,7 @@
     "descendants": descendants,
     "_firstdescendants": _firstdescendants,
     "draft": draft,
+    "extinct": extinct,
     "extra": extra,
     "file": hasfile,
     "filelog": filelog,
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -300,3 +300,13 @@
   searching for changes
   abort: push includes an unstable changeset: 7878242aeece!
   [255]
+
+Test that extinct changeset are properly detected
+
+  $ hg log -r 'extinct()'
+  changeset:   3:cdbce2fbb163
+  parent:      1:7c3bad9141dc
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     add new_c
+  


More information about the Mercurial-devel mailing list