From 8063b2108f64b174cda4cb19ad6d2f1828c8c7f6 Mon Sep 17 00:00:00 2001 From: Shaoxuan Yuan Date: Thu, 30 Jun 2022 15:54:30 +0800 Subject: [PATCH 1/4] t7002: add tests for moving from in-cone to out-of-cone Add corresponding tests to test that user can move an in-cone to out-of-cone when --sparse is supplied. Such can be either clean or dirty, and moving it results in different behaviors: A clean move should move the to the , both in the working tree and the index, then remove the resulted path from the working tree, and turn on its CE_SKIP_WORKTREE bit. A dirty move should move the to the , both in the working tree and the index, but should *not* remove the resulted path from the working tree and should *not* turn on its CE_SKIP_WORKTREE bit. Instead advise user to "git add" this path and run "git sparse-checkout reapply" to re-sparsify that path. Signed-off-by: Shaoxuan Yuan --- t/t7002-mv-sparse-checkout.sh | 80 +++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh index 71fe29690fd122..123aa3b4d319cb 100755 --- a/t/t7002-mv-sparse-checkout.sh +++ b/t/t7002-mv-sparse-checkout.sh @@ -290,4 +290,84 @@ test_expect_success 'move sparse file to existing destination with --force and - test_cmp expect sub/file1 ' +test_expect_failure 'move clean path from in-cone to out-of-cone' ' + test_when_finished "cleanup_sparse_checkout" && + setup_sparse_checkout && + + git mv --sparse sub/d folder1 2>stderr && + test_must_be_empty stderr && + + test_path_is_missing sub/d && + test_path_is_missing folder1/d && + git ls-files -t >actual && + ! grep -x "H sub/d" actual && + grep -x "S folder1/d" actual +' + +test_expect_failure 'move dirty path from in-cone to out-of-cone' ' + test_when_finished "cleanup_sparse_checkout" && + setup_sparse_checkout && + echo "modified" >>sub/d && + + git mv --sparse sub/d folder1 2>stderr && + cat >expect <<-EOF && + The following dirty paths and/or pathspecs are moved + but not sparsified. Use "git add" to stage them then + use "git sparse-checkout reapply" to sparsify them. + folder1/d + EOF + test_cmp expect stderr && + + test_path_is_missing sub/d && + test_path_is_file folder1/d && + git ls-files -t >actual && + ! grep -x "H sub/d" actual && + grep -x "H folder1/d" actual +' + +test_expect_failure 'move dir from in-cone to out-of-cone' ' + test_when_finished "cleanup_sparse_checkout" && + setup_sparse_checkout && + + git mv --sparse sub/dir folder1 2>stderr && + test_must_be_empty stderr && + + test_path_is_missing sub/dir && + test_path_is_missing folder1 && + git ls-files -t >actual && + ! grep -x "H sub/dir/e" actual && + grep -x "S folder1/dir/e" actual +' + +test_expect_failure 'move partially-dirty dir from in-cone to out-of-cone' ' + test_when_finished "cleanup_sparse_checkout" && + setup_sparse_checkout && + touch sub/dir/e2 sub/dir/e3 && + git add sub/dir/e2 sub/dir/e3 && + echo "modified" >>sub/dir/e2 && + echo "modified" >>sub/dir/e3 && + + git mv --sparse sub/dir folder1 2>stderr && + cat >expect <<-EOF && + The following dirty paths and/or pathspecs are moved + but not sparsified. Use "git add" to stage them then + use "git sparse-checkout reapply" to sparsify them. + folder1/dir/e2 + folder1/dir/e3 + EOF + test_cmp expect stderr && + + test_path_is_missing sub/dir && + test_path_is_missing folder1/dir/e && + test_path_is_file folder1/dir/e2 && + test_path_is_file folder1/dir/e3 && + git ls-files -t >actual && + ! grep -x "H sub/dir/e" actual && + ! grep -x "H sub/dir/e2" actual && + ! grep -x "H sub/dir/e3" actual && + grep -x "S folder1/dir/e" actual && + grep -x "H folder1/dir/e2" actual && + grep -x "H folder1/dir/e3" actual +' + test_done From 29400d6377377f5c9e8a0097f34770ab26cd3e6d Mon Sep 17 00:00:00 2001 From: Shaoxuan Yuan Date: Tue, 21 Jun 2022 18:56:32 +0800 Subject: [PATCH 2/4] mv: check if is a directory in the index with Originally, is assumed to be in the working tree. If it is not found as a directory, then it is determined to be either a regular file path, or error out if used under the first form of 'git-mv'. Change the logic so that when supplied with --sparse, first check if is a directory with all its contents sparsified (called a SKIP_WORKTREE_DIR). If yes, then treat as a directory exists in the working tree. If no, continue the original checking logic. Signed-off-by: Shaoxuan Yuan --- builtin/mv.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index 2a38e2af4664dc..92932314cd9293 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -168,7 +168,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) OPT_END(), }; const char **source, **destination, **dest_path, **submodule_gitfile; - enum update_mode *modes; + enum update_mode *modes, dst_mode = 0; struct stat st; struct string_list src_for_dst = STRING_LIST_INIT_NODUP; struct lock_file lock_file = LOCK_INIT; @@ -207,9 +207,15 @@ int cmd_mv(int argc, const char **argv, const char *prefix) dest_path[0] = add_slash(dest_path[0]); destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME); } else { - if (argc != 1) + if (!check_dir_in_index(dest_path[0])) { + dest_path[0] = add_slash(dest_path[0]); + destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME); + dst_mode |= SKIP_WORKTREE_DIR; + } else if (argc != 1) { die(_("destination '%s' is not a directory"), dest_path[0]); - destination = dest_path; + } else { + destination = dest_path; + } } /* Checking */ From 044cd4081e0375d3ee772649bee6144d2076cae2 Mon Sep 17 00:00:00 2001 From: Shaoxuan Yuan Date: Tue, 21 Jun 2022 19:13:16 +0800 Subject: [PATCH 3/4] mv: rename BOTH flag to DEFAULT Rename BOTH flag to DEFAULT, since BOTH seems to does not stand for any useful meanings, it should be named DEFAULT instead. Signed-off-by: Shaoxuan Yuan --- builtin/mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/mv.c b/builtin/mv.c index 92932314cd9293..012763664b5e56 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -21,7 +21,7 @@ static const char * const builtin_mv_usage[] = { }; enum update_mode { - BOTH = 0, + DEFAULT = 0, WORKING_DIRECTORY = (1 << 1), INDEX = (1 << 2), SPARSE = (1 << 3), From 34b53e93bff01dff84b14aaf3531773ee36c96a0 Mon Sep 17 00:00:00 2001 From: Shaoxuan Yuan Date: Wed, 22 Jun 2022 14:14:21 +0800 Subject: [PATCH 4/4] mv: from in-cone to out-of-cone Originally, moving an in-cone to an out-of-cone was not possible, mainly because such is a directory that is not present in the working tree. Change the behavior so that we can move an in-cone to out-of-cone when --sparse is supplied. Such can be either clean or dirty, and moving it results in different behaviors: A clean move should move the to the , both in the working tree and the index, then remove the resulted path from the working tree, and turn on its CE_SKIP_WORKTREE bit. A dirty move should move the to the , both in the working tree and the index, but should *not* remove the resulted path from the working tree and should *not* turn on its CE_SKIP_WORKTREE bit. Instead advise user to "git add" this path and run "git sparse-checkout reapply" to re-sparsify that path. Signed-off-by: Shaoxuan Yuan --- advice.c | 14 ++++++++++ advice.h | 1 + builtin/mv.c | 50 ++++++++++++++++++++++++++++++----- t/t7002-mv-sparse-checkout.sh | 8 +++--- 4 files changed, 62 insertions(+), 11 deletions(-) diff --git a/advice.c b/advice.c index 6fda9edbc2474f..88441c8f3d37e7 100644 --- a/advice.c +++ b/advice.c @@ -261,3 +261,17 @@ void detach_advice(const char *new_name) fprintf(stderr, fmt, new_name); } + +void advise_on_moving_dirty_path(struct string_list *pathspec_list) +{ + struct string_list_item *item; + + if (!pathspec_list->nr) + return; + + fprintf(stderr, _("The following dirty paths and/or pathspecs are moved\n" + "but not sparsified. Use \"git add\" to stage them then\n" + "use \"git sparse-checkout reapply\" to sparsify them.\n")); + for_each_string_list_item(item, pathspec_list) + fprintf(stderr, "%s\n", item->string); +} diff --git a/advice.h b/advice.h index 7ddc6cbc1ac8d7..07e0f76833e780 100644 --- a/advice.h +++ b/advice.h @@ -74,5 +74,6 @@ void NORETURN die_conclude_merge(void); void NORETURN die_ff_impossible(void); void advise_on_updating_sparse_paths(struct string_list *pathspec_list); void detach_advice(const char *new_name); +void advise_on_moving_dirty_path(struct string_list *pathspec_list); #endif /* ADVICE_H */ diff --git a/builtin/mv.c b/builtin/mv.c index 012763664b5e56..beb4d089345557 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -174,6 +174,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) struct lock_file lock_file = LOCK_INIT; struct cache_entry *ce; struct string_list only_match_skip_worktree = STRING_LIST_INIT_NODUP; + struct string_list dirty_paths = STRING_LIST_INIT_NODUP; git_config(git_default_config, NULL); @@ -404,6 +405,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) const char *src = source[i], *dst = destination[i]; enum update_mode mode = modes[i]; int pos; + int up_to_date = 0; struct checkout state = CHECKOUT_INIT; state.istate = &the_index; @@ -414,6 +416,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) if (show_only) continue; if (!(mode & (INDEX | SPARSE | SKIP_WORKTREE_DIR)) && + !(dst_mode & SKIP_WORKTREE_DIR) && rename(src, dst) < 0) { if (ignore_errors) continue; @@ -433,20 +436,52 @@ int cmd_mv(int argc, const char **argv, const char *prefix) pos = cache_name_pos(src, strlen(src)); assert(pos >= 0); + if (!(mode & SPARSE) && !lstat(src, &st)) + up_to_date = !ce_modified(active_cache[pos], &st, 0); rename_cache_entry_at(pos, dst); - if ((mode & SPARSE) && - (path_in_sparse_checkout(dst, &the_index))) { - int dst_pos; + if (ignore_sparse && + !init_sparse_checkout_patterns(&the_index) && + the_index.sparse_checkout_patterns->use_cone_patterns) { - dst_pos = cache_name_pos(dst, strlen(dst)); - active_cache[dst_pos]->ce_flags &= ~CE_SKIP_WORKTREE; + /* from out-of-cone to in-cone */ + if ((mode & SPARSE) && + path_in_sparse_checkout(dst, &the_index)) { + int dst_pos = cache_name_pos(dst, strlen(dst)); + struct cache_entry *dst_ce = active_cache[dst_pos]; - if (checkout_entry(active_cache[dst_pos], &state, NULL, NULL)) - die(_("cannot checkout %s"), active_cache[dst_pos]->name); + dst_ce->ce_flags &= ~CE_SKIP_WORKTREE; + + if (checkout_entry(dst_ce, &state, NULL, NULL)) + die(_("cannot checkout %s"), dst_ce->name); + continue; + } + + /* from in-cone to out-of-cone */ + if ((dst_mode & SKIP_WORKTREE_DIR) && + !(mode & SPARSE) && + !path_in_sparse_checkout(dst, &the_index)) { + int dst_pos = cache_name_pos(dst, strlen(dst)); + struct cache_entry *dst_ce = active_cache[dst_pos]; + char *src_dir = dirname(xstrdup(src)); + + if (up_to_date) { + dst_ce->ce_flags |= CE_SKIP_WORKTREE; + unlink_or_warn(src); + } else { + string_list_append(&dirty_paths, dst); + safe_create_leading_directories(xstrdup(dst)); + rename(src, dst); + } + if ((mode & INDEX) && is_empty_dir(src_dir)) + rmdir_or_warn(src_dir); + } } } + if (dirty_paths.nr) + advise_on_moving_dirty_path(&dirty_paths); + if (gitmodules_modified) stage_updated_gitmodules(&the_index); @@ -455,6 +490,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) die(_("Unable to write new index file")); string_list_clear(&src_for_dst, 0); + string_list_clear(&dirty_paths, 0); UNLEAK(source); UNLEAK(dest_path); free(submodule_gitfile); diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh index 123aa3b4d319cb..e3b73c9eaa94d6 100755 --- a/t/t7002-mv-sparse-checkout.sh +++ b/t/t7002-mv-sparse-checkout.sh @@ -290,7 +290,7 @@ test_expect_success 'move sparse file to existing destination with --force and - test_cmp expect sub/file1 ' -test_expect_failure 'move clean path from in-cone to out-of-cone' ' +test_expect_success 'move clean path from in-cone to out-of-cone' ' test_when_finished "cleanup_sparse_checkout" && setup_sparse_checkout && @@ -304,7 +304,7 @@ test_expect_failure 'move clean path from in-cone to out-of-cone' ' grep -x "S folder1/d" actual ' -test_expect_failure 'move dirty path from in-cone to out-of-cone' ' +test_expect_success 'move dirty path from in-cone to out-of-cone' ' test_when_finished "cleanup_sparse_checkout" && setup_sparse_checkout && echo "modified" >>sub/d && @@ -325,7 +325,7 @@ test_expect_failure 'move dirty path from in-cone to out-of-cone' ' grep -x "H folder1/d" actual ' -test_expect_failure 'move dir from in-cone to out-of-cone' ' +test_expect_success 'move dir from in-cone to out-of-cone' ' test_when_finished "cleanup_sparse_checkout" && setup_sparse_checkout && @@ -339,7 +339,7 @@ test_expect_failure 'move dir from in-cone to out-of-cone' ' grep -x "S folder1/dir/e" actual ' -test_expect_failure 'move partially-dirty dir from in-cone to out-of-cone' ' +test_expect_success 'move partially-dirty dir from in-cone to out-of-cone' ' test_when_finished "cleanup_sparse_checkout" && setup_sparse_checkout && touch sub/dir/e2 sub/dir/e3 &&