Andrew's git - gitweb.git/blob - builtin-commit-tree.c

   1/*
   2 * GIT - The information manager from hell
   3 *
   4 * Copyright (C) Linus Torvalds, 2005
   5 */
   6#include "cache.h"
   7#include "commit.h"
   8#include "tree.h"
   9#include "builtin.h"
  10#include "utf8.h"
  11
  12#define BLOCKING (1ul << 14)
  13
  14/*
  15 * FIXME! Share the code with "write-tree.c"
  16 */
  17static void init_buffer(char **bufp, unsigned int *sizep)
  18{
  19        *bufp = xmalloc(BLOCKING);
  20        *sizep = 0;
  21}
  22
  23static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
  24{
  25        char one_line[2048];
  26        va_list args;
  27        int len;
  28        unsigned long alloc, size, newsize;
  29        char *buf;
  30
  31        va_start(args, fmt);
  32        len = vsnprintf(one_line, sizeof(one_line), fmt, args);
  33        va_end(args);
  34        size = *sizep;
  35        newsize = size + len + 1;
  36        alloc = (size + 32767) & ~32767;
  37        buf = *bufp;
  38        if (newsize > alloc) {
  39                alloc = (newsize + 32767) & ~32767;
  40                buf = xrealloc(buf, alloc);
  41                *bufp = buf;
  42        }
  43        *sizep = newsize - 1;
  44        memcpy(buf + size, one_line, len);
  45}
  46
  47static void check_valid(unsigned char *sha1, enum object_type expect)
  48{
  49        enum object_type type = sha1_object_info(sha1, NULL);
  50        if (type < 0)
  51                die("%s is not a valid object", sha1_to_hex(sha1));
  52        if (type != expect)
  53                die("%s is not a valid '%s' object", sha1_to_hex(sha1),
  54                    typename(expect));
  55}
  56
  57/*
  58 * Having more than two parents is not strange at all, and this is
  59 * how multi-way merges are represented.
  60 */
  61#define MAXPARENT (16)
  62static unsigned char parent_sha1[MAXPARENT][20];
  63
  64static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
  65
  66static int new_parent(int idx)
  67{
  68        int i;
  69        unsigned char *sha1 = parent_sha1[idx];
  70        for (i = 0; i < idx; i++) {
  71                if (!hashcmp(parent_sha1[i], sha1)) {
  72                        error("duplicate parent %s ignored", sha1_to_hex(sha1));
  73                        return 0;
  74                }
  75        }
  76        return 1;
  77}
  78
  79static const char commit_utf8_warn[] =
  80"Warning: commit message does not conform to UTF-8.\n"
  81"You may want to amend it after fixing the message, or set the config\n"
  82"variable i18n.commitencoding to the encoding your project uses.\n";
  83
  84int cmd_commit_tree(int argc, const char **argv, const char *prefix)
  85{
  86        int i;
  87        int parents = 0;
  88        unsigned char tree_sha1[20];
  89        unsigned char commit_sha1[20];
  90        char comment[1000];
  91        char *buffer;
  92        unsigned int size;
  93        int encoding_is_utf8;
  94
  95        git_config(git_default_config);
  96
  97        if (argc < 2)
  98                usage(commit_tree_usage);
  99        if (get_sha1(argv[1], tree_sha1))
 100                die("Not a valid object name %s", argv[1]);
 101
 102        check_valid(tree_sha1, OBJ_TREE);
 103        for (i = 2; i < argc; i += 2) {
 104                const char *a, *b;
 105                a = argv[i]; b = argv[i+1];
 106                if (!b || strcmp(a, "-p"))
 107                        usage(commit_tree_usage);
 108
 109                if (parents >= MAXPARENT)
 110                        die("Too many parents (%d max)", MAXPARENT);
 111                if (get_sha1(b, parent_sha1[parents]))
 112                        die("Not a valid object name %s", b);
 113                check_valid(parent_sha1[parents], OBJ_COMMIT);
 114                if (new_parent(parents))
 115                        parents++;
 116        }
 117
 118        /* Not having i18n.commitencoding is the same as having utf-8 */
 119        encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
 120
 121        init_buffer(&buffer, &size);
 122        add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
 123
 124        /*
 125         * NOTE! This ordering means that the same exact tree merged with a
 126         * different order of parents will be a _different_ changeset even
 127         * if everything else stays the same.
 128         */
 129        for (i = 0; i < parents; i++)
 130                add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
 131
 132        /* Person/date information */
 133        add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
 134        add_buffer(&buffer, &size, "committer %s\n", git_committer_info(1));
 135        if (!encoding_is_utf8)
 136                add_buffer(&buffer, &size,
 137                                "encoding %s\n", git_commit_encoding);
 138        add_buffer(&buffer, &size, "\n");
 139
 140        /* And add the comment */
 141        while (fgets(comment, sizeof(comment), stdin) != NULL)
 142                add_buffer(&buffer, &size, "%s", comment);
 143
 144        /* And check the encoding */
 145        buffer[size] = '\0';
 146        if (encoding_is_utf8 && !is_utf8(buffer))
 147                fprintf(stderr, commit_utf8_warn);
 148
 149        if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
 150                printf("%s\n", sha1_to_hex(commit_sha1));
 151                return 0;
 152        }
 153        else
 154                return 1;
 155}