Repository navigation
Commit 3da67f3
Patrick Pfeifer
add tests for git.diff.Diff._index_from_raw_format()
1 parent 8dc98aa commit 3da67f3
2 files changed
Lines changed: 25 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,4 @@ | |||
| 1 | + :000000 100644 0000000000000000000000000000000000000000 8b137891791fe96927ad78e64b0aad7bded08bdc A git/test/refs/__init__.py | ||
| 2 | + :100644 100644 271924aa5bf43ef58a0b0dae5a356e502c48dcf8 271924aa5bf43ef58a0b0dae5a356e502c48dcf8 R100 git/test/test_reflog.py git/test/refs/test_reflog.py | ||
| 3 | + :100644 100644 e49b23abc5c47f26e8cf64d46aa6851593ce1404 e49b23abc5c47f26e8cf64d46aa6851593ce1404 R100 git/test/test_refs.py git/test/refs/test_refs.py | ||
| 4 | + :100644 100644 b9a0b617b66962d2c2ba211641675d06f591461f b9a0b617b66962d2c2ba211641675d06f591461f R100 git/test/test_git.py git/test/test_cmd.py | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -51,6 +51,19 @@ def test_diff_with_rename(self): | |||
| 51 | 51 | assert_equal(diff.rename_from, 'AUTHORS') | |
| 52 | 52 | assert_equal(diff.rename_to, 'CONTRIBUTORS') | |
| 53 | 53 | ||
| 54 | + def test_diff_with_rename_raw(self): | ||
| 55 | + output = StringProcessAdapter(fixture('diff_rename_raw')) | ||
| 56 | + diffs = Diff._index_from_raw_format(self.rorepo, output.stdout) | ||
| 57 | + self._assert_diff_format(diffs) | ||
| 58 | + | ||
| 59 | + diffs = filter(lambda d: d.renamed, diffs) | ||
| 60 | + assert_equal(3, len(diffs)) | ||
| 61 | + | ||
| 62 | + diff = diffs[0] | ||
| 63 | + assert_true(diff.renamed) | ||
| 64 | + assert_equal(diff.rename_from, 'git/test/test_reflog.py') | ||
| 65 | + assert_equal(diff.rename_to, 'git/test/refs/test_reflog.py') | ||
| 66 | + | ||
| 54 | 67 | def test_diff_patch_format(self): | |
| 55 | 68 | # test all of the 'old' format diffs for completness - it should at least | |
| 56 | 69 | # be able to deal with it | |
@@ -98,6 +111,14 @@ def test_diff_interface(self): | |||
| 98 | 111 | # END for each path option | |
| 99 | 112 | # END for each other side | |
| 100 | 113 | # END for each commit | |
| 114 | + | ||
| 115 | + # test rename detection | ||
| 116 | + rename_commit = self.rorepo.rev_parse('4772fe0') | ||
| 117 | + rename_diffs = rename_commit.parents[0].diff(rename_commit, M=True) | ||
| 118 | + rename_diffs = filter(lambda d: d.renamed, rename_diffs) | ||
| 119 | + assert len(rename_diffs) == 3 | ||
| 120 | + assert rename_diffs[0].rename_from == rename_diffs[0].a_blob.path | ||
| 121 | + assert rename_diffs[0].rename_to == rename_diffs[0].b_blob.path | ||
| 101 | 122 | ||
| 102 | 123 | # assert we could always find at least one instance of the members we | |
| 103 | 124 | # can iterate in the diff index - if not this indicates its not working correctly | |
0 commit comments