This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8969

extdiff: pass full paths of `dir1a` and `dir1b` to `_runperfilediff()`
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe7c5735433ac: extdiff: pass full paths of `dir1a` and `dir1b` to `_runperfilediff()`
Summary

Earlier we were passing basename instead of the fullpath and then joining with
the tmproot. This is wrong because the user can choose rev1a as wdir and in
those cases, tmproot should not be joined with the path.

I am working on refactoring extdiff logic so that we can have options like `diff
--tool` and encountered this. Although this patch in itself makes no difference,
however in future when a new caller of _runperfilediff() will be added, it
will be useful to directly pass on the full paths instead.

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

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (8 lines)

Diff 22505

hgext/extdiff.py

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(tmproot, 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(tmproot, 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(dir2root, dir2, commonfile)
label2 = commonfile + rev2 label2 = commonfile + rev2
if confirm: if confirm:
cmdline, cmdline,
repo.root, repo.root,
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=dir1a, dir1a=os.path.join(tmproot, dir1a),
dir1b=dir1b, dir1b=os.path.join(tmproot, dir1b) if do3way else None,
dir2root=dir2root, dir2root=dir2root,
dir2=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: