Mercurial > public > mercurial-scm > hg
comparison mercurial/filemerge.py @ 48783:218154867575
filemerge: remove an unnecessary join with absolute path
The `backup` path is now always absolute, so we don't need to join it
with the working copy path.
Differential Revision: https://phab.mercurial-scm.org/D12188
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 11 Feb 2022 22:39:53 -0800 |
| parents | c7dbfc363655 |
| children | 9d0d0a388c39 |
comparison
equal
deleted
inserted
replaced
| 48782:c7dbfc363655 | 48783:218154867575 |
|---|---|
| 743 return False, 1, None | 743 return False, 1, None |
| 744 localpath = _workingpath(repo, fcd) | 744 localpath = _workingpath(repo, fcd) |
| 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 fco, fca, repo.wvfs.join(backup.path()), b"$output" in args | 748 fco, fca, 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"" |
| 752 | 752 |
| 753 def format_label(input): | 753 def format_label(input): |