This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8971

extdiff: move single file handling inside `not per-file` conditional
ClosedPublic

Authored by pulkit on Aug 29 2020, 10:18 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG451e13cc6d85: extdiff: move single file handling inside `not per-file` conditional
Summary

If --per-file is passed, we will diffing files one by one, hence there is no
need to make this optimization around single file in that case. This
optimization is only required when --per-file is not passed and we will be
opening directory-diff for a single file.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Aug 29 2020, 10:18 AM
pulkit added a commit: rHG451e13cc6d85: extdiff: move single file handling inside `not per-file` conditional.Sep 2 2020, 6:12 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG451e13cc6d85: extdiff: move single file handling inside `not per-file` conditional (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (32 lines)

Diff 22507

hgext/extdiff.py

# This lets the diff tool open the changed file directly # This lets the diff tool open the changed file directly
dir2 = b'' dir2 = b''
dir2root = repo.root dir2root = repo.root
label1a = rev1a label1a = rev1a
label1b = rev1b label1b = rev1b
label2 = rev2 label2 = rev2
if not opts.get(b'per_file'):
# If only one change, diff the files instead of the directories # If only one change, diff the files instead of the directories
# Handle bogus modifies correctly by checking if the files exist # Handle bogus modifies correctly by checking if the files exist
if len(common) == 1: if len(common) == 1:
common_file = util.localpath(common.pop()) common_file = util.localpath(common.pop())
dir1a = os.path.join(tmproot, dir1a, common_file) dir1a = os.path.join(tmproot, dir1a, common_file)
label1a = common_file + rev1a label1a = common_file + rev1a
if not os.path.isfile(dir1a): if not os.path.isfile(dir1a):
dir1a = pycompat.osdevnull dir1a = pycompat.osdevnull
if do3way: if do3way:
dir1b = os.path.join(tmproot, dir1b, common_file) dir1b = os.path.join(tmproot, dir1b, common_file)
label1b = common_file + rev1b label1b = common_file + rev1b
if not os.path.isfile(dir1b): if not os.path.isfile(dir1b):
dir1b = pycompat.osdevnull dir1b = pycompat.osdevnull
dir2 = os.path.join(dir2root, dir2, common_file) dir2 = os.path.join(dir2root, dir2, common_file)
label2 = common_file + rev2 label2 = common_file + rev2
if not opts.get(b'per_file'):
# Run the external tool on the 2 temp directories or the patches # Run the external tool on the 2 temp directories or the patches
cmdline = formatcmdline( cmdline = formatcmdline(
cmdline, cmdline,
repo.root, repo.root,
do3way=do3way, do3way=do3way,
parent1=dir1a, parent1=dir1a,
plabel1=label1a, plabel1=label1a,
parent2=dir1b, parent2=dir1b,