forked from twaugh/patchutils
-
Notifications
You must be signed in to change notification settings - Fork 0
/
ChangeLog
2337 lines (1530 loc) · 67.4 KB
/
ChangeLog
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
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
2015-04-20 Tim Waugh <[email protected]>
* configure.ac: Version 0.3.4.
* NEWS: Updated.
2015-04-14 Tim Waugh <[email protected]>
* src/filterdiff.c: Handle git extended headers.
* Makefile.am: The fullheader1 test case should now pass.
* tests/lsdiff6/run-test: Fixed typo.
* tests/fullheader1/run-test: Fixed typo.
2015-04-13 Tim Waugh <[email protected]>
* src/interdiff.c: Applied patch from Ulrich Drepper to fix
fullheader2 test case.
* Makefile.am: Now the test case is expected to pass.
* tests/fullheader2/run-test: Another test for handling git
output.
* Makefile.am: Run it. Currently expected to fail.
2015-03-20 Tim Waugh <[email protected]>
* tests/fullheader1/run-test: Test for handling git output.
* Makefile.am: Run it. Currently expected to fail.
2015-02-19 Tim Waugh <[email protected]>
* tests/recount7/run-test: Test for recountdiff with broken
whitespace-only lines.
* scripts/recountdiff.in: Be more forgiving of broken
whitespace-only context lines (found due to bug #1194285).
2014-11-04 Tim Waugh <[email protected]>
* NEWS: Updated.
* splitdiff.in: New -D option, suggested by Ulf Samuelsson.
* common.sh: Set path to splitdiff in the test environment.
* tests/splitdiffD/run-test: Test splitdiff -D.
* Makefile.am: Make sure splitdiff is up to date before
running tests. Run splitdiffD test.
* doc/patchutils.xml: Updated.
2014-10-17 Tim Waugh <[email protected]>
* Makefile.am: Run delhunk6 test even though it is expected to
fail.
* tests/trimlast1/run-test: Test case for trac issue #32.
* tests/trimlast1/run-test: Another one.
* Makefile.am: Run them (they both currently fail).
2014-05-09 Tim Waugh <[email protected]>
* src/filterdiff.c: Make --clean drop comments after '@@'
lines as well (trac #29).
* tests/clean2/run-test: Test case for that.
* Makefile.am: Run it.
2013-04-11 Tim Waugh <[email protected]>
* src/filterdiff.c: Don't show grepdiff-specific options in
help output for filterdiff/lsdiff (bug #948973).
2013-04-02 Tim Waugh <[email protected]>
* configure.in: Version 0.3.3.
2011-05-26 Tim Waugh <[email protected]>
* src/filterdiff.c (do_context): Handle "no newline" lines
(trac #13, newline6 test case).
2011-05-25 Tim Waugh <[email protected]>
* splitdiff.in: Output files now have a .patch filename
extension, unless the new -E option is given.
2011-05-20 Tim Waugh <[email protected]>
* src/rediff.c: Applied patch from Jiri Popelka to fix
possible NULL pointer access.
* src/diff.c: Applied patch from Jiri Popelka to fix incorrect
use of sizeof for memory allocation.
* src/diff.c, src/interdiff.c: Applied patch from Jiri Popelka
to fix resource leaks. Slight changes made my me.
2011-03-08 Tim Waugh <[email protected]>
* tests/newline6/run-test: New test case for trac #13.
* Makefile.am: Run it (currently fails).
2011-02-14 Tim Waugh <[email protected]>
* src/util.c (patlist_add_file): Avoid PATH_MAX (trac #11).
* tests/rediff2/run-test: Portability fix (trac #18).
2011-02-10 Tim Waugh <[email protected]>
* configure.in: Version 0.3.2.
2011-02-10 Tim Waugh <[email protected]>
* editdiff.in: Do not run rediff if no changes were made (trac
#14).
* doc/patchutils.xml: Updated grepdiff documentation to
include all its options (trac #17).
* src/interdiff.c (apply_patch): Don't put absolute filenames
in the input to patch.
2011-01-04 Tim Waugh <[email protected]>
* src/util.c (xopen_unzip): Use correct exit status for
"lsdiff -z nonexistentfile" (trac #16).
2009-08-10 Tim Waugh <[email protected]>
* src/util.c (xtmpfile): Clean up temporary file (trac #12).
Also free the memory allocated to hold its name.
2009-01-23 Tim Waugh <[email protected]>
* configure.in: Version 0.3.1.
2009-01-23 Tim Waugh <[email protected]>
* src/filterdiff.c (main): Provide GNU-style long names for all
options (trac #6).
* src/interdiff.c (main): Likewise.
* doc/patchutils.xml: Updated.
2009-01-23 Tim Waugh <[email protected]>
* src/filterdiff.c (do_unified): Cope a little better with
incomplete @@ lines.
2009-01-23 Tim Waugh <[email protected]>
* src/rediff.c (adjust_offsets_and_copy): Keep the trailing text
after @@ (trac #8).
(removed_hunk): Likewise.
2009-01-21 Tim Waugh <[email protected]>
* src/rediff.c (show_modified_hunk): If changes have been made
outside the original diff, error out (trac #1).
2009-01-21 Tim Waugh <[email protected]>
* tests/rediff2/run-test: New test case.
2009-01-21 Tim Waugh <[email protected]>
* doc/patchutils.xml: Fixed typo (trac #7).
2009-01-21 Tim Waugh <[email protected]>
* src/util.c (xtmpfile): New function.
* src/interdiff.c (output_delta): Use it.
(take_diff): Likewise.
(interdiff): Likewise.
* src/diff.c (do_convert): Likewise.
* src/filterdiff.c (do_unified): Likewise.
(do_context): Likewise.
* src/rediff.c (added_hunk): Likewise.
(show_modified_hunk): Likewise.
(rediff): Likewise.
* src/util.c (xopen_seekable): Likewise.
(xopen_unzip): Likewise.
The tmpfile() function is not specified to use the TMPDIR
environment variable. We wrap it to make sure that TMPDIR is
honoured (trac #3).
2008-07-28 Tim Waugh <[email protected]>
* src/interdiff.c (output_patch1_only): Clean up error messages.
(output_delta): Likewise.
Patch from Eli Carter.
2008-07-02 Tim Waugh <[email protected]>
* configure.in: Version 0.3.0 (stable).
2008-07-02 Tim Waugh <[email protected]>
* src/filterdiff.c (clean_comments): New global.
(filterdiff): Use it in determining whether to show non-diff
lines.
(syntax_str): Updated.
(main): New option --clean.
* doc/patchutils.xml: Updated.
* tests/clean1/run-test: New test case.
* Makefile.am (TESTS): Run it.
2008-07-02 Tim Waugh <[email protected]>
* Makefile.am: Add TESTS and XFAIL_TESTS to EXTRA_DIST,
instead of listing each test twice.
2008-06-11 Tim Waugh <[email protected]>
* src/util.c (patlist_add_file): New function.
* src/filterdiff.c (main): Use it, for new options -X and -I.
(syntax_str): Updated.
Original patch from Serj Kalichev.
* doc/patchutils.xml: Updated.
* tests/select2/run-test: Test -I (context format).
* tests/select1/run-test: Test -I (unified format).
* tests/select10/run-test: New test. Test -x and -X for unified
format.
* tests/select11/run-test: New test. Test -x and -X for context
format.
* Makefile.am (TESTS): Run new tests.
2008-06-11 Tim Waugh <[email protected]>
* src/filterdiff.c (print_patchnames): Initial value is -1.
(main): Initialise print_patchnames: if -H is allowed, and
multiple input files are given, set it to 1; otherwise set it to
0.
* tests/lsdiff13/run-test: Verify that -H is the default when
multiple files are given.
2005-08-10 Tim Waugh <[email protected]>
* src/diff.c (best_name): Prevent use of uninitialised variable.
2005-07-22 Tim Waugh <[email protected]>
* doc/patchutils.xml: Use referenceinfo for including author section.
2005-06-13 Tim Waugh <[email protected]>
* configure.in: Version 0.2.31.
2005-05-11 Tim Waugh <[email protected]>
* tests/delhunk6/run-test: New failing rediff test.
* Makefile.am: Run it.
* src/interdiff.c (construct_unline): Fixed compiler warning.
* splitdiff.in: Applied Debian patch to prevent warnings from
splitdiff (Debian bug #306869).
2005-03-21 Tim Waugh <[email protected]>
* doc/patchutils.xml: Fixed missing space (debian bug #299310).
Patch from Michael Fedrowitz.
2005-02-26 Tim Waugh <[email protected]>
* src/diff.c (read_atatline): Require decimal for offsets. Reported
by Robert Collins <[email protected]>.
2004-11-29 Tim Waugh <[email protected]>
* src/filterdiff.c (syntax), src/rediff.c (main): Applied patch from
Juan M. Bello Rivas <[email protected]> to use xstrdup instead of
strdup.
* src/rediff.c (main): Applied patch from Juan M. Bello
Rivas <[email protected]>.
2004-11-22 Tim Waugh <[email protected]>
* splitdiff.in: Applied patch from Martin Schulze <[email protected]>
to use %03d when generating output filenames (Debian bug #282017).
2004-07-15 Tim Waugh <[email protected]>
* configure.in: Version 0.2.30 (stable).
2004-07-15 Tim Waugh <[email protected]>
* src/filterdiff.c (display_filename): Better padding for file
number.
2004-07-07 Tim Waugh <[email protected]>
* src/diff.c (read_timezone): New function.
(read_timestamp): Use it. Suggested by Shawn Wagner, for parsing
another common traditional date format.
2004-07-03 Tim Waugh <[email protected]>
* src/filterdiff.c (syntax): Explain --number-files a bit more.
* src/filterdiff.c (hunk_matches): Don't call file_matches()
unnecessarily.
2004-07-02 Tim Waugh <[email protected]>
* src/filterdiff.c: New --number-files option for lsdiff/grepdiff.
* doc/patchutils.xml (lsdiff): Document it.
2004-05-19 Tim Waugh <[email protected]>
* src/filterdiff.c (hunk_matches): Small correction.
2004-05-14 Tim Waugh <[email protected]>
* doc/patchutils.xml (interdiff.1): Clarify requirement for
reference files being exactly the same.
2004-05-07 Tim Waugh <[email protected]>
* doc/patchutils.xml: For grepdiff -n output format refer to the
lsdiff man page.
* src/filterdiff.c (main): Prevent -n being accepted by
filterdiff.
2004-05-06 Tim Waugh <[email protected]>
* doc/patchutils.xml: Include --hunks/--lines/--files in lsdiff man
page.
* src/filterdiff.c: Fixed --help output.
* src/filterdiff.c: Added --files option, based on work by
Sérgio Monteiro Basto <[email protected]>.
* doc/patchutils.xml: Document it.
* tests/lsdiff12/run-test: Avoid using /dev/stdin, which is not
available on Cygwin set-ups.
* tests/flip*/run-test: Use /bin/echo instead of the shell builtin.
Patch from Max Bowsher <[email protected]>.
2004-04-16 Tim Waugh <[email protected]>
* src/filterdiff.c (do_unified): Handle no-newline line counts
correctly.
* tests/newline5/run-test: New test.
* Makefile.am: Run it.
2004-04-05 Tim Waugh <[email protected]>
* configure.in: Version 0.2.29 (stable).
2004-04-02 Tim Waugh <[email protected]>
* src/filterdiff.c (do_unified): Fix grep delayed-output logic.
* tests/grepdiff7/run-test: New test.
* Makefile.am: Run it.
2004-03-27 Tim Waugh <[email protected]>
* tests/*/run-test: Use -s to test for errors.
* src/interdiff.c (creare_orig): Fix no-newline handling (Debian
bug #240406).
* tests/newline4/run-test: New test case, from Debian bug #240406.
* Makefile.am: Run it.
2004-03-25 Tim Waugh <[email protected]>
* src/filterdiff.c (do_context): Generate context format that GNU
patch actually understands.
* tests/convert2/run-test: Check that multiple hunk context output
is accepted by GNU patch.
* tests/grepdiff4/run-test: Expect GNU patch compatible context
format.
2004-03-10 Tim Waugh <[email protected]>
* configure.in: Version 0.2.28 (stable).
2004-03-10 Tim Waugh <[email protected]>
* tests/convert1/run-test, tests/convert2/run-test: New tests.
* Makefile.am: Run them.
* src/diff.c (copy_context_hunks): Share variable holding getline
return value with caller to avoid getting in a muddle.
(convert_context_hunks_to_unified): Initialize linelengths array.
2004-03-09 Tim Waugh <[email protected]>
* src/filterdiff.c (filterdiff): Pass through partial diff headers
in verbose mode or when excluding.
2004-02-26 Tim Waugh <[email protected]>
* configure.in: Version 0.2.27 (stable).
2004-02-26 Tim Waugh <[email protected]>
* dehtmldiff.in: Display the line containing the unknown entity to
stderr, where the error message went. Translate ".
2004-01-22 Tim Waugh <[email protected]>
* doc/patchutils.xml: Note strict requirements of interdiff and
combinediff.
2004-01-16 Tim Waugh <[email protected]>
* tests/nul0/run-test, tests/nul1/run-test, tests/nul2/run-test,
tests/nul3/run-test: New tests.
* Makefile.am: Run them.
* src/diff.c: Handle embedded null characteres.
2004-01-15 Tim Waugh <[email protected]>
* src/filterdiff.c (do_unified): Handle embedded null characters.
(do_context): Likewise.
* src/interdiff.c: Likewise.
* src/interdiff.c (output_delta): Fixed typo spotted by Michael
Fedrowitz.
2004-01-15 Tim Waugh <[email protected]>
* tests/lsdiff14/run-test, tests/lsdiff15/run-test: New tests.
* Makefile.am: Run them.
* doc/patchutils.xml: Document lsdiff -E.
2004-01-14 Tim Waugh <[email protected]>
* src/interdiff.c (construct_unline): Fix compiler warning.
* src/filterdiff.c (do_unified): Implement -E option for lsdiff.
* src/filterdiff.c (do_context): Likewise.
2004-01-12 Tim Waugh <[email protected]>
* configure.in: Version 0.2.26 (stable).
2004-01-12 Tim Waugh <[email protected]>
* doc/patchutils.xml: Suggested improvement in wording.
2004-01-07 Tim Waugh <[email protected]>
* src/interdiff.c (output_patch1_only): Use size_t* for 2nd
argument to getline.
(trim_context): Likewise.
(output_delta): Likewise.
Patch from Yoshihiro Toda <[email protected]>.
* src/filterdiff.c (do_unified): Make linelen a size_t*, since
that's how it is used.
(do_context): Likewise.
(read_regex_file): Likewise.
Patch from Yoshihiro Toda <[email protected]>.
2003-12-21 Tim Waugh <[email protected]>
* src/interdiff.c, src/rediff.c: Move always-executed code outside
assert() so that NDEBUG builds work.
2003-12-14 Tim Waugh <[email protected]>
* configure.in: Version 0.2.25 (stable).
2003-10-30 Tim Waugh <[email protected]>
* splitdiff.in (process): Avoid ugliness caused by 'diff -u ...'
lines not being start-of-diff markers. Patch from Eric
Wong <[email protected]>.
2003-10-21 Tim Waugh <[email protected]>
* splitdiff.in: Added '-d' option so that 'splitdiff -ad' operates
a bit more like diffsplit, for Debian bug #215870.
* doc/patchutils.xml: Updated documentation.
2003-09-30 Tim Waugh <[email protected]>
* dehtmldiff.in: Make shell-generic, from Dmitry V. Levin
2003-08-28 Tim Waugh <[email protected]>
* src/util.c (getline): Apply fix from Max Bowsher <[email protected]>.
2003-07-31 Tim Waugh <[email protected]>
* src/filterdiff.c (syntax): Dynamic --help output.
* src/filterdiff.c: Support --with-filename as a synonym for -H.
Add support for -h/--no-filename to allow us to assume -H in the
future when there are multiple input files.
* doc/patchutils.xml: Document it.
* tests/lsdiff3/run-test, tests/lsdiff11/run-test: Specify -h/-H.
2003-07-28 Tim Waugh <[email protected]>
* tests/lsdiff13/run-test: New test for -H.
* Makefile.am: Run it.
2003-07-26 Tim Waugh <[email protected]>
* src/filterdiff.c (do_context): Fix left-behind NULL.
2003-07-26 Tim Waugh <[email protected]>
* src/filterdiff.c: Implement -H option similarly to GNU grep; it
displays the filenames containing the matches. Based on patch by
David Necas <[email protected]>.
2003-07-25 Tim Waugh <[email protected]>
* configure.in: Version 0.2.24 (stable).
2003-07-25 Tim Waugh <[email protected]>
* src/filterdiff.c (file_exists): Treat /dev/null as nonexistent.
* tests/lsdiff12/run-test: New test.
* Makefile.am: Run test.
2003-07-07 Tim Waugh <[email protected]>
* doc/patchutils.xml: Fix typo (debian bug #198068).
2003-06-13 Tim Waugh <[email protected]>
* src/filterdiff.c: Move timestamp code to..
* src/diff.c (read_timestamp): ..here.
(filename_from_header): Function for intuiting the filename.
* src/diff.h: Prototypes for new functions.
* src/filterdiff.c (filterdiff): Use filename_from_header.
* src/interdiff.c (index_patch2, interdiff): Likewise.
* tests/lsdiff11/run-test: New tests for filename intuition.
* Makefile.am: Run it.
2003-06-12 Tim Waugh <[email protected]>
* src/filterdiff.c: Add grepdiff's -f option to --help output.
2003-06-10 Tim Waugh <[email protected]>
* src/diff.c, src/interdiff.c: Fix signed/unsigned comparisons.
* src/filterdiff.c (read_regex_file): New function to implement
'grepdiff -f FILE'.
* doc/patchutils.xml: Document it.
2003-06-07 Tim Waugh <[email protected]>
* src/filterdiff.c (egrepping): New global.
(main): Handle -E option.
(syntax_str): Display -E option in help.
* doc/patchutils.xml: Document it.
2003-06-05 Tim Waugh <[email protected]>
* src/filterdiff.c (output_header_line): Implement timestamp
removal.
* doc/patchutils.xml (filterdiff.1): Document it.
2003-06-05 Tim Waugh <[email protected]>
* configure.in: Version 0.2.23 (stable).
2003-06-05 Tim Waugh <[email protected]>
* src/interdiff.c (apply_patch): Take note of exit status of
sub-process.
(flipdiff): Abort on error.
(output_delta): Likewise. Fixes Red Hat bugzilla bug #92320.
2003-04-11 Tim Waugh <[email protected]>
* src/interdiff.c (index_patch2, interdiff): Warn if non-empty
input file contains no patch (debian bug #187767). Based on patch
by Michael Fedrowitz <[email protected]>.
2003-03-19 Tim Waugh <[email protected]>
* editdiff.in: Fix behaviour when no parameters are given.
Be verbose if rediff fails (debian bug #185345).
2003-03-11 Tim Waugh <[email protected]>
* tests/flip1/run-test, tests/flip1/run-test, tests/flip1/run-test,
tests/flip1/run-test, tests/flip1/run-test, tests/flip1/run-test,
tests/flip1/run-test, tests/flip1/run-test, tests/flip1/run-test,
tests/flip1/run-test, tests/flip1/run-test, tests/flip1/run-test,
tests/flip1/run-test, tests/flip1/run-test, tests/flip1/run-test,
tests/flip1/run-test, tests/flip1/run-test, tests/flip1/run-test,
tests/flip1/run-test: Make sed usage compatible with older versions.
2003-03-08 Tim Waugh <[email protected]>
* configure.in: Version 0.2.22 (stable).
2003-03-08 Tim Waugh <[email protected]>
* configure.in: Check for a default editor.
* editdiff.in: Use it.
2003-03-06 Tim Waugh <[email protected]>
* doc/patchutils.xml: Don't use <sbr/> any more, now that xmlto
wraps <cmdsynopsis> properly.
2003-03-05 Tim Waugh <[email protected]>
* src/filterdiff.c (do_unified): Prevent uninitialised use of
first_hunk.
* espdiff.in, configure.in: Implementation.
* Makefile.am: Ship it.
* doc/patchutils.xml (espdiff.1): New man page.
2003-03-03 Tim Waugh <[email protected]>
* fixcvsdiff.in: More tweaking.
2003-03-03 Tim Waugh <[email protected]>
* fixcvsdiff.in: Add patch from Eli Carter <[email protected]>
to make output easier for vim parsing.
2003-03-03 Tim Waugh <[email protected]>
* tests/number1/run-test, tests/number2/run-test: New tests for
filterdiff --as-numbered-lines.
* src/filterdiff.c (do_unified, do_context): Pass them.
(do_context): Simply code a little.
* Makefile.am: Run them.
* src/filterdiff.c (main): Prevent grepdiff --as-numbered-lines unless
--output-matching is also given.
* src/filterdiff.c (do_context): Make --as-numbered-lines and
--output-matching get along.
* Makefile.am: Now we pass grepdiff6.
2003-03-02 Tim Waugh <[email protected]>
* tests/grepdiff6/run-test: New test; context format equivalent of
grepdiff5.
* Makefile.am: Run it, but don't expect to pass yet.
* tests/grepdiff5/run-test: New test.
* Makefile.am: Run test.
* src/filterdiff.c (do_context): Tend to severe indentationitis.
(do_unified): Make --as-numbered-lines and --output-matching get
along.
2003-03-01 Tim Waugh <[email protected]>
* src/filterdiff.c (main): Weed out invalid option combinations.
(do_unified, do_context): Weed out superfluous tests.
* src/filterdiff.c (do_context): Fix annotations (missing newline).
Fix up offset munging for --output-matching=hunk.
* tests/grepdiff4/run-test: Test offset munging.
* Makefile.am: Run test.
* src/filterdiff.c (do_unified): Fix up offset munging for
--output-matching=hunk.
* tests/grepdiff3/run-test: Test offset munging for
--output-matching=hunk.
* Makefile.am: Run test.
2003-03-01 Tim Waugh <[email protected]>
* doc/patchutils.xml (grepdiff_: Document --output-matching.
* src/filterdiff.c (do_unified): Support --output-matching.
(do_context): Likewise (but it doesn't work right yet).
* tests/grepdiff2/run-tests: New test (grepdiff and -nv).
* Makefile.am: Run it.
* tests/lsdiff10/run-test: New test (non-diff lines with -v).
* Makefile.am: Run it.
2003-02-28 Tim Waugh <[email protected]>
* src/filterdiff.c (do_unified, do_context): Give meaning to -v
with grepdiff, and fix lsdiff -v behaviour.
* doc/patchutils.xml (grepdiff): Document -v.
* src/filterdiff.c (filterdiff): Don't show non-diff lines unless
filtering.
* doc/patchutils.xml: Formatting change for grepdiff.
2003-02-28 Tim Waugh <[email protected]>
* splitdiff.in: Eliminate sed dependency to increase efficiency.
2003-02-28 Tim Waugh <[email protected]>
* splitdiff.in: Add 'a' option to split out every single
file-level patch.
* doc/patchutils.xml: Document it.
2003-02-21 Tim Waugh <[email protected]>
* configure.in: Version 0.2.21 (stable).
2003-02-21 Tim Waugh <[email protected]>
* src/interdiff.c (interdiff): Surround flipdiff marker with newlines,
to prevent confusing unwrapdiff.
* tests/flip*/run-test: Adjust accordingly.
* doc/patchutils.xml (flipdiff): Document more options.
* tests/unline1/run-test: New test where evasive action is not needed
now.
* Makefile.am: Run it.
* src/interdiff.c (output_delta): Now that trim_context is a little
smarter, we don't have to take evasive action quite so often.
2003-02-20 Tim Waugh <[email protected]>
* doc/patchutils.xml (flipdiff.1): Warn that the output may not
always be what you expect.
* src/interdiff.c (trim_context): Abort if hunk-splitting would be
required.
* tests/flip18/run-test, tests/flip19/run-test: New tests.
* Makefile.am: Run them.
* src/interdiff.c (trim_context): Same corner-case for pre trimming.
* tests/flip4/run-test: Correction.
* src/interdiff.c (trim_context): Deal with corner-case for post
trimming (now we pass flip17).
* tests/flip17/run-test: New test.
* Makefile.am: Run it. We don't pass it yet.
* dehtmldiff.in: Check for entities we didn't translate.
* tests/flip16/run-test: New test.
* Makefile.am: Run it.
2003-02-19 Tim Waugh <[email protected]>
* src/interdiff.c (offset_at_line, patch2_removes_line, flipdiff):
Completely re-wrote offset handling.
2003-02-17 Tim Waugh <[email protected]>
* src/interdiff.c (remove_line): We pass flip15 now, but somehow
it doesn't feel right.
* tests/flip15/run-test: New test.
* Makefile.am: Run it. We don't pass it yet.
2003-02-17 Tim Waugh <[email protected]>
* src/interdiff.c (offset_at_line): Think it's better now.
(patch2_removes_line): Needed similar fixing.
* tests/flip13/run-test, tests/flip14/run-test: New tests.
* Makefile.am: Run them.
* src/interdiff.c (offset_at_line): More fixes, but still doesn't
seem quite right yet.
2003-02-17 Tim Waugh <[email protected]>
* tests/flip12/run-test: New test.
* Makefile.am: Run it.
* src/interdiff.c (offset_at_line): Correct for insertions.
* dehtmldiff.in: Fix argument parsing.
2003-02-16 Tim Waugh <[email protected]>
* tests/flip11/run-test: New test.
* Makefile.am: Run it.
* src/interdiff.c (flipdiff): More parsing code improvements.
* tests/flip10/run-test: New test.
* Makefile.am: Run it.
* tests/common.sh: Use -s option to patch.
* src/interdiff.c (trim_context): Handle trimming from either end,
not just the start.
* src/interdiff.c (flipdiff): Redo parsing code in the manner of
interdiff().
2003-02-12 Tim Waugh <[email protected]>
* tests/common.sh: If VERBOSE environment variable is non-empty,
set -x.
* tests/*/run-test: Don't set -x here.
* src/rediff.c (main): Use execvp not execv for recountdiff (patch
from Michael Fedrowitz).
2003-02-04 Tim Waugh <[email protected]>
* src/interdiff.c (add_to_list): Don't reverse the order of the
files.
2003-02-04 Tim Waugh <[email protected]>
* src/interdiff.c (interdiff): Really write flipped diffs to the
right files when --in-place.
2003-02-03 Tim Waugh <[email protected]>
* doc/patchutils.xml (filterdiff.1): Fix wrapping.
2003-02-02 Tim Waugh <[email protected]>
* configure.in: Version 0.2.20 (stable).
2003-02-02 Tim Waugh <[email protected]>
* move-to-front: Helper script for using flipdiff.
* Makefile.am: Ship it in the tarball.
* interdiff.c (add_line, create_orig): Count line clashes.
(flipdiff): Refuse to proceed if there are any clashes.
2003-02-02 Tim Waugh <[email protected]>
* doc/patchutils.xml (flipdiff.1): Warn that the patches should be
"clean".
* tests/flip9/run-test: New test.
* Makefile.am: Run it.
* src/interdiff.c (interdiff): When writing flipped patches in place,
write to the right files.
* src/interdiff.c: Don't ever revert patches when flipping.
2003-02-01 Tim Waugh <[email protected]>
* tests/flip8/run-test: New test.
* src/interdiff.c (flipdiff): Remove bad 'break;' from loop.
* Makefile.am: Now we pass flip8.
* tests/flip7/run-test: New test.
* Makefile.am: Run it.
* src/interdiff.c (main): Don't allow --in-place unless we are
behaving as flipdiff.
2003-01-31 Tim Waugh <[email protected]>
* tests/flip5/run-test, tests/flip6/run-test: New tests.
* Makefile.am: Run them.
* src/interdiff.c (flipdiff): Fix bug. Now we pass flip5.
2003-01-31 Tim Waugh <[email protected]>
* tests/flip4/run-test: New test.
* Makefile.am: Run it.
* src/interdiff.c: Sort out first_offset problem to fix flip4.
2003-01-31 Tim Waugh <[email protected]>
* tests/flip2/run-test, tests/flip2/run-test: New tests.
* Makefile.am: Run them.
* doc/patchutils.xml: Document flipdiff.
* Makefile.am: Ship flipdiff.1.
* src/interdiff.c: New option --in-place for flipdiff.
* tests/flip1/run-test: New test.
* Makefile.am: Run it.
* tests/common.sh: Support flipdiff testing.
* Makefile.am: Ship flipdiff.
* src/interdiff.c: New command flipdiff. Still a bit rudimentary.
* src/interdiff.c (do_output_patch1_only, output_patch1_only,
trim_context, output_delta, copy_residue): New parameter (where to
send output).
* src/util.h, src/util.c: New function xrealloc.
2003-01-30 Tim Waugh <[email protected]>
* src/interdiff.c (main): Propagate errors.
Also some preliminary work on flipdiff.
Formatting changes.
2003-01-23 Tim Waugh <[email protected]>
* configure.in: Version 0.2.19 (stable).
2003-01-23 Tim Waugh <[email protected]>
* src/interdiff.c (create_orig): Note the minimum leading context.
(output_patch1_only): Trim -U to the minimum leading context.
* Makefile.am: Now we pass U3.
* src/interdiff.c (create_orig): Note the first offset.
(write_file): Write unlines up to the first offset.
(merge_lines): Merge first offsets.
* tests/U3/run-test: New test.
* Makefile.am: Run it. We don't pass it yet.
2003-01-22 Tim Waugh <[email protected]>
* editdiff.in: Don't run interdiff -U3, since it behaves badly
when there are fewer than the specified number of context lines.
* Makefile.am: Make sure the tests are executable.
* tests/rediff1/run-test: New test.
* Makefile.am: Run it.
* src/rediff.c (show_modified_hunk): Pass it.
2003-01-17 Tim Waugh <[email protected]>
* dehtmldiff.in: New file.
* configure.in: Create dehtmldiff from it.
* Makefile.am: Ship it.
* doc/patchutils.xml: Document it.
2002-12-16 Tim Waugh <[email protected]>
* src/filterdiff.c (file_exists): Fix thinko.
2002-12-16 Tim Waugh <[email protected]>
* configure.in: Version 0.2.18 (stable).
2002-12-16 Tim Waugh <[email protected]>
* configure.in: Fix LIBOBJ handling.
2002-12-13 Ville Skyttä <[email protected]>
* fixcvsdiff.in: Fix header paths up from the Index: line.
2002-10-15 Tim Waugh <[email protected]>
* src/filterdiff.c (file_exists): Handle ISO 8601 timezones.
* tests/lsdiff3/run-test: Test ISO 8601 timezones.
2002-10-11 Tim Waugh <[email protected]>
* doc/patchutils.xml (splitdiff.1): Clarifications.
2002-09-10 Tim Waugh <[email protected]>
* configure.in: Version 0.2.17 (stable).
2002-09-03 Tim Waugh <[email protected]>
* src/filterdiff.c (main): Close each input file given on the
command line after use.
* src/interdiff.c (main): Use mode "m" to permit the C library to
use mmap(2).
* src/filterdiff.c (main): Likewise.
* src/rediff.c (rediff): Likewise.
2002-08-23 Tim Waugh <[email protected]>
* doc/patchutils.xml (filterdiff.1): Add example for forma
conversion.
2002-08-22 Tim Waugh <[email protected]>
* src/diff.c: Line number tracking, for reporting errors.
2002-08-21 Tim Waugh <[email protected]>