kallithea Changeset - 218ed589e44a

Changeset - 218ed589e44a

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 12 years ago 2013-06-04 13:26:41
madski@unity3d.com

Grafted from: 6d3b7006e98a

branch selectors: show closed branches too

It would be even better if they were fetched dynamically somehow and perhaps
placed in a sub sub menu ... but showing them in the list is often better than
not showing them at all.

4 files changed with 27 insertions and 1 deletions:

rhodecode/controllers/changelog.py

rhodecode/lib/vcs/backends/git/repository.py

rhodecode/lib/vcs/backends/hg/repository.py

rhodecode/templates/switch_to_list.html

0 comments (0 inline, 0 general)

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -167,24 +167,28 @@ class ChangelogController(BaseRepoContro @@
             c.statuses = c.rhodecode_db_repo.statuses(page_revisions)
         except (EmptyRepositoryError), e:
             h.flash(str(e), category='warning')
             return redirect(url('summary_home', repo_name=c.repo_name))
         except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
             h.flash(str(e), category='error')
             return redirect(url('changelog_home', repo_name=c.repo_name))
         c.branch_name = branch_name
         c.branch_filters = [('', _('All Branches'))] + \
             [(k, k) for k in c.rhodecode_repo.branches.keys()]
         if c.rhodecode_repo.closed_branches:
             prefix = _('(closed)') + ' '
             c.branch_filters += [('-', '-')] + \
                 [(k, prefix + k) for k in c.rhodecode_repo.closed_branches.keys()]
         _revs = []
         if not f_path:
             _revs = [x.revision for x in c.pagination]
         self._graph(c.rhodecode_repo, _revs, c.total_cs, c.size, p)
         return render('changelog/changelog.html')
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def changelog_details(self, cs):
         if request.environ.get('HTTP_X_PARTIAL_XHR'):

rhodecode/lib/vcs/backends/git/repository.py

➞

Show inline comments

@@ @@ -362,24 +362,28 @@ class GitRepository(BaseRepository): @@
         return undefined_contact
     @property
     def branches(self):
         if not self.revisions:
             return {}
         sortkey = lambda ctx: ctx[0]
         _branches = [(x[0], x[1][0])
                      for x in self._parsed_refs.iteritems() if x[1][1] == 'H']
         return OrderedDict(sorted(_branches, key=sortkey, reverse=False))
     @LazyProperty
     def closed_branches(self):
         return {}
     @LazyProperty
     def tags(self):
         return self._get_tags()
     def _get_tags(self):
         if not self.revisions:
             return {}
         sortkey = lambda ctx: ctx[0]
         _tags = [(x[0], x[1][0])
                  for x in self._parsed_refs.iteritems() if x[1][1] == 'T']
         return OrderedDict(sorted(_tags, key=sortkey, reverse=True))

rhodecode/lib/vcs/backends/hg/repository.py

➞

Show inline comments

@@ @@ -92,58 +92,65 @@ class MercurialRepository(BaseRepository @@
         """
         return self._get_all_revisions()
     @LazyProperty
     def name(self):
         return os.path.basename(self.path)
     @LazyProperty
     def branches(self):
         return self._get_branches()
     @LazyProperty
     def closed_branches(self):
         return self._get_branches(normal=False, closed=True)
     @LazyProperty
     def allbranches(self):
         """
         List all branches, including closed branches.
         """
         return self._get_branches(closed=True)
     def _get_branches(self, closed=False):
+    def _get_branches(self, normal=True, closed=False):
         """
         Get's branches for this repository
         Returns only not closed branches by default
         :param closed: return also closed branches for mercurial
         :param normal: return also normal branches
         """
         if self._empty:
             return {}
         def _branchtags(localrepo):
             """
             Patched version of mercurial branchtags to not return the closed
             branches
             :param localrepo: locarepository instance
             """
             bt = {}
             bt_closed = {}
             for bn, heads in localrepo.branchmap().iteritems():
                 tip = heads[-1]
                 if 'close' in localrepo.changelog.read(tip)[5]:
                     bt_closed[bn] = tip
                 else:
                     bt[bn] = tip
             if not normal:
                 return bt_closed
             if closed:
                 bt.update(bt_closed)
             return bt
         sortkey = lambda ctx: ctx[0]  # sort by name
         _branches = [(safe_unicode(n), hex(h),) for n, h in
                      _branchtags(self._repo).items()]
         return OrderedDict(sorted(_branches, key=sortkey, reverse=False))
     @LazyProperty
     def tags(self):

rhodecode/templates/switch_to_list.html

➞

Show inline comments

@@ @@ -2,24 +2,35 @@ @@
 <li>
     ${h.link_to('%s (%s)' % (_('Branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
     <ul>
     %if c.rhodecode_repo.branches.values():
         %for cnt,branch in enumerate(c.rhodecode_repo.branches.items()):
             <li><div><pre>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=(branch[0] if '/' not in branch[0] else branch[1]), at=branch[0]))}</pre></div></li>
         %endfor
     %else:
         <li>${h.link_to(_('There are no branches yet'),'#')}</li>
     %endif
     </ul>
 </li>
 %if c.rhodecode_repo.closed_branches.values():
 <li>
     ${h.link_to('%s (%s)' % (_('Closed Branches'),len(c.rhodecode_repo.closed_branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
     <ul>
         <li><a>-</a></li>
         %for cnt,branch in enumerate(c.rhodecode_repo.closed_branches.items()):
             <li><div><pre>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=(branch[0] if '/' not in branch[0] else branch[1]), at=branch[0]))}</pre></div></li>
         %endfor
     </ul>
 </li>
 %endif
 <li>
     ${h.link_to('%s (%s)' % (_('Tags'),len(c.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
     <ul>
     %if c.rhodecode_repo.tags.values():
         %for cnt,tag in enumerate(c.rhodecode_repo.tags.items()):
          <li><div><pre>${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=(tag[0] if '/' not in tag[0] else tag[1]), at=tag[0]))}</pre></div></li>
         %endfor
     %else:
         <li>${h.link_to(_('There are no tags yet'),'#')}</li>
     %endif
     </ul>
 </li>

0 comments (0 inline, 0 general)