From 17712991a59824a8d22d5115c0c154d3122fc17b Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 10 Oct 2005 16:31:08 -0700 Subject: Add ".git/config" file parser This is a first cut at a very simple parser for a git config file. The format of the file is a simple ini-file like thing, with simple variable/value pairs. You can (and should) make the variables have a simple single-level scope, ie a valid file looks something like this: # # This is the config file, and # a '#' or ';' character indicates # a comment # ; core variables [core] ; Don't trust file modes filemode = false ; Our diff algorithm [diff] external = "/usr/local/bin/gnu-diff -u" renames = true which parses into three variables: "core.filemode" is associated with the string "false", and "diff.external" gets the appropriate quoted value. Right now we only react to one variable: "core.filemode" is a boolean that decides if we should care about the 0100 (user-execute) bit of the stat information. Even that is just a parsing demonstration - this doesn't actually implement that st_mode compare logic itself. Different programs can react to different config options, although they should always fall back to calling "git_default_config()" on any config option name that they don't recognize. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- diff-tree.c | 1 + 1 file changed, 1 insertion(+) (limited to 'diff-tree.c') diff --git a/diff-tree.c b/diff-tree.c index b2d74eb1d1..2203fa56d0 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -408,6 +408,7 @@ int main(int argc, const char **argv) unsigned char sha1[2][20]; const char *prefix = setup_git_directory(); + git_config(git_default_config); nr_sha1 = 0; diff_setup(&diff_options); -- cgit v1.3 From 4546738b58a0134eef154231b07d60fc174d56e3 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 13 Oct 2005 11:03:18 -0700 Subject: Unlocalized isspace and friends Do our own ctype.h, just to get the sane semantics: we want locale-independence, _and_ we want the right signed behaviour. Plus we only use a very small subset of ctype.h anyway (isspace, isalpha, isdigit and isalnum). Signed-off-by: Junio C Hamano --- Makefile | 3 ++- apply.c | 1 - cache.h | 26 ++++++++++++++++++++++++++ commit-tree.c | 1 - commit.c | 1 - config.c | 1 - convert-objects.c | 1 - ctype.c | 23 +++++++++++++++++++++++ date.c | 1 - diff-tree.c | 1 - ident.c | 1 - mailsplit.c | 1 - pack-objects.c | 1 - patch-id.c | 1 - refs.c | 1 - update-ref.c | 1 - 16 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 ctype.c (limited to 'diff-tree.c') diff --git a/Makefile b/Makefile index e2e87f6beb..9fe65ba2be 100644 --- a/Makefile +++ b/Makefile @@ -159,7 +159,8 @@ LIB_OBJS = \ object.o pack-check.o patch-delta.o path.o pkt-line.o \ quote.o read-cache.o refs.o run-command.o \ server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \ - tag.o tree.o usage.o config.o environment.o $(DIFF_OBJS) + tag.o tree.o usage.o config.o environment.o ctype.o \ + $(DIFF_OBJS) LIBS = $(LIB_FILE) LIBS += -lz diff --git a/apply.c b/apply.c index 155fbe84da..f4d00f2835 100644 --- a/apply.c +++ b/apply.c @@ -6,7 +6,6 @@ * This applies patches on top of some (arbitrary) version of the SCM. * */ -#include #include #include "cache.h" diff --git a/cache.h b/cache.h index 328658235b..f1d15ab3c9 100644 --- a/cache.h +++ b/cache.h @@ -387,4 +387,30 @@ extern int git_config_bool(const char *, const char *); extern char git_default_email[MAX_GITNAME]; extern char git_default_name[MAX_GITNAME]; +/* Sane ctype - no locale, and works with signed chars */ +#undef isspace +#undef isdigit +#undef isalpha +#undef isalnum +#undef tolower +#undef toupper +extern unsigned char sane_ctype[256]; +#define GIT_SPACE 0x01 +#define GIT_DIGIT 0x02 +#define GIT_ALPHA 0x04 +#define sane_istest(x,mask) ((sane_ctype[(unsigned char)(x)] & (mask)) != 0) +#define isspace(x) sane_istest(x,GIT_SPACE) +#define isdigit(x) sane_istest(x,GIT_DIGIT) +#define isalpha(x) sane_istest(x,GIT_ALPHA) +#define isalnum(x) sane_istest(x,GIT_ALPHA | GIT_DIGIT) +#define tolower(x) sane_case((unsigned char)(x), 0x20) +#define toupper(x) sane_case((unsigned char)(x), 0) + +static inline int sane_case(int x, int high) +{ + if (sane_istest(x, GIT_ALPHA)) + x = (x & ~0x20) | high; + return x; +} + #endif /* CACHE_H */ diff --git a/commit-tree.c b/commit-tree.c index 030fb704e5..ea0fdd44e2 100644 --- a/commit-tree.c +++ b/commit-tree.c @@ -7,7 +7,6 @@ #include #include -#include #define BLOCKING (1ul << 14) diff --git a/commit.c b/commit.c index f735f981bb..8f403180e5 100644 --- a/commit.c +++ b/commit.c @@ -1,4 +1,3 @@ -#include #include "tag.h" #include "commit.h" #include "cache.h" diff --git a/config.c b/config.c index 9b7c6f2942..519fecfee4 100644 --- a/config.c +++ b/config.c @@ -1,4 +1,3 @@ -#include #include "cache.h" diff --git a/convert-objects.c b/convert-objects.c index 9ad0c77678..a892013f0f 100644 --- a/convert-objects.c +++ b/convert-objects.c @@ -1,6 +1,5 @@ #define _XOPEN_SOURCE /* glibc2 needs this */ #include -#include #include "cache.h" struct entry { diff --git a/ctype.c b/ctype.c new file mode 100644 index 0000000000..56bdffa636 --- /dev/null +++ b/ctype.c @@ -0,0 +1,23 @@ +/* + * Sane locale-independent, ASCII ctype. + * + * No surprises, and works with signed and unsigned chars. + */ +#include "cache.h" + +#define SS GIT_SPACE +#define AA GIT_ALPHA +#define DD GIT_DIGIT + +unsigned char sane_ctype[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, SS, SS, 0, 0, SS, 0, 0, /* 0-15 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 16-15 */ + SS, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 32-15 */ + DD, DD, DD, DD, DD, DD, DD, DD, DD, DD, 0, 0, 0, 0, 0, 0, /* 48-15 */ + 0, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, /* 64-15 */ + AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, 0, 0, 0, 0, 0, /* 80-15 */ + 0, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, /* 96-15 */ + AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, 0, 0, 0, 0, 0, /* 112-15 */ + /* Nothing in the 128.. range */ +}; + diff --git a/date.c b/date.c index b21cadc4d6..63f5a09197 100644 --- a/date.c +++ b/date.c @@ -4,7 +4,6 @@ * Copyright (C) Linus Torvalds, 2005 */ -#include #include #include "cache.h" diff --git a/diff-tree.c b/diff-tree.c index 2203fa56d0..851722037d 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -1,4 +1,3 @@ -#include #include "cache.h" #include "diff.h" #include "commit.h" diff --git a/ident.c b/ident.c index 7a9f5672eb..1bfbc6ff35 100644 --- a/ident.c +++ b/ident.c @@ -9,7 +9,6 @@ #include #include -#include static char git_default_date[50]; diff --git a/mailsplit.c b/mailsplit.c index 0f8100dcca..189f4ed724 100644 --- a/mailsplit.c +++ b/mailsplit.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include "cache.h" diff --git a/pack-objects.c b/pack-objects.c index 8a1ee746e0..b3e6152033 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -1,4 +1,3 @@ -#include #include "cache.h" #include "object.h" #include "delta.h" diff --git a/patch-id.c b/patch-id.c index 960e7cedf9..edbc4aa3e8 100644 --- a/patch-id.c +++ b/patch-id.c @@ -1,4 +1,3 @@ -#include #include "cache.h" static void flush_current_id(int patchlen, unsigned char *id, SHA_CTX *c) diff --git a/refs.c b/refs.c index 5a8cbd4ef3..42240d2769 100644 --- a/refs.c +++ b/refs.c @@ -2,7 +2,6 @@ #include "cache.h" #include -#include /* We allow "recursive" symbolic refs. Only within reason, though */ #define MAXDEPTH 5 diff --git a/update-ref.c b/update-ref.c index 4a1704c1a5..65dc3d6385 100644 --- a/update-ref.c +++ b/update-ref.c @@ -1,6 +1,5 @@ #include "cache.h" #include "refs.h" -#include static const char git_update_ref_usage[] = "git-update-ref []"; -- cgit v1.3 From ac1b3d1248f36b26c2eab55022b9a54bde36b1ee Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 20 Oct 2005 21:05:05 -0700 Subject: Split up tree diff functions into tree-diff.c library This makes the tree diff functionality independent of the "git-diff-tree" program, by splitting the core functionality up into a library file. This will be needed for when we teach git-rev-list to only follow a specified set of pathnames, rather than the global revision history. Most of it is a fairly straightforward code move, but it also involves some calling convention cleanup, and moving some of the static variables from diff-tree.c into the options structure. The actual tree change callback routines also become paramterized by the diff_options structure, allowing the library functionality to do something else than just show the diff on stdout. Right now the only user of this functionality remains git-diff-tree itself. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- Makefile | 2 +- diff-tree.c | 282 +++--------------------------------------------------------- diff.c | 3 + diff.h | 29 +++++++ tree-diff.c | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 317 insertions(+), 269 deletions(-) create mode 100644 tree-diff.c (limited to 'diff-tree.c') diff --git a/Makefile b/Makefile index 903c57cdaf..7eacf61b3f 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ LIB_H = \ DIFF_OBJS = \ diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \ - diffcore-pickaxe.o diffcore-rename.o + diffcore-pickaxe.o diffcore-rename.o tree-diff.o LIB_OBJS = \ blob.o commit.o connect.o count-delta.o csum-file.o \ diff --git a/diff-tree.c b/diff-tree.c index 851722037d..382011a2a6 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -5,256 +5,13 @@ static int show_root_diff = 0; static int verbose_header = 0; static int ignore_merges = 1; -static int recursive = 0; -static int show_tree_entry_in_recursive = 0; static int read_stdin = 0; -static struct diff_options diff_options; - 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; -static const char **paths = NULL; -static int *pathlens = NULL; - -static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base); - -static void update_tree_entry(void **bufp, unsigned long *sizep) -{ - void *buf = *bufp; - unsigned long size = *sizep; - int len = strlen(buf) + 1 + 20; - - if (size < len) - die("corrupt tree file"); - *bufp = buf + len; - *sizep = size - len; -} - -static const unsigned char *extract(void *tree, unsigned long size, const char **pathp, unsigned int *modep) -{ - 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", &mode) != 1) - die("corrupt tree file"); - *pathp = path+1; - *modep = DIFF_FILE_CANON_MODE(mode); - return sha1; -} - -static char *malloc_base(const char *base, const char *path, int pathlen) -{ - int baselen = strlen(base); - char *newbase = xmalloc(baselen + pathlen + 2); - memcpy(newbase, base, baselen); - memcpy(newbase + baselen, path, pathlen); - memcpy(newbase + baselen + pathlen, "/", 2); - return newbase; -} - -static void show_file(const char *prefix, void *tree, unsigned long size, const char *base); -static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base); - -/* A file entry went away or appeared */ -static void show_file(const char *prefix, void *tree, unsigned long size, const char *base) -{ - unsigned mode; - const char *path; - const unsigned char *sha1 = extract(tree, size, &path, &mode); - - if (recursive && S_ISDIR(mode)) { - char type[20]; - unsigned long size; - char *newbase = malloc_base(base, path, strlen(path)); - void *tree; - - tree = read_sha1_file(sha1, type, &size); - if (!tree || strcmp(type, "tree")) - die("corrupt tree sha %s", sha1_to_hex(sha1)); - - show_tree(prefix, tree, size, newbase); - - free(tree); - free(newbase); - return; - } - - diff_addremove(&diff_options, prefix[0], mode, sha1, base, path); -} - -static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base) -{ - unsigned mode1, mode2; - const char *path1, *path2; - const unsigned char *sha1, *sha2; - int cmp, pathlen1, pathlen2; - - sha1 = extract(tree1, size1, &path1, &mode1); - sha2 = extract(tree2, size2, &path2, &mode2); - - pathlen1 = strlen(path1); - pathlen2 = strlen(path2); - cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2); - if (cmp < 0) { - show_file("-", tree1, size1, base); - return -1; - } - if (cmp > 0) { - show_file("+", tree2, size2, base); - return 1; - } - if (!diff_options.find_copies_harder && - !memcmp(sha1, sha2, 20) && mode1 == mode2) - return 0; - - /* - * If the filemode has changed to/from a directory from/to a regular - * file, we need to consider it a remove and an add. - */ - if (S_ISDIR(mode1) != S_ISDIR(mode2)) { - show_file("-", tree1, size1, base); - show_file("+", tree2, size2, base); - return 0; - } - - if (recursive && S_ISDIR(mode1)) { - int retval; - char *newbase = malloc_base(base, path1, pathlen1); - if (show_tree_entry_in_recursive) - diff_change(&diff_options, mode1, mode2, - sha1, sha2, base, path1); - retval = diff_tree_sha1(sha1, sha2, newbase); - free(newbase); - return retval; - } - - diff_change(&diff_options, mode1, mode2, sha1, sha2, base, path1); - return 0; -} - -static int interesting(void *tree, unsigned long size, const char *base) -{ - const char *path; - unsigned mode; - int i; - int baselen, pathlen; - - if (!nr_paths) - return 1; - - (void)extract(tree, size, &path, &mode); - - pathlen = strlen(path); - baselen = strlen(base); - - for (i=0; i < nr_paths; i++) { - const char *match = paths[i]; - int matchlen = pathlens[i]; - - if (baselen >= matchlen) { - /* If it doesn't match, move along... */ - if (strncmp(base, match, matchlen)) - continue; - - /* The base is a subdirectory of a path which was specified. */ - return 1; - } - - /* Does the base match? */ - if (strncmp(base, match, baselen)) - continue; - - match += baselen; - matchlen -= baselen; - - if (pathlen > matchlen) - continue; - - if (matchlen > pathlen) { - if (match[pathlen] != '/') - continue; - if (!S_ISDIR(mode)) - continue; - } - - if (strncmp(path, match, pathlen)) - continue; - - return 1; - } - return 0; /* No matches */ -} - -/* A whole sub-tree went away or appeared */ -static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base) -{ - while (size) { - if (interesting(tree, size, base)) - show_file(prefix, tree, size, base); - update_tree_entry(&tree, &size); - } -} - -static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base) -{ - while (size1 | size2) { - if (nr_paths && size1 && !interesting(tree1, size1, base)) { - update_tree_entry(&tree1, &size1); - continue; - } - if (nr_paths && size2 && !interesting(tree2, size2, base)) { - update_tree_entry(&tree2, &size2); - continue; - } - if (!size1) { - show_file("+", tree2, size2, base); - update_tree_entry(&tree2, &size2); - continue; - } - if (!size2) { - show_file("-", tree1, size1, base); - update_tree_entry(&tree1, &size1); - continue; - } - switch (compare_tree_entry(tree1, size1, tree2, size2, base)) { - case -1: - update_tree_entry(&tree1, &size1); - continue; - case 0: - update_tree_entry(&tree1, &size1); - /* Fallthrough */ - case 1: - update_tree_entry(&tree2, &size2); - continue; - } - die("git-diff-tree: internal error"); - } - return 0; -} - -static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base) -{ - void *tree1, *tree2; - unsigned long size1, size2; - int retval; - - tree1 = read_object_with_reference(old, "tree", &size1, NULL); - if (!tree1) - die("unable to read source tree (%s)", sha1_to_hex(old)); - tree2 = read_object_with_reference(new, "tree", &size2, NULL); - if (!tree2) - die("unable to read destination tree (%s)", sha1_to_hex(new)); - retval = diff_tree(tree1, size1, tree2, size2, base); - free(tree1); - free(tree2); - return retval; -} +static struct diff_options diff_options; static void call_diff_setup_done(void) { @@ -285,7 +42,7 @@ static int diff_tree_sha1_top(const unsigned char *old, int ret; call_diff_setup_done(); - ret = diff_tree_sha1(old, new, base); + ret = diff_tree_sha1(old, new, base, &diff_options); call_diff_flush(); return ret; } @@ -294,13 +51,17 @@ static int diff_root_tree(const unsigned char *new, const char *base) { int retval; void *tree; - unsigned long size; + struct tree_desc empty, real; call_diff_setup_done(); - tree = read_object_with_reference(new, "tree", &size, NULL); + tree = read_object_with_reference(new, "tree", &real.size, NULL); if (!tree) die("unable to read root tree (%s)", sha1_to_hex(new)); - retval = diff_tree("", 0, tree, size, base); + real.buf = tree; + + empty.buf = ""; + empty.size = 0; + retval = diff_tree(&empty, &real, base, &diff_options); free(tree); call_diff_flush(); return retval; @@ -387,14 +148,6 @@ static int diff_tree_stdin(char *line) return diff_tree_commit(commit, line); } -static int count_paths(const char **paths) -{ - int i = 0; - while (*paths++) - i++; - return i; -} - static const char diff_tree_usage[] = "git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] " "[] " @@ -445,11 +198,12 @@ int main(int argc, const char **argv) break; } if (!strcmp(arg, "-r")) { - recursive = 1; + diff_options.recursive = 1; continue; } if (!strcmp(arg, "-t")) { - recursive = show_tree_entry_in_recursive = 1; + diff_options.recursive = 1; + diff_options.tree_in_recursive = 1; continue; } if (!strcmp(arg, "-m")) { @@ -478,17 +232,9 @@ int main(int argc, const char **argv) usage(diff_tree_usage); } if (diff_options.output_format == DIFF_FORMAT_PATCH) - recursive = 1; + diff_options.recursive = 1; - paths = get_pathspec(prefix, argv); - if (paths) { - int i; - - nr_paths = count_paths(paths); - pathlens = xmalloc(nr_paths * sizeof(int)); - for (i=0; iline_termination = '\n'; options->break_opt = -1; options->rename_limit = -1; + + options->change = diff_change; + options->add_remove = diff_addremove; } int diff_setup_done(struct diff_options *options) diff --git a/diff.h b/diff.h index 2f4a7b463b..51155479a4 100644 --- a/diff.h +++ b/diff.h @@ -8,11 +8,31 @@ (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \ S_ISLNK(mode) ? S_IFLNK : S_IFDIR) +struct tree_desc { + void *buf; + unsigned long size; +}; + +struct diff_options; + +typedef void (*change_fn_t)(struct diff_options *options, + unsigned old_mode, unsigned new_mode, + const unsigned char *old_sha1, + const unsigned char *new_sha1, + const char *base, const char *path); + +typedef void (*add_remove_fn_t)(struct diff_options *options, + int addremove, unsigned mode, + const unsigned char *sha1, + const char *base, const char *path); + struct diff_options { const char **paths; const char *filter; const char *orderfile; const char *pickaxe; + unsigned recursive:1, + tree_in_recursive:1; int break_opt; int detect_rename; int find_copies_harder; @@ -23,8 +43,17 @@ struct diff_options { int reverse_diff; int rename_limit; int setup; + + change_fn_t change; + add_remove_fn_t add_remove; }; +extern void diff_tree_setup_paths(const char **paths); +extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, + const char *base, struct diff_options *opt); +extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, + const char *base, struct diff_options *opt); + extern void diff_addremove(struct diff_options *, int addremove, unsigned mode, diff --git a/tree-diff.c b/tree-diff.c new file mode 100644 index 0000000000..0ef06a9e36 --- /dev/null +++ b/tree-diff.c @@ -0,0 +1,270 @@ +/* + * Helper functions for tree diff generation + */ +#include "cache.h" +#include "diff.h" + +// What paths are we interested in? +static int nr_paths = 0; +static const char **paths = NULL; +static int *pathlens = NULL; + +static void update_tree_entry(struct tree_desc *desc) +{ + void *buf = desc->buf; + unsigned long size = desc->size; + int len = strlen(buf) + 1 + 20; + + if (size < len) + die("corrupt tree file"); + desc->buf = buf + len; + desc->size = size - len; +} + +static const unsigned char *extract(struct tree_desc *desc, const char **pathp, unsigned int *modep) +{ + void *tree = desc->buf; + unsigned long size = desc->size; + 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", &mode) != 1) + die("corrupt tree file"); + *pathp = path+1; + *modep = DIFF_FILE_CANON_MODE(mode); + return sha1; +} + +static char *malloc_base(const char *base, const char *path, int pathlen) +{ + int baselen = strlen(base); + char *newbase = xmalloc(baselen + pathlen + 2); + memcpy(newbase, base, baselen); + memcpy(newbase + baselen, path, pathlen); + memcpy(newbase + baselen + pathlen, "/", 2); + return newbase; +} + +static int show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base); + +static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt) +{ + unsigned mode1, mode2; + const char *path1, *path2; + const unsigned char *sha1, *sha2; + int cmp, pathlen1, pathlen2; + + sha1 = extract(t1, &path1, &mode1); + sha2 = extract(t2, &path2, &mode2); + + pathlen1 = strlen(path1); + pathlen2 = strlen(path2); + cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2); + if (cmp < 0) { + show_entry(opt, "-", t1, base); + return -1; + } + if (cmp > 0) { + show_entry(opt, "+", t2, base); + return 1; + } + if (!opt->find_copies_harder && + !memcmp(sha1, sha2, 20) && mode1 == mode2) + return 0; + + /* + * If the filemode has changed to/from a directory from/to a regular + * file, we need to consider it a remove and an add. + */ + if (S_ISDIR(mode1) != S_ISDIR(mode2)) { + show_entry(opt, "-", t1, base); + show_entry(opt, "+", t2, base); + return 0; + } + + if (opt->recursive && S_ISDIR(mode1)) { + int retval; + char *newbase = malloc_base(base, path1, pathlen1); + if (opt->tree_in_recursive) + opt->change(opt, mode1, mode2, + sha1, sha2, base, path1); + retval = diff_tree_sha1(sha1, sha2, newbase, opt); + free(newbase); + return retval; + } + + opt->change(opt, mode1, mode2, sha1, sha2, base, path1); + return 0; +} + +static int interesting(struct tree_desc *desc, const char *base) +{ + const char *path; + unsigned mode; + int i; + int baselen, pathlen; + + if (!nr_paths) + return 1; + + (void)extract(desc, &path, &mode); + + pathlen = strlen(path); + baselen = strlen(base); + + for (i=0; i < nr_paths; i++) { + const char *match = paths[i]; + int matchlen = pathlens[i]; + + if (baselen >= matchlen) { + /* If it doesn't match, move along... */ + if (strncmp(base, match, matchlen)) + continue; + + /* The base is a subdirectory of a path which was specified. */ + return 1; + } + + /* Does the base match? */ + if (strncmp(base, match, baselen)) + continue; + + match += baselen; + matchlen -= baselen; + + if (pathlen > matchlen) + continue; + + if (matchlen > pathlen) { + if (match[pathlen] != '/') + continue; + if (!S_ISDIR(mode)) + continue; + } + + if (strncmp(path, match, pathlen)) + continue; + + return 1; + } + return 0; /* No matches */ +} + +/* A whole sub-tree went away or appeared */ +static void show_tree(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base) +{ + while (desc->size) { + if (interesting(desc, base)) + show_entry(opt, prefix, desc, base); + update_tree_entry(desc); + } +} + +/* A file entry went away or appeared */ +static int show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base) +{ + unsigned mode; + const char *path; + const unsigned char *sha1 = extract(desc, &path, &mode); + + if (opt->recursive && S_ISDIR(mode)) { + char type[20]; + char *newbase = malloc_base(base, path, strlen(path)); + struct tree_desc inner; + void *tree; + + tree = read_sha1_file(sha1, type, &inner.size); + if (!tree || strcmp(type, "tree")) + die("corrupt tree sha %s", sha1_to_hex(sha1)); + + inner.buf = tree; + show_tree(opt, prefix, &inner, newbase); + + free(tree); + free(newbase); + return 0; + } + + opt->add_remove(opt, prefix[0], mode, sha1, base, path); + return 0; +} + +int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt) +{ + while (t1->size | t2->size) { + if (nr_paths && t1->size && !interesting(t1, base)) { + update_tree_entry(t1); + continue; + } + if (nr_paths && t2->size && !interesting(t2, base)) { + update_tree_entry(t2); + continue; + } + if (!t1->size) { + show_entry(opt, "+", t2, base); + update_tree_entry(t2); + continue; + } + if (!t2->size) { + show_entry(opt, "-", t1, base); + update_tree_entry(t1); + continue; + } + switch (compare_tree_entry(t1, t2, base, opt)) { + case -1: + update_tree_entry(t1); + continue; + case 0: + update_tree_entry(t1); + /* Fallthrough */ + case 1: + update_tree_entry(t2); + continue; + } + die("git-diff-tree: internal error"); + } + return 0; +} + +int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base, struct diff_options *opt) +{ + void *tree1, *tree2; + struct tree_desc t1, t2; + int retval; + + tree1 = read_object_with_reference(old, "tree", &t1.size, NULL); + if (!tree1) + die("unable to read source tree (%s)", sha1_to_hex(old)); + tree2 = read_object_with_reference(new, "tree", &t2.size, NULL); + if (!tree2) + die("unable to read destination tree (%s)", sha1_to_hex(new)); + t1.buf = tree1; + t2.buf = tree2; + retval = diff_tree(&t1, &t2, base, opt); + free(tree1); + free(tree2); + return retval; +} + +static int count_paths(const char **paths) +{ + int i = 0; + while (*paths++) + i++; + return i; +} + +void diff_tree_setup_paths(const char **p) +{ + if (p) { + int i; + + paths = p; + nr_paths = count_paths(paths); + pathlens = xmalloc(nr_paths * sizeof(int)); + for (i=0; i Date: Fri, 28 Oct 2005 13:04:49 -0400 Subject: Documentation changes to recursive option for git-diff-tree Update docs and usages regarding '-r' recursive option for git-diff-tree. Remove '-r' from common diff options, mention it only for git-diff-tree. Remove one extraneous use of '-r' with git-diff-files in get-merge.sh. Sync the synopsis and usage string for git-diff-tree. Signed-off-by: Chris Shoemaker Signed-off-by: Junio C Hamano --- Documentation/git-diff-tree.txt | 5 ++++- diff-tree.c | 6 ++++-- diff.h | 1 - git-merge.sh | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) (limited to 'diff-tree.c') diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index dcfb9e18c7..f57c8d0d81 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -8,7 +8,7 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object SYNOPSIS -------- -'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [] [] [...] +'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r] [--root] [] [] [...] DESCRIPTION ----------- @@ -33,6 +33,9 @@ include::diff-options.txt[] Note that this parameter does not provide any wildcard or regexp features. +-r:: + recurse into sub-trees + -t:: show tree entry itself as well as subtrees. Implies -r. diff --git a/diff-tree.c b/diff-tree.c index 382011a2a6..ed323d877c 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -149,8 +149,10 @@ static int diff_tree_stdin(char *line) } static const char diff_tree_usage[] = -"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] " -"[] " +"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r] [--root] " +"[] [] [...]\n" +" -r diff recursively\n" +" --root include the initial commit as diff against /dev/null\n" COMMON_DIFF_OPTIONS_HELP; int main(int argc, const char **argv) diff --git a/diff.h b/diff.h index 51155479a4..12590791cb 100644 --- a/diff.h +++ b/diff.h @@ -91,7 +91,6 @@ extern void diffcore_std_no_resolve(struct diff_options *); #define COMMON_DIFF_OPTIONS_HELP \ "\ncommon diff options:\n" \ -" -r diff recursively (only meaningful in diff-tree)\n" \ " -z output diff-raw with lines terminated with NUL.\n" \ " -p output patch format.\n" \ " -u synonym for -p.\n" \ diff --git a/git-merge.sh b/git-merge.sh index 3457a96cfd..6ad96ebfbb 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -25,7 +25,7 @@ dropsave() { savestate() { # Stash away any local modifications. - git-diff-index -r -z --name-only $head | + git-diff-index -z --name-only $head | cpio -0 -o >"$GIT_DIR/MERGE_SAVE" } -- cgit v1.3