Mercurial > kallithea
changeset 3812:4324d6899e55 beta
diff: cleanup of variables and logging in compare and pullrequests
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 11 Apr 2013 15:42:44 +0200 |
parents | 3591b33e0c94 |
children | dca89d578c70 |
files | rhodecode/controllers/compare.py rhodecode/controllers/pullrequests.py |
diffstat | 2 files changed, 13 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/compare.py Mon Apr 08 21:59:09 2013 +0200 +++ b/rhodecode/controllers/compare.py Thu Apr 11 15:42:44 2013 +0200 @@ -240,13 +240,11 @@ diff_limit = self.cut_off_limit if not c.fulldiff else None - 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])) + log.debug('running diff between %s and %s in %s' + % (org_ref, other_ref, org_repo.scm_instance.path)) + txtdiff = org_repo.scm_instance.get_diff(rev1=safe_str(org_ref[1]), rev2=safe_str(other_ref[1])) - diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff', + diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff', diff_limit=diff_limit) _parsed = diff_processor.prepare() @@ -265,7 +263,7 @@ c.lines_deleted += st[1] fid = h.FID('', f['filename']) c.files.append([fid, f['operation'], f['filename'], f['stats']]) - diff = diff_processor.as_html(enable_comments=False, parsed_lines=[f]) - c.changes[fid] = [f['operation'], f['filename'], diff] + htmldiff = diff_processor.as_html(enable_comments=False, parsed_lines=[f]) + c.changes[fid] = [f['operation'], f['filename'], htmldiff] return render('compare/compare_diff.html')
--- a/rhodecode/controllers/pullrequests.py Mon Apr 08 21:59:09 2013 +0200 +++ b/rhodecode/controllers/pullrequests.py Thu Apr 11 15:42:44 2013 +0200 @@ -186,12 +186,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 - 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(other_ref[1]), rev2=safe_str(org_ref[1])) + log.debug('running diff between %s and %s in %s' + % (other_ref, org_ref, org_repo.scm_instance.path)) + txtdiff = 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_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff', diff_limit=diff_limit) _parsed = diff_processor.prepare() @@ -210,9 +209,9 @@ c.lines_deleted += st[1] fid = h.FID('', f['filename']) c.files.append([fid, f['operation'], f['filename'], f['stats']]) - diff = diff_processor.as_html(enable_comments=enable_comments, - parsed_lines=[f]) - c.changes[fid] = [f['operation'], f['filename'], diff] + htmldiff = diff_processor.as_html(enable_comments=enable_comments, + parsed_lines=[f]) + c.changes[fid] = [f['operation'], f['filename'], htmldiff] @LoginRequired() @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',