Mercurial > kallithea

comparison rhodecode/controllers/branches.py @ 3960:5293d4bbb1ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged dev into stable/default/master branch
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Jun 2013 00:31:11 +0200
parents 63e58ef80ef1 b950b884ab87
children ffd45b185016
comparison
equal deleted inserted replaced
3879:51596d9ef2f8 3960:5293d4bbb1ea
36 log = logging.getLogger(__name__) 36 log = logging.getLogger(__name__)
37 37
38 38
39 class BranchesController(BaseRepoController): 39 class BranchesController(BaseRepoController):
40 40
41 def __before__(self):
42 super(BranchesController, self).__before__()
43
41 @LoginRequired() 44 @LoginRequired()
42 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', 45 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
43 'repository.admin') 46 'repository.admin')
44 def __before__(self):
45 super(BranchesController, self).__before__()
46
47 def index(self): 47 def index(self):
48 48
49 def _branchtags(localrepo): 49 def _branchtags(localrepo):
50 bt_closed = {} 50 bt_closed = {}
51 for bn, heads in localrepo.branchmap().iteritems(): 51 for bn, heads in localrepo.branchmap().iteritems():
70 for n, h in c.rhodecode_repo.branches.items()] 70 for n, h in c.rhodecode_repo.branches.items()]
71 c.repo_branches = OrderedDict(sorted(_branches, 71 c.repo_branches = OrderedDict(sorted(_branches,
72 key=lambda ctx: ctx[0], 72 key=lambda ctx: ctx[0],
73 reverse=False)) 73 reverse=False))
74 74
75
76 return render('branches/branches.html') 75 return render('branches/branches.html')