-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathDiffWindowController.m
828 lines (683 loc) · 19.4 KB
/
DiffWindowController.m
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
/*
* DiffWindowController.m
*
* Copyright (c) 2002 Pierre-Yves Rivaille <[email protected]>
* Copyright (c) 2002-2020, GNUstep Project
*
* This file is part of EasyDiff.app.
*
* EasyDiff.app 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 2 of the License, or
* (at your option) any later version.
*
* EasyDiff.app 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 EasyDiff.app; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#import <AppKit/AppKit.h>
//#include "DiffTextView.h"
//#include "DiffMiddleView.h"
#import "DiffView.h"
#import "DiffWindowController.h"
#import "DiffWrapper.h"
//extern void tasktest(NSString *file1, NSString *file2,
// NSMutableArray **r1, NSMutableArray **r2);
@interface PatchData : NSObject
{
@public
NSMutableString *patchString;
int start;
int end;
int lineDifference;
}
@end
@implementation PatchData
@end
@interface DiffWindowController (Private)
- (void) diffViewFrameDidChange: (NSNotification*) aNotification;
- (id) _initWithFilename: (NSString *) filename1
andFilename: (NSString *) filename2;
- (NSMutableString *) _patchMutableString: (int) direction;
- (void) saveMergedAt: (NSString *) mergedName;
@end
@implementation DiffWindowController
- (id) initWithFilename: (NSString *) filename1
andTempFilename: (NSString *) filename2
{
/* Switch filenames so the VC version is on the left */
[self _initWithFilename: filename2
andFilename: filename1];
if (self)
{
tempFilename = filename2;
[[self window] setTitle:
[NSString
stringWithFormat:
@"Comparing %@ to the VC version",
[filename1 lastPathComponent]]];
[[self window] makeKeyAndOrderFront: self];
leftFileName = nil;
rightFileName = [filename1 retain];
}
return self;
}
- (id) initWithFilename: (NSString *) filename1
andFilename: (NSString *) filename2
{
[self _initWithFilename: filename1
andFilename: filename2];
if (self)
{
tempFilename = nil;
[[self window] setTitle:
[NSString
stringWithFormat:
@"Comparing %@ to %@",
[filename1 lastPathComponent],
[filename2 lastPathComponent]]];
[[self window] makeKeyAndOrderFront: self];
leftFileName = [filename1 retain];
rightFileName = [filename2 retain];
NSLog(@"windowsMenu %@", [NSApp windowsMenu]);
}
return self;
}
- (id) _initWithFilename: (NSString *) filename1
andFilename: (NSString *) filename2
{
self = [super initWithWindowNibName: @"window"];
if (self)
{
[self window];
NSLog(@"%@", scroller);
[scroller setArrowsPosition: NSScrollerArrowsMaxEnd];
[scroller setFloatValue:0.5 knobProportion:0.2];
[scroller setEnabled: YES];
diffWrapper = [[DiffWrapper alloc] initWithFilename: filename1
andFilename: filename2];
[diffWrapper compare];
leftChanges = [diffWrapper leftChanges];
rightChanges = [diffWrapper rightChanges];
// tasktest(filename1, filename2, &leftChanges, &rightChanges);
[leftChanges retain];
[rightChanges retain];
{
NSString *string1;
NSString *string2;
string1 = [NSString stringWithContentsOfFile: filename1];
string2 = [NSString stringWithContentsOfFile: filename2];
[diffView setLeftString: string1];
[diffView setRightString: string2];
[diffView setLeftChanges: leftChanges
andRightChanges: rightChanges];
[diffView setLeftLineRanges: [diffWrapper leftLineRanges]
andRightLineRanges: [diffWrapper rightLineRanges]];
[scroller setFloatValue: 0.
knobProportion:
([diffView frame].size.height /
[diffView mergeFileHeight])];
[diffView tile];
[diffView setPostsFrameChangedNotifications: YES];
[[NSNotificationCenter defaultCenter]
addObserver: self
selector: @selector(diffViewFrameDidChange:)
name: NSViewFrameDidChangeNotification
object: diffView];
choices = (int *) calloc([leftChanges count], sizeof(int));
}
[self diffViewFrameDidChange: nil];
}
return self;
}
- (void) diffViewFrameDidChange: (NSNotification*) aNotification
{
[diffView computeScrollerSize];
if ([diffView frame].size.height >= [diffView mergeFileHeight])
{
[scroller setEnabled: NO];
}
else
{
[scroller setEnabled: YES];
[scroller setFloatValue: [scroller floatValue]
knobProportion:
([diffView frame].size.height /
[diffView mergeFileHeight])];
[diffView doScroll: scroller];
}
}
- (void) windowWillClose: (id) sender
{
NSLog(@"windowWillClose called");
// RELEASE([self window]);
[self autorelease];
}
- (void) dealloc
{
NSLog(@"dealloc called");
[[NSNotificationCenter defaultCenter]
removeObserver: self
name: NSViewFrameDidChangeNotification
object: diffView];
if (tempFilename != nil)
{
if ([[NSFileManager defaultManager]
removeFileAtPath: tempFilename
handler: nil] == NO)
NSLog(@"We could not delete %@", tempFilename);
}
[leftChanges release];
[rightChanges release];
[leftFileName release];
[rightFileName release];
[diffWrapper release];
free(choices);
[super dealloc];
}
- (void) matrixButtonClicked: (id) sender
{
int oldChoice = choices[[sender tag]];
NSLog(@"matrixButtonClicked %d, %d", (int)[sender tag],
(int)[sender selectedColumn]);
choices[[sender tag]] = [sender selectedColumn] - 1;
if ((oldChoice == -1) && (choices[[sender tag]] != -1))
{
[[diffView leftTextView] setColor:
[NSColor colorWithDeviceRed:0.7
green:0.7
blue:1.
alpha:1.]
forChangeNumber: [sender tag]];
}
else if ((oldChoice != -1) && (choices[[sender tag]] == -1))
{
[[diffView leftTextView] setColor:
[NSColor whiteColor]
forChangeNumber: [sender tag]];
}
if ((oldChoice == 1) && (choices[[sender tag]] != 1))
{
[[diffView rightTextView] setColor:
[NSColor colorWithDeviceRed:0.7
green:0.7
blue:1.
alpha:1.]
forChangeNumber: [sender tag]];
}
else if ((oldChoice != 1) && (choices[[sender tag]] == 1))
{
[[diffView rightTextView] setColor:
[NSColor whiteColor]
forChangeNumber: [sender tag]];
}
}
- (void) selectAllLeftChanges: (id) sender
{
int i;
NSArray *matrixArray = [[diffView middleView] matrixArray];
int count = [matrixArray count];
for ( i = 0; i < count; i ++ )
{
if (choices[i] != - 1)
{
choices[i] = -1;
[[diffView leftTextView] setColor:
[NSColor whiteColor]
forChangeNumber: i];
[[diffView rightTextView] setColor:
[NSColor colorWithDeviceRed:0.7
green:0.7
blue:1.
alpha:1.]
forChangeNumber: i];
[[matrixArray objectAtIndex: i] selectCellAtRow: 0 column:0];
}
}
}
- (void) selectAllRightChanges: (id) sender
{
int i;
NSArray *matrixArray = [[diffView middleView] matrixArray];
int count = [matrixArray count];
for ( i = 0; i < count; i ++ )
{
if (choices[i] != 1)
{
choices[i] = 1;
[[diffView rightTextView] setColor:
[NSColor whiteColor]
forChangeNumber: i];
[[diffView leftTextView] setColor:
[NSColor colorWithDeviceRed:0.7
green:0.7
blue:1.
alpha:1.]
forChangeNumber: i];
[[matrixArray objectAtIndex: i] selectCellAtRow: 0 column:2];
}
}
}
- (void) selectNoChanges: (id) sender
{
int i;
NSArray *matrixArray = [[diffView middleView] matrixArray];
int count = [matrixArray count];
for ( i = 0; i < count; i ++ )
{
if (choices[i] != 0)
{
choices[i] = 0;
[[diffView leftTextView] setColor:
[NSColor colorWithDeviceRed:0.7
green:0.7
blue:1.
alpha:1.]
forChangeNumber: i];
[[diffView rightTextView] setColor:
[NSColor colorWithDeviceRed:0.7
green:0.7
blue:1.
alpha:1.]
forChangeNumber: i];
[[matrixArray objectAtIndex: i] selectCellAtRow: 0 column:1];
}
}
}
- (void) savePatchFromRight: (id) sender
{
NSMutableString *patchString;
int result;
NSSavePanel *sPanel;
NSString *path = [[NSUserDefaults standardUserDefaults]
objectForKey:@"OpenDirectory"];
NSString *mergedName;
sPanel = [NSSavePanel savePanel];
// [sPanel setAllowsMultipleSelection:NO];
result = [sPanel runModalForDirectory: path
file: @""];
if (result != NSOKButton)
return;
path = [sPanel directory];
mergedName = [sPanel filename];
[[NSUserDefaults standardUserDefaults]
setObject: path
forKey:@"OpenDirectory"];
patchString = [self _patchMutableString: -1];
[patchString insertString: [NSString stringWithFormat: @"+++ %@\n",
leftFileName]
atIndex: 0];
if (rightFileName)
{
[patchString insertString: [NSString stringWithFormat: @"--- %@\n",
rightFileName]
atIndex: 0];
}
else
{
[patchString insertString: [NSString stringWithFormat: @"--- %@\n",
leftFileName]
atIndex: 0];
}
[patchString writeToFile: mergedName atomically: YES];
}
- (void) savePatchFromLeft: (id) sender
{
NSMutableString *patchString;
int result;
NSSavePanel *sPanel;
NSString *path = [[NSUserDefaults standardUserDefaults]
objectForKey:@"OpenDirectory"];
NSString *mergedName;
sPanel = [NSSavePanel savePanel];
// [sPanel setAllowsMultipleSelection:NO];
result = [sPanel runModalForDirectory: path
file: @""];
if (result != NSOKButton)
return;
path = [sPanel directory];
mergedName = [sPanel filename];
[[NSUserDefaults standardUserDefaults]
setObject: path
forKey:@"OpenDirectory"];
patchString = [self _patchMutableString: 1];
if (rightFileName)
{
[patchString insertString: [NSString stringWithFormat: @"+++ %@\n",
rightFileName]
atIndex: 0];
}
else
{
[patchString insertString: [NSString stringWithFormat: @"+++ %@\n",
leftFileName]
atIndex: 0];
}
[patchString insertString: [NSString stringWithFormat: @"--- %@\n",
leftFileName]
atIndex: 0];
[patchString writeToFile: mergedName atomically: YES];
}
- (NSMutableString *) _patchMutableString: (int) direction
{
NSArray *flr;
NSArray *tlr;
NSString *fstr;
NSString *tstr;
NSMutableArray *patchArray = [NSMutableArray arrayWithCapacity:
([leftChanges count] / 2) + 1];
NSMutableArray *finalArray = [NSMutableArray arrayWithCapacity:
([leftChanges count] / 2) + 1];
NSArray *fromChanges;
NSArray *toChanges;
NSMutableString *stringToInsert;
PatchData *p, *pp;
int i, j, k;
int toStart;
int toEnd;
int count;
int linesCount;
if (direction > 0)
{
flr = [diffWrapper leftLineRanges];
tlr = [diffWrapper rightLineRanges];
fstr = [diffWrapper leftString];
tstr = [diffWrapper rightString];
fromChanges = leftChanges;
toChanges = rightChanges;
}
else
{
flr = [diffWrapper rightLineRanges];
tlr = [diffWrapper leftLineRanges];
fstr = [diffWrapper rightString];
tstr = [diffWrapper leftString];
fromChanges = rightChanges;
toChanges = leftChanges;
}
linesCount = [flr count] - 1;
for (i = 0; i < [fromChanges count] - 1; i += 2)
{
p = [[PatchData alloc] init];
p->patchString = [NSMutableString string];
if (choices[i/2] * direction > 0)
{
p->start = [[fromChanges objectAtIndex: i] intValue];
p->end = [[fromChanges objectAtIndex: i + 1] intValue];
toStart = [[toChanges objectAtIndex: i] intValue];
toEnd = [[toChanges objectAtIndex: i + 1] intValue];
p->lineDifference = (toEnd - toStart) - (p->end - p->start);
for (j = p->start; j < p->end; j++ )
{
[p->patchString appendString: @"-"];
[p->patchString appendString:[fstr
substringWithRange:
NSMakeRange
([[flr objectAtIndex: j] intValue],
[[flr objectAtIndex: j+1] intValue] -
[[flr objectAtIndex: j] intValue])]];
}
for (j = toStart; j < toEnd; j++ )
{
[p->patchString appendString: @"+"];
[p->patchString appendString:[tstr
substringWithRange:
NSMakeRange
([[tlr objectAtIndex: j] intValue],
[[tlr objectAtIndex: j+1] intValue] -
[[tlr objectAtIndex: j] intValue])]];
}
[patchArray addObject: p];
}
else if (choices[i/2] * direction < 0)
{
}
else if (choices[i/2] == 0)
{
p->start = [[fromChanges objectAtIndex: i] intValue];
p->end = [[fromChanges objectAtIndex: i + 1] intValue];
p->lineDifference = - (p->end - p->start);
for (j = p->start; j < p->end; j++ )
{
[p->patchString appendString: @"-"];
[p->patchString appendString:[fstr
substringWithRange:
NSMakeRange
([[flr objectAtIndex: j] intValue],
[[flr objectAtIndex: j+1] intValue] -
[[flr objectAtIndex: j] intValue])]];
}
if (p->lineDifference != 0)
[patchArray addObject: p];
}
[p release];
}
i = 0;
count = [patchArray count];
pp = nil;
while (i < count)
{
p = [patchArray objectAtIndex: i];
if ((pp == nil) || (p->start - pp->end >= 6))
{
// two separate chunks
if (pp != nil)
{
j = pp->end + 3;
if (j >= linesCount)
j = linesCount;
stringToInsert = [NSMutableString string];
for ( k = pp->end; k < j; k++ )
{
[stringToInsert appendString: @" "];
[stringToInsert appendString: [fstr
substringWithRange:
NSMakeRange
([[flr objectAtIndex: k] intValue],
[[flr objectAtIndex: k+1] intValue] -
[[flr objectAtIndex: k] intValue])]];
}
[pp->patchString appendString: stringToInsert];
pp->end = j;
[finalArray addObject: pp];
}
// new chunk
[pp release];
j = p->start - 3;
if ( j < 0)
j = 0;
pp = [[PatchData alloc] init];
pp->patchString = p->patchString;
stringToInsert = [NSMutableString string];
for ( k = j; k < p->start; k++ )
{
[stringToInsert appendString: @" "];
[stringToInsert appendString: [fstr
substringWithRange:
NSMakeRange
([[flr objectAtIndex: k] intValue],
[[flr objectAtIndex: k+1] intValue] -
[[flr objectAtIndex: k] intValue])]];
}
[pp->patchString insertString: stringToInsert
atIndex: 0];
pp->start = j;
pp->end = p->end;
pp->lineDifference = p->lineDifference;
}
else
{
// merge the two chunks
stringToInsert = [NSMutableString string];
for ( k = pp->end; k < p->start; k++ )
{
[stringToInsert appendString: @" "];
[stringToInsert appendString: [fstr
substringWithRange:
NSMakeRange
([[flr objectAtIndex: k] intValue],
[[flr objectAtIndex: k+1] intValue] -
[[flr objectAtIndex: k] intValue])]];
}
[pp->patchString appendString: stringToInsert];
[pp->patchString appendString: p->patchString];
pp->end = p->end;
pp->lineDifference += p->lineDifference;
}
i++;
}
if (pp != nil)
{
j = pp->end + 3;
if (j >= linesCount)
j = linesCount;
stringToInsert = [NSMutableString string];
for ( k = pp->end; k < j; k++ )
{
[stringToInsert appendString: @" "];
[stringToInsert appendString: [fstr
substringWithRange:
NSMakeRange
([[flr objectAtIndex: k] intValue],
[[flr objectAtIndex: k+1] intValue] -
[[flr objectAtIndex: k] intValue])]];
}
[pp->patchString appendString: stringToInsert];
pp->end = j;
[finalArray addObject: pp];
}
[pp release];
{
NSMutableString *patchFileString = [NSMutableString string];
int d = 0;
for ( i = 0; i < [finalArray count]; i++ )
{
p = [finalArray objectAtIndex: i];
[patchFileString appendFormat:
@"@@ -%d,%d +%d,%d @@\n%@",
p->start+1,
p->end - p->start,
p->start + d + 1,
p->end - p->start + p->lineDifference,
p->patchString];
d += p->lineDifference;
}
// NSLog(@"\n%@", patchFileString);
return patchFileString;
}
}
- (void) saveMergedAt: (NSString *) mergedName
{
NSMutableString *mergedString = [NSMutableString string];
int i;
{
NSArray *llr = [diffWrapper leftLineRanges];
NSArray *rlr = [diffWrapper rightLineRanges];
[mergedString appendString:
[[diffWrapper leftString]
substringWithRange:
NSMakeRange
(0,
[[llr objectAtIndex:
[[leftChanges objectAtIndex: 0]
intValue]] intValue]
)]];
for ( i = 0; i < [leftChanges count] - 1; i++ )
{
if (i % 2 == 1)
{
[mergedString appendString:
[[diffWrapper leftString]
substringWithRange:
NSMakeRange
([[llr objectAtIndex:
[[leftChanges objectAtIndex: i]
intValue]] intValue],
[[llr objectAtIndex:
[[leftChanges objectAtIndex: i+1]
intValue]] intValue] -
[[llr objectAtIndex:
[[leftChanges objectAtIndex: i]
intValue]] intValue]
)]];
}
else
{
if (choices[i/2] < 0)
{
[mergedString appendString:
[[diffWrapper leftString]
substringWithRange:
NSMakeRange
([[llr objectAtIndex:
[[leftChanges objectAtIndex: i]
intValue]] intValue],
[[llr objectAtIndex:
[[leftChanges objectAtIndex: i+1]
intValue]] intValue] -
[[llr objectAtIndex:
[[leftChanges objectAtIndex: i]
intValue]] intValue]
)]];
}
else if (choices[i/2] > 0)
{
[mergedString appendString:
[[diffWrapper rightString]
substringWithRange:
NSMakeRange
([[rlr objectAtIndex:
[[rightChanges objectAtIndex: i]
intValue]] intValue],
[[rlr objectAtIndex:
[[rightChanges objectAtIndex: i+1]
intValue]] intValue] -
[[rlr objectAtIndex:
[[rightChanges objectAtIndex: i]
intValue]] intValue]
)]];
}
else
{
}
}
}
[mergedString appendString:
[[diffWrapper leftString]
substringFromIndex:
[[llr objectAtIndex:
[[leftChanges objectAtIndex:
[leftChanges count] - 1]
intValue]] intValue]]];
// NSLog(@"%@", mergedString);
}
[mergedString writeToFile: mergedName atomically: YES];
}
- (void) saveMergedFile: (id) sender
{
int result;
NSSavePanel *sPanel;
NSString *path = [[NSUserDefaults standardUserDefaults]
objectForKey:@"OpenDirectory"];
NSString *mergedName;
sPanel = [NSSavePanel savePanel];
// [sPanel setAllowsMultipleSelection:NO];
result = [sPanel runModalForDirectory: path
file: @""];
if (result != NSOKButton)
return;
path = [sPanel directory];
mergedName = [sPanel filename];
[[NSUserDefaults standardUserDefaults]
setObject: path
forKey:@"OpenDirectory"];
// NSLog(@"%@", mergedName);
[self saveMergedAt: mergedName];
}
@end