Files
@ 12946daf44f9
Branch filter:
Location: kallithea/rhodecode/controllers/changeset.py - annotation
12946daf44f9
10.1 KiB
text/x-python
fixed template after merge
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | 30ad41c76fae 30ad41c76fae 30ad41c76fae 30ad41c76fae 30ad41c76fae 6832ef664673 28524453bb76 6832ef664673 30ad41c76fae 30ad41c76fae 6832ef664673 30ad41c76fae 30ad41c76fae a671db5bdd58 a671db5bdd58 a671db5bdd58 a671db5bdd58 6832ef664673 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 6832ef664673 1e757ac98988 a671db5bdd58 30ad41c76fae 30ad41c76fae 30ad41c76fae 1e757ac98988 1e757ac98988 1e757ac98988 30ad41c76fae 30ad41c76fae 1e757ac98988 3fc9183e05dd 3765f0f479a2 37625d304a16 30ad41c76fae 6d2239363c81 6d2239363c81 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 50e41777675d 3fc9183e05dd ffd07396d315 1e757ac98988 1e757ac98988 ffd07396d315 1e757ac98988 1e757ac98988 1cecc7db3106 ffd07396d315 1e757ac98988 ffd07396d315 1e757ac98988 ffd07396d315 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 ffd07396d315 28524453bb76 28524453bb76 e654898120b6 1e757ac98988 28524453bb76 28524453bb76 28524453bb76 7bb902022d86 7bb902022d86 28524453bb76 899c19b0865c 57a2b792a3a1 57a2b792a3a1 57a2b792a3a1 6d2239363c81 1e757ac98988 c8bd0e6cc3da ffd07396d315 28524453bb76 28524453bb76 28524453bb76 28524453bb76 0a2a10a1912f 0a2a10a1912f 215a4801bb1e ffd07396d315 7a0004efde12 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 1e757ac98988 28524453bb76 28524453bb76 7a0004efde12 7fcc539e20b1 1e757ac98988 1e757ac98988 4209cd4b7823 1e757ac98988 7a0004efde12 7a0004efde12 7a0004efde12 1e757ac98988 30ad41c76fae ce4287e3e3c9 0a2a10a1912f 7a0004efde12 7a0004efde12 0a2a10a1912f 7a0004efde12 1e757ac98988 50e41777675d 50e41777675d 50e41777675d 1cecc7db3106 1cecc7db3106 ffd07396d315 1e757ac98988 ffd07396d315 0a2a10a1912f 0a2a10a1912f 0a2a10a1912f 0a2a10a1912f ffd07396d315 28524453bb76 1e757ac98988 28524453bb76 1cecc7db3106 1cecc7db3106 1cecc7db3106 1cecc7db3106 1cecc7db3106 7a0004efde12 50e41777675d 50e41777675d ffd07396d315 1cecc7db3106 1cecc7db3106 4209cd4b7823 1cecc7db3106 ffd07396d315 1cecc7db3106 1cecc7db3106 0a2a10a1912f 0a2a10a1912f 4209cd4b7823 7a0004efde12 7a0004efde12 7a0004efde12 7a0004efde12 7a0004efde12 7a0004efde12 7a0004efde12 1cecc7db3106 1cecc7db3106 1cecc7db3106 50e41777675d 50e41777675d 50e41777675d 1cecc7db3106 1cecc7db3106 ffd07396d315 1cecc7db3106 1cecc7db3106 0a2a10a1912f 0a2a10a1912f 0a2a10a1912f 0a2a10a1912f ffd07396d315 28524453bb76 6832ef664673 28524453bb76 1cecc7db3106 1cecc7db3106 50e41777675d 4209cd4b7823 ffd07396d315 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 1e757ac98988 1e757ac98988 ffd07396d315 1e757ac98988 1e757ac98988 3fc9183e05dd 3fc9183e05dd 1e757ac98988 1e757ac98988 ffd07396d315 1e757ac98988 1e757ac98988 28524453bb76 1e757ac98988 28524453bb76 1e757ac98988 ffd07396d315 1e757ac98988 1e757ac98988 1e757ac98988 30ad41c76fae ffd07396d315 ce4287e3e3c9 50e41777675d 50e41777675d 1e757ac98988 1e757ac98988 ffd07396d315 1e757ac98988 ffd07396d315 1e757ac98988 28524453bb76 1e757ac98988 1e757ac98988 ffd07396d315 ce4287e3e3c9 50e41777675d 50e41777675d 1e757ac98988 ffd07396d315 ffd07396d315 ffd07396d315 ffd07396d315 1e757ac98988 30ad41c76fae 1e757ac98988 50e41777675d 50e41777675d 30ad41c76fae edfbf3ee9965 edfbf3ee9965 ffd07396d315 1e757ac98988 1e757ac98988 1e757ac98988 30ad41c76fae 1e757ac98988 | # -*- coding: utf-8 -*-
"""
rhodecode.controllers.changeset
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
changeset controller for pylons showoing changes beetween
revisions
:created_on: Apr 25, 2010
:author: marcink
:copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
:license: GPLv3, see COPYING for more details.
"""
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
import traceback
from pylons import tmpl_context as c, url, request, response
from pylons.i18n.translation import _
from pylons.controllers.util import redirect
import rhodecode.lib.helpers as h
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
from rhodecode.lib.base import BaseRepoController, render
from rhodecode.lib.utils import EmptyChangeset
from rhodecode.lib.odict import OrderedDict
from vcs.exceptions import RepositoryError, ChangesetError, \
ChangesetDoesNotExistError
from vcs.nodes import FileNode
from vcs.utils import diffs as differ
log = logging.getLogger(__name__)
class ChangesetController(BaseRepoController):
@LoginRequired()
@HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
'repository.admin')
def __before__(self):
super(ChangesetController, self).__before__()
c.affected_files_cut_off = 60
def index(self, revision):
def wrap_to_table(str):
return '''<table class="code-difftable">
<tr class="line">
<td class="lineno new"></td>
<td class="code"><pre>%s</pre></td>
</tr>
</table>''' % str
#get ranges of revisions if preset
rev_range = revision.split('...')[:2]
try:
if len(rev_range) == 2:
rev_start = rev_range[0]
rev_end = rev_range[1]
rev_ranges = c.rhodecode_repo.get_changesets(start=rev_start,
end=rev_end)
else:
rev_ranges = [c.rhodecode_repo.get_changeset(revision)]
c.cs_ranges = list(rev_ranges)
except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
log.error(traceback.format_exc())
h.flash(str(e), category='warning')
return redirect(url('home'))
c.changes = OrderedDict()
c.sum_added = 0
c.sum_removed = 0
c.lines_added = 0
c.lines_deleted = 0
c.cut_off = False # defines if cut off limit is reached
# Iterate over ranges (default changeset view is always one changeset)
for changeset in c.cs_ranges:
c.changes[changeset.raw_id] = []
try:
changeset_parent = changeset.parents[0]
except IndexError:
changeset_parent = None
#==================================================================
# ADDED FILES
#==================================================================
for node in changeset.added:
filenode_old = FileNode(node.path, '', EmptyChangeset())
if filenode_old.is_binary or node.is_binary:
diff = wrap_to_table(_('binary file'))
st = (0, 0)
else:
# in this case node.size is good parameter since those are
# added nodes and their size defines how many changes were
# made
c.sum_added += node.size
if c.sum_added < self.cut_off_limit:
f_gitdiff = differ.get_gitdiff(filenode_old, node)
d = differ.DiffProcessor(f_gitdiff, format='gitdiff')
st = d.stat()
diff = d.as_html()
else:
diff = wrap_to_table(_('Changeset is to big and '
'was cut off, see raw '
'changeset instead'))
c.cut_off = True
break
cs1 = None
cs2 = node.last_changeset.raw_id
c.lines_added += st[0]
c.lines_deleted += st[1]
c.changes[changeset.raw_id].append(('added', node, diff,
cs1, cs2, st))
#==================================================================
# CHANGED FILES
#==================================================================
if not c.cut_off:
for node in changeset.changed:
try:
filenode_old = changeset_parent.get_node(node.path)
except ChangesetError:
log.warning('Unable to fetch parent node for diff')
filenode_old = FileNode(node.path, '',
EmptyChangeset())
if filenode_old.is_binary or node.is_binary:
diff = wrap_to_table(_('binary file'))
st = (0, 0)
else:
if c.sum_removed < self.cut_off_limit:
f_gitdiff = differ.get_gitdiff(filenode_old, node)
d = differ.DiffProcessor(f_gitdiff,
format='gitdiff')
st = d.stat()
if (st[0] + st[1]) * 256 > self.cut_off_limit:
diff = wrap_to_table(_('Diff is to big '
'and was cut off, see '
'raw diff instead'))
else:
diff = d.as_html()
if diff:
c.sum_removed += len(diff)
else:
diff = wrap_to_table(_('Changeset is to big and '
'was cut off, see raw '
'changeset instead'))
c.cut_off = True
break
cs1 = filenode_old.last_changeset.raw_id
cs2 = node.last_changeset.raw_id
c.lines_added += st[0]
c.lines_deleted += st[1]
c.changes[changeset.raw_id].append(('changed', node, diff,
cs1, cs2, st))
#==================================================================
# REMOVED FILES
#==================================================================
if not c.cut_off:
for node in changeset.removed:
c.changes[changeset.raw_id].append(('removed', node, None,
None, None, (0, 0)))
if len(c.cs_ranges) == 1:
c.changeset = c.cs_ranges[0]
c.changes = c.changes[c.changeset.raw_id]
return render('changeset/changeset.html')
else:
return render('changeset/changeset_range.html')
def raw_changeset(self, revision):
method = request.GET.get('diff', 'show')
try:
c.scm_type = c.rhodecode_repo.alias
c.changeset = c.rhodecode_repo.get_changeset(revision)
except RepositoryError:
log.error(traceback.format_exc())
return redirect(url('home'))
else:
try:
c.changeset_parent = c.changeset.parents[0]
except IndexError:
c.changeset_parent = None
c.changes = []
for node in c.changeset.added:
filenode_old = FileNode(node.path, '')
if filenode_old.is_binary or node.is_binary:
diff = _('binary file') + '\n'
else:
f_gitdiff = differ.get_gitdiff(filenode_old, node)
diff = differ.DiffProcessor(f_gitdiff,
format='gitdiff').raw_diff()
cs1 = None
cs2 = node.last_changeset.raw_id
c.changes.append(('added', node, diff, cs1, cs2))
for node in c.changeset.changed:
filenode_old = c.changeset_parent.get_node(node.path)
if filenode_old.is_binary or node.is_binary:
diff = _('binary file')
else:
f_gitdiff = differ.get_gitdiff(filenode_old, node)
diff = differ.DiffProcessor(f_gitdiff,
format='gitdiff').raw_diff()
cs1 = filenode_old.last_changeset.raw_id
cs2 = node.last_changeset.raw_id
c.changes.append(('changed', node, diff, cs1, cs2))
response.content_type = 'text/plain'
if method == 'download':
response.content_disposition = 'attachment; filename=%s.patch' \
% revision
c.parent_tmpl = ''.join(['# Parent %s\n' % x.raw_id for x in
c.changeset.parents])
c.diffs = ''
for x in c.changes:
c.diffs += x[2]
return render('changeset/raw_changeset.html')
|