Mercurial > kallithea

comparison rhodecode/controllers/compare.py @ 3192:b9105d31e582 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring: drop unused 'discovery data' in pull request and compare diffs
author Mads Kiilerich <madski@unity3d.com>
date Wed, 02 Jan 2013 13:56:22 +0100
parents db4ca2212ec0
children 70309536c143
comparison
equal deleted inserted replaced
3191:875b417b4155 3192:b9105d31e582
125 if rev_start and rev_end: 125 if rev_start and rev_end:
126 #replace our org_ref with given CS 126 #replace our org_ref with given CS
127 org_ref = ('rev', rev_start) 127 org_ref = ('rev', rev_start)
128 other_ref = ('rev', rev_end) 128 other_ref = ('rev', rev_end)
129 129
130 c.cs_ranges, discovery_data = PullRequestModel().get_compare_data( 130 c.cs_ranges = PullRequestModel().get_compare_data(
131 org_repo, org_ref, other_repo, other_ref, 131 org_repo, org_ref, other_repo, other_ref,
132 ) 132 )
133 133
134 c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in 134 c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in
135 c.cs_ranges]) 135 c.cs_ranges])
154 other_repo = org_repo 154 other_repo = org_repo
155 155
156 diff_limit = self.cut_off_limit if not fulldiff else None 156 diff_limit = self.cut_off_limit if not fulldiff else None
157 157
158 _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref, 158 _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref,
159 discovery_data,
160 remote_compare=incoming_changesets) 159 remote_compare=incoming_changesets)
161 160
162 diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff', 161 diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff',
163 diff_limit=diff_limit) 162 diff_limit=diff_limit)
164 _parsed = diff_processor.prepare() 163 _parsed = diff_processor.prepare()