drawdag: include files from both parents in merge commits

Consider a graph like this:

  D
  |\
  B C
  |/
  A

drawdag will add a file called A in commit A, file B in B, file C in
C. That's fine and expected. In merge commits like D, I would expect
the files and their contents to be taken from the parent commits, so
commit D in this example would have files A, B, and C. However,
drawdag will instead add the file D compared to the first
parent. Depending on whether B or C got a smaller nodeid, the contents
of D would be {A, B, D} or {A, C, D}. This patch changes it to to be
{A, B, C}.

Differential Revision: https://phab.mercurial-scm.org/D92

tests/drawdag.py

@@ -1,354 +1,363
 # drawdag.py - convert ASCII revision DAG to actual changesets
 #
 # Copyright 2016 Facebook, Inc.
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 """
 create changesets from an ASCII graph for testing purpose.
 
 For example, given the following input::
 
     c d
     |/
     b
     |
     a
 
 4 changesets and 4 local tags will be created.
 `hg log -G -T "{rev} {desc} (tag: {tags})"` will output::
 
     o  3 d (tag: d tip)
     |
     | o  2 c (tag: c)
     |/
     o  1 b (tag: b)
     |
     o  0 a (tag: a)
 
 For root nodes (nodes without parents) in the graph, they can be revsets
 pointing to existing nodes.  The ASCII graph could also have disconnected
 components with same names referring to the same changeset.
 
 Therefore, given the repo having the 4 changesets (and tags) above, with the
 following ASCII graph as input::
 
     foo    bar       bar  foo
      |     /          |    |
     ancestor(c,d)     a   baz
 
 The result (`hg log -G -T "{desc}"`) will look like::
 
     o    foo
     |\
     +---o  bar
     | | |
     | o |  baz
     |  /
     +---o  d
     | |
     +---o  c
     | |
     o |  b
     |/
     o  a
 
 Note that if you take the above `hg log` output directly as input. It will work
 as expected - the result would be an isomorphic graph::
 
     o    foo
     |\
     | | o  d
     | |/
     | | o  c
     | |/
     | | o  bar
     | |/|
     | o |  b
     | |/
     o /  baz
      /
     o  a
 
 This is because 'o' is specially handled in the input: instead of using 'o' as
 the node name, the word to the right will be used.
 
 Some special comments could have side effects:
 
     - Create obsmarkers
       # replace: A -> B -> C -> D  # chained 1 to 1 replacements
       # split: A -> B, C           # 1 to many
       # prune: A, B, C             # many to nothing
 """
 from __future__ import absolute_import, print_function
 
 import collections
 import itertools
 
 from mercurial.i18n import _
 from mercurial import (
     context,
     error,
     node,
     obsolete,
     registrar,
     scmutil,
     tags as tagsmod,
 )
 
 cmdtable = {}
 command = registrar.command(cmdtable)
 
 _pipechars = '\\/+-|'
 _nonpipechars = ''.join(chr(i) for i in xrange(33, 127)
                         if chr(i) not in _pipechars)
 
 def _isname(ch):
     """char -> bool. return True if ch looks like part of a name, False
     otherwise"""
     return ch in _nonpipechars
 
 def _parseasciigraph(text):
     """str -> {str : [str]}. convert the ASCII graph to edges"""
     lines = text.splitlines()
     edges = collections.defaultdict(list)  # {node: []}
 
     def get(y, x):
         """(int, int) -> char. give a coordinate, return the char. return a
         space for anything out of range"""
         if x < 0 or y < 0:
             return ' '
         try:
             return lines[y][x]
         except IndexError:
             return ' '
 
     def getname(y, x):
         """(int, int) -> str. like get(y, x) but concatenate left and right
         parts. if name is an 'o', try to replace it to the right"""
         result = ''
         for i in itertools.count(0):
             ch = get(y, x - i)
             if not _isname(ch):
                 break
             result = ch + result
         for i in itertools.count(1):
             ch = get(y, x + i)
             if not _isname(ch):
                 break
             result += ch
         if result == 'o':
             # special handling, find the name to the right
             result = ''
             for i in itertools.count(2):
                 ch = get(y, x + i)
                 if ch == ' ' or ch in _pipechars:
                     if result or x + i >= len(lines[y]):
                         break
                 else:
                     result += ch
             return result or 'o'
         return result
 
     def parents(y, x):
         """(int, int) -> [str]. follow the ASCII edges at given position,
         return a list of parents"""
         visited = {(y, x)}
         visit = []
         result = []
 
         def follow(y, x, expected):
             """conditionally append (y, x) to visit array, if it's a char
             in excepted. 'o' in expected means an '_isname' test.
             if '-' (or '+') is not in excepted, and get(y, x) is '-' (or '+'),
             the next line (y + 1, x) will be checked instead."""
             ch = get(y, x)
             if any(ch == c and c not in expected for c in '-+'):
                 y += 1
                 return follow(y + 1, x, expected)
             if ch in expected or ('o' in expected and _isname(ch)):
                 visit.append((y, x))
 
         #  -o-  # starting point:
         #  /|\ # follow '-' (horizontally), and '/|\' (to the bottom)
         follow(y + 1, x, '|')
         follow(y + 1, x - 1, '/')
         follow(y + 1, x + 1, '\\')
         follow(y, x - 1, '-')
         follow(y, x + 1, '-')
 
         while visit:
             y, x = visit.pop()
             if (y, x) in visited:
                 continue
             visited.add((y, x))
             ch = get(y, x)
             if _isname(ch):
                 result.append(getname(y, x))
                 continue
             elif ch == '|':
                 follow(y + 1, x, '/|o')
                 follow(y + 1, x - 1, '/')
                 follow(y + 1, x + 1, '\\')
             elif ch == '+':
                 follow(y, x - 1, '-')
                 follow(y, x + 1, '-')
                 follow(y + 1, x - 1, '/')
                 follow(y + 1, x + 1, '\\')
                 follow(y + 1, x, '|')
             elif ch == '\\':
                 follow(y + 1, x + 1, '\\|o')
             elif ch == '/':
                 follow(y + 1, x - 1, '/|o')
             elif ch == '-':
                 follow(y, x - 1, '-+o')
                 follow(y, x + 1, '-+o')
         return result
 
     for y, line in enumerate(lines):
         for x, ch in enumerate(line):
             if ch == '#':  # comment
                 break
             if _isname(ch):
                 edges[getname(y, x)] += parents(y, x)
 
     return dict(edges)
 
 class simplefilectx(object):
     def __init__(self, path, data):
         self._data = data
         self._path = path
 
     def data(self):
         return self._data
 
     def filenode(self):
         return None
 
     def path(self):
         return self._path
 
     def renamed(self):
         return None
 
     def flags(self):
         return ''
 
 class simplecommitctx(context.committablectx):
-    def __init__(self, repo, name, parentctxs, added=None):
+    def __init__(self, repo, name, parentctxs, added):
         opts = {
-            'changes': scmutil.status([], added or [], [], [], [], [], []),
+            'changes': scmutil.status([], list(added), [], [], [], [], []),
             'date': '0 0',
             'extra': {'branch': 'default'},
         }
         super(simplecommitctx, self).__init__(self, name, **opts)
         self._repo = repo
-        self._name = name
+        self._added = added
         self._parents = parentctxs
-        self._parents.sort(key=lambda c: c.node())
         while len(self._parents) < 2:
             self._parents.append(repo[node.nullid])
 
     def filectx(self, key):
