blob: fb43eee844cd89a5aa7f01280c9e82396a570027 [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;
126 redraw_later(VALID);
127 }
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);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000562 if (dnew != NULL)
563 {
564 dnew->df_next = dp;
565 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000566 tp->tp_first_diff = dnew;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000567 else
568 dprev->df_next = dnew;
569 }
570 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)
Bram Moolenaarcd38bb42022-06-26 14:04:07 +0100681 // when closing windows or wiping buffers skip invalid window
682 if (wp->w_p_diff && buf_valid(wp->w_buffer))
Bram Moolenaar071d4272004-06-13 20:20:40 +0000683 {
Bram Moolenaar60f83772006-03-12 21:52:47 +0000684 redraw_win_later(wp, SOME_VALID);
Bram Moolenaar04626c22021-09-01 16:02:07 +0200685 if (wp != curwin)
686 wp_other = wp;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000687#ifdef FEAT_FOLDING
688 if (dofold && foldmethodIsDiff(wp))
689 foldUpdateAll(wp);
690#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100691 // A change may have made filler lines invalid, need to take care
692 // of that for other windows.
Bram Moolenaara80888d2012-10-21 22:18:21 +0200693 n = diff_check(wp, wp->w_topline);
694 if ((wp != curwin && wp->w_topfill > 0) || n > 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000695 {
Bram Moolenaar071d4272004-06-13 20:20:40 +0000696 if (wp->w_topfill > n)
697 wp->w_topfill = (n < 0 ? 0 : n);
Bram Moolenaara80888d2012-10-21 22:18:21 +0200698 else if (n > 0 && n > wp->w_topfill)
Bram Moolenaar04626c22021-09-01 16:02:07 +0200699 {
Bram Moolenaara80888d2012-10-21 22:18:21 +0200700 wp->w_topfill = n;
Bram Moolenaar04626c22021-09-01 16:02:07 +0200701 if (wp == curwin)
Bram Moolenaar841c2252021-10-22 20:56:55 +0100702 used_max_fill_curwin = TRUE;
703 else if (wp_other != NULL)
704 used_max_fill_other = TRUE;
Bram Moolenaar04626c22021-09-01 16:02:07 +0200705 }
Bram Moolenaar846a2ff2014-05-28 11:35:37 +0200706 check_topfill(wp, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000707 }
708 }
Bram Moolenaar04626c22021-09-01 16:02:07 +0200709
Bram Moolenaar841c2252021-10-22 20:56:55 +0100710 if (wp_other != NULL && curwin->w_p_scb)
711 {
712 if (used_max_fill_curwin)
Dominique Pelleaf4a61a2021-12-27 17:21:41 +0000713 // The current window was set to use the maximum number of filler
Bram Moolenaar841c2252021-10-22 20:56:55 +0100714 // lines, may need to reduce them.
715 diff_set_topline(wp_other, curwin);
716 else if (used_max_fill_other)
Dominique Pelleaf4a61a2021-12-27 17:21:41 +0000717 // The other window was set to use the maximum number of filler
Bram Moolenaar841c2252021-10-22 20:56:55 +0100718 // lines, may need to reduce them.
719 diff_set_topline(curwin, wp_other);
720 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000721}
722
Bram Moolenaare828b762018-09-10 17:51:58 +0200723 static void
724clear_diffin(diffin_T *din)
725{
726 if (din->din_fname == NULL)
727 {
728 vim_free(din->din_mmfile.ptr);
729 din->din_mmfile.ptr = NULL;
730 }
731 else
732 mch_remove(din->din_fname);
733}
734
735 static void
736clear_diffout(diffout_T *dout)
737{
738 if (dout->dout_fname == NULL)
739 ga_clear_strings(&dout->dout_ga);
740 else
741 mch_remove(dout->dout_fname);
742}
743
Bram Moolenaar071d4272004-06-13 20:20:40 +0000744/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200745 * Write buffer "buf" to a memory buffer.
746 * Return FAIL for failure.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000747 */
748 static int
Bram Moolenaare828b762018-09-10 17:51:58 +0200749diff_write_buffer(buf_T *buf, diffin_T *din)
750{
751 linenr_T lnum;
752 char_u *s;
753 long len = 0;
754 char_u *ptr;
755
756 // xdiff requires one big block of memory with all the text.
757 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
Bram Moolenaar6e272ac2018-09-16 14:51:36 +0200758 len += (long)STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
Bram Moolenaar18a4ba22019-05-24 19:39:03 +0200759 ptr = alloc(len);
Bram Moolenaare828b762018-09-10 17:51:58 +0200760 if (ptr == NULL)
761 {
762 // Allocating memory failed. This can happen, because we try to read
763 // the whole buffer text into memory. Set the failed flag, the diff
764 // will be retried with external diff. The flag is never reset.
765 buf->b_diff_failed = TRUE;
766 if (p_verbose > 0)
767 {
768 verbose_enter();
Bram Moolenaarf9e3e092019-01-13 23:38:42 +0100769 smsg(_("Not enough memory to use internal diff for buffer \"%s\""),
Bram Moolenaare828b762018-09-10 17:51:58 +0200770 buf->b_fname);
771 verbose_leave();
772 }
773 return FAIL;
774 }
775 din->din_mmfile.ptr = (char *)ptr;
776 din->din_mmfile.size = len;
777
778 len = 0;
779 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
780 {
781 for (s = ml_get_buf(buf, lnum, FALSE); *s != NUL; )
782 {
783 if (diff_flags & DIFF_ICASE)
784 {
785 int c;
Bram Moolenaare828b762018-09-10 17:51:58 +0200786 int orig_len;
787 char_u cbuf[MB_MAXBYTES + 1];
788
Bram Moolenaar06f60952021-12-28 18:30:05 +0000789 if (*s == NL)
790 c = NUL;
791 else
792 {
793 // xdiff doesn't support ignoring case, fold-case the text.
794 c = PTR2CHAR(s);
795 c = MB_CASEFOLD(c);
796 }
Bram Moolenaar1614a142019-10-06 22:00:13 +0200797 orig_len = mb_ptr2len(s);
Bram Moolenaare828b762018-09-10 17:51:58 +0200798 if (mb_char2bytes(c, cbuf) != orig_len)
799 // TODO: handle byte length difference
800 mch_memmove(ptr + len, s, orig_len);
801 else
802 mch_memmove(ptr + len, cbuf, orig_len);
803
804 s += orig_len;
805 len += orig_len;
Bram Moolenaare828b762018-09-10 17:51:58 +0200806 }
807 else
Bram Moolenaar06f60952021-12-28 18:30:05 +0000808 {
809 ptr[len++] = *s == NL ? NUL : *s;
810 s++;
811 }
Bram Moolenaare828b762018-09-10 17:51:58 +0200812 }
813 ptr[len++] = NL;
814 }
815 return OK;
816}
817
818/*
819 * Write buffer "buf" to file or memory buffer.
820 * Return FAIL for failure.
821 */
822 static int
823diff_write(buf_T *buf, diffin_T *din)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000824{
825 int r;
826 char_u *save_ff;
Bram Moolenaare1004402020-10-24 20:49:43 +0200827 int save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000828
Bram Moolenaare828b762018-09-10 17:51:58 +0200829 if (din->din_fname == NULL)
830 return diff_write_buffer(buf, din);
831
832 // Always use 'fileformat' set to "unix".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000833 save_ff = buf->b_p_ff;
834 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
Bram Moolenaare1004402020-10-24 20:49:43 +0200835 save_cmod_flags = cmdmod.cmod_flags;
Bram Moolenaarf4a1d1c2019-11-16 13:50:25 +0100836 // Writing the buffer is an implementation detail of performing the diff,
837 // so it shouldn't update the '[ and '] marks.
Bram Moolenaare1004402020-10-24 20:49:43 +0200838 cmdmod.cmod_flags |= CMOD_LOCKMARKS;
Bram Moolenaare828b762018-09-10 17:51:58 +0200839 r = buf_write(buf, din->din_fname, NULL,
840 (linenr_T)1, buf->b_ml.ml_line_count,
841 NULL, FALSE, FALSE, FALSE, TRUE);
Bram Moolenaare1004402020-10-24 20:49:43 +0200842 cmdmod.cmod_flags = save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000843 free_string_option(buf->b_p_ff);
844 buf->b_p_ff = save_ff;
845 return r;
846}
847
848/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200849 * Update the diffs for all buffers involved.
850 */
851 static void
852diff_try_update(
853 diffio_T *dio,
854 int idx_orig,
855 exarg_T *eap) // "eap" can be NULL
856{
857 buf_T *buf;
858 int idx_new;
859
860 if (dio->dio_internal)
861 {
862 ga_init2(&dio->dio_diff.dout_ga, sizeof(char *), 1000);
863 }
864 else
865 {
866 // We need three temp file names.
867 dio->dio_orig.din_fname = vim_tempname('o', TRUE);
868 dio->dio_new.din_fname = vim_tempname('n', TRUE);
869 dio->dio_diff.dout_fname = vim_tempname('d', TRUE);
870 if (dio->dio_orig.din_fname == NULL
871 || dio->dio_new.din_fname == NULL
872 || dio->dio_diff.dout_fname == NULL)
873 goto theend;
874 }
875
876 // Check external diff is actually working.
877 if (!dio->dio_internal && check_external_diff(dio) == FAIL)
878 goto theend;
879
880 // :diffupdate!
881 if (eap != NULL && eap->forceit)
882 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
883 {
884 buf = curtab->tp_diffbuf[idx_new];
885 if (buf_valid(buf))
886 buf_check_timestamp(buf, FALSE);
887 }
888
889 // Write the first buffer to a tempfile or mmfile_t.
890 buf = curtab->tp_diffbuf[idx_orig];
891 if (diff_write(buf, &dio->dio_orig) == FAIL)
892 goto theend;
893
894 // Make a difference between the first buffer and every other.
895 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
896 {
897 buf = curtab->tp_diffbuf[idx_new];
898 if (buf == NULL || buf->b_ml.ml_mfp == NULL)
899 continue; // skip buffer that isn't loaded
900
901 // Write the other buffer and diff with the first one.
902 if (diff_write(buf, &dio->dio_new) == FAIL)
903 continue;
904 if (diff_file(dio) == FAIL)
905 continue;
906
907 // Read the diff output and add each entry to the diff list.
Lewis Russelld9da86e2021-12-28 13:54:41 +0000908 diff_read(idx_orig, idx_new, dio);
Bram Moolenaare828b762018-09-10 17:51:58 +0200909
910 clear_diffin(&dio->dio_new);
911 clear_diffout(&dio->dio_diff);
912 }
913 clear_diffin(&dio->dio_orig);
914
915theend:
916 vim_free(dio->dio_orig.din_fname);
917 vim_free(dio->dio_new.din_fname);
918 vim_free(dio->dio_diff.dout_fname);
919}
920
921/*
922 * Return TRUE if the options are set to use the internal diff library.
923 * Note that if the internal diff failed for one of the buffers, the external
924 * diff will be used anyway.
925 */
Bram Moolenaare3521d92018-09-16 14:10:31 +0200926 int
Bram Moolenaare828b762018-09-10 17:51:58 +0200927diff_internal(void)
928{
Bram Moolenaar975880b2019-03-03 14:42:11 +0100929 return (diff_flags & DIFF_INTERNAL) != 0
930#ifdef FEAT_EVAL
931 && *p_dex == NUL
932#endif
933 ;
Bram Moolenaare828b762018-09-10 17:51:58 +0200934}
935
936/*
937 * Return TRUE if the internal diff failed for one of the diff buffers.
938 */
939 static int
940diff_internal_failed(void)
941{
942 int idx;
943
944 // Only need to do something when there is another buffer.
945 for (idx = 0; idx < DB_COUNT; ++idx)
946 if (curtab->tp_diffbuf[idx] != NULL
947 && curtab->tp_diffbuf[idx]->b_diff_failed)
948 return TRUE;
949 return FALSE;
950}
951
952/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000953 * Completely update the diffs for the buffers involved.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200954 * When using the external "diff" command the buffers are written to a file,
955 * also for unmodified buffers (the file could have been produced by
956 * autocommands, e.g. the netrw plugin).
Bram Moolenaar071d4272004-06-13 20:20:40 +0000957 */
Bram Moolenaar071d4272004-06-13 20:20:40 +0000958 void
Bram Moolenaare828b762018-09-10 17:51:58 +0200959ex_diffupdate(exarg_T *eap) // "eap" can be NULL
Bram Moolenaar071d4272004-06-13 20:20:40 +0000960{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000961 int idx_orig;
962 int idx_new;
Bram Moolenaare828b762018-09-10 17:51:58 +0200963 diffio_T diffio;
Bram Moolenaar198fa062018-09-18 21:20:26 +0200964 int had_diffs = curtab->tp_first_diff != NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000965
Bram Moolenaard2b58c02018-09-16 18:10:48 +0200966 if (diff_busy)
967 {
968 diff_need_update = TRUE;
969 return;
970 }
971
Bram Moolenaare828b762018-09-10 17:51:58 +0200972 // Delete all diffblocks.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000973 diff_clear(curtab);
974 curtab->tp_diff_invalid = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000975
Bram Moolenaare828b762018-09-10 17:51:58 +0200976 // Use the first buffer as the original text.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000977 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000978 if (curtab->tp_diffbuf[idx_orig] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000979 break;
980 if (idx_orig == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200981 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000982
Bram Moolenaare828b762018-09-10 17:51:58 +0200983 // Only need to do something when there is another buffer.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000984 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000985 if (curtab->tp_diffbuf[idx_new] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000986 break;
987 if (idx_new == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200988 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000989
Bram Moolenaare828b762018-09-10 17:51:58 +0200990 // Only use the internal method if it did not fail for one of the buffers.
Bram Moolenaara80faa82020-04-12 19:37:17 +0200991 CLEAR_FIELD(diffio);
Bram Moolenaare828b762018-09-10 17:51:58 +0200992 diffio.dio_internal = diff_internal() && !diff_internal_failed();
Bram Moolenaar071d4272004-06-13 20:20:40 +0000993
Bram Moolenaare828b762018-09-10 17:51:58 +0200994 diff_try_update(&diffio, idx_orig, eap);
995 if (diffio.dio_internal && diff_internal_failed())
996 {
997 // Internal diff failed, use external diff instead.
Bram Moolenaara80faa82020-04-12 19:37:17 +0200998 CLEAR_FIELD(diffio);
Bram Moolenaare828b762018-09-10 17:51:58 +0200999 diff_try_update(&diffio, idx_orig, eap);
1000 }
1001
1002 // force updating cursor position on screen
1003 curwin->w_valid_cursor.lnum = 0;
1004
Bram Moolenaar198fa062018-09-18 21:20:26 +02001005theend:
1006 // A redraw is needed if there were diffs and they were cleared, or there
1007 // are diffs now, which means they got updated.
1008 if (had_diffs || curtab->tp_first_diff != NULL)
1009 {
1010 diff_redraw(TRUE);
1011 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
1012 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001013}
1014
1015/*
1016 * Do a quick test if "diff" really works. Otherwise it looks like there
1017 * are no differences. Can't use the return value, it's non-zero when
1018 * there are differences.
1019 */
1020 static int
1021check_external_diff(diffio_T *diffio)
1022{
1023 FILE *fd;
1024 int ok;
1025 int io_error = FALSE;
1026
1027 // May try twice, first with "-a" and then without.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001028 for (;;)
1029 {
1030 ok = FALSE;
Bram Moolenaare828b762018-09-10 17:51:58 +02001031 fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001032 if (fd == NULL)
1033 io_error = TRUE;
1034 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001035 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001036 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
1037 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001038 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +02001039 fd = mch_fopen((char *)diffio->dio_new.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001040 if (fd == NULL)
1041 io_error = TRUE;
1042 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001043 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001044 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
1045 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001046 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +02001047 fd = NULL;
1048 if (diff_file(diffio) == OK)
1049 fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001050 if (fd == NULL)
1051 io_error = TRUE;
1052 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001053 {
1054 char_u linebuf[LBUFLEN];
1055
1056 for (;;)
1057 {
glacambread5c1782021-05-24 14:20:53 +02001058 // For normal diff there must be a line that contains
1059 // "1c1". For unified diff "@@ -1 +1 @@".
Bram Moolenaar00590742019-02-15 21:06:09 +01001060 if (vim_fgets(linebuf, LBUFLEN, fd))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001061 break;
glacambread5c1782021-05-24 14:20:53 +02001062 if (STRNCMP(linebuf, "1c1", 3) == 0
1063 || STRNCMP(linebuf, "@@ -1 +1 @@", 11) == 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001064 ok = TRUE;
1065 }
1066 fclose(fd);
1067 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001068 mch_remove(diffio->dio_diff.dout_fname);
1069 mch_remove(diffio->dio_new.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001070 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001071 mch_remove(diffio->dio_orig.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001072 }
1073
1074#ifdef FEAT_EVAL
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001075 // When using 'diffexpr' break here.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001076 if (*p_dex != NUL)
1077 break;
1078#endif
1079
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001080#if defined(MSWIN)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001081 // If the "-a" argument works, also check if "--binary" works.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001082 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
1083 {
1084 diff_a_works = TRUE;
1085 diff_bin_works = TRUE;
1086 continue;
1087 }
1088 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
1089 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001090 // Tried --binary, but it failed. "-a" works though.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001091 diff_bin_works = FALSE;
1092 ok = TRUE;
1093 }
1094#endif
1095
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001096 // If we checked if "-a" works already, break here.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001097 if (diff_a_works != MAYBE)
1098 break;
1099 diff_a_works = ok;
1100
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001101 // If "-a" works break here, otherwise retry without "-a".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001102 if (ok)
1103 break;
1104 }
1105 if (!ok)
1106 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001107 if (io_error)
Bram Moolenaar9d00e4a2022-01-05 17:49:15 +00001108 emsg(_(e_cannot_read_or_write_temp_files));
Bram Moolenaare1242042021-12-16 20:56:57 +00001109 emsg(_(e_cannot_create_diffs));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001110 diff_a_works = MAYBE;
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001111#if defined(MSWIN)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001112 diff_bin_works = MAYBE;
1113#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001114 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001115 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001116 return OK;
1117}
Bram Moolenaar071d4272004-06-13 20:20:40 +00001118
Bram Moolenaare828b762018-09-10 17:51:58 +02001119/*
1120 * Invoke the xdiff function.
1121 */
1122 static int
1123diff_file_internal(diffio_T *diffio)
1124{
1125 xpparam_t param;
1126 xdemitconf_t emit_cfg;
1127 xdemitcb_t emit_cb;
Bram Moolenaarbd1d5602012-05-18 18:47:17 +02001128
Bram Moolenaara80faa82020-04-12 19:37:17 +02001129 CLEAR_FIELD(param);
1130 CLEAR_FIELD(emit_cfg);
1131 CLEAR_FIELD(emit_cb);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001132
Bram Moolenaare828b762018-09-10 17:51:58 +02001133 param.flags = diff_algorithm;
1134
1135 if (diff_flags & DIFF_IWHITE)
1136 param.flags |= XDF_IGNORE_WHITESPACE_CHANGE;
Bram Moolenaar785fc652018-09-15 19:17:38 +02001137 if (diff_flags & DIFF_IWHITEALL)
1138 param.flags |= XDF_IGNORE_WHITESPACE;
1139 if (diff_flags & DIFF_IWHITEEOL)
1140 param.flags |= XDF_IGNORE_WHITESPACE_AT_EOL;
1141 if (diff_flags & DIFF_IBLANK)
1142 param.flags |= XDF_IGNORE_BLANK_LINES;
Bram Moolenaare828b762018-09-10 17:51:58 +02001143
1144 emit_cfg.ctxlen = 0; // don't need any diff_context here
1145 emit_cb.priv = &diffio->dio_diff;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001146 emit_cfg.hunk_func = xdiff_out;
Bram Moolenaare828b762018-09-10 17:51:58 +02001147 if (xdl_diff(&diffio->dio_orig.din_mmfile,
1148 &diffio->dio_new.din_mmfile,
1149 &param, &emit_cfg, &emit_cb) < 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001150 {
Bram Moolenaard82a47d2022-01-05 20:24:39 +00001151 emsg(_(e_problem_creating_internal_diff));
Bram Moolenaare828b762018-09-10 17:51:58 +02001152 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001153 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001154 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001155}
1156
1157/*
1158 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
Bram Moolenaare828b762018-09-10 17:51:58 +02001159 * return OK or FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001160 */
Bram Moolenaare828b762018-09-10 17:51:58 +02001161 static int
1162diff_file(diffio_T *dio)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001163{
1164 char_u *cmd;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001165 size_t len;
Bram Moolenaare828b762018-09-10 17:51:58 +02001166 char_u *tmp_orig = dio->dio_orig.din_fname;
1167 char_u *tmp_new = dio->dio_new.din_fname;
1168 char_u *tmp_diff = dio->dio_diff.dout_fname;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001169
1170#ifdef FEAT_EVAL
1171 if (*p_dex != NUL)
Bram Moolenaare828b762018-09-10 17:51:58 +02001172 {
1173 // Use 'diffexpr' to generate the diff file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001174 eval_diff(tmp_orig, tmp_new, tmp_diff);
Bram Moolenaare828b762018-09-10 17:51:58 +02001175 return OK;
1176 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001177 else
1178#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001179 // Use xdiff for generating the diff.
1180 if (dio->dio_internal)
1181 {
1182 return diff_file_internal(dio);
1183 }
1184 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001185 {
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001186 len = STRLEN(tmp_orig) + STRLEN(tmp_new)
1187 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
Bram Moolenaar964b3742019-05-24 18:54:09 +02001188 cmd = alloc(len);
Bram Moolenaare828b762018-09-10 17:51:58 +02001189 if (cmd == NULL)
1190 return FAIL;
Bram Moolenaar95fb60a2005-03-08 22:29:20 +00001191
Bram Moolenaare828b762018-09-10 17:51:58 +02001192 // We don't want $DIFF_OPTIONS to get in the way.
1193 if (getenv("DIFF_OPTIONS"))
1194 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
1195
1196 // Build the diff command and execute it. Always use -a, binary
1197 // differences are of no use. Ignore errors, diff returns
1198 // non-zero when differences have been found.
Bram Moolenaar785fc652018-09-15 19:17:38 +02001199 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s%s%s%s %s",
Bram Moolenaare828b762018-09-10 17:51:58 +02001200 diff_a_works == FALSE ? "" : "-a ",
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001201#if defined(MSWIN)
Bram Moolenaare828b762018-09-10 17:51:58 +02001202 diff_bin_works == TRUE ? "--binary " : "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001203#else
Bram Moolenaare828b762018-09-10 17:51:58 +02001204 "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001205#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001206 (diff_flags & DIFF_IWHITE) ? "-b " : "",
Bram Moolenaar785fc652018-09-15 19:17:38 +02001207 (diff_flags & DIFF_IWHITEALL) ? "-w " : "",
1208 (diff_flags & DIFF_IWHITEEOL) ? "-Z " : "",
1209 (diff_flags & DIFF_IBLANK) ? "-B " : "",
Bram Moolenaare828b762018-09-10 17:51:58 +02001210 (diff_flags & DIFF_ICASE) ? "-i " : "",
1211 tmp_orig, tmp_new);
1212 append_redir(cmd, (int)len, p_srr, tmp_diff);
1213 block_autocmds(); // avoid ShellCmdPost stuff
1214 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
1215 unblock_autocmds();
1216 vim_free(cmd);
1217 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001218 }
1219}
1220
1221/*
1222 * Create a new version of a file from the current buffer and a diff file.
1223 * The buffer is written to a file, also for unmodified buffers (the file
1224 * could have been produced by autocommands, e.g. the netrw plugin).
1225 */
1226 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001227ex_diffpatch(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001228{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001229 char_u *tmp_orig; // name of original temp file
1230 char_u *tmp_new; // name of patched temp file
Bram Moolenaar071d4272004-06-13 20:20:40 +00001231 char_u *buf = NULL;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001232 size_t buflen;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001233 win_T *old_curwin = curwin;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001234 char_u *newname = NULL; // name of patched file buffer
Bram Moolenaar071d4272004-06-13 20:20:40 +00001235#ifdef UNIX
1236 char_u dirbuf[MAXPATHL];
1237 char_u *fullname = NULL;
1238#endif
1239#ifdef FEAT_BROWSE
1240 char_u *browseFile = NULL;
Bram Moolenaare1004402020-10-24 20:49:43 +02001241 int save_cmod_flags = cmdmod.cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001242#endif
Bram Moolenaar8767f522016-07-01 17:17:39 +02001243 stat_T st;
Bram Moolenaara95ab322017-03-11 19:21:53 +01001244 char_u *esc_name = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001245
1246#ifdef FEAT_BROWSE
Bram Moolenaare1004402020-10-24 20:49:43 +02001247 if (cmdmod.cmod_flags & CMOD_BROWSE)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001248 {
Bram Moolenaar7171abe2004-10-11 10:06:20 +00001249 browseFile = do_browse(0, (char_u *)_("Patch file"),
Bram Moolenaarc36651b2018-04-29 12:22:56 +02001250 eap->arg, NULL, NULL,
1251 (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001252 if (browseFile == NULL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001253 return; // operation cancelled
Bram Moolenaar071d4272004-06-13 20:20:40 +00001254 eap->arg = browseFile;
Bram Moolenaare1004402020-10-24 20:49:43 +02001255 cmdmod.cmod_flags &= ~CMOD_BROWSE; // don't let do_ecmd() browse again
Bram Moolenaar071d4272004-06-13 20:20:40 +00001256 }
1257#endif
1258
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001259 // We need two temp file names.
Bram Moolenaare5c421c2015-03-31 13:33:08 +02001260 tmp_orig = vim_tempname('o', FALSE);
1261 tmp_new = vim_tempname('n', FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001262 if (tmp_orig == NULL || tmp_new == NULL)
1263 goto theend;
1264
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001265 // Write the current buffer to "tmp_orig".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001266 if (buf_write(curbuf, tmp_orig, NULL,
1267 (linenr_T)1, curbuf->b_ml.ml_line_count,
1268 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
1269 goto theend;
1270
1271#ifdef UNIX
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001272 // Get the absolute path of the patchfile, changing directory below.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001273 fullname = FullName_save(eap->arg, FALSE);
1274#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001275 esc_name = vim_strsave_shellescape(
Bram Moolenaar071d4272004-06-13 20:20:40 +00001276# ifdef UNIX
Bram Moolenaara95ab322017-03-11 19:21:53 +01001277 fullname != NULL ? fullname :
Bram Moolenaar071d4272004-06-13 20:20:40 +00001278# endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001279 eap->arg, TRUE, TRUE);
1280 if (esc_name == NULL)
1281 goto theend;
1282 buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16;
Bram Moolenaar964b3742019-05-24 18:54:09 +02001283 buf = alloc(buflen);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001284 if (buf == NULL)
1285 goto theend;
1286
1287#ifdef UNIX
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001288 // Temporarily chdir to /tmp, to avoid patching files in the current
1289 // directory when the patch file contains more than one patch. When we
1290 // have our own temp dir use that instead, it will be cleaned up when we
1291 // exit (any .rej files created). Don't change directory if we can't
1292 // return to the current.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001293 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
1294 dirbuf[0] = NUL;
1295 else
1296 {
1297# ifdef TEMPDIRNAMES
1298 if (vim_tempdir != NULL)
Bram Moolenaar42335f52018-09-13 15:33:43 +02001299 vim_ignored = mch_chdir((char *)vim_tempdir);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001300 else
1301# endif
Bram Moolenaar42335f52018-09-13 15:33:43 +02001302 vim_ignored = mch_chdir("/tmp");
Bram Moolenaar071d4272004-06-13 20:20:40 +00001303 shorten_fnames(TRUE);
1304 }
1305#endif
1306
1307#ifdef FEAT_EVAL
1308 if (*p_pex != NUL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001309 // Use 'patchexpr' to generate the new file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001310 eval_patch(tmp_orig,
1311# ifdef UNIX
1312 fullname != NULL ? fullname :
1313# endif
1314 eap->arg, tmp_new);
1315 else
1316#endif
1317 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001318 // Build the patch command and execute it. Ignore errors. Switch to
1319 // cooked mode to allow the user to respond to prompts.
Bram Moolenaara95ab322017-03-11 19:21:53 +01001320 vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s",
1321 tmp_new, tmp_orig, esc_name);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001322 block_autocmds(); // Avoid ShellCmdPost stuff
Bram Moolenaar071d4272004-06-13 20:20:40 +00001323 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
Bram Moolenaar78ab3312007-09-29 12:16:41 +00001324 unblock_autocmds();
Bram Moolenaar071d4272004-06-13 20:20:40 +00001325 }
1326
1327#ifdef UNIX
1328 if (dirbuf[0] != NUL)
1329 {
1330 if (mch_chdir((char *)dirbuf) != 0)
Bram Moolenaar460ae5d2022-01-01 14:19:49 +00001331 emsg(_(e_cannot_go_back_to_previous_directory));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001332 shorten_fnames(TRUE);
1333 }
1334#endif
1335
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001336 // patch probably has written over the screen
Bram Moolenaar071d4272004-06-13 20:20:40 +00001337 redraw_later(CLEAR);
1338
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001339 // Delete any .orig or .rej file created.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001340 STRCPY(buf, tmp_new);
1341 STRCAT(buf, ".orig");
1342 mch_remove(buf);
1343 STRCPY(buf, tmp_new);
1344 STRCAT(buf, ".rej");
1345 mch_remove(buf);
1346
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001347 // Only continue if the output file was created.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001348 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
Bram Moolenaar9d00e4a2022-01-05 17:49:15 +00001349 emsg(_(e_cannot_read_patch_output));
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001350 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001351 {
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001352 if (curbuf->b_fname != NULL)
1353 {
1354 newname = vim_strnsave(curbuf->b_fname,
Bram Moolenaardf44a272020-06-07 20:49:05 +02001355 STRLEN(curbuf->b_fname) + 4);
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001356 if (newname != NULL)
1357 STRCAT(newname, ".new");
1358 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001359
1360#ifdef FEAT_GUI
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001361 need_mouse_correct = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001362#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001363 // don't use a new tab page, each tab page has its own diffs
Bram Moolenaare1004402020-10-24 20:49:43 +02001364 cmdmod.cmod_tab = 0;
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001365
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001366 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001367 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001368 // Pretend it was a ":split fname" command
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001369 eap->cmdidx = CMD_split;
1370 eap->arg = tmp_new;
1371 do_exedit(eap, old_curwin);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001372
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001373 // check that split worked and editing tmp_new
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001374 if (curwin != old_curwin && win_valid(old_curwin))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001375 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001376 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001377 diff_win_options(curwin, TRUE);
1378 diff_win_options(old_curwin, TRUE);
1379
1380 if (newname != NULL)
1381 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001382 // do a ":file filename.new" on the patched buffer
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001383 eap->arg = newname;
1384 ex_file(eap);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001385
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001386 // Do filetype detection with the new name.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001387 if (au_has_group((char_u *)"filetypedetect"))
1388 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001389 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001390 }
1391 }
1392 }
1393
1394theend:
1395 if (tmp_orig != NULL)
1396 mch_remove(tmp_orig);
1397 vim_free(tmp_orig);
1398 if (tmp_new != NULL)
1399 mch_remove(tmp_new);
1400 vim_free(tmp_new);
1401 vim_free(newname);
1402 vim_free(buf);
1403#ifdef UNIX
1404 vim_free(fullname);
1405#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001406 vim_free(esc_name);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001407#ifdef FEAT_BROWSE
1408 vim_free(browseFile);
Bram Moolenaare1004402020-10-24 20:49:43 +02001409 cmdmod.cmod_flags = save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001410#endif
1411}
1412
1413/*
1414 * Split the window and edit another file, setting options to show the diffs.
1415 */
1416 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001417ex_diffsplit(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001418{
1419 win_T *old_curwin = curwin;
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001420 bufref_T old_curbuf;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001421
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001422 set_bufref(&old_curbuf, curbuf);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001423#ifdef FEAT_GUI
1424 need_mouse_correct = TRUE;
1425#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001426 // Need to compute w_fraction when no redraw happened yet.
Bram Moolenaar46328f92016-08-28 15:39:57 +02001427 validate_cursor();
1428 set_fraction(curwin);
1429
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001430 // don't use a new tab page, each tab page has its own diffs
Bram Moolenaare1004402020-10-24 20:49:43 +02001431 cmdmod.cmod_tab = 0;
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001432
Bram Moolenaarc4675a12006-03-15 22:50:30 +00001433 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001434 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001435 // Pretend it was a ":split fname" command
Bram Moolenaar071d4272004-06-13 20:20:40 +00001436 eap->cmdidx = CMD_split;
Bram Moolenaar4be06f92005-07-29 22:36:03 +00001437 curwin->w_p_diff = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001438 do_exedit(eap, old_curwin);
1439
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001440 if (curwin != old_curwin) // split must have worked
Bram Moolenaar071d4272004-06-13 20:20:40 +00001441 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001442 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001443 diff_win_options(curwin, TRUE);
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001444 if (win_valid(old_curwin))
1445 {
1446 diff_win_options(old_curwin, TRUE);
1447
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001448 if (bufref_valid(&old_curbuf))
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001449 // Move the cursor position to that of the old window.
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001450 curwin->w_cursor.lnum = diff_get_corresponding_line(
Bram Moolenaar025e3e02016-10-18 14:50:18 +02001451 old_curbuf.br_buf, old_curwin->w_cursor.lnum);
Bram Moolenaarf29a82d2015-12-17 15:03:55 +01001452 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001453 // Now that lines are folded scroll to show the cursor at the same
1454 // relative position.
Bram Moolenaar46328f92016-08-28 15:39:57 +02001455 scroll_to_fraction(curwin, curwin->w_height);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001456 }
1457 }
1458}
1459
1460/*
Bram Moolenaar84a05ac2013-05-06 04:24:17 +02001461 * Set options to show diffs for the current window.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001462 */
Bram Moolenaar071d4272004-06-13 20:20:40 +00001463 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001464ex_diffthis(exarg_T *eap UNUSED)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001465{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001466 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001467 diff_win_options(curwin, TRUE);
1468}
1469
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001470 static void
1471set_diff_option(win_T *wp, int value)
1472{
1473 win_T *old_curwin = curwin;
1474
1475 curwin = wp;
1476 curbuf = curwin->w_buffer;
1477 ++curbuf_lock;
Bram Moolenaar31e5c602022-04-15 13:53:33 +01001478 set_option_value_give_err((char_u *)"diff", (long)value, NULL, OPT_LOCAL);
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001479 --curbuf_lock;
1480 curwin = old_curwin;
1481 curbuf = curwin->w_buffer;
1482}
1483
Bram Moolenaar071d4272004-06-13 20:20:40 +00001484/*
1485 * Set options in window "wp" for diff mode.
1486 */
1487 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001488diff_win_options(
1489 win_T *wp,
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001490 int addbuf) // Add buffer to diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001491{
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001492# ifdef FEAT_FOLDING
1493 win_T *old_curwin = curwin;
1494
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001495 // close the manually opened folds
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001496 curwin = wp;
1497 newFoldLevel();
1498 curwin = old_curwin;
1499# endif
1500
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001501 // Use 'scrollbind' and 'cursorbind' when available
Bram Moolenaar43929962015-07-03 15:06:56 +02001502 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001503 wp->w_p_scb_save = wp->w_p_scb;
Bram Moolenaar3368ea22010-09-21 16:56:35 +02001504 wp->w_p_scb = TRUE;
Bram Moolenaar43929962015-07-03 15:06:56 +02001505 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001506 wp->w_p_crb_save = wp->w_p_crb;
Bram Moolenaar860cae12010-06-05 23:22:07 +02001507 wp->w_p_crb = TRUE;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001508 if (!(diff_flags & DIFF_FOLLOWWRAP))
1509 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001510 if (!wp->w_p_diff)
Bram Moolenaar4223d432021-02-10 13:18:17 +01001511 wp->w_p_wrap_save = wp->w_p_wrap;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001512 wp->w_p_wrap = FALSE;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001513 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001514# ifdef FEAT_FOLDING
Bram Moolenaar43929962015-07-03 15:06:56 +02001515 if (!wp->w_p_diff)
1516 {
1517 if (wp->w_p_diff_saved)
1518 free_string_option(wp->w_p_fdm_save);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001519 wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm);
Bram Moolenaar43929962015-07-03 15:06:56 +02001520 }
Bram Moolenaar20c023a2019-05-26 21:03:24 +02001521 set_string_option_direct_in_win(wp, (char_u *)"fdm", -1, (char_u *)"diff",
Bram Moolenaar5e3cb7e2006-02-27 23:58:35 +00001522 OPT_LOCAL|OPT_FREE, 0);
Bram Moolenaar43929962015-07-03 15:06:56 +02001523 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001524 {
1525 wp->w_p_fdc_save = wp->w_p_fdc;
1526 wp->w_p_fen_save = wp->w_p_fen;
1527 wp->w_p_fdl_save = wp->w_p_fdl;
1528 }
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001529 wp->w_p_fdc = diff_foldcolumn;
1530 wp->w_p_fen = TRUE;
1531 wp->w_p_fdl = 0;
1532 foldUpdateAll(wp);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001533 // make sure topline is not halfway a fold
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001534 changed_window_setting_win(wp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001535# endif
Bram Moolenaar071d4272004-06-13 20:20:40 +00001536 if (vim_strchr(p_sbo, 'h') == NULL)
1537 do_cmdline_cmd((char_u *)"set sbo+=hor");
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001538 // Save the current values, to be restored in ex_diffoff().
Bram Moolenaara87aa802013-07-03 15:47:03 +02001539 wp->w_p_diff_saved = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001540
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001541 set_diff_option(wp, TRUE);
Bram Moolenaar43929962015-07-03 15:06:56 +02001542
Bram Moolenaar071d4272004-06-13 20:20:40 +00001543 if (addbuf)
1544 diff_buf_add(wp->w_buffer);
1545 redraw_win_later(wp, NOT_VALID);
1546}
1547
1548/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001549 * Set options not to show diffs. For the current window or all windows.
Bram Moolenaarf740b292006-02-16 22:11:02 +00001550 * Only in the current tab page.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001551 */
1552 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001553ex_diffoff(exarg_T *eap)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001554{
1555 win_T *wp;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001556 int diffwin = FALSE;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001557
Bram Moolenaar29323592016-07-24 22:04:11 +02001558 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001559 {
Bram Moolenaar00462ff2013-09-20 20:13:53 +02001560 if (eap->forceit ? wp->w_p_diff : wp == curwin)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001561 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001562 // Set 'diff' off. If option values were saved in
1563 // diff_win_options(), restore the ones whose settings seem to have
1564 // been left over from diff mode.
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001565 set_diff_option(wp, FALSE);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001566
Bram Moolenaara87aa802013-07-03 15:47:03 +02001567 if (wp->w_p_diff_saved)
1568 {
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001569
Bram Moolenaar43929962015-07-03 15:06:56 +02001570 if (wp->w_p_scb)
1571 wp->w_p_scb = wp->w_p_scb_save;
Bram Moolenaar43929962015-07-03 15:06:56 +02001572 if (wp->w_p_crb)
1573 wp->w_p_crb = wp->w_p_crb_save;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001574 if (!(diff_flags & DIFF_FOLLOWWRAP))
1575 {
1576 if (!wp->w_p_wrap)
Lewis Russelld9da86e2021-12-28 13:54:41 +00001577 wp->w_p_wrap = wp->w_p_wrap_save;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001578 }
Bram Moolenaar43929962015-07-03 15:06:56 +02001579#ifdef FEAT_FOLDING
1580 free_string_option(wp->w_p_fdm);
Bram Moolenaar79a213d2017-05-16 13:15:18 +02001581 wp->w_p_fdm = vim_strsave(
1582 *wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u*)"manual");
Bram Moolenaar43929962015-07-03 15:06:56 +02001583
1584 if (wp->w_p_fdc == diff_foldcolumn)
1585 wp->w_p_fdc = wp->w_p_fdc_save;
1586 if (wp->w_p_fdl == 0)
1587 wp->w_p_fdl = wp->w_p_fdl_save;
1588
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001589 // Only restore 'foldenable' when 'foldmethod' is not
1590 // "manual", otherwise we continue to show the diff folds.
Bram Moolenaar43929962015-07-03 15:06:56 +02001591 if (wp->w_p_fen)
1592 wp->w_p_fen = foldmethodIsManual(wp) ? FALSE
1593 : wp->w_p_fen_save;
1594
1595 foldUpdateAll(wp);
Bram Moolenaar43929962015-07-03 15:06:56 +02001596#endif
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001597 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001598 // remove filler lines
Bram Moolenaare67d5462016-08-27 22:40:42 +02001599 wp->w_topfill = 0;
1600
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001601 // make sure topline is not halfway a fold and cursor is
1602 // invalidated
Bram Moolenaare67d5462016-08-27 22:40:42 +02001603 changed_window_setting_win(wp);
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001604
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001605 // Note: 'sbo' is not restored, it's a global option.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001606 diff_buf_adjust(wp);
1607 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001608 diffwin |= wp->w_p_diff;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001609 }
1610
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001611 // Also remove hidden buffers from the list.
Bram Moolenaar25ea0542017-02-03 23:16:28 +01001612 if (eap->forceit)
1613 diff_buf_clear();
1614
Bram Moolenaarc8234772019-11-10 21:00:27 +01001615 if (!diffwin)
1616 {
1617 diff_need_update = FALSE;
1618 curtab->tp_diff_invalid = FALSE;
1619 curtab->tp_diff_update = FALSE;
1620 diff_clear(curtab);
1621 }
1622
Dominique Pelleaf4a61a2021-12-27 17:21:41 +00001623 // Remove "hor" from 'scrollopt' if there are no diff windows left.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001624 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
1625 do_cmdline_cmd((char_u *)"set sbo-=hor");
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001626}
1627
1628/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00001629 * Read the diff output and add each entry to the diff list.
1630 */
1631 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001632diff_read(
Bram Moolenaare828b762018-09-10 17:51:58 +02001633 int idx_orig, // idx of original file
1634 int idx_new, // idx of new file
Lewis Russelld9da86e2021-12-28 13:54:41 +00001635 diffio_T *dio) // diff output
Bram Moolenaar071d4272004-06-13 20:20:40 +00001636{
Bram Moolenaare828b762018-09-10 17:51:58 +02001637 FILE *fd = NULL;
1638 int line_idx = 0;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001639 diff_T *dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001640 diff_T *dp = curtab->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001641 diff_T *dn, *dpl;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001642 diffout_T *dout = &dio->dio_diff;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001643 char_u linebuf[LBUFLEN]; // only need to hold the diff line
Bram Moolenaare828b762018-09-10 17:51:58 +02001644 char_u *line;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001645 long off;
1646 int i;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001647 int notset = TRUE; // block "*dp" not set yet
Bram Moolenaar49166972021-12-30 10:51:45 +00001648 diffhunk_T *hunk = NULL; // init to avoid gcc warning
Lewis Russelld9da86e2021-12-28 13:54:41 +00001649
Bram Moolenaare828b762018-09-10 17:51:58 +02001650 enum {
1651 DIFF_ED,
1652 DIFF_UNIFIED,
1653 DIFF_NONE
1654 } diffstyle = DIFF_NONE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001655
Bram Moolenaare828b762018-09-10 17:51:58 +02001656 if (dout->dout_fname == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001657 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001658 diffstyle = DIFF_UNIFIED;
1659 }
1660 else
1661 {
1662 fd = mch_fopen((char *)dout->dout_fname, "r");
1663 if (fd == NULL)
1664 {
Bram Moolenaare1242042021-12-16 20:56:57 +00001665 emsg(_(e_cannot_read_diff_output));
Bram Moolenaare828b762018-09-10 17:51:58 +02001666 return;
1667 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001668 }
1669
Lewis Russelld9da86e2021-12-28 13:54:41 +00001670 if (!dio->dio_internal)
1671 {
1672 hunk = ALLOC_ONE(diffhunk_T);
1673 if (hunk == NULL)
Bram Moolenaar5d46dcf2022-03-25 14:46:47 +00001674 {
1675 if (fd != NULL)
1676 fclose(fd);
Lewis Russelld9da86e2021-12-28 13:54:41 +00001677 return;
Bram Moolenaar5d46dcf2022-03-25 14:46:47 +00001678 }
Lewis Russelld9da86e2021-12-28 13:54:41 +00001679 }
1680
Bram Moolenaar071d4272004-06-13 20:20:40 +00001681 for (;;)
1682 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001683 if (dio->dio_internal)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001684 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001685 if (line_idx >= dout->dout_ga.ga_len) {
1686 break; // did last line
1687 }
1688 hunk = ((diffhunk_T **)dout->dout_ga.ga_data)[line_idx++];
Bram Moolenaar071d4272004-06-13 20:20:40 +00001689 }
1690 else
1691 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001692 if (fd == NULL)
1693 {
1694 if (line_idx >= dout->dout_ga.ga_len)
1695 break; // did last line
1696 line = ((char_u **)dout->dout_ga.ga_data)[line_idx++];
1697 }
Bram Moolenaar3b8defd2018-09-13 13:03:11 +02001698 else
Lewis Russelld9da86e2021-12-28 13:54:41 +00001699 {
1700 if (vim_fgets(linebuf, LBUFLEN, fd))
1701 break; // end of file
1702 line = linebuf;
1703 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001704
Lewis Russelld9da86e2021-12-28 13:54:41 +00001705 if (diffstyle == DIFF_NONE)
1706 {
1707 // Determine diff style.
1708 // ed like diff looks like this:
1709 // {first}[,{last}]c{first}[,{last}]
1710 // {first}a{first}[,{last}]
1711 // {first}[,{last}]d{first}
1712 //
1713 // unified diff looks like this:
1714 // --- file1 2018-03-20 13:23:35.783153140 +0100
1715 // +++ file2 2018-03-20 13:23:41.183156066 +0100
1716 // @@ -1,3 +1,5 @@
1717 if (isdigit(*line))
1718 diffstyle = DIFF_ED;
1719 else if ((STRNCMP(line, "@@ ", 3) == 0))
1720 diffstyle = DIFF_UNIFIED;
1721 else if ((STRNCMP(line, "--- ", 4) == 0)
1722 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
1723 && (STRNCMP(line, "+++ ", 4) == 0)
1724 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
1725 && (STRNCMP(line, "@@ ", 3) == 0))
1726 diffstyle = DIFF_UNIFIED;
1727 else
1728 // Format not recognized yet, skip over this line. Cygwin
1729 // diff may put a warning at the start of the file.
1730 continue;
1731 }
1732
1733 if (diffstyle == DIFF_ED)
1734 {
1735 if (!isdigit(*line))
1736 continue; // not the start of a diff block
1737 if (parse_diff_ed(line, hunk) == FAIL)
1738 continue;
1739 }
1740 else if (diffstyle == DIFF_UNIFIED)
1741 {
1742 if (STRNCMP(line, "@@ ", 3) != 0)
1743 continue; // not the start of a diff block
1744 if (parse_diff_unified(line, hunk) == FAIL)
1745 continue;
1746 }
1747 else
1748 {
Bram Moolenaard82a47d2022-01-05 20:24:39 +00001749 emsg(_(e_invalid_diff_format));
Lewis Russelld9da86e2021-12-28 13:54:41 +00001750 break;
1751 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001752 }
1753
1754 // Go over blocks before the change, for which orig and new are equal.
1755 // Copy blocks from orig to new.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001756 while (dp != NULL
Lewis Russelld9da86e2021-12-28 13:54:41 +00001757 && hunk->lnum_orig > dp->df_lnum[idx_orig]
1758 + dp->df_count[idx_orig])
Bram Moolenaar071d4272004-06-13 20:20:40 +00001759 {
1760 if (notset)
1761 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1762 dprev = dp;
1763 dp = dp->df_next;
1764 notset = TRUE;
1765 }
1766
1767 if (dp != NULL
Lewis Russelld9da86e2021-12-28 13:54:41 +00001768 && hunk->lnum_orig <= dp->df_lnum[idx_orig]
1769 + dp->df_count[idx_orig]
1770 && hunk->lnum_orig + hunk->count_orig >= dp->df_lnum[idx_orig])
Bram Moolenaar071d4272004-06-13 20:20:40 +00001771 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001772 // New block overlaps with existing block(s).
1773 // First find last block that overlaps.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001774 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
Lewis Russelld9da86e2021-12-28 13:54:41 +00001775 if (hunk->lnum_orig + hunk->count_orig
1776 < dpl->df_next->df_lnum[idx_orig])
Bram Moolenaar071d4272004-06-13 20:20:40 +00001777 break;
1778
Bram Moolenaare828b762018-09-10 17:51:58 +02001779 // If the newly found block starts before the old one, set the
1780 // start back a number of lines.
Lewis Russelld9da86e2021-12-28 13:54:41 +00001781 off = dp->df_lnum[idx_orig] - hunk->lnum_orig;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001782 if (off > 0)
1783 {
1784 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001785 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001786 dp->df_lnum[i] -= off;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001787 dp->df_lnum[idx_new] = hunk->lnum_new;
1788 dp->df_count[idx_new] = hunk->count_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001789 }
1790 else if (notset)
1791 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001792 // new block inside existing one, adjust new block
Lewis Russelld9da86e2021-12-28 13:54:41 +00001793 dp->df_lnum[idx_new] = hunk->lnum_new + off;
1794 dp->df_count[idx_new] = hunk->count_new - off;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001795 }
1796 else
Bram Moolenaare828b762018-09-10 17:51:58 +02001797 // second overlap of new block with existing block
Lewis Russelld9da86e2021-12-28 13:54:41 +00001798 dp->df_count[idx_new] += hunk->count_new - hunk->count_orig
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00001799 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
1800 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001801
Bram Moolenaare828b762018-09-10 17:51:58 +02001802 // Adjust the size of the block to include all the lines to the
1803 // end of the existing block or the new diff, whatever ends last.
Lewis Russelld9da86e2021-12-28 13:54:41 +00001804 off = (hunk->lnum_orig + hunk->count_orig)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001805 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
1806 if (off < 0)
1807 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001808 // new change ends in existing block, adjust the end if not
1809 // done already
Bram Moolenaar071d4272004-06-13 20:20:40 +00001810 if (notset)
1811 dp->df_count[idx_new] += -off;
1812 off = 0;
1813 }
Bram Moolenaard4b96bc2007-10-19 15:33:39 +00001814 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001815 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001816 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
1817 - dp->df_lnum[i] + off;
1818
Bram Moolenaare828b762018-09-10 17:51:58 +02001819 // Delete the diff blocks that have been merged into one.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001820 dn = dp->df_next;
1821 dp->df_next = dpl->df_next;
1822 while (dn != dp->df_next)
1823 {
1824 dpl = dn->df_next;
1825 vim_free(dn);
1826 dn = dpl;
1827 }
1828 }
1829 else
1830 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001831 // Allocate a new diffblock.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001832 dp = diff_alloc_new(curtab, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001833 if (dp == NULL)
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001834 goto done;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001835
Lewis Russelld9da86e2021-12-28 13:54:41 +00001836 dp->df_lnum[idx_orig] = hunk->lnum_orig;
1837 dp->df_count[idx_orig] = hunk->count_orig;
1838 dp->df_lnum[idx_new] = hunk->lnum_new;
1839 dp->df_count[idx_new] = hunk->count_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001840
Bram Moolenaare828b762018-09-10 17:51:58 +02001841 // Set values for other buffers, these must be equal to the
1842 // original buffer, otherwise there would have been a change
1843 // already.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001844 for (i = idx_orig + 1; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001845 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001846 diff_copy_entry(dprev, dp, idx_orig, i);
1847 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001848 notset = FALSE; // "*dp" has been set
Bram Moolenaar071d4272004-06-13 20:20:40 +00001849 }
1850
Bram Moolenaare828b762018-09-10 17:51:58 +02001851 // for remaining diff blocks orig and new are equal
Bram Moolenaar071d4272004-06-13 20:20:40 +00001852 while (dp != NULL)
1853 {
1854 if (notset)
1855 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1856 dprev = dp;
1857 dp = dp->df_next;
1858 notset = TRUE;
1859 }
1860
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001861done:
Lewis Russelld9da86e2021-12-28 13:54:41 +00001862 if (!dio->dio_internal)
1863 vim_free(hunk);
1864
Bram Moolenaare828b762018-09-10 17:51:58 +02001865 if (fd != NULL)
1866 fclose(fd);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001867}
1868
1869/*
1870 * Copy an entry at "dp" from "idx_orig" to "idx_new".
1871 */
1872 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001873diff_copy_entry(
1874 diff_T *dprev,
1875 diff_T *dp,
1876 int idx_orig,
1877 int idx_new)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001878{
1879 long off;
1880
1881 if (dprev == NULL)
1882 off = 0;
1883 else
1884 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
1885 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
1886 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
1887 dp->df_count[idx_new] = dp->df_count[idx_orig];
1888}
1889
1890/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001891 * Clear the list of diffblocks for tab page "tp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001892 */
Bram Moolenaarea408852005-06-25 22:49:46 +00001893 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001894diff_clear(tabpage_T *tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001895{
1896 diff_T *p, *next_p;
1897
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001898 for (p = tp->tp_first_diff; p != NULL; p = next_p)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001899 {
1900 next_p = p->df_next;
1901 vim_free(p);
1902 }
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001903 tp->tp_first_diff = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001904}
1905
1906/*
1907 * Check diff status for line "lnum" in buffer "buf":
1908 * Returns 0 for nothing special
1909 * Returns -1 for a line that should be highlighted as changed.
1910 * Returns -2 for a line that should be highlighted as added/deleted.
1911 * Returns > 0 for inserting that many filler lines above it (never happens
1912 * when 'diffopt' doesn't contain "filler").
1913 * This should only be used for windows where 'diff' is set.
1914 */
1915 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001916diff_check(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001917{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001918 int idx; // index in tp_diffbuf[] for this buffer
Bram Moolenaar071d4272004-06-13 20:20:40 +00001919 diff_T *dp;
1920 int maxcount;
1921 int i;
1922 buf_T *buf = wp->w_buffer;
1923 int cmp;
1924
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001925 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001926 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00001927
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001928 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) // no diffs at all
Bram Moolenaar071d4272004-06-13 20:20:40 +00001929 return 0;
1930
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001931 // safety check: "lnum" must be a buffer line
Bram Moolenaar071d4272004-06-13 20:20:40 +00001932 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
1933 return 0;
1934
1935 idx = diff_buf_idx(buf);
1936 if (idx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001937 return 0; // no diffs for buffer "buf"
Bram Moolenaar071d4272004-06-13 20:20:40 +00001938
1939#ifdef FEAT_FOLDING
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001940 // A closed fold never has filler lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001941 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
1942 return 0;
1943#endif
1944
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001945 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02001946 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001947 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1948 break;
1949 if (dp == NULL || lnum < dp->df_lnum[idx])
1950 return 0;
1951
1952 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
1953 {
1954 int zero = FALSE;
1955
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001956 // Changed or inserted line. If the other buffers have a count of
1957 // zero, the lines were inserted. If the other buffers have the same
1958 // count, check if the lines are identical.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001959 cmp = FALSE;
1960 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001961 if (i != idx && curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001962 {
1963 if (dp->df_count[i] == 0)
1964 zero = TRUE;
1965 else
1966 {
1967 if (dp->df_count[i] != dp->df_count[idx])
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001968 return -1; // nr of lines changed.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001969 cmp = TRUE;
1970 }
1971 }
1972 if (cmp)
1973 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001974 // Compare all lines. If they are equal the lines were inserted
1975 // in some buffers, deleted in others, but not changed.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001976 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001977 if (i != idx && curtab->tp_diffbuf[i] != NULL
1978 && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001979 if (!diff_equal_entry(dp, idx, i))
1980 return -1;
1981 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001982 // If there is no buffer with zero lines then there is no difference
1983 // any longer. Happens when making a change (or undo) that removes
1984 // the difference. Can't remove the entry here, we might be halfway
1985 // updating the window. Just report the text as unchanged. Other
1986 // windows might still show the change though.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001987 if (zero == FALSE)
1988 return 0;
1989 return -2;
1990 }
1991
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001992 // If 'diffopt' doesn't contain "filler", return 0.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001993 if (!(diff_flags & DIFF_FILLER))
1994 return 0;
1995
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001996 // Insert filler lines above the line just below the change. Will return
1997 // 0 when this buf had the max count.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001998 maxcount = 0;
1999 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002000 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002001 maxcount = dp->df_count[i];
2002 return maxcount - dp->df_count[idx];
2003}
2004
2005/*
2006 * Compare two entries in diff "*dp" and return TRUE if they are equal.
2007 */
2008 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002009diff_equal_entry(diff_T *dp, int idx1, int idx2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002010{
2011 int i;
2012 char_u *line;
2013 int cmp;
2014
2015 if (dp->df_count[idx1] != dp->df_count[idx2])
2016 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002017 if (diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002018 return FALSE;
2019 for (i = 0; i < dp->df_count[idx1]; ++i)
2020 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002021 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
Bram Moolenaar071d4272004-06-13 20:20:40 +00002022 dp->df_lnum[idx1] + i, FALSE));
2023 if (line == NULL)
2024 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002025 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
Bram Moolenaar071d4272004-06-13 20:20:40 +00002026 dp->df_lnum[idx2] + i, FALSE));
2027 vim_free(line);
2028 if (cmp != 0)
2029 return FALSE;
2030 }
2031 return TRUE;
2032}
2033
2034/*
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002035 * Compare the characters at "p1" and "p2". If they are equal (possibly
2036 * ignoring case) return TRUE and set "len" to the number of bytes.
2037 */
2038 static int
2039diff_equal_char(char_u *p1, char_u *p2, int *len)
2040{
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002041 int l = (*mb_ptr2len)(p1);
2042
2043 if (l != (*mb_ptr2len)(p2))
2044 return FALSE;
2045 if (l > 1)
2046 {
2047 if (STRNCMP(p1, p2, l) != 0
2048 && (!enc_utf8
2049 || !(diff_flags & DIFF_ICASE)
2050 || utf_fold(utf_ptr2char(p1))
2051 != utf_fold(utf_ptr2char(p2))))
2052 return FALSE;
2053 *len = l;
2054 }
2055 else
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002056 {
2057 if ((*p1 != *p2)
2058 && (!(diff_flags & DIFF_ICASE)
2059 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
2060 return FALSE;
2061 *len = 1;
2062 }
2063 return TRUE;
2064}
2065
2066/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002067 * Compare strings "s1" and "s2" according to 'diffopt'.
2068 * Return non-zero when they are different.
2069 */
2070 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002071diff_cmp(char_u *s1, char_u *s2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002072{
2073 char_u *p1, *p2;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002074 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002075
Bram Moolenaar785fc652018-09-15 19:17:38 +02002076 if ((diff_flags & DIFF_IBLANK)
2077 && (*skipwhite(s1) == NUL || *skipwhite(s2) == NUL))
2078 return 0;
2079
2080 if ((diff_flags & (DIFF_ICASE | ALL_WHITE_DIFF)) == 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002081 return STRCMP(s1, s2);
Bram Moolenaar785fc652018-09-15 19:17:38 +02002082 if ((diff_flags & DIFF_ICASE) && !(diff_flags & ALL_WHITE_DIFF))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002083 return MB_STRICMP(s1, s2);
2084
Bram Moolenaar071d4272004-06-13 20:20:40 +00002085 p1 = s1;
2086 p2 = s2;
Bram Moolenaar785fc652018-09-15 19:17:38 +02002087
2088 // Ignore white space changes and possibly ignore case.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002089 while (*p1 != NUL && *p2 != NUL)
2090 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002091 if (((diff_flags & DIFF_IWHITE)
2092 && VIM_ISWHITE(*p1) && VIM_ISWHITE(*p2))
2093 || ((diff_flags & DIFF_IWHITEALL)
2094 && (VIM_ISWHITE(*p1) || VIM_ISWHITE(*p2))))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002095 {
2096 p1 = skipwhite(p1);
2097 p2 = skipwhite(p2);
2098 }
2099 else
2100 {
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002101 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002102 break;
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002103 p1 += l;
2104 p2 += l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002105 }
2106 }
2107
Bram Moolenaar785fc652018-09-15 19:17:38 +02002108 // Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002109 p1 = skipwhite(p1);
2110 p2 = skipwhite(p2);
2111 if (*p1 != NUL || *p2 != NUL)
2112 return 1;
2113 return 0;
2114}
2115
2116/*
2117 * Return the number of filler lines above "lnum".
2118 */
2119 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002120diff_check_fill(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002121{
2122 int n;
2123
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002124 // be quick when there are no filler lines
Bram Moolenaar071d4272004-06-13 20:20:40 +00002125 if (!(diff_flags & DIFF_FILLER))
2126 return 0;
2127 n = diff_check(wp, lnum);
2128 if (n <= 0)
2129 return 0;
2130 return n;
2131}
2132
2133/*
2134 * Set the topline of "towin" to match the position in "fromwin", so that they
2135 * show the same diff'ed lines.
2136 */
2137 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002138diff_set_topline(win_T *fromwin, win_T *towin)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002139{
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002140 buf_T *frombuf = fromwin->w_buffer;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002141 linenr_T lnum = fromwin->w_topline;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002142 int fromidx;
2143 int toidx;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002144 diff_T *dp;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002145 int max_count;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002146 int i;
2147
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002148 fromidx = diff_buf_idx(frombuf);
2149 if (fromidx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002150 return; // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00002151
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002152 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002153 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002154
2155 towin->w_topfill = 0;
2156
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002157 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002158 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002159 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002160 break;
2161 if (dp == NULL)
2162 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002163 // After last change, compute topline relative to end of file; no
2164 // filler lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002165 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002166 - (frombuf->b_ml.ml_line_count - lnum);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002167 }
2168 else
2169 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002170 // Find index for "towin".
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002171 toidx = diff_buf_idx(towin->w_buffer);
2172 if (toidx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002173 return; // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00002174
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002175 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
2176 if (lnum >= dp->df_lnum[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002177 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002178 // Inside a change: compute filler lines. With three or more
2179 // buffers we need to know the largest count.
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002180 max_count = 0;
2181 for (i = 0; i < DB_COUNT; ++i)
2182 if (curtab->tp_diffbuf[i] != NULL
2183 && max_count < dp->df_count[i])
2184 max_count = dp->df_count[i];
2185
2186 if (dp->df_count[toidx] == dp->df_count[fromidx])
2187 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002188 // same number of lines: use same filler count
Bram Moolenaar071d4272004-06-13 20:20:40 +00002189 towin->w_topfill = fromwin->w_topfill;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002190 }
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002191 else if (dp->df_count[toidx] > dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002192 {
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002193 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002194 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002195 // more lines in towin and fromwin doesn't show diff
2196 // lines, only filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002197 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
2198 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002199 // towin also only shows filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002200 towin->w_topline = dp->df_lnum[toidx]
2201 + dp->df_count[toidx];
2202 towin->w_topfill = fromwin->w_topfill;
2203 }
2204 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002205 // towin still has some diff lines to show
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002206 towin->w_topline = dp->df_lnum[toidx]
2207 + max_count - fromwin->w_topfill;
2208 }
2209 }
2210 else if (towin->w_topline >= dp->df_lnum[toidx]
2211 + dp->df_count[toidx])
2212 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002213 // less lines in towin and no diff lines to show: compute
2214 // filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002215 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
2216 if (diff_flags & DIFF_FILLER)
2217 {
2218 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002219 // fromwin is also out of diff lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002220 towin->w_topfill = fromwin->w_topfill;
2221 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002222 // fromwin has some diff lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002223 towin->w_topfill = dp->df_lnum[fromidx]
2224 + max_count - lnum;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002225 }
2226 }
2227 }
2228 }
2229
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002230 // safety check (if diff info gets outdated strange things may happen)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002231 towin->w_botfill = FALSE;
2232 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
2233 {
2234 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
2235 towin->w_botfill = TRUE;
2236 }
2237 if (towin->w_topline < 1)
2238 {
2239 towin->w_topline = 1;
2240 towin->w_topfill = 0;
2241 }
2242
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002243 // When w_topline changes need to recompute w_botline and cursor position
Bram Moolenaar071d4272004-06-13 20:20:40 +00002244 invalidate_botline_win(towin);
2245 changed_line_abv_curs_win(towin);
2246
2247 check_topfill(towin, FALSE);
2248#ifdef FEAT_FOLDING
2249 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
2250 NULL, TRUE, NULL);
2251#endif
2252}
2253
2254/*
2255 * This is called when 'diffopt' is changed.
2256 */
2257 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002258diffopt_changed(void)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002259{
2260 char_u *p;
2261 int diff_context_new = 6;
2262 int diff_flags_new = 0;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002263 int diff_foldcolumn_new = 2;
Bram Moolenaare828b762018-09-10 17:51:58 +02002264 long diff_algorithm_new = 0;
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002265 long diff_indent_heuristic = 0;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002266 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002267
2268 p = p_dip;
2269 while (*p != NUL)
2270 {
2271 if (STRNCMP(p, "filler", 6) == 0)
2272 {
2273 p += 6;
2274 diff_flags_new |= DIFF_FILLER;
2275 }
2276 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
2277 {
2278 p += 8;
2279 diff_context_new = getdigits(&p);
2280 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002281 else if (STRNCMP(p, "iblank", 6) == 0)
2282 {
2283 p += 6;
2284 diff_flags_new |= DIFF_IBLANK;
2285 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002286 else if (STRNCMP(p, "icase", 5) == 0)
2287 {
2288 p += 5;
2289 diff_flags_new |= DIFF_ICASE;
2290 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002291 else if (STRNCMP(p, "iwhiteall", 9) == 0)
2292 {
2293 p += 9;
2294 diff_flags_new |= DIFF_IWHITEALL;
2295 }
2296 else if (STRNCMP(p, "iwhiteeol", 9) == 0)
2297 {
2298 p += 9;
2299 diff_flags_new |= DIFF_IWHITEEOL;
2300 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002301 else if (STRNCMP(p, "iwhite", 6) == 0)
2302 {
2303 p += 6;
2304 diff_flags_new |= DIFF_IWHITE;
2305 }
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002306 else if (STRNCMP(p, "horizontal", 10) == 0)
2307 {
2308 p += 10;
2309 diff_flags_new |= DIFF_HORIZONTAL;
2310 }
2311 else if (STRNCMP(p, "vertical", 8) == 0)
2312 {
2313 p += 8;
2314 diff_flags_new |= DIFF_VERTICAL;
2315 }
2316 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
2317 {
2318 p += 11;
2319 diff_foldcolumn_new = getdigits(&p);
2320 }
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002321 else if (STRNCMP(p, "hiddenoff", 9) == 0)
2322 {
2323 p += 9;
2324 diff_flags_new |= DIFF_HIDDEN_OFF;
2325 }
Bram Moolenaarc8234772019-11-10 21:00:27 +01002326 else if (STRNCMP(p, "closeoff", 8) == 0)
2327 {
2328 p += 8;
2329 diff_flags_new |= DIFF_CLOSE_OFF;
2330 }
Bram Moolenaar4223d432021-02-10 13:18:17 +01002331 else if (STRNCMP(p, "followwrap", 10) == 0)
2332 {
2333 p += 10;
2334 diff_flags_new |= DIFF_FOLLOWWRAP;
2335 }
Bram Moolenaare828b762018-09-10 17:51:58 +02002336 else if (STRNCMP(p, "indent-heuristic", 16) == 0)
2337 {
2338 p += 16;
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002339 diff_indent_heuristic = XDF_INDENT_HEURISTIC;
Bram Moolenaare828b762018-09-10 17:51:58 +02002340 }
2341 else if (STRNCMP(p, "internal", 8) == 0)
2342 {
2343 p += 8;
2344 diff_flags_new |= DIFF_INTERNAL;
2345 }
2346 else if (STRNCMP(p, "algorithm:", 10) == 0)
2347 {
2348 p += 10;
2349 if (STRNCMP(p, "myers", 5) == 0)
2350 {
2351 p += 5;
2352 diff_algorithm_new = 0;
2353 }
2354 else if (STRNCMP(p, "minimal", 7) == 0)
2355 {
2356 p += 7;
2357 diff_algorithm_new = XDF_NEED_MINIMAL;
2358 }
2359 else if (STRNCMP(p, "patience", 8) == 0)
2360 {
2361 p += 8;
2362 diff_algorithm_new = XDF_PATIENCE_DIFF;
2363 }
2364 else if (STRNCMP(p, "histogram", 9) == 0)
2365 {
2366 p += 9;
2367 diff_algorithm_new = XDF_HISTOGRAM_DIFF;
2368 }
Bram Moolenaard0721052018-11-05 21:21:33 +01002369 else
2370 return FAIL;
Bram Moolenaare828b762018-09-10 17:51:58 +02002371 }
2372
Bram Moolenaar071d4272004-06-13 20:20:40 +00002373 if (*p != ',' && *p != NUL)
2374 return FAIL;
2375 if (*p == ',')
2376 ++p;
2377 }
2378
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002379 diff_algorithm_new |= diff_indent_heuristic;
2380
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002381 // Can't have both "horizontal" and "vertical".
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002382 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
2383 return FAIL;
2384
Bram Moolenaar198fa062018-09-18 21:20:26 +02002385 // If flags were added or removed, or the algorithm was changed, need to
2386 // update the diff.
Bram Moolenaare828b762018-09-10 17:51:58 +02002387 if (diff_flags != diff_flags_new || diff_algorithm != diff_algorithm_new)
Bram Moolenaar29323592016-07-24 22:04:11 +02002388 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002389 tp->tp_diff_invalid = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002390
2391 diff_flags = diff_flags_new;
Bram Moolenaarb9ddda62019-02-19 23:00:50 +01002392 diff_context = diff_context_new == 0 ? 1 : diff_context_new;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002393 diff_foldcolumn = diff_foldcolumn_new;
Bram Moolenaare828b762018-09-10 17:51:58 +02002394 diff_algorithm = diff_algorithm_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002395
2396 diff_redraw(TRUE);
2397
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002398 // recompute the scroll binding with the new option value, may
2399 // remove or add filler lines
Bram Moolenaar071d4272004-06-13 20:20:40 +00002400 check_scrollbind((linenr_T)0, 0L);
2401
2402 return OK;
2403}
2404
2405/*
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002406 * Return TRUE if 'diffopt' contains "horizontal".
2407 */
2408 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002409diffopt_horizontal(void)
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002410{
2411 return (diff_flags & DIFF_HORIZONTAL) != 0;
2412}
2413
2414/*
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002415 * Return TRUE if 'diffopt' contains "hiddenoff".
2416 */
2417 int
2418diffopt_hiddenoff(void)
2419{
2420 return (diff_flags & DIFF_HIDDEN_OFF) != 0;
2421}
2422
2423/*
Bram Moolenaarc8234772019-11-10 21:00:27 +01002424 * Return TRUE if 'diffopt' contains "closeoff".
2425 */
2426 int
2427diffopt_closeoff(void)
2428{
2429 return (diff_flags & DIFF_CLOSE_OFF) != 0;
2430}
2431
2432/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002433 * Find the difference within a changed line.
2434 * Returns TRUE if the line was added, no other buffer has it.
2435 */
2436 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002437diff_find_change(
2438 win_T *wp,
2439 linenr_T lnum,
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002440 int *startp, // first char of the change
2441 int *endp) // last char of the change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002442{
2443 char_u *line_org;
2444 char_u *line_new;
2445 int i;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002446 int si_org, si_new;
2447 int ei_org, ei_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002448 diff_T *dp;
2449 int idx;
2450 int off;
2451 int added = TRUE;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002452 char_u *p1, *p2;
2453 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002454
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002455 // Make a copy of the line, the next ml_get() will invalidate it.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002456 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
2457 if (line_org == NULL)
2458 return FALSE;
2459
2460 idx = diff_buf_idx(wp->w_buffer);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002461 if (idx == DB_COUNT) // cannot happen
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002462 {
2463 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002464 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002465 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002466
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002467 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002468 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002469 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
2470 break;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002471 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002472 {
2473 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002474 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002475 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002476
2477 off = lnum - dp->df_lnum[idx];
2478
2479 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002480 if (curtab->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002481 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002482 // Skip lines that are not in the other change (filler lines).
Bram Moolenaar071d4272004-06-13 20:20:40 +00002483 if (off >= dp->df_count[i])
2484 continue;
2485 added = FALSE;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002486 line_new = ml_get_buf(curtab->tp_diffbuf[i],
2487 dp->df_lnum[i] + off, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002488
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002489 // Search for start of difference
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002490 si_org = si_new = 0;
2491 while (line_org[si_org] != NUL)
2492 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002493 if (((diff_flags & DIFF_IWHITE)
2494 && VIM_ISWHITE(line_org[si_org])
2495 && VIM_ISWHITE(line_new[si_new]))
2496 || ((diff_flags & DIFF_IWHITEALL)
2497 && (VIM_ISWHITE(line_org[si_org])
2498 || VIM_ISWHITE(line_new[si_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002499 {
Bram Moolenaara93fa7e2006-04-17 22:14:47 +00002500 si_org = (int)(skipwhite(line_org + si_org) - line_org);
2501 si_new = (int)(skipwhite(line_new + si_new) - line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002502 }
2503 else
2504 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002505 if (!diff_equal_char(line_org + si_org, line_new + si_new,
2506 &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002507 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002508 si_org += l;
2509 si_new += l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002510 }
2511 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002512 if (has_mbyte)
2513 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002514 // Move back to first byte of character in both lines (may
2515 // have "nn^" in line_org and "n^ in line_new).
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002516 si_org -= (*mb_head_off)(line_org, line_org + si_org);
2517 si_new -= (*mb_head_off)(line_new, line_new + si_new);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002518 }
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002519 if (*startp > si_org)
2520 *startp = si_org;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002521
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002522 // Search for end of difference, if any.
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002523 if (line_org[si_org] != NUL || line_new[si_new] != NUL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002524 {
2525 ei_org = (int)STRLEN(line_org);
2526 ei_new = (int)STRLEN(line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002527 while (ei_org >= *startp && ei_new >= si_new
2528 && ei_org >= 0 && ei_new >= 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002529 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002530 if (((diff_flags & DIFF_IWHITE)
2531 && VIM_ISWHITE(line_org[ei_org])
2532 && VIM_ISWHITE(line_new[ei_new]))
2533 || ((diff_flags & DIFF_IWHITEALL)
2534 && (VIM_ISWHITE(line_org[ei_org])
2535 || VIM_ISWHITE(line_new[ei_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002536 {
2537 while (ei_org >= *startp
Bram Moolenaar1c465442017-03-12 20:10:05 +01002538 && VIM_ISWHITE(line_org[ei_org]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002539 --ei_org;
2540 while (ei_new >= si_new
Bram Moolenaar1c465442017-03-12 20:10:05 +01002541 && VIM_ISWHITE(line_new[ei_new]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002542 --ei_new;
2543 }
2544 else
2545 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002546 p1 = line_org + ei_org;
2547 p2 = line_new + ei_new;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002548 p1 -= (*mb_head_off)(line_org, p1);
2549 p2 -= (*mb_head_off)(line_new, p2);
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002550 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002551 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002552 ei_org -= l;
2553 ei_new -= l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002554 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002555 }
2556 if (*endp < ei_org)
2557 *endp = ei_org;
2558 }
2559 }
2560
2561 vim_free(line_org);
2562 return added;
2563}
2564
2565#if defined(FEAT_FOLDING) || defined(PROTO)
2566/*
2567 * Return TRUE if line "lnum" is not close to a diff block, this line should
2568 * be in a fold.
2569 * Return FALSE if there are no diff blocks at all in this window.
2570 */
2571 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002572diff_infold(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002573{
2574 int i;
2575 int idx = -1;
2576 int other = FALSE;
2577 diff_T *dp;
2578
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002579 // Return if 'diff' isn't set.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002580 if (!wp->w_p_diff)
2581 return FALSE;
2582
2583 for (i = 0; i < DB_COUNT; ++i)
2584 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002585 if (curtab->tp_diffbuf[i] == wp->w_buffer)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002586 idx = i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002587 else if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002588 other = TRUE;
2589 }
2590
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002591 // return here if there are no diffs in the window
Bram Moolenaar071d4272004-06-13 20:20:40 +00002592 if (idx == -1 || !other)
2593 return FALSE;
2594
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002595 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002596 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002597
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002598 // Return if there are no diff blocks. All lines will be folded.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002599 if (curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002600 return TRUE;
2601
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002602 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002603 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002604 // If this change is below the line there can't be any further match.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002605 if (dp->df_lnum[idx] - diff_context > lnum)
2606 break;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002607 // If this change ends before the line we have a match.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002608 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
2609 return FALSE;
2610 }
2611 return TRUE;
2612}
2613#endif
2614
2615/*
2616 * "dp" and "do" commands.
2617 */
2618 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002619nv_diffgetput(int put, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002620{
2621 exarg_T ea;
Bram Moolenaar6a643652014-10-31 13:54:25 +01002622 char_u buf[30];
Bram Moolenaar071d4272004-06-13 20:20:40 +00002623
Bram Moolenaarf2732452018-06-03 14:47:35 +02002624#ifdef FEAT_JOB_CHANNEL
2625 if (bt_prompt(curbuf))
2626 {
2627 vim_beep(BO_OPER);
2628 return;
2629 }
2630#endif
Bram Moolenaar6a643652014-10-31 13:54:25 +01002631 if (count == 0)
2632 ea.arg = (char_u *)"";
2633 else
2634 {
2635 vim_snprintf((char *)buf, 30, "%ld", count);
2636 ea.arg = buf;
2637 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002638 if (put)
2639 ea.cmdidx = CMD_diffput;
2640 else
2641 ea.cmdidx = CMD_diffget;
2642 ea.addr_count = 0;
2643 ea.line1 = curwin->w_cursor.lnum;
2644 ea.line2 = curwin->w_cursor.lnum;
2645 ex_diffgetput(&ea);
2646}
2647
2648/*
Bram Moolenaarc5274dd2022-07-02 15:10:00 +01002649 * Return TRUE if "diff" appears in the list of diff blocks of the current tab.
2650 */
2651 static int
2652valid_diff(diff_T *diff)
2653{
2654 diff_T *dp;
2655
2656 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
2657 if (dp == diff)
2658 return TRUE;
2659 return FALSE;
2660}
2661
2662/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002663 * ":diffget"
2664 * ":diffput"
2665 */
2666 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002667ex_diffgetput(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002668{
2669 linenr_T lnum;
2670 int count;
2671 linenr_T off = 0;
2672 diff_T *dp;
2673 diff_T *dprev;
2674 diff_T *dfree;
2675 int idx_cur;
2676 int idx_other;
2677 int idx_from;
2678 int idx_to;
2679 int i;
2680 int added;
2681 char_u *p;
2682 aco_save_T aco;
2683 buf_T *buf;
2684 int start_skip, end_skip;
2685 int new_count;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002686 int buf_empty;
Bram Moolenaar602eb742007-02-20 03:43:38 +00002687 int found_not_ma = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002688
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002689 // Find the current buffer in the list of diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002690 idx_cur = diff_buf_idx(curbuf);
2691 if (idx_cur == DB_COUNT)
2692 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002693 emsg(_(e_current_buffer_is_not_in_diff_mode));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002694 return;
2695 }
2696
2697 if (*eap->arg == NUL)
2698 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002699 // No argument: Find the other buffer in the list of diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002700 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002701 if (curtab->tp_diffbuf[idx_other] != curbuf
Bram Moolenaar602eb742007-02-20 03:43:38 +00002702 && curtab->tp_diffbuf[idx_other] != NULL)
2703 {
2704 if (eap->cmdidx != CMD_diffput
2705 || curtab->tp_diffbuf[idx_other]->b_p_ma)
2706 break;
2707 found_not_ma = TRUE;
2708 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002709 if (idx_other == DB_COUNT)
2710 {
Bram Moolenaar602eb742007-02-20 03:43:38 +00002711 if (found_not_ma)
Bram Moolenaar677658a2022-01-05 16:09:06 +00002712 emsg(_(e_no_other_buffer_in_diff_mode_is_modifiable));
Bram Moolenaar602eb742007-02-20 03:43:38 +00002713 else
Bram Moolenaare1242042021-12-16 20:56:57 +00002714 emsg(_(e_no_other_buffer_in_diff_mode));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002715 return;
2716 }
2717
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002718 // Check that there isn't a third buffer in the list
Bram Moolenaar071d4272004-06-13 20:20:40 +00002719 for (i = idx_other + 1; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002720 if (curtab->tp_diffbuf[i] != curbuf
2721 && curtab->tp_diffbuf[i] != NULL
2722 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002723 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002724 emsg(_(e_more_than_two_buffers_in_diff_mode_dont_know_which_one_to_use));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002725 return;
2726 }
2727 }
2728 else
2729 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002730 // Buffer number or pattern given. Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002731 p = eap->arg + STRLEN(eap->arg);
Bram Moolenaar1c465442017-03-12 20:10:05 +01002732 while (p > eap->arg && VIM_ISWHITE(p[-1]))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002733 --p;
2734 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
2735 ;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002736 if (eap->arg + i == p) // digits only
Bram Moolenaar071d4272004-06-13 20:20:40 +00002737 i = atol((char *)eap->arg);
2738 else
2739 {
Bram Moolenaar0c279bb2013-03-19 14:25:54 +01002740 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002741 if (i < 0)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002742 return; // error message already given
Bram Moolenaar071d4272004-06-13 20:20:40 +00002743 }
2744 buf = buflist_findnr(i);
2745 if (buf == NULL)
2746 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002747 semsg(_(e_cant_find_buffer_str), eap->arg);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002748 return;
2749 }
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +00002750 if (buf == curbuf)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002751 return; // nothing to do
Bram Moolenaar071d4272004-06-13 20:20:40 +00002752 idx_other = diff_buf_idx(buf);
2753 if (idx_other == DB_COUNT)
2754 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002755 semsg(_(e_buffer_str_is_not_in_diff_mode), eap->arg);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002756 return;
2757 }
2758 }
2759
2760 diff_busy = TRUE;
2761
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002762 // When no range given include the line above or below the cursor.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002763 if (eap->addr_count == 0)
2764 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002765 // Make it possible that ":diffget" on the last line gets line below
2766 // the cursor line when there is no difference above the cursor.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002767 if (eap->cmdidx == CMD_diffget
2768 && eap->line1 == curbuf->b_ml.ml_line_count
2769 && diff_check(curwin, eap->line1) == 0
2770 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
2771 ++eap->line2;
2772 else if (eap->line1 > 0)
2773 --eap->line1;
2774 }
2775
2776 if (eap->cmdidx == CMD_diffget)
2777 {
2778 idx_from = idx_other;
2779 idx_to = idx_cur;
2780 }
2781 else
2782 {
2783 idx_from = idx_cur;
2784 idx_to = idx_other;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002785 // Need to make the other buffer the current buffer to be able to make
2786 // changes in it.
2787 // set curwin/curbuf to buf and save a few things
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002788 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002789 }
2790
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002791 // May give the warning for a changed buffer here, which can trigger the
2792 // FileChangedRO autocommand, which may do nasty things and mess
2793 // everything up.
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002794 if (!curbuf->b_changed)
2795 {
2796 change_warning(0);
2797 if (diff_buf_idx(curbuf) != idx_to)
2798 {
Bram Moolenaar677658a2022-01-05 16:09:06 +00002799 emsg(_(e_buffer_changed_unexpectedly));
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002800 goto theend;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002801 }
2802 }
2803
Bram Moolenaar071d4272004-06-13 20:20:40 +00002804 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002805 for (dp = curtab->tp_first_diff; dp != NULL; )
Bram Moolenaar071d4272004-06-13 20:20:40 +00002806 {
2807 if (dp->df_lnum[idx_cur] > eap->line2 + off)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002808 break; // past the range that was specified
Bram Moolenaar071d4272004-06-13 20:20:40 +00002809
2810 dfree = NULL;
2811 lnum = dp->df_lnum[idx_to];
2812 count = dp->df_count[idx_to];
2813 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
2814 && u_save(lnum - 1, lnum + count) != FAIL)
2815 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002816 // Inside the specified range and saving for undo worked.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002817 start_skip = 0;
2818 end_skip = 0;
2819 if (eap->addr_count > 0)
2820 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002821 // A range was specified: check if lines need to be skipped.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002822 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
2823 if (start_skip > 0)
2824 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002825 // range starts below start of current diff block
Bram Moolenaar071d4272004-06-13 20:20:40 +00002826 if (start_skip > count)
2827 {
2828 lnum += count;
2829 count = 0;
2830 }
2831 else
2832 {
2833 count -= start_skip;
2834 lnum += start_skip;
2835 }
2836 }
2837 else
2838 start_skip = 0;
2839
2840 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
2841 - (eap->line2 + off);
2842 if (end_skip > 0)
2843 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002844 // range ends above end of current/from diff block
2845 if (idx_cur == idx_from) // :diffput
Bram Moolenaar071d4272004-06-13 20:20:40 +00002846 {
2847 i = dp->df_count[idx_cur] - start_skip - end_skip;
2848 if (count > i)
2849 count = i;
2850 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002851 else // :diffget
Bram Moolenaar071d4272004-06-13 20:20:40 +00002852 {
2853 count -= end_skip;
2854 end_skip = dp->df_count[idx_from] - start_skip - count;
2855 if (end_skip < 0)
2856 end_skip = 0;
2857 }
2858 }
2859 else
2860 end_skip = 0;
2861 }
2862
Bram Moolenaarb5aedf32017-03-12 18:23:53 +01002863 buf_empty = BUFEMPTY();
Bram Moolenaar071d4272004-06-13 20:20:40 +00002864 added = 0;
2865 for (i = 0; i < count; ++i)
2866 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002867 // remember deleting the last line of the buffer
Bram Moolenaar280f1262006-01-30 00:14:18 +00002868 buf_empty = curbuf->b_ml.ml_line_count == 1;
Bram Moolenaar4e677b92022-07-28 18:44:27 +01002869 if (ml_delete(lnum) == OK)
2870 --added;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002871 }
2872 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
2873 {
2874 linenr_T nr;
2875
2876 nr = dp->df_lnum[idx_from] + start_skip + i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002877 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002878 break;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002879 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
2880 nr, FALSE));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002881 if (p != NULL)
2882 {
2883 ml_append(lnum + i - 1, p, 0, FALSE);
2884 vim_free(p);
2885 ++added;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002886 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
2887 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002888 // Added the first line into an empty buffer, need to
2889 // delete the dummy empty line.
Bram Moolenaar280f1262006-01-30 00:14:18 +00002890 buf_empty = FALSE;
Bram Moolenaarca70c072020-05-30 20:30:46 +02002891 ml_delete((linenr_T)2);
Bram Moolenaar280f1262006-01-30 00:14:18 +00002892 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002893 }
2894 }
2895 new_count = dp->df_count[idx_to] + added;
2896 dp->df_count[idx_to] = new_count;
2897
2898 if (start_skip == 0 && end_skip == 0)
2899 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002900 // Check if there are any other buffers and if the diff is
2901 // equal in them.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002902 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002903 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
2904 && i != idx_to
Bram Moolenaar071d4272004-06-13 20:20:40 +00002905 && !diff_equal_entry(dp, idx_from, i))
2906 break;
2907 if (i == DB_COUNT)
2908 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002909 // delete the diff entry, the buffers are now equal here
Bram Moolenaar071d4272004-06-13 20:20:40 +00002910 dfree = dp;
2911 dp = dp->df_next;
2912 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002913 curtab->tp_first_diff = dp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002914 else
2915 dprev->df_next = dp;
2916 }
2917 }
2918
Bram Moolenaar071d4272004-06-13 20:20:40 +00002919 if (added != 0)
2920 {
Bram Moolenaarc5274dd2022-07-02 15:10:00 +01002921 // Adjust marks. This will change the following entries!
Bram Moolenaar071d4272004-06-13 20:20:40 +00002922 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
2923 if (curwin->w_cursor.lnum >= lnum)
2924 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002925 // Adjust the cursor position if it's in/after the changed
2926 // lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002927 if (curwin->w_cursor.lnum >= lnum + count)
2928 curwin->w_cursor.lnum += added;
2929 else if (added < 0)
2930 curwin->w_cursor.lnum = lnum;
2931 }
2932 }
2933 changed_lines(lnum, 0, lnum + count, (long)added);
2934
2935 if (dfree != NULL)
2936 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002937 // Diff is deleted, update folds in other windows.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002938#ifdef FEAT_FOLDING
2939 diff_fold_update(dfree, idx_to);
2940#endif
2941 vim_free(dfree);
2942 }
Bram Moolenaarc5274dd2022-07-02 15:10:00 +01002943
2944 // mark_adjust() may have made "dp" invalid. We don't know where
2945 // to continue then, bail out.
2946 if (added != 0 && !valid_diff(dp))
2947 break;
2948
2949 if (dfree == NULL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002950 // mark_adjust() may have changed the count in a wrong way
Bram Moolenaar071d4272004-06-13 20:20:40 +00002951 dp->df_count[idx_to] = new_count;
2952
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002953 // When changing the current buffer, keep track of line numbers
Bram Moolenaar071d4272004-06-13 20:20:40 +00002954 if (idx_cur == idx_to)
2955 off += added;
2956 }
2957
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002958 // If before the range or not deleted, go to next diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002959 if (dfree == NULL)
2960 {
2961 dprev = dp;
2962 dp = dp->df_next;
2963 }
2964 }
2965
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002966 // restore curwin/curbuf and a few other things
Bram Moolenaara9d52e32010-07-31 16:44:19 +02002967 if (eap->cmdidx != CMD_diffget)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002968 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002969 // Syncing undo only works for the current buffer, but we change
2970 // another buffer. Sync undo if the command was typed. This isn't
2971 // 100% right when ":diffput" is used in a function or mapping.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002972 if (KeyTyped)
Bram Moolenaar779b74b2006-04-10 14:55:34 +00002973 u_sync(FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002974 aucmd_restbuf(&aco);
2975 }
2976
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002977theend:
Bram Moolenaar071d4272004-06-13 20:20:40 +00002978 diff_busy = FALSE;
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002979 if (diff_need_update)
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002980 ex_diffupdate(NULL);
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002981
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +02002982 // Check that the cursor is on a valid character and update its
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002983 // position. When there were filler lines the topline has become
2984 // invalid.
2985 check_cursor();
2986 changed_line_abv_curs();
2987
2988 if (diff_need_update)
2989 // redraw already done by ex_diffupdate()
2990 diff_need_update = FALSE;
Bram Moolenaar198fa062018-09-18 21:20:26 +02002991 else
2992 {
Bram Moolenaar198fa062018-09-18 21:20:26 +02002993 // Also need to redraw the other buffers.
2994 diff_redraw(FALSE);
2995 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
2996 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002997}
2998
2999#ifdef FEAT_FOLDING
3000/*
3001 * Update folds for all diff buffers for entry "dp".
3002 * Skip buffer with index "skip_idx".
3003 * When there are no diffs, all folds are removed.
3004 */
3005 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01003006diff_fold_update(diff_T *dp, int skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003007{
3008 int i;
3009 win_T *wp;
3010
Bram Moolenaar29323592016-07-24 22:04:11 +02003011 FOR_ALL_WINDOWS(wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003012 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003013 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003014 foldUpdate(wp, dp->df_lnum[i],
3015 dp->df_lnum[i] + dp->df_count[i]);
3016}
3017#endif
3018
3019/*
3020 * Return TRUE if buffer "buf" is in diff-mode.
3021 */
3022 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01003023diff_mode_buf(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003024{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003025 tabpage_T *tp;
3026
Bram Moolenaar29323592016-07-24 22:04:11 +02003027 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003028 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
3029 return TRUE;
3030 return FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00003031}
3032
3033/*
3034 * Move "count" times in direction "dir" to the next diff block.
3035 * Return FAIL if there isn't such a diff block.
3036 */
3037 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01003038diff_move_to(int dir, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003039{
3040 int idx;
3041 linenr_T lnum = curwin->w_cursor.lnum;
3042 diff_T *dp;
3043
3044 idx = diff_buf_idx(curbuf);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003045 if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003046 return FAIL;
3047
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003048 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003049 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00003050
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003051 if (curtab->tp_first_diff == NULL) // no diffs today
Bram Moolenaar071d4272004-06-13 20:20:40 +00003052 return FAIL;
3053
3054 while (--count >= 0)
3055 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003056 // Check if already before first diff.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003057 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00003058 break;
3059
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003060 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003061 {
3062 if (dp == NULL)
3063 break;
3064 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
3065 || (dir == BACKWARD
3066 && (dp->df_next == NULL
3067 || lnum <= dp->df_next->df_lnum[idx])))
3068 {
3069 lnum = dp->df_lnum[idx];
3070 break;
3071 }
3072 }
3073 }
3074
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003075 // don't end up past the end of the file
Bram Moolenaar071d4272004-06-13 20:20:40 +00003076 if (lnum > curbuf->b_ml.ml_line_count)
3077 lnum = curbuf->b_ml.ml_line_count;
3078
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003079 // When the cursor didn't move at all we fail.
Bram Moolenaar071d4272004-06-13 20:20:40 +00003080 if (lnum == curwin->w_cursor.lnum)
3081 return FAIL;
3082
3083 setpcmark();
3084 curwin->w_cursor.lnum = lnum;
3085 curwin->w_cursor.col = 0;
3086
3087 return OK;
3088}
3089
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003090/*
3091 * Return the line number in the current window that is closest to "lnum1" in
3092 * "buf1" in diff mode.
3093 */
3094 static linenr_T
3095diff_get_corresponding_line_int(
Bram Moolenaar7454a062016-01-30 15:14:10 +01003096 buf_T *buf1,
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003097 linenr_T lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003098{
3099 int idx1;
3100 int idx2;
3101 diff_T *dp;
3102 int baseline = 0;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003103
3104 idx1 = diff_buf_idx(buf1);
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003105 idx2 = diff_buf_idx(curbuf);
Bram Moolenaar860cae12010-06-05 23:22:07 +02003106 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL)
3107 return lnum1;
3108
3109 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003110 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar860cae12010-06-05 23:22:07 +02003111
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003112 if (curtab->tp_first_diff == NULL) // no diffs today
Bram Moolenaar860cae12010-06-05 23:22:07 +02003113 return lnum1;
3114
Bram Moolenaaraeea7212020-04-02 18:50:46 +02003115 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003116 {
3117 if (dp->df_lnum[idx1] > lnum1)
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003118 return lnum1 - baseline;
3119 if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003120 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003121 // Inside the diffblock
Bram Moolenaar860cae12010-06-05 23:22:07 +02003122 baseline = lnum1 - dp->df_lnum[idx1];
3123 if (baseline > dp->df_count[idx2])
3124 baseline = dp->df_count[idx2];
3125
3126 return dp->df_lnum[idx2] + baseline;
3127 }
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003128 if ( (dp->df_lnum[idx1] == lnum1)
3129 && (dp->df_count[idx1] == 0)
3130 && (dp->df_lnum[idx2] <= curwin->w_cursor.lnum)
3131 && ((dp->df_lnum[idx2] + dp->df_count[idx2])
3132 > curwin->w_cursor.lnum))
Bram Moolenaar860cae12010-06-05 23:22:07 +02003133 /*
3134 * Special case: if the cursor is just after a zero-count
3135 * block (i.e. all filler) and the target cursor is already
3136 * inside the corresponding block, leave the target cursor
3137 * unmoved. This makes repeated CTRL-W W operations work
3138 * as expected.
3139 */
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003140 return curwin->w_cursor.lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003141 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1])
3142 - (dp->df_lnum[idx2] + dp->df_count[idx2]);
3143 }
3144
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003145 // If we get here then the cursor is after the last diff
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003146 return lnum1 - baseline;
3147}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003148
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003149/*
3150 * Return the line number in the current window that is closest to "lnum1" in
3151 * "buf1" in diff mode. Checks the line number to be valid.
3152 */
3153 linenr_T
3154diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1)
3155{
3156 linenr_T lnum = diff_get_corresponding_line_int(buf1, lnum1);
3157
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003158 // don't end up past the end of the file
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003159 if (lnum > curbuf->b_ml.ml_line_count)
3160 return curbuf->b_ml.ml_line_count;
3161 return lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003162}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003163
Bram Moolenaar071d4272004-06-13 20:20:40 +00003164/*
3165 * For line "lnum" in the current window find the equivalent lnum in window
3166 * "wp", compensating for inserted/deleted lines.
3167 */
3168 linenr_T
Bram Moolenaar7454a062016-01-30 15:14:10 +01003169diff_lnum_win(linenr_T lnum, win_T *wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003170{
3171 diff_T *dp;
3172 int idx;
3173 int i;
3174 linenr_T n;
3175
3176 idx = diff_buf_idx(curbuf);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003177 if (idx == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00003178 return (linenr_T)0;
3179
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003180 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003181 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00003182
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003183 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02003184 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003185 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3186 break;
3187
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003188 // When after the last change, compute relative to the last line number.
Bram Moolenaar071d4272004-06-13 20:20:40 +00003189 if (dp == NULL)
3190 return wp->w_buffer->b_ml.ml_line_count
3191 - (curbuf->b_ml.ml_line_count - lnum);
3192
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003193 // Find index for "wp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00003194 i = diff_buf_idx(wp->w_buffer);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003195 if (i == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00003196 return (linenr_T)0;
3197
3198 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
3199 if (n > dp->df_lnum[i] + dp->df_count[i])
3200 n = dp->df_lnum[i] + dp->df_count[i];
3201 return n;
3202}
Bram Moolenaar071d4272004-06-13 20:20:40 +00003203
Bram Moolenaare828b762018-09-10 17:51:58 +02003204/*
3205 * Handle an ED style diff line.
3206 * Return FAIL if the line does not contain diff info.
3207 */
3208 static int
3209parse_diff_ed(
3210 char_u *line,
Lewis Russelld9da86e2021-12-28 13:54:41 +00003211 diffhunk_T *hunk)
Bram Moolenaare828b762018-09-10 17:51:58 +02003212{
3213 char_u *p;
3214 long f1, l1, f2, l2;
3215 int difftype;
3216
3217 // The line must be one of three formats:
3218 // change: {first}[,{last}]c{first}[,{last}]
3219 // append: {first}a{first}[,{last}]
3220 // delete: {first}[,{last}]d{first}
3221 p = line;
3222 f1 = getdigits(&p);
3223 if (*p == ',')
3224 {
3225 ++p;
3226 l1 = getdigits(&p);
3227 }
3228 else
3229 l1 = f1;
3230 if (*p != 'a' && *p != 'c' && *p != 'd')
3231 return FAIL; // invalid diff format
3232 difftype = *p++;
3233 f2 = getdigits(&p);
3234 if (*p == ',')
3235 {
3236 ++p;
3237 l2 = getdigits(&p);
3238 }
3239 else
3240 l2 = f2;
3241 if (l1 < f1 || l2 < f2)
3242 return FAIL;
3243
3244 if (difftype == 'a')
3245 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003246 hunk->lnum_orig = f1 + 1;
3247 hunk->count_orig = 0;
Bram Moolenaare828b762018-09-10 17:51:58 +02003248 }
3249 else
3250 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003251 hunk->lnum_orig = f1;
3252 hunk->count_orig = l1 - f1 + 1;
Bram Moolenaare828b762018-09-10 17:51:58 +02003253 }
3254 if (difftype == 'd')
3255 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003256 hunk->lnum_new = f2 + 1;
3257 hunk->count_new = 0;
Bram Moolenaare828b762018-09-10 17:51:58 +02003258 }
3259 else
3260 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003261 hunk->lnum_new = f2;
3262 hunk->count_new = l2 - f2 + 1;
Bram Moolenaare828b762018-09-10 17:51:58 +02003263 }
3264 return OK;
3265}
3266
3267/*
3268 * Parses unified diff with zero(!) context lines.
3269 * Return FAIL if there is no diff information in "line".
3270 */
3271 static int
3272parse_diff_unified(
3273 char_u *line,
Lewis Russelld9da86e2021-12-28 13:54:41 +00003274 diffhunk_T *hunk)
Bram Moolenaare828b762018-09-10 17:51:58 +02003275{
3276 char_u *p;
3277 long oldline, oldcount, newline, newcount;
3278
3279 // Parse unified diff hunk header:
3280 // @@ -oldline,oldcount +newline,newcount @@
3281 p = line;
3282 if (*p++ == '@' && *p++ == '@' && *p++ == ' ' && *p++ == '-')
3283 {
3284 oldline = getdigits(&p);
3285 if (*p == ',')
3286 {
3287 ++p;
3288 oldcount = getdigits(&p);
3289 }
3290 else
3291 oldcount = 1;
3292 if (*p++ == ' ' && *p++ == '+')
3293 {
3294 newline = getdigits(&p);
3295 if (*p == ',')
3296 {
3297 ++p;
3298 newcount = getdigits(&p);
3299 }
3300 else
3301 newcount = 1;
3302 }
3303 else
3304 return FAIL; // invalid diff format
3305
3306 if (oldcount == 0)
3307 oldline += 1;
3308 if (newcount == 0)
3309 newline += 1;
3310 if (newline == 0)
3311 newline = 1;
3312
Lewis Russelld9da86e2021-12-28 13:54:41 +00003313 hunk->lnum_orig = oldline;
3314 hunk->count_orig = oldcount;
3315 hunk->lnum_new = newline;
3316 hunk->count_new = newcount;
Bram Moolenaare828b762018-09-10 17:51:58 +02003317
3318 return OK;
3319 }
3320
3321 return FAIL;
3322}
3323
3324/*
3325 * Callback function for the xdl_diff() function.
3326 * Stores the diff output in a grow array.
3327 */
3328 static int
Lewis Russelld9da86e2021-12-28 13:54:41 +00003329xdiff_out(
3330 long start_a,
3331 long count_a,
3332 long start_b,
3333 long count_b,
3334 void *priv)
Bram Moolenaare828b762018-09-10 17:51:58 +02003335{
3336 diffout_T *dout = (diffout_T *)priv;
Lewis Russelld9da86e2021-12-28 13:54:41 +00003337 diffhunk_T *p = ALLOC_ONE(diffhunk_T);
Bram Moolenaare828b762018-09-10 17:51:58 +02003338
Lewis Russelld9da86e2021-12-28 13:54:41 +00003339 if (p == NULL)
3340 return -1;
Bram Moolenaarf080d702018-10-31 22:57:26 +01003341
3342 if (ga_grow(&dout->dout_ga, 1) == FAIL)
Bram Moolenaarfebb78f2021-12-29 11:59:53 +00003343 {
3344 vim_free(p);
Bram Moolenaarf080d702018-10-31 22:57:26 +01003345 return -1;
Bram Moolenaarfebb78f2021-12-29 11:59:53 +00003346 }
Lewis Russelld9da86e2021-12-28 13:54:41 +00003347
3348 p->lnum_orig = start_a + 1;
3349 p->count_orig = count_a;
3350 p->lnum_new = start_b + 1;
3351 p->count_new = count_b;
3352 ((diffhunk_T **)dout->dout_ga.ga_data)[dout->dout_ga.ga_len++] = p;
Bram Moolenaare828b762018-09-10 17:51:58 +02003353 return 0;
3354}
3355
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003356#endif // FEAT_DIFF
3357
3358#if defined(FEAT_EVAL) || defined(PROTO)
3359
3360/*
3361 * "diff_filler()" function
3362 */
3363 void
3364f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
3365{
3366#ifdef FEAT_DIFF
Yegappan Lakshmanan4490ec42021-07-27 22:00:44 +02003367 if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL)
3368 return;
3369
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003370 rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars));
3371#endif
3372}
3373
3374/*
3375 * "diff_hlID()" function
3376 */
3377 void
3378f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
3379{
3380#ifdef FEAT_DIFF
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003381 linenr_T lnum;
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003382 static linenr_T prev_lnum = 0;
3383 static varnumber_T changedtick = 0;
3384 static int fnum = 0;
3385 static int change_start = 0;
3386 static int change_end = 0;
3387 static hlf_T hlID = (hlf_T)0;
3388 int filler_lines;
3389 int col;
3390
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003391 if (in_vim9script()
Yegappan Lakshmanancd917202021-07-21 19:09:09 +02003392 && (check_for_lnum_arg(argvars,0) == FAIL
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003393 || check_for_number_arg(argvars, 1) == FAIL))
3394 return;
3395
3396 lnum = tv_get_lnum(argvars);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003397 if (lnum < 0) // ignore type error in {lnum} arg
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003398 lnum = 0;
3399 if (lnum != prev_lnum
3400 || changedtick != CHANGEDTICK(curbuf)
3401 || fnum != curbuf->b_fnum)
3402 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003403 // New line, buffer, change: need to get the values.
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003404 filler_lines = diff_check(curwin, lnum);
3405 if (filler_lines < 0)
3406 {
3407 if (filler_lines == -1)
3408 {
3409 change_start = MAXCOL;
3410 change_end = -1;
3411 if (diff_find_change(curwin, lnum, &change_start, &change_end))
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003412 hlID = HLF_ADD; // added line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003413 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003414 hlID = HLF_CHD; // changed line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003415 }
3416 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003417 hlID = HLF_ADD; // added line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003418 }
3419 else
3420 hlID = (hlf_T)0;
3421 prev_lnum = lnum;
3422 changedtick = CHANGEDTICK(curbuf);
3423 fnum = curbuf->b_fnum;
3424 }
3425
3426 if (hlID == HLF_CHD || hlID == HLF_TXD)
3427 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003428 col = tv_get_number(&argvars[1]) - 1; // ignore type error in {col}
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003429 if (col >= change_start && col <= change_end)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003430 hlID = HLF_TXD; // changed text
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003431 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003432 hlID = HLF_CHD; // changed line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003433 }
3434 rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID;
3435#endif
3436}
3437
3438#endif