##// END OF EJS Templates
compare: minor refactoring and comments
Mads Kiilerich -
r3443:3ac76dfd beta
parent child Browse files
Show More
@@ -83,12 +83,15 b' class CompareController(BaseRepoControll'
83 83 raise HTTPBadRequest()
84 84
85 85 def index(self, org_ref_type, org_ref, other_ref_type, other_ref):
86
86 # org_ref will be evaluated in org_repo
87 87 org_repo = c.rhodecode_db_repo.repo_name
88 88 org_ref = (org_ref_type, org_ref)
89 # other_ref will be evaluated in other_repo
89 90 other_ref = (other_ref_type, other_ref)
90 91 other_repo = request.GET.get('other_repo', org_repo)
91 c.fulldiff = fulldiff = request.GET.get('fulldiff')
92 # fulldiff disables cut_off_limit
93 c.fulldiff = request.GET.get('fulldiff')
94 # only consider this range of changesets
92 95 rev_start = request.GET.get('rev_start')
93 96 rev_end = request.GET.get('rev_end')
94 97 # partial uses compare_cs.html template directly
@@ -163,7 +166,7 b' class CompareController(BaseRepoControll'
163 166 org_ref = ('rev', ancestor)
164 167 org_repo = other_repo
165 168
166 diff_limit = self.cut_off_limit if not fulldiff else None
169 diff_limit = self.cut_off_limit if not c.fulldiff else None
167 170
168 171 _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref)
169 172
@@ -249,11 +249,7 b' class PullRequestModel(BaseModel):'
249 249 if len(other_ref) != 2 or not isinstance(org_ref, (list, tuple)):
250 250 raise Exception('other_ref must be a two element list/tuple')
251 251
252 org_repo_scm = org_repo.scm_instance
253 other_repo_scm = other_repo.scm_instance
254
255 alias = org_repo.scm_instance.alias
256 cs_ranges, ancestor = self._get_changesets(alias,
257 org_repo_scm, org_ref,
258 other_repo_scm, other_ref)
252 cs_ranges, ancestor = self._get_changesets(org_repo.scm_instance.alias,
253 org_repo.scm_instance, org_ref,
254 other_repo.scm_instance, other_ref)
259 255 return cs_ranges, ancestor
General Comments 0
You need to be logged in to leave comments. Login now