-        return simplefilectx(key, self._name)
+        return simplefilectx(key, self._added[key])
 
     def commit(self):
         return self._repo.commitctx(self)
 
 def _walkgraph(edges):
     """yield node, parents in topologically order"""
     visible = set(edges.keys())
     remaining = {}  # {str: [str]}
     for k, vs in edges.iteritems():
         for v in vs:
             if v not in remaining:
                 remaining[v] = []
         remaining[k] = vs[:]
     while remaining:
         leafs = [k for k, v in remaining.items() if not v]
         if not leafs:
             raise error.Abort(_('the graph has cycles'))
         for leaf in sorted(leafs):
             if leaf in visible:
                 yield leaf, edges[leaf]
             del remaining[leaf]
             for k, v in remaining.iteritems():
                 if leaf in v:
                     v.remove(leaf)
 
 @command('debugdrawdag', [])
 def debugdrawdag(ui, repo, **opts):
     """read an ASCII graph from stdin and create changesets
 
     The ASCII graph is like what :hg:`log -G` outputs, with each `o` replaced
     to the name of the node. The command will create dummy changesets and local
     tags with those names to make the dummy changesets easier to be referred
     to.
 
     If the name of a node is a single character 'o', It will be replaced by the
     word to the right. This makes it easier to reuse
     :hg:`log -G -T '{desc}'` outputs.
 
     For root (no parents) nodes, revset can be used to query existing repo.
     Note that the revset cannot have confusing characters which can be seen as
     the part of the graph edges, like `|/+-\`.
     """
     text = ui.fin.read()
 
     # parse the graph and make sure len(parents) <= 2 for each node
     edges = _parseasciigraph(text)
     for k, v in edges.iteritems():
         if len(v) > 2:
             raise error.Abort(_('%s: too many parents: %s')
                               % (k, ' '.join(v)))
 
     committed = {None: node.nullid}  # {name: node}
 
     # for leaf nodes, try to find existing nodes in repo
     for name, parents in edges.iteritems():
         if len(parents) == 0:
             try:
                 committed[name] = scmutil.revsingle(repo, name)
             except error.RepoLookupError:
                 pass
 
     # commit in topological order
     for name, parents in _walkgraph(edges):
         if name in committed:
             continue
         pctxs = [repo[committed[n]] for n in parents]
-        ctx = simplecommitctx(repo, name, pctxs, [name])
+        pctxs.sort(key=lambda c: c.node())
+        added = {}
+        if len(parents) > 1:
+            # If it's a merge, take the files and contents from the parents
+            for f in pctxs[1].manifest():
+                if f not in pctxs[0].manifest():
+                    added[f] = pctxs[1][f].data()
+        else:
+            # If it's not a merge, add a single file
+            added[name] = name
+        ctx = simplecommitctx(repo, name, pctxs, added)
         n = ctx.commit()
         committed[name] = n
         tagsmod.tag(repo, name, n, message=None, user=None, date=None,
                     local=True)
 
     # handle special comments
     with repo.wlock(), repo.lock(), repo.transaction('drawdag'):
         getctx = lambda x: repo.unfiltered()[committed[x.strip()]]
         for line in text.splitlines():
             if ' # ' not in line:
                 continue
 
             rels = [] # obsolete relationships
             comment = line.split(' # ', 1)[1].split(' # ')[0].strip()
             args = comment.split(':', 1)
             if len(args) <= 1:
                 continue
 
             cmd = args[0].strip()
             arg = args[1].strip()
 
             if cmd in ('replace', 'rebase', 'amend'):
                 nodes = [getctx(m) for m in arg.split('->')]
                 for i in range(len(nodes) - 1):
                     rels.append((nodes[i], (nodes[i + 1],)))
             elif cmd in ('split',):
                 pre, succs = arg.split('->')
                 succs = succs.split(',')
                 rels.append((getctx(pre), (getctx(s) for s in succs)))
             elif cmd in ('prune',):
                 for n in arg.split(','):
                     rels.append((getctx(n), ()))
             if rels:
                 obsolete.createmarkers(repo, rels, date=(0, 0), operation=cmd)

tests/test-bundle-phases.t

@@ -1,285 +1,285
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > bundle-phases=yes
   > [extensions]
   > strip=
   > drawdag=$TESTDIR/drawdag.py
   > EOF
 
 Set up repo with linear history
   $ hg init linear
   $ cd linear
   $ hg debugdrawdag <<'EOF'
   > E
   > |
   > D
   > |
   > C
   > |
   > B
   > |
   > A
   > EOF
   $ hg phase --public A
   $ hg phase --force --secret D
   $ hg log -G -T '{desc} {phase}\n'
   o  E secret
   |
   o  D secret
   |
   o  C draft
   |
   o  B draft
   |
   o  A public
   
 Phases are restored when unbundling
   $ hg bundle --base B -r E bundle
   3 changesets found
   $ hg debugbundle bundle
   Stream params: sortdict([('Compression', 'BZ')])
   changegroup -- "sortdict([('version', '02'), ('nbchanges', '3'), ('targetphase', '2')])"
       26805aba1e600a82e93661149f2313866a221a7b
       f585351a92f85104bff7c284233c338b10eb1df7
       9bc730a19041f9ec7cb33c626e811aa233efb18c
   phase-heads -- 'sortdict()'
       26805aba1e600a82e93661149f2313866a221a7b draft
   $ hg strip --no-backup C
   $ hg unbundle -q bundle
   $ rm bundle
   $ hg log -G -T '{desc} {phase}\n'
   o  E secret
   |
   o  D secret
   |
   o  C draft
   |
   o  B draft
   |
   o  A public
   
 Root revision's phase is preserved
   $ hg bundle -a bundle
   5 changesets found
   $ hg strip --no-backup A
   $ hg unbundle -q bundle
   $ rm bundle
   $ hg log -G -T '{desc} {phase}\n'
   o  E secret
   |
   o  D secret
   |
   o  C draft
   |
   o  B draft
   |
   o  A public
   
 Completely public history can be restored
   $ hg phase --public E
   $ hg bundle -a bundle
   5 changesets found
   $ hg strip --no-backup A
   $ hg unbundle -q bundle
   $ rm bundle
   $ hg log -G -T '{desc} {phase}\n'
   o  E public
   |
   o  D public
   |
   o  C public
   |
   o  B public
   |
   o  A public
   
 Direct transition from public to secret can be restored
   $ hg phase --secret --force D
   $ hg bundle -a bundle
   5 changesets found
   $ hg strip --no-backup A
   $ hg unbundle -q bundle
   $ rm bundle
   $ hg log -G -T '{desc} {phase}\n'
   o  E secret
   |
   o  D secret
   |
   o  C public
   |
   o  B public
   |
   o  A public
   
 Revisions within bundle preserve their phase even if parent changes its phase
   $ hg phase --draft --force B
   $ hg bundle --base B -r E bundle
   3 changesets found
   $ hg strip --no-backup C
   $ hg phase --public B
   $ hg unbundle -q bundle
   $ rm bundle
   $ hg log -G -T '{desc} {phase}\n'
   o  E secret
   |
   o  D secret
   |
   o  C draft
   |
   o  B public
   |
   o  A public
   
 Phase of ancestors of stripped node get advanced to accommodate child
   $ hg bundle --base B -r E bundle
   3 changesets found
   $ hg strip --no-backup C
   $ hg phase --force --secret B
   $ hg unbundle -q bundle
   $ rm bundle
   $ hg log -G -T '{desc} {phase}\n'
   o  E secret
   |
   o  D secret
   |
   o  C draft
   |
   o  B draft
   |
   o  A public
   
 Unbundling advances phases of changesets even if they were already in the repo.
 To test that, create a bundle of everything in draft phase and then unbundle
 to see that secret becomes draft, but public remains public.
   $ hg phase --draft --force A
   $ hg phase --draft E
   $ hg bundle -a bundle
   5 changesets found
   $ hg phase --public A
   $ hg phase --secret --force E
   $ hg unbundle -q bundle
   $ rm bundle
   $ hg log -G -T '{desc} {phase}\n'
   o  E draft
   |
   o  D draft
   |
   o  C draft
   |
   o  B draft
   |
   o  A public
   
 Unbundling change in the middle of a stack does not affect later changes
   $ hg strip --no-backup E
   $ hg phase --secret --force D
   $ hg log -G -T '{desc} {phase}\n'
   o  D secret
   |
   o  C draft
   |
   o  B draft
   |
   o  A public
   
   $ hg bundle --base A -r B bundle
   1 changesets found
   $ hg unbundle -q bundle
   $ rm bundle
   $ hg log -G -T '{desc} {phase}\n'
   o  D secret
   |
   o  C draft
   |
   o  B draft
   |
   o  A public
   
 
   $ cd ..
 
 Set up repo with non-linear history
   $ hg init non-linear
   $ cd non-linear
   $ hg debugdrawdag <<'EOF'
   > D E
   > |\|
   > B C
   > |/
   > A
   > EOF
   $ hg phase --public C
   $ hg phase --force --secret B
   $ hg log -G -T '{node|short} {desc} {phase}\n'
   o  03ca77807e91 E draft
   |
