builtin / mv.con commit merge hook tests: fix missing '&&' in test (3219bad)
   1/*
   2 * "git mv" builtin command
   3 *
   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"
  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
  64int cmd_mv(int argc, const char **argv, const char *prefix)
  65{
  66        int i, newfd, gitmodules_modified = 0;
  67        int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
  68        struct option builtin_mv_options[] = {
  69                OPT__VERBOSE(&verbose, N_("be verbose")),
  70                OPT__DRY_RUN(&show_only, N_("dry run")),
  71                OPT__FORCE(&force, N_("force move/rename even if target exists")),
  72                OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
  73                OPT_END(),
  74        };
  75        const char **source, **destination, **dest_path, **submodule_gitfile;
  76        enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
  77        struct stat st;
  78        struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
  79
  80        gitmodules_config();
  81        git_config(git_default_config, NULL);
  82
  83        argc = parse_options(argc, argv, prefix, builtin_mv_options,
  84                             builtin_mv_usage, 0);
  85        if (--argc < 1)
  86                usage_with_options(builtin_mv_usage, builtin_mv_options);
  87
  88        newfd = hold_locked_index(&lock_file, 1);
  89        if (read_cache() < 0)
  90                die(_("index file corrupt"));
  91
  92        source = internal_copy_pathspec(prefix, argv, argc, 0);
  93        modes = xcalloc(argc, sizeof(enum update_mode));
  94        /*
  95         * Keep trailing slash, needed to let
  96         * "git mv file no-such-dir/" error out.
  97         */
  98        dest_path = internal_copy_pathspec(prefix, argv + argc, 1,
  99                                           KEEP_TRAILING_SLASH);
 100        submodule_gitfile = xcalloc(argc, sizeof(char *));
 101
 102        if (dest_path[0][0] == '\0')
 103                /* special case: "." was normalized to "" */
 104                destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
 105        else if (!lstat(dest_path[0], &st) &&
 106                        S_ISDIR(st.st_mode)) {
 107                dest_path[0] = add_slash(dest_path[0]);
 108                destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
 109        } else {
 110                if (argc != 1)
 111                        die("destination '%s' is not a directory", dest_path[0]);
 112                destination = dest_path;
 113        }
 114
 115        /* Checking */
 116        for (i = 0; i < argc; i++) {
 117                const char *src = source[i], *dst = destination[i];
 118                int length, src_is_dir;
 119                const char *bad = NULL;
 120
 121                if (show_only)
 122                        printf(_("Checking rename of '%s' to '%s'\n"), src, dst);
 123
 124                length = strlen(src);
 125                if (lstat(src, &st) < 0)
 126                        bad = _("bad source");
 127                else if (!strncmp(src, dst, length) &&
 128                                (dst[length] == 0 || dst[length] == '/')) {
 129                        bad = _("can not move directory into itself");
 130                } else if ((src_is_dir = S_ISDIR(st.st_mode))
 131                                && lstat(dst, &st) == 0)
 132                        bad = _("cannot move directory over file");
 133                else if (src_is_dir) {
 134                        int first = cache_name_pos(src, length);
 135                        if (first >= 0) {
 136                                struct strbuf submodule_dotgit = STRBUF_INIT;
 137                                if (!S_ISGITLINK(active_cache[first]->ce_mode))
 138                                        die (_("Huh? Directory %s is in index and no submodule?"), src);
 139                                if (!is_staging_gitmodules_ok())
 140                                        die (_("Please, stage your changes to .gitmodules or stash them to proceed"));
 141                                strbuf_addf(&submodule_dotgit, "%s/.git", src);
 142                                submodule_gitfile[i] = read_gitfile(submodule_dotgit.buf);
 143                                if (submodule_gitfile[i])
 144                                        submodule_gitfile[i] = xstrdup(submodule_gitfile[i]);
 145                                else
 146                                        submodule_gitfile[i] = SUBMODULE_WITH_GITDIR;
 147                                strbuf_release(&submodule_dotgit);
 148                        } else {
 149                                const char *src_w_slash = add_slash(src);
 150                                int last, len_w_slash = length + 1;
 151
 152                                modes[i] = WORKING_DIRECTORY;
 153
 154                                first = cache_name_pos(src_w_slash, len_w_slash);
 155                                if (first >= 0)
 156                                        die (_("Huh? %.*s is in index?"),
 157                                                        len_w_slash, src_w_slash);
 158
 159                                first = -1 - first;
 160                                for (last = first; last < active_nr; last++) {
 161                                        const char *path = active_cache[last]->name;
 162                                        if (strncmp(path, src_w_slash, len_w_slash))
 163                                                break;
 164                                }
 165                                free((char *)src_w_slash);
 166
 167                                if (last - first < 1)
 168                                        bad = _("source directory is empty");
 169                                else {
 170                                        int j, dst_len;
 171
 172                                        if (last - first > 0) {
 173                                                source = xrealloc(source,
 174                                                                (argc + last - first)
 175                                                                * sizeof(char *));
 176                                                destination = xrealloc(destination,
 177                                                                (argc + last - first)
 178                                                                * sizeof(char *));
 179                                                modes = xrealloc(modes,
 180                                                                (argc + last - first)
 181                                                                * sizeof(enum update_mode));
 182                                        }
 183
 184                                        dst = add_slash(dst);
 185                                        dst_len = strlen(dst);
 186
 187                                        for (j = 0; j < last - first; j++) {
 188                                                const char *path =
 189                                                        active_cache[first + j]->name;
 190                                                source[argc + j] = path;
 191                                                destination[argc + j] =
 192                                                        prefix_path(dst, dst_len,
 193                                                                path + length + 1);
 194                                                modes[argc + j] = INDEX;
 195                                        }
 196                                        argc += last - first;
 197                                }
 198                        }
 199                } else if (cache_name_pos(src, length) < 0)
 200                        bad = _("not under version control");
 201                else if (lstat(dst, &st) == 0) {
 202                        bad = _("destination exists");
 203                        if (force) {
 204                                /*
 205                                 * only files can overwrite each other:
 206                                 * check both source and destination
 207                                 */
 208                                if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
 209                                        if (verbose)
 210                                                warning(_("overwriting '%s'"), dst);
 211                                        bad = NULL;
 212                                } else
 213                                        bad = _("Cannot overwrite");
 214                        }
 215                } else if (string_list_has_string(&src_for_dst, dst))
 216                        bad = _("multiple sources for the same target");
 217                else if (is_dir_sep(dst[strlen(dst) - 1]))
 218                        bad = _("destination directory does not exist");
 219                else
 220                        string_list_insert(&src_for_dst, dst);
 221
 222                if (bad) {
 223                        if (ignore_errors) {
 224                                if (--argc > 0) {
 225                                        memmove(source + i, source + i + 1,
 226                                                (argc - i) * sizeof(char *));
 227                                        memmove(destination + i,
 228                                                destination + i + 1,
 229                                                (argc - i) * sizeof(char *));
 230                                        i--;
 231                                }
 232                        } else
 233                                die (_("%s, source=%s, destination=%s"),
 234                                     bad, src, dst);
 235                }
 236        }
 237
 238        for (i = 0; i < argc; i++) {
 239                const char *src = source[i], *dst = destination[i];
 240                enum update_mode mode = modes[i];
 241                int pos;
 242                if (show_only || verbose)
 243                        printf(_("Renaming %s to %s\n"), src, dst);
 244                if (!show_only && mode != INDEX) {
 245                        if (rename(src, dst) < 0 && !ignore_errors)
 246                                die_errno (_("renaming '%s' failed"), src);
 247                        if (submodule_gitfile[i]) {
 248                                if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
 249                                        connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
 250                                if (!update_path_in_gitmodules(src, dst))
 251                                        gitmodules_modified = 1;
 252                        }
 253                }
 254
 255                if (mode == WORKING_DIRECTORY)
 256                        continue;
 257
 258                pos = cache_name_pos(src, strlen(src));
 259                assert(pos >= 0);
 260                if (!show_only)
 261                        rename_cache_entry_at(pos, dst);
 262        }
 263
 264        if (gitmodules_modified)
 265                stage_updated_gitmodules();
 266
 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"));
 271        }
 272
 273        return 0;
 274}