From: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
To: shaoxuan.yuan02@gmail.com
Cc: derrickstolee@github.com, git@vger.kernel.org, gitster@pobox.com,
vdye@github.com
Subject: [PATCH v4 0/7] mv: fix out-of-cone file/directory move logic
Date: Thu, 23 Jun 2022 19:41:13 +0800 [thread overview]
Message-ID: <20220623114120.12768-1-shaoxuan.yuan02@gmail.com> (raw)
In-Reply-To: <20220331091755.385961-1-shaoxuan.yuan02@gmail.com>
## Changes since WIP v3 ##
1. Fix style-nits.
2. Move "mv: update sparsity after moving from out-of-cone to in-cone" to the
(2/7) position (was (7/7) position in WIP v3). Make this move so that we
can drop "git sparse-checkout reapply" from the tests, as suggested by
Victoria [1]. The reason is we need to check out the moved cache_entry
for all out-of-cone to in-cone moves, so this commit works better if being the
first one.
3. Fix the commit message of "mv: use flags mode for update_mode", as suggested
here [2].
4. Add "Helped-by" and "Suggested-by" trailers.
5. In "mv: add check_dir_in_index() and solve general dir check issue", change
the 'check_dir_in_index()' to no more accept 'namelen' as argument. The
original "namelen + 1" logic can be erroneous, for example when 'name' already
has a trailing slash. So just use strlen() to save the trouble.
## Notes ##
As discussed in WIP v3, we can postpone the "in-cone to out-of-cone" move
to a later series. Hence, this series' functionality part has been done,
remove the WIP prefix.
[1] https://lore.kernel.org/git/adb795ba-56ce-8441-0c38-a3e6b0a6e861@github.com/
[2] https://lore.kernel.org/git/01b39c63-5652-4293-0424-ff99b6f9f7d2@github.com/
Shaoxuan Yuan (7):
t7002: add tests for moving out-of-cone file/directory
mv: update sparsity after moving from out-of-cone to in-cone
mv: decouple if/else-if checks using goto
mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit
mv: check if <destination> exists in index to handle overwriting
mv: use flags mode for update_mode
mv: add check_dir_in_index() and solve general dir check issue
builtin/mv.c | 239 +++++++++++++++++++++++++---------
t/t7002-mv-sparse-checkout.sh | 84 ++++++++++++
2 files changed, 259 insertions(+), 64 deletions(-)
Range-diff against v3:
1: 574cbdfdb4 ! 1: 90c38f479b t7002: add tests for moving out-of-cone file/directory
@@ t/t7002-mv-sparse-checkout.sh: test_expect_success 'refuse to move file to non-s
+ test_when_finished "cleanup_sparse_checkout" &&
+ setup_sparse_checkout &&
+
-+ git mv --sparse folder1 sub 1>actual 2>stderr &&
++ git mv --sparse folder1 sub 2>stderr &&
+ test_must_be_empty stderr &&
+
-+ git sparse-checkout reapply &&
+ test_path_is_dir sub/folder1 &&
+ test_path_is_file sub/folder1/file1
+'
@@ t/t7002-mv-sparse-checkout.sh: test_expect_success 'refuse to move file to non-s
+ test_when_finished "cleanup_sparse_checkout" &&
+ setup_sparse_checkout &&
+
-+ git mv --sparse folder1/file1 sub 1>actual 2>stderr &&
++ git mv --sparse folder1/file1 sub 2>stderr &&
+ test_must_be_empty stderr &&
+
-+ git sparse-checkout reapply &&
-+ ! test_path_is_dir sub/folder1 &&
+ test_path_is_file sub/file1
+'
+
7: 6fa630203b ! 2: c6fcaf8313 mv: update sparsity after moving from out-of-cone to in-cone
@@ Commit message
2. The moved cache entry is checked out in the working tree to reflect
the updated sparsity.
+ Helped-by: Victoria Dye <vdye@github.com>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
## builtin/mv.c ##
@@ builtin/mv.c: int cmd_mv(int argc, const char **argv, const char *prefix)
assert(pos >= 0);
rename_cache_entry_at(pos, dst);
+
-+ if (mode & SPARSE) {
-+ if (path_in_sparse_checkout(dst, &the_index)) {
-+ int dst_pos;
++ if ((mode & SPARSE) &&
++ (path_in_sparse_checkout(dst, &the_index))) {
++ int dst_pos;
+
-+ dst_pos = cache_name_pos(dst, strlen(dst));
-+ active_cache[dst_pos]->ce_flags &= ~CE_SKIP_WORKTREE;
++ 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"), ce->name);
-+ }
++ if (checkout_entry(active_cache[dst_pos], &state, NULL, NULL))
++ die(_("cannot checkout %s"), ce->name);
+ }
}
if (gitmodules_modified)
-
- ## t/t7002-mv-sparse-checkout.sh ##
-@@ t/t7002-mv-sparse-checkout.sh: test_expect_success 'can move out-of-cone directory with --sparse' '
- git mv --sparse folder1 sub 1>actual 2>stderr &&
- test_must_be_empty stderr &&
-
-- git sparse-checkout reapply &&
- test_path_is_dir sub/folder1 &&
- test_path_is_file sub/folder1/file1
- '
-@@ t/t7002-mv-sparse-checkout.sh: test_expect_success 'can move out-of-cone file with --sparse' '
- git mv --sparse folder1/file1 sub 1>actual 2>stderr &&
- test_must_be_empty stderr &&
-
-- git sparse-checkout reapply &&
- ! test_path_is_dir sub/folder1 &&
- test_path_is_file sub/file1
- '
-@@ t/t7002-mv-sparse-checkout.sh: test_expect_success 'refuse to move sparse file to existing destination' '
- test_cmp expect stderr
- '
-
--test_expect_failure 'move sparse file to existing destination with --force and --sparse' '
-+test_expect_success 'move sparse file to existing destination with --force and --sparse' '
- test_when_finished "cleanup_sparse_checkout" &&
- mkdir folder1 &&
- touch folder1/file1 &&
2: aac267091b ! 3: aee896a3f2 mv: decouple if/else-if checks using goto
@@ Commit message
Refactor to decouple this if/else-if chain by using goto to jump ahead.
Suggested-by: Derrick Stolee <derrickstolee@github.com>
+ Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
## builtin/mv.c ##
@@ builtin/mv.c: int cmd_mv(int argc, const char **argv, const char *prefix)
3: b0e90cfa01 = 4: 82c10486ec mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit
4: c0c9dc9575 ! 5: 59dcf1a55f mv: check if <destination> exists in index to handle overwriting
@@ t/t7002-mv-sparse-checkout.sh: test_expect_success 'can move out-of-cone file wi
test_when_finished "cleanup_sparse_checkout" &&
mkdir folder1 &&
touch folder1/file1 &&
+@@ t/t7002-mv-sparse-checkout.sh: test_expect_failure 'refuse to move sparse file to existing destination' '
+ test_cmp expect stderr
+ '
+
+-test_expect_failure 'move sparse file to existing destination with --force and --sparse' '
++test_expect_success 'move sparse file to existing destination with --force and --sparse' '
+ test_when_finished "cleanup_sparse_checkout" &&
+ mkdir folder1 &&
+ touch folder1/file1 &&
5: 3088724e72 ! 6: b8e3094178 mv: use flags mode for update_mode
@@ Commit message
of the file and make it use "flags" mode (each state is a different
bit in the word).
+ Change the flag assignments from '=' (single assignment) to '|='
+ (additive). Also change flag evaluation from '==' to '&', etc.
+
[1] https://lore.kernel.org/git/22aadea2-9330-aa9e-7b6a-834585189144@github.com/
+ Helped-by: Victoria Dye <vdye@github.com>
+ Helped-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
## builtin/mv.c ##
@@ builtin/mv.c: static const char * const builtin_mv_usage[] = {
+ WORKING_DIRECTORY = (1 << 1),
+ INDEX = (1 << 2),
+ SPARSE = (1 << 3),
-+ SKIP_WORKTREE_DIR = (1 << 4),
+};
+
#define DUP_BASENAME 1
@@ builtin/mv.c: int cmd_mv(int argc, const char **argv, const char *prefix)
if (show_only)
continue;
- if (mode != INDEX && mode != SPARSE && rename(src, dst) < 0) {
-+ if (!(mode & (INDEX | SPARSE | SKIP_WORKTREE_DIR)) &&
-+ rename(src, dst) < 0) {
++ if (!(mode & (INDEX | SPARSE)) &&
++ rename(src, dst) < 0) {
if (ignore_errors)
continue;
die_errno(_("renaming '%s' failed"), src);
@@ builtin/mv.c: int cmd_mv(int argc, const char **argv, const char *prefix)
}
- if (mode == WORKING_DIRECTORY)
-+ if (mode & (WORKING_DIRECTORY | SKIP_WORKTREE_DIR))
++ if (mode & (WORKING_DIRECTORY))
continue;
pos = cache_name_pos(src, strlen(src));
6: 0c7ba28ddc ! 7: 080f34ee01 mv: add check_dir_in_index() and solve general dir check issue
@@ Commit message
instead of "bad source"; also user now can supply a "--sparse" flag so
this operation can be carried out successfully.
+ Helped-by: Victoria Dye <vdye@github.com>
+ Helped-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
## builtin/mv.c ##
+@@ builtin/mv.c: enum update_mode {
+ WORKING_DIRECTORY = (1 << 1),
+ INDEX = (1 << 2),
+ SPARSE = (1 << 3),
++ SKIP_WORKTREE_DIR = (1 << 4),
+ };
+
+ #define DUP_BASENAME 1
@@ builtin/mv.c: static int index_range_of_same_dir(const char *src, int length,
return last - first;
}
@@ builtin/mv.c: static int index_range_of_same_dir(const char *src, int length,
+ * marked with CE_SKIP_WORKTREE, the directory would be present in working tree).
+ * Return 1 otherwise.
+ */
-+static int check_dir_in_index(const char *name, int namelen)
++static int check_dir_in_index(const char *name)
+{
-+ int ret = 1;
+ const char *with_slash = add_slash(name);
-+ int length = namelen + 1;
++ int length = strlen(with_slash);
+
+ int pos = cache_name_pos(with_slash, length);
+ const struct cache_entry *ce;
@@ builtin/mv.c: static int index_range_of_same_dir(const char *src, int length,
+ if (pos < 0) {
+ pos = -pos - 1;
+ if (pos >= the_index.cache_nr)
-+ return ret;
++ return 1;
+ ce = active_cache[pos];
+ if (strncmp(with_slash, ce->name, length))
-+ return ret;
++ return 1;
+ if (ce_skip_worktree(ce))
-+ return ret = 0;
++ return 0;
+ }
-+ return ret;
++ return 1;
+}
+
int cmd_mv(int argc, const char **argv, const char *prefix)
@@ builtin/mv.c: int cmd_mv(int argc, const char **argv, const char *prefix)
pos = cache_name_pos(src, length);
if (pos < 0) {
+ const char *src_w_slash = add_slash(src);
-+ if (!check_dir_in_index(src, length) &&
-+ !path_in_sparse_checkout(src_w_slash, &the_index)) {
++ if (!path_in_sparse_checkout(src_w_slash, &the_index) &&
++ !check_dir_in_index(src)) {
+ modes[i] |= SKIP_WORKTREE_DIR;
+ goto dir_check;
+ }
@@ builtin/mv.c: int cmd_mv(int argc, const char **argv, const char *prefix)
+dir_check:
+ if (S_ISDIR(st.st_mode)) {
int j, dst_len, n;
-- int first = cache_name_pos(src, length), last;
-+ int first, last;
-+ first = cache_name_pos(src, length);
+ int first = cache_name_pos(src, length), last;
+
+@@ builtin/mv.c: int cmd_mv(int argc, const char **argv, const char *prefix)
+ printf(_("Renaming %s to %s\n"), src, dst);
+ if (show_only)
+ continue;
+- if (!(mode & (INDEX | SPARSE)) &&
++ if (!(mode & (INDEX | SPARSE | SKIP_WORKTREE_DIR)) &&
+ rename(src, dst) < 0) {
+ if (ignore_errors)
+ continue;
+@@ builtin/mv.c: int cmd_mv(int argc, const char **argv, const char *prefix)
+ 1);
+ }
+
+- if (mode & (WORKING_DIRECTORY))
++ if (mode & (WORKING_DIRECTORY | SKIP_WORKTREE_DIR))
+ continue;
- if (first >= 0) {
- prepare_move_submodule(src, first,
+ pos = cache_name_pos(src, strlen(src));
## t/t7002-mv-sparse-checkout.sh ##
@@ t/t7002-mv-sparse-checkout.sh: test_expect_success 'refuse to move file to non-skip-worktree sparse path' '
base-commit: ddbc07872e86265dc30aefa5f4d881f762120044
--
2.35.1
next prev parent reply other threads:[~2022-06-23 11:41 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 9:17 [WIP v1 0/4] mv: fix out-of-cone file/directory move logic Shaoxuan Yuan
2022-03-31 9:17 ` [WIP v1 1/4] mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit Shaoxuan Yuan
2022-03-31 16:39 ` Victoria Dye
2022-04-01 14:30 ` Derrick Stolee
2022-03-31 9:17 ` [WIP v1 2/4] mv: add check_dir_in_index() and solve general dir check issue Shaoxuan Yuan
2022-03-31 10:25 ` Ævar Arnfjörð Bjarmason
2022-04-01 3:51 ` Shaoxuan Yuan
2022-03-31 21:28 ` Victoria Dye
2022-04-01 12:49 ` Shaoxuan Yuan
2022-04-01 14:49 ` Derrick Stolee
2022-04-04 7:25 ` Shaoxuan Yuan
2022-04-04 7:49 ` Shaoxuan Yuan
2022-04-04 12:43 ` Derrick Stolee
2022-03-31 9:17 ` [WIP v1 3/4] mv: add advise_to_reapply hint for moving file into cone Shaoxuan Yuan
2022-03-31 10:30 ` Ævar Arnfjörð Bjarmason
2022-04-01 4:00 ` Shaoxuan Yuan
2022-04-01 8:02 ` Ævar Arnfjörð Bjarmason
2022-04-03 2:01 ` Eric Sunshine
2022-03-31 21:56 ` Victoria Dye
2022-04-01 14:55 ` Derrick Stolee
2022-03-31 9:17 ` [WIP v1 4/4] t7002: add tests for moving out-of-cone file/directory Shaoxuan Yuan
2022-03-31 10:33 ` Ævar Arnfjörð Bjarmason
2022-03-31 22:11 ` Victoria Dye
2022-03-31 9:28 ` [WIP v1 0/4] mv: fix out-of-cone file/directory move logic Shaoxuan Yuan
2022-03-31 22:21 ` Victoria Dye
2022-04-01 12:18 ` Shaoxuan Yuan
2022-04-08 12:22 ` Shaoxuan Yuan
2022-05-27 10:07 ` [WIP v2 0/5] " Shaoxuan Yuan
2022-05-27 10:08 ` [WIP v2 1/5] t7002: add tests for moving out-of-cone file/directory Shaoxuan Yuan
2022-05-27 12:07 ` Ævar Arnfjörð Bjarmason
2022-05-27 14:48 ` Derrick Stolee
2022-05-27 15:51 ` Victoria Dye
2022-05-27 10:08 ` [WIP v2 2/5] mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit Shaoxuan Yuan
2022-05-27 15:13 ` Derrick Stolee
2022-05-27 22:38 ` Victoria Dye
2022-05-31 8:06 ` Shaoxuan Yuan
2022-05-27 10:08 ` [WIP v2 3/5] mv: check if <destination> exists in index to handle overwriting Shaoxuan Yuan
2022-05-27 22:04 ` Victoria Dye
2022-05-27 10:08 ` [WIP v2 4/5] mv: add check_dir_in_index() and solve general dir check issue Shaoxuan Yuan
2022-05-27 15:27 ` Derrick Stolee
2022-05-31 9:56 ` Shaoxuan Yuan
2022-05-31 15:49 ` Derrick Stolee
2022-05-27 10:08 ` [WIP v2 5/5] mv: use update_sparsity() after touching sparse contents Shaoxuan Yuan
2022-05-27 12:10 ` Ævar Arnfjörð Bjarmason
2022-05-27 19:36 ` Victoria Dye
2022-05-27 19:59 ` Junio C Hamano
2022-05-27 21:24 ` Victoria Dye
2022-06-16 13:51 ` Shaoxuan Yuan
2022-06-16 16:42 ` Victoria Dye
2022-06-17 2:15 ` Shaoxuan Yuan
2022-06-19 3:25 ` [WIP v3 0/7] mv: fix out-of-cone file/directory move logic Shaoxuan Yuan
2022-06-19 3:25 ` [WIP v3 1/7] t7002: add tests for moving out-of-cone file/directory Shaoxuan Yuan
2022-06-21 21:23 ` Victoria Dye
2022-06-19 3:25 ` [WIP v3 2/7] mv: decouple if/else-if checks using goto Shaoxuan Yuan
2022-06-19 3:25 ` [WIP v3 3/7] mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit Shaoxuan Yuan
2022-06-19 3:25 ` [WIP v3 4/7] mv: check if <destination> exists in index to handle overwriting Shaoxuan Yuan
2022-06-19 3:25 ` [WIP v3 5/7] mv: use flags mode for update_mode Shaoxuan Yuan
2022-06-21 22:32 ` Victoria Dye
2022-06-22 9:37 ` Shaoxuan Yuan
2022-06-19 3:25 ` [WIP v3 6/7] mv: add check_dir_in_index() and solve general dir check issue Shaoxuan Yuan
2022-06-21 22:55 ` Victoria Dye
2022-06-19 3:25 ` [WIP v3 7/7] mv: update sparsity after moving from out-of-cone to in-cone Shaoxuan Yuan
2022-06-21 23:11 ` Victoria Dye
2022-06-21 23:30 ` [WIP v3 0/7] mv: fix out-of-cone file/directory move logic Victoria Dye
2022-06-23 15:06 ` Derrick Stolee
2022-06-23 16:19 ` Junio C Hamano
2022-06-24 8:26 ` Shaoxuan Yuan
2022-06-23 11:41 ` Shaoxuan Yuan [this message]
2022-06-23 11:41 ` [PATCH v4 1/7] t7002: add tests for moving out-of-cone file/directory Shaoxuan Yuan
2022-06-23 11:41 ` [PATCH v4 2/7] mv: update sparsity after moving from out-of-cone to in-cone Shaoxuan Yuan
2022-06-23 15:08 ` Derrick Stolee
2022-06-24 8:04 ` Shaoxuan Yuan
2022-06-27 13:55 ` Derrick Stolee
2022-06-23 11:41 ` [PATCH v4 3/7] mv: decouple if/else-if checks using goto Shaoxuan Yuan
2022-06-23 11:41 ` [PATCH v4 4/7] mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit Shaoxuan Yuan
2022-06-23 11:41 ` [PATCH v4 5/7] mv: check if <destination> exists in index to handle overwriting Shaoxuan Yuan
2022-06-23 11:41 ` [PATCH v4 6/7] mv: use flags mode for update_mode Shaoxuan Yuan
2022-06-23 15:10 ` Derrick Stolee
2022-06-23 11:41 ` [PATCH v4 7/7] mv: add check_dir_in_index() and solve general dir check issue Shaoxuan Yuan
2022-06-23 15:14 ` Derrick Stolee
2022-06-24 7:57 ` Shaoxuan Yuan
2022-06-27 13:59 ` Derrick Stolee
2022-06-23 15:16 ` [PATCH v4 0/7] mv: fix out-of-cone file/directory move logic Derrick Stolee
2022-06-23 18:05 ` Junio C Hamano
2022-06-30 2:37 ` [PATCH v5 0/8] " Shaoxuan Yuan
2022-06-30 2:37 ` [PATCH v5 1/8] t7002: add tests for moving out-of-cone file/directory Shaoxuan Yuan
2022-06-30 2:37 ` [PATCH v5 2/8] t1092: mv directory from out-of-cone to in-cone Shaoxuan Yuan
2022-06-30 2:37 ` [PATCH v5 3/8] mv: update sparsity after moving " Shaoxuan Yuan
2022-06-30 2:37 ` [PATCH v5 4/8] mv: decouple if/else-if checks using goto Shaoxuan Yuan
2022-06-30 2:37 ` [PATCH v5 5/8] mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit Shaoxuan Yuan
2022-06-30 2:37 ` [PATCH v5 6/8] mv: check if <destination> exists in index to handle overwriting Shaoxuan Yuan
2022-06-30 2:37 ` [PATCH v5 7/8] mv: use flags mode for update_mode Shaoxuan Yuan
2022-06-30 2:37 ` [PATCH v5 8/8] mv: add check_dir_in_index() and solve general dir check issue Shaoxuan Yuan
2022-07-01 19:43 ` [PATCH v5 0/8] mv: fix out-of-cone file/directory move logic Derrick Stolee
2022-07-01 21:50 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220623114120.12768-1-shaoxuan.yuan02@gmail.com \
--to=shaoxuan.yuan02@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vdye@github.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).