diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2009-10-22 22:22:00 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2009-10-22 22:22:00 +0200 |
| commit | b2a14e4b96a0ffc5353733b50266b477539ef899 (patch) | |
| tree | ce48feb6d2da2bed92240c0fbd2350e05f7b7519 /test/git/test_diff.py | |
| parent | 20c34a929a8b2871edd4fd44a38688e8977a4be6 (diff) | |
| parent | ea33fe8b21d2b02f902b131aba0d14389f2f8715 (diff) | |
| download | gitpython-b2a14e4b96a0ffc5353733b50266b477539ef899.tar.gz | |
Merge branch 'index' into improvements
* index:
Index: Is now diffable and appears to properly implement diffing against other items as well as the working tree
default index writing now writes the index of the current repository in a fashion comparable to the native implementation
Added test for ConcurrentWriteOperation
utils: Added LockFile including test
Index now behaves more like the default index if no explicit stream is given. It will lazily read its data on first access
Diffstat (limited to 'test/git/test_diff.py')
| -rw-r--r-- | test/git/test_diff.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/test/git/test_diff.py b/test/git/test_diff.py index d7505987..ead231e5 100644 --- a/test/git/test_diff.py +++ b/test/git/test_diff.py @@ -59,6 +59,14 @@ class TestDiff(TestBase): assertion_map.setdefault(key, 0) assertion_map[key] = assertion_map[key]+len(list(diff_index.iter_change_type(ct))) # END for each changetype + + # check entries + diff_set = set() + diff_set.add(diff_index[0]) + diff_set.add(diff_index[0]) + assert len(diff_set) == 1 + assert diff_index[0] == diff_index[0] + assert not (diff_index[0] != diff_index[0]) # END diff index checking # END for each patch option # END for each path option @@ -71,7 +79,4 @@ class TestDiff(TestBase): for key,value in assertion_map.items(): assert value, "Did not find diff for %s" % key # END for each iteration type - - def test_diff_index_working_tree(self): - self.fail("""Find a good way to diff an index against the working tree -which is not possible with the current interface""") + |