builtin / mktree.con commit submodule: add --dissociate option to add/update commands (a0ef293)
   1/*
   2 * GIT - the stupid content tracker
   3 *
   4 * Copyright (c) Junio C Hamano, 2006, 2009
   5 */
   6#include "builtin.h"
   7#include "quote.h"
   8#include "tree.h"
   9#include "parse-options.h"
  10
  11static struct treeent {
  12        unsigned mode;
  13        unsigned char sha1[20];
  14        int len;
  15        char name[FLEX_ARRAY];
  16} **entries;
  17static int alloc, used;
  18
  19static void append_to_tree(unsigned mode, unsigned char *sha1, char *path)
  20{
  21        struct treeent *ent;
  22        size_t len = strlen(path);
  23        if (strchr(path, '/'))
  24                die("path %s contains slash", path);
  25
  26        FLEX_ALLOC_MEM(ent, name, path, len);
  27        ent->mode = mode;
  28        ent->len = len;
  29        hashcpy(ent->sha1, sha1);
  30
  31        ALLOC_GROW(entries, used + 1, alloc);
  32        entries[used++] = ent;
  33}
  34
  35static int ent_compare(const void *a_, const void *b_)
  36{
  37        struct treeent *a = *(struct treeent **)a_;
  38        struct treeent *b = *(struct treeent **)b_;
  39        return base_name_compare(a->name, a->len, a->mode,
  40                                 b->name, b->len, b->mode);
  41}
  42
  43static void write_tree(struct object_id *oid)
  44{
  45        struct strbuf buf;
  46        size_t size;
  47        int i;
  48
  49        QSORT(entries, used, ent_compare);
  50        for (size = i = 0; i < used; i++)
  51                size += 32 + entries[i]->len;
  52
  53        strbuf_init(&buf, size);
  54        for (i = 0; i < used; i++) {
  55                struct treeent *ent = entries[i];
  56                strbuf_addf(&buf, "%o %s%c", ent->mode, ent->name, '\0');
  57                strbuf_add(&buf, ent->sha1, 20);
  58        }
  59
  60        write_object_file(buf.buf, buf.len, tree_type, oid);
  61        strbuf_release(&buf);
  62}
  63
  64static const char *mktree_usage[] = {
  65        N_("git mktree [-z] [--missing] [--batch]"),
  66        NULL
  67};
  68
  69static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_missing)
  70{
  71        char *ptr, *ntr;
  72        unsigned mode;
  73        enum object_type mode_type; /* object type derived from mode */
  74        enum object_type obj_type; /* object type derived from sha */
  75        char *path, *to_free = NULL;
  76        unsigned char sha1[20];
  77
  78        ptr = buf;
  79        /*
  80         * Read non-recursive ls-tree output format:
  81         *     mode SP type SP sha1 TAB name
  82         */
  83        mode = strtoul(ptr, &ntr, 8);
  84        if (ptr == ntr || !ntr || *ntr != ' ')
  85                die("input format error: %s", buf);
  86        ptr = ntr + 1; /* type */
  87        ntr = strchr(ptr, ' ');
  88        if (!ntr || buf + len <= ntr + 40 ||
  89            ntr[41] != '\t' ||
  90            get_sha1_hex(ntr + 1, sha1))
  91                die("input format error: %s", buf);
  92
  93        /* It is perfectly normal if we do not have a commit from a submodule */
  94        if (S_ISGITLINK(mode))
  95                allow_missing = 1;
  96
  97
  98        *ntr++ = 0; /* now at the beginning of SHA1 */
  99
 100        path = ntr + 41;  /* at the beginning of name */
 101        if (!nul_term_line && path[0] == '"') {
 102                struct strbuf p_uq = STRBUF_INIT;
 103                if (unquote_c_style(&p_uq, path, NULL))
 104                        die("invalid quoting");
 105                path = to_free = strbuf_detach(&p_uq, NULL);
 106        }
 107
 108        /*
 109         * Object type is redundantly derivable three ways.
 110         * These should all agree.
 111         */
 112        mode_type = object_type(mode);
 113        if (mode_type != type_from_string(ptr)) {
 114                die("entry '%s' object type (%s) doesn't match mode type (%s)",
 115                        path, ptr, type_name(mode_type));
 116        }
 117
 118        /* Check the type of object identified by sha1 */
 119        obj_type = sha1_object_info(sha1, NULL);
 120        if (obj_type < 0) {
 121                if (allow_missing) {
 122                        ; /* no problem - missing objects are presumed to be of the right type */
 123                } else {
 124                        die("entry '%s' object %s is unavailable", path, sha1_to_hex(sha1));
 125                }
 126        } else {
 127                if (obj_type != mode_type) {
 128                        /*
 129                         * The object exists but is of the wrong type.
 130                         * This is a problem regardless of allow_missing
 131                         * because the new tree entry will never be correct.
 132                         */
 133                        die("entry '%s' object %s is a %s but specified type was (%s)",
 134                                path, sha1_to_hex(sha1), type_name(obj_type), type_name(mode_type));
 135                }
 136        }
 137
 138        append_to_tree(mode, sha1, path);
 139        free(to_free);
 140}
 141
 142int cmd_mktree(int ac, const char **av, const char *prefix)
 143{
 144        struct strbuf sb = STRBUF_INIT;
 145        struct object_id oid;
 146        int nul_term_line = 0;
 147        int allow_missing = 0;
 148        int is_batch_mode = 0;
 149        int got_eof = 0;
 150        strbuf_getline_fn getline_fn;
 151
 152        const struct option option[] = {
 153                OPT_BOOL('z', NULL, &nul_term_line, N_("input is NUL terminated")),
 154                OPT_SET_INT( 0 , "missing", &allow_missing, N_("allow missing objects"), 1),
 155                OPT_SET_INT( 0 , "batch", &is_batch_mode, N_("allow creation of more than one tree"), 1),
 156                OPT_END()
 157        };
 158
 159        ac = parse_options(ac, av, prefix, option, mktree_usage, 0);
 160        getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
 161
 162        while (!got_eof) {
 163                while (1) {
 164                        if (getline_fn(&sb, stdin) == EOF) {
 165                                got_eof = 1;
 166                                break;
 167                        }
 168                        if (sb.buf[0] == '\0') {
 169                                /* empty lines denote tree boundaries in batch mode */
 170                                if (is_batch_mode)
 171                                        break;
 172                                die("input format error: (blank line only valid in batch mode)");
 173                        }
 174                        mktree_line(sb.buf, sb.len, nul_term_line, allow_missing);
 175                }
 176                if (is_batch_mode && got_eof && used < 1) {
 177                        /*
 178                         * Execution gets here if the last tree entry is terminated with a
 179                         * new-line.  The final new-line has been made optional to be
 180                         * consistent with the original non-batch behaviour of mktree.
 181                         */
 182                        ; /* skip creating an empty tree */
 183                } else {
 184                        write_tree(&oid);
 185                        puts(oid_to_hex(&oid));
 186                        fflush(stdout);
 187                }
 188                used=0; /* reset tree entry buffer for re-use in batch mode */
 189        }
 190        strbuf_release(&sb);
 191        exit(0);
 192}