blob: f9969045431459cef6fc6670b465d24e933d61c6 [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
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010027// 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
Bram Moolenaarc8234772019-11-10 21:00:27 +010038#define DIFF_CLOSE_OFF 0x400 // diffoff when closing window
Bram Moolenaar785fc652018-09-15 19:17:38 +020039#define ALL_WHITE_DIFF (DIFF_IWHITE | DIFF_IWHITEALL | DIFF_IWHITEEOL)
Bram Moolenaarc8234772019-11-10 21:00:27 +010040static int diff_flags = DIFF_INTERNAL | DIFF_FILLER | DIFF_CLOSE_OFF;
Bram Moolenaar071d4272004-06-13 20:20:40 +000041
Bram Moolenaare828b762018-09-10 17:51:58 +020042static long diff_algorithm = 0;
43
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010044#define LBUFLEN 50 // length of line in diff file
Bram Moolenaar071d4272004-06-13 20:20:40 +000045
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010046static int diff_a_works = MAYBE; // TRUE when "diff -a" works, FALSE when it
47 // doesn't work, MAYBE when not checked yet
Bram Moolenaar48e330a2016-02-23 14:53:34 +010048#if defined(MSWIN)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010049static int diff_bin_works = MAYBE; // TRUE when "diff --binary" works, FALSE
50 // when it doesn't work, MAYBE when not
51 // checked yet
Bram Moolenaar071d4272004-06-13 20:20:40 +000052#endif
53
Bram Moolenaare828b762018-09-10 17:51:58 +020054// used for diff input
55typedef struct {
56 char_u *din_fname; // used for external diff
57 mmfile_t din_mmfile; // used for internal diff
58} diffin_T;
59
60// used for diff result
61typedef struct {
62 char_u *dout_fname; // used for external diff
63 garray_T dout_ga; // used for internal diff
64} diffout_T;
65
66// two diff inputs and one result
67typedef struct {
68 diffin_T dio_orig; // original file input
69 diffin_T dio_new; // new file input
70 diffout_T dio_diff; // diff result
71 int dio_internal; // using internal diff
72} diffio_T;
73
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010074static int diff_buf_idx(buf_T *buf);
75static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp);
76static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after);
77static void diff_check_unchanged(tabpage_T *tp, diff_T *dp);
78static int diff_check_sanity(tabpage_T *tp, diff_T *dp);
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
Bram Moolenaar071d4272004-06-13 20:20:40 +000093/*
Bram Moolenaar071d4272004-06-13 20:20:40 +000094 * Called when deleting or unloading a buffer: No longer make a diff with it.
Bram Moolenaar071d4272004-06-13 20:20:40 +000095 */
96 void
Bram Moolenaar7454a062016-01-30 15:14:10 +010097diff_buf_delete(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +000098{
99 int i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000100 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000101
Bram Moolenaar29323592016-07-24 22:04:11 +0200102 FOR_ALL_TABPAGES(tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000103 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000104 i = diff_buf_idx_tp(buf, tp);
105 if (i != DB_COUNT)
106 {
107 tp->tp_diffbuf[i] = NULL;
108 tp->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000109 if (tp == curtab)
110 diff_redraw(TRUE);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000111 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000112 }
113}
114
115/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000116 * Check if the current buffer should be added to or removed from the list of
117 * diff buffers.
118 */
119 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100120diff_buf_adjust(win_T *win)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000121{
122 win_T *wp;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000123 int i;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000124
125 if (!win->w_p_diff)
126 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100127 // When there is no window showing a diff for this buffer, remove
128 // it from the diffs.
Bram Moolenaar29323592016-07-24 22:04:11 +0200129 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000130 if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
131 break;
132 if (wp == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000133 {
134 i = diff_buf_idx(win->w_buffer);
135 if (i != DB_COUNT)
136 {
137 curtab->tp_diffbuf[i] = NULL;
138 curtab->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000139 diff_redraw(TRUE);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000140 }
141 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000142 }
143 else
144 diff_buf_add(win->w_buffer);
145}
146
147/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000148 * Add a buffer to make diffs for.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000149 * Call this when a new buffer is being edited in the current window where
150 * 'diff' is set.
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +0000151 * Marks the current buffer as being part of the diff and requiring updating.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000152 * This must be done before any autocmd, because a command may use info
153 * about the screen contents.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000154 */
155 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100156diff_buf_add(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000157{
158 int i;
159
160 if (diff_buf_idx(buf) != DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100161 return; // It's already there.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000162
163 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000164 if (curtab->tp_diffbuf[i] == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000165 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000166 curtab->tp_diffbuf[i] = buf;
167 curtab->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000168 diff_redraw(TRUE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000169 return;
170 }
171
Bram Moolenaarb5443cc2019-01-15 20:19:40 +0100172 semsg(_("E96: Cannot diff more than %d buffers"), DB_COUNT);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000173}
174
175/*
Bram Moolenaar25ea0542017-02-03 23:16:28 +0100176 * Remove all buffers to make diffs for.
177 */
178 static void
179diff_buf_clear(void)
180{
181 int i;
182
183 for (i = 0; i < DB_COUNT; ++i)
184 if (curtab->tp_diffbuf[i] != NULL)
185 {
186 curtab->tp_diffbuf[i] = NULL;
187 curtab->tp_diff_invalid = TRUE;
188 diff_redraw(TRUE);
189 }
190}
191
192/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000193 * Find buffer "buf" in the list of diff buffers for the current tab page.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000194 * Return its index or DB_COUNT if not found.
195 */
196 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100197diff_buf_idx(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000198{
199 int idx;
200
201 for (idx = 0; idx < DB_COUNT; ++idx)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000202 if (curtab->tp_diffbuf[idx] == buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000203 break;
204 return idx;
205}
206
207/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000208 * Find buffer "buf" in the list of diff buffers for tab page "tp".
209 * Return its index or DB_COUNT if not found.
210 */
211 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100212diff_buf_idx_tp(buf_T *buf, tabpage_T *tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000213{
214 int idx;
215
216 for (idx = 0; idx < DB_COUNT; ++idx)
217 if (tp->tp_diffbuf[idx] == buf)
218 break;
219 return idx;
220}
221
222/*
223 * Mark the diff info involving buffer "buf" as invalid, it will be updated
224 * when info is requested.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000225 */
226 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100227diff_invalidate(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000228{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000229 tabpage_T *tp;
230 int i;
231
Bram Moolenaar29323592016-07-24 22:04:11 +0200232 FOR_ALL_TABPAGES(tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000233 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000234 i = diff_buf_idx_tp(buf, tp);
235 if (i != DB_COUNT)
236 {
237 tp->tp_diff_invalid = TRUE;
238 if (tp == curtab)
239 diff_redraw(TRUE);
240 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000241 }
242}
243
244/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000245 * Called by mark_adjust(): update line numbers in "curbuf".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000246 */
247 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100248diff_mark_adjust(
249 linenr_T line1,
250 linenr_T line2,
251 long amount,
252 long amount_after)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000253{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000254 int idx;
255 tabpage_T *tp;
256
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100257 // Handle all tab pages that use the current buffer in a diff.
Bram Moolenaar29323592016-07-24 22:04:11 +0200258 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000259 {
260 idx = diff_buf_idx_tp(curbuf, tp);
261 if (idx != DB_COUNT)
262 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
263 }
264}
265
266/*
267 * Update line numbers in tab page "tp" for "curbuf" with index "idx".
268 * This attempts to update the changes as much as possible:
269 * When inserting/deleting lines outside of existing change blocks, create a
270 * new change block and update the line numbers in following blocks.
271 * When inserting/deleting lines in existing change blocks, update them.
272 */
273 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100274diff_mark_adjust_tp(
275 tabpage_T *tp,
276 int idx,
277 linenr_T line1,
278 linenr_T line2,
279 long amount,
280 long amount_after)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000281{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000282 diff_T *dp;
283 diff_T *dprev;
284 diff_T *dnext;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000285 int i;
286 int inserted, deleted;
287 int n, off;
288 linenr_T last;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100289 linenr_T lnum_deleted = line1; // lnum of remaining deletion
Bram Moolenaar071d4272004-06-13 20:20:40 +0000290 int check_unchanged;
291
Bram Moolenaare3521d92018-09-16 14:10:31 +0200292 if (diff_internal())
293 {
Bram Moolenaar198fa062018-09-18 21:20:26 +0200294 // Will update diffs before redrawing. Set _invalid to update the
Bram Moolenaare3521d92018-09-16 14:10:31 +0200295 // diffs themselves, set _update to also update folds properly just
296 // before redrawing.
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +0200297 // Do update marks here, it is needed for :%diffput.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200298 tp->tp_diff_invalid = TRUE;
299 tp->tp_diff_update = TRUE;
Bram Moolenaare3521d92018-09-16 14:10:31 +0200300 }
301
Bram Moolenaar071d4272004-06-13 20:20:40 +0000302 if (line2 == MAXLNUM)
303 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100304 // mark_adjust(99, MAXLNUM, 9, 0): insert lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000305 inserted = amount;
306 deleted = 0;
307 }
308 else if (amount_after > 0)
309 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100310 // mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000311 inserted = amount_after;
312 deleted = 0;
313 }
314 else
315 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100316 // mark_adjust(98, 99, MAXLNUM, -2): delete lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000317 inserted = 0;
318 deleted = -amount_after;
319 }
320
321 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000322 dp = tp->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000323 for (;;)
324 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100325 // If the change is after the previous diff block and before the next
326 // diff block, thus not touching an existing change, create a new diff
327 // block. Don't do this when ex_diffgetput() is busy.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000328 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2
329 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
330 && (dprev == NULL
331 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
332 && !diff_busy)
333 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000334 dnext = diff_alloc_new(tp, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000335 if (dnext == NULL)
336 return;
337
338 dnext->df_lnum[idx] = line1;
339 dnext->df_count[idx] = inserted;
340 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000341 if (tp->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000342 {
343 if (dprev == NULL)
344 dnext->df_lnum[i] = line1;
345 else
346 dnext->df_lnum[i] = line1
347 + (dprev->df_lnum[i] + dprev->df_count[i])
348 - (dprev->df_lnum[idx] + dprev->df_count[idx]);
349 dnext->df_count[i] = deleted;
350 }
351 }
352
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100353 // if at end of the list, quit
Bram Moolenaar071d4272004-06-13 20:20:40 +0000354 if (dp == NULL)
355 break;
356
357 /*
358 * Check for these situations:
359 * 1 2 3
360 * 1 2 3
361 * line1 2 3 4 5
362 * 2 3 4 5
363 * 2 3 4 5
364 * line2 2 3 4 5
365 * 3 5 6
366 * 3 5 6
367 */
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100368 // compute last line of this change
Bram Moolenaar071d4272004-06-13 20:20:40 +0000369 last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
370
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100371 // 1. change completely above line1: nothing to do
Bram Moolenaar071d4272004-06-13 20:20:40 +0000372 if (last >= line1 - 1)
373 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100374 // 6. change below line2: only adjust for amount_after; also when
375 // "deleted" became zero when deleted all lines between two diffs
Bram Moolenaar071d4272004-06-13 20:20:40 +0000376 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
377 {
378 if (amount_after == 0)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100379 break; // nothing left to change
Bram Moolenaar071d4272004-06-13 20:20:40 +0000380 dp->df_lnum[idx] += amount_after;
381 }
382 else
383 {
384 check_unchanged = FALSE;
385
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100386 // 2. 3. 4. 5.: inserted/deleted lines touching this diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000387 if (deleted > 0)
388 {
389 if (dp->df_lnum[idx] >= line1)
390 {
391 off = dp->df_lnum[idx] - lnum_deleted;
392 if (last <= line2)
393 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100394 // 4. delete all lines of diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000395 if (dp->df_next != NULL
396 && dp->df_next->df_lnum[idx] - 1 <= line2)
397 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100398 // delete continues in next diff, only do
399 // lines until that one
Bram Moolenaar071d4272004-06-13 20:20:40 +0000400 n = dp->df_next->df_lnum[idx] - lnum_deleted;
401 deleted -= n;
402 n -= dp->df_count[idx];
403 lnum_deleted = dp->df_next->df_lnum[idx];
404 }
405 else
406 n = deleted - dp->df_count[idx];
407 dp->df_count[idx] = 0;
408 }
409 else
410 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100411 // 5. delete lines at or just before top of diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000412 n = off;
413 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
414 check_unchanged = TRUE;
415 }
416 dp->df_lnum[idx] = line1;
417 }
418 else
419 {
420 off = 0;
421 if (last < line2)
422 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100423 // 2. delete at end of diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000424 dp->df_count[idx] -= last - lnum_deleted + 1;
425 if (dp->df_next != NULL
426 && dp->df_next->df_lnum[idx] - 1 <= line2)
427 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100428 // delete continues in next diff, only do
429 // lines until that one
Bram Moolenaar071d4272004-06-13 20:20:40 +0000430 n = dp->df_next->df_lnum[idx] - 1 - last;
431 deleted -= dp->df_next->df_lnum[idx]
432 - lnum_deleted;
433 lnum_deleted = dp->df_next->df_lnum[idx];
434 }
435 else
436 n = line2 - last;
437 check_unchanged = TRUE;
438 }
439 else
440 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100441 // 3. delete lines inside the diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000442 n = 0;
443 dp->df_count[idx] -= deleted;
444 }
445 }
446
447 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000448 if (tp->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000449 {
450 dp->df_lnum[i] -= off;
451 dp->df_count[i] += n;
452 }
453 }
454 else
455 {
456 if (dp->df_lnum[idx] <= line1)
457 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100458 // inserted lines somewhere in this diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000459 dp->df_count[idx] += inserted;
460 check_unchanged = TRUE;
461 }
462 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100463 // inserted lines somewhere above this diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000464 dp->df_lnum[idx] += inserted;
465 }
466
467 if (check_unchanged)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100468 // Check if inserted lines are equal, may reduce the
469 // size of the diff. TODO: also check for equal lines
470 // in the middle and perhaps split the block.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000471 diff_check_unchanged(tp, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000472 }
473 }
474
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100475 // check if this block touches the previous one, may merge them.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000476 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
477 == dp->df_lnum[idx])
478 {
479 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000480 if (tp->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000481 dprev->df_count[i] += dp->df_count[i];
482 dprev->df_next = dp->df_next;
483 vim_free(dp);
484 dp = dprev->df_next;
485 }
486 else
487 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100488 // Advance to next entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000489 dprev = dp;
490 dp = dp->df_next;
491 }
492 }
493
494 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000495 dp = tp->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000496 while (dp != NULL)
497 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100498 // All counts are zero, remove this entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000499 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000500 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000501 break;
502 if (i == DB_COUNT)
503 {
504 dnext = dp->df_next;
505 vim_free(dp);
506 dp = dnext;
507 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000508 tp->tp_first_diff = dnext;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000509 else
510 dprev->df_next = dnext;
511 }
512 else
513 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100514 // Advance to next entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000515 dprev = dp;
516 dp = dp->df_next;
517 }
518
519 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000520
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000521 if (tp == curtab)
522 {
Bram Moolenaar4f57eef2019-08-24 20:54:19 +0200523 // Don't redraw right away, this updates the diffs, which can be slow.
524 need_diff_redraw = TRUE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000525
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100526 // Need to recompute the scroll binding, may remove or add filler
527 // lines (e.g., when adding lines above w_topline). But it's slow when
528 // making many changes, postpone until redrawing.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000529 diff_need_scrollbind = TRUE;
530 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000531}
532
533/*
534 * Allocate a new diff block and link it between "dprev" and "dp".
535 */
536 static diff_T *
Bram Moolenaar7454a062016-01-30 15:14:10 +0100537diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000538{
539 diff_T *dnew;
540
Bram Moolenaarc799fe22019-05-28 23:08:19 +0200541 dnew = ALLOC_ONE(diff_T);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000542 if (dnew != NULL)
543 {
544 dnew->df_next = dp;
545 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000546 tp->tp_first_diff = dnew;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000547 else
548 dprev->df_next = dnew;
549 }
550 return dnew;
551}
552
553/*
554 * Check if the diff block "dp" can be made smaller for lines at the start and
555 * end that are equal. Called after inserting lines.
556 * This may result in a change where all buffers have zero lines, the caller
557 * must take care of removing it.
558 */
559 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100560diff_check_unchanged(tabpage_T *tp, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000561{
562 int i_org;
563 int i_new;
564 int off_org, off_new;
565 char_u *line_org;
566 int dir = FORWARD;
567
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100568 // Find the first buffers, use it as the original, compare the other
569 // buffer lines against this one.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000570 for (i_org = 0; i_org < DB_COUNT; ++i_org)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000571 if (tp->tp_diffbuf[i_org] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000572 break;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100573 if (i_org == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +0000574 return;
575
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000576 if (diff_check_sanity(tp, dp) == FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000577 return;
578
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100579 // First check lines at the top, then at the bottom.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000580 off_org = 0;
581 off_new = 0;
582 for (;;)
583 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100584 // Repeat until a line is found which is different or the number of
585 // lines has become zero.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000586 while (dp->df_count[i_org] > 0)
587 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100588 // Copy the line, the next ml_get() will invalidate it.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000589 if (dir == BACKWARD)
590 off_org = dp->df_count[i_org] - 1;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000591 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org],
Bram Moolenaar071d4272004-06-13 20:20:40 +0000592 dp->df_lnum[i_org] + off_org, FALSE));
593 if (line_org == NULL)
594 return;
595 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new)
596 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000597 if (tp->tp_diffbuf[i_new] == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000598 continue;
599 if (dir == BACKWARD)
600 off_new = dp->df_count[i_new] - 1;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100601 // if other buffer doesn't have this line, it was inserted
Bram Moolenaar071d4272004-06-13 20:20:40 +0000602 if (off_new < 0 || off_new >= dp->df_count[i_new])
603 break;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000604 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new],
Bram Moolenaar071d4272004-06-13 20:20:40 +0000605 dp->df_lnum[i_new] + off_new, FALSE)) != 0)
606 break;
607 }
608 vim_free(line_org);
609
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100610 // Stop when a line isn't equal in all diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000611 if (i_new != DB_COUNT)
612 break;
613
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100614 // Line matched in all buffers, remove it from the diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000615 for (i_new = i_org; i_new < DB_COUNT; ++i_new)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000616 if (tp->tp_diffbuf[i_new] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000617 {
618 if (dir == FORWARD)
619 ++dp->df_lnum[i_new];
620 --dp->df_count[i_new];
621 }
622 }
623 if (dir == BACKWARD)
624 break;
625 dir = BACKWARD;
626 }
627}
628
629/*
630 * Check if a diff block doesn't contain invalid line numbers.
631 * This can happen when the diff program returns invalid results.
632 */
633 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100634diff_check_sanity(tabpage_T *tp, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000635{
636 int i;
637
638 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000639 if (tp->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000640 if (dp->df_lnum[i] + dp->df_count[i] - 1
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000641 > tp->tp_diffbuf[i]->b_ml.ml_line_count)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000642 return FAIL;
643 return OK;
644}
645
646/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000647 * Mark all diff buffers in the current tab page for redraw.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000648 */
Bram Moolenaar4f57eef2019-08-24 20:54:19 +0200649 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100650diff_redraw(
Bram Moolenaare3521d92018-09-16 14:10:31 +0200651 int dofold) // also recompute the folds
Bram Moolenaar071d4272004-06-13 20:20:40 +0000652{
653 win_T *wp;
654 int n;
655
Bram Moolenaar4f57eef2019-08-24 20:54:19 +0200656 need_diff_redraw = FALSE;
Bram Moolenaar29323592016-07-24 22:04:11 +0200657 FOR_ALL_WINDOWS(wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000658 if (wp->w_p_diff)
659 {
Bram Moolenaar60f83772006-03-12 21:52:47 +0000660 redraw_win_later(wp, SOME_VALID);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000661#ifdef FEAT_FOLDING
662 if (dofold && foldmethodIsDiff(wp))
663 foldUpdateAll(wp);
664#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100665 // A change may have made filler lines invalid, need to take care
666 // of that for other windows.
Bram Moolenaara80888d2012-10-21 22:18:21 +0200667 n = diff_check(wp, wp->w_topline);
668 if ((wp != curwin && wp->w_topfill > 0) || n > 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000669 {
Bram Moolenaar071d4272004-06-13 20:20:40 +0000670 if (wp->w_topfill > n)
671 wp->w_topfill = (n < 0 ? 0 : n);
Bram Moolenaara80888d2012-10-21 22:18:21 +0200672 else if (n > 0 && n > wp->w_topfill)
673 wp->w_topfill = n;
Bram Moolenaar846a2ff2014-05-28 11:35:37 +0200674 check_topfill(wp, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000675 }
676 }
677}
678
Bram Moolenaare828b762018-09-10 17:51:58 +0200679 static void
680clear_diffin(diffin_T *din)
681{
682 if (din->din_fname == NULL)
683 {
684 vim_free(din->din_mmfile.ptr);
685 din->din_mmfile.ptr = NULL;
686 }
687 else
688 mch_remove(din->din_fname);
689}
690
691 static void
692clear_diffout(diffout_T *dout)
693{
694 if (dout->dout_fname == NULL)
695 ga_clear_strings(&dout->dout_ga);
696 else
697 mch_remove(dout->dout_fname);
698}
699
Bram Moolenaar071d4272004-06-13 20:20:40 +0000700/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200701 * Write buffer "buf" to a memory buffer.
702 * Return FAIL for failure.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000703 */
704 static int
Bram Moolenaare828b762018-09-10 17:51:58 +0200705diff_write_buffer(buf_T *buf, diffin_T *din)
706{
707 linenr_T lnum;
708 char_u *s;
709 long len = 0;
710 char_u *ptr;
711
712 // xdiff requires one big block of memory with all the text.
713 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
Bram Moolenaar6e272ac2018-09-16 14:51:36 +0200714 len += (long)STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
Bram Moolenaar18a4ba22019-05-24 19:39:03 +0200715 ptr = alloc(len);
Bram Moolenaare828b762018-09-10 17:51:58 +0200716 if (ptr == NULL)
717 {
718 // Allocating memory failed. This can happen, because we try to read
719 // the whole buffer text into memory. Set the failed flag, the diff
720 // will be retried with external diff. The flag is never reset.
721 buf->b_diff_failed = TRUE;
722 if (p_verbose > 0)
723 {
724 verbose_enter();
Bram Moolenaarf9e3e092019-01-13 23:38:42 +0100725 smsg(_("Not enough memory to use internal diff for buffer \"%s\""),
Bram Moolenaare828b762018-09-10 17:51:58 +0200726 buf->b_fname);
727 verbose_leave();
728 }
729 return FAIL;
730 }
731 din->din_mmfile.ptr = (char *)ptr;
732 din->din_mmfile.size = len;
733
734 len = 0;
735 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
736 {
737 for (s = ml_get_buf(buf, lnum, FALSE); *s != NUL; )
738 {
739 if (diff_flags & DIFF_ICASE)
740 {
741 int c;
Bram Moolenaare828b762018-09-10 17:51:58 +0200742 int orig_len;
743 char_u cbuf[MB_MAXBYTES + 1];
744
Bram Moolenaar13505972019-01-24 15:04:48 +0100745 // xdiff doesn't support ignoring case, fold-case the text.
Bram Moolenaare828b762018-09-10 17:51:58 +0200746 c = PTR2CHAR(s);
747 c = enc_utf8 ? utf_fold(c) : MB_TOLOWER(c);
Bram Moolenaar1614a142019-10-06 22:00:13 +0200748 orig_len = mb_ptr2len(s);
Bram Moolenaare828b762018-09-10 17:51:58 +0200749 if (mb_char2bytes(c, cbuf) != orig_len)
750 // TODO: handle byte length difference
751 mch_memmove(ptr + len, s, orig_len);
752 else
753 mch_memmove(ptr + len, cbuf, orig_len);
754
755 s += orig_len;
756 len += orig_len;
Bram Moolenaare828b762018-09-10 17:51:58 +0200757 }
758 else
759 ptr[len++] = *s++;
760 }
761 ptr[len++] = NL;
762 }
763 return OK;
764}
765
766/*
767 * Write buffer "buf" to file or memory buffer.
768 * Return FAIL for failure.
769 */
770 static int
771diff_write(buf_T *buf, diffin_T *din)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000772{
773 int r;
774 char_u *save_ff;
Bram Moolenaarf4a1d1c2019-11-16 13:50:25 +0100775 int save_lockmarks;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000776
Bram Moolenaare828b762018-09-10 17:51:58 +0200777 if (din->din_fname == NULL)
778 return diff_write_buffer(buf, din);
779
780 // Always use 'fileformat' set to "unix".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000781 save_ff = buf->b_p_ff;
782 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
Bram Moolenaarf4a1d1c2019-11-16 13:50:25 +0100783 save_lockmarks = cmdmod.lockmarks;
784 // Writing the buffer is an implementation detail of performing the diff,
785 // so it shouldn't update the '[ and '] marks.
786 cmdmod.lockmarks = TRUE;
Bram Moolenaare828b762018-09-10 17:51:58 +0200787 r = buf_write(buf, din->din_fname, NULL,
788 (linenr_T)1, buf->b_ml.ml_line_count,
789 NULL, FALSE, FALSE, FALSE, TRUE);
Bram Moolenaarf4a1d1c2019-11-16 13:50:25 +0100790 cmdmod.lockmarks = save_lockmarks;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000791 free_string_option(buf->b_p_ff);
792 buf->b_p_ff = save_ff;
793 return r;
794}
795
796/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200797 * Update the diffs for all buffers involved.
798 */
799 static void
800diff_try_update(
801 diffio_T *dio,
802 int idx_orig,
803 exarg_T *eap) // "eap" can be NULL
804{
805 buf_T *buf;
806 int idx_new;
807
808 if (dio->dio_internal)
809 {
810 ga_init2(&dio->dio_diff.dout_ga, sizeof(char *), 1000);
811 }
812 else
813 {
814 // We need three temp file names.
815 dio->dio_orig.din_fname = vim_tempname('o', TRUE);
816 dio->dio_new.din_fname = vim_tempname('n', TRUE);
817 dio->dio_diff.dout_fname = vim_tempname('d', TRUE);
818 if (dio->dio_orig.din_fname == NULL
819 || dio->dio_new.din_fname == NULL
820 || dio->dio_diff.dout_fname == NULL)
821 goto theend;
822 }
823
824 // Check external diff is actually working.
825 if (!dio->dio_internal && check_external_diff(dio) == FAIL)
826 goto theend;
827
828 // :diffupdate!
829 if (eap != NULL && eap->forceit)
830 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
831 {
832 buf = curtab->tp_diffbuf[idx_new];
833 if (buf_valid(buf))
834 buf_check_timestamp(buf, FALSE);
835 }
836
837 // Write the first buffer to a tempfile or mmfile_t.
838 buf = curtab->tp_diffbuf[idx_orig];
839 if (diff_write(buf, &dio->dio_orig) == FAIL)
840 goto theend;
841
842 // Make a difference between the first buffer and every other.
843 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
844 {
845 buf = curtab->tp_diffbuf[idx_new];
846 if (buf == NULL || buf->b_ml.ml_mfp == NULL)
847 continue; // skip buffer that isn't loaded
848
849 // Write the other buffer and diff with the first one.
850 if (diff_write(buf, &dio->dio_new) == FAIL)
851 continue;
852 if (diff_file(dio) == FAIL)
853 continue;
854
855 // Read the diff output and add each entry to the diff list.
856 diff_read(idx_orig, idx_new, &dio->dio_diff);
857
858 clear_diffin(&dio->dio_new);
859 clear_diffout(&dio->dio_diff);
860 }
861 clear_diffin(&dio->dio_orig);
862
863theend:
864 vim_free(dio->dio_orig.din_fname);
865 vim_free(dio->dio_new.din_fname);
866 vim_free(dio->dio_diff.dout_fname);
867}
868
869/*
870 * Return TRUE if the options are set to use the internal diff library.
871 * Note that if the internal diff failed for one of the buffers, the external
872 * diff will be used anyway.
873 */
Bram Moolenaare3521d92018-09-16 14:10:31 +0200874 int
Bram Moolenaare828b762018-09-10 17:51:58 +0200875diff_internal(void)
876{
Bram Moolenaar975880b2019-03-03 14:42:11 +0100877 return (diff_flags & DIFF_INTERNAL) != 0
878#ifdef FEAT_EVAL
879 && *p_dex == NUL
880#endif
881 ;
Bram Moolenaare828b762018-09-10 17:51:58 +0200882}
883
884/*
885 * Return TRUE if the internal diff failed for one of the diff buffers.
886 */
887 static int
888diff_internal_failed(void)
889{
890 int idx;
891
892 // Only need to do something when there is another buffer.
893 for (idx = 0; idx < DB_COUNT; ++idx)
894 if (curtab->tp_diffbuf[idx] != NULL
895 && curtab->tp_diffbuf[idx]->b_diff_failed)
896 return TRUE;
897 return FALSE;
898}
899
900/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000901 * Completely update the diffs for the buffers involved.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200902 * When using the external "diff" command the buffers are written to a file,
903 * also for unmodified buffers (the file could have been produced by
904 * autocommands, e.g. the netrw plugin).
Bram Moolenaar071d4272004-06-13 20:20:40 +0000905 */
Bram Moolenaar071d4272004-06-13 20:20:40 +0000906 void
Bram Moolenaare828b762018-09-10 17:51:58 +0200907ex_diffupdate(exarg_T *eap) // "eap" can be NULL
Bram Moolenaar071d4272004-06-13 20:20:40 +0000908{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000909 int idx_orig;
910 int idx_new;
Bram Moolenaare828b762018-09-10 17:51:58 +0200911 diffio_T diffio;
Bram Moolenaar198fa062018-09-18 21:20:26 +0200912 int had_diffs = curtab->tp_first_diff != NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000913
Bram Moolenaard2b58c02018-09-16 18:10:48 +0200914 if (diff_busy)
915 {
916 diff_need_update = TRUE;
917 return;
918 }
919
Bram Moolenaare828b762018-09-10 17:51:58 +0200920 // Delete all diffblocks.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000921 diff_clear(curtab);
922 curtab->tp_diff_invalid = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000923
Bram Moolenaare828b762018-09-10 17:51:58 +0200924 // Use the first buffer as the original text.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000925 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000926 if (curtab->tp_diffbuf[idx_orig] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000927 break;
928 if (idx_orig == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200929 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000930
Bram Moolenaare828b762018-09-10 17:51:58 +0200931 // Only need to do something when there is another buffer.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000932 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000933 if (curtab->tp_diffbuf[idx_new] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000934 break;
935 if (idx_new == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200936 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000937
Bram Moolenaare828b762018-09-10 17:51:58 +0200938 // Only use the internal method if it did not fail for one of the buffers.
939 vim_memset(&diffio, 0, sizeof(diffio));
940 diffio.dio_internal = diff_internal() && !diff_internal_failed();
Bram Moolenaar071d4272004-06-13 20:20:40 +0000941
Bram Moolenaare828b762018-09-10 17:51:58 +0200942 diff_try_update(&diffio, idx_orig, eap);
943 if (diffio.dio_internal && diff_internal_failed())
944 {
945 // Internal diff failed, use external diff instead.
946 vim_memset(&diffio, 0, sizeof(diffio));
947 diff_try_update(&diffio, idx_orig, eap);
948 }
949
950 // force updating cursor position on screen
951 curwin->w_valid_cursor.lnum = 0;
952
Bram Moolenaar198fa062018-09-18 21:20:26 +0200953theend:
954 // A redraw is needed if there were diffs and they were cleared, or there
955 // are diffs now, which means they got updated.
956 if (had_diffs || curtab->tp_first_diff != NULL)
957 {
958 diff_redraw(TRUE);
959 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
960 }
Bram Moolenaare828b762018-09-10 17:51:58 +0200961}
962
963/*
964 * Do a quick test if "diff" really works. Otherwise it looks like there
965 * are no differences. Can't use the return value, it's non-zero when
966 * there are differences.
967 */
968 static int
969check_external_diff(diffio_T *diffio)
970{
971 FILE *fd;
972 int ok;
973 int io_error = FALSE;
974
975 // May try twice, first with "-a" and then without.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000976 for (;;)
977 {
978 ok = FALSE;
Bram Moolenaare828b762018-09-10 17:51:58 +0200979 fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000980 if (fd == NULL)
981 io_error = TRUE;
982 else
Bram Moolenaar071d4272004-06-13 20:20:40 +0000983 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000984 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
985 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000986 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +0200987 fd = mch_fopen((char *)diffio->dio_new.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000988 if (fd == NULL)
989 io_error = TRUE;
990 else
Bram Moolenaar071d4272004-06-13 20:20:40 +0000991 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000992 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
993 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000994 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +0200995 fd = NULL;
996 if (diff_file(diffio) == OK)
997 fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000998 if (fd == NULL)
999 io_error = TRUE;
1000 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001001 {
1002 char_u linebuf[LBUFLEN];
1003
1004 for (;;)
1005 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001006 // There must be a line that contains "1c1".
Bram Moolenaar00590742019-02-15 21:06:09 +01001007 if (vim_fgets(linebuf, LBUFLEN, fd))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001008 break;
1009 if (STRNCMP(linebuf, "1c1", 3) == 0)
1010 ok = TRUE;
1011 }
1012 fclose(fd);
1013 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001014 mch_remove(diffio->dio_diff.dout_fname);
1015 mch_remove(diffio->dio_new.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001016 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001017 mch_remove(diffio->dio_orig.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001018 }
1019
1020#ifdef FEAT_EVAL
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001021 // When using 'diffexpr' break here.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001022 if (*p_dex != NUL)
1023 break;
1024#endif
1025
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001026#if defined(MSWIN)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001027 // If the "-a" argument works, also check if "--binary" works.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001028 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
1029 {
1030 diff_a_works = TRUE;
1031 diff_bin_works = TRUE;
1032 continue;
1033 }
1034 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
1035 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001036 // Tried --binary, but it failed. "-a" works though.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001037 diff_bin_works = FALSE;
1038 ok = TRUE;
1039 }
1040#endif
1041
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001042 // If we checked if "-a" works already, break here.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001043 if (diff_a_works != MAYBE)
1044 break;
1045 diff_a_works = ok;
1046
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001047 // If "-a" works break here, otherwise retry without "-a".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001048 if (ok)
1049 break;
1050 }
1051 if (!ok)
1052 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001053 if (io_error)
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001054 emsg(_("E810: Cannot read or write temp files"));
1055 emsg(_("E97: Cannot create diffs"));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001056 diff_a_works = MAYBE;
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001057#if defined(MSWIN)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001058 diff_bin_works = MAYBE;
1059#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001060 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001061 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001062 return OK;
1063}
Bram Moolenaar071d4272004-06-13 20:20:40 +00001064
Bram Moolenaare828b762018-09-10 17:51:58 +02001065/*
1066 * Invoke the xdiff function.
1067 */
1068 static int
1069diff_file_internal(diffio_T *diffio)
1070{
1071 xpparam_t param;
1072 xdemitconf_t emit_cfg;
1073 xdemitcb_t emit_cb;
Bram Moolenaarbd1d5602012-05-18 18:47:17 +02001074
Bram Moolenaare828b762018-09-10 17:51:58 +02001075 vim_memset(&param, 0, sizeof(param));
1076 vim_memset(&emit_cfg, 0, sizeof(emit_cfg));
1077 vim_memset(&emit_cb, 0, sizeof(emit_cb));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001078
Bram Moolenaare828b762018-09-10 17:51:58 +02001079 param.flags = diff_algorithm;
1080
1081 if (diff_flags & DIFF_IWHITE)
1082 param.flags |= XDF_IGNORE_WHITESPACE_CHANGE;
Bram Moolenaar785fc652018-09-15 19:17:38 +02001083 if (diff_flags & DIFF_IWHITEALL)
1084 param.flags |= XDF_IGNORE_WHITESPACE;
1085 if (diff_flags & DIFF_IWHITEEOL)
1086 param.flags |= XDF_IGNORE_WHITESPACE_AT_EOL;
1087 if (diff_flags & DIFF_IBLANK)
1088 param.flags |= XDF_IGNORE_BLANK_LINES;
Bram Moolenaare828b762018-09-10 17:51:58 +02001089
1090 emit_cfg.ctxlen = 0; // don't need any diff_context here
1091 emit_cb.priv = &diffio->dio_diff;
1092 emit_cb.outf = xdiff_out;
1093 if (xdl_diff(&diffio->dio_orig.din_mmfile,
1094 &diffio->dio_new.din_mmfile,
1095 &param, &emit_cfg, &emit_cb) < 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001096 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001097 emsg(_("E960: Problem creating the internal diff"));
Bram Moolenaare828b762018-09-10 17:51:58 +02001098 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001099 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001100 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001101}
1102
1103/*
1104 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
Bram Moolenaare828b762018-09-10 17:51:58 +02001105 * return OK or FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001106 */
Bram Moolenaare828b762018-09-10 17:51:58 +02001107 static int
1108diff_file(diffio_T *dio)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001109{
1110 char_u *cmd;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001111 size_t len;
Bram Moolenaare828b762018-09-10 17:51:58 +02001112 char_u *tmp_orig = dio->dio_orig.din_fname;
1113 char_u *tmp_new = dio->dio_new.din_fname;
1114 char_u *tmp_diff = dio->dio_diff.dout_fname;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001115
1116#ifdef FEAT_EVAL
1117 if (*p_dex != NUL)
Bram Moolenaare828b762018-09-10 17:51:58 +02001118 {
1119 // Use 'diffexpr' to generate the diff file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001120 eval_diff(tmp_orig, tmp_new, tmp_diff);
Bram Moolenaare828b762018-09-10 17:51:58 +02001121 return OK;
1122 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001123 else
1124#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001125 // Use xdiff for generating the diff.
1126 if (dio->dio_internal)
1127 {
1128 return diff_file_internal(dio);
1129 }
1130 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001131 {
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001132 len = STRLEN(tmp_orig) + STRLEN(tmp_new)
1133 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
Bram Moolenaar964b3742019-05-24 18:54:09 +02001134 cmd = alloc(len);
Bram Moolenaare828b762018-09-10 17:51:58 +02001135 if (cmd == NULL)
1136 return FAIL;
Bram Moolenaar95fb60a2005-03-08 22:29:20 +00001137
Bram Moolenaare828b762018-09-10 17:51:58 +02001138 // We don't want $DIFF_OPTIONS to get in the way.
1139 if (getenv("DIFF_OPTIONS"))
1140 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
1141
1142 // Build the diff command and execute it. Always use -a, binary
1143 // differences are of no use. Ignore errors, diff returns
1144 // non-zero when differences have been found.
Bram Moolenaar785fc652018-09-15 19:17:38 +02001145 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s%s%s%s %s",
Bram Moolenaare828b762018-09-10 17:51:58 +02001146 diff_a_works == FALSE ? "" : "-a ",
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001147#if defined(MSWIN)
Bram Moolenaare828b762018-09-10 17:51:58 +02001148 diff_bin_works == TRUE ? "--binary " : "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001149#else
Bram Moolenaare828b762018-09-10 17:51:58 +02001150 "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001151#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001152 (diff_flags & DIFF_IWHITE) ? "-b " : "",
Bram Moolenaar785fc652018-09-15 19:17:38 +02001153 (diff_flags & DIFF_IWHITEALL) ? "-w " : "",
1154 (diff_flags & DIFF_IWHITEEOL) ? "-Z " : "",
1155 (diff_flags & DIFF_IBLANK) ? "-B " : "",
Bram Moolenaare828b762018-09-10 17:51:58 +02001156 (diff_flags & DIFF_ICASE) ? "-i " : "",
1157 tmp_orig, tmp_new);
1158 append_redir(cmd, (int)len, p_srr, tmp_diff);
1159 block_autocmds(); // avoid ShellCmdPost stuff
1160 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
1161 unblock_autocmds();
1162 vim_free(cmd);
1163 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001164 }
1165}
1166
1167/*
1168 * Create a new version of a file from the current buffer and a diff file.
1169 * The buffer is written to a file, also for unmodified buffers (the file
1170 * could have been produced by autocommands, e.g. the netrw plugin).
1171 */
1172 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001173ex_diffpatch(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001174{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001175 char_u *tmp_orig; // name of original temp file
1176 char_u *tmp_new; // name of patched temp file
Bram Moolenaar071d4272004-06-13 20:20:40 +00001177 char_u *buf = NULL;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001178 size_t buflen;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001179 win_T *old_curwin = curwin;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001180 char_u *newname = NULL; // name of patched file buffer
Bram Moolenaar071d4272004-06-13 20:20:40 +00001181#ifdef UNIX
1182 char_u dirbuf[MAXPATHL];
1183 char_u *fullname = NULL;
1184#endif
1185#ifdef FEAT_BROWSE
1186 char_u *browseFile = NULL;
1187 int browse_flag = cmdmod.browse;
1188#endif
Bram Moolenaar8767f522016-07-01 17:17:39 +02001189 stat_T st;
Bram Moolenaara95ab322017-03-11 19:21:53 +01001190 char_u *esc_name = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001191
1192#ifdef FEAT_BROWSE
1193 if (cmdmod.browse)
1194 {
Bram Moolenaar7171abe2004-10-11 10:06:20 +00001195 browseFile = do_browse(0, (char_u *)_("Patch file"),
Bram Moolenaarc36651b2018-04-29 12:22:56 +02001196 eap->arg, NULL, NULL,
1197 (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001198 if (browseFile == NULL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001199 return; // operation cancelled
Bram Moolenaar071d4272004-06-13 20:20:40 +00001200 eap->arg = browseFile;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001201 cmdmod.browse = FALSE; // don't let do_ecmd() browse again
Bram Moolenaar071d4272004-06-13 20:20:40 +00001202 }
1203#endif
1204
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001205 // We need two temp file names.
Bram Moolenaare5c421c2015-03-31 13:33:08 +02001206 tmp_orig = vim_tempname('o', FALSE);
1207 tmp_new = vim_tempname('n', FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001208 if (tmp_orig == NULL || tmp_new == NULL)
1209 goto theend;
1210
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001211 // Write the current buffer to "tmp_orig".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001212 if (buf_write(curbuf, tmp_orig, NULL,
1213 (linenr_T)1, curbuf->b_ml.ml_line_count,
1214 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
1215 goto theend;
1216
1217#ifdef UNIX
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001218 // Get the absolute path of the patchfile, changing directory below.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001219 fullname = FullName_save(eap->arg, FALSE);
1220#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001221 esc_name = vim_strsave_shellescape(
Bram Moolenaar071d4272004-06-13 20:20:40 +00001222# ifdef UNIX
Bram Moolenaara95ab322017-03-11 19:21:53 +01001223 fullname != NULL ? fullname :
Bram Moolenaar071d4272004-06-13 20:20:40 +00001224# endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001225 eap->arg, TRUE, TRUE);
1226 if (esc_name == NULL)
1227 goto theend;
1228 buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16;
Bram Moolenaar964b3742019-05-24 18:54:09 +02001229 buf = alloc(buflen);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001230 if (buf == NULL)
1231 goto theend;
1232
1233#ifdef UNIX
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001234 // Temporarily chdir to /tmp, to avoid patching files in the current
1235 // directory when the patch file contains more than one patch. When we
1236 // have our own temp dir use that instead, it will be cleaned up when we
1237 // exit (any .rej files created). Don't change directory if we can't
1238 // return to the current.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001239 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
1240 dirbuf[0] = NUL;
1241 else
1242 {
1243# ifdef TEMPDIRNAMES
1244 if (vim_tempdir != NULL)
Bram Moolenaar42335f52018-09-13 15:33:43 +02001245 vim_ignored = mch_chdir((char *)vim_tempdir);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001246 else
1247# endif
Bram Moolenaar42335f52018-09-13 15:33:43 +02001248 vim_ignored = mch_chdir("/tmp");
Bram Moolenaar071d4272004-06-13 20:20:40 +00001249 shorten_fnames(TRUE);
1250 }
1251#endif
1252
1253#ifdef FEAT_EVAL
1254 if (*p_pex != NUL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001255 // Use 'patchexpr' to generate the new file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001256 eval_patch(tmp_orig,
1257# ifdef UNIX
1258 fullname != NULL ? fullname :
1259# endif
1260 eap->arg, tmp_new);
1261 else
1262#endif
1263 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001264 // Build the patch command and execute it. Ignore errors. Switch to
1265 // cooked mode to allow the user to respond to prompts.
Bram Moolenaara95ab322017-03-11 19:21:53 +01001266 vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s",
1267 tmp_new, tmp_orig, esc_name);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001268 block_autocmds(); // Avoid ShellCmdPost stuff
Bram Moolenaar071d4272004-06-13 20:20:40 +00001269 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
Bram Moolenaar78ab3312007-09-29 12:16:41 +00001270 unblock_autocmds();
Bram Moolenaar071d4272004-06-13 20:20:40 +00001271 }
1272
1273#ifdef UNIX
1274 if (dirbuf[0] != NUL)
1275 {
1276 if (mch_chdir((char *)dirbuf) != 0)
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001277 emsg(_(e_prev_dir));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001278 shorten_fnames(TRUE);
1279 }
1280#endif
1281
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001282 // patch probably has written over the screen
Bram Moolenaar071d4272004-06-13 20:20:40 +00001283 redraw_later(CLEAR);
1284
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001285 // Delete any .orig or .rej file created.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001286 STRCPY(buf, tmp_new);
1287 STRCAT(buf, ".orig");
1288 mch_remove(buf);
1289 STRCPY(buf, tmp_new);
1290 STRCAT(buf, ".rej");
1291 mch_remove(buf);
1292
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001293 // Only continue if the output file was created.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001294 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001295 emsg(_("E816: Cannot read patch output"));
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001296 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001297 {
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001298 if (curbuf->b_fname != NULL)
1299 {
1300 newname = vim_strnsave(curbuf->b_fname,
Bram Moolenaar071d4272004-06-13 20:20:40 +00001301 (int)(STRLEN(curbuf->b_fname) + 4));
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001302 if (newname != NULL)
1303 STRCAT(newname, ".new");
1304 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001305
1306#ifdef FEAT_GUI
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001307 need_mouse_correct = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001308#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001309 // don't use a new tab page, each tab page has its own diffs
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001310 cmdmod.tab = 0;
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001311
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001312 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001313 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001314 // Pretend it was a ":split fname" command
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001315 eap->cmdidx = CMD_split;
1316 eap->arg = tmp_new;
1317 do_exedit(eap, old_curwin);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001318
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001319 // check that split worked and editing tmp_new
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001320 if (curwin != old_curwin && win_valid(old_curwin))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001321 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001322 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001323 diff_win_options(curwin, TRUE);
1324 diff_win_options(old_curwin, TRUE);
1325
1326 if (newname != NULL)
1327 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001328 // do a ":file filename.new" on the patched buffer
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001329 eap->arg = newname;
1330 ex_file(eap);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001331
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001332 // Do filetype detection with the new name.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001333 if (au_has_group((char_u *)"filetypedetect"))
1334 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001335 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001336 }
1337 }
1338 }
1339
1340theend:
1341 if (tmp_orig != NULL)
1342 mch_remove(tmp_orig);
1343 vim_free(tmp_orig);
1344 if (tmp_new != NULL)
1345 mch_remove(tmp_new);
1346 vim_free(tmp_new);
1347 vim_free(newname);
1348 vim_free(buf);
1349#ifdef UNIX
1350 vim_free(fullname);
1351#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001352 vim_free(esc_name);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001353#ifdef FEAT_BROWSE
1354 vim_free(browseFile);
1355 cmdmod.browse = browse_flag;
1356#endif
1357}
1358
1359/*
1360 * Split the window and edit another file, setting options to show the diffs.
1361 */
1362 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001363ex_diffsplit(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001364{
1365 win_T *old_curwin = curwin;
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001366 bufref_T old_curbuf;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001367
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001368 set_bufref(&old_curbuf, curbuf);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001369#ifdef FEAT_GUI
1370 need_mouse_correct = TRUE;
1371#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001372 // Need to compute w_fraction when no redraw happened yet.
Bram Moolenaar46328f92016-08-28 15:39:57 +02001373 validate_cursor();
1374 set_fraction(curwin);
1375
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001376 // don't use a new tab page, each tab page has its own diffs
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001377 cmdmod.tab = 0;
1378
Bram Moolenaarc4675a12006-03-15 22:50:30 +00001379 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001380 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001381 // Pretend it was a ":split fname" command
Bram Moolenaar071d4272004-06-13 20:20:40 +00001382 eap->cmdidx = CMD_split;
Bram Moolenaar4be06f92005-07-29 22:36:03 +00001383 curwin->w_p_diff = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001384 do_exedit(eap, old_curwin);
1385
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001386 if (curwin != old_curwin) // split must have worked
Bram Moolenaar071d4272004-06-13 20:20:40 +00001387 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001388 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001389 diff_win_options(curwin, TRUE);
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001390 if (win_valid(old_curwin))
1391 {
1392 diff_win_options(old_curwin, TRUE);
1393
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001394 if (bufref_valid(&old_curbuf))
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001395 // Move the cursor position to that of the old window.
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001396 curwin->w_cursor.lnum = diff_get_corresponding_line(
Bram Moolenaar025e3e02016-10-18 14:50:18 +02001397 old_curbuf.br_buf, old_curwin->w_cursor.lnum);
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001398 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001399 // Now that lines are folded scroll to show the cursor at the same
1400 // relative position.
Bram Moolenaar46328f92016-08-28 15:39:57 +02001401 scroll_to_fraction(curwin, curwin->w_height);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001402 }
1403 }
1404}
1405
1406/*
Bram Moolenaar84a05ac2013-05-06 04:24:17 +02001407 * Set options to show diffs for the current window.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001408 */
Bram Moolenaar071d4272004-06-13 20:20:40 +00001409 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001410ex_diffthis(exarg_T *eap UNUSED)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001411{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001412 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001413 diff_win_options(curwin, TRUE);
1414}
1415
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001416 static void
1417set_diff_option(win_T *wp, int value)
1418{
1419 win_T *old_curwin = curwin;
1420
1421 curwin = wp;
1422 curbuf = curwin->w_buffer;
1423 ++curbuf_lock;
1424 set_option_value((char_u *)"diff", (long)value, NULL, OPT_LOCAL);
1425 --curbuf_lock;
1426 curwin = old_curwin;
1427 curbuf = curwin->w_buffer;
1428}
1429
Bram Moolenaar071d4272004-06-13 20:20:40 +00001430/*
1431 * Set options in window "wp" for diff mode.
1432 */
1433 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001434diff_win_options(
1435 win_T *wp,
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001436 int addbuf) // Add buffer to diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001437{
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001438# ifdef FEAT_FOLDING
1439 win_T *old_curwin = curwin;
1440
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001441 // close the manually opened folds
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001442 curwin = wp;
1443 newFoldLevel();
1444 curwin = old_curwin;
1445# endif
1446
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001447 // Use 'scrollbind' and 'cursorbind' when available
Bram Moolenaar43929962015-07-03 15:06:56 +02001448 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001449 wp->w_p_scb_save = wp->w_p_scb;
Bram Moolenaar3368ea22010-09-21 16:56:35 +02001450 wp->w_p_scb = TRUE;
Bram Moolenaar43929962015-07-03 15:06:56 +02001451 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001452 wp->w_p_crb_save = wp->w_p_crb;
Bram Moolenaar860cae12010-06-05 23:22:07 +02001453 wp->w_p_crb = TRUE;
Bram Moolenaar43929962015-07-03 15:06:56 +02001454 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001455 wp->w_p_wrap_save = wp->w_p_wrap;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001456 wp->w_p_wrap = FALSE;
1457# ifdef FEAT_FOLDING
Bram Moolenaar43929962015-07-03 15:06:56 +02001458 if (!wp->w_p_diff)
1459 {
1460 if (wp->w_p_diff_saved)
1461 free_string_option(wp->w_p_fdm_save);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001462 wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm);
Bram Moolenaar43929962015-07-03 15:06:56 +02001463 }
Bram Moolenaar20c023a2019-05-26 21:03:24 +02001464 set_string_option_direct_in_win(wp, (char_u *)"fdm", -1, (char_u *)"diff",
Bram Moolenaar5e3cb7e2006-02-27 23:58:35 +00001465 OPT_LOCAL|OPT_FREE, 0);
Bram Moolenaar43929962015-07-03 15:06:56 +02001466 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001467 {
1468 wp->w_p_fdc_save = wp->w_p_fdc;
1469 wp->w_p_fen_save = wp->w_p_fen;
1470 wp->w_p_fdl_save = wp->w_p_fdl;
1471 }
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001472 wp->w_p_fdc = diff_foldcolumn;
1473 wp->w_p_fen = TRUE;
1474 wp->w_p_fdl = 0;
1475 foldUpdateAll(wp);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001476 // make sure topline is not halfway a fold
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001477 changed_window_setting_win(wp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001478# endif
Bram Moolenaar071d4272004-06-13 20:20:40 +00001479 if (vim_strchr(p_sbo, 'h') == NULL)
1480 do_cmdline_cmd((char_u *)"set sbo+=hor");
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001481 // Save the current values, to be restored in ex_diffoff().
Bram Moolenaara87aa802013-07-03 15:47:03 +02001482 wp->w_p_diff_saved = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001483
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001484 set_diff_option(wp, TRUE);
Bram Moolenaar43929962015-07-03 15:06:56 +02001485
Bram Moolenaar071d4272004-06-13 20:20:40 +00001486 if (addbuf)
1487 diff_buf_add(wp->w_buffer);
1488 redraw_win_later(wp, NOT_VALID);
1489}
1490
1491/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001492 * Set options not to show diffs. For the current window or all windows.
Bram Moolenaarf740b292006-02-16 22:11:02 +00001493 * Only in the current tab page.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001494 */
1495 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001496ex_diffoff(exarg_T *eap)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001497{
1498 win_T *wp;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001499 int diffwin = FALSE;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001500
Bram Moolenaar29323592016-07-24 22:04:11 +02001501 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001502 {
Bram Moolenaar00462ff2013-09-20 20:13:53 +02001503 if (eap->forceit ? wp->w_p_diff : wp == curwin)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001504 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001505 // Set 'diff' off. If option values were saved in
1506 // diff_win_options(), restore the ones whose settings seem to have
1507 // been left over from diff mode.
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001508 set_diff_option(wp, FALSE);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001509
Bram Moolenaara87aa802013-07-03 15:47:03 +02001510 if (wp->w_p_diff_saved)
1511 {
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001512
Bram Moolenaar43929962015-07-03 15:06:56 +02001513 if (wp->w_p_scb)
1514 wp->w_p_scb = wp->w_p_scb_save;
Bram Moolenaar43929962015-07-03 15:06:56 +02001515 if (wp->w_p_crb)
1516 wp->w_p_crb = wp->w_p_crb_save;
Bram Moolenaar43929962015-07-03 15:06:56 +02001517 if (!wp->w_p_wrap)
1518 wp->w_p_wrap = wp->w_p_wrap_save;
1519#ifdef FEAT_FOLDING
1520 free_string_option(wp->w_p_fdm);
Bram Moolenaar79a213d2017-05-16 13:15:18 +02001521 wp->w_p_fdm = vim_strsave(
1522 *wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u*)"manual");
Bram Moolenaar43929962015-07-03 15:06:56 +02001523
1524 if (wp->w_p_fdc == diff_foldcolumn)
1525 wp->w_p_fdc = wp->w_p_fdc_save;
1526 if (wp->w_p_fdl == 0)
1527 wp->w_p_fdl = wp->w_p_fdl_save;
1528
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001529 // Only restore 'foldenable' when 'foldmethod' is not
1530 // "manual", otherwise we continue to show the diff folds.
Bram Moolenaar43929962015-07-03 15:06:56 +02001531 if (wp->w_p_fen)
1532 wp->w_p_fen = foldmethodIsManual(wp) ? FALSE
1533 : wp->w_p_fen_save;
1534
1535 foldUpdateAll(wp);
Bram Moolenaar43929962015-07-03 15:06:56 +02001536#endif
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001537 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001538 // remove filler lines
Bram Moolenaare67d5462016-08-27 22:40:42 +02001539 wp->w_topfill = 0;
1540
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001541 // make sure topline is not halfway a fold and cursor is
1542 // invalidated
Bram Moolenaare67d5462016-08-27 22:40:42 +02001543 changed_window_setting_win(wp);
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001544
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001545 // Note: 'sbo' is not restored, it's a global option.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001546 diff_buf_adjust(wp);
1547 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001548 diffwin |= wp->w_p_diff;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001549 }
1550
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001551 // Also remove hidden buffers from the list.
Bram Moolenaar25ea0542017-02-03 23:16:28 +01001552 if (eap->forceit)
1553 diff_buf_clear();
1554
Bram Moolenaarc8234772019-11-10 21:00:27 +01001555 if (!diffwin)
1556 {
1557 diff_need_update = FALSE;
1558 curtab->tp_diff_invalid = FALSE;
1559 curtab->tp_diff_update = FALSE;
1560 diff_clear(curtab);
1561 }
1562
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001563 // Remove "hor" from from 'scrollopt' if there are no diff windows left.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001564 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
1565 do_cmdline_cmd((char_u *)"set sbo-=hor");
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001566}
1567
1568/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00001569 * Read the diff output and add each entry to the diff list.
1570 */
1571 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001572diff_read(
Bram Moolenaare828b762018-09-10 17:51:58 +02001573 int idx_orig, // idx of original file
1574 int idx_new, // idx of new file
1575 diffout_T *dout) // diff output
Bram Moolenaar071d4272004-06-13 20:20:40 +00001576{
Bram Moolenaare828b762018-09-10 17:51:58 +02001577 FILE *fd = NULL;
1578 int line_idx = 0;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001579 diff_T *dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001580 diff_T *dp = curtab->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001581 diff_T *dn, *dpl;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001582 char_u linebuf[LBUFLEN]; // only need to hold the diff line
Bram Moolenaare828b762018-09-10 17:51:58 +02001583 char_u *line;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001584 long off;
1585 int i;
1586 linenr_T lnum_orig, lnum_new;
1587 long count_orig, count_new;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001588 int notset = TRUE; // block "*dp" not set yet
Bram Moolenaare828b762018-09-10 17:51:58 +02001589 enum {
1590 DIFF_ED,
1591 DIFF_UNIFIED,
1592 DIFF_NONE
1593 } diffstyle = DIFF_NONE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001594
Bram Moolenaare828b762018-09-10 17:51:58 +02001595 if (dout->dout_fname == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001596 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001597 diffstyle = DIFF_UNIFIED;
1598 }
1599 else
1600 {
1601 fd = mch_fopen((char *)dout->dout_fname, "r");
1602 if (fd == NULL)
1603 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001604 emsg(_("E98: Cannot read diff output"));
Bram Moolenaare828b762018-09-10 17:51:58 +02001605 return;
1606 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001607 }
1608
1609 for (;;)
1610 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001611 if (fd == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001612 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001613 if (line_idx >= dout->dout_ga.ga_len)
1614 break; // did last line
1615 line = ((char_u **)dout->dout_ga.ga_data)[line_idx++];
Bram Moolenaar071d4272004-06-13 20:20:40 +00001616 }
1617 else
1618 {
Bram Moolenaar00590742019-02-15 21:06:09 +01001619 if (vim_fgets(linebuf, LBUFLEN, fd))
Bram Moolenaare828b762018-09-10 17:51:58 +02001620 break; // end of file
1621 line = linebuf;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001622 }
1623
Bram Moolenaare828b762018-09-10 17:51:58 +02001624 if (diffstyle == DIFF_NONE)
1625 {
1626 // Determine diff style.
1627 // ed like diff looks like this:
1628 // {first}[,{last}]c{first}[,{last}]
1629 // {first}a{first}[,{last}]
1630 // {first}[,{last}]d{first}
1631 //
1632 // unified diff looks like this:
1633 // --- file1 2018-03-20 13:23:35.783153140 +0100
1634 // +++ file2 2018-03-20 13:23:41.183156066 +0100
1635 // @@ -1,3 +1,5 @@
1636 if (isdigit(*line))
1637 diffstyle = DIFF_ED;
1638 else if ((STRNCMP(line, "@@ ", 3) == 0))
1639 diffstyle = DIFF_UNIFIED;
1640 else if ((STRNCMP(line, "--- ", 4) == 0)
Bram Moolenaar00590742019-02-15 21:06:09 +01001641 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
Bram Moolenaare828b762018-09-10 17:51:58 +02001642 && (STRNCMP(line, "+++ ", 4) == 0)
Bram Moolenaar00590742019-02-15 21:06:09 +01001643 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
Bram Moolenaare828b762018-09-10 17:51:58 +02001644 && (STRNCMP(line, "@@ ", 3) == 0))
1645 diffstyle = DIFF_UNIFIED;
Bram Moolenaar3b8defd2018-09-13 13:03:11 +02001646 else
1647 // Format not recognized yet, skip over this line. Cygwin diff
1648 // may put a warning at the start of the file.
1649 continue;
Bram Moolenaare828b762018-09-10 17:51:58 +02001650 }
1651
1652 if (diffstyle == DIFF_ED)
1653 {
1654 if (!isdigit(*line))
1655 continue; // not the start of a diff block
1656 if (parse_diff_ed(line, &lnum_orig, &count_orig,
1657 &lnum_new, &count_new) == FAIL)
1658 continue;
1659 }
1660 else if (diffstyle == DIFF_UNIFIED)
1661 {
1662 if (STRNCMP(line, "@@ ", 3) != 0)
1663 continue; // not the start of a diff block
1664 if (parse_diff_unified(line, &lnum_orig, &count_orig,
1665 &lnum_new, &count_new) == FAIL)
1666 continue;
1667 }
1668 else
1669 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001670 emsg(_("E959: Invalid diff format."));
Bram Moolenaare828b762018-09-10 17:51:58 +02001671 break;
1672 }
1673
1674 // Go over blocks before the change, for which orig and new are equal.
1675 // Copy blocks from orig to new.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001676 while (dp != NULL
1677 && lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig])
1678 {
1679 if (notset)
1680 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1681 dprev = dp;
1682 dp = dp->df_next;
1683 notset = TRUE;
1684 }
1685
1686 if (dp != NULL
1687 && lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig]
1688 && lnum_orig + count_orig >= dp->df_lnum[idx_orig])
1689 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001690 // New block overlaps with existing block(s).
1691 // First find last block that overlaps.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001692 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
1693 if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig])
1694 break;
1695
Bram Moolenaare828b762018-09-10 17:51:58 +02001696 // If the newly found block starts before the old one, set the
1697 // start back a number of lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001698 off = dp->df_lnum[idx_orig] - lnum_orig;
1699 if (off > 0)
1700 {
1701 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001702 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001703 dp->df_lnum[i] -= off;
1704 dp->df_lnum[idx_new] = lnum_new;
1705 dp->df_count[idx_new] = count_new;
1706 }
1707 else if (notset)
1708 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001709 // new block inside existing one, adjust new block
Bram Moolenaar071d4272004-06-13 20:20:40 +00001710 dp->df_lnum[idx_new] = lnum_new + off;
1711 dp->df_count[idx_new] = count_new - off;
1712 }
1713 else
Bram Moolenaare828b762018-09-10 17:51:58 +02001714 // second overlap of new block with existing block
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00001715 dp->df_count[idx_new] += count_new - count_orig
1716 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
1717 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001718
Bram Moolenaare828b762018-09-10 17:51:58 +02001719 // Adjust the size of the block to include all the lines to the
1720 // end of the existing block or the new diff, whatever ends last.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001721 off = (lnum_orig + count_orig)
1722 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
1723 if (off < 0)
1724 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001725 // new change ends in existing block, adjust the end if not
1726 // done already
Bram Moolenaar071d4272004-06-13 20:20:40 +00001727 if (notset)
1728 dp->df_count[idx_new] += -off;
1729 off = 0;
1730 }
Bram Moolenaard4b96bc2007-10-19 15:33:39 +00001731 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001732 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001733 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
1734 - dp->df_lnum[i] + off;
1735
Bram Moolenaare828b762018-09-10 17:51:58 +02001736 // Delete the diff blocks that have been merged into one.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001737 dn = dp->df_next;
1738 dp->df_next = dpl->df_next;
1739 while (dn != dp->df_next)
1740 {
1741 dpl = dn->df_next;
1742 vim_free(dn);
1743 dn = dpl;
1744 }
1745 }
1746 else
1747 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001748 // Allocate a new diffblock.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001749 dp = diff_alloc_new(curtab, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001750 if (dp == NULL)
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001751 goto done;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001752
1753 dp->df_lnum[idx_orig] = lnum_orig;
1754 dp->df_count[idx_orig] = count_orig;
1755 dp->df_lnum[idx_new] = lnum_new;
1756 dp->df_count[idx_new] = count_new;
1757
Bram Moolenaare828b762018-09-10 17:51:58 +02001758 // Set values for other buffers, these must be equal to the
1759 // original buffer, otherwise there would have been a change
1760 // already.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001761 for (i = idx_orig + 1; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001762 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001763 diff_copy_entry(dprev, dp, idx_orig, i);
1764 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001765 notset = FALSE; // "*dp" has been set
Bram Moolenaar071d4272004-06-13 20:20:40 +00001766 }
1767
Bram Moolenaare828b762018-09-10 17:51:58 +02001768 // for remaining diff blocks orig and new are equal
Bram Moolenaar071d4272004-06-13 20:20:40 +00001769 while (dp != NULL)
1770 {
1771 if (notset)
1772 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1773 dprev = dp;
1774 dp = dp->df_next;
1775 notset = TRUE;
1776 }
1777
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001778done:
Bram Moolenaare828b762018-09-10 17:51:58 +02001779 if (fd != NULL)
1780 fclose(fd);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001781}
1782
1783/*
1784 * Copy an entry at "dp" from "idx_orig" to "idx_new".
1785 */
1786 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001787diff_copy_entry(
1788 diff_T *dprev,
1789 diff_T *dp,
1790 int idx_orig,
1791 int idx_new)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001792{
1793 long off;
1794
1795 if (dprev == NULL)
1796 off = 0;
1797 else
1798 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
1799 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
1800 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
1801 dp->df_count[idx_new] = dp->df_count[idx_orig];
1802}
1803
1804/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001805 * Clear the list of diffblocks for tab page "tp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001806 */
Bram Moolenaarea408852005-06-25 22:49:46 +00001807 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001808diff_clear(tabpage_T *tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001809{
1810 diff_T *p, *next_p;
1811
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001812 for (p = tp->tp_first_diff; p != NULL; p = next_p)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001813 {
1814 next_p = p->df_next;
1815 vim_free(p);
1816 }
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001817 tp->tp_first_diff = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001818}
1819
1820/*
1821 * Check diff status for line "lnum" in buffer "buf":
1822 * Returns 0 for nothing special
1823 * Returns -1 for a line that should be highlighted as changed.
1824 * Returns -2 for a line that should be highlighted as added/deleted.
1825 * Returns > 0 for inserting that many filler lines above it (never happens
1826 * when 'diffopt' doesn't contain "filler").
1827 * This should only be used for windows where 'diff' is set.
1828 */
1829 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001830diff_check(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001831{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001832 int idx; // index in tp_diffbuf[] for this buffer
Bram Moolenaar071d4272004-06-13 20:20:40 +00001833 diff_T *dp;
1834 int maxcount;
1835 int i;
1836 buf_T *buf = wp->w_buffer;
1837 int cmp;
1838
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001839 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001840 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00001841
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001842 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) // no diffs at all
Bram Moolenaar071d4272004-06-13 20:20:40 +00001843 return 0;
1844
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001845 // safety check: "lnum" must be a buffer line
Bram Moolenaar071d4272004-06-13 20:20:40 +00001846 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
1847 return 0;
1848
1849 idx = diff_buf_idx(buf);
1850 if (idx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001851 return 0; // no diffs for buffer "buf"
Bram Moolenaar071d4272004-06-13 20:20:40 +00001852
1853#ifdef FEAT_FOLDING
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001854 // A closed fold never has filler lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001855 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
1856 return 0;
1857#endif
1858
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001859 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001860 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001861 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1862 break;
1863 if (dp == NULL || lnum < dp->df_lnum[idx])
1864 return 0;
1865
1866 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
1867 {
1868 int zero = FALSE;
1869
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001870 // Changed or inserted line. If the other buffers have a count of
1871 // zero, the lines were inserted. If the other buffers have the same
1872 // count, check if the lines are identical.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001873 cmp = FALSE;
1874 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001875 if (i != idx && curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001876 {
1877 if (dp->df_count[i] == 0)
1878 zero = TRUE;
1879 else
1880 {
1881 if (dp->df_count[i] != dp->df_count[idx])
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001882 return -1; // nr of lines changed.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001883 cmp = TRUE;
1884 }
1885 }
1886 if (cmp)
1887 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001888 // Compare all lines. If they are equal the lines were inserted
1889 // in some buffers, deleted in others, but not changed.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001890 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001891 if (i != idx && curtab->tp_diffbuf[i] != NULL
1892 && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001893 if (!diff_equal_entry(dp, idx, i))
1894 return -1;
1895 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001896 // If there is no buffer with zero lines then there is no difference
1897 // any longer. Happens when making a change (or undo) that removes
1898 // the difference. Can't remove the entry here, we might be halfway
1899 // updating the window. Just report the text as unchanged. Other
1900 // windows might still show the change though.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001901 if (zero == FALSE)
1902 return 0;
1903 return -2;
1904 }
1905
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001906 // If 'diffopt' doesn't contain "filler", return 0.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001907 if (!(diff_flags & DIFF_FILLER))
1908 return 0;
1909
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001910 // Insert filler lines above the line just below the change. Will return
1911 // 0 when this buf had the max count.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001912 maxcount = 0;
1913 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001914 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001915 maxcount = dp->df_count[i];
1916 return maxcount - dp->df_count[idx];
1917}
1918
1919/*
1920 * Compare two entries in diff "*dp" and return TRUE if they are equal.
1921 */
1922 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001923diff_equal_entry(diff_T *dp, int idx1, int idx2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001924{
1925 int i;
1926 char_u *line;
1927 int cmp;
1928
1929 if (dp->df_count[idx1] != dp->df_count[idx2])
1930 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001931 if (diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001932 return FALSE;
1933 for (i = 0; i < dp->df_count[idx1]; ++i)
1934 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001935 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
Bram Moolenaar071d4272004-06-13 20:20:40 +00001936 dp->df_lnum[idx1] + i, FALSE));
1937 if (line == NULL)
1938 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001939 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
Bram Moolenaar071d4272004-06-13 20:20:40 +00001940 dp->df_lnum[idx2] + i, FALSE));
1941 vim_free(line);
1942 if (cmp != 0)
1943 return FALSE;
1944 }
1945 return TRUE;
1946}
1947
1948/*
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02001949 * Compare the characters at "p1" and "p2". If they are equal (possibly
1950 * ignoring case) return TRUE and set "len" to the number of bytes.
1951 */
1952 static int
1953diff_equal_char(char_u *p1, char_u *p2, int *len)
1954{
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02001955 int l = (*mb_ptr2len)(p1);
1956
1957 if (l != (*mb_ptr2len)(p2))
1958 return FALSE;
1959 if (l > 1)
1960 {
1961 if (STRNCMP(p1, p2, l) != 0
1962 && (!enc_utf8
1963 || !(diff_flags & DIFF_ICASE)
1964 || utf_fold(utf_ptr2char(p1))
1965 != utf_fold(utf_ptr2char(p2))))
1966 return FALSE;
1967 *len = l;
1968 }
1969 else
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02001970 {
1971 if ((*p1 != *p2)
1972 && (!(diff_flags & DIFF_ICASE)
1973 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
1974 return FALSE;
1975 *len = 1;
1976 }
1977 return TRUE;
1978}
1979
1980/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00001981 * Compare strings "s1" and "s2" according to 'diffopt'.
1982 * Return non-zero when they are different.
1983 */
1984 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001985diff_cmp(char_u *s1, char_u *s2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001986{
1987 char_u *p1, *p2;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001988 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001989
Bram Moolenaar785fc652018-09-15 19:17:38 +02001990 if ((diff_flags & DIFF_IBLANK)
1991 && (*skipwhite(s1) == NUL || *skipwhite(s2) == NUL))
1992 return 0;
1993
1994 if ((diff_flags & (DIFF_ICASE | ALL_WHITE_DIFF)) == 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001995 return STRCMP(s1, s2);
Bram Moolenaar785fc652018-09-15 19:17:38 +02001996 if ((diff_flags & DIFF_ICASE) && !(diff_flags & ALL_WHITE_DIFF))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001997 return MB_STRICMP(s1, s2);
1998
Bram Moolenaar071d4272004-06-13 20:20:40 +00001999 p1 = s1;
2000 p2 = s2;
Bram Moolenaar785fc652018-09-15 19:17:38 +02002001
2002 // Ignore white space changes and possibly ignore case.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002003 while (*p1 != NUL && *p2 != NUL)
2004 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002005 if (((diff_flags & DIFF_IWHITE)
2006 && VIM_ISWHITE(*p1) && VIM_ISWHITE(*p2))
2007 || ((diff_flags & DIFF_IWHITEALL)
2008 && (VIM_ISWHITE(*p1) || VIM_ISWHITE(*p2))))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002009 {
2010 p1 = skipwhite(p1);
2011 p2 = skipwhite(p2);
2012 }
2013 else
2014 {
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002015 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002016 break;
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002017 p1 += l;
2018 p2 += l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002019 }
2020 }
2021
Bram Moolenaar785fc652018-09-15 19:17:38 +02002022 // Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002023 p1 = skipwhite(p1);
2024 p2 = skipwhite(p2);
2025 if (*p1 != NUL || *p2 != NUL)
2026 return 1;
2027 return 0;
2028}
2029
2030/*
2031 * Return the number of filler lines above "lnum".
2032 */
2033 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002034diff_check_fill(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002035{
2036 int n;
2037
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002038 // be quick when there are no filler lines
Bram Moolenaar071d4272004-06-13 20:20:40 +00002039 if (!(diff_flags & DIFF_FILLER))
2040 return 0;
2041 n = diff_check(wp, lnum);
2042 if (n <= 0)
2043 return 0;
2044 return n;
2045}
2046
2047/*
2048 * Set the topline of "towin" to match the position in "fromwin", so that they
2049 * show the same diff'ed lines.
2050 */
2051 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002052diff_set_topline(win_T *fromwin, win_T *towin)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002053{
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002054 buf_T *frombuf = fromwin->w_buffer;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002055 linenr_T lnum = fromwin->w_topline;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002056 int fromidx;
2057 int toidx;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002058 diff_T *dp;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002059 int max_count;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002060 int i;
2061
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002062 fromidx = diff_buf_idx(frombuf);
2063 if (fromidx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002064 return; // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00002065
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002066 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002067 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002068
2069 towin->w_topfill = 0;
2070
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002071 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002072 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002073 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002074 break;
2075 if (dp == NULL)
2076 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002077 // After last change, compute topline relative to end of file; no
2078 // filler lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002079 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002080 - (frombuf->b_ml.ml_line_count - lnum);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002081 }
2082 else
2083 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002084 // Find index for "towin".
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002085 toidx = diff_buf_idx(towin->w_buffer);
2086 if (toidx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002087 return; // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00002088
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002089 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
2090 if (lnum >= dp->df_lnum[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002091 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002092 // Inside a change: compute filler lines. With three or more
2093 // buffers we need to know the largest count.
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002094 max_count = 0;
2095 for (i = 0; i < DB_COUNT; ++i)
2096 if (curtab->tp_diffbuf[i] != NULL
2097 && max_count < dp->df_count[i])
2098 max_count = dp->df_count[i];
2099
2100 if (dp->df_count[toidx] == dp->df_count[fromidx])
2101 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002102 // same number of lines: use same filler count
Bram Moolenaar071d4272004-06-13 20:20:40 +00002103 towin->w_topfill = fromwin->w_topfill;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002104 }
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002105 else if (dp->df_count[toidx] > dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002106 {
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002107 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002108 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002109 // more lines in towin and fromwin doesn't show diff
2110 // lines, only filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002111 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
2112 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002113 // towin also only shows filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002114 towin->w_topline = dp->df_lnum[toidx]
2115 + dp->df_count[toidx];
2116 towin->w_topfill = fromwin->w_topfill;
2117 }
2118 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002119 // towin still has some diff lines to show
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002120 towin->w_topline = dp->df_lnum[toidx]
2121 + max_count - fromwin->w_topfill;
2122 }
2123 }
2124 else if (towin->w_topline >= dp->df_lnum[toidx]
2125 + dp->df_count[toidx])
2126 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002127 // less lines in towin and no diff lines to show: compute
2128 // filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002129 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
2130 if (diff_flags & DIFF_FILLER)
2131 {
2132 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002133 // fromwin is also out of diff lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002134 towin->w_topfill = fromwin->w_topfill;
2135 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002136 // fromwin has some diff lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002137 towin->w_topfill = dp->df_lnum[fromidx]
2138 + max_count - lnum;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002139 }
2140 }
2141 }
2142 }
2143
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002144 // safety check (if diff info gets outdated strange things may happen)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002145 towin->w_botfill = FALSE;
2146 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
2147 {
2148 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
2149 towin->w_botfill = TRUE;
2150 }
2151 if (towin->w_topline < 1)
2152 {
2153 towin->w_topline = 1;
2154 towin->w_topfill = 0;
2155 }
2156
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002157 // When w_topline changes need to recompute w_botline and cursor position
Bram Moolenaar071d4272004-06-13 20:20:40 +00002158 invalidate_botline_win(towin);
2159 changed_line_abv_curs_win(towin);
2160
2161 check_topfill(towin, FALSE);
2162#ifdef FEAT_FOLDING
2163 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
2164 NULL, TRUE, NULL);
2165#endif
2166}
2167
2168/*
2169 * This is called when 'diffopt' is changed.
2170 */
2171 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002172diffopt_changed(void)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002173{
2174 char_u *p;
2175 int diff_context_new = 6;
2176 int diff_flags_new = 0;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002177 int diff_foldcolumn_new = 2;
Bram Moolenaare828b762018-09-10 17:51:58 +02002178 long diff_algorithm_new = 0;
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002179 long diff_indent_heuristic = 0;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002180 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002181
2182 p = p_dip;
2183 while (*p != NUL)
2184 {
2185 if (STRNCMP(p, "filler", 6) == 0)
2186 {
2187 p += 6;
2188 diff_flags_new |= DIFF_FILLER;
2189 }
2190 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
2191 {
2192 p += 8;
2193 diff_context_new = getdigits(&p);
2194 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002195 else if (STRNCMP(p, "iblank", 6) == 0)
2196 {
2197 p += 6;
2198 diff_flags_new |= DIFF_IBLANK;
2199 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002200 else if (STRNCMP(p, "icase", 5) == 0)
2201 {
2202 p += 5;
2203 diff_flags_new |= DIFF_ICASE;
2204 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002205 else if (STRNCMP(p, "iwhiteall", 9) == 0)
2206 {
2207 p += 9;
2208 diff_flags_new |= DIFF_IWHITEALL;
2209 }
2210 else if (STRNCMP(p, "iwhiteeol", 9) == 0)
2211 {
2212 p += 9;
2213 diff_flags_new |= DIFF_IWHITEEOL;
2214 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002215 else if (STRNCMP(p, "iwhite", 6) == 0)
2216 {
2217 p += 6;
2218 diff_flags_new |= DIFF_IWHITE;
2219 }
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002220 else if (STRNCMP(p, "horizontal", 10) == 0)
2221 {
2222 p += 10;
2223 diff_flags_new |= DIFF_HORIZONTAL;
2224 }
2225 else if (STRNCMP(p, "vertical", 8) == 0)
2226 {
2227 p += 8;
2228 diff_flags_new |= DIFF_VERTICAL;
2229 }
2230 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
2231 {
2232 p += 11;
2233 diff_foldcolumn_new = getdigits(&p);
2234 }
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002235 else if (STRNCMP(p, "hiddenoff", 9) == 0)
2236 {
2237 p += 9;
2238 diff_flags_new |= DIFF_HIDDEN_OFF;
2239 }
Bram Moolenaarc8234772019-11-10 21:00:27 +01002240 else if (STRNCMP(p, "closeoff", 8) == 0)
2241 {
2242 p += 8;
2243 diff_flags_new |= DIFF_CLOSE_OFF;
2244 }
Bram Moolenaare828b762018-09-10 17:51:58 +02002245 else if (STRNCMP(p, "indent-heuristic", 16) == 0)
2246 {
2247 p += 16;
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002248 diff_indent_heuristic = XDF_INDENT_HEURISTIC;
Bram Moolenaare828b762018-09-10 17:51:58 +02002249 }
2250 else if (STRNCMP(p, "internal", 8) == 0)
2251 {
2252 p += 8;
2253 diff_flags_new |= DIFF_INTERNAL;
2254 }
2255 else if (STRNCMP(p, "algorithm:", 10) == 0)
2256 {
2257 p += 10;
2258 if (STRNCMP(p, "myers", 5) == 0)
2259 {
2260 p += 5;
2261 diff_algorithm_new = 0;
2262 }
2263 else if (STRNCMP(p, "minimal", 7) == 0)
2264 {
2265 p += 7;
2266 diff_algorithm_new = XDF_NEED_MINIMAL;
2267 }
2268 else if (STRNCMP(p, "patience", 8) == 0)
2269 {
2270 p += 8;
2271 diff_algorithm_new = XDF_PATIENCE_DIFF;
2272 }
2273 else if (STRNCMP(p, "histogram", 9) == 0)
2274 {
2275 p += 9;
2276 diff_algorithm_new = XDF_HISTOGRAM_DIFF;
2277 }
Bram Moolenaard0721052018-11-05 21:21:33 +01002278 else
2279 return FAIL;
Bram Moolenaare828b762018-09-10 17:51:58 +02002280 }
2281
Bram Moolenaar071d4272004-06-13 20:20:40 +00002282 if (*p != ',' && *p != NUL)
2283 return FAIL;
2284 if (*p == ',')
2285 ++p;
2286 }
2287
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002288 diff_algorithm_new |= diff_indent_heuristic;
2289
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002290 // Can't have both "horizontal" and "vertical".
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002291 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
2292 return FAIL;
2293
Bram Moolenaar198fa062018-09-18 21:20:26 +02002294 // If flags were added or removed, or the algorithm was changed, need to
2295 // update the diff.
Bram Moolenaare828b762018-09-10 17:51:58 +02002296 if (diff_flags != diff_flags_new || diff_algorithm != diff_algorithm_new)
Bram Moolenaar29323592016-07-24 22:04:11 +02002297 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002298 tp->tp_diff_invalid = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002299
2300 diff_flags = diff_flags_new;
Bram Moolenaarb9ddda62019-02-19 23:00:50 +01002301 diff_context = diff_context_new == 0 ? 1 : diff_context_new;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002302 diff_foldcolumn = diff_foldcolumn_new;
Bram Moolenaare828b762018-09-10 17:51:58 +02002303 diff_algorithm = diff_algorithm_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002304
2305 diff_redraw(TRUE);
2306
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002307 // recompute the scroll binding with the new option value, may
2308 // remove or add filler lines
Bram Moolenaar071d4272004-06-13 20:20:40 +00002309 check_scrollbind((linenr_T)0, 0L);
2310
2311 return OK;
2312}
2313
2314/*
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002315 * Return TRUE if 'diffopt' contains "horizontal".
2316 */
2317 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002318diffopt_horizontal(void)
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002319{
2320 return (diff_flags & DIFF_HORIZONTAL) != 0;
2321}
2322
2323/*
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002324 * Return TRUE if 'diffopt' contains "hiddenoff".
2325 */
2326 int
2327diffopt_hiddenoff(void)
2328{
2329 return (diff_flags & DIFF_HIDDEN_OFF) != 0;
2330}
2331
2332/*
Bram Moolenaarc8234772019-11-10 21:00:27 +01002333 * Return TRUE if 'diffopt' contains "closeoff".
2334 */
2335 int
2336diffopt_closeoff(void)
2337{
2338 return (diff_flags & DIFF_CLOSE_OFF) != 0;
2339}
2340
2341/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002342 * Find the difference within a changed line.
2343 * Returns TRUE if the line was added, no other buffer has it.
2344 */
2345 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002346diff_find_change(
2347 win_T *wp,
2348 linenr_T lnum,
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002349 int *startp, // first char of the change
2350 int *endp) // last char of the change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002351{
2352 char_u *line_org;
2353 char_u *line_new;
2354 int i;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002355 int si_org, si_new;
2356 int ei_org, ei_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002357 diff_T *dp;
2358 int idx;
2359 int off;
2360 int added = TRUE;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002361 char_u *p1, *p2;
2362 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002363
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002364 // Make a copy of the line, the next ml_get() will invalidate it.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002365 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
2366 if (line_org == NULL)
2367 return FALSE;
2368
2369 idx = diff_buf_idx(wp->w_buffer);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002370 if (idx == DB_COUNT) // cannot happen
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002371 {
2372 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002373 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002374 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002375
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002376 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002377 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002378 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
2379 break;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002380 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002381 {
2382 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002383 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002384 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002385
2386 off = lnum - dp->df_lnum[idx];
2387
2388 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002389 if (curtab->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002390 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002391 // Skip lines that are not in the other change (filler lines).
Bram Moolenaar071d4272004-06-13 20:20:40 +00002392 if (off >= dp->df_count[i])
2393 continue;
2394 added = FALSE;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002395 line_new = ml_get_buf(curtab->tp_diffbuf[i],
2396 dp->df_lnum[i] + off, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002397
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002398 // Search for start of difference
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002399 si_org = si_new = 0;
2400 while (line_org[si_org] != NUL)
2401 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002402 if (((diff_flags & DIFF_IWHITE)
2403 && VIM_ISWHITE(line_org[si_org])
2404 && VIM_ISWHITE(line_new[si_new]))
2405 || ((diff_flags & DIFF_IWHITEALL)
2406 && (VIM_ISWHITE(line_org[si_org])
2407 || VIM_ISWHITE(line_new[si_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002408 {
Bram Moolenaara93fa7e2006-04-17 22:14:47 +00002409 si_org = (int)(skipwhite(line_org + si_org) - line_org);
2410 si_new = (int)(skipwhite(line_new + si_new) - line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002411 }
2412 else
2413 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002414 if (!diff_equal_char(line_org + si_org, line_new + si_new,
2415 &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002416 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002417 si_org += l;
2418 si_new += l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002419 }
2420 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002421 if (has_mbyte)
2422 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002423 // Move back to first byte of character in both lines (may
2424 // have "nn^" in line_org and "n^ in line_new).
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002425 si_org -= (*mb_head_off)(line_org, line_org + si_org);
2426 si_new -= (*mb_head_off)(line_new, line_new + si_new);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002427 }
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002428 if (*startp > si_org)
2429 *startp = si_org;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002430
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002431 // Search for end of difference, if any.
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002432 if (line_org[si_org] != NUL || line_new[si_new] != NUL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002433 {
2434 ei_org = (int)STRLEN(line_org);
2435 ei_new = (int)STRLEN(line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002436 while (ei_org >= *startp && ei_new >= si_new
2437 && ei_org >= 0 && ei_new >= 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002438 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002439 if (((diff_flags & DIFF_IWHITE)
2440 && VIM_ISWHITE(line_org[ei_org])
2441 && VIM_ISWHITE(line_new[ei_new]))
2442 || ((diff_flags & DIFF_IWHITEALL)
2443 && (VIM_ISWHITE(line_org[ei_org])
2444 || VIM_ISWHITE(line_new[ei_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002445 {
2446 while (ei_org >= *startp
Bram Moolenaar1c465442017-03-12 20:10:05 +01002447 && VIM_ISWHITE(line_org[ei_org]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002448 --ei_org;
2449 while (ei_new >= si_new
Bram Moolenaar1c465442017-03-12 20:10:05 +01002450 && VIM_ISWHITE(line_new[ei_new]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002451 --ei_new;
2452 }
2453 else
2454 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002455 p1 = line_org + ei_org;
2456 p2 = line_new + ei_new;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002457 p1 -= (*mb_head_off)(line_org, p1);
2458 p2 -= (*mb_head_off)(line_new, p2);
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002459 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002460 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002461 ei_org -= l;
2462 ei_new -= l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002463 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002464 }
2465 if (*endp < ei_org)
2466 *endp = ei_org;
2467 }
2468 }
2469
2470 vim_free(line_org);
2471 return added;
2472}
2473
2474#if defined(FEAT_FOLDING) || defined(PROTO)
2475/*
2476 * Return TRUE if line "lnum" is not close to a diff block, this line should
2477 * be in a fold.
2478 * Return FALSE if there are no diff blocks at all in this window.
2479 */
2480 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002481diff_infold(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002482{
2483 int i;
2484 int idx = -1;
2485 int other = FALSE;
2486 diff_T *dp;
2487
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002488 // Return if 'diff' isn't set.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002489 if (!wp->w_p_diff)
2490 return FALSE;
2491
2492 for (i = 0; i < DB_COUNT; ++i)
2493 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002494 if (curtab->tp_diffbuf[i] == wp->w_buffer)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002495 idx = i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002496 else if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002497 other = TRUE;
2498 }
2499
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002500 // return here if there are no diffs in the window
Bram Moolenaar071d4272004-06-13 20:20:40 +00002501 if (idx == -1 || !other)
2502 return FALSE;
2503
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002504 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002505 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002506
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002507 // Return if there are no diff blocks. All lines will be folded.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002508 if (curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002509 return TRUE;
2510
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002511 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002512 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002513 // If this change is below the line there can't be any further match.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002514 if (dp->df_lnum[idx] - diff_context > lnum)
2515 break;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002516 // If this change ends before the line we have a match.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002517 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
2518 return FALSE;
2519 }
2520 return TRUE;
2521}
2522#endif
2523
2524/*
2525 * "dp" and "do" commands.
2526 */
2527 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002528nv_diffgetput(int put, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002529{
2530 exarg_T ea;
Bram Moolenaar6a643652014-10-31 13:54:25 +01002531 char_u buf[30];
Bram Moolenaar071d4272004-06-13 20:20:40 +00002532
Bram Moolenaarf2732452018-06-03 14:47:35 +02002533#ifdef FEAT_JOB_CHANNEL
2534 if (bt_prompt(curbuf))
2535 {
2536 vim_beep(BO_OPER);
2537 return;
2538 }
2539#endif
Bram Moolenaar6a643652014-10-31 13:54:25 +01002540 if (count == 0)
2541 ea.arg = (char_u *)"";
2542 else
2543 {
2544 vim_snprintf((char *)buf, 30, "%ld", count);
2545 ea.arg = buf;
2546 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002547 if (put)
2548 ea.cmdidx = CMD_diffput;
2549 else
2550 ea.cmdidx = CMD_diffget;
2551 ea.addr_count = 0;
2552 ea.line1 = curwin->w_cursor.lnum;
2553 ea.line2 = curwin->w_cursor.lnum;
2554 ex_diffgetput(&ea);
2555}
2556
2557/*
2558 * ":diffget"
2559 * ":diffput"
2560 */
2561 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002562ex_diffgetput(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002563{
2564 linenr_T lnum;
2565 int count;
2566 linenr_T off = 0;
2567 diff_T *dp;
2568 diff_T *dprev;
2569 diff_T *dfree;
2570 int idx_cur;
2571 int idx_other;
2572 int idx_from;
2573 int idx_to;
2574 int i;
2575 int added;
2576 char_u *p;
2577 aco_save_T aco;
2578 buf_T *buf;
2579 int start_skip, end_skip;
2580 int new_count;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002581 int buf_empty;
Bram Moolenaar602eb742007-02-20 03:43:38 +00002582 int found_not_ma = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002583
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002584 // Find the current buffer in the list of diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002585 idx_cur = diff_buf_idx(curbuf);
2586 if (idx_cur == DB_COUNT)
2587 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002588 emsg(_("E99: Current buffer is not in diff mode"));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002589 return;
2590 }
2591
2592 if (*eap->arg == NUL)
2593 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002594 // No argument: Find the other buffer in the list of diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002595 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002596 if (curtab->tp_diffbuf[idx_other] != curbuf
Bram Moolenaar602eb742007-02-20 03:43:38 +00002597 && curtab->tp_diffbuf[idx_other] != NULL)
2598 {
2599 if (eap->cmdidx != CMD_diffput
2600 || curtab->tp_diffbuf[idx_other]->b_p_ma)
2601 break;
2602 found_not_ma = TRUE;
2603 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002604 if (idx_other == DB_COUNT)
2605 {
Bram Moolenaar602eb742007-02-20 03:43:38 +00002606 if (found_not_ma)
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002607 emsg(_("E793: No other buffer in diff mode is modifiable"));
Bram Moolenaar602eb742007-02-20 03:43:38 +00002608 else
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002609 emsg(_("E100: No other buffer in diff mode"));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002610 return;
2611 }
2612
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002613 // Check that there isn't a third buffer in the list
Bram Moolenaar071d4272004-06-13 20:20:40 +00002614 for (i = idx_other + 1; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002615 if (curtab->tp_diffbuf[i] != curbuf
2616 && curtab->tp_diffbuf[i] != NULL
2617 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002618 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002619 emsg(_("E101: More than two buffers in diff mode, don't know which one to use"));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002620 return;
2621 }
2622 }
2623 else
2624 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002625 // Buffer number or pattern given. Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002626 p = eap->arg + STRLEN(eap->arg);
Bram Moolenaar1c465442017-03-12 20:10:05 +01002627 while (p > eap->arg && VIM_ISWHITE(p[-1]))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002628 --p;
2629 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
2630 ;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002631 if (eap->arg + i == p) // digits only
Bram Moolenaar071d4272004-06-13 20:20:40 +00002632 i = atol((char *)eap->arg);
2633 else
2634 {
Bram Moolenaar0c279bb2013-03-19 14:25:54 +01002635 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002636 if (i < 0)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002637 return; // error message already given
Bram Moolenaar071d4272004-06-13 20:20:40 +00002638 }
2639 buf = buflist_findnr(i);
2640 if (buf == NULL)
2641 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002642 semsg(_("E102: Can't find buffer \"%s\""), eap->arg);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002643 return;
2644 }
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +00002645 if (buf == curbuf)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002646 return; // nothing to do
Bram Moolenaar071d4272004-06-13 20:20:40 +00002647 idx_other = diff_buf_idx(buf);
2648 if (idx_other == DB_COUNT)
2649 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002650 semsg(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002651 return;
2652 }
2653 }
2654
2655 diff_busy = TRUE;
2656
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002657 // When no range given include the line above or below the cursor.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002658 if (eap->addr_count == 0)
2659 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002660 // Make it possible that ":diffget" on the last line gets line below
2661 // the cursor line when there is no difference above the cursor.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002662 if (eap->cmdidx == CMD_diffget
2663 && eap->line1 == curbuf->b_ml.ml_line_count
2664 && diff_check(curwin, eap->line1) == 0
2665 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
2666 ++eap->line2;
2667 else if (eap->line1 > 0)
2668 --eap->line1;
2669 }
2670
2671 if (eap->cmdidx == CMD_diffget)
2672 {
2673 idx_from = idx_other;
2674 idx_to = idx_cur;
2675 }
2676 else
2677 {
2678 idx_from = idx_cur;
2679 idx_to = idx_other;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002680 // Need to make the other buffer the current buffer to be able to make
2681 // changes in it.
2682 // set curwin/curbuf to buf and save a few things
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002683 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002684 }
2685
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002686 // May give the warning for a changed buffer here, which can trigger the
2687 // FileChangedRO autocommand, which may do nasty things and mess
2688 // everything up.
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002689 if (!curbuf->b_changed)
2690 {
2691 change_warning(0);
2692 if (diff_buf_idx(curbuf) != idx_to)
2693 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002694 emsg(_("E787: Buffer changed unexpectedly"));
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002695 goto theend;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002696 }
2697 }
2698
Bram Moolenaar071d4272004-06-13 20:20:40 +00002699 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002700 for (dp = curtab->tp_first_diff; dp != NULL; )
Bram Moolenaar071d4272004-06-13 20:20:40 +00002701 {
2702 if (dp->df_lnum[idx_cur] > eap->line2 + off)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002703 break; // past the range that was specified
Bram Moolenaar071d4272004-06-13 20:20:40 +00002704
2705 dfree = NULL;
2706 lnum = dp->df_lnum[idx_to];
2707 count = dp->df_count[idx_to];
2708 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
2709 && u_save(lnum - 1, lnum + count) != FAIL)
2710 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002711 // Inside the specified range and saving for undo worked.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002712 start_skip = 0;
2713 end_skip = 0;
2714 if (eap->addr_count > 0)
2715 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002716 // A range was specified: check if lines need to be skipped.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002717 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
2718 if (start_skip > 0)
2719 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002720 // range starts below start of current diff block
Bram Moolenaar071d4272004-06-13 20:20:40 +00002721 if (start_skip > count)
2722 {
2723 lnum += count;
2724 count = 0;
2725 }
2726 else
2727 {
2728 count -= start_skip;
2729 lnum += start_skip;
2730 }
2731 }
2732 else
2733 start_skip = 0;
2734
2735 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
2736 - (eap->line2 + off);
2737 if (end_skip > 0)
2738 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002739 // range ends above end of current/from diff block
2740 if (idx_cur == idx_from) // :diffput
Bram Moolenaar071d4272004-06-13 20:20:40 +00002741 {
2742 i = dp->df_count[idx_cur] - start_skip - end_skip;
2743 if (count > i)
2744 count = i;
2745 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002746 else // :diffget
Bram Moolenaar071d4272004-06-13 20:20:40 +00002747 {
2748 count -= end_skip;
2749 end_skip = dp->df_count[idx_from] - start_skip - count;
2750 if (end_skip < 0)
2751 end_skip = 0;
2752 }
2753 }
2754 else
2755 end_skip = 0;
2756 }
2757
Bram Moolenaarb5aedf32017-03-12 18:23:53 +01002758 buf_empty = BUFEMPTY();
Bram Moolenaar071d4272004-06-13 20:20:40 +00002759 added = 0;
2760 for (i = 0; i < count; ++i)
2761 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002762 // remember deleting the last line of the buffer
Bram Moolenaar280f1262006-01-30 00:14:18 +00002763 buf_empty = curbuf->b_ml.ml_line_count == 1;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002764 ml_delete(lnum, FALSE);
2765 --added;
2766 }
2767 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
2768 {
2769 linenr_T nr;
2770
2771 nr = dp->df_lnum[idx_from] + start_skip + i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002772 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002773 break;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002774 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
2775 nr, FALSE));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002776 if (p != NULL)
2777 {
2778 ml_append(lnum + i - 1, p, 0, FALSE);
2779 vim_free(p);
2780 ++added;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002781 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
2782 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002783 // Added the first line into an empty buffer, need to
2784 // delete the dummy empty line.
Bram Moolenaar280f1262006-01-30 00:14:18 +00002785 buf_empty = FALSE;
2786 ml_delete((linenr_T)2, FALSE);
2787 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002788 }
2789 }
2790 new_count = dp->df_count[idx_to] + added;
2791 dp->df_count[idx_to] = new_count;
2792
2793 if (start_skip == 0 && end_skip == 0)
2794 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002795 // Check if there are any other buffers and if the diff is
2796 // equal in them.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002797 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002798 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
2799 && i != idx_to
Bram Moolenaar071d4272004-06-13 20:20:40 +00002800 && !diff_equal_entry(dp, idx_from, i))
2801 break;
2802 if (i == DB_COUNT)
2803 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002804 // delete the diff entry, the buffers are now equal here
Bram Moolenaar071d4272004-06-13 20:20:40 +00002805 dfree = dp;
2806 dp = dp->df_next;
2807 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002808 curtab->tp_first_diff = dp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002809 else
2810 dprev->df_next = dp;
2811 }
2812 }
2813
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002814 // Adjust marks. This will change the following entries!
Bram Moolenaar071d4272004-06-13 20:20:40 +00002815 if (added != 0)
2816 {
2817 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
2818 if (curwin->w_cursor.lnum >= lnum)
2819 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002820 // Adjust the cursor position if it's in/after the changed
2821 // lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002822 if (curwin->w_cursor.lnum >= lnum + count)
2823 curwin->w_cursor.lnum += added;
2824 else if (added < 0)
2825 curwin->w_cursor.lnum = lnum;
2826 }
2827 }
2828 changed_lines(lnum, 0, lnum + count, (long)added);
2829
2830 if (dfree != NULL)
2831 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002832 // Diff is deleted, update folds in other windows.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002833#ifdef FEAT_FOLDING
2834 diff_fold_update(dfree, idx_to);
2835#endif
2836 vim_free(dfree);
2837 }
2838 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002839 // mark_adjust() may have changed the count in a wrong way
Bram Moolenaar071d4272004-06-13 20:20:40 +00002840 dp->df_count[idx_to] = new_count;
2841
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002842 // When changing the current buffer, keep track of line numbers
Bram Moolenaar071d4272004-06-13 20:20:40 +00002843 if (idx_cur == idx_to)
2844 off += added;
2845 }
2846
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002847 // If before the range or not deleted, go to next diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002848 if (dfree == NULL)
2849 {
2850 dprev = dp;
2851 dp = dp->df_next;
2852 }
2853 }
2854
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002855 // restore curwin/curbuf and a few other things
Bram Moolenaara9d52e32010-07-31 16:44:19 +02002856 if (eap->cmdidx != CMD_diffget)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002857 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002858 // Syncing undo only works for the current buffer, but we change
2859 // another buffer. Sync undo if the command was typed. This isn't
2860 // 100% right when ":diffput" is used in a function or mapping.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002861 if (KeyTyped)
Bram Moolenaar779b74b2006-04-10 14:55:34 +00002862 u_sync(FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002863 aucmd_restbuf(&aco);
2864 }
2865
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002866theend:
Bram Moolenaar071d4272004-06-13 20:20:40 +00002867 diff_busy = FALSE;
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002868 if (diff_need_update)
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002869 ex_diffupdate(NULL);
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002870
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +02002871 // Check that the cursor is on a valid character and update its
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002872 // position. When there were filler lines the topline has become
2873 // invalid.
2874 check_cursor();
2875 changed_line_abv_curs();
2876
2877 if (diff_need_update)
2878 // redraw already done by ex_diffupdate()
2879 diff_need_update = FALSE;
Bram Moolenaar198fa062018-09-18 21:20:26 +02002880 else
2881 {
Bram Moolenaar198fa062018-09-18 21:20:26 +02002882 // Also need to redraw the other buffers.
2883 diff_redraw(FALSE);
2884 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
2885 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002886}
2887
2888#ifdef FEAT_FOLDING
2889/*
2890 * Update folds for all diff buffers for entry "dp".
2891 * Skip buffer with index "skip_idx".
2892 * When there are no diffs, all folds are removed.
2893 */
2894 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002895diff_fold_update(diff_T *dp, int skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002896{
2897 int i;
2898 win_T *wp;
2899
Bram Moolenaar29323592016-07-24 22:04:11 +02002900 FOR_ALL_WINDOWS(wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002901 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002902 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002903 foldUpdate(wp, dp->df_lnum[i],
2904 dp->df_lnum[i] + dp->df_count[i]);
2905}
2906#endif
2907
2908/*
2909 * Return TRUE if buffer "buf" is in diff-mode.
2910 */
2911 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002912diff_mode_buf(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002913{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002914 tabpage_T *tp;
2915
Bram Moolenaar29323592016-07-24 22:04:11 +02002916 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002917 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
2918 return TRUE;
2919 return FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002920}
2921
2922/*
2923 * Move "count" times in direction "dir" to the next diff block.
2924 * Return FAIL if there isn't such a diff block.
2925 */
2926 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002927diff_move_to(int dir, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002928{
2929 int idx;
2930 linenr_T lnum = curwin->w_cursor.lnum;
2931 diff_T *dp;
2932
2933 idx = diff_buf_idx(curbuf);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002934 if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002935 return FAIL;
2936
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002937 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002938 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002939
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002940 if (curtab->tp_first_diff == NULL) // no diffs today
Bram Moolenaar071d4272004-06-13 20:20:40 +00002941 return FAIL;
2942
2943 while (--count >= 0)
2944 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002945 // Check if already before first diff.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002946 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002947 break;
2948
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002949 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002950 {
2951 if (dp == NULL)
2952 break;
2953 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
2954 || (dir == BACKWARD
2955 && (dp->df_next == NULL
2956 || lnum <= dp->df_next->df_lnum[idx])))
2957 {
2958 lnum = dp->df_lnum[idx];
2959 break;
2960 }
2961 }
2962 }
2963
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002964 // don't end up past the end of the file
Bram Moolenaar071d4272004-06-13 20:20:40 +00002965 if (lnum > curbuf->b_ml.ml_line_count)
2966 lnum = curbuf->b_ml.ml_line_count;
2967
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002968 // When the cursor didn't move at all we fail.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002969 if (lnum == curwin->w_cursor.lnum)
2970 return FAIL;
2971
2972 setpcmark();
2973 curwin->w_cursor.lnum = lnum;
2974 curwin->w_cursor.col = 0;
2975
2976 return OK;
2977}
2978
Bram Moolenaar025e3e02016-10-18 14:50:18 +02002979/*
2980 * Return the line number in the current window that is closest to "lnum1" in
2981 * "buf1" in diff mode.
2982 */
2983 static linenr_T
2984diff_get_corresponding_line_int(
Bram Moolenaar7454a062016-01-30 15:14:10 +01002985 buf_T *buf1,
Bram Moolenaar025e3e02016-10-18 14:50:18 +02002986 linenr_T lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02002987{
2988 int idx1;
2989 int idx2;
2990 diff_T *dp;
2991 int baseline = 0;
Bram Moolenaar860cae12010-06-05 23:22:07 +02002992
2993 idx1 = diff_buf_idx(buf1);
Bram Moolenaar025e3e02016-10-18 14:50:18 +02002994 idx2 = diff_buf_idx(curbuf);
Bram Moolenaar860cae12010-06-05 23:22:07 +02002995 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL)
2996 return lnum1;
2997
2998 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002999 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar860cae12010-06-05 23:22:07 +02003000
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003001 if (curtab->tp_first_diff == NULL) // no diffs today
Bram Moolenaar860cae12010-06-05 23:22:07 +02003002 return lnum1;
3003
3004 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
3005 {
3006 if (dp->df_lnum[idx1] > lnum1)
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003007 return lnum1 - baseline;
3008 if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003009 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003010 // Inside the diffblock
Bram Moolenaar860cae12010-06-05 23:22:07 +02003011 baseline = lnum1 - dp->df_lnum[idx1];
3012 if (baseline > dp->df_count[idx2])
3013 baseline = dp->df_count[idx2];
3014
3015 return dp->df_lnum[idx2] + baseline;
3016 }
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003017 if ( (dp->df_lnum[idx1] == lnum1)
3018 && (dp->df_count[idx1] == 0)
3019 && (dp->df_lnum[idx2] <= curwin->w_cursor.lnum)
3020 && ((dp->df_lnum[idx2] + dp->df_count[idx2])
3021 > curwin->w_cursor.lnum))
Bram Moolenaar860cae12010-06-05 23:22:07 +02003022 /*
3023 * Special case: if the cursor is just after a zero-count
3024 * block (i.e. all filler) and the target cursor is already
3025 * inside the corresponding block, leave the target cursor
3026 * unmoved. This makes repeated CTRL-W W operations work
3027 * as expected.
3028 */
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003029 return curwin->w_cursor.lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003030 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1])
3031 - (dp->df_lnum[idx2] + dp->df_count[idx2]);
3032 }
3033
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003034 // If we get here then the cursor is after the last diff
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003035 return lnum1 - baseline;
3036}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003037
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003038/*
3039 * Return the line number in the current window that is closest to "lnum1" in
3040 * "buf1" in diff mode. Checks the line number to be valid.
3041 */
3042 linenr_T
3043diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1)
3044{
3045 linenr_T lnum = diff_get_corresponding_line_int(buf1, lnum1);
3046
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003047 // don't end up past the end of the file
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003048 if (lnum > curbuf->b_ml.ml_line_count)
3049 return curbuf->b_ml.ml_line_count;
3050 return lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003051}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003052
Bram Moolenaar071d4272004-06-13 20:20:40 +00003053/*
3054 * For line "lnum" in the current window find the equivalent lnum in window
3055 * "wp", compensating for inserted/deleted lines.
3056 */
3057 linenr_T
Bram Moolenaar7454a062016-01-30 15:14:10 +01003058diff_lnum_win(linenr_T lnum, win_T *wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003059{
3060 diff_T *dp;
3061 int idx;
3062 int i;
3063 linenr_T n;
3064
3065 idx = diff_buf_idx(curbuf);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003066 if (idx == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00003067 return (linenr_T)0;
3068
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003069 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003070 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00003071
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003072 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003073 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003074 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3075 break;
3076
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003077 // When after the last change, compute relative to the last line number.
Bram Moolenaar071d4272004-06-13 20:20:40 +00003078 if (dp == NULL)
3079 return wp->w_buffer->b_ml.ml_line_count
3080 - (curbuf->b_ml.ml_line_count - lnum);
3081
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003082 // Find index for "wp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00003083 i = diff_buf_idx(wp->w_buffer);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003084 if (i == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00003085 return (linenr_T)0;
3086
3087 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
3088 if (n > dp->df_lnum[i] + dp->df_count[i])
3089 n = dp->df_lnum[i] + dp->df_count[i];
3090 return n;
3091}
Bram Moolenaar071d4272004-06-13 20:20:40 +00003092
Bram Moolenaare828b762018-09-10 17:51:58 +02003093/*
3094 * Handle an ED style diff line.
3095 * Return FAIL if the line does not contain diff info.
3096 */
3097 static int
3098parse_diff_ed(
3099 char_u *line,
3100 linenr_T *lnum_orig,
3101 long *count_orig,
3102 linenr_T *lnum_new,
3103 long *count_new)
3104{
3105 char_u *p;
3106 long f1, l1, f2, l2;
3107 int difftype;
3108
3109 // The line must be one of three formats:
3110 // change: {first}[,{last}]c{first}[,{last}]
3111 // append: {first}a{first}[,{last}]
3112 // delete: {first}[,{last}]d{first}
3113 p = line;
3114 f1 = getdigits(&p);
3115 if (*p == ',')
3116 {
3117 ++p;
3118 l1 = getdigits(&p);
3119 }
3120 else
3121 l1 = f1;
3122 if (*p != 'a' && *p != 'c' && *p != 'd')
3123 return FAIL; // invalid diff format
3124 difftype = *p++;
3125 f2 = getdigits(&p);
3126 if (*p == ',')
3127 {
3128 ++p;
3129 l2 = getdigits(&p);
3130 }
3131 else
3132 l2 = f2;
3133 if (l1 < f1 || l2 < f2)
3134 return FAIL;
3135
3136 if (difftype == 'a')
3137 {
3138 *lnum_orig = f1 + 1;
3139 *count_orig = 0;
3140 }
3141 else
3142 {
3143 *lnum_orig = f1;
3144 *count_orig = l1 - f1 + 1;
3145 }
3146 if (difftype == 'd')
3147 {
3148 *lnum_new = f2 + 1;
3149 *count_new = 0;
3150 }
3151 else
3152 {
3153 *lnum_new = f2;
3154 *count_new = l2 - f2 + 1;
3155 }
3156 return OK;
3157}
3158
3159/*
3160 * Parses unified diff with zero(!) context lines.
3161 * Return FAIL if there is no diff information in "line".
3162 */
3163 static int
3164parse_diff_unified(
3165 char_u *line,
3166 linenr_T *lnum_orig,
3167 long *count_orig,
3168 linenr_T *lnum_new,
3169 long *count_new)
3170{
3171 char_u *p;
3172 long oldline, oldcount, newline, newcount;
3173
3174 // Parse unified diff hunk header:
3175 // @@ -oldline,oldcount +newline,newcount @@
3176 p = line;
3177 if (*p++ == '@' && *p++ == '@' && *p++ == ' ' && *p++ == '-')
3178 {
3179 oldline = getdigits(&p);
3180 if (*p == ',')
3181 {
3182 ++p;
3183 oldcount = getdigits(&p);
3184 }
3185 else
3186 oldcount = 1;
3187 if (*p++ == ' ' && *p++ == '+')
3188 {
3189 newline = getdigits(&p);
3190 if (*p == ',')
3191 {
3192 ++p;
3193 newcount = getdigits(&p);
3194 }
3195 else
3196 newcount = 1;
3197 }
3198 else
3199 return FAIL; // invalid diff format
3200
3201 if (oldcount == 0)
3202 oldline += 1;
3203 if (newcount == 0)
3204 newline += 1;
3205 if (newline == 0)
3206 newline = 1;
3207
3208 *lnum_orig = oldline;
3209 *count_orig = oldcount;
3210 *lnum_new = newline;
3211 *count_new = newcount;
3212
3213 return OK;
3214 }
3215
3216 return FAIL;
3217}
3218
3219/*
3220 * Callback function for the xdl_diff() function.
3221 * Stores the diff output in a grow array.
3222 */
3223 static int
3224xdiff_out(void *priv, mmbuffer_t *mb, int nbuf)
3225{
3226 diffout_T *dout = (diffout_T *)priv;
Bram Moolenaare828b762018-09-10 17:51:58 +02003227 char_u *p;
3228
Bram Moolenaarf080d702018-10-31 22:57:26 +01003229 // The header line always comes by itself, text lines in at least two
3230 // parts. We drop the text part.
3231 if (nbuf > 1)
3232 return 0;
3233
3234 // sanity check
3235 if (STRNCMP(mb[0].ptr, "@@ ", 3) != 0)
3236 return 0;
3237
3238 if (ga_grow(&dout->dout_ga, 1) == FAIL)
3239 return -1;
3240 p = vim_strnsave((char_u *)mb[0].ptr, mb[0].size);
3241 if (p == NULL)
3242 return -1;
3243 ((char_u **)dout->dout_ga.ga_data)[dout->dout_ga.ga_len++] = p;
Bram Moolenaare828b762018-09-10 17:51:58 +02003244 return 0;
3245}
3246
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003247#endif // FEAT_DIFF
3248
3249#if defined(FEAT_EVAL) || defined(PROTO)
3250
3251/*
3252 * "diff_filler()" function
3253 */
3254 void
3255f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
3256{
3257#ifdef FEAT_DIFF
3258 rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars));
3259#endif
3260}
3261
3262/*
3263 * "diff_hlID()" function
3264 */
3265 void
3266f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
3267{
3268#ifdef FEAT_DIFF
3269 linenr_T lnum = tv_get_lnum(argvars);
3270 static linenr_T prev_lnum = 0;
3271 static varnumber_T changedtick = 0;
3272 static int fnum = 0;
3273 static int change_start = 0;
3274 static int change_end = 0;
3275 static hlf_T hlID = (hlf_T)0;
3276 int filler_lines;
3277 int col;
3278
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003279 if (lnum < 0) // ignore type error in {lnum} arg
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003280 lnum = 0;
3281 if (lnum != prev_lnum
3282 || changedtick != CHANGEDTICK(curbuf)
3283 || fnum != curbuf->b_fnum)
3284 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003285 // New line, buffer, change: need to get the values.
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003286 filler_lines = diff_check(curwin, lnum);
3287 if (filler_lines < 0)
3288 {
3289 if (filler_lines == -1)
3290 {
3291 change_start = MAXCOL;
3292 change_end = -1;
3293 if (diff_find_change(curwin, lnum, &change_start, &change_end))
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003294 hlID = HLF_ADD; // added line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003295 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003296 hlID = HLF_CHD; // changed line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003297 }
3298 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003299 hlID = HLF_ADD; // added line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003300 }
3301 else
3302 hlID = (hlf_T)0;
3303 prev_lnum = lnum;
3304 changedtick = CHANGEDTICK(curbuf);
3305 fnum = curbuf->b_fnum;
3306 }
3307
3308 if (hlID == HLF_CHD || hlID == HLF_TXD)
3309 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003310 col = tv_get_number(&argvars[1]) - 1; // ignore type error in {col}
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003311 if (col >= change_start && col <= change_end)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003312 hlID = HLF_TXD; // changed text
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003313 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003314 hlID = HLF_CHD; // changed line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003315 }
3316 rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID;
3317#endif
3318}
3319
3320#endif