2006-07-26 09:52:35 +08:00
|
|
|
/*
|
|
|
|
* "git mv" builtin command
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006 Johannes Schindelin
|
|
|
|
*/
|
|
|
|
#include "builtin.h"
|
2014-10-01 18:28:42 +08:00
|
|
|
#include "lockfile.h"
|
2006-07-26 09:52:35 +08:00
|
|
|
#include "dir.h"
|
|
|
|
#include "cache-tree.h"
|
2008-07-22 02:03:49 +08:00
|
|
|
#include "string-list.h"
|
2007-10-07 20:19:33 +08:00
|
|
|
#include "parse-options.h"
|
2013-07-31 03:50:03 +08:00
|
|
|
#include "submodule.h"
|
2006-07-26 09:52:35 +08:00
|
|
|
|
2007-10-07 20:19:33 +08:00
|
|
|
static const char * const builtin_mv_usage[] = {
|
2012-08-20 20:32:26 +08:00
|
|
|
N_("git mv [options] <source>... <destination>"),
|
2007-10-07 20:19:33 +08:00
|
|
|
NULL
|
|
|
|
};
|
2006-07-26 09:52:35 +08:00
|
|
|
|
2013-12-03 16:32:04 +08:00
|
|
|
#define DUP_BASENAME 1
|
|
|
|
#define KEEP_TRAILING_SLASH 2
|
|
|
|
|
2013-07-14 16:35:27 +08:00
|
|
|
static const char **internal_copy_pathspec(const char *prefix,
|
|
|
|
const char **pathspec,
|
2013-12-03 16:32:04 +08:00
|
|
|
int count, unsigned flags)
|
2006-07-26 09:52:35 +08:00
|
|
|
{
|
2006-08-16 16:44:02 +08:00
|
|
|
int i;
|
2006-07-26 09:52:35 +08:00
|
|
|
const char **result = xmalloc((count + 1) * sizeof(const char *));
|
|
|
|
memcpy(result, pathspec, count * sizeof(const char *));
|
|
|
|
result[count] = NULL;
|
2006-08-16 16:44:02 +08:00
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
int length = strlen(result[i]);
|
2010-01-23 06:17:06 +08:00
|
|
|
int to_copy = length;
|
2013-12-03 16:32:04 +08:00
|
|
|
while (!(flags & KEEP_TRAILING_SLASH) &&
|
|
|
|
to_copy > 0 && is_dir_sep(result[i][to_copy - 1]))
|
2010-01-23 06:17:06 +08:00
|
|
|
to_copy--;
|
2013-12-03 16:32:04 +08:00
|
|
|
if (to_copy != length || flags & DUP_BASENAME) {
|
2010-01-23 06:17:06 +08:00
|
|
|
char *it = xmemdupz(result[i], to_copy);
|
2013-12-03 16:32:04 +08:00
|
|
|
if (flags & DUP_BASENAME) {
|
2011-10-07 02:22:23 +08:00
|
|
|
result[i] = xstrdup(basename(it));
|
|
|
|
free(it);
|
|
|
|
} else
|
|
|
|
result[i] = it;
|
2010-01-23 06:17:06 +08:00
|
|
|
}
|
2006-07-26 09:52:35 +08:00
|
|
|
}
|
2008-03-07 15:29:40 +08:00
|
|
|
return get_pathspec(prefix, result);
|
2006-07-26 09:52:35 +08:00
|
|
|
}
|
|
|
|
|
2006-07-27 01:47:54 +08:00
|
|
|
static const char *add_slash(const char *path)
|
|
|
|
{
|
|
|
|
int len = strlen(path);
|
|
|
|
if (path[len - 1] != '/') {
|
|
|
|
char *with_slash = xmalloc(len + 2);
|
|
|
|
memcpy(with_slash, path, len);
|
2006-08-09 03:21:33 +08:00
|
|
|
with_slash[len++] = '/';
|
|
|
|
with_slash[len] = 0;
|
2006-07-27 01:47:54 +08:00
|
|
|
return with_slash;
|
|
|
|
}
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
2006-07-26 09:52:35 +08:00
|
|
|
static struct lock_file lock_file;
|
2013-10-13 19:52:05 +08:00
|
|
|
#define SUBMODULE_WITH_GITDIR ((const char *)1)
|
2006-07-26 09:52:35 +08:00
|
|
|
|
2014-08-10 10:29:31 +08: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);
|
|
|
|
if (!is_staging_gitmodules_ok())
|
|
|
|
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 10:29:33 +08: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 16:54:54 +08:00
|
|
|
int cmd_mv(int argc, const char **argv, const char *prefix)
|
2006-07-26 09:52:35 +08:00
|
|
|
{
|
2014-06-13 20:19:23 +08:00
|
|
|
int i, gitmodules_modified = 0;
|
2006-07-26 09:52:35 +08:00
|
|
|
int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
|
2007-10-07 20:19:33 +08:00
|
|
|
struct option builtin_mv_options[] = {
|
2012-08-20 20:32:26 +08:00
|
|
|
OPT__VERBOSE(&verbose, N_("be verbose")),
|
|
|
|
OPT__DRY_RUN(&show_only, N_("dry run")),
|
|
|
|
OPT__FORCE(&force, N_("force move/rename even if target exists")),
|
2013-08-03 19:51:19 +08:00
|
|
|
OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
|
2007-10-07 20:19:33 +08:00
|
|
|
OPT_END(),
|
|
|
|
};
|
2013-07-31 03:50:03 +08:00
|
|
|
const char **source, **destination, **dest_path, **submodule_gitfile;
|
2006-07-27 01:47:54 +08:00
|
|
|
enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
|
2006-07-26 09:52:35 +08:00
|
|
|
struct stat st;
|
2010-07-05 03:46:19 +08:00
|
|
|
struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
|
2006-07-26 09:52:35 +08:00
|
|
|
|
2013-08-07 03:15:11 +08:00
|
|
|
gitmodules_config();
|
2008-05-15 01:46:53 +08:00
|
|
|
git_config(git_default_config, NULL);
|
2006-07-26 09:52:35 +08:00
|
|
|
|
2009-05-24 02:53:12 +08:00
|
|
|
argc = parse_options(argc, argv, prefix, builtin_mv_options,
|
|
|
|
builtin_mv_usage, 0);
|
2007-10-07 20:19:33 +08:00
|
|
|
if (--argc < 1)
|
|
|
|
usage_with_options(builtin_mv_usage, builtin_mv_options);
|
2006-07-26 09:52:35 +08:00
|
|
|
|
2014-06-13 20:19:23 +08:00
|
|
|
hold_locked_index(&lock_file, 1);
|
2009-11-09 23:05:01 +08:00
|
|
|
if (read_cache() < 0)
|
2011-02-23 07:42:03 +08:00
|
|
|
die(_("index file corrupt"));
|
2009-11-09 23:05:01 +08:00
|
|
|
|
2013-07-14 16:35:27 +08:00
|
|
|
source = internal_copy_pathspec(prefix, argv, argc, 0);
|
2007-10-07 20:19:33 +08:00
|
|
|
modes = xcalloc(argc, sizeof(enum update_mode));
|
2013-12-03 16:32:04 +08:00
|
|
|
/*
|
|
|
|
* Keep trailing slash, needed to let
|
|
|
|
* "git mv file no-such-dir/" error out.
|
|
|
|
*/
|
|
|
|
dest_path = internal_copy_pathspec(prefix, argv + argc, 1,
|
|
|
|
KEEP_TRAILING_SLASH);
|
2013-07-31 03:50:03 +08:00
|
|
|
submodule_gitfile = xcalloc(argc, sizeof(char *));
|
2006-07-26 09:52:35 +08:00
|
|
|
|
2006-08-18 18:42:39 +08:00
|
|
|
if (dest_path[0][0] == '\0')
|
|
|
|
/* special case: "." was normalized to "" */
|
2013-12-03 16:32:04 +08:00
|
|
|
destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
|
2006-08-18 18:42:39 +08:00
|
|
|
else if (!lstat(dest_path[0], &st) &&
|
2006-07-27 01:47:54 +08:00
|
|
|
S_ISDIR(st.st_mode)) {
|
|
|
|
dest_path[0] = add_slash(dest_path[0]);
|
2013-12-03 16:32:04 +08:00
|
|
|
destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
|
2006-07-27 01:47:54 +08:00
|
|
|
} else {
|
2007-10-07 20:19:33 +08:00
|
|
|
if (argc != 1)
|
2014-08-10 10:29:29 +08:00
|
|
|
die(_("destination '%s' is not a directory"), dest_path[0]);
|
2006-07-26 09:52:35 +08:00
|
|
|
destination = dest_path;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Checking */
|
2007-10-07 20:19:33 +08:00
|
|
|
for (i = 0; i < argc; i++) {
|
2006-08-19 22:52:21 +08:00
|
|
|
const char *src = source[i], *dst = destination[i];
|
|
|
|
int length, src_is_dir;
|
2006-07-26 09:52:35 +08:00
|
|
|
const char *bad = NULL;
|
|
|
|
|
|
|
|
if (show_only)
|
2011-02-23 07:42:03 +08:00
|
|
|
printf(_("Checking rename of '%s' to '%s'\n"), src, dst);
|
2006-07-26 09:52:35 +08:00
|
|
|
|
2006-08-19 22:52:21 +08:00
|
|
|
length = strlen(src);
|
|
|
|
if (lstat(src, &st) < 0)
|
2011-02-23 07:42:04 +08:00
|
|
|
bad = _("bad source");
|
2006-08-19 22:52:21 +08:00
|
|
|
else if (!strncmp(src, dst, length) &&
|
|
|
|
(dst[length] == 0 || dst[length] == '/')) {
|
2011-02-23 07:42:04 +08:00
|
|
|
bad = _("can not move directory into itself");
|
2006-08-19 22:52:21 +08:00
|
|
|
} else if ((src_is_dir = S_ISDIR(st.st_mode))
|
|
|
|
&& lstat(dst, &st) == 0)
|
2011-02-23 07:42:04 +08:00
|
|
|
bad = _("cannot move directory over file");
|
2006-08-19 22:52:21 +08:00
|
|
|
else if (src_is_dir) {
|
2014-08-10 10:29:34 +08:00
|
|
|
int first = cache_name_pos(src, length), last;
|
2014-08-10 10:29:31 +08:00
|
|
|
|
|
|
|
if (first >= 0)
|
|
|
|
prepare_move_submodule(src, first,
|
|
|
|
submodule_gitfile + i);
|
2014-08-10 10:29:34 +08: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-31 03:49:25 +08:00
|
|
|
|
|
|
|
modes[i] = WORKING_DIRECTORY;
|
2014-08-10 10:29:34 +08:00
|
|
|
n = argc + last - first;
|
2014-09-17 02:56:57 +08:00
|
|
|
REALLOC_ARRAY(source, n);
|
|
|
|
REALLOC_ARRAY(destination, n);
|
|
|
|
REALLOC_ARRAY(modes, n);
|
|
|
|
REALLOC_ARRAY(submodule_gitfile, n);
|
2014-08-10 10:29:34 +08: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-27 01:47:54 +08:00
|
|
|
}
|
2014-08-10 10:29:34 +08:00
|
|
|
argc += last - first;
|
2006-07-27 01:47:54 +08:00
|
|
|
}
|
2009-02-04 17:32:08 +08:00
|
|
|
} else if (cache_name_pos(src, length) < 0)
|
2011-02-23 07:42:04 +08:00
|
|
|
bad = _("not under version control");
|
2014-05-09 01:23:34 +08:00
|
|
|
else if (lstat(dst, &st) == 0 &&
|
|
|
|
(!ignore_case || strcasecmp(src, dst))) {
|
2011-02-23 07:42:04 +08:00
|
|
|
bad = _("destination exists");
|
2006-07-26 09:52:35 +08:00
|
|
|
if (force) {
|
|
|
|
/*
|
|
|
|
* only files can overwrite each other:
|
|
|
|
* check both source and destination
|
|
|
|
*/
|
2008-07-21 08:25:56 +08:00
|
|
|
if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
|
2011-12-13 05:54:42 +08:00
|
|
|
if (verbose)
|
|
|
|
warning(_("overwriting '%s'"), dst);
|
2006-07-26 09:52:35 +08:00
|
|
|
bad = NULL;
|
|
|
|
} else
|
2011-02-23 07:42:04 +08:00
|
|
|
bad = _("Cannot overwrite");
|
2006-07-26 09:52:35 +08:00
|
|
|
}
|
2009-02-04 17:32:08 +08:00
|
|
|
} else if (string_list_has_string(&src_for_dst, dst))
|
2011-02-23 07:42:04 +08:00
|
|
|
bad = _("multiple sources for the same target");
|
2014-01-09 00:33:44 +08:00
|
|
|
else if (is_dir_sep(dst[strlen(dst) - 1]))
|
|
|
|
bad = _("destination directory does not exist");
|
2006-08-19 22:52:21 +08:00
|
|
|
else
|
2010-06-26 07:41:35 +08:00
|
|
|
string_list_insert(&src_for_dst, dst);
|
2006-07-26 09:52:35 +08:00
|
|
|
|
2014-08-10 10:29:30 +08:00
|
|
|
if (!bad)
|
|
|
|
continue;
|
|
|
|
if (!ignore_errors)
|
2014-08-10 10:29:36 +08:00
|
|
|
die(_("%s, source=%s, destination=%s"),
|
2014-08-10 10:29:30 +08: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 09:52:35 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-07 20:19:33 +08:00
|
|
|
for (i = 0; i < argc; i++) {
|
2006-08-19 22:52:21 +08:00
|
|
|
const char *src = source[i], *dst = destination[i];
|
|
|
|
enum update_mode mode = modes[i];
|
2008-07-21 08:25:56 +08:00
|
|
|
int pos;
|
2006-07-26 09:52:35 +08:00
|
|
|
if (show_only || verbose)
|
2011-02-23 07:42:03 +08:00
|
|
|
printf(_("Renaming %s to %s\n"), src, dst);
|
2013-07-31 03:50:03 +08:00
|
|
|
if (!show_only && mode != INDEX) {
|
|
|
|
if (rename(src, dst) < 0 && !ignore_errors)
|
2014-08-10 10:29:36 +08:00
|
|
|
die_errno(_("renaming '%s' failed"), src);
|
2013-10-13 19:52:05 +08:00
|
|
|
if (submodule_gitfile[i]) {
|
|
|
|
if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
|
|
|
|
connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
|
|
|
|
if (!update_path_in_gitmodules(src, dst))
|
|
|
|
gitmodules_modified = 1;
|
|
|
|
}
|
2013-07-31 03:50:03 +08:00
|
|
|
}
|
2006-08-19 22:52:21 +08:00
|
|
|
|
|
|
|
if (mode == WORKING_DIRECTORY)
|
2006-07-27 01:47:54 +08:00
|
|
|
continue;
|
|
|
|
|
2008-07-21 08:25:56 +08:00
|
|
|
pos = cache_name_pos(src, strlen(src));
|
|
|
|
assert(pos >= 0);
|
|
|
|
if (!show_only)
|
|
|
|
rename_cache_entry_at(pos, dst);
|
2006-07-26 09:52:35 +08:00
|
|
|
}
|
|
|
|
|
2013-08-07 03:15:11 +08:00
|
|
|
if (gitmodules_modified)
|
|
|
|
stage_updated_gitmodules();
|
|
|
|
|
2014-08-10 10:29:35 +08:00
|
|
|
if (active_cache_changed &&
|
|
|
|
write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
|
|
|
|
die(_("Unable to write new index file"));
|
2006-07-26 09:52:35 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|