1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
|
;;; diff-mode-tests.el --- Tests for diff-mode.el -*- lexical-binding:t -*-
;; Copyright (C) 2017-2021 Free Software Foundation, Inc.
;; Author: Dima Kogan <dima@secretsauce.net>
;; Maintainer: emacs-devel@gnu.org
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Code:
(require 'ert)
(require 'ert-x)
(require 'diff-mode)
(require 'diff)
(ert-deftest diff-mode-test-ignore-trailing-dashes ()
"Check to make sure we successfully ignore trailing -- made by
'git format-patch'. This is bug #9597"
;; I made a test repo, put some files in it, made arbitrary changes
;; and invoked 'git format-patch' to get a patch out of it. The
;; patch and the before and after versions of the files appear here.
;; The test simply tries to apply the patch. The patch contains
;; trailing --, which confused diff-mode previously
(let ((patch "From 18ed35640be496647e0a02fc155b4ee4a0490eca Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Mon, 30 Jan 2017 22:24:13 -0800
Subject: [PATCH] test commit
---
fil | 3 ---
fil2 | 4 ----
2 files changed, 7 deletions(-)
diff --git a/fil b/fil
index 10344f1..2a56245 100644
--- a/fil
+++ b/fil
@@ -2,10 +2,8 @@ Afrocentrism
Americanisms
Americanization
Americanizations
-Americanized
Americanizes
Americanizing
-Andrianampoinimerina
Anglicanisms
Antananarivo
Apalachicola
@@ -15,6 +13,5 @@ Aristophanes
Aristotelian
Ashurbanipal
Australopithecus
-Austronesian
Bangladeshis
Barquisimeto
diff --git a/fil2 b/fil2
index 8858f0d..86e8ea5 100644
--- a/fil2
+++ b/fil2
@@ -1,20 +1,16 @@
whippoorwills
whitewashing
wholehearted
-wholeheartedly
wholesomeness
wildernesses
windbreakers
wisecracking
withstanding
-woodcarvings
woolgathering
workstations
worthlessness
wretchedness
wristwatches
-wrongfulness
wrongheadedly
wrongheadedness
-xylophonists
youthfulness
--
2.11.0
")
(fil_before "Afrocentrism
Americanisms
Americanization
Americanizations
Americanized
Americanizes
Americanizing
Andrianampoinimerina
Anglicanisms
Antananarivo
Apalachicola
Appalachians
Argentinians
Aristophanes
Aristotelian
Ashurbanipal
Australopithecus
Austronesian
Bangladeshis
Barquisimeto
")
(fil_after "Afrocentrism
Americanisms
Americanization
Americanizations
Americanizes
Americanizing
Anglicanisms
Antananarivo
Apalachicola
Appalachians
Argentinians
Aristophanes
Aristotelian
Ashurbanipal
Australopithecus
Bangladeshis
Barquisimeto
")
(fil2_before "whippoorwills
whitewashing
wholehearted
wholeheartedly
wholesomeness
wildernesses
windbreakers
wisecracking
withstanding
woodcarvings
woolgathering
workstations
worthlessness
wretchedness
wristwatches
wrongfulness
wrongheadedly
wrongheadedness
xylophonists
youthfulness
")
(fil2_after "whippoorwills
whitewashing
wholehearted
wholesomeness
wildernesses
windbreakers
wisecracking
withstanding
woolgathering
workstations
worthlessness
wretchedness
wristwatches
wrongheadedly
wrongheadedness
youthfulness
")
(temp-dir (make-temp-file "diff-mode-test" 'dir)))
(let ((buf (find-file-noselect (format "%s/%s" temp-dir "fil" )))
(buf2 (find-file-noselect (format "%s/%s" temp-dir "fil2"))))
(unwind-protect
(progn
(with-current-buffer buf (insert fil_before) (save-buffer))
(with-current-buffer buf2 (insert fil2_before) (save-buffer))
(with-temp-buffer
(cd temp-dir)
(insert patch)
(goto-char (point-min))
(diff-apply-hunk)
(diff-apply-hunk)
(diff-apply-hunk))
(should (equal (with-current-buffer buf (buffer-string))
fil_after))
(should (equal (with-current-buffer buf2 (buffer-string))
fil2_after)))
(ignore-errors
(with-current-buffer buf (set-buffer-modified-p nil))
(kill-buffer buf)
(with-current-buffer buf2 (set-buffer-modified-p nil))
(kill-buffer buf2)
(delete-directory temp-dir 'recursive))))))
(ert-deftest diff-mode-test-hunk-text-no-newline ()
"Check output of `diff-hunk-text' with no newline at end of file."
;; First check unified change/remove/add cases with newline
(let ((hunk "\
@@ -1 +1 @@
-foo
+bar
"))
(should (equal (diff-hunk-text hunk nil nil) "\
foo
"))
(should (equal (diff-hunk-text hunk t nil) "\
bar
")))
(let ((hunk "\
@@ -1 +0,0 @@
-foo
"))
(should (equal (diff-hunk-text hunk nil nil) "\
foo
"))
(should (equal (diff-hunk-text hunk t nil) "\
")))
(let ((hunk "\
@@ -0,0 +1 @@
+bar
"))
(should (equal (diff-hunk-text hunk nil nil) "\
"))
(should (equal (diff-hunk-text hunk t nil) "\
bar
")))
;; Check unified change/remove cases with no newline in old file
(let ((hunk "\
@@ -1 +1 @@
-foo
\\ No newline at end of file
+bar
"))
(should (equal (diff-hunk-text hunk nil nil) "\
foo"))
(should (equal (diff-hunk-text hunk t nil) "\
bar
")))
(let ((hunk "\
@@ -1 +0,0 @@
-foo
\\ No newline at end of file
"))
(should (equal (diff-hunk-text hunk nil nil) "\
foo"))
(should (equal (diff-hunk-text hunk t nil) "\
")))
;; Check unified change/add cases with no newline in new file
(let ((hunk "\
@@ -1 +1 @@
-foo
+bar
\\ No newline at end of file
"))
(should (equal (diff-hunk-text hunk nil nil) "\
foo
"))
(should (equal (diff-hunk-text hunk t nil) "\
bar")))
(let ((hunk "\
@@ -0,0 +1 @@
+bar
\\ No newline at end of file
"))
(should (equal (diff-hunk-text hunk nil nil) "\
"))
(should (equal (diff-hunk-text hunk t nil) "\
bar")))
;; Check unified change case with no newline in both old/new file
(let ((hunk "\
@@ -1 +1 @@
-foo
\\ No newline at end of file
+bar
\\ No newline at end of file
"))
(should (equal (diff-hunk-text hunk nil nil) "\
foo"))
(should (equal (diff-hunk-text hunk t nil) "\
bar")))
;; Check context-after unified change case with no newline in both old/new file
(let ((hunk "\
@@ -1,2 +1,2 @@
-foo
+bar
baz
\\ No newline at end of file
"))
(should (equal (diff-hunk-text hunk nil nil) "\
foo
baz"))
(should (equal (diff-hunk-text hunk t nil) "\
bar
baz")))
(let ((hunk "\
@@ -1,2 +1,2 @@
-foo
-baz
\\ No newline at end of file
+bar
+baz
"))
(should (equal (diff-hunk-text hunk nil nil) "\
foo
baz"))
(should (equal (diff-hunk-text hunk t nil) "\
bar
baz
")))
(let ((hunk "\
@@ -1,2 +1,2 @@
-foo
-baz
+bar
+baz
\\ No newline at end of file
"))
(should (equal (diff-hunk-text hunk nil nil) "\
foo
baz
"))
(should (equal (diff-hunk-text hunk t nil) "\
bar
baz"))))
(ert-deftest diff-mode-test-font-lock ()
"Check font-locking of diff hunks."
;; See comments in diff-hunk-file-names about nonascii.
;; In such cases, the diff-font-lock-syntax portion of this fails.
:expected-result (if (string-match-p "[[:nonascii:]]"
(ert-resource-directory))
:failed :passed)
(skip-unless (executable-find shell-file-name))
(skip-unless (executable-find diff-command))
(let ((default-directory (ert-resource-directory))
(old "hello_world.c")
(new "hello_emacs.c")
(diff-buffer (get-buffer-create "*Diff*"))
(diff-refine 'font-lock)
(diff-font-lock-syntax t)
diff-beg)
(diff-no-select old new '("-u") 'no-async diff-buffer)
(with-current-buffer diff-buffer
(font-lock-ensure)
(narrow-to-region (progn (diff-hunk-next)
(setq diff-beg (diff-beginning-of-hunk)))
(diff-end-of-hunk))
(should (equal-including-properties
(buffer-string)
#("@@ -1,6 +1,6 @@
#include <stdio.h>
int main()
{
- printf(\"Hello, World!\\n\");
+ printf(\"Hello, Emacs!\\n\");
return 0;
}
"
0 15 (face diff-hunk-header)
16 36 (face diff-context)
36 48 (face diff-context)
48 51 (face diff-context)
51 52 (face diff-indicator-removed)
52 81 (face diff-removed)
81 82 (face diff-indicator-added)
82 111 (face diff-added)
111 124 (face diff-context)
124 127 (face diff-context))))
;; Test diff-font-lock-syntax.
(should (equal (mapcar (lambda (o)
(list (- (overlay-start o) diff-beg)
(- (overlay-end o) diff-beg)
(append (and (overlay-get o 'diff-mode)
`(diff-mode ,(overlay-get o 'diff-mode)))
(and (overlay-get o 'face)
`(face ,(overlay-get o 'face))))))
(sort (overlays-in (point-min) (point-max))
(lambda (a b) (< (overlay-start a) (overlay-start b)))))
'((0 127 (diff-mode fine))
(0 127 (diff-mode syntax))
(17 25 (diff-mode syntax face font-lock-preprocessor-face))
(26 35 (diff-mode syntax face font-lock-string-face))
(37 40 (diff-mode syntax face font-lock-type-face))
(41 45 (diff-mode syntax face font-lock-function-name-face))
(61 78 (diff-mode syntax face font-lock-string-face))
(69 74 (diff-mode fine face diff-refine-removed))
(91 108 (diff-mode syntax face font-lock-string-face))
(99 104 (diff-mode fine face diff-refine-added))
(114 120 (diff-mode syntax face font-lock-keyword-face))))))))
(ert-deftest diff-mode-test-font-lock-syntax-one-line ()
"Check diff syntax highlighting for one line with no newline at end."
:expected-result (if (string-match-p "[[:nonascii:]]"
(ert-resource-directory))
:failed :passed)
(skip-unless (executable-find shell-file-name))
(skip-unless (executable-find diff-command))
(let ((default-directory (ert-resource-directory))
(old "hello_world_1.c")
(new "hello_emacs_1.c")
(diff-buffer (get-buffer-create "*Diff*"))
(diff-refine nil)
(diff-font-lock-syntax t)
diff-beg)
(diff-no-select old new '("-u") 'no-async diff-buffer)
(with-current-buffer diff-buffer
(font-lock-ensure)
(narrow-to-region (progn (diff-hunk-next)
(setq diff-beg (diff-beginning-of-hunk)))
(diff-end-of-hunk))
(should (equal-including-properties
(buffer-string)
#("@@ -1 +1 @@
-int main() { printf(\"Hello, World!\\n\"); return 0; }
\\ No newline at end of file
+int main() { printf(\"Hello, Emacs!\\n\"); return 0; }
\\ No newline at end of file
"
0 11 (face diff-hunk-header)
12 13 (face diff-indicator-removed)
13 65 (face diff-removed)
65 93 (face diff-context)
93 94 (face diff-indicator-added)
94 146 (face diff-added)
146 174 (face diff-context))))
(should (equal (mapcar (lambda (o)
(list (- (overlay-start o) diff-beg)
(- (overlay-end o) diff-beg)
(append (and (overlay-get o 'diff-mode)
`(diff-mode ,(overlay-get o 'diff-mode)))
(and (overlay-get o 'face)
`(face ,(overlay-get o 'face))))))
(sort (overlays-in (point-min) (point-max))
(lambda (a b) (< (overlay-start a) (overlay-start b)))))
'((0 174 (diff-mode syntax))
(13 16 (diff-mode syntax face font-lock-type-face))
(17 21 (diff-mode syntax face font-lock-function-name-face))
(33 50 (diff-mode syntax face font-lock-string-face))
(53 59 (diff-mode syntax face font-lock-keyword-face))
(94 97 (diff-mode syntax face font-lock-type-face))
(98 102 (diff-mode syntax face font-lock-function-name-face))
(114 131 (diff-mode syntax face font-lock-string-face))
(134 140 (diff-mode syntax face font-lock-keyword-face))))))))
(ert-deftest test-hunk-file-names ()
(with-temp-buffer
(insert "diff -c /tmp/ange-ftp13518wvE.el /tmp/ange-ftp1351895K.el\n")
(goto-char (point-min))
(should (equal (diff-hunk-file-names)
'("/tmp/ange-ftp1351895K.el" "/tmp/ange-ftp13518wvE.el"))))
(with-temp-buffer
(insert "diff -c -L /ftp:slbhao:/home/albinus/src/tramp/lisp/tramp.el -L /ftp:slbhao:/home/albinus/src/emacs/lisp/net/tramp.el /tmp/ange-ftp13518wvE.el /tmp/ange-ftp1351895K.el\n")
(goto-char (point-min))
(should (equal (diff-hunk-file-names)
'("/tmp/ange-ftp1351895K.el" "/tmp/ange-ftp13518wvE.el")))))
(provide 'diff-mode-tests)
|
