Mercurial > evolve

diff hgext3rd/evolve/evolvecmd.py @ 3734:aae54e80c95c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: store divergent nodes in evolvestate when resolving content-divergence We need to store the divergent nodes in evolvestate so that we can continue an interrupted phase divergence resolution.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 29 Apr 2018 17:54:01 +0530
parents 95ee7bf46ade
children bdf7fb6af7b8
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Wed May 02 11:59:06 2018 +0200
+++ b/hgext3rd/evolve/evolvecmd.py	Sun Apr 29 17:54:01 2018 +0530
@@ -338,6 +338,7 @@
     """
     repo = repo.unfiltered()
     divergent = repo[divergent.rev()]
+    evolvestate['divergent'] = divergent.node()
     base, others = divergentdata(divergent)
     if len(others) > 1:
         othersstr = "[%s]" % (','.join([str(i) for i in others]))
@@ -355,6 +356,7 @@
         ui.write_err(msg)
         return (False, '')
     other = others[0]
+    evolvestate['other-divergent'] = other.node()
     if len(other.parents()) > 1:
         msg = _("skipping %s: %s changeset can't be "
                 "a merge (yet)\n") % (divergent, TROUBLES['CONTENTDIVERGENT'])