D379: simplemerge: use context paths for default labels instead of file paths
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Mon Aug 14 06:15:57 UTC 2017
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is the last place we used the filepath arguments without first using the
context version.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D379
AFFECTED FILES
mercurial/simplemerge.py
CHANGE DETAILS
diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -471,8 +471,8 @@
mode = opts.get('mode','merge')
name_a, name_b, name_base = None, None, None
if mode != 'union':
- name_a, name_b, name_base = _picklabels([localfile,
- otherfile, None],
+ name_a, name_b, name_base = _picklabels([localctx.path(),
+ otherctx.path(), None],
opts.get('label', []))
try:
To: phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list