Mercurial > kallithea

annotate rhodecode/controllers/branches.py @ 4116:ffd45b185016 rhodecode-2.2.5-gpl

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Imported some of the GPLv3'd changes from RhodeCode v2.2.5. This imports changes between changesets 21af6c4eab3d and 6177597791c2 in RhodeCode's original repository, including only changes to Python files and HTML. RhodeCode clearly licensed its changes to these files under GPLv3 in their /LICENSE file, which states the following: The Python code and integrated HTML are licensed under the GPLv3 license. (See: https://code.rhodecode.com/rhodecode/files/v2.2.5/LICENSE or http://web.archive.org/web/20140512193334/https://code.rhodecode.com/rhodecode/files/f3b123159901f15426d18e3dc395e8369f70ebe0/LICENSE for an online copy of that LICENSE file) Conservancy reviewed these changes and confirmed that they can be licensed as a whole to the Kallithea project under GPLv3-only. While some of the contents committed herein are clearly licensed GPLv3-or-later, on the whole we must assume the are GPLv3-only, since the statement above from RhodeCode indicates that they intend GPLv3-only as their license, per GPLv3ยง14 and other relevant sections of GPLv3.
author Bradley M. Kuhn <bkuhn@sfconservancy.org>
date Wed, 02 Jul 2014 19:03:13 -0400
parents 5293d4bbb1ea
children 7e5f8c12a3fc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
861
fd2ea6ceadc8 updated docs on every controller
Marcin Kuzminski <marcin@python-works.com>
parents: 691
diff changeset
1 # -*- coding: utf-8 -*-
1206
a671db5bdd58 fixed license issue #149
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
2 # This program is free software: you can redistribute it and/or modify
a671db5bdd58 fixed license issue #149
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
3 # it under the terms of the GNU General Public License as published by
a671db5bdd58 fixed license issue #149
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
4 # the Free Software Foundation, either version 3 of the License, or
a671db5bdd58 fixed license issue #149
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
5 # (at your option) any later version.
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1045
diff changeset
6 #
252
3782a6d698af licensing updates, code cleanups
Marcin Kuzminski <marcin@python-works.com>
parents: 245
diff changeset
7 # This program is distributed in the hope that it will be useful,
3782a6d698af licensing updates, code cleanups
Marcin Kuzminski <marcin@python-works.com>
parents: 245
diff changeset
8 # but WITHOUT ANY WARRANTY; without even the implied warranty of
3782a6d698af licensing updates, code cleanups
Marcin Kuzminski <marcin@python-works.com>
parents: 245
diff changeset
9 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3782a6d698af licensing updates, code cleanups
Marcin Kuzminski <marcin@python-works.com>
parents: 245
diff changeset
10 # GNU General Public License for more details.
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1045
diff changeset
11 #
252
3782a6d698af licensing updates, code cleanups
Marcin Kuzminski <marcin@python-works.com>
parents: 245
diff changeset
12 # You should have received a copy of the GNU General Public License
1206
a671db5bdd58 fixed license issue #149
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
13 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
14 """
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
15 rhodecode.controllers.branches
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
17
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
18 branches controller for rhodecode
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
19
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
20 :created_on: Apr 21, 2010
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
21 :author: marcink
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
22 :copyright: (c) 2013 RhodeCode GmbH.
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
23 :license: GPLv3, see LICENSE for more details.
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3960
diff changeset
24 """
861
fd2ea6ceadc8 updated docs on every controller
Marcin Kuzminski <marcin@python-works.com>
parents: 691
diff changeset
25
fd2ea6ceadc8 updated docs on every controller
Marcin Kuzminski <marcin@python-works.com>
parents: 691
diff changeset
26 import logging
2348
a07e04ef7bb4 Implemented basic compare view(for pull requests) for mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 2109
diff changeset
27 import binascii
861
fd2ea6ceadc8 updated docs on every controller
Marcin Kuzminski <marcin@python-works.com>
parents: 691
diff changeset
28
389
174785aa5dc4 fixed sorting of tags and branches. Fix made in vcs.
Marcin Kuzminski <marcin@python-works.com>
parents: 318
diff changeset
29 from pylons import tmpl_context as c
861
fd2ea6ceadc8 updated docs on every controller
Marcin Kuzminski <marcin@python-works.com>
parents: 691
diff changeset
30
547
1e757ac98988 renamed project to rhodecode
Marcin Kuzminski <marcin@python-works.com>
parents: 389
diff changeset
31 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
1045
3fc9183e05dd another major codes rewrite:
Marcin Kuzminski <marcin@python-works.com>
parents: 1038
diff changeset
32 from rhodecode.lib.base import BaseRepoController, render
1514
87ec80c280bb fixed issues with python2.5
Marcin Kuzminski <marcin@python-works.com>
parents: 1440
diff changeset
33 from rhodecode.lib.compat import OrderedDict
2109
8ecfed1d8f8b utils/conf
Marcin Kuzminski <marcin@python-works.com>
parents: 1824
diff changeset
34 from rhodecode.lib.utils2 import safe_unicode
2348
a07e04ef7bb4 Implemented basic compare view(for pull requests) for mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 2109
diff changeset
35
127
20dc7a5eb748 Html changes and cleanups, made folders for html templates, implemented tags and branches pages
Marcin Kuzminski <marcin@python-works.com>
parents: 93
diff changeset
36 log = logging.getLogger(__name__)
93
aec4c0071cb3 added empty controllers for branches tags files graph, routing and test for them
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
37
1212
50e41777675d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1206
diff changeset
38
1045
3fc9183e05dd another major codes rewrite:
Marcin Kuzminski <marcin@python-works.com>
parents: 1038
diff changeset
39 class BranchesController(BaseRepoController):
861
fd2ea6ceadc8 updated docs on every controller
Marcin Kuzminski <marcin@python-works.com>
parents: 691
diff changeset
40
3749
b950b884ab87 auth decorators are not used anymore on __before__
Marcin Kuzminski <marcin@python-works.com>
parents: 2348
diff changeset
41 def __before__(self):
b950b884ab87 auth decorators are not used anymore on __before__
Marcin Kuzminski <marcin@python-works.com>
parents: 2348
diff changeset
42 super(BranchesController, self).__before__()
b950b884ab87 auth decorators are not used anymore on __before__
Marcin Kuzminski <marcin@python-works.com>
parents: 2348
diff changeset
43
191
b68b2246e5a6 Authenticated controller with LoginRequired decorator, and cleaned __before__ (used in baseController now). fixed User for clone url with logged in session user.
Marcin Kuzminski <marcin@python-works.com>
parents: 127
diff changeset
44 @LoginRequired()
861
fd2ea6ceadc8 updated docs on every controller
Marcin Kuzminski <marcin@python-works.com>
parents: 691
diff changeset
45 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
fd2ea6ceadc8 updated docs on every controller
Marcin Kuzminski <marcin@python-works.com>
parents: 691
diff changeset
46 'repository.admin')
93
aec4c0071cb3 added empty controllers for branches tags files graph, routing and test for them
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
47 def index(self):
1045
3fc9183e05dd another major codes rewrite:
Marcin Kuzminski <marcin@python-works.com>
parents: 1038
diff changeset
48
1440
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
49 def _branchtags(localrepo):
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
50 bt_closed = {}
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
51 for bn, heads in localrepo.branchmap().iteritems():
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
52 tip = heads[-1]
1698
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
53 if 'close' in localrepo.changelog.read(tip)[5]:
1440
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
54 bt_closed[bn] = tip
1698
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
55 return bt_closed
1440
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
56
1698
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
57 cs_g = c.rhodecode_repo.get_changeset
1440
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
58
1698
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
59 c.repo_closed_branches = {}
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
60 if c.rhodecode_db_repo.repo_type == 'hg':
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
61 bt_closed = _branchtags(c.rhodecode_repo._repo)
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
62 _closed_branches = [(safe_unicode(n), cs_g(binascii.hexlify(h)),)
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
63 for n, h in bt_closed.items()]
1440
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
64
1698
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
65 c.repo_closed_branches = OrderedDict(sorted(_closed_branches,
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
66 key=lambda ctx: ctx[0],
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
67 reverse=False))
1440
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
68
1698
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
69 _branches = [(safe_unicode(n), cs_g(h))
8fdabc8cce1a fixes GIT issues with branch page
Marcin Kuzminski <marcin@python-works.com>
parents: 1514
diff changeset
70 for n, h in c.rhodecode_repo.branches.items()]
1440
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
71 c.repo_branches = OrderedDict(sorted(_branches,
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
72 key=lambda ctx: ctx[0],
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
73 reverse=False))
b074dfa51292 implements #195 added closed branches to detailed branches view
Marcin Kuzminski <marcin@python-works.com>
parents: 1337
diff changeset
74
127
20dc7a5eb748 Html changes and cleanups, made folders for html templates, implemented tags and branches pages
Marcin Kuzminski <marcin@python-works.com>
parents: 93
diff changeset
75 return render('branches/branches.html')