filemerge: do what the context __bytes__ does, but locally
authorAugie Fackler <augie@google.com>
Sun, 25 Feb 2018 23:09:58 -0500
changeset 36424 3ab9d74dd1c5
parent 36423 2831d918e1b4
child 36425 24c2c760c1cb
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
mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sun Feb 25 23:09:07 2018 -0500
+++ b/mercurial/filemerge.py	Sun Feb 25 23:09:58 2018 -0500
@@ -520,8 +520,8 @@
             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(),