##// END OF EJS Templates
removed wrong import
removed wrong import

File last commit:

r285:42f5c368 default
r304:14478d98 default
Show More
changeset.py
96 lines | 3.8 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>
few validation bugfixes/ new repo changesets, first commit changesets
r285 from pylons import tmpl_context as c, url
from pylons.controllers.util import redirect
from pylons_app.lib.auth import LoginRequired
from pylons_app.lib.base import BaseController, render
from pylons_app.model.hg_model import HgModel
from vcs.exceptions import RepositoryError
from vcs.nodes import FileNode
from vcs.utils import diffs as differ
import logging
import traceback
licensing updates, code cleanups
r252
# 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
"""
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()
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()
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:
diff = 'binary file'
else:
f_udiff = differ.get_udiff(filenode_old, node)
diff = differ.DiffProcessor(f_udiff).as_html()
try:
diff = unicode(diff)
except:
log.warning('Decoding failed of %s', filenode_old)
log.warning('Decoding failed of %s', node)
diff = 'unsupported type'
cs1 = None
cs2 = node.last_changeset.raw_id
c.changes.append(('added', node, diff, cs1, cs2))
version bump. Made changesets work as should, but vcs had to be fixed for that.
r218
few validation bugfixes/ new repo changesets, first commit changesets
r285 for node in c.changeset.changed:
filenode_old = c.changeset_old.get_node(node.path)
if filenode_old.is_binary or node.is_binary:
diff = 'binary file'
else:
f_udiff = differ.get_udiff(filenode_old, node)
diff = differ.DiffProcessor(f_udiff).as_html()
try:
diff = unicode(diff)
except:
log.warning('Decoding failed of %s', filenode_old)
log.warning('Decoding failed of %s', node)
diff = 'unsupported type'
cs1 = filenode_old.last_changeset.raw_id
cs2 = node.last_changeset.raw_id
c.changes.append(('changed', node, diff, cs1, cs2))
for node in c.changeset.removed:
c.changes.append(('removed', node, None, None, None))
version bump. Made changesets work as should, but vcs had to be fixed for that.
r218
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
r193 return render('changeset/changeset.html')