#include "cache.h"
+#include "diff.h"
static int recursive = 0;
+static int line_termination = '\n';
+static int generate_patch = 0;
+
+// What paths are we interested in?
+static int nr_paths = 0;
+static char **paths = NULL;
+static int *pathlens = NULL;
static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);
int len = strlen(buf) + 1 + 20;
if (size < len)
- usage("corrupt tree file");
+ die("corrupt tree file");
*bufp = buf + len;
*sizep = size - len;
}
const char *path = strchr(tree, ' ');
if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
- usage("corrupt tree file");
+ die("corrupt tree file");
*pathp = path+1;
return sha1;
}
static char *malloc_base(const char *base, const char *path, int pathlen)
{
int baselen = strlen(base);
- char *newbase = malloc(baselen + pathlen + 2);
+ char *newbase = xmalloc(baselen + pathlen + 2);
memcpy(newbase, base, baselen);
memcpy(newbase + baselen, path, pathlen);
memcpy(newbase + baselen + pathlen, "/", 2);
tree = read_sha1_file(sha1, type, &size);
if (!tree || strcmp(type, "tree"))
- usage("corrupt tree sha %s", sha1_to_hex(sha1));
+ die("corrupt tree sha %s", sha1_to_hex(sha1));
show_tree(prefix, tree, size, newbase);
return;
}
- printf("%s%o %s %s%s%c", prefix, mode, sha1_to_hex(sha1), base, path, 0);
+ if (generate_patch) {
+ if (!S_ISDIR(mode))
+ diff_addremove(prefix[0], mode, sha1, base, path);
+ }
+ else
+ printf("%s%06o\t%s\t%s\t%s%s%c", prefix, mode,
+ S_ISDIR(mode) ? "tree" : "blob",
+ sha1_to_hex(sha1), base, path,
+ line_termination);
}
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
/*
* If the filemode has changed to/from a directory from/to a regular
- * file, we need to consider it a remove and an add.
+ * file, we need to consider it a remove and an add.
*/
if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
show_file("-", tree1, size1, base);
return retval;
}
- strcpy(old_sha1_hex, sha1_to_hex(sha1));
- printf("*%o->%o %s->%s %s%s%c", mode1, mode2, old_sha1_hex, sha1_to_hex(sha2), base, path1, 0);
+ if (generate_patch) {
+ if (!S_ISDIR(mode1))
+ diff_change(mode1, mode2, sha1, sha2, base, path1);
+ }
+ else {
+ strcpy(old_sha1_hex, sha1_to_hex(sha1));
+ printf("*%06o->%06o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
+ S_ISDIR(mode1) ? "tree" : "blob",
+ old_sha1_hex, sha1_to_hex(sha2), base, path1,
+ line_termination);
+ }
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 (strncmp(path, match, pathlen))
+ continue;
+
+ return 1;
+ }
+ return 0; /* No matches */
+}
+
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);
update_tree_entry(&tree2, &size2);
continue;
}
- usage("diff-tree: internal error");
+ die("diff-tree: internal error");
}
return 0;
}
{
void *tree1, *tree2;
unsigned long size1, size2;
- char type[20];
int retval;
- tree1 = read_sha1_file(old, type, &size1);
- if (!tree1 || strcmp(type, "tree"))
- usage("unable to read source tree");
- tree2 = read_sha1_file(new, type, &size2);
- if (!tree2 || strcmp(type, "tree"))
- usage("unable to read destination tree");
+ tree1 = read_object_with_reference(old, "tree", &size1, 0);
+ if (!tree1)
+ die("unable to read source tree (%s)", sha1_to_hex(old));
+ tree2 = read_object_with_reference(new, "tree", &size2, 0);
+ 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 char *diff_tree_usage = "diff-tree [-r] [-z] <tree sha1> <tree sha1>";
+
int main(int argc, char **argv)
{
unsigned char old[20], new[20];
- while (argc > 3) {
+ for (;;) {
char *arg = argv[1];
+
+ if (!arg || *arg != '-')
+ break;
+
argv++;
argc--;
if (!strcmp(arg, "-r")) {
recursive = 1;
continue;
}
- usage("diff-tree [-R] <tree sha1> <tree sha1>");
+ if (!strcmp(arg, "-p")) {
+ recursive = generate_patch = 1;
+ continue;
+ }
+ if (!strcmp(arg, "-z")) {
+ line_termination = '\0';
+ continue;
+ }
+ usage(diff_tree_usage);
+ }
+
+ if (argc < 3 || get_sha1(argv[1], old) || get_sha1(argv[2], new))
+ usage(diff_tree_usage);
+
+ if (argc > 3) {
+ int i;
+
+ paths = &argv[3];
+ nr_paths = argc - 3;
+ pathlens = xmalloc(nr_paths * sizeof(int));
+ for (i=0; i<nr_paths; i++)
+ pathlens[i] = strlen(paths[i]);
}
- if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
- usage("diff-tree <tree sha1> <tree sha1>");
return diff_tree_sha1(old, new, "");
}