Changeset - 20bf8e618bc9
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
domruf - 10 years ago 2016-03-02 18:58:25
dominikruf@gmail.com
windows: node paths should always use posixpath - avoid \ in repo internal paths on windows

Using \ on Windows would result in a wrong node path which could not be checked
out with Git on Windows.
3 files changed with 29 insertions and 26 deletions:
kallithea/controllers/files.py
2
1
kallithea/model/scm.py
2
1
kallithea/tests/functional/test_files.py
25
24
0 comments (0 inline, 0 general)
kallithea/controllers/files.py
➞
Show inline comments
 
@@ -23,12 +23,13 @@ Original author and date, and relevant c
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
:license: GPLv3, see LICENSE.md for more details.
 
"""
 

			




	
	
	
		
 
import os

			




	
	
	
		
 
import posixpath

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import tempfile

			




	
	
	
		
 
import shutil

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import request, response, tmpl_context as c, url

			




	
	
		
 
@@ -468,13 +469,13 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
            if not filename:

			




	
	
	
		
 
                h.flash(_('No filename'), category='warning')

			




	
	
	
		
 
                raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name,

			




	
	
	
		
 
                                    revision='tip'))

			




	
	
	
		
 
            #strip all crap out of file, just leave the basename

			




	
	
	
		
 
            filename = os.path.basename(filename)

			




	
	
	
		
 
            node_path = os.path.join(location, filename)

			




	
	
	
		
 
            node_path = posixpath.join(location, filename)

			




	
	
	
		
 
            author = self.authuser.full_contact

			




	
	
	
		
 

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                nodes = {

			




	
	
	
		
 
                    node_path: {

			




	
	
	
		
 
                        'content': content

			




        

    


    
    

    

        

                

                    kallithea/model/scm.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,12 +23,13 @@ Original author and date, and relevant c

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import os

			




	
	
	
		
 
import posixpath

			




	
	
	
		
 
import re

			




	
	
	
		
 
import time

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import cStringIO

			




	
	
	
		
 
import pkg_resources

			




	
	
		
 
@@ -572,13 +573,13 @@ class ScmModel(BaseModel):

			




	
	
	
		
 
        return tip

			




	
	
	
		
 

			




	
	
	
		
 
    def _sanitize_path(self, f_path):

			




	
	
	
		
 
        if f_path.startswith('/') or f_path.startswith('.') or '../' in f_path:

			




	
	
	
		
 
            raise NonRelativePathError('%s is not an relative path' % f_path)

			




	
	
	
		
 
        if f_path:

			




	
	
	
		
 
            f_path = os.path.normpath(f_path)

			




	
	
	
		
 
            f_path = posixpath.normpath(f_path)

			




	
	
	
		
 
        return f_path

			




	
	
	
		
 

			




	
	
	
		
 
    def get_nodes(self, repo_name, revision, root_path='/', flat=True):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Recursively walk root dir and return a set of all paths found.

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# -*- coding: utf-8 -*-

			




	
	
	
		
 
import os

			




	
	
	
		
 
import posixpath

			




	
	
	
		
 
from kallithea.tests import *

			




	
	
	
		
 
from kallithea.model.db import Repository

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 
from kallithea.tests.fixture import Fixture

			




	
	
	
		
 

			




	
	
	
		
 
fixture = Fixture()

			




	
	
		
 
@@ -384,13 +385,13 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
                                    'location': location,

			




	
	
	
		
 
                                    '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                 },

			




	
	
	
		
 
                                 status=302)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % os.path.join(location, filename))

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            fixture.destroy_repo(repo.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
    # Git - add file

			




	
	
	
		
 
    def test_add_file_view_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
		
 
@@ -460,13 +461,13 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
                                    'location': location,

			




	
	
	
		
 
                                    '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                 },

			




	
	
	
		
 
                                 status=302)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % os.path.join(location, filename))

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            fixture.destroy_repo(repo.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
    # Hg - EDIT

			




	
	
	
		
 
    def test_edit_file_view_hg(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
		
 
@@ -491,16 +492,16 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
                                    '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                 },

			




	
	
	
		
 
                                 status=302)

			




	
	
	
		
 
        response.follow()

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % os.path.join(location, filename))

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
            response = self.app.get(url('files_edit_home',

			




	
	
	
		
 
                                          repo_name=repo.repo_name,

			




	
	
	
		
 
                                          revision='tip', f_path='vcs/nodes.py'),

			




	
	
	
		
 
                                          revision='tip', f_path=posixpath.join(location, filename)),

			




	
	
	
		
 
                                    status=302)

			




	
	
	
		
 
            self.checkSessionFlash(response,

			




	
	
	
		
 
                'You can only edit files with revision being a valid branch')

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            fixture.destroy_repo(repo.repo_name)

			




	
	
	
		
 

			




	
	
		
 
@@ -522,25 +523,25 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
                                    '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                 },

			




	
	
	
		
 
                                 status=302)

			




	
	
	
		
 
        response.follow()

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % os.path.join(location, filename))

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
            response = self.app.post(url('files_edit_home',

			




	
	
	
		
 
                                          repo_name=repo.repo_name,

			




	
	
	
		
 
                                          revision=repo.scm_instance.DEFAULT_BRANCH_NAME,

			




	
	
	
		
 
                                          f_path='vcs/nodes.py'),

			




	
	
	
		
 
                                          f_path=posixpath.join(location, filename)),

			




	
	
	
		
 
                                     params={

			




	
	
	
		
 
                                        'content': "def py():\n print 'hello world'\n",

			




	
	
	
		
 
                                        'message': 'i commited',

			




	
	
	
		
 
                                        '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                     },

			




	
	
	
		
 
                                    status=302)

			




	
	
	
		
 
            self.checkSessionFlash(response,

			




	
	
	
		
 
                                   'Successfully committed to vcs/nodes.py')

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            fixture.destroy_repo(repo.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
    # Git - edit

			




	
	
	
		
 
    def test_edit_file_view_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
		
 
@@ -565,16 +566,16 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
                                    '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                 },

			




	
	
	
		
 
                                 status=302)

			




	
	
	
		
 
        response.follow()

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % os.path.join(location, filename))

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
            response = self.app.get(url('files_edit_home',

			




	
	
	
		
 
                                          repo_name=repo.repo_name,

			




	
	
	
		
 
                                          revision='tip', f_path='vcs/nodes.py'),

			




	
	
	
		
 
                                          revision='tip', f_path=posixpath.join(location, filename)),

			




	
	
	
		
 
                                    status=302)

			




	
	
	
		
 
            self.checkSessionFlash(response,

			




	
	
	
		
 
                'You can only edit files with revision being a valid branch')

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            fixture.destroy_repo(repo.repo_name)

			




	
	
	
		
 

			




	
	
		
 
@@ -596,25 +597,25 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
                                    '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                 },

			




	
	
	
		
 
                                 status=302)

			




	
	
	
		
 
        response.follow()

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % os.path.join(location, filename))

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
            response = self.app.post(url('files_edit_home',

			




	
	
	
		
 
                                          repo_name=repo.repo_name,

			




	
	
	
		
 
                                          revision=repo.scm_instance.DEFAULT_BRANCH_NAME,

			




	
	
	
		
 
                                          f_path='vcs/nodes.py'),

			




	
	
	
		
 
                                          f_path=posixpath.join(location, filename)),

			




	
	
	
		
 
                                     params={

			




	
	
	
		
 
                                        'content': "def py():\n print 'hello world'\n",

			




	
	
	
		
 
                                        'message': 'i commited',

			




	
	
	
		
 
                                        '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                     },

			




	
	
	
		
 
                                    status=302)

			




	
	
	
		
 
            self.checkSessionFlash(response,

			




	
	
	
		
 
                                   'Successfully committed to vcs/nodes.py')

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            fixture.destroy_repo(repo.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
    # Hg - delete

			




	
	
	
		
 
    def test_delete_file_view_hg(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
		
 
@@ -639,16 +640,16 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
                                    '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                 },

			




	
	
	
		
 
                                 status=302)

			




	
	
	
		
 
        response.follow()

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % os.path.join(location, filename))

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
            response = self.app.get(url('files_delete_home',

			




	
	
	
		
 
                                          repo_name=repo.repo_name,

			




	
	
	
		
 
                                          revision='tip', f_path='vcs/nodes.py'),

			




	
	
	
		
 
                                          revision='tip', f_path=posixpath.join(location, filename)),

			




	
	
	
		
 
                                    status=302)

			




	
	
	
		
 
            self.checkSessionFlash(response,

			




	
	
	
		
 
                'You can only delete files with revision being a valid branch')

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            fixture.destroy_repo(repo.repo_name)

			




	
	
	
		
 

			




	
	
		
 
@@ -670,24 +671,24 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
                                    '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                 },

			




	
	
	
		
 
                                 status=302)

			




	
	
	
		
 
        response.follow()

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % os.path.join(location, filename))

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
            response = self.app.post(url('files_delete_home',

			




	
	
	
		
 
                                          repo_name=repo.repo_name,

			




	
	
	
		
 
                                          revision=repo.scm_instance.DEFAULT_BRANCH_NAME,

			




	
	
	
		
 
                                          f_path='vcs/nodes.py'),

			




	
	
	
		
 
                                          f_path=posixpath.join(location, filename)),

			




	
	
	
		
 
                                     params={

			




	
	
	
		
 
                                        'message': 'i commited',

			




	
	
	
		
 
                                        '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                     },

			




	
	
	
		
 
                                    status=302)

			




	
	
	
		
 
            self.checkSessionFlash(response,

			




	
	
	
		
 
                                   'Successfully deleted file vcs/nodes.py')

			




	
	
	
		
 
                                   'Successfully deleted file %s' % posixpath.join(location, filename))

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            fixture.destroy_repo(repo.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
    # Git - delete

			




	
	
	
		
 
    def test_delete_file_view_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
		
 
@@ -712,16 +713,16 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
                                    '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                 },

			




	
	
	
		
 
                                 status=302)

			




	
	
	
		
 
        response.follow()

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % os.path.join(location, filename))

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
            response = self.app.get(url('files_delete_home',

			




	
	
	
		
 
                                          repo_name=repo.repo_name,

			




	
	
	
		
 
                                          revision='tip', f_path='vcs/nodes.py'),

			




	
	
	
		
 
                                          revision='tip', f_path=posixpath.join(location, filename)),

			




	
	
	
		
 
                                    status=302)

			




	
	
	
		
 
            self.checkSessionFlash(response,

			




	
	
	
		
 
                'You can only delete files with revision being a valid branch')

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            fixture.destroy_repo(repo.repo_name)

			




	
	
	
		
 

			




	
	
		
 
@@ -743,20 +744,20 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
                                    '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                 },

			




	
	
	
		
 
                                 status=302)

			




	
	
	
		
 
        response.follow()

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.checkSessionFlash(response, 'Successfully committed to %s'

			




	
	
	
		
 
                                   % os.path.join(location, filename))

			




	
	
	
		
 
                                   % posixpath.join(location, filename))

			




	
	
	
		
 
            response = self.app.post(url('files_delete_home',

			




	
	
	
		
 
                                          repo_name=repo.repo_name,

			




	
	
	
		
 
                                          revision=repo.scm_instance.DEFAULT_BRANCH_NAME,

			




	
	
	
		
 
                                          f_path='vcs/nodes.py'),

			




	
	
	
		
 
                                          f_path=posixpath.join(location, filename)),

			




	
	
	
		
 
                                     params={

			




	
	
	
		
 
                                        'message': 'i commited',

			




	
	
	
		
 
                                        '_authentication_token': self.authentication_token(),

			




	
	
	
		
 
                                     },

			




	
	
	
		
 
                                    status=302)

			




	
	
	
		
 
            self.checkSessionFlash(response,

			




	
	
	
		
 
                                   'Successfully deleted file vcs/nodes.py')

			




	
	
	
		
 
                                   'Successfully deleted file %s' % posixpath.join(location, filename))

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            fixture.destroy_repo(repo.repo_name)

			




        

    



    


    



    



      

      





    
    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.