Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/filemerge.py @ 36454:3ab9d74dd1c5
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
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 25 Feb 2018 23:09:58 -0500 |
| parents | 9037c29e9f53 |
| children | 5bc7ff103081 |
comparison
equal
deleted
inserted
replaced
| 36453:2831d918e1b4 | 36454:3ab9d74dd1c5 |
|---|---|
| 518 baselabel = labels[2] | 518 baselabel = labels[2] |
| 519 else: | 519 else: |
| 520 baselabel = 'base' | 520 baselabel = 'base' |
| 521 env = {'HG_FILE': fcd.path(), | 521 env = {'HG_FILE': fcd.path(), |
| 522 'HG_MY_NODE': short(mynode), | 522 'HG_MY_NODE': short(mynode), |
| 523 'HG_OTHER_NODE': str(fco.changectx()), | 523 'HG_OTHER_NODE': short(fco.changectx().node()), |
| 524 'HG_BASE_NODE': str(fca.changectx()), | 524 'HG_BASE_NODE': short(fca.changectx().node()), |
| 525 'HG_MY_ISLINK': 'l' in fcd.flags(), | 525 'HG_MY_ISLINK': 'l' in fcd.flags(), |
| 526 'HG_OTHER_ISLINK': 'l' in fco.flags(), | 526 'HG_OTHER_ISLINK': 'l' in fco.flags(), |
| 527 'HG_BASE_ISLINK': 'l' in fca.flags(), | 527 'HG_BASE_ISLINK': 'l' in fca.flags(), |
| 528 'HG_MY_LABEL': mylabel, | 528 'HG_MY_LABEL': mylabel, |
| 529 'HG_OTHER_LABEL': otherlabel, | 529 'HG_OTHER_LABEL': otherlabel, |