Mercurial > kallithea
changeset 5743:20bf8e618bc9
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.
| author | domruf <dominikruf@gmail.com> |
|---|---|
| date | Wed, 02 Mar 2016 18:58:25 +0100 |
| parents | ff9eba8e2541 |
| children | 2d92227f576d |
| files | kallithea/controllers/files.py kallithea/model/scm.py kallithea/tests/functional/test_files.py |
| diffstat | 3 files changed, 29 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/files.py Thu Mar 03 18:53:16 2016 +0100 +++ b/kallithea/controllers/files.py Wed Mar 02 18:58:25 2016 +0100 @@ -26,6 +26,7 @@ """ import os +import posixpath import logging import traceback import tempfile @@ -471,7 +472,7 @@ 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:
--- a/kallithea/model/scm.py Thu Mar 03 18:53:16 2016 +0100 +++ b/kallithea/model/scm.py Wed Mar 02 18:58:25 2016 +0100 @@ -26,6 +26,7 @@ """ import os +import posixpath import re import time import traceback @@ -575,7 +576,7 @@ 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):
--- a/kallithea/tests/functional/test_files.py Thu Mar 03 18:53:16 2016 +0100 +++ b/kallithea/tests/functional/test_files.py Wed Mar 02 18:58:25 2016 +0100 @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- import os +import posixpath from kallithea.tests import * from kallithea.model.db import Repository from kallithea.model.meta import Session @@ -387,7 +388,7 @@ 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) @@ -463,7 +464,7 @@ 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) @@ -494,10 +495,10 @@ 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') @@ -525,19 +526,19 @@ 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) @@ -568,10 +569,10 @@ 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') @@ -599,19 +600,19 @@ 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) @@ -642,10 +643,10 @@ 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') @@ -673,18 +674,18 @@ 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) @@ -715,10 +716,10 @@ 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') @@ -746,17 +747,17 @@ 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)