##// END OF EJS Templates
Don't cast to string on warning about deleting an user who still owns repositories
Don't cast to string on warning about deleting an user who still owns repositories

File last commit:

r2123:f47f27a6 beta
r2155:24d90665 beta
Show More
changeset.py
374 lines | 13.5 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
2012 copyrights
r1824 :copyright: (C) 2010-2012 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
implements #307, configurable diffs...
r1776 from collections import defaultdict
from webob.exc import HTTPForbidden
fixes #79 cut off limit was added into .ini config files
r812
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
#77 code review...
r1670 from pylons.decorators import jsonify
fixes #79 cut off limit was added into .ini config files
r812
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetError, \
implements #307, configurable diffs...
r1776 ChangesetDoesNotExistError
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from rhodecode.lib.vcs.nodes import FileNode
implements #307, configurable diffs...
r1776
fixes #79 cut off limit was added into .ini config files
r812 import rhodecode.lib.helpers as h
Notification system improvements...
r1712 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
fixed issues with python2.5...
r1514 from rhodecode.lib.compat import OrderedDict
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 from rhodecode.lib import diffs
#77 code review...
r1670 from rhodecode.model.db import ChangesetComment
from rhodecode.model.comment import ChangesetCommentsModel
Tests updates, Session refactoring
r1713 from rhodecode.model.meta import Session
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 from rhodecode.lib.diffs import wrapped_diff
renamed project to rhodecode
r547
log = logging.getLogger(__name__)
pep8ify
r1212
code garden for changeset ranges and comments...
r1787 def anchor_url(revision, path):
implements #307, configurable diffs...
r1776 fid = h.FID(revision, path)
p2.5 fixes
r2068 return h.url.current(anchor=fid, **dict(request.GET))
code garden for changeset ranges and comments...
r1787
implements #307, configurable diffs...
r1776
def get_ignore_ws(fid, GET):
ig_ws_global = request.GET.get('ignorews')
code garden for changeset ranges and comments...
r1787 ig_ws = filter(lambda k: k.startswith('WS'), GET.getall(fid))
implements #307, configurable diffs...
r1776 if ig_ws:
try:
return int(ig_ws[0].split(':')[-1])
except:
pass
return ig_ws_global
code garden for changeset ranges and comments...
r1787
implements #307, configurable diffs...
r1776 def _ignorews_url(fileid=None):
fixes for #393 py2.5 compatability for url generators
r2123 fileid = str(fileid)
implements #307, configurable diffs...
r1776 params = defaultdict(list)
lbl = _('show white space')
ig_ws = get_ignore_ws(fileid, request.GET)
ln_ctx = get_line_ctx(fileid, request.GET)
# global option
if fileid is None:
if ig_ws is None:
params['ignorews'] += [1]
lbl = _('ignore white space')
ctx_key = 'context'
ctx_val = ln_ctx
# per file options
else:
if ig_ws is None:
params[fileid] += ['WS:1']
lbl = _('ignore white space')
ctx_key = fileid
ctx_val = 'C:%s' % ln_ctx
# if we have passed in ln_ctx pass it along to our params
if ln_ctx:
params[ctx_key] += [ctx_val]
code garden for changeset ranges and comments...
r1787
implements #307, configurable diffs...
r1776 params['anchor'] = fileid
Erwin Kroon
Fix for #378
r2073 img = h.image(h.url('/images/icons/text_strikethrough.png'), lbl, class_='icon')
added tooltips into diff icons
r1902 return h.link_to(img, h.url.current(**params), title=lbl, class_='tooltip')
implements #307, configurable diffs...
r1776
code garden for changeset ranges and comments...
r1787
implements #307, configurable diffs...
r1776 def get_line_ctx(fid, GET):
ln_ctx_global = request.GET.get('context')
code garden for changeset ranges and comments...
r1787 ln_ctx = filter(lambda k: k.startswith('C'), GET.getall(fid))
implements #307, configurable diffs...
r1776 if ln_ctx:
retval = ln_ctx[0].split(':')[-1]
else:
retval = ln_ctx_global
try:
return int(retval)
except:
return
code garden for changeset ranges and comments...
r1787
implements #307, configurable diffs...
r1776 def _context_url(fileid=None):
"""
Generates url for context lines
code garden for changeset ranges and comments...
r1787
implements #307, configurable diffs...
r1776 :param fileid:
"""
fixes for #393 py2.5 compatability for url generators
r2123 fileid = str(fileid)
implements #307, configurable diffs...
r1776 ig_ws = get_ignore_ws(fileid, request.GET)
ln_ctx = (get_line_ctx(fileid, request.GET) or 3) * 2
params = defaultdict(list)
# global option
if fileid is None:
if ln_ctx > 0:
params['context'] += [ln_ctx]
if ig_ws:
ig_ws_key = 'ignorews'
ig_ws_val = 1
# per file option
else:
params[fileid] += ['C:%s' % ln_ctx]
ig_ws_key = fileid
ig_ws_val = 'WS:%s' % 1
code garden for changeset ranges and comments...
r1787
implements #307, configurable diffs...
r1776 if ig_ws:
params[ig_ws_key] += [ig_ws_val]
lbl = _('%s line context') % ln_ctx
params['anchor'] = fileid
Erwin Kroon
Fix for #378
r2073 img = h.image(h.url('/images/icons/table_add.png'), lbl, class_='icon')
added tooltips into diff icons
r1902 return h.link_to(img, h.url.current(**params), title=lbl, class_='tooltip')
implements #307, configurable diffs...
r1776
code garden for changeset ranges and comments...
r1787
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
implements #307, configurable diffs...
r1776 c.anchor_url = anchor_url
c.ignorews_url = _ignorews_url
c.context_url = _context_url
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]
code garden for changeset ranges and comments...
r1787 enable_comments = True
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:
code garden for changeset ranges and comments...
r1787 enable_comments = False
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 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)
implemented #44 - branch filtering in changelog, aka branch browser...
r1656 if not c.cs_ranges:
raise RepositoryError('Changeset range returned empty result')
fixed error for single changeset
r983
#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()
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789
c.lines_added = 0 # count of lines added
c.lines_deleted = 0 # count of lines removes
cumulative_diff = 0
pep8ify + small fixes for followers page + added tooltips for followers
r1280 c.cut_off = False # defines if cut off limit is reached
Fixes for raw_id, needed for git...
r636
#77 code review...
r1670 c.comments = []
#71 code-review...
r1677 c.inline_comments = []
c.inline_cnt = 0
Added extra check for very large diffs in changesets, sometimes for very large diffs the diff parser could kill CPU.
r1274 # Iterate over ranges (default changeset view is always one changeset)
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 for changeset in c.cs_ranges:
code refactoring
r1675 c.comments.extend(ChangesetCommentsModel()\
.get_comments(c.rhodecode_db_repo.repo_id,
changeset.raw_id))
#71 code-review...
r1677 inlines = ChangesetCommentsModel()\
.get_inline_comments(c.rhodecode_db_repo.repo_id,
changeset.raw_id)
c.inline_comments.extend(inlines)
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 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:
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 fid = h.FID(revision, node.path)
line_context_lcl = get_line_ctx(fid, request.GET)
ign_whitespace_lcl = get_ignore_ws(fid, request.GET)
lim = self.cut_off_limit
if cumulative_diff > self.cut_off_limit:
lim = -1
fixed raw_changeset for git, accidentally it was generated with hg patch headers...
r2083 size, cs1, cs2, diff, st = wrapped_diff(
filenode_old=None,
filenode_new=node,
cut_off_limit=lim,
ignore_whitespace=ign_whitespace_lcl,
line_context=line_context_lcl,
enable_comments=enable_comments
)
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 cumulative_diff += size
Implemented --stat for changelog
r1257 c.lines_added += st[0]
c.lines_deleted += st[1]
fixed raw_changeset for git, accidentally it was generated with hg patch headers...
r2083 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 #==================================================================
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 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())
Fixes for raw_id, needed for git...
r636
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 fid = h.FID(revision, node.path)
line_context_lcl = get_line_ctx(fid, request.GET)
ign_whitespace_lcl = get_ignore_ws(fid, request.GET)
lim = self.cut_off_limit
if cumulative_diff > self.cut_off_limit:
lim = -1
fixed raw_changeset for git, accidentally it was generated with hg patch headers...
r2083 size, cs1, cs2, diff, st = wrapped_diff(
filenode_old=filenode_old,
filenode_new=node,
cut_off_limit=lim,
ignore_whitespace=ign_whitespace_lcl,
line_context=line_context_lcl,
enable_comments=enable_comments
)
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 cumulative_diff += size
c.lines_added += st[0]
c.lines_deleted += st[1]
fixed raw_changeset for git, accidentally it was generated with hg patch headers...
r2083 c.changes[changeset.raw_id].append(
('changed', node, diff, cs1, cs2, st)
)
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 #==================================================================
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 for node in changeset.removed:
fixed raw_changeset for git, accidentally it was generated with hg patch headers...
r2083 c.changes[changeset.raw_id].append(
('removed', node, None, None, None, (0, 0))
)
Fixes for raw_id, needed for git...
r636
#71 code-review...
r1677 # count inline comments
for path, lines in c.inline_comments:
for comments in lines.values():
c.inline_cnt += len(comments)
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')
Added handling of ignore whitespace flag in changesets...
r1752 ignore_whitespace = request.GET.get('ignorews') == '1'
added line context control to diffs
r1768 line_context = request.GET.get('context', 3)
renamed project to rhodecode
r547 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:
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 f_gitdiff = diffs.get_gitdiff(filenode_old, node,
added line context control to diffs
r1768 ignore_whitespace=ignore_whitespace,
context=line_context)
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 diff = diffs.DiffProcessor(f_gitdiff,
pep8ify
r1212 format='gitdiff').raw_diff()
renamed project to rhodecode
r547
cs1 = None
fixed vcs issue with last_changeset for filenodes...
r2084 cs2 = node.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:
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 f_gitdiff = diffs.get_gitdiff(filenode_old, node,
added line context control to diffs
r1768 ignore_whitespace=ignore_whitespace,
context=line_context)
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 diff = diffs.DiffProcessor(f_gitdiff,
pep8ify
r1212 format='gitdiff').raw_diff()
renamed project to rhodecode
r547
fixed vcs issue with last_changeset for filenodes...
r2084 cs1 = filenode_old.changeset.raw_id
cs2 = node.changeset.raw_id
Fixes for raw_id, needed for git...
r636 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
fixed raw_changeset for git, accidentally it was generated with hg patch headers...
r2083 c.parent_tmpl = ''.join(['# Parent %s\n' % x.raw_id
for x in c.changeset.parents])
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')
#77 code review...
r1670
def comment(self, repo_name, revision):
Notification system improvements...
r1712 ChangesetCommentsModel().create(text=request.POST.get('text'),
repo_id=c.rhodecode_db_repo.repo_id,
user_id=c.rhodecode_user.user_id,
revision=revision,
f_path=request.POST.get('f_path'),
line_no=request.POST.get('line'))
commit less models...
r1749 Session.commit()
#77 code review...
r1670 return redirect(h.url('changeset_home', repo_name=repo_name,
revision=revision))
@jsonify
notification to commit author + gardening
r1716 def delete_comment(self, repo_name, comment_id):
#71 code review...
r1674 co = ChangesetComment.get(comment_id)
code garden for changeset ranges and comments...
r1787 owner = lambda: co.author.user_id == c.rhodecode_user.user_id
Notification system improvements...
r1712 if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner:
Tests updates, Session refactoring
r1713 ChangesetCommentsModel().delete(comment=co)
commit less models...
r1749 Session.commit()
#71 code review...
r1674 return True
else:
raise HTTPForbidden()