Merge branch 'tr/cache-tree'
* tr/cache-tree: reset: update cache-tree data when appropriate commit: write cache-tree data when writing index anyway Refactor cache_tree_update idiom from commit Test the current state of the cache-tree optimization Add test-scrap-cache-tree
This commit is contained in:
commit
33e7fefef6
1
.gitignore
vendored
1
.gitignore
vendored
@ -175,6 +175,7 @@
|
||||
/test-date
|
||||
/test-delta
|
||||
/test-dump-cache-tree
|
||||
/test-scrap-cache-tree
|
||||
/test-genrandom
|
||||
/test-index-version
|
||||
/test-line-buffer
|
||||
|
1
Makefile
1
Makefile
@ -439,6 +439,7 @@ TEST_PROGRAMS_NEED_X += test-ctype
|
||||
TEST_PROGRAMS_NEED_X += test-date
|
||||
TEST_PROGRAMS_NEED_X += test-delta
|
||||
TEST_PROGRAMS_NEED_X += test-dump-cache-tree
|
||||
TEST_PROGRAMS_NEED_X += test-scrap-cache-tree
|
||||
TEST_PROGRAMS_NEED_X += test-genrandom
|
||||
TEST_PROGRAMS_NEED_X += test-index-version
|
||||
TEST_PROGRAMS_NEED_X += test-line-buffer
|
||||
|
@ -395,6 +395,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix,
|
||||
fd = hold_locked_index(&index_lock, 1);
|
||||
add_files_to_cache(also ? prefix : NULL, pathspec, 0);
|
||||
refresh_cache_or_die(refresh_flags);
|
||||
update_main_cache_tree(1);
|
||||
if (write_cache(fd, active_cache, active_nr) ||
|
||||
close_lock_file(&index_lock))
|
||||
die(_("unable to write new_index file"));
|
||||
@ -415,6 +416,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix,
|
||||
fd = hold_locked_index(&index_lock, 1);
|
||||
refresh_cache_or_die(refresh_flags);
|
||||
if (active_cache_changed) {
|
||||
update_main_cache_tree(1);
|
||||
if (write_cache(fd, active_cache, active_nr) ||
|
||||
commit_locked_index(&index_lock))
|
||||
die(_("unable to write new_index file"));
|
||||
@ -863,10 +865,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||
*/
|
||||
discard_cache();
|
||||
read_cache_from(index_file);
|
||||
if (!active_cache_tree)
|
||||
active_cache_tree = cache_tree();
|
||||
if (cache_tree_update(active_cache_tree,
|
||||
active_cache, active_nr, 0, 0) < 0) {
|
||||
if (update_main_cache_tree(0)) {
|
||||
error(_("Error building trees"));
|
||||
return 0;
|
||||
}
|
||||
|
@ -43,6 +43,7 @@ static int reset_index_file(const unsigned char *sha1, int reset_type, int quiet
|
||||
int nr = 1;
|
||||
int newfd;
|
||||
struct tree_desc desc[2];
|
||||
struct tree *tree;
|
||||
struct unpack_trees_options opts;
|
||||
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
|
||||
|
||||
@ -84,6 +85,12 @@ static int reset_index_file(const unsigned char *sha1, int reset_type, int quiet
|
||||
return error(_("Failed to find tree of %s."), sha1_to_hex(sha1));
|
||||
if (unpack_trees(nr, desc, &opts))
|
||||
return -1;
|
||||
|
||||
if (reset_type == MIXED || reset_type == HARD) {
|
||||
tree = parse_tree_indirect(sha1);
|
||||
prime_cache_tree(&active_cache_tree, tree);
|
||||
}
|
||||
|
||||
if (write_cache(newfd, active_cache, active_nr) ||
|
||||
commit_locked_index(lock))
|
||||
return error(_("Could not write new index file."));
|
||||
|
19
cache-tree.c
19
cache-tree.c
@ -150,7 +150,7 @@ void cache_tree_invalidate_path(struct cache_tree *it, const char *path)
|
||||
}
|
||||
|
||||
static int verify_cache(struct cache_entry **cache,
|
||||
int entries)
|
||||
int entries, int silent)
|
||||
{
|
||||
int i, funny;
|
||||
|
||||
@ -159,6 +159,8 @@ static int verify_cache(struct cache_entry **cache,
|
||||
for (i = 0; i < entries; i++) {
|
||||
struct cache_entry *ce = cache[i];
|
||||
if (ce_stage(ce) || (ce->ce_flags & CE_INTENT_TO_ADD)) {
|
||||
if (silent)
|
||||
return -1;
|
||||
if (10 < ++funny) {
|
||||
fprintf(stderr, "...\n");
|
||||
break;
|
||||
@ -370,10 +372,11 @@ int cache_tree_update(struct cache_tree *it,
|
||||
struct cache_entry **cache,
|
||||
int entries,
|
||||
int missing_ok,
|
||||
int dryrun)
|
||||
int dryrun,
|
||||
int silent)
|
||||
{
|
||||
int i;
|
||||
i = verify_cache(cache, entries);
|
||||
i = verify_cache(cache, entries, silent);
|
||||
if (i)
|
||||
return i;
|
||||
i = update_one(it, cache, entries, "", 0, missing_ok, dryrun);
|
||||
@ -573,7 +576,7 @@ int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
|
||||
|
||||
if (cache_tree_update(active_cache_tree,
|
||||
active_cache, active_nr,
|
||||
missing_ok, 0) < 0)
|
||||
missing_ok, 0, 0) < 0)
|
||||
return WRITE_TREE_UNMERGED_INDEX;
|
||||
if (0 <= newfd) {
|
||||
if (!write_cache(newfd, active_cache, active_nr) &&
|
||||
@ -668,3 +671,11 @@ int cache_tree_matches_traversal(struct cache_tree *root,
|
||||
return it->entry_count;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int update_main_cache_tree (int silent)
|
||||
{
|
||||
if (!the_index.cache_tree)
|
||||
the_index.cache_tree = cache_tree();
|
||||
return cache_tree_update(the_index.cache_tree,
|
||||
the_index.cache, the_index.cache_nr, 0, 0, silent);
|
||||
}
|
||||
|
@ -29,7 +29,9 @@ void cache_tree_write(struct strbuf *, struct cache_tree *root);
|
||||
struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
|
||||
|
||||
int cache_tree_fully_valid(struct cache_tree *);
|
||||
int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int);
|
||||
int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int, int);
|
||||
|
||||
int update_main_cache_tree(int);
|
||||
|
||||
/* bitmasks to write_cache_as_tree flags */
|
||||
#define WRITE_TREE_MISSING_OK 1
|
||||
|
@ -264,7 +264,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
|
||||
|
||||
if (!cache_tree_fully_valid(active_cache_tree) &&
|
||||
cache_tree_update(active_cache_tree,
|
||||
active_cache, active_nr, 0, 0) < 0)
|
||||
active_cache, active_nr, 0, 0, 0) < 0)
|
||||
die("error building trees");
|
||||
|
||||
result = lookup_tree(active_cache_tree->sha1);
|
||||
|
95
t/t0090-cache-tree.sh
Executable file
95
t/t0090-cache-tree.sh
Executable file
@ -0,0 +1,95 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description="Test whether cache-tree is properly updated
|
||||
|
||||
Tests whether various commands properly update and/or rewrite the
|
||||
cache-tree extension.
|
||||
"
|
||||
. ./test-lib.sh
|
||||
|
||||
cmp_cache_tree () {
|
||||
test-dump-cache-tree >actual &&
|
||||
sed "s/$_x40/SHA/" <actual >filtered &&
|
||||
test_cmp "$1" filtered
|
||||
}
|
||||
|
||||
# We don't bother with actually checking the SHA1:
|
||||
# test-dump-cache-tree already verifies that all existing data is
|
||||
# correct.
|
||||
test_shallow_cache_tree () {
|
||||
echo "SHA " \
|
||||
"($(git ls-files|wc -l) entries, 0 subtrees)" >expect &&
|
||||
cmp_cache_tree expect
|
||||
}
|
||||
|
||||
test_invalid_cache_tree () {
|
||||
echo "invalid (0 subtrees)" >expect &&
|
||||
echo "SHA #(ref) " \
|
||||
"($(git ls-files|wc -l) entries, 0 subtrees)" >>expect &&
|
||||
cmp_cache_tree expect
|
||||
}
|
||||
|
||||
test_no_cache_tree () {
|
||||
: >expect &&
|
||||
cmp_cache_tree expect
|
||||
}
|
||||
|
||||
test_expect_failure 'initial commit has cache-tree' '
|
||||
test_commit foo &&
|
||||
test_shallow_cache_tree
|
||||
'
|
||||
|
||||
test_expect_success 'read-tree HEAD establishes cache-tree' '
|
||||
git read-tree HEAD &&
|
||||
test_shallow_cache_tree
|
||||
'
|
||||
|
||||
test_expect_success 'git-add invalidates cache-tree' '
|
||||
test_when_finished "git reset --hard; git read-tree HEAD" &&
|
||||
echo "I changed this file" > foo &&
|
||||
git add foo &&
|
||||
test_invalid_cache_tree
|
||||
'
|
||||
|
||||
test_expect_success 'update-index invalidates cache-tree' '
|
||||
test_when_finished "git reset --hard; git read-tree HEAD" &&
|
||||
echo "I changed this file" > foo &&
|
||||
git update-index --add foo &&
|
||||
test_invalid_cache_tree
|
||||
'
|
||||
|
||||
test_expect_success 'write-tree establishes cache-tree' '
|
||||
test-scrap-cache-tree &&
|
||||
git write-tree &&
|
||||
test_shallow_cache_tree
|
||||
'
|
||||
|
||||
test_expect_success 'test-scrap-cache-tree works' '
|
||||
git read-tree HEAD &&
|
||||
test-scrap-cache-tree &&
|
||||
test_no_cache_tree
|
||||
'
|
||||
|
||||
test_expect_success 'second commit has cache-tree' '
|
||||
test_commit bar &&
|
||||
test_shallow_cache_tree
|
||||
'
|
||||
|
||||
test_expect_success 'reset --hard gives cache-tree' '
|
||||
test-scrap-cache-tree &&
|
||||
git reset --hard &&
|
||||
test_shallow_cache_tree
|
||||
'
|
||||
|
||||
test_expect_success 'reset --hard without index gives cache-tree' '
|
||||
rm -f .git/index &&
|
||||
git reset --hard &&
|
||||
test_shallow_cache_tree
|
||||
'
|
||||
|
||||
test_expect_failure 'checkout gives cache-tree' '
|
||||
git checkout HEAD^ &&
|
||||
test_shallow_cache_tree
|
||||
'
|
||||
|
||||
test_done
|
@ -59,6 +59,6 @@ int main(int ac, char **av)
|
||||
struct cache_tree *another = cache_tree();
|
||||
if (read_cache() < 0)
|
||||
die("unable to read index file");
|
||||
cache_tree_update(another, active_cache, active_nr, 0, 1);
|
||||
cache_tree_update(another, active_cache, active_nr, 0, 1, 0);
|
||||
return dump_cache_tree(active_cache_tree, another, "");
|
||||
}
|
||||
|
17
test-scrap-cache-tree.c
Normal file
17
test-scrap-cache-tree.c
Normal file
@ -0,0 +1,17 @@
|
||||
#include "cache.h"
|
||||
#include "tree.h"
|
||||
#include "cache-tree.h"
|
||||
|
||||
static struct lock_file index_lock;
|
||||
|
||||
int main(int ac, char **av)
|
||||
{
|
||||
int fd = hold_locked_index(&index_lock, 1);
|
||||
if (read_cache() < 0)
|
||||
die("unable to read index file");
|
||||
active_cache_tree = NULL;
|
||||
if (write_cache(fd, active_cache, active_nr)
|
||||
|| commit_lock_file(&index_lock))
|
||||
die("unable to write index file");
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue
Block a user