kallithea Changeset - 9d61aad859bc

Changeset - 9d61aad859bc

Parent rev.

Child rev.

[Not reviewed]

codereview

0 1 0

Marcin Kuzminski - 13 years ago 2012-05-30 23:12:24
marcin@python-works.com

code garden

1 file changed with 5 insertions and 2 deletions:

rhodecode/lib/diffs.py

0 comments (0 inline, 0 general)

rhodecode/lib/diffs.py

➞

Show inline comments

@@ @@ -573,7 +573,8 @@ def differ(org_repo, org_ref, other_repo @@
     :type other_ref:
     """
     bundlerepo = ignore_whitespace = False
     bundlerepo = None
     ignore_whitespace = False
     context = 3
     org_repo = org_repo.scm_instance._repo
     other_repo = other_repo.scm_instance._repo
@@ @@ -604,12 +605,14 @@ def differ(org_repo, org_ref, other_repo @@
                 buf.write(chunk)
             buf.seek(0)
             # 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, opts=opts))
         return ''.join(patch.diff(bundlerepo or org_repo, node2=other_ref,
                                   opts=opts))
     else:
         return ''.join(patch.diff(org_repo, node1=org_ref, node2=other_ref,
                                   opts=opts))

0 comments (0 inline, 0 general)