blob: a46f0bf81e7fb632b6bec590d3955287b29c14d0 [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
Lewis Russelld9da86e2021-12-28 13:54:41 +000067// used for recording hunks from xdiff
68typedef struct {
69 linenr_T lnum_orig;
70 long count_orig;
71 linenr_T lnum_new;
72 long count_new;
73} diffhunk_T;
74
Bram Moolenaare828b762018-09-10 17:51:58 +020075// two diff inputs and one result
76typedef struct {
77 diffin_T dio_orig; // original file input
78 diffin_T dio_new; // new file input
79 diffout_T dio_diff; // diff result
80 int dio_internal; // using internal diff
81} diffio_T;
82
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010083static int diff_buf_idx(buf_T *buf);
84static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp);
85static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after);
86static void diff_check_unchanged(tabpage_T *tp, diff_T *dp);
87static int diff_check_sanity(tabpage_T *tp, diff_T *dp);
Bram Moolenaare828b762018-09-10 17:51:58 +020088static int check_external_diff(diffio_T *diffio);
89static int diff_file(diffio_T *diffio);
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010090static int diff_equal_entry(diff_T *dp, int idx1, int idx2);
91static int diff_cmp(char_u *s1, char_u *s2);
Bram Moolenaar071d4272004-06-13 20:20:40 +000092#ifdef FEAT_FOLDING
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010093static void diff_fold_update(diff_T *dp, int skip_idx);
Bram Moolenaar071d4272004-06-13 20:20:40 +000094#endif
Lewis Russelld9da86e2021-12-28 13:54:41 +000095static void diff_read(int idx_orig, int idx_new, diffio_T *dio);
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010096static void diff_copy_entry(diff_T *dprev, diff_T *dp, int idx_orig, int idx_new);
97static diff_T *diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp);
Lewis Russelld9da86e2021-12-28 13:54:41 +000098static int parse_diff_ed(char_u *line, diffhunk_T *hunk);
99static int parse_diff_unified(char_u *line, diffhunk_T *hunk);
100static int xdiff_out(long start_a, long count_a, long start_b, long count_b, void *priv);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000101
Bram Moolenaaraeea7212020-04-02 18:50:46 +0200102#define FOR_ALL_DIFFBLOCKS_IN_TAB(tp, dp) \
103 for ((dp) = (tp)->tp_first_diff; (dp) != NULL; (dp) = (dp)->df_next)
104
Bram Moolenaar071d4272004-06-13 20:20:40 +0000105/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000106 * Called when deleting or unloading a buffer: No longer make a diff with it.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000107 */
108 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100109diff_buf_delete(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000110{
111 int i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000112 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000113
Bram Moolenaar29323592016-07-24 22:04:11 +0200114 FOR_ALL_TABPAGES(tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000115 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000116 i = diff_buf_idx_tp(buf, tp);
117 if (i != DB_COUNT)
118 {
119 tp->tp_diffbuf[i] = NULL;
120 tp->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000121 if (tp == curtab)
Bram Moolenaarcd38bb42022-06-26 14:04:07 +0100122 {
123 // don't redraw right away, more might change or buffer state
124 // is invalid right now
125 need_diff_redraw = TRUE;
Bram Moolenaara4d158b2022-08-14 14:17:45 +0100126 redraw_later(UPD_VALID);
Bram Moolenaarcd38bb42022-06-26 14:04:07 +0100127 }
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000128 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000129 }
130}
131
132/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000133 * Check if the current buffer should be added to or removed from the list of
134 * diff buffers.
135 */
136 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100137diff_buf_adjust(win_T *win)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000138{
139 win_T *wp;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000140 int i;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000141
142 if (!win->w_p_diff)
143 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100144 // When there is no window showing a diff for this buffer, remove
145 // it from the diffs.
Bram Moolenaar29323592016-07-24 22:04:11 +0200146 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000147 if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
148 break;
149 if (wp == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000150 {
151 i = diff_buf_idx(win->w_buffer);
152 if (i != DB_COUNT)
153 {
154 curtab->tp_diffbuf[i] = NULL;
155 curtab->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000156 diff_redraw(TRUE);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000157 }
158 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000159 }
160 else
161 diff_buf_add(win->w_buffer);
162}
163
164/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000165 * Add a buffer to make diffs for.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000166 * Call this when a new buffer is being edited in the current window where
167 * 'diff' is set.
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +0000168 * Marks the current buffer as being part of the diff and requiring updating.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000169 * This must be done before any autocmd, because a command may use info
170 * about the screen contents.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000171 */
172 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100173diff_buf_add(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000174{
175 int i;
176
177 if (diff_buf_idx(buf) != DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100178 return; // It's already there.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000179
180 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000181 if (curtab->tp_diffbuf[i] == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000182 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000183 curtab->tp_diffbuf[i] = buf;
184 curtab->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000185 diff_redraw(TRUE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000186 return;
187 }
188
Bram Moolenaare1242042021-12-16 20:56:57 +0000189 semsg(_(e_cannot_diff_more_than_nr_buffers), DB_COUNT);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000190}
191
192/*
Bram Moolenaar25ea0542017-02-03 23:16:28 +0100193 * Remove all buffers to make diffs for.
194 */
195 static void
196diff_buf_clear(void)
197{
198 int i;
199
200 for (i = 0; i < DB_COUNT; ++i)
201 if (curtab->tp_diffbuf[i] != NULL)
202 {
203 curtab->tp_diffbuf[i] = NULL;
204 curtab->tp_diff_invalid = TRUE;
205 diff_redraw(TRUE);
206 }
207}
208
209/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000210 * Find buffer "buf" in the list of diff buffers for the current tab page.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000211 * Return its index or DB_COUNT if not found.
212 */
213 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100214diff_buf_idx(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000215{
216 int idx;
217
218 for (idx = 0; idx < DB_COUNT; ++idx)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000219 if (curtab->tp_diffbuf[idx] == buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000220 break;
221 return idx;
222}
223
224/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000225 * Find buffer "buf" in the list of diff buffers for tab page "tp".
226 * Return its index or DB_COUNT if not found.
227 */
228 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100229diff_buf_idx_tp(buf_T *buf, tabpage_T *tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000230{
231 int idx;
232
233 for (idx = 0; idx < DB_COUNT; ++idx)
234 if (tp->tp_diffbuf[idx] == buf)
235 break;
236 return idx;
237}
238
239/*
240 * Mark the diff info involving buffer "buf" as invalid, it will be updated
241 * when info is requested.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000242 */
243 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100244diff_invalidate(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000245{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000246 tabpage_T *tp;
247 int i;
248
Bram Moolenaar29323592016-07-24 22:04:11 +0200249 FOR_ALL_TABPAGES(tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000250 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000251 i = diff_buf_idx_tp(buf, tp);
252 if (i != DB_COUNT)
253 {
254 tp->tp_diff_invalid = TRUE;
255 if (tp == curtab)
256 diff_redraw(TRUE);
257 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000258 }
259}
260
261/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000262 * Called by mark_adjust(): update line numbers in "curbuf".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000263 */
264 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100265diff_mark_adjust(
266 linenr_T line1,
267 linenr_T line2,
268 long amount,
269 long amount_after)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000270{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000271 int idx;
272 tabpage_T *tp;
273
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100274 // Handle all tab pages that use the current buffer in a diff.
Bram Moolenaar29323592016-07-24 22:04:11 +0200275 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000276 {
277 idx = diff_buf_idx_tp(curbuf, tp);
278 if (idx != DB_COUNT)
279 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
280 }
281}
282
283/*
284 * Update line numbers in tab page "tp" for "curbuf" with index "idx".
285 * This attempts to update the changes as much as possible:
286 * When inserting/deleting lines outside of existing change blocks, create a
287 * new change block and update the line numbers in following blocks.
288 * When inserting/deleting lines in existing change blocks, update them.
289 */
290 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100291diff_mark_adjust_tp(
292 tabpage_T *tp,
293 int idx,
294 linenr_T line1,
295 linenr_T line2,
296 long amount,
297 long amount_after)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000298{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000299 diff_T *dp;
300 diff_T *dprev;
301 diff_T *dnext;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000302 int i;
303 int inserted, deleted;
304 int n, off;
305 linenr_T last;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100306 linenr_T lnum_deleted = line1; // lnum of remaining deletion
Bram Moolenaar071d4272004-06-13 20:20:40 +0000307 int check_unchanged;
308
Bram Moolenaare3521d92018-09-16 14:10:31 +0200309 if (diff_internal())
310 {
Bram Moolenaar198fa062018-09-18 21:20:26 +0200311 // Will update diffs before redrawing. Set _invalid to update the
Bram Moolenaare3521d92018-09-16 14:10:31 +0200312 // diffs themselves, set _update to also update folds properly just
313 // before redrawing.
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +0200314 // Do update marks here, it is needed for :%diffput.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200315 tp->tp_diff_invalid = TRUE;
316 tp->tp_diff_update = TRUE;
Bram Moolenaare3521d92018-09-16 14:10:31 +0200317 }
318
Bram Moolenaar071d4272004-06-13 20:20:40 +0000319 if (line2 == MAXLNUM)
320 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100321 // mark_adjust(99, MAXLNUM, 9, 0): insert lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000322 inserted = amount;
323 deleted = 0;
324 }
325 else if (amount_after > 0)
326 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100327 // mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000328 inserted = amount_after;
329 deleted = 0;
330 }
331 else
332 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100333 // mark_adjust(98, 99, MAXLNUM, -2): delete lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000334 inserted = 0;
335 deleted = -amount_after;
336 }
337
338 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000339 dp = tp->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000340 for (;;)
341 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100342 // If the change is after the previous diff block and before the next
343 // diff block, thus not touching an existing change, create a new diff
344 // block. Don't do this when ex_diffgetput() is busy.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000345 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2
346 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
347 && (dprev == NULL
348 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
349 && !diff_busy)
350 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000351 dnext = diff_alloc_new(tp, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000352 if (dnext == NULL)
353 return;
354
355 dnext->df_lnum[idx] = line1;
356 dnext->df_count[idx] = inserted;
357 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000358 if (tp->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000359 {
360 if (dprev == NULL)
361 dnext->df_lnum[i] = line1;
362 else
363 dnext->df_lnum[i] = line1
364 + (dprev->df_lnum[i] + dprev->df_count[i])
365 - (dprev->df_lnum[idx] + dprev->df_count[idx]);
366 dnext->df_count[i] = deleted;
367 }
368 }
369
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100370 // if at end of the list, quit
Bram Moolenaar071d4272004-06-13 20:20:40 +0000371 if (dp == NULL)
372 break;
373
374 /*
375 * Check for these situations:
376 * 1 2 3
377 * 1 2 3
378 * line1 2 3 4 5
379 * 2 3 4 5
380 * 2 3 4 5
381 * line2 2 3 4 5
382 * 3 5 6
383 * 3 5 6
384 */
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100385 // compute last line of this change
Bram Moolenaar071d4272004-06-13 20:20:40 +0000386 last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
387
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100388 // 1. change completely above line1: nothing to do
Bram Moolenaar071d4272004-06-13 20:20:40 +0000389 if (last >= line1 - 1)
390 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100391 // 6. change below line2: only adjust for amount_after; also when
392 // "deleted" became zero when deleted all lines between two diffs
Bram Moolenaar071d4272004-06-13 20:20:40 +0000393 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
394 {
395 if (amount_after == 0)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100396 break; // nothing left to change
Bram Moolenaar071d4272004-06-13 20:20:40 +0000397 dp->df_lnum[idx] += amount_after;
398 }
399 else
400 {
401 check_unchanged = FALSE;
402
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100403 // 2. 3. 4. 5.: inserted/deleted lines touching this diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000404 if (deleted > 0)
405 {
Bram Moolenaarc101abf2022-06-26 16:53:34 +0100406 off = 0;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000407 if (dp->df_lnum[idx] >= line1)
408 {
Bram Moolenaar071d4272004-06-13 20:20:40 +0000409 if (last <= line2)
410 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100411 // 4. delete all lines of diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000412 if (dp->df_next != NULL
413 && dp->df_next->df_lnum[idx] - 1 <= line2)
414 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100415 // delete continues in next diff, only do
416 // lines until that one
Bram Moolenaar071d4272004-06-13 20:20:40 +0000417 n = dp->df_next->df_lnum[idx] - lnum_deleted;
418 deleted -= n;
419 n -= dp->df_count[idx];
420 lnum_deleted = dp->df_next->df_lnum[idx];
421 }
422 else
423 n = deleted - dp->df_count[idx];
424 dp->df_count[idx] = 0;
425 }
426 else
427 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100428 // 5. delete lines at or just before top of diff
Bram Moolenaarc101abf2022-06-26 16:53:34 +0100429 off = dp->df_lnum[idx] - lnum_deleted;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000430 n = off;
431 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
432 check_unchanged = TRUE;
433 }
434 dp->df_lnum[idx] = line1;
435 }
436 else
437 {
Bram Moolenaar071d4272004-06-13 20:20:40 +0000438 if (last < line2)
439 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100440 // 2. delete at end of diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000441 dp->df_count[idx] -= last - lnum_deleted + 1;
442 if (dp->df_next != NULL
443 && dp->df_next->df_lnum[idx] - 1 <= line2)
444 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100445 // delete continues in next diff, only do
446 // lines until that one
Bram Moolenaar071d4272004-06-13 20:20:40 +0000447 n = dp->df_next->df_lnum[idx] - 1 - last;
448 deleted -= dp->df_next->df_lnum[idx]
449 - lnum_deleted;
450 lnum_deleted = dp->df_next->df_lnum[idx];
451 }
452 else
453 n = line2 - last;
454 check_unchanged = TRUE;
455 }
456 else
457 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100458 // 3. delete lines inside the diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000459 n = 0;
460 dp->df_count[idx] -= deleted;
461 }
462 }
463
464 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000465 if (tp->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000466 {
Bram Moolenaar4e677b92022-07-28 18:44:27 +0100467 if (dp->df_lnum[i] > off)
468 dp->df_lnum[i] -= off;
469 else
470 dp->df_lnum[i] = 1;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000471 dp->df_count[i] += n;
472 }
473 }
474 else
475 {
476 if (dp->df_lnum[idx] <= line1)
477 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100478 // inserted lines somewhere in this diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000479 dp->df_count[idx] += inserted;
480 check_unchanged = TRUE;
481 }
482 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100483 // inserted lines somewhere above this diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000484 dp->df_lnum[idx] += inserted;
485 }
486
487 if (check_unchanged)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100488 // Check if inserted lines are equal, may reduce the
489 // size of the diff. TODO: also check for equal lines
490 // in the middle and perhaps split the block.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000491 diff_check_unchanged(tp, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000492 }
493 }
494
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100495 // check if this block touches the previous one, may merge them.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000496 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
497 == dp->df_lnum[idx])
498 {
499 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000500 if (tp->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000501 dprev->df_count[i] += dp->df_count[i];
502 dprev->df_next = dp->df_next;
503 vim_free(dp);
504 dp = dprev->df_next;
505 }
506 else
507 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100508 // Advance to next entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000509 dprev = dp;
510 dp = dp->df_next;
511 }
512 }
513
514 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000515 dp = tp->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000516 while (dp != NULL)
517 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100518 // All counts are zero, remove this entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000519 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000520 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000521 break;
522 if (i == DB_COUNT)
523 {
524 dnext = dp->df_next;
525 vim_free(dp);
526 dp = dnext;
527 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000528 tp->tp_first_diff = dnext;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000529 else
530 dprev->df_next = dnext;
531 }
532 else
533 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100534 // Advance to next entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000535 dprev = dp;
536 dp = dp->df_next;
537 }
538
539 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000540
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000541 if (tp == curtab)
542 {
Bram Moolenaar4f57eef2019-08-24 20:54:19 +0200543 // Don't redraw right away, this updates the diffs, which can be slow.
544 need_diff_redraw = TRUE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000545
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100546 // Need to recompute the scroll binding, may remove or add filler
547 // lines (e.g., when adding lines above w_topline). But it's slow when
548 // making many changes, postpone until redrawing.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000549 diff_need_scrollbind = TRUE;
550 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000551}
552
553/*
554 * Allocate a new diff block and link it between "dprev" and "dp".
555 */
556 static diff_T *
Bram Moolenaar7454a062016-01-30 15:14:10 +0100557diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000558{
559 diff_T *dnew;
560
Bram Moolenaarc799fe22019-05-28 23:08:19 +0200561 dnew = ALLOC_ONE(diff_T);
Yegappan Lakshmanan1cfb14a2023-01-09 19:04:23 +0000562 if (dnew == NULL)
563 return NULL;
564
565 dnew->df_next = dp;
566 if (dprev == NULL)
567 tp->tp_first_diff = dnew;
568 else
569 dprev->df_next = dnew;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000570 return dnew;
571}
572
573/*
574 * Check if the diff block "dp" can be made smaller for lines at the start and
575 * end that are equal. Called after inserting lines.
576 * This may result in a change where all buffers have zero lines, the caller
577 * must take care of removing it.
578 */
579 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100580diff_check_unchanged(tabpage_T *tp, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000581{
582 int i_org;
583 int i_new;
584 int off_org, off_new;
585 char_u *line_org;
586 int dir = FORWARD;
587
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100588 // Find the first buffers, use it as the original, compare the other
589 // buffer lines against this one.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000590 for (i_org = 0; i_org < DB_COUNT; ++i_org)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000591 if (tp->tp_diffbuf[i_org] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000592 break;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100593 if (i_org == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +0000594 return;
595
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000596 if (diff_check_sanity(tp, dp) == FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000597 return;
598
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100599 // First check lines at the top, then at the bottom.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000600 off_org = 0;
601 off_new = 0;
602 for (;;)
603 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100604 // Repeat until a line is found which is different or the number of
605 // lines has become zero.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000606 while (dp->df_count[i_org] > 0)
607 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100608 // Copy the line, the next ml_get() will invalidate it.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000609 if (dir == BACKWARD)
610 off_org = dp->df_count[i_org] - 1;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000611 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org],
Bram Moolenaar071d4272004-06-13 20:20:40 +0000612 dp->df_lnum[i_org] + off_org, FALSE));
613 if (line_org == NULL)
614 return;
615 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new)
616 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000617 if (tp->tp_diffbuf[i_new] == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000618 continue;
619 if (dir == BACKWARD)
620 off_new = dp->df_count[i_new] - 1;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100621 // if other buffer doesn't have this line, it was inserted
Bram Moolenaar071d4272004-06-13 20:20:40 +0000622 if (off_new < 0 || off_new >= dp->df_count[i_new])
623 break;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000624 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new],
Bram Moolenaar071d4272004-06-13 20:20:40 +0000625 dp->df_lnum[i_new] + off_new, FALSE)) != 0)
626 break;
627 }
628 vim_free(line_org);
629
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100630 // Stop when a line isn't equal in all diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000631 if (i_new != DB_COUNT)
632 break;
633
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100634 // Line matched in all buffers, remove it from the diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000635 for (i_new = i_org; i_new < DB_COUNT; ++i_new)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000636 if (tp->tp_diffbuf[i_new] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000637 {
638 if (dir == FORWARD)
639 ++dp->df_lnum[i_new];
640 --dp->df_count[i_new];
641 }
642 }
643 if (dir == BACKWARD)
644 break;
645 dir = BACKWARD;
646 }
647}
648
649/*
650 * Check if a diff block doesn't contain invalid line numbers.
651 * This can happen when the diff program returns invalid results.
652 */
653 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100654diff_check_sanity(tabpage_T *tp, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000655{
656 int i;
657
658 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000659 if (tp->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000660 if (dp->df_lnum[i] + dp->df_count[i] - 1
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000661 > tp->tp_diffbuf[i]->b_ml.ml_line_count)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000662 return FAIL;
663 return OK;
664}
665
666/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000667 * Mark all diff buffers in the current tab page for redraw.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000668 */
Bram Moolenaar4f57eef2019-08-24 20:54:19 +0200669 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100670diff_redraw(
Bram Moolenaare3521d92018-09-16 14:10:31 +0200671 int dofold) // also recompute the folds
Bram Moolenaar071d4272004-06-13 20:20:40 +0000672{
673 win_T *wp;
Bram Moolenaar04626c22021-09-01 16:02:07 +0200674 win_T *wp_other = NULL;
Bram Moolenaar841c2252021-10-22 20:56:55 +0100675 int used_max_fill_other = FALSE;
676 int used_max_fill_curwin = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000677 int n;
678
Bram Moolenaar4f57eef2019-08-24 20:54:19 +0200679 need_diff_redraw = FALSE;
Bram Moolenaar29323592016-07-24 22:04:11 +0200680 FOR_ALL_WINDOWS(wp)
zeertzjq101d57b2022-07-31 18:34:32 +0100681 {
Bram Moolenaarcd38bb42022-06-26 14:04:07 +0100682 // when closing windows or wiping buffers skip invalid window
zeertzjq101d57b2022-07-31 18:34:32 +0100683 if (!wp->w_p_diff || !buf_valid(wp->w_buffer))
684 continue;
685
Bram Moolenaara4d158b2022-08-14 14:17:45 +0100686 redraw_win_later(wp, UPD_SOME_VALID);
zeertzjq101d57b2022-07-31 18:34:32 +0100687 if (wp != curwin)
688 wp_other = wp;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000689#ifdef FEAT_FOLDING
zeertzjq101d57b2022-07-31 18:34:32 +0100690 if (dofold && foldmethodIsDiff(wp))
691 foldUpdateAll(wp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000692#endif
zeertzjq101d57b2022-07-31 18:34:32 +0100693 // A change may have made filler lines invalid, need to take care of
694 // that for other windows.
695 n = diff_check(wp, wp->w_topline);
696 if ((wp != curwin && wp->w_topfill > 0) || n > 0)
697 {
698 if (wp->w_topfill > n)
699 wp->w_topfill = (n < 0 ? 0 : n);
700 else if (n > 0 && n > wp->w_topfill)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000701 {
zeertzjq101d57b2022-07-31 18:34:32 +0100702 wp->w_topfill = n;
703 if (wp == curwin)
704 used_max_fill_curwin = TRUE;
705 else if (wp_other != NULL)
706 used_max_fill_other = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000707 }
zeertzjq101d57b2022-07-31 18:34:32 +0100708 check_topfill(wp, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000709 }
zeertzjq101d57b2022-07-31 18:34:32 +0100710 }
Bram Moolenaar04626c22021-09-01 16:02:07 +0200711
Bram Moolenaar841c2252021-10-22 20:56:55 +0100712 if (wp_other != NULL && curwin->w_p_scb)
713 {
714 if (used_max_fill_curwin)
Dominique Pelleaf4a61a2021-12-27 17:21:41 +0000715 // The current window was set to use the maximum number of filler
Bram Moolenaar841c2252021-10-22 20:56:55 +0100716 // lines, may need to reduce them.
717 diff_set_topline(wp_other, curwin);
718 else if (used_max_fill_other)
Dominique Pelleaf4a61a2021-12-27 17:21:41 +0000719 // The other window was set to use the maximum number of filler
Bram Moolenaar841c2252021-10-22 20:56:55 +0100720 // lines, may need to reduce them.
721 diff_set_topline(curwin, wp_other);
722 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000723}
724
Bram Moolenaare828b762018-09-10 17:51:58 +0200725 static void
726clear_diffin(diffin_T *din)
727{
728 if (din->din_fname == NULL)
Yegappan Lakshmanan960dcbd2023-03-07 17:45:11 +0000729 VIM_CLEAR(din->din_mmfile.ptr);
Bram Moolenaare828b762018-09-10 17:51:58 +0200730 else
731 mch_remove(din->din_fname);
732}
733
734 static void
735clear_diffout(diffout_T *dout)
736{
737 if (dout->dout_fname == NULL)
738 ga_clear_strings(&dout->dout_ga);
739 else
740 mch_remove(dout->dout_fname);
741}
742
Bram Moolenaar071d4272004-06-13 20:20:40 +0000743/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200744 * Write buffer "buf" to a memory buffer.
745 * Return FAIL for failure.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000746 */
747 static int
Bram Moolenaare828b762018-09-10 17:51:58 +0200748diff_write_buffer(buf_T *buf, diffin_T *din)
749{
750 linenr_T lnum;
751 char_u *s;
752 long len = 0;
753 char_u *ptr;
754
755 // xdiff requires one big block of memory with all the text.
756 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
Bram Moolenaar6e272ac2018-09-16 14:51:36 +0200757 len += (long)STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
Bram Moolenaar18a4ba22019-05-24 19:39:03 +0200758 ptr = alloc(len);
Bram Moolenaare828b762018-09-10 17:51:58 +0200759 if (ptr == NULL)
760 {
761 // Allocating memory failed. This can happen, because we try to read
762 // the whole buffer text into memory. Set the failed flag, the diff
763 // will be retried with external diff. The flag is never reset.
764 buf->b_diff_failed = TRUE;
765 if (p_verbose > 0)
766 {
767 verbose_enter();
Bram Moolenaarf9e3e092019-01-13 23:38:42 +0100768 smsg(_("Not enough memory to use internal diff for buffer \"%s\""),
Bram Moolenaare828b762018-09-10 17:51:58 +0200769 buf->b_fname);
770 verbose_leave();
771 }
772 return FAIL;
773 }
774 din->din_mmfile.ptr = (char *)ptr;
775 din->din_mmfile.size = len;
776
777 len = 0;
778 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
779 {
780 for (s = ml_get_buf(buf, lnum, FALSE); *s != NUL; )
781 {
782 if (diff_flags & DIFF_ICASE)
783 {
784 int c;
Bram Moolenaare828b762018-09-10 17:51:58 +0200785 int orig_len;
786 char_u cbuf[MB_MAXBYTES + 1];
787
Bram Moolenaar06f60952021-12-28 18:30:05 +0000788 if (*s == NL)
789 c = NUL;
790 else
791 {
792 // xdiff doesn't support ignoring case, fold-case the text.
793 c = PTR2CHAR(s);
794 c = MB_CASEFOLD(c);
795 }
Bram Moolenaar1614a142019-10-06 22:00:13 +0200796 orig_len = mb_ptr2len(s);
Bram Moolenaare828b762018-09-10 17:51:58 +0200797 if (mb_char2bytes(c, cbuf) != orig_len)
798 // TODO: handle byte length difference
799 mch_memmove(ptr + len, s, orig_len);
800 else
801 mch_memmove(ptr + len, cbuf, orig_len);
802
803 s += orig_len;
804 len += orig_len;
Bram Moolenaare828b762018-09-10 17:51:58 +0200805 }
806 else
Bram Moolenaar06f60952021-12-28 18:30:05 +0000807 {
808 ptr[len++] = *s == NL ? NUL : *s;
809 s++;
810 }
Bram Moolenaare828b762018-09-10 17:51:58 +0200811 }
812 ptr[len++] = NL;
813 }
814 return OK;
815}
816
817/*
818 * Write buffer "buf" to file or memory buffer.
819 * Return FAIL for failure.
820 */
821 static int
822diff_write(buf_T *buf, diffin_T *din)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000823{
824 int r;
825 char_u *save_ff;
Bram Moolenaare1004402020-10-24 20:49:43 +0200826 int save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000827
Bram Moolenaare828b762018-09-10 17:51:58 +0200828 if (din->din_fname == NULL)
829 return diff_write_buffer(buf, din);
830
831 // Always use 'fileformat' set to "unix".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000832 save_ff = buf->b_p_ff;
833 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
Bram Moolenaare1004402020-10-24 20:49:43 +0200834 save_cmod_flags = cmdmod.cmod_flags;
Bram Moolenaarf4a1d1c2019-11-16 13:50:25 +0100835 // Writing the buffer is an implementation detail of performing the diff,
836 // so it shouldn't update the '[ and '] marks.
Bram Moolenaare1004402020-10-24 20:49:43 +0200837 cmdmod.cmod_flags |= CMOD_LOCKMARKS;
Bram Moolenaare828b762018-09-10 17:51:58 +0200838 r = buf_write(buf, din->din_fname, NULL,
839 (linenr_T)1, buf->b_ml.ml_line_count,
840 NULL, FALSE, FALSE, FALSE, TRUE);
Bram Moolenaare1004402020-10-24 20:49:43 +0200841 cmdmod.cmod_flags = save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000842 free_string_option(buf->b_p_ff);
843 buf->b_p_ff = save_ff;
844 return r;
845}
846
847/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200848 * Update the diffs for all buffers involved.
849 */
850 static void
851diff_try_update(
852 diffio_T *dio,
853 int idx_orig,
854 exarg_T *eap) // "eap" can be NULL
855{
856 buf_T *buf;
857 int idx_new;
858
859 if (dio->dio_internal)
860 {
861 ga_init2(&dio->dio_diff.dout_ga, sizeof(char *), 1000);
862 }
863 else
864 {
865 // We need three temp file names.
866 dio->dio_orig.din_fname = vim_tempname('o', TRUE);
867 dio->dio_new.din_fname = vim_tempname('n', TRUE);
868 dio->dio_diff.dout_fname = vim_tempname('d', TRUE);
869 if (dio->dio_orig.din_fname == NULL
870 || dio->dio_new.din_fname == NULL
871 || dio->dio_diff.dout_fname == NULL)
872 goto theend;
873 }
874
875 // Check external diff is actually working.
876 if (!dio->dio_internal && check_external_diff(dio) == FAIL)
877 goto theend;
878
879 // :diffupdate!
880 if (eap != NULL && eap->forceit)
881 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
882 {
883 buf = curtab->tp_diffbuf[idx_new];
884 if (buf_valid(buf))
885 buf_check_timestamp(buf, FALSE);
886 }
887
888 // Write the first buffer to a tempfile or mmfile_t.
889 buf = curtab->tp_diffbuf[idx_orig];
890 if (diff_write(buf, &dio->dio_orig) == FAIL)
891 goto theend;
892
893 // Make a difference between the first buffer and every other.
894 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
895 {
896 buf = curtab->tp_diffbuf[idx_new];
897 if (buf == NULL || buf->b_ml.ml_mfp == NULL)
898 continue; // skip buffer that isn't loaded
899
900 // Write the other buffer and diff with the first one.
901 if (diff_write(buf, &dio->dio_new) == FAIL)
902 continue;
903 if (diff_file(dio) == FAIL)
904 continue;
905
906 // Read the diff output and add each entry to the diff list.
Lewis Russelld9da86e2021-12-28 13:54:41 +0000907 diff_read(idx_orig, idx_new, dio);
Bram Moolenaare828b762018-09-10 17:51:58 +0200908
909 clear_diffin(&dio->dio_new);
910 clear_diffout(&dio->dio_diff);
911 }
912 clear_diffin(&dio->dio_orig);
913
914theend:
915 vim_free(dio->dio_orig.din_fname);
916 vim_free(dio->dio_new.din_fname);
917 vim_free(dio->dio_diff.dout_fname);
918}
919
920/*
921 * Return TRUE if the options are set to use the internal diff library.
922 * Note that if the internal diff failed for one of the buffers, the external
923 * diff will be used anyway.
924 */
Bram Moolenaare3521d92018-09-16 14:10:31 +0200925 int
Bram Moolenaare828b762018-09-10 17:51:58 +0200926diff_internal(void)
927{
Bram Moolenaar975880b2019-03-03 14:42:11 +0100928 return (diff_flags & DIFF_INTERNAL) != 0
929#ifdef FEAT_EVAL
930 && *p_dex == NUL
931#endif
932 ;
Bram Moolenaare828b762018-09-10 17:51:58 +0200933}
934
935/*
936 * Return TRUE if the internal diff failed for one of the diff buffers.
937 */
938 static int
939diff_internal_failed(void)
940{
941 int idx;
942
943 // Only need to do something when there is another buffer.
944 for (idx = 0; idx < DB_COUNT; ++idx)
945 if (curtab->tp_diffbuf[idx] != NULL
946 && curtab->tp_diffbuf[idx]->b_diff_failed)
947 return TRUE;
948 return FALSE;
949}
950
951/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000952 * Completely update the diffs for the buffers involved.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200953 * When using the external "diff" command the buffers are written to a file,
954 * also for unmodified buffers (the file could have been produced by
955 * autocommands, e.g. the netrw plugin).
Bram Moolenaar071d4272004-06-13 20:20:40 +0000956 */
Bram Moolenaar071d4272004-06-13 20:20:40 +0000957 void
Bram Moolenaare828b762018-09-10 17:51:58 +0200958ex_diffupdate(exarg_T *eap) // "eap" can be NULL
Bram Moolenaar071d4272004-06-13 20:20:40 +0000959{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000960 int idx_orig;
961 int idx_new;
Bram Moolenaare828b762018-09-10 17:51:58 +0200962 diffio_T diffio;
Bram Moolenaar198fa062018-09-18 21:20:26 +0200963 int had_diffs = curtab->tp_first_diff != NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000964
Bram Moolenaard2b58c02018-09-16 18:10:48 +0200965 if (diff_busy)
966 {
967 diff_need_update = TRUE;
968 return;
969 }
970
Bram Moolenaare828b762018-09-10 17:51:58 +0200971 // Delete all diffblocks.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000972 diff_clear(curtab);
973 curtab->tp_diff_invalid = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000974
Bram Moolenaare828b762018-09-10 17:51:58 +0200975 // Use the first buffer as the original text.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000976 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000977 if (curtab->tp_diffbuf[idx_orig] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000978 break;
979 if (idx_orig == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200980 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000981
Bram Moolenaare828b762018-09-10 17:51:58 +0200982 // Only need to do something when there is another buffer.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000983 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000984 if (curtab->tp_diffbuf[idx_new] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000985 break;
986 if (idx_new == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200987 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000988
Bram Moolenaare828b762018-09-10 17:51:58 +0200989 // Only use the internal method if it did not fail for one of the buffers.
Bram Moolenaara80faa82020-04-12 19:37:17 +0200990 CLEAR_FIELD(diffio);
Bram Moolenaare828b762018-09-10 17:51:58 +0200991 diffio.dio_internal = diff_internal() && !diff_internal_failed();
Bram Moolenaar071d4272004-06-13 20:20:40 +0000992
Bram Moolenaare828b762018-09-10 17:51:58 +0200993 diff_try_update(&diffio, idx_orig, eap);
994 if (diffio.dio_internal && diff_internal_failed())
995 {
996 // Internal diff failed, use external diff instead.
Bram Moolenaara80faa82020-04-12 19:37:17 +0200997 CLEAR_FIELD(diffio);
Bram Moolenaare828b762018-09-10 17:51:58 +0200998 diff_try_update(&diffio, idx_orig, eap);
999 }
1000
1001 // force updating cursor position on screen
1002 curwin->w_valid_cursor.lnum = 0;
1003
Bram Moolenaar198fa062018-09-18 21:20:26 +02001004theend:
1005 // A redraw is needed if there were diffs and they were cleared, or there
1006 // are diffs now, which means they got updated.
1007 if (had_diffs || curtab->tp_first_diff != NULL)
1008 {
1009 diff_redraw(TRUE);
1010 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
1011 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001012}
1013
1014/*
1015 * Do a quick test if "diff" really works. Otherwise it looks like there
1016 * are no differences. Can't use the return value, it's non-zero when
1017 * there are differences.
1018 */
1019 static int
1020check_external_diff(diffio_T *diffio)
1021{
1022 FILE *fd;
1023 int ok;
1024 int io_error = FALSE;
1025
1026 // May try twice, first with "-a" and then without.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001027 for (;;)
1028 {
1029 ok = FALSE;
Bram Moolenaare828b762018-09-10 17:51:58 +02001030 fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001031 if (fd == NULL)
1032 io_error = TRUE;
1033 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001034 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001035 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
1036 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001037 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +02001038 fd = mch_fopen((char *)diffio->dio_new.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001039 if (fd == NULL)
1040 io_error = TRUE;
1041 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001042 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001043 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
1044 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001045 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +02001046 fd = NULL;
1047 if (diff_file(diffio) == OK)
1048 fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001049 if (fd == NULL)
1050 io_error = TRUE;
1051 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001052 {
1053 char_u linebuf[LBUFLEN];
1054
1055 for (;;)
1056 {
glacambread5c1782021-05-24 14:20:53 +02001057 // For normal diff there must be a line that contains
1058 // "1c1". For unified diff "@@ -1 +1 @@".
Bram Moolenaar00590742019-02-15 21:06:09 +01001059 if (vim_fgets(linebuf, LBUFLEN, fd))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001060 break;
glacambread5c1782021-05-24 14:20:53 +02001061 if (STRNCMP(linebuf, "1c1", 3) == 0
1062 || STRNCMP(linebuf, "@@ -1 +1 @@", 11) == 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001063 ok = TRUE;
1064 }
1065 fclose(fd);
1066 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001067 mch_remove(diffio->dio_diff.dout_fname);
1068 mch_remove(diffio->dio_new.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001069 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001070 mch_remove(diffio->dio_orig.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001071 }
1072
1073#ifdef FEAT_EVAL
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001074 // When using 'diffexpr' break here.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001075 if (*p_dex != NUL)
1076 break;
1077#endif
1078
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001079#if defined(MSWIN)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001080 // If the "-a" argument works, also check if "--binary" works.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001081 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
1082 {
1083 diff_a_works = TRUE;
1084 diff_bin_works = TRUE;
1085 continue;
1086 }
1087 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
1088 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001089 // Tried --binary, but it failed. "-a" works though.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001090 diff_bin_works = FALSE;
1091 ok = TRUE;
1092 }
1093#endif
1094
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001095 // If we checked if "-a" works already, break here.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001096 if (diff_a_works != MAYBE)
1097 break;
1098 diff_a_works = ok;
1099
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001100 // If "-a" works break here, otherwise retry without "-a".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001101 if (ok)
1102 break;
1103 }
1104 if (!ok)
1105 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001106 if (io_error)
Bram Moolenaar9d00e4a2022-01-05 17:49:15 +00001107 emsg(_(e_cannot_read_or_write_temp_files));
Bram Moolenaare1242042021-12-16 20:56:57 +00001108 emsg(_(e_cannot_create_diffs));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001109 diff_a_works = MAYBE;
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001110#if defined(MSWIN)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001111 diff_bin_works = MAYBE;
1112#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001113 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001114 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001115 return OK;
1116}
Bram Moolenaar071d4272004-06-13 20:20:40 +00001117
Bram Moolenaare828b762018-09-10 17:51:58 +02001118/*
1119 * Invoke the xdiff function.
1120 */
1121 static int
1122diff_file_internal(diffio_T *diffio)
1123{
1124 xpparam_t param;
1125 xdemitconf_t emit_cfg;
1126 xdemitcb_t emit_cb;
Bram Moolenaarbd1d5602012-05-18 18:47:17 +02001127
Bram Moolenaara80faa82020-04-12 19:37:17 +02001128 CLEAR_FIELD(param);
1129 CLEAR_FIELD(emit_cfg);
1130 CLEAR_FIELD(emit_cb);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001131
Bram Moolenaare828b762018-09-10 17:51:58 +02001132 param.flags = diff_algorithm;
1133
1134 if (diff_flags & DIFF_IWHITE)
1135 param.flags |= XDF_IGNORE_WHITESPACE_CHANGE;
Bram Moolenaar785fc652018-09-15 19:17:38 +02001136 if (diff_flags & DIFF_IWHITEALL)
1137 param.flags |= XDF_IGNORE_WHITESPACE;
1138 if (diff_flags & DIFF_IWHITEEOL)
1139 param.flags |= XDF_IGNORE_WHITESPACE_AT_EOL;
1140 if (diff_flags & DIFF_IBLANK)
1141 param.flags |= XDF_IGNORE_BLANK_LINES;
Bram Moolenaare828b762018-09-10 17:51:58 +02001142
1143 emit_cfg.ctxlen = 0; // don't need any diff_context here
1144 emit_cb.priv = &diffio->dio_diff;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001145 emit_cfg.hunk_func = xdiff_out;
Bram Moolenaare828b762018-09-10 17:51:58 +02001146 if (xdl_diff(&diffio->dio_orig.din_mmfile,
1147 &diffio->dio_new.din_mmfile,
1148 &param, &emit_cfg, &emit_cb) < 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001149 {
Bram Moolenaard82a47d2022-01-05 20:24:39 +00001150 emsg(_(e_problem_creating_internal_diff));
Bram Moolenaare828b762018-09-10 17:51:58 +02001151 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001152 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001153 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001154}
1155
1156/*
1157 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
Bram Moolenaare828b762018-09-10 17:51:58 +02001158 * return OK or FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001159 */
Bram Moolenaare828b762018-09-10 17:51:58 +02001160 static int
1161diff_file(diffio_T *dio)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001162{
1163 char_u *cmd;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001164 size_t len;
Bram Moolenaare828b762018-09-10 17:51:58 +02001165 char_u *tmp_orig = dio->dio_orig.din_fname;
1166 char_u *tmp_new = dio->dio_new.din_fname;
1167 char_u *tmp_diff = dio->dio_diff.dout_fname;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001168
1169#ifdef FEAT_EVAL
1170 if (*p_dex != NUL)
Bram Moolenaare828b762018-09-10 17:51:58 +02001171 {
1172 // Use 'diffexpr' to generate the diff file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001173 eval_diff(tmp_orig, tmp_new, tmp_diff);
Bram Moolenaare828b762018-09-10 17:51:58 +02001174 return OK;
1175 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001176 else
1177#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001178 // Use xdiff for generating the diff.
1179 if (dio->dio_internal)
Bram Moolenaare828b762018-09-10 17:51:58 +02001180 return diff_file_internal(dio);
Bram Moolenaar95fb60a2005-03-08 22:29:20 +00001181
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001182 len = STRLEN(tmp_orig) + STRLEN(tmp_new)
1183 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
1184 cmd = alloc(len);
1185 if (cmd == NULL)
1186 return FAIL;
Bram Moolenaare828b762018-09-10 17:51:58 +02001187
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001188 // We don't want $DIFF_OPTIONS to get in the way.
1189 if (getenv("DIFF_OPTIONS"))
1190 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
1191
1192 // Build the diff command and execute it. Always use -a, binary
1193 // differences are of no use. Ignore errors, diff returns
1194 // non-zero when differences have been found.
1195 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s%s%s%s %s",
1196 diff_a_works == FALSE ? "" : "-a ",
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001197#if defined(MSWIN)
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001198 diff_bin_works == TRUE ? "--binary " : "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001199#else
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001200 "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001201#endif
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001202 (diff_flags & DIFF_IWHITE) ? "-b " : "",
1203 (diff_flags & DIFF_IWHITEALL) ? "-w " : "",
1204 (diff_flags & DIFF_IWHITEEOL) ? "-Z " : "",
1205 (diff_flags & DIFF_IBLANK) ? "-B " : "",
1206 (diff_flags & DIFF_ICASE) ? "-i " : "",
1207 tmp_orig, tmp_new);
1208 append_redir(cmd, (int)len, p_srr, tmp_diff);
1209 block_autocmds(); // avoid ShellCmdPost stuff
1210 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
1211 unblock_autocmds();
1212 vim_free(cmd);
1213 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001214}
1215
1216/*
1217 * Create a new version of a file from the current buffer and a diff file.
1218 * The buffer is written to a file, also for unmodified buffers (the file
1219 * could have been produced by autocommands, e.g. the netrw plugin).
1220 */
1221 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001222ex_diffpatch(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001223{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001224 char_u *tmp_orig; // name of original temp file
1225 char_u *tmp_new; // name of patched temp file
Bram Moolenaar071d4272004-06-13 20:20:40 +00001226 char_u *buf = NULL;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001227 size_t buflen;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001228 win_T *old_curwin = curwin;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001229 char_u *newname = NULL; // name of patched file buffer
Bram Moolenaar071d4272004-06-13 20:20:40 +00001230#ifdef UNIX
1231 char_u dirbuf[MAXPATHL];
1232 char_u *fullname = NULL;
1233#endif
1234#ifdef FEAT_BROWSE
1235 char_u *browseFile = NULL;
Bram Moolenaare1004402020-10-24 20:49:43 +02001236 int save_cmod_flags = cmdmod.cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001237#endif
Bram Moolenaar8767f522016-07-01 17:17:39 +02001238 stat_T st;
Bram Moolenaara95ab322017-03-11 19:21:53 +01001239 char_u *esc_name = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001240
1241#ifdef FEAT_BROWSE
Bram Moolenaare1004402020-10-24 20:49:43 +02001242 if (cmdmod.cmod_flags & CMOD_BROWSE)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001243 {
Bram Moolenaar7171abe2004-10-11 10:06:20 +00001244 browseFile = do_browse(0, (char_u *)_("Patch file"),
Bram Moolenaarc36651b2018-04-29 12:22:56 +02001245 eap->arg, NULL, NULL,
1246 (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001247 if (browseFile == NULL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001248 return; // operation cancelled
Bram Moolenaar071d4272004-06-13 20:20:40 +00001249 eap->arg = browseFile;
Bram Moolenaare1004402020-10-24 20:49:43 +02001250 cmdmod.cmod_flags &= ~CMOD_BROWSE; // don't let do_ecmd() browse again
Bram Moolenaar071d4272004-06-13 20:20:40 +00001251 }
1252#endif
1253
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001254 // We need two temp file names.
Bram Moolenaare5c421c2015-03-31 13:33:08 +02001255 tmp_orig = vim_tempname('o', FALSE);
1256 tmp_new = vim_tempname('n', FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001257 if (tmp_orig == NULL || tmp_new == NULL)
1258 goto theend;
1259
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001260 // Write the current buffer to "tmp_orig".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001261 if (buf_write(curbuf, tmp_orig, NULL,
1262 (linenr_T)1, curbuf->b_ml.ml_line_count,
1263 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
1264 goto theend;
1265
1266#ifdef UNIX
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001267 // Get the absolute path of the patchfile, changing directory below.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001268 fullname = FullName_save(eap->arg, FALSE);
1269#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001270 esc_name = vim_strsave_shellescape(
Bram Moolenaar071d4272004-06-13 20:20:40 +00001271# ifdef UNIX
Bram Moolenaara95ab322017-03-11 19:21:53 +01001272 fullname != NULL ? fullname :
Bram Moolenaar071d4272004-06-13 20:20:40 +00001273# endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001274 eap->arg, TRUE, TRUE);
1275 if (esc_name == NULL)
1276 goto theend;
1277 buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16;
Bram Moolenaar964b3742019-05-24 18:54:09 +02001278 buf = alloc(buflen);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001279 if (buf == NULL)
1280 goto theend;
1281
1282#ifdef UNIX
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001283 // Temporarily chdir to /tmp, to avoid patching files in the current
1284 // directory when the patch file contains more than one patch. When we
1285 // have our own temp dir use that instead, it will be cleaned up when we
1286 // exit (any .rej files created). Don't change directory if we can't
1287 // return to the current.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001288 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
1289 dirbuf[0] = NUL;
1290 else
1291 {
1292# ifdef TEMPDIRNAMES
1293 if (vim_tempdir != NULL)
Bram Moolenaar42335f52018-09-13 15:33:43 +02001294 vim_ignored = mch_chdir((char *)vim_tempdir);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001295 else
1296# endif
Bram Moolenaar42335f52018-09-13 15:33:43 +02001297 vim_ignored = mch_chdir("/tmp");
Bram Moolenaar071d4272004-06-13 20:20:40 +00001298 shorten_fnames(TRUE);
1299 }
1300#endif
1301
1302#ifdef FEAT_EVAL
1303 if (*p_pex != NUL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001304 // Use 'patchexpr' to generate the new file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001305 eval_patch(tmp_orig,
1306# ifdef UNIX
1307 fullname != NULL ? fullname :
1308# endif
1309 eap->arg, tmp_new);
1310 else
1311#endif
1312 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001313 // Build the patch command and execute it. Ignore errors. Switch to
1314 // cooked mode to allow the user to respond to prompts.
Bram Moolenaara95ab322017-03-11 19:21:53 +01001315 vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s",
1316 tmp_new, tmp_orig, esc_name);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001317 block_autocmds(); // Avoid ShellCmdPost stuff
Bram Moolenaar071d4272004-06-13 20:20:40 +00001318 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
Bram Moolenaar78ab3312007-09-29 12:16:41 +00001319 unblock_autocmds();
Bram Moolenaar071d4272004-06-13 20:20:40 +00001320 }
1321
1322#ifdef UNIX
1323 if (dirbuf[0] != NUL)
1324 {
1325 if (mch_chdir((char *)dirbuf) != 0)
Bram Moolenaar460ae5d2022-01-01 14:19:49 +00001326 emsg(_(e_cannot_go_back_to_previous_directory));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001327 shorten_fnames(TRUE);
1328 }
1329#endif
1330
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001331 // patch probably has written over the screen
Bram Moolenaara4d158b2022-08-14 14:17:45 +01001332 redraw_later(UPD_CLEAR);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001333
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001334 // Delete any .orig or .rej file created.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001335 STRCPY(buf, tmp_new);
1336 STRCAT(buf, ".orig");
1337 mch_remove(buf);
1338 STRCPY(buf, tmp_new);
1339 STRCAT(buf, ".rej");
1340 mch_remove(buf);
1341
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001342 // Only continue if the output file was created.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001343 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
Bram Moolenaar9d00e4a2022-01-05 17:49:15 +00001344 emsg(_(e_cannot_read_patch_output));
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001345 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001346 {
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001347 if (curbuf->b_fname != NULL)
1348 {
1349 newname = vim_strnsave(curbuf->b_fname,
Bram Moolenaardf44a272020-06-07 20:49:05 +02001350 STRLEN(curbuf->b_fname) + 4);
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001351 if (newname != NULL)
1352 STRCAT(newname, ".new");
1353 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001354
1355#ifdef FEAT_GUI
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001356 need_mouse_correct = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001357#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001358 // don't use a new tab page, each tab page has its own diffs
Bram Moolenaare1004402020-10-24 20:49:43 +02001359 cmdmod.cmod_tab = 0;
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001360
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001361 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001362 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001363 // Pretend it was a ":split fname" command
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001364 eap->cmdidx = CMD_split;
1365 eap->arg = tmp_new;
1366 do_exedit(eap, old_curwin);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001367
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001368 // check that split worked and editing tmp_new
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001369 if (curwin != old_curwin && win_valid(old_curwin))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001370 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001371 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001372 diff_win_options(curwin, TRUE);
1373 diff_win_options(old_curwin, TRUE);
1374
1375 if (newname != NULL)
1376 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001377 // do a ":file filename.new" on the patched buffer
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001378 eap->arg = newname;
1379 ex_file(eap);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001380
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001381 // Do filetype detection with the new name.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001382 if (au_has_group((char_u *)"filetypedetect"))
1383 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001384 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001385 }
1386 }
1387 }
1388
1389theend:
1390 if (tmp_orig != NULL)
1391 mch_remove(tmp_orig);
1392 vim_free(tmp_orig);
1393 if (tmp_new != NULL)
1394 mch_remove(tmp_new);
1395 vim_free(tmp_new);
1396 vim_free(newname);
1397 vim_free(buf);
1398#ifdef UNIX
1399 vim_free(fullname);
1400#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001401 vim_free(esc_name);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001402#ifdef FEAT_BROWSE
1403 vim_free(browseFile);
Bram Moolenaare1004402020-10-24 20:49:43 +02001404 cmdmod.cmod_flags = save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001405#endif
1406}
1407
1408/*
1409 * Split the window and edit another file, setting options to show the diffs.
1410 */
1411 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001412ex_diffsplit(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001413{
1414 win_T *old_curwin = curwin;
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001415 bufref_T old_curbuf;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001416
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001417 set_bufref(&old_curbuf, curbuf);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001418#ifdef FEAT_GUI
1419 need_mouse_correct = TRUE;
1420#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001421 // Need to compute w_fraction when no redraw happened yet.
Bram Moolenaar46328f92016-08-28 15:39:57 +02001422 validate_cursor();
1423 set_fraction(curwin);
1424
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001425 // don't use a new tab page, each tab page has its own diffs
Bram Moolenaare1004402020-10-24 20:49:43 +02001426 cmdmod.cmod_tab = 0;
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001427
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001428 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) == FAIL)
1429 return;
1430
1431 // Pretend it was a ":split fname" command
1432 eap->cmdidx = CMD_split;
1433 curwin->w_p_diff = TRUE;
1434 do_exedit(eap, old_curwin);
1435
1436 if (curwin == old_curwin) // split didn't work
1437 return;
1438
1439 // Set 'diff', 'scrollbind' on and 'wrap' off.
1440 diff_win_options(curwin, TRUE);
1441 if (win_valid(old_curwin))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001442 {
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001443 diff_win_options(old_curwin, TRUE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001444
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001445 if (bufref_valid(&old_curbuf))
1446 // Move the cursor position to that of the old window.
1447 curwin->w_cursor.lnum = diff_get_corresponding_line(
1448 old_curbuf.br_buf, old_curwin->w_cursor.lnum);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001449 }
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001450 // Now that lines are folded scroll to show the cursor at the same
1451 // relative position.
1452 scroll_to_fraction(curwin, curwin->w_height);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001453}
1454
1455/*
Bram Moolenaar84a05ac2013-05-06 04:24:17 +02001456 * Set options to show diffs for the current window.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001457 */
Bram Moolenaar071d4272004-06-13 20:20:40 +00001458 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001459ex_diffthis(exarg_T *eap UNUSED)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001460{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001461 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001462 diff_win_options(curwin, TRUE);
1463}
1464
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001465 static void
1466set_diff_option(win_T *wp, int value)
1467{
1468 win_T *old_curwin = curwin;
1469
1470 curwin = wp;
1471 curbuf = curwin->w_buffer;
1472 ++curbuf_lock;
Bram Moolenaar31e5c602022-04-15 13:53:33 +01001473 set_option_value_give_err((char_u *)"diff", (long)value, NULL, OPT_LOCAL);
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001474 --curbuf_lock;
1475 curwin = old_curwin;
1476 curbuf = curwin->w_buffer;
1477}
1478
Bram Moolenaar071d4272004-06-13 20:20:40 +00001479/*
1480 * Set options in window "wp" for diff mode.
1481 */
1482 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001483diff_win_options(
1484 win_T *wp,
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001485 int addbuf) // Add buffer to diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001486{
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001487# ifdef FEAT_FOLDING
1488 win_T *old_curwin = curwin;
1489
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001490 // close the manually opened folds
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001491 curwin = wp;
1492 newFoldLevel();
1493 curwin = old_curwin;
1494# endif
1495
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001496 // Use 'scrollbind' and 'cursorbind' when available
Bram Moolenaar43929962015-07-03 15:06:56 +02001497 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001498 wp->w_p_scb_save = wp->w_p_scb;
Bram Moolenaar3368ea22010-09-21 16:56:35 +02001499 wp->w_p_scb = TRUE;
Bram Moolenaar43929962015-07-03 15:06:56 +02001500 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001501 wp->w_p_crb_save = wp->w_p_crb;
Bram Moolenaar860cae12010-06-05 23:22:07 +02001502 wp->w_p_crb = TRUE;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001503 if (!(diff_flags & DIFF_FOLLOWWRAP))
1504 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001505 if (!wp->w_p_diff)
Bram Moolenaar4223d432021-02-10 13:18:17 +01001506 wp->w_p_wrap_save = wp->w_p_wrap;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001507 wp->w_p_wrap = FALSE;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001508 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001509# ifdef FEAT_FOLDING
Bram Moolenaar43929962015-07-03 15:06:56 +02001510 if (!wp->w_p_diff)
1511 {
1512 if (wp->w_p_diff_saved)
1513 free_string_option(wp->w_p_fdm_save);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001514 wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm);
Bram Moolenaar43929962015-07-03 15:06:56 +02001515 }
Bram Moolenaar20c023a2019-05-26 21:03:24 +02001516 set_string_option_direct_in_win(wp, (char_u *)"fdm", -1, (char_u *)"diff",
Bram Moolenaar5e3cb7e2006-02-27 23:58:35 +00001517 OPT_LOCAL|OPT_FREE, 0);
Bram Moolenaar43929962015-07-03 15:06:56 +02001518 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001519 {
1520 wp->w_p_fdc_save = wp->w_p_fdc;
1521 wp->w_p_fen_save = wp->w_p_fen;
1522 wp->w_p_fdl_save = wp->w_p_fdl;
1523 }
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001524 wp->w_p_fdc = diff_foldcolumn;
1525 wp->w_p_fen = TRUE;
1526 wp->w_p_fdl = 0;
1527 foldUpdateAll(wp);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001528 // make sure topline is not halfway a fold
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001529 changed_window_setting_win(wp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001530# endif
Bram Moolenaar071d4272004-06-13 20:20:40 +00001531 if (vim_strchr(p_sbo, 'h') == NULL)
1532 do_cmdline_cmd((char_u *)"set sbo+=hor");
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001533 // Save the current values, to be restored in ex_diffoff().
Bram Moolenaara87aa802013-07-03 15:47:03 +02001534 wp->w_p_diff_saved = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001535
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001536 set_diff_option(wp, TRUE);
Bram Moolenaar43929962015-07-03 15:06:56 +02001537
Bram Moolenaar071d4272004-06-13 20:20:40 +00001538 if (addbuf)
1539 diff_buf_add(wp->w_buffer);
Bram Moolenaara4d158b2022-08-14 14:17:45 +01001540 redraw_win_later(wp, UPD_NOT_VALID);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001541}
1542
1543/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001544 * Set options not to show diffs. For the current window or all windows.
Bram Moolenaarf740b292006-02-16 22:11:02 +00001545 * Only in the current tab page.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001546 */
1547 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001548ex_diffoff(exarg_T *eap)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001549{
1550 win_T *wp;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001551 int diffwin = FALSE;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001552
Bram Moolenaar29323592016-07-24 22:04:11 +02001553 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001554 {
Bram Moolenaar00462ff2013-09-20 20:13:53 +02001555 if (eap->forceit ? wp->w_p_diff : wp == curwin)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001556 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001557 // Set 'diff' off. If option values were saved in
1558 // diff_win_options(), restore the ones whose settings seem to have
1559 // been left over from diff mode.
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001560 set_diff_option(wp, FALSE);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001561
Bram Moolenaara87aa802013-07-03 15:47:03 +02001562 if (wp->w_p_diff_saved)
1563 {
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001564
Bram Moolenaar43929962015-07-03 15:06:56 +02001565 if (wp->w_p_scb)
1566 wp->w_p_scb = wp->w_p_scb_save;
Bram Moolenaar43929962015-07-03 15:06:56 +02001567 if (wp->w_p_crb)
1568 wp->w_p_crb = wp->w_p_crb_save;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001569 if (!(diff_flags & DIFF_FOLLOWWRAP))
1570 {
1571 if (!wp->w_p_wrap)
Lewis Russelld9da86e2021-12-28 13:54:41 +00001572 wp->w_p_wrap = wp->w_p_wrap_save;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001573 }
Bram Moolenaar43929962015-07-03 15:06:56 +02001574#ifdef FEAT_FOLDING
1575 free_string_option(wp->w_p_fdm);
Bram Moolenaar79a213d2017-05-16 13:15:18 +02001576 wp->w_p_fdm = vim_strsave(
1577 *wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u*)"manual");
Bram Moolenaar43929962015-07-03 15:06:56 +02001578
1579 if (wp->w_p_fdc == diff_foldcolumn)
1580 wp->w_p_fdc = wp->w_p_fdc_save;
1581 if (wp->w_p_fdl == 0)
1582 wp->w_p_fdl = wp->w_p_fdl_save;
1583
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001584 // Only restore 'foldenable' when 'foldmethod' is not
1585 // "manual", otherwise we continue to show the diff folds.
Bram Moolenaar43929962015-07-03 15:06:56 +02001586 if (wp->w_p_fen)
1587 wp->w_p_fen = foldmethodIsManual(wp) ? FALSE
1588 : wp->w_p_fen_save;
1589
1590 foldUpdateAll(wp);
Bram Moolenaar43929962015-07-03 15:06:56 +02001591#endif
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001592 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001593 // remove filler lines
Bram Moolenaare67d5462016-08-27 22:40:42 +02001594 wp->w_topfill = 0;
1595
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001596 // make sure topline is not halfway a fold and cursor is
1597 // invalidated
Bram Moolenaare67d5462016-08-27 22:40:42 +02001598 changed_window_setting_win(wp);
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001599
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001600 // Note: 'sbo' is not restored, it's a global option.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001601 diff_buf_adjust(wp);
1602 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001603 diffwin |= wp->w_p_diff;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001604 }
1605
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001606 // Also remove hidden buffers from the list.
Bram Moolenaar25ea0542017-02-03 23:16:28 +01001607 if (eap->forceit)
1608 diff_buf_clear();
1609
Bram Moolenaarc8234772019-11-10 21:00:27 +01001610 if (!diffwin)
1611 {
1612 diff_need_update = FALSE;
1613 curtab->tp_diff_invalid = FALSE;
1614 curtab->tp_diff_update = FALSE;
1615 diff_clear(curtab);
1616 }
1617
Dominique Pelleaf4a61a2021-12-27 17:21:41 +00001618 // Remove "hor" from 'scrollopt' if there are no diff windows left.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001619 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
1620 do_cmdline_cmd((char_u *)"set sbo-=hor");
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001621}
1622
1623/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00001624 * Read the diff output and add each entry to the diff list.
1625 */
1626 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001627diff_read(
Bram Moolenaare828b762018-09-10 17:51:58 +02001628 int idx_orig, // idx of original file
1629 int idx_new, // idx of new file
Lewis Russelld9da86e2021-12-28 13:54:41 +00001630 diffio_T *dio) // diff output
Bram Moolenaar071d4272004-06-13 20:20:40 +00001631{
Bram Moolenaare828b762018-09-10 17:51:58 +02001632 FILE *fd = NULL;
1633 int line_idx = 0;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001634 diff_T *dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001635 diff_T *dp = curtab->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001636 diff_T *dn, *dpl;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001637 diffout_T *dout = &dio->dio_diff;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001638 char_u linebuf[LBUFLEN]; // only need to hold the diff line
Bram Moolenaare828b762018-09-10 17:51:58 +02001639 char_u *line;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001640 long off;
1641 int i;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001642 int notset = TRUE; // block "*dp" not set yet
Bram Moolenaar49166972021-12-30 10:51:45 +00001643 diffhunk_T *hunk = NULL; // init to avoid gcc warning
Lewis Russelld9da86e2021-12-28 13:54:41 +00001644
Bram Moolenaare828b762018-09-10 17:51:58 +02001645 enum {
1646 DIFF_ED,
1647 DIFF_UNIFIED,
1648 DIFF_NONE
1649 } diffstyle = DIFF_NONE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001650
Bram Moolenaare828b762018-09-10 17:51:58 +02001651 if (dout->dout_fname == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001652 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001653 diffstyle = DIFF_UNIFIED;
1654 }
1655 else
1656 {
1657 fd = mch_fopen((char *)dout->dout_fname, "r");
1658 if (fd == NULL)
1659 {
Bram Moolenaare1242042021-12-16 20:56:57 +00001660 emsg(_(e_cannot_read_diff_output));
Bram Moolenaare828b762018-09-10 17:51:58 +02001661 return;
1662 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001663 }
1664
Lewis Russelld9da86e2021-12-28 13:54:41 +00001665 if (!dio->dio_internal)
1666 {
1667 hunk = ALLOC_ONE(diffhunk_T);
1668 if (hunk == NULL)
Bram Moolenaar5d46dcf2022-03-25 14:46:47 +00001669 {
1670 if (fd != NULL)
1671 fclose(fd);
Lewis Russelld9da86e2021-12-28 13:54:41 +00001672 return;
Bram Moolenaar5d46dcf2022-03-25 14:46:47 +00001673 }
Lewis Russelld9da86e2021-12-28 13:54:41 +00001674 }
1675
Bram Moolenaar071d4272004-06-13 20:20:40 +00001676 for (;;)
1677 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001678 if (dio->dio_internal)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001679 {
Bram Moolenaarebfec1c2023-01-22 21:14:53 +00001680 if (line_idx >= dout->dout_ga.ga_len)
Lewis Russelld9da86e2021-12-28 13:54:41 +00001681 break; // did last line
Lewis Russelld9da86e2021-12-28 13:54:41 +00001682 hunk = ((diffhunk_T **)dout->dout_ga.ga_data)[line_idx++];
Bram Moolenaar071d4272004-06-13 20:20:40 +00001683 }
1684 else
1685 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001686 if (fd == NULL)
1687 {
1688 if (line_idx >= dout->dout_ga.ga_len)
1689 break; // did last line
1690 line = ((char_u **)dout->dout_ga.ga_data)[line_idx++];
1691 }
Bram Moolenaar3b8defd2018-09-13 13:03:11 +02001692 else
Lewis Russelld9da86e2021-12-28 13:54:41 +00001693 {
1694 if (vim_fgets(linebuf, LBUFLEN, fd))
1695 break; // end of file
1696 line = linebuf;
1697 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001698
Lewis Russelld9da86e2021-12-28 13:54:41 +00001699 if (diffstyle == DIFF_NONE)
1700 {
1701 // Determine diff style.
1702 // ed like diff looks like this:
1703 // {first}[,{last}]c{first}[,{last}]
1704 // {first}a{first}[,{last}]
1705 // {first}[,{last}]d{first}
1706 //
1707 // unified diff looks like this:
1708 // --- file1 2018-03-20 13:23:35.783153140 +0100
1709 // +++ file2 2018-03-20 13:23:41.183156066 +0100
1710 // @@ -1,3 +1,5 @@
1711 if (isdigit(*line))
1712 diffstyle = DIFF_ED;
1713 else if ((STRNCMP(line, "@@ ", 3) == 0))
1714 diffstyle = DIFF_UNIFIED;
1715 else if ((STRNCMP(line, "--- ", 4) == 0)
1716 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
1717 && (STRNCMP(line, "+++ ", 4) == 0)
1718 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
1719 && (STRNCMP(line, "@@ ", 3) == 0))
1720 diffstyle = DIFF_UNIFIED;
1721 else
1722 // Format not recognized yet, skip over this line. Cygwin
1723 // diff may put a warning at the start of the file.
1724 continue;
1725 }
1726
1727 if (diffstyle == DIFF_ED)
1728 {
1729 if (!isdigit(*line))
1730 continue; // not the start of a diff block
1731 if (parse_diff_ed(line, hunk) == FAIL)
1732 continue;
1733 }
1734 else if (diffstyle == DIFF_UNIFIED)
1735 {
1736 if (STRNCMP(line, "@@ ", 3) != 0)
1737 continue; // not the start of a diff block
1738 if (parse_diff_unified(line, hunk) == FAIL)
1739 continue;
1740 }
1741 else
1742 {
Bram Moolenaard82a47d2022-01-05 20:24:39 +00001743 emsg(_(e_invalid_diff_format));
Lewis Russelld9da86e2021-12-28 13:54:41 +00001744 break;
1745 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001746 }
1747
1748 // Go over blocks before the change, for which orig and new are equal.
1749 // Copy blocks from orig to new.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001750 while (dp != NULL
Lewis Russelld9da86e2021-12-28 13:54:41 +00001751 && hunk->lnum_orig > dp->df_lnum[idx_orig]
1752 + dp->df_count[idx_orig])
Bram Moolenaar071d4272004-06-13 20:20:40 +00001753 {
1754 if (notset)
1755 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1756 dprev = dp;
1757 dp = dp->df_next;
1758 notset = TRUE;
1759 }
1760
1761 if (dp != NULL
Lewis Russelld9da86e2021-12-28 13:54:41 +00001762 && hunk->lnum_orig <= dp->df_lnum[idx_orig]
1763 + dp->df_count[idx_orig]
1764 && hunk->lnum_orig + hunk->count_orig >= dp->df_lnum[idx_orig])
Bram Moolenaar071d4272004-06-13 20:20:40 +00001765 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001766 // New block overlaps with existing block(s).
1767 // First find last block that overlaps.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001768 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
Lewis Russelld9da86e2021-12-28 13:54:41 +00001769 if (hunk->lnum_orig + hunk->count_orig
1770 < dpl->df_next->df_lnum[idx_orig])
Bram Moolenaar071d4272004-06-13 20:20:40 +00001771 break;
1772
Bram Moolenaare828b762018-09-10 17:51:58 +02001773 // If the newly found block starts before the old one, set the
1774 // start back a number of lines.
Lewis Russelld9da86e2021-12-28 13:54:41 +00001775 off = dp->df_lnum[idx_orig] - hunk->lnum_orig;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001776 if (off > 0)
1777 {
1778 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001779 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001780 dp->df_lnum[i] -= off;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001781 dp->df_lnum[idx_new] = hunk->lnum_new;
1782 dp->df_count[idx_new] = hunk->count_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001783 }
1784 else if (notset)
1785 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001786 // new block inside existing one, adjust new block
Lewis Russelld9da86e2021-12-28 13:54:41 +00001787 dp->df_lnum[idx_new] = hunk->lnum_new + off;
1788 dp->df_count[idx_new] = hunk->count_new - off;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001789 }
1790 else
Bram Moolenaare828b762018-09-10 17:51:58 +02001791 // second overlap of new block with existing block
Lewis Russelld9da86e2021-12-28 13:54:41 +00001792 dp->df_count[idx_new] += hunk->count_new - hunk->count_orig
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00001793 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
1794 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001795
Bram Moolenaare828b762018-09-10 17:51:58 +02001796 // Adjust the size of the block to include all the lines to the
1797 // end of the existing block or the new diff, whatever ends last.
Lewis Russelld9da86e2021-12-28 13:54:41 +00001798 off = (hunk->lnum_orig + hunk->count_orig)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001799 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
1800 if (off < 0)
1801 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001802 // new change ends in existing block, adjust the end if not
1803 // done already
Bram Moolenaar071d4272004-06-13 20:20:40 +00001804 if (notset)
1805 dp->df_count[idx_new] += -off;
1806 off = 0;
1807 }
Bram Moolenaard4b96bc2007-10-19 15:33:39 +00001808 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001809 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001810 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
1811 - dp->df_lnum[i] + off;
1812
Bram Moolenaare828b762018-09-10 17:51:58 +02001813 // Delete the diff blocks that have been merged into one.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001814 dn = dp->df_next;
1815 dp->df_next = dpl->df_next;
1816 while (dn != dp->df_next)
1817 {
1818 dpl = dn->df_next;
1819 vim_free(dn);
1820 dn = dpl;
1821 }
1822 }
1823 else
1824 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001825 // Allocate a new diffblock.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001826 dp = diff_alloc_new(curtab, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001827 if (dp == NULL)
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001828 goto done;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001829
Lewis Russelld9da86e2021-12-28 13:54:41 +00001830 dp->df_lnum[idx_orig] = hunk->lnum_orig;
1831 dp->df_count[idx_orig] = hunk->count_orig;
1832 dp->df_lnum[idx_new] = hunk->lnum_new;
1833 dp->df_count[idx_new] = hunk->count_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001834
Bram Moolenaare828b762018-09-10 17:51:58 +02001835 // Set values for other buffers, these must be equal to the
1836 // original buffer, otherwise there would have been a change
1837 // already.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001838 for (i = idx_orig + 1; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001839 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001840 diff_copy_entry(dprev, dp, idx_orig, i);
1841 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001842 notset = FALSE; // "*dp" has been set
Bram Moolenaar071d4272004-06-13 20:20:40 +00001843 }
1844
Bram Moolenaare828b762018-09-10 17:51:58 +02001845 // for remaining diff blocks orig and new are equal
Bram Moolenaar071d4272004-06-13 20:20:40 +00001846 while (dp != NULL)
1847 {
1848 if (notset)
1849 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1850 dprev = dp;
1851 dp = dp->df_next;
1852 notset = TRUE;
1853 }
1854
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001855done:
Lewis Russelld9da86e2021-12-28 13:54:41 +00001856 if (!dio->dio_internal)
1857 vim_free(hunk);
1858
Bram Moolenaare828b762018-09-10 17:51:58 +02001859 if (fd != NULL)
1860 fclose(fd);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001861}
1862
1863/*
1864 * Copy an entry at "dp" from "idx_orig" to "idx_new".
1865 */
1866 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001867diff_copy_entry(
1868 diff_T *dprev,
1869 diff_T *dp,
1870 int idx_orig,
1871 int idx_new)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001872{
1873 long off;
1874
1875 if (dprev == NULL)
1876 off = 0;
1877 else
1878 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
1879 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
1880 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
1881 dp->df_count[idx_new] = dp->df_count[idx_orig];
1882}
1883
1884/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001885 * Clear the list of diffblocks for tab page "tp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001886 */
Bram Moolenaarea408852005-06-25 22:49:46 +00001887 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001888diff_clear(tabpage_T *tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001889{
1890 diff_T *p, *next_p;
1891
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001892 for (p = tp->tp_first_diff; p != NULL; p = next_p)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001893 {
1894 next_p = p->df_next;
1895 vim_free(p);
1896 }
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001897 tp->tp_first_diff = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001898}
1899
1900/*
1901 * Check diff status for line "lnum" in buffer "buf":
1902 * Returns 0 for nothing special
1903 * Returns -1 for a line that should be highlighted as changed.
1904 * Returns -2 for a line that should be highlighted as added/deleted.
1905 * Returns > 0 for inserting that many filler lines above it (never happens
1906 * when 'diffopt' doesn't contain "filler").
1907 * This should only be used for windows where 'diff' is set.
1908 */
1909 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001910diff_check(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001911{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001912 int idx; // index in tp_diffbuf[] for this buffer
Bram Moolenaar071d4272004-06-13 20:20:40 +00001913 diff_T *dp;
1914 int maxcount;
1915 int i;
1916 buf_T *buf = wp->w_buffer;
1917 int cmp;
1918
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001919 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001920 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00001921
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001922 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) // no diffs at all
Bram Moolenaar071d4272004-06-13 20:20:40 +00001923 return 0;
1924
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001925 // safety check: "lnum" must be a buffer line
Bram Moolenaar071d4272004-06-13 20:20:40 +00001926 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
1927 return 0;
1928
1929 idx = diff_buf_idx(buf);
1930 if (idx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001931 return 0; // no diffs for buffer "buf"
Bram Moolenaar071d4272004-06-13 20:20:40 +00001932
1933#ifdef FEAT_FOLDING
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001934 // A closed fold never has filler lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001935 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
1936 return 0;
1937#endif
1938
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001939 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02001940 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001941 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1942 break;
1943 if (dp == NULL || lnum < dp->df_lnum[idx])
1944 return 0;
1945
1946 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
1947 {
1948 int zero = FALSE;
1949
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001950 // Changed or inserted line. If the other buffers have a count of
1951 // zero, the lines were inserted. If the other buffers have the same
1952 // count, check if the lines are identical.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001953 cmp = FALSE;
1954 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001955 if (i != idx && curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001956 {
1957 if (dp->df_count[i] == 0)
1958 zero = TRUE;
1959 else
1960 {
1961 if (dp->df_count[i] != dp->df_count[idx])
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001962 return -1; // nr of lines changed.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001963 cmp = TRUE;
1964 }
1965 }
1966 if (cmp)
1967 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001968 // Compare all lines. If they are equal the lines were inserted
1969 // in some buffers, deleted in others, but not changed.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001970 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001971 if (i != idx && curtab->tp_diffbuf[i] != NULL
1972 && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001973 if (!diff_equal_entry(dp, idx, i))
1974 return -1;
1975 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001976 // If there is no buffer with zero lines then there is no difference
1977 // any longer. Happens when making a change (or undo) that removes
1978 // the difference. Can't remove the entry here, we might be halfway
1979 // updating the window. Just report the text as unchanged. Other
1980 // windows might still show the change though.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001981 if (zero == FALSE)
1982 return 0;
1983 return -2;
1984 }
1985
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001986 // If 'diffopt' doesn't contain "filler", return 0.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001987 if (!(diff_flags & DIFF_FILLER))
1988 return 0;
1989
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001990 // Insert filler lines above the line just below the change. Will return
1991 // 0 when this buf had the max count.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001992 maxcount = 0;
1993 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001994 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001995 maxcount = dp->df_count[i];
1996 return maxcount - dp->df_count[idx];
1997}
1998
1999/*
2000 * Compare two entries in diff "*dp" and return TRUE if they are equal.
2001 */
2002 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002003diff_equal_entry(diff_T *dp, int idx1, int idx2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002004{
2005 int i;
2006 char_u *line;
2007 int cmp;
2008
2009 if (dp->df_count[idx1] != dp->df_count[idx2])
2010 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002011 if (diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002012 return FALSE;
2013 for (i = 0; i < dp->df_count[idx1]; ++i)
2014 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002015 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
Bram Moolenaar071d4272004-06-13 20:20:40 +00002016 dp->df_lnum[idx1] + i, FALSE));
2017 if (line == NULL)
2018 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002019 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
Bram Moolenaar071d4272004-06-13 20:20:40 +00002020 dp->df_lnum[idx2] + i, FALSE));
2021 vim_free(line);
2022 if (cmp != 0)
2023 return FALSE;
2024 }
2025 return TRUE;
2026}
2027
2028/*
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002029 * Compare the characters at "p1" and "p2". If they are equal (possibly
2030 * ignoring case) return TRUE and set "len" to the number of bytes.
2031 */
2032 static int
2033diff_equal_char(char_u *p1, char_u *p2, int *len)
2034{
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002035 int l = (*mb_ptr2len)(p1);
2036
2037 if (l != (*mb_ptr2len)(p2))
2038 return FALSE;
2039 if (l > 1)
2040 {
2041 if (STRNCMP(p1, p2, l) != 0
2042 && (!enc_utf8
2043 || !(diff_flags & DIFF_ICASE)
2044 || utf_fold(utf_ptr2char(p1))
2045 != utf_fold(utf_ptr2char(p2))))
2046 return FALSE;
2047 *len = l;
2048 }
2049 else
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002050 {
2051 if ((*p1 != *p2)
2052 && (!(diff_flags & DIFF_ICASE)
2053 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
2054 return FALSE;
2055 *len = 1;
2056 }
2057 return TRUE;
2058}
2059
2060/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002061 * Compare strings "s1" and "s2" according to 'diffopt'.
2062 * Return non-zero when they are different.
2063 */
2064 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002065diff_cmp(char_u *s1, char_u *s2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002066{
2067 char_u *p1, *p2;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002068 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002069
Bram Moolenaar785fc652018-09-15 19:17:38 +02002070 if ((diff_flags & DIFF_IBLANK)
2071 && (*skipwhite(s1) == NUL || *skipwhite(s2) == NUL))
2072 return 0;
2073
2074 if ((diff_flags & (DIFF_ICASE | ALL_WHITE_DIFF)) == 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002075 return STRCMP(s1, s2);
Bram Moolenaar785fc652018-09-15 19:17:38 +02002076 if ((diff_flags & DIFF_ICASE) && !(diff_flags & ALL_WHITE_DIFF))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002077 return MB_STRICMP(s1, s2);
2078
Bram Moolenaar071d4272004-06-13 20:20:40 +00002079 p1 = s1;
2080 p2 = s2;
Bram Moolenaar785fc652018-09-15 19:17:38 +02002081
2082 // Ignore white space changes and possibly ignore case.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002083 while (*p1 != NUL && *p2 != NUL)
2084 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002085 if (((diff_flags & DIFF_IWHITE)
2086 && VIM_ISWHITE(*p1) && VIM_ISWHITE(*p2))
2087 || ((diff_flags & DIFF_IWHITEALL)
2088 && (VIM_ISWHITE(*p1) || VIM_ISWHITE(*p2))))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002089 {
2090 p1 = skipwhite(p1);
2091 p2 = skipwhite(p2);
2092 }
2093 else
2094 {
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002095 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002096 break;
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002097 p1 += l;
2098 p2 += l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002099 }
2100 }
2101
Bram Moolenaar785fc652018-09-15 19:17:38 +02002102 // Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002103 p1 = skipwhite(p1);
2104 p2 = skipwhite(p2);
2105 if (*p1 != NUL || *p2 != NUL)
2106 return 1;
2107 return 0;
2108}
2109
2110/*
2111 * Return the number of filler lines above "lnum".
2112 */
2113 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002114diff_check_fill(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002115{
2116 int n;
2117
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002118 // be quick when there are no filler lines
Bram Moolenaar071d4272004-06-13 20:20:40 +00002119 if (!(diff_flags & DIFF_FILLER))
2120 return 0;
2121 n = diff_check(wp, lnum);
2122 if (n <= 0)
2123 return 0;
2124 return n;
2125}
2126
2127/*
2128 * Set the topline of "towin" to match the position in "fromwin", so that they
2129 * show the same diff'ed lines.
2130 */
2131 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002132diff_set_topline(win_T *fromwin, win_T *towin)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002133{
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002134 buf_T *frombuf = fromwin->w_buffer;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002135 linenr_T lnum = fromwin->w_topline;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002136 int fromidx;
2137 int toidx;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002138 diff_T *dp;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002139 int max_count;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002140 int i;
2141
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002142 fromidx = diff_buf_idx(frombuf);
2143 if (fromidx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002144 return; // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00002145
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002146 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002147 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002148
2149 towin->w_topfill = 0;
2150
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002151 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002152 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002153 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002154 break;
2155 if (dp == NULL)
2156 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002157 // After last change, compute topline relative to end of file; no
2158 // filler lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002159 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002160 - (frombuf->b_ml.ml_line_count - lnum);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002161 }
2162 else
2163 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002164 // Find index for "towin".
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002165 toidx = diff_buf_idx(towin->w_buffer);
2166 if (toidx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002167 return; // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00002168
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002169 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
2170 if (lnum >= dp->df_lnum[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002171 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002172 // Inside a change: compute filler lines. With three or more
2173 // buffers we need to know the largest count.
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002174 max_count = 0;
2175 for (i = 0; i < DB_COUNT; ++i)
2176 if (curtab->tp_diffbuf[i] != NULL
2177 && max_count < dp->df_count[i])
2178 max_count = dp->df_count[i];
2179
2180 if (dp->df_count[toidx] == dp->df_count[fromidx])
2181 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002182 // same number of lines: use same filler count
Bram Moolenaar071d4272004-06-13 20:20:40 +00002183 towin->w_topfill = fromwin->w_topfill;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002184 }
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002185 else if (dp->df_count[toidx] > dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002186 {
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002187 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002188 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002189 // more lines in towin and fromwin doesn't show diff
2190 // lines, only filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002191 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
2192 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002193 // towin also only shows filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002194 towin->w_topline = dp->df_lnum[toidx]
2195 + dp->df_count[toidx];
2196 towin->w_topfill = fromwin->w_topfill;
2197 }
2198 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002199 // towin still has some diff lines to show
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002200 towin->w_topline = dp->df_lnum[toidx]
2201 + max_count - fromwin->w_topfill;
2202 }
2203 }
2204 else if (towin->w_topline >= dp->df_lnum[toidx]
2205 + dp->df_count[toidx])
2206 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002207 // less lines in towin and no diff lines to show: compute
2208 // filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002209 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
2210 if (diff_flags & DIFF_FILLER)
2211 {
2212 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002213 // fromwin is also out of diff lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002214 towin->w_topfill = fromwin->w_topfill;
2215 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002216 // fromwin has some diff lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002217 towin->w_topfill = dp->df_lnum[fromidx]
2218 + max_count - lnum;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002219 }
2220 }
2221 }
2222 }
2223
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002224 // safety check (if diff info gets outdated strange things may happen)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002225 towin->w_botfill = FALSE;
2226 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
2227 {
2228 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
2229 towin->w_botfill = TRUE;
2230 }
2231 if (towin->w_topline < 1)
2232 {
2233 towin->w_topline = 1;
2234 towin->w_topfill = 0;
2235 }
2236
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002237 // When w_topline changes need to recompute w_botline and cursor position
Bram Moolenaar071d4272004-06-13 20:20:40 +00002238 invalidate_botline_win(towin);
2239 changed_line_abv_curs_win(towin);
2240
2241 check_topfill(towin, FALSE);
2242#ifdef FEAT_FOLDING
2243 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
2244 NULL, TRUE, NULL);
2245#endif
2246}
2247
2248/*
2249 * This is called when 'diffopt' is changed.
2250 */
2251 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002252diffopt_changed(void)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002253{
2254 char_u *p;
2255 int diff_context_new = 6;
2256 int diff_flags_new = 0;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002257 int diff_foldcolumn_new = 2;
Bram Moolenaare828b762018-09-10 17:51:58 +02002258 long diff_algorithm_new = 0;
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002259 long diff_indent_heuristic = 0;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002260 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002261
2262 p = p_dip;
2263 while (*p != NUL)
2264 {
2265 if (STRNCMP(p, "filler", 6) == 0)
2266 {
2267 p += 6;
2268 diff_flags_new |= DIFF_FILLER;
2269 }
2270 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
2271 {
2272 p += 8;
2273 diff_context_new = getdigits(&p);
2274 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002275 else if (STRNCMP(p, "iblank", 6) == 0)
2276 {
2277 p += 6;
2278 diff_flags_new |= DIFF_IBLANK;
2279 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002280 else if (STRNCMP(p, "icase", 5) == 0)
2281 {
2282 p += 5;
2283 diff_flags_new |= DIFF_ICASE;
2284 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002285 else if (STRNCMP(p, "iwhiteall", 9) == 0)
2286 {
2287 p += 9;
2288 diff_flags_new |= DIFF_IWHITEALL;
2289 }
2290 else if (STRNCMP(p, "iwhiteeol", 9) == 0)
2291 {
2292 p += 9;
2293 diff_flags_new |= DIFF_IWHITEEOL;
2294 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002295 else if (STRNCMP(p, "iwhite", 6) == 0)
2296 {
2297 p += 6;
2298 diff_flags_new |= DIFF_IWHITE;
2299 }
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002300 else if (STRNCMP(p, "horizontal", 10) == 0)
2301 {
2302 p += 10;
2303 diff_flags_new |= DIFF_HORIZONTAL;
2304 }
2305 else if (STRNCMP(p, "vertical", 8) == 0)
2306 {
2307 p += 8;
2308 diff_flags_new |= DIFF_VERTICAL;
2309 }
2310 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
2311 {
2312 p += 11;
2313 diff_foldcolumn_new = getdigits(&p);
2314 }
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002315 else if (STRNCMP(p, "hiddenoff", 9) == 0)
2316 {
2317 p += 9;
2318 diff_flags_new |= DIFF_HIDDEN_OFF;
2319 }
Bram Moolenaarc8234772019-11-10 21:00:27 +01002320 else if (STRNCMP(p, "closeoff", 8) == 0)
2321 {
2322 p += 8;
2323 diff_flags_new |= DIFF_CLOSE_OFF;
2324 }
Bram Moolenaar4223d432021-02-10 13:18:17 +01002325 else if (STRNCMP(p, "followwrap", 10) == 0)
2326 {
2327 p += 10;
2328 diff_flags_new |= DIFF_FOLLOWWRAP;
2329 }
Bram Moolenaare828b762018-09-10 17:51:58 +02002330 else if (STRNCMP(p, "indent-heuristic", 16) == 0)
2331 {
2332 p += 16;
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002333 diff_indent_heuristic = XDF_INDENT_HEURISTIC;
Bram Moolenaare828b762018-09-10 17:51:58 +02002334 }
2335 else if (STRNCMP(p, "internal", 8) == 0)
2336 {
2337 p += 8;
2338 diff_flags_new |= DIFF_INTERNAL;
2339 }
2340 else if (STRNCMP(p, "algorithm:", 10) == 0)
2341 {
2342 p += 10;
2343 if (STRNCMP(p, "myers", 5) == 0)
2344 {
2345 p += 5;
2346 diff_algorithm_new = 0;
2347 }
2348 else if (STRNCMP(p, "minimal", 7) == 0)
2349 {
2350 p += 7;
2351 diff_algorithm_new = XDF_NEED_MINIMAL;
2352 }
2353 else if (STRNCMP(p, "patience", 8) == 0)
2354 {
2355 p += 8;
2356 diff_algorithm_new = XDF_PATIENCE_DIFF;
2357 }
2358 else if (STRNCMP(p, "histogram", 9) == 0)
2359 {
2360 p += 9;
2361 diff_algorithm_new = XDF_HISTOGRAM_DIFF;
2362 }
Bram Moolenaard0721052018-11-05 21:21:33 +01002363 else
2364 return FAIL;
Bram Moolenaare828b762018-09-10 17:51:58 +02002365 }
2366
Bram Moolenaar071d4272004-06-13 20:20:40 +00002367 if (*p != ',' && *p != NUL)
2368 return FAIL;
2369 if (*p == ',')
2370 ++p;
2371 }
2372
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002373 diff_algorithm_new |= diff_indent_heuristic;
2374
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002375 // Can't have both "horizontal" and "vertical".
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002376 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
2377 return FAIL;
2378
Bram Moolenaar198fa062018-09-18 21:20:26 +02002379 // If flags were added or removed, or the algorithm was changed, need to
2380 // update the diff.
Bram Moolenaare828b762018-09-10 17:51:58 +02002381 if (diff_flags != diff_flags_new || diff_algorithm != diff_algorithm_new)
Bram Moolenaar29323592016-07-24 22:04:11 +02002382 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002383 tp->tp_diff_invalid = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002384
2385 diff_flags = diff_flags_new;
Bram Moolenaarb9ddda62019-02-19 23:00:50 +01002386 diff_context = diff_context_new == 0 ? 1 : diff_context_new;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002387 diff_foldcolumn = diff_foldcolumn_new;
Bram Moolenaare828b762018-09-10 17:51:58 +02002388 diff_algorithm = diff_algorithm_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002389
2390 diff_redraw(TRUE);
2391
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002392 // recompute the scroll binding with the new option value, may
2393 // remove or add filler lines
Bram Moolenaar071d4272004-06-13 20:20:40 +00002394 check_scrollbind((linenr_T)0, 0L);
2395
2396 return OK;
2397}
2398
2399/*
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002400 * Return TRUE if 'diffopt' contains "horizontal".
2401 */
2402 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002403diffopt_horizontal(void)
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002404{
2405 return (diff_flags & DIFF_HORIZONTAL) != 0;
2406}
2407
2408/*
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002409 * Return TRUE if 'diffopt' contains "hiddenoff".
2410 */
2411 int
2412diffopt_hiddenoff(void)
2413{
2414 return (diff_flags & DIFF_HIDDEN_OFF) != 0;
2415}
2416
2417/*
Bram Moolenaarc8234772019-11-10 21:00:27 +01002418 * Return TRUE if 'diffopt' contains "closeoff".
2419 */
2420 int
2421diffopt_closeoff(void)
2422{
2423 return (diff_flags & DIFF_CLOSE_OFF) != 0;
2424}
2425
2426/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002427 * Find the difference within a changed line.
2428 * Returns TRUE if the line was added, no other buffer has it.
2429 */
2430 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002431diff_find_change(
2432 win_T *wp,
2433 linenr_T lnum,
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002434 int *startp, // first char of the change
2435 int *endp) // last char of the change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002436{
2437 char_u *line_org;
2438 char_u *line_new;
2439 int i;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002440 int si_org, si_new;
2441 int ei_org, ei_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002442 diff_T *dp;
2443 int idx;
2444 int off;
2445 int added = TRUE;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002446 char_u *p1, *p2;
2447 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002448
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002449 // Make a copy of the line, the next ml_get() will invalidate it.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002450 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
2451 if (line_org == NULL)
2452 return FALSE;
2453
2454 idx = diff_buf_idx(wp->w_buffer);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002455 if (idx == DB_COUNT) // cannot happen
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002456 {
2457 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002458 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002459 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002460
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002461 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002462 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002463 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
2464 break;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002465 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002466 {
2467 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002468 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002469 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002470
2471 off = lnum - dp->df_lnum[idx];
2472
2473 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002474 if (curtab->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002475 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002476 // Skip lines that are not in the other change (filler lines).
Bram Moolenaar071d4272004-06-13 20:20:40 +00002477 if (off >= dp->df_count[i])
2478 continue;
2479 added = FALSE;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002480 line_new = ml_get_buf(curtab->tp_diffbuf[i],
2481 dp->df_lnum[i] + off, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002482
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002483 // Search for start of difference
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002484 si_org = si_new = 0;
2485 while (line_org[si_org] != NUL)
2486 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002487 if (((diff_flags & DIFF_IWHITE)
2488 && VIM_ISWHITE(line_org[si_org])
2489 && VIM_ISWHITE(line_new[si_new]))
2490 || ((diff_flags & DIFF_IWHITEALL)
2491 && (VIM_ISWHITE(line_org[si_org])
2492 || VIM_ISWHITE(line_new[si_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002493 {
Bram Moolenaara93fa7e2006-04-17 22:14:47 +00002494 si_org = (int)(skipwhite(line_org + si_org) - line_org);
2495 si_new = (int)(skipwhite(line_new + si_new) - line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002496 }
2497 else
2498 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002499 if (!diff_equal_char(line_org + si_org, line_new + si_new,
2500 &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002501 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002502 si_org += l;
2503 si_new += l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002504 }
2505 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002506 if (has_mbyte)
2507 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002508 // Move back to first byte of character in both lines (may
2509 // have "nn^" in line_org and "n^ in line_new).
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002510 si_org -= (*mb_head_off)(line_org, line_org + si_org);
2511 si_new -= (*mb_head_off)(line_new, line_new + si_new);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002512 }
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002513 if (*startp > si_org)
2514 *startp = si_org;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002515
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002516 // Search for end of difference, if any.
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002517 if (line_org[si_org] != NUL || line_new[si_new] != NUL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002518 {
2519 ei_org = (int)STRLEN(line_org);
2520 ei_new = (int)STRLEN(line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002521 while (ei_org >= *startp && ei_new >= si_new
2522 && ei_org >= 0 && ei_new >= 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002523 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002524 if (((diff_flags & DIFF_IWHITE)
2525 && VIM_ISWHITE(line_org[ei_org])
2526 && VIM_ISWHITE(line_new[ei_new]))
2527 || ((diff_flags & DIFF_IWHITEALL)
2528 && (VIM_ISWHITE(line_org[ei_org])
2529 || VIM_ISWHITE(line_new[ei_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002530 {
2531 while (ei_org >= *startp
Bram Moolenaar1c465442017-03-12 20:10:05 +01002532 && VIM_ISWHITE(line_org[ei_org]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002533 --ei_org;
2534 while (ei_new >= si_new
Bram Moolenaar1c465442017-03-12 20:10:05 +01002535 && VIM_ISWHITE(line_new[ei_new]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002536 --ei_new;
2537 }
2538 else
2539 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002540 p1 = line_org + ei_org;
2541 p2 = line_new + ei_new;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002542 p1 -= (*mb_head_off)(line_org, p1);
2543 p2 -= (*mb_head_off)(line_new, p2);
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002544 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002545 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002546 ei_org -= l;
2547 ei_new -= l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002548 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002549 }
2550 if (*endp < ei_org)
2551 *endp = ei_org;
2552 }
2553 }
2554
2555 vim_free(line_org);
2556 return added;
2557}
2558
2559#if defined(FEAT_FOLDING) || defined(PROTO)
2560/*
2561 * Return TRUE if line "lnum" is not close to a diff block, this line should
2562 * be in a fold.
2563 * Return FALSE if there are no diff blocks at all in this window.
2564 */
2565 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002566diff_infold(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002567{
2568 int i;
2569 int idx = -1;
2570 int other = FALSE;
2571 diff_T *dp;
2572
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002573 // Return if 'diff' isn't set.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002574 if (!wp->w_p_diff)
2575 return FALSE;
2576
2577 for (i = 0; i < DB_COUNT; ++i)
2578 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002579 if (curtab->tp_diffbuf[i] == wp->w_buffer)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002580 idx = i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002581 else if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002582 other = TRUE;
2583 }
2584
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002585 // return here if there are no diffs in the window
Bram Moolenaar071d4272004-06-13 20:20:40 +00002586 if (idx == -1 || !other)
2587 return FALSE;
2588
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002589 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002590 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002591
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002592 // Return if there are no diff blocks. All lines will be folded.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002593 if (curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002594 return TRUE;
2595
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002596 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002597 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002598 // If this change is below the line there can't be any further match.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002599 if (dp->df_lnum[idx] - diff_context > lnum)
2600 break;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002601 // If this change ends before the line we have a match.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002602 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
2603 return FALSE;
2604 }
2605 return TRUE;
2606}
2607#endif
2608
2609/*
2610 * "dp" and "do" commands.
2611 */
2612 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002613nv_diffgetput(int put, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002614{
2615 exarg_T ea;
Bram Moolenaar6a643652014-10-31 13:54:25 +01002616 char_u buf[30];
Bram Moolenaar071d4272004-06-13 20:20:40 +00002617
Bram Moolenaarf2732452018-06-03 14:47:35 +02002618#ifdef FEAT_JOB_CHANNEL
2619 if (bt_prompt(curbuf))
2620 {
2621 vim_beep(BO_OPER);
2622 return;
2623 }
2624#endif
Bram Moolenaar6a643652014-10-31 13:54:25 +01002625 if (count == 0)
2626 ea.arg = (char_u *)"";
2627 else
2628 {
2629 vim_snprintf((char *)buf, 30, "%ld", count);
2630 ea.arg = buf;
2631 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002632 if (put)
2633 ea.cmdidx = CMD_diffput;
2634 else
2635 ea.cmdidx = CMD_diffget;
2636 ea.addr_count = 0;
2637 ea.line1 = curwin->w_cursor.lnum;
2638 ea.line2 = curwin->w_cursor.lnum;
2639 ex_diffgetput(&ea);
2640}
2641
2642/*
Bram Moolenaarc5274dd2022-07-02 15:10:00 +01002643 * Return TRUE if "diff" appears in the list of diff blocks of the current tab.
2644 */
2645 static int
2646valid_diff(diff_T *diff)
2647{
2648 diff_T *dp;
2649
Yegappan Lakshmanan14113fd2023-03-07 17:13:51 +00002650 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaarc5274dd2022-07-02 15:10:00 +01002651 if (dp == diff)
2652 return TRUE;
2653 return FALSE;
2654}
2655
2656/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002657 * ":diffget"
2658 * ":diffput"
2659 */
2660 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002661ex_diffgetput(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002662{
2663 linenr_T lnum;
2664 int count;
2665 linenr_T off = 0;
2666 diff_T *dp;
2667 diff_T *dprev;
2668 diff_T *dfree;
2669 int idx_cur;
2670 int idx_other;
2671 int idx_from;
2672 int idx_to;
2673 int i;
2674 int added;
2675 char_u *p;
2676 aco_save_T aco;
2677 buf_T *buf;
2678 int start_skip, end_skip;
2679 int new_count;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002680 int buf_empty;
Bram Moolenaar602eb742007-02-20 03:43:38 +00002681 int found_not_ma = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002682
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002683 // Find the current buffer in the list of diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002684 idx_cur = diff_buf_idx(curbuf);
2685 if (idx_cur == DB_COUNT)
2686 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002687 emsg(_(e_current_buffer_is_not_in_diff_mode));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002688 return;
2689 }
2690
2691 if (*eap->arg == NUL)
2692 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002693 // No argument: Find the other buffer in the list of diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002694 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002695 if (curtab->tp_diffbuf[idx_other] != curbuf
Bram Moolenaar602eb742007-02-20 03:43:38 +00002696 && curtab->tp_diffbuf[idx_other] != NULL)
2697 {
2698 if (eap->cmdidx != CMD_diffput
2699 || curtab->tp_diffbuf[idx_other]->b_p_ma)
2700 break;
2701 found_not_ma = TRUE;
2702 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002703 if (idx_other == DB_COUNT)
2704 {
Bram Moolenaar602eb742007-02-20 03:43:38 +00002705 if (found_not_ma)
Bram Moolenaar677658a2022-01-05 16:09:06 +00002706 emsg(_(e_no_other_buffer_in_diff_mode_is_modifiable));
Bram Moolenaar602eb742007-02-20 03:43:38 +00002707 else
Bram Moolenaare1242042021-12-16 20:56:57 +00002708 emsg(_(e_no_other_buffer_in_diff_mode));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002709 return;
2710 }
2711
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002712 // Check that there isn't a third buffer in the list
Bram Moolenaar071d4272004-06-13 20:20:40 +00002713 for (i = idx_other + 1; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002714 if (curtab->tp_diffbuf[i] != curbuf
2715 && curtab->tp_diffbuf[i] != NULL
2716 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002717 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002718 emsg(_(e_more_than_two_buffers_in_diff_mode_dont_know_which_one_to_use));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002719 return;
2720 }
2721 }
2722 else
2723 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002724 // Buffer number or pattern given. Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002725 p = eap->arg + STRLEN(eap->arg);
Bram Moolenaar1c465442017-03-12 20:10:05 +01002726 while (p > eap->arg && VIM_ISWHITE(p[-1]))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002727 --p;
2728 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
2729 ;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002730 if (eap->arg + i == p) // digits only
Bram Moolenaar071d4272004-06-13 20:20:40 +00002731 i = atol((char *)eap->arg);
2732 else
2733 {
Bram Moolenaar0c279bb2013-03-19 14:25:54 +01002734 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002735 if (i < 0)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002736 return; // error message already given
Bram Moolenaar071d4272004-06-13 20:20:40 +00002737 }
2738 buf = buflist_findnr(i);
2739 if (buf == NULL)
2740 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002741 semsg(_(e_cant_find_buffer_str), eap->arg);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002742 return;
2743 }
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +00002744 if (buf == curbuf)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002745 return; // nothing to do
Bram Moolenaar071d4272004-06-13 20:20:40 +00002746 idx_other = diff_buf_idx(buf);
2747 if (idx_other == DB_COUNT)
2748 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002749 semsg(_(e_buffer_str_is_not_in_diff_mode), eap->arg);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002750 return;
2751 }
2752 }
2753
2754 diff_busy = TRUE;
2755
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002756 // When no range given include the line above or below the cursor.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002757 if (eap->addr_count == 0)
2758 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002759 // Make it possible that ":diffget" on the last line gets line below
2760 // the cursor line when there is no difference above the cursor.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002761 if (eap->cmdidx == CMD_diffget
2762 && eap->line1 == curbuf->b_ml.ml_line_count
2763 && diff_check(curwin, eap->line1) == 0
2764 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
2765 ++eap->line2;
2766 else if (eap->line1 > 0)
2767 --eap->line1;
2768 }
2769
2770 if (eap->cmdidx == CMD_diffget)
2771 {
2772 idx_from = idx_other;
2773 idx_to = idx_cur;
2774 }
2775 else
2776 {
2777 idx_from = idx_cur;
2778 idx_to = idx_other;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002779 // Need to make the other buffer the current buffer to be able to make
2780 // changes in it.
Bram Moolenaare76062c2022-11-28 18:51:43 +00002781 // Set curwin/curbuf to buf and save a few things.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002782 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
Bram Moolenaare76062c2022-11-28 18:51:43 +00002783 if (curbuf != curtab->tp_diffbuf[idx_other])
2784 // Could not find a window for this buffer, the rest is likely to
2785 // fail.
2786 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002787 }
2788
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002789 // May give the warning for a changed buffer here, which can trigger the
2790 // FileChangedRO autocommand, which may do nasty things and mess
2791 // everything up.
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002792 if (!curbuf->b_changed)
2793 {
2794 change_warning(0);
2795 if (diff_buf_idx(curbuf) != idx_to)
2796 {
Bram Moolenaar677658a2022-01-05 16:09:06 +00002797 emsg(_(e_buffer_changed_unexpectedly));
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002798 goto theend;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002799 }
2800 }
2801
Bram Moolenaar071d4272004-06-13 20:20:40 +00002802 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002803 for (dp = curtab->tp_first_diff; dp != NULL; )
Bram Moolenaar071d4272004-06-13 20:20:40 +00002804 {
2805 if (dp->df_lnum[idx_cur] > eap->line2 + off)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002806 break; // past the range that was specified
Bram Moolenaar071d4272004-06-13 20:20:40 +00002807
2808 dfree = NULL;
2809 lnum = dp->df_lnum[idx_to];
2810 count = dp->df_count[idx_to];
2811 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
2812 && u_save(lnum - 1, lnum + count) != FAIL)
2813 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002814 // Inside the specified range and saving for undo worked.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002815 start_skip = 0;
2816 end_skip = 0;
2817 if (eap->addr_count > 0)
2818 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002819 // A range was specified: check if lines need to be skipped.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002820 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
2821 if (start_skip > 0)
2822 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002823 // range starts below start of current diff block
Bram Moolenaar071d4272004-06-13 20:20:40 +00002824 if (start_skip > count)
2825 {
2826 lnum += count;
2827 count = 0;
2828 }
2829 else
2830 {
2831 count -= start_skip;
2832 lnum += start_skip;
2833 }
2834 }
2835 else
2836 start_skip = 0;
2837
2838 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
2839 - (eap->line2 + off);
2840 if (end_skip > 0)
2841 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002842 // range ends above end of current/from diff block
2843 if (idx_cur == idx_from) // :diffput
Bram Moolenaar071d4272004-06-13 20:20:40 +00002844 {
2845 i = dp->df_count[idx_cur] - start_skip - end_skip;
2846 if (count > i)
2847 count = i;
2848 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002849 else // :diffget
Bram Moolenaar071d4272004-06-13 20:20:40 +00002850 {
2851 count -= end_skip;
2852 end_skip = dp->df_count[idx_from] - start_skip - count;
2853 if (end_skip < 0)
2854 end_skip = 0;
2855 }
2856 }
2857 else
2858 end_skip = 0;
2859 }
2860
Bram Moolenaarb5aedf32017-03-12 18:23:53 +01002861 buf_empty = BUFEMPTY();
Bram Moolenaar071d4272004-06-13 20:20:40 +00002862 added = 0;
2863 for (i = 0; i < count; ++i)
2864 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002865 // remember deleting the last line of the buffer
Bram Moolenaar280f1262006-01-30 00:14:18 +00002866 buf_empty = curbuf->b_ml.ml_line_count == 1;
Bram Moolenaar4e677b92022-07-28 18:44:27 +01002867 if (ml_delete(lnum) == OK)
2868 --added;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002869 }
2870 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
2871 {
2872 linenr_T nr;
2873
2874 nr = dp->df_lnum[idx_from] + start_skip + i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002875 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002876 break;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002877 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
2878 nr, FALSE));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002879 if (p != NULL)
2880 {
2881 ml_append(lnum + i - 1, p, 0, FALSE);
2882 vim_free(p);
2883 ++added;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002884 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
2885 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002886 // Added the first line into an empty buffer, need to
2887 // delete the dummy empty line.
Bram Moolenaar280f1262006-01-30 00:14:18 +00002888 buf_empty = FALSE;
Bram Moolenaarca70c072020-05-30 20:30:46 +02002889 ml_delete((linenr_T)2);
Bram Moolenaar280f1262006-01-30 00:14:18 +00002890 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002891 }
2892 }
2893 new_count = dp->df_count[idx_to] + added;
2894 dp->df_count[idx_to] = new_count;
2895
2896 if (start_skip == 0 && end_skip == 0)
2897 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002898 // Check if there are any other buffers and if the diff is
2899 // equal in them.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002900 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002901 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
2902 && i != idx_to
Bram Moolenaar071d4272004-06-13 20:20:40 +00002903 && !diff_equal_entry(dp, idx_from, i))
2904 break;
2905 if (i == DB_COUNT)
2906 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002907 // delete the diff entry, the buffers are now equal here
Bram Moolenaar071d4272004-06-13 20:20:40 +00002908 dfree = dp;
2909 dp = dp->df_next;
2910 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002911 curtab->tp_first_diff = dp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002912 else
2913 dprev->df_next = dp;
2914 }
2915 }
2916
Bram Moolenaar071d4272004-06-13 20:20:40 +00002917 if (added != 0)
2918 {
Bram Moolenaarc5274dd2022-07-02 15:10:00 +01002919 // Adjust marks. This will change the following entries!
Bram Moolenaar071d4272004-06-13 20:20:40 +00002920 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
2921 if (curwin->w_cursor.lnum >= lnum)
2922 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002923 // Adjust the cursor position if it's in/after the changed
2924 // lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002925 if (curwin->w_cursor.lnum >= lnum + count)
2926 curwin->w_cursor.lnum += added;
2927 else if (added < 0)
2928 curwin->w_cursor.lnum = lnum;
2929 }
2930 }
2931 changed_lines(lnum, 0, lnum + count, (long)added);
2932
2933 if (dfree != NULL)
2934 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002935 // Diff is deleted, update folds in other windows.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002936#ifdef FEAT_FOLDING
2937 diff_fold_update(dfree, idx_to);
2938#endif
2939 vim_free(dfree);
2940 }
Bram Moolenaarc5274dd2022-07-02 15:10:00 +01002941
2942 // mark_adjust() may have made "dp" invalid. We don't know where
2943 // to continue then, bail out.
2944 if (added != 0 && !valid_diff(dp))
2945 break;
2946
2947 if (dfree == NULL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002948 // mark_adjust() may have changed the count in a wrong way
Bram Moolenaar071d4272004-06-13 20:20:40 +00002949 dp->df_count[idx_to] = new_count;
2950
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002951 // When changing the current buffer, keep track of line numbers
Bram Moolenaar071d4272004-06-13 20:20:40 +00002952 if (idx_cur == idx_to)
2953 off += added;
2954 }
2955
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002956 // If before the range or not deleted, go to next diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002957 if (dfree == NULL)
2958 {
2959 dprev = dp;
2960 dp = dp->df_next;
2961 }
2962 }
2963
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002964 // restore curwin/curbuf and a few other things
Bram Moolenaara9d52e32010-07-31 16:44:19 +02002965 if (eap->cmdidx != CMD_diffget)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002966 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002967 // Syncing undo only works for the current buffer, but we change
2968 // another buffer. Sync undo if the command was typed. This isn't
2969 // 100% right when ":diffput" is used in a function or mapping.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002970 if (KeyTyped)
Bram Moolenaar779b74b2006-04-10 14:55:34 +00002971 u_sync(FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002972 aucmd_restbuf(&aco);
2973 }
2974
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002975theend:
Bram Moolenaar071d4272004-06-13 20:20:40 +00002976 diff_busy = FALSE;
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002977 if (diff_need_update)
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002978 ex_diffupdate(NULL);
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002979
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +02002980 // Check that the cursor is on a valid character and update its
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002981 // position. When there were filler lines the topline has become
2982 // invalid.
2983 check_cursor();
2984 changed_line_abv_curs();
2985
2986 if (diff_need_update)
2987 // redraw already done by ex_diffupdate()
2988 diff_need_update = FALSE;
Bram Moolenaar198fa062018-09-18 21:20:26 +02002989 else
2990 {
Bram Moolenaar198fa062018-09-18 21:20:26 +02002991 // Also need to redraw the other buffers.
2992 diff_redraw(FALSE);
2993 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
2994 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002995}
2996
2997#ifdef FEAT_FOLDING
2998/*
2999 * Update folds for all diff buffers for entry "dp".
3000 * Skip buffer with index "skip_idx".
3001 * When there are no diffs, all folds are removed.
3002 */
3003 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01003004diff_fold_update(diff_T *dp, int skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003005{
3006 int i;
3007 win_T *wp;
3008
Bram Moolenaar29323592016-07-24 22:04:11 +02003009 FOR_ALL_WINDOWS(wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003010 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003011 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003012 foldUpdate(wp, dp->df_lnum[i],
3013 dp->df_lnum[i] + dp->df_count[i]);
3014}
3015#endif
3016
3017/*
3018 * Return TRUE if buffer "buf" is in diff-mode.
3019 */
3020 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01003021diff_mode_buf(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003022{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003023 tabpage_T *tp;
3024
Bram Moolenaar29323592016-07-24 22:04:11 +02003025 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003026 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
3027 return TRUE;
3028 return FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00003029}
3030
3031/*
3032 * Move "count" times in direction "dir" to the next diff block.
3033 * Return FAIL if there isn't such a diff block.
3034 */
3035 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01003036diff_move_to(int dir, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003037{
3038 int idx;
3039 linenr_T lnum = curwin->w_cursor.lnum;
3040 diff_T *dp;
3041
3042 idx = diff_buf_idx(curbuf);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003043 if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003044 return FAIL;
3045
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003046 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003047 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00003048
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003049 if (curtab->tp_first_diff == NULL) // no diffs today
Bram Moolenaar071d4272004-06-13 20:20:40 +00003050 return FAIL;
3051
3052 while (--count >= 0)
3053 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003054 // Check if already before first diff.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003055 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00003056 break;
3057
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003058 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003059 {
3060 if (dp == NULL)
3061 break;
3062 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
3063 || (dir == BACKWARD
3064 && (dp->df_next == NULL
3065 || lnum <= dp->df_next->df_lnum[idx])))
3066 {
3067 lnum = dp->df_lnum[idx];
3068 break;
3069 }
3070 }
3071 }
3072
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003073 // don't end up past the end of the file
Bram Moolenaar071d4272004-06-13 20:20:40 +00003074 if (lnum > curbuf->b_ml.ml_line_count)
3075 lnum = curbuf->b_ml.ml_line_count;
3076
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003077 // When the cursor didn't move at all we fail.
Bram Moolenaar071d4272004-06-13 20:20:40 +00003078 if (lnum == curwin->w_cursor.lnum)
3079 return FAIL;
3080
3081 setpcmark();
3082 curwin->w_cursor.lnum = lnum;
3083 curwin->w_cursor.col = 0;
3084
3085 return OK;
3086}
3087
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003088/*
3089 * Return the line number in the current window that is closest to "lnum1" in
3090 * "buf1" in diff mode.
3091 */
3092 static linenr_T
3093diff_get_corresponding_line_int(
Bram Moolenaar7454a062016-01-30 15:14:10 +01003094 buf_T *buf1,
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003095 linenr_T lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003096{
3097 int idx1;
3098 int idx2;
3099 diff_T *dp;
3100 int baseline = 0;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003101
3102 idx1 = diff_buf_idx(buf1);
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003103 idx2 = diff_buf_idx(curbuf);
Bram Moolenaar860cae12010-06-05 23:22:07 +02003104 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL)
3105 return lnum1;
3106
3107 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003108 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar860cae12010-06-05 23:22:07 +02003109
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003110 if (curtab->tp_first_diff == NULL) // no diffs today
Bram Moolenaar860cae12010-06-05 23:22:07 +02003111 return lnum1;
3112
Bram Moolenaaraeea7212020-04-02 18:50:46 +02003113 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003114 {
3115 if (dp->df_lnum[idx1] > lnum1)
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003116 return lnum1 - baseline;
3117 if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003118 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003119 // Inside the diffblock
Bram Moolenaar860cae12010-06-05 23:22:07 +02003120 baseline = lnum1 - dp->df_lnum[idx1];
3121 if (baseline > dp->df_count[idx2])
3122 baseline = dp->df_count[idx2];
3123
3124 return dp->df_lnum[idx2] + baseline;
3125 }
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003126 if ( (dp->df_lnum[idx1] == lnum1)
3127 && (dp->df_count[idx1] == 0)
3128 && (dp->df_lnum[idx2] <= curwin->w_cursor.lnum)
3129 && ((dp->df_lnum[idx2] + dp->df_count[idx2])
3130 > curwin->w_cursor.lnum))
Bram Moolenaar860cae12010-06-05 23:22:07 +02003131 /*
3132 * Special case: if the cursor is just after a zero-count
3133 * block (i.e. all filler) and the target cursor is already
3134 * inside the corresponding block, leave the target cursor
3135 * unmoved. This makes repeated CTRL-W W operations work
3136 * as expected.
3137 */
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003138 return curwin->w_cursor.lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003139 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1])
3140 - (dp->df_lnum[idx2] + dp->df_count[idx2]);
3141 }
3142
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003143 // If we get here then the cursor is after the last diff
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003144 return lnum1 - baseline;
3145}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003146
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003147/*
3148 * Return the line number in the current window that is closest to "lnum1" in
3149 * "buf1" in diff mode. Checks the line number to be valid.
3150 */
3151 linenr_T
3152diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1)
3153{
3154 linenr_T lnum = diff_get_corresponding_line_int(buf1, lnum1);
3155
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003156 // don't end up past the end of the file
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003157 if (lnum > curbuf->b_ml.ml_line_count)
3158 return curbuf->b_ml.ml_line_count;
3159 return lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003160}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003161
Bram Moolenaar071d4272004-06-13 20:20:40 +00003162/*
3163 * For line "lnum" in the current window find the equivalent lnum in window
3164 * "wp", compensating for inserted/deleted lines.
3165 */
3166 linenr_T
Bram Moolenaar7454a062016-01-30 15:14:10 +01003167diff_lnum_win(linenr_T lnum, win_T *wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003168{
3169 diff_T *dp;
3170 int idx;
3171 int i;
3172 linenr_T n;
3173
3174 idx = diff_buf_idx(curbuf);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003175 if (idx == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00003176 return (linenr_T)0;
3177
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003178 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003179 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00003180
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003181 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02003182 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003183 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3184 break;
3185
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003186 // When after the last change, compute relative to the last line number.
Bram Moolenaar071d4272004-06-13 20:20:40 +00003187 if (dp == NULL)
3188 return wp->w_buffer->b_ml.ml_line_count
3189 - (curbuf->b_ml.ml_line_count - lnum);
3190
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003191 // Find index for "wp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00003192 i = diff_buf_idx(wp->w_buffer);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003193 if (i == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00003194 return (linenr_T)0;
3195
3196 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
3197 if (n > dp->df_lnum[i] + dp->df_count[i])
3198 n = dp->df_lnum[i] + dp->df_count[i];
3199 return n;
3200}
Bram Moolenaar071d4272004-06-13 20:20:40 +00003201
Bram Moolenaare828b762018-09-10 17:51:58 +02003202/*
3203 * Handle an ED style diff line.
3204 * Return FAIL if the line does not contain diff info.
3205 */
3206 static int
3207parse_diff_ed(
3208 char_u *line,
Lewis Russelld9da86e2021-12-28 13:54:41 +00003209 diffhunk_T *hunk)
Bram Moolenaare828b762018-09-10 17:51:58 +02003210{
3211 char_u *p;
3212 long f1, l1, f2, l2;
3213 int difftype;
3214
3215 // The line must be one of three formats:
3216 // change: {first}[,{last}]c{first}[,{last}]
3217 // append: {first}a{first}[,{last}]
3218 // delete: {first}[,{last}]d{first}
3219 p = line;
3220 f1 = getdigits(&p);
3221 if (*p == ',')
3222 {
3223 ++p;
3224 l1 = getdigits(&p);
3225 }
3226 else
3227 l1 = f1;
3228 if (*p != 'a' && *p != 'c' && *p != 'd')
3229 return FAIL; // invalid diff format
3230 difftype = *p++;
3231 f2 = getdigits(&p);
3232 if (*p == ',')
3233 {
3234 ++p;
3235 l2 = getdigits(&p);
3236 }
3237 else
3238 l2 = f2;
3239 if (l1 < f1 || l2 < f2)
3240 return FAIL;
3241
3242 if (difftype == 'a')
3243 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003244 hunk->lnum_orig = f1 + 1;
3245 hunk->count_orig = 0;
Bram Moolenaare828b762018-09-10 17:51:58 +02003246 }
3247 else
3248 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003249 hunk->lnum_orig = f1;
3250 hunk->count_orig = l1 - f1 + 1;
Bram Moolenaare828b762018-09-10 17:51:58 +02003251 }
3252 if (difftype == 'd')
3253 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003254 hunk->lnum_new = f2 + 1;
3255 hunk->count_new = 0;
Bram Moolenaare828b762018-09-10 17:51:58 +02003256 }
3257 else
3258 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003259 hunk->lnum_new = f2;
3260 hunk->count_new = l2 - f2 + 1;
Bram Moolenaare828b762018-09-10 17:51:58 +02003261 }
3262 return OK;
3263}
3264
3265/*
3266 * Parses unified diff with zero(!) context lines.
3267 * Return FAIL if there is no diff information in "line".
3268 */
3269 static int
3270parse_diff_unified(
3271 char_u *line,
Lewis Russelld9da86e2021-12-28 13:54:41 +00003272 diffhunk_T *hunk)
Bram Moolenaare828b762018-09-10 17:51:58 +02003273{
3274 char_u *p;
3275 long oldline, oldcount, newline, newcount;
3276
3277 // Parse unified diff hunk header:
3278 // @@ -oldline,oldcount +newline,newcount @@
3279 p = line;
3280 if (*p++ == '@' && *p++ == '@' && *p++ == ' ' && *p++ == '-')
3281 {
3282 oldline = getdigits(&p);
3283 if (*p == ',')
3284 {
3285 ++p;
3286 oldcount = getdigits(&p);
3287 }
3288 else
3289 oldcount = 1;
3290 if (*p++ == ' ' && *p++ == '+')
3291 {
3292 newline = getdigits(&p);
3293 if (*p == ',')
3294 {
3295 ++p;
3296 newcount = getdigits(&p);
3297 }
3298 else
3299 newcount = 1;
3300 }
3301 else
3302 return FAIL; // invalid diff format
3303
3304 if (oldcount == 0)
3305 oldline += 1;
3306 if (newcount == 0)
3307 newline += 1;
3308 if (newline == 0)
3309 newline = 1;
3310
Lewis Russelld9da86e2021-12-28 13:54:41 +00003311 hunk->lnum_orig = oldline;
3312 hunk->count_orig = oldcount;
3313 hunk->lnum_new = newline;
3314 hunk->count_new = newcount;
Bram Moolenaare828b762018-09-10 17:51:58 +02003315
3316 return OK;
3317 }
3318
3319 return FAIL;
3320}
3321
3322/*
3323 * Callback function for the xdl_diff() function.
3324 * Stores the diff output in a grow array.
3325 */
3326 static int
Lewis Russelld9da86e2021-12-28 13:54:41 +00003327xdiff_out(
3328 long start_a,
3329 long count_a,
3330 long start_b,
3331 long count_b,
3332 void *priv)
Bram Moolenaare828b762018-09-10 17:51:58 +02003333{
3334 diffout_T *dout = (diffout_T *)priv;
Lewis Russelld9da86e2021-12-28 13:54:41 +00003335 diffhunk_T *p = ALLOC_ONE(diffhunk_T);
Bram Moolenaare828b762018-09-10 17:51:58 +02003336
Lewis Russelld9da86e2021-12-28 13:54:41 +00003337 if (p == NULL)
3338 return -1;
Bram Moolenaarf080d702018-10-31 22:57:26 +01003339
3340 if (ga_grow(&dout->dout_ga, 1) == FAIL)
Bram Moolenaarfebb78f2021-12-29 11:59:53 +00003341 {
3342 vim_free(p);
Bram Moolenaarf080d702018-10-31 22:57:26 +01003343 return -1;
Bram Moolenaarfebb78f2021-12-29 11:59:53 +00003344 }
Lewis Russelld9da86e2021-12-28 13:54:41 +00003345
3346 p->lnum_orig = start_a + 1;
3347 p->count_orig = count_a;
3348 p->lnum_new = start_b + 1;
3349 p->count_new = count_b;
3350 ((diffhunk_T **)dout->dout_ga.ga_data)[dout->dout_ga.ga_len++] = p;
Bram Moolenaare828b762018-09-10 17:51:58 +02003351 return 0;
3352}
3353
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003354#endif // FEAT_DIFF
3355
3356#if defined(FEAT_EVAL) || defined(PROTO)
3357
3358/*
3359 * "diff_filler()" function
3360 */
3361 void
3362f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
3363{
3364#ifdef FEAT_DIFF
Yegappan Lakshmanan4490ec42021-07-27 22:00:44 +02003365 if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL)
3366 return;
3367
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003368 rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars));
3369#endif
3370}
3371
3372/*
3373 * "diff_hlID()" function
3374 */
3375 void
3376f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
3377{
3378#ifdef FEAT_DIFF
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003379 linenr_T lnum;
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003380 static linenr_T prev_lnum = 0;
3381 static varnumber_T changedtick = 0;
3382 static int fnum = 0;
3383 static int change_start = 0;
3384 static int change_end = 0;
3385 static hlf_T hlID = (hlf_T)0;
3386 int filler_lines;
3387 int col;
3388
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003389 if (in_vim9script()
Yegappan Lakshmanancd917202021-07-21 19:09:09 +02003390 && (check_for_lnum_arg(argvars,0) == FAIL
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003391 || check_for_number_arg(argvars, 1) == FAIL))
3392 return;
3393
3394 lnum = tv_get_lnum(argvars);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003395 if (lnum < 0) // ignore type error in {lnum} arg
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003396 lnum = 0;
3397 if (lnum != prev_lnum
3398 || changedtick != CHANGEDTICK(curbuf)
3399 || fnum != curbuf->b_fnum)
3400 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003401 // New line, buffer, change: need to get the values.
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003402 filler_lines = diff_check(curwin, lnum);
3403 if (filler_lines < 0)
3404 {
3405 if (filler_lines == -1)
3406 {
3407 change_start = MAXCOL;
3408 change_end = -1;
3409 if (diff_find_change(curwin, lnum, &change_start, &change_end))
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003410 hlID = HLF_ADD; // added line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003411 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003412 hlID = HLF_CHD; // changed line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003413 }
3414 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003415 hlID = HLF_ADD; // added line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003416 }
3417 else
3418 hlID = (hlf_T)0;
3419 prev_lnum = lnum;
3420 changedtick = CHANGEDTICK(curbuf);
3421 fnum = curbuf->b_fnum;
3422 }
3423
3424 if (hlID == HLF_CHD || hlID == HLF_TXD)
3425 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003426 col = tv_get_number(&argvars[1]) - 1; // ignore type error in {col}
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003427 if (col >= change_start && col <= change_end)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003428 hlID = HLF_TXD; // changed text
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003429 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003430 hlID = HLF_CHD; // changed line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003431 }
3432 rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID;
3433#endif
3434}
3435
3436#endif