2006-07-26 01:52:35 +00:00
|
|
|
/*
|
|
|
|
* "git mv" builtin command
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006 Johannes Schindelin
|
|
|
|
*/
|
2023-02-10 10:28:36 +00:00
|
|
|
#define USE_THE_INDEX_VARIABLE
|
2006-07-26 01:52:35 +00:00
|
|
|
#include "builtin.h"
|
2023-03-21 06:25:58 +00:00
|
|
|
#include "abspath.h"
|
2023-04-11 03:00:39 +00:00
|
|
|
#include "advice.h"
|
2023-02-24 00:09:24 +00:00
|
|
|
#include "alloc.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
2023-03-21 06:26:03 +00:00
|
|
|
#include "environment.h"
|
2023-03-21 06:25:54 +00:00
|
|
|
#include "gettext.h"
|
2023-04-11 07:41:53 +00:00
|
|
|
#include "object-file.h"
|
2017-01-04 18:03:56 +00:00
|
|
|
#include "pathspec.h"
|
2014-10-01 10:28:42 +00:00
|
|
|
#include "lockfile.h"
|
2006-07-26 01:52:35 +00:00
|
|
|
#include "dir.h"
|
|
|
|
#include "cache-tree.h"
|
2008-07-21 18:03:49 +00:00
|
|
|
#include "string-list.h"
|
2007-10-07 12:19:33 +00:00
|
|
|
#include "parse-options.h"
|
2023-04-22 20:17:20 +00:00
|
|
|
#include "repository.h"
|
2023-03-21 06:26:05 +00:00
|
|
|
#include "setup.h"
|
2013-07-30 19:50:03 +00:00
|
|
|
#include "submodule.h"
|
2022-06-30 02:37:32 +00:00
|
|
|
#include "entry.h"
|
2006-07-26 01:52:35 +00:00
|
|
|
|
2007-10-07 12:19:33 +00:00
|
|
|
static const char * const builtin_mv_usage[] = {
|
2015-01-13 07:44:47 +00:00
|
|
|
N_("git mv [<options>] <source>... <destination>"),
|
2007-10-07 12:19:33 +00:00
|
|
|
NULL
|
|
|
|
};
|
2006-07-26 01:52:35 +00:00
|
|
|
|
2022-06-30 02:37:36 +00:00
|
|
|
enum update_mode {
|
|
|
|
WORKING_DIRECTORY = (1 << 1),
|
|
|
|
INDEX = (1 << 2),
|
|
|
|
SPARSE = (1 << 3),
|
2022-06-30 02:37:37 +00:00
|
|
|
SKIP_WORKTREE_DIR = (1 << 4),
|
2022-06-30 02:37:36 +00:00
|
|
|
};
|
|
|
|
|
2013-12-03 08:32:04 +00:00
|
|
|
#define DUP_BASENAME 1
|
|
|
|
#define KEEP_TRAILING_SLASH 2
|
|
|
|
|
2017-01-04 18:03:56 +00:00
|
|
|
static const char **internal_prefix_pathspec(const char *prefix,
|
|
|
|
const char **pathspec,
|
|
|
|
int count, unsigned flags)
|
2006-07-26 01:52:35 +00:00
|
|
|
{
|
2006-08-16 08:44:02 +00:00
|
|
|
int i;
|
2016-02-22 22:44:25 +00:00
|
|
|
const char **result;
|
2017-01-04 18:03:56 +00:00
|
|
|
int prefixlen = prefix ? strlen(prefix) : 0;
|
2016-02-22 22:44:25 +00:00
|
|
|
ALLOC_ARRAY(result, count + 1);
|
2017-01-04 18:03:56 +00:00
|
|
|
|
|
|
|
/* Create an intermediate copy of the pathspec based on the flags */
|
2006-08-16 08:44:02 +00:00
|
|
|
for (i = 0; i < count; i++) {
|
2017-01-04 18:03:56 +00:00
|
|
|
int length = strlen(pathspec[i]);
|
2010-01-22 22:17:06 +00:00
|
|
|
int to_copy = length;
|
2017-01-04 18:03:56 +00:00
|
|
|
char *it;
|
2013-12-03 08:32:04 +00:00
|
|
|
while (!(flags & KEEP_TRAILING_SLASH) &&
|
2017-01-04 18:03:56 +00:00
|
|
|
to_copy > 0 && is_dir_sep(pathspec[i][to_copy - 1]))
|
2010-01-22 22:17:06 +00:00
|
|
|
to_copy--;
|
2017-01-04 18:03:56 +00:00
|
|
|
|
|
|
|
it = xmemdupz(pathspec[i], to_copy);
|
|
|
|
if (flags & DUP_BASENAME) {
|
|
|
|
result[i] = xstrdup(basename(it));
|
|
|
|
free(it);
|
|
|
|
} else {
|
|
|
|
result[i] = it;
|
2010-01-22 22:17:06 +00:00
|
|
|
}
|
2006-07-26 01:52:35 +00:00
|
|
|
}
|
2017-01-04 18:03:56 +00:00
|
|
|
result[count] = NULL;
|
|
|
|
|
|
|
|
/* Prefix the pathspec and free the old intermediate strings */
|
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
const char *match = prefix_path(prefix, prefixlen, result[i]);
|
|
|
|
free((char *) result[i]);
|
|
|
|
result[i] = match;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
2006-07-26 01:52:35 +00:00
|
|
|
}
|
|
|
|
|
2006-07-26 17:47:54 +00:00
|
|
|
static const char *add_slash(const char *path)
|
|
|
|
{
|
2016-02-22 22:44:35 +00:00
|
|
|
size_t len = strlen(path);
|
2022-09-09 22:27:36 +00:00
|
|
|
if (len && path[len - 1] != '/') {
|
2016-02-22 22:44:35 +00:00
|
|
|
char *with_slash = xmalloc(st_add(len, 2));
|
2006-07-26 17:47:54 +00:00
|
|
|
memcpy(with_slash, path, len);
|
2006-08-08 19:21:33 +00:00
|
|
|
with_slash[len++] = '/';
|
|
|
|
with_slash[len] = 0;
|
2006-07-26 17:47:54 +00:00
|
|
|
return with_slash;
|
|
|
|
}
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
2013-10-13 11:52:05 +00:00
|
|
|
#define SUBMODULE_WITH_GITDIR ((const char *)1)
|
2006-07-26 01:52:35 +00:00
|
|
|
|
2014-08-10 02:29:31 +00:00
|
|
|
static void prepare_move_submodule(const char *src, int first,
|
|
|
|
const char **submodule_gitfile)
|
|
|
|
{
|
|
|
|
struct strbuf submodule_dotgit = STRBUF_INIT;
|
2022-11-19 13:07:34 +00:00
|
|
|
if (!S_ISGITLINK(the_index.cache[first]->ce_mode))
|
2014-08-10 02:29:31 +00:00
|
|
|
die(_("Directory %s is in index and no submodule?"), src);
|
2017-08-02 19:49:20 +00:00
|
|
|
if (!is_staging_gitmodules_ok(&the_index))
|
2014-08-10 02:29:31 +00:00
|
|
|
die(_("Please stage your changes to .gitmodules or stash them to proceed"));
|
|
|
|
strbuf_addf(&submodule_dotgit, "%s/.git", src);
|
|
|
|
*submodule_gitfile = read_gitfile(submodule_dotgit.buf);
|
|
|
|
if (*submodule_gitfile)
|
|
|
|
*submodule_gitfile = xstrdup(*submodule_gitfile);
|
|
|
|
else
|
|
|
|
*submodule_gitfile = SUBMODULE_WITH_GITDIR;
|
|
|
|
strbuf_release(&submodule_dotgit);
|
|
|
|
}
|
|
|
|
|
2014-08-10 02:29:33 +00:00
|
|
|
static int index_range_of_same_dir(const char *src, int length,
|
|
|
|
int *first_p, int *last_p)
|
|
|
|
{
|
|
|
|
const char *src_w_slash = add_slash(src);
|
|
|
|
int first, last, len_w_slash = length + 1;
|
|
|
|
|
2022-11-19 13:07:38 +00:00
|
|
|
first = index_name_pos(&the_index, src_w_slash, len_w_slash);
|
2014-08-10 02:29:33 +00:00
|
|
|
if (first >= 0)
|
|
|
|
die(_("%.*s is in index"), len_w_slash, src_w_slash);
|
|
|
|
|
|
|
|
first = -1 - first;
|
2022-11-19 13:07:34 +00:00
|
|
|
for (last = first; last < the_index.cache_nr; last++) {
|
|
|
|
const char *path = the_index.cache[last]->name;
|
2014-08-10 02:29:33 +00:00
|
|
|
if (strncmp(path, src_w_slash, len_w_slash))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (src_w_slash != src)
|
|
|
|
free((char *)src_w_slash);
|
|
|
|
*first_p = first;
|
|
|
|
*last_p = last;
|
|
|
|
return last - first;
|
|
|
|
}
|
|
|
|
|
2022-06-30 02:37:37 +00:00
|
|
|
/*
|
2022-08-09 12:09:03 +00:00
|
|
|
* Given the path of a directory that does not exist on-disk, check whether the
|
|
|
|
* directory contains any entries in the index with the SKIP_WORKTREE flag
|
|
|
|
* enabled.
|
|
|
|
* Return 1 if such index entries exist.
|
|
|
|
* Return 0 otherwise.
|
2022-06-30 02:37:37 +00:00
|
|
|
*/
|
2022-08-09 12:09:03 +00:00
|
|
|
static int empty_dir_has_sparse_contents(const char *name)
|
2022-06-30 02:37:37 +00:00
|
|
|
{
|
2022-08-09 12:09:04 +00:00
|
|
|
int ret = 0;
|
2022-06-30 02:37:37 +00:00
|
|
|
const char *with_slash = add_slash(name);
|
|
|
|
int length = strlen(with_slash);
|
|
|
|
|
2022-11-19 13:07:38 +00:00
|
|
|
int pos = index_name_pos(&the_index, with_slash, length);
|
2022-06-30 02:37:37 +00:00
|
|
|
const struct cache_entry *ce;
|
|
|
|
|
|
|
|
if (pos < 0) {
|
|
|
|
pos = -pos - 1;
|
|
|
|
if (pos >= the_index.cache_nr)
|
2022-08-09 12:09:04 +00:00
|
|
|
goto free_return;
|
2022-11-19 13:07:34 +00:00
|
|
|
ce = the_index.cache[pos];
|
2022-06-30 02:37:37 +00:00
|
|
|
if (strncmp(with_slash, ce->name, length))
|
2022-08-09 12:09:04 +00:00
|
|
|
goto free_return;
|
2022-06-30 02:37:37 +00:00
|
|
|
if (ce_skip_worktree(ce))
|
2022-08-09 12:09:04 +00:00
|
|
|
ret = 1;
|
2022-06-30 02:37:37 +00:00
|
|
|
}
|
2022-08-09 12:09:04 +00:00
|
|
|
|
|
|
|
free_return:
|
|
|
|
if (with_slash != name)
|
|
|
|
free((char *)with_slash);
|
|
|
|
return ret;
|
2022-06-30 02:37:37 +00:00
|
|
|
}
|
|
|
|
|
2006-07-29 08:54:54 +00:00
|
|
|
int cmd_mv(int argc, const char **argv, const char *prefix)
|
2006-07-26 01:52:35 +00:00
|
|
|
{
|
2016-08-05 14:41:12 +00:00
|
|
|
int i, flags, gitmodules_modified = 0;
|
2021-09-24 15:39:13 +00:00
|
|
|
int verbose = 0, show_only = 0, force = 0, ignore_errors = 0, ignore_sparse = 0;
|
2007-10-07 12:19:33 +00:00
|
|
|
struct option builtin_mv_options[] = {
|
2012-08-20 12:32:26 +00:00
|
|
|
OPT__VERBOSE(&verbose, N_("be verbose")),
|
|
|
|
OPT__DRY_RUN(&show_only, N_("dry run")),
|
2018-02-09 11:02:06 +00:00
|
|
|
OPT__FORCE(&force, N_("force move/rename even if target exists"),
|
|
|
|
PARSE_OPT_NOCOMPLETE),
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
|
2021-09-24 15:39:13 +00:00
|
|
|
OPT_BOOL(0, "sparse", &ignore_sparse, N_("allow updating entries outside of the sparse-checkout cone")),
|
2007-10-07 12:19:33 +00:00
|
|
|
OPT_END(),
|
|
|
|
};
|
2013-07-30 19:50:03 +00:00
|
|
|
const char **source, **destination, **dest_path, **submodule_gitfile;
|
2022-08-09 12:09:05 +00:00
|
|
|
const char *dst_w_slash;
|
2022-08-09 12:09:08 +00:00
|
|
|
const char **src_dir = NULL;
|
|
|
|
int src_dir_nr = 0, src_dir_alloc = 0;
|
|
|
|
struct strbuf a_src_dir = STRBUF_INIT;
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
enum update_mode *modes, dst_mode = 0;
|
2006-07-26 01:52:35 +00:00
|
|
|
struct stat st;
|
2010-07-04 19:46:19 +00:00
|
|
|
struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
|
lock_file: move static locks into functions
Placing `struct lock_file`s on the stack used to be a bad idea, because
the temp- and lockfile-machinery would keep a pointer into the struct.
But after 076aa2cbd (tempfile: auto-allocate tempfiles on heap,
2017-09-05), we can safely have lockfiles on the stack. (This applies
even if a user returns early, leaving a locked lock behind.)
Each of these `struct lock_file`s is used from within a single function.
Move them into the respective functions to make the scope clearer and
drop the staticness.
For good measure, I have inspected these sites and come to believe that
they always release the lock, with the possible exception of bailing out
using `die()` or `exit()` or by returning from a `cmd_foo()`.
As pointed out by Jeff King, it would be bad if someone held on to a
`struct lock_file *` for some reason. After some grepping, I agree with
his findings: no-one appears to be doing that.
After this commit, the remaining occurrences of "static struct
lock_file" are locks that are used from within different functions. That
is, they need to remain static. (Short of more intrusive changes like
passing around pointers to non-static locks.)
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-05-09 20:55:39 +00:00
|
|
|
struct lock_file lock_file = LOCK_INIT;
|
2020-07-20 06:17:52 +00:00
|
|
|
struct cache_entry *ce;
|
2021-09-24 15:39:13 +00:00
|
|
|
struct string_list only_match_skip_worktree = STRING_LIST_INIT_NODUP;
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
struct string_list dirty_paths = STRING_LIST_INIT_NODUP;
|
2006-07-26 01:52:35 +00:00
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2006-07-26 01:52:35 +00:00
|
|
|
|
2009-05-23 18:53:12 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, builtin_mv_options,
|
|
|
|
builtin_mv_usage, 0);
|
2007-10-07 12:19:33 +00:00
|
|
|
if (--argc < 1)
|
|
|
|
usage_with_options(builtin_mv_usage, builtin_mv_options);
|
2006-07-26 01:52:35 +00:00
|
|
|
|
2022-11-19 13:07:38 +00:00
|
|
|
repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);
|
|
|
|
if (repo_read_index(the_repository) < 0)
|
2011-02-22 23:42:03 +00:00
|
|
|
die(_("index file corrupt"));
|
2009-11-09 15:05:01 +00:00
|
|
|
|
2017-01-04 18:03:56 +00:00
|
|
|
source = internal_prefix_pathspec(prefix, argv, argc, 0);
|
builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove()
The variables 'source', 'destination', and 'submodule_gitfile' are
all of type "const char **", and an element of such an array is of
"type const char *", but these memmove() calls were written as if
these variables are of type "char **".
Once these memmove() calls are fixed to use the correct type to
compute the number of bytes to be moved, e.g.
- memmove(source + i, source + i + 1, n * sizeof(char *));
+ memmove(source + i, source + i + 1, n * sizeof(const char *));
existing contrib/coccinelle/array.cocci rules can recognize them as
candidates for turning into MOVE_ARRAY().
While at it, use CALLOC_ARRAY() instead of xcalloc() to allocate the
modes[] array that is involved in the change.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-10 01:33:54 +00:00
|
|
|
CALLOC_ARRAY(modes, argc);
|
|
|
|
|
2013-12-03 08:32:04 +00:00
|
|
|
/*
|
|
|
|
* Keep trailing slash, needed to let
|
2016-08-05 14:41:12 +00:00
|
|
|
* "git mv file no-such-dir/" error out, except in the case
|
|
|
|
* "git mv directory no-such-dir/".
|
2013-12-03 08:32:04 +00:00
|
|
|
*/
|
2016-08-05 14:41:12 +00:00
|
|
|
flags = KEEP_TRAILING_SLASH;
|
|
|
|
if (argc == 1 && is_directory(argv[0]) && !is_directory(argv[1]))
|
|
|
|
flags = 0;
|
2017-01-04 18:03:56 +00:00
|
|
|
dest_path = internal_prefix_pathspec(prefix, argv + argc, 1, flags);
|
2022-08-09 12:09:05 +00:00
|
|
|
dst_w_slash = add_slash(dest_path[0]);
|
2013-07-30 19:50:03 +00:00
|
|
|
submodule_gitfile = xcalloc(argc, sizeof(char *));
|
2006-07-26 01:52:35 +00:00
|
|
|
|
2006-08-18 10:42:39 +00:00
|
|
|
if (dest_path[0][0] == '\0')
|
|
|
|
/* special case: "." was normalized to "" */
|
2017-01-04 18:03:56 +00:00
|
|
|
destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
|
2006-08-18 10:42:39 +00:00
|
|
|
else if (!lstat(dest_path[0], &st) &&
|
2006-07-26 17:47:54 +00:00
|
|
|
S_ISDIR(st.st_mode)) {
|
2022-08-09 12:09:05 +00:00
|
|
|
destination = internal_prefix_pathspec(dst_w_slash, argv, argc, DUP_BASENAME);
|
2006-07-26 17:47:54 +00:00
|
|
|
} else {
|
2022-08-09 12:09:05 +00:00
|
|
|
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);
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
dst_mode = SKIP_WORKTREE_DIR;
|
2022-08-09 12:09:05 +00:00
|
|
|
} else if (argc != 1) {
|
2014-08-10 02:29:29 +00:00
|
|
|
die(_("destination '%s' is not a directory"), dest_path[0]);
|
2022-08-09 12:09:05 +00:00
|
|
|
} else {
|
|
|
|
destination = dest_path;
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
/*
|
|
|
|
* <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;
|
2022-08-09 12:09:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (dst_w_slash != dest_path[0]) {
|
|
|
|
free((char *)dst_w_slash);
|
|
|
|
dst_w_slash = NULL;
|
2006-07-26 01:52:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Checking */
|
2007-10-07 12:19:33 +00:00
|
|
|
for (i = 0; i < argc; i++) {
|
2006-08-19 14:52:21 +00:00
|
|
|
const char *src = source[i], *dst = destination[i];
|
2022-06-30 02:37:37 +00:00
|
|
|
int length;
|
2006-07-26 01:52:35 +00:00
|
|
|
const char *bad = NULL;
|
2021-09-24 15:39:13 +00:00
|
|
|
int skip_sparse = 0;
|
2006-07-26 01:52:35 +00:00
|
|
|
|
|
|
|
if (show_only)
|
2011-02-22 23:42:03 +00:00
|
|
|
printf(_("Checking rename of '%s' to '%s'\n"), src, dst);
|
2006-07-26 01:52:35 +00:00
|
|
|
|
2006-08-19 14:52:21 +00:00
|
|
|
length = strlen(src);
|
2021-09-24 15:39:13 +00:00
|
|
|
if (lstat(src, &st) < 0) {
|
2022-06-30 02:37:34 +00:00
|
|
|
int pos;
|
|
|
|
const struct cache_entry *ce;
|
|
|
|
|
2022-11-19 13:07:38 +00:00
|
|
|
pos = index_name_pos(&the_index, src, length);
|
2022-06-30 02:37:34 +00:00
|
|
|
if (pos < 0) {
|
2022-06-30 02:37:37 +00:00
|
|
|
const char *src_w_slash = add_slash(src);
|
|
|
|
if (!path_in_sparse_checkout(src_w_slash, &the_index) &&
|
2022-08-09 12:09:03 +00:00
|
|
|
empty_dir_has_sparse_contents(src)) {
|
2022-06-30 02:37:37 +00:00
|
|
|
modes[i] |= SKIP_WORKTREE_DIR;
|
|
|
|
goto dir_check;
|
|
|
|
}
|
2022-06-30 02:37:34 +00:00
|
|
|
/* only error if existence is expected. */
|
2022-06-30 02:37:36 +00:00
|
|
|
if (!(modes[i] & SPARSE))
|
2022-06-30 02:37:34 +00:00
|
|
|
bad = _("bad source");
|
|
|
|
goto act_on_entry;
|
|
|
|
}
|
2022-11-19 13:07:34 +00:00
|
|
|
ce = the_index.cache[pos];
|
2022-06-30 02:37:34 +00:00
|
|
|
if (!ce_skip_worktree(ce)) {
|
2021-09-24 15:39:13 +00:00
|
|
|
bad = _("bad source");
|
2022-06-30 02:37:33 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
2022-06-30 02:37:35 +00:00
|
|
|
if (!ignore_sparse) {
|
2022-06-30 02:37:34 +00:00
|
|
|
string_list_append(&only_match_skip_worktree, src);
|
2022-06-30 02:37:35 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
|
|
|
/* Check if dst exists in index */
|
2022-11-19 13:07:38 +00:00
|
|
|
if (index_name_pos(&the_index, dst, strlen(dst)) < 0) {
|
2022-06-30 02:37:36 +00:00
|
|
|
modes[i] |= SPARSE;
|
2022-06-30 02:37:35 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
|
|
|
if (!force) {
|
|
|
|
bad = _("destination exists");
|
|
|
|
goto act_on_entry;
|
|
|
|
}
|
2022-06-30 02:37:36 +00:00
|
|
|
modes[i] |= SPARSE;
|
2022-06-30 02:37:34 +00:00
|
|
|
goto act_on_entry;
|
2022-06-30 02:37:33 +00:00
|
|
|
}
|
|
|
|
if (!strncmp(src, dst, length) &&
|
|
|
|
(dst[length] == 0 || dst[length] == '/')) {
|
2011-02-22 23:42:04 +00:00
|
|
|
bad = _("can not move directory into itself");
|
2022-06-30 02:37:33 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
2022-06-30 02:37:37 +00:00
|
|
|
if (S_ISDIR(st.st_mode)
|
2022-06-30 02:37:33 +00:00
|
|
|
&& lstat(dst, &st) == 0) {
|
2011-02-22 23:42:04 +00:00
|
|
|
bad = _("cannot move directory over file");
|
2022-06-30 02:37:33 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
2022-06-30 02:37:37 +00:00
|
|
|
|
|
|
|
dir_check:
|
|
|
|
if (S_ISDIR(st.st_mode)) {
|
2022-06-30 02:37:33 +00:00
|
|
|
int j, dst_len, n;
|
2022-11-19 13:07:38 +00:00
|
|
|
int first = index_name_pos(&the_index, src, length), last;
|
2014-08-10 02:29:31 +00:00
|
|
|
|
2022-06-30 02:37:33 +00:00
|
|
|
if (first >= 0) {
|
2014-08-10 02:29:31 +00:00
|
|
|
prepare_move_submodule(src, first,
|
|
|
|
submodule_gitfile + i);
|
2022-06-30 02:37:33 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
} else if (index_range_of_same_dir(src, length,
|
|
|
|
&first, &last) < 1) {
|
2014-08-10 02:29:34 +00:00
|
|
|
bad = _("source directory is empty");
|
2022-06-30 02:37:33 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
2013-07-30 19:49:25 +00:00
|
|
|
|
2022-06-30 02:37:33 +00:00
|
|
|
/* last - first >= 1 */
|
2022-06-30 02:37:36 +00:00
|
|
|
modes[i] |= WORKING_DIRECTORY;
|
2022-08-09 12:09:08 +00:00
|
|
|
|
|
|
|
ALLOC_GROW(src_dir, src_dir_nr + 1, src_dir_alloc);
|
|
|
|
src_dir[src_dir_nr++] = src;
|
|
|
|
|
2022-06-30 02:37:33 +00:00
|
|
|
n = argc + last - first;
|
|
|
|
REALLOC_ARRAY(source, n);
|
|
|
|
REALLOC_ARRAY(destination, n);
|
|
|
|
REALLOC_ARRAY(modes, n);
|
|
|
|
REALLOC_ARRAY(submodule_gitfile, n);
|
2014-08-10 02:29:34 +00:00
|
|
|
|
2022-06-30 02:37:33 +00:00
|
|
|
dst = add_slash(dst);
|
|
|
|
dst_len = strlen(dst);
|
2014-08-10 02:29:34 +00:00
|
|
|
|
2022-06-30 02:37:33 +00:00
|
|
|
for (j = 0; j < last - first; j++) {
|
2022-11-19 13:07:34 +00:00
|
|
|
const struct cache_entry *ce = the_index.cache[first + j];
|
2022-06-30 02:37:33 +00:00
|
|
|
const char *path = ce->name;
|
|
|
|
source[argc + j] = path;
|
|
|
|
destination[argc + j] =
|
|
|
|
prefix_path(dst, dst_len, path + length + 1);
|
2022-06-30 02:37:36 +00:00
|
|
|
memset(modes + argc + j, 0, sizeof(enum update_mode));
|
|
|
|
modes[argc + j] |= ce_skip_worktree(ce) ? SPARSE : INDEX;
|
2022-06-30 02:37:33 +00:00
|
|
|
submodule_gitfile[argc + j] = NULL;
|
2006-07-26 17:47:54 +00:00
|
|
|
}
|
2022-06-30 02:37:33 +00:00
|
|
|
argc += last - first;
|
|
|
|
goto act_on_entry;
|
|
|
|
}
|
2022-11-19 13:07:30 +00:00
|
|
|
if (!(ce = index_file_exists(&the_index, src, length, 0))) {
|
2011-02-22 23:42:04 +00:00
|
|
|
bad = _("not under version control");
|
2022-06-30 02:37:33 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
|
|
|
if (ce_stage(ce)) {
|
2020-07-20 06:17:52 +00:00
|
|
|
bad = _("conflicted");
|
2022-06-30 02:37:33 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
|
|
|
if (lstat(dst, &st) == 0 &&
|
|
|
|
(!ignore_case || strcasecmp(src, dst))) {
|
2011-02-22 23:42:04 +00:00
|
|
|
bad = _("destination exists");
|
2006-07-26 01:52:35 +00:00
|
|
|
if (force) {
|
|
|
|
/*
|
|
|
|
* only files can overwrite each other:
|
|
|
|
* check both source and destination
|
|
|
|
*/
|
2008-07-21 00:25:56 +00:00
|
|
|
if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
|
2011-12-12 21:54:42 +00:00
|
|
|
if (verbose)
|
|
|
|
warning(_("overwriting '%s'"), dst);
|
2006-07-26 01:52:35 +00:00
|
|
|
bad = NULL;
|
|
|
|
} else
|
2011-02-22 23:42:04 +00:00
|
|
|
bad = _("Cannot overwrite");
|
2006-07-26 01:52:35 +00:00
|
|
|
}
|
2022-06-30 02:37:33 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
|
|
|
if (string_list_has_string(&src_for_dst, dst)) {
|
2011-02-22 23:42:04 +00:00
|
|
|
bad = _("multiple sources for the same target");
|
2022-06-30 02:37:33 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
|
|
|
if (is_dir_sep(dst[strlen(dst) - 1])) {
|
2014-01-08 16:33:44 +00:00
|
|
|
bad = _("destination directory does not exist");
|
2022-06-30 02:37:33 +00:00
|
|
|
goto act_on_entry;
|
|
|
|
}
|
2021-09-24 15:39:13 +00:00
|
|
|
|
2022-08-09 12:09:10 +00:00
|
|
|
if (ignore_sparse &&
|
|
|
|
(dst_mode & (SKIP_WORKTREE_DIR | SPARSE)) &&
|
|
|
|
index_entry_exists(&the_index, dst, strlen(dst))) {
|
|
|
|
bad = _("destination exists in the index");
|
|
|
|
if (force) {
|
|
|
|
if (verbose)
|
|
|
|
warning(_("overwriting '%s'"), dst);
|
|
|
|
bad = NULL;
|
|
|
|
} else {
|
|
|
|
goto act_on_entry;
|
|
|
|
}
|
|
|
|
}
|
2022-06-30 02:37:33 +00:00
|
|
|
/*
|
|
|
|
* 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;
|
2021-09-24 15:39:13 +00:00
|
|
|
}
|
2006-07-26 01:52:35 +00:00
|
|
|
|
2022-06-30 02:37:33 +00:00
|
|
|
if (skip_sparse)
|
|
|
|
goto remove_entry;
|
|
|
|
|
|
|
|
string_list_insert(&src_for_dst, dst);
|
|
|
|
|
|
|
|
act_on_entry:
|
2014-08-10 02:29:30 +00:00
|
|
|
if (!bad)
|
|
|
|
continue;
|
|
|
|
if (!ignore_errors)
|
2014-08-10 02:29:36 +00:00
|
|
|
die(_("%s, source=%s, destination=%s"),
|
2014-08-10 02:29:30 +00:00
|
|
|
bad, src, dst);
|
2021-09-24 15:39:13 +00:00
|
|
|
remove_entry:
|
2014-08-10 02:29:30 +00:00
|
|
|
if (--argc > 0) {
|
|
|
|
int n = argc - i;
|
builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove()
The variables 'source', 'destination', and 'submodule_gitfile' are
all of type "const char **", and an element of such an array is of
"type const char *", but these memmove() calls were written as if
these variables are of type "char **".
Once these memmove() calls are fixed to use the correct type to
compute the number of bytes to be moved, e.g.
- memmove(source + i, source + i + 1, n * sizeof(char *));
+ memmove(source + i, source + i + 1, n * sizeof(const char *));
existing contrib/coccinelle/array.cocci rules can recognize them as
candidates for turning into MOVE_ARRAY().
While at it, use CALLOC_ARRAY() instead of xcalloc() to allocate the
modes[] array that is involved in the change.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-10 01:33:54 +00:00
|
|
|
MOVE_ARRAY(source + i, source + i + 1, n);
|
|
|
|
MOVE_ARRAY(destination + i, destination + i + 1, n);
|
|
|
|
MOVE_ARRAY(modes + i, modes + i + 1, n);
|
|
|
|
MOVE_ARRAY(submodule_gitfile + i,
|
|
|
|
submodule_gitfile + i + 1, n);
|
2014-08-10 02:29:30 +00:00
|
|
|
i--;
|
2006-07-26 01:52:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-24 15:39:13 +00:00
|
|
|
if (only_match_skip_worktree.nr) {
|
|
|
|
advise_on_updating_sparse_paths(&only_match_skip_worktree);
|
|
|
|
if (!ignore_errors)
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-10-07 12:19:33 +00:00
|
|
|
for (i = 0; i < argc; i++) {
|
2006-08-19 14:52:21 +00:00
|
|
|
const char *src = source[i], *dst = destination[i];
|
|
|
|
enum update_mode mode = modes[i];
|
2008-07-21 00:25:56 +00:00
|
|
|
int pos;
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
int sparse_and_dirty = 0;
|
2022-06-30 02:37:32 +00:00
|
|
|
struct checkout state = CHECKOUT_INIT;
|
|
|
|
state.istate = &the_index;
|
|
|
|
|
|
|
|
if (force)
|
|
|
|
state.force = 1;
|
2006-07-26 01:52:35 +00:00
|
|
|
if (show_only || verbose)
|
2011-02-22 23:42:03 +00:00
|
|
|
printf(_("Renaming %s to %s\n"), src, dst);
|
2016-04-19 18:32:04 +00:00
|
|
|
if (show_only)
|
|
|
|
continue;
|
2022-06-30 02:37:37 +00:00
|
|
|
if (!(mode & (INDEX | SPARSE | SKIP_WORKTREE_DIR)) &&
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
!(dst_mode & (SKIP_WORKTREE_DIR | SPARSE)) &&
|
2022-06-30 02:37:36 +00:00
|
|
|
rename(src, dst) < 0) {
|
2016-04-19 18:32:04 +00:00
|
|
|
if (ignore_errors)
|
|
|
|
continue;
|
|
|
|
die_errno(_("renaming '%s' failed"), src);
|
|
|
|
}
|
|
|
|
if (submodule_gitfile[i]) {
|
|
|
|
if (!update_path_in_gitmodules(src, dst))
|
|
|
|
gitmodules_modified = 1;
|
2018-03-28 22:35:31 +00:00
|
|
|
if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
|
|
|
|
connect_work_tree_and_git_dir(dst,
|
|
|
|
submodule_gitfile[i],
|
|
|
|
1);
|
2013-07-30 19:50:03 +00:00
|
|
|
}
|
2006-08-19 14:52:21 +00:00
|
|
|
|
2022-06-30 02:37:37 +00:00
|
|
|
if (mode & (WORKING_DIRECTORY | SKIP_WORKTREE_DIR))
|
2006-07-26 17:47:54 +00:00
|
|
|
continue;
|
|
|
|
|
2022-11-19 13:07:38 +00:00
|
|
|
pos = index_name_pos(&the_index, src, strlen(src));
|
2008-07-21 00:25:56 +00:00
|
|
|
assert(pos >= 0);
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
if (!(mode & SPARSE) && !lstat(src, &st))
|
2022-11-19 13:07:33 +00:00
|
|
|
sparse_and_dirty = ie_modified(&the_index,
|
2022-11-19 13:07:34 +00:00
|
|
|
the_index.cache[pos],
|
|
|
|
&st,
|
2022-11-19 13:07:33 +00:00
|
|
|
0);
|
2022-11-19 13:07:30 +00:00
|
|
|
rename_index_entry_at(&the_index, pos, dst);
|
2022-06-30 02:37:32 +00:00
|
|
|
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
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 */
|
2023-02-10 10:28:36 +00:00
|
|
|
int dst_pos = index_name_pos(&the_index, dst,
|
|
|
|
strlen(dst));
|
2022-11-19 13:07:34 +00:00
|
|
|
struct cache_entry *dst_ce = the_index.cache[dst_pos];
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
|
|
|
|
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 */
|
2023-02-10 10:28:36 +00:00
|
|
|
int dst_pos = index_name_pos(&the_index, dst,
|
|
|
|
strlen(dst));
|
2022-11-19 13:07:34 +00:00
|
|
|
struct cache_entry *dst_ce = the_index.cache[dst_pos];
|
2022-06-30 02:37:32 +00:00
|
|
|
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
/*
|
|
|
|
* 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);
|
|
|
|
}
|
|
|
|
}
|
2022-06-30 02:37:32 +00:00
|
|
|
}
|
2006-07-26 01:52:35 +00:00
|
|
|
}
|
2022-06-30 02:37:32 +00:00
|
|
|
|
2022-08-09 12:09:08 +00:00
|
|
|
/*
|
|
|
|
* cleanup the empty src_dirs
|
|
|
|
*/
|
|
|
|
for (i = 0; i < src_dir_nr; i++) {
|
|
|
|
int dummy;
|
|
|
|
strbuf_addstr(&a_src_dir, src_dir[i]);
|
|
|
|
/*
|
|
|
|
* if entries under a_src_dir are all moved away,
|
|
|
|
* recursively remove a_src_dir to cleanup
|
|
|
|
*/
|
|
|
|
if (index_range_of_same_dir(a_src_dir.buf, a_src_dir.len,
|
|
|
|
&dummy, &dummy) < 1) {
|
|
|
|
remove_dir_recursively(&a_src_dir, 0);
|
2022-06-30 02:37:32 +00:00
|
|
|
}
|
2022-08-09 12:09:08 +00:00
|
|
|
strbuf_reset(&a_src_dir);
|
2006-07-26 01:52:35 +00:00
|
|
|
}
|
|
|
|
|
2022-08-09 12:09:08 +00:00
|
|
|
strbuf_release(&a_src_dir);
|
|
|
|
free(src_dir);
|
|
|
|
|
2022-08-09 12:09:09 +00:00
|
|
|
if (dirty_paths.nr)
|
|
|
|
advise_on_moving_dirty_path(&dirty_paths);
|
|
|
|
|
2013-08-06 19:15:11 +00:00
|
|
|
if (gitmodules_modified)
|
2017-12-12 19:53:50 +00:00
|
|
|
stage_updated_gitmodules(&the_index);
|
2013-08-06 19:15:11 +00:00
|
|
|
|
2018-03-01 20:40:20 +00:00
|
|
|
if (write_locked_index(&the_index, &lock_file,
|
|
|
|
COMMIT_LOCK | SKIP_IF_UNCHANGED))
|
2014-08-10 02:29:35 +00:00
|
|
|
die(_("Unable to write new index file"));
|
2006-07-26 01:52:35 +00:00
|
|
|
|
2021-07-25 13:08:27 +00:00
|
|
|
string_list_clear(&src_for_dst, 0);
|
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>
2022-08-09 12:09:07 +00:00
|
|
|
string_list_clear(&dirty_paths, 0);
|
2021-07-25 13:08:27 +00:00
|
|
|
UNLEAK(source);
|
|
|
|
UNLEAK(dest_path);
|
|
|
|
free(submodule_gitfile);
|
|
|
|
free(modes);
|
2006-07-26 01:52:35 +00:00
|
|
|
return 0;
|
|
|
|
}
|