-  | o  215e7b0814e1 D secret
+  | o  4e4f9194f9f1 D secret
   |/|
   o |  dc0947a82db8 C public
   | |
   | o  112478962961 B secret
   |/
   o  426bada5c675 A public
   
 
 Restore bundle of entire repo
   $ hg bundle -a bundle
   5 changesets found
   $ hg debugbundle bundle
   Stream params: sortdict([('Compression', 'BZ')])
   changegroup -- "sortdict([('version', '02'), ('nbchanges', '5'), ('targetphase', '2')])"
       426bada5c67598ca65036d57d9e4b64b0c1ce7a0
       112478962961147124edd43549aedd1a335e44bf
       dc0947a82db884575bb76ea10ac97b08536bfa03
-      215e7b0814e1cac8e2614e7284f2a5dc266b4323
+      4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
       03ca77807e919db8807c3749086dc36fb478cac0
   phase-heads -- 'sortdict()'
       dc0947a82db884575bb76ea10ac97b08536bfa03 public
       03ca77807e919db8807c3749086dc36fb478cac0 draft
   $ hg strip --no-backup A
   $ hg unbundle -q bundle
   $ rm bundle
   $ hg log -G -T '{node|short} {desc} {phase}\n'
   o  03ca77807e91 E draft
   |
-  | o  215e7b0814e1 D secret
+  | o  4e4f9194f9f1 D secret
   |/|
   o |  dc0947a82db8 C public
   | |
   | o  112478962961 B secret
   |/
   o  426bada5c675 A public
   
 
   $ hg bundle --base 'A + C' -r D bundle
   2 changesets found
   $ hg debugbundle bundle
   Stream params: sortdict([('Compression', 'BZ')])
   changegroup -- "sortdict([('version', '02'), ('nbchanges', '2'), ('targetphase', '2')])"
       112478962961147124edd43549aedd1a335e44bf
-      215e7b0814e1cac8e2614e7284f2a5dc266b4323
+      4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
   phase-heads -- 'sortdict()'
   $ rm bundle
 
   $ hg bundle --base A -r D bundle
   3 changesets found
   $ hg debugbundle bundle
   Stream params: sortdict([('Compression', 'BZ')])
   changegroup -- "sortdict([('version', '02'), ('nbchanges', '3'), ('targetphase', '2')])"
       112478962961147124edd43549aedd1a335e44bf
       dc0947a82db884575bb76ea10ac97b08536bfa03
-      215e7b0814e1cac8e2614e7284f2a5dc266b4323
+      4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
   phase-heads -- 'sortdict()'
       dc0947a82db884575bb76ea10ac97b08536bfa03 public
   $ rm bundle
 
   $ hg bundle --base 'B + C' -r 'D + E' bundle
   2 changesets found
   $ hg debugbundle bundle
   Stream params: sortdict([('Compression', 'BZ')])
   changegroup -- "sortdict([('version', '02'), ('nbchanges', '2'), ('targetphase', '2')])"
-      215e7b0814e1cac8e2614e7284f2a5dc266b4323
+      4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
       03ca77807e919db8807c3749086dc36fb478cac0
   phase-heads -- 'sortdict()'
       03ca77807e919db8807c3749086dc36fb478cac0 draft
   $ rm bundle

tests/test-drawdag.t

@@ -1,222 +1,234
   $ cat >> $HGRCPATH<<EOF
   > [extensions]
   > drawdag=$TESTDIR/drawdag.py
   > [experimental]
   > evolution=all
   > EOF
 
   $ reinit () {
   >   rm -rf .hg && hg init
   > }
 
   $ hg init
 
 Test what said in drawdag.py docstring
 
   $ hg debugdrawdag <<'EOS'
   > c d
   > |/
   > b
   > |
   > a
   > EOS
 
   $ hg log -G -T '{rev} {desc} ({tags})'
   o  3 d (d tip)
   |
   | o  2 c (c)
   |/
   o  1 b (b)
   |
   o  0 a (a)
   
   $ hg debugdrawdag <<'EOS'
   >  foo    bar       bar  foo
   >   |     /          |    |
   >  ancestor(c,d)     a   baz
   > EOS
 
   $ hg log -G -T '{desc}'
   o    foo
   |\
   +---o  bar
   | | |
   | o |  baz
   |  /
   +---o  d
   | |
   +---o  c
   | |
   o |  b
   |/
   o  a
   
   $ reinit
 
   $ hg debugdrawdag <<'EOS'
   > o    foo
   > |\
   > +---o  bar
   > | | |
   > | o |  baz
   > |  /
   > +---o  d
   > | |
   > +---o  c
   > | |
   > o |  b
   > |/
   > o  a
   > EOS
 
   $ hg log -G -T '{desc}'
   o    foo
   |\
   | | o  d
   | |/
   | | o  c
   | |/
   | | o  bar
   | |/|
   | o |  b
   | |/
   o /  baz
    /
   o  a
   
   $ reinit
 
   $ hg debugdrawdag <<'EOS'
   > o    foo
   > |\
   > | | o  d
   > | |/
   > | | o  c
   > | |/
   > | | o  bar
   > | |/|
   > | o |  b
   > | |/
   > o /  baz
   >  /
   > o  a
   > EOS
 
   $ hg log -G -T '{desc}'
   o    foo
   |\
   | | o  d
   | |/
   | | o  c
   | |/
   | | o  bar
   | |/|
   | o |  b
   | |/
   o /  baz
    /
   o  a
   
