Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ankostis-cygwin

Author: Byron

.appveyor.yml

@@ -21,18 +21,17 @@ environment:
 IS_CONDA: "yes"
 GIT_PATH: "%GIT_DAEMON_PATH%"
 
-# ## Cygwin
-# #
-# - PYTHON: "C:\\Miniconda-x64"
-# PYTHON_VERSION: "2.7"
-# IS_CONDA: "yes"
-# GIT_PATH: "%CYGWIN_GIT_PATH%"
-# - PYTHON: "C:\\Python34-x64"
-# PYTHON_VERSION: "3.4"
-# GIT_PATH: "%CYGWIN_GIT_PATH%"
-# - PYTHON: "C:\\Python35-x64"
-# PYTHON_VERSION: "3.5"
-# GIT_PATH: "%CYGWIN64_GIT_PATH%"
+## Cygwin
+#
+ - PYTHON: "C:\\Miniconda-x64"
+PYTHON_VERSION: "2.7"
+IS_CONDA: "yes"
+IS_CYGWIN: "yes"
+GIT_PATH: "%CYGWIN_GIT_PATH%"
+ - PYTHON: "C:\\Python35-x64"
+PYTHON_VERSION: "3.5"
+GIT_PATH: "%CYGWIN64_GIT_PATH%"
+IS_CYGWIN: "yes"
 
 
 install:
@@ -48,14 +47,12 @@ install:
  python --version
  python -c "import struct; print(struct.calcsize('P') * 8)"
 
- - IF "%IS_CONDA%"=="yes" (
+ - IF "%IS_CONDA%" == "yes" (
 conda info -a &
 conda install --yes --quiet pip
 )
- - pip install nose ddt wheel codecov
- - IF "%PYTHON_VERSION%"=="2.7" (
-pip install mock
-)
+ - pip install -r test-requirements.txt
+ - pip install codecov
 
 ## Copied from `init-tests-after-clone.sh`.
 #
@@ -79,7 +76,15 @@ install:
 build: false
 
 test_script:
- - IF "%PYTHON_VERSION%"=="3.5" (nosetests -v --with-coverage) ELSE (nosetests -v)
+ - IF "%IS_CYGWIN%" == "yes" (
+nosetests -v
+) ELSE (
+IF "%PYTHON_VERSION%" == "3.5" (
+nosetests -v --with-coverage
+) ELSE (
+nosetests -v
+)
+)
 
 on_success:
- - IF "%PYTHON_VERSION%"=="3.5" (codecov)
+ - IF "%PYTHON_VERSION%" == "3.5" IF NOT "%IS_CYGWIN%" == "yes" (codecov)

.travis.yml

@@ -1,14 +1,10 @@
 language: python
 python:
- - "2.6"
  - "2.7"
  - "3.3"
  - "3.4"
  - "3.5"
 # - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details)
-matrix:
-allow_failures:
- - python: "2.6"
 git:
 # a higher depth is needed for most of the tests - must be high enough to not actually be shallow
 # as we clone our own repository in the process
@@ -17,7 +13,8 @@ install:
  - python --version; git --version
  - git submodule update --init --recursive
  - git fetch --tags
- - pip install codecov flake8 ddt sphinx
+ - pip install -r test-requirements.txt
+ - pip install codecov sphinx
 
 # generate some reflog as git-python tests need it (in master)
  - ./init-tests-after-clone.sh

git/__init__.py

@@ -5,9 +5,12 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 # flake8: noqa
 #@PydevCodeAnalysisIgnore
+importinspect
 importos
 importsys
-importinspect
+
+importos.pathasosp
+
 
 __version__='git'
 
@@ -16,7 +19,7 @@
 def_init_externals():
 """Initialize external projects by putting them into the path"""
 if__version__=='git':
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'ext', 'gitdb'))
+sys.path.insert(0, osp.join(osp.dirname(__file__), 'ext', 'gitdb'))
 
 try:
 importgitdb

git/cmd.py

@@ -31,6 +31,7 @@
 )
 fromgit.excimportCommandError
 fromgit.odictimportOrderedDict
