# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2018-02-26 04:09:58
# Node ID 3ab9d74dd1c53efd2bfc9fd8938bc098df907244
# Parent  2831d918e1b47c175208441561cb3836cc2df0e3

filemerge: do what the context __bytes__ does, but locally

str() here is clearly the wrong thing, and I think the code is clearer
when it doesn't just depend on the magic __{str,bytes}__ behavior.

I decided to grep around for \sstr\( and see what low-hanging fruit
that showed me. This was part of that hunt. That grep pattern still
has some things worth exploring.

Differential Revision: https://phab.mercurial-scm.org/D2442

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -520,8 +520,8 @@ def _xmerge(repo, mynode, orig, fcd, fco
             baselabel = 'base'
         env = {'HG_FILE': fcd.path(),
                'HG_MY_NODE': short(mynode),
-               'HG_OTHER_NODE': str(fco.changectx()),
-               'HG_BASE_NODE': str(fca.changectx()),
+               'HG_OTHER_NODE': short(fco.changectx().node()),
+               'HG_BASE_NODE': short(fca.changectx().node()),
                'HG_MY_ISLINK': 'l' in fcd.flags(),
                'HG_OTHER_ISLINK': 'l' in fco.flags(),
                'HG_BASE_ISLINK': 'l' in fca.flags(),