Mercurial > vim
annotate src/diff.c @ 14696:195e8b1fcbbf v8.1.0360
patch 8.1.0360: using an external diff program is slow and inflexible
commit https://github.com/vim/vim/commit/e828b7621cf9065a3582be0c4dd1e0e846e335bf
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Sep 10 17:51:58 2018 +0200
patch 8.1.0360: using an external diff program is slow and inflexible
Problem: Using an external diff program is slow and inflexible.
Solution: Include the xdiff library. (Christian Brabandt, closes https://github.com/vim/vim/issues/2732)
Use it by default.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Mon, 10 Sep 2018 18:00:06 +0200 |
parents | dc67449d648c |
children | 973d3f4d8017 |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
10013
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7 | 2 * |
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 /* | |
1788 | 11 * diff.c: code for diff'ing two, three or four buffers. |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
12 * |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
13 * There are three ways to diff: |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
14 * - Shell out to an external diff program, using files. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
15 * - Use the compiled-in xdiff library. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
16 * - Let 'diffexpr' do the work, using files. |
7 | 17 */ |
18 | |
19 #include "vim.h" | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
20 #include "xdiff/xdiff.h" |
7 | 21 |
22 #if defined(FEAT_DIFF) || defined(PROTO) | |
23 | |
24 static int diff_busy = FALSE; /* ex_diffgetput() is busy */ | |
25 | |
26 /* flags obtained from the 'diffopt' option */ | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
27 #define DIFF_FILLER 1 // display filler lines |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
28 #define DIFF_ICASE 2 // ignore case |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
29 #define DIFF_IWHITE 4 // ignore change in white space |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
30 #define DIFF_HORIZONTAL 8 // horizontal splits |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
31 #define DIFF_VERTICAL 16 // vertical splits |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
32 #define DIFF_HIDDEN_OFF 32 // diffoff when hidden |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
33 #define DIFF_INTERNAL 64 // use internal xdiff algorithm |
7 | 34 static int diff_flags = DIFF_FILLER; |
35 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
36 static long diff_algorithm = 0; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
37 |
7 | 38 #define LBUFLEN 50 /* length of line in diff file */ |
39 | |
40 static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it | |
41 doesn't work, MAYBE when not checked yet */ | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7817
diff
changeset
|
42 #if defined(MSWIN) |
7 | 43 static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE |
44 when it doesn't work, MAYBE when not | |
45 checked yet */ | |
46 #endif | |
47 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
48 // used for diff input |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
49 typedef struct { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
50 char_u *din_fname; // used for external diff |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
51 mmfile_t din_mmfile; // used for internal diff |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
52 } diffin_T; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
53 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
54 // used for diff result |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
55 typedef struct { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
56 char_u *dout_fname; // used for external diff |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
57 garray_T dout_ga; // used for internal diff |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
58 } diffout_T; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
59 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
60 // two diff inputs and one result |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
61 typedef struct { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
62 diffin_T dio_orig; // original file input |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
63 diffin_T dio_new; // new file input |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
64 diffout_T dio_diff; // diff result |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
65 int dio_internal; // using internal diff |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
66 } diffio_T; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
67 |
7799
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
68 static int diff_buf_idx(buf_T *buf); |
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
69 static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp); |
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
70 static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after); |
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
71 static void diff_check_unchanged(tabpage_T *tp, diff_T *dp); |
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
72 static int diff_check_sanity(tabpage_T *tp, diff_T *dp); |
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
73 static void diff_redraw(int dofold); |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
74 static int check_external_diff(diffio_T *diffio); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
75 static int diff_file(diffio_T *diffio); |
7799
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
76 static int diff_equal_entry(diff_T *dp, int idx1, int idx2); |
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
77 static int diff_cmp(char_u *s1, char_u *s2); |
7 | 78 #ifdef FEAT_FOLDING |
7799
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
79 static void diff_fold_update(diff_T *dp, int skip_idx); |
7 | 80 #endif |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
81 static void diff_read(int idx_orig, int idx_new, diffout_T *fname); |
7799
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
82 static void diff_copy_entry(diff_T *dprev, diff_T *dp, int idx_orig, int idx_new); |
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7338
diff
changeset
|
83 static diff_T *diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp); |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
84 static int parse_diff_ed(char_u *line, linenr_T *lnum_orig, long *count_orig, linenr_T *lnum_new, long *count_new); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
85 static int parse_diff_unified(char_u *line, linenr_T *lnum_orig, long *count_orig, linenr_T *lnum_new, long *count_new); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
86 static int xdiff_out(void *priv, mmbuffer_t *mb, int nbuf); |
7 | 87 |
88 #ifndef USE_CR | |
89 # define tag_fgets vim_fgets | |
90 #endif | |
91 | |
92 /* | |
93 * Called when deleting or unloading a buffer: No longer make a diff with it. | |
94 */ | |
95 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
96 diff_buf_delete(buf_T *buf) |
7 | 97 { |
98 int i; | |
672 | 99 tabpage_T *tp; |
7 | 100 |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9487
diff
changeset
|
101 FOR_ALL_TABPAGES(tp) |
7 | 102 { |
672 | 103 i = diff_buf_idx_tp(buf, tp); |
104 if (i != DB_COUNT) | |
105 { | |
106 tp->tp_diffbuf[i] = NULL; | |
107 tp->tp_diff_invalid = TRUE; | |
1761 | 108 if (tp == curtab) |
109 diff_redraw(TRUE); | |
672 | 110 } |
7 | 111 } |
112 } | |
113 | |
114 /* | |
16 | 115 * Check if the current buffer should be added to or removed from the list of |
116 * diff buffers. | |
117 */ | |
118 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
119 diff_buf_adjust(win_T *win) |
16 | 120 { |
121 win_T *wp; | |
672 | 122 int i; |
16 | 123 |
124 if (!win->w_p_diff) | |
125 { | |
126 /* When there is no window showing a diff for this buffer, remove | |
127 * it from the diffs. */ | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9487
diff
changeset
|
128 FOR_ALL_WINDOWS(wp) |
16 | 129 if (wp->w_buffer == win->w_buffer && wp->w_p_diff) |
130 break; | |
131 if (wp == NULL) | |
672 | 132 { |
133 i = diff_buf_idx(win->w_buffer); | |
134 if (i != DB_COUNT) | |
135 { | |
136 curtab->tp_diffbuf[i] = NULL; | |
137 curtab->tp_diff_invalid = TRUE; | |
1761 | 138 diff_redraw(TRUE); |
672 | 139 } |
140 } | |
16 | 141 } |
142 else | |
143 diff_buf_add(win->w_buffer); | |
144 } | |
145 | |
146 /* | |
7 | 147 * Add a buffer to make diffs for. |
672 | 148 * Call this when a new buffer is being edited in the current window where |
149 * 'diff' is set. | |
1788 | 150 * Marks the current buffer as being part of the diff and requiring updating. |
672 | 151 * This must be done before any autocmd, because a command may use info |
152 * about the screen contents. | |
7 | 153 */ |
154 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
155 diff_buf_add(buf_T *buf) |
7 | 156 { |
157 int i; | |
158 | |
159 if (diff_buf_idx(buf) != DB_COUNT) | |
160 return; /* It's already there. */ | |
161 | |
162 for (i = 0; i < DB_COUNT; ++i) | |
672 | 163 if (curtab->tp_diffbuf[i] == NULL) |
7 | 164 { |
672 | 165 curtab->tp_diffbuf[i] = buf; |
166 curtab->tp_diff_invalid = TRUE; | |
1761 | 167 diff_redraw(TRUE); |
7 | 168 return; |
169 } | |
170 | |
9719
219dbe63ad2a
commit https://github.com/vim/vim/commit/89eaa4185efacab253b23a182c1c8a7bbf1096c9
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
171 EMSGN(_("E96: Cannot diff more than %ld buffers"), DB_COUNT); |
7 | 172 } |
173 | |
174 /* | |
10821
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
175 * Remove all buffers to make diffs for. |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
176 */ |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
177 static void |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
178 diff_buf_clear(void) |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
179 { |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
180 int i; |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
181 |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
182 for (i = 0; i < DB_COUNT; ++i) |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
183 if (curtab->tp_diffbuf[i] != NULL) |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
184 { |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
185 curtab->tp_diffbuf[i] = NULL; |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
186 curtab->tp_diff_invalid = TRUE; |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
187 diff_redraw(TRUE); |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
188 } |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
189 } |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
190 |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
191 /* |
672 | 192 * Find buffer "buf" in the list of diff buffers for the current tab page. |
7 | 193 * Return its index or DB_COUNT if not found. |
194 */ | |
195 static int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
196 diff_buf_idx(buf_T *buf) |
7 | 197 { |
198 int idx; | |
199 | |
200 for (idx = 0; idx < DB_COUNT; ++idx) | |
672 | 201 if (curtab->tp_diffbuf[idx] == buf) |
202 break; | |
203 return idx; | |
204 } | |
205 | |
206 /* | |
207 * Find buffer "buf" in the list of diff buffers for tab page "tp". | |
208 * Return its index or DB_COUNT if not found. | |
209 */ | |
210 static int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
211 diff_buf_idx_tp(buf_T *buf, tabpage_T *tp) |
672 | 212 { |
213 int idx; | |
214 | |
215 for (idx = 0; idx < DB_COUNT; ++idx) | |
216 if (tp->tp_diffbuf[idx] == buf) | |
7 | 217 break; |
218 return idx; | |
219 } | |
220 | |
221 /* | |
672 | 222 * Mark the diff info involving buffer "buf" as invalid, it will be updated |
223 * when info is requested. | |
7 | 224 */ |
225 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
226 diff_invalidate(buf_T *buf) |
7 | 227 { |
672 | 228 tabpage_T *tp; |
229 int i; | |
230 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9487
diff
changeset
|
231 FOR_ALL_TABPAGES(tp) |
7 | 232 { |
672 | 233 i = diff_buf_idx_tp(buf, tp); |
234 if (i != DB_COUNT) | |
235 { | |
236 tp->tp_diff_invalid = TRUE; | |
237 if (tp == curtab) | |
238 diff_redraw(TRUE); | |
239 } | |
7 | 240 } |
241 } | |
242 | |
243 /* | |
672 | 244 * Called by mark_adjust(): update line numbers in "curbuf". |
7 | 245 */ |
246 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
247 diff_mark_adjust( |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
248 linenr_T line1, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
249 linenr_T line2, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
250 long amount, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
251 long amount_after) |
7 | 252 { |
672 | 253 int idx; |
254 tabpage_T *tp; | |
255 | |
256 /* Handle all tab pages that use the current buffer in a diff. */ | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9487
diff
changeset
|
257 FOR_ALL_TABPAGES(tp) |
672 | 258 { |
259 idx = diff_buf_idx_tp(curbuf, tp); | |
260 if (idx != DB_COUNT) | |
261 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after); | |
262 } | |
263 } | |
264 | |
265 /* | |
266 * Update line numbers in tab page "tp" for "curbuf" with index "idx". | |
267 * This attempts to update the changes as much as possible: | |
268 * When inserting/deleting lines outside of existing change blocks, create a | |
269 * new change block and update the line numbers in following blocks. | |
270 * When inserting/deleting lines in existing change blocks, update them. | |
271 */ | |
272 static void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
273 diff_mark_adjust_tp( |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
274 tabpage_T *tp, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
275 int idx, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
276 linenr_T line1, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
277 linenr_T line2, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
278 long amount, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
279 long amount_after) |
672 | 280 { |
7 | 281 diff_T *dp; |
282 diff_T *dprev; | |
283 diff_T *dnext; | |
284 int i; | |
285 int inserted, deleted; | |
286 int n, off; | |
287 linenr_T last; | |
288 linenr_T lnum_deleted = line1; /* lnum of remaining deletion */ | |
289 int check_unchanged; | |
290 | |
291 if (line2 == MAXLNUM) | |
292 { | |
293 /* mark_adjust(99, MAXLNUM, 9, 0): insert lines */ | |
294 inserted = amount; | |
295 deleted = 0; | |
296 } | |
297 else if (amount_after > 0) | |
298 { | |
299 /* mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines*/ | |
300 inserted = amount_after; | |
301 deleted = 0; | |
302 } | |
303 else | |
304 { | |
305 /* mark_adjust(98, 99, MAXLNUM, -2): delete lines */ | |
306 inserted = 0; | |
307 deleted = -amount_after; | |
308 } | |
309 | |
310 dprev = NULL; | |
672 | 311 dp = tp->tp_first_diff; |
7 | 312 for (;;) |
313 { | |
314 /* If the change is after the previous diff block and before the next | |
315 * diff block, thus not touching an existing change, create a new diff | |
316 * block. Don't do this when ex_diffgetput() is busy. */ | |
317 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2 | |
318 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1)) | |
319 && (dprev == NULL | |
320 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1) | |
321 && !diff_busy) | |
322 { | |
672 | 323 dnext = diff_alloc_new(tp, dprev, dp); |
7 | 324 if (dnext == NULL) |
325 return; | |
326 | |
327 dnext->df_lnum[idx] = line1; | |
328 dnext->df_count[idx] = inserted; | |
329 for (i = 0; i < DB_COUNT; ++i) | |
672 | 330 if (tp->tp_diffbuf[i] != NULL && i != idx) |
7 | 331 { |
332 if (dprev == NULL) | |
333 dnext->df_lnum[i] = line1; | |
334 else | |
335 dnext->df_lnum[i] = line1 | |
336 + (dprev->df_lnum[i] + dprev->df_count[i]) | |
337 - (dprev->df_lnum[idx] + dprev->df_count[idx]); | |
338 dnext->df_count[i] = deleted; | |
339 } | |
340 } | |
341 | |
342 /* if at end of the list, quit */ | |
343 if (dp == NULL) | |
344 break; | |
345 | |
346 /* | |
347 * Check for these situations: | |
348 * 1 2 3 | |
349 * 1 2 3 | |
350 * line1 2 3 4 5 | |
351 * 2 3 4 5 | |
352 * 2 3 4 5 | |
353 * line2 2 3 4 5 | |
354 * 3 5 6 | |
355 * 3 5 6 | |
356 */ | |
357 /* compute last line of this change */ | |
358 last = dp->df_lnum[idx] + dp->df_count[idx] - 1; | |
359 | |
360 /* 1. change completely above line1: nothing to do */ | |
361 if (last >= line1 - 1) | |
362 { | |
363 /* 6. change below line2: only adjust for amount_after; also when | |
364 * "deleted" became zero when deleted all lines between two diffs */ | |
365 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2) | |
366 { | |
367 if (amount_after == 0) | |
368 break; /* nothing left to change */ | |
369 dp->df_lnum[idx] += amount_after; | |
370 } | |
371 else | |
372 { | |
373 check_unchanged = FALSE; | |
374 | |
375 /* 2. 3. 4. 5.: inserted/deleted lines touching this diff. */ | |
376 if (deleted > 0) | |
377 { | |
378 if (dp->df_lnum[idx] >= line1) | |
379 { | |
380 off = dp->df_lnum[idx] - lnum_deleted; | |
381 if (last <= line2) | |
382 { | |
383 /* 4. delete all lines of diff */ | |
384 if (dp->df_next != NULL | |
385 && dp->df_next->df_lnum[idx] - 1 <= line2) | |
386 { | |
387 /* delete continues in next diff, only do | |
388 * lines until that one */ | |
389 n = dp->df_next->df_lnum[idx] - lnum_deleted; | |
390 deleted -= n; | |
391 n -= dp->df_count[idx]; | |
392 lnum_deleted = dp->df_next->df_lnum[idx]; | |
393 } | |
394 else | |
395 n = deleted - dp->df_count[idx]; | |
396 dp->df_count[idx] = 0; | |
397 } | |
398 else | |
399 { | |
400 /* 5. delete lines at or just before top of diff */ | |
401 n = off; | |
402 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1; | |
403 check_unchanged = TRUE; | |
404 } | |
405 dp->df_lnum[idx] = line1; | |
406 } | |
407 else | |
408 { | |
409 off = 0; | |
410 if (last < line2) | |
411 { | |
412 /* 2. delete at end of of diff */ | |
413 dp->df_count[idx] -= last - lnum_deleted + 1; | |
414 if (dp->df_next != NULL | |
415 && dp->df_next->df_lnum[idx] - 1 <= line2) | |
416 { | |
417 /* delete continues in next diff, only do | |
418 * lines until that one */ | |
419 n = dp->df_next->df_lnum[idx] - 1 - last; | |
420 deleted -= dp->df_next->df_lnum[idx] | |
421 - lnum_deleted; | |
422 lnum_deleted = dp->df_next->df_lnum[idx]; | |
423 } | |
424 else | |
425 n = line2 - last; | |
426 check_unchanged = TRUE; | |
427 } | |
428 else | |
429 { | |
430 /* 3. delete lines inside the diff */ | |
431 n = 0; | |
432 dp->df_count[idx] -= deleted; | |
433 } | |
434 } | |
435 | |
436 for (i = 0; i < DB_COUNT; ++i) | |
672 | 437 if (tp->tp_diffbuf[i] != NULL && i != idx) |
7 | 438 { |
439 dp->df_lnum[i] -= off; | |
440 dp->df_count[i] += n; | |
441 } | |
442 } | |
443 else | |
444 { | |
445 if (dp->df_lnum[idx] <= line1) | |
446 { | |
447 /* inserted lines somewhere in this diff */ | |
448 dp->df_count[idx] += inserted; | |
449 check_unchanged = TRUE; | |
450 } | |
451 else | |
452 /* inserted lines somewhere above this diff */ | |
453 dp->df_lnum[idx] += inserted; | |
454 } | |
455 | |
456 if (check_unchanged) | |
457 /* Check if inserted lines are equal, may reduce the | |
458 * size of the diff. TODO: also check for equal lines | |
459 * in the middle and perhaps split the block. */ | |
672 | 460 diff_check_unchanged(tp, dp); |
7 | 461 } |
462 } | |
463 | |
464 /* check if this block touches the previous one, may merge them. */ | |
465 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx] | |
466 == dp->df_lnum[idx]) | |
467 { | |
468 for (i = 0; i < DB_COUNT; ++i) | |
672 | 469 if (tp->tp_diffbuf[i] != NULL) |
7 | 470 dprev->df_count[i] += dp->df_count[i]; |
471 dprev->df_next = dp->df_next; | |
472 vim_free(dp); | |
473 dp = dprev->df_next; | |
474 } | |
475 else | |
476 { | |
477 /* Advance to next entry. */ | |
478 dprev = dp; | |
479 dp = dp->df_next; | |
480 } | |
481 } | |
482 | |
483 dprev = NULL; | |
672 | 484 dp = tp->tp_first_diff; |
7 | 485 while (dp != NULL) |
486 { | |
487 /* All counts are zero, remove this entry. */ | |
488 for (i = 0; i < DB_COUNT; ++i) | |
672 | 489 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0) |
7 | 490 break; |
491 if (i == DB_COUNT) | |
492 { | |
493 dnext = dp->df_next; | |
494 vim_free(dp); | |
495 dp = dnext; | |
496 if (dprev == NULL) | |
672 | 497 tp->tp_first_diff = dnext; |
7 | 498 else |
499 dprev->df_next = dnext; | |
500 } | |
501 else | |
502 { | |
503 /* Advance to next entry. */ | |
504 dprev = dp; | |
505 dp = dp->df_next; | |
506 } | |
507 | |
508 } | |
672 | 509 |
510 if (tp == curtab) | |
511 { | |
512 diff_redraw(TRUE); | |
7 | 513 |
672 | 514 /* Need to recompute the scroll binding, may remove or add filler |
515 * lines (e.g., when adding lines above w_topline). But it's slow when | |
516 * making many changes, postpone until redrawing. */ | |
517 diff_need_scrollbind = TRUE; | |
518 } | |
7 | 519 } |
520 | |
521 /* | |
522 * Allocate a new diff block and link it between "dprev" and "dp". | |
523 */ | |
524 static diff_T * | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
525 diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp) |
7 | 526 { |
527 diff_T *dnew; | |
528 | |
529 dnew = (diff_T *)alloc((unsigned)sizeof(diff_T)); | |
530 if (dnew != NULL) | |
531 { | |
532 dnew->df_next = dp; | |
533 if (dprev == NULL) | |
672 | 534 tp->tp_first_diff = dnew; |
7 | 535 else |
536 dprev->df_next = dnew; | |
537 } | |
538 return dnew; | |
539 } | |
540 | |
541 /* | |
542 * Check if the diff block "dp" can be made smaller for lines at the start and | |
543 * end that are equal. Called after inserting lines. | |
544 * This may result in a change where all buffers have zero lines, the caller | |
545 * must take care of removing it. | |
546 */ | |
547 static void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
548 diff_check_unchanged(tabpage_T *tp, diff_T *dp) |
7 | 549 { |
550 int i_org; | |
551 int i_new; | |
552 int off_org, off_new; | |
553 char_u *line_org; | |
554 int dir = FORWARD; | |
555 | |
556 /* Find the first buffers, use it as the original, compare the other | |
557 * buffer lines against this one. */ | |
558 for (i_org = 0; i_org < DB_COUNT; ++i_org) | |
672 | 559 if (tp->tp_diffbuf[i_org] != NULL) |
7 | 560 break; |
561 if (i_org == DB_COUNT) /* safety check */ | |
562 return; | |
563 | |
672 | 564 if (diff_check_sanity(tp, dp) == FAIL) |
7 | 565 return; |
566 | |
567 /* First check lines at the top, then at the bottom. */ | |
568 off_org = 0; | |
569 off_new = 0; | |
570 for (;;) | |
571 { | |
572 /* Repeat until a line is found which is different or the number of | |
573 * lines has become zero. */ | |
574 while (dp->df_count[i_org] > 0) | |
575 { | |
576 /* Copy the line, the next ml_get() will invalidate it. */ | |
577 if (dir == BACKWARD) | |
578 off_org = dp->df_count[i_org] - 1; | |
672 | 579 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org], |
7 | 580 dp->df_lnum[i_org] + off_org, FALSE)); |
581 if (line_org == NULL) | |
582 return; | |
583 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new) | |
584 { | |
672 | 585 if (tp->tp_diffbuf[i_new] == NULL) |
7 | 586 continue; |
587 if (dir == BACKWARD) | |
588 off_new = dp->df_count[i_new] - 1; | |
589 /* if other buffer doesn't have this line, it was inserted */ | |
590 if (off_new < 0 || off_new >= dp->df_count[i_new]) | |
591 break; | |
672 | 592 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new], |
7 | 593 dp->df_lnum[i_new] + off_new, FALSE)) != 0) |
594 break; | |
595 } | |
596 vim_free(line_org); | |
597 | |
598 /* Stop when a line isn't equal in all diff buffers. */ | |
599 if (i_new != DB_COUNT) | |
600 break; | |
601 | |
602 /* Line matched in all buffers, remove it from the diff. */ | |
603 for (i_new = i_org; i_new < DB_COUNT; ++i_new) | |
672 | 604 if (tp->tp_diffbuf[i_new] != NULL) |
7 | 605 { |
606 if (dir == FORWARD) | |
607 ++dp->df_lnum[i_new]; | |
608 --dp->df_count[i_new]; | |
609 } | |
610 } | |
611 if (dir == BACKWARD) | |
612 break; | |
613 dir = BACKWARD; | |
614 } | |
615 } | |
616 | |
617 /* | |
618 * Check if a diff block doesn't contain invalid line numbers. | |
619 * This can happen when the diff program returns invalid results. | |
620 */ | |
621 static int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
622 diff_check_sanity(tabpage_T *tp, diff_T *dp) |
7 | 623 { |
624 int i; | |
625 | |
626 for (i = 0; i < DB_COUNT; ++i) | |
672 | 627 if (tp->tp_diffbuf[i] != NULL) |
7 | 628 if (dp->df_lnum[i] + dp->df_count[i] - 1 |
672 | 629 > tp->tp_diffbuf[i]->b_ml.ml_line_count) |
7 | 630 return FAIL; |
631 return OK; | |
632 } | |
633 | |
634 /* | |
672 | 635 * Mark all diff buffers in the current tab page for redraw. |
7 | 636 */ |
637 static void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
638 diff_redraw( |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
639 int dofold) /* also recompute the folds */ |
7 | 640 { |
641 win_T *wp; | |
642 int n; | |
643 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9487
diff
changeset
|
644 FOR_ALL_WINDOWS(wp) |
7 | 645 if (wp->w_p_diff) |
646 { | |
738 | 647 redraw_win_later(wp, SOME_VALID); |
7 | 648 #ifdef FEAT_FOLDING |
649 if (dofold && foldmethodIsDiff(wp)) | |
650 foldUpdateAll(wp); | |
651 #endif | |
652 /* A change may have made filler lines invalid, need to take care | |
653 * of that for other windows. */ | |
3904 | 654 n = diff_check(wp, wp->w_topline); |
655 if ((wp != curwin && wp->w_topfill > 0) || n > 0) | |
7 | 656 { |
657 if (wp->w_topfill > n) | |
658 wp->w_topfill = (n < 0 ? 0 : n); | |
3904 | 659 else if (n > 0 && n > wp->w_topfill) |
660 wp->w_topfill = n; | |
5934 | 661 check_topfill(wp, FALSE); |
7 | 662 } |
663 } | |
664 } | |
665 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
666 static void |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
667 clear_diffin(diffin_T *din) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
668 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
669 if (din->din_fname == NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
670 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
671 vim_free(din->din_mmfile.ptr); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
672 din->din_mmfile.ptr = NULL; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
673 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
674 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
675 mch_remove(din->din_fname); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
676 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
677 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
678 static void |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
679 clear_diffout(diffout_T *dout) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
680 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
681 if (dout->dout_fname == NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
682 ga_clear_strings(&dout->dout_ga); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
683 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
684 mch_remove(dout->dout_fname); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
685 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
686 |
7 | 687 /* |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
688 * Write buffer "buf" to a memory buffer. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
689 * Return FAIL for failure. |
7 | 690 */ |
691 static int | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
692 diff_write_buffer(buf_T *buf, diffin_T *din) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
693 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
694 linenr_T lnum; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
695 char_u *s; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
696 long len = 0; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
697 char_u *ptr; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
698 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
699 // xdiff requires one big block of memory with all the text. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
700 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
701 len += STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
702 ptr = lalloc(len, TRUE); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
703 if (ptr == NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
704 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
705 // Allocating memory failed. This can happen, because we try to read |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
706 // the whole buffer text into memory. Set the failed flag, the diff |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
707 // will be retried with external diff. The flag is never reset. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
708 buf->b_diff_failed = TRUE; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
709 if (p_verbose > 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
710 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
711 verbose_enter(); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
712 smsg((char_u *) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
713 _("Not enough memory to use internal diff for buffer \"%s\""), |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
714 buf->b_fname); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
715 verbose_leave(); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
716 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
717 return FAIL; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
718 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
719 din->din_mmfile.ptr = (char *)ptr; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
720 din->din_mmfile.size = len; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
721 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
722 len = 0; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
723 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
724 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
725 for (s = ml_get_buf(buf, lnum, FALSE); *s != NUL; ) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
726 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
727 if (diff_flags & DIFF_ICASE) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
728 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
729 int c; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
730 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
731 // xdiff doesn't support ignoring case, fold-case the text. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
732 #ifdef FEAT_MBYTE |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
733 int orig_len; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
734 char_u cbuf[MB_MAXBYTES + 1]; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
735 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
736 c = PTR2CHAR(s); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
737 c = enc_utf8 ? utf_fold(c) : MB_TOLOWER(c); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
738 orig_len = MB_PTR2LEN(s); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
739 if (mb_char2bytes(c, cbuf) != orig_len) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
740 // TODO: handle byte length difference |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
741 mch_memmove(ptr + len, s, orig_len); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
742 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
743 mch_memmove(ptr + len, cbuf, orig_len); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
744 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
745 s += orig_len; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
746 len += orig_len; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
747 #else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
748 c = *s++; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
749 ptr[len++] = TOLOWER_LOC(c); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
750 #endif |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
751 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
752 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
753 ptr[len++] = *s++; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
754 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
755 ptr[len++] = NL; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
756 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
757 return OK; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
758 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
759 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
760 /* |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
761 * Write buffer "buf" to file or memory buffer. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
762 * Return FAIL for failure. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
763 */ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
764 static int |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
765 diff_write(buf_T *buf, diffin_T *din) |
7 | 766 { |
767 int r; | |
768 char_u *save_ff; | |
769 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
770 if (din->din_fname == NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
771 return diff_write_buffer(buf, din); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
772 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
773 // Always use 'fileformat' set to "unix". |
7 | 774 save_ff = buf->b_p_ff; |
775 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX); | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
776 r = buf_write(buf, din->din_fname, NULL, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
777 (linenr_T)1, buf->b_ml.ml_line_count, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
778 NULL, FALSE, FALSE, FALSE, TRUE); |
7 | 779 free_string_option(buf->b_p_ff); |
780 buf->b_p_ff = save_ff; | |
781 return r; | |
782 } | |
783 | |
784 /* | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
785 * Update the diffs for all buffers involved. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
786 */ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
787 static void |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
788 diff_try_update( |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
789 diffio_T *dio, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
790 int idx_orig, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
791 exarg_T *eap) // "eap" can be NULL |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
792 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
793 buf_T *buf; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
794 int idx_new; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
795 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
796 if (dio->dio_internal) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
797 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
798 ga_init2(&dio->dio_diff.dout_ga, sizeof(char *), 1000); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
799 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
800 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
801 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
802 // We need three temp file names. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
803 dio->dio_orig.din_fname = vim_tempname('o', TRUE); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
804 dio->dio_new.din_fname = vim_tempname('n', TRUE); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
805 dio->dio_diff.dout_fname = vim_tempname('d', TRUE); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
806 if (dio->dio_orig.din_fname == NULL |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
807 || dio->dio_new.din_fname == NULL |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
808 || dio->dio_diff.dout_fname == NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
809 goto theend; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
810 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
811 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
812 // Check external diff is actually working. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
813 if (!dio->dio_internal && check_external_diff(dio) == FAIL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
814 goto theend; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
815 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
816 // :diffupdate! |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
817 if (eap != NULL && eap->forceit) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
818 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
819 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
820 buf = curtab->tp_diffbuf[idx_new]; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
821 if (buf_valid(buf)) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
822 buf_check_timestamp(buf, FALSE); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
823 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
824 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
825 // Write the first buffer to a tempfile or mmfile_t. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
826 buf = curtab->tp_diffbuf[idx_orig]; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
827 if (diff_write(buf, &dio->dio_orig) == FAIL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
828 goto theend; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
829 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
830 // Make a difference between the first buffer and every other. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
831 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
832 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
833 buf = curtab->tp_diffbuf[idx_new]; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
834 if (buf == NULL || buf->b_ml.ml_mfp == NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
835 continue; // skip buffer that isn't loaded |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
836 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
837 // Write the other buffer and diff with the first one. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
838 if (diff_write(buf, &dio->dio_new) == FAIL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
839 continue; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
840 if (diff_file(dio) == FAIL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
841 continue; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
842 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
843 // Read the diff output and add each entry to the diff list. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
844 diff_read(idx_orig, idx_new, &dio->dio_diff); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
845 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
846 clear_diffin(&dio->dio_new); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
847 clear_diffout(&dio->dio_diff); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
848 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
849 clear_diffin(&dio->dio_orig); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
850 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
851 theend: |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
852 vim_free(dio->dio_orig.din_fname); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
853 vim_free(dio->dio_new.din_fname); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
854 vim_free(dio->dio_diff.dout_fname); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
855 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
856 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
857 /* |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
858 * Return TRUE if the options are set to use the internal diff library. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
859 * Note that if the internal diff failed for one of the buffers, the external |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
860 * diff will be used anyway. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
861 */ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
862 static int |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
863 diff_internal(void) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
864 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
865 return (diff_flags & DIFF_INTERNAL) != 0 && *p_dex == NUL; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
866 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
867 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
868 /* |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
869 * Return TRUE if the internal diff failed for one of the diff buffers. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
870 */ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
871 static int |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
872 diff_internal_failed(void) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
873 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
874 int idx; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
875 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
876 // Only need to do something when there is another buffer. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
877 for (idx = 0; idx < DB_COUNT; ++idx) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
878 if (curtab->tp_diffbuf[idx] != NULL |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
879 && curtab->tp_diffbuf[idx]->b_diff_failed) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
880 return TRUE; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
881 return FALSE; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
882 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
883 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
884 /* |
7 | 885 * Completely update the diffs for the buffers involved. |
886 * This uses the ordinary "diff" command. | |
887 * The buffers are written to a file, also for unmodified buffers (the file | |
888 * could have been produced by autocommands, e.g. the netrw plugin). | |
889 */ | |
890 void | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
891 ex_diffupdate(exarg_T *eap) // "eap" can be NULL |
7 | 892 { |
893 int idx_orig; | |
894 int idx_new; | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
895 diffio_T diffio; |
7 | 896 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
897 // Delete all diffblocks. |
672 | 898 diff_clear(curtab); |
899 curtab->tp_diff_invalid = FALSE; | |
7 | 900 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
901 // Use the first buffer as the original text. |
7 | 902 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig) |
672 | 903 if (curtab->tp_diffbuf[idx_orig] != NULL) |
7 | 904 break; |
905 if (idx_orig == DB_COUNT) | |
906 return; | |
907 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
908 // Only need to do something when there is another buffer. |
7 | 909 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) |
672 | 910 if (curtab->tp_diffbuf[idx_new] != NULL) |
7 | 911 break; |
912 if (idx_new == DB_COUNT) | |
913 return; | |
914 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
915 // Only use the internal method if it did not fail for one of the buffers. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
916 vim_memset(&diffio, 0, sizeof(diffio)); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
917 diffio.dio_internal = diff_internal() && !diff_internal_failed(); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
918 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
919 diff_try_update(&diffio, idx_orig, eap); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
920 if (diffio.dio_internal && diff_internal_failed()) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
921 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
922 // Internal diff failed, use external diff instead. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
923 vim_memset(&diffio, 0, sizeof(diffio)); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
924 diff_try_update(&diffio, idx_orig, eap); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
925 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
926 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
927 // force updating cursor position on screen |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
928 curwin->w_valid_cursor.lnum = 0; |
7 | 929 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
930 diff_redraw(TRUE); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
931 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
932 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
933 /* |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
934 * Do a quick test if "diff" really works. Otherwise it looks like there |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
935 * are no differences. Can't use the return value, it's non-zero when |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
936 * there are differences. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
937 */ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
938 static int |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
939 check_external_diff(diffio_T *diffio) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
940 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
941 FILE *fd; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
942 int ok; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
943 int io_error = FALSE; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
944 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
945 // May try twice, first with "-a" and then without. |
7 | 946 for (;;) |
947 { | |
948 ok = FALSE; | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
949 fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w"); |
1757 | 950 if (fd == NULL) |
951 io_error = TRUE; | |
952 else | |
7 | 953 { |
1757 | 954 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1) |
955 io_error = TRUE; | |
7 | 956 fclose(fd); |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
957 fd = mch_fopen((char *)diffio->dio_new.din_fname, "w"); |
1757 | 958 if (fd == NULL) |
959 io_error = TRUE; | |
960 else | |
7 | 961 { |
1757 | 962 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1) |
963 io_error = TRUE; | |
7 | 964 fclose(fd); |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
965 fd = NULL; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
966 if (diff_file(diffio) == OK) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
967 fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r"); |
1757 | 968 if (fd == NULL) |
969 io_error = TRUE; | |
970 else | |
7 | 971 { |
972 char_u linebuf[LBUFLEN]; | |
973 | |
974 for (;;) | |
975 { | |
976 /* There must be a line that contains "1c1". */ | |
977 if (tag_fgets(linebuf, LBUFLEN, fd)) | |
978 break; | |
979 if (STRNCMP(linebuf, "1c1", 3) == 0) | |
980 ok = TRUE; | |
981 } | |
982 fclose(fd); | |
983 } | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
984 mch_remove(diffio->dio_diff.dout_fname); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
985 mch_remove(diffio->dio_new.din_fname); |
7 | 986 } |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
987 mch_remove(diffio->dio_orig.din_fname); |
7 | 988 } |
989 | |
990 #ifdef FEAT_EVAL | |
991 /* When using 'diffexpr' break here. */ | |
992 if (*p_dex != NUL) | |
993 break; | |
994 #endif | |
995 | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7817
diff
changeset
|
996 #if defined(MSWIN) |
7 | 997 /* If the "-a" argument works, also check if "--binary" works. */ |
998 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE) | |
999 { | |
1000 diff_a_works = TRUE; | |
1001 diff_bin_works = TRUE; | |
1002 continue; | |
1003 } | |
1004 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE) | |
1005 { | |
1006 /* Tried --binary, but it failed. "-a" works though. */ | |
1007 diff_bin_works = FALSE; | |
1008 ok = TRUE; | |
1009 } | |
1010 #endif | |
1011 | |
1012 /* If we checked if "-a" works already, break here. */ | |
1013 if (diff_a_works != MAYBE) | |
1014 break; | |
1015 diff_a_works = ok; | |
1016 | |
1017 /* If "-a" works break here, otherwise retry without "-a". */ | |
1018 if (ok) | |
1019 break; | |
1020 } | |
1021 if (!ok) | |
1022 { | |
1757 | 1023 if (io_error) |
1024 EMSG(_("E810: Cannot read or write temp files")); | |
7 | 1025 EMSG(_("E97: Cannot create diffs")); |
1026 diff_a_works = MAYBE; | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7817
diff
changeset
|
1027 #if defined(MSWIN) |
7 | 1028 diff_bin_works = MAYBE; |
1029 #endif | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1030 return FAIL; |
7 | 1031 } |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1032 return OK; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1033 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1034 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1035 /* |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1036 * Invoke the xdiff function. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1037 */ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1038 static int |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1039 diff_file_internal(diffio_T *diffio) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1040 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1041 xpparam_t param; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1042 xdemitconf_t emit_cfg; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1043 xdemitcb_t emit_cb; |
7 | 1044 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1045 vim_memset(¶m, 0, sizeof(param)); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1046 vim_memset(&emit_cfg, 0, sizeof(emit_cfg)); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1047 vim_memset(&emit_cb, 0, sizeof(emit_cb)); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1048 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1049 param.flags = diff_algorithm; |
3524 | 1050 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1051 if (diff_flags & DIFF_IWHITE) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1052 param.flags |= XDF_IGNORE_WHITESPACE_CHANGE; |
7 | 1053 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1054 emit_cfg.ctxlen = 0; // don't need any diff_context here |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1055 emit_cb.priv = &diffio->dio_diff; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1056 emit_cb.outf = xdiff_out; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1057 if (xdl_diff(&diffio->dio_orig.din_mmfile, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1058 &diffio->dio_new.din_mmfile, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1059 ¶m, &emit_cfg, &emit_cb) < 0) |
7 | 1060 { |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1061 EMSG(_("E960: Problem creating the internal diff")); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1062 return FAIL; |
7 | 1063 } |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1064 return OK; |
7 | 1065 } |
1066 | |
1067 /* | |
1068 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff". | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1069 * return OK or FAIL; |
7 | 1070 */ |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1071 static int |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1072 diff_file(diffio_T *dio) |
7 | 1073 { |
1074 char_u *cmd; | |
1872 | 1075 size_t len; |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1076 char_u *tmp_orig = dio->dio_orig.din_fname; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1077 char_u *tmp_new = dio->dio_new.din_fname; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1078 char_u *tmp_diff = dio->dio_diff.dout_fname; |
7 | 1079 |
1080 #ifdef FEAT_EVAL | |
1081 if (*p_dex != NUL) | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1082 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1083 // Use 'diffexpr' to generate the diff file. |
7 | 1084 eval_diff(tmp_orig, tmp_new, tmp_diff); |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1085 return OK; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1086 } |
7 | 1087 else |
1088 #endif | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1089 // Use xdiff for generating the diff. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1090 if (dio->dio_internal) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1091 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1092 return diff_file_internal(dio); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1093 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1094 else |
7 | 1095 { |
1872 | 1096 len = STRLEN(tmp_orig) + STRLEN(tmp_new) |
1097 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27; | |
1098 cmd = alloc((unsigned)len); | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1099 if (cmd == NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1100 return FAIL; |
193 | 1101 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1102 // We don't want $DIFF_OPTIONS to get in the way. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1103 if (getenv("DIFF_OPTIONS")) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1104 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)""); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1105 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1106 // Build the diff command and execute it. Always use -a, binary |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1107 // differences are of no use. Ignore errors, diff returns |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1108 // non-zero when differences have been found. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1109 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s", |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1110 diff_a_works == FALSE ? "" : "-a ", |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7817
diff
changeset
|
1111 #if defined(MSWIN) |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1112 diff_bin_works == TRUE ? "--binary " : "", |
7 | 1113 #else |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1114 "", |
7 | 1115 #endif |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1116 (diff_flags & DIFF_IWHITE) ? "-b " : "", |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1117 (diff_flags & DIFF_ICASE) ? "-i " : "", |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1118 tmp_orig, tmp_new); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1119 append_redir(cmd, (int)len, p_srr, tmp_diff); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1120 block_autocmds(); // avoid ShellCmdPost stuff |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1121 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1122 unblock_autocmds(); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1123 vim_free(cmd); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1124 return OK; |
7 | 1125 } |
1126 } | |
1127 | |
1128 /* | |
1129 * Create a new version of a file from the current buffer and a diff file. | |
1130 * The buffer is written to a file, also for unmodified buffers (the file | |
1131 * could have been produced by autocommands, e.g. the netrw plugin). | |
1132 */ | |
1133 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1134 ex_diffpatch(exarg_T *eap) |
7 | 1135 { |
1136 char_u *tmp_orig; /* name of original temp file */ | |
1137 char_u *tmp_new; /* name of patched temp file */ | |
1138 char_u *buf = NULL; | |
1872 | 1139 size_t buflen; |
7 | 1140 win_T *old_curwin = curwin; |
1141 char_u *newname = NULL; /* name of patched file buffer */ | |
1142 #ifdef UNIX | |
1143 char_u dirbuf[MAXPATHL]; | |
1144 char_u *fullname = NULL; | |
1145 #endif | |
1146 #ifdef FEAT_BROWSE | |
1147 char_u *browseFile = NULL; | |
1148 int browse_flag = cmdmod.browse; | |
1149 #endif | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
8368
diff
changeset
|
1150 stat_T st; |
11113
081ed9efb5c0
patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents:
11109
diff
changeset
|
1151 char_u *esc_name = NULL; |
7 | 1152 |
1153 #ifdef FEAT_BROWSE | |
1154 if (cmdmod.browse) | |
1155 { | |
28 | 1156 browseFile = do_browse(0, (char_u *)_("Patch file"), |
13802
378f9f8e6d8f
patch 8.0.1773: dialog messages are not translated
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
1157 eap->arg, NULL, NULL, |
378f9f8e6d8f
patch 8.0.1773: dialog messages are not translated
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
1158 (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL); |
7 | 1159 if (browseFile == NULL) |
1160 return; /* operation cancelled */ | |
1161 eap->arg = browseFile; | |
1162 cmdmod.browse = FALSE; /* don't let do_ecmd() browse again */ | |
1163 } | |
1164 #endif | |
1165 | |
1166 /* We need two temp file names. */ | |
6721 | 1167 tmp_orig = vim_tempname('o', FALSE); |
1168 tmp_new = vim_tempname('n', FALSE); | |
7 | 1169 if (tmp_orig == NULL || tmp_new == NULL) |
1170 goto theend; | |
1171 | |
1172 /* Write the current buffer to "tmp_orig". */ | |
1173 if (buf_write(curbuf, tmp_orig, NULL, | |
1174 (linenr_T)1, curbuf->b_ml.ml_line_count, | |
1175 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL) | |
1176 goto theend; | |
1177 | |
1178 #ifdef UNIX | |
1179 /* Get the absolute path of the patchfile, changing directory below. */ | |
1180 fullname = FullName_save(eap->arg, FALSE); | |
1181 #endif | |
11113
081ed9efb5c0
patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents:
11109
diff
changeset
|
1182 esc_name = vim_strsave_shellescape( |
7 | 1183 # ifdef UNIX |
11113
081ed9efb5c0
patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents:
11109
diff
changeset
|
1184 fullname != NULL ? fullname : |
7 | 1185 # endif |
11113
081ed9efb5c0
patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents:
11109
diff
changeset
|
1186 eap->arg, TRUE, TRUE); |
081ed9efb5c0
patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents:
11109
diff
changeset
|
1187 if (esc_name == NULL) |
081ed9efb5c0
patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents:
11109
diff
changeset
|
1188 goto theend; |
081ed9efb5c0
patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents:
11109
diff
changeset
|
1189 buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16; |
1872 | 1190 buf = alloc((unsigned)buflen); |
7 | 1191 if (buf == NULL) |
1192 goto theend; | |
1193 | |
1194 #ifdef UNIX | |
1788 | 1195 /* Temporarily chdir to /tmp, to avoid patching files in the current |
7 | 1196 * directory when the patch file contains more than one patch. When we |
1197 * have our own temp dir use that instead, it will be cleaned up when we | |
1198 * exit (any .rej files created). Don't change directory if we can't | |
1199 * return to the current. */ | |
1200 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0) | |
1201 dirbuf[0] = NUL; | |
1202 else | |
1203 { | |
1204 # ifdef TEMPDIRNAMES | |
1205 if (vim_tempdir != NULL) | |
1757 | 1206 ignored = mch_chdir((char *)vim_tempdir); |
7 | 1207 else |
1208 # endif | |
1757 | 1209 ignored = mch_chdir("/tmp"); |
7 | 1210 shorten_fnames(TRUE); |
1211 } | |
1212 #endif | |
1213 | |
1214 #ifdef FEAT_EVAL | |
1215 if (*p_pex != NUL) | |
1216 /* Use 'patchexpr' to generate the new file. */ | |
1217 eval_patch(tmp_orig, | |
1218 # ifdef UNIX | |
1219 fullname != NULL ? fullname : | |
1220 # endif | |
1221 eap->arg, tmp_new); | |
1222 else | |
1223 #endif | |
1224 { | |
1225 /* Build the patch command and execute it. Ignore errors. Switch to | |
1226 * cooked mode to allow the user to respond to prompts. */ | |
11113
081ed9efb5c0
patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents:
11109
diff
changeset
|
1227 vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s", |
081ed9efb5c0
patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents:
11109
diff
changeset
|
1228 tmp_new, tmp_orig, esc_name); |
1410 | 1229 block_autocmds(); /* Avoid ShellCmdPost stuff */ |
7 | 1230 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED); |
1410 | 1231 unblock_autocmds(); |
7 | 1232 } |
1233 | |
1234 #ifdef UNIX | |
1235 if (dirbuf[0] != NUL) | |
1236 { | |
1237 if (mch_chdir((char *)dirbuf) != 0) | |
1238 EMSG(_(e_prev_dir)); | |
1239 shorten_fnames(TRUE); | |
1240 } | |
1241 #endif | |
1242 | |
1243 /* patch probably has written over the screen */ | |
1244 redraw_later(CLEAR); | |
1245 | |
1246 /* Delete any .orig or .rej file created. */ | |
1247 STRCPY(buf, tmp_new); | |
1248 STRCAT(buf, ".orig"); | |
1249 mch_remove(buf); | |
1250 STRCPY(buf, tmp_new); | |
1251 STRCAT(buf, ".rej"); | |
1252 mch_remove(buf); | |
1253 | |
1942 | 1254 /* Only continue if the output file was created. */ |
1255 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0) | |
1256 EMSG(_("E816: Cannot read patch output")); | |
1257 else | |
7 | 1258 { |
1942 | 1259 if (curbuf->b_fname != NULL) |
1260 { | |
1261 newname = vim_strnsave(curbuf->b_fname, | |
7 | 1262 (int)(STRLEN(curbuf->b_fname) + 4)); |
1942 | 1263 if (newname != NULL) |
1264 STRCAT(newname, ".new"); | |
1265 } | |
7 | 1266 |
1267 #ifdef FEAT_GUI | |
1942 | 1268 need_mouse_correct = TRUE; |
7 | 1269 #endif |
1942 | 1270 /* don't use a new tab page, each tab page has its own diffs */ |
1271 cmdmod.tab = 0; | |
682 | 1272 |
1942 | 1273 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) |
1274 { | |
1275 /* Pretend it was a ":split fname" command */ | |
1276 eap->cmdidx = CMD_split; | |
1277 eap->arg = tmp_new; | |
1278 do_exedit(eap, old_curwin); | |
7 | 1279 |
1942 | 1280 /* check that split worked and editing tmp_new */ |
1281 if (curwin != old_curwin && win_valid(old_curwin)) | |
1282 { | |
1283 /* Set 'diff', 'scrollbind' on and 'wrap' off. */ | |
1284 diff_win_options(curwin, TRUE); | |
1285 diff_win_options(old_curwin, TRUE); | |
7 | 1286 |
1942 | 1287 if (newname != NULL) |
1288 { | |
1289 /* do a ":file filename.new" on the patched buffer */ | |
1290 eap->arg = newname; | |
1291 ex_file(eap); | |
7 | 1292 |
1942 | 1293 /* Do filetype detection with the new name. */ |
1294 if (au_has_group((char_u *)"filetypedetect")) | |
1295 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead"); | |
1296 } | |
7 | 1297 } |
1298 } | |
1299 } | |
1300 | |
1301 theend: | |
1302 if (tmp_orig != NULL) | |
1303 mch_remove(tmp_orig); | |
1304 vim_free(tmp_orig); | |
1305 if (tmp_new != NULL) | |
1306 mch_remove(tmp_new); | |
1307 vim_free(tmp_new); | |
1308 vim_free(newname); | |
1309 vim_free(buf); | |
1310 #ifdef UNIX | |
1311 vim_free(fullname); | |
1312 #endif | |
11113
081ed9efb5c0
patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents:
11109
diff
changeset
|
1313 vim_free(esc_name); |
7 | 1314 #ifdef FEAT_BROWSE |
1315 vim_free(browseFile); | |
1316 cmdmod.browse = browse_flag; | |
1317 #endif | |
1318 } | |
1319 | |
1320 /* | |
1321 * Split the window and edit another file, setting options to show the diffs. | |
1322 */ | |
1323 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1324 ex_diffsplit(exarg_T *eap) |
7 | 1325 { |
1326 win_T *old_curwin = curwin; | |
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9387
diff
changeset
|
1327 bufref_T old_curbuf; |
7 | 1328 |
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9387
diff
changeset
|
1329 set_bufref(&old_curbuf, curbuf); |
7 | 1330 #ifdef FEAT_GUI |
1331 need_mouse_correct = TRUE; | |
1332 #endif | |
10013
942d40a92be6
commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents:
10005
diff
changeset
|
1333 /* Need to compute w_fraction when no redraw happened yet. */ |
942d40a92be6
commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents:
10005
diff
changeset
|
1334 validate_cursor(); |
942d40a92be6
commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents:
10005
diff
changeset
|
1335 set_fraction(curwin); |
942d40a92be6
commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents:
10005
diff
changeset
|
1336 |
682 | 1337 /* don't use a new tab page, each tab page has its own diffs */ |
1338 cmdmod.tab = 0; | |
1339 | |
764 | 1340 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) |
7 | 1341 { |
1342 /* Pretend it was a ":split fname" command */ | |
1343 eap->cmdidx = CMD_split; | |
449 | 1344 curwin->w_p_diff = TRUE; |
7 | 1345 do_exedit(eap, old_curwin); |
1346 | |
1347 if (curwin != old_curwin) /* split must have worked */ | |
1348 { | |
1349 /* Set 'diff', 'scrollbind' on and 'wrap' off. */ | |
1350 diff_win_options(curwin, TRUE); | |
7338
96d5dd9e7bc9
commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents:
6985
diff
changeset
|
1351 if (win_valid(old_curwin)) |
96d5dd9e7bc9
commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents:
6985
diff
changeset
|
1352 { |
96d5dd9e7bc9
commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents:
6985
diff
changeset
|
1353 diff_win_options(old_curwin, TRUE); |
96d5dd9e7bc9
commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents:
6985
diff
changeset
|
1354 |
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9387
diff
changeset
|
1355 if (bufref_valid(&old_curbuf)) |
7338
96d5dd9e7bc9
commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents:
6985
diff
changeset
|
1356 /* Move the cursor position to that of the old window. */ |
96d5dd9e7bc9
commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents:
6985
diff
changeset
|
1357 curwin->w_cursor.lnum = diff_get_corresponding_line( |
10295
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1358 old_curbuf.br_buf, old_curwin->w_cursor.lnum); |
7338
96d5dd9e7bc9
commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents:
6985
diff
changeset
|
1359 } |
10013
942d40a92be6
commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents:
10005
diff
changeset
|
1360 /* Now that lines are folded scroll to show the cursor at the same |
942d40a92be6
commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents:
10005
diff
changeset
|
1361 * relative position. */ |
942d40a92be6
commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents:
10005
diff
changeset
|
1362 scroll_to_fraction(curwin, curwin->w_height); |
7 | 1363 } |
1364 } | |
1365 } | |
1366 | |
1367 /* | |
4352 | 1368 * Set options to show diffs for the current window. |
7 | 1369 */ |
1370 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1371 ex_diffthis(exarg_T *eap UNUSED) |
7 | 1372 { |
1373 /* Set 'diff', 'scrollbind' on and 'wrap' off. */ | |
1374 diff_win_options(curwin, TRUE); | |
1375 } | |
1376 | |
11707
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1377 static void |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1378 set_diff_option(win_T *wp, int value) |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1379 { |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1380 win_T *old_curwin = curwin; |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1381 |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1382 curwin = wp; |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1383 curbuf = curwin->w_buffer; |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1384 ++curbuf_lock; |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1385 set_option_value((char_u *)"diff", (long)value, NULL, OPT_LOCAL); |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1386 --curbuf_lock; |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1387 curwin = old_curwin; |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1388 curbuf = curwin->w_buffer; |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1389 } |
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1390 |
7 | 1391 /* |
1392 * Set options in window "wp" for diff mode. | |
1393 */ | |
1394 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1395 diff_win_options( |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1396 win_T *wp, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1397 int addbuf) /* Add buffer to diff. */ |
7 | 1398 { |
2086
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1399 # ifdef FEAT_FOLDING |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1400 win_T *old_curwin = curwin; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1401 |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1402 /* close the manually opened folds */ |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1403 curwin = wp; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1404 newFoldLevel(); |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1405 curwin = old_curwin; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1406 # endif |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1407 |
2583 | 1408 /* Use 'scrollbind' and 'cursorbind' when available */ |
6897 | 1409 if (!wp->w_p_diff) |
5102
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1410 wp->w_p_scb_save = wp->w_p_scb; |
2583 | 1411 wp->w_p_scb = TRUE; |
6897 | 1412 if (!wp->w_p_diff) |
5102
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1413 wp->w_p_crb_save = wp->w_p_crb; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
1414 wp->w_p_crb = TRUE; |
6897 | 1415 if (!wp->w_p_diff) |
5102
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1416 wp->w_p_wrap_save = wp->w_p_wrap; |
7 | 1417 wp->w_p_wrap = FALSE; |
1418 # ifdef FEAT_FOLDING | |
2086
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1419 curwin = wp; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1420 curbuf = curwin->w_buffer; |
6897 | 1421 if (!wp->w_p_diff) |
1422 { | |
1423 if (wp->w_p_diff_saved) | |
1424 free_string_option(wp->w_p_fdm_save); | |
5102
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1425 wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm); |
6897 | 1426 } |
2086
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1427 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff", |
694 | 1428 OPT_LOCAL|OPT_FREE, 0); |
2086
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1429 curwin = old_curwin; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1430 curbuf = curwin->w_buffer; |
6897 | 1431 if (!wp->w_p_diff) |
5102
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1432 { |
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1433 wp->w_p_fdc_save = wp->w_p_fdc; |
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1434 wp->w_p_fen_save = wp->w_p_fen; |
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1435 wp->w_p_fdl_save = wp->w_p_fdl; |
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1436 } |
2086
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1437 wp->w_p_fdc = diff_foldcolumn; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1438 wp->w_p_fen = TRUE; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1439 wp->w_p_fdl = 0; |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1440 foldUpdateAll(wp); |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1441 /* make sure topline is not halfway a fold */ |
c11845a465ae
updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents:
1942
diff
changeset
|
1442 changed_window_setting_win(wp); |
7 | 1443 # endif |
1444 if (vim_strchr(p_sbo, 'h') == NULL) | |
1445 do_cmdline_cmd((char_u *)"set sbo+=hor"); | |
11707
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1446 /* Save the current values, to be restored in ex_diffoff(). */ |
5102
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1447 wp->w_p_diff_saved = TRUE; |
7 | 1448 |
11707
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1449 set_diff_option(wp, TRUE); |
6897 | 1450 |
7 | 1451 if (addbuf) |
1452 diff_buf_add(wp->w_buffer); | |
1453 redraw_win_later(wp, NOT_VALID); | |
1454 } | |
1455 | |
1456 /* | |
16 | 1457 * Set options not to show diffs. For the current window or all windows. |
671 | 1458 * Only in the current tab page. |
16 | 1459 */ |
1460 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1461 ex_diffoff(exarg_T *eap) |
16 | 1462 { |
1463 win_T *wp; | |
1464 int diffwin = FALSE; | |
1465 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9487
diff
changeset
|
1466 FOR_ALL_WINDOWS(wp) |
16 | 1467 { |
5358 | 1468 if (eap->forceit ? wp->w_p_diff : wp == curwin) |
16 | 1469 { |
6897 | 1470 /* Set 'diff' off. If option values were saved in |
1471 * diff_win_options(), restore the ones whose settings seem to have | |
1472 * been left over from diff mode. */ | |
11707
1395a3b6978d
patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents:
11430
diff
changeset
|
1473 set_diff_option(wp, FALSE); |
5102
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1474 |
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1475 if (wp->w_p_diff_saved) |
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1476 { |
6897 | 1477 |
1478 if (wp->w_p_scb) | |
1479 wp->w_p_scb = wp->w_p_scb_save; | |
1480 if (wp->w_p_crb) | |
1481 wp->w_p_crb = wp->w_p_crb_save; | |
1482 if (!wp->w_p_wrap) | |
1483 wp->w_p_wrap = wp->w_p_wrap_save; | |
1484 #ifdef FEAT_FOLDING | |
5102
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1485 free_string_option(wp->w_p_fdm); |
11430
eba1a8c6e21d
patch 8.0.0599: diff mode is insufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
1486 wp->w_p_fdm = vim_strsave( |
eba1a8c6e21d
patch 8.0.0599: diff mode is insufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
1487 *wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u*)"manual"); |
5200
b3ff17862b4c
updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents:
5102
diff
changeset
|
1488 |
6897 | 1489 if (wp->w_p_fdc == diff_foldcolumn) |
1490 wp->w_p_fdc = wp->w_p_fdc_save; | |
1491 if (wp->w_p_fdl == 0) | |
1492 wp->w_p_fdl = wp->w_p_fdl_save; | |
1493 | |
5200
b3ff17862b4c
updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents:
5102
diff
changeset
|
1494 /* Only restore 'foldenable' when 'foldmethod' is not |
b3ff17862b4c
updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents:
5102
diff
changeset
|
1495 * "manual", otherwise we continue to show the diff folds. */ |
6897 | 1496 if (wp->w_p_fen) |
1497 wp->w_p_fen = foldmethodIsManual(wp) ? FALSE | |
1498 : wp->w_p_fen_save; | |
1499 | |
1500 foldUpdateAll(wp); | |
1501 #endif | |
5200
b3ff17862b4c
updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents:
5102
diff
changeset
|
1502 } |
10005
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9719
diff
changeset
|
1503 /* remove filler lines */ |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9719
diff
changeset
|
1504 wp->w_topfill = 0; |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9719
diff
changeset
|
1505 |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9719
diff
changeset
|
1506 /* make sure topline is not halfway a fold and cursor is |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9719
diff
changeset
|
1507 * invalidated */ |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9719
diff
changeset
|
1508 changed_window_setting_win(wp); |
5200
b3ff17862b4c
updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents:
5102
diff
changeset
|
1509 |
5102
11d0c6df1d7b
updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1510 /* Note: 'sbo' is not restored, it's a global option. */ |
16 | 1511 diff_buf_adjust(wp); |
1512 } | |
1513 diffwin |= wp->w_p_diff; | |
1514 } | |
1515 | |
10821
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
1516 /* Also remove hidden buffers from the list. */ |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
1517 if (eap->forceit) |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
1518 diff_buf_clear(); |
d9e48fb5142f
patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
1519 |
16 | 1520 /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */ |
1521 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL) | |
1522 do_cmdline_cmd((char_u *)"set sbo-=hor"); | |
1523 } | |
1524 | |
1525 /* | |
7 | 1526 * Read the diff output and add each entry to the diff list. |
1527 */ | |
1528 static void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1529 diff_read( |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1530 int idx_orig, // idx of original file |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1531 int idx_new, // idx of new file |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1532 diffout_T *dout) // diff output |
7 | 1533 { |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1534 FILE *fd = NULL; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1535 int line_idx = 0; |
7 | 1536 diff_T *dprev = NULL; |
672 | 1537 diff_T *dp = curtab->tp_first_diff; |
7 | 1538 diff_T *dn, *dpl; |
1539 char_u linebuf[LBUFLEN]; /* only need to hold the diff line */ | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1540 char_u *line; |
7 | 1541 long off; |
1542 int i; | |
1543 linenr_T lnum_orig, lnum_new; | |
1544 long count_orig, count_new; | |
1545 int notset = TRUE; /* block "*dp" not set yet */ | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1546 enum { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1547 DIFF_ED, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1548 DIFF_UNIFIED, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1549 DIFF_NONE |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1550 } diffstyle = DIFF_NONE; |
7 | 1551 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1552 if (dout->dout_fname == NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1553 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1554 diffstyle = DIFF_UNIFIED; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1555 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1556 else |
7 | 1557 { |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1558 fd = mch_fopen((char *)dout->dout_fname, "r"); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1559 if (fd == NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1560 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1561 EMSG(_("E98: Cannot read diff output")); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1562 return; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1563 } |
7 | 1564 } |
1565 | |
1566 for (;;) | |
1567 { | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1568 if (fd == NULL) |
7 | 1569 { |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1570 if (line_idx >= dout->dout_ga.ga_len) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1571 break; // did last line |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1572 line = ((char_u **)dout->dout_ga.ga_data)[line_idx++]; |
7 | 1573 } |
1574 else | |
1575 { | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1576 if (tag_fgets(linebuf, LBUFLEN, fd)) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1577 break; // end of file |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1578 line = linebuf; |
7 | 1579 } |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1580 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1581 if (diffstyle == DIFF_NONE) |
7 | 1582 { |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1583 // Determine diff style. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1584 // ed like diff looks like this: |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1585 // {first}[,{last}]c{first}[,{last}] |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1586 // {first}a{first}[,{last}] |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1587 // {first}[,{last}]d{first} |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1588 // |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1589 // unified diff looks like this: |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1590 // --- file1 2018-03-20 13:23:35.783153140 +0100 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1591 // +++ file2 2018-03-20 13:23:41.183156066 +0100 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1592 // @@ -1,3 +1,5 @@ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1593 if (isdigit(*line)) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1594 diffstyle = DIFF_ED; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1595 else if ((STRNCMP(line, "@@ ", 3) == 0)) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1596 diffstyle = DIFF_UNIFIED; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1597 else if ((STRNCMP(line, "--- ", 4) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1598 && (tag_fgets(linebuf, LBUFLEN, fd) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1599 && (STRNCMP(line, "+++ ", 4) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1600 && (tag_fgets(linebuf, LBUFLEN, fd) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1601 && (STRNCMP(line, "@@ ", 3) == 0)) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1602 diffstyle = DIFF_UNIFIED; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1603 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1604 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1605 if (diffstyle == DIFF_ED) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1606 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1607 if (!isdigit(*line)) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1608 continue; // not the start of a diff block |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1609 if (parse_diff_ed(line, &lnum_orig, &count_orig, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1610 &lnum_new, &count_new) == FAIL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1611 continue; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1612 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1613 else if (diffstyle == DIFF_UNIFIED) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1614 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1615 if (STRNCMP(line, "@@ ", 3) != 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1616 continue; // not the start of a diff block |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1617 if (parse_diff_unified(line, &lnum_orig, &count_orig, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1618 &lnum_new, &count_new) == FAIL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1619 continue; |
7 | 1620 } |
1621 else | |
1622 { | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1623 EMSG(_("E959: Invalid diff format.")); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1624 break; |
7 | 1625 } |
1626 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1627 // Go over blocks before the change, for which orig and new are equal. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1628 // Copy blocks from orig to new. |
7 | 1629 while (dp != NULL |
1630 && lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig]) | |
1631 { | |
1632 if (notset) | |
1633 diff_copy_entry(dprev, dp, idx_orig, idx_new); | |
1634 dprev = dp; | |
1635 dp = dp->df_next; | |
1636 notset = TRUE; | |
1637 } | |
1638 | |
1639 if (dp != NULL | |
1640 && lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig] | |
1641 && lnum_orig + count_orig >= dp->df_lnum[idx_orig]) | |
1642 { | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1643 // New block overlaps with existing block(s). |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1644 // First find last block that overlaps. |
7 | 1645 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next) |
1646 if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig]) | |
1647 break; | |
1648 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1649 // If the newly found block starts before the old one, set the |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1650 // start back a number of lines. |
7 | 1651 off = dp->df_lnum[idx_orig] - lnum_orig; |
1652 if (off > 0) | |
1653 { | |
1654 for (i = idx_orig; i < idx_new; ++i) | |
672 | 1655 if (curtab->tp_diffbuf[i] != NULL) |
7 | 1656 dp->df_lnum[i] -= off; |
1657 dp->df_lnum[idx_new] = lnum_new; | |
1658 dp->df_count[idx_new] = count_new; | |
1659 } | |
1660 else if (notset) | |
1661 { | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1662 // new block inside existing one, adjust new block |
7 | 1663 dp->df_lnum[idx_new] = lnum_new + off; |
1664 dp->df_count[idx_new] = count_new - off; | |
1665 } | |
1666 else | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1667 // second overlap of new block with existing block |
1519 | 1668 dp->df_count[idx_new] += count_new - count_orig |
1669 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig] | |
1670 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]); | |
7 | 1671 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1672 // Adjust the size of the block to include all the lines to the |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1673 // end of the existing block or the new diff, whatever ends last. |
7 | 1674 off = (lnum_orig + count_orig) |
1675 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]); | |
1676 if (off < 0) | |
1677 { | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1678 // new change ends in existing block, adjust the end if not |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1679 // done already |
7 | 1680 if (notset) |
1681 dp->df_count[idx_new] += -off; | |
1682 off = 0; | |
1683 } | |
1428 | 1684 for (i = idx_orig; i < idx_new; ++i) |
672 | 1685 if (curtab->tp_diffbuf[i] != NULL) |
7 | 1686 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i] |
1687 - dp->df_lnum[i] + off; | |
1688 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1689 // Delete the diff blocks that have been merged into one. |
7 | 1690 dn = dp->df_next; |
1691 dp->df_next = dpl->df_next; | |
1692 while (dn != dp->df_next) | |
1693 { | |
1694 dpl = dn->df_next; | |
1695 vim_free(dn); | |
1696 dn = dpl; | |
1697 } | |
1698 } | |
1699 else | |
1700 { | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1701 // Allocate a new diffblock. |
672 | 1702 dp = diff_alloc_new(curtab, dprev, dp); |
7 | 1703 if (dp == NULL) |
840 | 1704 goto done; |
7 | 1705 |
1706 dp->df_lnum[idx_orig] = lnum_orig; | |
1707 dp->df_count[idx_orig] = count_orig; | |
1708 dp->df_lnum[idx_new] = lnum_new; | |
1709 dp->df_count[idx_new] = count_new; | |
1710 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1711 // Set values for other buffers, these must be equal to the |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1712 // original buffer, otherwise there would have been a change |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1713 // already. |
7 | 1714 for (i = idx_orig + 1; i < idx_new; ++i) |
672 | 1715 if (curtab->tp_diffbuf[i] != NULL) |
7 | 1716 diff_copy_entry(dprev, dp, idx_orig, i); |
1717 } | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1718 notset = FALSE; // "*dp" has been set |
7 | 1719 } |
1720 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1721 // for remaining diff blocks orig and new are equal |
7 | 1722 while (dp != NULL) |
1723 { | |
1724 if (notset) | |
1725 diff_copy_entry(dprev, dp, idx_orig, idx_new); | |
1726 dprev = dp; | |
1727 dp = dp->df_next; | |
1728 notset = TRUE; | |
1729 } | |
1730 | |
840 | 1731 done: |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1732 if (fd != NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
1733 fclose(fd); |
7 | 1734 } |
1735 | |
1736 /* | |
1737 * Copy an entry at "dp" from "idx_orig" to "idx_new". | |
1738 */ | |
1739 static void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1740 diff_copy_entry( |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1741 diff_T *dprev, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1742 diff_T *dp, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1743 int idx_orig, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1744 int idx_new) |
7 | 1745 { |
1746 long off; | |
1747 | |
1748 if (dprev == NULL) | |
1749 off = 0; | |
1750 else | |
1751 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig]) | |
1752 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]); | |
1753 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off; | |
1754 dp->df_count[idx_new] = dp->df_count[idx_orig]; | |
1755 } | |
1756 | |
1757 /* | |
672 | 1758 * Clear the list of diffblocks for tab page "tp". |
7 | 1759 */ |
358 | 1760 void |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1761 diff_clear(tabpage_T *tp) |
7 | 1762 { |
1763 diff_T *p, *next_p; | |
1764 | |
672 | 1765 for (p = tp->tp_first_diff; p != NULL; p = next_p) |
7 | 1766 { |
1767 next_p = p->df_next; | |
1768 vim_free(p); | |
1769 } | |
672 | 1770 tp->tp_first_diff = NULL; |
7 | 1771 } |
1772 | |
1773 /* | |
1774 * Check diff status for line "lnum" in buffer "buf": | |
1775 * Returns 0 for nothing special | |
1776 * Returns -1 for a line that should be highlighted as changed. | |
1777 * Returns -2 for a line that should be highlighted as added/deleted. | |
1778 * Returns > 0 for inserting that many filler lines above it (never happens | |
1779 * when 'diffopt' doesn't contain "filler"). | |
1780 * This should only be used for windows where 'diff' is set. | |
1781 */ | |
1782 int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1783 diff_check(win_T *wp, linenr_T lnum) |
7 | 1784 { |
672 | 1785 int idx; /* index in tp_diffbuf[] for this buffer */ |
7 | 1786 diff_T *dp; |
1787 int maxcount; | |
1788 int i; | |
1789 buf_T *buf = wp->w_buffer; | |
1790 int cmp; | |
1791 | |
672 | 1792 if (curtab->tp_diff_invalid) |
7 | 1793 ex_diffupdate(NULL); /* update after a big change */ |
1794 | |
672 | 1795 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) /* no diffs at all */ |
7 | 1796 return 0; |
1797 | |
1798 /* safety check: "lnum" must be a buffer line */ | |
1799 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1) | |
1800 return 0; | |
1801 | |
1802 idx = diff_buf_idx(buf); | |
1803 if (idx == DB_COUNT) | |
1804 return 0; /* no diffs for buffer "buf" */ | |
1805 | |
1806 #ifdef FEAT_FOLDING | |
1807 /* A closed fold never has filler lines. */ | |
1808 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL)) | |
1809 return 0; | |
1810 #endif | |
1811 | |
1812 /* search for a change that includes "lnum" in the list of diffblocks. */ | |
672 | 1813 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
7 | 1814 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) |
1815 break; | |
1816 if (dp == NULL || lnum < dp->df_lnum[idx]) | |
1817 return 0; | |
1818 | |
1819 if (lnum < dp->df_lnum[idx] + dp->df_count[idx]) | |
1820 { | |
1821 int zero = FALSE; | |
1822 | |
1823 /* Changed or inserted line. If the other buffers have a count of | |
1824 * zero, the lines were inserted. If the other buffers have the same | |
1825 * count, check if the lines are identical. */ | |
1826 cmp = FALSE; | |
1827 for (i = 0; i < DB_COUNT; ++i) | |
672 | 1828 if (i != idx && curtab->tp_diffbuf[i] != NULL) |
7 | 1829 { |
1830 if (dp->df_count[i] == 0) | |
1831 zero = TRUE; | |
1832 else | |
1833 { | |
1834 if (dp->df_count[i] != dp->df_count[idx]) | |
1835 return -1; /* nr of lines changed. */ | |
1836 cmp = TRUE; | |
1837 } | |
1838 } | |
1839 if (cmp) | |
1840 { | |
1841 /* Compare all lines. If they are equal the lines were inserted | |
1842 * in some buffers, deleted in others, but not changed. */ | |
1843 for (i = 0; i < DB_COUNT; ++i) | |
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9387
diff
changeset
|
1844 if (i != idx && curtab->tp_diffbuf[i] != NULL |
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9387
diff
changeset
|
1845 && dp->df_count[i] != 0) |
7 | 1846 if (!diff_equal_entry(dp, idx, i)) |
1847 return -1; | |
1848 } | |
1849 /* If there is no buffer with zero lines then there is no difference | |
1850 * any longer. Happens when making a change (or undo) that removes | |
1851 * the difference. Can't remove the entry here, we might be halfway | |
1852 * updating the window. Just report the text as unchanged. Other | |
1853 * windows might still show the change though. */ | |
1854 if (zero == FALSE) | |
1855 return 0; | |
1856 return -2; | |
1857 } | |
1858 | |
1859 /* If 'diffopt' doesn't contain "filler", return 0. */ | |
1860 if (!(diff_flags & DIFF_FILLER)) | |
1861 return 0; | |
1862 | |
1863 /* Insert filler lines above the line just below the change. Will return | |
1864 * 0 when this buf had the max count. */ | |
1865 maxcount = 0; | |
1866 for (i = 0; i < DB_COUNT; ++i) | |
672 | 1867 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount) |
7 | 1868 maxcount = dp->df_count[i]; |
1869 return maxcount - dp->df_count[idx]; | |
1870 } | |
1871 | |
1872 /* | |
1873 * Compare two entries in diff "*dp" and return TRUE if they are equal. | |
1874 */ | |
1875 static int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1876 diff_equal_entry(diff_T *dp, int idx1, int idx2) |
7 | 1877 { |
1878 int i; | |
1879 char_u *line; | |
1880 int cmp; | |
1881 | |
1882 if (dp->df_count[idx1] != dp->df_count[idx2]) | |
1883 return FALSE; | |
672 | 1884 if (diff_check_sanity(curtab, dp) == FAIL) |
7 | 1885 return FALSE; |
1886 for (i = 0; i < dp->df_count[idx1]; ++i) | |
1887 { | |
672 | 1888 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1], |
7 | 1889 dp->df_lnum[idx1] + i, FALSE)); |
1890 if (line == NULL) | |
1891 return FALSE; | |
672 | 1892 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2], |
7 | 1893 dp->df_lnum[idx2] + i, FALSE)); |
1894 vim_free(line); | |
1895 if (cmp != 0) | |
1896 return FALSE; | |
1897 } | |
1898 return TRUE; | |
1899 } | |
1900 | |
1901 /* | |
12333
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1902 * Compare the characters at "p1" and "p2". If they are equal (possibly |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1903 * ignoring case) return TRUE and set "len" to the number of bytes. |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1904 */ |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1905 static int |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1906 diff_equal_char(char_u *p1, char_u *p2, int *len) |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1907 { |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1908 #ifdef FEAT_MBYTE |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1909 int l = (*mb_ptr2len)(p1); |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1910 |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1911 if (l != (*mb_ptr2len)(p2)) |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1912 return FALSE; |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1913 if (l > 1) |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1914 { |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1915 if (STRNCMP(p1, p2, l) != 0 |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1916 && (!enc_utf8 |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1917 || !(diff_flags & DIFF_ICASE) |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1918 || utf_fold(utf_ptr2char(p1)) |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1919 != utf_fold(utf_ptr2char(p2)))) |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1920 return FALSE; |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1921 *len = l; |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1922 } |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1923 else |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1924 #endif |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1925 { |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1926 if ((*p1 != *p2) |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1927 && (!(diff_flags & DIFF_ICASE) |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1928 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2))) |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1929 return FALSE; |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1930 *len = 1; |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1931 } |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1932 return TRUE; |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1933 } |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1934 |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1935 /* |
7 | 1936 * Compare strings "s1" and "s2" according to 'diffopt'. |
1937 * Return non-zero when they are different. | |
1938 */ | |
1939 static int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1940 diff_cmp(char_u *s1, char_u *s2) |
7 | 1941 { |
1942 char_u *p1, *p2; | |
1943 int l; | |
1944 | |
1945 if ((diff_flags & (DIFF_ICASE | DIFF_IWHITE)) == 0) | |
1946 return STRCMP(s1, s2); | |
1947 if ((diff_flags & DIFF_ICASE) && !(diff_flags & DIFF_IWHITE)) | |
1948 return MB_STRICMP(s1, s2); | |
1949 | |
1950 /* Ignore white space changes and possibly ignore case. */ | |
1951 p1 = s1; | |
1952 p2 = s2; | |
1953 while (*p1 != NUL && *p2 != NUL) | |
1954 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
1955 if (VIM_ISWHITE(*p1) && VIM_ISWHITE(*p2)) |
7 | 1956 { |
1957 p1 = skipwhite(p1); | |
1958 p2 = skipwhite(p2); | |
1959 } | |
1960 else | |
1961 { | |
12333
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1962 if (!diff_equal_char(p1, p2, &l)) |
7 | 1963 break; |
12333
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1964 p1 += l; |
dea5dda9ef30
patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents:
12315
diff
changeset
|
1965 p2 += l; |
7 | 1966 } |
1967 } | |
1968 | |
1969 /* Ignore trailing white space. */ | |
1970 p1 = skipwhite(p1); | |
1971 p2 = skipwhite(p2); | |
1972 if (*p1 != NUL || *p2 != NUL) | |
1973 return 1; | |
1974 return 0; | |
1975 } | |
1976 | |
1977 /* | |
1978 * Return the number of filler lines above "lnum". | |
1979 */ | |
1980 int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1981 diff_check_fill(win_T *wp, linenr_T lnum) |
7 | 1982 { |
1983 int n; | |
1984 | |
1985 /* be quick when there are no filler lines */ | |
1986 if (!(diff_flags & DIFF_FILLER)) | |
1987 return 0; | |
1988 n = diff_check(wp, lnum); | |
1989 if (n <= 0) | |
1990 return 0; | |
1991 return n; | |
1992 } | |
1993 | |
1994 /* | |
1995 * Set the topline of "towin" to match the position in "fromwin", so that they | |
1996 * show the same diff'ed lines. | |
1997 */ | |
1998 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1999 diff_set_topline(win_T *fromwin, win_T *towin) |
7 | 2000 { |
1519 | 2001 buf_T *frombuf = fromwin->w_buffer; |
7 | 2002 linenr_T lnum = fromwin->w_topline; |
1519 | 2003 int fromidx; |
2004 int toidx; | |
7 | 2005 diff_T *dp; |
1519 | 2006 int max_count; |
7 | 2007 int i; |
2008 | |
1519 | 2009 fromidx = diff_buf_idx(frombuf); |
2010 if (fromidx == DB_COUNT) | |
7 | 2011 return; /* safety check */ |
2012 | |
672 | 2013 if (curtab->tp_diff_invalid) |
7 | 2014 ex_diffupdate(NULL); /* update after a big change */ |
2015 | |
2016 towin->w_topfill = 0; | |
2017 | |
2018 /* search for a change that includes "lnum" in the list of diffblocks. */ | |
672 | 2019 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
1519 | 2020 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx]) |
7 | 2021 break; |
2022 if (dp == NULL) | |
2023 { | |
2024 /* After last change, compute topline relative to end of file; no | |
2025 * filler lines. */ | |
2026 towin->w_topline = towin->w_buffer->b_ml.ml_line_count | |
1519 | 2027 - (frombuf->b_ml.ml_line_count - lnum); |
7 | 2028 } |
2029 else | |
2030 { | |
2031 /* Find index for "towin". */ | |
1519 | 2032 toidx = diff_buf_idx(towin->w_buffer); |
2033 if (toidx == DB_COUNT) | |
7 | 2034 return; /* safety check */ |
2035 | |
1519 | 2036 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]); |
2037 if (lnum >= dp->df_lnum[fromidx]) | |
7 | 2038 { |
1519 | 2039 /* Inside a change: compute filler lines. With three or more |
2040 * buffers we need to know the largest count. */ | |
2041 max_count = 0; | |
2042 for (i = 0; i < DB_COUNT; ++i) | |
2043 if (curtab->tp_diffbuf[i] != NULL | |
2044 && max_count < dp->df_count[i]) | |
2045 max_count = dp->df_count[i]; | |
2046 | |
2047 if (dp->df_count[toidx] == dp->df_count[fromidx]) | |
2048 { | |
2049 /* same number of lines: use same filler count */ | |
7 | 2050 towin->w_topfill = fromwin->w_topfill; |
1519 | 2051 } |
2052 else if (dp->df_count[toidx] > dp->df_count[fromidx]) | |
7 | 2053 { |
1519 | 2054 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx]) |
2055 { | |
2056 /* more lines in towin and fromwin doesn't show diff | |
2057 * lines, only filler lines */ | |
2058 if (max_count - fromwin->w_topfill >= dp->df_count[toidx]) | |
2059 { | |
2060 /* towin also only shows filler lines */ | |
2061 towin->w_topline = dp->df_lnum[toidx] | |
2062 + dp->df_count[toidx]; | |
2063 towin->w_topfill = fromwin->w_topfill; | |
2064 } | |
2065 else | |
2066 /* towin still has some diff lines to show */ | |
2067 towin->w_topline = dp->df_lnum[toidx] | |
2068 + max_count - fromwin->w_topfill; | |
2069 } | |
7 | 2070 } |
1519 | 2071 else if (towin->w_topline >= dp->df_lnum[toidx] |
2072 + dp->df_count[toidx]) | |
7 | 2073 { |
1519 | 2074 /* less lines in towin and no diff lines to show: compute |
2075 * filler lines */ | |
2076 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx]; | |
2077 if (diff_flags & DIFF_FILLER) | |
7 | 2078 { |
1519 | 2079 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx]) |
2080 /* fromwin is also out of diff lines */ | |
2081 towin->w_topfill = fromwin->w_topfill; | |
2082 else | |
2083 /* fromwin has some diff lines */ | |
2084 towin->w_topfill = dp->df_lnum[fromidx] | |
2085 + max_count - lnum; | |
7 | 2086 } |
2087 } | |
2088 } | |
2089 } | |
2090 | |
2091 /* safety check (if diff info gets outdated strange things may happen) */ | |
2092 towin->w_botfill = FALSE; | |
2093 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count) | |
2094 { | |
2095 towin->w_topline = towin->w_buffer->b_ml.ml_line_count; | |
2096 towin->w_botfill = TRUE; | |
2097 } | |
2098 if (towin->w_topline < 1) | |
2099 { | |
2100 towin->w_topline = 1; | |
2101 towin->w_topfill = 0; | |
2102 } | |
2103 | |
2104 /* When w_topline changes need to recompute w_botline and cursor position */ | |
2105 invalidate_botline_win(towin); | |
2106 changed_line_abv_curs_win(towin); | |
2107 | |
2108 check_topfill(towin, FALSE); | |
2109 #ifdef FEAT_FOLDING | |
2110 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline, | |
2111 NULL, TRUE, NULL); | |
2112 #endif | |
2113 } | |
2114 | |
2115 /* | |
2116 * This is called when 'diffopt' is changed. | |
2117 */ | |
2118 int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2119 diffopt_changed(void) |
7 | 2120 { |
2121 char_u *p; | |
2122 int diff_context_new = 6; | |
2123 int diff_flags_new = 0; | |
764 | 2124 int diff_foldcolumn_new = 2; |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2125 long diff_algorithm_new = 0; |
672 | 2126 tabpage_T *tp; |
7 | 2127 |
2128 p = p_dip; | |
2129 while (*p != NUL) | |
2130 { | |
2131 if (STRNCMP(p, "filler", 6) == 0) | |
2132 { | |
2133 p += 6; | |
2134 diff_flags_new |= DIFF_FILLER; | |
2135 } | |
2136 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8])) | |
2137 { | |
2138 p += 8; | |
2139 diff_context_new = getdigits(&p); | |
2140 } | |
2141 else if (STRNCMP(p, "icase", 5) == 0) | |
2142 { | |
2143 p += 5; | |
2144 diff_flags_new |= DIFF_ICASE; | |
2145 } | |
2146 else if (STRNCMP(p, "iwhite", 6) == 0) | |
2147 { | |
2148 p += 6; | |
2149 diff_flags_new |= DIFF_IWHITE; | |
2150 } | |
764 | 2151 else if (STRNCMP(p, "horizontal", 10) == 0) |
2152 { | |
2153 p += 10; | |
2154 diff_flags_new |= DIFF_HORIZONTAL; | |
2155 } | |
2156 else if (STRNCMP(p, "vertical", 8) == 0) | |
2157 { | |
2158 p += 8; | |
2159 diff_flags_new |= DIFF_VERTICAL; | |
2160 } | |
2161 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11])) | |
2162 { | |
2163 p += 11; | |
2164 diff_foldcolumn_new = getdigits(&p); | |
2165 } | |
12971
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2166 else if (STRNCMP(p, "hiddenoff", 9) == 0) |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2167 { |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2168 p += 9; |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2169 diff_flags_new |= DIFF_HIDDEN_OFF; |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2170 } |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2171 else if (STRNCMP(p, "indent-heuristic", 16) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2172 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2173 p += 16; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2174 diff_algorithm_new |= XDF_INDENT_HEURISTIC; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2175 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2176 else if (STRNCMP(p, "internal", 8) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2177 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2178 p += 8; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2179 diff_flags_new |= DIFF_INTERNAL; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2180 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2181 else if (STRNCMP(p, "algorithm:", 10) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2182 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2183 p += 10; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2184 if (STRNCMP(p, "myers", 5) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2185 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2186 p += 5; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2187 diff_algorithm_new = 0; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2188 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2189 else if (STRNCMP(p, "minimal", 7) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2190 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2191 p += 7; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2192 diff_algorithm_new = XDF_NEED_MINIMAL; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2193 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2194 else if (STRNCMP(p, "patience", 8) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2195 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2196 p += 8; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2197 diff_algorithm_new = XDF_PATIENCE_DIFF; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2198 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2199 else if (STRNCMP(p, "histogram", 9) == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2200 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2201 p += 9; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2202 diff_algorithm_new = XDF_HISTOGRAM_DIFF; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2203 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2204 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2205 |
7 | 2206 if (*p != ',' && *p != NUL) |
2207 return FAIL; | |
2208 if (*p == ',') | |
2209 ++p; | |
2210 } | |
2211 | |
764 | 2212 /* Can't have both "horizontal" and "vertical". */ |
2213 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL)) | |
2214 return FAIL; | |
2215 | |
7 | 2216 /* If "icase" or "iwhite" was added or removed, need to update the diff. */ |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2217 if (diff_flags != diff_flags_new || diff_algorithm != diff_algorithm_new) |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9487
diff
changeset
|
2218 FOR_ALL_TABPAGES(tp) |
672 | 2219 tp->tp_diff_invalid = TRUE; |
7 | 2220 |
2221 diff_flags = diff_flags_new; | |
2222 diff_context = diff_context_new; | |
764 | 2223 diff_foldcolumn = diff_foldcolumn_new; |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2224 diff_algorithm = diff_algorithm_new; |
7 | 2225 |
2226 diff_redraw(TRUE); | |
2227 | |
2228 /* recompute the scroll binding with the new option value, may | |
2229 * remove or add filler lines */ | |
2230 check_scrollbind((linenr_T)0, 0L); | |
2231 | |
2232 return OK; | |
2233 } | |
2234 | |
2235 /* | |
764 | 2236 * Return TRUE if 'diffopt' contains "horizontal". |
2237 */ | |
2238 int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2239 diffopt_horizontal(void) |
764 | 2240 { |
2241 return (diff_flags & DIFF_HORIZONTAL) != 0; | |
2242 } | |
2243 | |
2244 /* | |
12971
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2245 * Return TRUE if 'diffopt' contains "hiddenoff". |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2246 */ |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2247 int |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2248 diffopt_hiddenoff(void) |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2249 { |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2250 return (diff_flags & DIFF_HIDDEN_OFF) != 0; |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2251 } |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2252 |
ca3cb1997f08
patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents:
12353
diff
changeset
|
2253 /* |
7 | 2254 * Find the difference within a changed line. |
2255 * Returns TRUE if the line was added, no other buffer has it. | |
2256 */ | |
2257 int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2258 diff_find_change( |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2259 win_T *wp, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2260 linenr_T lnum, |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2261 int *startp, /* first char of the change */ |
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2262 int *endp) /* last char of the change */ |
7 | 2263 { |
2264 char_u *line_org; | |
2265 char_u *line_new; | |
2266 int i; | |
829 | 2267 int si_org, si_new; |
2268 int ei_org, ei_new; | |
7 | 2269 diff_T *dp; |
2270 int idx; | |
2271 int off; | |
2272 int added = TRUE; | |
12315
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2273 char_u *p1, *p2; |
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2274 int l; |
7 | 2275 |
2276 /* Make a copy of the line, the next ml_get() will invalidate it. */ | |
2277 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
2278 if (line_org == NULL) | |
2279 return FALSE; | |
2280 | |
2281 idx = diff_buf_idx(wp->w_buffer); | |
2282 if (idx == DB_COUNT) /* cannot happen */ | |
1074 | 2283 { |
2284 vim_free(line_org); | |
7 | 2285 return FALSE; |
1074 | 2286 } |
7 | 2287 |
2288 /* search for a change that includes "lnum" in the list of diffblocks. */ | |
672 | 2289 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
7 | 2290 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) |
2291 break; | |
672 | 2292 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL) |
1074 | 2293 { |
2294 vim_free(line_org); | |
7 | 2295 return FALSE; |
1074 | 2296 } |
7 | 2297 |
2298 off = lnum - dp->df_lnum[idx]; | |
2299 | |
2300 for (i = 0; i < DB_COUNT; ++i) | |
672 | 2301 if (curtab->tp_diffbuf[i] != NULL && i != idx) |
7 | 2302 { |
2303 /* Skip lines that are not in the other change (filler lines). */ | |
2304 if (off >= dp->df_count[i]) | |
2305 continue; | |
2306 added = FALSE; | |
829 | 2307 line_new = ml_get_buf(curtab->tp_diffbuf[i], |
2308 dp->df_lnum[i] + off, FALSE); | |
7 | 2309 |
2310 /* Search for start of difference */ | |
829 | 2311 si_org = si_new = 0; |
2312 while (line_org[si_org] != NUL) | |
2313 { | |
2314 if ((diff_flags & DIFF_IWHITE) | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
2315 && VIM_ISWHITE(line_org[si_org]) |
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
2316 && VIM_ISWHITE(line_new[si_new])) |
829 | 2317 { |
835 | 2318 si_org = (int)(skipwhite(line_org + si_org) - line_org); |
2319 si_new = (int)(skipwhite(line_new + si_new) - line_new); | |
829 | 2320 } |
2321 else | |
2322 { | |
12315
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2323 if (!diff_equal_char(line_org + si_org, line_new + si_new, |
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2324 &l)) |
829 | 2325 break; |
12315
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2326 si_org += l; |
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2327 si_new += l; |
829 | 2328 } |
2329 } | |
7 | 2330 #ifdef FEAT_MBYTE |
2331 if (has_mbyte) | |
2332 { | |
2333 /* Move back to first byte of character in both lines (may | |
2334 * have "nn^" in line_org and "n^ in line_new). */ | |
829 | 2335 si_org -= (*mb_head_off)(line_org, line_org + si_org); |
2336 si_new -= (*mb_head_off)(line_new, line_new + si_new); | |
7 | 2337 } |
2338 #endif | |
829 | 2339 if (*startp > si_org) |
2340 *startp = si_org; | |
7 | 2341 |
2342 /* Search for end of difference, if any. */ | |
829 | 2343 if (line_org[si_org] != NUL || line_new[si_new] != NUL) |
7 | 2344 { |
2345 ei_org = (int)STRLEN(line_org); | |
2346 ei_new = (int)STRLEN(line_new); | |
829 | 2347 while (ei_org >= *startp && ei_new >= si_new |
2348 && ei_org >= 0 && ei_new >= 0) | |
7 | 2349 { |
829 | 2350 if ((diff_flags & DIFF_IWHITE) |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
2351 && VIM_ISWHITE(line_org[ei_org]) |
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
2352 && VIM_ISWHITE(line_new[ei_new])) |
829 | 2353 { |
2354 while (ei_org >= *startp | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
2355 && VIM_ISWHITE(line_org[ei_org])) |
829 | 2356 --ei_org; |
2357 while (ei_new >= si_new | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
2358 && VIM_ISWHITE(line_new[ei_new])) |
829 | 2359 --ei_new; |
2360 } | |
2361 else | |
2362 { | |
12315
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2363 p1 = line_org + ei_org; |
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2364 p2 = line_new + ei_new; |
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2365 #ifdef FEAT_MBYTE |
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2366 p1 -= (*mb_head_off)(line_org, p1); |
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2367 p2 -= (*mb_head_off)(line_new, p2); |
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2368 #endif |
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2369 if (!diff_equal_char(p1, p2, &l)) |
829 | 2370 break; |
12315
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2371 ei_org -= l; |
40ee9f3d265f
patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents:
11707
diff
changeset
|
2372 ei_new -= l; |
829 | 2373 } |
7 | 2374 } |
2375 if (*endp < ei_org) | |
2376 *endp = ei_org; | |
2377 } | |
2378 } | |
2379 | |
2380 vim_free(line_org); | |
2381 return added; | |
2382 } | |
2383 | |
2384 #if defined(FEAT_FOLDING) || defined(PROTO) | |
2385 /* | |
2386 * Return TRUE if line "lnum" is not close to a diff block, this line should | |
2387 * be in a fold. | |
2388 * Return FALSE if there are no diff blocks at all in this window. | |
2389 */ | |
2390 int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2391 diff_infold(win_T *wp, linenr_T lnum) |
7 | 2392 { |
2393 int i; | |
2394 int idx = -1; | |
2395 int other = FALSE; | |
2396 diff_T *dp; | |
2397 | |
2398 /* Return if 'diff' isn't set. */ | |
2399 if (!wp->w_p_diff) | |
2400 return FALSE; | |
2401 | |
2402 for (i = 0; i < DB_COUNT; ++i) | |
2403 { | |
672 | 2404 if (curtab->tp_diffbuf[i] == wp->w_buffer) |
7 | 2405 idx = i; |
672 | 2406 else if (curtab->tp_diffbuf[i] != NULL) |
7 | 2407 other = TRUE; |
2408 } | |
2409 | |
2410 /* return here if there are no diffs in the window */ | |
2411 if (idx == -1 || !other) | |
2412 return FALSE; | |
2413 | |
672 | 2414 if (curtab->tp_diff_invalid) |
7 | 2415 ex_diffupdate(NULL); /* update after a big change */ |
2416 | |
2417 /* Return if there are no diff blocks. All lines will be folded. */ | |
672 | 2418 if (curtab->tp_first_diff == NULL) |
7 | 2419 return TRUE; |
2420 | |
672 | 2421 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
7 | 2422 { |
2423 /* If this change is below the line there can't be any further match. */ | |
2424 if (dp->df_lnum[idx] - diff_context > lnum) | |
2425 break; | |
2426 /* If this change ends before the line we have a match. */ | |
2427 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum) | |
2428 return FALSE; | |
2429 } | |
2430 return TRUE; | |
2431 } | |
2432 #endif | |
2433 | |
2434 /* | |
2435 * "dp" and "do" commands. | |
2436 */ | |
2437 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2438 nv_diffgetput(int put, long count) |
7 | 2439 { |
2440 exarg_T ea; | |
6314 | 2441 char_u buf[30]; |
7 | 2442 |
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
13802
diff
changeset
|
2443 #ifdef FEAT_JOB_CHANNEL |
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
13802
diff
changeset
|
2444 if (bt_prompt(curbuf)) |
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
13802
diff
changeset
|
2445 { |
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
13802
diff
changeset
|
2446 vim_beep(BO_OPER); |
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
13802
diff
changeset
|
2447 return; |
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
13802
diff
changeset
|
2448 } |
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
13802
diff
changeset
|
2449 #endif |
6314 | 2450 if (count == 0) |
2451 ea.arg = (char_u *)""; | |
2452 else | |
2453 { | |
2454 vim_snprintf((char *)buf, 30, "%ld", count); | |
2455 ea.arg = buf; | |
2456 } | |
7 | 2457 if (put) |
2458 ea.cmdidx = CMD_diffput; | |
2459 else | |
2460 ea.cmdidx = CMD_diffget; | |
2461 ea.addr_count = 0; | |
2462 ea.line1 = curwin->w_cursor.lnum; | |
2463 ea.line2 = curwin->w_cursor.lnum; | |
2464 ex_diffgetput(&ea); | |
2465 } | |
2466 | |
2467 /* | |
2468 * ":diffget" | |
2469 * ":diffput" | |
2470 */ | |
2471 void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2472 ex_diffgetput(exarg_T *eap) |
7 | 2473 { |
2474 linenr_T lnum; | |
2475 int count; | |
2476 linenr_T off = 0; | |
2477 diff_T *dp; | |
2478 diff_T *dprev; | |
2479 diff_T *dfree; | |
2480 int idx_cur; | |
2481 int idx_other; | |
2482 int idx_from; | |
2483 int idx_to; | |
2484 int i; | |
2485 int added; | |
2486 char_u *p; | |
2487 aco_save_T aco; | |
2488 buf_T *buf; | |
2489 int start_skip, end_skip; | |
2490 int new_count; | |
648 | 2491 int buf_empty; |
1075 | 2492 int found_not_ma = FALSE; |
7 | 2493 |
2494 /* Find the current buffer in the list of diff buffers. */ | |
2495 idx_cur = diff_buf_idx(curbuf); | |
2496 if (idx_cur == DB_COUNT) | |
2497 { | |
2498 EMSG(_("E99: Current buffer is not in diff mode")); | |
2499 return; | |
2500 } | |
2501 | |
2502 if (*eap->arg == NUL) | |
2503 { | |
2504 /* No argument: Find the other buffer in the list of diff buffers. */ | |
2505 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other) | |
672 | 2506 if (curtab->tp_diffbuf[idx_other] != curbuf |
1075 | 2507 && curtab->tp_diffbuf[idx_other] != NULL) |
2508 { | |
2509 if (eap->cmdidx != CMD_diffput | |
2510 || curtab->tp_diffbuf[idx_other]->b_p_ma) | |
2511 break; | |
2512 found_not_ma = TRUE; | |
2513 } | |
7 | 2514 if (idx_other == DB_COUNT) |
2515 { | |
1075 | 2516 if (found_not_ma) |
2517 EMSG(_("E793: No other buffer in diff mode is modifiable")); | |
2518 else | |
2519 EMSG(_("E100: No other buffer in diff mode")); | |
7 | 2520 return; |
2521 } | |
2522 | |
2523 /* Check that there isn't a third buffer in the list */ | |
2524 for (i = idx_other + 1; i < DB_COUNT; ++i) | |
672 | 2525 if (curtab->tp_diffbuf[i] != curbuf |
2526 && curtab->tp_diffbuf[i] != NULL | |
2527 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma)) | |
7 | 2528 { |
2529 EMSG(_("E101: More than two buffers in diff mode, don't know which one to use")); | |
2530 return; | |
2531 } | |
2532 } | |
2533 else | |
2534 { | |
2535 /* Buffer number or pattern given. Ignore trailing white space. */ | |
2536 p = eap->arg + STRLEN(eap->arg); | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
2537 while (p > eap->arg && VIM_ISWHITE(p[-1])) |
7 | 2538 --p; |
2539 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i) | |
2540 ; | |
2541 if (eap->arg + i == p) /* digits only */ | |
2542 i = atol((char *)eap->arg); | |
2543 else | |
2544 { | |
4236 | 2545 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE); |
7 | 2546 if (i < 0) |
2547 return; /* error message already given */ | |
2548 } | |
2549 buf = buflist_findnr(i); | |
2550 if (buf == NULL) | |
2551 { | |
2552 EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg); | |
2553 return; | |
2554 } | |
1788 | 2555 if (buf == curbuf) |
2556 return; /* nothing to do */ | |
7 | 2557 idx_other = diff_buf_idx(buf); |
2558 if (idx_other == DB_COUNT) | |
2559 { | |
2560 EMSG2(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg); | |
2561 return; | |
2562 } | |
2563 } | |
2564 | |
2565 diff_busy = TRUE; | |
2566 | |
2567 /* When no range given include the line above or below the cursor. */ | |
2568 if (eap->addr_count == 0) | |
2569 { | |
2570 /* Make it possible that ":diffget" on the last line gets line below | |
2571 * the cursor line when there is no difference above the cursor. */ | |
2572 if (eap->cmdidx == CMD_diffget | |
2573 && eap->line1 == curbuf->b_ml.ml_line_count | |
2574 && diff_check(curwin, eap->line1) == 0 | |
2575 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0)) | |
2576 ++eap->line2; | |
2577 else if (eap->line1 > 0) | |
2578 --eap->line1; | |
2579 } | |
2580 | |
2581 if (eap->cmdidx == CMD_diffget) | |
2582 { | |
2583 idx_from = idx_other; | |
2584 idx_to = idx_cur; | |
2585 } | |
2586 else | |
2587 { | |
2588 idx_from = idx_cur; | |
2589 idx_to = idx_other; | |
2590 /* Need to make the other buffer the current buffer to be able to make | |
2591 * changes in it. */ | |
2592 /* set curwin/curbuf to buf and save a few things */ | |
672 | 2593 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]); |
7 | 2594 } |
2595 | |
819 | 2596 /* May give the warning for a changed buffer here, which can trigger the |
2597 * FileChangedRO autocommand, which may do nasty things and mess | |
2598 * everything up. */ | |
2599 if (!curbuf->b_changed) | |
2600 { | |
2601 change_warning(0); | |
2602 if (diff_buf_idx(curbuf) != idx_to) | |
2603 { | |
2604 EMSG(_("E787: Buffer changed unexpectedly")); | |
2605 return; | |
2606 } | |
2607 } | |
2608 | |
7 | 2609 dprev = NULL; |
672 | 2610 for (dp = curtab->tp_first_diff; dp != NULL; ) |
7 | 2611 { |
2612 if (dp->df_lnum[idx_cur] > eap->line2 + off) | |
2613 break; /* past the range that was specified */ | |
2614 | |
2615 dfree = NULL; | |
2616 lnum = dp->df_lnum[idx_to]; | |
2617 count = dp->df_count[idx_to]; | |
2618 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off | |
2619 && u_save(lnum - 1, lnum + count) != FAIL) | |
2620 { | |
2621 /* Inside the specified range and saving for undo worked. */ | |
2622 start_skip = 0; | |
2623 end_skip = 0; | |
2624 if (eap->addr_count > 0) | |
2625 { | |
2626 /* A range was specified: check if lines need to be skipped. */ | |
2627 start_skip = eap->line1 + off - dp->df_lnum[idx_cur]; | |
2628 if (start_skip > 0) | |
2629 { | |
2630 /* range starts below start of current diff block */ | |
2631 if (start_skip > count) | |
2632 { | |
2633 lnum += count; | |
2634 count = 0; | |
2635 } | |
2636 else | |
2637 { | |
2638 count -= start_skip; | |
2639 lnum += start_skip; | |
2640 } | |
2641 } | |
2642 else | |
2643 start_skip = 0; | |
2644 | |
2645 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1 | |
2646 - (eap->line2 + off); | |
2647 if (end_skip > 0) | |
2648 { | |
2649 /* range ends above end of current/from diff block */ | |
2650 if (idx_cur == idx_from) /* :diffput */ | |
2651 { | |
2652 i = dp->df_count[idx_cur] - start_skip - end_skip; | |
2653 if (count > i) | |
2654 count = i; | |
2655 } | |
2656 else /* :diffget */ | |
2657 { | |
2658 count -= end_skip; | |
2659 end_skip = dp->df_count[idx_from] - start_skip - count; | |
2660 if (end_skip < 0) | |
2661 end_skip = 0; | |
2662 } | |
2663 } | |
2664 else | |
2665 end_skip = 0; | |
2666 } | |
2667 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11113
diff
changeset
|
2668 buf_empty = BUFEMPTY(); |
7 | 2669 added = 0; |
2670 for (i = 0; i < count; ++i) | |
2671 { | |
648 | 2672 /* remember deleting the last line of the buffer */ |
2673 buf_empty = curbuf->b_ml.ml_line_count == 1; | |
7 | 2674 ml_delete(lnum, FALSE); |
2675 --added; | |
2676 } | |
2677 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i) | |
2678 { | |
2679 linenr_T nr; | |
2680 | |
2681 nr = dp->df_lnum[idx_from] + start_skip + i; | |
672 | 2682 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count) |
7 | 2683 break; |
819 | 2684 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from], |
2685 nr, FALSE)); | |
7 | 2686 if (p != NULL) |
2687 { | |
2688 ml_append(lnum + i - 1, p, 0, FALSE); | |
2689 vim_free(p); | |
2690 ++added; | |
648 | 2691 if (buf_empty && curbuf->b_ml.ml_line_count == 2) |
2692 { | |
2693 /* Added the first line into an empty buffer, need to | |
2694 * delete the dummy empty line. */ | |
2695 buf_empty = FALSE; | |
2696 ml_delete((linenr_T)2, FALSE); | |
2697 } | |
7 | 2698 } |
2699 } | |
2700 new_count = dp->df_count[idx_to] + added; | |
2701 dp->df_count[idx_to] = new_count; | |
2702 | |
2703 if (start_skip == 0 && end_skip == 0) | |
2704 { | |
2705 /* Check if there are any other buffers and if the diff is | |
2706 * equal in them. */ | |
2707 for (i = 0; i < DB_COUNT; ++i) | |
819 | 2708 if (curtab->tp_diffbuf[i] != NULL && i != idx_from |
2709 && i != idx_to | |
7 | 2710 && !diff_equal_entry(dp, idx_from, i)) |
2711 break; | |
2712 if (i == DB_COUNT) | |
2713 { | |
2714 /* delete the diff entry, the buffers are now equal here */ | |
2715 dfree = dp; | |
2716 dp = dp->df_next; | |
2717 if (dprev == NULL) | |
672 | 2718 curtab->tp_first_diff = dp; |
7 | 2719 else |
2720 dprev->df_next = dp; | |
2721 } | |
2722 } | |
2723 | |
2724 /* Adjust marks. This will change the following entries! */ | |
2725 if (added != 0) | |
2726 { | |
2727 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added); | |
2728 if (curwin->w_cursor.lnum >= lnum) | |
2729 { | |
2730 /* Adjust the cursor position if it's in/after the changed | |
2731 * lines. */ | |
2732 if (curwin->w_cursor.lnum >= lnum + count) | |
2733 curwin->w_cursor.lnum += added; | |
2734 else if (added < 0) | |
2735 curwin->w_cursor.lnum = lnum; | |
2736 } | |
2737 } | |
2738 changed_lines(lnum, 0, lnum + count, (long)added); | |
2739 | |
2740 if (dfree != NULL) | |
2741 { | |
2742 /* Diff is deleted, update folds in other windows. */ | |
2743 #ifdef FEAT_FOLDING | |
2744 diff_fold_update(dfree, idx_to); | |
2745 #endif | |
2746 vim_free(dfree); | |
2747 } | |
2748 else | |
2749 /* mark_adjust() may have changed the count in a wrong way */ | |
2750 dp->df_count[idx_to] = new_count; | |
2751 | |
2752 /* When changing the current buffer, keep track of line numbers */ | |
2753 if (idx_cur == idx_to) | |
2754 off += added; | |
2755 } | |
2756 | |
2757 /* If before the range or not deleted, go to next diff. */ | |
2758 if (dfree == NULL) | |
2759 { | |
2760 dprev = dp; | |
2761 dp = dp->df_next; | |
2762 } | |
2763 } | |
2764 | |
2765 /* restore curwin/curbuf and a few other things */ | |
2445
04dae202d316
Fixes for coverity warnings.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
2766 if (eap->cmdidx != CMD_diffget) |
7 | 2767 { |
2768 /* Syncing undo only works for the current buffer, but we change | |
2769 * another buffer. Sync undo if the command was typed. This isn't | |
2770 * 100% right when ":diffput" is used in a function or mapping. */ | |
2771 if (KeyTyped) | |
825 | 2772 u_sync(FALSE); |
7 | 2773 aucmd_restbuf(&aco); |
2774 } | |
2775 | |
2776 diff_busy = FALSE; | |
2777 | |
2778 /* Check that the cursor is on a valid character and update it's position. | |
2779 * When there were filler lines the topline has become invalid. */ | |
2780 check_cursor(); | |
2781 changed_line_abv_curs(); | |
2782 | |
2783 /* Also need to redraw the other buffers. */ | |
2784 diff_redraw(FALSE); | |
2785 } | |
2786 | |
2787 #ifdef FEAT_FOLDING | |
2788 /* | |
2789 * Update folds for all diff buffers for entry "dp". | |
2790 * Skip buffer with index "skip_idx". | |
2791 * When there are no diffs, all folds are removed. | |
2792 */ | |
2793 static void | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2794 diff_fold_update(diff_T *dp, int skip_idx) |
7 | 2795 { |
2796 int i; | |
2797 win_T *wp; | |
2798 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9487
diff
changeset
|
2799 FOR_ALL_WINDOWS(wp) |
7 | 2800 for (i = 0; i < DB_COUNT; ++i) |
672 | 2801 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx) |
7 | 2802 foldUpdate(wp, dp->df_lnum[i], |
2803 dp->df_lnum[i] + dp->df_count[i]); | |
2804 } | |
2805 #endif | |
2806 | |
2807 /* | |
2808 * Return TRUE if buffer "buf" is in diff-mode. | |
2809 */ | |
2810 int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2811 diff_mode_buf(buf_T *buf) |
7 | 2812 { |
672 | 2813 tabpage_T *tp; |
2814 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9487
diff
changeset
|
2815 FOR_ALL_TABPAGES(tp) |
672 | 2816 if (diff_buf_idx_tp(buf, tp) != DB_COUNT) |
2817 return TRUE; | |
2818 return FALSE; | |
7 | 2819 } |
2820 | |
2821 /* | |
2822 * Move "count" times in direction "dir" to the next diff block. | |
2823 * Return FAIL if there isn't such a diff block. | |
2824 */ | |
2825 int | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2826 diff_move_to(int dir, long count) |
7 | 2827 { |
2828 int idx; | |
2829 linenr_T lnum = curwin->w_cursor.lnum; | |
2830 diff_T *dp; | |
2831 | |
2832 idx = diff_buf_idx(curbuf); | |
672 | 2833 if (idx == DB_COUNT || curtab->tp_first_diff == NULL) |
7 | 2834 return FAIL; |
2835 | |
672 | 2836 if (curtab->tp_diff_invalid) |
7 | 2837 ex_diffupdate(NULL); /* update after a big change */ |
2838 | |
672 | 2839 if (curtab->tp_first_diff == NULL) /* no diffs today */ |
7 | 2840 return FAIL; |
2841 | |
2842 while (--count >= 0) | |
2843 { | |
2844 /* Check if already before first diff. */ | |
672 | 2845 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx]) |
7 | 2846 break; |
2847 | |
672 | 2848 for (dp = curtab->tp_first_diff; ; dp = dp->df_next) |
7 | 2849 { |
2850 if (dp == NULL) | |
2851 break; | |
2852 if ((dir == FORWARD && lnum < dp->df_lnum[idx]) | |
2853 || (dir == BACKWARD | |
2854 && (dp->df_next == NULL | |
2855 || lnum <= dp->df_next->df_lnum[idx]))) | |
2856 { | |
2857 lnum = dp->df_lnum[idx]; | |
2858 break; | |
2859 } | |
2860 } | |
2861 } | |
2862 | |
2863 /* don't end up past the end of the file */ | |
2864 if (lnum > curbuf->b_ml.ml_line_count) | |
2865 lnum = curbuf->b_ml.ml_line_count; | |
2866 | |
2867 /* When the cursor didn't move at all we fail. */ | |
2868 if (lnum == curwin->w_cursor.lnum) | |
2869 return FAIL; | |
2870 | |
2871 setpcmark(); | |
2872 curwin->w_cursor.lnum = lnum; | |
2873 curwin->w_cursor.col = 0; | |
2874 | |
2875 return OK; | |
2876 } | |
2877 | |
10295
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2878 /* |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2879 * Return the line number in the current window that is closest to "lnum1" in |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2880 * "buf1" in diff mode. |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2881 */ |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2882 static linenr_T |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2883 diff_get_corresponding_line_int( |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2884 buf_T *buf1, |
10295
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2885 linenr_T lnum1) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2886 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2887 int idx1; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2888 int idx2; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2889 diff_T *dp; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2890 int baseline = 0; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2891 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2892 idx1 = diff_buf_idx(buf1); |
10295
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2893 idx2 = diff_buf_idx(curbuf); |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2894 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2895 return lnum1; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2896 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2897 if (curtab->tp_diff_invalid) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2898 ex_diffupdate(NULL); /* update after a big change */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2899 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2900 if (curtab->tp_first_diff == NULL) /* no diffs today */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2901 return lnum1; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2902 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2903 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2904 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2905 if (dp->df_lnum[idx1] > lnum1) |
10295
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2906 return lnum1 - baseline; |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2907 if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2908 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2909 /* Inside the diffblock */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2910 baseline = lnum1 - dp->df_lnum[idx1]; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2911 if (baseline > dp->df_count[idx2]) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2912 baseline = dp->df_count[idx2]; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2913 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2914 return dp->df_lnum[idx2] + baseline; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2915 } |
10295
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2916 if ( (dp->df_lnum[idx1] == lnum1) |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2917 && (dp->df_count[idx1] == 0) |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2918 && (dp->df_lnum[idx2] <= curwin->w_cursor.lnum) |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2919 && ((dp->df_lnum[idx2] + dp->df_count[idx2]) |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2920 > curwin->w_cursor.lnum)) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2921 /* |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2922 * Special case: if the cursor is just after a zero-count |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2923 * block (i.e. all filler) and the target cursor is already |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2924 * inside the corresponding block, leave the target cursor |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2925 * unmoved. This makes repeated CTRL-W W operations work |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2926 * as expected. |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2927 */ |
10295
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2928 return curwin->w_cursor.lnum; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2929 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1]) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2930 - (dp->df_lnum[idx2] + dp->df_count[idx2]); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2931 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2932 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2933 /* If we get here then the cursor is after the last diff */ |
10295
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2934 return lnum1 - baseline; |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2935 } |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2936 |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2937 /* |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2938 * Return the line number in the current window that is closest to "lnum1" in |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2939 * "buf1" in diff mode. Checks the line number to be valid. |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2940 */ |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2941 linenr_T |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2942 diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1) |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2943 { |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2944 linenr_T lnum = diff_get_corresponding_line_int(buf1, lnum1); |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2945 |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2946 /* don't end up past the end of the file */ |
10295
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2947 if (lnum > curbuf->b_ml.ml_line_count) |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2948 return curbuf->b_ml.ml_line_count; |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2949 return lnum; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2950 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2086
diff
changeset
|
2951 |
7 | 2952 /* |
2953 * For line "lnum" in the current window find the equivalent lnum in window | |
2954 * "wp", compensating for inserted/deleted lines. | |
2955 */ | |
2956 linenr_T | |
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2957 diff_lnum_win(linenr_T lnum, win_T *wp) |
7 | 2958 { |
2959 diff_T *dp; | |
2960 int idx; | |
2961 int i; | |
2962 linenr_T n; | |
2963 | |
2964 idx = diff_buf_idx(curbuf); | |
2965 if (idx == DB_COUNT) /* safety check */ | |
2966 return (linenr_T)0; | |
2967 | |
672 | 2968 if (curtab->tp_diff_invalid) |
7 | 2969 ex_diffupdate(NULL); /* update after a big change */ |
2970 | |
2971 /* search for a change that includes "lnum" in the list of diffblocks. */ | |
672 | 2972 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) |
7 | 2973 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) |
2974 break; | |
2975 | |
2976 /* When after the last change, compute relative to the last line number. */ | |
2977 if (dp == NULL) | |
2978 return wp->w_buffer->b_ml.ml_line_count | |
2979 - (curbuf->b_ml.ml_line_count - lnum); | |
2980 | |
2981 /* Find index for "wp". */ | |
2982 i = diff_buf_idx(wp->w_buffer); | |
2983 if (i == DB_COUNT) /* safety check */ | |
2984 return (linenr_T)0; | |
2985 | |
2986 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]); | |
2987 if (n > dp->df_lnum[i] + dp->df_count[i]) | |
2988 n = dp->df_lnum[i] + dp->df_count[i]; | |
2989 return n; | |
2990 } | |
2991 | |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2992 /* |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2993 * Handle an ED style diff line. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2994 * Return FAIL if the line does not contain diff info. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2995 */ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2996 static int |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2997 parse_diff_ed( |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2998 char_u *line, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
2999 linenr_T *lnum_orig, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3000 long *count_orig, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3001 linenr_T *lnum_new, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3002 long *count_new) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3003 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3004 char_u *p; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3005 long f1, l1, f2, l2; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3006 int difftype; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3007 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3008 // The line must be one of three formats: |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3009 // change: {first}[,{last}]c{first}[,{last}] |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3010 // append: {first}a{first}[,{last}] |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3011 // delete: {first}[,{last}]d{first} |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3012 p = line; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3013 f1 = getdigits(&p); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3014 if (*p == ',') |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3015 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3016 ++p; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3017 l1 = getdigits(&p); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3018 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3019 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3020 l1 = f1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3021 if (*p != 'a' && *p != 'c' && *p != 'd') |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3022 return FAIL; // invalid diff format |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3023 difftype = *p++; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3024 f2 = getdigits(&p); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3025 if (*p == ',') |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3026 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3027 ++p; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3028 l2 = getdigits(&p); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3029 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3030 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3031 l2 = f2; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3032 if (l1 < f1 || l2 < f2) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3033 return FAIL; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3034 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3035 if (difftype == 'a') |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3036 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3037 *lnum_orig = f1 + 1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3038 *count_orig = 0; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3039 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3040 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3041 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3042 *lnum_orig = f1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3043 *count_orig = l1 - f1 + 1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3044 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3045 if (difftype == 'd') |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3046 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3047 *lnum_new = f2 + 1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3048 *count_new = 0; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3049 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3050 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3051 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3052 *lnum_new = f2; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3053 *count_new = l2 - f2 + 1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3054 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3055 return OK; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3056 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3057 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3058 /* |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3059 * Parses unified diff with zero(!) context lines. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3060 * Return FAIL if there is no diff information in "line". |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3061 */ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3062 static int |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3063 parse_diff_unified( |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3064 char_u *line, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3065 linenr_T *lnum_orig, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3066 long *count_orig, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3067 linenr_T *lnum_new, |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3068 long *count_new) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3069 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3070 char_u *p; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3071 long oldline, oldcount, newline, newcount; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3072 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3073 // Parse unified diff hunk header: |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3074 // @@ -oldline,oldcount +newline,newcount @@ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3075 p = line; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3076 if (*p++ == '@' && *p++ == '@' && *p++ == ' ' && *p++ == '-') |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3077 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3078 oldline = getdigits(&p); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3079 if (*p == ',') |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3080 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3081 ++p; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3082 oldcount = getdigits(&p); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3083 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3084 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3085 oldcount = 1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3086 if (*p++ == ' ' && *p++ == '+') |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3087 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3088 newline = getdigits(&p); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3089 if (*p == ',') |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3090 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3091 ++p; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3092 newcount = getdigits(&p); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3093 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3094 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3095 newcount = 1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3096 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3097 else |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3098 return FAIL; // invalid diff format |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3099 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3100 if (oldcount == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3101 oldline += 1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3102 if (newcount == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3103 newline += 1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3104 if (newline == 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3105 newline = 1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3106 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3107 *lnum_orig = oldline; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3108 *count_orig = oldcount; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3109 *lnum_new = newline; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3110 *count_new = newcount; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3111 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3112 return OK; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3113 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3114 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3115 return FAIL; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3116 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3117 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3118 /* |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3119 * Callback function for the xdl_diff() function. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3120 * Stores the diff output in a grow array. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3121 */ |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3122 static int |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3123 xdiff_out(void *priv, mmbuffer_t *mb, int nbuf) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3124 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3125 diffout_T *dout = (diffout_T *)priv; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3126 int i; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3127 char_u *p; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3128 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3129 for (i = 0; i < nbuf; i++) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3130 { |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3131 // We are only interested in the header lines, skip text lines. |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3132 if (STRNCMP(mb[i].ptr, "@@ ", 3) != 0) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3133 continue; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3134 if (ga_grow(&dout->dout_ga, 1) == FAIL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3135 return -1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3136 p = vim_strnsave((char_u *)mb[i].ptr, mb[i].size); |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3137 if (p == NULL) |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3138 return -1; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3139 ((char_u **)dout->dout_ga.ga_data)[dout->dout_ga.ga_len++] = p; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3140 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3141 return 0; |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3142 } |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3143 |
7 | 3144 #endif /* FEAT_DIFF */ |