X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=3c8838582fbe516ef028dc5564d0e39287f0f4ea;hb=a8db165ee90c7a460916c3efbf97750dd019872c;hp=c66c78708e81617c3bce19750e07bff9d692e5c9;hpb=367cec1c024c3849cb32eaac15884a4adfefe1de;p=git.git diff --git a/diff-tree.c b/diff-tree.c index c66c7870..3c883858 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; @@ -14,8 +15,11 @@ 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 *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 +45,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; } @@ -261,10 +267,11 @@ static void call_diff_setup(void) static int call_diff_flush(void) { - if (detect_rename) - diffcore_rename(detect_rename, diff_score_opt); - if (pickaxe) - diffcore_pickaxe(pickaxe, pickaxe_opts); + diffcore_std(0, + detect_rename, diff_score_opt, + pickaxe, pickaxe_opts, + diff_break_opt, + orderfile); if (diff_queue_is_empty()) { diff_flush(DIFF_FORMAT_NO_OUTPUT, 0); return 0; @@ -308,38 +315,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]; @@ -347,44 +322,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; @@ -458,7 +398,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) { @@ -510,18 +463,29 @@ int main(int argc, const char **argv) pickaxe = arg + 2; continue; } + if (!strncmp(arg, "-O", 2)) { + orderfile = arg + 2; + 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, "-z")) { @@ -541,6 +505,11 @@ int main(int argc, const char **argv) header_prefix = "diff-tree "; continue; } + if (!strncmp(arg, "--pretty", 8)) { + verbose_header = 1; + commit_format = get_commit_format(arg+8); + continue; + } if (!strcmp(arg, "--stdin")) { read_stdin = 1; continue; @@ -578,6 +547,9 @@ int main(int argc, const char **argv) if (!read_stdin) return 0; + if (detect_rename) + diff_setup_opt |= (DIFF_SETUP_USE_SIZE_CACHE | + DIFF_SETUP_USE_CACHE); while (fgets(line, sizeof(line), stdin)) diff_tree_stdin(line);