Mercurial > hg
comparison mercurial/simplemerge.py @ 33904:1915a5e809ca
simplemerge: use context paths for default labels instead of file paths
This is the last place we used the filepath arguments without first using the
context version.
Differential Revision: https://phab.mercurial-scm.org/D379
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Thu, 24 Aug 2017 21:30:37 -0700 |
| parents | f39ba8237ed6 |
| children | 61b267a99fea |
comparison
equal
deleted
inserted
replaced
| 33903:ed6f64173121 | 33904:1915a5e809ca |
|---|---|
| 459 self.ctx.write(self.text, self.ctx.flags()) | 459 self.ctx.write(self.text, self.ctx.flags()) |
| 460 | 460 |
| 461 mode = opts.get('mode','merge') | 461 mode = opts.get('mode','merge') |
| 462 name_a, name_b, name_base = None, None, None | 462 name_a, name_b, name_base = None, None, None |
| 463 if mode != 'union': | 463 if mode != 'union': |
| 464 name_a, name_b, name_base = _picklabels([localfile, | 464 name_a, name_b, name_base = _picklabels([localctx.path(), |
| 465 otherfile, None], | 465 otherctx.path(), None], |
| 466 opts.get('label', [])) | 466 opts.get('label', [])) |
| 467 | 467 |
| 468 try: | 468 try: |
| 469 localtext = readctx(localctx) if localctx else readfile(localfile) | 469 localtext = readctx(localctx) if localctx else readfile(localfile) |
| 470 basetext = readctx(basectx) if basectx else readfile(basefile) | 470 basetext = readctx(basectx) if basectx else readfile(basefile) |