Andrew's git / gitweb.git / builtin/add.c
?
builtin / add.con commit Merge branch 'ph/credential-gnome-keyring' (7ff38b0)
   1/*
   2 * "git add" builtin command
   3 *
   4 * Copyright (C) 2006 Linus Torvalds
   5 */
   6#include "cache.h"
   7#include "builtin.h"
   8#include "dir.h"
   9#include "exec_cmd.h"
  10#include "cache-tree.h"
  11#include "run-command.h"
  12#include "parse-options.h"
  13#include "diff.h"
  14#include "diffcore.h"
  15#include "revision.h"
  16#include "bulk-checkin.h"
  17
  18static const char * const builtin_add_usage[] = {
  19        N_("git add [options] [--] <filepattern>..."),
  20        NULL
  21};
  22static int patch_interactive, add_interactive, edit_interactive;
  23static int take_worktree_changes;
  24
  25struct update_callback_data {
  26        int flags;
  27        int add_errors;
  28};
  29
  30static int fix_unmerged_status(struct diff_filepair *p,
  31                               struct update_callback_data *data)
  32{
  33        if (p->status != DIFF_STATUS_UNMERGED)
  34                return p->status;
  35        if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL) && !p->two->mode)
  36                /*
  37                 * This is not an explicit add request, and the
  38                 * path is missing from the working tree (deleted)
  39                 */
  40                return DIFF_STATUS_DELETED;
  41        else
  42                /*
  43                 * Either an explicit add request, or path exists
  44                 * in the working tree.  An attempt to explicitly
  45                 * add a path that does not exist in the working tree
  46                 * will be caught as an error by the caller immediately.
  47                 */
  48                return DIFF_STATUS_MODIFIED;
  49}
  50
  51static void update_callback(struct diff_queue_struct *q,
  52                            struct diff_options *opt, void *cbdata)
  53{
  54        int i;
  55        struct update_callback_data *data = cbdata;
  56
  57        for (i = 0; i < q->nr; i++) {
  58                struct diff_filepair *p = q->queue[i];
  59                const char *path = p->one->path;
  60                switch (fix_unmerged_status(p, data)) {
  61                default:
  62                        die(_("unexpected diff status %c"), p->status);
  63                case DIFF_STATUS_MODIFIED:
  64                case DIFF_STATUS_TYPE_CHANGED:
  65                        if (add_file_to_index(&the_index, path, data->flags)) {
  66                                if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
  67                                        die(_("updating files failed"));
  68                                data->add_errors++;
  69                        }
  70                        break;
  71                case DIFF_STATUS_DELETED:
  72                        if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
  73                                break;
  74                        if (!(data->flags & ADD_CACHE_PRETEND))
  75                                remove_file_from_index(&the_index, path);
  76                        if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
  77                                printf(_("remove '%s'\n"), path);
  78                        break;
  79                }
  80        }
  81}
  82
  83int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
  84{
  85        struct update_callback_data data;
  86        struct rev_info rev;
  87        init_revisions(&rev, prefix);
  88        setup_revisions(0, NULL, &rev, NULL);
  89        init_pathspec(&rev.prune_data, pathspec);
  90        rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
  91        rev.diffopt.format_callback = update_callback;
  92        data.flags = flags;
  93        data.add_errors = 0;
  94        rev.diffopt.format_callback_data = &data;
  95        rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
  96        run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
  97        return !!data.add_errors;
  98}
  99
 100static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
 101{
 102        int num_unmatched = 0, i;
 103
 104        /*
 105         * Since we are walking the index as if we were walking the directory,
 106         * we have to mark the matched pathspec as seen; otherwise we will
 107         * mistakenly think that the user gave a pathspec that did not match
 108         * anything.
 109         */
 110        for (i = 0; i < specs; i++)
 111                if (!seen[i])
 112                        num_unmatched++;
 113        if (!num_unmatched)
 114                return;
 115        for (i = 0; i < active_nr; i++) {
 116                struct cache_entry *ce = active_cache[i];
 117                match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen);
 118        }
 119}
 120
 121static char *find_used_pathspec(const char **pathspec)
 122{
 123        char *seen;
 124        int i;
 125
 126        for (i = 0; pathspec[i];  i++)
 127                ; /* just counting */
 128        seen = xcalloc(i, 1);
 129        fill_pathspec_matches(pathspec, seen, i);
 130        return seen;
 131}
 132
 133static char *prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
 134{
 135        char *seen;
 136        int i, specs;
 137        struct dir_entry **src, **dst;
 138
 139        for (specs = 0; pathspec[specs];  specs++)
 140                /* nothing */;
 141        seen = xcalloc(specs, 1);
 142
 143        src = dst = dir->entries;
 144        i = dir->nr;
 145        while (--i >= 0) {
 146                struct dir_entry *entry = *src++;
 147                if (match_pathspec(pathspec, entry->name, entry->len,
 148                                   prefix, seen))
 149                        *dst++ = entry;
 150        }
 151        dir->nr = dst - dir->entries;
 152        fill_pathspec_matches(pathspec, seen, specs);
 153        return seen;
 154}
 155
 156static void treat_gitlinks(const char **pathspec)
 157{
 158        int i;
 159
 160        if (!pathspec || !*pathspec)
 161                return;
 162
 163        for (i = 0; i < active_nr; i++) {
 164                struct cache_entry *ce = active_cache[i];
 165                if (S_ISGITLINK(ce->ce_mode)) {
 166                        int len = ce_namelen(ce), j;
 167                        for (j = 0; pathspec[j]; j++) {
 168                                int len2 = strlen(pathspec[j]);
 169                                if (len2 <= len || pathspec[j][len] != '/' ||
 170                                    memcmp(ce->name, pathspec[j], len))
 171                                        continue;
 172                                if (len2 == len + 1)
 173                                        /* strip trailing slash */
 174                                        pathspec[j] = xstrndup(ce->name, len);
 175                                else
 176                                        die (_("Path '%s' is in submodule '%.*s'"),
 177                                                pathspec[j], len, ce->name);
 178                        }
 179                }
 180        }
 181}
 182
 183static void refresh(int verbose, const char **pathspec)
 184{
 185        char *seen;
 186        int i, specs;
 187
 188        for (specs = 0; pathspec[specs];  specs++)
 189                /* nothing */;
 190        seen = xcalloc(specs, 1);
 191        refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET,
 192                      pathspec, seen, _("Unstaged changes after refreshing the index:"));
 193        for (i = 0; i < specs; i++) {
 194                if (!seen[i])
 195                        die(_("pathspec '%s' did not match any files"), pathspec[i]);
 196        }
 197        free(seen);
 198}
 199
 200static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
 201{
 202        const char **pathspec = get_pathspec(prefix, argv);
 203
 204        if (pathspec) {
 205                const char **p;
 206                for (p = pathspec; *p; p++) {
 207                        if (has_symlink_leading_path(*p, strlen(*p))) {
 208                                int len = prefix ? strlen(prefix) : 0;
 209                                die(_("'%s' is beyond a symbolic link"), *p + len);
 210                        }
 211                }
 212        }
 213
 214        return pathspec;
 215}
 216
 217int run_add_interactive(const char *revision, const char *patch_mode,
 218                        const char **pathspec)
 219{
 220        int status, ac, pc = 0;
 221        const char **args;
 222
 223        if (pathspec)
 224                while (pathspec[pc])
 225                        pc++;
 226
 227        args = xcalloc(sizeof(const char *), (pc + 5));
 228        ac = 0;
 229        args[ac++] = "add--interactive";
 230        if (patch_mode)
 231                args[ac++] = patch_mode;
 232        if (revision)
 233                args[ac++] = revision;
 234        args[ac++] = "--";
 235        if (pc) {
 236                memcpy(&(args[ac]), pathspec, sizeof(const char *) * pc);
 237                ac += pc;
 238        }
 239        args[ac] = NULL;
 240
 241        status = run_command_v_opt(args, RUN_GIT_CMD);
 242        free(args);
 243        return status;
 244}
 245
 246int interactive_add(int argc, const char **argv, const char *prefix, int patch)
 247{
 248        const char **pathspec = NULL;
 249
 250        if (argc) {
 251                pathspec = validate_pathspec(argc, argv, prefix);
 252                if (!pathspec)
 253                        return -1;
 254        }
 255
 256        return run_add_interactive(NULL,
 257                                   patch ? "--patch" : NULL,
 258                                   pathspec);
 259}
 260
 261static int edit_patch(int argc, const char **argv, const char *prefix)
 262{
 263        char *file = xstrdup(git_path("ADD_EDIT.patch"));
 264        const char *apply_argv[] = { "apply", "--recount", "--cached",
 265                NULL, NULL };
 266        struct child_process child;
 267        struct rev_info rev;
 268        int out;
 269        struct stat st;
 270
 271        apply_argv[3] = file;
 272
 273        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 274
 275        if (read_cache() < 0)
 276                die (_("Could not read the index"));
 277
 278        init_revisions(&rev, prefix);
 279        rev.diffopt.context = 7;
 280
 281        argc = setup_revisions(argc, argv, &rev, NULL);
 282        rev.diffopt.output_format = DIFF_FORMAT_PATCH;
 283        DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
 284        out = open(file, O_CREAT | O_WRONLY, 0666);
 285        if (out < 0)
 286                die (_("Could not open '%s' for writing."), file);
 287        rev.diffopt.file = xfdopen(out, "w");
 288        rev.diffopt.close_file = 1;
 289        if (run_diff_files(&rev, 0))
 290                die (_("Could not write patch"));
 291
 292        launch_editor(file, NULL, NULL);
 293
 294        if (stat(file, &st))
 295                die_errno(_("Could not stat '%s'"), file);
 296        if (!st.st_size)
 297                die(_("Empty patch. Aborted."));
 298
 299        memset(&child, 0, sizeof(child));
 300        child.git_cmd = 1;
 301        child.argv = apply_argv;
 302        if (run_command(&child))
 303                die (_("Could not apply '%s'"), file);
 304
 305        unlink(file);
 306        return 0;
 307}
 308
 309static struct lock_file lock_file;
 310
 311static const char ignore_error[] =
 312N_("The following paths are ignored by one of your .gitignore files:\n");
 313
 314static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
 315static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0;
 316
 317static struct option builtin_add_options[] = {
 318        OPT__DRY_RUN(&show_only, N_("dry run")),
 319        OPT__VERBOSE(&verbose, N_("be verbose")),
 320        OPT_GROUP(""),
 321        OPT_BOOLEAN('i', "interactive", &add_interactive, N_("interactive picking")),
 322        OPT_BOOLEAN('p', "patch", &patch_interactive, N_("select hunks interactively")),
 323        OPT_BOOLEAN('e', "edit", &edit_interactive, N_("edit current diff and apply")),
 324        OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files")),
 325        OPT_BOOLEAN('u', "update", &take_worktree_changes, N_("update tracked files")),
 326        OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")),
 327        OPT_BOOLEAN('A', "all", &addremove, N_("add changes from all tracked and untracked files")),
 328        OPT_BOOLEAN( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
 329        OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
 330        OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
 331        OPT_END(),
 332};
 333
 334static int add_config(const char *var, const char *value, void *cb)
 335{
 336        if (!strcmp(var, "add.ignoreerrors") ||
 337            !strcmp(var, "add.ignore-errors")) {
 338                ignore_add_errors = git_config_bool(var, value);
 339                return 0;
 340        }
 341        return git_default_config(var, value, cb);
 342}
 343
 344static int add_files(struct dir_struct *dir, int flags)
 345{
 346        int i, exit_status = 0;
 347
 348        if (dir->ignored_nr) {
 349                fprintf(stderr, _(ignore_error));
 350                for (i = 0; i < dir->ignored_nr; i++)
 351                        fprintf(stderr, "%s\n", dir->ignored[i]->name);
 352                fprintf(stderr, _("Use -f if you really want to add them.\n"));
 353                die(_("no files added"));
 354        }
 355
 356        for (i = 0; i < dir->nr; i++)
 357                if (add_file_to_cache(dir->entries[i]->name, flags)) {
 358                        if (!ignore_add_errors)
 359                                die(_("adding files failed"));
 360                        exit_status = 1;
 361                }
 362        return exit_status;
 363}
 364
 365int cmd_add(int argc, const char **argv, const char *prefix)
 366{
 367        int exit_status = 0;
 368        int newfd;
 369        const char **pathspec;
 370        struct dir_struct dir;
 371        int flags;
 372        int add_new_files;
 373        int require_pathspec;
 374        char *seen = NULL;
 375
 376        git_config(add_config, NULL);
 377
 378        argc = parse_options(argc, argv, prefix, builtin_add_options,
 379                          builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
 380        if (patch_interactive)
 381                add_interactive = 1;
 382        if (add_interactive)
 383                exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive));
 384
 385        if (edit_interactive)
 386                return(edit_patch(argc, argv, prefix));
 387        argc--;
 388        argv++;
 389
 390        if (addremove && take_worktree_changes)
 391                die(_("-A and -u are mutually incompatible"));
 392        if (!show_only && ignore_missing)
 393                die(_("Option --ignore-missing can only be used together with --dry-run"));
 394        if ((addremove || take_worktree_changes) && !argc) {
 395                static const char *here[2] = { ".", NULL };
 396                argc = 1;
 397                argv = here;
 398        }
 399
 400        add_new_files = !take_worktree_changes && !refresh_only;
 401        require_pathspec = !take_worktree_changes;
 402
 403        newfd = hold_locked_index(&lock_file, 1);
 404
 405        flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
 406                 (show_only ? ADD_CACHE_PRETEND : 0) |
 407                 (intent_to_add ? ADD_CACHE_INTENT : 0) |
 408                 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
 409                 (!(addremove || take_worktree_changes)
 410                  ? ADD_CACHE_IGNORE_REMOVAL : 0));
 411
 412        if (require_pathspec && argc == 0) {
 413                fprintf(stderr, _("Nothing specified, nothing added.\n"));
 414                fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
 415                return 0;
 416        }
 417        pathspec = validate_pathspec(argc, argv, prefix);
 418
 419        if (read_cache() < 0)
 420                die(_("index file corrupt"));
 421        treat_gitlinks(pathspec);
 422
 423        if (add_new_files) {
 424                int baselen;
 425
 426                /* Set up the default git porcelain excludes */
 427                memset(&dir, 0, sizeof(dir));
 428                if (!ignored_too) {
 429                        dir.flags |= DIR_COLLECT_IGNORED;
 430                        setup_standard_excludes(&dir);
 431                }
 432
 433                /* This picks up the paths that are not tracked */
 434                baselen = fill_directory(&dir, pathspec);
 435                if (pathspec)
 436                        seen = prune_directory(&dir, pathspec, baselen);
 437        }
 438
 439        if (refresh_only) {
 440                refresh(verbose, pathspec);
 441                goto finish;
 442        }
 443
 444        if (pathspec) {
 445                int i;
 446                struct path_exclude_check check;
 447
 448                path_exclude_check_init(&check, &dir);
 449                if (!seen)
 450                        seen = find_used_pathspec(pathspec);
 451                for (i = 0; pathspec[i]; i++) {
 452                        if (!seen[i] && pathspec[i][0]
 453                            && !file_exists(pathspec[i])) {
 454                                if (ignore_missing) {
 455                                        int dtype = DT_UNKNOWN;
 456                                        if (path_excluded(&check, pathspec[i], -1, &dtype))
 457                                                dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i]));
 458                                } else
 459                                        die(_("pathspec '%s' did not match any files"),
 460                                            pathspec[i]);
 461                        }
 462                }
 463                free(seen);
 464                path_exclude_check_clear(&check);
 465        }
 466
 467        plug_bulk_checkin();
 468
 469        exit_status |= add_files_to_cache(prefix, pathspec, flags);
 470
 471        if (add_new_files)
 472                exit_status |= add_files(&dir, flags);
 473
 474        unplug_bulk_checkin();
 475
 476 finish:
 477        if (active_cache_changed) {
 478                if (write_cache(newfd, active_cache, active_nr) ||
 479                    commit_locked_index(&lock_file))
 480                        die(_("Unable to write new index file"));
 481        }
 482
 483        return exit_status;
 484}