##// END OF EJS Templates
Adding context bar to the changeset page
Adding context bar to the changeset page

File last commit:

r3430:bbe21df7 beta
r3533:5462bb07 beta
Show More
changeset.py
404 lines | 14.6 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
new tooltip implementation...
r2971 from webob.exc import HTTPForbidden, HTTPBadRequest
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
fixed issue #671 commenting on pull requests sometimes used old JSON encoder and broke. This changeset replaces it's with RhodeCode json encoder to ensure all data is properly serializable
r3061 from rhodecode.lib.utils import jsonify
fixes #79 cut off limit was added into .ini config files
r812
fixed issue #671 commenting on pull requests sometimes used old JSON encoder and broke. This changeset replaces it's with RhodeCode json encoder to ensure all data is properly serializable
r3061 from rhodecode.lib.vcs.exceptions import RepositoryError, \
implements #307, configurable diffs...
r1776 ChangesetDoesNotExistError
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
Bumped mercurial version to 2.3...
r2684 from rhodecode.lib.utils import action_logger
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
Implemented initial code-review status of changesets
r2217 from rhodecode.model.db import ChangesetComment, ChangesetStatus
#77 code review...
r1670 from rhodecode.model.comment import ChangesetCommentsModel
dummy ChangesetStatus model
r2216 from rhodecode.model.changeset_status import ChangesetStatusModel
Tests updates, Session refactoring
r1713 from rhodecode.model.meta import Session
fixed issue #671 commenting on pull requests sometimes used old JSON encoder and broke. This changeset replaces it's with RhodeCode json encoder to ensure all data is properly serializable
r3061 from rhodecode.model.repo import RepoModel
Implemented generation of changesets based...
r2995 from rhodecode.lib.diffs import LimitedDiffContainer
Forbid changing changset status when it is associated with a closed pull request...
r2677 from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError
Bumped mercurial version to 2.3...
r2684 from rhodecode.lib.vcs.backends.base import EmptyChangeset
new patch function, and urls schema....
r2996 from rhodecode.lib.utils2 import safe_unicode
renamed project to rhodecode
r547
log = logging.getLogger(__name__)
pep8ify
r1212
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161 def _update_with_GET(params, GET):
for k in ['diff1', 'diff2', 'diff']:
params[k] += GET.getall(k)
def anchor_url(revision, path, GET):
implements #307, configurable diffs...
r1776 fid = h.FID(revision, path)
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161 return h.url.current(anchor=fid, **dict(GET))
code garden for changeset ranges and comments...
r1787
implements #307, configurable diffs...
r1776
def get_ignore_ws(fid, GET):
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161 ig_ws_global = 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
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161 def _ignorews_url(GET, fileid=None):
fileid = str(fileid) if fileid else None
implements #307, configurable diffs...
r1776 params = defaultdict(list)
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161 _update_with_GET(params, GET)
implements #307, configurable diffs...
r1776 lbl = _('show white space')
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161 ig_ws = get_ignore_ws(fileid, GET)
ln_ctx = get_line_ctx(fileid, GET)
implements #307, configurable diffs...
r1776 # 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):
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161 ln_ctx_global = GET.get('context')
Implemented generation of changesets based...
r2995 if fid:
ln_ctx = filter(lambda k: k.startswith('C'), GET.getall(fid))
else:
_ln_ctx = filter(lambda k: k.startswith('C'), GET)
ln_ctx = GET.get(_ln_ctx[0]) if _ln_ctx else ln_ctx_global
if ln_ctx:
ln_ctx = [ln_ctx]
code garden for changeset ranges and comments...
r1787
implements #307, configurable diffs...
r1776 if ln_ctx:
retval = ln_ctx[0].split(':')[-1]
else:
retval = ln_ctx_global
try:
return int(retval)
except:
Implemented generation of changesets based...
r2995 return 3
implements #307, configurable diffs...
r1776
code garden for changeset ranges and comments...
r1787
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161 def _context_url(GET, fileid=None):
implements #307, configurable diffs...
r1776 """
Generates url for context lines
code garden for changeset ranges and comments...
r1787
implements #307, configurable diffs...
r1776 :param fileid:
"""
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161
fileid = str(fileid) if fileid else None
ig_ws = get_ignore_ws(fileid, GET)
ln_ctx = (get_line_ctx(fileid, GET) or 3) * 2
implements #307, configurable diffs...
r1776
params = defaultdict(list)
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161 _update_with_GET(params, GET)
implements #307, configurable diffs...
r1776
# 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
Added mentions autocomplete into main comments form...
r2368 repo_model = RepoModel()
c.users_array = repo_model.get_users_js()
c.users_groups_array = repo_model.get_users_groups_js()
Fixes for raw_id, needed for git...
r636
new patch function, and urls schema....
r2996 def index(self, revision, method='show'):
implements #307, configurable diffs...
r1776 c.anchor_url = anchor_url
c.ignorews_url = _ignorews_url
c.context_url = _context_url
new patch function, and urls schema....
r2996 c.fulldiff = fulldiff = request.GET.get('fulldiff')
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,
Basic implementation of cherry picking changesets...
r3023 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
Implemented initial code-review status of changesets
r2217 c.changeset_statuses = ChangesetStatus.STATUSES
#77 code review...
r1670 c.comments = []
code-review initial
r2215 c.statuses = []
#71 code-review...
r1677 c.inline_comments = []
c.inline_cnt = 0
Implemented generation of changesets based...
r2995
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:
Implemented generation of changesets based...
r2995 inlines = []
if method == 'show':
show comments from pull requests into associated changesets
r3176 c.statuses.extend([ChangesetStatusModel().get_status(
c.rhodecode_db_repo.repo_id, changeset.raw_id)])
code-review initial
r2215
Implemented generation of changesets based...
r2995 c.comments.extend(ChangesetCommentsModel()\
.get_comments(c.rhodecode_db_repo.repo_id,
revision=changeset.raw_id))
show comments from pull requests into associated changesets
r3176
#comments from PR
st = ChangesetStatusModel().get_statuses(
c.rhodecode_db_repo.repo_id, changeset.raw_id,
with_revisions=True)
# from associated statuses, check the pull requests, and
# show comments from them
prs = set([x.pull_request for x in
filter(lambda x: x.pull_request != None, st)])
for pr in prs:
c.comments.extend(pr.comments)
Implemented generation of changesets based...
r2995 inlines = ChangesetCommentsModel()\
.get_inline_comments(c.rhodecode_db_repo.repo_id,
revision=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] = []
Implemented generation of changesets based...
r2995
cs2 = changeset.raw_id
cs1 = changeset.parents[0].raw_id if changeset.parents else EmptyChangeset()
context_lcl = get_line_ctx('', request.GET)
ign_whitespace_lcl = ign_whitespace_lcl = get_ignore_ws('', request.GET)
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977
Implemented generation of changesets based...
r2995 _diff = c.rhodecode_repo.get_diff(cs1, cs2,
ignore_whitespace=ign_whitespace_lcl, context=context_lcl)
new patch function, and urls schema....
r2996 diff_limit = self.cut_off_limit if not fulldiff else None
Implemented generation of changesets based...
r2995 diff_processor = diffs.DiffProcessor(_diff,
vcs=c.rhodecode_repo.alias,
format='gitdiff',
diff_limit=diff_limit)
cs_changes = OrderedDict()
if method == 'show':
_parsed = diff_processor.prepare()
c.limited_diff = False
if isinstance(_parsed, LimitedDiffContainer):
c.limited_diff = True
for f in _parsed:
st = f['stats']
if st[0] != 'b':
c.lines_added += st[0]
c.lines_deleted += st[1]
fid = h.FID(changeset.raw_id, f['filename'])
diff = diff_processor.as_html(enable_comments=enable_comments,
parsed_lines=[f])
cs_changes[fid] = [cs1, cs2, f['operation'], f['filename'],
diff, st]
else:
# downloads/raw we only need RAW diff nothing else
diff = diff_processor.as_raw()
cs_changes[''] = [None, None, None, None, diff, None]
c.changes[changeset.raw_id] = cs_changes
Fixes for raw_id, needed for git...
r636
show comments from pull requests into associated changesets
r3176 #sort comments by how they were generated
c.comments = sorted(c.comments, key=lambda x: x.comment_id)
#71 code-review...
r1677 # count inline comments
- pull request generates overview based on it's params...
r2440 for __, lines in c.inline_comments:
#71 code-review...
r1677 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]
Implemented generation of changesets based...
r2995 c.parent_tmpl = ''.join(['# Parent %s\n' % x.raw_id
for x in c.changeset.parents])
if method == 'download':
response.content_type = 'text/plain'
new patch function, and urls schema....
r2996 response.content_disposition = 'attachment; filename=%s.diff' \
% revision[:12]
return diff
elif method == 'patch':
response.content_type = 'text/plain'
c.diff = safe_unicode(diff)
return render('changeset/patch_changeset.html')
Implemented generation of changesets based...
r2995 elif method == 'raw':
response.content_type = 'text/plain'
new patch function, and urls schema....
r2996 return diff
Implemented generation of changesets based...
r2995 elif method == 'show':
if len(c.cs_ranges) == 1:
return render('changeset/changeset.html')
else:
return render('changeset/changeset_range.html')
renamed project to rhodecode
r547
new patch function, and urls schema....
r2996 def changeset_raw(self, revision):
return self.index(revision, method='raw')
def changeset_patch(self, revision):
return self.index(revision, method='patch')
def changeset_download(self, revision):
return self.index(revision, method='download')
#77 code review...
r1670
#415: Adding comment to changeset causes reload...
r2187 @jsonify
#77 code review...
r1670 def comment(self, repo_name, revision):
Add changeset status change into emails
r2296 status = request.POST.get('changeset_status')
change_status = request.POST.get('change_changeset_status')
always post text about status changes of code-review
r2796 text = request.POST.get('text')
if status and change_status:
text = text or (_('Status change -> %s')
% ChangesetStatus.get_status_lbl(status))
Add changeset status change into emails
r2296
notifications changes...
r3430 c.co = comm = ChangesetCommentsModel().create(
always post text about status changes of code-review
r2796 text=text,
Added dynamic data loading for other repo we open pull request against...
r2541 repo=c.rhodecode_db_repo.repo_id,
user=c.rhodecode_user.user_id,
#415: Adding comment to changeset causes reload...
r2187 revision=revision,
f_path=request.POST.get('f_path'),
Add changeset status change into emails
r2296 line_no=request.POST.get('line'),
white space cleanup
r2478 status_change=(ChangesetStatus.get_status_lbl(status)
Add changeset status change into emails
r2296 if status and change_status else None)
#415: Adding comment to changeset causes reload...
r2187 )
Implemented initial code-review status of changesets
r2217
# get status if set !
Add changeset status change into emails
r2296 if status and change_status:
Forbid changing changset status when it is associated with a closed pull request...
r2677 # if latest status was from pull request and it's closed
White space cleanup
r2815 # disallow changing status !
Forbid changing changset status when it is associated with a closed pull request...
r2677 # dont_allow_on_closed_pull_request = True !
try:
ChangesetStatusModel().set_status(
c.rhodecode_db_repo.repo_id,
status,
c.rhodecode_user.user_id,
comm,
revision=revision,
dont_allow_on_closed_pull_request=True
)
except StatusChangeOnClosedPullRequestError:
log.error(traceback.format_exc())
show comments from pull requests into associated changesets
r3176 msg = _('Changing status on a changeset associated with '
Forbid changing changset status when it is associated with a closed pull request...
r2677 'a closed pull request is not allowed')
h.flash(msg, category='warning')
return redirect(h.url('changeset_home', repo_name=repo_name,
revision=revision))
Implemented #467 Journal logs comments on changesets...
r2375 action_logger(self.rhodecode_user,
'user_commented_revision:%s' % revision,
c.rhodecode_db_repo, self.ip_addr, self.sa)
Forbid changing changset status when it is associated with a closed pull request...
r2677 Session().commit()
Implemented #467 Journal logs comments on changesets...
r2375
fixed main comments, prevent from sending inline comments if text is empty
r2189 if not request.environ.get('HTTP_X_PARTIAL_XHR'):
return redirect(h.url('changeset_home', repo_name=repo_name,
revision=revision))
notifications changes...
r3430 #only ajax below
#415: Adding comment to changeset causes reload...
r2187 data = {
'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
}
if comm:
data.update(comm.get_dict())
white space cleanup
r2188 data.update({'rendered_text':
render('changeset/changeset_comment_block.html')})
fixed main comments, prevent from sending inline comments if text is empty
r2189
#415: Adding comment to changeset causes reload...
r2187 return data
#77 code review...
r1670
@jsonify
notification to commit author + gardening
r1716 def delete_comment(self, repo_name, comment_id):
#71 code review...
r1674 co = ChangesetComment.get(comment_id)
Mads Kiilerich
access control: fix owner checks - they were always true...
r3141 owner = 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)
Forbid changing changset status when it is associated with a closed pull request...
r2677 Session().commit()
#71 code review...
r1674 return True
else:
raise HTTPForbidden()
new tooltip implementation...
r2971
@jsonify
def changeset_info(self, repo_name, revision):
hanlde stripped or removed changesets on changeset info function
r2978 if request.is_xhr:
try:
return c.rhodecode_repo.get_changeset(revision)
except ChangesetDoesNotExistError, e:
return EmptyChangeset(message=str(e))
new tooltip implementation...
r2971 else:
raise HTTPBadRequest()