X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.c;h=74004e5a3f9fa491b30ab3d5f231826593e4eae4;hb=cb6c8ed2fea4515ee876c40a2bbd5541e24fc12b;hp=95488cdd9f026f897c688428f7090aa59d099bad;hpb=74c7cfa875448c71a18d21a0cc7c973afe759fa5;p=git.git diff --git a/diff.c b/diff.c index 95488cdd..74004e5a 100644 --- a/diff.c +++ b/diff.c @@ -4,14 +4,15 @@ #include #include #include +#include #include "cache.h" #include "diff.h" -static char *diff_opts = "-pu"; +static const char *diff_opts = "-pu"; static const char *external_diff(void) { - static char *external_diff_cmd = NULL; + static const char *external_diff_cmd = NULL; static int done_preparing = 0; if (done_preparing) @@ -25,11 +26,11 @@ static const char *external_diff(void) * * GIT_DIFF_OPTS="-c"; */ - if (getenv("GIT_EXTERNAL_DIFF")) - external_diff_cmd = getenv("GIT_EXTERNAL_DIFF"); + if (gitenv("GIT_EXTERNAL_DIFF")) + external_diff_cmd = gitenv("GIT_EXTERNAL_DIFF"); /* In case external diff fails... */ - diff_opts = getenv("GIT_DIFF_OPTS") ? : diff_opts; + diff_opts = gitenv("GIT_DIFF_OPTS") ? : diff_opts; done_preparing = 1; return external_diff_cmd; @@ -78,7 +79,8 @@ static struct diff_tempfile { char tmp_path[50]; } diff_temp[2]; -static void builtin_diff(const char *name, +static void builtin_diff(const char *name_a, + const char *name_b, struct diff_tempfile *temp) { int i, next_at; @@ -87,9 +89,12 @@ static void builtin_diff(const char *name, const char *input_name_sq[2]; const char *path0[2]; const char *path1[2]; - const char *name_sq = sq_expand(name); + const char *name_sq[2]; char *cmd; - + + name_sq[0] = sq_expand(name_a); + name_sq[1] = sq_expand(name_b); + /* diff_cmd and diff_arg have 6 %s in total which makes * the sum of these strings 12 bytes larger than required. * we use 2 spaces around diff-opts, and we need to count @@ -104,7 +109,7 @@ static void builtin_diff(const char *name, path1[i] = ""; } else { path0[i] = i ? "b/" : "a/"; - path1[i] = name_sq; + path1[i] = name_sq[i]; } cmd_size += (strlen(path0[i]) + strlen(path1[i]) + strlen(input_name_sq[i])); @@ -121,18 +126,24 @@ static void builtin_diff(const char *name, next_at += snprintf(cmd+next_at, cmd_size-next_at, diff_arg, input_name_sq[0], input_name_sq[1]); + printf("diff --git a/%s b/%s\n", name_a, name_b); if (!path1[0][0]) - printf("Created: %s (mode:%s)\n", name, temp[1].mode); + printf("new file mode %s\n", temp[1].mode); else if (!path1[1][0]) - printf("Deleted: %s\n", name); - else if (strcmp(temp[0].mode, temp[1].mode)) { - printf("Mode changed: %s (%s->%s)\n", name, - temp[0].mode, temp[1].mode); - /* Be careful. We do not want to diff between - * symlink and a file. - */ - if (strncmp(temp[0].mode, "120", 3) != - strncmp(temp[1].mode, "120", 3)) + printf("deleted file mode %s\n", temp[0].mode); + else { + if (strcmp(temp[0].mode, temp[1].mode)) { + printf("old mode %s\n", temp[0].mode); + printf("new mode %s\n", temp[1].mode); + } + if (strcmp(name_a, name_b)) { + printf("rename old %s\n", name_a); + printf("rename new %s\n", name_b); + } + if (strncmp(temp[0].mode, temp[1].mode, 3)) + /* we do not run diff between different kind + * of objects. + */ exit(0); } fflush(NULL); @@ -154,7 +165,7 @@ static int work_tree_matches(const char *name, const unsigned char *sha1) * benchmark with my previous version that always reads cache * shows that it makes things worse for diff-tree comparing * two linux-2.6 kernel trees in an already checked out work - * tree. This is because most diff-tree comparison deals with + * tree. This is because most diff-tree comparisons deal with * only a small number of files, while reading the cache is * expensive for a large project, and its cost outweighs the * savings we get by not inflating the object to a temporary @@ -172,7 +183,7 @@ static int work_tree_matches(const char *name, const unsigned char *sha1) ce = active_cache[pos]; if ((lstat(name, &st) < 0) || !S_ISREG(st.st_mode) || - cache_match_stat(ce, &st) || + ce_match_stat(ce, &st) || memcmp(sha1, ce->sha1, 20)) return 0; return 1; @@ -291,6 +302,7 @@ static void remove_tempfile_on_signal(int signo) * */ void run_external_diff(const char *name, + const char *other, struct diff_spec *one, struct diff_spec *two) { @@ -301,7 +313,7 @@ void run_external_diff(const char *name, if (one && two) { prepare_temp_file(name, &temp[0], one); - prepare_temp_file(name, &temp[1], two); + prepare_temp_file(other ? : name, &temp[1], two); if (! atexit_asked && (temp[0].name == temp[0].tmp_path || temp[1].name == temp[1].tmp_path)) { @@ -317,7 +329,8 @@ void run_external_diff(const char *name, die("unable to fork"); if (!pid) { const char *pgm = external_diff(); - if (pgm) { + /* not passing rename patch to external ones */ + if (!other && pgm) { if (one && two) execlp(pgm, pgm, name, @@ -331,7 +344,7 @@ void run_external_diff(const char *name, * otherwise we use the built-in one. */ if (one && two) - builtin_diff(name, temp); + builtin_diff(name, other ? : name, temp); else printf("* Unmerged path %s\n", name); exit(0); @@ -376,7 +389,7 @@ void diff_addremove(int addremove, unsigned mode, strcpy(concatpath, base); strcat(concatpath, path); } - run_external_diff(path ? concatpath : base, one, two); + run_external_diff(path ? concatpath : base, NULL, one, two); } void diff_change(unsigned old_mode, unsigned new_mode, @@ -397,10 +410,10 @@ void diff_change(unsigned old_mode, unsigned new_mode, strcpy(concatpath, base); strcat(concatpath, path); } - run_external_diff(path ? concatpath : base, &spec[0], &spec[1]); + run_external_diff(path ? concatpath : base, NULL, &spec[0], &spec[1]); } void diff_unmerge(const char *path) { - run_external_diff(path, NULL, NULL); + run_external_diff(path, NULL, NULL, NULL); }