X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=apply.c;h=e0a1549022ef4ad027c2dae369615bb4c2aec796;hb=000182eacf99cde27d5916aa415921924b82972c;hp=3c3ec905743d3aeaa0f33bbea11db4824d5129dc;hpb=3f40315aaa4f1abc4883c85ca0a8ea9570da6e24;p=git.git diff --git a/apply.c b/apply.c index 3c3ec905..e0a15490 100644 --- a/apply.c +++ b/apply.c @@ -17,9 +17,19 @@ #include "cache.h" // We default to the merge behaviour, since that's what most people would -// expect +// expect. +// +// --check turns on checking that the working tree matches the +// files that are being modified, but doesn't apply the patch +// --stat does just a diffstat, and doesn't actually apply +// --show-files shows the directory changes +// static int merge_patch = 1; -static const char apply_usage[] = "git-apply "; +static int diffstat = 0; +static int check = 0; +static int apply = 1; +static int show_files = 0; +static const char apply_usage[] = "git-apply [--stat] [--check] [--show-files] "; /* * For "diff-stat" like behaviour, we keep track of the biggest change @@ -34,7 +44,6 @@ static int max_change, max_len; * things are flags, where -1 means "don't know yet". */ static int linenr = 1; -static char *def_name = NULL; struct fragment { unsigned long oldpos, oldlines; @@ -45,7 +54,7 @@ struct fragment { }; struct patch { - char *new_name, *old_name; + char *new_name, *old_name, *def_name; unsigned int old_mode, new_mode; int is_rename, is_copy, is_new, is_delete; int lines_added, lines_deleted; @@ -107,9 +116,8 @@ static int is_dev_null(const char *str) return !memcmp("/dev/null", str, 9) && isspace(str[9]); } -#define TERM_EXIST 1 -#define TERM_SPACE 2 -#define TERM_TAB 4 +#define TERM_SPACE 1 +#define TERM_TAB 2 static int name_terminate(const char *name, int namelen, int c, int terminate) { @@ -118,13 +126,6 @@ static int name_terminate(const char *name, int namelen, int c, int terminate) if (c == '\t' && !(terminate & TERM_TAB)) return 0; - /* - * Do we want an existing name? Return false and - * continue if it's not there. - */ - if (terminate & TERM_EXIST) - return cache_name_pos(name, namelen) >= 0; - return 1; } @@ -191,16 +192,16 @@ static void parse_traditional_patch(const char *first, const char *second, struc if (is_dev_null(first)) { patch->is_new = 1; patch->is_delete = 0; - name = find_name(second, def_name, p_value, TERM_SPACE | TERM_TAB); + name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB); patch->new_name = name; } else if (is_dev_null(second)) { patch->is_new = 0; patch->is_delete = 1; - name = find_name(first, def_name, p_value, TERM_EXIST | TERM_SPACE | TERM_TAB); + name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); patch->old_name = name; } else { - name = find_name(first, def_name, p_value, TERM_EXIST | TERM_SPACE | TERM_TAB); - name = find_name(second, name, p_value, TERM_EXIST | TERM_SPACE | TERM_TAB); + name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); + name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB); patch->old_name = patch->new_name = name; } if (!name) @@ -283,12 +284,14 @@ static int gitdiff_newmode(const char *line, struct patch *patch) static int gitdiff_delete(const char *line, struct patch *patch) { patch->is_delete = 1; + patch->old_name = patch->def_name; return gitdiff_oldmode(line, patch); } static int gitdiff_newfile(const char *line, struct patch *patch) { patch->is_new = 1; + patch->new_name = patch->def_name; return gitdiff_newmode(line, patch); } @@ -325,6 +328,11 @@ static int gitdiff_similarity(const char *line, struct patch *patch) return 0; } +static int gitdiff_dissimilarity(const char *line, struct patch *patch) +{ + return 0; +} + /* * This is normal for a diff that doesn't change anything: we'll fall through * into the next diff. Tell the parser to break out. @@ -334,6 +342,61 @@ static int gitdiff_unrecognized(const char *line, struct patch *patch) return -1; } +static char *git_header_name(char *line) +{ + int len; + char *name, *second; + + /* + * Find the first '/' + */ + name = line; + for (;;) { + char c = *name++; + if (c == '\n') + return NULL; + if (c == '/') + break; + } + + /* + * We don't accept absolute paths (/dev/null) as possibly valid + */ + if (name == line+1) + return NULL; + + /* + * Accept a name only if it shows up twice, exactly the same + * form. + */ + for (len = 0 ; ; len++) { + char c = name[len]; + + switch (c) { + default: + continue; + case '\n': + break; + case '\t': case ' ': + second = name+len; + for (;;) { + char c = *second++; + if (c == '\n') + return NULL; + if (c == '/') + break; + } + if (second[len] == '\n' && !memcmp(name, second, len)) { + char *ret = xmalloc(len + 1); + memcpy(ret, name, len); + ret[len] = 0; + return ret; + } + } + } + return NULL; +} + /* Verify that we recognize the lines following a git header */ static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch) { @@ -343,6 +406,14 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch patch->is_new = 0; patch->is_delete = 0; + /* + * Some things may not have the old name in the + * rest of the headers anywhere (pure mode changes, + * or removing or adding empty files), so we get + * the default name from the header. + */ + patch->def_name = git_header_name(line + strlen("diff --git ")); + line += len; size -= len; linenr++; @@ -363,6 +434,7 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch { "rename from ", gitdiff_renamesrc }, { "rename to ", gitdiff_renamedst }, { "similarity index ", gitdiff_similarity }, + { "dissimilarity index ", gitdiff_dissimilarity }, { "", gitdiff_unrecognized }, }; int i; @@ -384,9 +456,19 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch return offset; } -static int parse_num(const char *line, int len, int offset, const char *expect, unsigned long *p) +static int parse_num(const char *line, unsigned long *p) { char *ptr; + + if (!isdigit(*line)) + return 0; + *p = strtoul(line, &ptr, 10); + return ptr - line; +} + +static int parse_range(const char *line, int len, int offset, const char *expect, + unsigned long *p1, unsigned long *p2) +{ int digits, ex; if (offset < 0 || offset >= len) @@ -394,16 +476,25 @@ static int parse_num(const char *line, int len, int offset, const char *expect, line += offset; len -= offset; - if (!isdigit(*line)) + digits = parse_num(line, p1); + if (!digits) return -1; - *p = strtoul(line, &ptr, 10); - - digits = ptr - line; offset += digits; line += digits; len -= digits; + *p2 = *p1; + if (*line == ',') { + digits = parse_num(line+1, p2); + if (!digits) + return -1; + + offset += digits+1; + line += digits+1; + len -= digits+1; + } + ex = strlen(expect); if (ex > len) return -1; @@ -425,10 +516,8 @@ static int parse_fragment_header(char *line, int len, struct fragment *fragment) return -1; /* Figure out the number of lines in a fragment */ - offset = parse_num(line, len, 4, ",", &fragment->oldpos); - offset = parse_num(line, len, offset, " +", &fragment->oldlines); - offset = parse_num(line, len, offset, ",", &fragment->newpos); - offset = parse_num(line, len, offset, " @@", &fragment->newlines); + offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines); + offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines); return offset; } @@ -475,7 +564,8 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc int git_hdr_len = parse_git_header(line, len, size, patch); if (git_hdr_len < 0) continue; - + if (!patch->old_name && !patch->new_name) + die("git diff header lacks filename information"); *hdrsize = git_hdr_len; return offset; } @@ -552,6 +642,9 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s added++; newlines--; break; + /* We allow "\ No newline at end of file" */ + case '\\': + break; } } patch->lines_added += added; @@ -606,7 +699,7 @@ const char minuses[]= "--------------------------------------------------------- static void show_stats(struct patch *patch) { char *name = patch->old_name; - int len, max, add, del; + int len, max, add, del, total; if (!name) name = patch->new_name; @@ -628,41 +721,102 @@ static void show_stats(struct patch *patch) max = max_change; if (max + len > 70) max = 70 - len; - - add = (patch->lines_added * max + max_change/2) / max_change; - del = (patch->lines_deleted * max + max_change/2) / max_change; + + add = patch->lines_added; + del = patch->lines_deleted; + total = add + del; + + total = (total * max + max_change / 2) / max_change; + add = (add * max + max_change / 2) / max_change; + del = total - add; printf(" %-*s |%5d %.*s%.*s\n", len, name, patch->lines_added + patch->lines_deleted, add, pluses, del, minuses); } -static void apply_patch_list(struct patch *patch) +static int check_patch(struct patch *patch) { - int files, adds, dels; + struct stat st; + const char *old_name = patch->old_name; + const char *new_name = patch->new_name; + + if (old_name) { + int pos = cache_name_pos(old_name, strlen(old_name)); + int changed; + + if (pos < 0) + return error("%s: does not exist in index", old_name); + if (patch->is_new < 0) + patch->is_new = 0; + if (lstat(old_name, &st) < 0) + return error("%s: %s\n", strerror(errno)); + changed = ce_match_stat(active_cache[pos], &st); + if (changed) + return error("%s: does not match index", old_name); + if (!patch->old_mode) + patch->old_mode = st.st_mode; + } + + if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) { + if (cache_name_pos(new_name, strlen(new_name)) >= 0) + return error("%s: already exists in index", new_name); + if (!lstat(new_name, &st)) + return error("%s: already exists in working directory", new_name); + if (errno != ENOENT) + return error("%s: %s", new_name, strerror(errno)); + } + return 0; +} + +static int check_patch_list(struct patch *patch) +{ + int error = 0; + + for (;patch ; patch = patch->next) + error |= check_patch(patch); + return error; +} + +static void show_file(int c, unsigned int mode, const char *name) +{ + printf("%c %o %s\n", c, mode, name); +} - files = adds = dels = 0; - if (!patch) - die("no patch found"); - do { - const char *old_name = patch->old_name; - const char *new_name = patch->new_name; - - if (old_name) { - if (cache_name_pos(old_name, strlen(old_name)) < 0) - die("file %s does not exist", old_name); - if (patch->is_new < 0) - patch->is_new = 0; +static void show_file_list(struct patch *patch) +{ + for (;patch ; patch = patch->next) { + if (patch->is_rename) { + show_file('-', patch->old_mode, patch->old_name); + show_file('+', patch->new_mode, patch->new_name); + continue; + } + if (patch->is_copy || patch->is_new) { + show_file('+', patch->new_mode, patch->new_name); + continue; } - if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) { - if (cache_name_pos(new_name, strlen(new_name)) >= 0) - die("file %s already exists", new_name); + if (patch->is_delete) { + show_file('-', patch->old_mode, patch->old_name); + continue; } + if (patch->old_mode && patch->new_mode && patch->old_mode != patch->new_mode) { + printf("M %o:%o %s\n", patch->old_mode, patch->new_mode, patch->old_name); + continue; + } + printf("M %o %s\n", patch->old_mode, patch->old_name); + } +} + +static void stat_patch_list(struct patch *patch) +{ + int files, adds, dels; + for (files = adds = dels = 0 ; patch ; patch = patch->next) { files++; adds += patch->lines_added; dels += patch->lines_deleted; show_stats(patch); - } while ((patch = patch->next) != NULL); + } + printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels); } @@ -709,7 +863,14 @@ static int apply_patch(int fd) size -= nr; } - apply_patch_list(list); + if ((check || apply) && check_patch_list(list) < 0) + exit(1); + + if (show_files) + show_file_list(list); + + if (diffstat) + stat_patch_list(list); free(buffer); return 0; @@ -736,6 +897,20 @@ int main(int argc, char **argv) merge_patch = 0; continue; } + if (!strcmp(arg, "--stat")) { + apply = 0; + diffstat = 1; + continue; + } + if (!strcmp(arg, "--check")) { + apply = 0; + check = 1; + continue; + } + if (!strcmp(arg, "--show-files")) { + show_files = 1; + continue; + } fd = open(arg, O_RDONLY); if (fd < 0) usage(apply_usage);