Mercurial > kallithea

diff rhodecode/lib/diffs.py @ 2431:60dfc369df1d codereview

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improved cross-repo diff using bundlerepo
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 09 Jun 2012 18:10:59 +0200
parents 91fae60bf2b6
children 8eab81115660
line wrap: on
line diff
--- a/rhodecode/lib/diffs.py	Sat Jun 09 15:30:22 2012 +0200
+++ b/rhodecode/lib/diffs.py	Sat Jun 09 18:10:59 2012 +0200
@@ -617,7 +617,10 @@
             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,