kallithea Changeset - 3ac76dfdab8e

Changeset - 3ac76dfdab8e

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Mads Kiilerich - 13 years ago 2013-02-28 23:23:09
madski@unity3d.com

Grafted from: 6a5f7a89c648

compare: minor refactoring and comments

2 files changed with 9 insertions and 10 deletions:

rhodecode/controllers/compare.py

rhodecode/model/pull_request.py

0 comments (0 inline, 0 general)

rhodecode/controllers/compare.py

➞

Show inline comments

@@ @@ -80,18 +80,21 @@ class CompareController(BaseRepoControll @@
             h.flash(str(e), category='warning')
             if not partial:
                 redirect(h.url('summary_home', repo_name=repo.repo_name))
             raise HTTPBadRequest()
     def index(self, org_ref_type, org_ref, other_ref_type, other_ref):
+        # org_ref will be evaluated in org_repo
         org_repo = c.rhodecode_db_repo.repo_name
         org_ref = (org_ref_type, org_ref)
         # other_ref will be evaluated in other_repo
         other_ref = (other_ref_type, other_ref)
         other_repo = request.GET.get('other_repo', org_repo)
         c.fulldiff = fulldiff = request.GET.get('fulldiff')
         # fulldiff disables cut_off_limit
         c.fulldiff = request.GET.get('fulldiff')
         # only consider this range of changesets
         rev_start = request.GET.get('rev_start')
         rev_end = request.GET.get('rev_end')
         # partial uses compare_cs.html template directly
         partial = request.environ.get('HTTP_X_PARTIAL_XHR')
         # as_form puts hidden input field with changeset revisions
         c.as_form = partial and request.GET.get('as_form')
@@ @@ -160,13 +163,13 @@ class CompareController(BaseRepoControll @@
             # revision that is common ancestor
             log.debug('Using ancestor %s as org_ref instead of %s'
                       % (ancestor, org_ref))
             org_ref = ('rev', ancestor)
             org_repo = other_repo
         diff_limit = self.cut_off_limit if not fulldiff else None
+        diff_limit = self.cut_off_limit if not c.fulldiff else None
         _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref)
         diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff',
                                              diff_limit=diff_limit)
         _parsed = diff_processor.prepare()

rhodecode/model/pull_request.py

➞

Show inline comments

@@ @@ -246,14 +246,10 @@ class PullRequestModel(BaseModel): @@
         if len(org_ref) != 2 or not isinstance(org_ref, (list, tuple)):
             raise Exception('org_ref must be a two element list/tuple')
         if len(other_ref) != 2 or not isinstance(org_ref, (list, tuple)):
             raise Exception('other_ref must be a two element list/tuple')
         org_repo_scm = org_repo.scm_instance
         other_repo_scm = other_repo.scm_instance
         alias = org_repo.scm_instance.alias
         cs_ranges, ancestor = self._get_changesets(alias,
                                                    org_repo_scm, org_ref,
                                                    other_repo_scm, other_ref)
         cs_ranges, ancestor = self._get_changesets(org_repo.scm_instance.alias,
                                                    org_repo.scm_instance, org_ref,
                                                    other_repo.scm_instance, other_ref)
         return cs_ranges, ancestor

0 comments (0 inline, 0 general)