kallithea Changeset - 8049bb8502bd

Changeset - 8049bb8502bd

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 9 years ago 2016-05-23 18:02:33
madski@unity3d.com

pullrequests: update internal names after 'iteration' renaming

1 file changed with 3 insertions and 4 deletions:

kallithea/controllers/pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -380,17 +380,16 @@ class PullrequestsController(BaseRepoCon @@
                     category='error')
             log.error(traceback.format_exc())
             raise HTTPFound(location=url('pullrequest_home', repo_name=repo_name))
         raise HTTPFound(location=pull_request.url())
     # TODO: rename to create_new_iteration or iterate ...
     def create_update(self, old_pull_request, updaterev, title, description, reviewers_ids):
     def create_new_iteration(self, old_pull_request, new_rev, title, description, reviewers_ids):
         org_repo = RepoModel()._get_repo(old_pull_request.org_repo.repo_name)
         org_ref_type, org_ref_name, org_rev = old_pull_request.org_ref.split(':')
-        new_org_rev = self._get_ref_rev(org_repo, 'rev', updaterev)
+        new_org_rev = self._get_ref_rev(org_repo, 'rev', new_rev)
         other_repo = RepoModel()._get_repo(old_pull_request.other_repo.repo_name)
         other_ref_type, other_ref_name, other_rev = old_pull_request.other_ref.split(':') # other_rev is ancestor
         #assert other_ref_type == 'branch', other_ref_type # TODO: what if not?
         new_other_rev = self._get_ref_rev(other_repo, other_ref_type, other_ref_name)
@@ @@ -500,13 +499,13 @@ class PullrequestsController(BaseRepoCon @@
             raise HTTPForbidden()
         _form = PullRequestPostForm()().to_python(request.POST)
         reviewers_ids = [int(s) for s in _form['review_members']]
         if _form['updaterev']:
-            return self.create_update(pull_request,
+            return self.create_new_iteration(pull_request,
                                       _form['updaterev'],
                                       _form['pullrequest_title'],
                                       _form['pullrequest_desc'],
                                       reviewers_ids)
         old_description = pull_request.description

0 comments (0 inline, 0 general)