# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1598691746 -19800 # Node ID 1bed1b00b18d37bf59789065c72cf21b92701786 # Parent e7c5735433accb6a4e78507958e48a5c8a704ed4 extdiff: remove dir2root and pass full path as dir2 in _runperfilediff() 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. Differential Revision: https://phab.mercurial-scm.org/D8970 diff -r e7c5735433ac -r 1bed1b00b18d hgext/extdiff.py --- a/hgext/extdiff.py Sat Aug 29 14:28:34 2020 +0530 +++ b/hgext/extdiff.py Sat Aug 29 14:32:26 2020 +0530 @@ -255,7 +255,6 @@ tmproot, dir1a, dir1b, - dir2root, dir2, rev1a, rev1b, @@ -280,7 +279,7 @@ if not os.path.isfile(path1b): path1b = pycompat.osdevnull - path2 = os.path.join(dir2root, dir2, commonfile) + path2 = os.path.join(dir2, commonfile) label2 = commonfile + rev2 if confirm: @@ -501,8 +500,7 @@ tmproot=tmproot, dir1a=os.path.join(tmproot, dir1a), dir1b=os.path.join(tmproot, dir1b) if do3way else None, - dir2root=dir2root, - dir2=dir2, + dir2=os.path.join(dir2root, dir2), rev1a=rev1a, rev1b=rev1b, rev2=rev2,