mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / builtin-mv.c
blob3563216acaebba668f465895fe0563e5d7113fef
1 /*
2 * "git mv" builtin command
4 * Copyright (C) 2006 Johannes Schindelin
5 */
6 #include "cache.h"
7 #include "builtin.h"
8 #include "dir.h"
9 #include "cache-tree.h"
10 #include "path-list.h"
12 static const char builtin_mv_usage[] =
13 "git-mv [-n] [-f] (<source> <destination> | [-k] <source>... <destination>)";
15 static const char **copy_pathspec(const char *prefix, const char **pathspec,
16 int count, int base_name)
18 int i;
19 const char **result = xmalloc((count + 1) * sizeof(const char *));
20 memcpy(result, pathspec, count * sizeof(const char *));
21 result[count] = NULL;
22 for (i = 0; i < count; i++) {
23 int length = strlen(result[i]);
24 if (length > 0 && result[i][length - 1] == '/') {
25 char *without_slash = xmalloc(length);
26 memcpy(without_slash, result[i], length - 1);
27 without_slash[length - 1] = '\0';
28 result[i] = without_slash;
30 if (base_name) {
31 const char *last_slash = strrchr(result[i], '/');
32 if (last_slash)
33 result[i] = last_slash + 1;
36 return get_pathspec(prefix, result);
39 static void show_list(const char *label, struct path_list *list)
41 if (list->nr > 0) {
42 int i;
43 printf("%s", label);
44 for (i = 0; i < list->nr; i++)
45 printf("%s%s", i > 0 ? ", " : "", list->items[i].path);
46 putchar('\n');
50 static const char *add_slash(const char *path)
52 int len = strlen(path);
53 if (path[len - 1] != '/') {
54 char *with_slash = xmalloc(len + 2);
55 memcpy(with_slash, path, len);
56 with_slash[len++] = '/';
57 with_slash[len] = 0;
58 return with_slash;
60 return path;
63 static struct lock_file lock_file;
65 int cmd_mv(int argc, const char **argv, const char *prefix)
67 int i, newfd, count;
68 int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
69 const char **source, **destination, **dest_path;
70 enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
71 struct stat st;
72 struct path_list overwritten = {NULL, 0, 0, 0};
73 struct path_list src_for_dst = {NULL, 0, 0, 0};
74 struct path_list added = {NULL, 0, 0, 0};
75 struct path_list deleted = {NULL, 0, 0, 0};
76 struct path_list changed = {NULL, 0, 0, 0};
78 git_config(git_default_config);
80 newfd = hold_locked_index(&lock_file, 1);
81 if (read_cache() < 0)
82 die("index file corrupt");
84 for (i = 1; i < argc; i++) {
85 const char *arg = argv[i];
87 if (arg[0] != '-')
88 break;
89 if (!strcmp(arg, "--")) {
90 i++;
91 break;
93 if (!strcmp(arg, "-n")) {
94 show_only = 1;
95 continue;
97 if (!strcmp(arg, "-f")) {
98 force = 1;
99 continue;
101 if (!strcmp(arg, "-k")) {
102 ignore_errors = 1;
103 continue;
105 usage(builtin_mv_usage);
107 count = argc - i - 1;
108 if (count < 1)
109 usage(builtin_mv_usage);
111 source = copy_pathspec(prefix, argv + i, count, 0);
112 modes = xcalloc(count, sizeof(enum update_mode));
113 dest_path = copy_pathspec(prefix, argv + argc - 1, 1, 0);
115 if (dest_path[0][0] == '\0')
116 /* special case: "." was normalized to "" */
117 destination = copy_pathspec(dest_path[0], argv + i, count, 1);
118 else if (!lstat(dest_path[0], &st) &&
119 S_ISDIR(st.st_mode)) {
120 dest_path[0] = add_slash(dest_path[0]);
121 destination = copy_pathspec(dest_path[0], argv + i, count, 1);
122 } else {
123 if (count != 1)
124 usage(builtin_mv_usage);
125 destination = dest_path;
128 /* Checking */
129 for (i = 0; i < count; i++) {
130 const char *src = source[i], *dst = destination[i];
131 int length, src_is_dir;
132 const char *bad = NULL;
134 if (show_only)
135 printf("Checking rename of '%s' to '%s'\n", src, dst);
137 length = strlen(src);
138 if (lstat(src, &st) < 0)
139 bad = "bad source";
140 else if (!strncmp(src, dst, length) &&
141 (dst[length] == 0 || dst[length] == '/')) {
142 bad = "can not move directory into itself";
143 } else if ((src_is_dir = S_ISDIR(st.st_mode))
144 && lstat(dst, &st) == 0)
145 bad = "cannot move directory over file";
146 else if (src_is_dir) {
147 const char *src_w_slash = add_slash(src);
148 int len_w_slash = length + 1;
149 int first, last;
151 modes[i] = WORKING_DIRECTORY;
153 first = cache_name_pos(src_w_slash, len_w_slash);
154 if (first >= 0)
155 die ("Huh? %.*s is in index?",
156 len_w_slash, src_w_slash);
158 first = -1 - first;
159 for (last = first; last < active_nr; last++) {
160 const char *path = active_cache[last]->name;
161 if (strncmp(path, src_w_slash, len_w_slash))
162 break;
164 free((char *)src_w_slash);
166 if (last - first < 1)
167 bad = "source directory is empty";
168 else {
169 int j, dst_len;
171 if (last - first > 0) {
172 source = xrealloc(source,
173 (count + last - first)
174 * sizeof(char *));
175 destination = xrealloc(destination,
176 (count + last - first)
177 * sizeof(char *));
178 modes = xrealloc(modes,
179 (count + last - first)
180 * sizeof(enum update_mode));
183 dst = add_slash(dst);
184 dst_len = strlen(dst) - 1;
186 for (j = 0; j < last - first; j++) {
187 const char *path =
188 active_cache[first + j]->name;
189 source[count + j] = path;
190 destination[count + j] =
191 prefix_path(dst, dst_len,
192 path + length);
193 modes[count + j] = INDEX;
195 count += last - first;
197 } else if (lstat(dst, &st) == 0) {
198 bad = "destination exists";
199 if (force) {
201 * only files can overwrite each other:
202 * check both source and destination
204 if (S_ISREG(st.st_mode)) {
205 fprintf(stderr, "Warning: %s;"
206 " will overwrite!\n",
207 bad);
208 bad = NULL;
209 path_list_insert(dst, &overwritten);
210 } else
211 bad = "Cannot overwrite";
213 } else if (cache_name_pos(src, length) < 0)
214 bad = "not under version control";
215 else if (path_list_has_path(&src_for_dst, dst))
216 bad = "multiple sources for the same target";
217 else
218 path_list_insert(dst, &src_for_dst);
220 if (bad) {
221 if (ignore_errors) {
222 if (--count > 0) {
223 memmove(source + i, source + i + 1,
224 (count - i) * sizeof(char *));
225 memmove(destination + i,
226 destination + i + 1,
227 (count - i) * sizeof(char *));
229 } else
230 die ("%s, source=%s, destination=%s",
231 bad, src, dst);
235 for (i = 0; i < count; i++) {
236 const char *src = source[i], *dst = destination[i];
237 enum update_mode mode = modes[i];
238 if (show_only || verbose)
239 printf("Renaming %s to %s\n", src, dst);
240 if (!show_only && mode != INDEX &&
241 rename(src, dst) < 0 && !ignore_errors)
242 die ("renaming %s failed: %s", src, strerror(errno));
244 if (mode == WORKING_DIRECTORY)
245 continue;
247 if (cache_name_pos(src, strlen(src)) >= 0) {
248 path_list_insert(src, &deleted);
250 /* destination can be a directory with 1 file inside */
251 if (path_list_has_path(&overwritten, dst))
252 path_list_insert(dst, &changed);
253 else
254 path_list_insert(dst, &added);
255 } else
256 path_list_insert(dst, &added);
259 if (show_only) {
260 show_list("Changed : ", &changed);
261 show_list("Adding : ", &added);
262 show_list("Deleting : ", &deleted);
263 } else {
264 for (i = 0; i < changed.nr; i++) {
265 const char *path = changed.items[i].path;
266 int j = cache_name_pos(path, strlen(path));
267 struct cache_entry *ce = active_cache[j];
269 if (j < 0)
270 die ("Huh? Cache entry for %s unknown?", path);
271 refresh_cache_entry(ce, 0);
274 for (i = 0; i < added.nr; i++) {
275 const char *path = added.items[i].path;
276 add_file_to_cache(path, verbose);
279 for (i = 0; i < deleted.nr; i++) {
280 const char *path = deleted.items[i].path;
281 remove_file_from_cache(path);
282 cache_tree_invalidate_path(active_cache_tree, path);
285 if (active_cache_changed) {
286 if (write_cache(newfd, active_cache, active_nr) ||
287 close(newfd) ||
288 commit_locked_index(&lock_file))
289 die("Unable to write new index file");
293 return 0;