kallithea Changeset - 980691743559

Changeset - 980691743559

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 11 years ago 2014-07-24 12:41:55
madski@unity3d.com

pull requests: use name of branch of tip instead of tip - it is a confusing and moving target

1 file changed with 12 insertions and 4 deletions:

kallithea/controllers/pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -104,17 +104,23 @@ class PullrequestsController(BaseRepoCon @@
                 if abranch not in peerbranches:
                     n = 'branch:%s:%s' % (abranch, repo.get_changeset(abranch).raw_id)
                     peers.append((n, abranch))
                     peerbranches.add(abranch)
         selected = None
         tiprev = repo.tags.get('tip')
         tipbranch = None
         branches = []
         for abranch, branchrev in repo.branches.iteritems():
             n = 'branch:%s:%s' % (abranch, branchrev)
             branches.append((n, abranch))
             desc = abranch
             if branchrev == tiprev:
                 tipbranch = abranch
                 desc = '%s (tip)' % desc
             branches.append((n, desc))
             if rev == branchrev:
                 selected = n
             if branch == abranch:
                 if not rev:
                     selected = n
                 branch = None
@@ @@ -134,15 +140,17 @@ class PullrequestsController(BaseRepoCon @@
             bookmarks.append((n, bookmark))
             if rev == bookmarkrev:
                 selected = n
         tags = []
         for tag, tagrev in repo.tags.iteritems():
             if tag == 'tip':
                 continue
             n = 'tag:%s:%s' % (tag, tagrev)
             tags.append((n, tag))
-            if rev == tagrev and tag != 'tip':  # tip is not a real tag - and its branch is better
             if rev == tagrev:
                 selected = n
         # prio 1: rev was selected as existing entry above
         # prio 2: create special entry for rev; rev _must_ be used
         specials = []
@@ @@ -154,14 +162,14 @@ class PullrequestsController(BaseRepoCon @@
         if peers and not selected:
             selected = peers[0][0][0]
         # prio 4: tip revision
         if not selected:
             if h.is_hg(repo):
                 if 'tip' in repo.tags:
                     selected = 'tag:tip:%s' % repo.tags['tip']
                 if tipbranch:
                     selected = 'branch:%s:%s' % (tipbranch, tiprev)
                 else:
                     selected = 'tag:null:0'
                     tags.append((selected, 'null'))
             else:
                 if 'master' in repo.branches:
                     selected = 'branch:master:%s' % repo.branches['master']

0 comments (0 inline, 0 general)