X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=show-diff.c;h=fdd7dd4b0cc8c92a18ddaf0bcf8c9675fcab303b;hb=40469ee9c6a6f4c85df5520ef719bba3d38a64f0;hp=40bc187bdc201c6d5b7df0eb7144d98760b72bdd;hpb=8f3671dcd93b8c5ab21582752f736646c66e2249;p=git.git diff --git a/show-diff.c b/show-diff.c index 40bc187b..fdd7dd4b 100644 --- a/show-diff.c +++ b/show-diff.c @@ -4,85 +4,14 @@ * Copyright (C) Linus Torvalds, 2005 */ #include "cache.h" +#include "diff.h" -static char *diff_cmd = "diff -L '%s' -u -N - '%s'"; +static const char *show_diff_usage = +"show-diff [-p] [-q] [-r] [-z] [paths...]"; -/* Help to copy the thing properly quoted for the shell safety. - * any single quote is replaced with '\'', and the caller is - * expected to enclose the result within a single quote pair. - * - * E.g. - * original sq_expand result - * name ==> name ==> 'name' - * a b ==> a b ==> 'a b' - * a'b ==> a'\''b ==> 'a'\''b' - * - * NOTE! The returned memory belongs to this function so - * do not free it. - */ -static char *sq_expand(char *src) -{ - static char *buf = NULL; - int cnt, c; - char *cp; - - /* count bytes needed to store the quoted string. */ - for (cnt = 1, cp = src; *cp; cnt++, cp++) - if (*cp == '\'') - cnt += 3; - - if (! (buf = malloc(cnt))) - return buf; - cp = buf; - while ((c = *src++)) { - if (c != '\'') - *cp++ = c; - else { - cp = strcpy(cp, "'\\''"); - cp += 4; - } - } - *cp = 0; - return buf; -} - -static void show_differences(char *name, char *label, void *old_contents, - unsigned long long old_size) -{ - FILE *f; - char *name_sq = sq_expand(name); - char *label_sq = (name != label) ? sq_expand(label) : name_sq; - int cmd_size = strlen(name_sq) + strlen(label_sq) + strlen(diff_cmd); - char *cmd = malloc(cmd_size); - - fflush(stdout); - snprintf(cmd, cmd_size, diff_cmd, label_sq, name_sq); - f = popen(cmd, "w"); - if (old_size) - fwrite(old_contents, old_size, 1, f); - pclose(f); - if (label_sq != name_sq) - free(label_sq); - free(name_sq); - free(cmd); -} - -static void show_diff_empty(struct cache_entry *ce) -{ - char *old; - unsigned long int size; - unsigned char type[20]; - - old = read_sha1_file(ce->sha1, type, &size); - if (! old) { - error("unable to read blob object for %s (%s)", ce->name, - sha1_to_hex(ce->sha1)); - return; - } - show_differences("/dev/null", ce->name, old, size); -} - -static const char *show_diff_usage = "show-diff [-q] [-s] [-z] [paths...]"; +static int generate_patch = 0; +static int line_termination = '\n'; +static int silent = 0; static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt) { @@ -99,21 +28,57 @@ static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt) return 0; } +static void show_unmerge(const char *path) +{ + if (generate_patch) + diff_unmerge(path); + else + printf("U %s%c", path, line_termination); +} + +static void show_file(int pfx, struct cache_entry *ce) +{ + if (generate_patch) + diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, + ce->name, NULL); + else + printf("%c%06o\t%s\t%s\t%s%c", + pfx, ntohl(ce->ce_mode), "blob", + sha1_to_hex(ce->sha1), ce->name, line_termination); +} + +static void show_modified(int oldmode, int mode, + const char *old_sha1, const char *sha1, + char *path) +{ + char old_sha1_hex[41]; + strcpy(old_sha1_hex, sha1_to_hex(old_sha1)); + + if (generate_patch) + diff_change(oldmode, mode, old_sha1, sha1, path, NULL); + else + printf("*%06o->%06o\tblob\t%s->%s\t%s%c", + oldmode, mode, old_sha1_hex, sha1_to_hex(sha1), path, + line_termination); +} + int main(int argc, char **argv) { - int silent = 0; - int silent_on_nonexisting_files = 0; - int machine_readable = 0; + static const char null_sha1[20] = { 0, }; int entries = read_cache(); int i; while (1 < argc && argv[1][0] == '-') { - if (!strcmp(argv[1], "-s")) - silent_on_nonexisting_files = silent = 1; + if (!strcmp(argv[1], "-p")) + generate_patch = 1; else if (!strcmp(argv[1], "-q")) - silent_on_nonexisting_files = 1; + silent = 1; + else if (!strcmp(argv[1], "-r")) + ; /* no-op */ + else if (!strcmp(argv[1], "-s")) + ; /* no-op */ else if (!strcmp(argv[1], "-z")) - machine_readable = 1; + line_termination = 0; else usage(show_diff_usage); argv++; argc--; @@ -126,24 +91,19 @@ int main(int argc, char **argv) perror("read_cache"); exit(1); } + for (i = 0; i < entries; i++) { struct stat st; + unsigned int oldmode, mode; struct cache_entry *ce = active_cache[i]; int changed; - unsigned long size; - char type[20]; - void *old; if (1 < argc && ! matches_pathspec(ce, argv+1, argc-1)) continue; if (ce_stage(ce)) { - if (machine_readable) - printf("U %s%c", ce->name, 0); - else - printf("%s: Unmerged\n", - ce->name); + show_unmerge(ce->name); while (i < entries && !strcmp(ce->name, active_cache[i]->name)) i++; @@ -152,36 +112,24 @@ int main(int argc, char **argv) } if (stat(ce->name, &st) < 0) { - if (errno == ENOENT && silent_on_nonexisting_files) + if (errno != ENOENT) { + perror(ce->name); continue; - if (machine_readable) - printf("X %s%c", ce->name, 0); - else { - printf("%s: %s\n", ce->name, strerror(errno)); - if (errno == ENOENT) - show_diff_empty(ce); - } + } + if (silent) + continue; + show_file('-', ce); continue; } changed = cache_match_stat(ce, &st); if (!changed) continue; - if (!machine_readable) - printf("%s: %s\n", ce->name, sha1_to_hex(ce->sha1)); - else { - printf("%s %s%c", sha1_to_hex(ce->sha1), ce->name, 0); - continue; - } - if (silent) - continue; - old = read_sha1_file(ce->sha1, type, &size); - if (! old) - error("unable to read blob object for %s (%s)", - ce->name, sha1_to_hex(ce->sha1)); - else - show_differences(ce->name, ce->name, old, size); - free(old); + oldmode = ntohl(ce->ce_mode); + mode = S_IFREG | ce_permissions(st.st_mode); + + show_modified(oldmode, mode, ce->sha1, null_sha1, + ce->name); } return 0; }