mercurial-scm/hg: mercurial/filemerge.py comparison

comparison mercurial/filemerge.py @ 37077:1e30a26a65d0

filemerge: make the 'local' path match the format that 'base' and 'other' use If we pass a separate '$output' arg to the merge tool, we produce four files: local, base, other, and output. In this situation, 'output' will be the original filename, 'base' and 'other' are temporary files, and previously 'local' would be the backup file (so if 'output' was foo.txt, 'local' would be foo.txt.orig). This change makes it so that 'local' follows the same pattern as 'base' and 'other' - it will be a temporary file either in the `experimental.mergetempdirprefix`-controlled directory with a name like foo~local.txt, or in the normal system-wide temp dir with a name like foo~local.RaNd0m.txt. For the cases where the merge tool does not use an '$output' arg, 'local' is still the destination filename, and 'base' and 'other' are unchanged. The hope is that this is much easier for people to reason about; rather than having a tool like Meld pop up with three panes, one of them with the filename "foo.txt.orig", one with the filename "foo.txt", and one with "foo~other.StuFf2.txt", we can (when the merge temp dir stuff is enabled) make it show up as "foo~local.txt", "foo.txt" and "foo~other.txt", respectively. This also opens the door to future customization, such as getting the operation-provided labels and a hash prefix into the filenames (so we see something like "foo~dest.abc123", "foo.txt", and "foo~src.d4e5f6"). Differential Revision: https://phab.mercurial-scm.org/D2889

author	Kyle Lippincott <spectral@google.com>
date	Wed, 21 Mar 2018 12:36:29 -0700
parents	e349ad5cbb71
children	f0b6fbea00cf

comparison

equal deleted inserted replaced

-:66d478064d5f
+:1e30a26a65d0
 repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
 'for %s\n') % (tool, fcd.path()))
 return False, 1, None
 unused, unused, unused, back = files
 localpath = _workingpath(repo, fcd)
-with _maketempfiles(repo, fco, fca) as temppaths:
+args = _toolstr(repo.ui, tool, "args")
-basepath, otherpath = temppaths
+with _maketempfiles(repo, fco, fca, repo.wvfs.join(back.path()),
+"$output" in args) as temppaths:
+basepath, otherpath, localoutputpath = temppaths
 outpath = ""
 mylabel, otherlabel = labels[:2]
 if len(labels) >= 3:
 baselabel = labels[2]
 else:
 'HG_OTHER_LABEL': otherlabel,
 'HG_BASE_LABEL': baselabel,
 }
 ui = repo.ui
-args = _toolstr(ui, tool, "args")
 if "$output" in args:
 # read input from backup, write to original
 outpath = localpath
-localpath = repo.wvfs.join(back.path())
+localpath = localoutputpath
 replace = {'local': localpath, 'base': basepath, 'other': otherpath,
 'output': outpath, 'labellocal': mylabel,
 'labelother': otherlabel, 'labelbase': baselabel}
 args = util.interpolate(br'\$', replace, args,
 lambda s: util.shellquote(util.localpath(s)))
 # A arbitraryfilectx is returned, so we can run the same functions on
 # the backup context regardless of where it lives.
 return context.arbitraryfilectx(back, repo=repo)
 @contextlib.contextmanager
-def _maketempfiles(repo, fco, fca):
+def _maketempfiles(repo, fco, fca, localpath, uselocalpath):
-"""Writes out `fco` and `fca` as temporary files, so an external merge
+"""Writes out `fco` and `fca` as temporary files, and (if uselocalpath)
-tool may use them.
+copies `localpath` to another temporary file, so an external merge tool may
+use them.
 """
 tmproot = None
 tmprootprefix = repo.ui.config('experimental', 'mergetempdirprefix')
 if tmprootprefix:
 tmproot = tempfile.mkdtemp(prefix=tmprootprefix)
-def temp(prefix, ctx):
+def maketempfrompath(prefix, path):
-fullbase, ext = os.path.splitext(ctx.path())
+fullbase, ext = os.path.splitext(path)
 pre = "%s~%s" % (os.path.basename(fullbase), prefix)
 if tmproot:
 name = os.path.join(tmproot, pre)
 if ext:
 name += ext
 f = open(name, r"wb")
 else:
-(fd, name) = tempfile.mkstemp(prefix=pre + '.', suffix=ext)
+fd, name = tempfile.mkstemp(prefix=pre + '.', suffix=ext)
 f = os.fdopen(fd, r"wb")
+return f, name
+def tempfromcontext(prefix, ctx):
+f, name = maketempfrompath(prefix, ctx.path())
 data = repo.wwritedata(ctx.path(), ctx.data())
 f.write(data)
 f.close()
 return name
-b = temp("base", fca)
+b = tempfromcontext("base", fca)
-c = temp("other", fco)
+c = tempfromcontext("other", fco)
+d = localpath
+if uselocalpath:
+# We start off with this being the backup filename, so remove the .orig
+# to make syntax-highlighting more likely.
+if d.endswith('.orig'):
+d, _ = os.path.splitext(d)
+f, d = maketempfrompath("local", d)
+with open(localpath, 'rb') as src:
+f.write(src.read())
+f.close()
 try:
-yield b, c
+yield b, c, d
 finally:
 if tmproot:
 shutil.rmtree(tmproot)
 else:
 util.unlink(b)
 util.unlink(c)
+# if not uselocalpath, d is the 'orig'/backup file which we
+# shouldn't delete.
+if d and uselocalpath:
+util.unlink(d)
 def _filemerge(premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
 """perform a 3-way merge in the working directory
 premerge = whether this is a premerge

Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 37077:1e30a26a65d0