This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2442

filemerge: do what the context __bytes__ does, but locally
ClosedPublic

Authored by durin42 on Feb 26 2018, 12:16 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG3ab9d74dd1c5: filemerge: do what the context __bytes__ does, but locally
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Feb 26 2018, 12:16 AM
indygreg accepted this revision.Feb 26 2018, 12:43 AM
indygreg added a subscriber: indygreg.

I agree that making this behavior explicit instead of relying on coercion is better. At least in this case.

This revision is now accepted and ready to land.Feb 26 2018, 12:43 AM
Closed by commit rHG3ab9d74dd1c5: filemerge: do what the context __bytes__ does, but locally (authored by durin42). · Explain WhyFeb 26 2018, 12:43 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (4 lines)

Diff 6089

mercurial/filemerge.py

out = "" out = ""
mylabel, otherlabel = labels[:2] mylabel, otherlabel = labels[:2]
if len(labels) >= 3: if len(labels) >= 3:
baselabel = labels[2] baselabel = labels[2]
else: else:
baselabel = 'base' baselabel = 'base'
env = {'HG_FILE': fcd.path(), env = {'HG_FILE': fcd.path(),
'HG_MY_NODE': short(mynode), 'HG_MY_NODE': short(mynode),
'HG_OTHER_NODE': str(fco.changectx()), 'HG_OTHER_NODE': short(fco.changectx().node()),
'HG_BASE_NODE': str(fca.changectx()), 'HG_BASE_NODE': short(fca.changectx().node()),
'HG_MY_ISLINK': 'l' in fcd.flags(), 'HG_MY_ISLINK': 'l' in fcd.flags(),
'HG_OTHER_ISLINK': 'l' in fco.flags(), 'HG_OTHER_ISLINK': 'l' in fco.flags(),
'HG_BASE_ISLINK': 'l' in fca.flags(), 'HG_BASE_ISLINK': 'l' in fca.flags(),
'HG_MY_LABEL': mylabel, 'HG_MY_LABEL': mylabel,
'HG_OTHER_LABEL': otherlabel, 'HG_OTHER_LABEL': otherlabel,
'HG_BASE_LABEL': baselabel, 'HG_BASE_LABEL': baselabel,
} }
ui = repo.ui ui = repo.ui