builtin-branch: fix -v for --[no-]merged
[git/mingw.git] / builtin-mv.c
blob736a0b8bb1f39c47b35cb58f6775a683c5ed9ed7
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 "string-list.h"
11 #include "parse-options.h"
13 static const char * const builtin_mv_usage[] = {
14 "git mv [options] <source>... <destination>",
15 NULL
18 static const char **copy_pathspec(const char *prefix, const char **pathspec,
19 int count, int base_name)
21 int i;
22 const char **result = xmalloc((count + 1) * sizeof(const char *));
23 memcpy(result, pathspec, count * sizeof(const char *));
24 result[count] = NULL;
25 for (i = 0; i < count; i++) {
26 int length = strlen(result[i]);
27 if (length > 0 && result[i][length - 1] == '/') {
28 result[i] = xmemdupz(result[i], length - 1);
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 string_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 ? ", " : "",
46 list->items[i].string);
47 putchar('\n');
51 static const char *add_slash(const char *path)
53 int len = strlen(path);
54 if (path[len - 1] != '/') {
55 char *with_slash = xmalloc(len + 2);
56 memcpy(with_slash, path, len);
57 with_slash[len++] = '/';
58 with_slash[len] = 0;
59 return with_slash;
61 return path;
64 static struct lock_file lock_file;
66 int cmd_mv(int argc, const char **argv, const char *prefix)
68 int i, newfd;
69 int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
70 struct option builtin_mv_options[] = {
71 OPT__DRY_RUN(&show_only),
72 OPT_BOOLEAN('f', NULL, &force, "force move/rename even if target exists"),
73 OPT_BOOLEAN('k', NULL, &ignore_errors, "skip move/rename errors"),
74 OPT_END(),
76 const char **source, **destination, **dest_path;
77 enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
78 struct stat st;
79 struct string_list overwritten = {NULL, 0, 0, 0};
80 struct string_list src_for_dst = {NULL, 0, 0, 0};
81 struct string_list added = {NULL, 0, 0, 0};
82 struct string_list deleted = {NULL, 0, 0, 0};
83 struct string_list changed = {NULL, 0, 0, 0};
85 git_config(git_default_config, NULL);
87 newfd = hold_locked_index(&lock_file, 1);
88 if (read_cache() < 0)
89 die("index file corrupt");
91 argc = parse_options(argc, argv, builtin_mv_options, builtin_mv_usage, 0);
92 if (--argc < 1)
93 usage_with_options(builtin_mv_usage, builtin_mv_options);
95 source = copy_pathspec(prefix, argv, argc, 0);
96 modes = xcalloc(argc, sizeof(enum update_mode));
97 dest_path = copy_pathspec(prefix, argv + argc, 1, 0);
99 if (dest_path[0][0] == '\0')
100 /* special case: "." was normalized to "" */
101 destination = copy_pathspec(dest_path[0], argv, argc, 1);
102 else if (!lstat(dest_path[0], &st) &&
103 S_ISDIR(st.st_mode)) {
104 dest_path[0] = add_slash(dest_path[0]);
105 destination = copy_pathspec(dest_path[0], argv, argc, 1);
106 } else {
107 if (argc != 1)
108 usage_with_options(builtin_mv_usage, builtin_mv_options);
109 destination = dest_path;
112 /* Checking */
113 for (i = 0; i < argc; i++) {
114 const char *src = source[i], *dst = destination[i];
115 int length, src_is_dir;
116 const char *bad = NULL;
118 if (show_only)
119 printf("Checking rename of '%s' to '%s'\n", src, dst);
121 length = strlen(src);
122 if (lstat(src, &st) < 0)
123 bad = "bad source";
124 else if (!strncmp(src, dst, length) &&
125 (dst[length] == 0 || dst[length] == '/')) {
126 bad = "can not move directory into itself";
127 } else if ((src_is_dir = S_ISDIR(st.st_mode))
128 && lstat(dst, &st) == 0)
129 bad = "cannot move directory over file";
130 else if (src_is_dir) {
131 const char *src_w_slash = add_slash(src);
132 int len_w_slash = length + 1;
133 int first, last;
135 modes[i] = WORKING_DIRECTORY;
137 first = cache_name_pos(src_w_slash, len_w_slash);
138 if (first >= 0)
139 die ("Huh? %.*s is in index?",
140 len_w_slash, src_w_slash);
142 first = -1 - first;
143 for (last = first; last < active_nr; last++) {
144 const char *path = active_cache[last]->name;
145 if (strncmp(path, src_w_slash, len_w_slash))
146 break;
148 free((char *)src_w_slash);
150 if (last - first < 1)
151 bad = "source directory is empty";
152 else {
153 int j, dst_len;
155 if (last - first > 0) {
156 source = xrealloc(source,
157 (argc + last - first)
158 * sizeof(char *));
159 destination = xrealloc(destination,
160 (argc + last - first)
161 * sizeof(char *));
162 modes = xrealloc(modes,
163 (argc + last - first)
164 * sizeof(enum update_mode));
167 dst = add_slash(dst);
168 dst_len = strlen(dst);
170 for (j = 0; j < last - first; j++) {
171 const char *path =
172 active_cache[first + j]->name;
173 source[argc + j] = path;
174 destination[argc + j] =
175 prefix_path(dst, dst_len,
176 path + length + 1);
177 modes[argc + j] = INDEX;
179 argc += last - first;
181 } else if (lstat(dst, &st) == 0) {
182 bad = "destination exists";
183 if (force) {
185 * only files can overwrite each other:
186 * check both source and destination
188 if (S_ISREG(st.st_mode)) {
189 fprintf(stderr, "Warning: %s;"
190 " will overwrite!\n",
191 bad);
192 bad = NULL;
193 string_list_insert(dst, &overwritten);
194 } else
195 bad = "Cannot overwrite";
197 } else if (cache_name_pos(src, length) < 0)
198 bad = "not under version control";
199 else if (string_list_has_string(&src_for_dst, dst))
200 bad = "multiple sources for the same target";
201 else
202 string_list_insert(dst, &src_for_dst);
204 if (bad) {
205 if (ignore_errors) {
206 if (--argc > 0) {
207 memmove(source + i, source + i + 1,
208 (argc - i) * sizeof(char *));
209 memmove(destination + i,
210 destination + i + 1,
211 (argc - i) * sizeof(char *));
213 } else
214 die ("%s, source=%s, destination=%s",
215 bad, src, dst);
219 for (i = 0; i < argc; i++) {
220 const char *src = source[i], *dst = destination[i];
221 enum update_mode mode = modes[i];
222 if (show_only || verbose)
223 printf("Renaming %s to %s\n", src, dst);
224 if (!show_only && mode != INDEX &&
225 rename(src, dst) < 0 && !ignore_errors)
226 die ("renaming %s failed: %s", src, strerror(errno));
228 if (mode == WORKING_DIRECTORY)
229 continue;
231 if (cache_name_pos(src, strlen(src)) >= 0) {
232 string_list_insert(src, &deleted);
234 /* destination can be a directory with 1 file inside */
235 if (string_list_has_string(&overwritten, dst))
236 string_list_insert(dst, &changed);
237 else
238 string_list_insert(dst, &added);
239 } else
240 string_list_insert(dst, &added);
243 if (show_only) {
244 show_list("Changed : ", &changed);
245 show_list("Adding : ", &added);
246 show_list("Deleting : ", &deleted);
247 } else {
248 for (i = 0; i < changed.nr; i++) {
249 const char *path = changed.items[i].string;
250 int j = cache_name_pos(path, strlen(path));
251 struct cache_entry *ce = active_cache[j];
253 if (j < 0)
254 die ("Huh? Cache entry for %s unknown?", path);
255 refresh_cache_entry(ce, 0);
258 for (i = 0; i < added.nr; i++) {
259 const char *path = added.items[i].string;
260 if (add_file_to_cache(path, verbose ? ADD_CACHE_VERBOSE : 0))
261 die("updating index entries failed");
264 for (i = 0; i < deleted.nr; i++)
265 remove_file_from_cache(deleted.items[i].string);
267 if (active_cache_changed) {
268 if (write_cache(newfd, active_cache, active_nr) ||
269 commit_locked_index(&lock_file))
270 die("Unable to write new index file");
274 return 0;