Show More
@@ -350,7 +350,7 b' def _runperfilediff(' | |||
|
350 | 350 | proc.wait() |
|
351 | 351 | |
|
352 | 352 | |
|
353 |
def diffpatch(ui, repo, node1a, node2, tmproot, matcher, cmdline |
|
|
353 | def diffpatch(ui, repo, node1a, node2, tmproot, matcher, cmdline): | |
|
354 | 354 | template = b'hg-%h.patch' |
|
355 | 355 | with formatter.nullformatter(ui, b'extdiff', {}) as fm: |
|
356 | 356 | cmdutil.export( |
@@ -369,12 +369,13 b' def diffpatch(ui, repo, node1a, node2, t' | |||
|
369 | 369 | cmdline = formatcmdline( |
|
370 | 370 | cmdline, |
|
371 | 371 | repo.root, |
|
372 | do3way=do3way, | |
|
373 | 372 | parent1=dir1a, |
|
374 | 373 | plabel1=label1a, |
|
375 | 374 | parent2=dir1b, |
|
376 | 375 | plabel2=label1b, |
|
377 | 376 | child=dir2, |
|
377 | # no 3way while comparing patches | |
|
378 | do3way=False, | |
|
378 | 379 | clabel=label2, |
|
379 | 380 | ) |
|
380 | 381 | ui.debug(b'running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot)) |
@@ -567,9 +568,7 b' def dodiff(ui, repo, cmdline, pats, opts' | |||
|
567 | 568 | tmproot = pycompat.mkdtemp(prefix=b'extdiff.') |
|
568 | 569 | try: |
|
569 | 570 | if opts.get(b'patch'): |
|
570 | return diffpatch( | |
|
571 | ui, repo, node1a, node2, tmproot, matcher, cmdline, do3way | |
|
572 | ) | |
|
571 | return diffpatch(ui, repo, node1a, node2, tmproot, matcher, cmdline) | |
|
573 | 572 | |
|
574 | 573 | return diffrevs( |
|
575 | 574 | ui, |
General Comments 0
You need to be logged in to leave comments.
Login now