kallithea Changeset - 60dfc369df1d

Changeset - 60dfc369df1d

Parent rev.

Child rev.

[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:

rhodecode/lib/diffs.py

0 comments (0 inline, 0 general)

rhodecode/lib/diffs.py

➞

Show inline comments

@@ @@ -614,11 +614,14 @@ def differ(org_repo, org_ref, other_repo @@
             # replace chunked _stream with data that can do tell() and seek()
             unbundle._stream = buf
             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,
                                   opts=opts))

0 comments (0 inline, 0 general)