Mercurial > kallithea
changeset 3739:41b0e2b92283 beta
pullrequests: fix reversed diff
b2575bdb847c missed the 'we swap org/other ref' part.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 11 Apr 2013 15:07:42 +0200 |
parents | 752a57988a48 |
children | ea2c948a49b8 |
files | rhodecode/controllers/pullrequests.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/pullrequests.py Thu Apr 11 03:36:39 2013 +0200 +++ b/rhodecode/controllers/pullrequests.py Thu Apr 11 15:07:42 2013 +0200 @@ -332,11 +332,11 @@ diff_limit = self.cut_off_limit if not fulldiff else None - #we swap org/other ref since we run a simple diff on one repo + # we swap org/other ref since we run a simple diff on one repo log.debug('running diff between %s@%s and %s@%s' % (org_repo.scm_instance.path, org_ref, other_repo.scm_instance.path, other_ref)) - _diff = org_repo.scm_instance.get_diff(rev1=safe_str(org_ref[1]), rev2=safe_str(other_ref[1])) + _diff = org_repo.scm_instance.get_diff(rev1=safe_str(other_ref[1]), rev2=safe_str(org_ref[1])) diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff', diff_limit=diff_limit)