blob: b59a1251066b2c8476a3dbaed8c97ab3910e0fe8 [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 Moolenaar4223d432021-02-10 13:18:17 +010039#define DIFF_FOLLOWWRAP 0x800 // follow the wrap option
Bram Moolenaar785fc652018-09-15 19:17:38 +020040#define ALL_WHITE_DIFF (DIFF_IWHITE | DIFF_IWHITEALL | DIFF_IWHITEEOL)
Bram Moolenaarc8234772019-11-10 21:00:27 +010041static int diff_flags = DIFF_INTERNAL | DIFF_FILLER | DIFF_CLOSE_OFF;
Bram Moolenaar071d4272004-06-13 20:20:40 +000042
Bram Moolenaare828b762018-09-10 17:51:58 +020043static long diff_algorithm = 0;
44
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010045#define LBUFLEN 50 // length of line in diff file
Bram Moolenaar071d4272004-06-13 20:20:40 +000046
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010047static int diff_a_works = MAYBE; // TRUE when "diff -a" works, FALSE when it
48 // doesn't work, MAYBE when not checked yet
Bram Moolenaar48e330a2016-02-23 14:53:34 +010049#if defined(MSWIN)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010050static int diff_bin_works = MAYBE; // TRUE when "diff --binary" works, FALSE
51 // when it doesn't work, MAYBE when not
52 // checked yet
Bram Moolenaar071d4272004-06-13 20:20:40 +000053#endif
54
Bram Moolenaare828b762018-09-10 17:51:58 +020055// used for diff input
56typedef struct {
57 char_u *din_fname; // used for external diff
58 mmfile_t din_mmfile; // used for internal diff
59} diffin_T;
60
61// used for diff result
62typedef struct {
63 char_u *dout_fname; // used for external diff
64 garray_T dout_ga; // used for internal diff
65} diffout_T;
66
67// two diff inputs and one result
68typedef struct {
69 diffin_T dio_orig; // original file input
70 diffin_T dio_new; // new file input
71 diffout_T dio_diff; // diff result
72 int dio_internal; // using internal diff
73} diffio_T;
74
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010075static int diff_buf_idx(buf_T *buf);
76static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp);
77static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after);
78static void diff_check_unchanged(tabpage_T *tp, diff_T *dp);
79static int diff_check_sanity(tabpage_T *tp, diff_T *dp);
Bram Moolenaare828b762018-09-10 17:51:58 +020080static int check_external_diff(diffio_T *diffio);
81static int diff_file(diffio_T *diffio);
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010082static int diff_equal_entry(diff_T *dp, int idx1, int idx2);
83static int diff_cmp(char_u *s1, char_u *s2);
Bram Moolenaar071d4272004-06-13 20:20:40 +000084#ifdef FEAT_FOLDING
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010085static void diff_fold_update(diff_T *dp, int skip_idx);
Bram Moolenaar071d4272004-06-13 20:20:40 +000086#endif
Bram Moolenaare828b762018-09-10 17:51:58 +020087static void diff_read(int idx_orig, int idx_new, diffout_T *fname);
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010088static void diff_copy_entry(diff_T *dprev, diff_T *dp, int idx_orig, int idx_new);
89static diff_T *diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp);
Bram Moolenaare828b762018-09-10 17:51:58 +020090static int parse_diff_ed(char_u *line, linenr_T *lnum_orig, long *count_orig, linenr_T *lnum_new, long *count_new);
91static int parse_diff_unified(char_u *line, linenr_T *lnum_orig, long *count_orig, linenr_T *lnum_new, long *count_new);
92static int xdiff_out(void *priv, mmbuffer_t *mb, int nbuf);
Bram Moolenaar071d4272004-06-13 20:20:40 +000093
Bram Moolenaaraeea7212020-04-02 18:50:46 +020094#define FOR_ALL_DIFFBLOCKS_IN_TAB(tp, dp) \
95 for ((dp) = (tp)->tp_first_diff; (dp) != NULL; (dp) = (dp)->df_next)
96
Bram Moolenaar071d4272004-06-13 20:20:40 +000097/*
Bram Moolenaar071d4272004-06-13 20:20:40 +000098 * Called when deleting or unloading a buffer: No longer make a diff with it.
Bram Moolenaar071d4272004-06-13 20:20:40 +000099 */
100 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100101diff_buf_delete(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000102{
103 int i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000104 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000105
Bram Moolenaar29323592016-07-24 22:04:11 +0200106 FOR_ALL_TABPAGES(tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000107 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000108 i = diff_buf_idx_tp(buf, tp);
109 if (i != DB_COUNT)
110 {
111 tp->tp_diffbuf[i] = NULL;
112 tp->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000113 if (tp == curtab)
114 diff_redraw(TRUE);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000115 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000116 }
117}
118
119/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000120 * Check if the current buffer should be added to or removed from the list of
121 * diff buffers.
122 */
123 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100124diff_buf_adjust(win_T *win)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000125{
126 win_T *wp;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000127 int i;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000128
129 if (!win->w_p_diff)
130 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100131 // When there is no window showing a diff for this buffer, remove
132 // it from the diffs.
Bram Moolenaar29323592016-07-24 22:04:11 +0200133 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000134 if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
135 break;
136 if (wp == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000137 {
138 i = diff_buf_idx(win->w_buffer);
139 if (i != DB_COUNT)
140 {
141 curtab->tp_diffbuf[i] = NULL;
142 curtab->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000143 diff_redraw(TRUE);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000144 }
145 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000146 }
147 else
148 diff_buf_add(win->w_buffer);
149}
150
151/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000152 * Add a buffer to make diffs for.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000153 * Call this when a new buffer is being edited in the current window where
154 * 'diff' is set.
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +0000155 * Marks the current buffer as being part of the diff and requiring updating.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000156 * This must be done before any autocmd, because a command may use info
157 * about the screen contents.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000158 */
159 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100160diff_buf_add(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000161{
162 int i;
163
164 if (diff_buf_idx(buf) != DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100165 return; // It's already there.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000166
167 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000168 if (curtab->tp_diffbuf[i] == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000169 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000170 curtab->tp_diffbuf[i] = buf;
171 curtab->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000172 diff_redraw(TRUE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000173 return;
174 }
175
Bram Moolenaarb5443cc2019-01-15 20:19:40 +0100176 semsg(_("E96: Cannot diff more than %d buffers"), DB_COUNT);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000177}
178
179/*
Bram Moolenaar25ea0542017-02-03 23:16:28 +0100180 * Remove all buffers to make diffs for.
181 */
182 static void
183diff_buf_clear(void)
184{
185 int i;
186
187 for (i = 0; i < DB_COUNT; ++i)
188 if (curtab->tp_diffbuf[i] != NULL)
189 {
190 curtab->tp_diffbuf[i] = NULL;
191 curtab->tp_diff_invalid = TRUE;
192 diff_redraw(TRUE);
193 }
194}
195
196/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000197 * Find buffer "buf" in the list of diff buffers for the current tab page.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000198 * Return its index or DB_COUNT if not found.
199 */
200 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100201diff_buf_idx(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000202{
203 int idx;
204
205 for (idx = 0; idx < DB_COUNT; ++idx)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000206 if (curtab->tp_diffbuf[idx] == buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000207 break;
208 return idx;
209}
210
211/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000212 * Find buffer "buf" in the list of diff buffers for tab page "tp".
213 * Return its index or DB_COUNT if not found.
214 */
215 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100216diff_buf_idx_tp(buf_T *buf, tabpage_T *tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000217{
218 int idx;
219
220 for (idx = 0; idx < DB_COUNT; ++idx)
221 if (tp->tp_diffbuf[idx] == buf)
222 break;
223 return idx;
224}
225
226/*
227 * Mark the diff info involving buffer "buf" as invalid, it will be updated
228 * when info is requested.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000229 */
230 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100231diff_invalidate(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000232{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000233 tabpage_T *tp;
234 int i;
235
Bram Moolenaar29323592016-07-24 22:04:11 +0200236 FOR_ALL_TABPAGES(tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000237 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000238 i = diff_buf_idx_tp(buf, tp);
239 if (i != DB_COUNT)
240 {
241 tp->tp_diff_invalid = TRUE;
242 if (tp == curtab)
243 diff_redraw(TRUE);
244 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000245 }
246}
247
248/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000249 * Called by mark_adjust(): update line numbers in "curbuf".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000250 */
251 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100252diff_mark_adjust(
253 linenr_T line1,
254 linenr_T line2,
255 long amount,
256 long amount_after)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000257{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000258 int idx;
259 tabpage_T *tp;
260
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100261 // Handle all tab pages that use the current buffer in a diff.
Bram Moolenaar29323592016-07-24 22:04:11 +0200262 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000263 {
264 idx = diff_buf_idx_tp(curbuf, tp);
265 if (idx != DB_COUNT)
266 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
267 }
268}
269
270/*
271 * Update line numbers in tab page "tp" for "curbuf" with index "idx".
272 * This attempts to update the changes as much as possible:
273 * When inserting/deleting lines outside of existing change blocks, create a
274 * new change block and update the line numbers in following blocks.
275 * When inserting/deleting lines in existing change blocks, update them.
276 */
277 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100278diff_mark_adjust_tp(
279 tabpage_T *tp,
280 int idx,
281 linenr_T line1,
282 linenr_T line2,
283 long amount,
284 long amount_after)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000285{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000286 diff_T *dp;
287 diff_T *dprev;
288 diff_T *dnext;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000289 int i;
290 int inserted, deleted;
291 int n, off;
292 linenr_T last;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100293 linenr_T lnum_deleted = line1; // lnum of remaining deletion
Bram Moolenaar071d4272004-06-13 20:20:40 +0000294 int check_unchanged;
295
Bram Moolenaare3521d92018-09-16 14:10:31 +0200296 if (diff_internal())
297 {
Bram Moolenaar198fa062018-09-18 21:20:26 +0200298 // Will update diffs before redrawing. Set _invalid to update the
Bram Moolenaare3521d92018-09-16 14:10:31 +0200299 // diffs themselves, set _update to also update folds properly just
300 // before redrawing.
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +0200301 // Do update marks here, it is needed for :%diffput.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200302 tp->tp_diff_invalid = TRUE;
303 tp->tp_diff_update = TRUE;
Bram Moolenaare3521d92018-09-16 14:10:31 +0200304 }
305
Bram Moolenaar071d4272004-06-13 20:20:40 +0000306 if (line2 == MAXLNUM)
307 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100308 // mark_adjust(99, MAXLNUM, 9, 0): insert lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000309 inserted = amount;
310 deleted = 0;
311 }
312 else if (amount_after > 0)
313 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100314 // mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000315 inserted = amount_after;
316 deleted = 0;
317 }
318 else
319 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100320 // mark_adjust(98, 99, MAXLNUM, -2): delete lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000321 inserted = 0;
322 deleted = -amount_after;
323 }
324
325 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000326 dp = tp->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000327 for (;;)
328 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100329 // If the change is after the previous diff block and before the next
330 // diff block, thus not touching an existing change, create a new diff
331 // block. Don't do this when ex_diffgetput() is busy.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000332 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2
333 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
334 && (dprev == NULL
335 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
336 && !diff_busy)
337 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000338 dnext = diff_alloc_new(tp, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000339 if (dnext == NULL)
340 return;
341
342 dnext->df_lnum[idx] = line1;
343 dnext->df_count[idx] = inserted;
344 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000345 if (tp->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000346 {
347 if (dprev == NULL)
348 dnext->df_lnum[i] = line1;
349 else
350 dnext->df_lnum[i] = line1
351 + (dprev->df_lnum[i] + dprev->df_count[i])
352 - (dprev->df_lnum[idx] + dprev->df_count[idx]);
353 dnext->df_count[i] = deleted;
354 }
355 }
356
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100357 // if at end of the list, quit
Bram Moolenaar071d4272004-06-13 20:20:40 +0000358 if (dp == NULL)
359 break;
360
361 /*
362 * Check for these situations:
363 * 1 2 3
364 * 1 2 3
365 * line1 2 3 4 5
366 * 2 3 4 5
367 * 2 3 4 5
368 * line2 2 3 4 5
369 * 3 5 6
370 * 3 5 6
371 */
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100372 // compute last line of this change
Bram Moolenaar071d4272004-06-13 20:20:40 +0000373 last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
374
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100375 // 1. change completely above line1: nothing to do
Bram Moolenaar071d4272004-06-13 20:20:40 +0000376 if (last >= line1 - 1)
377 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100378 // 6. change below line2: only adjust for amount_after; also when
379 // "deleted" became zero when deleted all lines between two diffs
Bram Moolenaar071d4272004-06-13 20:20:40 +0000380 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
381 {
382 if (amount_after == 0)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100383 break; // nothing left to change
Bram Moolenaar071d4272004-06-13 20:20:40 +0000384 dp->df_lnum[idx] += amount_after;
385 }
386 else
387 {
388 check_unchanged = FALSE;
389
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100390 // 2. 3. 4. 5.: inserted/deleted lines touching this diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000391 if (deleted > 0)
392 {
393 if (dp->df_lnum[idx] >= line1)
394 {
395 off = dp->df_lnum[idx] - lnum_deleted;
396 if (last <= line2)
397 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100398 // 4. delete all lines of diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000399 if (dp->df_next != NULL
400 && dp->df_next->df_lnum[idx] - 1 <= line2)
401 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100402 // delete continues in next diff, only do
403 // lines until that one
Bram Moolenaar071d4272004-06-13 20:20:40 +0000404 n = dp->df_next->df_lnum[idx] - lnum_deleted;
405 deleted -= n;
406 n -= dp->df_count[idx];
407 lnum_deleted = dp->df_next->df_lnum[idx];
408 }
409 else
410 n = deleted - dp->df_count[idx];
411 dp->df_count[idx] = 0;
412 }
413 else
414 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100415 // 5. delete lines at or just before top of diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000416 n = off;
417 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
418 check_unchanged = TRUE;
419 }
420 dp->df_lnum[idx] = line1;
421 }
422 else
423 {
424 off = 0;
425 if (last < line2)
426 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100427 // 2. delete at end of diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000428 dp->df_count[idx] -= last - lnum_deleted + 1;
429 if (dp->df_next != NULL
430 && dp->df_next->df_lnum[idx] - 1 <= line2)
431 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100432 // delete continues in next diff, only do
433 // lines until that one
Bram Moolenaar071d4272004-06-13 20:20:40 +0000434 n = dp->df_next->df_lnum[idx] - 1 - last;
435 deleted -= dp->df_next->df_lnum[idx]
436 - lnum_deleted;
437 lnum_deleted = dp->df_next->df_lnum[idx];
438 }
439 else
440 n = line2 - last;
441 check_unchanged = TRUE;
442 }
443 else
444 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100445 // 3. delete lines inside the diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000446 n = 0;
447 dp->df_count[idx] -= deleted;
448 }
449 }
450
451 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000452 if (tp->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000453 {
454 dp->df_lnum[i] -= off;
455 dp->df_count[i] += n;
456 }
457 }
458 else
459 {
460 if (dp->df_lnum[idx] <= line1)
461 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100462 // inserted lines somewhere in this diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000463 dp->df_count[idx] += inserted;
464 check_unchanged = TRUE;
465 }
466 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100467 // inserted lines somewhere above this diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000468 dp->df_lnum[idx] += inserted;
469 }
470
471 if (check_unchanged)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100472 // Check if inserted lines are equal, may reduce the
473 // size of the diff. TODO: also check for equal lines
474 // in the middle and perhaps split the block.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000475 diff_check_unchanged(tp, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000476 }
477 }
478
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100479 // check if this block touches the previous one, may merge them.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000480 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
481 == dp->df_lnum[idx])
482 {
483 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000484 if (tp->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000485 dprev->df_count[i] += dp->df_count[i];
486 dprev->df_next = dp->df_next;
487 vim_free(dp);
488 dp = dprev->df_next;
489 }
490 else
491 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100492 // Advance to next entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000493 dprev = dp;
494 dp = dp->df_next;
495 }
496 }
497
498 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000499 dp = tp->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000500 while (dp != NULL)
501 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100502 // All counts are zero, remove this entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000503 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000504 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000505 break;
506 if (i == DB_COUNT)
507 {
508 dnext = dp->df_next;
509 vim_free(dp);
510 dp = dnext;
511 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000512 tp->tp_first_diff = dnext;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000513 else
514 dprev->df_next = dnext;
515 }
516 else
517 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100518 // Advance to next entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000519 dprev = dp;
520 dp = dp->df_next;
521 }
522
523 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000524
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000525 if (tp == curtab)
526 {
Bram Moolenaar4f57eef2019-08-24 20:54:19 +0200527 // Don't redraw right away, this updates the diffs, which can be slow.
528 need_diff_redraw = TRUE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000529
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100530 // Need to recompute the scroll binding, may remove or add filler
531 // lines (e.g., when adding lines above w_topline). But it's slow when
532 // making many changes, postpone until redrawing.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000533 diff_need_scrollbind = TRUE;
534 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000535}
536
537/*
538 * Allocate a new diff block and link it between "dprev" and "dp".
539 */
540 static diff_T *
Bram Moolenaar7454a062016-01-30 15:14:10 +0100541diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000542{
543 diff_T *dnew;
544
Bram Moolenaarc799fe22019-05-28 23:08:19 +0200545 dnew = ALLOC_ONE(diff_T);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000546 if (dnew != NULL)
547 {
548 dnew->df_next = dp;
549 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000550 tp->tp_first_diff = dnew;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000551 else
552 dprev->df_next = dnew;
553 }
554 return dnew;
555}
556
557/*
558 * Check if the diff block "dp" can be made smaller for lines at the start and
559 * end that are equal. Called after inserting lines.
560 * This may result in a change where all buffers have zero lines, the caller
561 * must take care of removing it.
562 */
563 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100564diff_check_unchanged(tabpage_T *tp, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000565{
566 int i_org;
567 int i_new;
568 int off_org, off_new;
569 char_u *line_org;
570 int dir = FORWARD;
571
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100572 // Find the first buffers, use it as the original, compare the other
573 // buffer lines against this one.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000574 for (i_org = 0; i_org < DB_COUNT; ++i_org)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000575 if (tp->tp_diffbuf[i_org] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000576 break;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100577 if (i_org == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +0000578 return;
579
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000580 if (diff_check_sanity(tp, dp) == FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000581 return;
582
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100583 // First check lines at the top, then at the bottom.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000584 off_org = 0;
585 off_new = 0;
586 for (;;)
587 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100588 // Repeat until a line is found which is different or the number of
589 // lines has become zero.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000590 while (dp->df_count[i_org] > 0)
591 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100592 // Copy the line, the next ml_get() will invalidate it.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000593 if (dir == BACKWARD)
594 off_org = dp->df_count[i_org] - 1;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000595 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org],
Bram Moolenaar071d4272004-06-13 20:20:40 +0000596 dp->df_lnum[i_org] + off_org, FALSE));
597 if (line_org == NULL)
598 return;
599 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new)
600 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000601 if (tp->tp_diffbuf[i_new] == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000602 continue;
603 if (dir == BACKWARD)
604 off_new = dp->df_count[i_new] - 1;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100605 // if other buffer doesn't have this line, it was inserted
Bram Moolenaar071d4272004-06-13 20:20:40 +0000606 if (off_new < 0 || off_new >= dp->df_count[i_new])
607 break;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000608 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new],
Bram Moolenaar071d4272004-06-13 20:20:40 +0000609 dp->df_lnum[i_new] + off_new, FALSE)) != 0)
610 break;
611 }
612 vim_free(line_org);
613
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100614 // Stop when a line isn't equal in all diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000615 if (i_new != DB_COUNT)
616 break;
617
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100618 // Line matched in all buffers, remove it from the diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000619 for (i_new = i_org; i_new < DB_COUNT; ++i_new)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000620 if (tp->tp_diffbuf[i_new] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000621 {
622 if (dir == FORWARD)
623 ++dp->df_lnum[i_new];
624 --dp->df_count[i_new];
625 }
626 }
627 if (dir == BACKWARD)
628 break;
629 dir = BACKWARD;
630 }
631}
632
633/*
634 * Check if a diff block doesn't contain invalid line numbers.
635 * This can happen when the diff program returns invalid results.
636 */
637 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100638diff_check_sanity(tabpage_T *tp, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000639{
640 int i;
641
642 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000643 if (tp->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000644 if (dp->df_lnum[i] + dp->df_count[i] - 1
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000645 > tp->tp_diffbuf[i]->b_ml.ml_line_count)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000646 return FAIL;
647 return OK;
648}
649
650/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000651 * Mark all diff buffers in the current tab page for redraw.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000652 */
Bram Moolenaar4f57eef2019-08-24 20:54:19 +0200653 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100654diff_redraw(
Bram Moolenaare3521d92018-09-16 14:10:31 +0200655 int dofold) // also recompute the folds
Bram Moolenaar071d4272004-06-13 20:20:40 +0000656{
657 win_T *wp;
Bram Moolenaar04626c22021-09-01 16:02:07 +0200658 win_T *wp_other = NULL;
659 int used_max_fill = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000660 int n;
661
Bram Moolenaar4f57eef2019-08-24 20:54:19 +0200662 need_diff_redraw = FALSE;
Bram Moolenaar29323592016-07-24 22:04:11 +0200663 FOR_ALL_WINDOWS(wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000664 if (wp->w_p_diff)
665 {
Bram Moolenaar60f83772006-03-12 21:52:47 +0000666 redraw_win_later(wp, SOME_VALID);
Bram Moolenaar04626c22021-09-01 16:02:07 +0200667 if (wp != curwin)
668 wp_other = wp;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000669#ifdef FEAT_FOLDING
670 if (dofold && foldmethodIsDiff(wp))
671 foldUpdateAll(wp);
672#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100673 // A change may have made filler lines invalid, need to take care
674 // of that for other windows.
Bram Moolenaara80888d2012-10-21 22:18:21 +0200675 n = diff_check(wp, wp->w_topline);
676 if ((wp != curwin && wp->w_topfill > 0) || n > 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000677 {
Bram Moolenaar071d4272004-06-13 20:20:40 +0000678 if (wp->w_topfill > n)
679 wp->w_topfill = (n < 0 ? 0 : n);
Bram Moolenaara80888d2012-10-21 22:18:21 +0200680 else if (n > 0 && n > wp->w_topfill)
Bram Moolenaar04626c22021-09-01 16:02:07 +0200681 {
Bram Moolenaara80888d2012-10-21 22:18:21 +0200682 wp->w_topfill = n;
Bram Moolenaar04626c22021-09-01 16:02:07 +0200683 if (wp == curwin)
684 used_max_fill = TRUE;
685 }
Bram Moolenaar846a2ff2014-05-28 11:35:37 +0200686 check_topfill(wp, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000687 }
688 }
Bram Moolenaar04626c22021-09-01 16:02:07 +0200689
690 if (wp_other != NULL && used_max_fill && curwin->w_p_scb)
691 // The current window was set to used the maximum number of filler
692 // lines, may need to reduce them.
693 diff_set_topline(wp_other, curwin);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000694}
695
Bram Moolenaare828b762018-09-10 17:51:58 +0200696 static void
697clear_diffin(diffin_T *din)
698{
699 if (din->din_fname == NULL)
700 {
701 vim_free(din->din_mmfile.ptr);
702 din->din_mmfile.ptr = NULL;
703 }
704 else
705 mch_remove(din->din_fname);
706}
707
708 static void
709clear_diffout(diffout_T *dout)
710{
711 if (dout->dout_fname == NULL)
712 ga_clear_strings(&dout->dout_ga);
713 else
714 mch_remove(dout->dout_fname);
715}
716
Bram Moolenaar071d4272004-06-13 20:20:40 +0000717/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200718 * Write buffer "buf" to a memory buffer.
719 * Return FAIL for failure.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000720 */
721 static int
Bram Moolenaare828b762018-09-10 17:51:58 +0200722diff_write_buffer(buf_T *buf, diffin_T *din)
723{
724 linenr_T lnum;
725 char_u *s;
726 long len = 0;
727 char_u *ptr;
728
729 // xdiff requires one big block of memory with all the text.
730 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
Bram Moolenaar6e272ac2018-09-16 14:51:36 +0200731 len += (long)STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
Bram Moolenaar18a4ba22019-05-24 19:39:03 +0200732 ptr = alloc(len);
Bram Moolenaare828b762018-09-10 17:51:58 +0200733 if (ptr == NULL)
734 {
735 // Allocating memory failed. This can happen, because we try to read
736 // the whole buffer text into memory. Set the failed flag, the diff
737 // will be retried with external diff. The flag is never reset.
738 buf->b_diff_failed = TRUE;
739 if (p_verbose > 0)
740 {
741 verbose_enter();
Bram Moolenaarf9e3e092019-01-13 23:38:42 +0100742 smsg(_("Not enough memory to use internal diff for buffer \"%s\""),
Bram Moolenaare828b762018-09-10 17:51:58 +0200743 buf->b_fname);
744 verbose_leave();
745 }
746 return FAIL;
747 }
748 din->din_mmfile.ptr = (char *)ptr;
749 din->din_mmfile.size = len;
750
751 len = 0;
752 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
753 {
754 for (s = ml_get_buf(buf, lnum, FALSE); *s != NUL; )
755 {
756 if (diff_flags & DIFF_ICASE)
757 {
758 int c;
Bram Moolenaare828b762018-09-10 17:51:58 +0200759 int orig_len;
760 char_u cbuf[MB_MAXBYTES + 1];
761
Bram Moolenaar13505972019-01-24 15:04:48 +0100762 // xdiff doesn't support ignoring case, fold-case the text.
Bram Moolenaare828b762018-09-10 17:51:58 +0200763 c = PTR2CHAR(s);
Bram Moolenaar59de4172020-06-09 19:34:54 +0200764 c = MB_CASEFOLD(c);
Bram Moolenaar1614a142019-10-06 22:00:13 +0200765 orig_len = mb_ptr2len(s);
Bram Moolenaare828b762018-09-10 17:51:58 +0200766 if (mb_char2bytes(c, cbuf) != orig_len)
767 // TODO: handle byte length difference
768 mch_memmove(ptr + len, s, orig_len);
769 else
770 mch_memmove(ptr + len, cbuf, orig_len);
771
772 s += orig_len;
773 len += orig_len;
Bram Moolenaare828b762018-09-10 17:51:58 +0200774 }
775 else
776 ptr[len++] = *s++;
777 }
778 ptr[len++] = NL;
779 }
780 return OK;
781}
782
783/*
784 * Write buffer "buf" to file or memory buffer.
785 * Return FAIL for failure.
786 */
787 static int
788diff_write(buf_T *buf, diffin_T *din)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000789{
790 int r;
791 char_u *save_ff;
Bram Moolenaare1004402020-10-24 20:49:43 +0200792 int save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000793
Bram Moolenaare828b762018-09-10 17:51:58 +0200794 if (din->din_fname == NULL)
795 return diff_write_buffer(buf, din);
796
797 // Always use 'fileformat' set to "unix".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000798 save_ff = buf->b_p_ff;
799 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
Bram Moolenaare1004402020-10-24 20:49:43 +0200800 save_cmod_flags = cmdmod.cmod_flags;
Bram Moolenaarf4a1d1c2019-11-16 13:50:25 +0100801 // Writing the buffer is an implementation detail of performing the diff,
802 // so it shouldn't update the '[ and '] marks.
Bram Moolenaare1004402020-10-24 20:49:43 +0200803 cmdmod.cmod_flags |= CMOD_LOCKMARKS;
Bram Moolenaare828b762018-09-10 17:51:58 +0200804 r = buf_write(buf, din->din_fname, NULL,
805 (linenr_T)1, buf->b_ml.ml_line_count,
806 NULL, FALSE, FALSE, FALSE, TRUE);
Bram Moolenaare1004402020-10-24 20:49:43 +0200807 cmdmod.cmod_flags = save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000808 free_string_option(buf->b_p_ff);
809 buf->b_p_ff = save_ff;
810 return r;
811}
812
813/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200814 * Update the diffs for all buffers involved.
815 */
816 static void
817diff_try_update(
818 diffio_T *dio,
819 int idx_orig,
820 exarg_T *eap) // "eap" can be NULL
821{
822 buf_T *buf;
823 int idx_new;
824
825 if (dio->dio_internal)
826 {
827 ga_init2(&dio->dio_diff.dout_ga, sizeof(char *), 1000);
828 }
829 else
830 {
831 // We need three temp file names.
832 dio->dio_orig.din_fname = vim_tempname('o', TRUE);
833 dio->dio_new.din_fname = vim_tempname('n', TRUE);
834 dio->dio_diff.dout_fname = vim_tempname('d', TRUE);
835 if (dio->dio_orig.din_fname == NULL
836 || dio->dio_new.din_fname == NULL
837 || dio->dio_diff.dout_fname == NULL)
838 goto theend;
839 }
840
841 // Check external diff is actually working.
842 if (!dio->dio_internal && check_external_diff(dio) == FAIL)
843 goto theend;
844
845 // :diffupdate!
846 if (eap != NULL && eap->forceit)
847 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
848 {
849 buf = curtab->tp_diffbuf[idx_new];
850 if (buf_valid(buf))
851 buf_check_timestamp(buf, FALSE);
852 }
853
854 // Write the first buffer to a tempfile or mmfile_t.
855 buf = curtab->tp_diffbuf[idx_orig];
856 if (diff_write(buf, &dio->dio_orig) == FAIL)
857 goto theend;
858
859 // Make a difference between the first buffer and every other.
860 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
861 {
862 buf = curtab->tp_diffbuf[idx_new];
863 if (buf == NULL || buf->b_ml.ml_mfp == NULL)
864 continue; // skip buffer that isn't loaded
865
866 // Write the other buffer and diff with the first one.
867 if (diff_write(buf, &dio->dio_new) == FAIL)
868 continue;
869 if (diff_file(dio) == FAIL)
870 continue;
871
872 // Read the diff output and add each entry to the diff list.
873 diff_read(idx_orig, idx_new, &dio->dio_diff);
874
875 clear_diffin(&dio->dio_new);
876 clear_diffout(&dio->dio_diff);
877 }
878 clear_diffin(&dio->dio_orig);
879
880theend:
881 vim_free(dio->dio_orig.din_fname);
882 vim_free(dio->dio_new.din_fname);
883 vim_free(dio->dio_diff.dout_fname);
884}
885
886/*
887 * Return TRUE if the options are set to use the internal diff library.
888 * Note that if the internal diff failed for one of the buffers, the external
889 * diff will be used anyway.
890 */
Bram Moolenaare3521d92018-09-16 14:10:31 +0200891 int
Bram Moolenaare828b762018-09-10 17:51:58 +0200892diff_internal(void)
893{
Bram Moolenaar975880b2019-03-03 14:42:11 +0100894 return (diff_flags & DIFF_INTERNAL) != 0
895#ifdef FEAT_EVAL
896 && *p_dex == NUL
897#endif
898 ;
Bram Moolenaare828b762018-09-10 17:51:58 +0200899}
900
901/*
902 * Return TRUE if the internal diff failed for one of the diff buffers.
903 */
904 static int
905diff_internal_failed(void)
906{
907 int idx;
908
909 // Only need to do something when there is another buffer.
910 for (idx = 0; idx < DB_COUNT; ++idx)
911 if (curtab->tp_diffbuf[idx] != NULL
912 && curtab->tp_diffbuf[idx]->b_diff_failed)
913 return TRUE;
914 return FALSE;
915}
916
917/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000918 * Completely update the diffs for the buffers involved.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200919 * When using the external "diff" command the buffers are written to a file,
920 * also for unmodified buffers (the file could have been produced by
921 * autocommands, e.g. the netrw plugin).
Bram Moolenaar071d4272004-06-13 20:20:40 +0000922 */
Bram Moolenaar071d4272004-06-13 20:20:40 +0000923 void
Bram Moolenaare828b762018-09-10 17:51:58 +0200924ex_diffupdate(exarg_T *eap) // "eap" can be NULL
Bram Moolenaar071d4272004-06-13 20:20:40 +0000925{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000926 int idx_orig;
927 int idx_new;
Bram Moolenaare828b762018-09-10 17:51:58 +0200928 diffio_T diffio;
Bram Moolenaar198fa062018-09-18 21:20:26 +0200929 int had_diffs = curtab->tp_first_diff != NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000930
Bram Moolenaard2b58c02018-09-16 18:10:48 +0200931 if (diff_busy)
932 {
933 diff_need_update = TRUE;
934 return;
935 }
936
Bram Moolenaare828b762018-09-10 17:51:58 +0200937 // Delete all diffblocks.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000938 diff_clear(curtab);
939 curtab->tp_diff_invalid = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000940
Bram Moolenaare828b762018-09-10 17:51:58 +0200941 // Use the first buffer as the original text.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000942 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000943 if (curtab->tp_diffbuf[idx_orig] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000944 break;
945 if (idx_orig == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200946 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000947
Bram Moolenaare828b762018-09-10 17:51:58 +0200948 // Only need to do something when there is another buffer.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000949 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000950 if (curtab->tp_diffbuf[idx_new] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000951 break;
952 if (idx_new == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200953 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000954
Bram Moolenaare828b762018-09-10 17:51:58 +0200955 // Only use the internal method if it did not fail for one of the buffers.
Bram Moolenaara80faa82020-04-12 19:37:17 +0200956 CLEAR_FIELD(diffio);
Bram Moolenaare828b762018-09-10 17:51:58 +0200957 diffio.dio_internal = diff_internal() && !diff_internal_failed();
Bram Moolenaar071d4272004-06-13 20:20:40 +0000958
Bram Moolenaare828b762018-09-10 17:51:58 +0200959 diff_try_update(&diffio, idx_orig, eap);
960 if (diffio.dio_internal && diff_internal_failed())
961 {
962 // Internal diff failed, use external diff instead.
Bram Moolenaara80faa82020-04-12 19:37:17 +0200963 CLEAR_FIELD(diffio);
Bram Moolenaare828b762018-09-10 17:51:58 +0200964 diff_try_update(&diffio, idx_orig, eap);
965 }
966
967 // force updating cursor position on screen
968 curwin->w_valid_cursor.lnum = 0;
969
Bram Moolenaar198fa062018-09-18 21:20:26 +0200970theend:
971 // A redraw is needed if there were diffs and they were cleared, or there
972 // are diffs now, which means they got updated.
973 if (had_diffs || curtab->tp_first_diff != NULL)
974 {
975 diff_redraw(TRUE);
976 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
977 }
Bram Moolenaare828b762018-09-10 17:51:58 +0200978}
979
980/*
981 * Do a quick test if "diff" really works. Otherwise it looks like there
982 * are no differences. Can't use the return value, it's non-zero when
983 * there are differences.
984 */
985 static int
986check_external_diff(diffio_T *diffio)
987{
988 FILE *fd;
989 int ok;
990 int io_error = FALSE;
991
992 // May try twice, first with "-a" and then without.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000993 for (;;)
994 {
995 ok = FALSE;
Bram Moolenaare828b762018-09-10 17:51:58 +0200996 fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +0000997 if (fd == NULL)
998 io_error = TRUE;
999 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001000 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001001 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
1002 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001003 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +02001004 fd = mch_fopen((char *)diffio->dio_new.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001005 if (fd == NULL)
1006 io_error = TRUE;
1007 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001008 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001009 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
1010 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001011 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +02001012 fd = NULL;
1013 if (diff_file(diffio) == OK)
1014 fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001015 if (fd == NULL)
1016 io_error = TRUE;
1017 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001018 {
1019 char_u linebuf[LBUFLEN];
1020
1021 for (;;)
1022 {
glacambread5c1782021-05-24 14:20:53 +02001023 // For normal diff there must be a line that contains
1024 // "1c1". For unified diff "@@ -1 +1 @@".
Bram Moolenaar00590742019-02-15 21:06:09 +01001025 if (vim_fgets(linebuf, LBUFLEN, fd))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001026 break;
glacambread5c1782021-05-24 14:20:53 +02001027 if (STRNCMP(linebuf, "1c1", 3) == 0
1028 || STRNCMP(linebuf, "@@ -1 +1 @@", 11) == 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001029 ok = TRUE;
1030 }
1031 fclose(fd);
1032 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001033 mch_remove(diffio->dio_diff.dout_fname);
1034 mch_remove(diffio->dio_new.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001035 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001036 mch_remove(diffio->dio_orig.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001037 }
1038
1039#ifdef FEAT_EVAL
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001040 // When using 'diffexpr' break here.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001041 if (*p_dex != NUL)
1042 break;
1043#endif
1044
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001045#if defined(MSWIN)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001046 // If the "-a" argument works, also check if "--binary" works.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001047 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
1048 {
1049 diff_a_works = TRUE;
1050 diff_bin_works = TRUE;
1051 continue;
1052 }
1053 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
1054 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001055 // Tried --binary, but it failed. "-a" works though.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001056 diff_bin_works = FALSE;
1057 ok = TRUE;
1058 }
1059#endif
1060
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001061 // If we checked if "-a" works already, break here.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001062 if (diff_a_works != MAYBE)
1063 break;
1064 diff_a_works = ok;
1065
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001066 // If "-a" works break here, otherwise retry without "-a".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001067 if (ok)
1068 break;
1069 }
1070 if (!ok)
1071 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001072 if (io_error)
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001073 emsg(_("E810: Cannot read or write temp files"));
1074 emsg(_("E97: Cannot create diffs"));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001075 diff_a_works = MAYBE;
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001076#if defined(MSWIN)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001077 diff_bin_works = MAYBE;
1078#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001079 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001080 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001081 return OK;
1082}
Bram Moolenaar071d4272004-06-13 20:20:40 +00001083
Bram Moolenaare828b762018-09-10 17:51:58 +02001084/*
1085 * Invoke the xdiff function.
1086 */
1087 static int
1088diff_file_internal(diffio_T *diffio)
1089{
1090 xpparam_t param;
1091 xdemitconf_t emit_cfg;
1092 xdemitcb_t emit_cb;
Bram Moolenaarbd1d5602012-05-18 18:47:17 +02001093
Bram Moolenaara80faa82020-04-12 19:37:17 +02001094 CLEAR_FIELD(param);
1095 CLEAR_FIELD(emit_cfg);
1096 CLEAR_FIELD(emit_cb);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001097
Bram Moolenaare828b762018-09-10 17:51:58 +02001098 param.flags = diff_algorithm;
1099
1100 if (diff_flags & DIFF_IWHITE)
1101 param.flags |= XDF_IGNORE_WHITESPACE_CHANGE;
Bram Moolenaar785fc652018-09-15 19:17:38 +02001102 if (diff_flags & DIFF_IWHITEALL)
1103 param.flags |= XDF_IGNORE_WHITESPACE;
1104 if (diff_flags & DIFF_IWHITEEOL)
1105 param.flags |= XDF_IGNORE_WHITESPACE_AT_EOL;
1106 if (diff_flags & DIFF_IBLANK)
1107 param.flags |= XDF_IGNORE_BLANK_LINES;
Bram Moolenaare828b762018-09-10 17:51:58 +02001108
1109 emit_cfg.ctxlen = 0; // don't need any diff_context here
1110 emit_cb.priv = &diffio->dio_diff;
Christian Brabandtba02e472021-08-31 20:46:39 +02001111 emit_cb.out_line = xdiff_out;
Bram Moolenaare828b762018-09-10 17:51:58 +02001112 if (xdl_diff(&diffio->dio_orig.din_mmfile,
1113 &diffio->dio_new.din_mmfile,
1114 &param, &emit_cfg, &emit_cb) < 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001115 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001116 emsg(_("E960: Problem creating the internal diff"));
Bram Moolenaare828b762018-09-10 17:51:58 +02001117 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001118 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001119 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001120}
1121
1122/*
1123 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
Bram Moolenaare828b762018-09-10 17:51:58 +02001124 * return OK or FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001125 */
Bram Moolenaare828b762018-09-10 17:51:58 +02001126 static int
1127diff_file(diffio_T *dio)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001128{
1129 char_u *cmd;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001130 size_t len;
Bram Moolenaare828b762018-09-10 17:51:58 +02001131 char_u *tmp_orig = dio->dio_orig.din_fname;
1132 char_u *tmp_new = dio->dio_new.din_fname;
1133 char_u *tmp_diff = dio->dio_diff.dout_fname;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001134
1135#ifdef FEAT_EVAL
1136 if (*p_dex != NUL)
Bram Moolenaare828b762018-09-10 17:51:58 +02001137 {
1138 // Use 'diffexpr' to generate the diff file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001139 eval_diff(tmp_orig, tmp_new, tmp_diff);
Bram Moolenaare828b762018-09-10 17:51:58 +02001140 return OK;
1141 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001142 else
1143#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001144 // Use xdiff for generating the diff.
1145 if (dio->dio_internal)
1146 {
1147 return diff_file_internal(dio);
1148 }
1149 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001150 {
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001151 len = STRLEN(tmp_orig) + STRLEN(tmp_new)
1152 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
Bram Moolenaar964b3742019-05-24 18:54:09 +02001153 cmd = alloc(len);
Bram Moolenaare828b762018-09-10 17:51:58 +02001154 if (cmd == NULL)
1155 return FAIL;
Bram Moolenaar95fb60a2005-03-08 22:29:20 +00001156
Bram Moolenaare828b762018-09-10 17:51:58 +02001157 // We don't want $DIFF_OPTIONS to get in the way.
1158 if (getenv("DIFF_OPTIONS"))
1159 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
1160
1161 // Build the diff command and execute it. Always use -a, binary
1162 // differences are of no use. Ignore errors, diff returns
1163 // non-zero when differences have been found.
Bram Moolenaar785fc652018-09-15 19:17:38 +02001164 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s%s%s%s %s",
Bram Moolenaare828b762018-09-10 17:51:58 +02001165 diff_a_works == FALSE ? "" : "-a ",
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001166#if defined(MSWIN)
Bram Moolenaare828b762018-09-10 17:51:58 +02001167 diff_bin_works == TRUE ? "--binary " : "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001168#else
Bram Moolenaare828b762018-09-10 17:51:58 +02001169 "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001170#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001171 (diff_flags & DIFF_IWHITE) ? "-b " : "",
Bram Moolenaar785fc652018-09-15 19:17:38 +02001172 (diff_flags & DIFF_IWHITEALL) ? "-w " : "",
1173 (diff_flags & DIFF_IWHITEEOL) ? "-Z " : "",
1174 (diff_flags & DIFF_IBLANK) ? "-B " : "",
Bram Moolenaare828b762018-09-10 17:51:58 +02001175 (diff_flags & DIFF_ICASE) ? "-i " : "",
1176 tmp_orig, tmp_new);
1177 append_redir(cmd, (int)len, p_srr, tmp_diff);
1178 block_autocmds(); // avoid ShellCmdPost stuff
1179 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
1180 unblock_autocmds();
1181 vim_free(cmd);
1182 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001183 }
1184}
1185
1186/*
1187 * Create a new version of a file from the current buffer and a diff file.
1188 * The buffer is written to a file, also for unmodified buffers (the file
1189 * could have been produced by autocommands, e.g. the netrw plugin).
1190 */
1191 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001192ex_diffpatch(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001193{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001194 char_u *tmp_orig; // name of original temp file
1195 char_u *tmp_new; // name of patched temp file
Bram Moolenaar071d4272004-06-13 20:20:40 +00001196 char_u *buf = NULL;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001197 size_t buflen;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001198 win_T *old_curwin = curwin;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001199 char_u *newname = NULL; // name of patched file buffer
Bram Moolenaar071d4272004-06-13 20:20:40 +00001200#ifdef UNIX
1201 char_u dirbuf[MAXPATHL];
1202 char_u *fullname = NULL;
1203#endif
1204#ifdef FEAT_BROWSE
1205 char_u *browseFile = NULL;
Bram Moolenaare1004402020-10-24 20:49:43 +02001206 int save_cmod_flags = cmdmod.cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001207#endif
Bram Moolenaar8767f522016-07-01 17:17:39 +02001208 stat_T st;
Bram Moolenaara95ab322017-03-11 19:21:53 +01001209 char_u *esc_name = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001210
1211#ifdef FEAT_BROWSE
Bram Moolenaare1004402020-10-24 20:49:43 +02001212 if (cmdmod.cmod_flags & CMOD_BROWSE)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001213 {
Bram Moolenaar7171abe2004-10-11 10:06:20 +00001214 browseFile = do_browse(0, (char_u *)_("Patch file"),
Bram Moolenaarc36651b2018-04-29 12:22:56 +02001215 eap->arg, NULL, NULL,
1216 (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001217 if (browseFile == NULL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001218 return; // operation cancelled
Bram Moolenaar071d4272004-06-13 20:20:40 +00001219 eap->arg = browseFile;
Bram Moolenaare1004402020-10-24 20:49:43 +02001220 cmdmod.cmod_flags &= ~CMOD_BROWSE; // don't let do_ecmd() browse again
Bram Moolenaar071d4272004-06-13 20:20:40 +00001221 }
1222#endif
1223
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001224 // We need two temp file names.
Bram Moolenaare5c421c2015-03-31 13:33:08 +02001225 tmp_orig = vim_tempname('o', FALSE);
1226 tmp_new = vim_tempname('n', FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001227 if (tmp_orig == NULL || tmp_new == NULL)
1228 goto theend;
1229
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001230 // Write the current buffer to "tmp_orig".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001231 if (buf_write(curbuf, tmp_orig, NULL,
1232 (linenr_T)1, curbuf->b_ml.ml_line_count,
1233 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
1234 goto theend;
1235
1236#ifdef UNIX
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001237 // Get the absolute path of the patchfile, changing directory below.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001238 fullname = FullName_save(eap->arg, FALSE);
1239#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001240 esc_name = vim_strsave_shellescape(
Bram Moolenaar071d4272004-06-13 20:20:40 +00001241# ifdef UNIX
Bram Moolenaara95ab322017-03-11 19:21:53 +01001242 fullname != NULL ? fullname :
Bram Moolenaar071d4272004-06-13 20:20:40 +00001243# endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001244 eap->arg, TRUE, TRUE);
1245 if (esc_name == NULL)
1246 goto theend;
1247 buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16;
Bram Moolenaar964b3742019-05-24 18:54:09 +02001248 buf = alloc(buflen);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001249 if (buf == NULL)
1250 goto theend;
1251
1252#ifdef UNIX
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001253 // Temporarily chdir to /tmp, to avoid patching files in the current
1254 // directory when the patch file contains more than one patch. When we
1255 // have our own temp dir use that instead, it will be cleaned up when we
1256 // exit (any .rej files created). Don't change directory if we can't
1257 // return to the current.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001258 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
1259 dirbuf[0] = NUL;
1260 else
1261 {
1262# ifdef TEMPDIRNAMES
1263 if (vim_tempdir != NULL)
Bram Moolenaar42335f52018-09-13 15:33:43 +02001264 vim_ignored = mch_chdir((char *)vim_tempdir);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001265 else
1266# endif
Bram Moolenaar42335f52018-09-13 15:33:43 +02001267 vim_ignored = mch_chdir("/tmp");
Bram Moolenaar071d4272004-06-13 20:20:40 +00001268 shorten_fnames(TRUE);
1269 }
1270#endif
1271
1272#ifdef FEAT_EVAL
1273 if (*p_pex != NUL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001274 // Use 'patchexpr' to generate the new file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001275 eval_patch(tmp_orig,
1276# ifdef UNIX
1277 fullname != NULL ? fullname :
1278# endif
1279 eap->arg, tmp_new);
1280 else
1281#endif
1282 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001283 // Build the patch command and execute it. Ignore errors. Switch to
1284 // cooked mode to allow the user to respond to prompts.
Bram Moolenaara95ab322017-03-11 19:21:53 +01001285 vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s",
1286 tmp_new, tmp_orig, esc_name);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001287 block_autocmds(); // Avoid ShellCmdPost stuff
Bram Moolenaar071d4272004-06-13 20:20:40 +00001288 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
Bram Moolenaar78ab3312007-09-29 12:16:41 +00001289 unblock_autocmds();
Bram Moolenaar071d4272004-06-13 20:20:40 +00001290 }
1291
1292#ifdef UNIX
1293 if (dirbuf[0] != NUL)
1294 {
1295 if (mch_chdir((char *)dirbuf) != 0)
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001296 emsg(_(e_prev_dir));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001297 shorten_fnames(TRUE);
1298 }
1299#endif
1300
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001301 // patch probably has written over the screen
Bram Moolenaar071d4272004-06-13 20:20:40 +00001302 redraw_later(CLEAR);
1303
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001304 // Delete any .orig or .rej file created.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001305 STRCPY(buf, tmp_new);
1306 STRCAT(buf, ".orig");
1307 mch_remove(buf);
1308 STRCPY(buf, tmp_new);
1309 STRCAT(buf, ".rej");
1310 mch_remove(buf);
1311
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001312 // Only continue if the output file was created.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001313 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001314 emsg(_("E816: Cannot read patch output"));
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001315 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001316 {
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001317 if (curbuf->b_fname != NULL)
1318 {
1319 newname = vim_strnsave(curbuf->b_fname,
Bram Moolenaardf44a272020-06-07 20:49:05 +02001320 STRLEN(curbuf->b_fname) + 4);
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001321 if (newname != NULL)
1322 STRCAT(newname, ".new");
1323 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001324
1325#ifdef FEAT_GUI
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001326 need_mouse_correct = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001327#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001328 // don't use a new tab page, each tab page has its own diffs
Bram Moolenaare1004402020-10-24 20:49:43 +02001329 cmdmod.cmod_tab = 0;
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001330
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001331 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001332 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001333 // Pretend it was a ":split fname" command
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001334 eap->cmdidx = CMD_split;
1335 eap->arg = tmp_new;
1336 do_exedit(eap, old_curwin);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001337
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001338 // check that split worked and editing tmp_new
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001339 if (curwin != old_curwin && win_valid(old_curwin))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001340 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001341 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001342 diff_win_options(curwin, TRUE);
1343 diff_win_options(old_curwin, TRUE);
1344
1345 if (newname != NULL)
1346 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001347 // do a ":file filename.new" on the patched buffer
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001348 eap->arg = newname;
1349 ex_file(eap);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001350
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001351 // Do filetype detection with the new name.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001352 if (au_has_group((char_u *)"filetypedetect"))
1353 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001354 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001355 }
1356 }
1357 }
1358
1359theend:
1360 if (tmp_orig != NULL)
1361 mch_remove(tmp_orig);
1362 vim_free(tmp_orig);
1363 if (tmp_new != NULL)
1364 mch_remove(tmp_new);
1365 vim_free(tmp_new);
1366 vim_free(newname);
1367 vim_free(buf);
1368#ifdef UNIX
1369 vim_free(fullname);
1370#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001371 vim_free(esc_name);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001372#ifdef FEAT_BROWSE
1373 vim_free(browseFile);
Bram Moolenaare1004402020-10-24 20:49:43 +02001374 cmdmod.cmod_flags = save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001375#endif
1376}
1377
1378/*
1379 * Split the window and edit another file, setting options to show the diffs.
1380 */
1381 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001382ex_diffsplit(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001383{
1384 win_T *old_curwin = curwin;
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001385 bufref_T old_curbuf;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001386
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001387 set_bufref(&old_curbuf, curbuf);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001388#ifdef FEAT_GUI
1389 need_mouse_correct = TRUE;
1390#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001391 // Need to compute w_fraction when no redraw happened yet.
Bram Moolenaar46328f92016-08-28 15:39:57 +02001392 validate_cursor();
1393 set_fraction(curwin);
1394
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001395 // don't use a new tab page, each tab page has its own diffs
Bram Moolenaare1004402020-10-24 20:49:43 +02001396 cmdmod.cmod_tab = 0;
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001397
Bram Moolenaarc4675a12006-03-15 22:50:30 +00001398 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001399 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001400 // Pretend it was a ":split fname" command
Bram Moolenaar071d4272004-06-13 20:20:40 +00001401 eap->cmdidx = CMD_split;
Bram Moolenaar4be06f92005-07-29 22:36:03 +00001402 curwin->w_p_diff = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001403 do_exedit(eap, old_curwin);
1404
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001405 if (curwin != old_curwin) // split must have worked
Bram Moolenaar071d4272004-06-13 20:20:40 +00001406 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001407 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001408 diff_win_options(curwin, TRUE);
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001409 if (win_valid(old_curwin))
1410 {
1411 diff_win_options(old_curwin, TRUE);
1412
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001413 if (bufref_valid(&old_curbuf))
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001414 // Move the cursor position to that of the old window.
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001415 curwin->w_cursor.lnum = diff_get_corresponding_line(
Bram Moolenaar025e3e02016-10-18 14:50:18 +02001416 old_curbuf.br_buf, old_curwin->w_cursor.lnum);
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001417 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001418 // Now that lines are folded scroll to show the cursor at the same
1419 // relative position.
Bram Moolenaar46328f92016-08-28 15:39:57 +02001420 scroll_to_fraction(curwin, curwin->w_height);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001421 }
1422 }
1423}
1424
1425/*
Bram Moolenaar84a05ac2013-05-06 04:24:17 +02001426 * Set options to show diffs for the current window.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001427 */
Bram Moolenaar071d4272004-06-13 20:20:40 +00001428 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001429ex_diffthis(exarg_T *eap UNUSED)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001430{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001431 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001432 diff_win_options(curwin, TRUE);
1433}
1434
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001435 static void
1436set_diff_option(win_T *wp, int value)
1437{
1438 win_T *old_curwin = curwin;
1439
1440 curwin = wp;
1441 curbuf = curwin->w_buffer;
1442 ++curbuf_lock;
1443 set_option_value((char_u *)"diff", (long)value, NULL, OPT_LOCAL);
1444 --curbuf_lock;
1445 curwin = old_curwin;
1446 curbuf = curwin->w_buffer;
1447}
1448
Bram Moolenaar071d4272004-06-13 20:20:40 +00001449/*
1450 * Set options in window "wp" for diff mode.
1451 */
1452 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001453diff_win_options(
1454 win_T *wp,
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001455 int addbuf) // Add buffer to diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001456{
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001457# ifdef FEAT_FOLDING
1458 win_T *old_curwin = curwin;
1459
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001460 // close the manually opened folds
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001461 curwin = wp;
1462 newFoldLevel();
1463 curwin = old_curwin;
1464# endif
1465
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001466 // Use 'scrollbind' and 'cursorbind' when available
Bram Moolenaar43929962015-07-03 15:06:56 +02001467 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001468 wp->w_p_scb_save = wp->w_p_scb;
Bram Moolenaar3368ea22010-09-21 16:56:35 +02001469 wp->w_p_scb = TRUE;
Bram Moolenaar43929962015-07-03 15:06:56 +02001470 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001471 wp->w_p_crb_save = wp->w_p_crb;
Bram Moolenaar860cae12010-06-05 23:22:07 +02001472 wp->w_p_crb = TRUE;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001473 if (!(diff_flags & DIFF_FOLLOWWRAP))
1474 {
1475 if (!wp->w_p_diff)
1476 wp->w_p_wrap_save = wp->w_p_wrap;
1477 wp->w_p_wrap = FALSE;
1478 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001479# ifdef FEAT_FOLDING
Bram Moolenaar43929962015-07-03 15:06:56 +02001480 if (!wp->w_p_diff)
1481 {
1482 if (wp->w_p_diff_saved)
1483 free_string_option(wp->w_p_fdm_save);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001484 wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm);
Bram Moolenaar43929962015-07-03 15:06:56 +02001485 }
Bram Moolenaar20c023a2019-05-26 21:03:24 +02001486 set_string_option_direct_in_win(wp, (char_u *)"fdm", -1, (char_u *)"diff",
Bram Moolenaar5e3cb7e2006-02-27 23:58:35 +00001487 OPT_LOCAL|OPT_FREE, 0);
Bram Moolenaar43929962015-07-03 15:06:56 +02001488 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001489 {
1490 wp->w_p_fdc_save = wp->w_p_fdc;
1491 wp->w_p_fen_save = wp->w_p_fen;
1492 wp->w_p_fdl_save = wp->w_p_fdl;
1493 }
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001494 wp->w_p_fdc = diff_foldcolumn;
1495 wp->w_p_fen = TRUE;
1496 wp->w_p_fdl = 0;
1497 foldUpdateAll(wp);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001498 // make sure topline is not halfway a fold
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001499 changed_window_setting_win(wp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001500# endif
Bram Moolenaar071d4272004-06-13 20:20:40 +00001501 if (vim_strchr(p_sbo, 'h') == NULL)
1502 do_cmdline_cmd((char_u *)"set sbo+=hor");
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001503 // Save the current values, to be restored in ex_diffoff().
Bram Moolenaara87aa802013-07-03 15:47:03 +02001504 wp->w_p_diff_saved = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001505
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001506 set_diff_option(wp, TRUE);
Bram Moolenaar43929962015-07-03 15:06:56 +02001507
Bram Moolenaar071d4272004-06-13 20:20:40 +00001508 if (addbuf)
1509 diff_buf_add(wp->w_buffer);
1510 redraw_win_later(wp, NOT_VALID);
1511}
1512
1513/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001514 * Set options not to show diffs. For the current window or all windows.
Bram Moolenaarf740b292006-02-16 22:11:02 +00001515 * Only in the current tab page.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001516 */
1517 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001518ex_diffoff(exarg_T *eap)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001519{
1520 win_T *wp;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001521 int diffwin = FALSE;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001522
Bram Moolenaar29323592016-07-24 22:04:11 +02001523 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001524 {
Bram Moolenaar00462ff2013-09-20 20:13:53 +02001525 if (eap->forceit ? wp->w_p_diff : wp == curwin)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001526 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001527 // Set 'diff' off. If option values were saved in
1528 // diff_win_options(), restore the ones whose settings seem to have
1529 // been left over from diff mode.
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001530 set_diff_option(wp, FALSE);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001531
Bram Moolenaara87aa802013-07-03 15:47:03 +02001532 if (wp->w_p_diff_saved)
1533 {
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001534
Bram Moolenaar43929962015-07-03 15:06:56 +02001535 if (wp->w_p_scb)
1536 wp->w_p_scb = wp->w_p_scb_save;
Bram Moolenaar43929962015-07-03 15:06:56 +02001537 if (wp->w_p_crb)
1538 wp->w_p_crb = wp->w_p_crb_save;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001539 if (!(diff_flags & DIFF_FOLLOWWRAP))
1540 {
1541 if (!wp->w_p_wrap)
1542 wp->w_p_wrap = wp->w_p_wrap_save;
1543 }
Bram Moolenaar43929962015-07-03 15:06:56 +02001544#ifdef FEAT_FOLDING
1545 free_string_option(wp->w_p_fdm);
Bram Moolenaar79a213d2017-05-16 13:15:18 +02001546 wp->w_p_fdm = vim_strsave(
1547 *wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u*)"manual");
Bram Moolenaar43929962015-07-03 15:06:56 +02001548
1549 if (wp->w_p_fdc == diff_foldcolumn)
1550 wp->w_p_fdc = wp->w_p_fdc_save;
1551 if (wp->w_p_fdl == 0)
1552 wp->w_p_fdl = wp->w_p_fdl_save;
1553
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001554 // Only restore 'foldenable' when 'foldmethod' is not
1555 // "manual", otherwise we continue to show the diff folds.
Bram Moolenaar43929962015-07-03 15:06:56 +02001556 if (wp->w_p_fen)
1557 wp->w_p_fen = foldmethodIsManual(wp) ? FALSE
1558 : wp->w_p_fen_save;
1559
1560 foldUpdateAll(wp);
Bram Moolenaar43929962015-07-03 15:06:56 +02001561#endif
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001562 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001563 // remove filler lines
Bram Moolenaare67d5462016-08-27 22:40:42 +02001564 wp->w_topfill = 0;
1565
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001566 // make sure topline is not halfway a fold and cursor is
1567 // invalidated
Bram Moolenaare67d5462016-08-27 22:40:42 +02001568 changed_window_setting_win(wp);
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001569
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001570 // Note: 'sbo' is not restored, it's a global option.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001571 diff_buf_adjust(wp);
1572 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001573 diffwin |= wp->w_p_diff;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001574 }
1575
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001576 // Also remove hidden buffers from the list.
Bram Moolenaar25ea0542017-02-03 23:16:28 +01001577 if (eap->forceit)
1578 diff_buf_clear();
1579
Bram Moolenaarc8234772019-11-10 21:00:27 +01001580 if (!diffwin)
1581 {
1582 diff_need_update = FALSE;
1583 curtab->tp_diff_invalid = FALSE;
1584 curtab->tp_diff_update = FALSE;
1585 diff_clear(curtab);
1586 }
1587
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001588 // Remove "hor" from from 'scrollopt' if there are no diff windows left.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001589 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
1590 do_cmdline_cmd((char_u *)"set sbo-=hor");
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001591}
1592
1593/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00001594 * Read the diff output and add each entry to the diff list.
1595 */
1596 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001597diff_read(
Bram Moolenaare828b762018-09-10 17:51:58 +02001598 int idx_orig, // idx of original file
1599 int idx_new, // idx of new file
1600 diffout_T *dout) // diff output
Bram Moolenaar071d4272004-06-13 20:20:40 +00001601{
Bram Moolenaare828b762018-09-10 17:51:58 +02001602 FILE *fd = NULL;
1603 int line_idx = 0;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001604 diff_T *dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001605 diff_T *dp = curtab->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001606 diff_T *dn, *dpl;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001607 char_u linebuf[LBUFLEN]; // only need to hold the diff line
Bram Moolenaare828b762018-09-10 17:51:58 +02001608 char_u *line;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001609 long off;
1610 int i;
1611 linenr_T lnum_orig, lnum_new;
1612 long count_orig, count_new;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001613 int notset = TRUE; // block "*dp" not set yet
Bram Moolenaare828b762018-09-10 17:51:58 +02001614 enum {
1615 DIFF_ED,
1616 DIFF_UNIFIED,
1617 DIFF_NONE
1618 } diffstyle = DIFF_NONE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001619
Bram Moolenaare828b762018-09-10 17:51:58 +02001620 if (dout->dout_fname == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001621 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001622 diffstyle = DIFF_UNIFIED;
1623 }
1624 else
1625 {
1626 fd = mch_fopen((char *)dout->dout_fname, "r");
1627 if (fd == NULL)
1628 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001629 emsg(_("E98: Cannot read diff output"));
Bram Moolenaare828b762018-09-10 17:51:58 +02001630 return;
1631 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001632 }
1633
1634 for (;;)
1635 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001636 if (fd == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001637 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001638 if (line_idx >= dout->dout_ga.ga_len)
1639 break; // did last line
1640 line = ((char_u **)dout->dout_ga.ga_data)[line_idx++];
Bram Moolenaar071d4272004-06-13 20:20:40 +00001641 }
1642 else
1643 {
Bram Moolenaar00590742019-02-15 21:06:09 +01001644 if (vim_fgets(linebuf, LBUFLEN, fd))
Bram Moolenaare828b762018-09-10 17:51:58 +02001645 break; // end of file
1646 line = linebuf;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001647 }
1648
Bram Moolenaare828b762018-09-10 17:51:58 +02001649 if (diffstyle == DIFF_NONE)
1650 {
1651 // Determine diff style.
1652 // ed like diff looks like this:
1653 // {first}[,{last}]c{first}[,{last}]
1654 // {first}a{first}[,{last}]
1655 // {first}[,{last}]d{first}
1656 //
1657 // unified diff looks like this:
1658 // --- file1 2018-03-20 13:23:35.783153140 +0100
1659 // +++ file2 2018-03-20 13:23:41.183156066 +0100
1660 // @@ -1,3 +1,5 @@
1661 if (isdigit(*line))
1662 diffstyle = DIFF_ED;
1663 else if ((STRNCMP(line, "@@ ", 3) == 0))
1664 diffstyle = DIFF_UNIFIED;
1665 else if ((STRNCMP(line, "--- ", 4) == 0)
Bram Moolenaar00590742019-02-15 21:06:09 +01001666 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
Bram Moolenaare828b762018-09-10 17:51:58 +02001667 && (STRNCMP(line, "+++ ", 4) == 0)
Bram Moolenaar00590742019-02-15 21:06:09 +01001668 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
Bram Moolenaare828b762018-09-10 17:51:58 +02001669 && (STRNCMP(line, "@@ ", 3) == 0))
1670 diffstyle = DIFF_UNIFIED;
Bram Moolenaar3b8defd2018-09-13 13:03:11 +02001671 else
1672 // Format not recognized yet, skip over this line. Cygwin diff
1673 // may put a warning at the start of the file.
1674 continue;
Bram Moolenaare828b762018-09-10 17:51:58 +02001675 }
1676
1677 if (diffstyle == DIFF_ED)
1678 {
1679 if (!isdigit(*line))
1680 continue; // not the start of a diff block
1681 if (parse_diff_ed(line, &lnum_orig, &count_orig,
1682 &lnum_new, &count_new) == FAIL)
1683 continue;
1684 }
1685 else if (diffstyle == DIFF_UNIFIED)
1686 {
1687 if (STRNCMP(line, "@@ ", 3) != 0)
1688 continue; // not the start of a diff block
1689 if (parse_diff_unified(line, &lnum_orig, &count_orig,
1690 &lnum_new, &count_new) == FAIL)
1691 continue;
1692 }
1693 else
1694 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01001695 emsg(_("E959: Invalid diff format."));
Bram Moolenaare828b762018-09-10 17:51:58 +02001696 break;
1697 }
1698
1699 // Go over blocks before the change, for which orig and new are equal.
1700 // Copy blocks from orig to new.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001701 while (dp != NULL
1702 && lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig])
1703 {
1704 if (notset)
1705 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1706 dprev = dp;
1707 dp = dp->df_next;
1708 notset = TRUE;
1709 }
1710
1711 if (dp != NULL
1712 && lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig]
1713 && lnum_orig + count_orig >= dp->df_lnum[idx_orig])
1714 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001715 // New block overlaps with existing block(s).
1716 // First find last block that overlaps.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001717 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
1718 if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig])
1719 break;
1720
Bram Moolenaare828b762018-09-10 17:51:58 +02001721 // If the newly found block starts before the old one, set the
1722 // start back a number of lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001723 off = dp->df_lnum[idx_orig] - lnum_orig;
1724 if (off > 0)
1725 {
1726 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001727 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001728 dp->df_lnum[i] -= off;
1729 dp->df_lnum[idx_new] = lnum_new;
1730 dp->df_count[idx_new] = count_new;
1731 }
1732 else if (notset)
1733 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001734 // new block inside existing one, adjust new block
Bram Moolenaar071d4272004-06-13 20:20:40 +00001735 dp->df_lnum[idx_new] = lnum_new + off;
1736 dp->df_count[idx_new] = count_new - off;
1737 }
1738 else
Bram Moolenaare828b762018-09-10 17:51:58 +02001739 // second overlap of new block with existing block
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00001740 dp->df_count[idx_new] += count_new - count_orig
1741 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
1742 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001743
Bram Moolenaare828b762018-09-10 17:51:58 +02001744 // Adjust the size of the block to include all the lines to the
1745 // end of the existing block or the new diff, whatever ends last.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001746 off = (lnum_orig + count_orig)
1747 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
1748 if (off < 0)
1749 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001750 // new change ends in existing block, adjust the end if not
1751 // done already
Bram Moolenaar071d4272004-06-13 20:20:40 +00001752 if (notset)
1753 dp->df_count[idx_new] += -off;
1754 off = 0;
1755 }
Bram Moolenaard4b96bc2007-10-19 15:33:39 +00001756 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001757 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001758 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
1759 - dp->df_lnum[i] + off;
1760
Bram Moolenaare828b762018-09-10 17:51:58 +02001761 // Delete the diff blocks that have been merged into one.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001762 dn = dp->df_next;
1763 dp->df_next = dpl->df_next;
1764 while (dn != dp->df_next)
1765 {
1766 dpl = dn->df_next;
1767 vim_free(dn);
1768 dn = dpl;
1769 }
1770 }
1771 else
1772 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001773 // Allocate a new diffblock.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001774 dp = diff_alloc_new(curtab, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001775 if (dp == NULL)
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001776 goto done;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001777
1778 dp->df_lnum[idx_orig] = lnum_orig;
1779 dp->df_count[idx_orig] = count_orig;
1780 dp->df_lnum[idx_new] = lnum_new;
1781 dp->df_count[idx_new] = count_new;
1782
Bram Moolenaare828b762018-09-10 17:51:58 +02001783 // Set values for other buffers, these must be equal to the
1784 // original buffer, otherwise there would have been a change
1785 // already.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001786 for (i = idx_orig + 1; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001787 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001788 diff_copy_entry(dprev, dp, idx_orig, i);
1789 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001790 notset = FALSE; // "*dp" has been set
Bram Moolenaar071d4272004-06-13 20:20:40 +00001791 }
1792
Bram Moolenaare828b762018-09-10 17:51:58 +02001793 // for remaining diff blocks orig and new are equal
Bram Moolenaar071d4272004-06-13 20:20:40 +00001794 while (dp != NULL)
1795 {
1796 if (notset)
1797 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1798 dprev = dp;
1799 dp = dp->df_next;
1800 notset = TRUE;
1801 }
1802
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001803done:
Bram Moolenaare828b762018-09-10 17:51:58 +02001804 if (fd != NULL)
1805 fclose(fd);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001806}
1807
1808/*
1809 * Copy an entry at "dp" from "idx_orig" to "idx_new".
1810 */
1811 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001812diff_copy_entry(
1813 diff_T *dprev,
1814 diff_T *dp,
1815 int idx_orig,
1816 int idx_new)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001817{
1818 long off;
1819
1820 if (dprev == NULL)
1821 off = 0;
1822 else
1823 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
1824 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
1825 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
1826 dp->df_count[idx_new] = dp->df_count[idx_orig];
1827}
1828
1829/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001830 * Clear the list of diffblocks for tab page "tp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001831 */
Bram Moolenaarea408852005-06-25 22:49:46 +00001832 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001833diff_clear(tabpage_T *tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001834{
1835 diff_T *p, *next_p;
1836
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001837 for (p = tp->tp_first_diff; p != NULL; p = next_p)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001838 {
1839 next_p = p->df_next;
1840 vim_free(p);
1841 }
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001842 tp->tp_first_diff = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001843}
1844
1845/*
1846 * Check diff status for line "lnum" in buffer "buf":
1847 * Returns 0 for nothing special
1848 * Returns -1 for a line that should be highlighted as changed.
1849 * Returns -2 for a line that should be highlighted as added/deleted.
1850 * Returns > 0 for inserting that many filler lines above it (never happens
1851 * when 'diffopt' doesn't contain "filler").
1852 * This should only be used for windows where 'diff' is set.
1853 */
1854 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001855diff_check(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001856{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001857 int idx; // index in tp_diffbuf[] for this buffer
Bram Moolenaar071d4272004-06-13 20:20:40 +00001858 diff_T *dp;
1859 int maxcount;
1860 int i;
1861 buf_T *buf = wp->w_buffer;
1862 int cmp;
1863
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001864 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001865 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00001866
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001867 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) // no diffs at all
Bram Moolenaar071d4272004-06-13 20:20:40 +00001868 return 0;
1869
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001870 // safety check: "lnum" must be a buffer line
Bram Moolenaar071d4272004-06-13 20:20:40 +00001871 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
1872 return 0;
1873
1874 idx = diff_buf_idx(buf);
1875 if (idx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001876 return 0; // no diffs for buffer "buf"
Bram Moolenaar071d4272004-06-13 20:20:40 +00001877
1878#ifdef FEAT_FOLDING
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001879 // A closed fold never has filler lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001880 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
1881 return 0;
1882#endif
1883
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001884 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02001885 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001886 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1887 break;
1888 if (dp == NULL || lnum < dp->df_lnum[idx])
1889 return 0;
1890
1891 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
1892 {
1893 int zero = FALSE;
1894
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001895 // Changed or inserted line. If the other buffers have a count of
1896 // zero, the lines were inserted. If the other buffers have the same
1897 // count, check if the lines are identical.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001898 cmp = FALSE;
1899 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001900 if (i != idx && curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001901 {
1902 if (dp->df_count[i] == 0)
1903 zero = TRUE;
1904 else
1905 {
1906 if (dp->df_count[i] != dp->df_count[idx])
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001907 return -1; // nr of lines changed.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001908 cmp = TRUE;
1909 }
1910 }
1911 if (cmp)
1912 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001913 // Compare all lines. If they are equal the lines were inserted
1914 // in some buffers, deleted in others, but not changed.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001915 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001916 if (i != idx && curtab->tp_diffbuf[i] != NULL
1917 && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001918 if (!diff_equal_entry(dp, idx, i))
1919 return -1;
1920 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001921 // If there is no buffer with zero lines then there is no difference
1922 // any longer. Happens when making a change (or undo) that removes
1923 // the difference. Can't remove the entry here, we might be halfway
1924 // updating the window. Just report the text as unchanged. Other
1925 // windows might still show the change though.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001926 if (zero == FALSE)
1927 return 0;
1928 return -2;
1929 }
1930
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001931 // If 'diffopt' doesn't contain "filler", return 0.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001932 if (!(diff_flags & DIFF_FILLER))
1933 return 0;
1934
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001935 // Insert filler lines above the line just below the change. Will return
1936 // 0 when this buf had the max count.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001937 maxcount = 0;
1938 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001939 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001940 maxcount = dp->df_count[i];
1941 return maxcount - dp->df_count[idx];
1942}
1943
1944/*
1945 * Compare two entries in diff "*dp" and return TRUE if they are equal.
1946 */
1947 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001948diff_equal_entry(diff_T *dp, int idx1, int idx2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001949{
1950 int i;
1951 char_u *line;
1952 int cmp;
1953
1954 if (dp->df_count[idx1] != dp->df_count[idx2])
1955 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001956 if (diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001957 return FALSE;
1958 for (i = 0; i < dp->df_count[idx1]; ++i)
1959 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001960 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
Bram Moolenaar071d4272004-06-13 20:20:40 +00001961 dp->df_lnum[idx1] + i, FALSE));
1962 if (line == NULL)
1963 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001964 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
Bram Moolenaar071d4272004-06-13 20:20:40 +00001965 dp->df_lnum[idx2] + i, FALSE));
1966 vim_free(line);
1967 if (cmp != 0)
1968 return FALSE;
1969 }
1970 return TRUE;
1971}
1972
1973/*
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02001974 * Compare the characters at "p1" and "p2". If they are equal (possibly
1975 * ignoring case) return TRUE and set "len" to the number of bytes.
1976 */
1977 static int
1978diff_equal_char(char_u *p1, char_u *p2, int *len)
1979{
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02001980 int l = (*mb_ptr2len)(p1);
1981
1982 if (l != (*mb_ptr2len)(p2))
1983 return FALSE;
1984 if (l > 1)
1985 {
1986 if (STRNCMP(p1, p2, l) != 0
1987 && (!enc_utf8
1988 || !(diff_flags & DIFF_ICASE)
1989 || utf_fold(utf_ptr2char(p1))
1990 != utf_fold(utf_ptr2char(p2))))
1991 return FALSE;
1992 *len = l;
1993 }
1994 else
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02001995 {
1996 if ((*p1 != *p2)
1997 && (!(diff_flags & DIFF_ICASE)
1998 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
1999 return FALSE;
2000 *len = 1;
2001 }
2002 return TRUE;
2003}
2004
2005/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002006 * Compare strings "s1" and "s2" according to 'diffopt'.
2007 * Return non-zero when they are different.
2008 */
2009 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002010diff_cmp(char_u *s1, char_u *s2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002011{
2012 char_u *p1, *p2;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002013 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002014
Bram Moolenaar785fc652018-09-15 19:17:38 +02002015 if ((diff_flags & DIFF_IBLANK)
2016 && (*skipwhite(s1) == NUL || *skipwhite(s2) == NUL))
2017 return 0;
2018
2019 if ((diff_flags & (DIFF_ICASE | ALL_WHITE_DIFF)) == 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002020 return STRCMP(s1, s2);
Bram Moolenaar785fc652018-09-15 19:17:38 +02002021 if ((diff_flags & DIFF_ICASE) && !(diff_flags & ALL_WHITE_DIFF))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002022 return MB_STRICMP(s1, s2);
2023
Bram Moolenaar071d4272004-06-13 20:20:40 +00002024 p1 = s1;
2025 p2 = s2;
Bram Moolenaar785fc652018-09-15 19:17:38 +02002026
2027 // Ignore white space changes and possibly ignore case.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002028 while (*p1 != NUL && *p2 != NUL)
2029 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002030 if (((diff_flags & DIFF_IWHITE)
2031 && VIM_ISWHITE(*p1) && VIM_ISWHITE(*p2))
2032 || ((diff_flags & DIFF_IWHITEALL)
2033 && (VIM_ISWHITE(*p1) || VIM_ISWHITE(*p2))))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002034 {
2035 p1 = skipwhite(p1);
2036 p2 = skipwhite(p2);
2037 }
2038 else
2039 {
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002040 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002041 break;
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002042 p1 += l;
2043 p2 += l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002044 }
2045 }
2046
Bram Moolenaar785fc652018-09-15 19:17:38 +02002047 // Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002048 p1 = skipwhite(p1);
2049 p2 = skipwhite(p2);
2050 if (*p1 != NUL || *p2 != NUL)
2051 return 1;
2052 return 0;
2053}
2054
2055/*
2056 * Return the number of filler lines above "lnum".
2057 */
2058 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002059diff_check_fill(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002060{
2061 int n;
2062
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002063 // be quick when there are no filler lines
Bram Moolenaar071d4272004-06-13 20:20:40 +00002064 if (!(diff_flags & DIFF_FILLER))
2065 return 0;
2066 n = diff_check(wp, lnum);
2067 if (n <= 0)
2068 return 0;
2069 return n;
2070}
2071
2072/*
2073 * Set the topline of "towin" to match the position in "fromwin", so that they
2074 * show the same diff'ed lines.
2075 */
2076 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002077diff_set_topline(win_T *fromwin, win_T *towin)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002078{
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002079 buf_T *frombuf = fromwin->w_buffer;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002080 linenr_T lnum = fromwin->w_topline;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002081 int fromidx;
2082 int toidx;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002083 diff_T *dp;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002084 int max_count;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002085 int i;
2086
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002087 fromidx = diff_buf_idx(frombuf);
2088 if (fromidx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002089 return; // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00002090
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002091 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002092 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002093
2094 towin->w_topfill = 0;
2095
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002096 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002097 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002098 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002099 break;
2100 if (dp == NULL)
2101 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002102 // After last change, compute topline relative to end of file; no
2103 // filler lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002104 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002105 - (frombuf->b_ml.ml_line_count - lnum);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002106 }
2107 else
2108 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002109 // Find index for "towin".
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002110 toidx = diff_buf_idx(towin->w_buffer);
2111 if (toidx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002112 return; // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00002113
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002114 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
2115 if (lnum >= dp->df_lnum[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002116 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002117 // Inside a change: compute filler lines. With three or more
2118 // buffers we need to know the largest count.
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002119 max_count = 0;
2120 for (i = 0; i < DB_COUNT; ++i)
2121 if (curtab->tp_diffbuf[i] != NULL
2122 && max_count < dp->df_count[i])
2123 max_count = dp->df_count[i];
2124
2125 if (dp->df_count[toidx] == dp->df_count[fromidx])
2126 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002127 // same number of lines: use same filler count
Bram Moolenaar071d4272004-06-13 20:20:40 +00002128 towin->w_topfill = fromwin->w_topfill;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002129 }
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002130 else if (dp->df_count[toidx] > dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002131 {
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002132 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002133 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002134 // more lines in towin and fromwin doesn't show diff
2135 // lines, only filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002136 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
2137 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002138 // towin also only shows filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002139 towin->w_topline = dp->df_lnum[toidx]
2140 + dp->df_count[toidx];
2141 towin->w_topfill = fromwin->w_topfill;
2142 }
2143 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002144 // towin still has some diff lines to show
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002145 towin->w_topline = dp->df_lnum[toidx]
2146 + max_count - fromwin->w_topfill;
2147 }
2148 }
2149 else if (towin->w_topline >= dp->df_lnum[toidx]
2150 + dp->df_count[toidx])
2151 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002152 // less lines in towin and no diff lines to show: compute
2153 // filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002154 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
2155 if (diff_flags & DIFF_FILLER)
2156 {
2157 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002158 // fromwin is also out of diff lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002159 towin->w_topfill = fromwin->w_topfill;
2160 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002161 // fromwin has some diff lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002162 towin->w_topfill = dp->df_lnum[fromidx]
2163 + max_count - lnum;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002164 }
2165 }
2166 }
2167 }
2168
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002169 // safety check (if diff info gets outdated strange things may happen)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002170 towin->w_botfill = FALSE;
2171 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
2172 {
2173 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
2174 towin->w_botfill = TRUE;
2175 }
2176 if (towin->w_topline < 1)
2177 {
2178 towin->w_topline = 1;
2179 towin->w_topfill = 0;
2180 }
2181
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002182 // When w_topline changes need to recompute w_botline and cursor position
Bram Moolenaar071d4272004-06-13 20:20:40 +00002183 invalidate_botline_win(towin);
2184 changed_line_abv_curs_win(towin);
2185
2186 check_topfill(towin, FALSE);
2187#ifdef FEAT_FOLDING
2188 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
2189 NULL, TRUE, NULL);
2190#endif
2191}
2192
2193/*
2194 * This is called when 'diffopt' is changed.
2195 */
2196 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002197diffopt_changed(void)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002198{
2199 char_u *p;
2200 int diff_context_new = 6;
2201 int diff_flags_new = 0;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002202 int diff_foldcolumn_new = 2;
Bram Moolenaare828b762018-09-10 17:51:58 +02002203 long diff_algorithm_new = 0;
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002204 long diff_indent_heuristic = 0;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002205 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002206
2207 p = p_dip;
2208 while (*p != NUL)
2209 {
2210 if (STRNCMP(p, "filler", 6) == 0)
2211 {
2212 p += 6;
2213 diff_flags_new |= DIFF_FILLER;
2214 }
2215 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
2216 {
2217 p += 8;
2218 diff_context_new = getdigits(&p);
2219 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002220 else if (STRNCMP(p, "iblank", 6) == 0)
2221 {
2222 p += 6;
2223 diff_flags_new |= DIFF_IBLANK;
2224 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002225 else if (STRNCMP(p, "icase", 5) == 0)
2226 {
2227 p += 5;
2228 diff_flags_new |= DIFF_ICASE;
2229 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002230 else if (STRNCMP(p, "iwhiteall", 9) == 0)
2231 {
2232 p += 9;
2233 diff_flags_new |= DIFF_IWHITEALL;
2234 }
2235 else if (STRNCMP(p, "iwhiteeol", 9) == 0)
2236 {
2237 p += 9;
2238 diff_flags_new |= DIFF_IWHITEEOL;
2239 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002240 else if (STRNCMP(p, "iwhite", 6) == 0)
2241 {
2242 p += 6;
2243 diff_flags_new |= DIFF_IWHITE;
2244 }
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002245 else if (STRNCMP(p, "horizontal", 10) == 0)
2246 {
2247 p += 10;
2248 diff_flags_new |= DIFF_HORIZONTAL;
2249 }
2250 else if (STRNCMP(p, "vertical", 8) == 0)
2251 {
2252 p += 8;
2253 diff_flags_new |= DIFF_VERTICAL;
2254 }
2255 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
2256 {
2257 p += 11;
2258 diff_foldcolumn_new = getdigits(&p);
2259 }
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002260 else if (STRNCMP(p, "hiddenoff", 9) == 0)
2261 {
2262 p += 9;
2263 diff_flags_new |= DIFF_HIDDEN_OFF;
2264 }
Bram Moolenaarc8234772019-11-10 21:00:27 +01002265 else if (STRNCMP(p, "closeoff", 8) == 0)
2266 {
2267 p += 8;
2268 diff_flags_new |= DIFF_CLOSE_OFF;
2269 }
Bram Moolenaar4223d432021-02-10 13:18:17 +01002270 else if (STRNCMP(p, "followwrap", 10) == 0)
2271 {
2272 p += 10;
2273 diff_flags_new |= DIFF_FOLLOWWRAP;
2274 }
Bram Moolenaare828b762018-09-10 17:51:58 +02002275 else if (STRNCMP(p, "indent-heuristic", 16) == 0)
2276 {
2277 p += 16;
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002278 diff_indent_heuristic = XDF_INDENT_HEURISTIC;
Bram Moolenaare828b762018-09-10 17:51:58 +02002279 }
2280 else if (STRNCMP(p, "internal", 8) == 0)
2281 {
2282 p += 8;
2283 diff_flags_new |= DIFF_INTERNAL;
2284 }
2285 else if (STRNCMP(p, "algorithm:", 10) == 0)
2286 {
2287 p += 10;
2288 if (STRNCMP(p, "myers", 5) == 0)
2289 {
2290 p += 5;
2291 diff_algorithm_new = 0;
2292 }
2293 else if (STRNCMP(p, "minimal", 7) == 0)
2294 {
2295 p += 7;
2296 diff_algorithm_new = XDF_NEED_MINIMAL;
2297 }
2298 else if (STRNCMP(p, "patience", 8) == 0)
2299 {
2300 p += 8;
2301 diff_algorithm_new = XDF_PATIENCE_DIFF;
2302 }
2303 else if (STRNCMP(p, "histogram", 9) == 0)
2304 {
2305 p += 9;
2306 diff_algorithm_new = XDF_HISTOGRAM_DIFF;
2307 }
Bram Moolenaard0721052018-11-05 21:21:33 +01002308 else
2309 return FAIL;
Bram Moolenaare828b762018-09-10 17:51:58 +02002310 }
2311
Bram Moolenaar071d4272004-06-13 20:20:40 +00002312 if (*p != ',' && *p != NUL)
2313 return FAIL;
2314 if (*p == ',')
2315 ++p;
2316 }
2317
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002318 diff_algorithm_new |= diff_indent_heuristic;
2319
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002320 // Can't have both "horizontal" and "vertical".
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002321 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
2322 return FAIL;
2323
Bram Moolenaar198fa062018-09-18 21:20:26 +02002324 // If flags were added or removed, or the algorithm was changed, need to
2325 // update the diff.
Bram Moolenaare828b762018-09-10 17:51:58 +02002326 if (diff_flags != diff_flags_new || diff_algorithm != diff_algorithm_new)
Bram Moolenaar29323592016-07-24 22:04:11 +02002327 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002328 tp->tp_diff_invalid = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002329
2330 diff_flags = diff_flags_new;
Bram Moolenaarb9ddda62019-02-19 23:00:50 +01002331 diff_context = diff_context_new == 0 ? 1 : diff_context_new;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002332 diff_foldcolumn = diff_foldcolumn_new;
Bram Moolenaare828b762018-09-10 17:51:58 +02002333 diff_algorithm = diff_algorithm_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002334
2335 diff_redraw(TRUE);
2336
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002337 // recompute the scroll binding with the new option value, may
2338 // remove or add filler lines
Bram Moolenaar071d4272004-06-13 20:20:40 +00002339 check_scrollbind((linenr_T)0, 0L);
2340
2341 return OK;
2342}
2343
2344/*
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002345 * Return TRUE if 'diffopt' contains "horizontal".
2346 */
2347 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002348diffopt_horizontal(void)
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002349{
2350 return (diff_flags & DIFF_HORIZONTAL) != 0;
2351}
2352
2353/*
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002354 * Return TRUE if 'diffopt' contains "hiddenoff".
2355 */
2356 int
2357diffopt_hiddenoff(void)
2358{
2359 return (diff_flags & DIFF_HIDDEN_OFF) != 0;
2360}
2361
2362/*
Bram Moolenaarc8234772019-11-10 21:00:27 +01002363 * Return TRUE if 'diffopt' contains "closeoff".
2364 */
2365 int
2366diffopt_closeoff(void)
2367{
2368 return (diff_flags & DIFF_CLOSE_OFF) != 0;
2369}
2370
2371/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002372 * Find the difference within a changed line.
2373 * Returns TRUE if the line was added, no other buffer has it.
2374 */
2375 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002376diff_find_change(
2377 win_T *wp,
2378 linenr_T lnum,
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002379 int *startp, // first char of the change
2380 int *endp) // last char of the change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002381{
2382 char_u *line_org;
2383 char_u *line_new;
2384 int i;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002385 int si_org, si_new;
2386 int ei_org, ei_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002387 diff_T *dp;
2388 int idx;
2389 int off;
2390 int added = TRUE;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002391 char_u *p1, *p2;
2392 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002393
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002394 // Make a copy of the line, the next ml_get() will invalidate it.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002395 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
2396 if (line_org == NULL)
2397 return FALSE;
2398
2399 idx = diff_buf_idx(wp->w_buffer);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002400 if (idx == DB_COUNT) // cannot happen
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002401 {
2402 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002403 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002404 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002405
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002406 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002407 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002408 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
2409 break;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002410 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002411 {
2412 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002413 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002414 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002415
2416 off = lnum - dp->df_lnum[idx];
2417
2418 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002419 if (curtab->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002420 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002421 // Skip lines that are not in the other change (filler lines).
Bram Moolenaar071d4272004-06-13 20:20:40 +00002422 if (off >= dp->df_count[i])
2423 continue;
2424 added = FALSE;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002425 line_new = ml_get_buf(curtab->tp_diffbuf[i],
2426 dp->df_lnum[i] + off, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002427
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002428 // Search for start of difference
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002429 si_org = si_new = 0;
2430 while (line_org[si_org] != NUL)
2431 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002432 if (((diff_flags & DIFF_IWHITE)
2433 && VIM_ISWHITE(line_org[si_org])
2434 && VIM_ISWHITE(line_new[si_new]))
2435 || ((diff_flags & DIFF_IWHITEALL)
2436 && (VIM_ISWHITE(line_org[si_org])
2437 || VIM_ISWHITE(line_new[si_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002438 {
Bram Moolenaara93fa7e2006-04-17 22:14:47 +00002439 si_org = (int)(skipwhite(line_org + si_org) - line_org);
2440 si_new = (int)(skipwhite(line_new + si_new) - line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002441 }
2442 else
2443 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002444 if (!diff_equal_char(line_org + si_org, line_new + si_new,
2445 &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002446 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002447 si_org += l;
2448 si_new += l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002449 }
2450 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002451 if (has_mbyte)
2452 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002453 // Move back to first byte of character in both lines (may
2454 // have "nn^" in line_org and "n^ in line_new).
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002455 si_org -= (*mb_head_off)(line_org, line_org + si_org);
2456 si_new -= (*mb_head_off)(line_new, line_new + si_new);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002457 }
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002458 if (*startp > si_org)
2459 *startp = si_org;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002460
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002461 // Search for end of difference, if any.
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002462 if (line_org[si_org] != NUL || line_new[si_new] != NUL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002463 {
2464 ei_org = (int)STRLEN(line_org);
2465 ei_new = (int)STRLEN(line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002466 while (ei_org >= *startp && ei_new >= si_new
2467 && ei_org >= 0 && ei_new >= 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002468 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002469 if (((diff_flags & DIFF_IWHITE)
2470 && VIM_ISWHITE(line_org[ei_org])
2471 && VIM_ISWHITE(line_new[ei_new]))
2472 || ((diff_flags & DIFF_IWHITEALL)
2473 && (VIM_ISWHITE(line_org[ei_org])
2474 || VIM_ISWHITE(line_new[ei_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002475 {
2476 while (ei_org >= *startp
Bram Moolenaar1c465442017-03-12 20:10:05 +01002477 && VIM_ISWHITE(line_org[ei_org]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002478 --ei_org;
2479 while (ei_new >= si_new
Bram Moolenaar1c465442017-03-12 20:10:05 +01002480 && VIM_ISWHITE(line_new[ei_new]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002481 --ei_new;
2482 }
2483 else
2484 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002485 p1 = line_org + ei_org;
2486 p2 = line_new + ei_new;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002487 p1 -= (*mb_head_off)(line_org, p1);
2488 p2 -= (*mb_head_off)(line_new, p2);
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002489 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002490 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002491 ei_org -= l;
2492 ei_new -= l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002493 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002494 }
2495 if (*endp < ei_org)
2496 *endp = ei_org;
2497 }
2498 }
2499
2500 vim_free(line_org);
2501 return added;
2502}
2503
2504#if defined(FEAT_FOLDING) || defined(PROTO)
2505/*
2506 * Return TRUE if line "lnum" is not close to a diff block, this line should
2507 * be in a fold.
2508 * Return FALSE if there are no diff blocks at all in this window.
2509 */
2510 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002511diff_infold(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002512{
2513 int i;
2514 int idx = -1;
2515 int other = FALSE;
2516 diff_T *dp;
2517
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002518 // Return if 'diff' isn't set.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002519 if (!wp->w_p_diff)
2520 return FALSE;
2521
2522 for (i = 0; i < DB_COUNT; ++i)
2523 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002524 if (curtab->tp_diffbuf[i] == wp->w_buffer)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002525 idx = i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002526 else if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002527 other = TRUE;
2528 }
2529
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002530 // return here if there are no diffs in the window
Bram Moolenaar071d4272004-06-13 20:20:40 +00002531 if (idx == -1 || !other)
2532 return FALSE;
2533
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002534 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002535 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002536
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002537 // Return if there are no diff blocks. All lines will be folded.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002538 if (curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002539 return TRUE;
2540
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002541 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002542 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002543 // If this change is below the line there can't be any further match.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002544 if (dp->df_lnum[idx] - diff_context > lnum)
2545 break;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002546 // If this change ends before the line we have a match.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002547 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
2548 return FALSE;
2549 }
2550 return TRUE;
2551}
2552#endif
2553
2554/*
2555 * "dp" and "do" commands.
2556 */
2557 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002558nv_diffgetput(int put, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002559{
2560 exarg_T ea;
Bram Moolenaar6a643652014-10-31 13:54:25 +01002561 char_u buf[30];
Bram Moolenaar071d4272004-06-13 20:20:40 +00002562
Bram Moolenaarf2732452018-06-03 14:47:35 +02002563#ifdef FEAT_JOB_CHANNEL
2564 if (bt_prompt(curbuf))
2565 {
2566 vim_beep(BO_OPER);
2567 return;
2568 }
2569#endif
Bram Moolenaar6a643652014-10-31 13:54:25 +01002570 if (count == 0)
2571 ea.arg = (char_u *)"";
2572 else
2573 {
2574 vim_snprintf((char *)buf, 30, "%ld", count);
2575 ea.arg = buf;
2576 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002577 if (put)
2578 ea.cmdidx = CMD_diffput;
2579 else
2580 ea.cmdidx = CMD_diffget;
2581 ea.addr_count = 0;
2582 ea.line1 = curwin->w_cursor.lnum;
2583 ea.line2 = curwin->w_cursor.lnum;
2584 ex_diffgetput(&ea);
2585}
2586
2587/*
2588 * ":diffget"
2589 * ":diffput"
2590 */
2591 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002592ex_diffgetput(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002593{
2594 linenr_T lnum;
2595 int count;
2596 linenr_T off = 0;
2597 diff_T *dp;
2598 diff_T *dprev;
2599 diff_T *dfree;
2600 int idx_cur;
2601 int idx_other;
2602 int idx_from;
2603 int idx_to;
2604 int i;
2605 int added;
2606 char_u *p;
2607 aco_save_T aco;
2608 buf_T *buf;
2609 int start_skip, end_skip;
2610 int new_count;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002611 int buf_empty;
Bram Moolenaar602eb742007-02-20 03:43:38 +00002612 int found_not_ma = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002613
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002614 // Find the current buffer in the list of diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002615 idx_cur = diff_buf_idx(curbuf);
2616 if (idx_cur == DB_COUNT)
2617 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002618 emsg(_("E99: Current buffer is not in diff mode"));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002619 return;
2620 }
2621
2622 if (*eap->arg == NUL)
2623 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002624 // No argument: Find the other buffer in the list of diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002625 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002626 if (curtab->tp_diffbuf[idx_other] != curbuf
Bram Moolenaar602eb742007-02-20 03:43:38 +00002627 && curtab->tp_diffbuf[idx_other] != NULL)
2628 {
2629 if (eap->cmdidx != CMD_diffput
2630 || curtab->tp_diffbuf[idx_other]->b_p_ma)
2631 break;
2632 found_not_ma = TRUE;
2633 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002634 if (idx_other == DB_COUNT)
2635 {
Bram Moolenaar602eb742007-02-20 03:43:38 +00002636 if (found_not_ma)
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002637 emsg(_("E793: No other buffer in diff mode is modifiable"));
Bram Moolenaar602eb742007-02-20 03:43:38 +00002638 else
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002639 emsg(_("E100: No other buffer in diff mode"));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002640 return;
2641 }
2642
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002643 // Check that there isn't a third buffer in the list
Bram Moolenaar071d4272004-06-13 20:20:40 +00002644 for (i = idx_other + 1; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002645 if (curtab->tp_diffbuf[i] != curbuf
2646 && curtab->tp_diffbuf[i] != NULL
2647 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002648 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002649 emsg(_("E101: More than two buffers in diff mode, don't know which one to use"));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002650 return;
2651 }
2652 }
2653 else
2654 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002655 // Buffer number or pattern given. Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002656 p = eap->arg + STRLEN(eap->arg);
Bram Moolenaar1c465442017-03-12 20:10:05 +01002657 while (p > eap->arg && VIM_ISWHITE(p[-1]))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002658 --p;
2659 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
2660 ;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002661 if (eap->arg + i == p) // digits only
Bram Moolenaar071d4272004-06-13 20:20:40 +00002662 i = atol((char *)eap->arg);
2663 else
2664 {
Bram Moolenaar0c279bb2013-03-19 14:25:54 +01002665 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002666 if (i < 0)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002667 return; // error message already given
Bram Moolenaar071d4272004-06-13 20:20:40 +00002668 }
2669 buf = buflist_findnr(i);
2670 if (buf == NULL)
2671 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002672 semsg(_("E102: Can't find buffer \"%s\""), eap->arg);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002673 return;
2674 }
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +00002675 if (buf == curbuf)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002676 return; // nothing to do
Bram Moolenaar071d4272004-06-13 20:20:40 +00002677 idx_other = diff_buf_idx(buf);
2678 if (idx_other == DB_COUNT)
2679 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002680 semsg(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002681 return;
2682 }
2683 }
2684
2685 diff_busy = TRUE;
2686
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002687 // When no range given include the line above or below the cursor.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002688 if (eap->addr_count == 0)
2689 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002690 // Make it possible that ":diffget" on the last line gets line below
2691 // the cursor line when there is no difference above the cursor.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002692 if (eap->cmdidx == CMD_diffget
2693 && eap->line1 == curbuf->b_ml.ml_line_count
2694 && diff_check(curwin, eap->line1) == 0
2695 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
2696 ++eap->line2;
2697 else if (eap->line1 > 0)
2698 --eap->line1;
2699 }
2700
2701 if (eap->cmdidx == CMD_diffget)
2702 {
2703 idx_from = idx_other;
2704 idx_to = idx_cur;
2705 }
2706 else
2707 {
2708 idx_from = idx_cur;
2709 idx_to = idx_other;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002710 // Need to make the other buffer the current buffer to be able to make
2711 // changes in it.
2712 // set curwin/curbuf to buf and save a few things
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002713 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002714 }
2715
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002716 // May give the warning for a changed buffer here, which can trigger the
2717 // FileChangedRO autocommand, which may do nasty things and mess
2718 // everything up.
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002719 if (!curbuf->b_changed)
2720 {
2721 change_warning(0);
2722 if (diff_buf_idx(curbuf) != idx_to)
2723 {
Bram Moolenaarf9e3e092019-01-13 23:38:42 +01002724 emsg(_("E787: Buffer changed unexpectedly"));
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002725 goto theend;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002726 }
2727 }
2728
Bram Moolenaar071d4272004-06-13 20:20:40 +00002729 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002730 for (dp = curtab->tp_first_diff; dp != NULL; )
Bram Moolenaar071d4272004-06-13 20:20:40 +00002731 {
2732 if (dp->df_lnum[idx_cur] > eap->line2 + off)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002733 break; // past the range that was specified
Bram Moolenaar071d4272004-06-13 20:20:40 +00002734
2735 dfree = NULL;
2736 lnum = dp->df_lnum[idx_to];
2737 count = dp->df_count[idx_to];
2738 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
2739 && u_save(lnum - 1, lnum + count) != FAIL)
2740 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002741 // Inside the specified range and saving for undo worked.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002742 start_skip = 0;
2743 end_skip = 0;
2744 if (eap->addr_count > 0)
2745 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002746 // A range was specified: check if lines need to be skipped.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002747 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
2748 if (start_skip > 0)
2749 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002750 // range starts below start of current diff block
Bram Moolenaar071d4272004-06-13 20:20:40 +00002751 if (start_skip > count)
2752 {
2753 lnum += count;
2754 count = 0;
2755 }
2756 else
2757 {
2758 count -= start_skip;
2759 lnum += start_skip;
2760 }
2761 }
2762 else
2763 start_skip = 0;
2764
2765 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
2766 - (eap->line2 + off);
2767 if (end_skip > 0)
2768 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002769 // range ends above end of current/from diff block
2770 if (idx_cur == idx_from) // :diffput
Bram Moolenaar071d4272004-06-13 20:20:40 +00002771 {
2772 i = dp->df_count[idx_cur] - start_skip - end_skip;
2773 if (count > i)
2774 count = i;
2775 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002776 else // :diffget
Bram Moolenaar071d4272004-06-13 20:20:40 +00002777 {
2778 count -= end_skip;
2779 end_skip = dp->df_count[idx_from] - start_skip - count;
2780 if (end_skip < 0)
2781 end_skip = 0;
2782 }
2783 }
2784 else
2785 end_skip = 0;
2786 }
2787
Bram Moolenaarb5aedf32017-03-12 18:23:53 +01002788 buf_empty = BUFEMPTY();
Bram Moolenaar071d4272004-06-13 20:20:40 +00002789 added = 0;
2790 for (i = 0; i < count; ++i)
2791 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002792 // remember deleting the last line of the buffer
Bram Moolenaar280f1262006-01-30 00:14:18 +00002793 buf_empty = curbuf->b_ml.ml_line_count == 1;
Bram Moolenaarca70c072020-05-30 20:30:46 +02002794 ml_delete(lnum);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002795 --added;
2796 }
2797 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
2798 {
2799 linenr_T nr;
2800
2801 nr = dp->df_lnum[idx_from] + start_skip + i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002802 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002803 break;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002804 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
2805 nr, FALSE));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002806 if (p != NULL)
2807 {
2808 ml_append(lnum + i - 1, p, 0, FALSE);
2809 vim_free(p);
2810 ++added;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002811 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
2812 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002813 // Added the first line into an empty buffer, need to
2814 // delete the dummy empty line.
Bram Moolenaar280f1262006-01-30 00:14:18 +00002815 buf_empty = FALSE;
Bram Moolenaarca70c072020-05-30 20:30:46 +02002816 ml_delete((linenr_T)2);
Bram Moolenaar280f1262006-01-30 00:14:18 +00002817 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002818 }
2819 }
2820 new_count = dp->df_count[idx_to] + added;
2821 dp->df_count[idx_to] = new_count;
2822
2823 if (start_skip == 0 && end_skip == 0)
2824 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002825 // Check if there are any other buffers and if the diff is
2826 // equal in them.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002827 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002828 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
2829 && i != idx_to
Bram Moolenaar071d4272004-06-13 20:20:40 +00002830 && !diff_equal_entry(dp, idx_from, i))
2831 break;
2832 if (i == DB_COUNT)
2833 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002834 // delete the diff entry, the buffers are now equal here
Bram Moolenaar071d4272004-06-13 20:20:40 +00002835 dfree = dp;
2836 dp = dp->df_next;
2837 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002838 curtab->tp_first_diff = dp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002839 else
2840 dprev->df_next = dp;
2841 }
2842 }
2843
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002844 // Adjust marks. This will change the following entries!
Bram Moolenaar071d4272004-06-13 20:20:40 +00002845 if (added != 0)
2846 {
2847 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
2848 if (curwin->w_cursor.lnum >= lnum)
2849 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002850 // Adjust the cursor position if it's in/after the changed
2851 // lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002852 if (curwin->w_cursor.lnum >= lnum + count)
2853 curwin->w_cursor.lnum += added;
2854 else if (added < 0)
2855 curwin->w_cursor.lnum = lnum;
2856 }
2857 }
2858 changed_lines(lnum, 0, lnum + count, (long)added);
2859
2860 if (dfree != NULL)
2861 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002862 // Diff is deleted, update folds in other windows.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002863#ifdef FEAT_FOLDING
2864 diff_fold_update(dfree, idx_to);
2865#endif
2866 vim_free(dfree);
2867 }
2868 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002869 // mark_adjust() may have changed the count in a wrong way
Bram Moolenaar071d4272004-06-13 20:20:40 +00002870 dp->df_count[idx_to] = new_count;
2871
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002872 // When changing the current buffer, keep track of line numbers
Bram Moolenaar071d4272004-06-13 20:20:40 +00002873 if (idx_cur == idx_to)
2874 off += added;
2875 }
2876
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002877 // If before the range or not deleted, go to next diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002878 if (dfree == NULL)
2879 {
2880 dprev = dp;
2881 dp = dp->df_next;
2882 }
2883 }
2884
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002885 // restore curwin/curbuf and a few other things
Bram Moolenaara9d52e32010-07-31 16:44:19 +02002886 if (eap->cmdidx != CMD_diffget)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002887 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002888 // Syncing undo only works for the current buffer, but we change
2889 // another buffer. Sync undo if the command was typed. This isn't
2890 // 100% right when ":diffput" is used in a function or mapping.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002891 if (KeyTyped)
Bram Moolenaar779b74b2006-04-10 14:55:34 +00002892 u_sync(FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002893 aucmd_restbuf(&aco);
2894 }
2895
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002896theend:
Bram Moolenaar071d4272004-06-13 20:20:40 +00002897 diff_busy = FALSE;
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002898 if (diff_need_update)
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002899 ex_diffupdate(NULL);
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002900
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +02002901 // Check that the cursor is on a valid character and update its
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002902 // position. When there were filler lines the topline has become
2903 // invalid.
2904 check_cursor();
2905 changed_line_abv_curs();
2906
2907 if (diff_need_update)
2908 // redraw already done by ex_diffupdate()
2909 diff_need_update = FALSE;
Bram Moolenaar198fa062018-09-18 21:20:26 +02002910 else
2911 {
Bram Moolenaar198fa062018-09-18 21:20:26 +02002912 // Also need to redraw the other buffers.
2913 diff_redraw(FALSE);
2914 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
2915 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002916}
2917
2918#ifdef FEAT_FOLDING
2919/*
2920 * Update folds for all diff buffers for entry "dp".
2921 * Skip buffer with index "skip_idx".
2922 * When there are no diffs, all folds are removed.
2923 */
2924 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002925diff_fold_update(diff_T *dp, int skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002926{
2927 int i;
2928 win_T *wp;
2929
Bram Moolenaar29323592016-07-24 22:04:11 +02002930 FOR_ALL_WINDOWS(wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002931 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002932 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002933 foldUpdate(wp, dp->df_lnum[i],
2934 dp->df_lnum[i] + dp->df_count[i]);
2935}
2936#endif
2937
2938/*
2939 * Return TRUE if buffer "buf" is in diff-mode.
2940 */
2941 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002942diff_mode_buf(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002943{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002944 tabpage_T *tp;
2945
Bram Moolenaar29323592016-07-24 22:04:11 +02002946 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002947 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
2948 return TRUE;
2949 return FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002950}
2951
2952/*
2953 * Move "count" times in direction "dir" to the next diff block.
2954 * Return FAIL if there isn't such a diff block.
2955 */
2956 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002957diff_move_to(int dir, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002958{
2959 int idx;
2960 linenr_T lnum = curwin->w_cursor.lnum;
2961 diff_T *dp;
2962
2963 idx = diff_buf_idx(curbuf);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002964 if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002965 return FAIL;
2966
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002967 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002968 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002969
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002970 if (curtab->tp_first_diff == NULL) // no diffs today
Bram Moolenaar071d4272004-06-13 20:20:40 +00002971 return FAIL;
2972
2973 while (--count >= 0)
2974 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002975 // Check if already before first diff.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002976 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002977 break;
2978
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002979 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002980 {
2981 if (dp == NULL)
2982 break;
2983 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
2984 || (dir == BACKWARD
2985 && (dp->df_next == NULL
2986 || lnum <= dp->df_next->df_lnum[idx])))
2987 {
2988 lnum = dp->df_lnum[idx];
2989 break;
2990 }
2991 }
2992 }
2993
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002994 // don't end up past the end of the file
Bram Moolenaar071d4272004-06-13 20:20:40 +00002995 if (lnum > curbuf->b_ml.ml_line_count)
2996 lnum = curbuf->b_ml.ml_line_count;
2997
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002998 // When the cursor didn't move at all we fail.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002999 if (lnum == curwin->w_cursor.lnum)
3000 return FAIL;
3001
3002 setpcmark();
3003 curwin->w_cursor.lnum = lnum;
3004 curwin->w_cursor.col = 0;
3005
3006 return OK;
3007}
3008
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003009/*
3010 * Return the line number in the current window that is closest to "lnum1" in
3011 * "buf1" in diff mode.
3012 */
3013 static linenr_T
3014diff_get_corresponding_line_int(
Bram Moolenaar7454a062016-01-30 15:14:10 +01003015 buf_T *buf1,
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003016 linenr_T lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003017{
3018 int idx1;
3019 int idx2;
3020 diff_T *dp;
3021 int baseline = 0;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003022
3023 idx1 = diff_buf_idx(buf1);
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003024 idx2 = diff_buf_idx(curbuf);
Bram Moolenaar860cae12010-06-05 23:22:07 +02003025 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL)
3026 return lnum1;
3027
3028 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003029 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar860cae12010-06-05 23:22:07 +02003030
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003031 if (curtab->tp_first_diff == NULL) // no diffs today
Bram Moolenaar860cae12010-06-05 23:22:07 +02003032 return lnum1;
3033
Bram Moolenaaraeea7212020-04-02 18:50:46 +02003034 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003035 {
3036 if (dp->df_lnum[idx1] > lnum1)
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003037 return lnum1 - baseline;
3038 if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003039 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003040 // Inside the diffblock
Bram Moolenaar860cae12010-06-05 23:22:07 +02003041 baseline = lnum1 - dp->df_lnum[idx1];
3042 if (baseline > dp->df_count[idx2])
3043 baseline = dp->df_count[idx2];
3044
3045 return dp->df_lnum[idx2] + baseline;
3046 }
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003047 if ( (dp->df_lnum[idx1] == lnum1)
3048 && (dp->df_count[idx1] == 0)
3049 && (dp->df_lnum[idx2] <= curwin->w_cursor.lnum)
3050 && ((dp->df_lnum[idx2] + dp->df_count[idx2])
3051 > curwin->w_cursor.lnum))
Bram Moolenaar860cae12010-06-05 23:22:07 +02003052 /*
3053 * Special case: if the cursor is just after a zero-count
3054 * block (i.e. all filler) and the target cursor is already
3055 * inside the corresponding block, leave the target cursor
3056 * unmoved. This makes repeated CTRL-W W operations work
3057 * as expected.
3058 */
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003059 return curwin->w_cursor.lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003060 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1])
3061 - (dp->df_lnum[idx2] + dp->df_count[idx2]);
3062 }
3063
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003064 // If we get here then the cursor is after the last diff
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003065 return lnum1 - baseline;
3066}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003067
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003068/*
3069 * Return the line number in the current window that is closest to "lnum1" in
3070 * "buf1" in diff mode. Checks the line number to be valid.
3071 */
3072 linenr_T
3073diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1)
3074{
3075 linenr_T lnum = diff_get_corresponding_line_int(buf1, lnum1);
3076
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003077 // don't end up past the end of the file
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003078 if (lnum > curbuf->b_ml.ml_line_count)
3079 return curbuf->b_ml.ml_line_count;
3080 return lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003081}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003082
Bram Moolenaar071d4272004-06-13 20:20:40 +00003083/*
3084 * For line "lnum" in the current window find the equivalent lnum in window
3085 * "wp", compensating for inserted/deleted lines.
3086 */
3087 linenr_T
Bram Moolenaar7454a062016-01-30 15:14:10 +01003088diff_lnum_win(linenr_T lnum, win_T *wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003089{
3090 diff_T *dp;
3091 int idx;
3092 int i;
3093 linenr_T n;
3094
3095 idx = diff_buf_idx(curbuf);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003096 if (idx == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00003097 return (linenr_T)0;
3098
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003099 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003100 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00003101
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003102 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02003103 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003104 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3105 break;
3106
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003107 // When after the last change, compute relative to the last line number.
Bram Moolenaar071d4272004-06-13 20:20:40 +00003108 if (dp == NULL)
3109 return wp->w_buffer->b_ml.ml_line_count
3110 - (curbuf->b_ml.ml_line_count - lnum);
3111
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003112 // Find index for "wp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00003113 i = diff_buf_idx(wp->w_buffer);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003114 if (i == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00003115 return (linenr_T)0;
3116
3117 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
3118 if (n > dp->df_lnum[i] + dp->df_count[i])
3119 n = dp->df_lnum[i] + dp->df_count[i];
3120 return n;
3121}
Bram Moolenaar071d4272004-06-13 20:20:40 +00003122
Bram Moolenaare828b762018-09-10 17:51:58 +02003123/*
3124 * Handle an ED style diff line.
3125 * Return FAIL if the line does not contain diff info.
3126 */
3127 static int
3128parse_diff_ed(
3129 char_u *line,
3130 linenr_T *lnum_orig,
3131 long *count_orig,
3132 linenr_T *lnum_new,
3133 long *count_new)
3134{
3135 char_u *p;
3136 long f1, l1, f2, l2;
3137 int difftype;
3138
3139 // The line must be one of three formats:
3140 // change: {first}[,{last}]c{first}[,{last}]
3141 // append: {first}a{first}[,{last}]
3142 // delete: {first}[,{last}]d{first}
3143 p = line;
3144 f1 = getdigits(&p);
3145 if (*p == ',')
3146 {
3147 ++p;
3148 l1 = getdigits(&p);
3149 }
3150 else
3151 l1 = f1;
3152 if (*p != 'a' && *p != 'c' && *p != 'd')
3153 return FAIL; // invalid diff format
3154 difftype = *p++;
3155 f2 = getdigits(&p);
3156 if (*p == ',')
3157 {
3158 ++p;
3159 l2 = getdigits(&p);
3160 }
3161 else
3162 l2 = f2;
3163 if (l1 < f1 || l2 < f2)
3164 return FAIL;
3165
3166 if (difftype == 'a')
3167 {
3168 *lnum_orig = f1 + 1;
3169 *count_orig = 0;
3170 }
3171 else
3172 {
3173 *lnum_orig = f1;
3174 *count_orig = l1 - f1 + 1;
3175 }
3176 if (difftype == 'd')
3177 {
3178 *lnum_new = f2 + 1;
3179 *count_new = 0;
3180 }
3181 else
3182 {
3183 *lnum_new = f2;
3184 *count_new = l2 - f2 + 1;
3185 }
3186 return OK;
3187}
3188
3189/*
3190 * Parses unified diff with zero(!) context lines.
3191 * Return FAIL if there is no diff information in "line".
3192 */
3193 static int
3194parse_diff_unified(
3195 char_u *line,
3196 linenr_T *lnum_orig,
3197 long *count_orig,
3198 linenr_T *lnum_new,
3199 long *count_new)
3200{
3201 char_u *p;
3202 long oldline, oldcount, newline, newcount;
3203
3204 // Parse unified diff hunk header:
3205 // @@ -oldline,oldcount +newline,newcount @@
3206 p = line;
3207 if (*p++ == '@' && *p++ == '@' && *p++ == ' ' && *p++ == '-')
3208 {
3209 oldline = getdigits(&p);
3210 if (*p == ',')
3211 {
3212 ++p;
3213 oldcount = getdigits(&p);
3214 }
3215 else
3216 oldcount = 1;
3217 if (*p++ == ' ' && *p++ == '+')
3218 {
3219 newline = getdigits(&p);
3220 if (*p == ',')
3221 {
3222 ++p;
3223 newcount = getdigits(&p);
3224 }
3225 else
3226 newcount = 1;
3227 }
3228 else
3229 return FAIL; // invalid diff format
3230
3231 if (oldcount == 0)
3232 oldline += 1;
3233 if (newcount == 0)
3234 newline += 1;
3235 if (newline == 0)
3236 newline = 1;
3237
3238 *lnum_orig = oldline;
3239 *count_orig = oldcount;
3240 *lnum_new = newline;
3241 *count_new = newcount;
3242
3243 return OK;
3244 }
3245
3246 return FAIL;
3247}
3248
3249/*
3250 * Callback function for the xdl_diff() function.
3251 * Stores the diff output in a grow array.
3252 */
3253 static int
3254xdiff_out(void *priv, mmbuffer_t *mb, int nbuf)
3255{
3256 diffout_T *dout = (diffout_T *)priv;
Bram Moolenaare828b762018-09-10 17:51:58 +02003257 char_u *p;
3258
Bram Moolenaarf080d702018-10-31 22:57:26 +01003259 // The header line always comes by itself, text lines in at least two
3260 // parts. We drop the text part.
3261 if (nbuf > 1)
3262 return 0;
3263
3264 // sanity check
3265 if (STRNCMP(mb[0].ptr, "@@ ", 3) != 0)
3266 return 0;
3267
3268 if (ga_grow(&dout->dout_ga, 1) == FAIL)
3269 return -1;
3270 p = vim_strnsave((char_u *)mb[0].ptr, mb[0].size);
3271 if (p == NULL)
3272 return -1;
3273 ((char_u **)dout->dout_ga.ga_data)[dout->dout_ga.ga_len++] = p;
Bram Moolenaare828b762018-09-10 17:51:58 +02003274 return 0;
3275}
3276
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003277#endif // FEAT_DIFF
3278
3279#if defined(FEAT_EVAL) || defined(PROTO)
3280
3281/*
3282 * "diff_filler()" function
3283 */
3284 void
3285f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
3286{
3287#ifdef FEAT_DIFF
Yegappan Lakshmanan4490ec42021-07-27 22:00:44 +02003288 if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL)
3289 return;
3290
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003291 rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars));
3292#endif
3293}
3294
3295/*
3296 * "diff_hlID()" function
3297 */
3298 void
3299f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
3300{
3301#ifdef FEAT_DIFF
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003302 linenr_T lnum;
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003303 static linenr_T prev_lnum = 0;
3304 static varnumber_T changedtick = 0;
3305 static int fnum = 0;
3306 static int change_start = 0;
3307 static int change_end = 0;
3308 static hlf_T hlID = (hlf_T)0;
3309 int filler_lines;
3310 int col;
3311
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003312 if (in_vim9script()
Yegappan Lakshmanancd917202021-07-21 19:09:09 +02003313 && (check_for_lnum_arg(argvars,0) == FAIL
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003314 || check_for_number_arg(argvars, 1) == FAIL))
3315 return;
3316
3317 lnum = tv_get_lnum(argvars);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003318 if (lnum < 0) // ignore type error in {lnum} arg
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003319 lnum = 0;
3320 if (lnum != prev_lnum
3321 || changedtick != CHANGEDTICK(curbuf)
3322 || fnum != curbuf->b_fnum)
3323 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003324 // New line, buffer, change: need to get the values.
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003325 filler_lines = diff_check(curwin, lnum);
3326 if (filler_lines < 0)
3327 {
3328 if (filler_lines == -1)
3329 {
3330 change_start = MAXCOL;
3331 change_end = -1;
3332 if (diff_find_change(curwin, lnum, &change_start, &change_end))
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003333 hlID = HLF_ADD; // added line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003334 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003335 hlID = HLF_CHD; // changed line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003336 }
3337 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003338 hlID = HLF_ADD; // added line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003339 }
3340 else
3341 hlID = (hlf_T)0;
3342 prev_lnum = lnum;
3343 changedtick = CHANGEDTICK(curbuf);
3344 fnum = curbuf->b_fnum;
3345 }
3346
3347 if (hlID == HLF_CHD || hlID == HLF_TXD)
3348 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003349 col = tv_get_number(&argvars[1]) - 1; // ignore type error in {col}
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003350 if (col >= change_start && col <= change_end)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003351 hlID = HLF_TXD; // changed text
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003352 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003353 hlID = HLF_CHD; // changed line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003354 }
3355 rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID;
3356#endif
3357}
3358
3359#endif