Changeset - 60dfc369df1d
[Not reviewed]
codereview
0 1 0
Marcin Kuzminski - 13 years ago 2012-06-09 18:10:59
marcin@python-works.com
Improved cross-repo diff using bundlerepo
1 file changed with 4 insertions and 1 deletions:
0 comments (0 inline, 0 general)
rhodecode/lib/diffs.py
Show inline comments
 
@@ -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,
0 comments (0 inline, 0 general)