kallithea Changeset - 8fdabc8cce1a

Changeset - 8fdabc8cce1a

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 14 years ago 2011-11-18 15:31:36
marcin@python-works.com

fixes GIT issues with branch page

1 file changed with 13 insertions and 16 deletions:

rhodecode/controllers/branches.py

0 comments (0 inline, 0 general)

rhodecode/controllers/branches.py

➞

Show inline comments

@@ @@ -43,36 +43,33 @@ class BranchesController(BaseRepoControl @@
     def __before__(self):
         super(BranchesController, self).__before__()
     def index(self):
         def _branchtags(localrepo):
             bt = {}
             bt_closed = {}
             for bn, heads in localrepo.branchmap().iteritems():
                 tip = heads[-1]
                 if 'close' not in localrepo.changelog.read(tip)[5]:
                     bt[bn] = tip
                 else:
                 if 'close' in localrepo.changelog.read(tip)[5]:
                     bt_closed[bn] = tip
-            return bt, bt_closed
             return bt_closed
         cs_g = c.rhodecode_repo.get_changeset
         bt, bt_closed = _branchtags(c.rhodecode_repo._repo)
         cs_g = c.rhodecode_repo.get_changeset
         _branches = [(safe_unicode(n), cs_g(binascii.hexlify(h)),) for n, h in
                      bt.items()]
         c.repo_closed_branches = {}
         if c.rhodecode_db_repo.repo_type == 'hg':
             bt_closed = _branchtags(c.rhodecode_repo._repo)
             _closed_branches = [(safe_unicode(n), cs_g(binascii.hexlify(h)),)
                                 for n, h in bt_closed.items()]
         _closed_branches = [(safe_unicode(n), cs_g(binascii.hexlify(h)),) for n, h in
                      bt_closed.items()]
         c.repo_branches = OrderedDict(sorted(_branches,
             c.repo_closed_branches = OrderedDict(sorted(_closed_branches,
                                              key=lambda ctx: ctx[0],
                                              reverse=False))
         c.repo_closed_branches = OrderedDict(sorted(_closed_branches,
         _branches = [(safe_unicode(n), cs_g(h))
                      for n, h in c.rhodecode_repo.branches.items()]
         c.repo_branches = OrderedDict(sorted(_branches,
                                                     key=lambda ctx: ctx[0],
                                                     reverse=False))
         return render('branches/branches.html')

0 comments (0 inline, 0 general)