##// END OF EJS Templates
moved locking of commit stats into the task itself to remove race conditions when lock was not removed before starting another task.
moved locking of commit stats into the task itself to remove race conditions when lock was not removed before starting another task.

File last commit:

r1259:4209cd4b beta
r1264:0c43c667 beta
Show More
changeset.py
239 lines | 9.4 KiB | text/x-python | PythonLexer
fixes #79 cut off limit was added into .ini config files
r812 # -*- coding: utf-8 -*-
"""
rhodecode.controllers.changeset
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
source code cleanup: remove trailing white space, normalize file endings
r1203 changeset controller for pylons showoing changes beetween
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 revisions
source code cleanup: remove trailing white space, normalize file endings
r1203
fixes #79 cut off limit was added into .ini config files
r812 :created_on: Apr 25, 2010
:author: marcink
source code cleanup: remove trailing white space, normalize file endings
r1203 :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
fixes #79 cut off limit was added into .ini config files
r812 :license: GPLv3, see COPYING for more details.
"""
fixed license issue #149
r1206 # 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.
source code cleanup: remove trailing white space, normalize file endings
r1203 #
renamed project to rhodecode
r547 # 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.
source code cleanup: remove trailing white space, normalize file endings
r1203 #
renamed project to rhodecode
r547 # You should have received a copy of the GNU General Public License
fixed license issue #149
r1206 # along with this program. If not, see <http://www.gnu.org/licenses/>.
fixes #79 cut off limit was added into .ini config files
r812 import logging
import traceback
renamed project to rhodecode
r547 from pylons import tmpl_context as c, url, request, response
from pylons.i18n.translation import _
from pylons.controllers.util import redirect
fixes #79 cut off limit was added into .ini config files
r812
import rhodecode.lib.helpers as h
renamed project to rhodecode
r547 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
another major codes rewrite:...
r1045 from rhodecode.lib.base import BaseRepoController, render
fixed raw diff as purly raw without html
r649 from rhodecode.lib.utils import EmptyChangeset
fixes #79 cut off limit was added into .ini config files
r812
#93 fixed errors on new revranges generation
r978 from vcs.exceptions import RepositoryError, ChangesetError, \
ChangesetDoesNotExistError
renamed project to rhodecode
r547 from vcs.nodes import FileNode
from vcs.utils import diffs as differ
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 from vcs.utils.ordered_dict import OrderedDict
renamed project to rhodecode
r547
log = logging.getLogger(__name__)
pep8ify
r1212
another major codes rewrite:...
r1045 class ChangesetController(BaseRepoController):
Fixes for raw_id, needed for git...
r636
renamed project to rhodecode
r547 @LoginRequired()
@HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
Fixes for raw_id, needed for git...
r636 'repository.admin')
renamed project to rhodecode
r547 def __before__(self):
super(ChangesetController, self).__before__()
fixed some limits in changesets and changelogs
r1130 c.affected_files_cut_off = 60
Fixes for raw_id, needed for git...
r636
renamed project to rhodecode
r547 def index(self, revision):
Fixes for raw_id, needed for git...
r636
renamed project to rhodecode
r547 def wrap_to_table(str):
Fixes for raw_id, needed for git...
r636
renamed project to rhodecode
r547 return '''<table class="code-difftable">
<tr class="line">
<td class="lineno new"></td>
<td class="code"><pre>%s</pre></td>
</tr>
</table>''' % str
Fixes for raw_id, needed for git...
r636
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 #get ranges of revisions if preset
rev_range = revision.split('...')[:2]
sorted tags by date in tag view
r1126
renamed project to rhodecode
r547 try:
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 if len(rev_range) == 2:
rev_start = rev_range[0]
rev_end = rev_range[1]
small simplification in changelog
r1107 rev_ranges = c.rhodecode_repo.get_changesets(start=rev_start,
end=rev_end)
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 else:
reverted removed list casting
r1108 rev_ranges = [c.rhodecode_repo.get_changeset(revision)]
fixed error for single changeset
r983
c.cs_ranges = list(rev_ranges)
#93 fixed errors on new revranges generation
r978 except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
renamed project to rhodecode
r547 log.error(traceback.format_exc())
some changes for #45....
r644 h.flash(str(e), category='warning')
Fixes for raw_id, needed for git...
r636 return redirect(url('home'))
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977
c.changes = OrderedDict()
c.sum_added = 0
c.sum_removed = 0
Implemented --stat for changelog
r1257 c.lines_added = 0
c.lines_deleted = 0
fixed some limits in changesets and changelogs
r1130 c.cut_off = False
Fixes for raw_id, needed for git...
r636
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 for changeset in c.cs_ranges:
c.changes[changeset.raw_id] = []
try:
changeset_parent = changeset.parents[0]
except IndexError:
changeset_parent = None
#==================================================================
renamed project to rhodecode
r547 # ADDED FILES
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 #==================================================================
for node in changeset.added:
large initial commits fixup...
r566 filenode_old = FileNode(node.path, '', EmptyChangeset())
renamed project to rhodecode
r547 if filenode_old.is_binary or node.is_binary:
diff = wrap_to_table(_('binary file'))
fixed problem with binary files, and for files that were deleted.
r1259 st = (0, 0)
renamed project to rhodecode
r547 else:
c.sum_added += node.size
fixes #79 cut off limit was added into .ini config files
r812 if c.sum_added < self.cut_off_limit:
changed all instances of udiff into gitdiff, for vcs issue #49
r1125 f_gitdiff = differ.get_gitdiff(filenode_old, node)
Implemented --stat for changelog
r1257 d = differ.DiffProcessor(f_gitdiff, format='gitdiff')
diff = d.as_html()
fixed problem with binary files, and for files that were deleted.
r1259 st = d.stat()
renamed project to rhodecode
r547 else:
pep8ify
r1212 diff = wrap_to_table(_('Changeset is to big and '
'was cut off, see raw '
'changeset instead'))
fixed some limits in changesets and changelogs
r1130 c.cut_off = True
break
Fixes for raw_id, needed for git...
r636
renamed project to rhodecode
r547 cs1 = None
Fixes for raw_id, needed for git...
r636 cs2 = node.last_changeset.raw_id
Implemented --stat for changelog
r1257 c.lines_added += st[0]
c.lines_deleted += st[1]
c.changes[changeset.raw_id].append(('added', node, diff,
cs1, cs2, st))
Fixes for raw_id, needed for git...
r636
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 #==================================================================
renamed project to rhodecode
r547 # CHANGED FILES
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 #==================================================================
fixed some limits in changesets and changelogs
r1130 if not c.cut_off:
for node in changeset.changed:
try:
filenode_old = changeset_parent.get_node(node.path)
except ChangesetError:
pep8ify
r1212 filenode_old = FileNode(node.path, '',
EmptyChangeset())
Fixes for raw_id, needed for git...
r636
fixed some limits in changesets and changelogs
r1130 if filenode_old.is_binary or node.is_binary:
diff = wrap_to_table(_('binary file'))
fixed problem with binary files, and for files that were deleted.
r1259 st = (0, 0)
fixed some limits in changesets and changelogs
r1130 else:
Fixes for raw_id, needed for git...
r636
fixed some limits in changesets and changelogs
r1130 if c.sum_removed < self.cut_off_limit:
f_gitdiff = differ.get_gitdiff(filenode_old, node)
Implemented --stat for changelog
r1257 d = differ.DiffProcessor(f_gitdiff,
format='gitdiff')
diff = d.as_html()
fixed problem with binary files, and for files that were deleted.
r1259 st = d.stat()
fixed some limits in changesets and changelogs
r1130 if diff:
c.sum_removed += len(diff)
else:
pep8ify
r1212 diff = wrap_to_table(_('Changeset is to big and '
'was cut off, see raw '
'changeset instead'))
fixed some limits in changesets and changelogs
r1130 c.cut_off = True
break
Fixes for raw_id, needed for git...
r636
fixed some limits in changesets and changelogs
r1130 cs1 = filenode_old.last_changeset.raw_id
cs2 = node.last_changeset.raw_id
Implemented --stat for changelog
r1257 c.lines_added += st[0]
c.lines_deleted += st[1]
c.changes[changeset.raw_id].append(('changed', node, diff,
cs1, cs2, st))
Fixes for raw_id, needed for git...
r636
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 #==================================================================
source code cleanup: remove trailing white space, normalize file endings
r1203 # REMOVED FILES
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 #==================================================================
fixed some limits in changesets and changelogs
r1130 if not c.cut_off:
for node in changeset.removed:
pep8ify
r1212 c.changes[changeset.raw_id].append(('removed', node, None,
fixed problem with binary files, and for files that were deleted.
r1259 None, None, (0, 0)))
Fixes for raw_id, needed for git...
r636
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 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')
renamed project to rhodecode
r547
def raw_changeset(self, revision):
Fixes for raw_id, needed for git...
r636
renamed project to rhodecode
r547 method = request.GET.get('diff', 'show')
try:
another major codes rewrite:...
r1045 c.scm_type = c.rhodecode_repo.alias
c.changeset = c.rhodecode_repo.get_changeset(revision)
renamed project to rhodecode
r547 except RepositoryError:
log.error(traceback.format_exc())
Fixes for raw_id, needed for git...
r636 return redirect(url('home'))
renamed project to rhodecode
r547 else:
try:
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 c.changeset_parent = c.changeset.parents[0]
renamed project to rhodecode
r547 except IndexError:
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 c.changeset_parent = None
renamed project to rhodecode
r547 c.changes = []
Fixes for raw_id, needed for git...
r636
renamed project to rhodecode
r547 for node in c.changeset.added:
filenode_old = FileNode(node.path, '')
if filenode_old.is_binary or node.is_binary:
fixes #79 cut off limit was added into .ini config files
r812 diff = _('binary file') + '\n'
Fixes for raw_id, needed for git...
r636 else:
changed all instances of udiff into gitdiff, for vcs issue #49
r1125 f_gitdiff = differ.get_gitdiff(filenode_old, node)
pep8ify
r1212 diff = differ.DiffProcessor(f_gitdiff,
format='gitdiff').raw_diff()
renamed project to rhodecode
r547
cs1 = None
Fixes for raw_id, needed for git...
r636 cs2 = node.last_changeset.raw_id
renamed project to rhodecode
r547 c.changes.append(('added', node, diff, cs1, cs2))
Fixes for raw_id, needed for git...
r636
renamed project to rhodecode
r547 for node in c.changeset.changed:
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 filenode_old = c.changeset_parent.get_node(node.path)
renamed project to rhodecode
r547 if filenode_old.is_binary or node.is_binary:
diff = _('binary file')
Fixes for raw_id, needed for git...
r636 else:
changed all instances of udiff into gitdiff, for vcs issue #49
r1125 f_gitdiff = differ.get_gitdiff(filenode_old, node)
pep8ify
r1212 diff = differ.DiffProcessor(f_gitdiff,
format='gitdiff').raw_diff()
renamed project to rhodecode
r547
Fixes for raw_id, needed for git...
r636 cs1 = filenode_old.last_changeset.raw_id
cs2 = node.last_changeset.raw_id
c.changes.append(('changed', node, diff, cs1, cs2))
renamed project to rhodecode
r547 response.content_type = 'text/plain'
fixes #79 cut off limit was added into .ini config files
r812
renamed project to rhodecode
r547 if method == 'download':
pep8ify
r1212 response.content_disposition = 'attachment; filename=%s.patch' \
% revision
fixes #79 cut off limit was added into .ini config files
r812
renamed project to rhodecode
r547 parent = True if len(c.changeset.parents) > 0 else False
pep8ify
r1212 c.parent_tmpl = 'Parent %s' \
% c.changeset.parents[0].raw_id if parent else ''
Fixes for raw_id, needed for git...
r636
renamed project to rhodecode
r547 c.diffs = ''
for x in c.changes:
c.diffs += x[2]
fixes #79 cut off limit was added into .ini config files
r812
renamed project to rhodecode
r547 return render('changeset/raw_changeset.html')