2006-07-26 01:52:35 +00:00
|
|
|
/*
|
|
|
|
* "git mv" builtin command
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006 Johannes Schindelin
|
|
|
|
*/
|
|
|
|
#include "builtin.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.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"
|
2013-07-30 19:50:03 +00:00
|
|
|
#include "submodule.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
|
|
|
|
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);
|
2006-07-26 17:47:54 +00:00
|
|
|
if (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;
|
|
|
|
if (!S_ISGITLINK(active_cache[first]->ce_mode))
|
|
|
|
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;
|
|
|
|
|
|
|
|
first = cache_name_pos(src_w_slash, len_w_slash);
|
|
|
|
if (first >= 0)
|
|
|
|
die(_("%.*s is in index"), len_w_slash, src_w_slash);
|
|
|
|
|
|
|
|
first = -1 - first;
|
|
|
|
for (last = first; last < active_nr; last++) {
|
|
|
|
const char *path = active_cache[last]->name;
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
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;
|
2006-07-26 01:52:35 +00:00
|
|
|
int verbose = 0, show_only = 0, force = 0, ignore_errors = 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")),
|
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;
|
2006-07-26 17:47:54 +00:00
|
|
|
enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
|
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;
|
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
|
|
|
|
2016-12-07 18:33:54 +00:00
|
|
|
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
|
2009-11-09 15:05:01 +00:00
|
|
|
if (read_cache() < 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);
|
2007-10-07 12:19:33 +00:00
|
|
|
modes = xcalloc(argc, sizeof(enum update_mode));
|
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);
|
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)) {
|
|
|
|
dest_path[0] = add_slash(dest_path[0]);
|
2017-01-04 18:03:56 +00:00
|
|
|
destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
|
2006-07-26 17:47:54 +00:00
|
|
|
} else {
|
2007-10-07 12:19:33 +00:00
|
|
|
if (argc != 1)
|
2014-08-10 02:29:29 +00:00
|
|
|
die(_("destination '%s' is not a directory"), dest_path[0]);
|
2006-07-26 01:52:35 +00:00
|
|
|
destination = dest_path;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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];
|
|
|
|
int length, src_is_dir;
|
2006-07-26 01:52:35 +00:00
|
|
|
const char *bad = NULL;
|
|
|
|
|
|
|
|
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);
|
|
|
|
if (lstat(src, &st) < 0)
|
2011-02-22 23:42:04 +00:00
|
|
|
bad = _("bad source");
|
2006-08-19 14:52:21 +00:00
|
|
|
else 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");
|
2006-08-19 14:52:21 +00:00
|
|
|
} else if ((src_is_dir = S_ISDIR(st.st_mode))
|
|
|
|
&& lstat(dst, &st) == 0)
|
2011-02-22 23:42:04 +00:00
|
|
|
bad = _("cannot move directory over file");
|
2006-08-19 14:52:21 +00:00
|
|
|
else if (src_is_dir) {
|
2014-08-10 02:29:34 +00:00
|
|
|
int first = cache_name_pos(src, length), last;
|
2014-08-10 02:29:31 +00:00
|
|
|
|
|
|
|
if (first >= 0)
|
|
|
|
prepare_move_submodule(src, first,
|
|
|
|
submodule_gitfile + i);
|
2014-08-10 02:29:34 +00:00
|
|
|
else if (index_range_of_same_dir(src, length,
|
|
|
|
&first, &last) < 1)
|
|
|
|
bad = _("source directory is empty");
|
|
|
|
else { /* last - first >= 1 */
|
|
|
|
int j, dst_len, n;
|
2013-07-30 19:49:25 +00:00
|
|
|
|
|
|
|
modes[i] = WORKING_DIRECTORY;
|
2014-08-10 02:29:34 +00:00
|
|
|
n = argc + last - first;
|
2014-09-16 18:56:57 +00:00
|
|
|
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
|
|
|
|
|
|
|
dst = add_slash(dst);
|
|
|
|
dst_len = strlen(dst);
|
|
|
|
|
|
|
|
for (j = 0; j < last - first; j++) {
|
|
|
|
const char *path = active_cache[first + j]->name;
|
|
|
|
source[argc + j] = path;
|
|
|
|
destination[argc + j] =
|
|
|
|
prefix_path(dst, dst_len, path + length + 1);
|
|
|
|
modes[argc + j] = INDEX;
|
|
|
|
submodule_gitfile[argc + j] = NULL;
|
2006-07-26 17:47:54 +00:00
|
|
|
}
|
2014-08-10 02:29:34 +00:00
|
|
|
argc += last - first;
|
2006-07-26 17:47:54 +00:00
|
|
|
}
|
2009-02-04 09:32:08 +00:00
|
|
|
} else if (cache_name_pos(src, length) < 0)
|
2011-02-22 23:42:04 +00:00
|
|
|
bad = _("not under version control");
|
2014-05-08 17:23:34 +00:00
|
|
|
else 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
|
|
|
}
|
2009-02-04 09:32:08 +00:00
|
|
|
} else if (string_list_has_string(&src_for_dst, dst))
|
2011-02-22 23:42:04 +00:00
|
|
|
bad = _("multiple sources for the same target");
|
2014-01-08 16:33:44 +00:00
|
|
|
else if (is_dir_sep(dst[strlen(dst) - 1]))
|
|
|
|
bad = _("destination directory does not exist");
|
2006-08-19 14:52:21 +00:00
|
|
|
else
|
2010-06-25 23:41:35 +00:00
|
|
|
string_list_insert(&src_for_dst, dst);
|
2006-07-26 01:52:35 +00:00
|
|
|
|
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);
|
|
|
|
if (--argc > 0) {
|
|
|
|
int n = argc - i;
|
|
|
|
memmove(source + i, source + i + 1,
|
|
|
|
n * sizeof(char *));
|
|
|
|
memmove(destination + i, destination + i + 1,
|
|
|
|
n * sizeof(char *));
|
|
|
|
memmove(modes + i, modes + i + 1,
|
|
|
|
n * sizeof(enum update_mode));
|
|
|
|
memmove(submodule_gitfile + i, submodule_gitfile + i + 1,
|
|
|
|
n * sizeof(char *));
|
|
|
|
i--;
|
2006-07-26 01:52:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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;
|
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;
|
|
|
|
if (mode != INDEX && rename(src, dst) < 0) {
|
|
|
|
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
|
|
|
|
|
|
|
if (mode == WORKING_DIRECTORY)
|
2006-07-26 17:47:54 +00:00
|
|
|
continue;
|
|
|
|
|
2008-07-21 00:25:56 +00:00
|
|
|
pos = cache_name_pos(src, strlen(src));
|
|
|
|
assert(pos >= 0);
|
2017-12-31 19:11:56 +00:00
|
|
|
rename_cache_entry_at(pos, dst);
|
2006-07-26 01:52:35 +00:00
|
|
|
}
|
|
|
|
|
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
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|