Mercurial > public > mercurial-scm > hg-stable

diff hgext/histedit.py @ 44915:b7808443ed6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: split out merge state handling code from main merge module There's already some pretty reasonable encapsulation here, but I want to make the mergestate storage a property of the context so memctx instances can do a reasonable thing. This is the first step in a reshuffle to make that easier. Differential Revision: https://phab.mercurial-scm.org/D8550
author Augie Fackler <augie@google.com>
date Mon, 18 May 2020 14:59:59 -0400
parents e147748f750b
children d2227d4c9e6b
line wrap: on
line diff
--- a/hgext/histedit.py	Mon May 18 12:45:45 2020 -0400
+++ b/hgext/histedit.py	Mon May 18 14:59:59 2020 -0400
@@ -224,6 +224,7 @@
     hg,
     logcmdutil,
     merge as mergemod,
+    mergestate as mergestatemod,
     mergeutil,
     node,
     obsolete,
@@ -2289,7 +2290,7 @@
 def bootstrapcontinue(ui, state, opts):
     repo = state.repo
 
-    ms = mergemod.mergestate.read(repo)
+    ms = mergestatemod.mergestate.read(repo)
     mergeutil.checkunresolved(ms)
 
     if state.actions: