1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 06:54:55 +01:00

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
  test-dump-cache-tree: validate the cached data as well.
  cache_tree_update: give an option to update cache-tree only.
This commit is contained in:
Junio C Hamano 2006-04-27 16:25:32 -07:00
commit fbc0f28a8d
4 changed files with 62 additions and 18 deletions

View file

@ -226,7 +226,8 @@ static int update_one(struct cache_tree *it,
int entries, int entries,
const char *base, const char *base,
int baselen, int baselen,
int missing_ok) int missing_ok,
int dryrun)
{ {
unsigned long size, offset; unsigned long size, offset;
char *buffer; char *buffer;
@ -273,7 +274,8 @@ static int update_one(struct cache_tree *it,
cache + i, entries - i, cache + i, entries - i,
path, path,
baselen + sublen + 1, baselen + sublen + 1,
missing_ok); missing_ok,
dryrun);
i += subcnt - 1; i += subcnt - 1;
sub->used = 1; sub->used = 1;
} }
@ -338,7 +340,14 @@ static int update_one(struct cache_tree *it,
#endif #endif
} }
write_sha1_file(buffer, offset, tree_type, it->sha1); if (dryrun) {
char hdr[200];
int hdrlen;
write_sha1_file_prepare(buffer, offset, tree_type, it->sha1,
hdr, &hdrlen);
}
else
write_sha1_file(buffer, offset, tree_type, it->sha1);
free(buffer); free(buffer);
it->entry_count = i; it->entry_count = i;
#if DEBUG #if DEBUG
@ -352,13 +361,14 @@ static int update_one(struct cache_tree *it,
int cache_tree_update(struct cache_tree *it, int cache_tree_update(struct cache_tree *it,
struct cache_entry **cache, struct cache_entry **cache,
int entries, int entries,
int missing_ok) int missing_ok,
int dryrun)
{ {
int i; int i;
i = verify_cache(cache, entries); i = verify_cache(cache, entries);
if (i) if (i)
return i; return i;
i = update_one(it, cache, entries, "", 0, missing_ok); i = update_one(it, cache, entries, "", 0, missing_ok, dryrun);
if (i < 0) if (i < 0)
return i; return i;
return 0; return 0;

View file

@ -26,6 +26,6 @@ void *cache_tree_write(struct cache_tree *root, unsigned long *size_p);
struct cache_tree *cache_tree_read(const char *buffer, unsigned long size); struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
int cache_tree_fully_valid(struct cache_tree *); int cache_tree_fully_valid(struct cache_tree *);
int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int); int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int);
#endif #endif

View file

@ -2,30 +2,64 @@
#include "tree.h" #include "tree.h"
#include "cache-tree.h" #include "cache-tree.h"
static void dump_cache_tree(struct cache_tree *it, const char *pfx)
static void dump_one(struct cache_tree *it, const char *pfx, const char *x)
{
if (it->entry_count < 0)
printf("%-40s %s%s (%d subtrees)\n",
"invalid", x, pfx, it->subtree_nr);
else
printf("%s %s%s (%d entries, %d subtrees)\n",
sha1_to_hex(it->sha1), x, pfx,
it->entry_count, it->subtree_nr);
}
static int dump_cache_tree(struct cache_tree *it,
struct cache_tree *ref,
const char *pfx)
{ {
int i; int i;
int errs = 0;
if (!it) if (!it)
return; return;
if (it->entry_count < 0) if (!ref)
printf("%-40s %s (%d subtrees)\n", "invalid", pfx, die("internal error");
it->subtree_nr);
else if (it->entry_count < 0) {
printf("%s %s (%d entries, %d subtrees)\n", dump_one(it, pfx, "");
sha1_to_hex(it->sha1), dump_one(ref, pfx, "#(ref) ");
pfx, it->entry_count, it->subtree_nr); if (it->subtree_nr != ref->subtree_nr)
errs = 1;
}
else {
dump_one(it, pfx, "");
if (memcmp(it->sha1, ref->sha1, 20) ||
ref->entry_count != it->entry_count ||
ref->subtree_nr != it->subtree_nr) {
dump_one(ref, pfx, "#(ref) ");
errs = 1;
}
}
for (i = 0; i < it->subtree_nr; i++) { for (i = 0; i < it->subtree_nr; i++) {
char path[PATH_MAX]; char path[PATH_MAX];
struct cache_tree_sub *down = it->down[i]; struct cache_tree_sub *down = it->down[i];
struct cache_tree_sub *rdwn;
rdwn = cache_tree_sub(ref, down->name);
sprintf(path, "%s%.*s/", pfx, down->namelen, down->name); sprintf(path, "%s%.*s/", pfx, down->namelen, down->name);
dump_cache_tree(down->cache_tree, path); if (dump_cache_tree(down->cache_tree, rdwn->cache_tree, path))
errs = 1;
} }
return errs;
} }
int main(int ac, char **av) int main(int ac, char **av)
{ {
struct cache_tree *another = cache_tree();
if (read_cache() < 0) if (read_cache() < 0)
die("unable to read index file"); die("unable to read index file");
dump_cache_tree(active_cache_tree, ""); cache_tree_update(another, active_cache, active_nr, 0, 1);
return 0; return dump_cache_tree(active_cache_tree, another, "");
} }

View file

@ -41,7 +41,7 @@ int main(int argc, char **argv)
if (!was_valid) { if (!was_valid) {
if (cache_tree_update(active_cache_tree, if (cache_tree_update(active_cache_tree,
active_cache, active_nr, active_cache, active_nr,
missing_ok) < 0) missing_ok, 0) < 0)
die("git-write-tree: error building trees"); die("git-write-tree: error building trees");
if (0 <= newfd) { if (0 <= newfd) {
if (!write_cache(newfd, active_cache, active_nr)) if (!write_cache(newfd, active_cache, active_nr))