Show More
@@ -745,7 +745,7 b' def _xmerge(repo, mynode, local, other, ' | |||||
745 | args = _toolstr(repo.ui, tool, b"args") |
|
745 | args = _toolstr(repo.ui, tool, b"args") | |
746 |
|
746 | |||
747 | with _maketempfiles( |
|
747 | with _maketempfiles( | |
748 |
|
|
748 | fco, fca, repo.wvfs.join(backup.path()), b"$output" in args | |
749 | ) as temppaths: |
|
749 | ) as temppaths: | |
750 | basepath, otherpath, localoutputpath = temppaths |
|
750 | basepath, otherpath, localoutputpath = temppaths | |
751 | outpath = b"" |
|
751 | outpath = b"" | |
@@ -921,7 +921,7 b' def _makebackup(repo, ui, wctx, fcd):' | |||||
921 |
|
921 | |||
922 |
|
922 | |||
923 | @contextlib.contextmanager |
|
923 | @contextlib.contextmanager | |
924 |
def _maketempfiles( |
|
924 | def _maketempfiles(fco, fca, localpath, uselocalpath): | |
925 | """Writes out `fco` and `fca` as temporary files, and (if uselocalpath) |
|
925 | """Writes out `fco` and `fca` as temporary files, and (if uselocalpath) | |
926 | copies `localpath` to another temporary file, so an external merge tool may |
|
926 | copies `localpath` to another temporary file, so an external merge tool may | |
927 | use them. |
|
927 | use them. |
General Comments 0
You need to be logged in to leave comments.
Login now