From 27b4efed7a435153f18598796473b3fba06c513d Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 8 Jan 2015 10:14:15 +0100 Subject: Added assertion to better detect diff issues. Helps fixing #35 Also, the production status was changed to 'stable', which should have been done much earlier. --- git/diff.py | 1 + git/remote.py | 2 +- git/test/test_diff.py | 2 +- setup.py | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/git/diff.py b/git/diff.py index 3c4e8529..b59c264c 100644 --- a/git/diff.py +++ b/git/diff.py @@ -302,6 +302,7 @@ class Diff(object): diff_header = cls.re_header.match for diff in ('\n' + text).split('\ndiff --git')[1:]: header = diff_header(diff) + assert header is not None, "Failed to parse diff header from " % diff a_path, b_path, similarity_index, rename_from, rename_to, \ old_mode, new_mode, new_file_mode, deleted_file_mode, \ diff --git a/git/remote.py b/git/remote.py index deddd1f4..ce0ed363 100644 --- a/git/remote.py +++ b/git/remote.py @@ -404,7 +404,7 @@ class Remote(LazyMixin, Iterable): self.config_reader.get('url') return True except cp.NoOptionError: - # we have the section at least ... + # we have the section at least ... return True except cp.NoSectionError: return False diff --git a/git/test/test_diff.py b/git/test/test_diff.py index 3453f6a8..c5183089 100644 --- a/git/test/test_diff.py +++ b/git/test/test_diff.py @@ -80,7 +80,7 @@ class TestDiff(TestBase): for other in (None, commit.Index, commit.parents[0]): for paths in (None, "CHANGES", ("CHANGES", "lib")): for create_patch in range(2): - diff_index = diff_item.diff(other, paths, create_patch) + diff_index = diff_item.diff(other=other, paths=paths, create_patch=create_patch) assert isinstance(diff_index, DiffIndex) if diff_index: diff --git a/setup.py b/setup.py index 0baf477b..16a47526 100755 --- a/setup.py +++ b/setup.py @@ -97,8 +97,8 @@ GitPython is a python library used to interact with Git repositories""", # "Development Status :: 1 - Planning", # "Development Status :: 2 - Pre-Alpha", # "Development Status :: 3 - Alpha", - "Development Status :: 4 - Beta", - # "Development Status :: 5 - Production/Stable", + # "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", # "Development Status :: 6 - Mature", # "Development Status :: 7 - Inactive", "Environment :: Console", -- cgit v1.2.1