Mercurial > kallithea

comparison rhodecode/controllers/pullrequests.py @ 3485:b19b1723ff10 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullrequest: pullrequest from changelog view It seems like it didn't work ... perhaps because I broke it. But now we clean it up and make it work: Use rev_end as the revision to merge. We don't know where to merge ... but start_rev cannot be used for that. This might to some extent have been working before ... but we prefer to clean it up and start over again when the normal merge workflow is fully working.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 01 Mar 2013 17:16:24 +0100
parents 75e563531350
children 2053053e0882
comparison
equal deleted inserted replaced
3484:75e563531350 3485:b19b1723ff10
119 except EmptyRepositoryError, e: 119 except EmptyRepositoryError, e:
120 h.flash(h.literal(_('There are no changesets yet')), 120 h.flash(h.literal(_('There are no changesets yet')),
121 category='warning') 121 category='warning')
122 redirect(url('summary_home', repo_name=org_repo.repo_name)) 122 redirect(url('summary_home', repo_name=org_repo.repo_name))
123 123
124 org_rev = request.GET.get('rev_end')
125 # rev_start is not directly useful - its parent could however be used
126 # as default for other and thus give a simple compare view
127 #other_rev = request.POST.get('rev_start')
128
124 other_repos_info = {} 129 other_repos_info = {}
125 130
126 c.org_repos = [] 131 c.org_repos = []
127 c.org_repos.append((org_repo.repo_name, org_repo.repo_name)) 132 c.org_repos.append((org_repo.repo_name, org_repo.repo_name))
128 c.default_org_repo = org_repo.repo_name 133 c.default_org_repo = org_repo.repo_name
129 c.org_refs, c.default_org_ref = self._get_repo_refs(org_repo.scm_instance) 134 c.org_refs, c.default_org_ref = self._get_repo_refs(org_repo.scm_instance, org_rev)
130 135
131 c.other_repos = [] 136 c.other_repos = []
132 # add org repo to other so we can open pull request against itself 137 # add org repo to other so we can open pull request against itself
133 c.other_repos.extend(c.org_repos) 138 c.other_repos.extend(c.org_repos)
134 c.default_other_repo = org_repo.repo_name 139 c.default_other_repo = org_repo.repo_name
194 org_ref = _form['org_ref'] 199 org_ref = _form['org_ref']
195 other_repo = _form['other_repo'] 200 other_repo = _form['other_repo']
196 other_ref = _form['other_ref'] 201 other_ref = _form['other_ref']
197 revisions = _form['revisions'] 202 revisions = _form['revisions']
198 reviewers = _form['review_members'] 203 reviewers = _form['review_members']
199
200 # if we have cherry picked pull request we don't care what is in
201 # org_ref/other_ref
202 rev_start = request.POST.get('rev_start')
203 rev_end = request.POST.get('rev_end')
204
205 if rev_start and rev_end:
206 # this is swapped to simulate that rev_end is a revision from
207 # parent of the fork
208 org_ref = 'rev:%s:%s' % (rev_end, rev_end)
209 other_ref = 'rev:%s:%s' % (rev_start, rev_start)
210 204
211 title = _form['pullrequest_title'] 205 title = _form['pullrequest_title']
212 description = _form['pullrequest_desc'] 206 description = _form['pullrequest_desc']
213 207
214 try: 208 try: