#include "diff.h"
static int silent = 0;
+static int verbose_header = 0;
static int ignore_merges = 1;
static int recursive = 0;
static int read_stdin = 0;
static int line_termination = '\n';
static int generate_patch = 0;
static const char *header = NULL;
+static const char *header_prefix = "";
// What paths are we interested in?
static int nr_paths = 0;
if (pathlen > matchlen)
continue;
+ if (matchlen > pathlen) {
+ if (match[pathlen] != '/')
+ continue;
+ }
+
if (strncmp(path, match, pathlen))
continue;
return retval;
}
-static int diff_tree_stdin(char *line)
+static int get_one_line(const char *msg, unsigned long len)
{
- int len = strlen(line);
- unsigned char commit[20], parent[20];
- unsigned long size, offset;
- static char this_header[100];
- char *buf;
+ int ret = 0;
- if (!len || line[len-1] != '\n')
- return -1;
- line[len-1] = 0;
- if (get_sha1_hex(line, commit))
- return -1;
- if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
- line[40] = 0;
- line[81] = 0;
- sprintf(this_header, "%s (from %s)\n", line, line+41);
- header = this_header;
- return diff_tree_sha1(parent, commit, "");
+ while (len--) {
+ ret++;
+ if (*msg++ == '\n')
+ break;
}
- buf = read_object_with_reference(commit, "commit", &size, NULL);
+ 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[1000];
+ int offset;
+
+ 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;
+ if (offset + linelen + 10 > sizeof(this_header))
+ 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;
+ }
+ this_header[offset++] = '\n';
+ this_header[offset] = 0;
+ }
+
+ return this_header;
+}
+
+static int diff_tree_commit(const unsigned char *commit, const char *name)
+{
+ unsigned long size, offset;
+ char *buf = read_object_with_reference(commit, "commit", &size, NULL);
+
if (!buf)
return -1;
return 0;
}
- line[40] = 0;
+ if (!name) {
+ static char commit_name[60];
+ strcpy(commit_name, sha1_to_hex(commit));
+ name = commit_name;
+ }
+
offset = 46;
while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
+ unsigned char parent[20];
if (get_sha1_hex(buf + offset + 7, parent))
return -1;
- sprintf(this_header, "%s (from %s)\n", line, sha1_to_hex(parent));
- header = this_header;
+ header = generate_header(name, sha1_to_hex(parent), buf, size);
diff_tree_sha1(parent, commit, "");
+ if (!header && verbose_header)
+ header_prefix = "\ndiff-tree ";
offset += 48;
}
- return -1;
+ return 0;
}
-static char *diff_tree_usage = "diff-tree [-p] [-r] [-z] <tree sha1> <tree sha1>";
+static int diff_tree_stdin(char *line)
+{
+ int len = strlen(line);
+ unsigned char commit[20], parent[20];
+ static char this_header[1000];
+
+ if (!len || line[len-1] != '\n')
+ return -1;
+ line[len-1] = 0;
+ if (get_sha1_hex(line, commit))
+ return -1;
+ if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
+ line[40] = 0;
+ line[81] = 0;
+ sprintf(this_header, "%s (from %s)\n", line, line+41);
+ header = this_header;
+ return diff_tree_sha1(parent, commit, "");
+ }
+ line[40] = 0;
+ return diff_tree_commit(commit, line);
+}
+
+static char *diff_tree_usage =
+"diff-tree [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] <tree sha1> <tree sha1>";
int main(int argc, char **argv)
{
+ int nr_sha1;
char line[1000];
- unsigned char old[20], new[20];
+ unsigned char sha1[2][20];
+ nr_sha1 = 0;
for (;;) {
char *arg;
argv++;
argc--;
arg = *argv;
- if (!arg || *arg != '-')
+ if (!arg)
break;
- if (!strcmp(arg, "-")) {
+ if (*arg != '-') {
+ if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
+ nr_sha1++;
+ continue;
+ }
+ break;
+ }
+
+ if (!strcmp(arg, "--")) {
argv++;
argc--;
break;
silent = 1;
continue;
}
+ if (!strcmp(arg, "-v")) {
+ verbose_header = 1;
+ header_prefix = "diff-tree ";
+ continue;
+ }
if (!strcmp(arg, "--stdin")) {
read_stdin = 1;
continue;
usage(diff_tree_usage);
}
- if (!read_stdin) {
- if (argc < 2 || get_sha1(argv[0], old) || get_sha1(argv[1], new))
- usage(diff_tree_usage);
- argv += 2;
- argc -= 2;
- }
-
if (argc > 0) {
int i;
pathlens[i] = strlen(paths[i]);
}
+ switch (nr_sha1) {
+ case 0:
+ if (!read_stdin)
+ usage(diff_tree_usage);
+ break;
+ case 1:
+ diff_tree_commit(sha1[0], NULL);
+ break;
+ case 2:
+ diff_tree_sha1(sha1[0], sha1[1], "");
+ break;
+ }
+
if (!read_stdin)
- return diff_tree_sha1(old, new, "");
+ return 0;
while (fgets(line, sizeof(line), stdin))
diff_tree_stdin(line);
projects / git.git / blobdiff