Show More
@@ -617,7 +617,10 def differ(org_repo, org_ref, other_repo | |||||
617 | ui = make_ui('db') |
|
617 | ui = make_ui('db') | |
618 | bundlerepo = InMemoryBundleRepo(ui, path=org_repo.root, |
|
618 | bundlerepo = InMemoryBundleRepo(ui, path=org_repo.root, | |
619 | bundlestream=unbundle) |
|
619 | bundlestream=unbundle) | |
620 | return ''.join(patch.diff(bundlerepo or org_repo, node2=other_ref, |
|
620 | ||
|
621 | return ''.join(patch.diff(bundlerepo or org_repo, | |||
|
622 | node1=org_repo[org_ref].node(), | |||
|
623 | node2=other_repo[other_ref].node(), | |||
621 | opts=opts)) |
|
624 | opts=opts)) | |
622 | else: |
|
625 | else: | |
623 | return ''.join(patch.diff(org_repo, node1=org_ref, node2=other_ref, |
|
626 | return ''.join(patch.diff(org_repo, node1=org_ref, node2=other_ref, |
General Comments 0
You need to be logged in to leave comments.
Login now