cache-tree: Write updated cache-tree after commit

During the commit process, update the cache-tree. Write this updated
cache-tree so that it's ready for subsequent commands.

Add test code which demonstrates that git commit now writes the cache
tree.  Make all tests test the entire cache-tree, not just the root
level.

Signed-off-by: David Turner <dturner@twitter.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit.c b/builtin/commit.c
index 12afc42d197bfaffc950e7f44acb5d75517f1fc2..77570c48ba02adf7aa78654c644b13478246a4e0 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -342,6 +342,17 @@ static char *prepare_index(int argc, const char **argv, const char *prefix,
 
                discard_cache();
                read_cache_from(index_lock.filename);
 
                discard_cache();
                read_cache_from(index_lock.filename);

+               if (update_main_cache_tree(WRITE_TREE_SILENT) == 0) {
+                       fd = open(index_lock.filename, O_WRONLY);
+                       if (fd >= 0)
+                               if (write_cache(fd, active_cache, active_nr) < 0)
+                                       die(_("unable to write index file"));
+                               else
+                                       close_lock_file(&index_lock);
+                       else
+                               die(_("unable to write index file"));
+               } else
+                       warning(_("Failed to update main cache tree"));

 
                commit_style = COMMIT_NORMAL;
                return index_lock.filename;
 
                commit_style = COMMIT_NORMAL;
                return index_lock.filename;


@@ -383,8 +394,12 @@ static char *prepare_index(int argc, const char **argv, const char *prefix,
        if (!only && !pathspec.nr) {
                fd = hold_locked_index(&index_lock, 1);
                refresh_cache_or_die(refresh_flags);
        if (!only && !pathspec.nr) {
                fd = hold_locked_index(&index_lock, 1);
                refresh_cache_or_die(refresh_flags);

-               if (active_cache_changed) {
+               if (active_cache_changed
+                   || !cache_tree_fully_valid(active_cache_tree)) {

                        update_main_cache_tree(WRITE_TREE_SILENT);
                        update_main_cache_tree(WRITE_TREE_SILENT);

+                       active_cache_changed = 1;
+               }
+               if (active_cache_changed) {

                        if (write_cache(fd, active_cache, active_nr) ||
                            commit_locked_index(&index_lock))
                                die(_("unable to write new_index file"));
                        if (write_cache(fd, active_cache, active_nr) ||
                            commit_locked_index(&index_lock))
                                die(_("unable to write new_index file"));


@@ -435,6 +450,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix,
        fd = hold_locked_index(&index_lock, 1);
        add_remove_files(&partial);
        refresh_cache(REFRESH_QUIET);
        fd = hold_locked_index(&index_lock, 1);
        add_remove_files(&partial);
        refresh_cache(REFRESH_QUIET);

+       update_main_cache_tree(WRITE_TREE_SILENT);

        if (write_cache(fd, active_cache, active_nr) ||
            close_lock_file(&index_lock))
                die(_("unable to write new_index file"));
        if (write_cache(fd, active_cache, active_nr) ||
            close_lock_file(&index_lock))
                die(_("unable to write new_index file"));

diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 3a3342e171edd29756a39b0f21518062649eca7a..48c42409d2f0bbc17fa54472b046b968434c2a93 100755 (executable)
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -8,7 +8,7 @@ cache-tree extension.
  . ./test-lib.sh
 
 cmp_cache_tree () {
  . ./test-lib.sh
 
 cmp_cache_tree () {

-       test-dump-cache-tree >actual &&
+       test-dump-cache-tree | sed -e '/#(ref)/d' >actual &&

        sed "s/$_x40/SHA/" <actual >filtered &&
        test_cmp "$1" filtered
 }
        sed "s/$_x40/SHA/" <actual >filtered &&
        test_cmp "$1" filtered
 }


@@ -16,14 +16,38 @@ cmp_cache_tree () {
 # We don't bother with actually checking the SHA1:
 # test-dump-cache-tree already verifies that all existing data is
 # correct.
 # 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 () {
-       printf "SHA  (%d entries, 0 subtrees)\n" $(git ls-files|wc -l) >expect &&
+generate_expected_cache_tree_rec () {
+       dir="$1${1:+/}" &&
+       parent="$2" &&
+       # ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux
+       # We want to count only foo because it's the only direct child
+       subtrees=$(git ls-files|grep /|cut -d / -f 1|uniq) &&
+       subtree_count=$(echo "$subtrees"|awk '$1 {++c} END {print c}') &&
+       entries=$(git ls-files|wc -l) &&
+       printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
+       for subtree in $subtrees
+       do
+               cd "$subtree"
+               generate_expected_cache_tree_rec "$dir$subtree" "$dir" || return 1
+               cd ..
+       done &&
+       dir=$parent
+}
+
+generate_expected_cache_tree () {
+       (
+               generate_expected_cache_tree_rec
+       )
+}
+
+test_cache_tree () {
+       generate_expected_cache_tree >expect &&

        cmp_cache_tree expect
 }
 
 test_invalid_cache_tree () {
        printf "invalid                                  %s ()\n" "" "$@" >expect &&
        cmp_cache_tree expect
 }
 
 test_invalid_cache_tree () {
        printf "invalid                                  %s ()\n" "" "$@" >expect &&

-       test-dump-cache-tree | \
+       test-dump-cache-tree |

        sed -n -e "s/[0-9]* subtrees//" -e '/#(ref)/d' -e '/^invalid /p' >actual &&
        test_cmp expect actual
 }
        sed -n -e "s/[0-9]* subtrees//" -e '/#(ref)/d' -e '/^invalid /p' >actual &&
        test_cmp expect actual
 }


@@ -33,14 +57,14 @@ test_no_cache_tree () {
        cmp_cache_tree expect
 }
 
        cmp_cache_tree expect
 }
 

-test_expect_failure 'initial commit has cache-tree' '
+test_expect_success 'initial commit has cache-tree' '

        test_commit foo &&
        test_commit foo &&

-       test_shallow_cache_tree
+       test_cache_tree

 '
 
 test_expect_success 'read-tree HEAD establishes cache-tree' '
        git read-tree HEAD &&
 '
 
 test_expect_success 'read-tree HEAD establishes cache-tree' '
        git read-tree HEAD &&

-       test_shallow_cache_tree
+       test_cache_tree

 '
 
 test_expect_success 'git-add invalidates cache-tree' '
 '
 
 test_expect_success 'git-add invalidates cache-tree' '


@@ -58,6 +82,18 @@ test_expect_success 'git-add in subdir invalidates cache-tree' '
        test_invalid_cache_tree
 '
 
        test_invalid_cache_tree
 '
 

+cat >before <<\EOF
+SHA  (3 entries, 2 subtrees)
+SHA dir1/ (1 entries, 0 subtrees)
+SHA dir2/ (1 entries, 0 subtrees)
+EOF
+
+cat >expect <<\EOF
+invalid                                   (2 subtrees)
+invalid                                  dir1/ (0 subtrees)
+SHA dir2/ (1 entries, 0 subtrees)
+EOF
+

 test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
        git tag no-children &&
        test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
 test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
        git tag no-children &&
        test_when_finished "git reset --hard no-children; git read-tree HEAD" &&


@@ -65,8 +101,10 @@ test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
        test_commit dir1/a &&
        test_commit dir2/b &&
        echo "I changed this file" >dir1/a &&
        test_commit dir1/a &&
        test_commit dir2/b &&
        echo "I changed this file" >dir1/a &&

+       cmp_cache_tree before &&
+       echo "I changed this file" >dir1/a &&

        git add dir1/a &&
        git add dir1/a &&

-       test_invalid_cache_tree dir1/
+       cmp_cache_tree expect

 '
 
 test_expect_success 'update-index invalidates cache-tree' '
 '
 
 test_expect_success 'update-index invalidates cache-tree' '


@@ -79,7 +117,7 @@ test_expect_success 'update-index invalidates cache-tree' '
 test_expect_success 'write-tree establishes cache-tree' '
        test-scrap-cache-tree &&
        git write-tree &&
 test_expect_success 'write-tree establishes cache-tree' '
        test-scrap-cache-tree &&
        git write-tree &&

-       test_shallow_cache_tree
+       test_cache_tree

 '
 
 test_expect_success 'test-scrap-cache-tree works' '
 '
 
 test_expect_success 'test-scrap-cache-tree works' '


@@ -90,37 +128,86 @@ test_expect_success 'test-scrap-cache-tree works' '
 
 test_expect_success 'second commit has cache-tree' '
        test_commit bar &&
 
 test_expect_success 'second commit has cache-tree' '
        test_commit bar &&

-       test_shallow_cache_tree
+       test_cache_tree
+'
+
+test_expect_success 'commit --interactive gives cache-tree on partial commit' '
+       cat <<-\EOT >foo.c &&
+       int foo()
+       {
+               return 42;
+       }
+       int bar()
+       {
+               return 42;
+       }
+       EOT
+       git add foo.c &&
+       test_invalid_cache_tree &&
+       git commit -m "add a file" &&
+       test_cache_tree &&
+       cat <<-\EOT >foo.c &&
+       int foo()
+       {
+               return 43;
+       }
+       int bar()
+       {
+               return 44;
+       }
+       EOT
+       (echo p; echo 1; echo; echo s; echo n; echo y; echo q) |
+       git commit --interactive -m foo &&
+       test_cache_tree
+'
+
+test_expect_success 'commit in child dir has cache-tree' '
+       mkdir dir &&
+       >dir/child.t &&
+       git add dir/child.t &&
+       git commit -m dir/child.t &&
+       test_cache_tree

 '
 
 test_expect_success 'reset --hard gives cache-tree' '
        test-scrap-cache-tree &&
        git reset --hard &&
 '
 
 test_expect_success 'reset --hard gives cache-tree' '
        test-scrap-cache-tree &&
        git reset --hard &&

-       test_shallow_cache_tree
+       test_cache_tree

 '
 
 test_expect_success 'reset --hard without index gives cache-tree' '
        rm -f .git/index &&
        git reset --hard &&
 '
 
 test_expect_success 'reset --hard without index gives cache-tree' '
        rm -f .git/index &&
        git reset --hard &&

-       test_shallow_cache_tree
+       test_cache_tree

 '
 
 test_expect_success 'checkout gives cache-tree' '
        git tag current &&
        git checkout HEAD^ &&
 '
 
 test_expect_success 'checkout gives cache-tree' '
        git tag current &&
        git checkout HEAD^ &&

-       test_shallow_cache_tree
+       test_cache_tree

 '
 
 test_expect_success 'checkout -b gives cache-tree' '
        git checkout current &&
        git checkout -b prev HEAD^ &&
 '
 
 test_expect_success 'checkout -b gives cache-tree' '
        git checkout current &&
        git checkout -b prev HEAD^ &&

-       test_shallow_cache_tree
+       test_cache_tree

 '
 
 test_expect_success 'checkout -B gives cache-tree' '
        git checkout current &&
        git checkout -B prev HEAD^ &&
 '
 
 test_expect_success 'checkout -B gives cache-tree' '
        git checkout current &&
        git checkout -B prev HEAD^ &&

-       test_shallow_cache_tree
+       test_cache_tree
+'
+
+test_expect_success 'partial commit gives cache-tree' '
+       git checkout -b partial no-children &&
+       test_commit one &&
+       test_commit two &&
+       echo "some change" >one.t &&
+       git add one.t &&
+       echo "some other change" >two.t &&
+       git commit two.t -m partial &&
+       test_cache_tree

 '
 
 test_done
 '
 
 test_done