Patchwork hg: use public interface ms.localctx instead of ms._local

login
register
mail settings
Submitter Pulkit Goyal
Date Jan. 18, 2018, 2:11 p.m.
Message ID <7b7a67361405f708c071.1516284671@workspace>
Download mbox | patch
Permalink /patch/26900/
State Accepted
Headers show

Comments

Pulkit Goyal - Jan. 18, 2018, 2:11 p.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1516284617 -19800
#      Thu Jan 18 19:40:17 2018 +0530
# Node ID 7b7a67361405f708c071c1fcacb72ad166a67d5b
# Parent  a1a5c3842b6f11c5f9eb4c9c55ada2d211e389a0
hg: use public interface ms.localctx instead of ms._local
Yuya Nishihara - Jan. 18, 2018, 2:23 p.m.
On Thu, 18 Jan 2018 19:41:11 +0530, Pulkit Goyal wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit@gmail.com>
> # Date 1516284617 -19800
> #      Thu Jan 18 19:40:17 2018 +0530
> # Node ID 7b7a67361405f708c071c1fcacb72ad166a67d5b
> # Parent  a1a5c3842b6f11c5f9eb4c9c55ada2d211e389a0
> hg: use public interface ms.localctx instead of ms._local

Queued, thanks.

Patch

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -15,7 +15,6 @@  import shutil
 
 from .i18n import _
 from .node import (
-    hex,
     nullid,
 )
 
@@ -858,7 +857,7 @@  def merge(repo, node, force=None, remind
         ms = mergemod.mergestate.read(repo)
         if ms.active():
             # there were conflicts
-            node = hex(ms._local)
+            node = ms.localctx.hex()
         else:
             # there were no conficts, mergestate was not stored
             node = repo['.'].hex()