##// END OF EJS Templates
merged
merged

File last commit:

r544:d8778cde default
r545:2e2ae0af merge default
Show More
changeset.py
176 lines | 7.4 KiB | text/x-python | PythonLexer
licensing updates, code cleanups
r252 #!/usr/bin/env python
# encoding: utf-8
# changeset controller for pylons
# Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
# 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; version 2
# of the License or (at your opinion) any later version of the license.
#
# 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, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA.
"""
Created on April 25, 2010
changeset controller for pylons
@author: marcink
"""
first implementation of #34 changeset raw diff based on udiff from python
r466 from pylons import tmpl_context as c, url, request, response
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 from pylons.i18n.translation import _
Implemented permissions into hg app, secured admin controllers, templates and repository specific controllers
r318 from pylons.controllers.util import redirect
from pylons_app.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
from pylons_app.lib.base import BaseController, render
from pylons_app.model.hg_model import HgModel
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 from vcs.exceptions import RepositoryError, ChangesetError
Implemented permissions into hg app, secured admin controllers, templates and repository specific controllers
r318 from vcs.nodes import FileNode
from vcs.utils import diffs as differ
import logging
import traceback
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
r193
Added changeset controllers
r103 log = logging.getLogger(__name__)
class ChangesetController(BaseController):
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
r193
@LoginRequired()
Implemented permissions into hg app, secured admin controllers, templates and repository specific controllers
r318 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
'repository.admin')
Added changeset controllers
r103 def __before__(self):
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
r193 super(ChangesetController, self).__before__()
Added changeset controllers
r103
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
r193 def index(self, revision):
hg_model = HgModel()
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 cut_off_limit = 1024 * 100
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
try:
c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision)
except RepositoryError:
log.error(traceback.format_exc())
return redirect(url('hg_home'))
else:
try:
c.changeset_old = c.changeset.parents[0]
except IndexError:
c.changeset_old = None
c.changes = []
added limits to single file diffs...
r544
#===================================================================
# ADDED FILES
#===================================================================
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 c.sum_added = 0
for node in c.changeset.added:
filenode_old = FileNode(node.path, '')
if filenode_old.is_binary or node.is_binary:
diff = wrap_to_table(_('binary file'))
else:
added limits to single file diffs...
r544 c.sum_added += node.size
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 if c.sum_added < cut_off_limit:
f_udiff = differ.get_udiff(filenode_old, node)
diff = differ.DiffProcessor(f_udiff).as_html()
else:
added limits to single file diffs...
r544 diff = wrap_to_table(_('Changeset is to big and was cut'
' off, see raw changeset instead'))
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543
cs1 = None
cs2 = node.last_changeset.short_id
c.changes.append(('added', node, diff, cs1, cs2))
added limits to single file diffs...
r544 #===================================================================
# CHANGED FILES
#===================================================================
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 c.sum_removed = 0
for node in c.changeset.changed:
try:
filenode_old = c.changeset_old.get_node(node.path)
except ChangesetError:
filenode_old = FileNode(node.path, '')
if filenode_old.is_binary or node.is_binary:
diff = wrap_to_table(_('binary file'))
else:
added limits to single file diffs...
r544 c.sum_removed += node.size
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 if c.sum_removed < cut_off_limit:
f_udiff = differ.get_udiff(filenode_old, node)
diff = differ.DiffProcessor(f_udiff).as_html()
else:
added limits to single file diffs...
r544 diff = wrap_to_table(_('Changeset is to big and was cut'
' off, see raw changeset instead'))
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543
cs1 = filenode_old.last_changeset.short_id
cs2 = node.last_changeset.short_id
c.changes.append(('changed', node, diff, cs1, cs2))
added limits to single file diffs...
r544 #===================================================================
# REMOVED FILES
#===================================================================
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 for node in c.changeset.removed:
c.changes.append(('removed', node, None, None, None))
return render('changeset/changeset.html')
def raw_changeset(self, revision):
hg_model = HgModel()
method = request.GET.get('diff', 'show')
few validation bugfixes/ new repo changesets, first commit changesets
r285 try:
c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision)
except RepositoryError:
log.error(traceback.format_exc())
return redirect(url('hg_home'))
else:
try:
c.changeset_old = c.changeset.parents[0]
except IndexError:
c.changeset_old = None
c.changes = []
for node in c.changeset.added:
filenode_old = FileNode(node.path, '')
if filenode_old.is_binary or node.is_binary:
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 diff = _('binary file')
first implementation of #34 changeset raw diff based on udiff from python
r466 else:
f_udiff = differ.get_udiff(filenode_old, node)
diff = differ.DiffProcessor(f_udiff).raw_diff()
cs1 = None
refactoring for new vcs implementation...
r512 cs2 = node.last_changeset.short_id
first implementation of #34 changeset raw diff based on udiff from python
r466 c.changes.append(('added', node, diff, cs1, cs2))
for node in c.changeset.changed:
filenode_old = c.changeset_old.get_node(node.path)
if filenode_old.is_binary or node.is_binary:
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 diff = _('binary file')
first implementation of #34 changeset raw diff based on udiff from python
r466 else:
f_udiff = differ.get_udiff(filenode_old, node)
diff = differ.DiffProcessor(f_udiff).raw_diff()
refactoring for new vcs implementation...
r512 cs1 = filenode_old.last_changeset.short_id
cs2 = node.last_changeset.short_id
first implementation of #34 changeset raw diff based on udiff from python
r466 c.changes.append(('changed', node, diff, cs1, cs2))
response.content_type = 'text/plain'
added menu for changeset raw diff and download diff...
r468 if method == 'download':
response.content_disposition = 'attachment; filename=%s.patch' % revision
first implementation of #34 changeset raw diff based on udiff from python
r466 parent = True if len(c.changeset.parents) > 0 else False
fixes #13 large initial commits and changesets are cut of now to not freeze the application....
r543 c.parent_tmpl = 'Parent %s' % c.changeset.parents[0].raw_id if parent else ''
first implementation of #34 changeset raw diff based on udiff from python
r466
c.diffs = ''
for x in c.changes:
c.diffs += x[2]
return render('changeset/raw_changeset.html')