kallithea Changeset - 4f31439c90d3

Changeset - 4f31439c90d3

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 12 years ago 2013-06-12 01:36:35
madski@unity3d.com

Grafted from: 8559313aef0a

pull requests: use org_ref with correct symbolic name instead of fake one

So far this is only cosmetic, but it might make a difference for further
processing of a PR.

1 file changed with 2 insertions and 2 deletions:

rhodecode/controllers/pullrequests.py

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -305,51 +305,51 @@ class PullrequestsController(BaseRepoCon @@
         return render('/pullrequests/pullrequest.html')
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def create(self, repo_name):
         repo = RepoModel()._get_repo(repo_name)
         try:
             _form = PullRequestForm(repo.repo_id)().to_python(request.POST)
         except formencode.Invalid, errors:
             log.error(traceback.format_exc())
             if errors.error_dict.get('revisions'):
                 msg = 'Revisions: %s' % errors.error_dict['revisions']
             elif errors.error_dict.get('pullrequest_title'):
                 msg = _('Pull request requires a title with min. 3 chars')
             else:
                 msg = _('Error creating pull request')
             h.flash(msg, 'error')
             return redirect(url('pullrequest_home', repo_name=repo_name))
         org_repo = _form['org_repo']
-        org_ref = 'rev:merge:%s' % _form['merge_rev']
+        org_ref = _form['org_ref'] # will end with merge_rev but have symbolic name
         other_repo = _form['other_repo']
         other_ref = 'rev:ancestor:%s' % _form['ancestor_rev']
+        other_ref = 'rev:ancestor:%s' % _form['ancestor_rev'] # could be calculated from other_ref ...
         revisions = [x for x in reversed(_form['revisions'])]
         reviewers = _form['review_members']
         title = _form['pullrequest_title']
         description = _form['pullrequest_desc']
         try:
             pull_request = PullRequestModel().create(
                 self.rhodecode_user.user_id, org_repo, org_ref, other_repo,
                 other_ref, revisions, reviewers, title, description
+            )
             Session().commit()
             h.flash(_('Successfully opened new pull request'),
                     category='success')
         except Exception:
             h.flash(_('Error occurred during sending pull request'),
                     category='error')
             log.error(traceback.format_exc())
             return redirect(url('pullrequest_home', repo_name=repo_name))
         return redirect(url('pullrequest_show', repo_name=other_repo,
                             pull_request_id=pull_request.pull_request_id))
     @LoginRequired()
     @NotAnonymous()

0 comments (0 inline, 0 general)