Mercurial > vim
annotate src/diff.c @ 2523:0dffdd8f8871 vim73
Fixed: on MS-Windows sometimes files with number 4913 or higher are left
behind.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Sun, 08 Aug 2010 18:46:06 +0200 |
parents | 04dae202d316 |
children | 7c2e6ba1d702 |
rev | line source |
---|---|
7 | 1 /* vim:set ts=8 sts=4 sw=4: |
2 * | |
3 * VIM - Vi IMproved by Bram Moolenaar | |
4 * | |
5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
6 * Do ":help credits" in Vim to see a list of people who contributed. | |
7 * See README.txt for an overview of the Vim source code. | |
8 */ | |
9 | |
10 /* | |
1788 | 11 * diff.c: code for diff'ing two, three or four buffers. |
7 | 12 */ |
13 | |
14 #include "vim.h" | |
15 | |
16 #if defined(FEAT_DIFF) || defined(PROTO) | |
17 | |
18 static int diff_busy = FALSE; /* ex_diffgetput() is busy */ | |
19 | |
20 /* flags obtained from the 'diffopt' option */ | |
21 #define DIFF_FILLER 1 /* display filler lines */ | |
22 #define DIFF_ICASE 2 /* ignore case */ | |
23 #define DIFF_IWHITE 4 /* ignore change in white space */ | |
764 | 24 #define DIFF_HORIZONTAL 8 /* horizontal splits */ |
25 #define DIFF_VERTICAL 16 /* vertical splits */ | |
7 | 26 static int diff_flags = DIFF_FILLER; |
27 | |
28 #define LBUFLEN 50 /* length of line in diff file */ | |
29 | |
30 static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it | |
31 doesn't work, MAYBE when not checked yet */ | |
32 #if defined(MSWIN) || defined(MSDOS) | |
33 static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE | |
34 when it doesn't work, MAYBE when not | |
35 checked yet */ | |
36 #endif | |
37 | |
38 static int diff_buf_idx __ARGS((buf_T *buf)); | |
672 | 39 static int diff_buf_idx_tp __ARGS((buf_T *buf, tabpage_T *tp)); |
40 static void diff_mark_adjust_tp __ARGS((tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after)); | |
41 static void diff_check_unchanged __ARGS((tabpage_T *tp, diff_T *dp)); | |
42 static int diff_check_sanity __ARGS((tabpage_T *tp, diff_T *dp)); | |
7 | 43 static void diff_redraw __ARGS((int dofold)); |
44 static int diff_write __ARGS((buf_T *buf, char_u *fname)); | |
45 static void diff_file __ARGS((char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff)); | |
46 static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2)); | |
47 static int diff_cmp __ARGS((char_u *s1, char_u *s2)); | |
48 #ifdef FEAT_FOLDING | |
49 static void diff_fold_update __ARGS((diff_T *dp, int skip_idx)); | |
50 #endif | |
51 static void diff_read __ARGS((int idx_orig, int idx_new, char_u *fname)); | |
52 static void diff_copy_entry __ARGS((diff_T *dprev, diff_T *dp, int idx_orig, int idx_new)); | |
672 | 53 static diff_T *diff_alloc_new __ARGS((tabpage_T *tp, diff_T *dprev, diff_T *dp)); |
7 | 54 |
55 #ifndef USE_CR | |
56 # define tag_fgets vim_fgets | |
57 #endif | |
58 | |
59 /* | |
60 * Called when deleting or unloading a buffer: No longer make a diff with it. | |
61 */ | |
62 void | |
63 diff_buf_delete(buf) | |
64 buf_T *buf; | |
65 { | |
66 int i; | |
672 | 67 tabpage_T *tp; |
7 | 68 |
672 | 69 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) |
7 | 70 { |
672 | 71 i = diff_buf_idx_tp(buf, tp); |
72 if (i != DB_COUNT) | |
73 { | |
74 tp->tp_diffbuf[i] = NULL; | |
75 tp->tp_diff_invalid = TRUE; | |
1761 | 76 if (tp == curtab) |
77 diff_redraw(TRUE); | |
672 | 78 } |
7 | 79 } |
80 } | |
81 | |
82 /* | |
16 | 83 * Check if the current buffer should be added to or removed from the list of |
84 * diff buffers. | |
85 */ | |
86 void | |
87 diff_buf_adjust(win) | |
88 win_T *win; | |
89 { | |
90 win_T *wp; | |
672 | 91 int i; |
16 | 92 |
93 if (!win->w_p_diff) | |
94 { | |
95 /* When there is no window showing a diff for this buffer, remove | |
96 * it from the diffs. */ | |
97 for (wp = firstwin; wp != NULL; wp = wp->w_next) | |
98 if (wp->w_buffer == win->w_buffer && wp->w_p_diff) | |
99 break; | |
100 if (wp == NULL) | |
672 | 101 { |
102 i = diff_buf_idx(win->w_buffer); | |
103 if (i != DB_COUNT) | |
104 { | |
105 curtab->tp_diffbuf[i] = NULL; | |
106 curtab->tp_diff_invalid = TRUE; | |
1761 | 107 diff_redraw(TRUE); |
672 | 108 } |
109 } | |
16 | 110 } |
111 else | |
112 diff_buf_add(win->w_buffer); | |
113 } | |
114 | |
115 /* | |
7 | 116 * Add a buffer to make diffs for. |
672 | 117 * Call this when a new buffer is being edited in the current window where |
118 * 'diff' is set. | |
1788 | 119 * Marks the current buffer as being part of the diff and requiring updating. |
672 | 120 * This must be done before any autocmd, because a command may use info |
121 * about the screen contents. | |
7 | 122 */ |
123 void | |
124 diff_buf_add(buf) | |
125 buf_T *buf; | |
126 { | |
127 int i; | |
128 | |
129 if (diff_buf_idx(buf) != DB_COUNT) | |
130 return; /* It's already there. */ | |
131 | |
132 for (i = 0; i < DB_COUNT; ++i) | |
672 | 133 if (curtab->tp_diffbuf[i] == NULL) |
7 | 134 { |
672 | 135 curtab->tp_diffbuf[i] = buf; |
136 curtab->tp_diff_invalid = TRUE; | |
1761 | 137 diff_redraw(TRUE); |
7 | 138 return; |
139 } | |
140 | |
141 EMSGN(_("E96: Can not diff more than %ld buffers"), DB_COUNT); | |
142 } | |
143 | |
144 /* | |
672 | 145 * Find buffer "buf" in the list of diff buffers for the current tab page. |
7 | 146 * Return its index or DB_COUNT if not found. |
147 */ | |
148 static int | |
149 diff_buf_idx(buf) | |
150 buf_T *buf; | |
151 { | |
152 int idx; | |
153 | |
154 for (idx = 0; idx < DB_COUNT; ++idx) | |
672 | 155 if (curtab->tp_diffbuf[idx] == buf) |
156 break; | |
157 return idx; | |
158 } | |
159 | |
160 /* | |
161 * Find buffer "buf" in the list of diff buffers for tab page "tp". | |
162 * Return its index or DB_COUNT if not found. | |
163 */ | |
164 static int | |
165 diff_buf_idx_tp(buf, tp) | |
166 buf_T *buf; | |
167 tabpage_T *tp; | |
168 { | |
169 int idx; | |
170 | |
171 for (idx = 0; idx < DB_COUNT; ++idx) | |
172 if (tp->tp_diffbuf[idx] == buf) | |
7 | 173 break; |
174 return idx; | |
175 } | |
176 | |
177 /* | |
672 | 178 * Mark the diff info involving buffer "buf" as invalid, it will be updated |
179 * when info is requested. | |
7 | 180 */ |
181 void | |
672 | 182 diff_invalidate(buf) |
183 buf_T *buf; | |
7 | 184 { |
672 | 185 tabpage_T *tp; |
186 int i; | |
187 | |
188 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) | |
7 | 189 { |
672 | 190 i = diff_buf_idx_tp(buf, tp); |
191 if (i != DB_COUNT) | |
192 { | |
193 tp->tp_diff_invalid = TRUE; | |
194 if (tp == curtab) | |
195 diff_redraw(TRUE); | |
196 } | |
7 | 197 } |
198 } | |
199 | |
200 /* | |
672 | 201 * Called by mark_adjust(): update line numbers in "curbuf". |
7 | 202 */ |
203 void | |
204 diff_mark_adjust(line1, line2, amount, amount_after) | |
205 linenr_T line1; | |
206 linenr_T line2; | |
207 long amount; | |
208 long amount_after; | |
209 { | |
672 | 210 int idx; |
211 tabpage_T *tp; | |
212 | |
213 /* Handle all tab pages that use the current buffer in a diff. */ | |
214 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) | |
215 { | |
216 idx = diff_buf_idx_tp(curbuf, tp); | |
217 if (idx != DB_COUNT) | |
218 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after); | |
219 } | |
220 } | |
221 | |
222 /* | |
223 * Update line numbers in tab page "tp" for "curbuf" with index "idx". | |
224 * This attempts to update the changes as much as possible: | |
225 * When inserting/deleting lines outside of existing change blocks, create a | |
226 * new change block and update the line numbers in following blocks. | |
227 * When inserting/deleting lines in existing change blocks, update them. | |
228 */ | |
229 static void | |
230 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after) | |
231 tabpage_T *tp; | |
232 int idx; | |
233 linenr_T line1; | |
234 linenr_T line2; | |
235 long amount; | |
236 long amount_after; | |
237 { | |
7 | 238 diff_T *dp; |
239 diff_T *dprev; | |
240 diff_T *dnext; | |
241 int i; | |
242 int inserted, deleted; | |
243 int n, off; | |
244 linenr_T last; | |
245 linenr_T lnum_deleted = line1; /* lnum of remaining deletion */ | |
246 int check_unchanged; | |
247 | |
248 if (line2 == MAXLNUM) | |
249 { | |
250 /* mark_adjust(99, MAXLNUM, 9, 0): insert lines */ | |
251 inserted = amount; | |
252 deleted = 0; | |
253 } | |
254 else if (amount_after > 0) | |
255 { | |
256 /* mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines*/ | |
257 inserted = amount_after; | |
258 deleted = 0; | |
259 } | |
260 else | |
261 { | |
262 /* mark_adjust(98, 99, MAXLNUM, -2): delete lines */ | |
263 inserted = 0; | |
264 deleted = -amount_after; | |
265 } | |
266 | |
267 dprev = NULL; | |
672 | 268 dp = tp->tp_first_diff; |
7 | 269 for (;;) |
270 { | |
271 /* If the change is after the previous diff block and before the next | |
272 * diff block, thus not touching an existing change, create a new diff | |
273 * block. Don't do this when ex_diffgetput() is busy. */ | |
274 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2 | |
275 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1)) | |
276 && (dprev == NULL | |
277 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1) | |
278 && !diff_busy) | |
279 { | |
672 | 280 dnext = diff_alloc_new(tp, dprev, dp); |
7 | 281 if (dnext == NULL) |
282 return; | |
283 | |
284 dnext->df_lnum[idx] = line1; | |
285 dnext->df_count[idx] = inserted; | |
286 for (i = 0; i < DB_COUNT; ++i) | |
672 | 287 if (tp->tp_diffbuf[i] != NULL && i != idx) |
7 | 288 { |
289 if (dprev == NULL) | |
290 dnext->df_lnum[i] = line1; | |
291 else | |
292 dnext->df_lnum[i] = line1 | |
293 + (dprev->df_lnum[i] + dprev->df_count[i]) | |
294 - (dprev->df_lnum[idx] + dprev->df_count[idx]); | |
295 dnext->df_count[i] = deleted; | |
296 } | |
297 } | |
298 | |
299 /* if at end of the list, quit */ | |
300 if (dp == NULL) | |
301 break; | |
302 | |
303 /* | |
304 * Check for these situations: | |
305 * 1 2 3 | |
306 * 1 2 3 | |
307 * line1 2 3 4 5 | |
308 * 2 3 4 5 | |
309 * 2 3 4 5 | |
310 * line2 2 3 4 5 | |
311 * 3 5 6 | |
312 * 3 5 6 | |
313 */ | |
314 /* compute last line of this change */ | |
315 last = dp->df_lnum[idx] + dp->df_count[idx] - 1; | |
316 | |
317 /* 1. change completely above line1: nothing to do */ | |
318 if (last >= line1 - 1) | |
319 { | |
320 /* 6. change below line2: only adjust for amount_after; also when | |
321 * "deleted" became zero when deleted all lines between two diffs */ | |
322 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2) | |
323 { | |
324 if (amount_after == 0) | |
325 break; /* nothing left to change */ | |
326 dp->df_lnum[idx] += amount_after; | |
327 } | |
328 else | |
329 { | |
330 check_unchanged = FALSE; | |
331 | |
332 /* 2. 3. 4. 5.: inserted/deleted lines touching this diff. */ | |
333 if (deleted > 0) | |
334 { | |
335 if (dp->df_lnum[idx] >= line1) | |
336 { | |
337 off = dp->df_lnum[idx] - lnum_deleted; | |
338 if (last <= line2) | |
339 { | |
340 /* 4. delete all lines of diff */ | |
341 if (dp->df_next != NULL | |
342 && dp->df_next->df_lnum[idx] - 1 <= line2) | |
343 { | |
344 /* delete continues in next diff, only do | |
345 * lines until that one */ | |
346 n = dp->df_next->df_lnum[idx] - lnum_deleted; | |
347 deleted -= n; | |
348 n -= dp->df_count[idx]; | |
349 lnum_deleted = dp->df_next->df_lnum[idx]; | |
350 } | |
351 else | |
352 n = deleted - dp->df_count[idx]; | |
353 dp->df_count[idx] = 0; | |
354 } | |
355 else | |
356 { | |
357 /* 5. delete lines at or just before top of diff */ | |
358 n = off; | |
359 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1; | |
360 check_unchanged = TRUE; | |
361 } | |
362 dp->df_lnum[idx] = line1; | |
363 } | |
364 else | |
365 { | |
366 off = 0; | |
367 if (last < line2) | |
368 { | |
369 /* 2. delete at end of of diff */ | |
370 dp->df_count[idx] -= last - lnum_deleted + 1; | |
371 if (dp->df_next != NULL | |
372 && dp->df_next->df_lnum[idx] - 1 <= line2) | |
373 { | |
374 /* delete continues in next diff, only do | |
375 * lines until that one */ | |
376 n = dp->df_next->df_lnum[idx] - 1 - last; | |
377 deleted -= dp->df_next->df_lnum[idx] | |
378 - lnum_deleted; | |
379 lnum_deleted = dp->df_next->df_lnum[idx]; | |
380 } | |
381 else | |
382 n = line2 - last; | |
383 check_unchanged = TRUE; | |
384 } | |
385 else | |
386 { | |
387 /* 3. delete lines inside the diff */ | |
388 n = 0; | |
389 dp->df_count[idx] -= deleted; | |
390 } | |
391 } | |
392 | |
393 for (i = 0; i < DB_COUNT; ++i) | |
672 | 394 if (tp->tp_diffbuf[i] != NULL && i != idx) |
7 | 395 { |
396 dp->df_lnum[i] -= off; | |
397 dp->df_count[i] += n; | |
398 } | |
399 } | |
400 else | |
401 { | |
402 if (dp->df_lnum[idx] <= line1) | |
403 { | |
404 /* inserted lines somewhere in this diff */ | |
405 dp->df_count[idx] += inserted; | |
406 check_unchanged = TRUE; | |
407 } | |
408 else | |
409 /* inserted lines somewhere above this diff */ | |
410 dp->df_lnum[idx] += inserted; | |
411 } | |
412 | |
413 if (check_unchanged) | |
414 /* Check if inserted lines are equal, may reduce the | |
415 * size of the diff. TODO: also check for equal lines | |
416 * in the middle and perhaps split the block. */ | |
672 | 417 diff_check_unchanged(tp, dp); |
7 | 418 } |
419 } | |
420 | |
421 /* check if this block touches the previous one, may merge them. */ | |
422 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx] | |
423 == dp->df_lnum[idx]) | |
424 { | |
425 for (i = 0; i < DB_COUNT; ++i) | |
672 | 426 if (tp->tp_diffbuf[i] != NULL) |
7 | 427 dprev->df_count[i] += dp->df_count[i]; |
428 dprev->df_next = dp->df_next; | |
429 vim_free(dp); | |
430 dp = dprev->df_next; | |
431 } | |
432 else | |
433 { | |
434 /* Advance to next entry. */ | |
435 dprev = dp; | |
436 dp = dp->df_next; | |
437 } | |
438 } | |
439 | |
440 dprev = NULL; | |
672 | 441 dp = tp->tp_first_diff; |
7 | 442 while (dp != NULL) |
443 { | |
444 /* All counts are zero, remove this entry. */ | |
445 for (i = 0; i < DB_COUNT; ++i) | |
672 | 446 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0) |
7 | 447 break; |
448 if (i == DB_COUNT) | |
449 { | |
450 dnext = dp->df_next; | |
451 vim_free(dp); | |
452 dp = dnext; | |
453 if (dprev == NULL) | |
672 | 454 tp->tp_first_diff = dnext; |
7 | 455 else |
456 dprev->df_next = dnext; | |
457 } | |
458 else | |
459 { | |
460 /* Advance to next entry. */ | |
461 dprev = dp; | |
462 dp = dp->df_next; | |
463 } | |
464 | |
465 } | |
672 | 466 |
467 if (tp == curtab) | |
468 { | |
469 diff_redraw(TRUE); | |
7 | 470 |
672 | 471 /* Need to recompute the scroll binding, may remove or add filler |
472 * lines (e.g., when adding lines above w_topline). But it's slow when | |
473 * making many changes, postpone until redrawing. */ | |
474 diff_need_scrollbind = TRUE; | |
475 } | |
7 | 476 } |
477 | |
478 /* | |
479 * Allocate a new diff block and link it between "dprev" and "dp". | |
480 */ | |
481 static diff_T * | |
672 | 482 diff_alloc_new(tp, dprev, dp) |
483 tabpage_T *tp; | |
7 | 484 diff_T *dprev; |
485 diff_T *dp; | |
486 { | |
487 diff_T *dnew; | |
488 | |
489 dnew = (diff_T *)alloc((unsigned)sizeof(diff_T)); | |
490 if (dnew != NULL) | |
491 { | |
492 dnew->df_next = dp; | |
493 if (dprev == NULL) | |
672 | 494 tp->tp_first_diff = dnew; |
7 | 495 else |
496 dprev->df_next = dnew; | |
497 } | |
498 return dnew; | |
499 } | |
500 | |
501 /* | |
502 * Check if the diff block "dp" can be made smaller for lines at the start and | |
503 * end that are equal. Called after inserting lines. | |
504 * This may result in a change where all buffers have zero lines, the caller | |
505 * must take care of removing it. | |
506 */ | |
507 static void | |
672 | 508 diff_check_unchanged(tp, dp) |
509 tabpage_T *tp; | |
7 | 510 diff_T *dp; |
511 { | |
512 int i_org; | |
513 int i_new; | |
514 int off_org, off_new; | |
515 char_u *line_org; | |
516 int dir = FORWARD; | |
517 | |
518 /* Find the first buffers, use it as the original, compare the other | |
519 * buffer lines against this one. */ | |
520 for (i_org = 0; i_org < DB_COUNT; ++i_org) | |
672 | 521 if (tp->tp_diffbuf[i_org] != NULL) |
7 | 522 break; |
523 if (i_org == DB_COUNT) /* safety check */ | |
524 return; | |
525 | |
672 | 526 if (diff_check_sanity(tp, dp) == FAIL) |
7 | 527 return; |
528 | |
529 /* First check lines at the top, then at the bottom. */ | |
530 off_org = 0; | |
531 off_new = 0; | |
532 for (;;) | |
533 { | |
534 /* Repeat until a line is found which is different or the number of | |
535 * lines has become zero. */ | |
536 while (dp->df_count[i_org] > 0) | |
537 { | |
538 /* Copy the line, the next ml_get() will invalidate it. */ | |
539 if (dir == BACKWARD) | |
540 off_org = dp->df_count[i_org] - 1; | |
672 | 541 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org], |
7 | 542 dp->df_lnum[i_org] + off_org, FALSE)); |
543 if (line_org == NULL) | |
544 return; | |
545 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new) | |
546 { | |
672 | 547 if (tp->tp_diffbuf[i_new] == NULL) |
7 | 548 continue; |
549 if (dir == BACKWARD) | |
550 off_new = dp->df_count[i_new] - 1; | |
551 /* if other buffer doesn't have this line, it was inserted */ | |
552 if (off_new < 0 || off_new >= dp->df_count[i_new]) | |
553 break; | |
672 | 554 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new], |
7 | 555 dp->df_lnum[i_new] + off_new, FALSE)) != 0) |
556 break; | |
557 } | |
558 vim_free(line_org); | |
559 | |
560 /* Stop when a line isn't equal in all diff buffers. */ | |
561 if (i_new != DB_COUNT) | |
562 break; | |
563 | |
564 /* Line matched in all buffers, remove it from the diff. */ | |
565 for (i_new = i_org; i_new < DB_COUNT; ++i_new) | |
672 | 566 if (tp->tp_diffbuf[i_new] != NULL) |
7 | 567 { |
568 if (dir == FORWARD) | |
569 ++dp->df_lnum[i_new]; | |
570 --dp->df_count[i_new]; | |
571 } | |
572 } | |
573 if (dir == BACKWARD) | |
574 break; | |
575 dir = BACKWARD; | |
576 } | |
577 } | |
578 | |
579 /* | |
580 * Check if a diff block doesn't contain invalid line numbers. | |
581 * This can happen when the diff program returns invalid results. | |
582 */ | |
583 static int | |
672 | 584 diff_check_sanity(tp, dp) |
585 tabpage_T *tp; | |
7 | 586 diff_T *dp; |
587 { | |
588 int i; | |
589 | |
590 for (i = 0; i < DB_COUNT; ++i) | |
672 | 591 if (tp->tp_diffbuf[i] != NULL) |
7 | 592 if (dp->df_lnum[i] + dp->df_count[i] - 1 |
672 | 593 > tp->tp_diffbuf[i]->b_ml.ml_line_count) |
7 | 594 return FAIL; |
595 return OK; | |
596 } | |
597 | |
598 /* | |
672 | 599 * Mark all diff buffers in the current tab page for redraw. |
7 | 600 */ |
601 static void | |
602 diff_redraw(dofold) | |
603 int dofold; /* also recompute the folds */ | |
604 { | |
605 win_T *wp; | |
606 int n; | |
607 | |
608 for (wp = firstwin; wp != NULL; wp = wp->w_next) | |
609 if (wp->w_p_diff) | |
610 { | |
738 | 611 redraw_win_later(wp, SOME_VALID); |
7 | 612 #ifdef FEAT_FOLDING |
613 if (dofold && foldmethodIsDiff(wp)) | |
614 foldUpdateAll(wp); | |
615 #endif | |
616 /* A change may have made filler lines invalid, need to take care | |
617 * of that for other windows. */ | |
618 if (wp != curwin && wp->w_topfill > 0) | |
619 { | |
620 n = diff_check(wp, wp->w_topline); | |
621 if (wp->w_topfill > n) | |
622 wp->w_topfill = (n < 0 ? 0 : n); | |
623 } | |
624 } | |
625 } | |
626 | |
627 /* | |
628 * Write buffer "buf" to file "name". | |
629 * Always use 'fileformat' set to "unix". | |
630 * Return FAIL for failure | |
631 */ | |
632 static int | |
633 diff_write(buf, fname) | |
634 buf_T *buf; | |
635 char_u *fname; | |
636 { | |
637 int r; | |
638 char_u *save_ff; | |
639 | |
640 save_ff = buf->b_p_ff; | |
641 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX); | |
642 r = buf_write(buf, fname, NULL, (linenr_T)1, buf->b_ml.ml_line_count, | |
643 NULL, FALSE, FALSE, FALSE, TRUE); | |
644 free_string_option(buf->b_p_ff); | |
645 buf->b_p_ff = save_ff; | |
646 return r; | |
647 } | |
648 | |
649 /* | |
650 * Completely update the diffs for the buffers involved. | |
651 * This uses the ordinary "diff" command. | |
652 * The buffers are written to a file, also for unmodified buffers (the file | |
653 * could have been produced by autocommands, e.g. the netrw plugin). | |
654 */ | |
655 void | |
656 ex_diffupdate(eap) | |
1876 | 657 exarg_T *eap UNUSED; /* can be NULL */ |
7 | 658 { |
659 buf_T *buf; | |
660 int idx_orig; | |
661 int idx_new; | |
662 char_u *tmp_orig; | |
663 char_u *tmp_new; | |
664 char_u *tmp_diff; | |
665 FILE *fd; | |
666 int ok; | |
1757 | 667 int io_error = FALSE; |
7 | 668 |
669 /* Delete all diffblocks. */ | |
672 | 670 diff_clear(curtab); |
671 curtab->tp_diff_invalid = FALSE; | |
7 | 672 |
673 /* Use the first buffer as the original text. */ | |
674 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig) | |
672 | 675 if (curtab->tp_diffbuf[idx_orig] != NULL) |
7 | 676 break; |
677 if (idx_orig == DB_COUNT) | |
678 return; | |
679 | |
680 /* Only need to do something when there is another buffer. */ | |
681 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) | |
672 | 682 if (curtab->tp_diffbuf[idx_new] != NULL) |
7 | 683 break; |
684 if (idx_new == DB_COUNT) | |
685 return; | |
686 | |
687 /* We need three temp file names. */ | |
688 tmp_orig = vim_tempname('o'); | |
689 tmp_new = vim_tempname('n'); | |
690 tmp_diff = vim_tempname('d'); | |
691 if (tmp_orig == NULL || tmp_new == NULL || tmp_diff == NULL) | |
692 goto theend; | |
693 | |
694 /* | |
695 * Do a quick test if "diff" really works. Otherwise it looks like there | |
696 * are no differences. Can't use the return value, it's non-zero when | |
697 * there are differences. | |
698 * May try twice, first with "-a" and then without. | |
699 */ | |
700 for (;;) | |
701 { | |
702 ok = FALSE; | |
531 | 703 fd = mch_fopen((char *)tmp_orig, "w"); |
1757 | 704 if (fd == NULL) |
705 io_error = TRUE; | |
706 else | |
7 | 707 { |
1757 | 708 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1) |
709 io_error = TRUE; | |
7 | 710 fclose(fd); |
531 | 711 fd = mch_fopen((char *)tmp_new, "w"); |
1757 | 712 if (fd == NULL) |
713 io_error = TRUE; | |
714 else | |
7 | 715 { |
1757 | 716 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1) |
717 io_error = TRUE; | |
7 | 718 fclose(fd); |
719 diff_file(tmp_orig, tmp_new, tmp_diff); | |
531 | 720 fd = mch_fopen((char *)tmp_diff, "r"); |
1757 | 721 if (fd == NULL) |
722 io_error = TRUE; | |
723 else | |
7 | 724 { |
725 char_u linebuf[LBUFLEN]; | |
726 | |
727 for (;;) | |
728 { | |
729 /* There must be a line that contains "1c1". */ | |
730 if (tag_fgets(linebuf, LBUFLEN, fd)) | |
731 break; | |
732 if (STRNCMP(linebuf, "1c1", 3) == 0) | |
733 ok = TRUE; | |
734 } | |
735 fclose(fd); | |
736 } | |
737 mch_remove(tmp_diff); | |
738 mch_remove(tmp_new); | |
739 } | |
740 mch_remove(tmp_orig); | |
741 } | |
742 | |
743 #ifdef FEAT_EVAL | |
744 /* When using 'diffexpr' break here. */ | |
745 if (*p_dex != NUL) | |
746 break; | |
747 #endif | |
748 | |
749 #if defined(MSWIN) || defined(MSDOS) | |
750 /* If the "-a" argument works, also check if "--binary" works. */ | |
751 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE) | |
752 { | |
753 diff_a_works = TRUE; | |
754 diff_bin_works = TRUE; | |
755 continue; | |
756 } | |
757 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE) | |
758 { | |
759 /* Tried --binary, but it failed. "-a" works though. */ | |
760 diff_bin_works = FALSE; | |
761 ok = TRUE; | |
762 } | |
763 #endif | |
764 | |
765 /* If we checked if "-a" works already, break here. */ | |
766 if (diff_a_works != MAYBE) | |
767 break; | |
768 diff_a_works = ok; | |
769 | |
770 /* If "-a" works break here, otherwise retry without "-a". */ | |
771 if (ok) | |
772 break; | |
773 } | |
774 if (!ok) | |
775 { | |
1757 | 776 if (io_error) |
777 EMSG(_("E810: Cannot read or write temp files")); | |
7 | 778 EMSG(_("E97: Cannot create diffs")); |
779 diff_a_works = MAYBE; | |
780 #if defined(MSWIN) || defined(MSDOS) | |
781 diff_bin_works = MAYBE; | |
782 #endif | |
783 goto theend; | |
784 } | |
785 | |
786 /* Write the first buffer to a tempfile. */ | |
672 | 787 buf = curtab->tp_diffbuf[idx_orig]; |
7 | 788 if (diff_write(buf, tmp_orig) == FAIL) |
789 goto theend; | |
790 | |
791 /* Make a difference between the first buffer and every other. */ | |
792 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) | |
793 { | |
672 | 794 buf = curtab->tp_diffbuf[idx_new]; |
7 | 795 if (buf == NULL) |
796 continue; | |
797 if (diff_write(buf, tmp_new) == FAIL) | |
798 continue; | |
799 diff_file(tmp_orig, tmp_new, tmp_diff); | |
800 | |
801 /* Read the diff output and add each entry to the diff list. */ | |
802 diff_read(idx_orig, idx_new, tmp_diff); | |
803 mch_remove(tmp_diff); | |
804 mch_remove(tmp_new); | |
805 } | |
806 mch_remove(tmp_orig); | |
807 | |
1429 | 808 /* force updating cursor position on screen */ |
809 curwin->w_valid_cursor.lnum = 0; | |
810 | |
7 | 811 diff_redraw(TRUE); |
812 | |
813 theend: | |
814 vim_free(tmp_orig); | |
815 vim_free(tmp_new); | |
816 vim_free(tmp_diff); | |
817 } | |
818 | |
819 /* | |
820 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff". | |
821 */ | |
822 static void | |
823 diff_file(tmp_orig, tmp_new, tmp_diff) | |
824 char_u *tmp_orig; | |
825 char_u *tmp_new; | |
826 char_u *tmp_diff; | |
827 { | |
828 char_u *cmd; | |
1872 | 829 size_t len; |
7 | 830 |
831 #ifdef FEAT_EVAL | |
832 if (*p_dex != NUL) | |
833 /* Use 'diffexpr' to generate the diff file. */ | |
834 eval_diff(tmp_orig, tmp_new, tmp_diff); | |
835 else | |
836 #endif | |
837 { | |
1872 | 838 len = STRLEN(tmp_orig) + STRLEN(tmp_new) |
839 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27; | |
840 cmd = alloc((unsigned)len); | |
7 | 841 if (cmd != NULL) |
842 { | |
193 | 843 /* We don't want $DIFF_OPTIONS to get in the way. */ |
844 if (getenv("DIFF_OPTIONS")) | |
845 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)""); | |
846 | |
7 | 847 /* Build the diff command and execute it. Always use -a, binary |
848 * differences are of no use. Ignore errors, diff returns | |
849 * non-zero when differences have been found. */ | |
1872 | 850 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s", |
7 | 851 diff_a_works == FALSE ? "" : "-a ", |
852 #if defined(MSWIN) || defined(MSDOS) | |
853 diff_bin_works == TRUE ? "--binary " : "", | |
854 #else | |
855 "", | |
856 #endif | |
857 (diff_flags & DIFF_IWHITE) ? "-b " : "", | |
858 (diff_flags & DIFF_ICASE) ? "-i " : "", | |
859 tmp_orig, tmp_new); | |
1872 | 860 append_redir(cmd, (int)len, p_srr, tmp_diff); |
828 | 861 #ifdef FEAT_AUTOCMD |
1410 | 862 block_autocmds(); /* Avoid ShellCmdPost stuff */ |
828 | 863 #endif |
7 | 864 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT); |
828 | 865 #ifdef FEAT_AUTOCMD |
1410 | 866 unblock_autocmds(); |
828 | 867 #endif |
7 | 868 vim_free(cmd); |
869 } | |
870 } | |
871 } | |
872 | |
873 /* | |
874 * Create a new version of a file from the current buffer and a diff file. | |
875 * The buffer is written to a file, also for unmodified buffers (the file | |
876 * could have been produced by autocommands, e.g. the netrw plugin). | |
877 */ | |
878 void | |
879 ex_diffpatch(eap) | |
880 exarg_T *eap; | |
881 { | |
882 char_u *tmp_orig; /* name of original temp file */ | |
883 char_u *tmp_new; /* name of patched temp file */ | |
884 char_u *buf = NULL; | |
1872 | 885 size_t buflen; |
7 | 886 win_T *old_curwin = curwin; |
887 char_u *newname = NULL; /* name of patched file buffer */ | |
888 #ifdef UNIX | |
889 char_u dirbuf[MAXPATHL]; | |
890 char_u *fullname = NULL; | |
891 #endif | |
892 #ifdef FEAT_BROWSE | |
893 char_u *browseFile = NULL; | |
894 int browse_flag = cmdmod.browse; | |
895 #endif | |
1942 | 896 struct stat st; |
7 | 897 |
898 #ifdef FEAT_BROWSE | |
899 if (cmdmod.browse) | |
900 { | |
28 | 901 browseFile = do_browse(0, (char_u *)_("Patch file"), |
7 | 902 eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL); |
903 if (browseFile == NULL) | |
904 return; /* operation cancelled */ | |
905 eap->arg = browseFile; | |
906 cmdmod.browse = FALSE; /* don't let do_ecmd() browse again */ | |
907 } | |
908 #endif | |
909 | |
910 /* We need two temp file names. */ | |
911 tmp_orig = vim_tempname('o'); | |
912 tmp_new = vim_tempname('n'); | |
913 if (tmp_orig == NULL || tmp_new == NULL) | |
914 goto theend; | |
915 | |
916 /* Write the current buffer to "tmp_orig". */ | |
917 if (buf_write(curbuf, tmp_orig, NULL, | |
918 (linenr_T)1, curbuf->b_ml.ml_line_count, | |
919 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL) | |
920 goto theend; | |
921 | |
922 #ifdef UNIX | |
923 /* Get the absolute path of the patchfile, changing directory below. */ | |
924 fullname = FullName_save(eap->arg, FALSE); | |
925 #endif | |
1872 | 926 buflen = STRLEN(tmp_orig) + ( |
7 | 927 # ifdef UNIX |
928 fullname != NULL ? STRLEN(fullname) : | |
929 # endif | |
1872 | 930 STRLEN(eap->arg)) + STRLEN(tmp_new) + 16; |
931 buf = alloc((unsigned)buflen); | |
7 | 932 if (buf == NULL) |
933 goto theend; | |
934 | |
935 #ifdef UNIX | |
1788 | 936 /* Temporarily chdir to /tmp, to avoid patching files in the current |
7 | 937 * directory when the patch file contains more than one patch. When we |
938 * have our own temp dir use that instead, it will be cleaned up when we | |
939 * exit (any .rej files created). Don't change directory if we can't | |
940 * return to the current. */ | |
941 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0) | |
942 dirbuf[0] = NUL; | |
943 else | |
944 { | |
945 # ifdef TEMPDIRNAMES | |
946 if (vim_tempdir != NULL) | |
1757 | 947 ignored = mch_chdir((char *)vim_tempdir); |
7 | 948 else |
949 # endif | |
1757 | 950 ignored = mch_chdir("/tmp"); |
7 | 951 shorten_fnames(TRUE); |
952 } | |
953 #endif | |
954 | |
955 #ifdef FEAT_EVAL | |
956 if (*p_pex != NUL) | |
957 /* Use 'patchexpr' to generate the new file. */ | |
958 eval_patch(tmp_orig, | |
959 # ifdef UNIX | |
960 fullname != NULL ? fullname : | |
961 # endif | |
962 eap->arg, tmp_new); | |
963 else | |
964 #endif | |
965 { | |
966 /* Build the patch command and execute it. Ignore errors. Switch to | |
967 * cooked mode to allow the user to respond to prompts. */ | |
1872 | 968 vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"", |
969 tmp_new, tmp_orig, | |
7 | 970 # ifdef UNIX |
971 fullname != NULL ? fullname : | |
972 # endif | |
973 eap->arg); | |
828 | 974 #ifdef FEAT_AUTOCMD |
1410 | 975 block_autocmds(); /* Avoid ShellCmdPost stuff */ |
828 | 976 #endif |
7 | 977 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED); |
828 | 978 #ifdef FEAT_AUTOCMD |
1410 | 979 unblock_autocmds(); |
828 | 980 #endif |
7 | 981 } |
982 | |
983 #ifdef UNIX | |
984 if (dirbuf[0] != NUL) | |
985 { | |
986 if (mch_chdir((char *)dirbuf) != 0) | |
987 EMSG(_(e_prev_dir)); | |
988 shorten_fnames(TRUE); | |
989 } | |
990 #endif | |
991 | |
992 /* patch probably has written over the screen */ | |
993 redraw_later(CLEAR); | |
994 | |
995 /* Delete any .orig or .rej file created. */ | |
996 STRCPY(buf, tmp_new); | |
997 STRCAT(buf, ".orig"); | |
998 mch_remove(buf); | |
999 STRCPY(buf, tmp_new); | |
1000 STRCAT(buf, ".rej"); | |
1001 mch_remove(buf); | |
1002 | |
1942 | 1003 /* Only continue if the output file was created. */ |
1004 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0) | |
1005 EMSG(_("E816: Cannot read patch output")); | |
1006 else | |
7 | 1007 { |
1942 | 1008 if (curbuf->b_fname != NULL) |
1009 { | |
1010 newname = vim_strnsave(curbuf->b_fname, | |
7 | 1011 (int)(STRLEN(curbuf->b_fname) + 4)); |
1942 | 1012 if (newname != NULL) |
1013 STRCAT(newname, ".new"); | |
1014 } | |
7 | 1015 |
1016 #ifdef FEAT_GUI | |
1942 | 1017 need_mouse_correct = TRUE; |
7 | 1018 #endif |
1942 | 1019 /* don't use a new tab page, each tab page has its own diffs */ |
1020 cmdmod.tab = 0; | |
682 | 1021 |
1942 | 1022 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) |
1023 { | |
1024 /* Pretend it was a ":split fname" command */ | |
1025 eap->cmdidx = CMD_split; | |
1026 eap->arg = tmp_new; | |
1027 do_exedit(eap, old_curwin); | |
7 | 1028 |
1942 | 1029 /* check that split worked and editing tmp_new */ |
1030 if (curwin != old_curwin && win_valid(old_curwin)) | |
1031 { | |
1032 /* Set 'diff', 'scrollbind' on and 'wrap' off. */ | |
1033 diff_win_options(curwin, TRUE); | |
1034 diff_win_options(old_curwin, TRUE); | |
7 | 1035 |
1942 | 1036 if (newname != NULL) |
1037 { | |
1038 /* do a ":file filename.new" on the patched buffer */ | |
1039 eap->arg = newname; | |
1040 ex_file(eap); | |
7 | 1041 |
1042 #ifdef FEAT_AUTOCMD | |
1942 | 1043 /* Do filetype detection with the new name. */ |
1044 if (au_has_group((char_u *)"filetypedetect")) | |
1045 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead"); | |
7 | 1046 #endif |
1942 | 1047 } |
7 | 1048 } |
1049 } | |
1050 } | |
1051 | |
1052 theend: | |
1053 if (tmp_orig != NULL) | |
1054 mch_remove(tmp_orig); | |
1055 vim_free(tmp_orig); | |
1056 if (tmp_new != NULL) | |
1057 mch_remove(tmp_new); | |
1058 vim_free(tmp_new); | |
1059 vim_free(newname); | |
1060 vim_free(buf); | |
1061 #ifdef UNIX | |
1062 vim_free(fullname); | |
1063 #endif | |
1064 #ifdef FEAT_BROWSE | |
1065 vim_free(browseFile); | |
1066 cmdmod.browse = browse_flag; | |
1067 #endif | |
1068 } | |
1069 | |
1070 /* | |
1071 * Split the window and edit another file, setting options to show the diffs. | |
1072 */ | |
1073 void | |
1074 ex_diffsplit(eap) | |
1075 exarg_T *eap; | |
1076 { | |
1077 win_T *old_curwin = curwin; | |
1078 | |
1079 #ifdef FEAT_GUI | |
1080 need_mouse_correct = TRUE; | |
1081 #endif | |
682 | 1082 /* don't use a new tab page, each tab page has its own diffs */ |
1083 cmdmod.tab = 0; | |
1084 | |
764 | 1085 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) |
7 | 1086 { |
1087 /* Pretend it was a ":split fname" command */ | |
1088 eap->cmdidx = CMD_split; | |
449 | 1089 curwin->w_p_diff = TRUE; |
7 | 1090 do_exedit(eap, old_curwin); |
1091 | |
1092 if (curwin != old_curwin) /* split must have worked */ | |
1093 { | |
1094 /* Set 'diff', 'scrollbind' on and 'wrap' off. */ | |
1095 diff_win_options(curwin, TRUE); | |
1096 diff_win_options(old_curwin, TRUE); | |
1097 } | |
1098 } | |
1099 } | |
1100 | |
1101 /* | |
1102 * Set options to show difs for the current window. | |
1103 */ | |
1104 void | |
1105 ex_diffthis(eap) | |
1876 | 1106 exarg_T *eap UNUSED; |
7 | 1107 { |
1108 /* Set 'diff', 'scrollbind' on and 'wrap' off. */ | |
1109 diff_win_options(curwin, TRUE); | |
1110 } | |
1111 | |
1112 /* | |
1113 * Set options in window "wp" for diff mode. | |
1114 */ | |
1115 void | |
1116 diff_win_options(wp, addbuf) | |
1117 win_T *wp; | |
1118 int addbuf; /* Add buffer to diff. */ | |
1119 { | |
2086
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1120 # ifdef FEAT_FOLDING |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1121 win_T *old_curwin = curwin; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1122 |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1123 /* close the manually opened folds */ |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1124 curwin = wp; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1125 newFoldLevel(); |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1126 curwin = old_curwin; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1127 # endif |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1128 |
7 | 1129 wp->w_p_diff = TRUE; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
1130 #ifdef FEAT_CURSORBIND |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
1131 /* Use cursorbind if it's available */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
1132 wp->w_p_crb = TRUE; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
1133 #endif |
7 | 1134 wp->w_p_scb = TRUE; |
1135 wp->w_p_wrap = FALSE; | |
1136 # ifdef FEAT_FOLDING | |
2086
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1137 curwin = wp; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1138 curbuf = curwin->w_buffer; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1139 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff", |
694 | 1140 OPT_LOCAL|OPT_FREE, 0); |
2086
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1141 curwin = old_curwin; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1142 curbuf = curwin->w_buffer; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1143 wp->w_p_fdc = diff_foldcolumn; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1144 wp->w_p_fen = TRUE; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1145 wp->w_p_fdl = 0; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1146 foldUpdateAll(wp); |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1147 /* make sure topline is not halfway a fold */ |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1148 changed_window_setting_win(wp); |
7 | 1149 # endif |
1150 #ifdef FEAT_SCROLLBIND | |
1151 if (vim_strchr(p_sbo, 'h') == NULL) | |
1152 do_cmdline_cmd((char_u *)"set sbo+=hor"); | |
1153 #endif | |
1154 | |
1155 if (addbuf) | |
1156 diff_buf_add(wp->w_buffer); | |
1157 redraw_win_later(wp, NOT_VALID); | |
1158 } | |
1159 | |
1160 /* | |
16 | 1161 * Set options not to show diffs. For the current window or all windows. |
671 | 1162 * Only in the current tab page. |
16 | 1163 */ |
1164 void | |
1165 ex_diffoff(eap) | |
1166 exarg_T *eap; | |
1167 { | |
1168 win_T *wp; | |
1169 win_T *old_curwin = curwin; | |
1170 #ifdef FEAT_SCROLLBIND | |
1171 int diffwin = FALSE; | |
1172 #endif | |
1173 | |
1174 for (wp = firstwin; wp != NULL; wp = wp->w_next) | |
1175 { | |
1835 | 1176 if (wp == curwin || (eap->forceit && wp->w_p_diff)) |
16 | 1177 { |
1178 /* Set 'diff', 'scrollbind' off and 'wrap' on. */ | |
1179 wp->w_p_diff = FALSE; | |
2445
04dae202d316
Fixes for coverity warnings.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
1180 #ifdef FEAT_CURSORBIND |
04dae202d316
Fixes for coverity warnings.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
1181 wp->w_p_crb = FALSE; |
04dae202d316
Fixes for coverity warnings.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
1182 #endif |
16 | 1183 wp->w_p_scb = FALSE; |
1184 wp->w_p_wrap = TRUE; | |
1185 #ifdef FEAT_FOLDING | |
1186 curwin = wp; | |
1187 curbuf = curwin->w_buffer; | |
1188 set_string_option_direct((char_u *)"fdm", -1, | |
694 | 1189 (char_u *)"manual", OPT_LOCAL|OPT_FREE, 0); |
16 | 1190 curwin = old_curwin; |
1191 curbuf = curwin->w_buffer; | |
1192 wp->w_p_fdc = 0; | |
1193 wp->w_p_fen = FALSE; | |
1194 wp->w_p_fdl = 0; | |
1195 foldUpdateAll(wp); | |
1196 /* make sure topline is not halfway a fold */ | |
1197 changed_window_setting_win(wp); | |
1198 #endif | |
1199 diff_buf_adjust(wp); | |
1200 } | |
1201 #ifdef FEAT_SCROLLBIND | |
1202 diffwin |= wp->w_p_diff; | |
1203 #endif | |
1204 } | |
1205 | |
1206 #ifdef FEAT_SCROLLBIND | |
1207 /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */ | |
1208 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL) | |
1209 do_cmdline_cmd((char_u *)"set sbo-=hor"); | |
1210 #endif | |
1211 } | |
1212 | |
1213 /* | |
7 | 1214 * Read the diff output and add each entry to the diff list. |
1215 */ | |
1216 static void | |
1217 diff_read(idx_orig, idx_new, fname) | |
1218 int idx_orig; /* idx of original file */ | |
1219 int idx_new; /* idx of new file */ | |
1220 char_u *fname; /* name of diff output file */ | |
1221 { | |
1222 FILE *fd; | |
1223 diff_T *dprev = NULL; | |
672 | 1224 diff_T *dp = curtab->tp_first_diff; |
7 | 1225 diff_T *dn, *dpl; |
1226 long f1, l1, f2, l2; | |
1227 char_u linebuf[LBUFLEN]; /* only need to hold the diff line */ | |
1228 int difftype; | |
1229 char_u *p; | |
1230 long off; | |
1231 int i; | |
1232 linenr_T lnum_orig, lnum_new; | |
1233 long count_orig, count_new; | |
1234 int notset = TRUE; /* block "*dp" not set yet */ | |
1235 | |
531 | 1236 fd = mch_fopen((char *)fname, "r"); |
7 | 1237 if (fd == NULL) |
1238 { | |
1239 EMSG(_("E98: Cannot read diff output")); | |
1240 return; | |
1241 } | |
1242 | |
1243 for (;;) | |
1244 { | |
1245 if (tag_fgets(linebuf, LBUFLEN, fd)) | |
1246 break; /* end of file */ | |
1247 if (!isdigit(*linebuf)) | |
1248 continue; /* not the start of a diff block */ | |
1249 | |
1250 /* This line must be one of three formats: | |
1251 * {first}[,{last}]c{first}[,{last}] | |
1252 * {first}a{first}[,{last}] | |
1253 * {first}[,{last}]d{first} | |
1254 */ | |
1255 p = linebuf; | |
1256 f1 = getdigits(&p); | |
1257 if (*p == ',') | |
1258 { | |
1259 ++p; | |
1260 l1 = getdigits(&p); | |
1261 } | |
1262 else | |
1263 l1 = f1; | |
1264 if (*p != 'a' && *p != 'c' && *p != 'd') | |
1265 continue; /* invalid diff format */ | |
1266 difftype = *p++; | |
1267 f2 = getdigits(&p); | |
1268 if (*p == ',') | |
1269 { | |
1270 ++p; | |
1271 l2 = getdigits(&p); | |
1272 } | |
1273 else | |
1274 l2 = f2; | |
1275 if (l1 < f1 || l2 < f2) | |
1276 continue; /* invalid line range */ | |
1277 | |
1278 if (difftype == 'a') | |
1279 { | |
1280 lnum_orig = f1 + 1; | |
1281 count_orig = 0; | |
1282 } | |
1283 else | |
1284 { | |
1285 lnum_orig = f1; | |
1286 count_orig = l1 - f1 + 1; | |
1287 } | |
1288 if (difftype == 'd') | |
1289 { | |
1290 lnum_new = f2 + 1; | |
1291 count_new = 0; | |
1292 } | |
1293 else | |
1294 { | |
1295 lnum_new = f2; | |
1296 count_new = l2 - f2 + 1; | |
1297 } | |
1298 | |
1299 /* Go over blocks before the change, for which orig and new are equal. | |
1300 * Copy blocks from orig to new. */ | |
1301 while (dp != NULL | |
1302 && lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig]) | |
1303 { | |
1304 if (notset) | |
1305 diff_copy_entry(dprev, dp, idx_orig, idx_new); | |
1306 dprev = dp; | |
1307 dp = dp->df_next; | |
1308 notset = TRUE; | |
1309 } | |
1310 | |
1311 if (dp != NULL | |
1312 && lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig] | |
1313 && lnum_orig + count_orig >= dp->df_lnum[idx_orig]) | |
1314 { | |
1315 /* New block overlaps with existing block(s). | |
1316 * First find last block that overlaps. */ | |
1317 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next) | |
1318 if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig]) | |
1319 break; | |
1320 | |
1321 /* If the newly found block starts before the old one, set the | |
1322 * start back a number of lines. */ | |
1323 off = dp->df_lnum[idx_orig] - lnum_orig; | |
1324 if (off > 0) | |
1325 { | |
1326 for (i = idx_orig; i < idx_new; ++i) | |
672 | 1327 if (curtab->tp_diffbuf[i] != NULL) |
7 | 1328 dp->df_lnum[i] -= off; |
1329 dp->df_lnum[idx_new] = lnum_new; | |
1330 dp->df_count[idx_new] = count_new; | |
1331 } | |
1332 else if (notset) | |
1333 { | |
1334 /* new block inside existing one, adjust new block */ | |
1335 dp->df_lnum[idx_new] = lnum_new + off; | |
1336 dp->df_count[idx_new] = count_new - off; | |
1337 } | |
1338 else | |
1339 /* second overlap of new block with existing block */ | |
1519 | 1340 dp->df_count[idx_new] += count_new - count_orig |
1341 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig] | |
1342 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]); | |
7 | 1343 |
1344 /* Adjust the size of the block to include all the lines to the | |
1345 * end of the existing block or the new diff, whatever ends last. */ | |
1346 off = (lnum_orig + count_orig) | |
1347 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]); | |
1348 if (off < 0) | |
1349 { | |
1350 /* new change ends in existing block, adjust the end if not | |
1351 * done already */ | |
1352 if (notset) | |
1353 dp->df_count[idx_new] += -off; | |
1354 off = 0; | |
1355 } | |
1428 | 1356 for (i = idx_orig; i < idx_new; ++i) |
672 | 1357 if (curtab->tp_diffbuf[i] != NULL) |
7 | 1358 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i] |
1359 - dp->df_lnum[i] + off; | |
1360 | |
1361 /* Delete the diff blocks that have been merged into one. */ | |
1362 dn = dp->df_next; | |
1363 dp->df_next = dpl->df_next; | |
1364 while (dn != dp->df_next) | |
1365 { | |
1366 dpl = dn->df_next; | |
1367 vim_free(dn); | |
1368 dn = dpl; | |
1369 } | |
1370 } | |
1371 else | |
1372 { | |
1373 /* Allocate a new diffblock. */ | |
672 | 1374 dp = diff_alloc_new(curtab, dprev, dp); |
7 | 1375 if (dp == NULL) |
840 | 1376 goto done; |
7 | 1377 |
1378 dp->df_lnum[idx_orig] = lnum_orig; | |
1379 dp->df_count[idx_orig] = count_orig; | |
1380 dp->df_lnum[idx_new] = lnum_new; | |
1381 dp->df_count[idx_new] = count_new; | |
1382 | |
1383 /* Set values for other buffers, these must be equal to the | |
1384 * original buffer, otherwise there would have been a change | |
1385 * already. */ | |
1386 for (i = idx_orig + 1; i < idx_new; ++i) | |
672 | 1387 if (curtab->tp_diffbuf[i] != NULL) |
7 | 1388 diff_copy_entry(dprev, dp, idx_orig, i); |
1389 } | |
1390 notset = FALSE; /* "*dp" has been set */ | |
1391 } | |
1392 | |
1393 /* for remaining diff blocks orig and new are equal */ | |
1394 while (dp != NULL) | |
1395 { | |
1396 if (notset) | |
1397 diff_copy_entry(dprev, dp, idx_orig, idx_new); | |
1398 dprev = dp; | |
1399 dp = dp->df_next; | |
1400 notset = TRUE; | |
1401 } | |
1402 | |
840 | 1403 done: |
7 | 1404 fclose(fd); |
1405 } | |
1406 | |
1407 /* | |
1408 * Copy an entry at "dp" from "idx_orig" to "idx_new". | |
1409 */ | |
1410 static void | |
1411 diff_copy_entry(dprev, dp, idx_orig, idx_new) | |
1412 diff_T *dprev; | |
1413 diff_T *dp; | |
1414 int idx_orig; | |
1415 int idx_new; | |
1416 { | |
1417 long off; | |
1418 | |
1419 if (dprev == NULL) | |
1420 off = 0; | |
1421 else | |
1422 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig]) | |
1423 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]); | |
1424 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off; | |
1425 dp->df_count[idx_new] = dp->df_count[idx_orig]; | |
1426 } | |
1427 | |
1428 /* | |
672 | 1429 * Clear the list of diffblocks for tab page "tp". |
7 | 1430 */ |
358 | 1431 void |
672 | 1432 diff_clear(tp) |
1433 tabpage_T *tp; | |
7 | 1434 { |
1435 diff_T *p, *next_p; | |
1436 | |
672 | 1437 for (p = tp->tp_first_diff; p != NULL; p = next_p) |
7 | 1438 { |
1439 next_p = p->df_next; | |
1440 vim_free(p); | |
1441 } | |
672 | 1442 tp->tp_first_diff = NULL; |
7 | 1443 } |
1444 | |
1445 /* | |
1446 * Check diff status for line "lnum" in buffer "buf": | |
1447 * Returns 0 for nothing special | |
1448 * Returns -1 for a line that should be highlighted as changed. | |
1449 * Returns -2 for a line that should be highlighted as added/deleted. | |
1450 * Returns > 0 for inserting that many filler lines above it (never happens | |
1451 * when 'diffopt' doesn't contain "filler"). | |
1452 * This should only be used for windows where 'diff' is set. | |
1453 */ | |
1454 int | |
1455 diff_check(wp, lnum) | |
1456 win_T *wp; | |
1457 linenr_T lnum; | |
1458 { | |
672 | 1459 int idx; /* index in tp_diffbuf[] for this buffer */ |
7 | 1460 diff_T *dp; |
1461 int maxcount; | |
1462 int i; | |
1463 buf_T *buf = wp->w_buffer; | |
1464 int cmp; | |
1465 | |
672 | 1466 if (curtab->tp_diff_invalid) |
7 | 1467 ex_diffupdate(NULL); /* update after a big change */ |
1468 | |
672 | 1469 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) /* no diffs at all */ |
7 | 1470 return 0; |
1471 | |
1472 /* safety check: "lnum" must be a buffer line */ | |
1473 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1) | |
1474 return 0; | |
1475 | |
1476 idx = diff_buf_idx(buf); | |
1477 if (idx == DB_COUNT) | |
1478 return 0; /* no diffs for buffer "buf" */ | |
1479 | |
1480 #ifdef FEAT_FOLDING | |
1481 /* A closed fold never has filler lines. */ | |
1482 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL)) | |
1483 return 0; | |
1484 #endif | |
1485 | |
1486 /* search for a change that includes "lnum" in the list of diffblocks. */ | |
672 | 1487 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
7 | 1488 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) |
1489 break; | |
1490 if (dp == NULL || lnum < dp->df_lnum[idx]) | |
1491 return 0; | |
1492 | |
1493 if (lnum < dp->df_lnum[idx] + dp->df_count[idx]) | |
1494 { | |
1495 int zero = FALSE; | |
1496 | |
1497 /* Changed or inserted line. If the other buffers have a count of | |
1498 * zero, the lines were inserted. If the other buffers have the same | |
1499 * count, check if the lines are identical. */ | |
1500 cmp = FALSE; | |
1501 for (i = 0; i < DB_COUNT; ++i) | |
672 | 1502 if (i != idx && curtab->tp_diffbuf[i] != NULL) |
7 | 1503 { |
1504 if (dp->df_count[i] == 0) | |
1505 zero = TRUE; | |
1506 else | |
1507 { | |
1508 if (dp->df_count[i] != dp->df_count[idx]) | |
1509 return -1; /* nr of lines changed. */ | |
1510 cmp = TRUE; | |
1511 } | |
1512 } | |
1513 if (cmp) | |
1514 { | |
1515 /* Compare all lines. If they are equal the lines were inserted | |
1516 * in some buffers, deleted in others, but not changed. */ | |
1517 for (i = 0; i < DB_COUNT; ++i) | |
672 | 1518 if (i != idx && curtab->tp_diffbuf[i] != NULL && dp->df_count[i] != 0) |
7 | 1519 if (!diff_equal_entry(dp, idx, i)) |
1520 return -1; | |
1521 } | |
1522 /* If there is no buffer with zero lines then there is no difference | |
1523 * any longer. Happens when making a change (or undo) that removes | |
1524 * the difference. Can't remove the entry here, we might be halfway | |
1525 * updating the window. Just report the text as unchanged. Other | |
1526 * windows might still show the change though. */ | |
1527 if (zero == FALSE) | |
1528 return 0; | |
1529 return -2; | |
1530 } | |
1531 | |
1532 /* If 'diffopt' doesn't contain "filler", return 0. */ | |
1533 if (!(diff_flags & DIFF_FILLER)) | |
1534 return 0; | |
1535 | |
1536 /* Insert filler lines above the line just below the change. Will return | |
1537 * 0 when this buf had the max count. */ | |
1538 maxcount = 0; | |
1539 for (i = 0; i < DB_COUNT; ++i) | |
672 | 1540 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount) |
7 | 1541 maxcount = dp->df_count[i]; |
1542 return maxcount - dp->df_count[idx]; | |
1543 } | |
1544 | |
1545 /* | |
1546 * Compare two entries in diff "*dp" and return TRUE if they are equal. | |
1547 */ | |
1548 static int | |
1549 diff_equal_entry(dp, idx1, idx2) | |
1550 diff_T *dp; | |
1551 int idx1; | |
1552 int idx2; | |
1553 { | |
1554 int i; | |
1555 char_u *line; | |
1556 int cmp; | |
1557 | |
1558 if (dp->df_count[idx1] != dp->df_count[idx2]) | |
1559 return FALSE; | |
672 | 1560 if (diff_check_sanity(curtab, dp) == FAIL) |
7 | 1561 return FALSE; |
1562 for (i = 0; i < dp->df_count[idx1]; ++i) | |
1563 { | |
672 | 1564 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1], |
7 | 1565 dp->df_lnum[idx1] + i, FALSE)); |
1566 if (line == NULL) | |
1567 return FALSE; | |
672 | 1568 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2], |
7 | 1569 dp->df_lnum[idx2] + i, FALSE)); |
1570 vim_free(line); | |
1571 if (cmp != 0) | |
1572 return FALSE; | |
1573 } | |
1574 return TRUE; | |
1575 } | |
1576 | |
1577 /* | |
1578 * Compare strings "s1" and "s2" according to 'diffopt'. | |
1579 * Return non-zero when they are different. | |
1580 */ | |
1581 static int | |
1582 diff_cmp(s1, s2) | |
1583 char_u *s1; | |
1584 char_u *s2; | |
1585 { | |
1586 char_u *p1, *p2; | |
1587 #ifdef FEAT_MBYTE | |
1588 int l; | |
1589 #endif | |
1590 | |
1591 if ((diff_flags & (DIFF_ICASE | DIFF_IWHITE)) == 0) | |
1592 return STRCMP(s1, s2); | |
1593 if ((diff_flags & DIFF_ICASE) && !(diff_flags & DIFF_IWHITE)) | |
1594 return MB_STRICMP(s1, s2); | |
1595 | |
1596 /* Ignore white space changes and possibly ignore case. */ | |
1597 p1 = s1; | |
1598 p2 = s2; | |
1599 while (*p1 != NUL && *p2 != NUL) | |
1600 { | |
1601 if (vim_iswhite(*p1) && vim_iswhite(*p2)) | |
1602 { | |
1603 p1 = skipwhite(p1); | |
1604 p2 = skipwhite(p2); | |
1605 } | |
1606 else | |
1607 { | |
1608 #ifdef FEAT_MBYTE | |
474 | 1609 l = (*mb_ptr2len)(p1); |
1610 if (l != (*mb_ptr2len)(p2)) | |
7 | 1611 break; |
1612 if (l > 1) | |
1613 { | |
1614 if (STRNCMP(p1, p2, l) != 0 | |
1615 && (!enc_utf8 | |
1616 || !(diff_flags & DIFF_ICASE) | |
1617 || utf_fold(utf_ptr2char(p1)) | |
1618 != utf_fold(utf_ptr2char(p2)))) | |
1619 break; | |
1620 p1 += l; | |
1621 p2 += l; | |
1622 } | |
1623 else | |
1624 #endif | |
1625 { | |
1626 if (*p1 != *p2 && (!(diff_flags & DIFF_ICASE) | |
1627 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2))) | |
1628 break; | |
1629 ++p1; | |
1630 ++p2; | |
1631 } | |
1632 } | |
1633 } | |
1634 | |
1635 /* Ignore trailing white space. */ | |
1636 p1 = skipwhite(p1); | |
1637 p2 = skipwhite(p2); | |
1638 if (*p1 != NUL || *p2 != NUL) | |
1639 return 1; | |
1640 return 0; | |
1641 } | |
1642 | |
1643 /* | |
1644 * Return the number of filler lines above "lnum". | |
1645 */ | |
1646 int | |
1647 diff_check_fill(wp, lnum) | |
1648 win_T *wp; | |
1649 linenr_T lnum; | |
1650 { | |
1651 int n; | |
1652 | |
1653 /* be quick when there are no filler lines */ | |
1654 if (!(diff_flags & DIFF_FILLER)) | |
1655 return 0; | |
1656 n = diff_check(wp, lnum); | |
1657 if (n <= 0) | |
1658 return 0; | |
1659 return n; | |
1660 } | |
1661 | |
1662 /* | |
1663 * Set the topline of "towin" to match the position in "fromwin", so that they | |
1664 * show the same diff'ed lines. | |
1665 */ | |
1666 void | |
1667 diff_set_topline(fromwin, towin) | |
1668 win_T *fromwin; | |
1669 win_T *towin; | |
1670 { | |
1519 | 1671 buf_T *frombuf = fromwin->w_buffer; |
7 | 1672 linenr_T lnum = fromwin->w_topline; |
1519 | 1673 int fromidx; |
1674 int toidx; | |
7 | 1675 diff_T *dp; |
1519 | 1676 int max_count; |
7 | 1677 int i; |
1678 | |
1519 | 1679 fromidx = diff_buf_idx(frombuf); |
1680 if (fromidx == DB_COUNT) | |
7 | 1681 return; /* safety check */ |
1682 | |
672 | 1683 if (curtab->tp_diff_invalid) |
7 | 1684 ex_diffupdate(NULL); /* update after a big change */ |
1685 | |
1686 towin->w_topfill = 0; | |
1687 | |
1688 /* search for a change that includes "lnum" in the list of diffblocks. */ | |
672 | 1689 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
1519 | 1690 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx]) |
7 | 1691 break; |
1692 if (dp == NULL) | |
1693 { | |
1694 /* After last change, compute topline relative to end of file; no | |
1695 * filler lines. */ | |
1696 towin->w_topline = towin->w_buffer->b_ml.ml_line_count | |
1519 | 1697 - (frombuf->b_ml.ml_line_count - lnum); |
7 | 1698 } |
1699 else | |
1700 { | |
1701 /* Find index for "towin". */ | |
1519 | 1702 toidx = diff_buf_idx(towin->w_buffer); |
1703 if (toidx == DB_COUNT) | |
7 | 1704 return; /* safety check */ |
1705 | |
1519 | 1706 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]); |
1707 if (lnum >= dp->df_lnum[fromidx]) | |
7 | 1708 { |
1519 | 1709 /* Inside a change: compute filler lines. With three or more |
1710 * buffers we need to know the largest count. */ | |
1711 max_count = 0; | |
1712 for (i = 0; i < DB_COUNT; ++i) | |
1713 if (curtab->tp_diffbuf[i] != NULL | |
1714 && max_count < dp->df_count[i]) | |
1715 max_count = dp->df_count[i]; | |
1716 | |
1717 if (dp->df_count[toidx] == dp->df_count[fromidx]) | |
1718 { | |
1719 /* same number of lines: use same filler count */ | |
7 | 1720 towin->w_topfill = fromwin->w_topfill; |
1519 | 1721 } |
1722 else if (dp->df_count[toidx] > dp->df_count[fromidx]) | |
7 | 1723 { |
1519 | 1724 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx]) |
1725 { | |
1726 /* more lines in towin and fromwin doesn't show diff | |
1727 * lines, only filler lines */ | |
1728 if (max_count - fromwin->w_topfill >= dp->df_count[toidx]) | |
1729 { | |
1730 /* towin also only shows filler lines */ | |
1731 towin->w_topline = dp->df_lnum[toidx] | |
1732 + dp->df_count[toidx]; | |
1733 towin->w_topfill = fromwin->w_topfill; | |
1734 } | |
1735 else | |
1736 /* towin still has some diff lines to show */ | |
1737 towin->w_topline = dp->df_lnum[toidx] | |
1738 + max_count - fromwin->w_topfill; | |
1739 } | |
7 | 1740 } |
1519 | 1741 else if (towin->w_topline >= dp->df_lnum[toidx] |
1742 + dp->df_count[toidx]) | |
7 | 1743 { |
1519 | 1744 /* less lines in towin and no diff lines to show: compute |
1745 * filler lines */ | |
1746 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx]; | |
1747 if (diff_flags & DIFF_FILLER) | |
7 | 1748 { |
1519 | 1749 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx]) |
1750 /* fromwin is also out of diff lines */ | |
1751 towin->w_topfill = fromwin->w_topfill; | |
1752 else | |
1753 /* fromwin has some diff lines */ | |
1754 towin->w_topfill = dp->df_lnum[fromidx] | |
1755 + max_count - lnum; | |
7 | 1756 } |
1757 } | |
1758 } | |
1759 } | |
1760 | |
1761 /* safety check (if diff info gets outdated strange things may happen) */ | |
1762 towin->w_botfill = FALSE; | |
1763 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count) | |
1764 { | |
1765 towin->w_topline = towin->w_buffer->b_ml.ml_line_count; | |
1766 towin->w_botfill = TRUE; | |
1767 } | |
1768 if (towin->w_topline < 1) | |
1769 { | |
1770 towin->w_topline = 1; | |
1771 towin->w_topfill = 0; | |
1772 } | |
1773 | |
1774 /* When w_topline changes need to recompute w_botline and cursor position */ | |
1775 invalidate_botline_win(towin); | |
1776 changed_line_abv_curs_win(towin); | |
1777 | |
1778 check_topfill(towin, FALSE); | |
1779 #ifdef FEAT_FOLDING | |
1780 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline, | |
1781 NULL, TRUE, NULL); | |
1782 #endif | |
1783 } | |
1784 | |
1785 /* | |
1786 * This is called when 'diffopt' is changed. | |
1787 */ | |
1788 int | |
1789 diffopt_changed() | |
1790 { | |
1791 char_u *p; | |
1792 int diff_context_new = 6; | |
1793 int diff_flags_new = 0; | |
764 | 1794 int diff_foldcolumn_new = 2; |
672 | 1795 tabpage_T *tp; |
7 | 1796 |
1797 p = p_dip; | |
1798 while (*p != NUL) | |
1799 { | |
1800 if (STRNCMP(p, "filler", 6) == 0) | |
1801 { | |
1802 p += 6; | |
1803 diff_flags_new |= DIFF_FILLER; | |
1804 } | |
1805 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8])) | |
1806 { | |
1807 p += 8; | |
1808 diff_context_new = getdigits(&p); | |
1809 } | |
1810 else if (STRNCMP(p, "icase", 5) == 0) | |
1811 { | |
1812 p += 5; | |
1813 diff_flags_new |= DIFF_ICASE; | |
1814 } | |
1815 else if (STRNCMP(p, "iwhite", 6) == 0) | |
1816 { | |
1817 p += 6; | |
1818 diff_flags_new |= DIFF_IWHITE; | |
1819 } | |
764 | 1820 else if (STRNCMP(p, "horizontal", 10) == 0) |
1821 { | |
1822 p += 10; | |
1823 diff_flags_new |= DIFF_HORIZONTAL; | |
1824 } | |
1825 else if (STRNCMP(p, "vertical", 8) == 0) | |
1826 { | |
1827 p += 8; | |
1828 diff_flags_new |= DIFF_VERTICAL; | |
1829 } | |
1830 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11])) | |
1831 { | |
1832 p += 11; | |
1833 diff_foldcolumn_new = getdigits(&p); | |
1834 } | |
7 | 1835 if (*p != ',' && *p != NUL) |
1836 return FAIL; | |
1837 if (*p == ',') | |
1838 ++p; | |
1839 } | |
1840 | |
764 | 1841 /* Can't have both "horizontal" and "vertical". */ |
1842 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL)) | |
1843 return FAIL; | |
1844 | |
7 | 1845 /* If "icase" or "iwhite" was added or removed, need to update the diff. */ |
1846 if (diff_flags != diff_flags_new) | |
672 | 1847 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) |
1848 tp->tp_diff_invalid = TRUE; | |
7 | 1849 |
1850 diff_flags = diff_flags_new; | |
1851 diff_context = diff_context_new; | |
764 | 1852 diff_foldcolumn = diff_foldcolumn_new; |
7 | 1853 |
1854 diff_redraw(TRUE); | |
1855 | |
1856 /* recompute the scroll binding with the new option value, may | |
1857 * remove or add filler lines */ | |
1858 check_scrollbind((linenr_T)0, 0L); | |
1859 | |
1860 return OK; | |
1861 } | |
1862 | |
1863 /* | |
764 | 1864 * Return TRUE if 'diffopt' contains "horizontal". |
1865 */ | |
1866 int | |
1867 diffopt_horizontal() | |
1868 { | |
1869 return (diff_flags & DIFF_HORIZONTAL) != 0; | |
1870 } | |
1871 | |
1872 /* | |
7 | 1873 * Find the difference within a changed line. |
1874 * Returns TRUE if the line was added, no other buffer has it. | |
1875 */ | |
1876 int | |
1877 diff_find_change(wp, lnum, startp, endp) | |
1878 win_T *wp; | |
1879 linenr_T lnum; | |
1880 int *startp; /* first char of the change */ | |
1881 int *endp; /* last char of the change */ | |
1882 { | |
1883 char_u *line_org; | |
1884 char_u *line_new; | |
1885 int i; | |
829 | 1886 int si_org, si_new; |
1887 int ei_org, ei_new; | |
7 | 1888 diff_T *dp; |
1889 int idx; | |
1890 int off; | |
1891 int added = TRUE; | |
1892 | |
1893 /* Make a copy of the line, the next ml_get() will invalidate it. */ | |
1894 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
1895 if (line_org == NULL) | |
1896 return FALSE; | |
1897 | |
1898 idx = diff_buf_idx(wp->w_buffer); | |
1899 if (idx == DB_COUNT) /* cannot happen */ | |
1074 | 1900 { |
1901 vim_free(line_org); | |
7 | 1902 return FALSE; |
1074 | 1903 } |
7 | 1904 |
1905 /* search for a change that includes "lnum" in the list of diffblocks. */ | |
672 | 1906 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
7 | 1907 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) |
1908 break; | |
672 | 1909 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL) |
1074 | 1910 { |
1911 vim_free(line_org); | |
7 | 1912 return FALSE; |
1074 | 1913 } |
7 | 1914 |
1915 off = lnum - dp->df_lnum[idx]; | |
1916 | |
1917 for (i = 0; i < DB_COUNT; ++i) | |
672 | 1918 if (curtab->tp_diffbuf[i] != NULL && i != idx) |
7 | 1919 { |
1920 /* Skip lines that are not in the other change (filler lines). */ | |
1921 if (off >= dp->df_count[i]) | |
1922 continue; | |
1923 added = FALSE; | |
829 | 1924 line_new = ml_get_buf(curtab->tp_diffbuf[i], |
1925 dp->df_lnum[i] + off, FALSE); | |
7 | 1926 |
1927 /* Search for start of difference */ | |
829 | 1928 si_org = si_new = 0; |
1929 while (line_org[si_org] != NUL) | |
1930 { | |
1931 if ((diff_flags & DIFF_IWHITE) | |
1932 && vim_iswhite(line_org[si_org]) | |
1933 && vim_iswhite(line_new[si_new])) | |
1934 { | |
835 | 1935 si_org = (int)(skipwhite(line_org + si_org) - line_org); |
1936 si_new = (int)(skipwhite(line_new + si_new) - line_new); | |
829 | 1937 } |
1938 else | |
1939 { | |
1940 if (line_org[si_org] != line_new[si_new]) | |
1941 break; | |
1942 ++si_org; | |
1943 ++si_new; | |
1944 } | |
1945 } | |
7 | 1946 #ifdef FEAT_MBYTE |
1947 if (has_mbyte) | |
1948 { | |
1949 /* Move back to first byte of character in both lines (may | |
1950 * have "nn^" in line_org and "n^ in line_new). */ | |
829 | 1951 si_org -= (*mb_head_off)(line_org, line_org + si_org); |
1952 si_new -= (*mb_head_off)(line_new, line_new + si_new); | |
7 | 1953 } |
1954 #endif | |
829 | 1955 if (*startp > si_org) |
1956 *startp = si_org; | |
7 | 1957 |
1958 /* Search for end of difference, if any. */ | |
829 | 1959 if (line_org[si_org] != NUL || line_new[si_new] != NUL) |
7 | 1960 { |
1961 ei_org = (int)STRLEN(line_org); | |
1962 ei_new = (int)STRLEN(line_new); | |
829 | 1963 while (ei_org >= *startp && ei_new >= si_new |
1964 && ei_org >= 0 && ei_new >= 0) | |
7 | 1965 { |
829 | 1966 if ((diff_flags & DIFF_IWHITE) |
1967 && vim_iswhite(line_org[ei_org]) | |
1968 && vim_iswhite(line_new[ei_new])) | |
1969 { | |
1970 while (ei_org >= *startp | |
1971 && vim_iswhite(line_org[ei_org])) | |
1972 --ei_org; | |
1973 while (ei_new >= si_new | |
1974 && vim_iswhite(line_new[ei_new])) | |
1975 --ei_new; | |
1976 } | |
1977 else | |
1978 { | |
1979 if (line_org[ei_org] != line_new[ei_new]) | |
1980 break; | |
1981 --ei_org; | |
1982 --ei_new; | |
1983 } | |
7 | 1984 } |
1985 if (*endp < ei_org) | |
1986 *endp = ei_org; | |
1987 } | |
1988 } | |
1989 | |
1990 vim_free(line_org); | |
1991 return added; | |
1992 } | |
1993 | |
1994 #if defined(FEAT_FOLDING) || defined(PROTO) | |
1995 /* | |
1996 * Return TRUE if line "lnum" is not close to a diff block, this line should | |
1997 * be in a fold. | |
1998 * Return FALSE if there are no diff blocks at all in this window. | |
1999 */ | |
2000 int | |
2001 diff_infold(wp, lnum) | |
2002 win_T *wp; | |
2003 linenr_T lnum; | |
2004 { | |
2005 int i; | |
2006 int idx = -1; | |
2007 int other = FALSE; | |
2008 diff_T *dp; | |
2009 | |
2010 /* Return if 'diff' isn't set. */ | |
2011 if (!wp->w_p_diff) | |
2012 return FALSE; | |
2013 | |
2014 for (i = 0; i < DB_COUNT; ++i) | |
2015 { | |
672 | 2016 if (curtab->tp_diffbuf[i] == wp->w_buffer) |
7 | 2017 idx = i; |
672 | 2018 else if (curtab->tp_diffbuf[i] != NULL) |
7 | 2019 other = TRUE; |
2020 } | |
2021 | |
2022 /* return here if there are no diffs in the window */ | |
2023 if (idx == -1 || !other) | |
2024 return FALSE; | |
2025 | |
672 | 2026 if (curtab->tp_diff_invalid) |
7 | 2027 ex_diffupdate(NULL); /* update after a big change */ |
2028 | |
2029 /* Return if there are no diff blocks. All lines will be folded. */ | |
672 | 2030 if (curtab->tp_first_diff == NULL) |
7 | 2031 return TRUE; |
2032 | |
672 | 2033 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
7 | 2034 { |
2035 /* If this change is below the line there can't be any further match. */ | |
2036 if (dp->df_lnum[idx] - diff_context > lnum) | |
2037 break; | |
2038 /* If this change ends before the line we have a match. */ | |
2039 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum) | |
2040 return FALSE; | |
2041 } | |
2042 return TRUE; | |
2043 } | |
2044 #endif | |
2045 | |
2046 /* | |
2047 * "dp" and "do" commands. | |
2048 */ | |
2049 void | |
2050 nv_diffgetput(put) | |
2051 int put; | |
2052 { | |
2053 exarg_T ea; | |
2054 | |
2055 ea.arg = (char_u *)""; | |
2056 if (put) | |
2057 ea.cmdidx = CMD_diffput; | |
2058 else | |
2059 ea.cmdidx = CMD_diffget; | |
2060 ea.addr_count = 0; | |
2061 ea.line1 = curwin->w_cursor.lnum; | |
2062 ea.line2 = curwin->w_cursor.lnum; | |
2063 ex_diffgetput(&ea); | |
2064 } | |
2065 | |
2066 /* | |
2067 * ":diffget" | |
2068 * ":diffput" | |
2069 */ | |
2070 void | |
2071 ex_diffgetput(eap) | |
2072 exarg_T *eap; | |
2073 { | |
2074 linenr_T lnum; | |
2075 int count; | |
2076 linenr_T off = 0; | |
2077 diff_T *dp; | |
2078 diff_T *dprev; | |
2079 diff_T *dfree; | |
2080 int idx_cur; | |
2081 int idx_other; | |
2082 int idx_from; | |
2083 int idx_to; | |
2084 int i; | |
2085 int added; | |
2086 char_u *p; | |
2087 aco_save_T aco; | |
2088 buf_T *buf; | |
2089 int start_skip, end_skip; | |
2090 int new_count; | |
648 | 2091 int buf_empty; |
1075 | 2092 int found_not_ma = FALSE; |
7 | 2093 |
2094 /* Find the current buffer in the list of diff buffers. */ | |
2095 idx_cur = diff_buf_idx(curbuf); | |
2096 if (idx_cur == DB_COUNT) | |
2097 { | |
2098 EMSG(_("E99: Current buffer is not in diff mode")); | |
2099 return; | |
2100 } | |
2101 | |
2102 if (*eap->arg == NUL) | |
2103 { | |
2104 /* No argument: Find the other buffer in the list of diff buffers. */ | |
2105 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other) | |
672 | 2106 if (curtab->tp_diffbuf[idx_other] != curbuf |
1075 | 2107 && curtab->tp_diffbuf[idx_other] != NULL) |
2108 { | |
2109 if (eap->cmdidx != CMD_diffput | |
2110 || curtab->tp_diffbuf[idx_other]->b_p_ma) | |
2111 break; | |
2112 found_not_ma = TRUE; | |
2113 } | |
7 | 2114 if (idx_other == DB_COUNT) |
2115 { | |
1075 | 2116 if (found_not_ma) |
2117 EMSG(_("E793: No other buffer in diff mode is modifiable")); | |
2118 else | |
2119 EMSG(_("E100: No other buffer in diff mode")); | |
7 | 2120 return; |
2121 } | |
2122 | |
2123 /* Check that there isn't a third buffer in the list */ | |
2124 for (i = idx_other + 1; i < DB_COUNT; ++i) | |
672 | 2125 if (curtab->tp_diffbuf[i] != curbuf |
2126 && curtab->tp_diffbuf[i] != NULL | |
2127 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma)) | |
7 | 2128 { |
2129 EMSG(_("E101: More than two buffers in diff mode, don't know which one to use")); | |
2130 return; | |
2131 } | |
2132 } | |
2133 else | |
2134 { | |
2135 /* Buffer number or pattern given. Ignore trailing white space. */ | |
2136 p = eap->arg + STRLEN(eap->arg); | |
2137 while (p > eap->arg && vim_iswhite(p[-1])) | |
2138 --p; | |
2139 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i) | |
2140 ; | |
2141 if (eap->arg + i == p) /* digits only */ | |
2142 i = atol((char *)eap->arg); | |
2143 else | |
2144 { | |
2145 i = buflist_findpat(eap->arg, p, FALSE, TRUE); | |
2146 if (i < 0) | |
2147 return; /* error message already given */ | |
2148 } | |
2149 buf = buflist_findnr(i); | |
2150 if (buf == NULL) | |
2151 { | |
2152 EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg); | |
2153 return; | |
2154 } | |
1788 | 2155 if (buf == curbuf) |
2156 return; /* nothing to do */ | |
7 | 2157 idx_other = diff_buf_idx(buf); |
2158 if (idx_other == DB_COUNT) | |
2159 { | |
2160 EMSG2(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg); | |
2161 return; | |
2162 } | |
2163 } | |
2164 | |
2165 diff_busy = TRUE; | |
2166 | |
2167 /* When no range given include the line above or below the cursor. */ | |
2168 if (eap->addr_count == 0) | |
2169 { | |
2170 /* Make it possible that ":diffget" on the last line gets line below | |
2171 * the cursor line when there is no difference above the cursor. */ | |
2172 if (eap->cmdidx == CMD_diffget | |
2173 && eap->line1 == curbuf->b_ml.ml_line_count | |
2174 && diff_check(curwin, eap->line1) == 0 | |
2175 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0)) | |
2176 ++eap->line2; | |
2177 else if (eap->line1 > 0) | |
2178 --eap->line1; | |
2179 } | |
2180 | |
2181 if (eap->cmdidx == CMD_diffget) | |
2182 { | |
2183 idx_from = idx_other; | |
2184 idx_to = idx_cur; | |
2185 } | |
2186 else | |
2187 { | |
2188 idx_from = idx_cur; | |
2189 idx_to = idx_other; | |
2190 /* Need to make the other buffer the current buffer to be able to make | |
2191 * changes in it. */ | |
2192 /* set curwin/curbuf to buf and save a few things */ | |
672 | 2193 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]); |
7 | 2194 } |
2195 | |
819 | 2196 /* May give the warning for a changed buffer here, which can trigger the |
2197 * FileChangedRO autocommand, which may do nasty things and mess | |
2198 * everything up. */ | |
2199 if (!curbuf->b_changed) | |
2200 { | |
2201 change_warning(0); | |
2202 if (diff_buf_idx(curbuf) != idx_to) | |
2203 { | |
2204 EMSG(_("E787: Buffer changed unexpectedly")); | |
2205 return; | |
2206 } | |
2207 } | |
2208 | |
7 | 2209 dprev = NULL; |
672 | 2210 for (dp = curtab->tp_first_diff; dp != NULL; ) |
7 | 2211 { |
2212 if (dp->df_lnum[idx_cur] > eap->line2 + off) | |
2213 break; /* past the range that was specified */ | |
2214 | |
2215 dfree = NULL; | |
2216 lnum = dp->df_lnum[idx_to]; | |
2217 count = dp->df_count[idx_to]; | |
2218 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off | |
2219 && u_save(lnum - 1, lnum + count) != FAIL) | |
2220 { | |
2221 /* Inside the specified range and saving for undo worked. */ | |
2222 start_skip = 0; | |
2223 end_skip = 0; | |
2224 if (eap->addr_count > 0) | |
2225 { | |
2226 /* A range was specified: check if lines need to be skipped. */ | |
2227 start_skip = eap->line1 + off - dp->df_lnum[idx_cur]; | |
2228 if (start_skip > 0) | |
2229 { | |
2230 /* range starts below start of current diff block */ | |
2231 if (start_skip > count) | |
2232 { | |
2233 lnum += count; | |
2234 count = 0; | |
2235 } | |
2236 else | |
2237 { | |
2238 count -= start_skip; | |
2239 lnum += start_skip; | |
2240 } | |
2241 } | |
2242 else | |
2243 start_skip = 0; | |
2244 | |
2245 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1 | |
2246 - (eap->line2 + off); | |
2247 if (end_skip > 0) | |
2248 { | |
2249 /* range ends above end of current/from diff block */ | |
2250 if (idx_cur == idx_from) /* :diffput */ | |
2251 { | |
2252 i = dp->df_count[idx_cur] - start_skip - end_skip; | |
2253 if (count > i) | |
2254 count = i; | |
2255 } | |
2256 else /* :diffget */ | |
2257 { | |
2258 count -= end_skip; | |
2259 end_skip = dp->df_count[idx_from] - start_skip - count; | |
2260 if (end_skip < 0) | |
2261 end_skip = 0; | |
2262 } | |
2263 } | |
2264 else | |
2265 end_skip = 0; | |
2266 } | |
2267 | |
648 | 2268 buf_empty = FALSE; |
7 | 2269 added = 0; |
2270 for (i = 0; i < count; ++i) | |
2271 { | |
648 | 2272 /* remember deleting the last line of the buffer */ |
2273 buf_empty = curbuf->b_ml.ml_line_count == 1; | |
7 | 2274 ml_delete(lnum, FALSE); |
2275 --added; | |
2276 } | |
2277 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i) | |
2278 { | |
2279 linenr_T nr; | |
2280 | |
2281 nr = dp->df_lnum[idx_from] + start_skip + i; | |
672 | 2282 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count) |
7 | 2283 break; |
819 | 2284 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from], |
2285 nr, FALSE)); | |
7 | 2286 if (p != NULL) |
2287 { | |
2288 ml_append(lnum + i - 1, p, 0, FALSE); | |
2289 vim_free(p); | |
2290 ++added; | |
648 | 2291 if (buf_empty && curbuf->b_ml.ml_line_count == 2) |
2292 { | |
2293 /* Added the first line into an empty buffer, need to | |
2294 * delete the dummy empty line. */ | |
2295 buf_empty = FALSE; | |
2296 ml_delete((linenr_T)2, FALSE); | |
2297 } | |
7 | 2298 } |
2299 } | |
2300 new_count = dp->df_count[idx_to] + added; | |
2301 dp->df_count[idx_to] = new_count; | |
2302 | |
2303 if (start_skip == 0 && end_skip == 0) | |
2304 { | |
2305 /* Check if there are any other buffers and if the diff is | |
2306 * equal in them. */ | |
2307 for (i = 0; i < DB_COUNT; ++i) | |
819 | 2308 if (curtab->tp_diffbuf[i] != NULL && i != idx_from |
2309 && i != idx_to | |
7 | 2310 && !diff_equal_entry(dp, idx_from, i)) |
2311 break; | |
2312 if (i == DB_COUNT) | |
2313 { | |
2314 /* delete the diff entry, the buffers are now equal here */ | |
2315 dfree = dp; | |
2316 dp = dp->df_next; | |
2317 if (dprev == NULL) | |
672 | 2318 curtab->tp_first_diff = dp; |
7 | 2319 else |
2320 dprev->df_next = dp; | |
2321 } | |
2322 } | |
2323 | |
2324 /* Adjust marks. This will change the following entries! */ | |
2325 if (added != 0) | |
2326 { | |
2327 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added); | |
2328 if (curwin->w_cursor.lnum >= lnum) | |
2329 { | |
2330 /* Adjust the cursor position if it's in/after the changed | |
2331 * lines. */ | |
2332 if (curwin->w_cursor.lnum >= lnum + count) | |
2333 curwin->w_cursor.lnum += added; | |
2334 else if (added < 0) | |
2335 curwin->w_cursor.lnum = lnum; | |
2336 } | |
2337 } | |
2338 changed_lines(lnum, 0, lnum + count, (long)added); | |
2339 | |
2340 if (dfree != NULL) | |
2341 { | |
2342 /* Diff is deleted, update folds in other windows. */ | |
2343 #ifdef FEAT_FOLDING | |
2344 diff_fold_update(dfree, idx_to); | |
2345 #endif | |
2346 vim_free(dfree); | |
2347 } | |
2348 else | |
2349 /* mark_adjust() may have changed the count in a wrong way */ | |
2350 dp->df_count[idx_to] = new_count; | |
2351 | |
2352 /* When changing the current buffer, keep track of line numbers */ | |
2353 if (idx_cur == idx_to) | |
2354 off += added; | |
2355 } | |
2356 | |
2357 /* If before the range or not deleted, go to next diff. */ | |
2358 if (dfree == NULL) | |
2359 { | |
2360 dprev = dp; | |
2361 dp = dp->df_next; | |
2362 } | |
2363 } | |
2364 | |
2365 /* restore curwin/curbuf and a few other things */ | |
2445
04dae202d316
Fixes for coverity warnings.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
2366 if (eap->cmdidx != CMD_diffget) |
7 | 2367 { |
2368 /* Syncing undo only works for the current buffer, but we change | |
2369 * another buffer. Sync undo if the command was typed. This isn't | |
2370 * 100% right when ":diffput" is used in a function or mapping. */ | |
2371 if (KeyTyped) | |
825 | 2372 u_sync(FALSE); |
7 | 2373 aucmd_restbuf(&aco); |
2374 } | |
2375 | |
2376 diff_busy = FALSE; | |
2377 | |
2378 /* Check that the cursor is on a valid character and update it's position. | |
2379 * When there were filler lines the topline has become invalid. */ | |
2380 check_cursor(); | |
2381 changed_line_abv_curs(); | |
2382 | |
2383 /* Also need to redraw the other buffers. */ | |
2384 diff_redraw(FALSE); | |
2385 } | |
2386 | |
2387 #ifdef FEAT_FOLDING | |
2388 /* | |
2389 * Update folds for all diff buffers for entry "dp". | |
2390 * Skip buffer with index "skip_idx". | |
2391 * When there are no diffs, all folds are removed. | |
2392 */ | |
2393 static void | |
2394 diff_fold_update(dp, skip_idx) | |
2395 diff_T *dp; | |
2396 int skip_idx; | |
2397 { | |
2398 int i; | |
2399 win_T *wp; | |
2400 | |
2401 for (wp = firstwin; wp != NULL; wp = wp->w_next) | |
2402 for (i = 0; i < DB_COUNT; ++i) | |
672 | 2403 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx) |
7 | 2404 foldUpdate(wp, dp->df_lnum[i], |
2405 dp->df_lnum[i] + dp->df_count[i]); | |
2406 } | |
2407 #endif | |
2408 | |
2409 /* | |
2410 * Return TRUE if buffer "buf" is in diff-mode. | |
2411 */ | |
2412 int | |
2413 diff_mode_buf(buf) | |
2414 buf_T *buf; | |
2415 { | |
672 | 2416 tabpage_T *tp; |
2417 | |
2418 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) | |
2419 if (diff_buf_idx_tp(buf, tp) != DB_COUNT) | |
2420 return TRUE; | |
2421 return FALSE; | |
7 | 2422 } |
2423 | |
2424 /* | |
2425 * Move "count" times in direction "dir" to the next diff block. | |
2426 * Return FAIL if there isn't such a diff block. | |
2427 */ | |
2428 int | |
2429 diff_move_to(dir, count) | |
2430 int dir; | |
2431 long count; | |
2432 { | |
2433 int idx; | |
2434 linenr_T lnum = curwin->w_cursor.lnum; | |
2435 diff_T *dp; | |
2436 | |
2437 idx = diff_buf_idx(curbuf); | |
672 | 2438 if (idx == DB_COUNT || curtab->tp_first_diff == NULL) |
7 | 2439 return FAIL; |
2440 | |
672 | 2441 if (curtab->tp_diff_invalid) |
7 | 2442 ex_diffupdate(NULL); /* update after a big change */ |
2443 | |
672 | 2444 if (curtab->tp_first_diff == NULL) /* no diffs today */ |
7 | 2445 return FAIL; |
2446 | |
2447 while (--count >= 0) | |
2448 { | |
2449 /* Check if already before first diff. */ | |
672 | 2450 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx]) |
7 | 2451 break; |
2452 | |
672 | 2453 for (dp = curtab->tp_first_diff; ; dp = dp->df_next) |
7 | 2454 { |
2455 if (dp == NULL) | |
2456 break; | |
2457 if ((dir == FORWARD && lnum < dp->df_lnum[idx]) | |
2458 || (dir == BACKWARD | |
2459 && (dp->df_next == NULL | |
2460 || lnum <= dp->df_next->df_lnum[idx]))) | |
2461 { | |
2462 lnum = dp->df_lnum[idx]; | |
2463 break; | |
2464 } | |
2465 } | |
2466 } | |
2467 | |
2468 /* don't end up past the end of the file */ | |
2469 if (lnum > curbuf->b_ml.ml_line_count) | |
2470 lnum = curbuf->b_ml.ml_line_count; | |
2471 | |
2472 /* When the cursor didn't move at all we fail. */ | |
2473 if (lnum == curwin->w_cursor.lnum) | |
2474 return FAIL; | |
2475 | |
2476 setpcmark(); | |
2477 curwin->w_cursor.lnum = lnum; | |
2478 curwin->w_cursor.col = 0; | |
2479 | |
2480 return OK; | |
2481 } | |
2482 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2483 #if defined(FEAT_CURSORBIND) || defined(PROTO) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2484 linenr_T |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2485 diff_get_corresponding_line(buf1, lnum1, buf2, lnum3) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2486 buf_T *buf1; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2487 linenr_T lnum1; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2488 buf_T *buf2; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2489 linenr_T lnum3; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2490 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2491 int idx1; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2492 int idx2; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2493 diff_T *dp; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2494 int baseline = 0; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2495 linenr_T lnum2; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2496 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2497 idx1 = diff_buf_idx(buf1); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2498 idx2 = diff_buf_idx(buf2); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2499 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2500 return lnum1; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2501 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2502 if (curtab->tp_diff_invalid) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2503 ex_diffupdate(NULL); /* update after a big change */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2504 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2505 if (curtab->tp_first_diff == NULL) /* no diffs today */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2506 return lnum1; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2507 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2508 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2509 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2510 if (dp->df_lnum[idx1] > lnum1) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2511 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2512 lnum2 = lnum1 - baseline; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2513 /* don't end up past the end of the file */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2514 if (lnum2 > buf2->b_ml.ml_line_count) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2515 lnum2 = buf2->b_ml.ml_line_count; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2516 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2517 return lnum2; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2518 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2519 else if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2520 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2521 /* Inside the diffblock */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2522 baseline = lnum1 - dp->df_lnum[idx1]; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2523 if (baseline > dp->df_count[idx2]) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2524 baseline = dp->df_count[idx2]; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2525 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2526 return dp->df_lnum[idx2] + baseline; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2527 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2528 else if ( (dp->df_lnum[idx1] == lnum1) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2529 && (dp->df_count[idx1] == 0) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2530 && (dp->df_lnum[idx2] <= lnum3) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2531 && ((dp->df_lnum[idx2] + dp->df_count[idx2]) > lnum3)) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2532 /* |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2533 * Special case: if the cursor is just after a zero-count |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2534 * block (i.e. all filler) and the target cursor is already |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2535 * inside the corresponding block, leave the target cursor |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2536 * unmoved. This makes repeated CTRL-W W operations work |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2537 * as expected. |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2538 */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2539 return lnum3; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2540 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1]) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2541 - (dp->df_lnum[idx2] + dp->df_count[idx2]); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2542 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2543 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2544 /* If we get here then the cursor is after the last diff */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2545 lnum2 = lnum1 - baseline; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2546 /* don't end up past the end of the file */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2547 if (lnum2 > buf2->b_ml.ml_line_count) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2548 lnum2 = buf2->b_ml.ml_line_count; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2549 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2550 return lnum2; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2551 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2552 #endif |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2553 |
7 | 2554 #if defined(FEAT_FOLDING) || defined(PROTO) |
2555 /* | |
2556 * For line "lnum" in the current window find the equivalent lnum in window | |
2557 * "wp", compensating for inserted/deleted lines. | |
2558 */ | |
2559 linenr_T | |
2560 diff_lnum_win(lnum, wp) | |
2561 linenr_T lnum; | |
2562 win_T *wp; | |
2563 { | |
2564 diff_T *dp; | |
2565 int idx; | |
2566 int i; | |
2567 linenr_T n; | |
2568 | |
2569 idx = diff_buf_idx(curbuf); | |
2570 if (idx == DB_COUNT) /* safety check */ | |
2571 return (linenr_T)0; | |
2572 | |
672 | 2573 if (curtab->tp_diff_invalid) |
7 | 2574 ex_diffupdate(NULL); /* update after a big change */ |
2575 | |
2576 /* search for a change that includes "lnum" in the list of diffblocks. */ | |
672 | 2577 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
7 | 2578 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) |
2579 break; | |
2580 | |
2581 /* When after the last change, compute relative to the last line number. */ | |
2582 if (dp == NULL) | |
2583 return wp->w_buffer->b_ml.ml_line_count | |
2584 - (curbuf->b_ml.ml_line_count - lnum); | |
2585 | |
2586 /* Find index for "wp". */ | |
2587 i = diff_buf_idx(wp->w_buffer); | |
2588 if (i == DB_COUNT) /* safety check */ | |
2589 return (linenr_T)0; | |
2590 | |
2591 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]); | |
2592 if (n > dp->df_lnum[i] + dp->df_count[i]) | |
2593 n = dp->df_lnum[i] + dp->df_count[i]; | |
2594 return n; | |
2595 } | |
2596 #endif | |
2597 | |
2598 #endif /* FEAT_DIFF */ |