Mercurial > kallithea
changeset 3443:3ac76dfdab8e beta
compare: minor refactoring and comments
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 28 Feb 2013 23:23:09 +0100 |
| parents | b3680a200f75 |
| children | c12603d5ee13 |
| files | rhodecode/controllers/compare.py rhodecode/model/pull_request.py |
| diffstat | 2 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/compare.py Thu Feb 28 17:54:42 2013 +0100 +++ b/rhodecode/controllers/compare.py Thu Feb 28 23:23:09 2013 +0100 @@ -83,12 +83,15 @@ 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 @@ -163,7 +166,7 @@ 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)
--- a/rhodecode/model/pull_request.py Thu Feb 28 17:54:42 2013 +0100 +++ b/rhodecode/model/pull_request.py Thu Feb 28 23:23:09 2013 +0100 @@ -249,11 +249,7 @@ 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