+fromgit.utilimportis_cygwin_git, cygpath
 
 from .excimport (
 GitCommandError,
@@ -191,8 +192,26 @@ def __setstate__(self, d):
 USE_SHELL=False
 
 @classmethod
-defpolish_url(cls, url):
-returnurl.replace("\\\\", "\\").replace("\\", "/")
+defis_cygwin(cls):
+returnis_cygwin_git(cls.GIT_PYTHON_GIT_EXECUTABLE)
+
+@classmethod
+defpolish_url(cls, url, is_cygwin=None):
+ifis_cygwinisNone:
+is_cygwin=cls.is_cygwin()
+
+ifis_cygwin:
+url=cygpath(url)
+else:
+"""Remove any backslahes from urls to be written in config files.
+
+ Windows might create config-files containing paths with backslashed,
+ but git stops liking them as it will escape the backslashes.
+ Hence we undo the escaping just to be sure.
+ """
+url=url.replace("\\\\", "\\").replace("\\", "/")
+
+returnurl
 
 classAutoInterrupt(object):
 """Kill/Interrupt the stored process instance once this instance goes out of scope. It is

git/config.py

@@ -6,21 +6,13 @@
 """Module containing module parser implementation able to properly read and write
 configuration files"""
 
-importre
-try:
-importConfigParserascp
-exceptImportError:
-# PY3
-importconfigparserascp
+importabc
+fromfunctoolsimportwraps
 importinspect
 importlogging
-importabc
 importos
+importre
 
-fromfunctoolsimportwraps
-
-fromgit.odictimportOrderedDict
-fromgit.utilimportLockFile
 fromgit.compatimport (
 string_types,
 FileType,
@@ -29,6 +21,18 @@
 with_metaclass,
 PY3
 )
+fromgit.odictimportOrderedDict
+fromgit.utilimportLockFile
+
+importos.pathasosp
+
+
+try:
+importConfigParserascp
+exceptImportError:
+# PY3
+importconfigparserascp
+
 
 __all__= ('GitConfigParser', 'SectionConstraint')
 
@@ -408,15 +412,15 @@ def read(self):
 ifself._has_includes():
 for_, include_pathinself.items('include'):
 ifinclude_path.startswith('~'):
-include_path=os.path.expanduser(include_path)
-ifnotos.path.isabs(include_path):
+include_path=osp.expanduser(include_path)
+ifnotosp.isabs(include_path):
 ifnotfile_ok:
 continue
 # end ignore relative paths if we don't know the configuration file path
-assertos.path.isabs(file_path), "Need absolute paths to be sure our cycle checks will work"
-include_path=os.path.join(os.path.dirname(file_path), include_path)
+assertosp.isabs(file_path), "Need absolute paths to be sure our cycle checks will work"
+include_path=osp.join(osp.dirname(file_path), include_path)
 # end make include path absolute
-include_path=os.path.normpath(include_path)
+include_path=osp.normpath(include_path)
 ifinclude_pathinseenornotos.access(include_path, os.R_OK):
 continue
 seen.add(include_path)

git/db.py

@@ -1,12 +1,9 @@
 """Module with our own gitdb implementation - it uses the git command"""
+fromgit.utilimportbin_to_hex, hex_to_bin
 fromgitdb.baseimport (
 OInfo,
 OStream
 )
-fromgitdb.utilimport (
-bin_to_hex,
-hex_to_bin
-)
 fromgitdb.dbimportGitDB# @UnusedImport
 fromgitdb.dbimportLooseObjectDB
 

git/diff.py

@@ -5,18 +5,17 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 importre
 
-fromgitdb.utilimporthex_to_bin
+fromgit.cmdimporthandle_process_output
+fromgit.compatimport (
+defenc,
+PY3
+)
+fromgit.utilimportfinalize_process, hex_to_bin
 
 from .compatimportbinary_type
 from .objects.blobimportBlob
 from .objects.utilimportmode_str_to_int
 
-fromgit.compatimport (
-defenc,
-PY3
-)
-fromgit.cmdimporthandle_process_output
-fromgit.utilimportfinalize_process
 
 __all__= ('Diffable', 'DiffIndex', 'Diff', 'NULL_TREE')