Mercurial > kallithea

comparison rhodecode/controllers/compare.py @ 3443:3ac76dfdab8e beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compare: minor refactoring and comments
author Mads Kiilerich <madski@unity3d.com>
date Thu, 28 Feb 2013 23:23:09 +0100
parents b3680a200f75
children 75e563531350
comparison
equal deleted inserted replaced
3442:b3680a200f75 3443:3ac76dfdab8e
81 if not partial: 81 if not partial:
82 redirect(h.url('summary_home', repo_name=repo.repo_name)) 82 redirect(h.url('summary_home', repo_name=repo.repo_name))
83 raise HTTPBadRequest() 83 raise HTTPBadRequest()
84 84
85 def index(self, org_ref_type, org_ref, other_ref_type, other_ref): 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 org_repo = c.rhodecode_db_repo.repo_name 87 org_repo = c.rhodecode_db_repo.repo_name
88 org_ref = (org_ref_type, org_ref) 88 org_ref = (org_ref_type, org_ref)
89 # other_ref will be evaluated in other_repo
89 other_ref = (other_ref_type, other_ref) 90 other_ref = (other_ref_type, other_ref)
90 other_repo = request.GET.get('other_repo', org_repo) 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 rev_start = request.GET.get('rev_start') 95 rev_start = request.GET.get('rev_start')
93 rev_end = request.GET.get('rev_end') 96 rev_end = request.GET.get('rev_end')
94 # partial uses compare_cs.html template directly 97 # partial uses compare_cs.html template directly
95 partial = request.environ.get('HTTP_X_PARTIAL_XHR') 98 partial = request.environ.get('HTTP_X_PARTIAL_XHR')
96 # as_form puts hidden input field with changeset revisions 99 # as_form puts hidden input field with changeset revisions
161 log.debug('Using ancestor %s as org_ref instead of %s' 164 log.debug('Using ancestor %s as org_ref instead of %s'
162 % (ancestor, org_ref)) 165 % (ancestor, org_ref))
163 org_ref = ('rev', ancestor) 166 org_ref = ('rev', ancestor)
164 org_repo = other_repo 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 _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref) 171 _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref)
169 172
170 diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff', 173 diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff',
171 diff_limit=diff_limit) 174 diff_limit=diff_limit)