# HG changeset patch # User Marcin Kuzminski # Date 2012-06-09 16:10:59 # Node ID 60dfc369df1d1c755e47ddaff05e13a5b077abf3 # Parent 9f37281195a20985b5d0a23ef30e8633b3e2918b Improved cross-repo diff using bundlerepo diff --git a/rhodecode/lib/diffs.py b/rhodecode/lib/diffs.py --- a/rhodecode/lib/diffs.py +++ b/rhodecode/lib/diffs.py @@ -617,7 +617,10 @@ def differ(org_repo, org_ref, other_repo ui = make_ui('db') bundlerepo = InMemoryBundleRepo(ui, path=org_repo.root, bundlestream=unbundle) - return ''.join(patch.diff(bundlerepo or org_repo, node2=other_ref, + + return ''.join(patch.diff(bundlerepo or org_repo, + node1=org_repo[org_ref].node(), + node2=other_repo[other_ref].node(), opts=opts)) else: return ''.join(patch.diff(org_repo, node1=org_ref, node2=other_ref,