+  $ hg manifest -r a
+  a
+  $ hg manifest -r b
+  a
+  b
+  $ hg manifest -r bar
+  a
+  b
+  $ hg manifest -r foo
+  a
+  b
+  baz
 
 Edges existed in repo are no-ops
 
   $ reinit
   $ hg debugdrawdag <<'EOS'
   > B C C
   > | | |
   > A A B
   > EOS
 
   $ hg log -G -T '{desc}'
   o    C
   |\
   | o  B
   |/
   o  A
   
 
   $ hg debugdrawdag <<'EOS'
   > C D C
   > | | |
   > B B A
   > EOS
 
   $ hg log -G -T '{desc}'
   o  D
   |
   | o  C
   |/|
   o |  B
   |/
   o  A
   
 
 Node with more than 2 parents are disallowed
 
   $ hg debugdrawdag <<'EOS'
   >   A
   >  /|\
   > D B C
   > EOS
   abort: A: too many parents: C D B
   [255]
 
 Cycles are disallowed
 
   $ hg debugdrawdag <<'EOS'
   > A
   > |
   > A
   > EOS
   abort: the graph has cycles
   [255]
 
   $ hg debugdrawdag <<'EOS'
   > A
   > |
   > B
   > |
   > A
   > EOS
   abort: the graph has cycles
   [255]
 
 Create obsmarkers via comments
 
   $ reinit
 
   $ hg debugdrawdag <<'EOS'
   >       G
   >       |
   > I D C F   # split: B -> E, F, G
   >  \ \| |   # replace: C -> D -> H
   >   H B E   # prune: F, I
   >    \|/
   >     A
   > EOS
 
   $ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}'
   o  G 711f53bbef0bebd12eb6f0511d5e2e998b984846
   |
   x  F 64a8289d249234b9886244d379f15e6b650b28e3
   |
   o  E 7fb047a69f220c21711122dfd94305a9efb60cba
   |
   | x  D be0ef73c17ade3fc89dc41701eb9fc3a91b58282
   | |
   | | x  C 26805aba1e600a82e93661149f2313866a221a7b
   | |/
   | x  B 112478962961147124edd43549aedd1a335e44bf
   |/
   | x  I 58e6b987bf7045fcd9c54f496396ca1d1fc81047
   | |
   | o  H 575c4b5ec114d64b681d33f8792853568bfb2b2c
   |/
   o  A 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
   
   $ hg debugobsolete
   112478962961147124edd43549aedd1a335e44bf 7fb047a69f220c21711122dfd94305a9efb60cba 64a8289d249234b9886244d379f15e6b650b28e3 711f53bbef0bebd12eb6f0511d5e2e998b984846 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   26805aba1e600a82e93661149f2313866a221a7b be0ef73c17ade3fc89dc41701eb9fc3a91b58282 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   be0ef73c17ade3fc89dc41701eb9fc3a91b58282 575c4b5ec114d64b681d33f8792853568bfb2b2c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   64a8289d249234b9886244d379f15e6b650b28e3 0 {7fb047a69f220c21711122dfd94305a9efb60cba} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   58e6b987bf7045fcd9c54f496396ca1d1fc81047 0 {575c4b5ec114d64b681d33f8792853568bfb2b2c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

tests/test-rebase-base.t

@@ -1,381 +1,381
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > rebase=
   > drawdag=$TESTDIR/drawdag.py
   > 
   > [phases]
   > publish=False
   > 
   > [alias]
   > tglog = log -G --template "{rev}: {desc}"
   > EOF
 
   $ rebasewithdag() {
   >   N=`$PYTHON -c "print($N+1)"`
   >   hg init repo$N && cd repo$N
   >   hg debugdrawdag
   >   hg rebase "$@" > _rebasetmp
   >   r=$?
   >   grep -v 'saved backup bundle' _rebasetmp
   >   [ $r -eq 0 ] && hg tglog
   >   cd ..
   >   return $r
   > }
 
 Single branching point, without merge:
 
   $ rebasewithdag -b D -d Z <<'EOS'
   >     D E
   >     |/
   > Z B C   # C: branching point, E should be picked
   >  \|/    # B should not be picked
   >   A
   >   |
   >   R
   > EOS
   rebasing 3:d6003a550c2c "C" (C)
   rebasing 5:4526cf523425 "D" (D)
   rebasing 6:b296604d9846 "E" (E tip)
   o  6: E
   |
   | o  5: D
   |/
   o  4: C
   |
   o  3: Z
   |
   | o  2: B
   |/
   o  1: A
   |
   o  0: R
   
 Multiple branching points caused by selecting a single merge changeset:
 
   $ rebasewithdag -b E -d Z <<'EOS'
   >     E
   >    /|
   >   B C D  # B, C: multiple branching points
   >   | |/   # D should not be picked
   > Z | /
   >  \|/
   >   A
   >   |
   >   R
   > EOS
   rebasing 2:c1e6b162678d "B" (B)
   rebasing 3:d6003a550c2c "C" (C)
-  rebasing 6:5251e0cb7302 "E" (E tip)
+  rebasing 6:54c8f00cb91c "E" (E tip)
   o    6: E
   |\
   | o  5: C
   | |
   o |  4: B
   |/
   o  3: Z
   |
   | o  2: D
   |/
   o  1: A
   |
   o  0: R
   
 Rebase should not extend the "--base" revset using "descendants":
 
   $ rebasewithdag -b B -d Z <<'EOS'
   >     E
   >    /|
   > Z B C  # descendants(B) = B+E. With E, C will be included incorrectly
   >  \|/
   >   A
   >   |
   >   R
   > EOS
   rebasing 2:c1e6b162678d "B" (B)
-  rebasing 5:5251e0cb7302 "E" (E tip)
+  rebasing 5:54c8f00cb91c "E" (E tip)
   o    5: E
   |\
   | o  4: B
   | |
   | o  3: Z
   | |
   o |  2: C
   |/
   o  1: A
   |
   o  0: R
   
 Rebase should not simplify the "--base" revset using "roots":
 
   $ rebasewithdag -b B+E -d Z <<'EOS'
   >     E
   >    /|
   > Z B C  # roots(B+E) = B. Without E, C will be missed incorrectly
   >  \|/
   >   A
   >   |
   >   R
   > EOS
   rebasing 2:c1e6b162678d "B" (B)
   rebasing 3:d6003a550c2c "C" (C)
-  rebasing 5:5251e0cb7302 "E" (E tip)
+  rebasing 5:54c8f00cb91c "E" (E tip)
   o    5: E
   |\
   | o  4: C
   | |
   o |  3: B
   |/
   o  2: Z
   |
   o  1: A
   |
   o  0: R
   
 The destination is one of the two branching points of a merge:
 
   $ rebasewithdag -b F -d Z <<'EOS'
   >     F
   >    / \
   >   E   D
   >  /   /
   > Z   C
   >  \ /
   >   B
   >   |
   >   A
   > EOS
   nothing to rebase
   [1]
 
 Multiple branching points caused by multiple bases (issue5420):
 
   $ rebasewithdag -b E1+E2+C2+B1 -d Z <<'EOS'
   >   Z    E2
   >   |   /
   >   F E1 C2
   >   |/  /
   >   E C1 B2
   >   |/  /
   >   C B1
   >   |/
   >   B
   >   |
   >   A
   >   |
   >   R
   > EOS
   rebasing 3:a113dbaa660a "B1" (B1)
   rebasing 5:06ce7b1cc8c2 "B2" (B2)
   rebasing 6:0ac98cce32d3 "C1" (C1)
   rebasing 8:781512f5e33d "C2" (C2)
   rebasing 9:428d8c18f641 "E1" (E1)
   rebasing 11:e1bf82f6b6df "E2" (E2)
   o  12: E2
   |
   o  11: E1
   |
   | o  10: C2
   | |
   | o  9: C1
   |/
   | o  8: B2
   | |
   | o  7: B1
   |/
   o  6: Z
   |
   o  5: F
   |
   o  4: E
   |
   o  3: C
   |
   o  2: B
   |
   o  1: A
   |
   o  0: R
   
 Multiple branching points with multiple merges:
 
   $ rebasewithdag -b G+P -d Z <<'EOS'
   > G   H   P
   > |\ /|   |\
   > F E D   M N
   >  \|/|  /| |\
   > Z C B I J K L
   >  \|/  |/  |/
   >   A   A   A
   > EOS
   rebasing 2:dc0947a82db8 "C" (C)
-  rebasing 8:215e7b0814e1 "D" (D)
+  rebasing 8:4e4f9194f9f1 "D" (D)
   rebasing 9:03ca77807e91 "E" (E)
   rebasing 10:afc707c82df0 "F" (F)
-  rebasing 13:018caa673317 "G" (G)
-  rebasing 14:4f710fbd68cb "H" (H)
+  rebasing 13:690dfff91e9e "G" (G)
+  rebasing 14:2893b886bb10 "H" (H)
   rebasing 3:08ebfeb61bac "I" (I)
   rebasing 4:a0a5005cec67 "J" (J)
   rebasing 5:83780307a7e8 "K" (K)
   rebasing 6:e131637a1cb6 "L" (L)
-  rebasing 11:d6fe3d11d95d "M" (M)
-  rebasing 12:fa1e02269063 "N" (N)
-  rebasing 15:448b1a498430 "P" (P tip)
+  rebasing 11:d1f6d0c3c7e4 "M" (M)
+  rebasing 12:7aaec6f81888 "N" (N)
+  rebasing 15:325bc8f1760d "P" (P tip)
   o    15: P
   |\
   | o    14: N
   | |\
   o \ \    13: M
   |\ \ \
   | | | o  12: L
   | | | |
   | | o |  11: K
   | | |/
   | o /  10: J
   | |/
   o /  9: I
   |/
   | o    8: H
   | |\
   | | | o  7: G
   | | |/|
   | | | o  6: F
   | | | |
   | | o |  5: E
   | | |/
   | o |  4: D
   | |\|
   +---o  3: C
   | |
   o |  2: Z
   | |
   | o  1: B
   |/
   o  0: A
   
 Slightly more complex merge case (mentioned in https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-November/091074.html):
 
   $ rebasewithdag -b A3+B3 -d Z <<'EOF'
   > Z     C1    A3     B3
   > |    /     / \    / \
   > M3 C0     A1  A2 B1  B2
   > | /       |   |  |   |
   > M2        M1  C1 C1  M3
   > |
   > M1
   > |
   > M0
   > EOF
   rebasing 4:8817fae53c94 "C0" (C0)
   rebasing 6:06ca5dfe3b5b "B2" (B2)
   rebasing 7:73508237b032 "C1" (C1)
   rebasing 9:fdb955e2faed "A2" (A2)
-  rebasing 11:1b2f368c3cb5 "A3" (A3)
+  rebasing 11:4e449bd1a643 "A3" (A3)
   rebasing 10:0a33b0519128 "B1" (B1)
-  rebasing 12:bd6a37b5b67a "B3" (B3 tip)
+  rebasing 12:209327807c3a "B3" (B3 tip)
   o    12: B3
   |\
   | o  11: B1
   | |
   | | o    10: A3
   | | |\
   | +---o  9: A2
   | | |
   | o |  8: C1
   | | |
   o | |  7: B2
   | | |
   | o |  6: C0
   |/ /
   o |  5: Z
   | |
   o |  4: M3
   | |
   o |  3: M2
   | |
   | o  2: A1
   |/
   o  1: M1
   |
   o  0: M0
   
 Disconnected graph:
 
   $ rebasewithdag -b B -d Z <<'EOS'
   >   B
   >   |
   > Z A
   > EOS
   nothing to rebase from 112478962961 to 48b9aae0607f
   [1]
 
 Multiple roots. Roots are ancestors of dest:
 
   $ rebasewithdag -b B+D -d Z <<'EOF'
   > D Z B
   >  \|\|
   >   C A
   > EOF
   rebasing 2:112478962961 "B" (B)
   rebasing 3:b70f76719894 "D" (D)
   o  4: D
   |
   | o  3: B
   |/
   o    2: Z
   |\
   | o  1: C
   |
   o  0: A
   
 Multiple roots. One root is not an ancestor of dest:
 
   $ rebasewithdag -b B+D -d Z <<'EOF'
   > Z B D
   >  \|\|
   >   A C
   > EOF
-  nothing to rebase from 86d01f49c0d9+b70f76719894 to 262e37e34f63
+  nothing to rebase from f675d5a1c6a4+b70f76719894 to 262e37e34f63
   [1]
 
 Multiple roots. One root is not an ancestor of dest. Select using a merge:
 
   $ rebasewithdag -b E -d Z <<'EOF'
   >   E
   >   |\
   > Z B D
   >  \|\|
   >   A C
   > EOF
-  rebasing 2:86d01f49c0d9 "B" (B)
-  rebasing 5:539a0ff83ea9 "E" (E tip)
+  rebasing 2:f675d5a1c6a4 "B" (B)
+  rebasing 5:f68696fe6af8 "E" (E tip)
   o    5: E
   |\
   | o    4: B
   | |\
   | | o  3: Z
   | | |
   o | |  2: D
   |/ /
   o /  1: C
    /
   o  0: A
   
 Multiple roots. Two children share two parents while dest has only one parent:
 
   $ rebasewithdag -b B+D -d Z <<'EOF'
   > Z B D
   >  \|\|\
   >   A C A
   > EOF
-  rebasing 2:86d01f49c0d9 "B" (B)
-  rebasing 3:b7df2ca01aa8 "D" (D)
+  rebasing 2:f675d5a1c6a4 "B" (B)
+  rebasing 3:c2a779e13b56 "D" (D)
   o    4: D
   |\
   +---o  3: B
   | |/
   | o  2: Z
   | |
   o |  1: C
    /
   o  0: A
   

tests/test-strip.t

@@ -1,1099 +1,1099
   $ echo "[format]" >> $HGRCPATH
   $ echo "usegeneraldelta=yes" >> $HGRCPATH
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "strip=" >> $HGRCPATH
   $ echo "drawdag=$TESTDIR/drawdag.py" >> $HGRCPATH
 
   $ restore() {
   >     hg unbundle -q .hg/strip-backup/*
   >     rm .hg/strip-backup/*
   > }
   $ teststrip() {
   >     hg up -C $1
   >     echo % before update $1, strip $2
   >     hg parents
   >     hg --traceback strip $2
   >     echo % after update $1, strip $2
   >     hg parents
   >     restore
   > }
 
   $ hg init test
   $ cd test
 
   $ echo foo > bar
   $ hg ci -Ama
   adding bar
 
   $ echo more >> bar
   $ hg ci -Amb
 
   $ echo blah >> bar
   $ hg ci -Amc
 
   $ hg up 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo blah >> bar
   $ hg ci -Amd
   created new head
 
   $ echo final >> bar
   $ hg ci -Ame
 
   $ hg log
   changeset:   4:443431ffac4f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     e
   
   changeset:   3:65bd5f99a4a3
   parent:      1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     d
   
   changeset:   2:264128213d29
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     c
   
   changeset:   1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
   changeset:   0:9ab35a2d17cb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
 
   $ teststrip 4 4
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   % before update 4, strip 4
   changeset:   4:443431ffac4f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     e
   
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   % after update 4, strip 4
   changeset:   3:65bd5f99a4a3
   tag:         tip
   parent:      1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     d
   
   $ teststrip 4 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   % before update 4, strip 3
   changeset:   4:443431ffac4f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     e
   
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   % after update 4, strip 3
   changeset:   1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
   $ teststrip 1 4
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   % before update 1, strip 4
   changeset:   1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   % after update 1, strip 4
   changeset:   1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
   $ teststrip 4 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   % before update 4, strip 2
   changeset:   4:443431ffac4f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     e
   
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   % after update 4, strip 2
   changeset:   3:443431ffac4f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     e
   
   $ teststrip 4 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   % before update 4, strip 1
   changeset:   4:264128213d29
   tag:         tip
   parent:      1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     c
   
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   % after update 4, strip 1
   changeset:   0:9ab35a2d17cb
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   $ teststrip null 4
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   % before update null, strip 4
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   % after update null, strip 4
 
   $ hg log
   changeset:   4:264128213d29
   tag:         tip
   parent:      1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     c
   
   changeset:   3:443431ffac4f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     e
   
   changeset:   2:65bd5f99a4a3
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     d
   
   changeset:   1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
   changeset:   0:9ab35a2d17cb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   $ hg up -C 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg parents
   changeset:   4:264128213d29
   tag:         tip
   parent:      1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     c
   
 
   $ hg --traceback strip 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob)
   $ hg parents
   changeset:   1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
   $ hg debugbundle .hg/strip-backup/*
   Stream params: sortdict([('Compression', 'BZ')])
   changegroup -- "sortdict([('version', '02'), ('nbchanges', '1')])"
       264128213d290d868c54642d13aeaa3675551a78
   phase-heads -- 'sortdict()'
       264128213d290d868c54642d13aeaa3675551a78 draft
   $ hg pull .hg/strip-backup/*
   pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ rm .hg/strip-backup/*
   $ hg log --graph
   o  changeset:   4:264128213d29
   |  tag:         tip
   |  parent:      1:ef3a871183d7
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     c
   |
   | o  changeset:   3:443431ffac4f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     e
   | |
   | o  changeset:   2:65bd5f99a4a3
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     d
   |
   @  changeset:   1:ef3a871183d7
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     b
   |
   o  changeset:   0:9ab35a2d17cb
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a
   
   $ hg up -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 4
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 before strip of merge parent
 
   $ hg parents
   changeset:   2:65bd5f99a4a3
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     d
   
   changeset:   4:264128213d29
   tag:         tip
   parent:      1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     c
   
   $ hg strip 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
 
 after strip of merge parent
 
   $ hg parents
   changeset:   1:ef3a871183d7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
   $ restore
 
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to "264128213d29: c"
   1 other heads for branch "default"
   $ hg log -G
   @  changeset:   4:264128213d29
   |  tag:         tip
   |  parent:      1:ef3a871183d7
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     c
   |
   | o  changeset:   3:443431ffac4f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     e
   | |
   | o  changeset:   2:65bd5f99a4a3
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     d
   |
   o  changeset:   1:ef3a871183d7
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     b
   |
   o  changeset:   0:9ab35a2d17cb
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a
   
 
 2 is parent of 3, only one strip should happen
 
   $ hg strip "roots(2)" 3
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   $ hg log -G
   @  changeset:   2:264128213d29
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     c
   |
   o  changeset:   1:ef3a871183d7
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     b
   |
   o  changeset:   0:9ab35a2d17cb
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a
   
   $ restore
   $ hg log -G
   o  changeset:   4:443431ffac4f
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     e
   |
   o  changeset:   3:65bd5f99a4a3
   |  parent:      1:ef3a871183d7
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     d
   |
   | @  changeset:   2:264128213d29
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     c
   |
   o  changeset:   1:ef3a871183d7
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     b
   |
   o  changeset:   0:9ab35a2d17cb
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a
   
 Failed hook while applying "saveheads" bundle.
 
   $ hg strip 2 --config hooks.pretxnchangegroup.bad=false
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   transaction abort!
   rollback completed
   strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob)
   strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob)
   (fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob)
   abort: pretxnchangegroup.bad hook exited with status 1
   [255]
   $ restore
   $ hg log -G
   o  changeset:   4:443431ffac4f
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     e
   |
   o  changeset:   3:65bd5f99a4a3
   |  parent:      1:ef3a871183d7
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     d
   |
   | o  changeset:   2:264128213d29
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     c
   |
   @  changeset:   1:ef3a871183d7
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     b
   |
   o  changeset:   0:9ab35a2d17cb
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a
   
 
 2 different branches: 2 strips
 
   $ hg strip 2 4
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   $ hg log -G
   o  changeset:   2:65bd5f99a4a3
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     d
   |
   @  changeset:   1:ef3a871183d7
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     b
   |
   o  changeset:   0:9ab35a2d17cb
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a
   
   $ restore
 
 2 different branches and a common ancestor: 1 strip
 
   $ hg strip 1 "2|4"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   $ restore
 
 verify fncache is kept up-to-date
 
   $ touch a
   $ hg ci -qAm a
   $ cat .hg/store/fncache | sort
   data/a.i
   data/bar.i
   $ hg strip tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   $ cat .hg/store/fncache
   data/bar.i
 
 stripping an empty revset
 
   $ hg strip "1 and not 1"
   abort: empty revision set
   [255]
 
 remove branchy history for qimport tests
 
   $ hg strip 3
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
 
 
 strip of applied mq should cleanup status file
 
   $ echo "mq=" >> $HGRCPATH
   $ hg up -C 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo fooagain >> bar
   $ hg ci -mf
   $ hg qimport -r tip:2
 
 applied patches before strip
 
   $ hg qapplied
   d
   e
   f
 
 stripping revision in queue
 
   $ hg strip 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
 
 applied patches after stripping rev in queue
 
   $ hg qapplied
   d
 
 stripping ancestor of queue
 
   $ hg strip 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
 
 applied patches after stripping ancestor of queue
 
   $ hg qapplied
 
 Verify strip protects against stripping wc parent when there are uncommitted mods
 
   $ echo b > b
   $ echo bb > bar
   $ hg add b
   $ hg ci -m 'b'
   $ hg log --graph
   @  changeset:   1:76dcf9fab855
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     b
   |
   o  changeset:   0:9ab35a2d17cb
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a
   
   $ hg up 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo c > bar
   $ hg up -t false
   merging bar
   merging bar failed!
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
   $ hg sum
   parent: 1:76dcf9fab855 tip
    b
   branch: default
   commit: 1 modified, 1 unknown, 1 unresolved
   update: (current)
   phases: 2 draft
   mq:     3 unapplied
 
   $ echo c > b
   $ hg strip tip
   abort: local changes found
   [255]
   $ hg strip tip --keep
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   $ hg log --graph
   @  changeset:   0:9ab35a2d17cb
      tag:         tip
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a
   
   $ hg status
   M bar
   ? b
   ? bar.orig
 
   $ rm bar.orig
   $ hg sum
   parent: 0:9ab35a2d17cb tip
    a
   branch: default
   commit: 1 modified, 1 unknown
   update: (current)
   phases: 1 draft
   mq:     3 unapplied
 
 Strip adds, removes, modifies with --keep
 
   $ touch b
   $ hg add b
   $ hg commit -mb
   $ touch c
 
 ... with a clean working dir
 
   $ hg add c
   $ hg rm bar
   $ hg commit -mc
   $ hg status
   $ hg strip --keep tip
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   $ hg status
   ! bar
   ? c
 
 ... with a dirty working dir
 
   $ hg add c
   $ hg rm bar
   $ hg commit -mc
   $ hg status
   $ echo b > b
   $ echo d > d
   $ hg strip --keep tip
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
   $ hg status
   M b
   ! bar
   ? c
   ? d
 
 ... after updating the dirstate
   $ hg add c
   $ hg commit -mc
   $ hg rm c
   $ hg commit -mc
   $ hg strip --keep '.^' -q
   $ cd ..
 
 stripping many nodes on a complex graph (issue3299)
 
   $ hg init issue3299
   $ cd issue3299
   $ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a'
   $ hg strip 'not ancestors(x)'
   saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob)
 
 test hg strip -B bookmark
 
   $ cd ..
   $ hg init bookmarks
   $ cd bookmarks
   $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f'
   $ hg bookmark -r 'a' 'todelete'
   $ hg bookmark -r 'b' 'B'
   $ hg bookmark -r 'b' 'nostrip'
   $ hg bookmark -r 'c' 'delete'
   $ hg bookmark -r 'd' 'multipledelete1'
   $ hg bookmark -r 'e' 'multipledelete2'
   $ hg bookmark -r 'f' 'singlenode1'
   $ hg bookmark -r 'f' 'singlenode2'
   $ hg up -C todelete
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark todelete)
   $ hg strip -B nostrip
   bookmark 'nostrip' deleted
   abort: empty revision set
   [255]
   $ hg strip -B todelete
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
   bookmark 'todelete' deleted
   $ hg id -ir dcbb326fdec2
   abort: unknown revision 'dcbb326fdec2'!
   [255]
   $ hg id -ir d62d843c9a01
   d62d843c9a01
   $ hg bookmarks
      B                         9:ff43616e5d0f
      delete                    6:2702dd0c91e7
      multipledelete1           11:e46a4836065c
      multipledelete2           12:b4594d867745
      singlenode1               13:43227190fef8
      singlenode2               13:43227190fef8
   $ hg strip -B multipledelete1 -B multipledelete2
   saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg (glob)
   bookmark 'multipledelete1' deleted
   bookmark 'multipledelete2' deleted
   $ hg id -ir e46a4836065c
   abort: unknown revision 'e46a4836065c'!
   [255]
   $ hg id -ir b4594d867745
   abort: unknown revision 'b4594d867745'!
   [255]
   $ hg strip -B singlenode1 -B singlenode2
   saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg (glob)
   bookmark 'singlenode1' deleted
   bookmark 'singlenode2' deleted
   $ hg id -ir 43227190fef8
   abort: unknown revision '43227190fef8'!
   [255]
   $ hg strip -B unknownbookmark
   abort: bookmark 'unknownbookmark' not found
   [255]
   $ hg strip -B unknownbookmark1 -B unknownbookmark2
   abort: bookmark 'unknownbookmark1,unknownbookmark2' not found
   [255]
   $ hg strip -B delete -B unknownbookmark
   abort: bookmark 'unknownbookmark' not found
   [255]
   $ hg strip -B delete
   saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
   bookmark 'delete' deleted
   $ hg id -ir 6:2702dd0c91e7
   abort: unknown revision '2702dd0c91e7'!
   [255]
   $ hg update B
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark B)
   $ echo a > a
   $ hg add a
   $ hg strip -B B
   abort: local changes found
   [255]
   $ hg bookmarks
    * B                         6:ff43616e5d0f
 
 Make sure no one adds back a -b option:
 
   $ hg strip -b tip
   hg strip: option -b not recognized
   hg strip [-k] [-f] [-B bookmark] [-r] REV...
   
   strip changesets and all their descendants from the repository
   
   (use 'hg help -e strip' to show help for the strip extension)
   
   options ([+] can be repeated):
   
    -r --rev REV [+]        strip specified revision (optional, can specify
                            revisions without this option)
    -f --force              force removal of changesets, discard uncommitted
                            changes (no backup)
       --no-backup          no backups
    -k --keep               do not modify working directory during strip
    -B --bookmark VALUE [+] remove revs only reachable from given bookmark
       --mq                 operate on patch repository
   
   (use 'hg strip -h' to show more help)
   [255]
 
   $ cd ..
 
 Verify bundles don't get overwritten:
 
   $ hg init doublebundle
   $ cd doublebundle
   $ touch a
   $ hg commit -Aqm a
   $ touch b
   $ hg commit -Aqm b
   $ hg strip -r 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg (glob)
   $ ls .hg/strip-backup
   3903775176ed-e68910bd-backup.hg
   $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg
   $ hg strip -r 0
   saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg (glob)
   $ ls .hg/strip-backup
   3903775176ed-54390173-backup.hg
   3903775176ed-e68910bd-backup.hg
   $ cd ..
 
 Test that we only bundle the stripped changesets (issue4736)
 ------------------------------------------------------------
 
 initialization (previous repo is empty anyway)
 
   $ hg init issue4736
   $ cd issue4736
   $ echo a > a
   $ hg add a
   $ hg commit -m commitA
   $ echo b > b
   $ hg add b
   $ hg commit -m commitB
   $ echo c > c
   $ hg add c
   $ hg commit -m commitC
   $ hg up 'desc(commitB)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo d > d
   $ hg add d
   $ hg commit -m commitD
   created new head
   $ hg up 'desc(commitC)'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc(commitD)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'mergeCD'
   $ hg log -G
   @    changeset:   4:d8db9d137221
   |\   tag:         tip
   | |  parent:      2:5c51d8d6557d
   | |  parent:      3:6625a5168474
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     mergeCD
   | |
   | o  changeset:   3:6625a5168474
   | |  parent:      1:eca11cf91c71
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     commitD
   | |
   o |  changeset:   2:5c51d8d6557d
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     commitC
   |
   o  changeset:   1:eca11cf91c71
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     commitB
   |
   o  changeset:   0:105141ef12d0
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     commitA
   
 
 Check bundle behavior:
 
   $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg
   2 changesets found
   $ hg log -r 'bundle()' -R ../issue4736.hg
   changeset:   3:6625a5168474
   parent:      1:eca11cf91c71
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commitD
   
   changeset:   4:d8db9d137221
   tag:         tip
   parent:      2:5c51d8d6557d
   parent:      3:6625a5168474
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     mergeCD
   
 
 check strip behavior
 
   $ hg --config extensions.strip= strip 'desc(commitD)' --debug
   resolving manifests
    branchmerge: False, force: True, partial: False
    ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71
    c: other deleted -> r
   removing c
    d: other deleted -> r
   removing d
   starting 4 threads for background file closing (?)
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   2 changesets found
   list of changesets:
   6625a516847449b6f0fa3737b9ba56e9f0f3032c
   d8db9d1372214336d2b5570f20ee468d2c72fa8b
   bundle2-output-bundle: "HG20", (1 params) 2 parts total
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   bundle2-output-part: "phase-heads" 24 bytes payload
   saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob)
   updating the branch cache
   invalid branchheads cache (served): tip differs
   truncating cache/rbc-revs-v1 to 24
   $ hg log -G
   o  changeset:   2:5c51d8d6557d
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     commitC
   |
   @  changeset:   1:eca11cf91c71
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     commitB
   |
   o  changeset:   0:105141ef12d0
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     commitA
   
 
 strip backup content
 
   $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg
   changeset:   3:6625a5168474
   parent:      1:eca11cf91c71
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commitD
   
   changeset:   4:d8db9d137221
   tag:         tip
   parent:      2:5c51d8d6557d
   parent:      3:6625a5168474
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     mergeCD
   
 Check that the phase cache is properly invalidated after a strip with bookmark.
 
   $ cat > ../stripstalephasecache.py << EOF
   > from mercurial import extensions, localrepo
   > def transactioncallback(orig, repo, desc, *args, **kwargs):
   >     def test(transaction):
   >         # observe cache inconsistency
   >         try:
   >             [repo.changelog.node(r) for r in repo.revs("not public()")]
   >         except IndexError:
   >             repo.ui.status("Index error!\n")
   >     transaction = orig(repo, desc, *args, **kwargs)
   >     # warm up the phase cache
   >     list(repo.revs("not public()"))
   >     if desc != 'strip':
   >          transaction.addpostclose("phase invalidation test", test)
   >     return transaction
   > def extsetup(ui):
   >     extensions.wrapfunction(localrepo.localrepository, "transaction",
   >                             transactioncallback)
   > EOF
   $ hg up -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo k > k
   $ hg add k
   $ hg commit -m commitK
   $ echo l > l
   $ hg add l
   $ hg commit -m commitL
   $ hg book -r tip blah
   $ hg strip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg (glob)
   $ hg up -C 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Error during post-close callback of the strip transaction
 (They should be gracefully handled and reported)
 
   $ cat > ../crashstrip.py << EOF
   > from mercurial import error
   > def reposetup(ui, repo):
   >     class crashstriprepo(repo.__class__):
   >         def transaction(self, desc, *args, **kwargs):
   >             tr = super(crashstriprepo, self).transaction(desc, *args, **kwargs)
   >             if desc == 'strip':
   >                 def crash(tra): raise error.Abort('boom')
   >                 tr.addpostclose('crash', crash)
   >             return tr
   >     repo.__class__ = crashstriprepo
   > EOF
   $ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py
   saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg (glob)
   strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg' (glob)
   abort: boom
   [255]
 
 Use delayedstrip to strip inside a transaction
 
   $ cd $TESTTMP
   $ hg init delayedstrip
   $ cd delayedstrip
   $ hg debugdrawdag <<'EOS'
   >   D
   >   |
   >   C F H    # Commit on top of "I",
   >   | |/|    # Strip B+D+I+E+G+H+Z
   > I B E G
   >  \|/
   >   A   Z
   > EOS
   $ cp -R . ../scmutilcleanup
 
   $ hg up -C I
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 3 >> I
   $ cat > $TESTTMP/delayedstrip.py <<EOF
   > from mercurial import repair, commands
   > def reposetup(ui, repo):
   >     def getnodes(expr):
   >         return [repo.changelog.node(r) for r in repo.revs(expr)]
   >     with repo.wlock():
   >         with repo.lock():
   >             with repo.transaction('delayedstrip'):
   >                 repair.delayedstrip(ui, repo, getnodes('B+I+Z+D+E'), 'J')
   >                 repair.delayedstrip(ui, repo, getnodes('G+H+Z'), 'I')
   >                 commands.commit(ui, repo, message='J', date='0 0')
   > EOF
   $ hg log -r . -T '\n' --config extensions.t=$TESTTMP/delayedstrip.py
   warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22
-  saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-81fa23b0-I.hg (glob)
+  saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg (glob)
   
   $ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)'
   @  6:2f2d51af6205 J
   |
   o  3:08ebfeb61bac I
   |
   | o  5:64a8289d2492 F
   | |
   | o  2:7fb047a69f22 E
   |/
   | o  4:26805aba1e60 C
   | |
   | o  1:112478962961 B
   |/
   o  0:426bada5c675 A
   
 Test high-level scmutil.cleanupnodes API
 
   $ cd $TESTTMP/scmutilcleanup
   $ hg debugdrawdag <<'EOS'
   >   D2  F2  G2   # D2, F2, G2 are replacements for D, F, G
   >   |   |   |
   >   C   H   G
   > EOS
   $ for i in B C D F G I Z; do
   >     hg bookmark -i -r $i b-$i
   > done
   $ hg bookmark -i -r E 'b-F@divergent1'
   $ hg bookmark -i -r H 'b-F@divergent2'
   $ hg bookmark -i -r G 'b-F@divergent3'
   $ cp -R . ../scmutilcleanup.obsstore
 
   $ cat > $TESTTMP/scmutilcleanup.py <<EOF
   > from mercurial import scmutil
   > def reposetup(ui, repo):
   >     def nodes(expr):
   >         return [repo.changelog.node(r) for r in repo.revs(expr)]
   >     def node(expr):
   >         return nodes(expr)[0]
   >     with repo.wlock():
   >         with repo.lock():
   >             with repo.transaction('delayedstrip'):
   >                 mapping = {node('F'): [node('F2')],
   >                            node('D'): [node('D2')],
   >                            node('G'): [node('G2')]}
   >                 scmutil.cleanupnodes(repo, mapping, 'replace')
   >                 scmutil.cleanupnodes(repo, nodes('((B::)+I+Z)-D2'), 'replace')
   > EOF
   $ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py
   warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60
   saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg (glob)
   
   $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
   o  8:1473d4b996d1 G2 b-F@divergent3 b-G
   |
-  | o  7:d94e89b773b6 F2 b-F
+  | o  7:d11b3456a873 F2 b-F
   | |
-  | o  5:7fe5bac4c918 H
+  | o  5:5cb05ba470a7 H
   |/|
   | o  3:7fb047a69f22 E b-F@divergent1
   | |
   | | o  6:7c78f703e465 D2 b-D
   | | |
   | | o  4:26805aba1e60 C
   | | |
   | | o  2:112478962961 B
   | |/
   o |  1:1fc8102cda62 G
    /
   o  0:426bada5c675 A b-B b-C b-I
   
   $ hg bookmark
      b-B                       0:426bada5c675
      b-C                       0:426bada5c675
      b-D                       6:7c78f703e465
-     b-F                       7:d94e89b773b6
+     b-F                       7:d11b3456a873
      b-F@divergent1            3:7fb047a69f22
      b-F@divergent3            8:1473d4b996d1
      b-G                       8:1473d4b996d1
      b-I                       0:426bada5c675
      b-Z                       -1:000000000000
 
 Test the above using obsstore "by the way". Not directly related to strip, but
 we have reusable code here
 
   $ cd $TESTTMP/scmutilcleanup.obsstore
   $ cat >> .hg/hgrc <<EOF
   > [experimental]
   > evolution=all
   > evolution.track-operation=1
   > EOF
 
   $ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py
   
   $ rm .hg/localtags
   $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
   o  12:1473d4b996d1 G2 b-F@divergent3 b-G
   |
-  | o  11:d94e89b773b6 F2 b-F
+  | o  11:d11b3456a873 F2 b-F
   | |
-  | o  8:7fe5bac4c918 H
+  | o  8:5cb05ba470a7 H
   |/|
   | o  4:7fb047a69f22 E b-F@divergent1
   | |
   | | o  10:7c78f703e465 D2 b-D
   | | |
   | | x  6:26805aba1e60 C
   | | |
   | | x  3:112478962961 B
   | |/
   x |  1:1fc8102cda62 G
    /
   o  0:426bada5c675 A b-B b-C b-I
   
   $ hg debugobsolete
   1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
-  64a8289d249234b9886244d379f15e6b650b28e3 d94e89b773b67e72642a931159ada8d1a9246998 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
+  64a8289d249234b9886244d379f15e6b650b28e3 d11b3456a873daec7c7bc53e5622e8df6d741bd2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
   f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
   48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
   112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
   08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
   26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}