kallithea Changeset - 4324d6899e55

Changeset - 4324d6899e55

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Mads Kiilerich - 13 years ago 2013-04-11 15:42:44
madski@unity3d.com

diff: cleanup of variables and logging in compare and pullrequests

2 files changed with 13 insertions and 16 deletions:

rhodecode/controllers/compare.py

rhodecode/controllers/pullrequests.py

0 comments (0 inline, 0 general)

rhodecode/controllers/compare.py

➞

Show inline comments

@@ @@ -237,19 +237,17 @@ class CompareController(BaseRepoControll @@
                       % (c.ancestor, org_ref))
             org_ref = ('rev', c.ancestor)
             org_repo = other_repo
         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()
         c.limited_diff = False
         if isinstance(_parsed, LimitedDiffContainer):
             c.limited_diff = True
@@ @@ -262,10 +260,10 @@ class CompareController(BaseRepoControll @@
             st = f['stats']
             if st[0] != 'b':
                 c.lines_added += st[0]
                 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')

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -183,18 +183,17 @@ class PullrequestsController(BaseRepoCon @@
         c.other_ref = other_ref[1]
         c.other_ref_type = other_ref[0]
         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()
         c.limited_diff = False
         if isinstance(_parsed, LimitedDiffContainer):
             c.limited_diff = True
@@ @@ -207,15 +206,15 @@ class PullrequestsController(BaseRepoCon @@
             st = f['stats']
             if st[0] != 'b':
                 c.lines_added += st[0]
                 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',
                                    'repository.admin')
     def show_all(self, repo_name):
         c.pull_requests = PullRequestModel().get_all(repo_name)

0 comments (0 inline, 0 general)