| 1 |
#!/bin/sh |
| 2 |
|
| 3 |
# Test all git extended headers for comprehensive coverage |
| 4 |
# This test ensures filterdiff correctly handles all git extended headers |
| 5 |
|
| 6 |
. ${top_srcdir-.}/tests/common.sh |
| 7 |
|
| 8 |
# Test 1a: deleted file mode (with hunks) |
| 9 |
cat << EOF > deleted-file.patch |
| 10 |
diff --git a/removed.txt b/removed.txt |
| 11 |
deleted file mode 100644 |
| 12 |
index 1234567..0000000 |
| 13 |
--- a/removed.txt |
| 14 |
+++ /dev/null |
| 15 |
@@ -1,3 +0,0 @@ |
| 16 |
-line 1 |
| 17 |
-line 2 |
| 18 |
-line 3 |
| 19 |
EOF |
| 20 |
|
| 21 |
${LSDIFF} --git-extended-diffs=include --git-extended-diffs=include --git-prefixes=strip deleted-file.patch 2>errors1a >result1a || exit 1 |
| 22 |
[ -s errors1a ] && exit 1 |
| 23 |
|
| 24 |
cat << EOF | cmp - result1a || exit 1 |
| 25 |
removed.txt |
| 26 |
EOF |
| 27 |
|
| 28 |
${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "removed.txt" deleted-file.patch 2>errors1a2 >result1a2 || exit 1 |
| 29 |
[ -s errors1a2 ] && exit 1 |
| 30 |
|
| 31 |
cat << EOF | cmp - result1a2 || exit 1 |
| 32 |
diff --git a/removed.txt b/removed.txt |
| 33 |
deleted file mode 100644 |
| 34 |
index 1234567..0000000 |
| 35 |
--- a/removed.txt |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,3 +0,0 @@ |
| 38 |
-line 1 |
| 39 |
-line 2 |
| 40 |
-line 3 |
| 41 |
EOF |
| 42 |
|
| 43 |
# Test 1b: deleted file mode (no hunks - triggers do_git_diff_no_hunks) |
| 44 |
cat << EOF > deleted-file-no-hunks.patch |
| 45 |
diff --git a/empty-deleted.txt b/empty-deleted.txt |
| 46 |
deleted file mode 100644 |
| 47 |
index e69de29..0000000 |
| 48 |
EOF |
| 49 |
|
| 50 |
${LSDIFF} --git-extended-diffs=include --git-extended-diffs=include --git-prefixes=strip deleted-file-no-hunks.patch 2>errors1b >result1b || exit 1 |
| 51 |
[ -s errors1b ] && exit 1 |
| 52 |
|
| 53 |
cat << EOF | cmp - result1b || exit 1 |
| 54 |
empty-deleted.txt |
| 55 |
EOF |
| 56 |
|
| 57 |
${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "empty-deleted.txt" deleted-file-no-hunks.patch 2>errors1b2 >result1b2 || exit 1 |
| 58 |
[ -s errors1b2 ] && exit 1 |
| 59 |
|
| 60 |
cat << EOF | cmp - result1b2 || exit 1 |
| 61 |
diff --git a/empty-deleted.txt b/empty-deleted.txt |
| 62 |
deleted file mode 100644 |
| 63 |
index e69de29..0000000 |
| 64 |
EOF |
| 65 |
|
| 66 |
# Test 2a: new file mode (with hunks) |
| 67 |
cat << EOF > new-file.patch |
| 68 |
diff --git a/created.txt b/created.txt |
| 69 |
new file mode 100644 |
| 70 |
index 0000000..abcdefg |
| 71 |
--- /dev/null |
| 72 |
+++ b/created.txt |
| 73 |
@@ -0,0 +1,3 @@ |
| 74 |
+new line 1 |
| 75 |
+new line 2 |
| 76 |
+new line 3 |
| 77 |
EOF |
| 78 |
|
| 79 |
${LSDIFF} --git-extended-diffs=include --git-extended-diffs=include --git-prefixes=strip new-file.patch 2>errors2a >result2a || exit 1 |
| 80 |
[ -s errors2a ] && exit 1 |
| 81 |
|
| 82 |
cat << EOF | cmp - result2a || exit 1 |
| 83 |
created.txt |
| 84 |
EOF |
| 85 |
|
| 86 |
${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "created.txt" new-file.patch 2>errors2a2 >result2a2 || exit 1 |
| 87 |
[ -s errors2a2 ] && exit 1 |
| 88 |
|
| 89 |
cat << EOF | cmp - result2a2 || exit 1 |
| 90 |
diff --git a/created.txt b/created.txt |
| 91 |
new file mode 100644 |
| 92 |
index 0000000..abcdefg |
| 93 |
--- /dev/null |
| 94 |
+++ b/created.txt |
| 95 |
@@ -0,0 +1,3 @@ |
| 96 |
+new line 1 |
| 97 |
+new line 2 |
| 98 |
+new line 3 |
| 99 |
EOF |
| 100 |
|
| 101 |
# Test 2b: new file mode (no hunks - triggers do_git_diff_no_hunks) |
| 102 |
cat << EOF > new-file-no-hunks.patch |
| 103 |
diff --git a/empty-new.txt b/empty-new.txt |
| 104 |
new file mode 100644 |
| 105 |
index 0000000..e69de29 |
| 106 |
EOF |
| 107 |
|
| 108 |
${LSDIFF} --git-extended-diffs=include --git-extended-diffs=include --git-prefixes=strip new-file-no-hunks.patch 2>errors2b >result2b || exit 1 |
| 109 |
[ -s errors2b ] && exit 1 |
| 110 |
|
| 111 |
cat << EOF | cmp - result2b || exit 1 |
| 112 |
empty-new.txt |
| 113 |
EOF |
| 114 |
|
| 115 |
${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "empty-new.txt" new-file-no-hunks.patch 2>errors2b2 >result2b2 || exit 1 |
| 116 |
[ -s errors2b2 ] && exit 1 |
| 117 |
|
| 118 |
cat << EOF | cmp - result2b2 || exit 1 |
| 119 |
diff --git a/empty-new.txt b/empty-new.txt |
| 120 |
new file mode 100644 |
| 121 |
index 0000000..e69de29 |
| 122 |
EOF |
| 123 |
|
| 124 |
# Test 1c: deleted file with binary content (triggers do_git_diff_no_hunks path) |
| 125 |
cat << EOF > deleted-file-binary.patch |
| 126 |
diff --git a/pure-deleted.txt b/pure-deleted.txt |
| 127 |
deleted file mode 100644 |
| 128 |
index e69de29..0000000 |
| 129 |
Binary files a/pure-deleted.txt and /dev/null differ |
| 130 |
EOF |
| 131 |
|
| 132 |
${LSDIFF} --git-extended-diffs=include --git-extended-diffs=include --git-prefixes=strip deleted-file-binary.patch 2>errors1c >result1c || exit 1 |
| 133 |
[ -s errors1c ] && exit 1 |
| 134 |
|
| 135 |
cat << EOF | cmp - result1c || exit 1 |
| 136 |
pure-deleted.txt |
| 137 |
EOF |
| 138 |
|
| 139 |
${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "pure-deleted.txt" deleted-file-binary.patch 2>errors1c2 >result1c2 || exit 1 |
| 140 |
[ -s errors1c2 ] && exit 1 |
| 141 |
|
| 142 |
cat << EOF | cmp - result1c2 || exit 1 |
| 143 |
diff --git a/pure-deleted.txt b/pure-deleted.txt |
| 144 |
deleted file mode 100644 |
| 145 |
index e69de29..0000000 |
| 146 |
Binary files a/pure-deleted.txt and /dev/null differ |
| 147 |
EOF |
| 148 |
|
| 149 |
# Test 3: dissimilarity index (file rewrite) |
| 150 |
cat << EOF > dissimilar-file.patch |
| 151 |
diff --git a/rewritten.c b/rewritten.c |
| 152 |
dissimilarity index 95% |
| 153 |
index abc1234..def5678 100644 |
| 154 |
--- a/rewritten.c |
| 155 |
+++ b/rewritten.c |
| 156 |
@@ -1,10 +1,15 @@ |
| 157 |
-#include <stdio.h> |
| 158 |
- |
| 159 |
-int old_function() { |
| 160 |
- printf("old code"); |
| 161 |
- return 0; |
| 162 |
-} |
| 163 |
- |
| 164 |
-int main() { |
| 165 |
- return old_function(); |
| 166 |
-} |
| 167 |
+#include <stdlib.h> |
| 168 |
+#include <string.h> |
| 169 |
+ |
| 170 |
+struct new_data { |
| 171 |
+ char *name; |
| 172 |
+ int value; |
| 173 |
+}; |
| 174 |
+ |
| 175 |
+int main(int argc, char **argv) { |
| 176 |
+ struct new_data data; |
| 177 |
+ data.name = strdup("new"); |
| 178 |
+ data.value = 42; |
| 179 |
+ free(data.name); |
| 180 |
+ return 0; |
| 181 |
+} |
| 182 |
EOF |
| 183 |
|
| 184 |
${LSDIFF} --git-extended-diffs=include --git-extended-diffs=include --git-prefixes=strip dissimilar-file.patch 2>errors3a >result3a || exit 1 |
| 185 |
[ -s errors3a ] && exit 1 |
| 186 |
|
| 187 |
cat << EOF | cmp - result3a || exit 1 |
| 188 |
rewritten.c |
| 189 |
EOF |
| 190 |
|
| 191 |
${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "rewritten.c" dissimilar-file.patch 2>errors3a2 >result3a2 || exit 1 |
| 192 |
[ -s errors3a2 ] && exit 1 |
| 193 |
|
| 194 |
grep -q "dissimilarity index 95%" result3a2 || exit 1 |
| 195 |
grep -q "rewritten.c" result3a2 || exit 1 |
| 196 |
|
| 197 |
# Test 4: Mixed extended headers in one patch |
| 198 |
cat << EOF > mixed-extended.patch |
| 199 |
diff --git a/old.txt b/old.txt |
| 200 |
deleted file mode 100644 |
| 201 |
index abc123..0000000 |
| 202 |
--- a/old.txt |
| 203 |
+++ /dev/null |
| 204 |
@@ -1,2 +0,0 @@ |
| 205 |
-old content |
| 206 |
-to be removed |
| 207 |
diff --git a/template.h b/variant1.h |
| 208 |
similarity index 60% |
| 209 |
copy from template.h |
| 210 |
copy to variant1.h |
| 211 |
index def456..ghi789 100644 |
| 212 |
--- a/template.h |
| 213 |
+++ b/variant1.h |
| 214 |
@@ -1,5 +1,6 @@ |
| 215 |
#ifndef TEMPLATE_H |
| 216 |
#define TEMPLATE_H |
| 217 |
+#define VARIANT1 |
| 218 |
|
| 219 |
void function(); |
| 220 |
#endif |
| 221 |
diff --git a/config.conf b/settings.conf |
| 222 |
similarity index 100% |
| 223 |
rename from config.conf |
| 224 |
rename to settings.conf |
| 225 |
diff --git a/script.sh b/script.sh |
| 226 |
old mode 100755 |
| 227 |
new mode 100644 |
| 228 |
index xyz987..uvw654 100644 |
| 229 |
--- a/script.sh |
| 230 |
+++ b/script.sh |
| 231 |
@@ -1,3 +1,3 @@ |
| 232 |
#!/bin/bash |
| 233 |
-echo "executable" |
| 234 |
+echo "not executable" |
| 235 |
exit 0 |
| 236 |
diff --git a/brand-new.py b/brand-new.py |
| 237 |
new file mode 100755 |
| 238 |
index 0000000..123abc |
| 239 |
--- /dev/null |
| 240 |
+++ b/brand-new.py |
| 241 |
@@ -0,0 +1,4 @@ |
| 242 |
+#!/usr/bin/env python3 |
| 243 |
+ |
| 244 |
+if __name__ == "__main__": |
| 245 |
+ print("Hello, World!") |
| 246 |
diff --git a/completely-rewritten.java b/completely-rewritten.java |
| 247 |
dissimilarity index 98% |
| 248 |
index old123..new456 100644 |
| 249 |
--- a/completely-rewritten.java |
| 250 |
+++ b/completely-rewritten.java |
| 251 |
@@ -1,15 +1,20 @@ |
| 252 |
-public class OldClass { |
| 253 |
- private int oldField; |
| 254 |
- |
| 255 |
- public OldClass(int value) { |
| 256 |
- this.oldField = value; |
| 257 |
- } |
| 258 |
- |
| 259 |
- public void oldMethod() { |
| 260 |
- System.out.println("Old: " + oldField); |
| 261 |
- } |
| 262 |
- |
| 263 |
- public static void main(String[] args) { |
| 264 |
- new OldClass(42).oldMethod(); |
| 265 |
- } |
| 266 |
-} |
| 267 |
+import java.util.*; |
| 268 |
+ |
| 269 |
+public class NewClass { |
| 270 |
+ private Map<String, Object> data; |
| 271 |
+ |
| 272 |
+ public NewClass() { |
| 273 |
+ this.data = new HashMap<>(); |
| 274 |
+ } |
| 275 |
+ |
| 276 |
+ public void addData(String key, Object value) { |
| 277 |
+ data.put(key, value); |
| 278 |
+ } |
| 279 |
+ |
| 280 |
+ public void printAll() { |
| 281 |
+ data.forEach((k, v) -> System.out.println(k + ": " + v)); |
| 282 |
+ } |
| 283 |
+ |
| 284 |
+ public static void main(String[] args) { |
| 285 |
+ new NewClass().printAll(); |
| 286 |
+ } |
| 287 |
+} |
| 288 |
EOF |
| 289 |
|
| 290 |
# Test lsdiff shows all files |
| 291 |
${LSDIFF} --git-extended-diffs=include --git-extended-diffs=include --git-prefixes=strip mixed-extended.patch 2>errors4 >result4 || exit 1 |
| 292 |
[ -s errors4 ] && exit 1 |
| 293 |
|
| 294 |
cat << EOF | cmp - result4 || exit 1 |
| 295 |
old.txt |
| 296 |
template.h |
| 297 |
config.conf |
| 298 |
script.sh |
| 299 |
brand-new.py |
| 300 |
completely-rewritten.java |
| 301 |
EOF |
| 302 |
|
| 303 |
# Test filtering works with all header types |
| 304 |
${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "*.py" mixed-extended.patch 2>errors5 >result5 || exit 1 |
| 305 |
[ -s errors5 ] && exit 1 |
| 306 |
|
| 307 |
grep -q "brand-new.py" result5 || exit 1 |
| 308 |
grep -q "new file mode 100755" result5 || exit 1 |
| 309 |
|
| 310 |
${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "*.java" mixed-extended.patch 2>errors6 >result6 || exit 1 |
| 311 |
[ -s errors6 ] && exit 1 |
| 312 |
|
| 313 |
grep -q "completely-rewritten.java" result6 || exit 1 |
| 314 |
grep -q "dissimilarity index 98%" result6 || exit 1 |
| 315 |
|
| 316 |
${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "old.txt" mixed-extended.patch 2>errors7 >result7 || exit 1 |
| 317 |
[ -s errors7 ] && exit 1 |
| 318 |
|
| 319 |
grep -q "deleted file mode 100644" result7 || exit 1 |
| 320 |
|
| 321 |
# Test 5: Edge case - file with multiple extended headers |
| 322 |
cat << EOF > multiple-headers.patch |
| 323 |
diff --git a/complex.c b/renamed-complex.c |
| 324 |
similarity index 75% |
| 325 |
rename from complex.c |
| 326 |
rename to renamed-complex.c |
| 327 |
old mode 100644 |
| 328 |
new mode 100755 |
| 329 |
index abc123..def456 100755 |
| 330 |
--- a/complex.c |
| 331 |
+++ b/renamed-complex.c |
| 332 |
@@ -1,4 +1,5 @@ |
| 333 |
#include <stdio.h> |
| 334 |
+#include <stdlib.h> |
| 335 |
|
| 336 |
int main() { |
| 337 |
printf("Hello"); |
| 338 |
EOF |
| 339 |
|
| 340 |
${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "*complex*.c" multiple-headers.patch 2>errors8 >result8 || exit 1 |
| 341 |
[ -s errors8 ] && exit 1 |
| 342 |
|
| 343 |
grep -q "similarity index 75%" result8 || exit 1 |
| 344 |
grep -q "rename from complex.c" result8 || exit 1 |
| 345 |
grep -q "rename to renamed-complex.c" result8 || exit 1 |
| 346 |
grep -q "old mode 100644" result8 || exit 1 |
| 347 |
grep -q "new mode 100755" result8 || exit 1 |
| 348 |
|
| 349 |
exit 0 |