diff: trivial style fix
[git/mjg.git] / builtin / mktree.c
blobf92ba404abd5cea0cde344936f697e46c1a46045
1 /*
2 * GIT - the stupid content tracker
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"
11 static struct treeent {
12 unsigned mode;
13 unsigned char sha1[20];
14 int len;
15 char name[FLEX_ARRAY];
16 } **entries;
17 static int alloc, used;
19 static void append_to_tree(unsigned mode, unsigned char *sha1, char *path)
21 struct treeent *ent;
22 int len = strlen(path);
23 if (strchr(path, '/'))
24 die("path %s contains slash", path);
26 if (alloc <= used) {
27 alloc = alloc_nr(used);
28 entries = xrealloc(entries, sizeof(*entries) * alloc);
30 ent = entries[used++] = xmalloc(sizeof(**entries) + len + 1);
31 ent->mode = mode;
32 ent->len = len;
33 hashcpy(ent->sha1, sha1);
34 memcpy(ent->name, path, len+1);
37 static int ent_compare(const void *a_, const void *b_)
39 struct treeent *a = *(struct treeent **)a_;
40 struct treeent *b = *(struct treeent **)b_;
41 return base_name_compare(a->name, a->len, a->mode,
42 b->name, b->len, b->mode);
45 static void write_tree(unsigned char *sha1)
47 struct strbuf buf;
48 size_t size;
49 int i;
51 qsort(entries, used, sizeof(*entries), ent_compare);
52 for (size = i = 0; i < used; i++)
53 size += 32 + entries[i]->len;
55 strbuf_init(&buf, size);
56 for (i = 0; i < used; i++) {
57 struct treeent *ent = entries[i];
58 strbuf_addf(&buf, "%o %s%c", ent->mode, ent->name, '\0');
59 strbuf_add(&buf, ent->sha1, 20);
62 write_sha1_file(buf.buf, buf.len, tree_type, sha1);
63 strbuf_release(&buf);
66 static const char *mktree_usage[] = {
67 N_("git mktree [-z] [--missing] [--batch]"),
68 NULL
71 static void mktree_line(char *buf, size_t len, int line_termination, int allow_missing)
73 char *ptr, *ntr;
74 unsigned mode;
75 enum object_type mode_type; /* object type derived from mode */
76 enum object_type obj_type; /* object type derived from sha */
77 char *path;
78 unsigned char sha1[20];
80 ptr = buf;
82 * Read non-recursive ls-tree output format:
83 * mode SP type SP sha1 TAB name
85 mode = strtoul(ptr, &ntr, 8);
86 if (ptr == ntr || !ntr || *ntr != ' ')
87 die("input format error: %s", buf);
88 ptr = ntr + 1; /* type */
89 ntr = strchr(ptr, ' ');
90 if (!ntr || buf + len <= ntr + 40 ||
91 ntr[41] != '\t' ||
92 get_sha1_hex(ntr + 1, sha1))
93 die("input format error: %s", buf);
95 /* It is perfectly normal if we do not have a commit from a submodule */
96 if (S_ISGITLINK(mode))
97 allow_missing = 1;
100 *ntr++ = 0; /* now at the beginning of SHA1 */
102 path = ntr + 41; /* at the beginning of name */
103 if (line_termination && path[0] == '"') {
104 struct strbuf p_uq = STRBUF_INIT;
105 if (unquote_c_style(&p_uq, path, NULL))
106 die("invalid quoting");
107 path = strbuf_detach(&p_uq, NULL);
111 * Object type is redundantly derivable three ways.
112 * These should all agree.
114 mode_type = object_type(mode);
115 if (mode_type != type_from_string(ptr)) {
116 die("entry '%s' object type (%s) doesn't match mode type (%s)",
117 path, ptr, typename(mode_type));
120 /* Check the type of object identified by sha1 */
121 obj_type = sha1_object_info(sha1, NULL);
122 if (obj_type < 0) {
123 if (allow_missing) {
124 ; /* no problem - missing objects are presumed to be of the right type */
125 } else {
126 die("entry '%s' object %s is unavailable", path, sha1_to_hex(sha1));
128 } else {
129 if (obj_type != mode_type) {
131 * The object exists but is of the wrong type.
132 * This is a problem regardless of allow_missing
133 * because the new tree entry will never be correct.
135 die("entry '%s' object %s is a %s but specified type was (%s)",
136 path, sha1_to_hex(sha1), typename(obj_type), typename(mode_type));
140 append_to_tree(mode, sha1, path);
143 int cmd_mktree(int ac, const char **av, const char *prefix)
145 struct strbuf sb = STRBUF_INIT;
146 unsigned char sha1[20];
147 int line_termination = '\n';
148 int allow_missing = 0;
149 int is_batch_mode = 0;
150 int got_eof = 0;
152 const struct option option[] = {
153 OPT_SET_INT('z', NULL, &line_termination, N_("input is NUL terminated"), '\0'),
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()
159 ac = parse_options(ac, av, prefix, option, mktree_usage, 0);
161 while (!got_eof) {
162 while (1) {
163 if (strbuf_getline(&sb, stdin, line_termination) == EOF) {
164 got_eof = 1;
165 break;
167 if (sb.buf[0] == '\0') {
168 /* empty lines denote tree boundaries in batch mode */
169 if (is_batch_mode)
170 break;
171 die("input format error: (blank line only valid in batch mode)");
173 mktree_line(sb.buf, sb.len, line_termination, allow_missing);
175 if (is_batch_mode && got_eof && used < 1) {
177 * Execution gets here if the last tree entry is terminated with a
178 * new-line. The final new-line has been made optional to be
179 * consistent with the original non-batch behaviour of mktree.
181 ; /* skip creating an empty tree */
182 } else {
183 write_tree(sha1);
184 puts(sha1_to_hex(sha1));
185 fflush(stdout);
187 used=0; /* reset tree entry buffer for re-use in batch mode */
189 strbuf_release(&sb);
190 exit(0);