git-mv: fix off-by-one error
[git/git.git] / builtin-mv.c
CommitLineData
11be42a4
JS
1/*
2 * "git mv" builtin command
3 *
4 * Copyright (C) 2006 Johannes Schindelin
5 */
6#include <fnmatch.h>
7
8#include "cache.h"
9#include "builtin.h"
10#include "dir.h"
11#include "cache-tree.h"
12#include "path-list.h"
13
14static const char builtin_mv_usage[] =
15"git-mv [-n] [-f] (<source> <destination> | [-k] <source>... <destination>)";
16
17static const char **copy_pathspec(const char *prefix, const char **pathspec,
18 int count, int base_name)
19{
d78b0f3d 20 int i;
11be42a4
JS
21 const char **result = xmalloc((count + 1) * sizeof(const char *));
22 memcpy(result, pathspec, count * sizeof(const char *));
23 result[count] = NULL;
d78b0f3d
JS
24 for (i = 0; i < count; i++) {
25 int length = strlen(result[i]);
26 if (length > 0 && result[i][length - 1] == '/') {
27 char *without_slash = xmalloc(length);
28 memcpy(without_slash, result[i], length - 1);
6e17886d 29 without_slash[length - 1] = '\0';
d78b0f3d
JS
30 result[i] = without_slash;
31 }
32 if (base_name) {
11be42a4
JS
33 const char *last_slash = strrchr(result[i], '/');
34 if (last_slash)
35 result[i] = last_slash + 1;
36 }
37 }
38 return get_pathspec(prefix, result);
39}
40
41static void show_list(const char *label, struct path_list *list)
42{
43 if (list->nr > 0) {
44 int i;
45 printf("%s", label);
46 for (i = 0; i < list->nr; i++)
47 printf("%s%s", i > 0 ? ", " : "", list->items[i].path);
48 putchar('\n');
49 }
50}
51
ac64a722
JS
52static const char *add_slash(const char *path)
53{
54 int len = strlen(path);
55 if (path[len - 1] != '/') {
56 char *with_slash = xmalloc(len + 2);
57 memcpy(with_slash, path, len);
329a3047
JH
58 with_slash[len++] = '/';
59 with_slash[len] = 0;
ac64a722
JS
60 return with_slash;
61 }
62 return path;
63}
64
11be42a4
JS
65static struct lock_file lock_file;
66
7061cf0f 67int cmd_mv(int argc, const char **argv, const char *prefix)
11be42a4
JS
68{
69 int i, newfd, count;
70 int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
11be42a4 71 const char **source, **destination, **dest_path;
ac64a722 72 enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
11be42a4
JS
73 struct stat st;
74 struct path_list overwritten = {NULL, 0, 0, 0};
75 struct path_list src_for_dst = {NULL, 0, 0, 0};
76 struct path_list added = {NULL, 0, 0, 0};
77 struct path_list deleted = {NULL, 0, 0, 0};
78 struct path_list changed = {NULL, 0, 0, 0};
79
80 git_config(git_default_config);
81
40aaae88 82 newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
11be42a4
JS
83 if (read_cache() < 0)
84 die("index file corrupt");
85
86 for (i = 1; i < argc; i++) {
87 const char *arg = argv[i];
88
89 if (arg[0] != '-')
90 break;
91 if (!strcmp(arg, "--")) {
92 i++;
93 break;
94 }
95 if (!strcmp(arg, "-n")) {
96 show_only = 1;
97 continue;
98 }
99 if (!strcmp(arg, "-f")) {
100 force = 1;
101 continue;
102 }
103 if (!strcmp(arg, "-k")) {
104 ignore_errors = 1;
105 continue;
106 }
cba05fa8 107 usage(builtin_mv_usage);
11be42a4
JS
108 }
109 count = argc - i - 1;
110 if (count < 1)
111 usage(builtin_mv_usage);
112
113 source = copy_pathspec(prefix, argv + i, count, 0);
ac64a722 114 modes = xcalloc(count, sizeof(enum update_mode));
11be42a4
JS
115 dest_path = copy_pathspec(prefix, argv + argc - 1, 1, 0);
116
c5203bdf
JS
117 if (dest_path[0][0] == '\0')
118 /* special case: "." was normalized to "" */
119 destination = copy_pathspec(dest_path[0], argv + i, count, 1);
120 else if (!lstat(dest_path[0], &st) &&
ac64a722
JS
121 S_ISDIR(st.st_mode)) {
122 dest_path[0] = add_slash(dest_path[0]);
11be42a4 123 destination = copy_pathspec(dest_path[0], argv + i, count, 1);
ac64a722 124 } else {
11be42a4
JS
125 if (count != 1)
126 usage(builtin_mv_usage);
127 destination = dest_path;
128 }
129
130 /* Checking */
131 for (i = 0; i < count; i++) {
1d6249e6 132 int length;
11be42a4
JS
133 const char *bad = NULL;
134
135 if (show_only)
136 printf("Checking rename of '%s' to '%s'\n",
137 source[i], destination[i]);
138
139 if (lstat(source[i], &st) < 0)
140 bad = "bad source";
ac64a722 141
d78b0f3d
JS
142 if (!bad &&
143 (length = strlen(source[i])) >= 0 &&
144 !strncmp(destination[i], source[i], length) &&
145 (destination[i][length] == 0 || destination[i][length] == '/'))
146 bad = "can not move directory into itself";
147
ac64a722
JS
148 if (S_ISDIR(st.st_mode)) {
149 const char *dir = source[i], *dest_dir = destination[i];
150 int first, last, len = strlen(dir);
151
152 if (lstat(dest_dir, &st) == 0) {
153 bad = "cannot move directory over file";
154 goto next;
155 }
156
157 modes[i] = WORKING_DIRECTORY;
158
159 first = cache_name_pos(source[i], len);
160 if (first >= 0)
161 die ("Huh? %s/ is in index?", dir);
162
163 first = -1 - first;
164 for (last = first; last < active_nr; last++) {
165 const char *path = active_cache[last]->name;
166 if (strncmp(path, dir, len) || path[len] != '/')
167 break;
168 }
169
170 if (last - first < 1)
171 bad = "source directory is empty";
172 else if (!bad) {
173 int j, dst_len = strlen(dest_dir);
174
175 if (last - first > 0) {
176 source = realloc(source,
177 (count + last - first)
178 * sizeof(char *));
179 destination = realloc(destination,
180 (count + last - first)
181 * sizeof(char *));
182 modes = realloc(modes,
183 (count + last - first)
184 * sizeof(enum update_mode));
185 }
186
187 dest_dir = add_slash(dest_dir);
188
189 for (j = 0; j < last - first; j++) {
190 const char *path =
191 active_cache[first + j]->name;
192 source[count + j] = path;
193 destination[count + j] =
194 prefix_path(dest_dir, dst_len,
195 path + len);
196 modes[count + j] = INDEX;
197 }
198 count += last - first;
199 }
200
201 goto next;
202 }
203
204 if (!bad && lstat(destination[i], &st) == 0) {
11be42a4
JS
205 bad = "destination exists";
206 if (force) {
207 /*
208 * only files can overwrite each other:
209 * check both source and destination
210 */
211 if (S_ISREG(st.st_mode)) {
212 fprintf(stderr, "Warning: %s;"
213 " will overwrite!\n",
214 bad);
215 bad = NULL;
216 path_list_insert(destination[i],
217 &overwritten);
218 } else
219 bad = "Cannot overwrite";
220 }
221 }
222
11be42a4
JS
223 if (!bad && cache_name_pos(source[i], strlen(source[i])) < 0)
224 bad = "not under version control";
225
226 if (!bad) {
227 if (path_list_has_path(&src_for_dst, destination[i]))
228 bad = "multiple sources for the same target";
229 else
230 path_list_insert(destination[i], &src_for_dst);
231 }
232
ac64a722 233next:
11be42a4
JS
234 if (bad) {
235 if (ignore_errors) {
236 if (--count > 0) {
237 memmove(source + i, source + i + 1,
238 (count - i) * sizeof(char *));
239 memmove(destination + i,
240 destination + i + 1,
241 (count - i) * sizeof(char *));
242 }
243 } else
ac64a722 244 die ("%s, source=%s, destination=%s",
11be42a4
JS
245 bad, source[i], destination[i]);
246 }
247 }
248
249 for (i = 0; i < count; i++) {
250 if (show_only || verbose)
251 printf("Renaming %s to %s\n",
252 source[i], destination[i]);
ac64a722 253 if (!show_only && modes[i] != INDEX &&
11be42a4
JS
254 rename(source[i], destination[i]) < 0 &&
255 !ignore_errors)
256 die ("renaming %s failed: %s",
257 source[i], strerror(errno));
258
ac64a722
JS
259 if (modes[i] == WORKING_DIRECTORY)
260 continue;
261
11be42a4
JS
262 if (cache_name_pos(source[i], strlen(source[i])) >= 0) {
263 path_list_insert(source[i], &deleted);
264
265 /* destination can be a directory with 1 file inside */
266 if (path_list_has_path(&overwritten, destination[i]))
267 path_list_insert(destination[i], &changed);
268 else
269 path_list_insert(destination[i], &added);
270 } else
271 path_list_insert(destination[i], &added);
272 }
273
274 if (show_only) {
275 show_list("Changed : ", &changed);
276 show_list("Adding : ", &added);
277 show_list("Deleting : ", &deleted);
278 } else {
279 for (i = 0; i < changed.nr; i++) {
280 const char *path = changed.items[i].path;
281 int i = cache_name_pos(path, strlen(path));
282 struct cache_entry *ce = active_cache[i];
283
284 if (i < 0)
285 die ("Huh? Cache entry for %s unknown?", path);
286 refresh_cache_entry(ce, 0);
287 }
288
289 for (i = 0; i < added.nr; i++) {
290 const char *path = added.items[i].path;
291 add_file_to_index(path, verbose);
292 }
293
294 for (i = 0; i < deleted.nr; i++) {
295 const char *path = deleted.items[i].path;
296 remove_file_from_cache(path);
297 }
298
299 if (active_cache_changed) {
300 if (write_cache(newfd, active_cache, active_nr) ||
301 close(newfd) ||
302 commit_lock_file(&lock_file))
303 die("Unable to write new index file");
304 }
305 }
306
307 return 0;
308}