Merge branch 'nd/mv-code-cleaning'
Code clean-up. * nd/mv-code-cleaning: mv: no SP between function name and the first opening parenthese mv: combine two if(s) mv: unindent one level for directory move code mv: move index search code out mv: remove an "if" that's always true mv: split submodule move preparation code out mv: flatten error handling code block mv: mark strings for translations
This commit is contained in:
Junio C Hamano
commit
5e1dc48858
174
builtin/mv.c
174
builtin/mv.c
@ -61,6 +61,46 @@ static const char *add_slash(const char *path)
|
||||
static struct lock_file lock_file;
|
||||
#define SUBMODULE_WITH_GITDIR ((const char *)1)
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
int cmd_mv(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int i, gitmodules_modified = 0;
|
||||
@ -108,7 +148,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
|
||||
destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
|
||||
} else {
|
||||
if (argc != 1)
|
||||
die("destination '%s' is not a directory", dest_path[0]);
|
||||
die(_("destination '%s' is not a directory"), dest_path[0]);
|
||||
destination = dest_path;
|
||||
}
|
||||
|
||||
@ -131,75 +171,36 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
|
||||
&& lstat(dst, &st) == 0)
|
||||
bad = _("cannot move directory over file");
|
||||
else if (src_is_dir) {
|
||||
int first = cache_name_pos(src, length);
|
||||
if (first >= 0) {
|
||||
struct strbuf submodule_dotgit = STRBUF_INIT;
|
||||
if (!S_ISGITLINK(active_cache[first]->ce_mode))
|
||||
die (_("Huh? 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[i] = read_gitfile(submodule_dotgit.buf);
|
||||
if (submodule_gitfile[i])
|
||||
submodule_gitfile[i] = xstrdup(submodule_gitfile[i]);
|
||||
else
|
||||
submodule_gitfile[i] = SUBMODULE_WITH_GITDIR;
|
||||
strbuf_release(&submodule_dotgit);
|
||||
} else {
|
||||
const char *src_w_slash = add_slash(src);
|
||||
int last, len_w_slash = length + 1;
|
||||
int first = cache_name_pos(src, length), last;
|
||||
|
||||
if (first >= 0)
|
||||
prepare_move_submodule(src, first,
|
||||
submodule_gitfile + i);
|
||||
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;
|
||||
|
||||
modes[i] = WORKING_DIRECTORY;
|
||||
n = argc + last - first;
|
||||
source = xrealloc(source, n * sizeof(char *));
|
||||
destination = xrealloc(destination, n * sizeof(char *));
|
||||
modes = xrealloc(modes, n * sizeof(enum update_mode));
|
||||
submodule_gitfile = xrealloc(submodule_gitfile, n * sizeof(char *));
|
||||
|
||||
first = cache_name_pos(src_w_slash, len_w_slash);
|
||||
if (first >= 0)
|
||||
die (_("Huh? %.*s is in index?"),
|
||||
len_w_slash, src_w_slash);
|
||||
dst = add_slash(dst);
|
||||
dst_len = strlen(dst);
|
||||
|
||||
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);
|
||||
|
||||
if (last - first < 1)
|
||||
bad = _("source directory is empty");
|
||||
else {
|
||||
int j, dst_len;
|
||||
|
||||
if (last - first > 0) {
|
||||
source = xrealloc(source,
|
||||
(argc + last - first)
|
||||
* sizeof(char *));
|
||||
destination = xrealloc(destination,
|
||||
(argc + last - first)
|
||||
* sizeof(char *));
|
||||
modes = xrealloc(modes,
|
||||
(argc + last - first)
|
||||
* sizeof(enum update_mode));
|
||||
submodule_gitfile = xrealloc(submodule_gitfile,
|
||||
(argc + last - first)
|
||||
* sizeof(char *));
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
argc += last - first;
|
||||
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;
|
||||
}
|
||||
argc += last - first;
|
||||
}
|
||||
} else if (cache_name_pos(src, length) < 0)
|
||||
bad = _("not under version control");
|
||||
@ -225,24 +226,22 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
|
||||
else
|
||||
string_list_insert(&src_for_dst, dst);
|
||||
|
||||
if (bad) {
|
||||
if (ignore_errors) {
|
||||
if (--argc > 0) {
|
||||
memmove(source + i, source + i + 1,
|
||||
(argc - i) * sizeof(char *));
|
||||
memmove(destination + i,
|
||||
destination + i + 1,
|
||||
(argc - i) * sizeof(char *));
|
||||
memmove(modes + i, modes + i + 1,
|
||||
(argc - i) * sizeof(enum update_mode));
|
||||
memmove(submodule_gitfile + i,
|
||||
submodule_gitfile + i + 1,
|
||||
(argc - i) * sizeof(char *));
|
||||
i--;
|
||||
}
|
||||
} else
|
||||
die (_("%s, source=%s, destination=%s"),
|
||||
bad, src, dst);
|
||||
if (!bad)
|
||||
continue;
|
||||
if (!ignore_errors)
|
||||
die(_("%s, source=%s, destination=%s"),
|
||||
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--;
|
||||
}
|
||||
}
|
||||
|
||||
@ -254,7 +253,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
|
||||
printf(_("Renaming %s to %s\n"), src, dst);
|
||||
if (!show_only && mode != INDEX) {
|
||||
if (rename(src, dst) < 0 && !ignore_errors)
|
||||
die_errno (_("renaming '%s' failed"), src);
|
||||
die_errno(_("renaming '%s' failed"), src);
|
||||
if (submodule_gitfile[i]) {
|
||||
if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
|
||||
connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
|
||||
@ -275,10 +274,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
|
||||
if (gitmodules_modified)
|
||||
stage_updated_gitmodules();
|
||||
|
||||
if (active_cache_changed) {
|
||||
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
|
||||
die(_("Unable to write new index file"));
|
||||
}
|
||||
if (active_cache_changed &&
|
||||
write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
|
||||
die(_("Unable to write new index file"));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user