kallithea Changeset - f8c55b487c9a

Changeset - f8c55b487c9a

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Mads Kiilerich - 13 years ago 2013-02-04 22:32:16
madski@unity3d.com

pull request: select 'tip' by default ... and show what it means right now

2 files changed with 19 insertions and 28 deletions:

rhodecode/controllers/pullrequests.py

rhodecode/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -72,32 +72,27 @@ class PullrequestsController(BaseRepoCon @@
         branches_group = ([('branch:%s:%s' % (k, v), k) for
                          k, v in repo.branches.iteritems()], _("Branches"))
         bookmarks_group = ([('book:%s:%s' % (k, v), k) for
                          k, v in repo.bookmarks.iteritems()], _("Bookmarks"))
         tags_group = ([('tag:%s:%s' % (k, v), k) for
                          k, v in repo.tags.iteritems()], _("Tags"))
                          k, v in repo.tags.iteritems()
                          if k != 'tip'], _("Tags"))
         tip = repo.tags['tip']
         tipref = 'tag:tip:%s' % tip
         colontip = ':' + tip
         tips = [x[1] for x in branches_group[0] + bookmarks_group[0] + tags_group[0]
                 if x[0].endswith(colontip)]
         tags_group[0].append((tipref, 'tip (%s)' % ', '.join(tips)))
         hist_l.append(bookmarks_group)
         hist_l.append(branches_group)
         hist_l.append(tags_group)
         return hist_l
     def _get_default_rev(self, repo):
         """
         Get's default revision to do compare on pull request
         :param repo:
         """
         repo = repo.scm_instance
         if 'default' in repo.branches:
             return 'default'
         else:
             #if repo doesn't have default branch return first found
             return repo.branches.keys()[0]
         return hist_l, tipref
     def _get_is_allowed_change_status(self, pull_request):
         owner = self.rhodecode_user.user_id == pull_request.user_id
         reviewer = self.rhodecode_user.user_id in [x.user_id for x in
                                                    pull_request.reviewers]
         return (self.rhodecode_user.admin or owner or reviewer)
@@ @@ -125,54 +120,50 @@ class PullrequestsController(BaseRepoCon @@
         other_repos_info = {}
         c.org_repos = []
         c.org_repos.append((org_repo.repo_name, '%s/%s' % (
                                 org_repo.user.username, org_repo.repo_name))
+                           )
         c.org_refs = self._get_repo_refs(org_repo.scm_instance)
         c.default_org_repo = org_repo.repo_name
         c.org_refs, c.default_org_ref = self._get_repo_refs(org_repo.scm_instance)
         c.other_repos = []
         # add org repo to other so we can open pull request against itself
         c.other_repos.extend(c.org_repos)
         c.default_other_repo = org_repo.repo_name
         c.default_other_refs = self._get_repo_refs(org_repo.scm_instance)
         c.default_other_ref = self._get_default_rev(org_repo)
         c.default_other_refs, c.default_other_ref = self._get_repo_refs(org_repo.scm_instance)
         other_repos_info[org_repo.repo_name] = {
             'gravatar': h.gravatar_url(org_repo.user.email, 24),
             'description': org_repo.description,
-            'revs': h.select('other_ref', '', c.default_other_refs, class_='refs')
+            'revs': h.select('other_ref', c.default_other_ref, c.default_other_refs, class_='refs')
+        }
         # gather forks and add to this list ... even though it is rare to request forks to pull their parent
         for fork in org_repo.forks:
             c.other_repos.append((fork.repo_name, '%s/%s' % (
                                     fork.user.username, fork.repo_name))
+                                 )
             refs, default_ref = self._get_repo_refs(fork.scm_instance)
             other_repos_info[fork.repo_name] = {
                 'gravatar': h.gravatar_url(fork.user.email, 24),
                 'description': fork.description,
                 'revs': h.select('other_ref', '',
                                  self._get_repo_refs(fork.scm_instance),
                                  class_='refs')
                 'revs': h.select('other_ref', default_ref, refs, class_='refs')
+            }
         # add parents of this fork also, but only if it's not empty
         if org_repo.parent and org_repo.parent.scm_instance.revisions:
             c.default_other_repo = org_repo.parent.repo_name
             c.default_other_refs = self._get_repo_refs(org_repo.parent.scm_instance)
             c.default_other_ref = self._get_default_rev(org_repo.parent)
             c.default_other_refs, c.default_other_ref = self._get_repo_refs(org_repo.parent.scm_instance)
             c.other_repos.append((org_repo.parent.repo_name, '%s/%s' % (
                                         org_repo.parent.user.username,
                                         org_repo.parent.repo_name))
+                                     )
             other_repos_info[org_repo.parent.repo_name] = {
                 'gravatar': h.gravatar_url(org_repo.parent.user.email, 24),
                 'description': org_repo.parent.description,
                 'revs': h.select('other_ref', '',
                                  self._get_repo_refs(org_repo.parent.scm_instance),
                                  class_='refs')
                 'revs': h.select('other_ref', c.default_other_ref, c.default_other_refs, class_='refs')
+            }
         c.other_repos_info = json.dumps(other_repos_info)
         c.review_members = [org_repo.user]
         return render('/pullrequests/pullrequest.html')

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -28,13 +28,13 @@ @@
         <div style="float:left">
             <div class="fork_user">
                 <div class="gravatar">
                     <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_db_repo.user.email,24)}"/>
                 </div>
                 <span style="font-size: 20px">
-                ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref','',c.org_refs,class_='refs')}
+                ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')}
                 </span>
                  <div style="padding:5px 3px 3px 42px;">${c.rhodecode_db_repo.description}</div>
             </div>
             <div style="clear:both;padding-top: 10px"></div>
         </div>
           <div style="float:left;font-size:24px;padding:0px 20px">

0 comments (0 inline, 0 general)