add: include magic part of pathspec on --refresh error
[git/debian.git] / builtin / mv.c
blob7dac714af908789c675a158cf44067771dd62ad2
1 /*
2 * "git mv" builtin command
4 * Copyright (C) 2006 Johannes Schindelin
5 */
6 #define USE_THE_INDEX_COMPATIBILITY_MACROS
7 #include "builtin.h"
8 #include "config.h"
9 #include "pathspec.h"
10 #include "lockfile.h"
11 #include "dir.h"
12 #include "cache-tree.h"
13 #include "string-list.h"
14 #include "parse-options.h"
15 #include "submodule.h"
17 static const char * const builtin_mv_usage[] = {
18 N_("git mv [<options>] <source>... <destination>"),
19 NULL
22 #define DUP_BASENAME 1
23 #define KEEP_TRAILING_SLASH 2
25 static const char **internal_prefix_pathspec(const char *prefix,
26 const char **pathspec,
27 int count, unsigned flags)
29 int i;
30 const char **result;
31 int prefixlen = prefix ? strlen(prefix) : 0;
32 ALLOC_ARRAY(result, count + 1);
34 /* Create an intermediate copy of the pathspec based on the flags */
35 for (i = 0; i < count; i++) {
36 int length = strlen(pathspec[i]);
37 int to_copy = length;
38 char *it;
39 while (!(flags & KEEP_TRAILING_SLASH) &&
40 to_copy > 0 && is_dir_sep(pathspec[i][to_copy - 1]))
41 to_copy--;
43 it = xmemdupz(pathspec[i], to_copy);
44 if (flags & DUP_BASENAME) {
45 result[i] = xstrdup(basename(it));
46 free(it);
47 } else {
48 result[i] = it;
51 result[count] = NULL;
53 /* Prefix the pathspec and free the old intermediate strings */
54 for (i = 0; i < count; i++) {
55 const char *match = prefix_path(prefix, prefixlen, result[i]);
56 free((char *) result[i]);
57 result[i] = match;
60 return result;
63 static const char *add_slash(const char *path)
65 size_t len = strlen(path);
66 if (path[len - 1] != '/') {
67 char *with_slash = xmalloc(st_add(len, 2));
68 memcpy(with_slash, path, len);
69 with_slash[len++] = '/';
70 with_slash[len] = 0;
71 return with_slash;
73 return path;
76 #define SUBMODULE_WITH_GITDIR ((const char *)1)
78 static void prepare_move_submodule(const char *src, int first,
79 const char **submodule_gitfile)
81 struct strbuf submodule_dotgit = STRBUF_INIT;
82 if (!S_ISGITLINK(active_cache[first]->ce_mode))
83 die(_("Directory %s is in index and no submodule?"), src);
84 if (!is_staging_gitmodules_ok(&the_index))
85 die(_("Please stage your changes to .gitmodules or stash them to proceed"));
86 strbuf_addf(&submodule_dotgit, "%s/.git", src);
87 *submodule_gitfile = read_gitfile(submodule_dotgit.buf);
88 if (*submodule_gitfile)
89 *submodule_gitfile = xstrdup(*submodule_gitfile);
90 else
91 *submodule_gitfile = SUBMODULE_WITH_GITDIR;
92 strbuf_release(&submodule_dotgit);
95 static int index_range_of_same_dir(const char *src, int length,
96 int *first_p, int *last_p)
98 const char *src_w_slash = add_slash(src);
99 int first, last, len_w_slash = length + 1;
101 first = cache_name_pos(src_w_slash, len_w_slash);
102 if (first >= 0)
103 die(_("%.*s is in index"), len_w_slash, src_w_slash);
105 first = -1 - first;
106 for (last = first; last < active_nr; last++) {
107 const char *path = active_cache[last]->name;
108 if (strncmp(path, src_w_slash, len_w_slash))
109 break;
111 if (src_w_slash != src)
112 free((char *)src_w_slash);
113 *first_p = first;
114 *last_p = last;
115 return last - first;
118 int cmd_mv(int argc, const char **argv, const char *prefix)
120 int i, flags, gitmodules_modified = 0;
121 int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
122 struct option builtin_mv_options[] = {
123 OPT__VERBOSE(&verbose, N_("be verbose")),
124 OPT__DRY_RUN(&show_only, N_("dry run")),
125 OPT__FORCE(&force, N_("force move/rename even if target exists"),
126 PARSE_OPT_NOCOMPLETE),
127 OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
128 OPT_END(),
130 const char **source, **destination, **dest_path, **submodule_gitfile;
131 enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
132 struct stat st;
133 struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
134 struct lock_file lock_file = LOCK_INIT;
135 struct cache_entry *ce;
137 git_config(git_default_config, NULL);
139 argc = parse_options(argc, argv, prefix, builtin_mv_options,
140 builtin_mv_usage, 0);
141 if (--argc < 1)
142 usage_with_options(builtin_mv_usage, builtin_mv_options);
144 hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
145 if (read_cache() < 0)
146 die(_("index file corrupt"));
148 source = internal_prefix_pathspec(prefix, argv, argc, 0);
149 modes = xcalloc(argc, sizeof(enum update_mode));
151 * Keep trailing slash, needed to let
152 * "git mv file no-such-dir/" error out, except in the case
153 * "git mv directory no-such-dir/".
155 flags = KEEP_TRAILING_SLASH;
156 if (argc == 1 && is_directory(argv[0]) && !is_directory(argv[1]))
157 flags = 0;
158 dest_path = internal_prefix_pathspec(prefix, argv + argc, 1, flags);
159 submodule_gitfile = xcalloc(argc, sizeof(char *));
161 if (dest_path[0][0] == '\0')
162 /* special case: "." was normalized to "" */
163 destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
164 else if (!lstat(dest_path[0], &st) &&
165 S_ISDIR(st.st_mode)) {
166 dest_path[0] = add_slash(dest_path[0]);
167 destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
168 } else {
169 if (argc != 1)
170 die(_("destination '%s' is not a directory"), dest_path[0]);
171 destination = dest_path;
174 /* Checking */
175 for (i = 0; i < argc; i++) {
176 const char *src = source[i], *dst = destination[i];
177 int length, src_is_dir;
178 const char *bad = NULL;
180 if (show_only)
181 printf(_("Checking rename of '%s' to '%s'\n"), src, dst);
183 length = strlen(src);
184 if (lstat(src, &st) < 0)
185 bad = _("bad source");
186 else if (!strncmp(src, dst, length) &&
187 (dst[length] == 0 || dst[length] == '/')) {
188 bad = _("can not move directory into itself");
189 } else if ((src_is_dir = S_ISDIR(st.st_mode))
190 && lstat(dst, &st) == 0)
191 bad = _("cannot move directory over file");
192 else if (src_is_dir) {
193 int first = cache_name_pos(src, length), last;
195 if (first >= 0)
196 prepare_move_submodule(src, first,
197 submodule_gitfile + i);
198 else if (index_range_of_same_dir(src, length,
199 &first, &last) < 1)
200 bad = _("source directory is empty");
201 else { /* last - first >= 1 */
202 int j, dst_len, n;
204 modes[i] = WORKING_DIRECTORY;
205 n = argc + last - first;
206 REALLOC_ARRAY(source, n);
207 REALLOC_ARRAY(destination, n);
208 REALLOC_ARRAY(modes, n);
209 REALLOC_ARRAY(submodule_gitfile, n);
211 dst = add_slash(dst);
212 dst_len = strlen(dst);
214 for (j = 0; j < last - first; j++) {
215 const char *path = active_cache[first + j]->name;
216 source[argc + j] = path;
217 destination[argc + j] =
218 prefix_path(dst, dst_len, path + length + 1);
219 modes[argc + j] = INDEX;
220 submodule_gitfile[argc + j] = NULL;
222 argc += last - first;
224 } else if (!(ce = cache_file_exists(src, length, ignore_case))) {
225 bad = _("not under version control");
226 } else if (ce_stage(ce)) {
227 bad = _("conflicted");
228 } else if (lstat(dst, &st) == 0 &&
229 (!ignore_case || strcasecmp(src, dst))) {
230 bad = _("destination exists");
231 if (force) {
233 * only files can overwrite each other:
234 * check both source and destination
236 if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
237 if (verbose)
238 warning(_("overwriting '%s'"), dst);
239 bad = NULL;
240 } else
241 bad = _("Cannot overwrite");
243 } else if (string_list_has_string(&src_for_dst, dst))
244 bad = _("multiple sources for the same target");
245 else if (is_dir_sep(dst[strlen(dst) - 1]))
246 bad = _("destination directory does not exist");
247 else
248 string_list_insert(&src_for_dst, dst);
250 if (!bad)
251 continue;
252 if (!ignore_errors)
253 die(_("%s, source=%s, destination=%s"),
254 bad, src, dst);
255 if (--argc > 0) {
256 int n = argc - i;
257 memmove(source + i, source + i + 1,
258 n * sizeof(char *));
259 memmove(destination + i, destination + i + 1,
260 n * sizeof(char *));
261 memmove(modes + i, modes + i + 1,
262 n * sizeof(enum update_mode));
263 memmove(submodule_gitfile + i, submodule_gitfile + i + 1,
264 n * sizeof(char *));
265 i--;
269 for (i = 0; i < argc; i++) {
270 const char *src = source[i], *dst = destination[i];
271 enum update_mode mode = modes[i];
272 int pos;
273 if (show_only || verbose)
274 printf(_("Renaming %s to %s\n"), src, dst);
275 if (show_only)
276 continue;
277 if (mode != INDEX && rename(src, dst) < 0) {
278 if (ignore_errors)
279 continue;
280 die_errno(_("renaming '%s' failed"), src);
282 if (submodule_gitfile[i]) {
283 if (!update_path_in_gitmodules(src, dst))
284 gitmodules_modified = 1;
285 if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
286 connect_work_tree_and_git_dir(dst,
287 submodule_gitfile[i],
291 if (mode == WORKING_DIRECTORY)
292 continue;
294 pos = cache_name_pos(src, strlen(src));
295 assert(pos >= 0);
296 rename_cache_entry_at(pos, dst);
299 if (gitmodules_modified)
300 stage_updated_gitmodules(&the_index);
302 if (write_locked_index(&the_index, &lock_file,
303 COMMIT_LOCK | SKIP_IF_UNCHANGED))
304 die(_("Unable to write new index file"));
306 return 0;