Dec 11, 2017 · Sep 28, 2017 · Nov 27, 2017 · Nov 27, 2017 · Nov 27, 2017 · Nov 28, 2017
diff --git a/.appveyor.yml b/.appveyor.yml
        echo %PATH%
        uname -a
        git --version
        where git git-daemon python pip pip3 pip34
        where git git-daemon python pip pip3 pip34 sh
        python --version
        python -c "import struct; print(struct.calcsize('P') * 8)"


 on_success:
    - IF "%PYTHON_VERSION%" == "3.5" IF NOT "%IS_CYGWIN%" == "yes" (codecov)

 # Enable this to be able to login to the build worker. You can use the
 # `remmina` program in Ubuntu, use the login information that the line below
 # prints into the log.
 #on_finish:
 #    - |
 #        echo "Running on_finish to establish connection back to the instance"
 #    - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
diff --git a/AUTHORS b/AUTHORS
 -Piotr Babij <piotr.babij _at_ gmail.com>
 -Mikuláš Poul <mikulaspoul _at_ gmail.com>
 -Charles Bouchard-Légaré <cblegare.atl _at_ ntis.ca>
 -Yaroslav Halchenko <debian _at_ onerussian.com>

 Portions derived from other open source works and are clearly marked.
diff --git a/VERSION b/VERSION
 2.1.6
 2.1.7
diff --git a/git/compat.py b/git/compat.py

 try:
 b"100644\x9f\0aaa".decode(defenc,"surrogateescape")
 except:
 exceptException:
 register_surrogateescape()
diff --git a/git/config.py b/git/config.py
                    if include_path in seen or not os.access(include_path, os.R_OK):
                        continue
                    seen.add(include_path)
                    files_to_read.append(include_path)
                    # insert included file to the top to be considered first
                    files_to_read.insert(0, include_path)
                    num_read_include_files += 1
                # each include path in configuration file
            # end handle includes
diff --git a/git/diff.py b/git/diff.py
            h %= self.b_blob.path

        msg = ''
 l = None    # temp line
 ll = 0      # line length
 line = None    # temp line
 line_length = 0      # line length
        for b, n in zip((self.a_blob, self.b_blob), ('lhs', 'rhs')):
            if b:
 l = "\n%s: %o | %s" % (n, b.mode, b.hexsha)
 line = "\n%s: %o | %s" % (n, b.mode, b.hexsha)
            else:
 l = "\n%s: None" % n
 line = "\n%s: None" % n
            # END if blob is not None
 ll = max(len(l),ll)
            msg +=l
 line_length = max(len(line),line_length)
            msg +=line
        # END for each blob

        # add headline
        h += '\n' + '=' *ll
        h += '\n' + '=' *line_length

        if self.deleted_file:
            msg += '\nfile deleted in rhs'
diff --git a/git/exc.py b/git/exc.py
            else:
                try:
                    status = u'exit code(%s)' % int(status)
                except:
                except (ValueError, TypeError):
                    s = safe_decode(str(status))
                    status = u"'%s'" % s if isinstance(status, string_types) else s

diff --git a/git/refs/log.py b/git/refs/log.py
 try:
 self._serialize(fp)
 lfd.commit()
 except:
 exceptException:
 # on failure it rolls back automatically, but we make it clear
 lfd.rollback()
 raise
diff --git a/git/remote.py b/git/remote.py
                        if '  Push  URL:' in line:
                            yield line.split(': ')[-1]
                except GitCommandError as ex:
                    if any([msg in str(ex) for msg in ['correct access rights','cannot run ssh']]):
                        # If ssh is not setup to access this repository, see issue 694
                        result = Git().execute(['git','config','--get','remote.%s.url' % self.name])
                    if any([msg in str(ex) for msg in ['correct access rights', 'cannot run ssh']]):
                        # If ssh is not setup to access this repository, see issue 694
                        result = Git().execute(
                            ['git', 'config', '--get', 'remote.%s.url' % self.name]
                        )
                        yield result
                    else:
                        raise ex
diff --git a/git/repo/base.py b/git/repo/base.py
 def__del__(self):
 try:
 self.close()
 except:
 exceptException:
 pass

 defclose(self):
