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