X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=apply.c;h=964df2db10c22d6ed0b89532e0af8cf9a43e607c;hb=f1f0d0889e5557bc467490fdbd53f7b912503a33;hp=074684a99b8647e1c47a14e4eda744293b08e641;hpb=1b668341db6576d8d851473c74388031b319798a;p=git.git diff --git a/apply.c b/apply.c index 074684a9..964df2db 100644 --- a/apply.c +++ b/apply.c @@ -13,7 +13,7 @@ * uses the working tree as a "branch" for a 3-way merge. */ #include - +#include #include "cache.h" // We default to the merge behaviour, since that's what most people would @@ -32,7 +32,8 @@ static int summary = 0; static int check = 0; static int apply = 1; static int show_files = 0; -static const char apply_usage[] = "git-apply [--stat] [--summary] [--check] [--show-files] "; +static const char apply_usage[] = +"git-apply [--no-merge] [--stat] [--summary] [--check] [--index] [--apply] [--show-files] ..."; /* * For "diff-stat" like behaviour, we keep track of the biggest change @@ -386,7 +387,7 @@ static char *git_header_name(char *line) default: continue; case '\n': - break; + return NULL; case '\t': case ' ': second = name+len; for (;;) { @@ -562,7 +563,7 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc struct fragment dummy; if (parse_fragment_header(line, len, &dummy) < 0) continue; - error("patch fragment without header at line %d: %.*s", linenr, len-1, line); + error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line); } if (size < len + 6) @@ -671,13 +672,24 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s added++; newlines--; break; - /* We allow "\ No newline at end of file" */ + + /* We allow "\ No newline at end of file". Depending + * on locale settings when the patch was produced we + * don't know what this line looks like. The only + * thing we do know is that it begins with "\ ". */ case '\\': - if (len < 12 || memcmp(line, "\\ No newline", 12)) + if (len < 12 || memcmp(line, "\\ ", 2)) return -1; break; } } + /* If a fragment ends with an incomplete line, we failed to include + * it in the above loop because we hit oldlines == newlines == 0 + * before seeing it. + */ + if (12 < size && !memcmp(line, "\\ ", 2)) + offset += linelen(line, size); + patch->lines_added += added; patch->lines_deleted += deleted; return offset; @@ -729,6 +741,7 @@ static const char minuses[]= "-------------------------------------------------- static void show_stats(struct patch *patch) { + const char *prefix = ""; char *name = patch->new_name; int len, max, add, del, total; @@ -742,8 +755,15 @@ static void show_stats(struct patch *patch) max = max_len; if (max > 50) max = 50; - if (len > max) + if (len > max) { + char *slash; + prefix = "..."; + max -= 3; name += len - max; + slash = strchr(name, '/'); + if (slash) + name = slash; + } len = max; /* @@ -762,7 +782,7 @@ static void show_stats(struct patch *patch) add = (add * max + max_change / 2) / max_change; del = total - add; } - printf(" %-*s |%5d %.*s%.*s\n", + printf(" %s%-*s |%5d %.*s%.*s\n", prefix, len, name, patch->lines_added + patch->lines_deleted, add, pluses, del, minuses); } @@ -899,7 +919,7 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag) * last one (which is the newline, of course). */ plen = len-1; - if (len > size && patch[len] == '\\') + if (len < size && patch[len] == '\\') plen--; switch (*patch) { case ' ': @@ -952,7 +972,7 @@ static int apply_fragments(struct buffer_desc *desc, struct patch *patch) while (frag) { if (apply_one_fragment(desc, frag) < 0) - return error("patch failed: %s:%d", patch->old_name, frag->oldpos); + return error("patch failed: %s:%ld", patch->old_name, frag->oldpos); frag = frag->next; } return 0; @@ -1027,8 +1047,12 @@ static int check_patch(struct patch *patch) return error("%s: already exists in working directory", new_name); if (errno != ENOENT) return error("%s: %s", new_name, strerror(errno)); - if (!patch->new_mode) - patch->new_mode = S_IFREG | 0644; + if (!patch->new_mode) { + if (patch->is_new) + patch->new_mode = S_IFREG | 0644; + else + patch->new_mode = patch->old_mode; + } } if (new_name && old_name) { @@ -1337,9 +1361,9 @@ static void write_out_one_result(struct patch *patch) create_file(patch); } -static void write_out_results(struct patch *list) +static void write_out_results(struct patch *list, int skipped_patch) { - if (!list) + if (!list && !skipped_patch) die("No changes"); while (list) { @@ -1350,12 +1374,30 @@ static void write_out_results(struct patch *list) static struct cache_file cache_file; +static struct excludes { + struct excludes *next; + const char *path; +} *excludes; + +static int use_patch(struct patch *p) +{ + const char *pathname = p->new_name ? p->new_name : p->old_name; + struct excludes *x = excludes; + while (x) { + if (fnmatch(x->path, pathname, 0) == 0) + return 0; + x = x->next; + } + return 1; +} + static int apply_patch(int fd) { int newfd; unsigned long offset, size; char *buffer = read_patch_file(fd, &size); struct patch *list = NULL, **listp = &list; + int skipped_patch = 0; if (!buffer) return -1; @@ -1369,9 +1411,15 @@ static int apply_patch(int fd) nr = parse_chunk(buffer + offset, size, patch); if (nr < 0) break; - patch_stats(patch); - *listp = patch; - listp = &patch->next; + if (use_patch(patch)) { + patch_stats(patch); + *listp = patch; + listp = &patch->next; + } else { + /* perhaps free it a bit better? */ + free(patch); + skipped_patch++; + } offset += nr; size -= nr; } @@ -1389,7 +1437,7 @@ static int apply_patch(int fd) exit(1); if (apply) - write_out_results(list); + write_out_results(list, skipped_patch); if (write_index) { if (write_cache(newfd, active_cache, active_nr) || @@ -1424,6 +1472,14 @@ int main(int argc, char **argv) read_stdin = 0; continue; } + if (!strncmp(arg, "--exclude=", 10)) { + struct excludes *x = xmalloc(sizeof(*x)); + x->path = arg + 10; + x->next = excludes; + excludes = x; + continue; + } + /* NEEDSWORK: this does not do anything at this moment. */ if (!strcmp(arg, "--no-merge")) { merge_patch = 0; continue;