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