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
  11#define BLOCKING (1ul << 14)
  12
  13/*
  14 * FIXME! Share the code with "write-tree.c"
  15 */
  16static void init_buffer(char **bufp, unsigned int *sizep)
  17{
  18        char *buf = xmalloc(BLOCKING);
  19        *sizep = 0;
  20        *bufp = buf;
  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;
  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;
  44        memcpy(buf + size, one_line, len);
  45}
  46
  47static void check_valid(unsigned char *sha1, const char *expect)
  48{
  49        char type[20];
  50
  51        if (sha1_object_info(sha1, type, NULL))
  52                die("%s is not a valid object", sha1_to_hex(sha1));
  53        if (expect && strcmp(type, expect))
  54                die("%s is not a valid '%s' object", sha1_to_hex(sha1),
  55                    expect);
  56}
  57
  58/*
  59 * Having more than two parents is not strange at all, and this is
  60 * how multi-way merges are represented.
  61 */
  62#define MAXPARENT (16)
  63static unsigned char parent_sha1[MAXPARENT][20];
  64
  65static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
  66
  67static int new_parent(int idx)
  68{
  69        int i;
  70        unsigned char *sha1 = parent_sha1[idx];
  71        for (i = 0; i < idx; i++) {
  72                if (!memcmp(parent_sha1[i], sha1, 20)) {
  73                        error("duplicate parent %s ignored", sha1_to_hex(sha1));
  74                        return 0;
  75                }
  76        }
  77        return 1;
  78}
  79
  80int cmd_commit_tree(int argc, const char **argv, char **envp)
  81{
  82        int i;
  83        int parents = 0;
  84        unsigned char tree_sha1[20];
  85        unsigned char commit_sha1[20];
  86        char comment[1000];
  87        char *buffer;
  88        unsigned int size;
  89
  90        setup_ident();
  91        setup_git_directory();
  92
  93        git_config(git_default_config);
  94
  95        if (argc < 2)
  96                usage(commit_tree_usage);
  97        if (get_sha1(argv[1], tree_sha1))
  98                die("Not a valid object name %s", argv[1]);
  99
 100        check_valid(tree_sha1, tree_type);
 101        for (i = 2; i < argc; i += 2) {
 102                const char *a, *b;
 103                a = argv[i]; b = argv[i+1];
 104                if (!b || strcmp(a, "-p"))
 105                        usage(commit_tree_usage);
 106                if (get_sha1(b, parent_sha1[parents]))
 107                        die("Not a valid object name %s", b);
 108                check_valid(parent_sha1[parents], commit_type);
 109                if (new_parent(parents))
 110                        parents++;
 111        }
 112        if (!parents)
 113                fprintf(stderr, "Committing initial tree %s\n", argv[1]);
 114
 115        init_buffer(&buffer, &size);
 116        add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
 117
 118        /*
 119         * NOTE! This ordering means that the same exact tree merged with a
 120         * different order of parents will be a _different_ changeset even
 121         * if everything else stays the same.
 122         */
 123        for (i = 0; i < parents; i++)
 124                add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
 125
 126        /* Person/date information */
 127        add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
 128        add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1));
 129
 130        /* And add the comment */
 131        while (fgets(comment, sizeof(comment), stdin) != NULL)
 132                add_buffer(&buffer, &size, "%s", comment);
 133
 134        if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
 135                printf("%s\n", sha1_to_hex(commit_sha1));
 136                return 0;
 137        }
 138        else
 139                return 1;
 140}