Junio C Hamano | d9ea73e | 2006-04-05 02:03:58 -0700 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "xdiff-interface.h" |
Junio C Hamano | 8a3f524 | 2008-08-13 23:18:22 -0700 | [diff] [blame] | 3 | #include "strbuf.h" |
| 4 | |
| 5 | struct xdiff_emit_state { |
| 6 | xdiff_emit_consume_fn consume; |
| 7 | void *consume_callback_data; |
| 8 | struct strbuf remainder; |
| 9 | }; |
Junio C Hamano | d9ea73e | 2006-04-05 02:03:58 -0700 | [diff] [blame] | 10 | |
Junio C Hamano | a0fd314 | 2006-04-06 22:29:55 -0700 | [diff] [blame] | 11 | static int parse_num(char **cp_p, int *num_p) |
Junio C Hamano | c1e335a | 2006-04-05 12:22:35 -0700 | [diff] [blame] | 12 | { |
| 13 | char *cp = *cp_p; |
Junio C Hamano | a0fd314 | 2006-04-06 22:29:55 -0700 | [diff] [blame] | 14 | int num = 0; |
Junio C Hamano | c1e335a | 2006-04-05 12:22:35 -0700 | [diff] [blame] | 15 | int read_some; |
| 16 | |
| 17 | while ('0' <= *cp && *cp <= '9') |
| 18 | num = num * 10 + *cp++ - '0'; |
| 19 | if (!(read_some = cp - *cp_p)) |
| 20 | return -1; |
| 21 | *cp_p = cp; |
| 22 | *num_p = num; |
| 23 | return 0; |
| 24 | } |
| 25 | |
| 26 | int parse_hunk_header(char *line, int len, |
Junio C Hamano | a0fd314 | 2006-04-06 22:29:55 -0700 | [diff] [blame] | 27 | int *ob, int *on, |
| 28 | int *nb, int *nn) |
Junio C Hamano | c1e335a | 2006-04-05 12:22:35 -0700 | [diff] [blame] | 29 | { |
| 30 | char *cp; |
| 31 | cp = line + 4; |
| 32 | if (parse_num(&cp, ob)) { |
| 33 | bad_line: |
| 34 | return error("malformed diff output: %s", line); |
| 35 | } |
| 36 | if (*cp == ',') { |
| 37 | cp++; |
| 38 | if (parse_num(&cp, on)) |
| 39 | goto bad_line; |
| 40 | } |
| 41 | else |
| 42 | *on = 1; |
| 43 | if (*cp++ != ' ' || *cp++ != '+') |
| 44 | goto bad_line; |
| 45 | if (parse_num(&cp, nb)) |
| 46 | goto bad_line; |
| 47 | if (*cp == ',') { |
| 48 | cp++; |
| 49 | if (parse_num(&cp, nn)) |
| 50 | goto bad_line; |
| 51 | } |
| 52 | else |
| 53 | *nn = 1; |
| 54 | return -!!memcmp(cp, " @@", 3); |
| 55 | } |
| 56 | |
Junio C Hamano | d9ea73e | 2006-04-05 02:03:58 -0700 | [diff] [blame] | 57 | static void consume_one(void *priv_, char *s, unsigned long size) |
| 58 | { |
| 59 | struct xdiff_emit_state *priv = priv_; |
| 60 | char *ep; |
| 61 | while (size) { |
| 62 | unsigned long this_size; |
| 63 | ep = memchr(s, '\n', size); |
| 64 | this_size = (ep == NULL) ? size : (ep - s + 1); |
Junio C Hamano | 8a3f524 | 2008-08-13 23:18:22 -0700 | [diff] [blame] | 65 | priv->consume(priv->consume_callback_data, s, this_size); |
Junio C Hamano | d9ea73e | 2006-04-05 02:03:58 -0700 | [diff] [blame] | 66 | size -= this_size; |
| 67 | s += this_size; |
| 68 | } |
| 69 | } |
| 70 | |
Brian Downing | c99db9d2 | 2008-08-14 00:36:50 -0500 | [diff] [blame] | 71 | static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf) |
Junio C Hamano | d9ea73e | 2006-04-05 02:03:58 -0700 | [diff] [blame] | 72 | { |
| 73 | struct xdiff_emit_state *priv = priv_; |
| 74 | int i; |
| 75 | |
| 76 | for (i = 0; i < nbuf; i++) { |
| 77 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
| 78 | /* Incomplete line */ |
Brian Downing | b463776 | 2008-08-14 00:36:51 -0500 | [diff] [blame] | 79 | strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size); |
Junio C Hamano | d9ea73e | 2006-04-05 02:03:58 -0700 | [diff] [blame] | 80 | continue; |
| 81 | } |
| 82 | |
| 83 | /* we have a complete line */ |
Brian Downing | b463776 | 2008-08-14 00:36:51 -0500 | [diff] [blame] | 84 | if (!priv->remainder.len) { |
Junio C Hamano | d9ea73e | 2006-04-05 02:03:58 -0700 | [diff] [blame] | 85 | consume_one(priv, mb[i].ptr, mb[i].size); |
| 86 | continue; |
| 87 | } |
Brian Downing | b463776 | 2008-08-14 00:36:51 -0500 | [diff] [blame] | 88 | strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size); |
| 89 | consume_one(priv, priv->remainder.buf, priv->remainder.len); |
| 90 | strbuf_reset(&priv->remainder); |
Junio C Hamano | d9ea73e | 2006-04-05 02:03:58 -0700 | [diff] [blame] | 91 | } |
Brian Downing | b463776 | 2008-08-14 00:36:51 -0500 | [diff] [blame] | 92 | if (priv->remainder.len) { |
| 93 | consume_one(priv, priv->remainder.buf, priv->remainder.len); |
| 94 | strbuf_reset(&priv->remainder); |
Junio C Hamano | d9ea73e | 2006-04-05 02:03:58 -0700 | [diff] [blame] | 95 | } |
| 96 | return 0; |
| 97 | } |
Johannes Schindelin | 7cab588 | 2006-12-20 17:37:07 +0100 | [diff] [blame] | 98 | |
Junio C Hamano | 913b45f | 2007-12-13 14:24:18 -0800 | [diff] [blame] | 99 | /* |
| 100 | * Trim down common substring at the end of the buffers, |
| 101 | * but leave at least ctx lines at the end. |
| 102 | */ |
Junio C Hamano | 29ab27f | 2007-12-14 12:00:42 -0800 | [diff] [blame] | 103 | static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx) |
Junio C Hamano | 913b45f | 2007-12-13 14:24:18 -0800 | [diff] [blame] | 104 | { |
| 105 | const int blk = 1024; |
Jeff King | 5249997 | 2007-12-16 02:06:14 -0500 | [diff] [blame] | 106 | long trimmed = 0, recovered = 0; |
Junio C Hamano | 913b45f | 2007-12-13 14:24:18 -0800 | [diff] [blame] | 107 | char *ap = a->ptr + a->size; |
| 108 | char *bp = b->ptr + b->size; |
| 109 | long smaller = (a->size < b->size) ? a->size : b->size; |
| 110 | |
Linus Torvalds | d2f8295 | 2007-12-20 20:22:46 -0800 | [diff] [blame] | 111 | if (ctx) |
| 112 | return; |
| 113 | |
Junio C Hamano | 913b45f | 2007-12-13 14:24:18 -0800 | [diff] [blame] | 114 | while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) { |
| 115 | trimmed += blk; |
| 116 | ap -= blk; |
| 117 | bp -= blk; |
| 118 | } |
| 119 | |
Linus Torvalds | d2f8295 | 2007-12-20 20:22:46 -0800 | [diff] [blame] | 120 | while (recovered < trimmed) |
Jeff King | 5249997 | 2007-12-16 02:06:14 -0500 | [diff] [blame] | 121 | if (ap[recovered++] == '\n') |
Linus Torvalds | d2f8295 | 2007-12-20 20:22:46 -0800 | [diff] [blame] | 122 | break; |
| 123 | a->size -= trimmed - recovered; |
| 124 | b->size -= trimmed - recovered; |
Junio C Hamano | 913b45f | 2007-12-13 14:24:18 -0800 | [diff] [blame] | 125 | } |
| 126 | |
Junio C Hamano | c279d7e | 2007-12-13 13:25:07 -0800 | [diff] [blame] | 127 | int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb) |
| 128 | { |
Junio C Hamano | 913b45f | 2007-12-13 14:24:18 -0800 | [diff] [blame] | 129 | mmfile_t a = *mf1; |
| 130 | mmfile_t b = *mf2; |
| 131 | |
| 132 | trim_common_tail(&a, &b, xecfg->ctxlen); |
| 133 | |
| 134 | return xdl_diff(&a, &b, xpp, xecfg, xecb); |
Junio C Hamano | c279d7e | 2007-12-13 13:25:07 -0800 | [diff] [blame] | 135 | } |
| 136 | |
Brian Downing | c99db9d2 | 2008-08-14 00:36:50 -0500 | [diff] [blame] | 137 | int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, |
Junio C Hamano | 8a3f524 | 2008-08-13 23:18:22 -0700 | [diff] [blame] | 138 | xdiff_emit_consume_fn fn, void *consume_callback_data, |
| 139 | xpparam_t const *xpp, |
Brian Downing | c99db9d2 | 2008-08-14 00:36:50 -0500 | [diff] [blame] | 140 | xdemitconf_t const *xecfg, xdemitcb_t *xecb) |
| 141 | { |
| 142 | int ret; |
Junio C Hamano | 8a3f524 | 2008-08-13 23:18:22 -0700 | [diff] [blame] | 143 | struct xdiff_emit_state state; |
| 144 | |
| 145 | memset(&state, 0, sizeof(state)); |
| 146 | state.consume = fn; |
| 147 | state.consume_callback_data = consume_callback_data; |
Brian Downing | c99db9d2 | 2008-08-14 00:36:50 -0500 | [diff] [blame] | 148 | xecb->outf = xdiff_outf; |
Junio C Hamano | 8a3f524 | 2008-08-13 23:18:22 -0700 | [diff] [blame] | 149 | xecb->priv = &state; |
| 150 | strbuf_init(&state.remainder, 0); |
Brian Downing | c99db9d2 | 2008-08-14 00:36:50 -0500 | [diff] [blame] | 151 | ret = xdi_diff(mf1, mf2, xpp, xecfg, xecb); |
Junio C Hamano | 8a3f524 | 2008-08-13 23:18:22 -0700 | [diff] [blame] | 152 | strbuf_release(&state.remainder); |
Brian Downing | c99db9d2 | 2008-08-14 00:36:50 -0500 | [diff] [blame] | 153 | return ret; |
| 154 | } |
| 155 | |
Johannes Schindelin | 7cab588 | 2006-12-20 17:37:07 +0100 | [diff] [blame] | 156 | int read_mmfile(mmfile_t *ptr, const char *filename) |
| 157 | { |
| 158 | struct stat st; |
| 159 | FILE *f; |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 160 | size_t sz; |
Johannes Schindelin | 7cab588 | 2006-12-20 17:37:07 +0100 | [diff] [blame] | 161 | |
| 162 | if (stat(filename, &st)) |
| 163 | return error("Could not stat %s", filename); |
| 164 | if ((f = fopen(filename, "rb")) == NULL) |
| 165 | return error("Could not open %s", filename); |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 166 | sz = xsize_t(st.st_size); |
Johannes Schindelin | 381b851 | 2008-03-13 16:19:35 +0100 | [diff] [blame] | 167 | ptr->ptr = xmalloc(sz ? sz : 1); |
| 168 | if (sz && fread(ptr->ptr, sz, 1, f) != 1) |
Johannes Schindelin | 7cab588 | 2006-12-20 17:37:07 +0100 | [diff] [blame] | 169 | return error("Could not read %s", filename); |
| 170 | fclose(f); |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 171 | ptr->size = sz; |
Johannes Schindelin | 7cab588 | 2006-12-20 17:37:07 +0100 | [diff] [blame] | 172 | return 0; |
| 173 | } |
| 174 | |
Johannes Schindelin | 6bfce93 | 2007-06-05 03:36:11 +0100 | [diff] [blame] | 175 | #define FIRST_FEW_BYTES 8000 |
| 176 | int buffer_is_binary(const char *ptr, unsigned long size) |
| 177 | { |
| 178 | if (FIRST_FEW_BYTES < size) |
| 179 | size = FIRST_FEW_BYTES; |
| 180 | return !!memchr(ptr, 0, size); |
| 181 | } |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 182 | |
| 183 | struct ff_regs { |
| 184 | int nr; |
| 185 | struct ff_reg { |
| 186 | regex_t re; |
| 187 | int negate; |
| 188 | } *array; |
| 189 | }; |
| 190 | |
| 191 | static long ff_regexp(const char *line, long len, |
| 192 | char *buffer, long buffer_size, void *priv) |
| 193 | { |
| 194 | char *line_buffer = xstrndup(line, len); /* make NUL terminated */ |
| 195 | struct ff_regs *regs = priv; |
| 196 | regmatch_t pmatch[2]; |
Junio C Hamano | 3d8dccd | 2008-09-20 00:52:11 -0700 | [diff] [blame^] | 197 | int i; |
| 198 | int result = -1; |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 199 | |
| 200 | for (i = 0; i < regs->nr; i++) { |
| 201 | struct ff_reg *reg = regs->array + i; |
Junio C Hamano | 3d8dccd | 2008-09-20 00:52:11 -0700 | [diff] [blame^] | 202 | if (!regexec(®->re, line_buffer, 2, pmatch, 0)) { |
| 203 | if (reg->negate) |
| 204 | goto fail; |
| 205 | break; |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 206 | } |
| 207 | } |
Junio C Hamano | 3d8dccd | 2008-09-20 00:52:11 -0700 | [diff] [blame^] | 208 | if (regs->nr <= i) |
| 209 | goto fail; |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 210 | i = pmatch[1].rm_so >= 0 ? 1 : 0; |
| 211 | line += pmatch[i].rm_so; |
| 212 | result = pmatch[i].rm_eo - pmatch[i].rm_so; |
| 213 | if (result > buffer_size) |
| 214 | result = buffer_size; |
| 215 | else |
Junio C Hamano | 3d8dccd | 2008-09-20 00:52:11 -0700 | [diff] [blame^] | 216 | while (result > 0 && (isspace(line[result - 1]))) |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 217 | result--; |
| 218 | memcpy(buffer, line, result); |
Junio C Hamano | 3d8dccd | 2008-09-20 00:52:11 -0700 | [diff] [blame^] | 219 | fail: |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 220 | free(line_buffer); |
| 221 | return result; |
| 222 | } |
| 223 | |
Brandon Casey | a013585 | 2008-09-18 17:42:48 -0500 | [diff] [blame] | 224 | void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags) |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 225 | { |
| 226 | int i; |
| 227 | struct ff_regs *regs; |
| 228 | |
| 229 | xecfg->find_func = ff_regexp; |
| 230 | regs = xecfg->find_func_priv = xmalloc(sizeof(struct ff_regs)); |
| 231 | for (i = 0, regs->nr = 1; value[i]; i++) |
| 232 | if (value[i] == '\n') |
| 233 | regs->nr++; |
| 234 | regs->array = xmalloc(regs->nr * sizeof(struct ff_reg)); |
| 235 | for (i = 0; i < regs->nr; i++) { |
| 236 | struct ff_reg *reg = regs->array + i; |
| 237 | const char *ep = strchr(value, '\n'), *expression; |
| 238 | char *buffer = NULL; |
| 239 | |
| 240 | reg->negate = (*value == '!'); |
| 241 | if (reg->negate && i == regs->nr - 1) |
| 242 | die("Last expression must not be negated: %s", value); |
| 243 | if (*value == '!') |
| 244 | value++; |
| 245 | if (ep) |
| 246 | expression = buffer = xstrndup(value, ep - value); |
| 247 | else |
| 248 | expression = value; |
Brandon Casey | a013585 | 2008-09-18 17:42:48 -0500 | [diff] [blame] | 249 | if (regcomp(®->re, expression, cflags)) |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 250 | die("Invalid regexp to look for hunk header: %s", expression); |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 251 | free(buffer); |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 252 | value = ep + 1; |
| 253 | } |
| 254 | } |