martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY The place where the `.orig` extension is removed in `_maketempfiles()` doesn't make it clear that it's the backup path, which is why we have a comment in the code explaining it. Let's instead move it out of the function and close to where we get it from `backup.path()`, so that becomes clear. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12190 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -746,6 +746,9 @@ localoutputpath = None if b"$output" in args: localoutputpath = backup.path() + # Remove the .orig to make syntax-highlighting more likely. + if localoutputpath.endswith(b'.orig'): + localoutputpath, ext = os.path.splitext(localoutputpath) with _maketempfiles( fco, @@ -940,10 +943,6 @@ c = tempfromcontext(b"other", fco) d = localpath if localpath is not None: - # We start off with this being the backup filename, so remove the .orig - # to make syntax-highlighting more likely. - if d.endswith(b'.orig'): - d, _ = os.path.splitext(d) f, d = maketempfrompath(b"local", d) with open(localpath, b'rb') as src: f.write(src.read()) To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
