mv: from in-cone to out-of-cone

Originally, moving an in-cone <source> to an out-of-cone <destination>
was not possible, mainly because such <destination> is a directory that
is not present in the working tree.

Change the behavior so that we can move an in-cone <source> to
out-of-cone <destination> when --sparse is supplied.

Notice that <destination> can also be an out-of-cone file path, rather
than a directory.

Such <source> can be either clean or dirty, and moving it results in
different behaviors:

A clean move should move <source> to <destination> in the index (do
*not* create <destination> in the worktree), then delete <source> from
the worktree.

A dirty move should move the <source> to the <destination>, 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.

Optional reading
================

We are strict about cone mode when <destination> is a file path.
The reason is that some of the previous tests that use no-cone mode in
t7002 are keep breaking, mainly because the `dst_mode = SPARSE;` line
added in this patch.

Most features developed in both "from-out-to-in" and "from-in-to-out"
only care about cone mode situation, as no-cone mode is becoming
irrelevant. And because assigning `SPARSE` to `dst_mode` when the
repo is in no-cone mode causes miscellaneous bugs, we should just leave
this new functionality to be exclusive cone mode and save some time.

Helped-by: Derrick Stolee <derrickstolee@github.com>
Helped-by: Victoria Dye <vdye@github.com>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/mv.c b/builtin/mv.c
index 7ac653be23c34bd6ccc1827d9106fe6861ce7b05..b64c28bd5b22d8379666e339a424a98103f3eabb 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -171,12 +171,13 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
        };
        const char **source, **destination, **dest_path, **submodule_gitfile;
        const char *dst_w_slash;
-       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;
        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);
 
@@ -213,10 +214,21 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
                if (!path_in_sparse_checkout(dst_w_slash, &the_index) &&
                    empty_dir_has_sparse_contents(dst_w_slash)) {
                        destination = internal_prefix_pathspec(dst_w_slash, argv, argc, DUP_BASENAME);
+                       dst_mode = SKIP_WORKTREE_DIR;
                } else if (argc != 1) {
                        die(_("destination '%s' is not a directory"), dest_path[0]);
                } else {
                        destination = dest_path;
+                       /*
+                        * <destination> is a file outside of sparse-checkout
+                        * cone. Insist on cone mode here for backward
+                        * compatibility. We don't want dst_mode to be assigned
+                        * for a file when the repo is using no-cone mode (which
+                        * is deprecated at this point) sparse-checkout. As
+                        * SPARSE here is only considering cone-mode situation.
+                        */
+                       if (!path_in_cone_mode_sparse_checkout(destination[0], &the_index))
+                               dst_mode = SPARSE;
                }
        }
        if (dst_w_slash != dest_path[0]) {
@@ -410,6 +422,7 @@ remove_entry:
                const char *src = source[i], *dst = destination[i];
                enum update_mode mode = modes[i];
                int pos;
+               int sparse_and_dirty = 0;
                struct checkout state = CHECKOUT_INIT;
                state.istate = &the_index;
 
@@ -420,6 +433,7 @@ remove_entry:
                if (show_only)
                        continue;
                if (!(mode & (INDEX | SPARSE | SKIP_WORKTREE_DIR)) &&
+                   !(dst_mode & (SKIP_WORKTREE_DIR | SPARSE)) &&
                    rename(src, dst) < 0) {
                        if (ignore_errors)
                                continue;
@@ -439,17 +453,55 @@ remove_entry:
 
                pos = cache_name_pos(src, strlen(src));
                assert(pos >= 0);
+               if (!(mode & SPARSE) && !lstat(src, &st))
+                       sparse_and_dirty = 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 &&
+                   core_apply_sparse_checkout &&
+                   core_sparse_checkout_cone) {
+                       /*
+                        * NEEDSWORK: we are *not* paying attention to
+                        * "out-to-out" move (<source> is out-of-cone and
+                        * <destination> is out-of-cone) at this point. It
+                        * should be added in a future patch.
+                        */
+                       if ((mode & SPARSE) &&
+                           path_in_sparse_checkout(dst, &the_index)) {
+                               /* from out-of-cone to in-cone */
+                               int dst_pos = cache_name_pos(dst, strlen(dst));
+                               struct cache_entry *dst_ce = active_cache[dst_pos];
+
+                               dst_ce->ce_flags &= ~CE_SKIP_WORKTREE;
+
+                               if (checkout_entry(dst_ce, &state, NULL, NULL))
+                                       die(_("cannot checkout %s"), dst_ce->name);
+                       } else if ((dst_mode & (SKIP_WORKTREE_DIR | SPARSE)) &&
+                                  !(mode & SPARSE) &&
+                                  !path_in_sparse_checkout(dst, &the_index)) {
+                               /* from in-cone to out-of-cone */
+                               int dst_pos = cache_name_pos(dst, strlen(dst));
+                               struct cache_entry *dst_ce = active_cache[dst_pos];
 
-                       dst_pos = cache_name_pos(dst, strlen(dst));
-                       active_cache[dst_pos]->ce_flags &= ~CE_SKIP_WORKTREE;
-
-                       if (checkout_entry(active_cache[dst_pos], &state, NULL, NULL))
-                               die(_("cannot checkout %s"), active_cache[dst_pos]->name);
+                               /*
+                                * if src is clean, it will suffice to remove it
+                                */
+                               if (!sparse_and_dirty) {
+                                       dst_ce->ce_flags |= CE_SKIP_WORKTREE;
+                                       unlink_or_warn(src);
+                               } else {
+                                       /*
+                                        * if src is dirty, move it to the
+                                        * destination and create leading
+                                        * dirs if necessary
+                                        */
+                                       char *dst_dup = xstrdup(dst);
+                                       string_list_append(&dirty_paths, dst);
+                                       safe_create_leading_directories(dst_dup);
+                                       FREE_AND_NULL(dst_dup);
+                                       rename(src, dst);
+                               }
+                       }
                }
        }
 
@@ -461,6 +513,7 @@ remove_entry:
                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 1ac78edde6c2f64b6e88e6803f21487ecea914cc..d875f492dd1ce605c7711cade22550cbea48f911 100755 (executable)
--- 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 &&
 
@@ -419,7 +419,7 @@ test_expect_failure 'move directory with one of the files overwrite' '
        test_cmp expect 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 &&
@@ -439,7 +439,7 @@ test_expect_failure 'move dirty path from in-cone to out-of-cone' '
        grep "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 &&
 
@@ -458,7 +458,7 @@ test_expect_failure 'move dir from in-cone to out-of-cone' '
        grep "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 &&