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