Mercurial > hg

diff mercurial/hg.py @ 44856: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 843418dc0b1b
children a03c177a4679
line wrap: on
line diff
--- a/mercurial/hg.py	Mon May 18 12:45:45 2020 -0400
+++ b/mercurial/hg.py	Mon May 18 14:59:59 2020 -0400
@@ -33,6 +33,7 @@
     logcmdutil,
     logexchange,
     merge as mergemod,
+    mergestate as mergestatemod,
     narrowspec,
     node,
     phases,
@@ -1164,7 +1165,7 @@
 
 
 def abortmerge(ui, repo):
-    ms = mergemod.mergestate.read(repo)
+    ms = mergestatemod.mergestate.read(repo)
     if ms.active():
         # there were conflicts
         node = ms.localctx.hex()