Patchwork D403: filemerge: reduce creation of tempfiles until needed

login
register
mail settings
Submitter phabricator
Date Aug. 31, 2017, 9:22 p.m.
Message ID <b61122891da2427c571de419d2aba57d@localhost.localdomain>
Download mbox | patch
Permalink /patch/23571/
State Not Applicable
Headers show

Comments

phabricator - Aug. 31, 2017, 9:22 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG96123bdea43e: filemerge: reduce creation of tempfiles until needed (authored by phillco).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D403?vs=1504&id=1514#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D403?vs=1504&id=1514

REVISION DETAIL
  https://phab.mercurial-scm.org/D403

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS




To: phillco, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -493,34 +493,38 @@ 
         repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
                        'for %s\n') % (tool, fcd.path()))
         return False, 1, None
-    unused, b, c, back = files
+    unused, unused, unused, back = files
     a = _workingpath(repo, fcd)
-    out = ""
-    env = {'HG_FILE': fcd.path(),
-           'HG_MY_NODE': short(mynode),
-           'HG_OTHER_NODE': str(fco.changectx()),
-           'HG_BASE_NODE': str(fca.changectx()),
-           'HG_MY_ISLINK': 'l' in fcd.flags(),
-           'HG_OTHER_ISLINK': 'l' in fco.flags(),
-           'HG_BASE_ISLINK': 'l' in fca.flags(),
-           }
-
-    ui = repo.ui
+    b, c = _maketempfiles(repo, fco, fca)
+    try:
+        out = ""
+        env = {'HG_FILE': fcd.path(),
+               'HG_MY_NODE': short(mynode),
+               'HG_OTHER_NODE': str(fco.changectx()),
+               'HG_BASE_NODE': str(fca.changectx()),
+               'HG_MY_ISLINK': 'l' in fcd.flags(),
+               'HG_OTHER_ISLINK': 'l' in fco.flags(),
+               'HG_BASE_ISLINK': 'l' in fca.flags(),
+               }
+        ui = repo.ui
 
-    args = _toolstr(ui, tool, "args", '$local $base $other')
-    if "$output" in args:
-        out, a = a, back # read input from backup, write to original
-    replace = {'local': a, 'base': b, 'other': c, 'output': out}
-    args = util.interpolate(r'\$', replace, args,
-                            lambda s: util.shellquote(util.localpath(s)))
-    cmd = toolpath + ' ' + args
-    if _toolbool(ui, tool, "gui"):
-        repo.ui.status(_('running merge tool %s for file %s\n') %
-                       (tool, fcd.path()))
-    repo.ui.debug('launching merge tool: %s\n' % cmd)
-    r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
-    repo.ui.debug('merge tool returned: %s\n' % r)
-    return True, r, False
+        args = _toolstr(ui, tool, "args", '$local $base $other')
+        if "$output" in args:
+            out, a = a, back # read input from backup, write to original
+        replace = {'local': a, 'base': b, 'other': c, 'output': out}
+        args = util.interpolate(r'\$', replace, args,
+                                lambda s: util.shellquote(util.localpath(s)))
+        cmd = toolpath + ' ' + args
+        if _toolbool(ui, tool, "gui"):
+            repo.ui.status(_('running merge tool %s for file %s\n') %
+                           (tool, fcd.path()))
+        repo.ui.debug('launching merge tool: %s\n' % cmd)
+        r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
+        repo.ui.debug('merge tool returned: %s\n' % r)
+        return True, r, False
+    finally:
+        util.unlink(b)
+        util.unlink(c)
 
 def _formatconflictmarker(repo, ctx, template, label, pad):
     """Applies the given template to the ctx, prefixed by the label.
@@ -603,12 +607,9 @@ 
         util.copyfile(a, back)
     return back
 
-def _maketempfiles(repo, fcd, fco, fca):
+def _maketempfiles(repo, fco, fca):
     """Writes out `fco` and `fca` as temporary files, so an external merge
     tool may use them.
-
-    `fcd` is returned as-is, by convention, because it currently doubles as both
-    the local version and merge destination.
     """
     def temp(prefix, ctx):
         fullbase, ext = os.path.splitext(ctx.path())
@@ -620,11 +621,10 @@ 
         f.close()
         return name
 
-    a = repo.wjoin(fcd.path())
     b = temp("base", fca)
     c = temp("other", fco)
 
-    return a, b, c
+    return b, c
 
 def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None):
     """perform a 3-way merge in the working directory
@@ -687,7 +687,7 @@ 
         return True, 1, False
 
     back = _makebackup(repo, ui, fcd, premerge)
-    files = _maketempfiles(repo, fcd, fco, fca) + (back,)
+    files = (None, None, None, back)
     r = 1
     try:
         markerstyle = ui.config('ui', 'mergemarkers')
@@ -715,8 +715,6 @@ 
     finally:
         if not r and back is not None:
             util.unlink(back)
-        util.unlink(files[1])
-        util.unlink(files[2])
 
 def _check(repo, r, ui, tool, fcd, files):
     fd = fcd.path()