blob: 41cfefe5e6a831e1802e8b752c1ea141d25ae645 [file] [log] [blame]
Bram Moolenaaredf3f972016-08-29 22:49:24 +02001/* vi:set ts=8 sts=4 sw=4 noet:
Bram Moolenaar071d4272004-06-13 20:20:40 +00002 *
3 * VIM - Vi IMproved by Bram Moolenaar
4 *
5 * Do ":help uganda" in Vim to read copying and usage conditions.
6 * Do ":help credits" in Vim to see a list of people who contributed.
7 * See README.txt for an overview of the Vim source code.
8 */
9
10/*
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +000011 * diff.c: code for diff'ing two, three or four buffers.
Bram Moolenaare828b762018-09-10 17:51:58 +020012 *
13 * There are three ways to diff:
14 * - Shell out to an external diff program, using files.
15 * - Use the compiled-in xdiff library.
16 * - Let 'diffexpr' do the work, using files.
Bram Moolenaar071d4272004-06-13 20:20:40 +000017 */
18
19#include "vim.h"
Bram Moolenaare828b762018-09-10 17:51:58 +020020#include "xdiff/xdiff.h"
Bram Moolenaar071d4272004-06-13 20:20:40 +000021
22#if defined(FEAT_DIFF) || defined(PROTO)
23
Bram Moolenaard2b58c02018-09-16 18:10:48 +020024static int diff_busy = FALSE; // using diff structs, don't change them
25static int diff_need_update = FALSE; // ex_diffupdate needs to be called
Bram Moolenaar071d4272004-06-13 20:20:40 +000026
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010027// flags obtained from the 'diffopt' option
Bram Moolenaar785fc652018-09-15 19:17:38 +020028#define DIFF_FILLER 0x001 // display filler lines
29#define DIFF_IBLANK 0x002 // ignore empty lines
30#define DIFF_ICASE 0x004 // ignore case
31#define DIFF_IWHITE 0x008 // ignore change in white space
32#define DIFF_IWHITEALL 0x010 // ignore all white space changes
33#define DIFF_IWHITEEOL 0x020 // ignore change in white space at EOL
34#define DIFF_HORIZONTAL 0x040 // horizontal splits
35#define DIFF_VERTICAL 0x080 // vertical splits
36#define DIFF_HIDDEN_OFF 0x100 // diffoff when hidden
37#define DIFF_INTERNAL 0x200 // use internal xdiff algorithm
Bram Moolenaarc8234772019-11-10 21:00:27 +010038#define DIFF_CLOSE_OFF 0x400 // diffoff when closing window
Bram Moolenaar4223d432021-02-10 13:18:17 +010039#define DIFF_FOLLOWWRAP 0x800 // follow the wrap option
Bram Moolenaar785fc652018-09-15 19:17:38 +020040#define ALL_WHITE_DIFF (DIFF_IWHITE | DIFF_IWHITEALL | DIFF_IWHITEEOL)
Bram Moolenaarc8234772019-11-10 21:00:27 +010041static int diff_flags = DIFF_INTERNAL | DIFF_FILLER | DIFF_CLOSE_OFF;
Bram Moolenaar071d4272004-06-13 20:20:40 +000042
Bram Moolenaare828b762018-09-10 17:51:58 +020043static long diff_algorithm = 0;
44
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010045#define LBUFLEN 50 // length of line in diff file
Bram Moolenaar071d4272004-06-13 20:20:40 +000046
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010047static int diff_a_works = MAYBE; // TRUE when "diff -a" works, FALSE when it
48 // doesn't work, MAYBE when not checked yet
Bram Moolenaar48e330a2016-02-23 14:53:34 +010049#if defined(MSWIN)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +010050static int diff_bin_works = MAYBE; // TRUE when "diff --binary" works, FALSE
51 // when it doesn't work, MAYBE when not
52 // checked yet
Bram Moolenaar071d4272004-06-13 20:20:40 +000053#endif
54
Bram Moolenaare828b762018-09-10 17:51:58 +020055// used for diff input
56typedef struct {
57 char_u *din_fname; // used for external diff
58 mmfile_t din_mmfile; // used for internal diff
59} diffin_T;
60
61// used for diff result
62typedef struct {
63 char_u *dout_fname; // used for external diff
64 garray_T dout_ga; // used for internal diff
65} diffout_T;
66
Lewis Russelld9da86e2021-12-28 13:54:41 +000067// used for recording hunks from xdiff
68typedef struct {
69 linenr_T lnum_orig;
70 long count_orig;
71 linenr_T lnum_new;
72 long count_new;
73} diffhunk_T;
74
Bram Moolenaare828b762018-09-10 17:51:58 +020075// two diff inputs and one result
76typedef struct {
77 diffin_T dio_orig; // original file input
78 diffin_T dio_new; // new file input
79 diffout_T dio_diff; // diff result
80 int dio_internal; // using internal diff
81} diffio_T;
82
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010083static int diff_buf_idx(buf_T *buf);
84static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp);
85static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after);
86static void diff_check_unchanged(tabpage_T *tp, diff_T *dp);
87static int diff_check_sanity(tabpage_T *tp, diff_T *dp);
Bram Moolenaare828b762018-09-10 17:51:58 +020088static int check_external_diff(diffio_T *diffio);
89static int diff_file(diffio_T *diffio);
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010090static int diff_equal_entry(diff_T *dp, int idx1, int idx2);
91static int diff_cmp(char_u *s1, char_u *s2);
Bram Moolenaar071d4272004-06-13 20:20:40 +000092#ifdef FEAT_FOLDING
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010093static void diff_fold_update(diff_T *dp, int skip_idx);
Bram Moolenaar071d4272004-06-13 20:20:40 +000094#endif
Lewis Russelld9da86e2021-12-28 13:54:41 +000095static void diff_read(int idx_orig, int idx_new, diffio_T *dio);
Bram Moolenaarf28dbce2016-01-29 22:03:47 +010096static void diff_copy_entry(diff_T *dprev, diff_T *dp, int idx_orig, int idx_new);
97static diff_T *diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp);
Lewis Russelld9da86e2021-12-28 13:54:41 +000098static int parse_diff_ed(char_u *line, diffhunk_T *hunk);
99static int parse_diff_unified(char_u *line, diffhunk_T *hunk);
100static int xdiff_out(long start_a, long count_a, long start_b, long count_b, void *priv);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000101
Bram Moolenaaraeea7212020-04-02 18:50:46 +0200102#define FOR_ALL_DIFFBLOCKS_IN_TAB(tp, dp) \
103 for ((dp) = (tp)->tp_first_diff; (dp) != NULL; (dp) = (dp)->df_next)
104
Bram Moolenaar071d4272004-06-13 20:20:40 +0000105/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000106 * Called when deleting or unloading a buffer: No longer make a diff with it.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000107 */
108 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100109diff_buf_delete(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000110{
111 int i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000112 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000113
Bram Moolenaar29323592016-07-24 22:04:11 +0200114 FOR_ALL_TABPAGES(tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000115 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000116 i = diff_buf_idx_tp(buf, tp);
117 if (i != DB_COUNT)
118 {
119 tp->tp_diffbuf[i] = NULL;
120 tp->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000121 if (tp == curtab)
Bram Moolenaarcd38bb42022-06-26 14:04:07 +0100122 {
123 // don't redraw right away, more might change or buffer state
124 // is invalid right now
125 need_diff_redraw = TRUE;
Bram Moolenaara4d158b2022-08-14 14:17:45 +0100126 redraw_later(UPD_VALID);
Bram Moolenaarcd38bb42022-06-26 14:04:07 +0100127 }
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000128 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000129 }
130}
131
132/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000133 * Check if the current buffer should be added to or removed from the list of
134 * diff buffers.
135 */
136 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100137diff_buf_adjust(win_T *win)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000138{
139 win_T *wp;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000140 int i;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000141
142 if (!win->w_p_diff)
143 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100144 // When there is no window showing a diff for this buffer, remove
145 // it from the diffs.
Bram Moolenaar29323592016-07-24 22:04:11 +0200146 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000147 if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
148 break;
149 if (wp == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000150 {
151 i = diff_buf_idx(win->w_buffer);
152 if (i != DB_COUNT)
153 {
154 curtab->tp_diffbuf[i] = NULL;
155 curtab->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000156 diff_redraw(TRUE);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000157 }
158 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +0000159 }
160 else
161 diff_buf_add(win->w_buffer);
162}
163
164/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000165 * Add a buffer to make diffs for.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000166 * Call this when a new buffer is being edited in the current window where
167 * 'diff' is set.
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +0000168 * Marks the current buffer as being part of the diff and requiring updating.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000169 * This must be done before any autocmd, because a command may use info
170 * about the screen contents.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000171 */
172 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100173diff_buf_add(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000174{
175 int i;
176
177 if (diff_buf_idx(buf) != DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100178 return; // It's already there.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000179
180 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000181 if (curtab->tp_diffbuf[i] == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000182 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000183 curtab->tp_diffbuf[i] = buf;
184 curtab->tp_diff_invalid = TRUE;
Bram Moolenaar5d55c0f2008-11-30 14:16:57 +0000185 diff_redraw(TRUE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000186 return;
187 }
188
Bram Moolenaare1242042021-12-16 20:56:57 +0000189 semsg(_(e_cannot_diff_more_than_nr_buffers), DB_COUNT);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000190}
191
192/*
Bram Moolenaar25ea0542017-02-03 23:16:28 +0100193 * Remove all buffers to make diffs for.
194 */
195 static void
196diff_buf_clear(void)
197{
198 int i;
199
200 for (i = 0; i < DB_COUNT; ++i)
201 if (curtab->tp_diffbuf[i] != NULL)
202 {
203 curtab->tp_diffbuf[i] = NULL;
204 curtab->tp_diff_invalid = TRUE;
205 diff_redraw(TRUE);
206 }
207}
208
209/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000210 * Find buffer "buf" in the list of diff buffers for the current tab page.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000211 * Return its index or DB_COUNT if not found.
212 */
213 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100214diff_buf_idx(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000215{
216 int idx;
217
218 for (idx = 0; idx < DB_COUNT; ++idx)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000219 if (curtab->tp_diffbuf[idx] == buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000220 break;
221 return idx;
222}
223
224/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000225 * Find buffer "buf" in the list of diff buffers for tab page "tp".
226 * Return its index or DB_COUNT if not found.
227 */
228 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +0100229diff_buf_idx_tp(buf_T *buf, tabpage_T *tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000230{
231 int idx;
232
233 for (idx = 0; idx < DB_COUNT; ++idx)
234 if (tp->tp_diffbuf[idx] == buf)
235 break;
236 return idx;
237}
238
239/*
240 * Mark the diff info involving buffer "buf" as invalid, it will be updated
241 * when info is requested.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000242 */
243 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100244diff_invalidate(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000245{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000246 tabpage_T *tp;
247 int i;
248
Bram Moolenaar29323592016-07-24 22:04:11 +0200249 FOR_ALL_TABPAGES(tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000250 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000251 i = diff_buf_idx_tp(buf, tp);
252 if (i != DB_COUNT)
253 {
254 tp->tp_diff_invalid = TRUE;
255 if (tp == curtab)
256 diff_redraw(TRUE);
257 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000258 }
259}
260
261/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000262 * Called by mark_adjust(): update line numbers in "curbuf".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000263 */
264 void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100265diff_mark_adjust(
266 linenr_T line1,
267 linenr_T line2,
268 long amount,
269 long amount_after)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000270{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000271 int idx;
272 tabpage_T *tp;
273
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100274 // Handle all tab pages that use the current buffer in a diff.
Bram Moolenaar29323592016-07-24 22:04:11 +0200275 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000276 {
277 idx = diff_buf_idx_tp(curbuf, tp);
278 if (idx != DB_COUNT)
279 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
280 }
281}
282
283/*
284 * Update line numbers in tab page "tp" for "curbuf" with index "idx".
285 * This attempts to update the changes as much as possible:
286 * When inserting/deleting lines outside of existing change blocks, create a
287 * new change block and update the line numbers in following blocks.
288 * When inserting/deleting lines in existing change blocks, update them.
289 */
290 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +0100291diff_mark_adjust_tp(
292 tabpage_T *tp,
293 int idx,
294 linenr_T line1,
295 linenr_T line2,
296 long amount,
297 long amount_after)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000298{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000299 diff_T *dp;
300 diff_T *dprev;
301 diff_T *dnext;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000302 int i;
303 int inserted, deleted;
304 int n, off;
305 linenr_T last;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100306 linenr_T lnum_deleted = line1; // lnum of remaining deletion
Bram Moolenaar071d4272004-06-13 20:20:40 +0000307 int check_unchanged;
308
Bram Moolenaare3521d92018-09-16 14:10:31 +0200309 if (diff_internal())
310 {
Bram Moolenaar198fa062018-09-18 21:20:26 +0200311 // Will update diffs before redrawing. Set _invalid to update the
Bram Moolenaare3521d92018-09-16 14:10:31 +0200312 // diffs themselves, set _update to also update folds properly just
313 // before redrawing.
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +0200314 // Do update marks here, it is needed for :%diffput.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200315 tp->tp_diff_invalid = TRUE;
316 tp->tp_diff_update = TRUE;
Bram Moolenaare3521d92018-09-16 14:10:31 +0200317 }
318
Bram Moolenaar071d4272004-06-13 20:20:40 +0000319 if (line2 == MAXLNUM)
320 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100321 // mark_adjust(99, MAXLNUM, 9, 0): insert lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000322 inserted = amount;
323 deleted = 0;
324 }
325 else if (amount_after > 0)
326 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100327 // mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000328 inserted = amount_after;
329 deleted = 0;
330 }
331 else
332 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100333 // mark_adjust(98, 99, MAXLNUM, -2): delete lines
Bram Moolenaar071d4272004-06-13 20:20:40 +0000334 inserted = 0;
335 deleted = -amount_after;
336 }
337
338 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000339 dp = tp->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000340 for (;;)
341 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100342 // If the change is after the previous diff block and before the next
343 // diff block, thus not touching an existing change, create a new diff
344 // block. Don't do this when ex_diffgetput() is busy.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000345 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2
346 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
347 && (dprev == NULL
348 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
349 && !diff_busy)
350 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000351 dnext = diff_alloc_new(tp, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000352 if (dnext == NULL)
353 return;
354
355 dnext->df_lnum[idx] = line1;
356 dnext->df_count[idx] = inserted;
357 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000358 if (tp->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000359 {
360 if (dprev == NULL)
361 dnext->df_lnum[i] = line1;
362 else
363 dnext->df_lnum[i] = line1
364 + (dprev->df_lnum[i] + dprev->df_count[i])
365 - (dprev->df_lnum[idx] + dprev->df_count[idx]);
366 dnext->df_count[i] = deleted;
367 }
368 }
369
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100370 // if at end of the list, quit
Bram Moolenaar071d4272004-06-13 20:20:40 +0000371 if (dp == NULL)
372 break;
373
374 /*
375 * Check for these situations:
376 * 1 2 3
377 * 1 2 3
378 * line1 2 3 4 5
379 * 2 3 4 5
380 * 2 3 4 5
381 * line2 2 3 4 5
382 * 3 5 6
383 * 3 5 6
384 */
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100385 // compute last line of this change
Bram Moolenaar071d4272004-06-13 20:20:40 +0000386 last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
387
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100388 // 1. change completely above line1: nothing to do
Bram Moolenaar071d4272004-06-13 20:20:40 +0000389 if (last >= line1 - 1)
390 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100391 // 6. change below line2: only adjust for amount_after; also when
392 // "deleted" became zero when deleted all lines between two diffs
Bram Moolenaar071d4272004-06-13 20:20:40 +0000393 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
394 {
395 if (amount_after == 0)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100396 break; // nothing left to change
Bram Moolenaar071d4272004-06-13 20:20:40 +0000397 dp->df_lnum[idx] += amount_after;
398 }
399 else
400 {
401 check_unchanged = FALSE;
402
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100403 // 2. 3. 4. 5.: inserted/deleted lines touching this diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000404 if (deleted > 0)
405 {
Bram Moolenaarc101abf2022-06-26 16:53:34 +0100406 off = 0;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000407 if (dp->df_lnum[idx] >= line1)
408 {
Bram Moolenaar071d4272004-06-13 20:20:40 +0000409 if (last <= line2)
410 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100411 // 4. delete all lines of diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000412 if (dp->df_next != NULL
413 && dp->df_next->df_lnum[idx] - 1 <= line2)
414 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100415 // delete continues in next diff, only do
416 // lines until that one
Bram Moolenaar071d4272004-06-13 20:20:40 +0000417 n = dp->df_next->df_lnum[idx] - lnum_deleted;
418 deleted -= n;
419 n -= dp->df_count[idx];
420 lnum_deleted = dp->df_next->df_lnum[idx];
421 }
422 else
423 n = deleted - dp->df_count[idx];
424 dp->df_count[idx] = 0;
425 }
426 else
427 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100428 // 5. delete lines at or just before top of diff
Bram Moolenaarc101abf2022-06-26 16:53:34 +0100429 off = dp->df_lnum[idx] - lnum_deleted;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000430 n = off;
431 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
432 check_unchanged = TRUE;
433 }
434 dp->df_lnum[idx] = line1;
435 }
436 else
437 {
Bram Moolenaar071d4272004-06-13 20:20:40 +0000438 if (last < line2)
439 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100440 // 2. delete at end of diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000441 dp->df_count[idx] -= last - lnum_deleted + 1;
442 if (dp->df_next != NULL
443 && dp->df_next->df_lnum[idx] - 1 <= line2)
444 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100445 // delete continues in next diff, only do
446 // lines until that one
Bram Moolenaar071d4272004-06-13 20:20:40 +0000447 n = dp->df_next->df_lnum[idx] - 1 - last;
448 deleted -= dp->df_next->df_lnum[idx]
449 - lnum_deleted;
450 lnum_deleted = dp->df_next->df_lnum[idx];
451 }
452 else
453 n = line2 - last;
454 check_unchanged = TRUE;
455 }
456 else
457 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100458 // 3. delete lines inside the diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000459 n = 0;
460 dp->df_count[idx] -= deleted;
461 }
462 }
463
464 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000465 if (tp->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000466 {
Bram Moolenaar4e677b92022-07-28 18:44:27 +0100467 if (dp->df_lnum[i] > off)
468 dp->df_lnum[i] -= off;
469 else
470 dp->df_lnum[i] = 1;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000471 dp->df_count[i] += n;
472 }
473 }
474 else
475 {
476 if (dp->df_lnum[idx] <= line1)
477 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100478 // inserted lines somewhere in this diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000479 dp->df_count[idx] += inserted;
480 check_unchanged = TRUE;
481 }
482 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100483 // inserted lines somewhere above this diff
Bram Moolenaar071d4272004-06-13 20:20:40 +0000484 dp->df_lnum[idx] += inserted;
485 }
486
487 if (check_unchanged)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100488 // Check if inserted lines are equal, may reduce the
489 // size of the diff. TODO: also check for equal lines
490 // in the middle and perhaps split the block.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000491 diff_check_unchanged(tp, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000492 }
493 }
494
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100495 // check if this block touches the previous one, may merge them.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000496 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
497 == dp->df_lnum[idx])
498 {
499 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000500 if (tp->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000501 dprev->df_count[i] += dp->df_count[i];
502 dprev->df_next = dp->df_next;
503 vim_free(dp);
504 dp = dprev->df_next;
505 }
506 else
507 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100508 // Advance to next entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000509 dprev = dp;
510 dp = dp->df_next;
511 }
512 }
513
514 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000515 dp = tp->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000516 while (dp != NULL)
517 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100518 // All counts are zero, remove this entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000519 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000520 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000521 break;
522 if (i == DB_COUNT)
523 {
524 dnext = dp->df_next;
525 vim_free(dp);
526 dp = dnext;
527 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000528 tp->tp_first_diff = dnext;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000529 else
530 dprev->df_next = dnext;
531 }
532 else
533 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100534 // Advance to next entry.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000535 dprev = dp;
536 dp = dp->df_next;
537 }
538
539 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000540
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000541 if (tp == curtab)
542 {
Bram Moolenaar4f57eef2019-08-24 20:54:19 +0200543 // Don't redraw right away, this updates the diffs, which can be slow.
544 need_diff_redraw = TRUE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000545
Bram Moolenaar5d18efe2019-12-01 21:11:22 +0100546 // Need to recompute the scroll binding, may remove or add filler
547 // lines (e.g., when adding lines above w_topline). But it's slow when
548 // making many changes, postpone until redrawing.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000549 diff_need_scrollbind = TRUE;
550 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000551}
552
553/*
554 * Allocate a new diff block and link it between "dprev" and "dp".
555 */
556 static diff_T *
Bram Moolenaar7454a062016-01-30 15:14:10 +0100557diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000558{
559 diff_T *dnew;
560
Bram Moolenaarc799fe22019-05-28 23:08:19 +0200561 dnew = ALLOC_ONE(diff_T);
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)
zeertzjq101d57b2022-07-31 18:34:32 +0100681 {
Bram Moolenaarcd38bb42022-06-26 14:04:07 +0100682 // when closing windows or wiping buffers skip invalid window
zeertzjq101d57b2022-07-31 18:34:32 +0100683 if (!wp->w_p_diff || !buf_valid(wp->w_buffer))
684 continue;
685
Bram Moolenaara4d158b2022-08-14 14:17:45 +0100686 redraw_win_later(wp, UPD_SOME_VALID);
zeertzjq101d57b2022-07-31 18:34:32 +0100687 if (wp != curwin)
688 wp_other = wp;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000689#ifdef FEAT_FOLDING
zeertzjq101d57b2022-07-31 18:34:32 +0100690 if (dofold && foldmethodIsDiff(wp))
691 foldUpdateAll(wp);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000692#endif
zeertzjq101d57b2022-07-31 18:34:32 +0100693 // A change may have made filler lines invalid, need to take care of
694 // that for other windows.
695 n = diff_check(wp, wp->w_topline);
696 if ((wp != curwin && wp->w_topfill > 0) || n > 0)
697 {
698 if (wp->w_topfill > n)
699 wp->w_topfill = (n < 0 ? 0 : n);
700 else if (n > 0 && n > wp->w_topfill)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000701 {
zeertzjq101d57b2022-07-31 18:34:32 +0100702 wp->w_topfill = n;
703 if (wp == curwin)
704 used_max_fill_curwin = TRUE;
705 else if (wp_other != NULL)
706 used_max_fill_other = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000707 }
zeertzjq101d57b2022-07-31 18:34:32 +0100708 check_topfill(wp, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +0000709 }
zeertzjq101d57b2022-07-31 18:34:32 +0100710 }
Bram Moolenaar04626c22021-09-01 16:02:07 +0200711
Bram Moolenaar841c2252021-10-22 20:56:55 +0100712 if (wp_other != NULL && curwin->w_p_scb)
713 {
714 if (used_max_fill_curwin)
Dominique Pelleaf4a61a2021-12-27 17:21:41 +0000715 // The current window was set to use the maximum number of filler
Bram Moolenaar841c2252021-10-22 20:56:55 +0100716 // lines, may need to reduce them.
717 diff_set_topline(wp_other, curwin);
718 else if (used_max_fill_other)
Dominique Pelleaf4a61a2021-12-27 17:21:41 +0000719 // The other window was set to use the maximum number of filler
Bram Moolenaar841c2252021-10-22 20:56:55 +0100720 // lines, may need to reduce them.
721 diff_set_topline(curwin, wp_other);
722 }
Bram Moolenaar071d4272004-06-13 20:20:40 +0000723}
724
Bram Moolenaare828b762018-09-10 17:51:58 +0200725 static void
726clear_diffin(diffin_T *din)
727{
728 if (din->din_fname == NULL)
729 {
730 vim_free(din->din_mmfile.ptr);
731 din->din_mmfile.ptr = NULL;
732 }
733 else
734 mch_remove(din->din_fname);
735}
736
737 static void
738clear_diffout(diffout_T *dout)
739{
740 if (dout->dout_fname == NULL)
741 ga_clear_strings(&dout->dout_ga);
742 else
743 mch_remove(dout->dout_fname);
744}
745
Bram Moolenaar071d4272004-06-13 20:20:40 +0000746/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200747 * Write buffer "buf" to a memory buffer.
748 * Return FAIL for failure.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000749 */
750 static int
Bram Moolenaare828b762018-09-10 17:51:58 +0200751diff_write_buffer(buf_T *buf, diffin_T *din)
752{
753 linenr_T lnum;
754 char_u *s;
755 long len = 0;
756 char_u *ptr;
757
758 // xdiff requires one big block of memory with all the text.
759 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
Bram Moolenaar6e272ac2018-09-16 14:51:36 +0200760 len += (long)STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
Bram Moolenaar18a4ba22019-05-24 19:39:03 +0200761 ptr = alloc(len);
Bram Moolenaare828b762018-09-10 17:51:58 +0200762 if (ptr == NULL)
763 {
764 // Allocating memory failed. This can happen, because we try to read
765 // the whole buffer text into memory. Set the failed flag, the diff
766 // will be retried with external diff. The flag is never reset.
767 buf->b_diff_failed = TRUE;
768 if (p_verbose > 0)
769 {
770 verbose_enter();
Bram Moolenaarf9e3e092019-01-13 23:38:42 +0100771 smsg(_("Not enough memory to use internal diff for buffer \"%s\""),
Bram Moolenaare828b762018-09-10 17:51:58 +0200772 buf->b_fname);
773 verbose_leave();
774 }
775 return FAIL;
776 }
777 din->din_mmfile.ptr = (char *)ptr;
778 din->din_mmfile.size = len;
779
780 len = 0;
781 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
782 {
783 for (s = ml_get_buf(buf, lnum, FALSE); *s != NUL; )
784 {
785 if (diff_flags & DIFF_ICASE)
786 {
787 int c;
Bram Moolenaare828b762018-09-10 17:51:58 +0200788 int orig_len;
789 char_u cbuf[MB_MAXBYTES + 1];
790
Bram Moolenaar06f60952021-12-28 18:30:05 +0000791 if (*s == NL)
792 c = NUL;
793 else
794 {
795 // xdiff doesn't support ignoring case, fold-case the text.
796 c = PTR2CHAR(s);
797 c = MB_CASEFOLD(c);
798 }
Bram Moolenaar1614a142019-10-06 22:00:13 +0200799 orig_len = mb_ptr2len(s);
Bram Moolenaare828b762018-09-10 17:51:58 +0200800 if (mb_char2bytes(c, cbuf) != orig_len)
801 // TODO: handle byte length difference
802 mch_memmove(ptr + len, s, orig_len);
803 else
804 mch_memmove(ptr + len, cbuf, orig_len);
805
806 s += orig_len;
807 len += orig_len;
Bram Moolenaare828b762018-09-10 17:51:58 +0200808 }
809 else
Bram Moolenaar06f60952021-12-28 18:30:05 +0000810 {
811 ptr[len++] = *s == NL ? NUL : *s;
812 s++;
813 }
Bram Moolenaare828b762018-09-10 17:51:58 +0200814 }
815 ptr[len++] = NL;
816 }
817 return OK;
818}
819
820/*
821 * Write buffer "buf" to file or memory buffer.
822 * Return FAIL for failure.
823 */
824 static int
825diff_write(buf_T *buf, diffin_T *din)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000826{
827 int r;
828 char_u *save_ff;
Bram Moolenaare1004402020-10-24 20:49:43 +0200829 int save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000830
Bram Moolenaare828b762018-09-10 17:51:58 +0200831 if (din->din_fname == NULL)
832 return diff_write_buffer(buf, din);
833
834 // Always use 'fileformat' set to "unix".
Bram Moolenaar071d4272004-06-13 20:20:40 +0000835 save_ff = buf->b_p_ff;
836 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
Bram Moolenaare1004402020-10-24 20:49:43 +0200837 save_cmod_flags = cmdmod.cmod_flags;
Bram Moolenaarf4a1d1c2019-11-16 13:50:25 +0100838 // Writing the buffer is an implementation detail of performing the diff,
839 // so it shouldn't update the '[ and '] marks.
Bram Moolenaare1004402020-10-24 20:49:43 +0200840 cmdmod.cmod_flags |= CMOD_LOCKMARKS;
Bram Moolenaare828b762018-09-10 17:51:58 +0200841 r = buf_write(buf, din->din_fname, NULL,
842 (linenr_T)1, buf->b_ml.ml_line_count,
843 NULL, FALSE, FALSE, FALSE, TRUE);
Bram Moolenaare1004402020-10-24 20:49:43 +0200844 cmdmod.cmod_flags = save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000845 free_string_option(buf->b_p_ff);
846 buf->b_p_ff = save_ff;
847 return r;
848}
849
850/*
Bram Moolenaare828b762018-09-10 17:51:58 +0200851 * Update the diffs for all buffers involved.
852 */
853 static void
854diff_try_update(
855 diffio_T *dio,
856 int idx_orig,
857 exarg_T *eap) // "eap" can be NULL
858{
859 buf_T *buf;
860 int idx_new;
861
862 if (dio->dio_internal)
863 {
864 ga_init2(&dio->dio_diff.dout_ga, sizeof(char *), 1000);
865 }
866 else
867 {
868 // We need three temp file names.
869 dio->dio_orig.din_fname = vim_tempname('o', TRUE);
870 dio->dio_new.din_fname = vim_tempname('n', TRUE);
871 dio->dio_diff.dout_fname = vim_tempname('d', TRUE);
872 if (dio->dio_orig.din_fname == NULL
873 || dio->dio_new.din_fname == NULL
874 || dio->dio_diff.dout_fname == NULL)
875 goto theend;
876 }
877
878 // Check external diff is actually working.
879 if (!dio->dio_internal && check_external_diff(dio) == FAIL)
880 goto theend;
881
882 // :diffupdate!
883 if (eap != NULL && eap->forceit)
884 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
885 {
886 buf = curtab->tp_diffbuf[idx_new];
887 if (buf_valid(buf))
888 buf_check_timestamp(buf, FALSE);
889 }
890
891 // Write the first buffer to a tempfile or mmfile_t.
892 buf = curtab->tp_diffbuf[idx_orig];
893 if (diff_write(buf, &dio->dio_orig) == FAIL)
894 goto theend;
895
896 // Make a difference between the first buffer and every other.
897 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
898 {
899 buf = curtab->tp_diffbuf[idx_new];
900 if (buf == NULL || buf->b_ml.ml_mfp == NULL)
901 continue; // skip buffer that isn't loaded
902
903 // Write the other buffer and diff with the first one.
904 if (diff_write(buf, &dio->dio_new) == FAIL)
905 continue;
906 if (diff_file(dio) == FAIL)
907 continue;
908
909 // Read the diff output and add each entry to the diff list.
Lewis Russelld9da86e2021-12-28 13:54:41 +0000910 diff_read(idx_orig, idx_new, dio);
Bram Moolenaare828b762018-09-10 17:51:58 +0200911
912 clear_diffin(&dio->dio_new);
913 clear_diffout(&dio->dio_diff);
914 }
915 clear_diffin(&dio->dio_orig);
916
917theend:
918 vim_free(dio->dio_orig.din_fname);
919 vim_free(dio->dio_new.din_fname);
920 vim_free(dio->dio_diff.dout_fname);
921}
922
923/*
924 * Return TRUE if the options are set to use the internal diff library.
925 * Note that if the internal diff failed for one of the buffers, the external
926 * diff will be used anyway.
927 */
Bram Moolenaare3521d92018-09-16 14:10:31 +0200928 int
Bram Moolenaare828b762018-09-10 17:51:58 +0200929diff_internal(void)
930{
Bram Moolenaar975880b2019-03-03 14:42:11 +0100931 return (diff_flags & DIFF_INTERNAL) != 0
932#ifdef FEAT_EVAL
933 && *p_dex == NUL
934#endif
935 ;
Bram Moolenaare828b762018-09-10 17:51:58 +0200936}
937
938/*
939 * Return TRUE if the internal diff failed for one of the diff buffers.
940 */
941 static int
942diff_internal_failed(void)
943{
944 int idx;
945
946 // Only need to do something when there is another buffer.
947 for (idx = 0; idx < DB_COUNT; ++idx)
948 if (curtab->tp_diffbuf[idx] != NULL
949 && curtab->tp_diffbuf[idx]->b_diff_failed)
950 return TRUE;
951 return FALSE;
952}
953
954/*
Bram Moolenaar071d4272004-06-13 20:20:40 +0000955 * Completely update the diffs for the buffers involved.
Bram Moolenaare3521d92018-09-16 14:10:31 +0200956 * When using the external "diff" command the buffers are written to a file,
957 * also for unmodified buffers (the file could have been produced by
958 * autocommands, e.g. the netrw plugin).
Bram Moolenaar071d4272004-06-13 20:20:40 +0000959 */
Bram Moolenaar071d4272004-06-13 20:20:40 +0000960 void
Bram Moolenaare828b762018-09-10 17:51:58 +0200961ex_diffupdate(exarg_T *eap) // "eap" can be NULL
Bram Moolenaar071d4272004-06-13 20:20:40 +0000962{
Bram Moolenaar071d4272004-06-13 20:20:40 +0000963 int idx_orig;
964 int idx_new;
Bram Moolenaare828b762018-09-10 17:51:58 +0200965 diffio_T diffio;
Bram Moolenaar198fa062018-09-18 21:20:26 +0200966 int had_diffs = curtab->tp_first_diff != NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000967
Bram Moolenaard2b58c02018-09-16 18:10:48 +0200968 if (diff_busy)
969 {
970 diff_need_update = TRUE;
971 return;
972 }
973
Bram Moolenaare828b762018-09-10 17:51:58 +0200974 // Delete all diffblocks.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000975 diff_clear(curtab);
976 curtab->tp_diff_invalid = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000977
Bram Moolenaare828b762018-09-10 17:51:58 +0200978 // Use the first buffer as the original text.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000979 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000980 if (curtab->tp_diffbuf[idx_orig] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000981 break;
982 if (idx_orig == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200983 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000984
Bram Moolenaare828b762018-09-10 17:51:58 +0200985 // Only need to do something when there is another buffer.
Bram Moolenaar071d4272004-06-13 20:20:40 +0000986 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +0000987 if (curtab->tp_diffbuf[idx_new] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +0000988 break;
989 if (idx_new == DB_COUNT)
Bram Moolenaar198fa062018-09-18 21:20:26 +0200990 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +0000991
Bram Moolenaare828b762018-09-10 17:51:58 +0200992 // Only use the internal method if it did not fail for one of the buffers.
Bram Moolenaara80faa82020-04-12 19:37:17 +0200993 CLEAR_FIELD(diffio);
Bram Moolenaare828b762018-09-10 17:51:58 +0200994 diffio.dio_internal = diff_internal() && !diff_internal_failed();
Bram Moolenaar071d4272004-06-13 20:20:40 +0000995
Bram Moolenaare828b762018-09-10 17:51:58 +0200996 diff_try_update(&diffio, idx_orig, eap);
997 if (diffio.dio_internal && diff_internal_failed())
998 {
999 // Internal diff failed, use external diff instead.
Bram Moolenaara80faa82020-04-12 19:37:17 +02001000 CLEAR_FIELD(diffio);
Bram Moolenaare828b762018-09-10 17:51:58 +02001001 diff_try_update(&diffio, idx_orig, eap);
1002 }
1003
1004 // force updating cursor position on screen
1005 curwin->w_valid_cursor.lnum = 0;
1006
Bram Moolenaar198fa062018-09-18 21:20:26 +02001007theend:
1008 // A redraw is needed if there were diffs and they were cleared, or there
1009 // are diffs now, which means they got updated.
1010 if (had_diffs || curtab->tp_first_diff != NULL)
1011 {
1012 diff_redraw(TRUE);
1013 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
1014 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001015}
1016
1017/*
1018 * Do a quick test if "diff" really works. Otherwise it looks like there
1019 * are no differences. Can't use the return value, it's non-zero when
1020 * there are differences.
1021 */
1022 static int
1023check_external_diff(diffio_T *diffio)
1024{
1025 FILE *fd;
1026 int ok;
1027 int io_error = FALSE;
1028
1029 // May try twice, first with "-a" and then without.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001030 for (;;)
1031 {
1032 ok = FALSE;
Bram Moolenaare828b762018-09-10 17:51:58 +02001033 fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001034 if (fd == NULL)
1035 io_error = TRUE;
1036 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001037 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001038 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
1039 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001040 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +02001041 fd = mch_fopen((char *)diffio->dio_new.din_fname, "w");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001042 if (fd == NULL)
1043 io_error = TRUE;
1044 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001045 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001046 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
1047 io_error = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001048 fclose(fd);
Bram Moolenaare828b762018-09-10 17:51:58 +02001049 fd = NULL;
1050 if (diff_file(diffio) == OK)
1051 fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r");
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001052 if (fd == NULL)
1053 io_error = TRUE;
1054 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001055 {
1056 char_u linebuf[LBUFLEN];
1057
1058 for (;;)
1059 {
glacambread5c1782021-05-24 14:20:53 +02001060 // For normal diff there must be a line that contains
1061 // "1c1". For unified diff "@@ -1 +1 @@".
Bram Moolenaar00590742019-02-15 21:06:09 +01001062 if (vim_fgets(linebuf, LBUFLEN, fd))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001063 break;
glacambread5c1782021-05-24 14:20:53 +02001064 if (STRNCMP(linebuf, "1c1", 3) == 0
1065 || STRNCMP(linebuf, "@@ -1 +1 @@", 11) == 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001066 ok = TRUE;
1067 }
1068 fclose(fd);
1069 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001070 mch_remove(diffio->dio_diff.dout_fname);
1071 mch_remove(diffio->dio_new.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001072 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001073 mch_remove(diffio->dio_orig.din_fname);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001074 }
1075
1076#ifdef FEAT_EVAL
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001077 // When using 'diffexpr' break here.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001078 if (*p_dex != NUL)
1079 break;
1080#endif
1081
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001082#if defined(MSWIN)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001083 // If the "-a" argument works, also check if "--binary" works.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001084 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
1085 {
1086 diff_a_works = TRUE;
1087 diff_bin_works = TRUE;
1088 continue;
1089 }
1090 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
1091 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001092 // Tried --binary, but it failed. "-a" works though.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001093 diff_bin_works = FALSE;
1094 ok = TRUE;
1095 }
1096#endif
1097
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001098 // If we checked if "-a" works already, break here.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001099 if (diff_a_works != MAYBE)
1100 break;
1101 diff_a_works = ok;
1102
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001103 // If "-a" works break here, otherwise retry without "-a".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001104 if (ok)
1105 break;
1106 }
1107 if (!ok)
1108 {
Bram Moolenaarfe86f2d2008-11-28 20:29:07 +00001109 if (io_error)
Bram Moolenaar9d00e4a2022-01-05 17:49:15 +00001110 emsg(_(e_cannot_read_or_write_temp_files));
Bram Moolenaare1242042021-12-16 20:56:57 +00001111 emsg(_(e_cannot_create_diffs));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001112 diff_a_works = MAYBE;
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001113#if defined(MSWIN)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001114 diff_bin_works = MAYBE;
1115#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001116 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001117 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001118 return OK;
1119}
Bram Moolenaar071d4272004-06-13 20:20:40 +00001120
Bram Moolenaare828b762018-09-10 17:51:58 +02001121/*
1122 * Invoke the xdiff function.
1123 */
1124 static int
1125diff_file_internal(diffio_T *diffio)
1126{
1127 xpparam_t param;
1128 xdemitconf_t emit_cfg;
1129 xdemitcb_t emit_cb;
Bram Moolenaarbd1d5602012-05-18 18:47:17 +02001130
Bram Moolenaara80faa82020-04-12 19:37:17 +02001131 CLEAR_FIELD(param);
1132 CLEAR_FIELD(emit_cfg);
1133 CLEAR_FIELD(emit_cb);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001134
Bram Moolenaare828b762018-09-10 17:51:58 +02001135 param.flags = diff_algorithm;
1136
1137 if (diff_flags & DIFF_IWHITE)
1138 param.flags |= XDF_IGNORE_WHITESPACE_CHANGE;
Bram Moolenaar785fc652018-09-15 19:17:38 +02001139 if (diff_flags & DIFF_IWHITEALL)
1140 param.flags |= XDF_IGNORE_WHITESPACE;
1141 if (diff_flags & DIFF_IWHITEEOL)
1142 param.flags |= XDF_IGNORE_WHITESPACE_AT_EOL;
1143 if (diff_flags & DIFF_IBLANK)
1144 param.flags |= XDF_IGNORE_BLANK_LINES;
Bram Moolenaare828b762018-09-10 17:51:58 +02001145
1146 emit_cfg.ctxlen = 0; // don't need any diff_context here
1147 emit_cb.priv = &diffio->dio_diff;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001148 emit_cfg.hunk_func = xdiff_out;
Bram Moolenaare828b762018-09-10 17:51:58 +02001149 if (xdl_diff(&diffio->dio_orig.din_mmfile,
1150 &diffio->dio_new.din_mmfile,
1151 &param, &emit_cfg, &emit_cb) < 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001152 {
Bram Moolenaard82a47d2022-01-05 20:24:39 +00001153 emsg(_(e_problem_creating_internal_diff));
Bram Moolenaare828b762018-09-10 17:51:58 +02001154 return FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001155 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001156 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001157}
1158
1159/*
1160 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
Bram Moolenaare828b762018-09-10 17:51:58 +02001161 * return OK or FAIL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001162 */
Bram Moolenaare828b762018-09-10 17:51:58 +02001163 static int
1164diff_file(diffio_T *dio)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001165{
1166 char_u *cmd;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001167 size_t len;
Bram Moolenaare828b762018-09-10 17:51:58 +02001168 char_u *tmp_orig = dio->dio_orig.din_fname;
1169 char_u *tmp_new = dio->dio_new.din_fname;
1170 char_u *tmp_diff = dio->dio_diff.dout_fname;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001171
1172#ifdef FEAT_EVAL
1173 if (*p_dex != NUL)
Bram Moolenaare828b762018-09-10 17:51:58 +02001174 {
1175 // Use 'diffexpr' to generate the diff file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001176 eval_diff(tmp_orig, tmp_new, tmp_diff);
Bram Moolenaare828b762018-09-10 17:51:58 +02001177 return OK;
1178 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001179 else
1180#endif
Bram Moolenaare828b762018-09-10 17:51:58 +02001181 // Use xdiff for generating the diff.
1182 if (dio->dio_internal)
Bram Moolenaare828b762018-09-10 17:51:58 +02001183 return diff_file_internal(dio);
Bram Moolenaar95fb60a2005-03-08 22:29:20 +00001184
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001185 len = STRLEN(tmp_orig) + STRLEN(tmp_new)
1186 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
1187 cmd = alloc(len);
1188 if (cmd == NULL)
1189 return FAIL;
Bram Moolenaare828b762018-09-10 17:51:58 +02001190
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001191 // We don't want $DIFF_OPTIONS to get in the way.
1192 if (getenv("DIFF_OPTIONS"))
1193 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
1194
1195 // Build the diff command and execute it. Always use -a, binary
1196 // differences are of no use. Ignore errors, diff returns
1197 // non-zero when differences have been found.
1198 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s%s%s%s %s",
1199 diff_a_works == FALSE ? "" : "-a ",
Bram Moolenaar48e330a2016-02-23 14:53:34 +01001200#if defined(MSWIN)
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001201 diff_bin_works == TRUE ? "--binary " : "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001202#else
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001203 "",
Bram Moolenaar071d4272004-06-13 20:20:40 +00001204#endif
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001205 (diff_flags & DIFF_IWHITE) ? "-b " : "",
1206 (diff_flags & DIFF_IWHITEALL) ? "-w " : "",
1207 (diff_flags & DIFF_IWHITEEOL) ? "-Z " : "",
1208 (diff_flags & DIFF_IBLANK) ? "-B " : "",
1209 (diff_flags & DIFF_ICASE) ? "-i " : "",
1210 tmp_orig, tmp_new);
1211 append_redir(cmd, (int)len, p_srr, tmp_diff);
1212 block_autocmds(); // avoid ShellCmdPost stuff
1213 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
1214 unblock_autocmds();
1215 vim_free(cmd);
1216 return OK;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001217}
1218
1219/*
1220 * Create a new version of a file from the current buffer and a diff file.
1221 * The buffer is written to a file, also for unmodified buffers (the file
1222 * could have been produced by autocommands, e.g. the netrw plugin).
1223 */
1224 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001225ex_diffpatch(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001226{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001227 char_u *tmp_orig; // name of original temp file
1228 char_u *tmp_new; // name of patched temp file
Bram Moolenaar071d4272004-06-13 20:20:40 +00001229 char_u *buf = NULL;
Bram Moolenaar5fd0ca72009-05-13 16:56:33 +00001230 size_t buflen;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001231 win_T *old_curwin = curwin;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001232 char_u *newname = NULL; // name of patched file buffer
Bram Moolenaar071d4272004-06-13 20:20:40 +00001233#ifdef UNIX
1234 char_u dirbuf[MAXPATHL];
1235 char_u *fullname = NULL;
1236#endif
1237#ifdef FEAT_BROWSE
1238 char_u *browseFile = NULL;
Bram Moolenaare1004402020-10-24 20:49:43 +02001239 int save_cmod_flags = cmdmod.cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001240#endif
Bram Moolenaar8767f522016-07-01 17:17:39 +02001241 stat_T st;
Bram Moolenaara95ab322017-03-11 19:21:53 +01001242 char_u *esc_name = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001243
1244#ifdef FEAT_BROWSE
Bram Moolenaare1004402020-10-24 20:49:43 +02001245 if (cmdmod.cmod_flags & CMOD_BROWSE)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001246 {
Bram Moolenaar7171abe2004-10-11 10:06:20 +00001247 browseFile = do_browse(0, (char_u *)_("Patch file"),
Bram Moolenaarc36651b2018-04-29 12:22:56 +02001248 eap->arg, NULL, NULL,
1249 (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001250 if (browseFile == NULL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001251 return; // operation cancelled
Bram Moolenaar071d4272004-06-13 20:20:40 +00001252 eap->arg = browseFile;
Bram Moolenaare1004402020-10-24 20:49:43 +02001253 cmdmod.cmod_flags &= ~CMOD_BROWSE; // don't let do_ecmd() browse again
Bram Moolenaar071d4272004-06-13 20:20:40 +00001254 }
1255#endif
1256
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001257 // We need two temp file names.
Bram Moolenaare5c421c2015-03-31 13:33:08 +02001258 tmp_orig = vim_tempname('o', FALSE);
1259 tmp_new = vim_tempname('n', FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001260 if (tmp_orig == NULL || tmp_new == NULL)
1261 goto theend;
1262
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001263 // Write the current buffer to "tmp_orig".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001264 if (buf_write(curbuf, tmp_orig, NULL,
1265 (linenr_T)1, curbuf->b_ml.ml_line_count,
1266 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
1267 goto theend;
1268
1269#ifdef UNIX
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001270 // Get the absolute path of the patchfile, changing directory below.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001271 fullname = FullName_save(eap->arg, FALSE);
1272#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001273 esc_name = vim_strsave_shellescape(
Bram Moolenaar071d4272004-06-13 20:20:40 +00001274# ifdef UNIX
Bram Moolenaara95ab322017-03-11 19:21:53 +01001275 fullname != NULL ? fullname :
Bram Moolenaar071d4272004-06-13 20:20:40 +00001276# endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001277 eap->arg, TRUE, TRUE);
1278 if (esc_name == NULL)
1279 goto theend;
1280 buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16;
Bram Moolenaar964b3742019-05-24 18:54:09 +02001281 buf = alloc(buflen);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001282 if (buf == NULL)
1283 goto theend;
1284
1285#ifdef UNIX
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001286 // Temporarily chdir to /tmp, to avoid patching files in the current
1287 // directory when the patch file contains more than one patch. When we
1288 // have our own temp dir use that instead, it will be cleaned up when we
1289 // exit (any .rej files created). Don't change directory if we can't
1290 // return to the current.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001291 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
1292 dirbuf[0] = NUL;
1293 else
1294 {
1295# ifdef TEMPDIRNAMES
1296 if (vim_tempdir != NULL)
Bram Moolenaar42335f52018-09-13 15:33:43 +02001297 vim_ignored = mch_chdir((char *)vim_tempdir);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001298 else
1299# endif
Bram Moolenaar42335f52018-09-13 15:33:43 +02001300 vim_ignored = mch_chdir("/tmp");
Bram Moolenaar071d4272004-06-13 20:20:40 +00001301 shorten_fnames(TRUE);
1302 }
1303#endif
1304
1305#ifdef FEAT_EVAL
1306 if (*p_pex != NUL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001307 // Use 'patchexpr' to generate the new file.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001308 eval_patch(tmp_orig,
1309# ifdef UNIX
1310 fullname != NULL ? fullname :
1311# endif
1312 eap->arg, tmp_new);
1313 else
1314#endif
1315 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001316 // Build the patch command and execute it. Ignore errors. Switch to
1317 // cooked mode to allow the user to respond to prompts.
Bram Moolenaara95ab322017-03-11 19:21:53 +01001318 vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s",
1319 tmp_new, tmp_orig, esc_name);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001320 block_autocmds(); // Avoid ShellCmdPost stuff
Bram Moolenaar071d4272004-06-13 20:20:40 +00001321 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
Bram Moolenaar78ab3312007-09-29 12:16:41 +00001322 unblock_autocmds();
Bram Moolenaar071d4272004-06-13 20:20:40 +00001323 }
1324
1325#ifdef UNIX
1326 if (dirbuf[0] != NUL)
1327 {
1328 if (mch_chdir((char *)dirbuf) != 0)
Bram Moolenaar460ae5d2022-01-01 14:19:49 +00001329 emsg(_(e_cannot_go_back_to_previous_directory));
Bram Moolenaar071d4272004-06-13 20:20:40 +00001330 shorten_fnames(TRUE);
1331 }
1332#endif
1333
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001334 // patch probably has written over the screen
Bram Moolenaara4d158b2022-08-14 14:17:45 +01001335 redraw_later(UPD_CLEAR);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001336
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001337 // Delete any .orig or .rej file created.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001338 STRCPY(buf, tmp_new);
1339 STRCAT(buf, ".orig");
1340 mch_remove(buf);
1341 STRCPY(buf, tmp_new);
1342 STRCAT(buf, ".rej");
1343 mch_remove(buf);
1344
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001345 // Only continue if the output file was created.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001346 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
Bram Moolenaar9d00e4a2022-01-05 17:49:15 +00001347 emsg(_(e_cannot_read_patch_output));
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001348 else
Bram Moolenaar071d4272004-06-13 20:20:40 +00001349 {
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001350 if (curbuf->b_fname != NULL)
1351 {
1352 newname = vim_strnsave(curbuf->b_fname,
Bram Moolenaardf44a272020-06-07 20:49:05 +02001353 STRLEN(curbuf->b_fname) + 4);
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001354 if (newname != NULL)
1355 STRCAT(newname, ".new");
1356 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001357
1358#ifdef FEAT_GUI
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001359 need_mouse_correct = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001360#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001361 // don't use a new tab page, each tab page has its own diffs
Bram Moolenaare1004402020-10-24 20:49:43 +02001362 cmdmod.cmod_tab = 0;
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001363
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001364 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001365 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001366 // Pretend it was a ":split fname" command
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001367 eap->cmdidx = CMD_split;
1368 eap->arg = tmp_new;
1369 do_exedit(eap, old_curwin);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001370
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001371 // check that split worked and editing tmp_new
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001372 if (curwin != old_curwin && win_valid(old_curwin))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001373 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001374 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001375 diff_win_options(curwin, TRUE);
1376 diff_win_options(old_curwin, TRUE);
1377
1378 if (newname != NULL)
1379 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001380 // do a ":file filename.new" on the patched buffer
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001381 eap->arg = newname;
1382 ex_file(eap);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001383
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001384 // Do filetype detection with the new name.
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001385 if (au_has_group((char_u *)"filetypedetect"))
1386 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
Bram Moolenaar6ec0a6c2009-07-22 14:23:13 +00001387 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001388 }
1389 }
1390 }
1391
1392theend:
1393 if (tmp_orig != NULL)
1394 mch_remove(tmp_orig);
1395 vim_free(tmp_orig);
1396 if (tmp_new != NULL)
1397 mch_remove(tmp_new);
1398 vim_free(tmp_new);
1399 vim_free(newname);
1400 vim_free(buf);
1401#ifdef UNIX
1402 vim_free(fullname);
1403#endif
Bram Moolenaara95ab322017-03-11 19:21:53 +01001404 vim_free(esc_name);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001405#ifdef FEAT_BROWSE
1406 vim_free(browseFile);
Bram Moolenaare1004402020-10-24 20:49:43 +02001407 cmdmod.cmod_flags = save_cmod_flags;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001408#endif
1409}
1410
1411/*
1412 * Split the window and edit another file, setting options to show the diffs.
1413 */
1414 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001415ex_diffsplit(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001416{
1417 win_T *old_curwin = curwin;
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001418 bufref_T old_curbuf;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001419
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001420 set_bufref(&old_curbuf, curbuf);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001421#ifdef FEAT_GUI
1422 need_mouse_correct = TRUE;
1423#endif
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001424 // Need to compute w_fraction when no redraw happened yet.
Bram Moolenaar46328f92016-08-28 15:39:57 +02001425 validate_cursor();
1426 set_fraction(curwin);
1427
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001428 // don't use a new tab page, each tab page has its own diffs
Bram Moolenaare1004402020-10-24 20:49:43 +02001429 cmdmod.cmod_tab = 0;
Bram Moolenaar80a94a52006-02-23 21:26:58 +00001430
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001431 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) == FAIL)
1432 return;
1433
1434 // Pretend it was a ":split fname" command
1435 eap->cmdidx = CMD_split;
1436 curwin->w_p_diff = TRUE;
1437 do_exedit(eap, old_curwin);
1438
1439 if (curwin == old_curwin) // split didn't work
1440 return;
1441
1442 // Set 'diff', 'scrollbind' on and 'wrap' off.
1443 diff_win_options(curwin, TRUE);
1444 if (win_valid(old_curwin))
Bram Moolenaar071d4272004-06-13 20:20:40 +00001445 {
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001446 diff_win_options(old_curwin, TRUE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001447
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001448 if (bufref_valid(&old_curbuf))
1449 // Move the cursor position to that of the old window.
1450 curwin->w_cursor.lnum = diff_get_corresponding_line(
1451 old_curbuf.br_buf, old_curwin->w_cursor.lnum);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001452 }
Yegappan Lakshmanan465de3a2022-12-26 12:50:04 +00001453 // Now that lines are folded scroll to show the cursor at the same
1454 // relative position.
1455 scroll_to_fraction(curwin, curwin->w_height);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001456}
1457
1458/*
Bram Moolenaar84a05ac2013-05-06 04:24:17 +02001459 * Set options to show diffs for the current window.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001460 */
Bram Moolenaar071d4272004-06-13 20:20:40 +00001461 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001462ex_diffthis(exarg_T *eap UNUSED)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001463{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001464 // Set 'diff', 'scrollbind' on and 'wrap' off.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001465 diff_win_options(curwin, TRUE);
1466}
1467
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001468 static void
1469set_diff_option(win_T *wp, int value)
1470{
1471 win_T *old_curwin = curwin;
1472
1473 curwin = wp;
1474 curbuf = curwin->w_buffer;
1475 ++curbuf_lock;
Bram Moolenaar31e5c602022-04-15 13:53:33 +01001476 set_option_value_give_err((char_u *)"diff", (long)value, NULL, OPT_LOCAL);
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001477 --curbuf_lock;
1478 curwin = old_curwin;
1479 curbuf = curwin->w_buffer;
1480}
1481
Bram Moolenaar071d4272004-06-13 20:20:40 +00001482/*
1483 * Set options in window "wp" for diff mode.
1484 */
1485 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001486diff_win_options(
1487 win_T *wp,
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001488 int addbuf) // Add buffer to diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001489{
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001490# ifdef FEAT_FOLDING
1491 win_T *old_curwin = curwin;
1492
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001493 // close the manually opened folds
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001494 curwin = wp;
1495 newFoldLevel();
1496 curwin = old_curwin;
1497# endif
1498
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001499 // Use 'scrollbind' and 'cursorbind' when available
Bram Moolenaar43929962015-07-03 15:06:56 +02001500 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001501 wp->w_p_scb_save = wp->w_p_scb;
Bram Moolenaar3368ea22010-09-21 16:56:35 +02001502 wp->w_p_scb = TRUE;
Bram Moolenaar43929962015-07-03 15:06:56 +02001503 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001504 wp->w_p_crb_save = wp->w_p_crb;
Bram Moolenaar860cae12010-06-05 23:22:07 +02001505 wp->w_p_crb = TRUE;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001506 if (!(diff_flags & DIFF_FOLLOWWRAP))
1507 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001508 if (!wp->w_p_diff)
Bram Moolenaar4223d432021-02-10 13:18:17 +01001509 wp->w_p_wrap_save = wp->w_p_wrap;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001510 wp->w_p_wrap = FALSE;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001511 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001512# ifdef FEAT_FOLDING
Bram Moolenaar43929962015-07-03 15:06:56 +02001513 if (!wp->w_p_diff)
1514 {
1515 if (wp->w_p_diff_saved)
1516 free_string_option(wp->w_p_fdm_save);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001517 wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm);
Bram Moolenaar43929962015-07-03 15:06:56 +02001518 }
Bram Moolenaar20c023a2019-05-26 21:03:24 +02001519 set_string_option_direct_in_win(wp, (char_u *)"fdm", -1, (char_u *)"diff",
Bram Moolenaar5e3cb7e2006-02-27 23:58:35 +00001520 OPT_LOCAL|OPT_FREE, 0);
Bram Moolenaar43929962015-07-03 15:06:56 +02001521 if (!wp->w_p_diff)
Bram Moolenaara87aa802013-07-03 15:47:03 +02001522 {
1523 wp->w_p_fdc_save = wp->w_p_fdc;
1524 wp->w_p_fen_save = wp->w_p_fen;
1525 wp->w_p_fdl_save = wp->w_p_fdl;
1526 }
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001527 wp->w_p_fdc = diff_foldcolumn;
1528 wp->w_p_fen = TRUE;
1529 wp->w_p_fdl = 0;
1530 foldUpdateAll(wp);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001531 // make sure topline is not halfway a fold
Bram Moolenaarf4d7f942010-02-24 14:34:19 +01001532 changed_window_setting_win(wp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001533# endif
Bram Moolenaar071d4272004-06-13 20:20:40 +00001534 if (vim_strchr(p_sbo, 'h') == NULL)
1535 do_cmdline_cmd((char_u *)"set sbo+=hor");
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001536 // Save the current values, to be restored in ex_diffoff().
Bram Moolenaara87aa802013-07-03 15:47:03 +02001537 wp->w_p_diff_saved = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001538
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001539 set_diff_option(wp, TRUE);
Bram Moolenaar43929962015-07-03 15:06:56 +02001540
Bram Moolenaar071d4272004-06-13 20:20:40 +00001541 if (addbuf)
1542 diff_buf_add(wp->w_buffer);
Bram Moolenaara4d158b2022-08-14 14:17:45 +01001543 redraw_win_later(wp, UPD_NOT_VALID);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001544}
1545
1546/*
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001547 * Set options not to show diffs. For the current window or all windows.
Bram Moolenaarf740b292006-02-16 22:11:02 +00001548 * Only in the current tab page.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001549 */
1550 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001551ex_diffoff(exarg_T *eap)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001552{
1553 win_T *wp;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001554 int diffwin = FALSE;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001555
Bram Moolenaar29323592016-07-24 22:04:11 +02001556 FOR_ALL_WINDOWS(wp)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001557 {
Bram Moolenaar00462ff2013-09-20 20:13:53 +02001558 if (eap->forceit ? wp->w_p_diff : wp == curwin)
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001559 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001560 // Set 'diff' off. If option values were saved in
1561 // diff_win_options(), restore the ones whose settings seem to have
1562 // been left over from diff mode.
Bram Moolenaar04f62f82017-07-19 18:18:39 +02001563 set_diff_option(wp, FALSE);
Bram Moolenaara87aa802013-07-03 15:47:03 +02001564
Bram Moolenaara87aa802013-07-03 15:47:03 +02001565 if (wp->w_p_diff_saved)
1566 {
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001567
Bram Moolenaar43929962015-07-03 15:06:56 +02001568 if (wp->w_p_scb)
1569 wp->w_p_scb = wp->w_p_scb_save;
Bram Moolenaar43929962015-07-03 15:06:56 +02001570 if (wp->w_p_crb)
1571 wp->w_p_crb = wp->w_p_crb_save;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001572 if (!(diff_flags & DIFF_FOLLOWWRAP))
1573 {
1574 if (!wp->w_p_wrap)
Lewis Russelld9da86e2021-12-28 13:54:41 +00001575 wp->w_p_wrap = wp->w_p_wrap_save;
Bram Moolenaar4223d432021-02-10 13:18:17 +01001576 }
Bram Moolenaar43929962015-07-03 15:06:56 +02001577#ifdef FEAT_FOLDING
1578 free_string_option(wp->w_p_fdm);
Bram Moolenaar79a213d2017-05-16 13:15:18 +02001579 wp->w_p_fdm = vim_strsave(
1580 *wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u*)"manual");
Bram Moolenaar43929962015-07-03 15:06:56 +02001581
1582 if (wp->w_p_fdc == diff_foldcolumn)
1583 wp->w_p_fdc = wp->w_p_fdc_save;
1584 if (wp->w_p_fdl == 0)
1585 wp->w_p_fdl = wp->w_p_fdl_save;
1586
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001587 // Only restore 'foldenable' when 'foldmethod' is not
1588 // "manual", otherwise we continue to show the diff folds.
Bram Moolenaar43929962015-07-03 15:06:56 +02001589 if (wp->w_p_fen)
1590 wp->w_p_fen = foldmethodIsManual(wp) ? FALSE
1591 : wp->w_p_fen_save;
1592
1593 foldUpdateAll(wp);
Bram Moolenaar43929962015-07-03 15:06:56 +02001594#endif
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001595 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001596 // remove filler lines
Bram Moolenaare67d5462016-08-27 22:40:42 +02001597 wp->w_topfill = 0;
1598
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001599 // make sure topline is not halfway a fold and cursor is
1600 // invalidated
Bram Moolenaare67d5462016-08-27 22:40:42 +02001601 changed_window_setting_win(wp);
Bram Moolenaar33ca6bf2013-07-17 13:43:39 +02001602
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001603 // Note: 'sbo' is not restored, it's a global option.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001604 diff_buf_adjust(wp);
1605 }
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001606 diffwin |= wp->w_p_diff;
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001607 }
1608
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001609 // Also remove hidden buffers from the list.
Bram Moolenaar25ea0542017-02-03 23:16:28 +01001610 if (eap->forceit)
1611 diff_buf_clear();
1612
Bram Moolenaarc8234772019-11-10 21:00:27 +01001613 if (!diffwin)
1614 {
1615 diff_need_update = FALSE;
1616 curtab->tp_diff_invalid = FALSE;
1617 curtab->tp_diff_update = FALSE;
1618 diff_clear(curtab);
1619 }
1620
Dominique Pelleaf4a61a2021-12-27 17:21:41 +00001621 // Remove "hor" from 'scrollopt' if there are no diff windows left.
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001622 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
1623 do_cmdline_cmd((char_u *)"set sbo-=hor");
Bram Moolenaar2df6dcc2004-07-12 15:53:54 +00001624}
1625
1626/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00001627 * Read the diff output and add each entry to the diff list.
1628 */
1629 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001630diff_read(
Bram Moolenaare828b762018-09-10 17:51:58 +02001631 int idx_orig, // idx of original file
1632 int idx_new, // idx of new file
Lewis Russelld9da86e2021-12-28 13:54:41 +00001633 diffio_T *dio) // diff output
Bram Moolenaar071d4272004-06-13 20:20:40 +00001634{
Bram Moolenaare828b762018-09-10 17:51:58 +02001635 FILE *fd = NULL;
1636 int line_idx = 0;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001637 diff_T *dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001638 diff_T *dp = curtab->tp_first_diff;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001639 diff_T *dn, *dpl;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001640 diffout_T *dout = &dio->dio_diff;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001641 char_u linebuf[LBUFLEN]; // only need to hold the diff line
Bram Moolenaare828b762018-09-10 17:51:58 +02001642 char_u *line;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001643 long off;
1644 int i;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001645 int notset = TRUE; // block "*dp" not set yet
Bram Moolenaar49166972021-12-30 10:51:45 +00001646 diffhunk_T *hunk = NULL; // init to avoid gcc warning
Lewis Russelld9da86e2021-12-28 13:54:41 +00001647
Bram Moolenaare828b762018-09-10 17:51:58 +02001648 enum {
1649 DIFF_ED,
1650 DIFF_UNIFIED,
1651 DIFF_NONE
1652 } diffstyle = DIFF_NONE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001653
Bram Moolenaare828b762018-09-10 17:51:58 +02001654 if (dout->dout_fname == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001655 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001656 diffstyle = DIFF_UNIFIED;
1657 }
1658 else
1659 {
1660 fd = mch_fopen((char *)dout->dout_fname, "r");
1661 if (fd == NULL)
1662 {
Bram Moolenaare1242042021-12-16 20:56:57 +00001663 emsg(_(e_cannot_read_diff_output));
Bram Moolenaare828b762018-09-10 17:51:58 +02001664 return;
1665 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00001666 }
1667
Lewis Russelld9da86e2021-12-28 13:54:41 +00001668 if (!dio->dio_internal)
1669 {
1670 hunk = ALLOC_ONE(diffhunk_T);
1671 if (hunk == NULL)
Bram Moolenaar5d46dcf2022-03-25 14:46:47 +00001672 {
1673 if (fd != NULL)
1674 fclose(fd);
Lewis Russelld9da86e2021-12-28 13:54:41 +00001675 return;
Bram Moolenaar5d46dcf2022-03-25 14:46:47 +00001676 }
Lewis Russelld9da86e2021-12-28 13:54:41 +00001677 }
1678
Bram Moolenaar071d4272004-06-13 20:20:40 +00001679 for (;;)
1680 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001681 if (dio->dio_internal)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001682 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001683 if (line_idx >= dout->dout_ga.ga_len) {
1684 break; // did last line
1685 }
1686 hunk = ((diffhunk_T **)dout->dout_ga.ga_data)[line_idx++];
Bram Moolenaar071d4272004-06-13 20:20:40 +00001687 }
1688 else
1689 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00001690 if (fd == NULL)
1691 {
1692 if (line_idx >= dout->dout_ga.ga_len)
1693 break; // did last line
1694 line = ((char_u **)dout->dout_ga.ga_data)[line_idx++];
1695 }
Bram Moolenaar3b8defd2018-09-13 13:03:11 +02001696 else
Lewis Russelld9da86e2021-12-28 13:54:41 +00001697 {
1698 if (vim_fgets(linebuf, LBUFLEN, fd))
1699 break; // end of file
1700 line = linebuf;
1701 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001702
Lewis Russelld9da86e2021-12-28 13:54:41 +00001703 if (diffstyle == DIFF_NONE)
1704 {
1705 // Determine diff style.
1706 // ed like diff looks like this:
1707 // {first}[,{last}]c{first}[,{last}]
1708 // {first}a{first}[,{last}]
1709 // {first}[,{last}]d{first}
1710 //
1711 // unified diff looks like this:
1712 // --- file1 2018-03-20 13:23:35.783153140 +0100
1713 // +++ file2 2018-03-20 13:23:41.183156066 +0100
1714 // @@ -1,3 +1,5 @@
1715 if (isdigit(*line))
1716 diffstyle = DIFF_ED;
1717 else if ((STRNCMP(line, "@@ ", 3) == 0))
1718 diffstyle = DIFF_UNIFIED;
1719 else if ((STRNCMP(line, "--- ", 4) == 0)
1720 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
1721 && (STRNCMP(line, "+++ ", 4) == 0)
1722 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
1723 && (STRNCMP(line, "@@ ", 3) == 0))
1724 diffstyle = DIFF_UNIFIED;
1725 else
1726 // Format not recognized yet, skip over this line. Cygwin
1727 // diff may put a warning at the start of the file.
1728 continue;
1729 }
1730
1731 if (diffstyle == DIFF_ED)
1732 {
1733 if (!isdigit(*line))
1734 continue; // not the start of a diff block
1735 if (parse_diff_ed(line, hunk) == FAIL)
1736 continue;
1737 }
1738 else if (diffstyle == DIFF_UNIFIED)
1739 {
1740 if (STRNCMP(line, "@@ ", 3) != 0)
1741 continue; // not the start of a diff block
1742 if (parse_diff_unified(line, hunk) == FAIL)
1743 continue;
1744 }
1745 else
1746 {
Bram Moolenaard82a47d2022-01-05 20:24:39 +00001747 emsg(_(e_invalid_diff_format));
Lewis Russelld9da86e2021-12-28 13:54:41 +00001748 break;
1749 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001750 }
1751
1752 // Go over blocks before the change, for which orig and new are equal.
1753 // Copy blocks from orig to new.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001754 while (dp != NULL
Lewis Russelld9da86e2021-12-28 13:54:41 +00001755 && hunk->lnum_orig > dp->df_lnum[idx_orig]
1756 + dp->df_count[idx_orig])
Bram Moolenaar071d4272004-06-13 20:20:40 +00001757 {
1758 if (notset)
1759 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1760 dprev = dp;
1761 dp = dp->df_next;
1762 notset = TRUE;
1763 }
1764
1765 if (dp != NULL
Lewis Russelld9da86e2021-12-28 13:54:41 +00001766 && hunk->lnum_orig <= dp->df_lnum[idx_orig]
1767 + dp->df_count[idx_orig]
1768 && hunk->lnum_orig + hunk->count_orig >= dp->df_lnum[idx_orig])
Bram Moolenaar071d4272004-06-13 20:20:40 +00001769 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001770 // New block overlaps with existing block(s).
1771 // First find last block that overlaps.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001772 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
Lewis Russelld9da86e2021-12-28 13:54:41 +00001773 if (hunk->lnum_orig + hunk->count_orig
1774 < dpl->df_next->df_lnum[idx_orig])
Bram Moolenaar071d4272004-06-13 20:20:40 +00001775 break;
1776
Bram Moolenaare828b762018-09-10 17:51:58 +02001777 // If the newly found block starts before the old one, set the
1778 // start back a number of lines.
Lewis Russelld9da86e2021-12-28 13:54:41 +00001779 off = dp->df_lnum[idx_orig] - hunk->lnum_orig;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001780 if (off > 0)
1781 {
1782 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001783 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001784 dp->df_lnum[i] -= off;
Lewis Russelld9da86e2021-12-28 13:54:41 +00001785 dp->df_lnum[idx_new] = hunk->lnum_new;
1786 dp->df_count[idx_new] = hunk->count_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001787 }
1788 else if (notset)
1789 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001790 // new block inside existing one, adjust new block
Lewis Russelld9da86e2021-12-28 13:54:41 +00001791 dp->df_lnum[idx_new] = hunk->lnum_new + off;
1792 dp->df_count[idx_new] = hunk->count_new - off;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001793 }
1794 else
Bram Moolenaare828b762018-09-10 17:51:58 +02001795 // second overlap of new block with existing block
Lewis Russelld9da86e2021-12-28 13:54:41 +00001796 dp->df_count[idx_new] += hunk->count_new - hunk->count_orig
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00001797 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
1798 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001799
Bram Moolenaare828b762018-09-10 17:51:58 +02001800 // Adjust the size of the block to include all the lines to the
1801 // end of the existing block or the new diff, whatever ends last.
Lewis Russelld9da86e2021-12-28 13:54:41 +00001802 off = (hunk->lnum_orig + hunk->count_orig)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001803 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
1804 if (off < 0)
1805 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001806 // new change ends in existing block, adjust the end if not
1807 // done already
Bram Moolenaar071d4272004-06-13 20:20:40 +00001808 if (notset)
1809 dp->df_count[idx_new] += -off;
1810 off = 0;
1811 }
Bram Moolenaard4b96bc2007-10-19 15:33:39 +00001812 for (i = idx_orig; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001813 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001814 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
1815 - dp->df_lnum[i] + off;
1816
Bram Moolenaare828b762018-09-10 17:51:58 +02001817 // Delete the diff blocks that have been merged into one.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001818 dn = dp->df_next;
1819 dp->df_next = dpl->df_next;
1820 while (dn != dp->df_next)
1821 {
1822 dpl = dn->df_next;
1823 vim_free(dn);
1824 dn = dpl;
1825 }
1826 }
1827 else
1828 {
Bram Moolenaare828b762018-09-10 17:51:58 +02001829 // Allocate a new diffblock.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001830 dp = diff_alloc_new(curtab, dprev, dp);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001831 if (dp == NULL)
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001832 goto done;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001833
Lewis Russelld9da86e2021-12-28 13:54:41 +00001834 dp->df_lnum[idx_orig] = hunk->lnum_orig;
1835 dp->df_count[idx_orig] = hunk->count_orig;
1836 dp->df_lnum[idx_new] = hunk->lnum_new;
1837 dp->df_count[idx_new] = hunk->count_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001838
Bram Moolenaare828b762018-09-10 17:51:58 +02001839 // Set values for other buffers, these must be equal to the
1840 // original buffer, otherwise there would have been a change
1841 // already.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001842 for (i = idx_orig + 1; i < idx_new; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001843 if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001844 diff_copy_entry(dprev, dp, idx_orig, i);
1845 }
Bram Moolenaare828b762018-09-10 17:51:58 +02001846 notset = FALSE; // "*dp" has been set
Bram Moolenaar071d4272004-06-13 20:20:40 +00001847 }
1848
Bram Moolenaare828b762018-09-10 17:51:58 +02001849 // for remaining diff blocks orig and new are equal
Bram Moolenaar071d4272004-06-13 20:20:40 +00001850 while (dp != NULL)
1851 {
1852 if (notset)
1853 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1854 dprev = dp;
1855 dp = dp->df_next;
1856 notset = TRUE;
1857 }
1858
Bram Moolenaareb3593b2006-04-22 22:33:57 +00001859done:
Lewis Russelld9da86e2021-12-28 13:54:41 +00001860 if (!dio->dio_internal)
1861 vim_free(hunk);
1862
Bram Moolenaare828b762018-09-10 17:51:58 +02001863 if (fd != NULL)
1864 fclose(fd);
Bram Moolenaar071d4272004-06-13 20:20:40 +00001865}
1866
1867/*
1868 * Copy an entry at "dp" from "idx_orig" to "idx_new".
1869 */
1870 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001871diff_copy_entry(
1872 diff_T *dprev,
1873 diff_T *dp,
1874 int idx_orig,
1875 int idx_new)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001876{
1877 long off;
1878
1879 if (dprev == NULL)
1880 off = 0;
1881 else
1882 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
1883 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
1884 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
1885 dp->df_count[idx_new] = dp->df_count[idx_orig];
1886}
1887
1888/*
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001889 * Clear the list of diffblocks for tab page "tp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00001890 */
Bram Moolenaarea408852005-06-25 22:49:46 +00001891 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01001892diff_clear(tabpage_T *tp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001893{
1894 diff_T *p, *next_p;
1895
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001896 for (p = tp->tp_first_diff; p != NULL; p = next_p)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001897 {
1898 next_p = p->df_next;
1899 vim_free(p);
1900 }
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001901 tp->tp_first_diff = NULL;
Bram Moolenaar071d4272004-06-13 20:20:40 +00001902}
1903
1904/*
1905 * Check diff status for line "lnum" in buffer "buf":
1906 * Returns 0 for nothing special
1907 * Returns -1 for a line that should be highlighted as changed.
1908 * Returns -2 for a line that should be highlighted as added/deleted.
1909 * Returns > 0 for inserting that many filler lines above it (never happens
1910 * when 'diffopt' doesn't contain "filler").
1911 * This should only be used for windows where 'diff' is set.
1912 */
1913 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01001914diff_check(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001915{
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001916 int idx; // index in tp_diffbuf[] for this buffer
Bram Moolenaar071d4272004-06-13 20:20:40 +00001917 diff_T *dp;
1918 int maxcount;
1919 int i;
1920 buf_T *buf = wp->w_buffer;
1921 int cmp;
1922
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001923 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001924 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00001925
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001926 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) // no diffs at all
Bram Moolenaar071d4272004-06-13 20:20:40 +00001927 return 0;
1928
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001929 // safety check: "lnum" must be a buffer line
Bram Moolenaar071d4272004-06-13 20:20:40 +00001930 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
1931 return 0;
1932
1933 idx = diff_buf_idx(buf);
1934 if (idx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001935 return 0; // no diffs for buffer "buf"
Bram Moolenaar071d4272004-06-13 20:20:40 +00001936
1937#ifdef FEAT_FOLDING
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001938 // A closed fold never has filler lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001939 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
1940 return 0;
1941#endif
1942
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001943 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02001944 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001945 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1946 break;
1947 if (dp == NULL || lnum < dp->df_lnum[idx])
1948 return 0;
1949
1950 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
1951 {
1952 int zero = FALSE;
1953
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001954 // Changed or inserted line. If the other buffers have a count of
1955 // zero, the lines were inserted. If the other buffers have the same
1956 // count, check if the lines are identical.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001957 cmp = FALSE;
1958 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001959 if (i != idx && curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001960 {
1961 if (dp->df_count[i] == 0)
1962 zero = TRUE;
1963 else
1964 {
1965 if (dp->df_count[i] != dp->df_count[idx])
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001966 return -1; // nr of lines changed.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001967 cmp = TRUE;
1968 }
1969 }
1970 if (cmp)
1971 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001972 // Compare all lines. If they are equal the lines were inserted
1973 // in some buffers, deleted in others, but not changed.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001974 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar7c0a2f32016-07-10 22:11:16 +02001975 if (i != idx && curtab->tp_diffbuf[i] != NULL
1976 && dp->df_count[i] != 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001977 if (!diff_equal_entry(dp, idx, i))
1978 return -1;
1979 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001980 // If there is no buffer with zero lines then there is no difference
1981 // any longer. Happens when making a change (or undo) that removes
1982 // the difference. Can't remove the entry here, we might be halfway
1983 // updating the window. Just report the text as unchanged. Other
1984 // windows might still show the change though.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001985 if (zero == FALSE)
1986 return 0;
1987 return -2;
1988 }
1989
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001990 // If 'diffopt' doesn't contain "filler", return 0.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001991 if (!(diff_flags & DIFF_FILLER))
1992 return 0;
1993
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01001994 // Insert filler lines above the line just below the change. Will return
1995 // 0 when this buf had the max count.
Bram Moolenaar071d4272004-06-13 20:20:40 +00001996 maxcount = 0;
1997 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00001998 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
Bram Moolenaar071d4272004-06-13 20:20:40 +00001999 maxcount = dp->df_count[i];
2000 return maxcount - dp->df_count[idx];
2001}
2002
2003/*
2004 * Compare two entries in diff "*dp" and return TRUE if they are equal.
2005 */
2006 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002007diff_equal_entry(diff_T *dp, int idx1, int idx2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002008{
2009 int i;
2010 char_u *line;
2011 int cmp;
2012
2013 if (dp->df_count[idx1] != dp->df_count[idx2])
2014 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002015 if (diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002016 return FALSE;
2017 for (i = 0; i < dp->df_count[idx1]; ++i)
2018 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002019 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
Bram Moolenaar071d4272004-06-13 20:20:40 +00002020 dp->df_lnum[idx1] + i, FALSE));
2021 if (line == NULL)
2022 return FALSE;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002023 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
Bram Moolenaar071d4272004-06-13 20:20:40 +00002024 dp->df_lnum[idx2] + i, FALSE));
2025 vim_free(line);
2026 if (cmp != 0)
2027 return FALSE;
2028 }
2029 return TRUE;
2030}
2031
2032/*
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002033 * Compare the characters at "p1" and "p2". If they are equal (possibly
2034 * ignoring case) return TRUE and set "len" to the number of bytes.
2035 */
2036 static int
2037diff_equal_char(char_u *p1, char_u *p2, int *len)
2038{
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002039 int l = (*mb_ptr2len)(p1);
2040
2041 if (l != (*mb_ptr2len)(p2))
2042 return FALSE;
2043 if (l > 1)
2044 {
2045 if (STRNCMP(p1, p2, l) != 0
2046 && (!enc_utf8
2047 || !(diff_flags & DIFF_ICASE)
2048 || utf_fold(utf_ptr2char(p1))
2049 != utf_fold(utf_ptr2char(p2))))
2050 return FALSE;
2051 *len = l;
2052 }
2053 else
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002054 {
2055 if ((*p1 != *p2)
2056 && (!(diff_flags & DIFF_ICASE)
2057 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
2058 return FALSE;
2059 *len = 1;
2060 }
2061 return TRUE;
2062}
2063
2064/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002065 * Compare strings "s1" and "s2" according to 'diffopt'.
2066 * Return non-zero when they are different.
2067 */
2068 static int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002069diff_cmp(char_u *s1, char_u *s2)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002070{
2071 char_u *p1, *p2;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002072 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002073
Bram Moolenaar785fc652018-09-15 19:17:38 +02002074 if ((diff_flags & DIFF_IBLANK)
2075 && (*skipwhite(s1) == NUL || *skipwhite(s2) == NUL))
2076 return 0;
2077
2078 if ((diff_flags & (DIFF_ICASE | ALL_WHITE_DIFF)) == 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002079 return STRCMP(s1, s2);
Bram Moolenaar785fc652018-09-15 19:17:38 +02002080 if ((diff_flags & DIFF_ICASE) && !(diff_flags & ALL_WHITE_DIFF))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002081 return MB_STRICMP(s1, s2);
2082
Bram Moolenaar071d4272004-06-13 20:20:40 +00002083 p1 = s1;
2084 p2 = s2;
Bram Moolenaar785fc652018-09-15 19:17:38 +02002085
2086 // Ignore white space changes and possibly ignore case.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002087 while (*p1 != NUL && *p2 != NUL)
2088 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002089 if (((diff_flags & DIFF_IWHITE)
2090 && VIM_ISWHITE(*p1) && VIM_ISWHITE(*p2))
2091 || ((diff_flags & DIFF_IWHITEALL)
2092 && (VIM_ISWHITE(*p1) || VIM_ISWHITE(*p2))))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002093 {
2094 p1 = skipwhite(p1);
2095 p2 = skipwhite(p2);
2096 }
2097 else
2098 {
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002099 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002100 break;
Bram Moolenaarae96b8d2017-09-03 15:04:21 +02002101 p1 += l;
2102 p2 += l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002103 }
2104 }
2105
Bram Moolenaar785fc652018-09-15 19:17:38 +02002106 // Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002107 p1 = skipwhite(p1);
2108 p2 = skipwhite(p2);
2109 if (*p1 != NUL || *p2 != NUL)
2110 return 1;
2111 return 0;
2112}
2113
2114/*
2115 * Return the number of filler lines above "lnum".
2116 */
2117 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002118diff_check_fill(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002119{
2120 int n;
2121
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002122 // be quick when there are no filler lines
Bram Moolenaar071d4272004-06-13 20:20:40 +00002123 if (!(diff_flags & DIFF_FILLER))
2124 return 0;
2125 n = diff_check(wp, lnum);
2126 if (n <= 0)
2127 return 0;
2128 return n;
2129}
2130
2131/*
2132 * Set the topline of "towin" to match the position in "fromwin", so that they
2133 * show the same diff'ed lines.
2134 */
2135 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002136diff_set_topline(win_T *fromwin, win_T *towin)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002137{
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002138 buf_T *frombuf = fromwin->w_buffer;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002139 linenr_T lnum = fromwin->w_topline;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002140 int fromidx;
2141 int toidx;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002142 diff_T *dp;
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002143 int max_count;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002144 int i;
2145
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002146 fromidx = diff_buf_idx(frombuf);
2147 if (fromidx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002148 return; // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00002149
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002150 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002151 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002152
2153 towin->w_topfill = 0;
2154
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002155 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002156 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002157 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002158 break;
2159 if (dp == NULL)
2160 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002161 // After last change, compute topline relative to end of file; no
2162 // filler lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002163 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002164 - (frombuf->b_ml.ml_line_count - lnum);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002165 }
2166 else
2167 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002168 // Find index for "towin".
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002169 toidx = diff_buf_idx(towin->w_buffer);
2170 if (toidx == DB_COUNT)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002171 return; // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00002172
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002173 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
2174 if (lnum >= dp->df_lnum[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002175 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002176 // Inside a change: compute filler lines. With three or more
2177 // buffers we need to know the largest count.
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002178 max_count = 0;
2179 for (i = 0; i < DB_COUNT; ++i)
2180 if (curtab->tp_diffbuf[i] != NULL
2181 && max_count < dp->df_count[i])
2182 max_count = dp->df_count[i];
2183
2184 if (dp->df_count[toidx] == dp->df_count[fromidx])
2185 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002186 // same number of lines: use same filler count
Bram Moolenaar071d4272004-06-13 20:20:40 +00002187 towin->w_topfill = fromwin->w_topfill;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002188 }
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002189 else if (dp->df_count[toidx] > dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002190 {
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002191 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00002192 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002193 // more lines in towin and fromwin doesn't show diff
2194 // lines, only filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002195 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
2196 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002197 // towin also only shows filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002198 towin->w_topline = dp->df_lnum[toidx]
2199 + dp->df_count[toidx];
2200 towin->w_topfill = fromwin->w_topfill;
2201 }
2202 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002203 // towin still has some diff lines to show
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002204 towin->w_topline = dp->df_lnum[toidx]
2205 + max_count - fromwin->w_topfill;
2206 }
2207 }
2208 else if (towin->w_topline >= dp->df_lnum[toidx]
2209 + dp->df_count[toidx])
2210 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002211 // less lines in towin and no diff lines to show: compute
2212 // filler lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002213 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
2214 if (diff_flags & DIFF_FILLER)
2215 {
2216 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002217 // fromwin is also out of diff lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002218 towin->w_topfill = fromwin->w_topfill;
2219 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002220 // fromwin has some diff lines
Bram Moolenaarbb8f88b2008-01-18 16:40:00 +00002221 towin->w_topfill = dp->df_lnum[fromidx]
2222 + max_count - lnum;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002223 }
2224 }
2225 }
2226 }
2227
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002228 // safety check (if diff info gets outdated strange things may happen)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002229 towin->w_botfill = FALSE;
2230 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
2231 {
2232 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
2233 towin->w_botfill = TRUE;
2234 }
2235 if (towin->w_topline < 1)
2236 {
2237 towin->w_topline = 1;
2238 towin->w_topfill = 0;
2239 }
2240
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002241 // When w_topline changes need to recompute w_botline and cursor position
Bram Moolenaar071d4272004-06-13 20:20:40 +00002242 invalidate_botline_win(towin);
2243 changed_line_abv_curs_win(towin);
2244
2245 check_topfill(towin, FALSE);
2246#ifdef FEAT_FOLDING
2247 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
2248 NULL, TRUE, NULL);
2249#endif
2250}
2251
2252/*
2253 * This is called when 'diffopt' is changed.
2254 */
2255 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002256diffopt_changed(void)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002257{
2258 char_u *p;
2259 int diff_context_new = 6;
2260 int diff_flags_new = 0;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002261 int diff_foldcolumn_new = 2;
Bram Moolenaare828b762018-09-10 17:51:58 +02002262 long diff_algorithm_new = 0;
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002263 long diff_indent_heuristic = 0;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002264 tabpage_T *tp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002265
2266 p = p_dip;
2267 while (*p != NUL)
2268 {
2269 if (STRNCMP(p, "filler", 6) == 0)
2270 {
2271 p += 6;
2272 diff_flags_new |= DIFF_FILLER;
2273 }
2274 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
2275 {
2276 p += 8;
2277 diff_context_new = getdigits(&p);
2278 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002279 else if (STRNCMP(p, "iblank", 6) == 0)
2280 {
2281 p += 6;
2282 diff_flags_new |= DIFF_IBLANK;
2283 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002284 else if (STRNCMP(p, "icase", 5) == 0)
2285 {
2286 p += 5;
2287 diff_flags_new |= DIFF_ICASE;
2288 }
Bram Moolenaar785fc652018-09-15 19:17:38 +02002289 else if (STRNCMP(p, "iwhiteall", 9) == 0)
2290 {
2291 p += 9;
2292 diff_flags_new |= DIFF_IWHITEALL;
2293 }
2294 else if (STRNCMP(p, "iwhiteeol", 9) == 0)
2295 {
2296 p += 9;
2297 diff_flags_new |= DIFF_IWHITEEOL;
2298 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002299 else if (STRNCMP(p, "iwhite", 6) == 0)
2300 {
2301 p += 6;
2302 diff_flags_new |= DIFF_IWHITE;
2303 }
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002304 else if (STRNCMP(p, "horizontal", 10) == 0)
2305 {
2306 p += 10;
2307 diff_flags_new |= DIFF_HORIZONTAL;
2308 }
2309 else if (STRNCMP(p, "vertical", 8) == 0)
2310 {
2311 p += 8;
2312 diff_flags_new |= DIFF_VERTICAL;
2313 }
2314 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
2315 {
2316 p += 11;
2317 diff_foldcolumn_new = getdigits(&p);
2318 }
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002319 else if (STRNCMP(p, "hiddenoff", 9) == 0)
2320 {
2321 p += 9;
2322 diff_flags_new |= DIFF_HIDDEN_OFF;
2323 }
Bram Moolenaarc8234772019-11-10 21:00:27 +01002324 else if (STRNCMP(p, "closeoff", 8) == 0)
2325 {
2326 p += 8;
2327 diff_flags_new |= DIFF_CLOSE_OFF;
2328 }
Bram Moolenaar4223d432021-02-10 13:18:17 +01002329 else if (STRNCMP(p, "followwrap", 10) == 0)
2330 {
2331 p += 10;
2332 diff_flags_new |= DIFF_FOLLOWWRAP;
2333 }
Bram Moolenaare828b762018-09-10 17:51:58 +02002334 else if (STRNCMP(p, "indent-heuristic", 16) == 0)
2335 {
2336 p += 16;
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002337 diff_indent_heuristic = XDF_INDENT_HEURISTIC;
Bram Moolenaare828b762018-09-10 17:51:58 +02002338 }
2339 else if (STRNCMP(p, "internal", 8) == 0)
2340 {
2341 p += 8;
2342 diff_flags_new |= DIFF_INTERNAL;
2343 }
2344 else if (STRNCMP(p, "algorithm:", 10) == 0)
2345 {
2346 p += 10;
2347 if (STRNCMP(p, "myers", 5) == 0)
2348 {
2349 p += 5;
2350 diff_algorithm_new = 0;
2351 }
2352 else if (STRNCMP(p, "minimal", 7) == 0)
2353 {
2354 p += 7;
2355 diff_algorithm_new = XDF_NEED_MINIMAL;
2356 }
2357 else if (STRNCMP(p, "patience", 8) == 0)
2358 {
2359 p += 8;
2360 diff_algorithm_new = XDF_PATIENCE_DIFF;
2361 }
2362 else if (STRNCMP(p, "histogram", 9) == 0)
2363 {
2364 p += 9;
2365 diff_algorithm_new = XDF_HISTOGRAM_DIFF;
2366 }
Bram Moolenaard0721052018-11-05 21:21:33 +01002367 else
2368 return FAIL;
Bram Moolenaare828b762018-09-10 17:51:58 +02002369 }
2370
Bram Moolenaar071d4272004-06-13 20:20:40 +00002371 if (*p != ',' && *p != NUL)
2372 return FAIL;
2373 if (*p == ',')
2374 ++p;
2375 }
2376
Bram Moolenaarb6fc7282018-12-04 22:24:16 +01002377 diff_algorithm_new |= diff_indent_heuristic;
2378
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002379 // Can't have both "horizontal" and "vertical".
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002380 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
2381 return FAIL;
2382
Bram Moolenaar198fa062018-09-18 21:20:26 +02002383 // If flags were added or removed, or the algorithm was changed, need to
2384 // update the diff.
Bram Moolenaare828b762018-09-10 17:51:58 +02002385 if (diff_flags != diff_flags_new || diff_algorithm != diff_algorithm_new)
Bram Moolenaar29323592016-07-24 22:04:11 +02002386 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002387 tp->tp_diff_invalid = TRUE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002388
2389 diff_flags = diff_flags_new;
Bram Moolenaarb9ddda62019-02-19 23:00:50 +01002390 diff_context = diff_context_new == 0 ? 1 : diff_context_new;
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002391 diff_foldcolumn = diff_foldcolumn_new;
Bram Moolenaare828b762018-09-10 17:51:58 +02002392 diff_algorithm = diff_algorithm_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002393
2394 diff_redraw(TRUE);
2395
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002396 // recompute the scroll binding with the new option value, may
2397 // remove or add filler lines
Bram Moolenaar071d4272004-06-13 20:20:40 +00002398 check_scrollbind((linenr_T)0, 0L);
2399
2400 return OK;
2401}
2402
2403/*
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002404 * Return TRUE if 'diffopt' contains "horizontal".
2405 */
2406 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002407diffopt_horizontal(void)
Bram Moolenaarc4675a12006-03-15 22:50:30 +00002408{
2409 return (diff_flags & DIFF_HORIZONTAL) != 0;
2410}
2411
2412/*
Bram Moolenaar97ce4192017-12-01 20:35:58 +01002413 * Return TRUE if 'diffopt' contains "hiddenoff".
2414 */
2415 int
2416diffopt_hiddenoff(void)
2417{
2418 return (diff_flags & DIFF_HIDDEN_OFF) != 0;
2419}
2420
2421/*
Bram Moolenaarc8234772019-11-10 21:00:27 +01002422 * Return TRUE if 'diffopt' contains "closeoff".
2423 */
2424 int
2425diffopt_closeoff(void)
2426{
2427 return (diff_flags & DIFF_CLOSE_OFF) != 0;
2428}
2429
2430/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002431 * Find the difference within a changed line.
2432 * Returns TRUE if the line was added, no other buffer has it.
2433 */
2434 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002435diff_find_change(
2436 win_T *wp,
2437 linenr_T lnum,
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002438 int *startp, // first char of the change
2439 int *endp) // last char of the change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002440{
2441 char_u *line_org;
2442 char_u *line_new;
2443 int i;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002444 int si_org, si_new;
2445 int ei_org, ei_new;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002446 diff_T *dp;
2447 int idx;
2448 int off;
2449 int added = TRUE;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002450 char_u *p1, *p2;
2451 int l;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002452
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002453 // Make a copy of the line, the next ml_get() will invalidate it.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002454 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
2455 if (line_org == NULL)
2456 return FALSE;
2457
2458 idx = diff_buf_idx(wp->w_buffer);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002459 if (idx == DB_COUNT) // cannot happen
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002460 {
2461 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002462 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002463 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002464
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002465 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002466 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002467 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
2468 break;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002469 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002470 {
2471 vim_free(line_org);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002472 return FALSE;
Bram Moolenaarfa3491a2007-02-20 02:49:19 +00002473 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002474
2475 off = lnum - dp->df_lnum[idx];
2476
2477 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002478 if (curtab->tp_diffbuf[i] != NULL && i != idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002479 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002480 // Skip lines that are not in the other change (filler lines).
Bram Moolenaar071d4272004-06-13 20:20:40 +00002481 if (off >= dp->df_count[i])
2482 continue;
2483 added = FALSE;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002484 line_new = ml_get_buf(curtab->tp_diffbuf[i],
2485 dp->df_lnum[i] + off, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002486
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002487 // Search for start of difference
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002488 si_org = si_new = 0;
2489 while (line_org[si_org] != NUL)
2490 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002491 if (((diff_flags & DIFF_IWHITE)
2492 && VIM_ISWHITE(line_org[si_org])
2493 && VIM_ISWHITE(line_new[si_new]))
2494 || ((diff_flags & DIFF_IWHITEALL)
2495 && (VIM_ISWHITE(line_org[si_org])
2496 || VIM_ISWHITE(line_new[si_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002497 {
Bram Moolenaara93fa7e2006-04-17 22:14:47 +00002498 si_org = (int)(skipwhite(line_org + si_org) - line_org);
2499 si_new = (int)(skipwhite(line_new + si_new) - line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002500 }
2501 else
2502 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002503 if (!diff_equal_char(line_org + si_org, line_new + si_new,
2504 &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002505 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002506 si_org += l;
2507 si_new += l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002508 }
2509 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002510 if (has_mbyte)
2511 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002512 // Move back to first byte of character in both lines (may
2513 // have "nn^" in line_org and "n^ in line_new).
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002514 si_org -= (*mb_head_off)(line_org, line_org + si_org);
2515 si_new -= (*mb_head_off)(line_new, line_new + si_new);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002516 }
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002517 if (*startp > si_org)
2518 *startp = si_org;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002519
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002520 // Search for end of difference, if any.
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002521 if (line_org[si_org] != NUL || line_new[si_new] != NUL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002522 {
2523 ei_org = (int)STRLEN(line_org);
2524 ei_new = (int)STRLEN(line_new);
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002525 while (ei_org >= *startp && ei_new >= si_new
2526 && ei_org >= 0 && ei_new >= 0)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002527 {
Bram Moolenaar785fc652018-09-15 19:17:38 +02002528 if (((diff_flags & DIFF_IWHITE)
2529 && VIM_ISWHITE(line_org[ei_org])
2530 && VIM_ISWHITE(line_new[ei_new]))
2531 || ((diff_flags & DIFF_IWHITEALL)
2532 && (VIM_ISWHITE(line_org[ei_org])
2533 || VIM_ISWHITE(line_new[ei_new]))))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002534 {
2535 while (ei_org >= *startp
Bram Moolenaar1c465442017-03-12 20:10:05 +01002536 && VIM_ISWHITE(line_org[ei_org]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002537 --ei_org;
2538 while (ei_new >= si_new
Bram Moolenaar1c465442017-03-12 20:10:05 +01002539 && VIM_ISWHITE(line_new[ei_new]))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002540 --ei_new;
2541 }
2542 else
2543 {
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002544 p1 = line_org + ei_org;
2545 p2 = line_new + ei_new;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002546 p1 -= (*mb_head_off)(line_org, p1);
2547 p2 -= (*mb_head_off)(line_new, p2);
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002548 if (!diff_equal_char(p1, p2, &l))
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002549 break;
Bram Moolenaarda22b8c2017-09-02 18:01:50 +02002550 ei_org -= l;
2551 ei_new -= l;
Bram Moolenaar9e54a0e2006-04-14 20:42:25 +00002552 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002553 }
2554 if (*endp < ei_org)
2555 *endp = ei_org;
2556 }
2557 }
2558
2559 vim_free(line_org);
2560 return added;
2561}
2562
2563#if defined(FEAT_FOLDING) || defined(PROTO)
2564/*
2565 * Return TRUE if line "lnum" is not close to a diff block, this line should
2566 * be in a fold.
2567 * Return FALSE if there are no diff blocks at all in this window.
2568 */
2569 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01002570diff_infold(win_T *wp, linenr_T lnum)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002571{
2572 int i;
2573 int idx = -1;
2574 int other = FALSE;
2575 diff_T *dp;
2576
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002577 // Return if 'diff' isn't set.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002578 if (!wp->w_p_diff)
2579 return FALSE;
2580
2581 for (i = 0; i < DB_COUNT; ++i)
2582 {
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002583 if (curtab->tp_diffbuf[i] == wp->w_buffer)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002584 idx = i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002585 else if (curtab->tp_diffbuf[i] != NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002586 other = TRUE;
2587 }
2588
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002589 // return here if there are no diffs in the window
Bram Moolenaar071d4272004-06-13 20:20:40 +00002590 if (idx == -1 || !other)
2591 return FALSE;
2592
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002593 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002594 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00002595
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002596 // Return if there are no diff blocks. All lines will be folded.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002597 if (curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002598 return TRUE;
2599
Bram Moolenaaraeea7212020-04-02 18:50:46 +02002600 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002601 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002602 // If this change is below the line there can't be any further match.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002603 if (dp->df_lnum[idx] - diff_context > lnum)
2604 break;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002605 // If this change ends before the line we have a match.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002606 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
2607 return FALSE;
2608 }
2609 return TRUE;
2610}
2611#endif
2612
2613/*
2614 * "dp" and "do" commands.
2615 */
2616 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002617nv_diffgetput(int put, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002618{
2619 exarg_T ea;
Bram Moolenaar6a643652014-10-31 13:54:25 +01002620 char_u buf[30];
Bram Moolenaar071d4272004-06-13 20:20:40 +00002621
Bram Moolenaarf2732452018-06-03 14:47:35 +02002622#ifdef FEAT_JOB_CHANNEL
2623 if (bt_prompt(curbuf))
2624 {
2625 vim_beep(BO_OPER);
2626 return;
2627 }
2628#endif
Bram Moolenaar6a643652014-10-31 13:54:25 +01002629 if (count == 0)
2630 ea.arg = (char_u *)"";
2631 else
2632 {
2633 vim_snprintf((char *)buf, 30, "%ld", count);
2634 ea.arg = buf;
2635 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002636 if (put)
2637 ea.cmdidx = CMD_diffput;
2638 else
2639 ea.cmdidx = CMD_diffget;
2640 ea.addr_count = 0;
2641 ea.line1 = curwin->w_cursor.lnum;
2642 ea.line2 = curwin->w_cursor.lnum;
2643 ex_diffgetput(&ea);
2644}
2645
2646/*
Bram Moolenaarc5274dd2022-07-02 15:10:00 +01002647 * Return TRUE if "diff" appears in the list of diff blocks of the current tab.
2648 */
2649 static int
2650valid_diff(diff_T *diff)
2651{
2652 diff_T *dp;
2653
2654 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
2655 if (dp == diff)
2656 return TRUE;
2657 return FALSE;
2658}
2659
2660/*
Bram Moolenaar071d4272004-06-13 20:20:40 +00002661 * ":diffget"
2662 * ":diffput"
2663 */
2664 void
Bram Moolenaar7454a062016-01-30 15:14:10 +01002665ex_diffgetput(exarg_T *eap)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002666{
2667 linenr_T lnum;
2668 int count;
2669 linenr_T off = 0;
2670 diff_T *dp;
2671 diff_T *dprev;
2672 diff_T *dfree;
2673 int idx_cur;
2674 int idx_other;
2675 int idx_from;
2676 int idx_to;
2677 int i;
2678 int added;
2679 char_u *p;
2680 aco_save_T aco;
2681 buf_T *buf;
2682 int start_skip, end_skip;
2683 int new_count;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002684 int buf_empty;
Bram Moolenaar602eb742007-02-20 03:43:38 +00002685 int found_not_ma = FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002686
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002687 // Find the current buffer in the list of diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002688 idx_cur = diff_buf_idx(curbuf);
2689 if (idx_cur == DB_COUNT)
2690 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002691 emsg(_(e_current_buffer_is_not_in_diff_mode));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002692 return;
2693 }
2694
2695 if (*eap->arg == NUL)
2696 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002697 // No argument: Find the other buffer in the list of diff buffers.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002698 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002699 if (curtab->tp_diffbuf[idx_other] != curbuf
Bram Moolenaar602eb742007-02-20 03:43:38 +00002700 && curtab->tp_diffbuf[idx_other] != NULL)
2701 {
2702 if (eap->cmdidx != CMD_diffput
2703 || curtab->tp_diffbuf[idx_other]->b_p_ma)
2704 break;
2705 found_not_ma = TRUE;
2706 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002707 if (idx_other == DB_COUNT)
2708 {
Bram Moolenaar602eb742007-02-20 03:43:38 +00002709 if (found_not_ma)
Bram Moolenaar677658a2022-01-05 16:09:06 +00002710 emsg(_(e_no_other_buffer_in_diff_mode_is_modifiable));
Bram Moolenaar602eb742007-02-20 03:43:38 +00002711 else
Bram Moolenaare1242042021-12-16 20:56:57 +00002712 emsg(_(e_no_other_buffer_in_diff_mode));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002713 return;
2714 }
2715
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002716 // Check that there isn't a third buffer in the list
Bram Moolenaar071d4272004-06-13 20:20:40 +00002717 for (i = idx_other + 1; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002718 if (curtab->tp_diffbuf[i] != curbuf
2719 && curtab->tp_diffbuf[i] != NULL
2720 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002721 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002722 emsg(_(e_more_than_two_buffers_in_diff_mode_dont_know_which_one_to_use));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002723 return;
2724 }
2725 }
2726 else
2727 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002728 // Buffer number or pattern given. Ignore trailing white space.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002729 p = eap->arg + STRLEN(eap->arg);
Bram Moolenaar1c465442017-03-12 20:10:05 +01002730 while (p > eap->arg && VIM_ISWHITE(p[-1]))
Bram Moolenaar071d4272004-06-13 20:20:40 +00002731 --p;
2732 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
2733 ;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002734 if (eap->arg + i == p) // digits only
Bram Moolenaar071d4272004-06-13 20:20:40 +00002735 i = atol((char *)eap->arg);
2736 else
2737 {
Bram Moolenaar0c279bb2013-03-19 14:25:54 +01002738 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002739 if (i < 0)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002740 return; // error message already given
Bram Moolenaar071d4272004-06-13 20:20:40 +00002741 }
2742 buf = buflist_findnr(i);
2743 if (buf == NULL)
2744 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002745 semsg(_(e_cant_find_buffer_str), eap->arg);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002746 return;
2747 }
Bram Moolenaar5cc6a6e2009-01-22 19:48:55 +00002748 if (buf == curbuf)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002749 return; // nothing to do
Bram Moolenaar071d4272004-06-13 20:20:40 +00002750 idx_other = diff_buf_idx(buf);
2751 if (idx_other == DB_COUNT)
2752 {
Bram Moolenaare1242042021-12-16 20:56:57 +00002753 semsg(_(e_buffer_str_is_not_in_diff_mode), eap->arg);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002754 return;
2755 }
2756 }
2757
2758 diff_busy = TRUE;
2759
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002760 // When no range given include the line above or below the cursor.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002761 if (eap->addr_count == 0)
2762 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002763 // Make it possible that ":diffget" on the last line gets line below
2764 // the cursor line when there is no difference above the cursor.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002765 if (eap->cmdidx == CMD_diffget
2766 && eap->line1 == curbuf->b_ml.ml_line_count
2767 && diff_check(curwin, eap->line1) == 0
2768 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
2769 ++eap->line2;
2770 else if (eap->line1 > 0)
2771 --eap->line1;
2772 }
2773
2774 if (eap->cmdidx == CMD_diffget)
2775 {
2776 idx_from = idx_other;
2777 idx_to = idx_cur;
2778 }
2779 else
2780 {
2781 idx_from = idx_cur;
2782 idx_to = idx_other;
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002783 // Need to make the other buffer the current buffer to be able to make
2784 // changes in it.
Bram Moolenaare76062c2022-11-28 18:51:43 +00002785 // Set curwin/curbuf to buf and save a few things.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002786 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
Bram Moolenaare76062c2022-11-28 18:51:43 +00002787 if (curbuf != curtab->tp_diffbuf[idx_other])
2788 // Could not find a window for this buffer, the rest is likely to
2789 // fail.
2790 goto theend;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002791 }
2792
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002793 // May give the warning for a changed buffer here, which can trigger the
2794 // FileChangedRO autocommand, which may do nasty things and mess
2795 // everything up.
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002796 if (!curbuf->b_changed)
2797 {
2798 change_warning(0);
2799 if (diff_buf_idx(curbuf) != idx_to)
2800 {
Bram Moolenaar677658a2022-01-05 16:09:06 +00002801 emsg(_(e_buffer_changed_unexpectedly));
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002802 goto theend;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002803 }
2804 }
2805
Bram Moolenaar071d4272004-06-13 20:20:40 +00002806 dprev = NULL;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002807 for (dp = curtab->tp_first_diff; dp != NULL; )
Bram Moolenaar071d4272004-06-13 20:20:40 +00002808 {
2809 if (dp->df_lnum[idx_cur] > eap->line2 + off)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002810 break; // past the range that was specified
Bram Moolenaar071d4272004-06-13 20:20:40 +00002811
2812 dfree = NULL;
2813 lnum = dp->df_lnum[idx_to];
2814 count = dp->df_count[idx_to];
2815 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
2816 && u_save(lnum - 1, lnum + count) != FAIL)
2817 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002818 // Inside the specified range and saving for undo worked.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002819 start_skip = 0;
2820 end_skip = 0;
2821 if (eap->addr_count > 0)
2822 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002823 // A range was specified: check if lines need to be skipped.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002824 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
2825 if (start_skip > 0)
2826 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002827 // range starts below start of current diff block
Bram Moolenaar071d4272004-06-13 20:20:40 +00002828 if (start_skip > count)
2829 {
2830 lnum += count;
2831 count = 0;
2832 }
2833 else
2834 {
2835 count -= start_skip;
2836 lnum += start_skip;
2837 }
2838 }
2839 else
2840 start_skip = 0;
2841
2842 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
2843 - (eap->line2 + off);
2844 if (end_skip > 0)
2845 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002846 // range ends above end of current/from diff block
2847 if (idx_cur == idx_from) // :diffput
Bram Moolenaar071d4272004-06-13 20:20:40 +00002848 {
2849 i = dp->df_count[idx_cur] - start_skip - end_skip;
2850 if (count > i)
2851 count = i;
2852 }
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002853 else // :diffget
Bram Moolenaar071d4272004-06-13 20:20:40 +00002854 {
2855 count -= end_skip;
2856 end_skip = dp->df_count[idx_from] - start_skip - count;
2857 if (end_skip < 0)
2858 end_skip = 0;
2859 }
2860 }
2861 else
2862 end_skip = 0;
2863 }
2864
Bram Moolenaarb5aedf32017-03-12 18:23:53 +01002865 buf_empty = BUFEMPTY();
Bram Moolenaar071d4272004-06-13 20:20:40 +00002866 added = 0;
2867 for (i = 0; i < count; ++i)
2868 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002869 // remember deleting the last line of the buffer
Bram Moolenaar280f1262006-01-30 00:14:18 +00002870 buf_empty = curbuf->b_ml.ml_line_count == 1;
Bram Moolenaar4e677b92022-07-28 18:44:27 +01002871 if (ml_delete(lnum) == OK)
2872 --added;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002873 }
2874 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
2875 {
2876 linenr_T nr;
2877
2878 nr = dp->df_lnum[idx_from] + start_skip + i;
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002879 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002880 break;
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002881 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
2882 nr, FALSE));
Bram Moolenaar071d4272004-06-13 20:20:40 +00002883 if (p != NULL)
2884 {
2885 ml_append(lnum + i - 1, p, 0, FALSE);
2886 vim_free(p);
2887 ++added;
Bram Moolenaar280f1262006-01-30 00:14:18 +00002888 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
2889 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002890 // Added the first line into an empty buffer, need to
2891 // delete the dummy empty line.
Bram Moolenaar280f1262006-01-30 00:14:18 +00002892 buf_empty = FALSE;
Bram Moolenaarca70c072020-05-30 20:30:46 +02002893 ml_delete((linenr_T)2);
Bram Moolenaar280f1262006-01-30 00:14:18 +00002894 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002895 }
2896 }
2897 new_count = dp->df_count[idx_to] + added;
2898 dp->df_count[idx_to] = new_count;
2899
2900 if (start_skip == 0 && end_skip == 0)
2901 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002902 // Check if there are any other buffers and if the diff is
2903 // equal in them.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002904 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar910f66f2006-04-05 20:41:53 +00002905 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
2906 && i != idx_to
Bram Moolenaar071d4272004-06-13 20:20:40 +00002907 && !diff_equal_entry(dp, idx_from, i))
2908 break;
2909 if (i == DB_COUNT)
2910 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002911 // delete the diff entry, the buffers are now equal here
Bram Moolenaar071d4272004-06-13 20:20:40 +00002912 dfree = dp;
2913 dp = dp->df_next;
2914 if (dprev == NULL)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00002915 curtab->tp_first_diff = dp;
Bram Moolenaar071d4272004-06-13 20:20:40 +00002916 else
2917 dprev->df_next = dp;
2918 }
2919 }
2920
Bram Moolenaar071d4272004-06-13 20:20:40 +00002921 if (added != 0)
2922 {
Bram Moolenaarc5274dd2022-07-02 15:10:00 +01002923 // Adjust marks. This will change the following entries!
Bram Moolenaar071d4272004-06-13 20:20:40 +00002924 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
2925 if (curwin->w_cursor.lnum >= lnum)
2926 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002927 // Adjust the cursor position if it's in/after the changed
2928 // lines.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002929 if (curwin->w_cursor.lnum >= lnum + count)
2930 curwin->w_cursor.lnum += added;
2931 else if (added < 0)
2932 curwin->w_cursor.lnum = lnum;
2933 }
2934 }
2935 changed_lines(lnum, 0, lnum + count, (long)added);
2936
2937 if (dfree != NULL)
2938 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002939 // Diff is deleted, update folds in other windows.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002940#ifdef FEAT_FOLDING
2941 diff_fold_update(dfree, idx_to);
2942#endif
2943 vim_free(dfree);
2944 }
Bram Moolenaarc5274dd2022-07-02 15:10:00 +01002945
2946 // mark_adjust() may have made "dp" invalid. We don't know where
2947 // to continue then, bail out.
2948 if (added != 0 && !valid_diff(dp))
2949 break;
2950
2951 if (dfree == NULL)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002952 // mark_adjust() may have changed the count in a wrong way
Bram Moolenaar071d4272004-06-13 20:20:40 +00002953 dp->df_count[idx_to] = new_count;
2954
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002955 // When changing the current buffer, keep track of line numbers
Bram Moolenaar071d4272004-06-13 20:20:40 +00002956 if (idx_cur == idx_to)
2957 off += added;
2958 }
2959
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002960 // If before the range or not deleted, go to next diff.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002961 if (dfree == NULL)
2962 {
2963 dprev = dp;
2964 dp = dp->df_next;
2965 }
2966 }
2967
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002968 // restore curwin/curbuf and a few other things
Bram Moolenaara9d52e32010-07-31 16:44:19 +02002969 if (eap->cmdidx != CMD_diffget)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002970 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01002971 // Syncing undo only works for the current buffer, but we change
2972 // another buffer. Sync undo if the command was typed. This isn't
2973 // 100% right when ":diffput" is used in a function or mapping.
Bram Moolenaar071d4272004-06-13 20:20:40 +00002974 if (KeyTyped)
Bram Moolenaar779b74b2006-04-10 14:55:34 +00002975 u_sync(FALSE);
Bram Moolenaar071d4272004-06-13 20:20:40 +00002976 aucmd_restbuf(&aco);
2977 }
2978
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002979theend:
Bram Moolenaar071d4272004-06-13 20:20:40 +00002980 diff_busy = FALSE;
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002981 if (diff_need_update)
Bram Moolenaard2b58c02018-09-16 18:10:48 +02002982 ex_diffupdate(NULL);
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002983
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +02002984 // Check that the cursor is on a valid character and update its
Bram Moolenaardf77cef2018-10-07 17:46:42 +02002985 // position. When there were filler lines the topline has become
2986 // invalid.
2987 check_cursor();
2988 changed_line_abv_curs();
2989
2990 if (diff_need_update)
2991 // redraw already done by ex_diffupdate()
2992 diff_need_update = FALSE;
Bram Moolenaar198fa062018-09-18 21:20:26 +02002993 else
2994 {
Bram Moolenaar198fa062018-09-18 21:20:26 +02002995 // Also need to redraw the other buffers.
2996 diff_redraw(FALSE);
2997 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
2998 }
Bram Moolenaar071d4272004-06-13 20:20:40 +00002999}
3000
3001#ifdef FEAT_FOLDING
3002/*
3003 * Update folds for all diff buffers for entry "dp".
3004 * Skip buffer with index "skip_idx".
3005 * When there are no diffs, all folds are removed.
3006 */
3007 static void
Bram Moolenaar7454a062016-01-30 15:14:10 +01003008diff_fold_update(diff_T *dp, int skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003009{
3010 int i;
3011 win_T *wp;
3012
Bram Moolenaar29323592016-07-24 22:04:11 +02003013 FOR_ALL_WINDOWS(wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003014 for (i = 0; i < DB_COUNT; ++i)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003015 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003016 foldUpdate(wp, dp->df_lnum[i],
3017 dp->df_lnum[i] + dp->df_count[i]);
3018}
3019#endif
3020
3021/*
3022 * Return TRUE if buffer "buf" is in diff-mode.
3023 */
3024 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01003025diff_mode_buf(buf_T *buf)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003026{
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003027 tabpage_T *tp;
3028
Bram Moolenaar29323592016-07-24 22:04:11 +02003029 FOR_ALL_TABPAGES(tp)
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003030 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
3031 return TRUE;
3032 return FALSE;
Bram Moolenaar071d4272004-06-13 20:20:40 +00003033}
3034
3035/*
3036 * Move "count" times in direction "dir" to the next diff block.
3037 * Return FAIL if there isn't such a diff block.
3038 */
3039 int
Bram Moolenaar7454a062016-01-30 15:14:10 +01003040diff_move_to(int dir, long count)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003041{
3042 int idx;
3043 linenr_T lnum = curwin->w_cursor.lnum;
3044 diff_T *dp;
3045
3046 idx = diff_buf_idx(curbuf);
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003047 if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003048 return FAIL;
3049
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003050 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003051 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00003052
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003053 if (curtab->tp_first_diff == NULL) // no diffs today
Bram Moolenaar071d4272004-06-13 20:20:40 +00003054 return FAIL;
3055
3056 while (--count >= 0)
3057 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003058 // Check if already before first diff.
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003059 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
Bram Moolenaar071d4272004-06-13 20:20:40 +00003060 break;
3061
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003062 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003063 {
3064 if (dp == NULL)
3065 break;
3066 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
3067 || (dir == BACKWARD
3068 && (dp->df_next == NULL
3069 || lnum <= dp->df_next->df_lnum[idx])))
3070 {
3071 lnum = dp->df_lnum[idx];
3072 break;
3073 }
3074 }
3075 }
3076
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003077 // don't end up past the end of the file
Bram Moolenaar071d4272004-06-13 20:20:40 +00003078 if (lnum > curbuf->b_ml.ml_line_count)
3079 lnum = curbuf->b_ml.ml_line_count;
3080
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003081 // When the cursor didn't move at all we fail.
Bram Moolenaar071d4272004-06-13 20:20:40 +00003082 if (lnum == curwin->w_cursor.lnum)
3083 return FAIL;
3084
3085 setpcmark();
3086 curwin->w_cursor.lnum = lnum;
3087 curwin->w_cursor.col = 0;
3088
3089 return OK;
3090}
3091
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003092/*
3093 * Return the line number in the current window that is closest to "lnum1" in
3094 * "buf1" in diff mode.
3095 */
3096 static linenr_T
3097diff_get_corresponding_line_int(
Bram Moolenaar7454a062016-01-30 15:14:10 +01003098 buf_T *buf1,
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003099 linenr_T lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003100{
3101 int idx1;
3102 int idx2;
3103 diff_T *dp;
3104 int baseline = 0;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003105
3106 idx1 = diff_buf_idx(buf1);
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003107 idx2 = diff_buf_idx(curbuf);
Bram Moolenaar860cae12010-06-05 23:22:07 +02003108 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL)
3109 return lnum1;
3110
3111 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003112 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar860cae12010-06-05 23:22:07 +02003113
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003114 if (curtab->tp_first_diff == NULL) // no diffs today
Bram Moolenaar860cae12010-06-05 23:22:07 +02003115 return lnum1;
3116
Bram Moolenaaraeea7212020-04-02 18:50:46 +02003117 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003118 {
3119 if (dp->df_lnum[idx1] > lnum1)
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003120 return lnum1 - baseline;
3121 if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1)
Bram Moolenaar860cae12010-06-05 23:22:07 +02003122 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003123 // Inside the diffblock
Bram Moolenaar860cae12010-06-05 23:22:07 +02003124 baseline = lnum1 - dp->df_lnum[idx1];
3125 if (baseline > dp->df_count[idx2])
3126 baseline = dp->df_count[idx2];
3127
3128 return dp->df_lnum[idx2] + baseline;
3129 }
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003130 if ( (dp->df_lnum[idx1] == lnum1)
3131 && (dp->df_count[idx1] == 0)
3132 && (dp->df_lnum[idx2] <= curwin->w_cursor.lnum)
3133 && ((dp->df_lnum[idx2] + dp->df_count[idx2])
3134 > curwin->w_cursor.lnum))
Bram Moolenaar860cae12010-06-05 23:22:07 +02003135 /*
3136 * Special case: if the cursor is just after a zero-count
3137 * block (i.e. all filler) and the target cursor is already
3138 * inside the corresponding block, leave the target cursor
3139 * unmoved. This makes repeated CTRL-W W operations work
3140 * as expected.
3141 */
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003142 return curwin->w_cursor.lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003143 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1])
3144 - (dp->df_lnum[idx2] + dp->df_count[idx2]);
3145 }
3146
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003147 // If we get here then the cursor is after the last diff
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003148 return lnum1 - baseline;
3149}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003150
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003151/*
3152 * Return the line number in the current window that is closest to "lnum1" in
3153 * "buf1" in diff mode. Checks the line number to be valid.
3154 */
3155 linenr_T
3156diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1)
3157{
3158 linenr_T lnum = diff_get_corresponding_line_int(buf1, lnum1);
3159
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003160 // don't end up past the end of the file
Bram Moolenaar025e3e02016-10-18 14:50:18 +02003161 if (lnum > curbuf->b_ml.ml_line_count)
3162 return curbuf->b_ml.ml_line_count;
3163 return lnum;
Bram Moolenaar860cae12010-06-05 23:22:07 +02003164}
Bram Moolenaar860cae12010-06-05 23:22:07 +02003165
Bram Moolenaar071d4272004-06-13 20:20:40 +00003166/*
3167 * For line "lnum" in the current window find the equivalent lnum in window
3168 * "wp", compensating for inserted/deleted lines.
3169 */
3170 linenr_T
Bram Moolenaar7454a062016-01-30 15:14:10 +01003171diff_lnum_win(linenr_T lnum, win_T *wp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003172{
3173 diff_T *dp;
3174 int idx;
3175 int i;
3176 linenr_T n;
3177
3178 idx = diff_buf_idx(curbuf);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003179 if (idx == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00003180 return (linenr_T)0;
3181
Bram Moolenaar49d7bf12006-02-17 21:45:41 +00003182 if (curtab->tp_diff_invalid)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003183 ex_diffupdate(NULL); // update after a big change
Bram Moolenaar071d4272004-06-13 20:20:40 +00003184
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003185 // search for a change that includes "lnum" in the list of diffblocks.
Bram Moolenaaraeea7212020-04-02 18:50:46 +02003186 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
Bram Moolenaar071d4272004-06-13 20:20:40 +00003187 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3188 break;
3189
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003190 // When after the last change, compute relative to the last line number.
Bram Moolenaar071d4272004-06-13 20:20:40 +00003191 if (dp == NULL)
3192 return wp->w_buffer->b_ml.ml_line_count
3193 - (curbuf->b_ml.ml_line_count - lnum);
3194
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003195 // Find index for "wp".
Bram Moolenaar071d4272004-06-13 20:20:40 +00003196 i = diff_buf_idx(wp->w_buffer);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003197 if (i == DB_COUNT) // safety check
Bram Moolenaar071d4272004-06-13 20:20:40 +00003198 return (linenr_T)0;
3199
3200 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
3201 if (n > dp->df_lnum[i] + dp->df_count[i])
3202 n = dp->df_lnum[i] + dp->df_count[i];
3203 return n;
3204}
Bram Moolenaar071d4272004-06-13 20:20:40 +00003205
Bram Moolenaare828b762018-09-10 17:51:58 +02003206/*
3207 * Handle an ED style diff line.
3208 * Return FAIL if the line does not contain diff info.
3209 */
3210 static int
3211parse_diff_ed(
3212 char_u *line,
Lewis Russelld9da86e2021-12-28 13:54:41 +00003213 diffhunk_T *hunk)
Bram Moolenaare828b762018-09-10 17:51:58 +02003214{
3215 char_u *p;
3216 long f1, l1, f2, l2;
3217 int difftype;
3218
3219 // The line must be one of three formats:
3220 // change: {first}[,{last}]c{first}[,{last}]
3221 // append: {first}a{first}[,{last}]
3222 // delete: {first}[,{last}]d{first}
3223 p = line;
3224 f1 = getdigits(&p);
3225 if (*p == ',')
3226 {
3227 ++p;
3228 l1 = getdigits(&p);
3229 }
3230 else
3231 l1 = f1;
3232 if (*p != 'a' && *p != 'c' && *p != 'd')
3233 return FAIL; // invalid diff format
3234 difftype = *p++;
3235 f2 = getdigits(&p);
3236 if (*p == ',')
3237 {
3238 ++p;
3239 l2 = getdigits(&p);
3240 }
3241 else
3242 l2 = f2;
3243 if (l1 < f1 || l2 < f2)
3244 return FAIL;
3245
3246 if (difftype == 'a')
3247 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003248 hunk->lnum_orig = f1 + 1;
3249 hunk->count_orig = 0;
Bram Moolenaare828b762018-09-10 17:51:58 +02003250 }
3251 else
3252 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003253 hunk->lnum_orig = f1;
3254 hunk->count_orig = l1 - f1 + 1;
Bram Moolenaare828b762018-09-10 17:51:58 +02003255 }
3256 if (difftype == 'd')
3257 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003258 hunk->lnum_new = f2 + 1;
3259 hunk->count_new = 0;
Bram Moolenaare828b762018-09-10 17:51:58 +02003260 }
3261 else
3262 {
Lewis Russelld9da86e2021-12-28 13:54:41 +00003263 hunk->lnum_new = f2;
3264 hunk->count_new = l2 - f2 + 1;
Bram Moolenaare828b762018-09-10 17:51:58 +02003265 }
3266 return OK;
3267}
3268
3269/*
3270 * Parses unified diff with zero(!) context lines.
3271 * Return FAIL if there is no diff information in "line".
3272 */
3273 static int
3274parse_diff_unified(
3275 char_u *line,
Lewis Russelld9da86e2021-12-28 13:54:41 +00003276 diffhunk_T *hunk)
Bram Moolenaare828b762018-09-10 17:51:58 +02003277{
3278 char_u *p;
3279 long oldline, oldcount, newline, newcount;
3280
3281 // Parse unified diff hunk header:
3282 // @@ -oldline,oldcount +newline,newcount @@
3283 p = line;
3284 if (*p++ == '@' && *p++ == '@' && *p++ == ' ' && *p++ == '-')
3285 {
3286 oldline = getdigits(&p);
3287 if (*p == ',')
3288 {
3289 ++p;
3290 oldcount = getdigits(&p);
3291 }
3292 else
3293 oldcount = 1;
3294 if (*p++ == ' ' && *p++ == '+')
3295 {
3296 newline = getdigits(&p);
3297 if (*p == ',')
3298 {
3299 ++p;
3300 newcount = getdigits(&p);
3301 }
3302 else
3303 newcount = 1;
3304 }
3305 else
3306 return FAIL; // invalid diff format
3307
3308 if (oldcount == 0)
3309 oldline += 1;
3310 if (newcount == 0)
3311 newline += 1;
3312 if (newline == 0)
3313 newline = 1;
3314
Lewis Russelld9da86e2021-12-28 13:54:41 +00003315 hunk->lnum_orig = oldline;
3316 hunk->count_orig = oldcount;
3317 hunk->lnum_new = newline;
3318 hunk->count_new = newcount;
Bram Moolenaare828b762018-09-10 17:51:58 +02003319
3320 return OK;
3321 }
3322
3323 return FAIL;
3324}
3325
3326/*
3327 * Callback function for the xdl_diff() function.
3328 * Stores the diff output in a grow array.
3329 */
3330 static int
Lewis Russelld9da86e2021-12-28 13:54:41 +00003331xdiff_out(
3332 long start_a,
3333 long count_a,
3334 long start_b,
3335 long count_b,
3336 void *priv)
Bram Moolenaare828b762018-09-10 17:51:58 +02003337{
3338 diffout_T *dout = (diffout_T *)priv;
Lewis Russelld9da86e2021-12-28 13:54:41 +00003339 diffhunk_T *p = ALLOC_ONE(diffhunk_T);
Bram Moolenaare828b762018-09-10 17:51:58 +02003340
Lewis Russelld9da86e2021-12-28 13:54:41 +00003341 if (p == NULL)
3342 return -1;
Bram Moolenaarf080d702018-10-31 22:57:26 +01003343
3344 if (ga_grow(&dout->dout_ga, 1) == FAIL)
Bram Moolenaarfebb78f2021-12-29 11:59:53 +00003345 {
3346 vim_free(p);
Bram Moolenaarf080d702018-10-31 22:57:26 +01003347 return -1;
Bram Moolenaarfebb78f2021-12-29 11:59:53 +00003348 }
Lewis Russelld9da86e2021-12-28 13:54:41 +00003349
3350 p->lnum_orig = start_a + 1;
3351 p->count_orig = count_a;
3352 p->lnum_new = start_b + 1;
3353 p->count_new = count_b;
3354 ((diffhunk_T **)dout->dout_ga.ga_data)[dout->dout_ga.ga_len++] = p;
Bram Moolenaare828b762018-09-10 17:51:58 +02003355 return 0;
3356}
3357
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003358#endif // FEAT_DIFF
3359
3360#if defined(FEAT_EVAL) || defined(PROTO)
3361
3362/*
3363 * "diff_filler()" function
3364 */
3365 void
3366f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
3367{
3368#ifdef FEAT_DIFF
Yegappan Lakshmanan4490ec42021-07-27 22:00:44 +02003369 if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL)
3370 return;
3371
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003372 rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars));
3373#endif
3374}
3375
3376/*
3377 * "diff_hlID()" function
3378 */
3379 void
3380f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
3381{
3382#ifdef FEAT_DIFF
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003383 linenr_T lnum;
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003384 static linenr_T prev_lnum = 0;
3385 static varnumber_T changedtick = 0;
3386 static int fnum = 0;
3387 static int change_start = 0;
3388 static int change_end = 0;
3389 static hlf_T hlID = (hlf_T)0;
3390 int filler_lines;
3391 int col;
3392
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003393 if (in_vim9script()
Yegappan Lakshmanancd917202021-07-21 19:09:09 +02003394 && (check_for_lnum_arg(argvars,0) == FAIL
Yegappan Lakshmanana9a7c0c2021-07-17 19:11:07 +02003395 || check_for_number_arg(argvars, 1) == FAIL))
3396 return;
3397
3398 lnum = tv_get_lnum(argvars);
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003399 if (lnum < 0) // ignore type error in {lnum} arg
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003400 lnum = 0;
3401 if (lnum != prev_lnum
3402 || changedtick != CHANGEDTICK(curbuf)
3403 || fnum != curbuf->b_fnum)
3404 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003405 // New line, buffer, change: need to get the values.
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003406 filler_lines = diff_check(curwin, lnum);
3407 if (filler_lines < 0)
3408 {
3409 if (filler_lines == -1)
3410 {
3411 change_start = MAXCOL;
3412 change_end = -1;
3413 if (diff_find_change(curwin, lnum, &change_start, &change_end))
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003414 hlID = HLF_ADD; // added line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003415 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003416 hlID = HLF_CHD; // changed line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003417 }
3418 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003419 hlID = HLF_ADD; // added line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003420 }
3421 else
3422 hlID = (hlf_T)0;
3423 prev_lnum = lnum;
3424 changedtick = CHANGEDTICK(curbuf);
3425 fnum = curbuf->b_fnum;
3426 }
3427
3428 if (hlID == HLF_CHD || hlID == HLF_TXD)
3429 {
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003430 col = tv_get_number(&argvars[1]) - 1; // ignore type error in {col}
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003431 if (col >= change_start && col <= change_end)
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003432 hlID = HLF_TXD; // changed text
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003433 else
Bram Moolenaar5d18efe2019-12-01 21:11:22 +01003434 hlID = HLF_CHD; // changed line
Bram Moolenaaraf7645d2019-09-05 22:33:28 +02003435 }
3436 rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID;
3437#endif
3438}
3439
3440#endif