Indefero

Indefero Commit Details


Date:2011-03-17 18:55:02 (13 years 9 months ago)
Author:Thomas Keller
Branch:develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.1, release-1.2, release-1.3
Commit:a3dd1c45f36cd0aa7674e265ba500ae96582a1a7
Parents: be7725694ef9eb38fb6ca0e9c0981dd619266cb6
Message:Handle partial incomplete and line-ending munging diffs (resolves issue 633).
Changes:

File differences

test/data/IDF_DiffTest/test-15-git-change-single-line-invalid.diff
1
2
3
4
5
6
7
diff --git a/test_file b/test_file␊
index 2134e75..2eaf9ea 100644␊
--- a/test_file␊
+++ b/test_file␊
@@ -1 +1 @@␊
-Steddy is awesome␊
+Steddy is very awesome
test/data/IDF_DiffTest/test-15-git-change-single-line-invalid.expected
1
a:1:{s:9:"test_file";a:2:{s:6:"chunks";a:1:{i:0;a:3:{i:0;a:3:{i:0;i:1;i:1;N;i:2;s:17:"Steddy is awesome";}i:1;a:3:{i:0;N;i:1;i:1;i:2;s:22:"Steddy is very awesome";}i:2;a:3:{i:0;i:2;i:1;i:2;i:2;N;}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:1:{i:0;i:1;}i:1;a:1:{i:0;i:1;}}}}}
test/data/IDF_DiffTest/test-15-git-change-single-line.diff
1
2
3
4
5
6
7
diff --git a/test_file b/test_file␊
index 2134e75..2eaf9ea 100644␊
--- a/test_file␊
+++ b/test_file␊
@@ -1 +1 @@␊
-Steddy is awesome␊
+Steddy is very awesome
test/data/IDF_DiffTest/test-15-git-change-single-line.expected
1
a:1:{s:9:"test_file";a:2:{s:6:"chunks";a:1:{i:0;a:3:{i:0;a:3:{i:0;i:1;i:1;N;i:2;s:17:"Steddy is awesome";}i:1;a:3:{i:0;N;i:1;i:1;i:2;s:22:"Steddy is very awesome";}i:2;a:3:{i:0;i:2;i:1;i:2;i:2;N;}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:1:{i:0;i:1;}i:1;a:1:{i:0;i:1;}}}}}
test/data/IDF_DiffTest/test-16-git-newline-removed.diff
1
2
3
4
5
6
7
8
diff --git a/foo b/foo␊
index a86c18f..71ccdd0 100644␊
--- a/foo␊
+++ b/foo␊
@@ -1 +1 @@␊
-This is foo␊
+This is foo␊
\ No newline at end of file␊
test/data/IDF_DiffTest/test-16-git-newline-removed.expected
1
a:1:{s:3:"foo";a:2:{s:6:"chunks";a:1:{i:0;a:2:{i:0;a:3:{i:0;s:1:"1";i:1;s:0:"";i:2;s:11:"This is foo";}i:1;a:3:{i:0;s:0:"";i:1;s:1:"1";i:2;s:11:"This is foo";}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:2:{i:0;s:1:"1";i:1;i:1;}i:1;a:2:{i:0;s:1:"1";i:1;i:1;}}}}}
test/data/IDF_DiffTest/test-17-git-newline-added.diff
1
2
3
4
5
6
7
8
diff --git a/foo b/foo␊
index 71ccdd0..a86c18f 100644␊
--- a/foo␊
+++ b/foo␊
@@ -1 +1 @@␊
-This is foo␊
\ No newline at end of file␊
+This is foo␊
test/data/IDF_DiffTest/test-17-git-newline-added.expected
1
a:1:{s:3:"foo";a:2:{s:6:"chunks";a:1:{i:0;a:2:{i:0;a:3:{i:0;s:1:"1";i:1;s:0:"";i:2;s:11:"This is foo";}i:1;a:3:{i:0;s:0:"";i:1;s:1:"1";i:2;s:11:"This is foo";}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:2:{i:0;s:1:"1";i:1;i:1;}i:1;a:2:{i:0;s:1:"1";i:1;i:1;}}}}}

Archive Download the corresponding diff file

Page rendered in 0.08954s using 14 queries.