diff --git a/git/test/fixtures/git_config b/git/test/fixtures/git_config
 url = git://gitorious.org/~martin.marcher/git-python/serverhorror.git
 fetch = +refs/heads/*:refs/remotes/MartinMarcher/*
    # can handle comments - the section name is supposed to be stripped
 # causes stock git-config puke
 [  gui ]
 geometry = 1316x820+219+243 207 192
 [branch "mainline_performance"]
 remote = mainline
 merge = refs/heads/master
 # section with value defined before include to be overriden
 [sec]
    var0 = value0_main
 [include]
 path = doesntexist.cfg
 abspath = /usr/bin/foodoesntexist.bar
    path = doesntexist.cfg
    # field should be 'path' so abspath should be ignored
    abspath = /usr/bin/foodoesntexist.bar
    path = /usr/bin/foodoesntexist.bar
    # should be relative to the path of this config file
    path = ./git_config-inc.cfg
 # and defined after include.  According to the documentation
 # and behavior of git config, this should be the value since
 # inclusions should be processed immediately
 [sec]
    var1 = value1_main

diff --git a/git/test/fixtures/git_config-inc.cfg b/git/test/fixtures/git_config-inc.cfg
 [sec]
    var0 = value0_included
    var1 = value1_included
 [diff]
    tool = diff_included
diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py
    import unittest

 TestCase = unittest.TestCase
 SkipTest = unittest.SkipTest
 skipIf = unittest.skipIf

 ospd = osp.dirname


 __all__ = (
    'fixture_path', 'fixture', 'StringProcessAdapter',
    'with_rw_directory', 'with_rw_repo', 'with_rw_and_rw_remote_repo', 'TestBase', 'TestCase',
    'with_rw_directory', 'with_rw_repo', 'with_rw_and_rw_remote_repo',
    'TestBase', 'TestCase',
    'SkipTest', 'skipIf',
    'GIT_REPO', 'GIT_DAEMON_PORT'
 )

            try:
                try:
                    return func(self, rw_repo)
                except:
                except:  # noqa E722
                    log.info("Keeping repo after failure: %s", repo_dir)
                    repo_dir = None
                    raise
    Same as with_rw_repo, but also provides a writable remote repository from which the
    rw_repo has been forked as well as a handle for a git-daemon that may be started to
    run the remote_repo.
    The remote repository was cloned as bare repository from therorepo, whereas
    The remote repository was cloned as bare repository from thero repo, whereas
    the rw repo has a working tree and was cloned from the remote repository.

    remote_repo has two remotes: origin and daemon_origin. One uses a local url,
                    with cwd(rw_repo.working_dir):
                        try:
                            return func(self, rw_repo, rw_daemon_repo)
                        except:
                        except:  # noqa E722
                            log.info("Keeping repos after failure: \n  rw_repo_dir: %s \n  rw_daemon_repo_dir: %s",
                                     rw_repo_dir, rw_daemon_repo_dir)
                            rw_repo_dir = rw_daemon_repo_dir = None
diff --git a/git/test/test_commit.py b/git/test/test_commit.py
        # at some point, both iterations should stop
        self.assertEqual(list(bfirst)[-1], first)
        stoptraverse = self.rorepo.commit("254d04aa3180eb8b8daf7b7ff25f010cd69b4e7d").traverse(as_edge=True)
        l = list(stoptraverse)
        self.assertEqual(len(l[0]), 2)
        self.assertEqual(len(next(stoptraverse)), 2)

        # ignore self
        self.assertEqual(next(start.traverse(ignore_self=False)), start)
diff --git a/git/test/test_config.py b/git/test/test_config.py
 from git.test.lib import (
    TestCase,
    fixture_path,
    SkipTest,
 )
 from git.test.lib import with_rw_directory

                assert r_config.get(sname, oname) == val
        # END for each filename

    def test_includes_order(self):
        with GitConfigParser(list(map(fixture_path, ("git_config", "git_config_global")))) as r_config:
            r_config.read()                 # enforce reading
            # Simple inclusions, again checking them taking precedence
            assert r_config.get_value('sec', 'var0') == "value0_included"
            # This one should take the git_config_global value since included
            # values must be considered as soon as they get them
            assert r_config.get_value('diff', 'tool') == "meld"
            try:
                assert r_config.get_value('sec', 'var1') == "value1_main"
            except AssertionError:
                raise SkipTest(
                    'Known failure -- included values are not in effect right away'
                )

    @with_rw_directory
    def test_lock_reentry(self, rw_dir):
        fpl = osp.join(rw_dir, 'l')
diff --git a/git/test/test_git.py b/git/test/test_git.py
 except ImportError:
    import mock

 from git.compat import is_win


 class TestGit(TestBase):

        self.assertRaises(GitCommandNotFound, refresh, "yada")

        # test a good path refresh
        path = os.popen("which git").read().strip()
        which_cmd = "where" if is_win else "which"
        path = os.popen("{0} git".format(which_cmd)).read().strip().split('\n')[0]
        refresh(path)

    def test_options_are_passed_to_git(self):
diff --git a/git/test/test_index.py b/git/test/test_index.py
 import os.path as osp
 from git.cmd import Git

 HOOKS_SHEBANG = "#!/usr/bin/env sh\n"


 @skipIf(HIDE_WINDOWS_KNOWN_ERRORS, "TODO: fix hooks execution on Windows: #703")
 def _make_hook(git_dir, name, content, make_exec=True):
    """A helper to create a hook"""
    hp = hook_path(name, git_dir)
    hpd = osp.dirname(hp)
    if not osp.isdir(hpd):
        os.mkdir(hpd)
    with open(hp, "wt") as fp:
        fp.write(HOOKS_SHEBANG + content)
    if make_exec:
        os.chmod(hp, 0o744)
    return hp


 class TestIndex(TestBase):

    @with_rw_repo('HEAD', bare=True)
    def test_pre_commit_hook_success(self, rw_repo):
        index = rw_repo.index
        hp = hook_path('pre-commit', index.repo.git_dir)
        hpd = osp.dirname(hp)
        if not osp.isdir(hpd):
            os.mkdir(hpd)
        with open(hp, "wt") as fp:
            fp.write("#!/usr/bin/env sh\nexit 0")
        os.chmod(hp, 0o744)
        _make_hook(
            index.repo.git_dir,
            'pre-commit',
            "exit 0"
        )
        index.commit("This should not fail")

    @with_rw_repo('HEAD', bare=True)
    def test_pre_commit_hook_fail(self, rw_repo):
        index = rw_repo.index
        hp = hook_path('pre-commit', index.repo.git_dir)
        hpd = osp.dirname(hp)
        if not osp.isdir(hpd):
            os.mkdir(hpd)
        with open(hp, "wt") as fp:
            fp.write("#!/usr/bin/env sh\necho stdout; echo stderr 1>&2; exit 1")
        os.chmod(hp, 0o744)
        hp = _make_hook(
            index.repo.git_dir,
            'pre-commit',
            "echo stdout; echo stderr 1>&2; exit 1"
        )
        try:
            index.commit("This should fail")
        except HookExecutionError as err:
                self.assertEqual(err.stderr, "\n  stderr: 'stderr\n'")
                assert str(err)
        else:
            raise AssertionError("Should havecought a HookExecutionError")
            raise AssertionError("Should havecaught a HookExecutionError")

    @with_rw_repo('HEAD', bare=True)
    def test_commit_msg_hook_success(self, rw_repo):
        index = rw_repo.index
        commit_message = u"commit default head by Frèderic Çaufl€"
        from_hook_message = u"from commit-msg"

        hp = hook_path('commit-msg', index.repo.git_dir)
        hpd = osp.dirname(hp)
        if not osp.isdir(hpd):
            os.mkdir(hpd)
        with open(hp, "wt") as fp:
            fp.write('#!/usr/bin/env sh\necho -n " {}" >> "$1"'.format(from_hook_message))
        os.chmod(hp, 0o744)

        index = rw_repo.index
        _make_hook(
            index.repo.git_dir,
            'commit-msg',
            'echo -n " {0}" >> "$1"'.format(from_hook_message)
        )
        new_commit = index.commit(commit_message)
        self.assertEqual(new_commit.message, u"{} {}".format(commit_message, from_hook_message))
        self.assertEqual(new_commit.message, u"{0} {1}".format(commit_message, from_hook_message))

    @with_rw_repo('HEAD', bare=True)
    def test_commit_msg_hook_fail(self, rw_repo):
        index = rw_repo.index
        hp = hook_path('commit-msg', index.repo.git_dir)
        hpd = osp.dirname(hp)
        if not osp.isdir(hpd):
            os.mkdir(hpd)
        with open(hp, "wt") as fp:
            fp.write("#!/usr/bin/env sh\necho stdout; echo stderr 1>&2; exit 1")
        os.chmod(hp, 0o744)
        hp = _make_hook(
            index.repo.git_dir,
            'commit-msg',
            "echo stdout; echo stderr 1>&2; exit 1"
        )
        try:
            index.commit("This should fail")
        except HookExecutionError as err:
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
 submodule_path='D:\\submodule_path'
 relative_path=Submodule._to_relative_path(super_repo,submodule_path)
 msg='_to_relative_path should be "submodule_path" but was "%s"'%relative_path
 assertrelative_path=='submodule_path',msg
 assertrelative_path=='submodule_path',msg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,7 +46,7 @@ install:
		echo %PATH%
		uname -a
		git --version
		where git git-daemon python pip pip3 pip34
		where git git-daemon python pip pip3 pip34 sh
		python --version
		python -c "import struct; print(struct.calcsize('P') * 8)"

Expand DownExpand Up		@@ -91,3 +91,11 @@ test_script:

		on_success:
		- IF "%PYTHON_VERSION%" == "3.5" IF NOT "%IS_CYGWIN%" == "yes" (codecov)

		# Enable this to be able to login to the build worker. You can use the
		# `remmina` program in Ubuntu, use the login information that the line below
		# prints into the log.
		#on_finish:
		# - \|
		# echo "Running on_finish to establish connection back to the instance"
		# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,5 +25,6 @@ Contributors are:
		-Piotr Babij <piotr.babij _at_ gmail.com>
		-Mikuláš Poul <mikulaspoul _at_ gmail.com>
		-Charles Bouchard-Légaré <cblegare.atl _at_ ntis.ca>
		-Yaroslav Halchenko <debian _at_ onerussian.com>

		Portions derived from other open source works and are clearly marked.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -309,5 +309,5 @@ def register_surrogateescape():

		try:
		b"100644\x9f\0aaa".decode(defenc,"surrogateescape")
		except:
		exceptException:
		register_surrogateescape()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -424,7 +424,8 @@ def read(self):
		if include_path in seen or not os.access(include_path, os.R_OK):
		continue
		seen.add(include_path)
		files_to_read.append(include_path)
		# insert included file to the top to be considered first
		files_to_read.insert(0, include_path)
		num_read_include_files += 1
		# each include path in configuration file
		# end handle includes
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -313,20 +313,20 @@ def __str__(self):
		h %= self.b_blob.path

		msg = ''
		l = None # temp line
		ll = 0 # line length
		line = None # temp line
		line_length = 0 # line length
		for b, n in zip((self.a_blob, self.b_blob), ('lhs', 'rhs')):
		if b:
		l = "\n%s: %o \| %s" % (n, b.mode, b.hexsha)
		line = "\n%s: %o \| %s" % (n, b.mode, b.hexsha)
		else:
		l = "\n%s: None" % n
		line = "\n%s: None" % n
		# END if blob is not None
		ll = max(len(l),ll)
		msg +=l
		line_length = max(len(line),line_length)
		msg +=line
		# END for each blob

		# add headline
		h += '\n' + '=' *ll
		h += '\n' + '=' *line_length

		if self.deleted_file:
		msg += '\nfile deleted in rhs'
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,7 +48,7 @@ def __init__(self, command, status=None, stderr=None, stdout=None):
		else:
		try:
		status = u'exit code(%s)' % int(status)
		except:
		except (ValueError, TypeError):
		s = safe_decode(str(status))
		status = u"'%s'" % s if isinstance(status, string_types) else s

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -246,7 +246,7 @@ def to_file(self, filepath):
		try:
		self._serialize(fp)
		lfd.commit()
		except:
		exceptException:
		# on failure it rolls back automatically, but we make it clear
		lfd.rollback()
		raise
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -542,9 +542,11 @@ def urls(self):
		if ' Push URL:' in line:
		yield line.split(': ')[-1]
		except GitCommandError as ex:
		if any([msg in str(ex) for msg in ['correct access rights','cannot run ssh']]):
		# If ssh is not setup to access this repository, see issue 694
		result = Git().execute(['git','config','--get','remote.%s.url' % self.name])
		if any([msg in str(ex) for msg in ['correct access rights', 'cannot run ssh']]):
		# If ssh is not setup to access this repository, see issue 694
		result = Git().execute(
		['git', 'config', '--get', 'remote.%s.url' % self.name]
		)
		yield result
		else:
		raise ex
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -203,7 +203,7 @@ def __exit__(self, exc_type, exc_value, traceback):
		def__del__(self):
		try:
		self.close()
		except:
		exceptException:
		pass

		defclose(self):
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,11 +22,25 @@
		url = git://gitorious.org/~martin.marcher/git-python/serverhorror.git
		fetch = +refs/heads/:refs/remotes/MartinMarcher/
		# can handle comments - the section name is supposed to be stripped
		# causes stock git-config puke
		[ gui ]
		geometry = 1316x820+219+243 207 192
		[branch "mainline_performance"]
		remote = mainline
		merge = refs/heads/master
		# section with value defined before include to be overriden
		[sec]
		var0 = value0_main
		[include]
		path = doesntexist.cfg
		abspath = /usr/bin/foodoesntexist.bar
		path = doesntexist.cfg
		# field should be 'path' so abspath should be ignored
		abspath = /usr/bin/foodoesntexist.bar
		path = /usr/bin/foodoesntexist.bar
		# should be relative to the path of this config file
		path = ./git_config-inc.cfg
		# and defined after include. According to the documentation
		# and behavior of git config, this should be the value since
		# inclusions should be processed immediately
		[sec]
		var1 = value1_main