Show More
@@ -267,7 +267,7 b' def _runperfilediff(' | |||||
267 | waitprocs = [] |
|
267 | waitprocs = [] | |
268 | totalfiles = len(commonfiles) |
|
268 | totalfiles = len(commonfiles) | |
269 | for idx, commonfile in enumerate(sorted(commonfiles)): |
|
269 | for idx, commonfile in enumerate(sorted(commonfiles)): | |
270 |
path1a = os.path.join( |
|
270 | path1a = os.path.join(dir1a, commonfile) | |
271 | label1a = commonfile + rev1a |
|
271 | label1a = commonfile + rev1a | |
272 | if not os.path.isfile(path1a): |
|
272 | if not os.path.isfile(path1a): | |
273 | path1a = pycompat.osdevnull |
|
273 | path1a = pycompat.osdevnull | |
@@ -275,7 +275,7 b' def _runperfilediff(' | |||||
275 | path1b = b'' |
|
275 | path1b = b'' | |
276 | label1b = b'' |
|
276 | label1b = b'' | |
277 | if do3way: |
|
277 | if do3way: | |
278 |
path1b = os.path.join( |
|
278 | path1b = os.path.join(dir1b, commonfile) | |
279 | label1b = commonfile + rev1b |
|
279 | label1b = commonfile + rev1b | |
280 | if not os.path.isfile(path1b): |
|
280 | if not os.path.isfile(path1b): | |
281 | path1b = pycompat.osdevnull |
|
281 | path1b = pycompat.osdevnull | |
@@ -499,8 +499,8 b' def diffrevs(' | |||||
499 | confirm=opts.get(b'confirm'), |
|
499 | confirm=opts.get(b'confirm'), | |
500 | commonfiles=common, |
|
500 | commonfiles=common, | |
501 | tmproot=tmproot, |
|
501 | tmproot=tmproot, | |
502 | dir1a=dir1a, |
|
502 | dir1a=os.path.join(tmproot, dir1a), | |
503 | dir1b=dir1b, |
|
503 | dir1b=os.path.join(tmproot, dir1b) if do3way else None, | |
504 | dir2root=dir2root, |
|
504 | dir2root=dir2root, | |
505 | dir2=dir2, |
|
505 | dir2=dir2, | |
506 | rev1a=rev1a, |
|
506 | rev1a=rev1a, |
General Comments 0
You need to be logged in to leave comments.
Login now