2005-04-09 20:00:54 +00:00
|
|
|
#include "cache.h"
|
|
|
|
|
2005-04-10 21:03:58 +00:00
|
|
|
static int recursive = 0;
|
2005-04-15 22:11:57 +00:00
|
|
|
static int line_termination = '\n';
|
2005-04-09 20:00:54 +00:00
|
|
|
|
2005-04-10 22:08:02 +00:00
|
|
|
static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);
|
2005-04-10 21:03:58 +00:00
|
|
|
|
|
|
|
static void update_tree_entry(void **bufp, unsigned long *sizep)
|
2005-04-09 20:00:54 +00:00
|
|
|
{
|
|
|
|
void *buf = *bufp;
|
|
|
|
unsigned long size = *sizep;
|
|
|
|
int len = strlen(buf) + 1 + 20;
|
|
|
|
|
|
|
|
if (size < len)
|
2005-04-13 09:28:48 +00:00
|
|
|
die("corrupt tree file");
|
2005-04-09 20:00:54 +00:00
|
|
|
*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, ' ');
|
|
|
|
|
|
|
|
if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
|
2005-04-13 09:28:48 +00:00
|
|
|
die("corrupt tree file");
|
2005-04-09 20:00:54 +00:00
|
|
|
*pathp = path+1;
|
|
|
|
return sha1;
|
|
|
|
}
|
|
|
|
|
2005-04-11 04:49:26 +00:00
|
|
|
static char *malloc_base(const char *base, const char *path, int pathlen)
|
|
|
|
{
|
|
|
|
int baselen = strlen(base);
|
|
|
|
char *newbase = malloc(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);
|
|
|
|
|
|
|
|
/* 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) {
|
|
|
|
show_file(prefix, tree, size, base);
|
|
|
|
update_tree_entry(&tree, &size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* A file entry went away or appeared */
|
2005-04-10 21:03:58 +00:00
|
|
|
static void show_file(const char *prefix, void *tree, unsigned long size, const char *base)
|
2005-04-09 20:00:54 +00:00
|
|
|
{
|
|
|
|
unsigned mode;
|
|
|
|
const char *path;
|
|
|
|
const unsigned char *sha1 = extract(tree, size, &path, &mode);
|
2005-04-11 04:49:26 +00:00
|
|
|
|
|
|
|
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"))
|
2005-04-13 09:28:48 +00:00
|
|
|
die("corrupt tree sha %s", sha1_to_hex(sha1));
|
2005-04-11 04:49:26 +00:00
|
|
|
|
|
|
|
show_tree(prefix, tree, size, newbase);
|
|
|
|
|
|
|
|
free(tree);
|
|
|
|
free(newbase);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-04-13 09:42:04 +00:00
|
|
|
printf("%s%o\t%s\t%s\t%s%s%c", prefix, mode,
|
|
|
|
S_ISDIR(mode) ? "tree" : "blob",
|
2005-04-15 22:11:57 +00:00
|
|
|
sha1_to_hex(sha1), base, path,
|
|
|
|
line_termination);
|
2005-04-09 20:00:54 +00:00
|
|
|
}
|
|
|
|
|
2005-04-10 22:08:02 +00:00
|
|
|
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
|
2005-04-09 20:00:54 +00:00
|
|
|
{
|
|
|
|
unsigned mode1, mode2;
|
|
|
|
const char *path1, *path2;
|
|
|
|
const unsigned char *sha1, *sha2;
|
2005-04-10 21:03:58 +00:00
|
|
|
int cmp, pathlen1, pathlen2;
|
2005-04-10 22:08:02 +00:00
|
|
|
char old_sha1_hex[50];
|
2005-04-09 20:00:54 +00:00
|
|
|
|
|
|
|
sha1 = extract(tree1, size1, &path1, &mode1);
|
|
|
|
sha2 = extract(tree2, size2, &path2, &mode2);
|
|
|
|
|
2005-04-10 21:03:58 +00:00
|
|
|
pathlen1 = strlen(path1);
|
|
|
|
pathlen2 = strlen(path2);
|
|
|
|
cmp = cache_name_compare(path1, pathlen1, path2, pathlen2);
|
2005-04-09 20:00:54 +00:00
|
|
|
if (cmp < 0) {
|
2005-04-10 22:08:02 +00:00
|
|
|
show_file("-", tree1, size1, base);
|
2005-04-09 20:00:54 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (cmp > 0) {
|
2005-04-10 22:08:02 +00:00
|
|
|
show_file("+", tree2, size2, base);
|
2005-04-09 20:00:54 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
|
|
|
|
return 0;
|
2005-04-11 04:49:26 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the filemode has changed to/from a directory from/to a regular
|
2005-04-12 18:36:26 +00:00
|
|
|
* file, we need to consider it a remove and an add.
|
2005-04-11 04:49:26 +00:00
|
|
|
*/
|
|
|
|
if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
|
|
|
|
show_file("-", tree1, size1, base);
|
|
|
|
show_file("+", tree2, size2, base);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (recursive && S_ISDIR(mode1)) {
|
2005-04-10 22:08:02 +00:00
|
|
|
int retval;
|
2005-04-11 04:49:26 +00:00
|
|
|
char *newbase = malloc_base(base, path1, pathlen1);
|
2005-04-10 22:08:02 +00:00
|
|
|
retval = diff_tree_sha1(sha1, sha2, newbase);
|
|
|
|
free(newbase);
|
|
|
|
return retval;
|
2005-04-10 21:03:58 +00:00
|
|
|
}
|
|
|
|
|
2005-04-10 22:08:02 +00:00
|
|
|
strcpy(old_sha1_hex, sha1_to_hex(sha1));
|
2005-04-13 09:42:04 +00:00
|
|
|
printf("*%o->%o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
|
|
|
|
S_ISDIR(mode1) ? "tree" : "blob",
|
2005-04-15 22:11:57 +00:00
|
|
|
old_sha1_hex, sha1_to_hex(sha2), base, path1,
|
|
|
|
line_termination);
|
2005-04-09 20:00:54 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-10 22:08:02 +00:00
|
|
|
static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
|
2005-04-09 20:00:54 +00:00
|
|
|
{
|
|
|
|
while (size1 | size2) {
|
|
|
|
if (!size1) {
|
2005-04-10 22:08:02 +00:00
|
|
|
show_file("+", tree2, size2, base);
|
2005-04-09 20:00:54 +00:00
|
|
|
update_tree_entry(&tree2, &size2);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!size2) {
|
2005-04-10 22:08:02 +00:00
|
|
|
show_file("-", tree1, size1, base);
|
2005-04-09 20:00:54 +00:00
|
|
|
update_tree_entry(&tree1, &size1);
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-10 22:08:02 +00:00
|
|
|
switch (compare_tree_entry(tree1, size1, tree2, size2, base)) {
|
2005-04-09 20:00:54 +00:00
|
|
|
case -1:
|
|
|
|
update_tree_entry(&tree1, &size1);
|
|
|
|
continue;
|
|
|
|
case 0:
|
|
|
|
update_tree_entry(&tree1, &size1);
|
|
|
|
/* Fallthrough */
|
|
|
|
case 1:
|
|
|
|
update_tree_entry(&tree2, &size2);
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-13 09:28:48 +00:00
|
|
|
die("diff-tree: internal error");
|
2005-04-09 20:00:54 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-10 22:08:02 +00:00
|
|
|
static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base)
|
2005-04-09 20:00:54 +00:00
|
|
|
{
|
|
|
|
void *tree1, *tree2;
|
|
|
|
unsigned long size1, size2;
|
2005-04-10 21:03:58 +00:00
|
|
|
int retval;
|
2005-04-09 20:00:54 +00:00
|
|
|
|
2005-04-21 01:06:50 +00:00
|
|
|
tree1 = read_tree_with_tree_or_commit_sha1(old, &size1, 0);
|
|
|
|
if (!tree1)
|
2005-04-13 09:28:48 +00:00
|
|
|
die("unable to read source tree (%s)", sha1_to_hex(old));
|
2005-04-21 01:06:50 +00:00
|
|
|
tree2 = read_tree_with_tree_or_commit_sha1(new, &size2, 0);
|
|
|
|
if (!tree2)
|
2005-04-13 09:28:48 +00:00
|
|
|
die("unable to read destination tree (%s)", sha1_to_hex(new));
|
2005-04-10 22:08:02 +00:00
|
|
|
retval = diff_tree(tree1, size1, tree2, size2, base);
|
2005-04-10 21:03:58 +00:00
|
|
|
free(tree1);
|
|
|
|
free(tree2);
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2005-04-21 02:49:16 +00:00
|
|
|
static char *diff_tree_usage = "diff-tree [-r] [-z] <tree sha1> <tree sha1>";
|
|
|
|
|
2005-04-10 21:03:58 +00:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
unsigned char old[20], new[20];
|
|
|
|
|
|
|
|
while (argc > 3) {
|
|
|
|
char *arg = argv[1];
|
|
|
|
argv++;
|
|
|
|
argc--;
|
2005-04-11 15:37:17 +00:00
|
|
|
if (!strcmp(arg, "-r")) {
|
2005-04-10 21:03:58 +00:00
|
|
|
recursive = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-15 22:11:57 +00:00
|
|
|
if (!strcmp(arg, "-z")) {
|
|
|
|
line_termination = '\0';
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-21 02:49:16 +00:00
|
|
|
usage(diff_tree_usage);
|
2005-04-10 21:03:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
|
2005-04-21 02:49:16 +00:00
|
|
|
usage(diff_tree_usage);
|
2005-04-10 22:08:02 +00:00
|
|
|
return diff_tree_sha1(old, new, "");
|
2005-04-09 20:00:54 +00:00
|
|
|
}
|