Show More
@@ -573,7 +573,8 b' def differ(org_repo, org_ref, other_repo' | |||
|
573 | 573 | :type other_ref: |
|
574 | 574 | """ |
|
575 | 575 | |
|
576 |
bundlerepo = |
|
|
576 | bundlerepo = None | |
|
577 | ignore_whitespace = False | |
|
577 | 578 | context = 3 |
|
578 | 579 | org_repo = org_repo.scm_instance._repo |
|
579 | 580 | other_repo = other_repo.scm_instance._repo |
@@ -598,18 +599,20 b' def differ(org_repo, org_ref, other_repo' | |||
|
598 | 599 | |
|
599 | 600 | buf = io.BytesIO() |
|
600 | 601 | while True: |
|
601 | chunk = unbundle._stream.read(1024*4) | |
|
602 | chunk = unbundle._stream.read(1024 * 4) | |
|
602 | 603 | if not chunk: |
|
603 | 604 | break |
|
604 | 605 | buf.write(chunk) |
|
605 | 606 | |
|
606 | 607 | buf.seek(0) |
|
608 | # replace chunked _stream with data that can do tell() and seek() | |
|
607 | 609 | unbundle._stream = buf |
|
608 | 610 | |
|
609 | 611 | ui = make_ui('db') |
|
610 | 612 | bundlerepo = InMemoryBundleRepo(ui, path=org_repo.root, |
|
611 | 613 | bundlestream=unbundle) |
|
612 |
return ''.join(patch.diff(bundlerepo or org_repo, node2=other_ref, |
|
|
614 | return ''.join(patch.diff(bundlerepo or org_repo, node2=other_ref, | |
|
615 | opts=opts)) | |
|
613 | 616 | else: |
|
614 | 617 | return ''.join(patch.diff(org_repo, node1=org_ref, node2=other_ref, |
|
615 | 618 | opts=opts)) |
General Comments 0
You need to be logged in to leave comments.
Login now