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