builtin-mv.con commit git-commit: allow --only to lose what was staged earlier. (158d057)
   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{
  20        int i;
  21        const char **result = xmalloc((count + 1) * sizeof(const char *));
  22        memcpy(result, pathspec, count * sizeof(const char *));
  23        result[count] = NULL;
  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);
  29                        without_slash[length - 1] = '\0';
  30                        result[i] = without_slash;
  31                }
  32                if (base_name) {
  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
  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);
  58                with_slash[len++] = '/';
  59                with_slash[len] = 0;
  60                return with_slash;
  61        }
  62        return path;
  63}
  64
  65static struct lock_file lock_file;
  66
  67int cmd_mv(int argc, const char **argv, const char *prefix)
  68{
  69        int i, newfd, count;
  70        int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
  71        const char **source, **destination, **dest_path;
  72        enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
  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
  82        newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
  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                }
 107                usage(builtin_mv_usage);
 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);
 114        modes = xcalloc(count, sizeof(enum update_mode));
 115        dest_path = copy_pathspec(prefix, argv + argc - 1, 1, 0);
 116
 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) &&
 121                        S_ISDIR(st.st_mode)) {
 122                dest_path[0] = add_slash(dest_path[0]);
 123                destination = copy_pathspec(dest_path[0], argv + i, count, 1);
 124        } else {
 125                if (count != 1)
 126                        usage(builtin_mv_usage);
 127                destination = dest_path;
 128        }
 129
 130        /* Checking */
 131        for (i = 0; i < count; i++) {
 132                const char *src = source[i], *dst = destination[i];
 133                int length, src_is_dir;
 134                const char *bad = NULL;
 135
 136                if (show_only)
 137                        printf("Checking rename of '%s' to '%s'\n", src, dst);
 138
 139                length = strlen(src);
 140                if (lstat(src, &st) < 0)
 141                        bad = "bad source";
 142                else if (!strncmp(src, dst, length) &&
 143                                (dst[length] == 0 || dst[length] == '/')) {
 144                        bad = "can not move directory into itself";
 145                } else if ((src_is_dir = S_ISDIR(st.st_mode))
 146                                && lstat(dst, &st) == 0)
 147                        bad = "cannot move directory over file";
 148                else if (src_is_dir) {
 149                        const char *src_w_slash = add_slash(src);
 150                        int len_w_slash = length + 1;
 151                        int first, last;
 152
 153                        modes[i] = WORKING_DIRECTORY;
 154
 155                        first = cache_name_pos(src_w_slash, len_w_slash);
 156                        if (first >= 0)
 157                                die ("Huh? %.*s is in index?",
 158                                                len_w_slash, src_w_slash);
 159
 160                        first = -1 - first;
 161                        for (last = first; last < active_nr; last++) {
 162                                const char *path = active_cache[last]->name;
 163                                if (strncmp(path, src_w_slash, len_w_slash))
 164                                        break;
 165                        }
 166                        free((char *)src_w_slash);
 167
 168                        if (last - first < 1)
 169                                bad = "source directory is empty";
 170                        else {
 171                                int j, dst_len;
 172
 173                                if (last - first > 0) {
 174                                        source = xrealloc(source,
 175                                                        (count + last - first)
 176                                                        * sizeof(char *));
 177                                        destination = xrealloc(destination,
 178                                                        (count + last - first)
 179                                                        * sizeof(char *));
 180                                        modes = xrealloc(modes,
 181                                                        (count + last - first)
 182                                                        * sizeof(enum update_mode));
 183                                }
 184
 185                                dst = add_slash(dst);
 186                                dst_len = strlen(dst) - 1;
 187
 188                                for (j = 0; j < last - first; j++) {
 189                                        const char *path =
 190                                                active_cache[first + j]->name;
 191                                        source[count + j] = path;
 192                                        destination[count + j] =
 193                                                prefix_path(dst, dst_len,
 194                                                        path + length);
 195                                        modes[count + j] = INDEX;
 196                                }
 197                                count += last - first;
 198                        }
 199                } else if (lstat(dst, &st) == 0) {
 200                        bad = "destination exists";
 201                        if (force) {
 202                                /*
 203                                 * only files can overwrite each other:
 204                                 * check both source and destination
 205                                 */
 206                                if (S_ISREG(st.st_mode)) {
 207                                        fprintf(stderr, "Warning: %s;"
 208                                                        " will overwrite!\n",
 209                                                        bad);
 210                                        bad = NULL;
 211                                        path_list_insert(dst, &overwritten);
 212                                } else
 213                                        bad = "Cannot overwrite";
 214                        }
 215                } else if (cache_name_pos(src, length) < 0)
 216                        bad = "not under version control";
 217                else if (path_list_has_path(&src_for_dst, dst))
 218                        bad = "multiple sources for the same target";
 219                else
 220                        path_list_insert(dst, &src_for_dst);
 221
 222                if (bad) {
 223                        if (ignore_errors) {
 224                                if (--count > 0) {
 225                                        memmove(source + i, source + i + 1,
 226                                                (count - i) * sizeof(char *));
 227                                        memmove(destination + i,
 228                                                destination + i + 1,
 229                                                (count - i) * sizeof(char *));
 230                                }
 231                        } else
 232                                die ("%s, source=%s, destination=%s",
 233                                     bad, src, dst);
 234                }
 235        }
 236
 237        for (i = 0; i < count; i++) {
 238                const char *src = source[i], *dst = destination[i];
 239                enum update_mode mode = modes[i];
 240                if (show_only || verbose)
 241                        printf("Renaming %s to %s\n", src, dst);
 242                if (!show_only && mode != INDEX &&
 243                                rename(src, dst) < 0 && !ignore_errors)
 244                        die ("renaming %s failed: %s", src, strerror(errno));
 245
 246                if (mode == WORKING_DIRECTORY)
 247                        continue;
 248
 249                if (cache_name_pos(src, strlen(src)) >= 0) {
 250                        path_list_insert(src, &deleted);
 251
 252                        /* destination can be a directory with 1 file inside */
 253                        if (path_list_has_path(&overwritten, dst))
 254                                path_list_insert(dst, &changed);
 255                        else
 256                                path_list_insert(dst, &added);
 257                } else
 258                        path_list_insert(dst, &added);
 259        }
 260
 261        if (show_only) {
 262                show_list("Changed  : ", &changed);
 263                show_list("Adding   : ", &added);
 264                show_list("Deleting : ", &deleted);
 265        } else {
 266                for (i = 0; i < changed.nr; i++) {
 267                        const char *path = changed.items[i].path;
 268                        int j = cache_name_pos(path, strlen(path));
 269                        struct cache_entry *ce = active_cache[j];
 270
 271                        if (j < 0)
 272                                die ("Huh? Cache entry for %s unknown?", path);
 273                        refresh_cache_entry(ce, 0);
 274                }
 275
 276                for (i = 0; i < added.nr; i++) {
 277                        const char *path = added.items[i].path;
 278                        add_file_to_index(path, verbose);
 279                }
 280
 281                for (i = 0; i < deleted.nr; i++) {
 282                        const char *path = deleted.items[i].path;
 283                        remove_file_from_cache(path);
 284                        cache_tree_invalidate_path(active_cache_tree, path);
 285                }
 286
 287                if (active_cache_changed) {
 288                        if (write_cache(newfd, active_cache, active_nr) ||
 289                            close(newfd) ||
 290                            commit_lock_file(&lock_file))
 291                                die("Unable to write new index file");
 292                }
 293        }
 294
 295        return 0;
 296}