kallithea Changeset - c12603d5ee13

Changeset - c12603d5ee13

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Mads Kiilerich - 13 years ago 2013-02-28 23:23:09
madski@unity3d.com

Grafted from: 75a83cce2e08

pullrequests: refactor changeset selectors, tip is special and not a real tag

1 file changed with 21 insertions and 17 deletions:

rhodecode/controllers/pullrequests.py

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -46,71 +46,75 @@ from rhodecode.lib.vcs.backends.base imp @@
 from rhodecode.lib.diffs import LimitedDiffContainer
 from rhodecode.model.db import User, PullRequest, ChangesetStatus,\
     ChangesetComment
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.comment import ChangesetCommentsModel
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.forms import PullRequestForm
 log = logging.getLogger(__name__)
 class PullrequestsController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(PullrequestsController, self).__before__()
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
     def _get_repo_refs(self, repo):
         hist_l = []
         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()
                          if k != 'tip'], _("Tags"))
     def _get_repo_refs(self, repo, rev=None):
         """return a structure with repo's interesting changesets, suitable for
         the selectors in pullrequest.html"""
         branches = [('branch:%s:%s' % (k, v), k)
                     for k, v in repo.branches.iteritems()]
         bookmarks = [('book:%s:%s' % (k, v), k)
                      for k, v in repo.bookmarks.iteritems()]
         tags = [('tag:%s:%s' % (k, v), k)
                 for k, v in repo.tags.iteritems()
                 if k != 'tip']
         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]
+        tips = [x[1] for x in branches + bookmarks + tags
                 if x[0].endswith(colontip)]
         tags_group[0].append((tipref, 'tip (%s)' % ', '.join(tips)))
         selected = 'tag:tip:%s' % tip
         special = [(selected, 'tip (%s)' % ', '.join(tips))]
         hist_l.append(bookmarks_group)
         hist_l.append(branches_group)
         hist_l.append(tags_group)
         if rev:
             selected = 'rev:%s:%s' % (rev, rev)
             special.append((selected, rev))
         return hist_l, tipref
         return [(special, _("Special")),
                 (bookmarks, _("Bookmarks")),
                 (branches, _("Branches")),
                 (tags, _("Tags")),
                 ], selected
     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)
     def show_all(self, repo_name):
         c.pull_requests = PullRequestModel().get_all(repo_name)
         c.repo_name = repo_name
         return render('/pullrequests/pullrequest_show_all.html')
     @NotAnonymous()
     def index(self):
         org_repo = c.rhodecode_db_repo
         if org_repo.scm_instance.alias != 'hg':
             log.error('Review not available for GIT REPOS')
             raise HTTPNotFound
         try:
             org_repo.scm_instance.get_changeset()
         except EmptyRepositoryError, e:
             h.flash(h.literal(_('There are no changesets yet')),

0 comments (0 inline, 0 general)