X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-tree.c;h=20757153500064a7868142d53d4933abfd444f5a;hb=f2ce9fde57513af026e0641073a6781a086251d5;hp=d634cb19e43bed03e6236b7c2e68df219b86cd6d;hpb=befe86392c767b62e4a6498cf951faae6f2c5ea3;p=git.git diff --git a/diff-tree.c b/diff-tree.c index d634cb19..20757153 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -1,6 +1,7 @@ #include #include "cache.h" #include "diff.h" +#include "commit.h" static int show_root_diff = 0; static int verbose_header = 0; @@ -10,12 +11,17 @@ static int show_tree_entry_in_recursive = 0; static int read_stdin = 0; static int diff_output_format = DIFF_FORMAT_HUMAN; static int detect_rename = 0; +static int find_copies_harder = 0; static int diff_setup_opt = 0; static int diff_score_opt = 0; static const char *pickaxe = NULL; static int pickaxe_opts = 0; +static int diff_break_opt = -1; +static const char *orderfile = NULL; +static const char *diff_filter = NULL; static const char *header = NULL; static const char *header_prefix = ""; +static enum cmit_fmt commit_format = CMIT_FMT_RAW; // What paths are we interested in? static int nr_paths = 0; @@ -41,10 +47,12 @@ static const unsigned char *extract(void *tree, unsigned long size, const char * int len = strlen(tree)+1; const unsigned char *sha1 = tree + len; const char *path = strchr(tree, ' '); + unsigned int mode; - if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1) + if (!path || size < len + 20 || sscanf(tree, "%o", &mode) != 1) die("corrupt tree file"); *pathp = path+1; + *modep = DIFF_FILE_CANON_MODE(mode); return sha1; } @@ -109,7 +117,7 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns show_file("+", tree2, size2, base); return 1; } - if (!memcmp(sha1, sha2, 20) && mode1 == mode2) + if (!find_copies_harder && !memcmp(sha1, sha2, 20) && mode1 == mode2) return 0; /* @@ -193,7 +201,7 @@ static int interesting(void *tree, unsigned long size, const char *base) static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base) { while (size) { - if (interesting(tree, size, base)) + if (find_copies_harder || interesting(tree, size, base)) show_file(prefix, tree, size, base); update_tree_entry(&tree, &size); } @@ -261,11 +269,14 @@ static void call_diff_setup(void) static int call_diff_flush(void) { - diffcore_std(0, + diffcore_std(find_copies_harder ? paths : 0, detect_rename, diff_score_opt, - pickaxe, pickaxe_opts); + pickaxe, pickaxe_opts, + diff_break_opt, + orderfile, + diff_filter); if (diff_queue_is_empty()) { - diff_flush(DIFF_FORMAT_NO_OUTPUT, 0); + diff_flush(DIFF_FORMAT_NO_OUTPUT); return 0; } if (header) { @@ -276,7 +287,7 @@ static int call_diff_flush(void) printf(fmt, header, 0); header = NULL; } - diff_flush(diff_output_format, 1); + diff_flush(diff_output_format); return 1; } @@ -307,38 +318,6 @@ static int diff_root_tree(const unsigned char *new, const char *base) return retval; } -static int get_one_line(const char *msg, unsigned long len) -{ - int ret = 0; - - while (len--) { - ret++; - if (*msg++ == '\n') - break; - } - return ret; -} - -static int add_author_info(char *buf, const char *line, int len) -{ - char *date; - unsigned int namelen; - unsigned long time; - int tz; - - line += strlen("author "); - date = strchr(line, '>'); - if (!date) - return 0; - namelen = ++date - line; - time = strtoul(date, &date, 10); - tz = strtol(date, NULL, 10); - - return sprintf(buf, "Author: %.*s\nDate: %s\n", - namelen, line, - show_date(time, tz)); -} - static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len) { static char this_header[16384]; @@ -346,44 +325,9 @@ static char *generate_header(const char *commit, const char *parent, const char offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent); if (verbose_header) { - int hdr = 1; - - for (;;) { - const char *line = msg; - int linelen = get_one_line(msg, len); - - if (!linelen) - break; - - /* - * We want some slop for indentation and a possible - * final "...". Thus the "+ 20". - */ - if (offset + linelen + 20 > sizeof(this_header)) { - memcpy(this_header + offset, " ...\n", 8); - offset += 8; - break; - } - - msg += linelen; - len -= linelen; - if (linelen == 1) - hdr = 0; - if (hdr) { - if (!memcmp(line, "author ", 7)) - offset += add_author_info(this_header + offset, line, linelen); - continue; - } - memset(this_header + offset, ' ', 4); - memcpy(this_header + offset + 4, line, linelen); - offset += linelen + 4; - } - /* Make sure there is an EOLN */ - if (this_header[offset-1] != '\n') - this_header[offset++] = '\n'; - /* Add _another_ EOLN if we are doing diff output */ + offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset); this_header[offset++] = '\n'; - this_header[offset] = 0; + this_header[offset++] = 0; } return this_header; @@ -457,7 +401,20 @@ static int diff_tree_stdin(char *line) } static char *diff_tree_usage = -"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S] [-m] [-s] [-v] [-t] "; +"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S] [-O] [-m] [-s] [-v] [--pretty] [-t] "; + +static enum cmit_fmt get_commit_format(const char *arg) +{ + if (!*arg) + return CMIT_FMT_DEFAULT; + if (!strcmp(arg, "=raw")) + return CMIT_FMT_RAW; + if (!strcmp(arg, "=medium")) + return CMIT_FMT_MEDIUM; + if (!strcmp(arg, "=short")) + return CMIT_FMT_SHORT; + usage(diff_tree_usage); +} int main(int argc, const char **argv) { @@ -509,18 +466,37 @@ int main(int argc, const char **argv) pickaxe = arg + 2; continue; } + if (!strncmp(arg, "-O", 2)) { + orderfile = arg + 2; + continue; + } + if (!strncmp(arg, "--diff-filter=", 14)) { + diff_filter = arg + 14; + continue; + } if (!strcmp(arg, "--pickaxe-all")) { pickaxe_opts = DIFF_PICKAXE_ALL; continue; } if (!strncmp(arg, "-M", 2)) { detect_rename = DIFF_DETECT_RENAME; - diff_score_opt = diff_scoreopt_parse(arg); + if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1) + usage(diff_tree_usage); continue; } if (!strncmp(arg, "-C", 2)) { detect_rename = DIFF_DETECT_COPY; - diff_score_opt = diff_scoreopt_parse(arg); + if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1) + usage(diff_tree_usage); + continue; + } + if (!strncmp(arg, "-B", 2)) { + if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1) + usage(diff_tree_usage); + continue; + } + if (!strcmp(arg, "--find-copies-harder")) { + find_copies_harder = 1; continue; } if (!strcmp(arg, "-z")) { @@ -540,6 +516,12 @@ int main(int argc, const char **argv) header_prefix = "diff-tree "; continue; } + if (!strncmp(arg, "--pretty", 8)) { + verbose_header = 1; + header_prefix = "diff-tree "; + commit_format = get_commit_format(arg+8); + continue; + } if (!strcmp(arg, "--stdin")) { read_stdin = 1; continue; @@ -550,6 +532,8 @@ int main(int argc, const char **argv) } usage(diff_tree_usage); } + if (find_copies_harder && detect_rename != DIFF_DETECT_COPY) + usage(diff_tree_usage); if (argc > 0) { int i;