Show More
@@ -255,7 +255,6 b' def _runperfilediff(' | |||||
255 | tmproot, |
|
255 | tmproot, | |
256 | dir1a, |
|
256 | dir1a, | |
257 | dir1b, |
|
257 | dir1b, | |
258 | dir2root, |
|
|||
259 | dir2, |
|
258 | dir2, | |
260 | rev1a, |
|
259 | rev1a, | |
261 | rev1b, |
|
260 | rev1b, | |
@@ -280,7 +279,7 b' def _runperfilediff(' | |||||
280 | if not os.path.isfile(path1b): |
|
279 | if not os.path.isfile(path1b): | |
281 | path1b = pycompat.osdevnull |
|
280 | path1b = pycompat.osdevnull | |
282 |
|
281 | |||
283 |
path2 = os.path.join( |
|
282 | path2 = os.path.join(dir2, commonfile) | |
284 | label2 = commonfile + rev2 |
|
283 | label2 = commonfile + rev2 | |
285 |
|
284 | |||
286 | if confirm: |
|
285 | if confirm: | |
@@ -501,8 +500,7 b' def diffrevs(' | |||||
501 | tmproot=tmproot, |
|
500 | tmproot=tmproot, | |
502 | dir1a=os.path.join(tmproot, dir1a), |
|
501 | dir1a=os.path.join(tmproot, dir1a), | |
503 | dir1b=os.path.join(tmproot, dir1b) if do3way else None, |
|
502 | dir1b=os.path.join(tmproot, dir1b) if do3way else None, | |
504 |
dir2 |
|
503 | dir2=os.path.join(dir2root, dir2), | |
505 | dir2=dir2, |
|
|||
506 | rev1a=rev1a, |
|
504 | rev1a=rev1a, | |
507 | rev1b=rev1b, |
|
505 | rev1b=rev1b, | |
508 | rev2=rev2, |
|
506 | rev2=rev2, |
General Comments 0
You need to be logged in to leave comments.
Login now