blob: 0399e7967a53499bfb2fdf043beb58394e9d8001 [file] [log] [blame]
Bram Moolenaaredf3f972016-08-29 22:49:24 +02001/* vi:set ts=8 sts=4 sw=4 noet:
Bram Moolenaar071d4272004-06-13 20:20:40 +00002 *
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/*
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +000011 * diff.c: code for diff'ing two, three or four buffers.
Bram Moolenaare828b762018-09-10 17:51:58 +020012 *
13 * There are three ways to diff:
14 * - Shell out to an external diff program, using files.
15 * - Use the compiled-in xdiff library.
16 * - Let 'diffexpr' do the work, using files.
Bram Moolenaar071d4272004-06-13 20:20:40 +000017 */
18
19#include "vim.h"
Bram Moolenaare828b762018-09-10 17:51:58 +020020#include "xdiff/xdiff.h"
Bram Moolenaar071d4272004-06-13 20:20:40 +000021
22#if defined(FEAT_DIFF) || defined(PROTO)
23
Bram Moolenaard2b58c02018-09-16 18:10:48 +020024static int diff_busy = FALSE; // using diff structs, don't change them
25static int diff_need_update = FALSE; // ex_diffupdate needs to be called
Bram Moolenaar071d4272004-06-13 20:20:40 +000026
27/* flags obtained from the 'diffopt' option */
Bram Moolenaar785fc652018-09-15 19:17:38 +020028#define DIFF_FILLER 0x001 // display filler lines
29#define DIFF_IBLANK 0x002 // ignore empty lines
30#define DIFF_ICASE 0x004 // ignore case
31#define DIFF_IWHITE 0x008 // ignore change in white space
32#define DIFF_IWHITEALL 0x010 // ignore all white space changes
33#define DIFF_IWHITEEOL 0x020 // ignore change in white space at EOL
34#define DIFF_HORIZONTAL 0x040 // horizontal splits
35#define DIFF_VERTICAL 0x080 // vertical splits
36#define DIFF_HIDDEN_OFF 0x100 // diffoff when hidden
37#define DIFF_INTERNAL 0x200 // use internal xdiff algorithm
38#define ALL_WHITE_DIFF (DIFF_IWHITE | DIFF_IWHITEALL | DIFF_IWHITEEOL)
Bram Moolenaar274cea32018-09-12 18:00:12 +020039static int diff_flags = DIFF_INTERNAL | DIFF_FILLER;
Bram Moolenaar071d4272004-06-13 20:20:40 +000040
Bram Moolenaare828b762018-09-10 17:51:58 +020041static long diff_algorithm = 0;
42
Bram Moolenaar071d4272004-06-13 20:20:40 +000043#define LBUFLEN 50 /* length of line in diff file */
44
45static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it
46 doesn't work, MAYBE when not checked yet */
Bram Moolenaar48e330a2016-02-23 14:53:34 +010047#if defined(MSWIN)
Bram Moolenaar071d4272004-06-13 20:20:40 +000048static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE
49 when it doesn't work, MAYBE when not
50 checked yet */
51#endif
52
Bram Moolenaare828b762018-09-10 17:51:58 +020053// used for diff input
54typedef struct {
55 char_u *din_fname; // used for external diff
56 mmfile_t din_mmfile; // used for internal diff
57} diffin_T;
58
59// used for diff result
60typedef struct {
61 char_u *dout_fname; // used for external diff
62 garray_T dout_ga; // used for internal diff
63} diffout_T;
64
65// two diff inputs and one result
66typedef struct {
67 diffin_T dio_orig; // original file input
68 diffin_T dio_new; // new file input
69 diffout_T dio_diff; // diff result
70 int dio_internal; // using internal diff
71} diffio_T;
72
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010073static int diff_buf_idx(buf_T *buf);
74static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp);
75static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after);
76static void diff_check_unchanged(tabpage_T *tp, diff_T *dp);
77static int diff_check_sanity(tabpage_T *tp, diff_T *dp);
78static void diff_redraw(int dofold);
Bram Moolenaare828b762018-09-10 17:51:58 +020079static int check_external_diff(diffio_T *diffio);
80static int diff_file(diffio_T *diffio);
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010081static int diff_equal_entry(diff_T *dp, int idx1, int idx2);
82static int diff_cmp(char_u *s1, char_u *s2);
Bram Moolenaar071d4272004-06-13 20:20:40 +000083#ifdef FEAT_FOLDING
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010084static void diff_fold_update(diff_T *dp, int skip_idx);
Bram Moolenaar071d4272004-06-13 20:20:40 +000085#endif
Bram Moolenaare828b762018-09-10 17:51:58 +020086static void diff_read(int idx_orig, int idx_new, diffout_T *fname);
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010087static void diff_copy_entry(diff_T *dprev, diff_T *dp, int idx_orig, int idx_new);
88static diff_T *diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp);
Bram Moolenaare828b762018-09-10 17:51:58 +020089static int parse_diff_ed(char_u *line, linenr_T *lnum_orig, long *count_orig, linenr_T *lnum_new, long *count_new);
90static int parse_diff_unified(char_u *line, linenr_T *lnum_orig, long *count_orig, linenr_T *lnum_new, long *count_new);
91static int xdiff_out(void *priv, mmbuffer_t *mb, int nbuf);
Bram Moolenaar071d4272004-06-13 20:20:40 +000092
93#ifndef USE_CR
94# define tag_fgets vim_fgets
95#endif
96
97/*
Bram Moolenaar071d4272004-06-13 20:20:40 +000098 * Called when deleting or unloading a buffer: No longer make a diff with it.
Bram Moolenaar071d4272004-06-13 20:20:40 +000099 */
100 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100101diff_buf_delete(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000102{
103 int i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000104 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000105
Bram Moolenaar29323592016-07-24 22:04:11 +0200106 FOR_ALL_TABPAGES(tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000107 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000108 i = diff_buf_idx_tp(buf, tp);
109 if (i != DB_COUNT)
110 {
111 tp->tp_diffbuf[i] = NULL;
112 tp->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000113 if (tp == curtab)
114 diff_redraw(TRUE);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000115 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000116 }
117}
118
119/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000120 * Check if the current buffer should be added to or removed from the list of
121 * diff buffers.
122 */
123 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100124diff_buf_adjust(win_T *win)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000125{
126 win_T *wp;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000127 int i;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000128
129 if (!win->w_p_diff)
130 {
131 /* When there is no window showing a diff for this buffer, remove
132 * it from the diffs. */
Bram Moolenaar29323592016-07-24 22:04:11 +0200133 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000134 if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
135 break;
136 if (wp == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000137 {
138 i = diff_buf_idx(win->w_buffer);
139 if (i != DB_COUNT)
140 {
141 curtab->tp_diffbuf[i] = NULL;
142 curtab->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000143 diff_redraw(TRUE);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000144 }
145 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000146 }
147 else
148 diff_buf_add(win->w_buffer);
149}
150
151/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000152 * Add a buffer to make diffs for.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000153 * Call this when a new buffer is being edited in the current window where
154 * 'diff' is set.
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +0000155 * Marks the current buffer as being part of the diff and requiring updating.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000156 * This must be done before any autocmd, because a command may use info
157 * about the screen contents.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000158 */
159 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100160diff_buf_add(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000161{
162 int i;
163
164 if (diff_buf_idx(buf) != DB_COUNT)
165 return; /* It's already there. */
166
167 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000168 if (curtab->tp_diffbuf[i] == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000169 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000170 curtab->tp_diffbuf[i] = buf;
171 curtab->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000172 diff_redraw(TRUE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000173 return;
174 }
175
Bram Moolenaar89eaa412016-07-31 14:17:27 +0200176 EMSGN(_("E96: Cannot diff more than %ld buffers"), DB_COUNT);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000177}
178
179/*
Bram Moolenaar25ea0542017-02-03 23:16:28 +0100180 * Remove all buffers to make diffs for.
181 */
182 static void
183diff_buf_clear(void)
184{
185 int i;
186
187 for (i = 0; i < DB_COUNT; ++i)
188 if (curtab->tp_diffbuf[i] != NULL)
189 {
190 curtab->tp_diffbuf[i] = NULL;
191 curtab->tp_diff_invalid = TRUE;
192 diff_redraw(TRUE);
193 }
194}
195
196/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000197 * Find buffer "buf" in the list of diff buffers for the current tab page.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000198 * Return its index or DB_COUNT if not found.
199 */
200 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100201diff_buf_idx(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000202{
203 int idx;
204
205 for (idx = 0; idx < DB_COUNT; ++idx)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000206 if (curtab->tp_diffbuf[idx] == buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000207 break;
208 return idx;
209}
210
211/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000212 * Find buffer "buf" in the list of diff buffers for tab page "tp".
213 * Return its index or DB_COUNT if not found.
214 */
215 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100216diff_buf_idx_tp(buf_T *buf, tabpage_T *tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000217{
218 int idx;
219
220 for (idx = 0; idx < DB_COUNT; ++idx)
221 if (tp->tp_diffbuf[idx] == buf)
222 break;
223 return idx;
224}
225
226/*
227 * Mark the diff info involving buffer "buf" as invalid, it will be updated
228 * when info is requested.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000229 */
230 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100231diff_invalidate(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000232{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000233 tabpage_T *tp;
234 int i;
235
Bram Moolenaar29323592016-07-24 22:04:11 +0200236 FOR_ALL_TABPAGES(tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000237 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000238 i = diff_buf_idx_tp(buf, tp);
239 if (i != DB_COUNT)
240 {
241 tp->tp_diff_invalid = TRUE;
242 if (tp == curtab)
243 diff_redraw(TRUE);
244 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000245 }
246}
247
248/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000249 * Called by mark_adjust(): update line numbers in "curbuf".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000250 */
251 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100252diff_mark_adjust(
253 linenr_T line1,
254 linenr_T line2,
255 long amount,
256 long amount_after)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000257{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000258 int idx;
259 tabpage_T *tp;
260
261 /* Handle all tab pages that use the current buffer in a diff. */
Bram Moolenaar29323592016-07-24 22:04:11 +0200262 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000263 {
264 idx = diff_buf_idx_tp(curbuf, tp);
265 if (idx != DB_COUNT)
266 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
267 }
268}
269
270/*
271 * Update line numbers in tab page "tp" for "curbuf" with index "idx".
272 * This attempts to update the changes as much as possible:
273 * When inserting/deleting lines outside of existing change blocks, create a
274 * new change block and update the line numbers in following blocks.
275 * When inserting/deleting lines in existing change blocks, update them.
276 */
277 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100278diff_mark_adjust_tp(
279 tabpage_T *tp,
280 int idx,
281 linenr_T line1,
282 linenr_T line2,
283 long amount,
284 long amount_after)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000285{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000286 diff_T *dp;
287 diff_T *dprev;
288 diff_T *dnext;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000289 int i;
290 int inserted, deleted;
291 int n, off;
292 linenr_T last;
293 linenr_T lnum_deleted = line1; /* lnum of remaining deletion */
294 int check_unchanged;
295
Bram Moolenaare3521d92018-09-16 14:10:31 +0200296 if (diff_internal())
297 {
Bram Moolenaar198fa062018-09-18 21:20:26 +0200298 // Will update diffs before redrawing. Set _invalid to update the
Bram Moolenaare3521d92018-09-16 14:10:31 +0200299 // diffs themselves, set _update to also update folds properly just
300 // before redrawing.
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +0200301 // Do update marks here, it is needed for :%diffput.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200302 tp->tp_diff_invalid = TRUE;
303 tp->tp_diff_update = TRUE;
Bram Moolenaare3521d92018-09-16 14:10:31 +0200304 }
305
Bram Moolenaar071d4272004-06-13 20:20:40 +0000306 if (line2 == MAXLNUM)
307 {
308 /* mark_adjust(99, MAXLNUM, 9, 0): insert lines */
309 inserted = amount;
310 deleted = 0;
311 }
312 else if (amount_after > 0)
313 {
314 /* mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines*/
315 inserted = amount_after;
316 deleted = 0;
317 }
318 else
319 {
320 /* mark_adjust(98, 99, MAXLNUM, -2): delete lines */
321 inserted = 0;
322 deleted = -amount_after;
323 }
324
325 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000326 dp = tp->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000327 for (;;)
328 {
329 /* If the change is after the previous diff block and before the next
330 * diff block, thus not touching an existing change, create a new diff
331 * block. Don't do this when ex_diffgetput() is busy. */
332 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2
333 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
334 && (dprev == NULL
335 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
336 && !diff_busy)
337 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000338 dnext = diff_alloc_new(tp, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000339 if (dnext == NULL)
340 return;
341
342 dnext->df_lnum[idx] = line1;
343 dnext->df_count[idx] = inserted;
344 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000345 if (tp->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000346 {
347 if (dprev == NULL)
348 dnext->df_lnum[i] = line1;
349 else
350 dnext->df_lnum[i] = line1
351 + (dprev->df_lnum[i] + dprev->df_count[i])
352 - (dprev->df_lnum[idx] + dprev->df_count[idx]);
353 dnext->df_count[i] = deleted;
354 }
355 }
356
357 /* if at end of the list, quit */
358 if (dp == NULL)
359 break;
360
361 /*
362 * Check for these situations:
363 * 1 2 3
364 * 1 2 3
365 * line1 2 3 4 5
366 * 2 3 4 5
367 * 2 3 4 5
368 * line2 2 3 4 5
369 * 3 5 6
370 * 3 5 6
371 */
372 /* compute last line of this change */
373 last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
374
375 /* 1. change completely above line1: nothing to do */
376 if (last >= line1 - 1)
377 {
378 /* 6. change below line2: only adjust for amount_after; also when
379 * "deleted" became zero when deleted all lines between two diffs */
380 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
381 {
382 if (amount_after == 0)
383 break; /* nothing left to change */
384 dp->df_lnum[idx] += amount_after;
385 }
386 else
387 {
388 check_unchanged = FALSE;
389
390 /* 2. 3. 4. 5.: inserted/deleted lines touching this diff. */
391 if (deleted > 0)
392 {
393 if (dp->df_lnum[idx] >= line1)
394 {
395 off = dp->df_lnum[idx] - lnum_deleted;
396 if (last <= line2)
397 {
398 /* 4. delete all lines of diff */
399 if (dp->df_next != NULL
400 && dp->df_next->df_lnum[idx] - 1 <= line2)
401 {
402 /* delete continues in next diff, only do
403 * lines until that one */
404 n = dp->df_next->df_lnum[idx] - lnum_deleted;
405 deleted -= n;
406 n -= dp->df_count[idx];
407 lnum_deleted = dp->df_next->df_lnum[idx];
408 }
409 else
410 n = deleted - dp->df_count[idx];
411 dp->df_count[idx] = 0;
412 }
413 else
414 {
415 /* 5. delete lines at or just before top of diff */
416 n = off;
417 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
418 check_unchanged = TRUE;
419 }
420 dp->df_lnum[idx] = line1;
421 }
422 else
423 {
424 off = 0;
425 if (last < line2)
426 {
427 /* 2. delete at end of of diff */
428 dp->df_count[idx] -= last - lnum_deleted + 1;
429 if (dp->df_next != NULL
430 && dp->df_next->df_lnum[idx] - 1 <= line2)
431 {
432 /* delete continues in next diff, only do
433 * lines until that one */
434 n = dp->df_next->df_lnum[idx] - 1 - last;
435 deleted -= dp->df_next->df_lnum[idx]
436 - lnum_deleted;
437 lnum_deleted = dp->df_next->df_lnum[idx];
438 }
439 else
440 n = line2 - last;
441 check_unchanged = TRUE;
442 }
443 else
444 {
445 /* 3. delete lines inside the diff */
446 n = 0;
447 dp->df_count[idx] -= deleted;
448 }
449 }
450
451 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000452 if (tp->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000453 {
454 dp->df_lnum[i] -= off;
455 dp->df_count[i] += n;
456 }
457 }
458 else
459 {
460 if (dp->df_lnum[idx] <= line1)
461 {
462 /* inserted lines somewhere in this diff */
463 dp->df_count[idx] += inserted;
464 check_unchanged = TRUE;
465 }
466 else
467 /* inserted lines somewhere above this diff */
468 dp->df_lnum[idx] += inserted;
469 }
470
471 if (check_unchanged)
472 /* Check if inserted lines are equal, may reduce the
473 * size of the diff. TODO: also check for equal lines
474 * in the middle and perhaps split the block. */
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000475 diff_check_unchanged(tp, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000476 }
477 }
478
479 /* check if this block touches the previous one, may merge them. */
480 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
481 == dp->df_lnum[idx])
482 {
483 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000484 if (tp->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000485 dprev->df_count[i] += dp->df_count[i];
486 dprev->df_next = dp->df_next;
487 vim_free(dp);
488 dp = dprev->df_next;
489 }
490 else
491 {
492 /* Advance to next entry. */
493 dprev = dp;
494 dp = dp->df_next;
495 }
496 }
497
498 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000499 dp = tp->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000500 while (dp != NULL)
501 {
502 /* All counts are zero, remove this entry. */
503 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000504 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000505 break;
506 if (i == DB_COUNT)
507 {
508 dnext = dp->df_next;
509 vim_free(dp);
510 dp = dnext;
511 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000512 tp->tp_first_diff = dnext;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000513 else
514 dprev->df_next = dnext;
515 }
516 else
517 {
518 /* Advance to next entry. */
519 dprev = dp;
520 dp = dp->df_next;
521 }
522
523 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000524
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000525 if (tp == curtab)
526 {
527 diff_redraw(TRUE);
528
529 /* Need to recompute the scroll binding, may remove or add filler
530 * lines (e.g., when adding lines above w_topline). But it's slow when
531 * making many changes, postpone until redrawing. */
532 diff_need_scrollbind = TRUE;
533 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000534}
535
536/*
537 * Allocate a new diff block and link it between "dprev" and "dp".
538 */
539 static diff_T *
Bram Moolenaar7454a062016-01-30 15:14:10 +0100540diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000541{
542 diff_T *dnew;
543
544 dnew = (diff_T *)alloc((unsigned)sizeof(diff_T));
545 if (dnew != NULL)
546 {
547 dnew->df_next = dp;
548 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000549 tp->tp_first_diff = dnew;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000550 else
551 dprev->df_next = dnew;
552 }
553 return dnew;
554}
555
556/*
557 * Check if the diff block "dp" can be made smaller for lines at the start and
558 * end that are equal. Called after inserting lines.
559 * This may result in a change where all buffers have zero lines, the caller
560 * must take care of removing it.
561 */
562 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100563diff_check_unchanged(tabpage_T *tp, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000564{
565 int i_org;
566 int i_new;
567 int off_org, off_new;
568 char_u *line_org;
569 int dir = FORWARD;
570
571 /* Find the first buffers, use it as the original, compare the other
572 * buffer lines against this one. */
573 for (i_org = 0; i_org < DB_COUNT; ++i_org)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000574 if (tp->tp_diffbuf[i_org] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000575 break;
576 if (i_org == DB_COUNT) /* safety check */
577 return;
578
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000579 if (diff_check_sanity(tp, dp) == FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000580 return;
581
582 /* First check lines at the top, then at the bottom. */
583 off_org = 0;
584 off_new = 0;
585 for (;;)
586 {
587 /* Repeat until a line is found which is different or the number of
588 * lines has become zero. */
589 while (dp->df_count[i_org] > 0)
590 {
591 /* Copy the line, the next ml_get() will invalidate it. */
592 if (dir == BACKWARD)
593 off_org = dp->df_count[i_org] - 1;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000594 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org],
Bram Moolenaar071d4272004-06-13 20:20:40 +0000595 dp->df_lnum[i_org] + off_org, FALSE));
596 if (line_org == NULL)
597 return;
598 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new)
599 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000600 if (tp->tp_diffbuf[i_new] == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000601 continue;
602 if (dir == BACKWARD)
603 off_new = dp->df_count[i_new] - 1;
604 /* if other buffer doesn't have this line, it was inserted */
605 if (off_new < 0 || off_new >= dp->df_count[i_new])
606 break;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000607 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new],
Bram Moolenaar071d4272004-06-13 20:20:40 +0000608 dp->df_lnum[i_new] + off_new, FALSE)) != 0)
609 break;
610 }
611 vim_free(line_org);
612
613 /* Stop when a line isn't equal in all diff buffers. */
614 if (i_new != DB_COUNT)
615 break;
616
617 /* Line matched in all buffers, remove it from the diff. */
618 for (i_new = i_org; i_new < DB_COUNT; ++i_new)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000619 if (tp->tp_diffbuf[i_new] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000620 {
621 if (dir == FORWARD)
622 ++dp->df_lnum[i_new];
623 --dp->df_count[i_new];
624 }
625 }
626 if (dir == BACKWARD)
627 break;
628 dir = BACKWARD;
629 }
630}
631
632/*
633 * Check if a diff block doesn't contain invalid line numbers.
634 * This can happen when the diff program returns invalid results.
635 */
636 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100637diff_check_sanity(tabpage_T *tp, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000638{
639 int i;
640
641 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000642 if (tp->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000643 if (dp->df_lnum[i] + dp->df_count[i] - 1
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000644 > tp->tp_diffbuf[i]->b_ml.ml_line_count)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000645 return FAIL;
646 return OK;
647}
648
649/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000650 * Mark all diff buffers in the current tab page for redraw.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000651 */
652 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100653diff_redraw(
Bram Moolenaare3521d92018-09-16 14:10:31 +0200654 int dofold) // also recompute the folds
Bram Moolenaar071d4272004-06-13 20:20:40 +0000655{
656 win_T *wp;
657 int n;
658
Bram Moolenaar29323592016-07-24 22:04:11 +0200659 FOR_ALL_WINDOWS(wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000660 if (wp->w_p_diff)
661 {
Bram Moolenaar60f83772006-03-12 21:52:47 +0000662 redraw_win_later(wp, SOME_VALID);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000663#ifdef FEAT_FOLDING
664 if (dofold && foldmethodIsDiff(wp))
665 foldUpdateAll(wp);
666#endif
667 /* A change may have made filler lines invalid, need to take care
668 * of that for other windows. */
Bram Moolenaara80888d2012-10-21 22:18:21 +0200669 n = diff_check(wp, wp->w_topline);
670 if ((wp != curwin && wp->w_topfill > 0) || n > 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000671 {
Bram Moolenaar071d4272004-06-13 20:20:40 +0000672 if (wp->w_topfill > n)
673 wp->w_topfill = (n < 0 ? 0 : n);
Bram Moolenaara80888d2012-10-21 22:18:21 +0200674 else if (n > 0 && n > wp->w_topfill)
675 wp->w_topfill = n;
Bram Moolenaar846a2ff2014-05-28 11:35:37 +0200676 check_topfill(wp, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000677 }
678 }
679}
680
Bram Moolenaare828b762018-09-10 17:51:58 +0200681 static void
682clear_diffin(diffin_T *din)
683{
684 if (din->din_fname == NULL)
685 {
686 vim_free(din->din_mmfile.ptr);
687 din->din_mmfile.ptr = NULL;
688 }
689 else
690 mch_remove(din->din_fname);
691}
692
693 static void
694clear_diffout(diffout_T *dout)
695{
696 if (dout->dout_fname == NULL)
697 ga_clear_strings(&dout->dout_ga);
698 else
699 mch_remove(dout->dout_fname);
700}
701
Bram Moolenaar071d4272004-06-13 20:20:40 +0000702/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200703 * Write buffer "buf" to a memory buffer.
704 * Return FAIL for failure.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000705 */
706 static int
Bram Moolenaare828b762018-09-10 17:51:58 +0200707diff_write_buffer(buf_T *buf, diffin_T *din)
708{
709 linenr_T lnum;
710 char_u *s;
711 long len = 0;
712 char_u *ptr;
713
714 // xdiff requires one big block of memory with all the text.
715 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
Bram Moolenaar6e272ac2018-09-16 14:51:36 +0200716 len += (long)STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
Bram Moolenaare828b762018-09-10 17:51:58 +0200717 ptr = lalloc(len, TRUE);
718 if (ptr == NULL)
719 {
720 // Allocating memory failed. This can happen, because we try to read
721 // the whole buffer text into memory. Set the failed flag, the diff
722 // will be retried with external diff. The flag is never reset.
723 buf->b_diff_failed = TRUE;
724 if (p_verbose > 0)
725 {
726 verbose_enter();
727 smsg((char_u *)
728 _("Not enough memory to use internal diff for buffer \"%s\""),
729 buf->b_fname);
730 verbose_leave();
731 }
732 return FAIL;
733 }
734 din->din_mmfile.ptr = (char *)ptr;
735 din->din_mmfile.size = len;
736
737 len = 0;
738 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
739 {
740 for (s = ml_get_buf(buf, lnum, FALSE); *s != NUL; )
741 {
742 if (diff_flags & DIFF_ICASE)
743 {
744 int c;
745
746 // xdiff doesn't support ignoring case, fold-case the text.
747#ifdef FEAT_MBYTE
748 int orig_len;
749 char_u cbuf[MB_MAXBYTES + 1];
750
751 c = PTR2CHAR(s);
752 c = enc_utf8 ? utf_fold(c) : MB_TOLOWER(c);
753 orig_len = MB_PTR2LEN(s);
754 if (mb_char2bytes(c, cbuf) != orig_len)
755 // TODO: handle byte length difference
756 mch_memmove(ptr + len, s, orig_len);
757 else
758 mch_memmove(ptr + len, cbuf, orig_len);
759
760 s += orig_len;
761 len += orig_len;
762#else
763 c = *s++;
764 ptr[len++] = TOLOWER_LOC(c);
765#endif
766 }
767 else
768 ptr[len++] = *s++;
769 }
770 ptr[len++] = NL;
771 }
772 return OK;
773}
774
775/*
776 * Write buffer "buf" to file or memory buffer.
777 * Return FAIL for failure.
778 */
779 static int
780diff_write(buf_T *buf, diffin_T *din)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000781{
782 int r;
783 char_u *save_ff;
784
Bram Moolenaare828b762018-09-10 17:51:58 +0200785 if (din->din_fname == NULL)
786 return diff_write_buffer(buf, din);
787
788 // Always use 'fileformat' set to "unix".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000789 save_ff = buf->b_p_ff;
790 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
Bram Moolenaare828b762018-09-10 17:51:58 +0200791 r = buf_write(buf, din->din_fname, NULL,
792 (linenr_T)1, buf->b_ml.ml_line_count,
793 NULL, FALSE, FALSE, FALSE, TRUE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000794 free_string_option(buf->b_p_ff);
795 buf->b_p_ff = save_ff;
796 return r;
797}
798
799/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200800 * Update the diffs for all buffers involved.
801 */
802 static void
803diff_try_update(
804 diffio_T *dio,
805 int idx_orig,
806 exarg_T *eap) // "eap" can be NULL
807{
808 buf_T *buf;
809 int idx_new;
810
811 if (dio->dio_internal)
812 {
813 ga_init2(&dio->dio_diff.dout_ga, sizeof(char *), 1000);
814 }
815 else
816 {
817 // We need three temp file names.
818 dio->dio_orig.din_fname = vim_tempname('o', TRUE);
819 dio->dio_new.din_fname = vim_tempname('n', TRUE);
820 dio->dio_diff.dout_fname = vim_tempname('d', TRUE);
821 if (dio->dio_orig.din_fname == NULL
822 || dio->dio_new.din_fname == NULL
823 || dio->dio_diff.dout_fname == NULL)
824 goto theend;
825 }
826
827 // Check external diff is actually working.
828 if (!dio->dio_internal && check_external_diff(dio) == FAIL)
829 goto theend;
830
831 // :diffupdate!
832 if (eap != NULL && eap->forceit)
833 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
834 {
835 buf = curtab->tp_diffbuf[idx_new];
836 if (buf_valid(buf))
837 buf_check_timestamp(buf, FALSE);
838 }
839
840 // Write the first buffer to a tempfile or mmfile_t.
841 buf = curtab->tp_diffbuf[idx_orig];
842 if (diff_write(buf, &dio->dio_orig) == FAIL)
843 goto theend;
844
845 // Make a difference between the first buffer and every other.
846 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
847 {
848 buf = curtab->tp_diffbuf[idx_new];
849 if (buf == NULL || buf->b_ml.ml_mfp == NULL)
850 continue; // skip buffer that isn't loaded
851
852 // Write the other buffer and diff with the first one.
853 if (diff_write(buf, &dio->dio_new) == FAIL)
854 continue;
855 if (diff_file(dio) == FAIL)
856 continue;
857
858 // Read the diff output and add each entry to the diff list.
859 diff_read(idx_orig, idx_new, &dio->dio_diff);
860
861 clear_diffin(&dio->dio_new);
862 clear_diffout(&dio->dio_diff);
863 }
864 clear_diffin(&dio->dio_orig);
865
866theend:
867 vim_free(dio->dio_orig.din_fname);
868 vim_free(dio->dio_new.din_fname);
869 vim_free(dio->dio_diff.dout_fname);
870}
871
872/*
873 * Return TRUE if the options are set to use the internal diff library.
874 * Note that if the internal diff failed for one of the buffers, the external
875 * diff will be used anyway.
876 */
Bram Moolenaare3521d92018-09-16 14:10:31 +0200877 int
Bram Moolenaare828b762018-09-10 17:51:58 +0200878diff_internal(void)
879{
880 return (diff_flags & DIFF_INTERNAL) != 0 && *p_dex == NUL;
881}
882
883/*
884 * Return TRUE if the internal diff failed for one of the diff buffers.
885 */
886 static int
887diff_internal_failed(void)
888{
889 int idx;
890
891 // Only need to do something when there is another buffer.
892 for (idx = 0; idx < DB_COUNT; ++idx)
893 if (curtab->tp_diffbuf[idx] != NULL
894 && curtab->tp_diffbuf[idx]->b_diff_failed)
895 return TRUE;
896 return FALSE;
897}
898
899/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000900 * Completely update the diffs for the buffers involved.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200901 * When using the external "diff" command the buffers are written to a file,
902 * also for unmodified buffers (the file could have been produced by
903 * autocommands, e.g. the netrw plugin).
Bram Moolenaar071d4272004-06-13 20:20:40 +0000904 */
Bram Moolenaar071d4272004-06-13 20:20:40 +0000905 void
Bram Moolenaare828b762018-09-10 17:51:58 +0200906ex_diffupdate(exarg_T *eap) // "eap" can be NULL
Bram Moolenaar071d4272004-06-13 20:20:40 +0000907{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000908 int idx_orig;
909 int idx_new;
Bram Moolenaare828b762018-09-10 17:51:58 +0200910 diffio_T diffio;
Bram Moolenaar198fa062018-09-18 21:20:26 +0200911 int had_diffs = curtab->tp_first_diff != NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000912
Bram Moolenaard2b58c02018-09-16 18:10:48 +0200913 if (diff_busy)
914 {
915 diff_need_update = TRUE;
916 return;
917 }
918
Bram Moolenaare828b762018-09-10 17:51:58 +0200919 // Delete all diffblocks.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000920 diff_clear(curtab);
921 curtab->tp_diff_invalid = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000922
Bram Moolenaare828b762018-09-10 17:51:58 +0200923 // Use the first buffer as the original text.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000924 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000925 if (curtab->tp_diffbuf[idx_orig] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000926 break;
927 if (idx_orig == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200928 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000929
Bram Moolenaare828b762018-09-10 17:51:58 +0200930 // Only need to do something when there is another buffer.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000931 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000932 if (curtab->tp_diffbuf[idx_new] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000933 break;
934 if (idx_new == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200935 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000936
Bram Moolenaare828b762018-09-10 17:51:58 +0200937 // Only use the internal method if it did not fail for one of the buffers.
938 vim_memset(&diffio, 0, sizeof(diffio));
939 diffio.dio_internal = diff_internal() && !diff_internal_failed();
Bram Moolenaar071d4272004-06-13 20:20:40 +0000940
Bram Moolenaare828b762018-09-10 17:51:58 +0200941 diff_try_update(&diffio, idx_orig, eap);
942 if (diffio.dio_internal && diff_internal_failed())
943 {
944 // Internal diff failed, use external diff instead.
945 vim_memset(&diffio, 0, sizeof(diffio));
946 diff_try_update(&diffio, idx_orig, eap);
947 }
948
949 // force updating cursor position on screen
950 curwin->w_valid_cursor.lnum = 0;
951
Bram Moolenaar198fa062018-09-18 21:20:26 +0200952theend:
953 // A redraw is needed if there were diffs and they were cleared, or there
954 // are diffs now, which means they got updated.
955 if (had_diffs || curtab->tp_first_diff != NULL)
956 {
957 diff_redraw(TRUE);
958 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
959 }
Bram Moolenaare828b762018-09-10 17:51:58 +0200960}
961
962/*
963 * Do a quick test if "diff" really works. Otherwise it looks like there
964 * are no differences. Can't use the return value, it's non-zero when
965 * there are differences.
966 */
967 static int
968check_external_diff(diffio_T *diffio)
969{
970 FILE *fd;
971 int ok;
972 int io_error = FALSE;
973
974 // May try twice, first with "-a" and then without.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000975 for (;;)
976 {
977 ok = FALSE;
Bram Moolenaare828b762018-09-10 17:51:58 +0200978 fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000979 if (fd == NULL)
980 io_error = TRUE;
981 else
Bram Moolenaar071d4272004-06-13 20:20:40 +0000982 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000983 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
984 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000985 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +0200986 fd = mch_fopen((char *)diffio->dio_new.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000987 if (fd == NULL)
988 io_error = TRUE;
989 else
Bram Moolenaar071d4272004-06-13 20:20:40 +0000990 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000991 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
992 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000993 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +0200994 fd = NULL;
995 if (diff_file(diffio) == OK)
996 fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000997 if (fd == NULL)
998 io_error = TRUE;
999 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001000 {
1001 char_u linebuf[LBUFLEN];
1002
1003 for (;;)
1004 {
1005 /* There must be a line that contains "1c1". */
1006 if (tag_fgets(linebuf, LBUFLEN, fd))
1007 break;
1008 if (STRNCMP(linebuf, "1c1", 3) == 0)
1009 ok = TRUE;
1010 }
1011 fclose(fd);
1012 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001013 mch_remove(diffio->dio_diff.dout_fname);
1014 mch_remove(diffio->dio_new.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001015 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001016 mch_remove(diffio->dio_orig.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001017 }
1018
1019#ifdef FEAT_EVAL
1020 /* When using 'diffexpr' break here. */
1021 if (*p_dex != NUL)
1022 break;
1023#endif
1024
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001025#if defined(MSWIN)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001026 /* If the "-a" argument works, also check if "--binary" works. */
1027 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
1028 {
1029 diff_a_works = TRUE;
1030 diff_bin_works = TRUE;
1031 continue;
1032 }
1033 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
1034 {
1035 /* Tried --binary, but it failed. "-a" works though. */
1036 diff_bin_works = FALSE;
1037 ok = TRUE;
1038 }
1039#endif
1040
1041 /* If we checked if "-a" works already, break here. */
1042 if (diff_a_works != MAYBE)
1043 break;
1044 diff_a_works = ok;
1045
1046 /* If "-a" works break here, otherwise retry without "-a". */
1047 if (ok)
1048 break;
1049 }
1050 if (!ok)
1051 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001052 if (io_error)
1053 EMSG(_("E810: Cannot read or write temp files"));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001054 EMSG(_("E97: Cannot create diffs"));
1055 diff_a_works = MAYBE;
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001056#if defined(MSWIN)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001057 diff_bin_works = MAYBE;
1058#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001059 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001060 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001061 return OK;
1062}
Bram Moolenaar071d4272004-06-13 20:20:40 +00001063
Bram Moolenaare828b762018-09-10 17:51:58 +02001064/*
1065 * Invoke the xdiff function.
1066 */
1067 static int
1068diff_file_internal(diffio_T *diffio)
1069{
1070 xpparam_t param;
1071 xdemitconf_t emit_cfg;
1072 xdemitcb_t emit_cb;
Bram Moolenaarbd1d5602012-05-18 18:47:17 +02001073
Bram Moolenaare828b762018-09-10 17:51:58 +02001074 vim_memset(&param, 0, sizeof(param));
1075 vim_memset(&emit_cfg, 0, sizeof(emit_cfg));
1076 vim_memset(&emit_cb, 0, sizeof(emit_cb));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001077
Bram Moolenaare828b762018-09-10 17:51:58 +02001078 param.flags = diff_algorithm;
1079
1080 if (diff_flags & DIFF_IWHITE)
1081 param.flags |= XDF_IGNORE_WHITESPACE_CHANGE;
Bram Moolenaar785fc652018-09-15 19:17:38 +02001082 if (diff_flags & DIFF_IWHITEALL)
1083 param.flags |= XDF_IGNORE_WHITESPACE;
1084 if (diff_flags & DIFF_IWHITEEOL)
1085 param.flags |= XDF_IGNORE_WHITESPACE_AT_EOL;
1086 if (diff_flags & DIFF_IBLANK)
1087 param.flags |= XDF_IGNORE_BLANK_LINES;
Bram Moolenaare828b762018-09-10 17:51:58 +02001088
1089 emit_cfg.ctxlen = 0; // don't need any diff_context here
1090 emit_cb.priv = &diffio->dio_diff;
1091 emit_cb.outf = xdiff_out;
1092 if (xdl_diff(&diffio->dio_orig.din_mmfile,
1093 &diffio->dio_new.din_mmfile,
1094 &param, &emit_cfg, &emit_cb) < 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001095 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001096 EMSG(_("E960: Problem creating the internal diff"));
1097 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001098 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001099 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001100}
1101
1102/*
1103 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
Bram Moolenaare828b762018-09-10 17:51:58 +02001104 * return OK or FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001105 */
Bram Moolenaare828b762018-09-10 17:51:58 +02001106 static int
1107diff_file(diffio_T *dio)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001108{
1109 char_u *cmd;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001110 size_t len;
Bram Moolenaare828b762018-09-10 17:51:58 +02001111 char_u *tmp_orig = dio->dio_orig.din_fname;
1112 char_u *tmp_new = dio->dio_new.din_fname;
1113 char_u *tmp_diff = dio->dio_diff.dout_fname;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001114
1115#ifdef FEAT_EVAL
1116 if (*p_dex != NUL)
Bram Moolenaare828b762018-09-10 17:51:58 +02001117 {
1118 // Use 'diffexpr' to generate the diff file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001119 eval_diff(tmp_orig, tmp_new, tmp_diff);
Bram Moolenaare828b762018-09-10 17:51:58 +02001120 return OK;
1121 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001122 else
1123#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001124 // Use xdiff for generating the diff.
1125 if (dio->dio_internal)
1126 {
1127 return diff_file_internal(dio);
1128 }
1129 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001130 {
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001131 len = STRLEN(tmp_orig) + STRLEN(tmp_new)
1132 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
1133 cmd = alloc((unsigned)len);
Bram Moolenaare828b762018-09-10 17:51:58 +02001134 if (cmd == NULL)
1135 return FAIL;
Bram Moolenaar95fb60a2005-03-08 22:29:20 +00001136
Bram Moolenaare828b762018-09-10 17:51:58 +02001137 // We don't want $DIFF_OPTIONS to get in the way.
1138 if (getenv("DIFF_OPTIONS"))
1139 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
1140
1141 // Build the diff command and execute it. Always use -a, binary
1142 // differences are of no use. Ignore errors, diff returns
1143 // non-zero when differences have been found.
Bram Moolenaar785fc652018-09-15 19:17:38 +02001144 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s%s%s%s %s",
Bram Moolenaare828b762018-09-10 17:51:58 +02001145 diff_a_works == FALSE ? "" : "-a ",
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001146#if defined(MSWIN)
Bram Moolenaare828b762018-09-10 17:51:58 +02001147 diff_bin_works == TRUE ? "--binary " : "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001148#else
Bram Moolenaare828b762018-09-10 17:51:58 +02001149 "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001150#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001151 (diff_flags & DIFF_IWHITE) ? "-b " : "",
Bram Moolenaar785fc652018-09-15 19:17:38 +02001152 (diff_flags & DIFF_IWHITEALL) ? "-w " : "",
1153 (diff_flags & DIFF_IWHITEEOL) ? "-Z " : "",
1154 (diff_flags & DIFF_IBLANK) ? "-B " : "",
Bram Moolenaare828b762018-09-10 17:51:58 +02001155 (diff_flags & DIFF_ICASE) ? "-i " : "",
1156 tmp_orig, tmp_new);
1157 append_redir(cmd, (int)len, p_srr, tmp_diff);
1158 block_autocmds(); // avoid ShellCmdPost stuff
1159 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
1160 unblock_autocmds();
1161 vim_free(cmd);
1162 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001163 }
1164}
1165
1166/*
1167 * Create a new version of a file from the current buffer and a diff file.
1168 * The buffer is written to a file, also for unmodified buffers (the file
1169 * could have been produced by autocommands, e.g. the netrw plugin).
1170 */
1171 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001172ex_diffpatch(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001173{
1174 char_u *tmp_orig; /* name of original temp file */
1175 char_u *tmp_new; /* name of patched temp file */
1176 char_u *buf = NULL;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001177 size_t buflen;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001178 win_T *old_curwin = curwin;
1179 char_u *newname = NULL; /* name of patched file buffer */
1180#ifdef UNIX
1181 char_u dirbuf[MAXPATHL];
1182 char_u *fullname = NULL;
1183#endif
1184#ifdef FEAT_BROWSE
1185 char_u *browseFile = NULL;
1186 int browse_flag = cmdmod.browse;
1187#endif
Bram Moolenaar8767f522016-07-01 17:17:39 +02001188 stat_T st;
Bram Moolenaara95ab322017-03-11 19:21:53 +01001189 char_u *esc_name = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001190
1191#ifdef FEAT_BROWSE
1192 if (cmdmod.browse)
1193 {
Bram Moolenaar7171abe2004-10-11 10:06:20 +00001194 browseFile = do_browse(0, (char_u *)_("Patch file"),
Bram Moolenaarc36651b2018-04-29 12:22:56 +02001195 eap->arg, NULL, NULL,
1196 (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001197 if (browseFile == NULL)
1198 return; /* operation cancelled */
1199 eap->arg = browseFile;
1200 cmdmod.browse = FALSE; /* don't let do_ecmd() browse again */
1201 }
1202#endif
1203
1204 /* We need two temp file names. */
Bram Moolenaare5c421c2015-03-31 13:33:08 +02001205 tmp_orig = vim_tempname('o', FALSE);
1206 tmp_new = vim_tempname('n', FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001207 if (tmp_orig == NULL || tmp_new == NULL)
1208 goto theend;
1209
1210 /* Write the current buffer to "tmp_orig". */
1211 if (buf_write(curbuf, tmp_orig, NULL,
1212 (linenr_T)1, curbuf->b_ml.ml_line_count,
1213 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
1214 goto theend;
1215
1216#ifdef UNIX
1217 /* Get the absolute path of the patchfile, changing directory below. */
1218 fullname = FullName_save(eap->arg, FALSE);
1219#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001220 esc_name = vim_strsave_shellescape(
Bram Moolenaar071d4272004-06-13 20:20:40 +00001221# ifdef UNIX
Bram Moolenaara95ab322017-03-11 19:21:53 +01001222 fullname != NULL ? fullname :
Bram Moolenaar071d4272004-06-13 20:20:40 +00001223# endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001224 eap->arg, TRUE, TRUE);
1225 if (esc_name == NULL)
1226 goto theend;
1227 buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001228 buf = alloc((unsigned)buflen);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001229 if (buf == NULL)
1230 goto theend;
1231
1232#ifdef UNIX
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +00001233 /* Temporarily chdir to /tmp, to avoid patching files in the current
Bram Moolenaar071d4272004-06-13 20:20:40 +00001234 * directory when the patch file contains more than one patch. When we
1235 * have our own temp dir use that instead, it will be cleaned up when we
1236 * exit (any .rej files created). Don't change directory if we can't
1237 * return to the current. */
1238 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
1239 dirbuf[0] = NUL;
1240 else
1241 {
1242# ifdef TEMPDIRNAMES
1243 if (vim_tempdir != NULL)
Bram Moolenaar42335f52018-09-13 15:33:43 +02001244 vim_ignored = mch_chdir((char *)vim_tempdir);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001245 else
1246# endif
Bram Moolenaar42335f52018-09-13 15:33:43 +02001247 vim_ignored = mch_chdir("/tmp");
Bram Moolenaar071d4272004-06-13 20:20:40 +00001248 shorten_fnames(TRUE);
1249 }
1250#endif
1251
1252#ifdef FEAT_EVAL
1253 if (*p_pex != NUL)
1254 /* Use 'patchexpr' to generate the new file. */
1255 eval_patch(tmp_orig,
1256# ifdef UNIX
1257 fullname != NULL ? fullname :
1258# endif
1259 eap->arg, tmp_new);
1260 else
1261#endif
1262 {
1263 /* Build the patch command and execute it. Ignore errors. Switch to
1264 * cooked mode to allow the user to respond to prompts. */
Bram Moolenaara95ab322017-03-11 19:21:53 +01001265 vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s",
1266 tmp_new, tmp_orig, esc_name);
Bram Moolenaar78ab3312007-09-29 12:16:41 +00001267 block_autocmds(); /* Avoid ShellCmdPost stuff */
Bram Moolenaar071d4272004-06-13 20:20:40 +00001268 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
Bram Moolenaar78ab3312007-09-29 12:16:41 +00001269 unblock_autocmds();
Bram Moolenaar071d4272004-06-13 20:20:40 +00001270 }
1271
1272#ifdef UNIX
1273 if (dirbuf[0] != NUL)
1274 {
1275 if (mch_chdir((char *)dirbuf) != 0)
1276 EMSG(_(e_prev_dir));
1277 shorten_fnames(TRUE);
1278 }
1279#endif
1280
1281 /* patch probably has written over the screen */
1282 redraw_later(CLEAR);
1283
1284 /* Delete any .orig or .rej file created. */
1285 STRCPY(buf, tmp_new);
1286 STRCAT(buf, ".orig");
1287 mch_remove(buf);
1288 STRCPY(buf, tmp_new);
1289 STRCAT(buf, ".rej");
1290 mch_remove(buf);
1291
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001292 /* Only continue if the output file was created. */
1293 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
1294 EMSG(_("E816: Cannot read patch output"));
1295 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001296 {
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001297 if (curbuf->b_fname != NULL)
1298 {
1299 newname = vim_strnsave(curbuf->b_fname,
Bram Moolenaar071d4272004-06-13 20:20:40 +00001300 (int)(STRLEN(curbuf->b_fname) + 4));
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001301 if (newname != NULL)
1302 STRCAT(newname, ".new");
1303 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001304
1305#ifdef FEAT_GUI
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001306 need_mouse_correct = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001307#endif
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001308 /* don't use a new tab page, each tab page has its own diffs */
1309 cmdmod.tab = 0;
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001310
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001311 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001312 {
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001313 /* Pretend it was a ":split fname" command */
1314 eap->cmdidx = CMD_split;
1315 eap->arg = tmp_new;
1316 do_exedit(eap, old_curwin);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001317
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001318 /* check that split worked and editing tmp_new */
1319 if (curwin != old_curwin && win_valid(old_curwin))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001320 {
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001321 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
1322 diff_win_options(curwin, TRUE);
1323 diff_win_options(old_curwin, TRUE);
1324
1325 if (newname != NULL)
1326 {
1327 /* do a ":file filename.new" on the patched buffer */
1328 eap->arg = newname;
1329 ex_file(eap);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001330
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001331 /* Do filetype detection with the new name. */
1332 if (au_has_group((char_u *)"filetypedetect"))
1333 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001334 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001335 }
1336 }
1337 }
1338
1339theend:
1340 if (tmp_orig != NULL)
1341 mch_remove(tmp_orig);
1342 vim_free(tmp_orig);
1343 if (tmp_new != NULL)
1344 mch_remove(tmp_new);
1345 vim_free(tmp_new);
1346 vim_free(newname);
1347 vim_free(buf);
1348#ifdef UNIX
1349 vim_free(fullname);
1350#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001351 vim_free(esc_name);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001352#ifdef FEAT_BROWSE
1353 vim_free(browseFile);
1354 cmdmod.browse = browse_flag;
1355#endif
1356}
1357
1358/*
1359 * Split the window and edit another file, setting options to show the diffs.
1360 */
1361 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001362ex_diffsplit(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001363{
1364 win_T *old_curwin = curwin;
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001365 bufref_T old_curbuf;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001366
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001367 set_bufref(&old_curbuf, curbuf);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001368#ifdef FEAT_GUI
1369 need_mouse_correct = TRUE;
1370#endif
Bram Moolenaar46328f92016-08-28 15:39:57 +02001371 /* Need to compute w_fraction when no redraw happened yet. */
1372 validate_cursor();
1373 set_fraction(curwin);
1374
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001375 /* don't use a new tab page, each tab page has its own diffs */
1376 cmdmod.tab = 0;
1377
Bram Moolenaarc4675a12006-03-15 22:50:30 +00001378 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001379 {
1380 /* Pretend it was a ":split fname" command */
1381 eap->cmdidx = CMD_split;
Bram Moolenaar4be06f92005-07-29 22:36:03 +00001382 curwin->w_p_diff = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001383 do_exedit(eap, old_curwin);
1384
1385 if (curwin != old_curwin) /* split must have worked */
1386 {
1387 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
1388 diff_win_options(curwin, TRUE);
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001389 if (win_valid(old_curwin))
1390 {
1391 diff_win_options(old_curwin, TRUE);
1392
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001393 if (bufref_valid(&old_curbuf))
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001394 /* Move the cursor position to that of the old window. */
1395 curwin->w_cursor.lnum = diff_get_corresponding_line(
Bram Moolenaar025e3e02016-10-18 14:50:18 +02001396 old_curbuf.br_buf, old_curwin->w_cursor.lnum);
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001397 }
Bram Moolenaar46328f92016-08-28 15:39:57 +02001398 /* Now that lines are folded scroll to show the cursor at the same
1399 * relative position. */
1400 scroll_to_fraction(curwin, curwin->w_height);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001401 }
1402 }
1403}
1404
1405/*
Bram Moolenaar84a05ac2013-05-06 04:24:17 +02001406 * Set options to show diffs for the current window.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001407 */
Bram Moolenaar071d4272004-06-13 20:20:40 +00001408 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001409ex_diffthis(exarg_T *eap UNUSED)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001410{
1411 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
1412 diff_win_options(curwin, TRUE);
1413}
1414
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001415 static void
1416set_diff_option(win_T *wp, int value)
1417{
1418 win_T *old_curwin = curwin;
1419
1420 curwin = wp;
1421 curbuf = curwin->w_buffer;
1422 ++curbuf_lock;
1423 set_option_value((char_u *)"diff", (long)value, NULL, OPT_LOCAL);
1424 --curbuf_lock;
1425 curwin = old_curwin;
1426 curbuf = curwin->w_buffer;
1427}
1428
Bram Moolenaar071d4272004-06-13 20:20:40 +00001429/*
1430 * Set options in window "wp" for diff mode.
1431 */
1432 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001433diff_win_options(
1434 win_T *wp,
1435 int addbuf) /* Add buffer to diff. */
Bram Moolenaar071d4272004-06-13 20:20:40 +00001436{
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001437# ifdef FEAT_FOLDING
1438 win_T *old_curwin = curwin;
1439
1440 /* close the manually opened folds */
1441 curwin = wp;
1442 newFoldLevel();
1443 curwin = old_curwin;
1444# endif
1445
Bram Moolenaar3368ea22010-09-21 16:56:35 +02001446 /* Use 'scrollbind' and 'cursorbind' when available */
Bram Moolenaar43929962015-07-03 15:06:56 +02001447 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001448 wp->w_p_scb_save = wp->w_p_scb;
Bram Moolenaar3368ea22010-09-21 16:56:35 +02001449 wp->w_p_scb = TRUE;
Bram Moolenaar43929962015-07-03 15:06:56 +02001450 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001451 wp->w_p_crb_save = wp->w_p_crb;
Bram Moolenaar860cae12010-06-05 23:22:07 +02001452 wp->w_p_crb = TRUE;
Bram Moolenaar43929962015-07-03 15:06:56 +02001453 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001454 wp->w_p_wrap_save = wp->w_p_wrap;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001455 wp->w_p_wrap = FALSE;
1456# ifdef FEAT_FOLDING
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001457 curwin = wp;
1458 curbuf = curwin->w_buffer;
Bram Moolenaar43929962015-07-03 15:06:56 +02001459 if (!wp->w_p_diff)
1460 {
1461 if (wp->w_p_diff_saved)
1462 free_string_option(wp->w_p_fdm_save);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001463 wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm);
Bram Moolenaar43929962015-07-03 15:06:56 +02001464 }
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001465 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff",
Bram Moolenaar5e3cb7e2006-02-27 23:58:35 +00001466 OPT_LOCAL|OPT_FREE, 0);
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001467 curwin = old_curwin;
1468 curbuf = curwin->w_buffer;
Bram Moolenaar43929962015-07-03 15:06:56 +02001469 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001470 {
1471 wp->w_p_fdc_save = wp->w_p_fdc;
1472 wp->w_p_fen_save = wp->w_p_fen;
1473 wp->w_p_fdl_save = wp->w_p_fdl;
1474 }
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001475 wp->w_p_fdc = diff_foldcolumn;
1476 wp->w_p_fen = TRUE;
1477 wp->w_p_fdl = 0;
1478 foldUpdateAll(wp);
1479 /* make sure topline is not halfway a fold */
1480 changed_window_setting_win(wp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001481# endif
Bram Moolenaar071d4272004-06-13 20:20:40 +00001482 if (vim_strchr(p_sbo, 'h') == NULL)
1483 do_cmdline_cmd((char_u *)"set sbo+=hor");
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001484 /* Save the current values, to be restored in ex_diffoff(). */
Bram Moolenaara87aa802013-07-03 15:47:03 +02001485 wp->w_p_diff_saved = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001486
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001487 set_diff_option(wp, TRUE);
Bram Moolenaar43929962015-07-03 15:06:56 +02001488
Bram Moolenaar071d4272004-06-13 20:20:40 +00001489 if (addbuf)
1490 diff_buf_add(wp->w_buffer);
1491 redraw_win_later(wp, NOT_VALID);
1492}
1493
1494/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001495 * Set options not to show diffs. For the current window or all windows.
Bram Moolenaarf740b292006-02-16 22:11:02 +00001496 * Only in the current tab page.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001497 */
1498 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001499ex_diffoff(exarg_T *eap)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001500{
1501 win_T *wp;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001502 int diffwin = FALSE;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001503
Bram Moolenaar29323592016-07-24 22:04:11 +02001504 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001505 {
Bram Moolenaar00462ff2013-09-20 20:13:53 +02001506 if (eap->forceit ? wp->w_p_diff : wp == curwin)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001507 {
Bram Moolenaar43929962015-07-03 15:06:56 +02001508 /* Set 'diff' off. If option values were saved in
1509 * diff_win_options(), restore the ones whose settings seem to have
1510 * been left over from diff mode. */
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001511 set_diff_option(wp, FALSE);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001512
Bram Moolenaara87aa802013-07-03 15:47:03 +02001513 if (wp->w_p_diff_saved)
1514 {
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001515
Bram Moolenaar43929962015-07-03 15:06:56 +02001516 if (wp->w_p_scb)
1517 wp->w_p_scb = wp->w_p_scb_save;
Bram Moolenaar43929962015-07-03 15:06:56 +02001518 if (wp->w_p_crb)
1519 wp->w_p_crb = wp->w_p_crb_save;
Bram Moolenaar43929962015-07-03 15:06:56 +02001520 if (!wp->w_p_wrap)
1521 wp->w_p_wrap = wp->w_p_wrap_save;
1522#ifdef FEAT_FOLDING
1523 free_string_option(wp->w_p_fdm);
Bram Moolenaar79a213d2017-05-16 13:15:18 +02001524 wp->w_p_fdm = vim_strsave(
1525 *wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u*)"manual");
Bram Moolenaar43929962015-07-03 15:06:56 +02001526
1527 if (wp->w_p_fdc == diff_foldcolumn)
1528 wp->w_p_fdc = wp->w_p_fdc_save;
1529 if (wp->w_p_fdl == 0)
1530 wp->w_p_fdl = wp->w_p_fdl_save;
1531
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001532 /* Only restore 'foldenable' when 'foldmethod' is not
1533 * "manual", otherwise we continue to show the diff folds. */
Bram Moolenaar43929962015-07-03 15:06:56 +02001534 if (wp->w_p_fen)
1535 wp->w_p_fen = foldmethodIsManual(wp) ? FALSE
1536 : wp->w_p_fen_save;
1537
1538 foldUpdateAll(wp);
Bram Moolenaar43929962015-07-03 15:06:56 +02001539#endif
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001540 }
Bram Moolenaare67d5462016-08-27 22:40:42 +02001541 /* remove filler lines */
1542 wp->w_topfill = 0;
1543
1544 /* make sure topline is not halfway a fold and cursor is
1545 * invalidated */
1546 changed_window_setting_win(wp);
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001547
Bram Moolenaara87aa802013-07-03 15:47:03 +02001548 /* Note: 'sbo' is not restored, it's a global option. */
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001549 diff_buf_adjust(wp);
1550 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001551 diffwin |= wp->w_p_diff;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001552 }
1553
Bram Moolenaar25ea0542017-02-03 23:16:28 +01001554 /* Also remove hidden buffers from the list. */
1555 if (eap->forceit)
1556 diff_buf_clear();
1557
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001558 /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */
1559 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
1560 do_cmdline_cmd((char_u *)"set sbo-=hor");
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001561}
1562
1563/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00001564 * Read the diff output and add each entry to the diff list.
1565 */
1566 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001567diff_read(
Bram Moolenaare828b762018-09-10 17:51:58 +02001568 int idx_orig, // idx of original file
1569 int idx_new, // idx of new file
1570 diffout_T *dout) // diff output
Bram Moolenaar071d4272004-06-13 20:20:40 +00001571{
Bram Moolenaare828b762018-09-10 17:51:58 +02001572 FILE *fd = NULL;
1573 int line_idx = 0;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001574 diff_T *dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001575 diff_T *dp = curtab->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001576 diff_T *dn, *dpl;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001577 char_u linebuf[LBUFLEN]; /* only need to hold the diff line */
Bram Moolenaare828b762018-09-10 17:51:58 +02001578 char_u *line;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001579 long off;
1580 int i;
1581 linenr_T lnum_orig, lnum_new;
1582 long count_orig, count_new;
1583 int notset = TRUE; /* block "*dp" not set yet */
Bram Moolenaare828b762018-09-10 17:51:58 +02001584 enum {
1585 DIFF_ED,
1586 DIFF_UNIFIED,
1587 DIFF_NONE
1588 } diffstyle = DIFF_NONE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001589
Bram Moolenaare828b762018-09-10 17:51:58 +02001590 if (dout->dout_fname == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001591 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001592 diffstyle = DIFF_UNIFIED;
1593 }
1594 else
1595 {
1596 fd = mch_fopen((char *)dout->dout_fname, "r");
1597 if (fd == NULL)
1598 {
1599 EMSG(_("E98: Cannot read diff output"));
1600 return;
1601 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001602 }
1603
1604 for (;;)
1605 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001606 if (fd == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001607 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001608 if (line_idx >= dout->dout_ga.ga_len)
1609 break; // did last line
1610 line = ((char_u **)dout->dout_ga.ga_data)[line_idx++];
Bram Moolenaar071d4272004-06-13 20:20:40 +00001611 }
1612 else
1613 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001614 if (tag_fgets(linebuf, LBUFLEN, fd))
1615 break; // end of file
1616 line = linebuf;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001617 }
1618
Bram Moolenaare828b762018-09-10 17:51:58 +02001619 if (diffstyle == DIFF_NONE)
1620 {
1621 // Determine diff style.
1622 // ed like diff looks like this:
1623 // {first}[,{last}]c{first}[,{last}]
1624 // {first}a{first}[,{last}]
1625 // {first}[,{last}]d{first}
1626 //
1627 // unified diff looks like this:
1628 // --- file1 2018-03-20 13:23:35.783153140 +0100
1629 // +++ file2 2018-03-20 13:23:41.183156066 +0100
1630 // @@ -1,3 +1,5 @@
1631 if (isdigit(*line))
1632 diffstyle = DIFF_ED;
1633 else if ((STRNCMP(line, "@@ ", 3) == 0))
1634 diffstyle = DIFF_UNIFIED;
1635 else if ((STRNCMP(line, "--- ", 4) == 0)
1636 && (tag_fgets(linebuf, LBUFLEN, fd) == 0)
1637 && (STRNCMP(line, "+++ ", 4) == 0)
1638 && (tag_fgets(linebuf, LBUFLEN, fd) == 0)
1639 && (STRNCMP(line, "@@ ", 3) == 0))
1640 diffstyle = DIFF_UNIFIED;
Bram Moolenaar3b8defd2018-09-13 13:03:11 +02001641 else
1642 // Format not recognized yet, skip over this line. Cygwin diff
1643 // may put a warning at the start of the file.
1644 continue;
Bram Moolenaare828b762018-09-10 17:51:58 +02001645 }
1646
1647 if (diffstyle == DIFF_ED)
1648 {
1649 if (!isdigit(*line))
1650 continue; // not the start of a diff block
1651 if (parse_diff_ed(line, &lnum_orig, &count_orig,
1652 &lnum_new, &count_new) == FAIL)
1653 continue;
1654 }
1655 else if (diffstyle == DIFF_UNIFIED)
1656 {
1657 if (STRNCMP(line, "@@ ", 3) != 0)
1658 continue; // not the start of a diff block
1659 if (parse_diff_unified(line, &lnum_orig, &count_orig,
1660 &lnum_new, &count_new) == FAIL)
1661 continue;
1662 }
1663 else
1664 {
1665 EMSG(_("E959: Invalid diff format."));
1666 break;
1667 }
1668
1669 // Go over blocks before the change, for which orig and new are equal.
1670 // Copy blocks from orig to new.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001671 while (dp != NULL
1672 && lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig])
1673 {
1674 if (notset)
1675 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1676 dprev = dp;
1677 dp = dp->df_next;
1678 notset = TRUE;
1679 }
1680
1681 if (dp != NULL
1682 && lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig]
1683 && lnum_orig + count_orig >= dp->df_lnum[idx_orig])
1684 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001685 // New block overlaps with existing block(s).
1686 // First find last block that overlaps.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001687 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
1688 if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig])
1689 break;
1690
Bram Moolenaare828b762018-09-10 17:51:58 +02001691 // If the newly found block starts before the old one, set the
1692 // start back a number of lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001693 off = dp->df_lnum[idx_orig] - lnum_orig;
1694 if (off > 0)
1695 {
1696 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001697 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001698 dp->df_lnum[i] -= off;
1699 dp->df_lnum[idx_new] = lnum_new;
1700 dp->df_count[idx_new] = count_new;
1701 }
1702 else if (notset)
1703 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001704 // new block inside existing one, adjust new block
Bram Moolenaar071d4272004-06-13 20:20:40 +00001705 dp->df_lnum[idx_new] = lnum_new + off;
1706 dp->df_count[idx_new] = count_new - off;
1707 }
1708 else
Bram Moolenaare828b762018-09-10 17:51:58 +02001709 // second overlap of new block with existing block
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00001710 dp->df_count[idx_new] += count_new - count_orig
1711 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
1712 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001713
Bram Moolenaare828b762018-09-10 17:51:58 +02001714 // Adjust the size of the block to include all the lines to the
1715 // end of the existing block or the new diff, whatever ends last.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001716 off = (lnum_orig + count_orig)
1717 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
1718 if (off < 0)
1719 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001720 // new change ends in existing block, adjust the end if not
1721 // done already
Bram Moolenaar071d4272004-06-13 20:20:40 +00001722 if (notset)
1723 dp->df_count[idx_new] += -off;
1724 off = 0;
1725 }
Bram Moolenaard4b96bc2007-10-19 15:33:39 +00001726 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001727 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001728 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
1729 - dp->df_lnum[i] + off;
1730
Bram Moolenaare828b762018-09-10 17:51:58 +02001731 // Delete the diff blocks that have been merged into one.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001732 dn = dp->df_next;
1733 dp->df_next = dpl->df_next;
1734 while (dn != dp->df_next)
1735 {
1736 dpl = dn->df_next;
1737 vim_free(dn);
1738 dn = dpl;
1739 }
1740 }
1741 else
1742 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001743 // Allocate a new diffblock.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001744 dp = diff_alloc_new(curtab, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001745 if (dp == NULL)
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001746 goto done;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001747
1748 dp->df_lnum[idx_orig] = lnum_orig;
1749 dp->df_count[idx_orig] = count_orig;
1750 dp->df_lnum[idx_new] = lnum_new;
1751 dp->df_count[idx_new] = count_new;
1752
Bram Moolenaare828b762018-09-10 17:51:58 +02001753 // Set values for other buffers, these must be equal to the
1754 // original buffer, otherwise there would have been a change
1755 // already.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001756 for (i = idx_orig + 1; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001757 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001758 diff_copy_entry(dprev, dp, idx_orig, i);
1759 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001760 notset = FALSE; // "*dp" has been set
Bram Moolenaar071d4272004-06-13 20:20:40 +00001761 }
1762
Bram Moolenaare828b762018-09-10 17:51:58 +02001763 // for remaining diff blocks orig and new are equal
Bram Moolenaar071d4272004-06-13 20:20:40 +00001764 while (dp != NULL)
1765 {
1766 if (notset)
1767 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1768 dprev = dp;
1769 dp = dp->df_next;
1770 notset = TRUE;
1771 }
1772
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001773done:
Bram Moolenaare828b762018-09-10 17:51:58 +02001774 if (fd != NULL)
1775 fclose(fd);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001776}
1777
1778/*
1779 * Copy an entry at "dp" from "idx_orig" to "idx_new".
1780 */
1781 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001782diff_copy_entry(
1783 diff_T *dprev,
1784 diff_T *dp,
1785 int idx_orig,
1786 int idx_new)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001787{
1788 long off;
1789
1790 if (dprev == NULL)
1791 off = 0;
1792 else
1793 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
1794 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
1795 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
1796 dp->df_count[idx_new] = dp->df_count[idx_orig];
1797}
1798
1799/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001800 * Clear the list of diffblocks for tab page "tp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001801 */
Bram Moolenaarea408852005-06-25 22:49:46 +00001802 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001803diff_clear(tabpage_T *tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001804{
1805 diff_T *p, *next_p;
1806
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001807 for (p = tp->tp_first_diff; p != NULL; p = next_p)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001808 {
1809 next_p = p->df_next;
1810 vim_free(p);
1811 }
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001812 tp->tp_first_diff = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001813}
1814
1815/*
1816 * Check diff status for line "lnum" in buffer "buf":
1817 * Returns 0 for nothing special
1818 * Returns -1 for a line that should be highlighted as changed.
1819 * Returns -2 for a line that should be highlighted as added/deleted.
1820 * Returns > 0 for inserting that many filler lines above it (never happens
1821 * when 'diffopt' doesn't contain "filler").
1822 * This should only be used for windows where 'diff' is set.
1823 */
1824 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001825diff_check(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001826{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001827 int idx; /* index in tp_diffbuf[] for this buffer */
Bram Moolenaar071d4272004-06-13 20:20:40 +00001828 diff_T *dp;
1829 int maxcount;
1830 int i;
1831 buf_T *buf = wp->w_buffer;
1832 int cmp;
1833
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001834 if (curtab->tp_diff_invalid)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001835 ex_diffupdate(NULL); /* update after a big change */
1836
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001837 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) /* no diffs at all */
Bram Moolenaar071d4272004-06-13 20:20:40 +00001838 return 0;
1839
1840 /* safety check: "lnum" must be a buffer line */
1841 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
1842 return 0;
1843
1844 idx = diff_buf_idx(buf);
1845 if (idx == DB_COUNT)
1846 return 0; /* no diffs for buffer "buf" */
1847
1848#ifdef FEAT_FOLDING
1849 /* A closed fold never has filler lines. */
1850 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
1851 return 0;
1852#endif
1853
1854 /* search for a change that includes "lnum" in the list of diffblocks. */
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001855 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001856 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1857 break;
1858 if (dp == NULL || lnum < dp->df_lnum[idx])
1859 return 0;
1860
1861 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
1862 {
1863 int zero = FALSE;
1864
1865 /* Changed or inserted line. If the other buffers have a count of
1866 * zero, the lines were inserted. If the other buffers have the same
1867 * count, check if the lines are identical. */
1868 cmp = FALSE;
1869 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001870 if (i != idx && curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001871 {
1872 if (dp->df_count[i] == 0)
1873 zero = TRUE;
1874 else
1875 {
1876 if (dp->df_count[i] != dp->df_count[idx])
1877 return -1; /* nr of lines changed. */
1878 cmp = TRUE;
1879 }
1880 }
1881 if (cmp)
1882 {
1883 /* Compare all lines. If they are equal the lines were inserted
1884 * in some buffers, deleted in others, but not changed. */
1885 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001886 if (i != idx && curtab->tp_diffbuf[i] != NULL
1887 && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001888 if (!diff_equal_entry(dp, idx, i))
1889 return -1;
1890 }
1891 /* If there is no buffer with zero lines then there is no difference
1892 * any longer. Happens when making a change (or undo) that removes
1893 * the difference. Can't remove the entry here, we might be halfway
1894 * updating the window. Just report the text as unchanged. Other
1895 * windows might still show the change though. */
1896 if (zero == FALSE)
1897 return 0;
1898 return -2;
1899 }
1900
1901 /* If 'diffopt' doesn't contain "filler", return 0. */
1902 if (!(diff_flags & DIFF_FILLER))
1903 return 0;
1904
1905 /* Insert filler lines above the line just below the change. Will return
1906 * 0 when this buf had the max count. */
1907 maxcount = 0;
1908 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001909 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001910 maxcount = dp->df_count[i];
1911 return maxcount - dp->df_count[idx];
1912}
1913
1914/*
1915 * Compare two entries in diff "*dp" and return TRUE if they are equal.
1916 */
1917 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001918diff_equal_entry(diff_T *dp, int idx1, int idx2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001919{
1920 int i;
1921 char_u *line;
1922 int cmp;
1923
1924 if (dp->df_count[idx1] != dp->df_count[idx2])
1925 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001926 if (diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001927 return FALSE;
1928 for (i = 0; i < dp->df_count[idx1]; ++i)
1929 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001930 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
Bram Moolenaar071d4272004-06-13 20:20:40 +00001931 dp->df_lnum[idx1] + i, FALSE));
1932 if (line == NULL)
1933 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001934 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
Bram Moolenaar071d4272004-06-13 20:20:40 +00001935 dp->df_lnum[idx2] + i, FALSE));
1936 vim_free(line);
1937 if (cmp != 0)
1938 return FALSE;
1939 }
1940 return TRUE;
1941}
1942
1943/*
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02001944 * Compare the characters at "p1" and "p2". If they are equal (possibly
1945 * ignoring case) return TRUE and set "len" to the number of bytes.
1946 */
1947 static int
1948diff_equal_char(char_u *p1, char_u *p2, int *len)
1949{
1950#ifdef FEAT_MBYTE
1951 int l = (*mb_ptr2len)(p1);
1952
1953 if (l != (*mb_ptr2len)(p2))
1954 return FALSE;
1955 if (l > 1)
1956 {
1957 if (STRNCMP(p1, p2, l) != 0
1958 && (!enc_utf8
1959 || !(diff_flags & DIFF_ICASE)
1960 || utf_fold(utf_ptr2char(p1))
1961 != utf_fold(utf_ptr2char(p2))))
1962 return FALSE;
1963 *len = l;
1964 }
1965 else
1966#endif
1967 {
1968 if ((*p1 != *p2)
1969 && (!(diff_flags & DIFF_ICASE)
1970 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
1971 return FALSE;
1972 *len = 1;
1973 }
1974 return TRUE;
1975}
1976
1977/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00001978 * Compare strings "s1" and "s2" according to 'diffopt'.
1979 * Return non-zero when they are different.
1980 */
1981 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001982diff_cmp(char_u *s1, char_u *s2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001983{
1984 char_u *p1, *p2;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001985 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001986
Bram Moolenaar785fc652018-09-15 19:17:38 +02001987 if ((diff_flags & DIFF_IBLANK)
1988 && (*skipwhite(s1) == NUL || *skipwhite(s2) == NUL))
1989 return 0;
1990
1991 if ((diff_flags & (DIFF_ICASE | ALL_WHITE_DIFF)) == 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001992 return STRCMP(s1, s2);
Bram Moolenaar785fc652018-09-15 19:17:38 +02001993 if ((diff_flags & DIFF_ICASE) && !(diff_flags & ALL_WHITE_DIFF))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001994 return MB_STRICMP(s1, s2);
1995
Bram Moolenaar071d4272004-06-13 20:20:40 +00001996 p1 = s1;
1997 p2 = s2;
Bram Moolenaar785fc652018-09-15 19:17:38 +02001998
1999 // Ignore white space changes and possibly ignore case.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002000 while (*p1 != NUL && *p2 != NUL)
2001 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002002 if (((diff_flags & DIFF_IWHITE)
2003 && VIM_ISWHITE(*p1) && VIM_ISWHITE(*p2))
2004 || ((diff_flags & DIFF_IWHITEALL)
2005 && (VIM_ISWHITE(*p1) || VIM_ISWHITE(*p2))))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002006 {
2007 p1 = skipwhite(p1);
2008 p2 = skipwhite(p2);
2009 }
2010 else
2011 {
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002012 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002013 break;
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002014 p1 += l;
2015 p2 += l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002016 }
2017 }
2018
Bram Moolenaar785fc652018-09-15 19:17:38 +02002019 // Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002020 p1 = skipwhite(p1);
2021 p2 = skipwhite(p2);
2022 if (*p1 != NUL || *p2 != NUL)
2023 return 1;
2024 return 0;
2025}
2026
2027/*
2028 * Return the number of filler lines above "lnum".
2029 */
2030 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002031diff_check_fill(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002032{
2033 int n;
2034
2035 /* be quick when there are no filler lines */
2036 if (!(diff_flags & DIFF_FILLER))
2037 return 0;
2038 n = diff_check(wp, lnum);
2039 if (n <= 0)
2040 return 0;
2041 return n;
2042}
2043
2044/*
2045 * Set the topline of "towin" to match the position in "fromwin", so that they
2046 * show the same diff'ed lines.
2047 */
2048 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002049diff_set_topline(win_T *fromwin, win_T *towin)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002050{
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002051 buf_T *frombuf = fromwin->w_buffer;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002052 linenr_T lnum = fromwin->w_topline;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002053 int fromidx;
2054 int toidx;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002055 diff_T *dp;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002056 int max_count;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002057 int i;
2058
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002059 fromidx = diff_buf_idx(frombuf);
2060 if (fromidx == DB_COUNT)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002061 return; /* safety check */
2062
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002063 if (curtab->tp_diff_invalid)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002064 ex_diffupdate(NULL); /* update after a big change */
2065
2066 towin->w_topfill = 0;
2067
2068 /* search for a change that includes "lnum" in the list of diffblocks. */
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002069 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002070 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002071 break;
2072 if (dp == NULL)
2073 {
2074 /* After last change, compute topline relative to end of file; no
2075 * filler lines. */
2076 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002077 - (frombuf->b_ml.ml_line_count - lnum);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002078 }
2079 else
2080 {
2081 /* Find index for "towin". */
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002082 toidx = diff_buf_idx(towin->w_buffer);
2083 if (toidx == DB_COUNT)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002084 return; /* safety check */
2085
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002086 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
2087 if (lnum >= dp->df_lnum[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002088 {
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002089 /* Inside a change: compute filler lines. With three or more
2090 * buffers we need to know the largest count. */
2091 max_count = 0;
2092 for (i = 0; i < DB_COUNT; ++i)
2093 if (curtab->tp_diffbuf[i] != NULL
2094 && max_count < dp->df_count[i])
2095 max_count = dp->df_count[i];
2096
2097 if (dp->df_count[toidx] == dp->df_count[fromidx])
2098 {
2099 /* same number of lines: use same filler count */
Bram Moolenaar071d4272004-06-13 20:20:40 +00002100 towin->w_topfill = fromwin->w_topfill;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002101 }
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002102 else if (dp->df_count[toidx] > dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002103 {
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002104 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002105 {
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002106 /* more lines in towin and fromwin doesn't show diff
2107 * lines, only filler lines */
2108 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
2109 {
2110 /* towin also only shows filler lines */
2111 towin->w_topline = dp->df_lnum[toidx]
2112 + dp->df_count[toidx];
2113 towin->w_topfill = fromwin->w_topfill;
2114 }
2115 else
2116 /* towin still has some diff lines to show */
2117 towin->w_topline = dp->df_lnum[toidx]
2118 + max_count - fromwin->w_topfill;
2119 }
2120 }
2121 else if (towin->w_topline >= dp->df_lnum[toidx]
2122 + dp->df_count[toidx])
2123 {
2124 /* less lines in towin and no diff lines to show: compute
2125 * filler lines */
2126 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
2127 if (diff_flags & DIFF_FILLER)
2128 {
2129 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
2130 /* fromwin is also out of diff lines */
2131 towin->w_topfill = fromwin->w_topfill;
2132 else
2133 /* fromwin has some diff lines */
2134 towin->w_topfill = dp->df_lnum[fromidx]
2135 + max_count - lnum;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002136 }
2137 }
2138 }
2139 }
2140
2141 /* safety check (if diff info gets outdated strange things may happen) */
2142 towin->w_botfill = FALSE;
2143 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
2144 {
2145 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
2146 towin->w_botfill = TRUE;
2147 }
2148 if (towin->w_topline < 1)
2149 {
2150 towin->w_topline = 1;
2151 towin->w_topfill = 0;
2152 }
2153
2154 /* When w_topline changes need to recompute w_botline and cursor position */
2155 invalidate_botline_win(towin);
2156 changed_line_abv_curs_win(towin);
2157
2158 check_topfill(towin, FALSE);
2159#ifdef FEAT_FOLDING
2160 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
2161 NULL, TRUE, NULL);
2162#endif
2163}
2164
2165/*
2166 * This is called when 'diffopt' is changed.
2167 */
2168 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002169diffopt_changed(void)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002170{
2171 char_u *p;
2172 int diff_context_new = 6;
2173 int diff_flags_new = 0;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002174 int diff_foldcolumn_new = 2;
Bram Moolenaare828b762018-09-10 17:51:58 +02002175 long diff_algorithm_new = 0;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002176 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002177
2178 p = p_dip;
2179 while (*p != NUL)
2180 {
2181 if (STRNCMP(p, "filler", 6) == 0)
2182 {
2183 p += 6;
2184 diff_flags_new |= DIFF_FILLER;
2185 }
2186 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
2187 {
2188 p += 8;
2189 diff_context_new = getdigits(&p);
2190 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002191 else if (STRNCMP(p, "iblank", 6) == 0)
2192 {
2193 p += 6;
2194 diff_flags_new |= DIFF_IBLANK;
2195 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002196 else if (STRNCMP(p, "icase", 5) == 0)
2197 {
2198 p += 5;
2199 diff_flags_new |= DIFF_ICASE;
2200 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002201 else if (STRNCMP(p, "iwhiteall", 9) == 0)
2202 {
2203 p += 9;
2204 diff_flags_new |= DIFF_IWHITEALL;
2205 }
2206 else if (STRNCMP(p, "iwhiteeol", 9) == 0)
2207 {
2208 p += 9;
2209 diff_flags_new |= DIFF_IWHITEEOL;
2210 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002211 else if (STRNCMP(p, "iwhite", 6) == 0)
2212 {
2213 p += 6;
2214 diff_flags_new |= DIFF_IWHITE;
2215 }
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002216 else if (STRNCMP(p, "horizontal", 10) == 0)
2217 {
2218 p += 10;
2219 diff_flags_new |= DIFF_HORIZONTAL;
2220 }
2221 else if (STRNCMP(p, "vertical", 8) == 0)
2222 {
2223 p += 8;
2224 diff_flags_new |= DIFF_VERTICAL;
2225 }
2226 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
2227 {
2228 p += 11;
2229 diff_foldcolumn_new = getdigits(&p);
2230 }
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002231 else if (STRNCMP(p, "hiddenoff", 9) == 0)
2232 {
2233 p += 9;
2234 diff_flags_new |= DIFF_HIDDEN_OFF;
2235 }
Bram Moolenaare828b762018-09-10 17:51:58 +02002236 else if (STRNCMP(p, "indent-heuristic", 16) == 0)
2237 {
2238 p += 16;
2239 diff_algorithm_new |= XDF_INDENT_HEURISTIC;
2240 }
2241 else if (STRNCMP(p, "internal", 8) == 0)
2242 {
2243 p += 8;
2244 diff_flags_new |= DIFF_INTERNAL;
2245 }
2246 else if (STRNCMP(p, "algorithm:", 10) == 0)
2247 {
2248 p += 10;
2249 if (STRNCMP(p, "myers", 5) == 0)
2250 {
2251 p += 5;
2252 diff_algorithm_new = 0;
2253 }
2254 else if (STRNCMP(p, "minimal", 7) == 0)
2255 {
2256 p += 7;
2257 diff_algorithm_new = XDF_NEED_MINIMAL;
2258 }
2259 else if (STRNCMP(p, "patience", 8) == 0)
2260 {
2261 p += 8;
2262 diff_algorithm_new = XDF_PATIENCE_DIFF;
2263 }
2264 else if (STRNCMP(p, "histogram", 9) == 0)
2265 {
2266 p += 9;
2267 diff_algorithm_new = XDF_HISTOGRAM_DIFF;
2268 }
Bram Moolenaard0721052018-11-05 21:21:33 +01002269 else
2270 return FAIL;
Bram Moolenaare828b762018-09-10 17:51:58 +02002271 }
2272
Bram Moolenaar071d4272004-06-13 20:20:40 +00002273 if (*p != ',' && *p != NUL)
2274 return FAIL;
2275 if (*p == ',')
2276 ++p;
2277 }
2278
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002279 /* Can't have both "horizontal" and "vertical". */
2280 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
2281 return FAIL;
2282
Bram Moolenaar198fa062018-09-18 21:20:26 +02002283 // If flags were added or removed, or the algorithm was changed, need to
2284 // update the diff.
Bram Moolenaare828b762018-09-10 17:51:58 +02002285 if (diff_flags != diff_flags_new || diff_algorithm != diff_algorithm_new)
Bram Moolenaar29323592016-07-24 22:04:11 +02002286 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002287 tp->tp_diff_invalid = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002288
2289 diff_flags = diff_flags_new;
2290 diff_context = diff_context_new;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002291 diff_foldcolumn = diff_foldcolumn_new;
Bram Moolenaare828b762018-09-10 17:51:58 +02002292 diff_algorithm = diff_algorithm_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002293
2294 diff_redraw(TRUE);
2295
2296 /* recompute the scroll binding with the new option value, may
2297 * remove or add filler lines */
2298 check_scrollbind((linenr_T)0, 0L);
2299
2300 return OK;
2301}
2302
2303/*
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002304 * Return TRUE if 'diffopt' contains "horizontal".
2305 */
2306 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002307diffopt_horizontal(void)
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002308{
2309 return (diff_flags & DIFF_HORIZONTAL) != 0;
2310}
2311
2312/*
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002313 * Return TRUE if 'diffopt' contains "hiddenoff".
2314 */
2315 int
2316diffopt_hiddenoff(void)
2317{
2318 return (diff_flags & DIFF_HIDDEN_OFF) != 0;
2319}
2320
2321/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002322 * Find the difference within a changed line.
2323 * Returns TRUE if the line was added, no other buffer has it.
2324 */
2325 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002326diff_find_change(
2327 win_T *wp,
2328 linenr_T lnum,
2329 int *startp, /* first char of the change */
2330 int *endp) /* last char of the change */
Bram Moolenaar071d4272004-06-13 20:20:40 +00002331{
2332 char_u *line_org;
2333 char_u *line_new;
2334 int i;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002335 int si_org, si_new;
2336 int ei_org, ei_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002337 diff_T *dp;
2338 int idx;
2339 int off;
2340 int added = TRUE;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002341 char_u *p1, *p2;
2342 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002343
2344 /* Make a copy of the line, the next ml_get() will invalidate it. */
2345 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
2346 if (line_org == NULL)
2347 return FALSE;
2348
2349 idx = diff_buf_idx(wp->w_buffer);
2350 if (idx == DB_COUNT) /* cannot happen */
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002351 {
2352 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002353 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002354 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002355
2356 /* search for a change that includes "lnum" in the list of diffblocks. */
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002357 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002358 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
2359 break;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002360 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002361 {
2362 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002363 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002364 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002365
2366 off = lnum - dp->df_lnum[idx];
2367
2368 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002369 if (curtab->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002370 {
2371 /* Skip lines that are not in the other change (filler lines). */
2372 if (off >= dp->df_count[i])
2373 continue;
2374 added = FALSE;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002375 line_new = ml_get_buf(curtab->tp_diffbuf[i],
2376 dp->df_lnum[i] + off, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002377
2378 /* Search for start of difference */
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002379 si_org = si_new = 0;
2380 while (line_org[si_org] != NUL)
2381 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002382 if (((diff_flags & DIFF_IWHITE)
2383 && VIM_ISWHITE(line_org[si_org])
2384 && VIM_ISWHITE(line_new[si_new]))
2385 || ((diff_flags & DIFF_IWHITEALL)
2386 && (VIM_ISWHITE(line_org[si_org])
2387 || VIM_ISWHITE(line_new[si_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002388 {
Bram Moolenaara93fa7e2006-04-17 22:14:47 +00002389 si_org = (int)(skipwhite(line_org + si_org) - line_org);
2390 si_new = (int)(skipwhite(line_new + si_new) - line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002391 }
2392 else
2393 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002394 if (!diff_equal_char(line_org + si_org, line_new + si_new,
2395 &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002396 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002397 si_org += l;
2398 si_new += l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002399 }
2400 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002401#ifdef FEAT_MBYTE
2402 if (has_mbyte)
2403 {
2404 /* Move back to first byte of character in both lines (may
2405 * have "nn^" in line_org and "n^ in line_new). */
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002406 si_org -= (*mb_head_off)(line_org, line_org + si_org);
2407 si_new -= (*mb_head_off)(line_new, line_new + si_new);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002408 }
2409#endif
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002410 if (*startp > si_org)
2411 *startp = si_org;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002412
2413 /* Search for end of difference, if any. */
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002414 if (line_org[si_org] != NUL || line_new[si_new] != NUL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002415 {
2416 ei_org = (int)STRLEN(line_org);
2417 ei_new = (int)STRLEN(line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002418 while (ei_org >= *startp && ei_new >= si_new
2419 && ei_org >= 0 && ei_new >= 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002420 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002421 if (((diff_flags & DIFF_IWHITE)
2422 && VIM_ISWHITE(line_org[ei_org])
2423 && VIM_ISWHITE(line_new[ei_new]))
2424 || ((diff_flags & DIFF_IWHITEALL)
2425 && (VIM_ISWHITE(line_org[ei_org])
2426 || VIM_ISWHITE(line_new[ei_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002427 {
2428 while (ei_org >= *startp
Bram Moolenaar1c465442017-03-12 20:10:05 +01002429 && VIM_ISWHITE(line_org[ei_org]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002430 --ei_org;
2431 while (ei_new >= si_new
Bram Moolenaar1c465442017-03-12 20:10:05 +01002432 && VIM_ISWHITE(line_new[ei_new]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002433 --ei_new;
2434 }
2435 else
2436 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002437 p1 = line_org + ei_org;
2438 p2 = line_new + ei_new;
2439#ifdef FEAT_MBYTE
2440 p1 -= (*mb_head_off)(line_org, p1);
2441 p2 -= (*mb_head_off)(line_new, p2);
2442#endif
2443 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002444 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002445 ei_org -= l;
2446 ei_new -= l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002447 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002448 }
2449 if (*endp < ei_org)
2450 *endp = ei_org;
2451 }
2452 }
2453
2454 vim_free(line_org);
2455 return added;
2456}
2457
2458#if defined(FEAT_FOLDING) || defined(PROTO)
2459/*
2460 * Return TRUE if line "lnum" is not close to a diff block, this line should
2461 * be in a fold.
2462 * Return FALSE if there are no diff blocks at all in this window.
2463 */
2464 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002465diff_infold(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002466{
2467 int i;
2468 int idx = -1;
2469 int other = FALSE;
2470 diff_T *dp;
2471
2472 /* Return if 'diff' isn't set. */
2473 if (!wp->w_p_diff)
2474 return FALSE;
2475
2476 for (i = 0; i < DB_COUNT; ++i)
2477 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002478 if (curtab->tp_diffbuf[i] == wp->w_buffer)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002479 idx = i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002480 else if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002481 other = TRUE;
2482 }
2483
2484 /* return here if there are no diffs in the window */
2485 if (idx == -1 || !other)
2486 return FALSE;
2487
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002488 if (curtab->tp_diff_invalid)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002489 ex_diffupdate(NULL); /* update after a big change */
2490
2491 /* Return if there are no diff blocks. All lines will be folded. */
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002492 if (curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002493 return TRUE;
2494
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002495 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002496 {
2497 /* If this change is below the line there can't be any further match. */
2498 if (dp->df_lnum[idx] - diff_context > lnum)
2499 break;
2500 /* If this change ends before the line we have a match. */
2501 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
2502 return FALSE;
2503 }
2504 return TRUE;
2505}
2506#endif
2507
2508/*
2509 * "dp" and "do" commands.
2510 */
2511 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002512nv_diffgetput(int put, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002513{
2514 exarg_T ea;
Bram Moolenaar6a643652014-10-31 13:54:25 +01002515 char_u buf[30];
Bram Moolenaar071d4272004-06-13 20:20:40 +00002516
Bram Moolenaarf2732452018-06-03 14:47:35 +02002517#ifdef FEAT_JOB_CHANNEL
2518 if (bt_prompt(curbuf))
2519 {
2520 vim_beep(BO_OPER);
2521 return;
2522 }
2523#endif
Bram Moolenaar6a643652014-10-31 13:54:25 +01002524 if (count == 0)
2525 ea.arg = (char_u *)"";
2526 else
2527 {
2528 vim_snprintf((char *)buf, 30, "%ld", count);
2529 ea.arg = buf;
2530 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002531 if (put)
2532 ea.cmdidx = CMD_diffput;
2533 else
2534 ea.cmdidx = CMD_diffget;
2535 ea.addr_count = 0;
2536 ea.line1 = curwin->w_cursor.lnum;
2537 ea.line2 = curwin->w_cursor.lnum;
2538 ex_diffgetput(&ea);
2539}
2540
2541/*
2542 * ":diffget"
2543 * ":diffput"
2544 */
2545 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002546ex_diffgetput(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002547{
2548 linenr_T lnum;
2549 int count;
2550 linenr_T off = 0;
2551 diff_T *dp;
2552 diff_T *dprev;
2553 diff_T *dfree;
2554 int idx_cur;
2555 int idx_other;
2556 int idx_from;
2557 int idx_to;
2558 int i;
2559 int added;
2560 char_u *p;
2561 aco_save_T aco;
2562 buf_T *buf;
2563 int start_skip, end_skip;
2564 int new_count;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002565 int buf_empty;
Bram Moolenaar602eb742007-02-20 03:43:38 +00002566 int found_not_ma = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002567
2568 /* Find the current buffer in the list of diff buffers. */
2569 idx_cur = diff_buf_idx(curbuf);
2570 if (idx_cur == DB_COUNT)
2571 {
2572 EMSG(_("E99: Current buffer is not in diff mode"));
2573 return;
2574 }
2575
2576 if (*eap->arg == NUL)
2577 {
2578 /* No argument: Find the other buffer in the list of diff buffers. */
2579 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002580 if (curtab->tp_diffbuf[idx_other] != curbuf
Bram Moolenaar602eb742007-02-20 03:43:38 +00002581 && curtab->tp_diffbuf[idx_other] != NULL)
2582 {
2583 if (eap->cmdidx != CMD_diffput
2584 || curtab->tp_diffbuf[idx_other]->b_p_ma)
2585 break;
2586 found_not_ma = TRUE;
2587 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002588 if (idx_other == DB_COUNT)
2589 {
Bram Moolenaar602eb742007-02-20 03:43:38 +00002590 if (found_not_ma)
2591 EMSG(_("E793: No other buffer in diff mode is modifiable"));
2592 else
2593 EMSG(_("E100: No other buffer in diff mode"));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002594 return;
2595 }
2596
2597 /* Check that there isn't a third buffer in the list */
2598 for (i = idx_other + 1; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002599 if (curtab->tp_diffbuf[i] != curbuf
2600 && curtab->tp_diffbuf[i] != NULL
2601 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002602 {
2603 EMSG(_("E101: More than two buffers in diff mode, don't know which one to use"));
2604 return;
2605 }
2606 }
2607 else
2608 {
2609 /* Buffer number or pattern given. Ignore trailing white space. */
2610 p = eap->arg + STRLEN(eap->arg);
Bram Moolenaar1c465442017-03-12 20:10:05 +01002611 while (p > eap->arg && VIM_ISWHITE(p[-1]))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002612 --p;
2613 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
2614 ;
2615 if (eap->arg + i == p) /* digits only */
2616 i = atol((char *)eap->arg);
2617 else
2618 {
Bram Moolenaar0c279bb2013-03-19 14:25:54 +01002619 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002620 if (i < 0)
2621 return; /* error message already given */
2622 }
2623 buf = buflist_findnr(i);
2624 if (buf == NULL)
2625 {
2626 EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
2627 return;
2628 }
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +00002629 if (buf == curbuf)
2630 return; /* nothing to do */
Bram Moolenaar071d4272004-06-13 20:20:40 +00002631 idx_other = diff_buf_idx(buf);
2632 if (idx_other == DB_COUNT)
2633 {
2634 EMSG2(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg);
2635 return;
2636 }
2637 }
2638
2639 diff_busy = TRUE;
2640
2641 /* When no range given include the line above or below the cursor. */
2642 if (eap->addr_count == 0)
2643 {
2644 /* Make it possible that ":diffget" on the last line gets line below
2645 * the cursor line when there is no difference above the cursor. */
2646 if (eap->cmdidx == CMD_diffget
2647 && eap->line1 == curbuf->b_ml.ml_line_count
2648 && diff_check(curwin, eap->line1) == 0
2649 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
2650 ++eap->line2;
2651 else if (eap->line1 > 0)
2652 --eap->line1;
2653 }
2654
2655 if (eap->cmdidx == CMD_diffget)
2656 {
2657 idx_from = idx_other;
2658 idx_to = idx_cur;
2659 }
2660 else
2661 {
2662 idx_from = idx_cur;
2663 idx_to = idx_other;
2664 /* Need to make the other buffer the current buffer to be able to make
2665 * changes in it. */
2666 /* set curwin/curbuf to buf and save a few things */
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002667 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002668 }
2669
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002670 /* May give the warning for a changed buffer here, which can trigger the
2671 * FileChangedRO autocommand, which may do nasty things and mess
2672 * everything up. */
2673 if (!curbuf->b_changed)
2674 {
2675 change_warning(0);
2676 if (diff_buf_idx(curbuf) != idx_to)
2677 {
2678 EMSG(_("E787: Buffer changed unexpectedly"));
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002679 goto theend;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002680 }
2681 }
2682
Bram Moolenaar071d4272004-06-13 20:20:40 +00002683 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002684 for (dp = curtab->tp_first_diff; dp != NULL; )
Bram Moolenaar071d4272004-06-13 20:20:40 +00002685 {
2686 if (dp->df_lnum[idx_cur] > eap->line2 + off)
2687 break; /* past the range that was specified */
2688
2689 dfree = NULL;
2690 lnum = dp->df_lnum[idx_to];
2691 count = dp->df_count[idx_to];
2692 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
2693 && u_save(lnum - 1, lnum + count) != FAIL)
2694 {
2695 /* Inside the specified range and saving for undo worked. */
2696 start_skip = 0;
2697 end_skip = 0;
2698 if (eap->addr_count > 0)
2699 {
2700 /* A range was specified: check if lines need to be skipped. */
2701 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
2702 if (start_skip > 0)
2703 {
2704 /* range starts below start of current diff block */
2705 if (start_skip > count)
2706 {
2707 lnum += count;
2708 count = 0;
2709 }
2710 else
2711 {
2712 count -= start_skip;
2713 lnum += start_skip;
2714 }
2715 }
2716 else
2717 start_skip = 0;
2718
2719 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
2720 - (eap->line2 + off);
2721 if (end_skip > 0)
2722 {
2723 /* range ends above end of current/from diff block */
2724 if (idx_cur == idx_from) /* :diffput */
2725 {
2726 i = dp->df_count[idx_cur] - start_skip - end_skip;
2727 if (count > i)
2728 count = i;
2729 }
2730 else /* :diffget */
2731 {
2732 count -= end_skip;
2733 end_skip = dp->df_count[idx_from] - start_skip - count;
2734 if (end_skip < 0)
2735 end_skip = 0;
2736 }
2737 }
2738 else
2739 end_skip = 0;
2740 }
2741
Bram Moolenaarb5aedf32017-03-12 18:23:53 +01002742 buf_empty = BUFEMPTY();
Bram Moolenaar071d4272004-06-13 20:20:40 +00002743 added = 0;
2744 for (i = 0; i < count; ++i)
2745 {
Bram Moolenaar280f1262006-01-30 00:14:18 +00002746 /* remember deleting the last line of the buffer */
2747 buf_empty = curbuf->b_ml.ml_line_count == 1;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002748 ml_delete(lnum, FALSE);
2749 --added;
2750 }
2751 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
2752 {
2753 linenr_T nr;
2754
2755 nr = dp->df_lnum[idx_from] + start_skip + i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002756 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002757 break;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002758 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
2759 nr, FALSE));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002760 if (p != NULL)
2761 {
2762 ml_append(lnum + i - 1, p, 0, FALSE);
2763 vim_free(p);
2764 ++added;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002765 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
2766 {
2767 /* Added the first line into an empty buffer, need to
2768 * delete the dummy empty line. */
2769 buf_empty = FALSE;
2770 ml_delete((linenr_T)2, FALSE);
2771 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002772 }
2773 }
2774 new_count = dp->df_count[idx_to] + added;
2775 dp->df_count[idx_to] = new_count;
2776
2777 if (start_skip == 0 && end_skip == 0)
2778 {
2779 /* Check if there are any other buffers and if the diff is
2780 * equal in them. */
2781 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002782 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
2783 && i != idx_to
Bram Moolenaar071d4272004-06-13 20:20:40 +00002784 && !diff_equal_entry(dp, idx_from, i))
2785 break;
2786 if (i == DB_COUNT)
2787 {
2788 /* delete the diff entry, the buffers are now equal here */
2789 dfree = dp;
2790 dp = dp->df_next;
2791 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002792 curtab->tp_first_diff = dp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002793 else
2794 dprev->df_next = dp;
2795 }
2796 }
2797
2798 /* Adjust marks. This will change the following entries! */
2799 if (added != 0)
2800 {
2801 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
2802 if (curwin->w_cursor.lnum >= lnum)
2803 {
2804 /* Adjust the cursor position if it's in/after the changed
2805 * lines. */
2806 if (curwin->w_cursor.lnum >= lnum + count)
2807 curwin->w_cursor.lnum += added;
2808 else if (added < 0)
2809 curwin->w_cursor.lnum = lnum;
2810 }
2811 }
2812 changed_lines(lnum, 0, lnum + count, (long)added);
2813
2814 if (dfree != NULL)
2815 {
2816 /* Diff is deleted, update folds in other windows. */
2817#ifdef FEAT_FOLDING
2818 diff_fold_update(dfree, idx_to);
2819#endif
2820 vim_free(dfree);
2821 }
2822 else
2823 /* mark_adjust() may have changed the count in a wrong way */
2824 dp->df_count[idx_to] = new_count;
2825
2826 /* When changing the current buffer, keep track of line numbers */
2827 if (idx_cur == idx_to)
2828 off += added;
2829 }
2830
2831 /* If before the range or not deleted, go to next diff. */
2832 if (dfree == NULL)
2833 {
2834 dprev = dp;
2835 dp = dp->df_next;
2836 }
2837 }
2838
2839 /* restore curwin/curbuf and a few other things */
Bram Moolenaara9d52e32010-07-31 16:44:19 +02002840 if (eap->cmdidx != CMD_diffget)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002841 {
2842 /* Syncing undo only works for the current buffer, but we change
2843 * another buffer. Sync undo if the command was typed. This isn't
2844 * 100% right when ":diffput" is used in a function or mapping. */
2845 if (KeyTyped)
Bram Moolenaar779b74b2006-04-10 14:55:34 +00002846 u_sync(FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002847 aucmd_restbuf(&aco);
2848 }
2849
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002850theend:
Bram Moolenaar071d4272004-06-13 20:20:40 +00002851 diff_busy = FALSE;
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002852 if (diff_need_update)
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002853 ex_diffupdate(NULL);
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002854
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +02002855 // Check that the cursor is on a valid character and update its
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002856 // position. When there were filler lines the topline has become
2857 // invalid.
2858 check_cursor();
2859 changed_line_abv_curs();
2860
2861 if (diff_need_update)
2862 // redraw already done by ex_diffupdate()
2863 diff_need_update = FALSE;
Bram Moolenaar198fa062018-09-18 21:20:26 +02002864 else
2865 {
Bram Moolenaar198fa062018-09-18 21:20:26 +02002866 // Also need to redraw the other buffers.
2867 diff_redraw(FALSE);
2868 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
2869 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002870}
2871
2872#ifdef FEAT_FOLDING
2873/*
2874 * Update folds for all diff buffers for entry "dp".
2875 * Skip buffer with index "skip_idx".
2876 * When there are no diffs, all folds are removed.
2877 */
2878 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002879diff_fold_update(diff_T *dp, int skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002880{
2881 int i;
2882 win_T *wp;
2883
Bram Moolenaar29323592016-07-24 22:04:11 +02002884 FOR_ALL_WINDOWS(wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002885 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002886 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002887 foldUpdate(wp, dp->df_lnum[i],
2888 dp->df_lnum[i] + dp->df_count[i]);
2889}
2890#endif
2891
2892/*
2893 * Return TRUE if buffer "buf" is in diff-mode.
2894 */
2895 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002896diff_mode_buf(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002897{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002898 tabpage_T *tp;
2899
Bram Moolenaar29323592016-07-24 22:04:11 +02002900 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002901 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
2902 return TRUE;
2903 return FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002904}
2905
2906/*
2907 * Move "count" times in direction "dir" to the next diff block.
2908 * Return FAIL if there isn't such a diff block.
2909 */
2910 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002911diff_move_to(int dir, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002912{
2913 int idx;
2914 linenr_T lnum = curwin->w_cursor.lnum;
2915 diff_T *dp;
2916
2917 idx = diff_buf_idx(curbuf);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002918 if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002919 return FAIL;
2920
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002921 if (curtab->tp_diff_invalid)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002922 ex_diffupdate(NULL); /* update after a big change */
2923
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002924 if (curtab->tp_first_diff == NULL) /* no diffs today */
Bram Moolenaar071d4272004-06-13 20:20:40 +00002925 return FAIL;
2926
2927 while (--count >= 0)
2928 {
2929 /* Check if already before first diff. */
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002930 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002931 break;
2932
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002933 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002934 {
2935 if (dp == NULL)
2936 break;
2937 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
2938 || (dir == BACKWARD
2939 && (dp->df_next == NULL
2940 || lnum <= dp->df_next->df_lnum[idx])))
2941 {
2942 lnum = dp->df_lnum[idx];
2943 break;
2944 }
2945 }
2946 }
2947
2948 /* don't end up past the end of the file */
2949 if (lnum > curbuf->b_ml.ml_line_count)
2950 lnum = curbuf->b_ml.ml_line_count;
2951
2952 /* When the cursor didn't move at all we fail. */
2953 if (lnum == curwin->w_cursor.lnum)
2954 return FAIL;
2955
2956 setpcmark();
2957 curwin->w_cursor.lnum = lnum;
2958 curwin->w_cursor.col = 0;
2959
2960 return OK;
2961}
2962
Bram Moolenaar025e3e02016-10-18 14:50:18 +02002963/*
2964 * Return the line number in the current window that is closest to "lnum1" in
2965 * "buf1" in diff mode.
2966 */
2967 static linenr_T
2968diff_get_corresponding_line_int(
Bram Moolenaar7454a062016-01-30 15:14:10 +01002969 buf_T *buf1,
Bram Moolenaar025e3e02016-10-18 14:50:18 +02002970 linenr_T lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02002971{
2972 int idx1;
2973 int idx2;
2974 diff_T *dp;
2975 int baseline = 0;
Bram Moolenaar860cae12010-06-05 23:22:07 +02002976
2977 idx1 = diff_buf_idx(buf1);
Bram Moolenaar025e3e02016-10-18 14:50:18 +02002978 idx2 = diff_buf_idx(curbuf);
Bram Moolenaar860cae12010-06-05 23:22:07 +02002979 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL)
2980 return lnum1;
2981
2982 if (curtab->tp_diff_invalid)
2983 ex_diffupdate(NULL); /* update after a big change */
2984
2985 if (curtab->tp_first_diff == NULL) /* no diffs today */
2986 return lnum1;
2987
2988 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
2989 {
2990 if (dp->df_lnum[idx1] > lnum1)
Bram Moolenaar025e3e02016-10-18 14:50:18 +02002991 return lnum1 - baseline;
2992 if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02002993 {
2994 /* Inside the diffblock */
2995 baseline = lnum1 - dp->df_lnum[idx1];
2996 if (baseline > dp->df_count[idx2])
2997 baseline = dp->df_count[idx2];
2998
2999 return dp->df_lnum[idx2] + baseline;
3000 }
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003001 if ( (dp->df_lnum[idx1] == lnum1)
3002 && (dp->df_count[idx1] == 0)
3003 && (dp->df_lnum[idx2] <= curwin->w_cursor.lnum)
3004 && ((dp->df_lnum[idx2] + dp->df_count[idx2])
3005 > curwin->w_cursor.lnum))
Bram Moolenaar860cae12010-06-05 23:22:07 +02003006 /*
3007 * Special case: if the cursor is just after a zero-count
3008 * block (i.e. all filler) and the target cursor is already
3009 * inside the corresponding block, leave the target cursor
3010 * unmoved. This makes repeated CTRL-W W operations work
3011 * as expected.
3012 */
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003013 return curwin->w_cursor.lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003014 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1])
3015 - (dp->df_lnum[idx2] + dp->df_count[idx2]);
3016 }
3017
3018 /* If we get here then the cursor is after the last diff */
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003019 return lnum1 - baseline;
3020}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003021
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003022/*
3023 * Return the line number in the current window that is closest to "lnum1" in
3024 * "buf1" in diff mode. Checks the line number to be valid.
3025 */
3026 linenr_T
3027diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1)
3028{
3029 linenr_T lnum = diff_get_corresponding_line_int(buf1, lnum1);
3030
3031 /* don't end up past the end of the file */
3032 if (lnum > curbuf->b_ml.ml_line_count)
3033 return curbuf->b_ml.ml_line_count;
3034 return lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003035}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003036
Bram Moolenaar071d4272004-06-13 20:20:40 +00003037/*
3038 * For line "lnum" in the current window find the equivalent lnum in window
3039 * "wp", compensating for inserted/deleted lines.
3040 */
3041 linenr_T
Bram Moolenaar7454a062016-01-30 15:14:10 +01003042diff_lnum_win(linenr_T lnum, win_T *wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003043{
3044 diff_T *dp;
3045 int idx;
3046 int i;
3047 linenr_T n;
3048
3049 idx = diff_buf_idx(curbuf);
3050 if (idx == DB_COUNT) /* safety check */
3051 return (linenr_T)0;
3052
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003053 if (curtab->tp_diff_invalid)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003054 ex_diffupdate(NULL); /* update after a big change */
3055
3056 /* search for a change that includes "lnum" in the list of diffblocks. */
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003057 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003058 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3059 break;
3060
3061 /* When after the last change, compute relative to the last line number. */
3062 if (dp == NULL)
3063 return wp->w_buffer->b_ml.ml_line_count
3064 - (curbuf->b_ml.ml_line_count - lnum);
3065
3066 /* Find index for "wp". */
3067 i = diff_buf_idx(wp->w_buffer);
3068 if (i == DB_COUNT) /* safety check */
3069 return (linenr_T)0;
3070
3071 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
3072 if (n > dp->df_lnum[i] + dp->df_count[i])
3073 n = dp->df_lnum[i] + dp->df_count[i];
3074 return n;
3075}
Bram Moolenaar071d4272004-06-13 20:20:40 +00003076
Bram Moolenaare828b762018-09-10 17:51:58 +02003077/*
3078 * Handle an ED style diff line.
3079 * Return FAIL if the line does not contain diff info.
3080 */
3081 static int
3082parse_diff_ed(
3083 char_u *line,
3084 linenr_T *lnum_orig,
3085 long *count_orig,
3086 linenr_T *lnum_new,
3087 long *count_new)
3088{
3089 char_u *p;
3090 long f1, l1, f2, l2;
3091 int difftype;
3092
3093 // The line must be one of three formats:
3094 // change: {first}[,{last}]c{first}[,{last}]
3095 // append: {first}a{first}[,{last}]
3096 // delete: {first}[,{last}]d{first}
3097 p = line;
3098 f1 = getdigits(&p);
3099 if (*p == ',')
3100 {
3101 ++p;
3102 l1 = getdigits(&p);
3103 }
3104 else
3105 l1 = f1;
3106 if (*p != 'a' && *p != 'c' && *p != 'd')
3107 return FAIL; // invalid diff format
3108 difftype = *p++;
3109 f2 = getdigits(&p);
3110 if (*p == ',')
3111 {
3112 ++p;
3113 l2 = getdigits(&p);
3114 }
3115 else
3116 l2 = f2;
3117 if (l1 < f1 || l2 < f2)
3118 return FAIL;
3119
3120 if (difftype == 'a')
3121 {
3122 *lnum_orig = f1 + 1;
3123 *count_orig = 0;
3124 }
3125 else
3126 {
3127 *lnum_orig = f1;
3128 *count_orig = l1 - f1 + 1;
3129 }
3130 if (difftype == 'd')
3131 {
3132 *lnum_new = f2 + 1;
3133 *count_new = 0;
3134 }
3135 else
3136 {
3137 *lnum_new = f2;
3138 *count_new = l2 - f2 + 1;
3139 }
3140 return OK;
3141}
3142
3143/*
3144 * Parses unified diff with zero(!) context lines.
3145 * Return FAIL if there is no diff information in "line".
3146 */
3147 static int
3148parse_diff_unified(
3149 char_u *line,
3150 linenr_T *lnum_orig,
3151 long *count_orig,
3152 linenr_T *lnum_new,
3153 long *count_new)
3154{
3155 char_u *p;
3156 long oldline, oldcount, newline, newcount;
3157
3158 // Parse unified diff hunk header:
3159 // @@ -oldline,oldcount +newline,newcount @@
3160 p = line;
3161 if (*p++ == '@' && *p++ == '@' && *p++ == ' ' && *p++ == '-')
3162 {
3163 oldline = getdigits(&p);
3164 if (*p == ',')
3165 {
3166 ++p;
3167 oldcount = getdigits(&p);
3168 }
3169 else
3170 oldcount = 1;
3171 if (*p++ == ' ' && *p++ == '+')
3172 {
3173 newline = getdigits(&p);
3174 if (*p == ',')
3175 {
3176 ++p;
3177 newcount = getdigits(&p);
3178 }
3179 else
3180 newcount = 1;
3181 }
3182 else
3183 return FAIL; // invalid diff format
3184
3185 if (oldcount == 0)
3186 oldline += 1;
3187 if (newcount == 0)
3188 newline += 1;
3189 if (newline == 0)
3190 newline = 1;
3191
3192 *lnum_orig = oldline;
3193 *count_orig = oldcount;
3194 *lnum_new = newline;
3195 *count_new = newcount;
3196
3197 return OK;
3198 }
3199
3200 return FAIL;
3201}
3202
3203/*
3204 * Callback function for the xdl_diff() function.
3205 * Stores the diff output in a grow array.
3206 */
3207 static int
3208xdiff_out(void *priv, mmbuffer_t *mb, int nbuf)
3209{
3210 diffout_T *dout = (diffout_T *)priv;
Bram Moolenaare828b762018-09-10 17:51:58 +02003211 char_u *p;
3212
Bram Moolenaarf080d702018-10-31 22:57:26 +01003213 // The header line always comes by itself, text lines in at least two
3214 // parts. We drop the text part.
3215 if (nbuf > 1)
3216 return 0;
3217
3218 // sanity check
3219 if (STRNCMP(mb[0].ptr, "@@ ", 3) != 0)
3220 return 0;
3221
3222 if (ga_grow(&dout->dout_ga, 1) == FAIL)
3223 return -1;
3224 p = vim_strnsave((char_u *)mb[0].ptr, mb[0].size);
3225 if (p == NULL)
3226 return -1;
3227 ((char_u **)dout->dout_ga.ga_data)[dout->dout_ga.ga_len++] = p;
Bram Moolenaare828b762018-09-10 17:51:58 +02003228 return 0;
3229}
3230
Bram Moolenaar071d4272004-06-13 20:20:40 +00003231#endif /* FEAT_DIFF */