| Message ID | 20220331091755.385961-2-shaoxuan.yuan02@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mv: fix out-of-cone file/directory move logic | expand |
Shaoxuan Yuan wrote: > Originally, moving a <source> file which is not on-disk but exists in > index as a SKIP_WORKTREE enabled cache entry, "giv mv" command errors > out with "bad source". > > Change the checking logic, so that such <source> > file makes "giv mv" command warns with "advise_on_updating_sparse_paths()" > instead of "bad source"; also user now can supply a "--sparse" flag so > this operation can be carried out successfully. > Good commit message, this clearly explains your changes! > Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> > --- > I found a new problem introduced by this patch, it is written in the TODO. > I still haven't found a better way to reconcile this conflict. Please enlighten > me on this :-) > > builtin/mv.c | 26 +++++++++++++++++++++++++- > 1 file changed, 25 insertions(+), 1 deletion(-) > > diff --git a/builtin/mv.c b/builtin/mv.c > index 83a465ba83..32ad4d5682 100644 > --- a/builtin/mv.c > +++ b/builtin/mv.c > @@ -185,8 +185,32 @@ int cmd_mv(int argc, const char **argv, const char *prefix) > > length = strlen(src); > if (lstat(src, &st) < 0) { > + /* > + * TODO: for now, when you try to overwrite a <destination> > + * with your <source> as a sparse file, if you supply a "--sparse" > + * flag, then the action will be done without providing "--force" > + * and no warning. > + * > + * This is mainly because the sparse <source> > + * is not on-disk, and this if-else chain will be cut off early in > + * this check, thus the "--force" check is ignored. Need fix. > + */ > + I can clarify this a bit. 'mv' is done in two steps: first the file-on-disk rename (in the call to 'rename()'), then the index entry (in 'rename_cache_entry_at()'). In the case of a sparse file, you're only dealing with the latter. However, 'rename_cache_entry_at()' moves the index entry with the flag 'ADD_CACHE_OK_TO_REPLACE', since it leaves it up to 'cmd_mv()' to enforce the "no overwrite" rule. So, in the case of moving *to* a SKIP_WORKTREE entry (where a file being present won't trigger the failure), you'll want to check that the destination *index entry* doesn't exist in addition to the 'lstat()' check. It might require some rearranging of if-statements in this block, but I think it can be done in 'cmd_mv'. > + int pos = cache_name_pos(src, length); > + if (pos >= 0) { > + const struct cache_entry *ce = active_cache[pos]; > + > + if (ce_skip_worktree(ce)) { > + if (!ignore_sparse) > + string_list_append(&only_match_skip_worktree, src); > + else > + modes[i] = SPARSE; > + } > + else > + bad = _("bad source"); This block is good. At first, I thought it was mishandling the '!ignore_sparse' case (i.e., that case should have included the "bad source" assignment), but using the 'only_match_skip_worktree' list is the appropriate way to handle it. > + } > /* only error if existence is expected. */ > - if (modes[i] != SPARSE) > + else if (modes[i] != SPARSE) > bad = _("bad source"); > } else if (!strncmp(src, dst, length) && > (dst[length] == 0 || dst[length] == '/')) { For a change like this, it would be really helpful to include the tests showing how sparse file moves should now be treated in this commit. I see that you've added some in patch 4 - could you move the ones related to this change into this commit? Another way you could do this is to put your "add tests" commit first in this series, changing the condition on the ones that are fixed later in the series to "test_expect_failure". Then, in each commit that "fixes" a test's behavior, change that test to "test_expect_success". This approach had the added benefit of showing that, before this series, the tests would fail and that this series explicitly fixes those scenarios.
On 3/31/2022 12:39 PM, Victoria Dye wrote: > Shaoxuan Yuan wrote: >> if (lstat(src, &st) < 0) { >> + /* >> + * TODO: for now, when you try to overwrite a <destination> >> + * with your <source> as a sparse file, if you supply a "--sparse" >> + * flag, then the action will be done without providing "--force" >> + * and no warning. >> + * >> + * This is mainly because the sparse <source> >> + * is not on-disk, and this if-else chain will be cut off early in >> + * this check, thus the "--force" check is ignored. Need fix. >> + */ >> + > > I can clarify this a bit. 'mv' is done in two steps: first the file-on-disk > rename (in the call to 'rename()'), then the index entry (in > 'rename_cache_entry_at()'). In the case of a sparse file, you're only > dealing with the latter. However, 'rename_cache_entry_at()' moves the index > entry with the flag 'ADD_CACHE_OK_TO_REPLACE', since it leaves it up to > 'cmd_mv()' to enforce the "no overwrite" rule. > > So, in the case of moving *to* a SKIP_WORKTREE entry (where a file being > present won't trigger the failure), you'll want to check that the > destination *index entry* doesn't exist in addition to the 'lstat()' check. > It might require some rearranging of if-statements in this block, but I > think it can be done in 'cmd_mv'. This also explains the issue when going from sparse to non-sparse: the file move is the expected way to populate the end-result, but we skip that part in the sparse case. We need to do an extra step to populate the file from the version in the index (after moving the cache entry). Related to this chain of if/else if/else blocks, it might be worth refactoring them to be sequential "if ()" blocks where we jump to a "cleanup:" label via a 'goto' if we know that we are in a failure mode. The previous organization made sense because any of the if () or else if () conditions were a failure mode. However, it might be better to rearrange things to be clearer about the situation. Here is a diff from what I was playing with. It's... unclear if this is a better arrangement, but I thought it worth discussing. --- >8 --- diff --git a/builtin/mv.c b/builtin/mv.c index 83a465ba831..683a412a3fc 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -186,15 +186,22 @@ int cmd_mv(int argc, const char **argv, const char *prefix) length = strlen(src); if (lstat(src, &st) < 0) { /* only error if existence is expected. */ - if (modes[i] != SPARSE) + if (modes[i] != SPARSE) { bad = _("bad source"); - } else if (!strncmp(src, dst, length) && + goto checked_move; + } + } + if (!strncmp(src, dst, length) && (dst[length] == 0 || dst[length] == '/')) { bad = _("can not move directory into itself"); - } else if ((src_is_dir = S_ISDIR(st.st_mode)) - && lstat(dst, &st) == 0) + goto checked_move; + } + if ((src_is_dir = S_ISDIR(st.st_mode)) + && lstat(dst, &st) == 0) { bad = _("cannot move directory over file"); - else if (src_is_dir) { + goto checked_move; + } + if (src_is_dir) { int first = cache_name_pos(src, length), last; if (first >= 0) @@ -227,11 +234,18 @@ int cmd_mv(int argc, const char **argv, const char *prefix) } argc += last - first; } - } else if (!(ce = cache_file_exists(src, length, 0))) { + + goto checked_move; + } + if (!(ce = cache_file_exists(src, length, 0))) { bad = _("not under version control"); - } else if (ce_stage(ce)) { + goto checked_move; + } + if (ce_stage(ce)) { bad = _("conflicted"); - } else if (lstat(dst, &st) == 0 && + goto checked_move; + } + if (lstat(dst, &st) == 0 && (!ignore_case || strcasecmp(src, dst))) { bad = _("destination exists"); if (force) { @@ -246,34 +260,40 @@ int cmd_mv(int argc, const char **argv, const char *prefix) } else bad = _("Cannot overwrite"); } - } else if (string_list_has_string(&src_for_dst, dst)) + goto checked_move; + } + if (string_list_has_string(&src_for_dst, dst)) { bad = _("multiple sources for the same target"); - else if (is_dir_sep(dst[strlen(dst) - 1])) + goto checked_move; + } + if (is_dir_sep(dst[strlen(dst) - 1])) { bad = _("destination directory does not exist"); - else { - /* - * We check if the paths are in the sparse-checkout - * definition as a very final check, since that - * allows us to point the user to the --sparse - * option as a way to have a successful run. - */ - if (!ignore_sparse && - !path_in_sparse_checkout(src, &the_index)) { - string_list_append(&only_match_skip_worktree, src); - skip_sparse = 1; - } - if (!ignore_sparse && - !path_in_sparse_checkout(dst, &the_index)) { - string_list_append(&only_match_skip_worktree, dst); - skip_sparse = 1; - } - - if (skip_sparse) - goto remove_entry; + goto checked_move; + } - string_list_insert(&src_for_dst, dst); + /* + * We check if the paths are in the sparse-checkout + * definition as a very final check, since that + * allows us to point the user to the --sparse + * option as a way to have a successful run. + */ + if (!ignore_sparse && + !path_in_sparse_checkout(src, &the_index)) { + string_list_append(&only_match_skip_worktree, src); + skip_sparse = 1; + } + if (!ignore_sparse && + !path_in_sparse_checkout(dst, &the_index)) { + string_list_append(&only_match_skip_worktree, dst); + skip_sparse = 1; } + if (skip_sparse) + goto remove_entry; + + string_list_insert(&src_for_dst, dst); + +checked_move: if (!bad) continue; if (!ignore_errors) --- >8 --- >> + } >> /* only error if existence is expected. */ >> - if (modes[i] != SPARSE) >> + else if (modes[i] != SPARSE) >> bad = _("bad source"); >> } else if (!strncmp(src, dst, length) && >> (dst[length] == 0 || dst[length] == '/')) { > > For a change like this, it would be really helpful to include the tests > showing how sparse file moves should now be treated in this commit. I see > that you've added some in patch 4 - could you move the ones related tothis > change into this commit? I completely agree: it's nice to see how behavior is intended to change next to your code change. > Another way you could do this is to put your "add tests" commit first in > this series, changing the condition on the ones that are fixed later in the > series to "test_expect_failure". Then, in each commit that "fixes" a test's > behavior, change that test to "test_expect_success". This approach had the > added benefit of showing that, before this series, the tests would fail and > that this series explicitly fixes those scenarios. And this would be easier to adapt your current patch structure to this model: move the last commit to be first, but flip the expectation. Then modify the expectation for the tests that pass as you go. This only works as long as you can make an entire test pass with each change. If multiple changes are needed to make any one test pass, then we don't get the benefit we're looking for. In that case, your test might be covering too much behavior in a single test, so it would be worth rewriting the tests to check a smaller part of the behavior. Thanks, -Stolee
diff --git a/builtin/mv.c b/builtin/mv.c index 83a465ba83..32ad4d5682 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -185,8 +185,32 @@ int cmd_mv(int argc, const char **argv, const char *prefix) length = strlen(src); if (lstat(src, &st) < 0) { + /* + * TODO: for now, when you try to overwrite a <destination> + * with your <source> as a sparse file, if you supply a "--sparse" + * flag, then the action will be done without providing "--force" + * and no warning. + * + * This is mainly because the sparse <source> + * is not on-disk, and this if-else chain will be cut off early in + * this check, thus the "--force" check is ignored. Need fix. + */ + + int pos = cache_name_pos(src, length); + if (pos >= 0) { + const struct cache_entry *ce = active_cache[pos]; + + if (ce_skip_worktree(ce)) { + if (!ignore_sparse) + string_list_append(&only_match_skip_worktree, src); + else + modes[i] = SPARSE; + } + else + bad = _("bad source"); + } /* only error if existence is expected. */ - if (modes[i] != SPARSE) + else if (modes[i] != SPARSE) bad = _("bad source"); } else if (!strncmp(src, dst, length) && (dst[length] == 0 || dst[length] == '/')) {
Originally, moving a <source> file which is not on-disk but exists in index as a SKIP_WORKTREE enabled cache entry, "giv mv" command errors out with "bad source". Change the checking logic, so that such <source> file makes "giv mv" command warns with "advise_on_updating_sparse_paths()" instead of "bad source"; also user now can supply a "--sparse" flag so this operation can be carried out successfully. Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> --- I found a new problem introduced by this patch, it is written in the TODO. I still haven't found a better way to reconcile this conflict. Please enlighten me on this :-) builtin/mv.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)