Changeset - 183cee110578
Parent rev.
Child rev.
[Not reviewed]
default
0 2 1
Marcin Kuzminski - 15 years ago 2010-09-11 01:52:16
marcin@python-works.com
first implementation of #34 changeset raw diff based on udiff from python
3 files changed with 64 insertions and 14 deletions:
pylons_app/config/routing.py
3
pylons_app/controllers/changeset.py
53
14
pylons_app/templates/changeset/raw_changeset.html
8
0 comments (0 inline, 0 general)
pylons_app/config/routing.py
➞
Show inline comments
 
@@ -119,24 +119,27 @@ def make_map(config):
 
    map.connect('rss_feed_home', '/{repo_name:.*}/feed/rss',
 
                controller='feed', action='rss',
 
                conditions=dict(function=check_repo))
 
    map.connect('atom_feed_home', '/{repo_name:.*}/feed/atom',
 
                controller='feed', action='atom',
 
                conditions=dict(function=check_repo))
 
 
 
    #OTHERS
 
    map.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}',
 
                controller='changeset', revision='tip',
 
                conditions=dict(function=check_repo))
 
    map.connect('raw_changeset_home', '/{repo_name:.*}/raw-changeset/{revision}',
 
                controller='changeset',action='raw_changeset', revision='tip',
 
                conditions=dict(function=check_repo))
 
    map.connect('summary_home', '/{repo_name:.*}/summary',
 
                controller='summary', conditions=dict(function=check_repo))
 
    map.connect('shortlog_home', '/{repo_name:.*}/shortlog',
 
                controller='shortlog', conditions=dict(function=check_repo))
 
    map.connect('branches_home', '/{repo_name:.*}/branches',
 
                controller='branches', conditions=dict(function=check_repo))
 
    map.connect('tags_home', '/{repo_name:.*}/tags',
 
                controller='tags', conditions=dict(function=check_repo))
 
    map.connect('changelog_home', '/{repo_name:.*}/changelog',
 
                controller='changelog', conditions=dict(function=check_repo))
 
    map.connect('files_home', '/{repo_name:.*}/files/{revision}/{f_path:.*}',
 
                controller='files', revision='tip', f_path='',
pylons_app/controllers/changeset.py
➞
Show inline comments
 
#!/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
 
"""
 
from pylons import tmpl_context as c, url, request
 
from pylons import tmpl_context as c, url, request, response
 
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
 
from vcs.exceptions import RepositoryError
 
from vcs.nodes import FileNode
 
from vcs.utils import diffs as differ
 
import logging
 
import traceback
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
		
 
@@ -55,43 +54,83 @@ class ChangesetController(BaseController

			




	
	
	
		
 
                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))

			




	
	
	
		
 
                

			




	
	
	
		
 
            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))            

			




	
	
	
		
 
            

			




	
	
	
		
 
        return render('changeset/changeset.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def raw_changeset(self,revision):

			




	
	
	
		
 
        

			




	
	
	
		
 
        hg_model = HgModel()

			




	
	
	
		
 
        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).raw_diff()

			




	
	
	
		
 

			




	
	
	
		
 
                cs1 = None

			




	
	
	
		
 
                cs2 = node.last_changeset.raw_id                                        

			




	
	
	
		
 
                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:

			




	
	
	
		
 
                    diff = 'binary file'

			




	
	
	
		
 
                else:    

			




	
	
	
		
 
                    f_udiff = differ.get_udiff(filenode_old, node)

			




	
	
	
		
 
                    diff = differ.DiffProcessor(f_udiff).raw_diff()

			




	
	
	
		
 

			




	
	
	
		
 
                cs1 = filenode_old.last_changeset.raw_id

			




	
	
	
		
 
                cs2 = node.last_changeset.raw_id                    

			




	
	
	
		
 
                c.changes.append(('changed', node, diff, cs1, cs2))      

			




	
	
	
		
 
        

			




	
	
	
		
 
        response.content_type = 'text/plain'

			




	
	
	
		
 

			




	
	
	
		
 
        parent = True if len(c.changeset.parents) > 0 else False

			




	
	
	
		
 
        c.parent_tmpl = 'Parent  %s' % c.changeset.parents[0]._hex if parent else ''

			




	
	
	
		
 
    

			




	
	
	
		
 
        c.diffs = ''

			




	
	
	
		
 
        for x in c.changes:

			




	
	
	
		
 
            c.diffs += x[2]

			




	
	
	
		
 
            

			




	
	
	
		
 
        return render('changeset/raw_changeset.html')

			




        

    


    
    

    

        

                

                    pylons_app/templates/changeset/raw_changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
# HG changeset patch

			




	
	
	
		
 
# User ${c.changeset.author}

			




	
	
	
		
 
# Date ${"%d %d" % c.changeset._ctx.date()}

			




	
	
	
		
 
# Node ID ${c.changeset._hex}

			




	
	
	
		
 
# ${c.parent_tmpl}

			




	
	
	
		
 
${c.changeset.message}

			




	
	
	
		
 

			




	
	
	
		
 
${c.diffs|n}

			




	
	
		
 
\ No newline at end of file

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.