This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8970

extdiff: remove dir2root and pass full path as dir2 in _runperfilediff()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1bed1b00b18d: extdiff: remove dir2root and pass full path as dir2 in _runperfilediff()
Summary

The only use of dir2root was to join with dir2 to generate the path for
other side of diff. Like in previous patch, dir1a and dir1b are full paths
and no longer base names, hence we pass dir2 as full path too and making
dir2root unrequired.

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:12 AM
pulkit added a commit: rHG1bed1b00b18d: extdiff: remove dir2root and pass full path as dir2 in _runperfilediff().Sep 2 2020, 6:12 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1bed1b00b18d: extdiff: remove dir2root and pass full path as dir2 in _runperfilediff() (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (6 lines)

Diff 22506

hgext/extdiff.py

ui, ui,
guitool, guitool,
do3way, do3way,
confirm, confirm,
commonfiles, commonfiles,
tmproot, tmproot,
dir1a, dir1a,
dir1b, dir1b,
dir2root,
dir2, dir2,
rev1a, rev1a,
rev1b, rev1b,
rev2, rev2,
): ):
# Note that we need to sort the list of files because it was # Note that we need to sort the list of files because it was
# built in an "unstable" way and it's annoying to get files in a # built in an "unstable" way and it's annoying to get files in a
# random order, especially when "confirm" mode is enabled. # random order, especially when "confirm" mode is enabled.
waitprocs = [] waitprocs = []
totalfiles = len(commonfiles) totalfiles = len(commonfiles)
for idx, commonfile in enumerate(sorted(commonfiles)): for idx, commonfile in enumerate(sorted(commonfiles)):
path1a = os.path.join(dir1a, commonfile) path1a = os.path.join(dir1a, commonfile)
label1a = commonfile + rev1a label1a = commonfile + rev1a
if not os.path.isfile(path1a): if not os.path.isfile(path1a):
path1a = pycompat.osdevnull path1a = pycompat.osdevnull
path1b = b'' path1b = b''
label1b = b'' label1b = b''
if do3way: if do3way:
path1b = os.path.join(dir1b, commonfile) path1b = os.path.join(dir1b, commonfile)
label1b = commonfile + rev1b label1b = commonfile + rev1b
if not os.path.isfile(path1b): if not os.path.isfile(path1b):
path1b = pycompat.osdevnull path1b = pycompat.osdevnull
path2 = os.path.join(dir2root, dir2, commonfile) path2 = os.path.join(dir2, commonfile)
label2 = commonfile + rev2 label2 = commonfile + rev2
if confirm: if confirm:
# Prompt before showing this diff # Prompt before showing this diff
difffiles = _(b'diff %s (%d of %d)') % ( difffiles = _(b'diff %s (%d of %d)') % (
commonfile, commonfile,
idx + 1, idx + 1,
totalfiles, totalfiles,
ui, ui,
guitool=guitool, guitool=guitool,
do3way=do3way, do3way=do3way,
confirm=opts.get(b'confirm'), confirm=opts.get(b'confirm'),
commonfiles=common, commonfiles=common,
tmproot=tmproot, tmproot=tmproot,
dir1a=os.path.join(tmproot, dir1a), dir1a=os.path.join(tmproot, dir1a),
dir1b=os.path.join(tmproot, dir1b) if do3way else None, dir1b=os.path.join(tmproot, dir1b) if do3way else None,
dir2root=dir2root, dir2=os.path.join(dir2root, dir2),
dir2=dir2,
rev1a=rev1a, rev1a=rev1a,
rev1b=rev1b, rev1b=rev1b,
rev2=rev2, rev2=rev2,
) )
for copy_fn, working_fn, st in fnsandstat: for copy_fn, working_fn, st in fnsandstat:
cpstat = os.lstat(copy_fn) cpstat = os.lstat(copy_fn)
# Some tools copy the file and attributes, so mtime may not detect # Some tools copy the file and attributes, so mtime may not detect