Patchwork [6,of,7,mergedriver] localrepo.commit: switch to mergestate.read()

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 18, 2015, 5:48 a.m.
Message ID <b117fd7573f85100dc93.1447825715@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11465/
State Accepted
Headers show

Comments

Siddharth Agarwal - Nov. 18, 2015, 5:48 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447797530 28800
#      Tue Nov 17 13:58:50 2015 -0800
# Node ID b117fd7573f85100dc93355a1cf0c0609d525aee
# Parent  ec781c2e8e8562fba23de88245e17ab474177e8e
localrepo.commit: switch to mergestate.read()

See previous patches for why we're doing this.

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1556,7 +1556,7 @@  class localrepository(object):
                 raise error.Abort(_("cannot commit merge with missing files"))
 
             unresolved, driverresolved = False, False
-            ms = mergemod.mergestate(self)
+            ms = mergemod.mergestate.read(self)
             for f in status.modified:
                 if f in ms:
                     if ms[f] == 'u':