🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.7.3 / . / commit.c
blob: 3f4f371e5eec41fa67345c0b9d373b541e52172a [file] [log] [blame]
Junio C Hamano8f1d2e62006-01-07 09:33:54[diff] [blame]1#include "cache.h"
Linus Torvalds961784e2005-05-18 23:14:22[diff] [blame]2#include "tag.h"
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]3#include "commit.h"
Johannes Schindelined09aef2006-10-30 19:09:06[diff] [blame]4#include "pkt-line.h"
Junio C Hamano52883fb2006-12-25 19:48:35[diff] [blame]5#include "utf8.h"
Junio C Hamano199c45b2007-04-09 09:34:05[diff] [blame]6#include "diff.h"
7#include "revision.h"
Johannes Schindelina97a7462009-10-09 10:21:57[diff] [blame]8#include "notes.h"
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]9#include "gpg-interface.h"
René Scharfe46905892012-03-31 22:10:39[diff] [blame]10#include "mergesort.h"
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]11#include "commit-slab.h"
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]12#include "prio-queue.h"
Dmitry S. Dolzhenko0a9136f2014-02-26 18:49:22[diff] [blame]13#include "sha1-lookup.h"
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]14
Junio C Hamano82a75292012-09-15 20:58:15[diff] [blame]15static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
16
Linus Torvalds60ab26d2005-09-15 21:43:17[diff] [blame]17int save_commit_buffer = 1;
18
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]19const char *commit_type = "commit";
20
Junio C Hamanof76412e2005-08-21 09:51:10[diff] [blame]21struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
22 int quiet)
Linus Torvalds961784e2005-05-18 23:14:22[diff] [blame]23{
Junio C Hamano9534f402005-11-02 23:19:13[diff] [blame]24 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
Linus Torvalds961784e2005-05-18 23:14:22[diff] [blame]25
26 if (!obj)
27 return NULL;
Jeff King8ff226a2014-07-13 06:42:03[diff] [blame]28 return object_as_type(obj, OBJ_COMMIT, quiet);
Junio C Hamanof76412e2005-08-21 09:51:10[diff] [blame]29}
30
31struct commit *lookup_commit_reference(const unsigned char *sha1)
32{
33 return lookup_commit_reference_gently(sha1, 0);
Linus Torvalds961784e2005-05-18 23:14:22[diff] [blame]34}
35
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 11:57:45[diff] [blame]36struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name)
37{
38 struct commit *c = lookup_commit_reference(sha1);
39 if (!c)
40 die(_("could not parse %s"), ref_name);
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]41 if (hashcmp(sha1, c->object.oid.hash)) {
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 11:57:45[diff] [blame]42 warning(_("%s %s is not a commit!"),
43 ref_name, sha1_to_hex(sha1));
44 }
45 return c;
46}
47
Jason McMullan5d6ccf52005-06-03 15:05:39[diff] [blame]48struct commit *lookup_commit(const unsigned char *sha1)
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]49{
50 struct object *obj = lookup_object(sha1);
Jeff Kingd36f51c2014-07-13 06:41:55[diff] [blame]51 if (!obj)
52 return create_object(sha1, alloc_commit_node());
Jeff King8ff226a2014-07-13 06:42:03[diff] [blame]53 return object_as_type(obj, OBJ_COMMIT, 0);
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]54}
55
Pat Notza6fa5992010-11-02 19:59:07[diff] [blame]56struct commit *lookup_commit_reference_by_name(const char *name)
57{
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]58 struct object_id oid;
Pat Notza6fa5992010-11-02 19:59:07[diff] [blame]59 struct commit *commit;
60
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]61 if (get_sha1_committish(name, oid.hash))
Pat Notza6fa5992010-11-02 19:59:07[diff] [blame]62 return NULL;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]63 commit = lookup_commit_reference(oid.hash);
Jeff King5e7d4d32013-10-24 08:53:19[diff] [blame]64 if (parse_commit(commit))
Pat Notza6fa5992010-11-02 19:59:07[diff] [blame]65 return NULL;
66 return commit;
67}
68
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]69static unsigned long parse_commit_date(const char *buf, const char *tail)
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]70{
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]71 const char *dateptr;
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]72
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]73 if (buf + 6 >= tail)
74 return 0;
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]75 if (memcmp(buf, "author", 6))
76 return 0;
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]77 while (buf < tail && *buf++ != '\n')
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]78 /* nada */;
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]79 if (buf + 9 >= tail)
80 return 0;
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]81 if (memcmp(buf, "committer", 9))
82 return 0;
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]83 while (buf < tail && *buf++ != '>')
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]84 /* nada */;
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]85 if (buf >= tail)
86 return 0;
87 dateptr = buf;
88 while (buf < tail && *buf++ != '\n')
89 /* nada */;
90 if (buf >= tail)
91 return 0;
92 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
Eric Wongf2909742009-07-03 04:34:54[diff] [blame]93 return strtoul(dateptr, NULL, 10);
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]94}
95
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]96static struct commit_graft **commit_graft;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]97static int commit_graft_alloc, commit_graft_nr;
98
Dmitry S. Dolzhenko0a9136f2014-02-26 18:49:22[diff] [blame]99static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
100{
101 struct commit_graft **commit_graft_table = table;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]102 return commit_graft_table[index]->oid.hash;
Dmitry S. Dolzhenko0a9136f2014-02-26 18:49:22[diff] [blame]103}
104
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]105static int commit_graft_pos(const unsigned char *sha1)
106{
Dmitry S. Dolzhenko0a9136f2014-02-26 18:49:22[diff] [blame]107 return sha1_pos(sha1, commit_graft, commit_graft_nr,
108 commit_graft_sha1_access);
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]109}
110
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]111int register_commit_graft(struct commit_graft *graft, int ignore_dups)
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]112{
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]113 int pos = commit_graft_pos(graft->oid.hash);
Junio C Hamanoa6080a02007-06-07 07:04:01[diff] [blame]114
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]115 if (0 <= pos) {
116 if (ignore_dups)
117 free(graft);
118 else {
119 free(commit_graft[pos]);
120 commit_graft[pos] = graft;
121 }
122 return 1;
123 }
124 pos = -pos - 1;
Dmitry S. Dolzhenkod6e82b52014-03-03 22:31:52[diff] [blame]125 ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc);
126 commit_graft_nr++;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]127 if (pos < commit_graft_nr)
128 memmove(commit_graft + pos + 1,
129 commit_graft + pos,
130 (commit_graft_nr - pos - 1) *
131 sizeof(*commit_graft));
132 commit_graft[pos] = graft;
133 return 0;
134}
135
136struct commit_graft *read_graft_line(char *buf, int len)
137{
138 /* The format is just "Commit Parent1 Parent2 ...\n" */
139 int i;
140 struct commit_graft *graft = NULL;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]141 const int entry_size = GIT_SHA1_HEXSZ + 1;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]142
Junio C Hamanofe0a3cb2009-10-14 18:51:03[diff] [blame]143 while (len && isspace(buf[len-1]))
144 buf[--len] = '\0';
Yann Dirson360204c2006-04-17 11:41:49[diff] [blame]145 if (buf[0] == '#' || buf[0] == '\0')
Junio C Hamano5bc4ce52006-04-16 21:24:56[diff] [blame]146 return NULL;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]147 if ((len + 1) % entry_size)
Ralf Thielowdf5d43b2010-12-01 19:15:59[diff] [blame]148 goto bad_graft_data;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]149 i = (len + 1) / entry_size - 1;
Jeff King50a6c8e2016-02-22 22:44:35[diff] [blame]150 graft = xmalloc(st_add(sizeof(*graft), st_mult(GIT_SHA1_RAWSZ, i)));
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]151 graft->nr_parent = i;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]152 if (get_oid_hex(buf, &graft->oid))
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]153 goto bad_graft_data;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]154 for (i = GIT_SHA1_HEXSZ; i < len; i += entry_size) {
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]155 if (buf[i] != ' ')
156 goto bad_graft_data;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]157 if (get_sha1_hex(buf + i + 1, graft->parent[i/entry_size].hash))
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]158 goto bad_graft_data;
159 }
160 return graft;
Ralf Thielowdf5d43b2010-12-01 19:15:59[diff] [blame]161
162bad_graft_data:
163 error("bad graft data: %s", buf);
164 free(graft);
165 return NULL;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]166}
167
Nanako Shiraishic5ae6432008-10-02 10:14:30[diff] [blame]168static int read_graft_file(const char *graft_file)
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]169{
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]170 FILE *fp = fopen(graft_file, "r");
Johannes Schindeline228c172013-12-27 20:49:57[diff] [blame]171 struct strbuf buf = STRBUF_INIT;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]172 if (!fp)
173 return -1;
Johannes Schindeline228c172013-12-27 20:49:57[diff] [blame]174 while (!strbuf_getwholeline(&buf, fp, '\n')) {
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]175 /* The format is just "Commit Parent1 Parent2 ...\n" */
Johannes Schindeline228c172013-12-27 20:49:57[diff] [blame]176 struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
Junio C Hamano5bc4ce52006-04-16 21:24:56[diff] [blame]177 if (!graft)
178 continue;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]179 if (register_commit_graft(graft, 1))
Johannes Schindeline228c172013-12-27 20:49:57[diff] [blame]180 error("duplicate graft data: %s", buf.buf);
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]181 }
182 fclose(fp);
Johannes Schindeline228c172013-12-27 20:49:57[diff] [blame]183 strbuf_release(&buf);
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]184 return 0;
185}
186
187static void prepare_commit_graft(void)
188{
189 static int commit_graft_prepared;
190 char *graft_file;
191
192 if (commit_graft_prepared)
193 return;
194 graft_file = get_graft_file();
195 read_graft_file(graft_file);
Johannes Schindelined09aef2006-10-30 19:09:06[diff] [blame]196 /* make sure shallows are read */
197 is_repository_shallow();
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]198 commit_graft_prepared = 1;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]199}
200
Martin Koegler45163382008-02-25 21:46:07[diff] [blame]201struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]202{
203 int pos;
Junio C Hamano5040f172006-04-07 06:58:51[diff] [blame]204 prepare_commit_graft();
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]205 pos = commit_graft_pos(sha1);
206 if (pos < 0)
207 return NULL;
208 return commit_graft[pos];
209}
210
Nguyễn Thái Ngọc Duy09d46642011-08-18 12:29:35[diff] [blame]211int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
Johannes Schindelined09aef2006-10-30 19:09:06[diff] [blame]212{
Nguyễn Thái Ngọc Duy09d46642011-08-18 12:29:35[diff] [blame]213 int i, ret;
214 for (i = ret = 0; i < commit_graft_nr && !ret; i++)
215 ret = fn(commit_graft[i], cb_data);
216 return ret;
Johannes Schindelined09aef2006-10-30 19:09:06[diff] [blame]217}
218
Johannes Schindelinf53514b2006-10-30 19:09:53[diff] [blame]219int unregister_shallow(const unsigned char *sha1)
220{
221 int pos = commit_graft_pos(sha1);
222 if (pos < 0)
223 return -1;
224 if (pos + 1 < commit_graft_nr)
Jeff King65d41d42010-01-29 10:28:44[diff] [blame]225 memmove(commit_graft + pos, commit_graft + pos + 1,
Johannes Schindelinf53514b2006-10-30 19:09:53[diff] [blame]226 sizeof(struct commit_graft *)
227 * (commit_graft_nr - pos - 1));
228 commit_graft_nr--;
229 return 0;
230}
231
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]232struct commit_buffer {
233 void *buffer;
234 unsigned long size;
235};
236define_commit_slab(buffer_slab, struct commit_buffer);
Jeff Kingc1b3c712014-06-10 21:43:02[diff] [blame]237static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab);
238
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]239void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size)
Jeff King66c28272014-06-10 21:40:14[diff] [blame]240{
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]241 struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit);
242 v->buffer = buffer;
243 v->size = size;
Jeff King66c28272014-06-10 21:40:14[diff] [blame]244}
245
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]246const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep)
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]247{
Junio C Hamano862e7302015-05-14 22:25:52[diff] [blame]248 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
249 if (!v) {
250 if (sizep)
251 *sizep = 0;
252 return NULL;
253 }
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]254 if (sizep)
255 *sizep = v->size;
256 return v->buffer;
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]257}
258
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]259const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]260{
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]261 const void *ret = get_cached_commit_buffer(commit, sizep);
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]262 if (!ret) {
263 enum object_type type;
264 unsigned long size;
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]265 ret = read_sha1_file(commit->object.oid.hash, &type, &size);
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]266 if (!ret)
267 die("cannot read commit object %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]268 oid_to_hex(&commit->object.oid));
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]269 if (type != OBJ_COMMIT)
270 die("expected commit for %s, got %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]271 oid_to_hex(&commit->object.oid), typename(type));
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]272 if (sizep)
273 *sizep = size;
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]274 }
275 return ret;
276}
277
278void unuse_commit_buffer(const struct commit *commit, const void *buffer)
279{
Junio C Hamano862e7302015-05-14 22:25:52[diff] [blame]280 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
281 if (!(v && v->buffer == buffer))
Jeff King152ff1c2014-06-10 21:40:39[diff] [blame]282 free((void *)buffer);
283}
284
Jeff King0fb370d2014-06-12 22:05:37[diff] [blame]285void free_commit_buffer(struct commit *commit)
286{
Junio C Hamano862e7302015-05-14 22:25:52[diff] [blame]287 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
288 if (v) {
289 free(v->buffer);
290 v->buffer = NULL;
291 v->size = 0;
292 }
Jeff King0fb370d2014-06-12 22:05:37[diff] [blame]293}
294
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]295const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
Jeff King0fb370d2014-06-12 22:05:37[diff] [blame]296{
Junio C Hamano862e7302015-05-14 22:25:52[diff] [blame]297 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]298 void *ret;
299
Junio C Hamano862e7302015-05-14 22:25:52[diff] [blame]300 if (!v) {
301 if (sizep)
302 *sizep = 0;
303 return NULL;
304 }
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]305 ret = v->buffer;
306 if (sizep)
307 *sizep = v->size;
308
309 v->buffer = NULL;
310 v->size = 0;
Jeff King0fb370d2014-06-12 22:05:37[diff] [blame]311 return ret;
312}
313
Nguyễn Thái Ngọc Duycf7b1ca2011-02-05 10:52:20[diff] [blame]314int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size)
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]315{
Nguyễn Thái Ngọc Duycf7b1ca2011-02-05 10:52:20[diff] [blame]316 const char *tail = buffer;
317 const char *bufptr = buffer;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]318 struct object_id parent;
Linus Torvalds6c88be12005-06-21 03:26:03[diff] [blame]319 struct commit_list **pptr;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]320 struct commit_graft *graft;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]321 const int tree_entry_len = GIT_SHA1_HEXSZ + 5;
322 const int parent_entry_len = GIT_SHA1_HEXSZ + 7;
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]323
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]324 if (item->object.parsed)
325 return 0;
326 item->object.parsed = 1;
Junio C Hamano3b44f152006-06-28 10:51:00[diff] [blame]327 tail += size;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]328 if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
329 bufptr[tree_entry_len] != '\n')
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]330 return error("bogus commit object %s", oid_to_hex(&item->object.oid));
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]331 if (get_sha1_hex(bufptr + 5, parent.hash) < 0)
Junio C Hamanobd2afde2006-02-23 01:47:10[diff] [blame]332 return error("bad tree pointer in commit %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]333 oid_to_hex(&item->object.oid));
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]334 item->tree = lookup_tree(parent.hash);
335 bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
Linus Torvalds6c88be12005-06-21 03:26:03[diff] [blame]336 pptr = &item->parents;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]337
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]338 graft = lookup_commit_graft(item->object.oid.hash);
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]339 while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
Linus Torvaldsf7cc77d2005-07-27 22:12:48[diff] [blame]340 struct commit *new_parent;
341
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]342 if (tail <= bufptr + parent_entry_len + 1 ||
343 get_sha1_hex(bufptr + 7, parent.hash) ||
344 bufptr[parent_entry_len] != '\n')
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]345 return error("bad parents in commit %s", oid_to_hex(&item->object.oid));
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]346 bufptr += parent_entry_len + 1;
Johannes Schindelin7f3140c2009-07-23 15:33:49[diff] [blame]347 /*
348 * The clone is shallow if nr_parent < 0, and we must
349 * not traverse its real parents even when we unhide them.
350 */
351 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]352 continue;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]353 new_parent = lookup_commit(parent.hash);
Miklos Vajna39468de2008-06-07 20:38:37[diff] [blame]354 if (new_parent)
Linus Torvalds6c88be12005-06-21 03:26:03[diff] [blame]355 pptr = &commit_list_insert(new_parent, pptr)->next;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]356 }
357 if (graft) {
358 int i;
359 struct commit *new_parent;
360 for (i = 0; i < graft->nr_parent; i++) {
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]361 new_parent = lookup_commit(graft->parent[i].hash);
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]362 if (!new_parent)
363 continue;
364 pptr = &commit_list_insert(new_parent, pptr)->next;
Junio C Hamano5da5c8f2005-07-30 07:58:28[diff] [blame]365 }
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]366 }
Martin Koegler0a617792008-01-19 17:35:23[diff] [blame]367 item->date = parse_commit_date(bufptr, tail);
Junio C Hamano27dedf02005-11-17 05:32:44[diff] [blame]368
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]369 return 0;
370}
371
Jeff King9cc2b072015-06-01 09:56:26[diff] [blame]372int parse_commit_gently(struct commit *item, int quiet_on_missing)
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]373{
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]374 enum object_type type;
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]375 void *buffer;
376 unsigned long size;
377 int ret;
378
Martin Koegler9786f682008-02-18 20:48:02[diff] [blame]379 if (!item)
380 return -1;
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]381 if (item->object.parsed)
382 return 0;
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]383 buffer = read_sha1_file(item->object.oid.hash, &type, &size);
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]384 if (!buffer)
Jeff King9cc2b072015-06-01 09:56:26[diff] [blame]385 return quiet_on_missing ? -1 :
386 error("Could not read %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]387 oid_to_hex(&item->object.oid));
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]388 if (type != OBJ_COMMIT) {
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]389 free(buffer);
390 return error("Object %s not a commit",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]391 oid_to_hex(&item->object.oid));
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]392 }
393 ret = parse_commit_buffer(item, buffer, size);
Linus Torvalds60ab26d2005-09-15 21:43:17[diff] [blame]394 if (save_commit_buffer && !ret) {
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]395 set_commit_buffer(item, buffer, size);
Linus Torvalds3ff1fbb2005-05-26 01:27:14[diff] [blame]396 return 0;
397 }
Nicolas Pitrebd2c39f2005-05-06 17:48:34[diff] [blame]398 free(buffer);
399 return ret;
400}
401
Jeff King7059dcc2013-10-24 08:52:36[diff] [blame]402void parse_commit_or_die(struct commit *item)
403{
404 if (parse_commit(item))
405 die("unable to parse commit %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]406 item ? oid_to_hex(&item->object.oid) : "(null)");
Jeff King7059dcc2013-10-24 08:52:36[diff] [blame]407}
408
Christian Couder11af2aa2010-07-22 13:18:30[diff] [blame]409int find_commit_subject(const char *commit_buffer, const char **subject)
410{
411 const char *eol;
412 const char *p = commit_buffer;
413
414 while (*p && (*p != '\n' || p[1] != '\n'))
415 p++;
416 if (*p) {
417 p += 2;
418 for (eol = p; *eol && *eol != '\n'; eol++)
419 ; /* do nothing */
420 } else
421 eol = p;
422
423 *subject = p;
424
425 return eol - p;
426}
427
Linus Torvaldsac5155e2005-05-31 01:44:02[diff] [blame]428struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]429{
Christopher Li812666c2005-04-26 19:00:58[diff] [blame]430 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]431 new_list->item = item;
432 new_list->next = *list_p;
433 *list_p = new_list;
Linus Torvaldsac5155e2005-05-31 01:44:02[diff] [blame]434 return new_list;
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]435}
436
Miklos Vajna65319472008-06-27 16:21:55[diff] [blame]437unsigned commit_list_count(const struct commit_list *l)
438{
439 unsigned c = 0;
440 for (; l; l = l->next )
441 c++;
442 return c;
443}
444
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]445struct commit_list *copy_commit_list(struct commit_list *list)
446{
447 struct commit_list *head = NULL;
448 struct commit_list **pp = &head;
449 while (list) {
René Scharfecb979db2014-07-10 09:47:47[diff] [blame]450 pp = commit_list_append(list->item, pp);
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]451 list = list->next;
452 }
453 return head;
454}
455
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]456void free_commit_list(struct commit_list *list)
457{
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]458 while (list)
459 pop_commit(&list);
Daniel Barkalow175785e2005-04-18 18:39:48[diff] [blame]460}
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]461
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]462struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]463{
464 struct commit_list **pp = list;
465 struct commit_list *p;
466 while ((p = *pp) != NULL) {
467 if (p->item->date < item->date) {
468 break;
469 }
470 pp = &p->next;
471 }
Linus Torvaldsf7554942005-07-06 16:31:17[diff] [blame]472 return commit_list_insert(item, pp);
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]473}
474
René Scharfe46905892012-03-31 22:10:39[diff] [blame]475static int commit_list_compare_by_date(const void *a, const void *b)
476{
477 unsigned long a_date = ((const struct commit_list *)a)->item->date;
478 unsigned long b_date = ((const struct commit_list *)b)->item->date;
479 if (a_date < b_date)
480 return 1;
481 if (a_date > b_date)
482 return -1;
483 return 0;
484}
485
486static void *commit_list_get_next(const void *a)
487{
488 return ((const struct commit_list *)a)->next;
489}
490
491static void commit_list_set_next(void *a, void *next)
492{
493 ((struct commit_list *)a)->next = next;
494}
Junio C Hamanoa6080a02007-06-07 07:04:01[diff] [blame]495
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]496void commit_list_sort_by_date(struct commit_list **list)
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]497{
Junio C Hamano7365c952012-04-17 18:07:01[diff] [blame]498 *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
499 commit_list_compare_by_date);
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]500}
501
Daniel Barkalow58e28af2005-04-24 03:29:22[diff] [blame]502struct commit *pop_most_recent_commit(struct commit_list **list,
503 unsigned int mark)
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]504{
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]505 struct commit *ret = pop_commit(list);
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]506 struct commit_list *parents = ret->parents;
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]507
508 while (parents) {
Linus Torvalds4056c092005-04-24 02:21:28[diff] [blame]509 struct commit *commit = parents->item;
Martin Koeglerdec38c82008-02-18 20:48:03[diff] [blame]510 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
Daniel Barkalow58e28af2005-04-24 03:29:22[diff] [blame]511 commit->object.flags |= mark;
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]512 commit_list_insert_by_date(commit, list);
Linus Torvalds4056c092005-04-24 02:21:28[diff] [blame]513 }
Daniel Barkalowdd97f852005-04-24 01:47:23[diff] [blame]514 parents = parents->next;
515 }
516 return ret;
517}
Linus Torvaldse3bc7a32005-06-01 15:34:23[diff] [blame]518
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]519static void clear_commit_marks_1(struct commit_list **plist,
520 struct commit *commit, unsigned int mark)
Junio C Hamanof8f9c732006-01-08 02:52:42[diff] [blame]521{
Johannes Schindelin60fcc2e2007-10-10 22:14:35[diff] [blame]522 while (commit) {
523 struct commit_list *parents;
Junio C Hamanof8f9c732006-01-08 02:52:42[diff] [blame]524
Johannes Schindelin60fcc2e2007-10-10 22:14:35[diff] [blame]525 if (!(mark & commit->object.flags))
526 return;
Junio C Hamano58ecf5c2006-07-05 00:45:22[diff] [blame]527
Johannes Schindelin60fcc2e2007-10-10 22:14:35[diff] [blame]528 commit->object.flags &= ~mark;
529
530 parents = commit->parents;
531 if (!parents)
532 return;
533
534 while ((parents = parents->next))
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]535 commit_list_insert(parents->item, plist);
Johannes Schindelin60fcc2e2007-10-10 22:14:35[diff] [blame]536
537 commit = commit->parents->item;
Junio C Hamanof8f9c732006-01-08 02:52:42[diff] [blame]538 }
539}
540
Junio C Hamanoe895cb52013-03-05 19:42:20[diff] [blame]541void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]542{
543 struct commit_list *list = NULL;
Junio C Hamanoe895cb52013-03-05 19:42:20[diff] [blame]544
545 while (nr--) {
546 commit_list_insert(*commit, &list);
547 commit++;
548 }
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]549 while (list)
550 clear_commit_marks_1(&list, pop_commit(&list), mark);
551}
552
Junio C Hamanoe895cb52013-03-05 19:42:20[diff] [blame]553void clear_commit_marks(struct commit *commit, unsigned int mark)
554{
555 clear_commit_marks_many(1, &commit, mark);
556}
557
René Scharfe86a0a402011-10-01 16:16:08[diff] [blame]558void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)
559{
560 struct object *object;
561 struct commit *commit;
562 unsigned int i;
563
564 for (i = 0; i < a->nr; i++) {
565 object = a->objects[i].item;
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]566 commit = lookup_commit_reference_gently(object->oid.hash, 1);
René Scharfe86a0a402011-10-01 16:16:08[diff] [blame]567 if (commit)
568 clear_commit_marks(commit, mark);
569 }
570}
571
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40[diff] [blame]572struct commit *pop_commit(struct commit_list **stack)
573{
574 struct commit_list *top = *stack;
575 struct commit *item = top ? top->item : NULL;
576
577 if (top) {
578 *stack = top->next;
579 free(top);
580 }
581 return item;
582}
583
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]584/*
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]585 * Topological sort support
586 */
Junio C Hamano66eb3752013-04-13 06:25:49[diff] [blame]587
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]588/* count number of children that have not been emitted */
589define_commit_slab(indegree_slab, int);
Jeff King96c4f4a2013-04-09 06:52:56[diff] [blame]590
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]591/* record author-date for each commit object */
592define_commit_slab(author_date_slab, unsigned long);
593
594static void record_author_date(struct author_date_slab *author_date,
595 struct commit *commit)
596{
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]597 const char *buffer = get_commit_buffer(commit, NULL);
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]598 struct ident_split ident;
Jeff Kingea5517f2014-08-27 07:56:55[diff] [blame]599 const char *ident_line;
600 size_t ident_len;
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]601 char *date_end;
602 unsigned long date;
603
Jeff Kingea5517f2014-08-27 07:56:55[diff] [blame]604 ident_line = find_commit_header(buffer, "author", &ident_len);
605 if (!ident_line)
606 goto fail_exit; /* no author line */
607 if (split_ident_line(&ident, ident_line, ident_len) ||
608 !ident.date_begin || !ident.date_end)
609 goto fail_exit; /* malformed "author" line */
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]610
611 date = strtoul(ident.date_begin, &date_end, 10);
612 if (date_end != ident.date_end)
613 goto fail_exit; /* malformed date */
614 *(author_date_slab_at(author_date, commit)) = date;
615
616fail_exit:
Jeff Kingba41c1c2014-06-10 21:41:02[diff] [blame]617 unuse_commit_buffer(commit, buffer);
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]618}
619
620static int compare_commits_by_author_date(const void *a_, const void *b_,
621 void *cb_data)
622{
623 const struct commit *a = a_, *b = b_;
624 struct author_date_slab *author_date = cb_data;
625 unsigned long a_date = *(author_date_slab_at(author_date, a));
626 unsigned long b_date = *(author_date_slab_at(author_date, b));
627
628 /* newer commits with larger date first */
629 if (a_date < b_date)
630 return 1;
631 else if (a_date > b_date)
632 return -1;
633 return 0;
634}
635
Jeff King727377f2013-07-02 06:21:48[diff] [blame]636int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]637{
638 const struct commit *a = a_, *b = b_;
639 /* newer commits with larger date first */
640 if (a->date < b->date)
641 return 1;
642 else if (a->date > b->date)
643 return -1;
644 return 0;
645}
646
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]647/*
648 * Performs an in-place topological sort on the list supplied.
649 */
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]650void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]651{
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]652 struct commit_list *next, *orig = *list;
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]653 struct commit_list **pptr;
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]654 struct indegree_slab indegree;
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]655 struct prio_queue queue;
656 struct commit *commit;
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]657 struct author_date_slab author_date;
Fredrik Kuivinen6b6dcfc2006-03-10 09:21:37[diff] [blame]658
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]659 if (!orig)
Eric Wong7d6fb372005-12-24 12:12:43[diff] [blame]660 return;
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]661 *list = NULL;
662
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]663 init_indegree_slab(&indegree);
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]664 memset(&queue, '\0', sizeof(queue));
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]665
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]666 switch (sort_order) {
667 default: /* REV_SORT_IN_GRAPH_ORDER */
668 queue.compare = NULL;
669 break;
670 case REV_SORT_BY_COMMIT_DATE:
671 queue.compare = compare_commits_by_commit_date;
672 break;
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]673 case REV_SORT_BY_AUTHOR_DATE:
674 init_author_date_slab(&author_date);
675 queue.compare = compare_commits_by_author_date;
676 queue.cb_data = &author_date;
677 break;
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]678 }
Jeff King96c4f4a2013-04-09 06:52:56[diff] [blame]679
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]680 /* Mark them and clear the indegree */
681 for (next = orig; next; next = next->next) {
682 struct commit *commit = next->item;
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]683 *(indegree_slab_at(&indegree, commit)) = 1;
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]684 /* also record the author dates, if needed */
685 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
686 record_author_date(&author_date, commit);
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]687 }
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]688
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]689 /* update the indegree */
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]690 for (next = orig; next; next = next->next) {
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]691 struct commit_list *parents = next->item->parents;
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]692 while (parents) {
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]693 struct commit *parent = parents->item;
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]694 int *pi = indegree_slab_at(&indegree, parent);
Fredrik Kuivinen6b6dcfc2006-03-10 09:21:37[diff] [blame]695
Jeff King96c4f4a2013-04-09 06:52:56[diff] [blame]696 if (*pi)
697 (*pi)++;
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]698 parents = parents->next;
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]699 }
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]700 }
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]701
Junio C Hamanoa6080a02007-06-07 07:04:01[diff] [blame]702 /*
Pierre Habouzit674d1722007-09-10 10:35:06[diff] [blame]703 * find the tips
704 *
705 * tips are nodes not reachable from any other node in the list
706 *
707 * the tips serve as a starting set for the work queue.
708 */
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]709 for (next = orig; next; next = next->next) {
710 struct commit *commit = next->item;
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]711
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]712 if (*(indegree_slab_at(&indegree, commit)) == 1)
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]713 prio_queue_put(&queue, commit);
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]714 }
Junio C Hamano4c8725f2006-02-16 06:05:33[diff] [blame]715
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]716 /*
717 * This is unfortunate; the initial tips need to be shown
718 * in the order given from the revision traversal machinery.
719 */
720 if (sort_order == REV_SORT_IN_GRAPH_ORDER)
721 prio_queue_reverse(&queue);
722
723 /* We no longer need the commit list */
724 free_commit_list(orig);
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]725
726 pptr = list;
727 *list = NULL;
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]728 while ((commit = prio_queue_get(&queue)) != NULL) {
729 struct commit_list *parents;
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]730
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]731 for (parents = commit->parents; parents ; parents = parents->next) {
Junio C Hamanocd2b8ae2011-08-25 21:46:52[diff] [blame]732 struct commit *parent = parents->item;
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]733 int *pi = indegree_slab_at(&indegree, parent);
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]734
Jeff King96c4f4a2013-04-09 06:52:56[diff] [blame]735 if (!*pi)
Linus Torvalds23c17d42007-11-02 20:32:58[diff] [blame]736 continue;
737
738 /*
739 * parents are only enqueued for emission
740 * when all their children have been emitted thereby
741 * guaranteeing topological order.
742 */
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]743 if (--(*pi) == 1)
744 prio_queue_put(&queue, parent);
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]745 }
746 /*
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]747 * all children of commit have already been
748 * emitted. we can emit it now.
Pierre Habouzit674d1722007-09-10 10:35:06[diff] [blame]749 */
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]750 *(indegree_slab_at(&indegree, commit)) = 0;
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]751
752 pptr = &commit_list_insert(commit, pptr)->next;
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]753 }
Jeff King96c4f4a2013-04-09 06:52:56[diff] [blame]754
Junio C Hamanoa84b7942013-04-13 18:56:41[diff] [blame]755 clear_indegree_slab(&indegree);
Junio C Hamanoda24b102013-06-07 04:58:12[diff] [blame]756 clear_prio_queue(&queue);
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]757 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
758 clear_author_date_slab(&author_date);
Jon Seymourab580ac2005-07-06 16:39:34[diff] [blame]759}
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]760
Junio C Hamano12952282007-01-09 07:10:49[diff] [blame]761/* merge-base stuff */
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]762
Nguyễn Thái Ngọc Duy208acbf2014-03-25 13:23:26[diff] [blame]763/* Remember to update object flag allocation in object.h */
Junio C Hamano577ed5c2006-10-23 00:32:47[diff] [blame]764#define PARENT1 (1u<<16)
765#define PARENT2 (1u<<17)
766#define STALE (1u<<18)
767#define RESULT (1u<<19)
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]768
Junio C Hamano12952282007-01-09 07:10:49[diff] [blame]769static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
770
Jeff King73f43f22014-07-14 05:53:54[diff] [blame]771static int queue_has_nonstale(struct prio_queue *queue)
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]772{
Jeff King73f43f22014-07-14 05:53:54[diff] [blame]773 int i;
774 for (i = 0; i < queue->nr; i++) {
775 struct commit *commit = queue->array[i].data;
776 if (!(commit->object.flags & STALE))
777 return 1;
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]778 }
Jeff King73f43f22014-07-14 05:53:54[diff] [blame]779 return 0;
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]780}
781
Junio C Hamanod8669242012-10-04 22:37:15[diff] [blame]782/* all input commits in one and twos[] must have been parsed! */
Junio C Hamanoda1f5152012-08-30 21:39:03[diff] [blame]783static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos)
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]784{
Jeff King73f43f22014-07-14 05:53:54[diff] [blame]785 struct prio_queue queue = { compare_commits_by_commit_date };
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]786 struct commit_list *result = NULL;
Junio C Hamano6a938642008-06-27 16:22:02[diff] [blame]787 int i;
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]788
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]789 one->object.flags |= PARENT1;
Jeff King73f43f22014-07-14 05:53:54[diff] [blame]790 if (!n) {
791 commit_list_append(one, &result);
792 return result;
793 }
794 prio_queue_put(&queue, one);
795
Junio C Hamano6a938642008-06-27 16:22:02[diff] [blame]796 for (i = 0; i < n; i++) {
797 twos[i]->object.flags |= PARENT2;
Jeff King73f43f22014-07-14 05:53:54[diff] [blame]798 prio_queue_put(&queue, twos[i]);
Junio C Hamano6a938642008-06-27 16:22:02[diff] [blame]799 }
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]800
Jeff King73f43f22014-07-14 05:53:54[diff] [blame]801 while (queue_has_nonstale(&queue)) {
802 struct commit *commit = prio_queue_get(&queue);
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]803 struct commit_list *parents;
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]804 int flags;
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]805
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]806 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]807 if (flags == (PARENT1 | PARENT2)) {
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]808 if (!(commit->object.flags & RESULT)) {
809 commit->object.flags |= RESULT;
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]810 commit_list_insert_by_date(commit, &result);
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]811 }
Junio C Hamano542ccef2006-07-02 18:34:17[diff] [blame]812 /* Mark parents of a found merge stale */
813 flags |= STALE;
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]814 }
815 parents = commit->parents;
816 while (parents) {
817 struct commit *p = parents->item;
818 parents = parents->next;
819 if ((p->object.flags & flags) == flags)
820 continue;
Martin Koegler172947e2008-02-18 20:47:57[diff] [blame]821 if (parse_commit(p))
822 return NULL;
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]823 p->object.flags |= flags;
Jeff King73f43f22014-07-14 05:53:54[diff] [blame]824 prio_queue_put(&queue, p);
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]825 }
826 }
827
Jeff King73f43f22014-07-14 05:53:54[diff] [blame]828 clear_prio_queue(&queue);
Junio C Hamanoda1f5152012-08-30 21:39:03[diff] [blame]829 return result;
830}
831
832static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
833{
834 struct commit_list *list = NULL;
835 struct commit_list *result = NULL;
836 int i;
837
838 for (i = 0; i < n; i++) {
839 if (one == twos[i])
840 /*
841 * We do not mark this even with RESULT so we do not
842 * have to clean it up.
843 */
844 return commit_list_insert(one, &result);
845 }
846
847 if (parse_commit(one))
848 return NULL;
849 for (i = 0; i < n; i++) {
850 if (parse_commit(twos[i]))
851 return NULL;
852 }
853
854 list = paint_down_to_common(one, n, twos);
855
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]856 while (list) {
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]857 struct commit *commit = pop_commit(&list);
858 if (!(commit->object.flags & STALE))
859 commit_list_insert_by_date(commit, &result);
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]860 }
861 return result;
862}
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]863
Miklos Vajna5240c9d2008-06-27 16:22:00[diff] [blame]864struct commit_list *get_octopus_merge_bases(struct commit_list *in)
865{
866 struct commit_list *i, *j, *k, *ret = NULL;
Miklos Vajna5240c9d2008-06-27 16:22:00[diff] [blame]867
Vasily Makarov6bc76722014-01-03 14:45:46[diff] [blame]868 if (!in)
869 return ret;
Miklos Vajna5240c9d2008-06-27 16:22:00[diff] [blame]870
Vasily Makarov6bc76722014-01-03 14:45:46[diff] [blame]871 commit_list_insert(in->item, &ret);
872
873 for (i = in->next; i; i = i->next) {
874 struct commit_list *new = NULL, *end = NULL;
875
876 for (j = ret; j; j = j->next) {
877 struct commit_list *bases;
Junio C Hamano2ce406c2014-10-30 19:20:44[diff] [blame]878 bases = get_merge_bases(i->item, j->item);
Vasily Makarov6bc76722014-01-03 14:45:46[diff] [blame]879 if (!new)
880 new = bases;
881 else
882 end->next = bases;
883 for (k = bases; k; k = k->next)
884 end = k;
Miklos Vajna5240c9d2008-06-27 16:22:00[diff] [blame]885 }
Vasily Makarov6bc76722014-01-03 14:45:46[diff] [blame]886 ret = new;
Miklos Vajna5240c9d2008-06-27 16:22:00[diff] [blame]887 }
888 return ret;
889}
890
Junio C Hamano94f0ced2012-08-30 22:35:39[diff] [blame]891static int remove_redundant(struct commit **array, int cnt)
892{
893 /*
894 * Some commit in the array may be an ancestor of
895 * another commit. Move such commit to the end of
896 * the array, and return the number of commits that
897 * are independent from each other.
898 */
899 struct commit **work;
900 unsigned char *redundant;
901 int *filled_index;
902 int i, j, filled;
903
904 work = xcalloc(cnt, sizeof(*work));
905 redundant = xcalloc(cnt, 1);
Jeff Kingb32fa952016-02-22 22:44:25[diff] [blame]906 ALLOC_ARRAY(filled_index, cnt - 1);
Junio C Hamano94f0ced2012-08-30 22:35:39[diff] [blame]907
Junio C Hamanod8669242012-10-04 22:37:15[diff] [blame]908 for (i = 0; i < cnt; i++)
909 parse_commit(array[i]);
Junio C Hamano94f0ced2012-08-30 22:35:39[diff] [blame]910 for (i = 0; i < cnt; i++) {
911 struct commit_list *common;
912
913 if (redundant[i])
914 continue;
915 for (j = filled = 0; j < cnt; j++) {
916 if (i == j || redundant[j])
917 continue;
918 filled_index[filled] = j;
919 work[filled++] = array[j];
920 }
921 common = paint_down_to_common(array[i], filled, work);
922 if (array[i]->object.flags & PARENT2)
923 redundant[i] = 1;
924 for (j = 0; j < filled; j++)
925 if (work[j]->object.flags & PARENT1)
926 redundant[filled_index[j]] = 1;
927 clear_commit_marks(array[i], all_flags);
928 for (j = 0; j < filled; j++)
929 clear_commit_marks(work[j], all_flags);
930 free_commit_list(common);
931 }
932
933 /* Now collect the result */
934 memcpy(work, array, sizeof(*array) * cnt);
935 for (i = filled = 0; i < cnt; i++)
936 if (!redundant[i])
937 array[filled++] = work[i];
938 for (j = filled, i = 0; i < cnt; i++)
939 if (redundant[i])
940 array[j++] = work[i];
941 free(work);
942 free(redundant);
943 free(filled_index);
944 return filled;
945}
946
Junio C Hamano2ce406c2014-10-30 19:20:44[diff] [blame]947static struct commit_list *get_merge_bases_many_0(struct commit *one,
948 int n,
949 struct commit **twos,
950 int cleanup)
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]951{
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]952 struct commit_list *list;
953 struct commit **rslt;
954 struct commit_list *result;
Junio C Hamano94f0ced2012-08-30 22:35:39[diff] [blame]955 int cnt, i;
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]956
Junio C Hamano6a938642008-06-27 16:22:02[diff] [blame]957 result = merge_bases_many(one, n, twos);
958 for (i = 0; i < n; i++) {
959 if (one == twos[i])
960 return result;
961 }
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]962 if (!result || !result->next) {
963 if (cleanup) {
964 clear_commit_marks(one, all_flags);
Junio C Hamanoe895cb52013-03-05 19:42:20[diff] [blame]965 clear_commit_marks_many(n, twos, all_flags);
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]966 }
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]967 return result;
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]968 }
969
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]970 /* There are more than one */
René Scharfe4bbaa1e2014-07-16 23:52:09[diff] [blame]971 cnt = commit_list_count(result);
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]972 rslt = xcalloc(cnt, sizeof(*rslt));
973 for (list = result, i = 0; list; list = list->next)
974 rslt[i++] = list->item;
975 free_commit_list(result);
976
977 clear_commit_marks(one, all_flags);
Junio C Hamanoe895cb52013-03-05 19:42:20[diff] [blame]978 clear_commit_marks_many(n, twos, all_flags);
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]979
Junio C Hamano94f0ced2012-08-30 22:35:39[diff] [blame]980 cnt = remove_redundant(rslt, cnt);
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]981 result = NULL;
Junio C Hamano94f0ced2012-08-30 22:35:39[diff] [blame]982 for (i = 0; i < cnt; i++)
983 commit_list_insert_by_date(rslt[i], &result);
Junio C Hamanof3249432006-07-05 01:46:42[diff] [blame]984 free(rslt);
Johannes Schindelin7c6f8aa2006-06-29 13:17:32[diff] [blame]985 return result;
986}
Junio C Hamano2ecd2bb2006-12-19 08:14:04[diff] [blame]987
Junio C Hamano2ce406c2014-10-30 19:20:44[diff] [blame]988struct commit_list *get_merge_bases_many(struct commit *one,
989 int n,
990 struct commit **twos)
Junio C Hamano6a938642008-06-27 16:22:02[diff] [blame]991{
Junio C Hamano2ce406c2014-10-30 19:20:44[diff] [blame]992 return get_merge_bases_many_0(one, n, twos, 1);
993}
994
995struct commit_list *get_merge_bases_many_dirty(struct commit *one,
996 int n,
997 struct commit **twos)
998{
999 return get_merge_bases_many_0(one, n, twos, 0);
1000}
1001
1002struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
1003{
1004 return get_merge_bases_many_0(one, 1, &two, 1);
Junio C Hamano6a938642008-06-27 16:22:02[diff] [blame]1005}
1006
Junio C Hamanoa20efee2012-08-27 21:46:01[diff] [blame]1007/*
Stefano Lattarini41ccfdd2013-04-11 22:36:10[diff] [blame]1008 * Is "commit" a descendant of one of the elements on the "with_commit" list?
Junio C Hamanoa20efee2012-08-27 21:46:01[diff] [blame]1009 */
Jake Goulding7fcdb362009-01-26 14:13:24[diff] [blame]1010int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
1011{
1012 if (!with_commit)
1013 return 1;
1014 while (with_commit) {
1015 struct commit *other;
1016
1017 other = with_commit->item;
1018 with_commit = with_commit->next;
Junio C Hamanoa20efee2012-08-27 21:46:01[diff] [blame]1019 if (in_merge_bases(other, commit))
Jake Goulding7fcdb362009-01-26 14:13:24[diff] [blame]1020 return 1;
1021 }
1022 return 0;
1023}
1024
Junio C Hamanoa20efee2012-08-27 21:46:01[diff] [blame]1025/*
Junio C Hamano4c4b27e2013-03-04 18:16:42[diff] [blame]1026 * Is "commit" an ancestor of one of the "references"?
1027 */
1028int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference)
1029{
1030 struct commit_list *bases;
1031 int ret = 0, i;
1032
1033 if (parse_commit(commit))
1034 return ret;
1035 for (i = 0; i < nr_reference; i++)
1036 if (parse_commit(reference[i]))
1037 return ret;
1038
1039 bases = paint_down_to_common(commit, nr_reference, reference);
1040 if (commit->object.flags & PARENT2)
1041 ret = 1;
1042 clear_commit_marks(commit, all_flags);
Junio C Hamano557899f2013-03-05 19:56:03[diff] [blame]1043 clear_commit_marks_many(nr_reference, reference, all_flags);
Junio C Hamano4c4b27e2013-03-04 18:16:42[diff] [blame]1044 free_commit_list(bases);
1045 return ret;
1046}
1047
1048/*
Junio C Hamanoa20efee2012-08-27 21:46:01[diff] [blame]1049 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
1050 */
1051int in_merge_bases(struct commit *commit, struct commit *reference)
Junio C Hamano2ecd2bb2006-12-19 08:14:04[diff] [blame]1052{
Junio C Hamano4c4b27e2013-03-04 18:16:42[diff] [blame]1053 return in_merge_bases_many(commit, 1, &reference);
Junio C Hamano2ecd2bb2006-12-19 08:14:04[diff] [blame]1054}
Junio C Hamano98cf9c32008-06-27 16:22:03[diff] [blame]1055
1056struct commit_list *reduce_heads(struct commit_list *heads)
1057{
1058 struct commit_list *p;
1059 struct commit_list *result = NULL, **tail = &result;
Junio C Hamanof37d3c72012-08-31 06:20:40[diff] [blame]1060 struct commit **array;
1061 int num_head, i;
Junio C Hamano98cf9c32008-06-27 16:22:03[diff] [blame]1062
1063 if (!heads)
1064 return NULL;
1065
Junio C Hamanof37d3c72012-08-31 06:20:40[diff] [blame]1066 /* Uniquify */
1067 for (p = heads; p; p = p->next)
1068 p->item->object.flags &= ~STALE;
1069 for (p = heads, num_head = 0; p; p = p->next) {
1070 if (p->item->object.flags & STALE)
Junio C Hamano711f6b22008-07-14 07:09:41[diff] [blame]1071 continue;
Junio C Hamanof37d3c72012-08-31 06:20:40[diff] [blame]1072 p->item->object.flags |= STALE;
1073 num_head++;
Junio C Hamano98cf9c32008-06-27 16:22:03[diff] [blame]1074 }
Brian Gesiakc4a7b002014-05-26 15:33:45[diff] [blame]1075 array = xcalloc(num_head, sizeof(*array));
Junio C Hamanof37d3c72012-08-31 06:20:40[diff] [blame]1076 for (p = heads, i = 0; p; p = p->next) {
1077 if (p->item->object.flags & STALE) {
1078 array[i++] = p->item;
1079 p->item->object.flags &= ~STALE;
1080 }
1081 }
1082 num_head = remove_redundant(array, num_head);
1083 for (i = 0; i < num_head; i++)
1084 tail = &commit_list_insert(array[i], tail)->next;
Junio C Hamano98cf9c32008-06-27 16:22:03[diff] [blame]1085 return result;
1086}
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1087
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1088static const char gpg_sig_header[] = "gpgsig";
1089static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
1090
1091static int do_sign_commit(struct strbuf *buf, const char *keyid)
1092{
1093 struct strbuf sig = STRBUF_INIT;
1094 int inspos, copypos;
1095
1096 /* find the end of the header */
1097 inspos = strstr(buf->buf, "\n\n") - buf->buf + 1;
1098
1099 if (!keyid || !*keyid)
1100 keyid = get_signing_key();
1101 if (sign_buffer(buf, &sig, keyid)) {
1102 strbuf_release(&sig);
1103 return -1;
1104 }
1105
1106 for (copypos = 0; sig.buf[copypos]; ) {
1107 const char *bol = sig.buf + copypos;
1108 const char *eol = strchrnul(bol, '\n');
1109 int len = (eol - bol) + !!*eol;
1110
1111 if (!copypos) {
1112 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
1113 inspos += gpg_sig_header_len;
1114 }
1115 strbuf_insert(buf, inspos++, " ", 1);
1116 strbuf_insert(buf, inspos, bol, len);
1117 inspos += len;
1118 copypos += len;
1119 }
1120 strbuf_release(&sig);
1121 return 0;
1122}
1123
Jeff King218aa3a2014-06-13 06:32:11[diff] [blame]1124int parse_signed_commit(const struct commit *commit,
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1125 struct strbuf *payload, struct strbuf *signature)
1126{
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1127
Jeff King218aa3a2014-06-13 06:32:11[diff] [blame]1128 unsigned long size;
1129 const char *buffer = get_commit_buffer(commit, &size);
1130 int in_signature, saw_signature = -1;
1131 const char *line, *tail;
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1132
1133 line = buffer;
1134 tail = buffer + size;
1135 in_signature = 0;
1136 saw_signature = 0;
1137 while (line < tail) {
1138 const char *sig = NULL;
Jeff King218aa3a2014-06-13 06:32:11[diff] [blame]1139 const char *next = memchr(line, '\n', tail - line);
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1140
1141 next = next ? next + 1 : tail;
1142 if (in_signature && line[0] == ' ')
1143 sig = line + 1;
Christian Couder59556542013-11-30 20:55:40[diff] [blame]1144 else if (starts_with(line, gpg_sig_header) &&
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1145 line[gpg_sig_header_len] == ' ')
1146 sig = line + gpg_sig_header_len + 1;
1147 if (sig) {
1148 strbuf_add(signature, sig, next - sig);
1149 saw_signature = 1;
1150 in_signature = 1;
1151 } else {
1152 if (*line == '\n')
1153 /* dump the whole remainder of the buffer */
1154 next = tail;
1155 strbuf_add(payload, line, next - line);
1156 in_signature = 0;
1157 }
1158 line = next;
1159 }
Jeff King218aa3a2014-06-13 06:32:11[diff] [blame]1160 unuse_commit_buffer(commit, buffer);
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1161 return saw_signature;
1162}
1163
Christian Couder0b05ab62014-07-19 15:01:12[diff] [blame]1164int remove_signature(struct strbuf *buf)
1165{
1166 const char *line = buf->buf;
1167 const char *tail = buf->buf + buf->len;
1168 int in_signature = 0;
1169 const char *sig_start = NULL;
1170 const char *sig_end = NULL;
1171
1172 while (line < tail) {
1173 const char *next = memchr(line, '\n', tail - line);
1174 next = next ? next + 1 : tail;
1175
1176 if (in_signature && line[0] == ' ')
1177 sig_end = next;
1178 else if (starts_with(line, gpg_sig_header) &&
1179 line[gpg_sig_header_len] == ' ') {
1180 sig_start = line;
1181 sig_end = next;
1182 in_signature = 1;
1183 } else {
1184 if (*line == '\n')
1185 /* dump the whole remainder of the buffer */
1186 next = tail;
1187 in_signature = 0;
1188 }
1189 line = next;
1190 }
1191
1192 if (sig_start)
1193 strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start);
1194
1195 return sig_start != NULL;
1196}
1197
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1198static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1199{
1200 struct merge_remote_desc *desc;
1201 struct commit_extra_header *mergetag;
1202 char *buf;
1203 unsigned long size, len;
1204 enum object_type type;
1205
1206 desc = merge_remote_util(parent);
1207 if (!desc || !desc->obj)
1208 return;
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]1209 buf = read_sha1_file(desc->obj->oid.hash, &type, &size);
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1210 if (!buf || type != OBJ_TAG)
1211 goto free_return;
1212 len = parse_signature(buf, size);
1213 if (size == len)
1214 goto free_return;
1215 /*
1216 * We could verify this signature and either omit the tag when
1217 * it does not validate, but the integrator may not have the
1218 * public key of the signer of the tag he is merging, while a
1219 * later auditor may have it while auditing, so let's not run
1220 * verify-signed-buffer here for now...
1221 *
1222 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1223 * warn("warning: signed tag unverified.");
1224 */
1225 mergetag = xcalloc(1, sizeof(*mergetag));
1226 mergetag->key = xstrdup("mergetag");
1227 mergetag->value = buf;
1228 mergetag->len = size;
1229
1230 **tail = mergetag;
1231 *tail = &mergetag->next;
1232 return;
1233
1234free_return:
1235 free(buf);
1236}
1237
brian m. carlson434060e2015-06-21 23:14:40[diff] [blame]1238int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1239{
1240 struct strbuf payload = STRBUF_INIT;
1241 struct strbuf signature = STRBUF_INIT;
brian m. carlson434060e2015-06-21 23:14:40[diff] [blame]1242 int ret = 1;
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1243
1244 sigc->result = 'N';
1245
Jeff King218aa3a2014-06-13 06:32:11[diff] [blame]1246 if (parse_signed_commit(commit, &payload, &signature) <= 0)
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1247 goto out;
brian m. carlson434060e2015-06-21 23:14:40[diff] [blame]1248 ret = check_signature(payload.buf, payload.len, signature.buf,
1249 signature.len, sigc);
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1250
1251 out:
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1252 strbuf_release(&payload);
1253 strbuf_release(&signature);
brian m. carlson434060e2015-06-21 23:14:40[diff] [blame]1254
1255 return ret;
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1256}
1257
1258
1259
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1260void append_merge_tag_headers(struct commit_list *parents,
1261 struct commit_extra_header ***tail)
1262{
1263 while (parents) {
1264 struct commit *parent = parents->item;
1265 handle_signed_tag(parent, tail);
1266 parents = parents->next;
1267 }
1268}
1269
1270static void add_extra_header(struct strbuf *buffer,
1271 struct commit_extra_header *extra)
1272{
1273 strbuf_addstr(buffer, extra->key);
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1274 if (extra->len)
1275 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1276 else
1277 strbuf_addch(buffer, '\n');
1278}
1279
Junio C Hamanoc871a1d2012-01-05 18:54:14[diff] [blame]1280struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1281 const char **exclude)
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1282{
1283 struct commit_extra_header *extra = NULL;
1284 unsigned long size;
Jeff King218aa3a2014-06-13 06:32:11[diff] [blame]1285 const char *buffer = get_commit_buffer(commit, &size);
1286 extra = read_commit_extra_header_lines(buffer, size, exclude);
1287 unuse_commit_buffer(commit, buffer);
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1288 return extra;
1289}
1290
Christian Couder063da622014-07-07 06:35:37[diff] [blame]1291void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
1292{
1293 struct commit_extra_header *extra, *to_free;
1294
1295 to_free = read_commit_extra_headers(commit, NULL);
1296 for (extra = to_free; extra; extra = extra->next) {
1297 if (strcmp(extra->key, "mergetag"))
1298 continue; /* not a merge tag */
1299 fn(commit, extra, data);
1300 }
1301 free_commit_extra_headers(to_free);
1302}
1303
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1304static inline int standard_header_field(const char *field, size_t len)
1305{
1306 return ((len == 4 && !memcmp(field, "tree ", 5)) ||
1307 (len == 6 && !memcmp(field, "parent ", 7)) ||
1308 (len == 6 && !memcmp(field, "author ", 7)) ||
1309 (len == 9 && !memcmp(field, "committer ", 10)) ||
1310 (len == 8 && !memcmp(field, "encoding ", 9)));
1311}
1312
Junio C Hamanoc871a1d2012-01-05 18:54:14[diff] [blame]1313static int excluded_header_field(const char *field, size_t len, const char **exclude)
1314{
1315 if (!exclude)
1316 return 0;
1317
1318 while (*exclude) {
1319 size_t xlen = strlen(*exclude);
1320 if (len == xlen &&
1321 !memcmp(field, *exclude, xlen) && field[xlen] == ' ')
1322 return 1;
1323 exclude++;
1324 }
1325 return 0;
1326}
1327
Junio C Hamano82a75292012-09-15 20:58:15[diff] [blame]1328static struct commit_extra_header *read_commit_extra_header_lines(
1329 const char *buffer, size_t size,
1330 const char **exclude)
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1331{
1332 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1333 const char *line, *next, *eof, *eob;
1334 struct strbuf buf = STRBUF_INIT;
1335
1336 for (line = buffer, eob = line + size;
1337 line < eob && *line != '\n';
1338 line = next) {
1339 next = memchr(line, '\n', eob - line);
1340 next = next ? next + 1 : eob;
1341 if (*line == ' ') {
1342 /* continuation */
1343 if (it)
1344 strbuf_add(&buf, line + 1, next - (line + 1));
1345 continue;
1346 }
1347 if (it)
1348 it->value = strbuf_detach(&buf, &it->len);
1349 strbuf_reset(&buf);
1350 it = NULL;
1351
1352 eof = strchr(line, ' ');
1353 if (next <= eof)
1354 eof = next;
1355
Junio C Hamanoc871a1d2012-01-05 18:54:14[diff] [blame]1356 if (standard_header_field(line, eof - line) ||
1357 excluded_header_field(line, eof - line, exclude))
Junio C Hamanoed7a42a2011-11-08 23:38:07[diff] [blame]1358 continue;
1359
1360 it = xcalloc(1, sizeof(*it));
1361 it->key = xmemdupz(line, eof-line);
1362 *tail = it;
1363 tail = &it->next;
1364 if (eof + 1 < next)
1365 strbuf_add(&buf, eof + 1, next - (eof + 1));
1366 }
1367 if (it)
1368 it->value = strbuf_detach(&buf, &it->len);
1369 return extra;
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1370}
1371
1372void free_commit_extra_headers(struct commit_extra_header *extra)
1373{
1374 while (extra) {
1375 struct commit_extra_header *next = extra->next;
1376 free(extra->key);
1377 free(extra->value);
1378 free(extra);
1379 extra = next;
1380 }
1381}
1382
Jeff King3ffefb52014-06-10 21:36:52[diff] [blame]1383int commit_tree(const char *msg, size_t msg_len,
1384 const unsigned char *tree,
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1385 struct commit_list *parents, unsigned char *ret,
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1386 const char *author, const char *sign_commit)
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1387{
1388 struct commit_extra_header *extra = NULL, **tail = &extra;
1389 int result;
1390
1391 append_merge_tag_headers(parents, &tail);
Jeff King3ffefb52014-06-10 21:36:52[diff] [blame]1392 result = commit_tree_extended(msg, msg_len, tree, parents, ret,
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1393 author, sign_commit, extra);
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1394 free_commit_extra_headers(extra);
1395 return result;
1396}
1397
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1398static int find_invalid_utf8(const char *buf, int len)
1399{
1400 int offset = 0;
brian m. carlsone82bd6c2013-07-04 17:20:34[diff] [blame]1401 static const unsigned int max_codepoint[] = {
1402 0x7f, 0x7ff, 0xffff, 0x10ffff
1403 };
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1404
1405 while (len) {
1406 unsigned char c = *buf++;
1407 int bytes, bad_offset;
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1408 unsigned int codepoint;
brian m. carlsone82bd6c2013-07-04 17:20:34[diff] [blame]1409 unsigned int min_val, max_val;
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1410
1411 len--;
1412 offset++;
1413
1414 /* Simple US-ASCII? No worries. */
1415 if (c < 0x80)
1416 continue;
1417
1418 bad_offset = offset-1;
1419
1420 /*
1421 * Count how many more high bits set: that's how
1422 * many more bytes this sequence should have.
1423 */
1424 bytes = 0;
1425 while (c & 0x40) {
1426 c <<= 1;
1427 bytes++;
1428 }
1429
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1430 /*
1431 * Must be between 1 and 3 more bytes. Longer sequences result in
1432 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1433 */
1434 if (bytes < 1 || 3 < bytes)
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1435 return bad_offset;
1436
1437 /* Do we *have* that many bytes? */
1438 if (len < bytes)
1439 return bad_offset;
1440
brian m. carlsone82bd6c2013-07-04 17:20:34[diff] [blame]1441 /*
1442 * Place the encoded bits at the bottom of the value and compute the
1443 * valid range.
1444 */
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1445 codepoint = (c & 0x7f) >> bytes;
brian m. carlsone82bd6c2013-07-04 17:20:34[diff] [blame]1446 min_val = max_codepoint[bytes-1] + 1;
1447 max_val = max_codepoint[bytes];
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1448
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1449 offset += bytes;
1450 len -= bytes;
1451
1452 /* And verify that they are good continuation bytes */
1453 do {
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1454 codepoint <<= 6;
1455 codepoint |= *buf & 0x3f;
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1456 if ((*buf++ & 0xc0) != 0x80)
1457 return bad_offset;
1458 } while (--bytes);
1459
brian m. carlsone82bd6c2013-07-04 17:20:34[diff] [blame]1460 /* Reject codepoints that are out of range for the sequence length. */
1461 if (codepoint < min_val || codepoint > max_val)
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1462 return bad_offset;
1463 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1464 if ((codepoint & 0x1ff800) == 0xd800)
1465 return bad_offset;
Peter Krefting81050ac2013-07-09 11:16:33[diff] [blame]1466 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
Junio C Hamanodc773a62013-08-05 16:52:28[diff] [blame]1467 if ((codepoint & 0xfffe) == 0xfffe)
Peter Krefting81050ac2013-07-09 11:16:33[diff] [blame]1468 return bad_offset;
1469 /* So are anything in the range U+FDD0..U+FDEF. */
1470 if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)
brian m. carlson28110d42013-07-04 17:19:43[diff] [blame]1471 return bad_offset;
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1472 }
1473 return -1;
1474}
1475
1476/*
1477 * This verifies that the buffer is in proper utf8 format.
1478 *
1479 * If it isn't, it assumes any non-utf8 characters are Latin1,
1480 * and does the conversion.
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1481 */
1482static int verify_utf8(struct strbuf *buf)
1483{
1484 int ok = 1;
1485 long pos = 0;
1486
1487 for (;;) {
1488 int bad;
1489 unsigned char c;
1490 unsigned char replace[2];
1491
1492 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1493 if (bad < 0)
1494 return ok;
1495 pos += bad;
1496 ok = 0;
1497 c = buf->buf[pos];
1498 strbuf_remove(buf, pos, 1);
1499
1500 /* We know 'c' must be in the range 128-255 */
1501 replace[0] = 0xc0 + (c >> 6);
1502 replace[1] = 0x80 + (c & 0x3f);
1503 strbuf_insert(buf, pos, replace, 2);
1504 pos += 2;
1505 }
1506}
1507
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1508static const char commit_utf8_warn[] =
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1509"Warning: commit message did not conform to UTF-8.\n"
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1510"You may want to amend it after fixing the message, or set the config\n"
1511"variable i18n.commitencoding to the encoding your project uses.\n";
1512
Jeff King3ffefb52014-06-10 21:36:52[diff] [blame]1513int commit_tree_extended(const char *msg, size_t msg_len,
1514 const unsigned char *tree,
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1515 struct commit_list *parents, unsigned char *ret,
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1516 const char *author, const char *sign_commit,
1517 struct commit_extra_header *extra)
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1518{
1519 int result;
1520 int encoding_is_utf8;
1521 struct strbuf buffer;
1522
1523 assert_sha1_type(tree, OBJ_TREE);
1524
Jeff King3ffefb52014-06-10 21:36:52[diff] [blame]1525 if (memchr(msg, '\0', msg_len))
Nguyễn Thái Ngọc Duy37576c12011-12-15 13:47:23[diff] [blame]1526 return error("a NUL byte in commit log message not allowed.");
1527
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1528 /* Not having i18n.commitencoding is the same as having utf-8 */
1529 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1530
1531 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1532 strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree));
1533
1534 /*
1535 * NOTE! This ordering means that the same exact tree merged with a
1536 * different order of parents will be a _different_ changeset even
1537 * if everything else stays the same.
1538 */
1539 while (parents) {
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]1540 struct commit *parent = pop_commit(&parents);
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1541 strbuf_addf(&buffer, "parent %s\n",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]1542 oid_to_hex(&parent->object.oid));
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1543 }
1544
1545 /* Person/date information */
1546 if (!author)
Jeff Kingf9bc5732012-05-24 23:28:40[diff] [blame]1547 author = git_author_info(IDENT_STRICT);
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1548 strbuf_addf(&buffer, "author %s\n", author);
Jeff Kingf9bc5732012-05-24 23:28:40[diff] [blame]1549 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1550 if (!encoding_is_utf8)
1551 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
Junio C Hamano5231c632011-11-08 00:21:32[diff] [blame]1552
1553 while (extra) {
1554 add_extra_header(&buffer, extra);
1555 extra = extra->next;
1556 }
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1557 strbuf_addch(&buffer, '\n');
1558
1559 /* And add the comment */
Jeff King3ffefb52014-06-10 21:36:52[diff] [blame]1560 strbuf_add(&buffer, msg, msg_len);
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1561
1562 /* And check the encoding */
Linus Torvalds08a94a12012-06-28 18:24:14[diff] [blame]1563 if (encoding_is_utf8 && !verify_utf8(&buffer))
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1564 fprintf(stderr, commit_utf8_warn);
1565
Junio C Hamanoba3c69a2011-10-06 00:23:20[diff] [blame]1566 if (sign_commit && do_sign_commit(&buffer, sign_commit))
1567 return -1;
1568
Jeff King40d52ff2010-04-02 00:05:23[diff] [blame]1569 result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
1570 strbuf_release(&buffer);
1571 return result;
1572}
Junio C Hamanoae8e4c92011-11-07 21:26:22[diff] [blame]1573
1574struct commit *get_merge_parent(const char *name)
1575{
1576 struct object *obj;
1577 struct commit *commit;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]1578 struct object_id oid;
1579 if (get_sha1(name, oid.hash))
Junio C Hamanoae8e4c92011-11-07 21:26:22[diff] [blame]1580 return NULL;
brian m. carlson7683e2e2015-03-13 23:39:34[diff] [blame]1581 obj = parse_object(oid.hash);
Junio C Hamanoae8e4c92011-11-07 21:26:22[diff] [blame]1582 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1583 if (commit && !commit->util) {
1584 struct merge_remote_desc *desc;
1585 desc = xmalloc(sizeof(*desc));
1586 desc->obj = obj;
1587 desc->name = strdup(name);
1588 commit->util = desc;
1589 }
1590 return commit;
1591}
René Scharfe89b5f1d2012-04-25 20:35:27[diff] [blame]1592
1593/*
1594 * Append a commit to the end of the commit_list.
1595 *
1596 * next starts by pointing to the variable that holds the head of an
1597 * empty commit_list, and is updated to point to the "next" field of
1598 * the last item on the list as new commits are appended.
1599 *
1600 * Usage example:
1601 *
1602 * struct commit_list *list;
1603 * struct commit_list **next = &list;
1604 *
1605 * next = commit_list_append(c1, next);
1606 * next = commit_list_append(c2, next);
1607 * assert(commit_list_count(list) == 2);
1608 * return list;
1609 */
1610struct commit_list **commit_list_append(struct commit *commit,
1611 struct commit_list **next)
1612{
1613 struct commit_list *new = xmalloc(sizeof(struct commit_list));
1614 new->item = commit;
1615 *next = new;
1616 new->next = NULL;
1617 return &new->next;
1618}
Nguyễn Thái Ngọc Duyefc7df42012-10-26 15:53:51[diff] [blame]1619
1620void print_commit_list(struct commit_list *list,
1621 const char *format_cur,
1622 const char *format_last)
1623{
1624 for ( ; list; list = list->next) {
1625 const char *format = list->next ? format_cur : format_last;
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]1626 printf(format, oid_to_hex(&list->item->object.oid));
Nguyễn Thái Ngọc Duyefc7df42012-10-26 15:53:51[diff] [blame]1627 }
1628}
Jeff Kingfe6eb7f2014-08-27 07:56:01[diff] [blame]1629
1630const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1631{
1632 int key_len = strlen(key);
1633 const char *line = msg;
1634
1635 while (line) {
1636 const char *eol = strchrnul(line, '\n');
1637
1638 if (line == eol)
1639 return NULL;
1640
1641 if (eol - line > key_len &&
1642 !strncmp(line, key, key_len) &&
1643 line[key_len] == ' ') {
1644 *out_len = eol - line - key_len - 1;
1645 return line + key_len + 1;
1646 }
1647 line = *eol ? eol + 1 : NULL;
1648 }
1649 return NULL;
1650}
Junio C Hamano0ed8a4e2014-12-22 20:26:23[diff] [blame]1651
Christian Couder8c384582014-11-09 09:23:41[diff] [blame]1652/*
1653 * Inspect sb and determine the true "end" of the log message, in
1654 * order to find where to put a new Signed-off-by: line. Ignored are
1655 * trailing comment lines and blank lines, and also the traditional
1656 * "Conflicts:" block that is not commented out, so that we can use
1657 * "git commit -s --amend" on an existing commit that forgot to remove
1658 * it.
1659 *
1660 * Returns the number of bytes from the tail to ignore, to be fed as
1661 * the second parameter to append_signoff().
1662 */
1663int ignore_non_trailer(struct strbuf *sb)
1664{
1665 int boc = 0;
1666 int bol = 0;
1667 int in_old_conflicts_block = 0;
1668
1669 while (bol < sb->len) {
1670 char *next_line;
1671
1672 if (!(next_line = memchr(sb->buf + bol, '\n', sb->len - bol)))
1673 next_line = sb->buf + sb->len;
1674 else
1675 next_line++;
1676
1677 if (sb->buf[bol] == comment_line_char || sb->buf[bol] == '\n') {
1678 /* is this the first of the run of comments? */
1679 if (!boc)
1680 boc = bol;
1681 /* otherwise, it is just continuing */
1682 } else if (starts_with(sb->buf + bol, "Conflicts:\n")) {
1683 in_old_conflicts_block = 1;
1684 if (!boc)
1685 boc = bol;
1686 } else if (in_old_conflicts_block && sb->buf[bol] == '\t') {
1687 ; /* a pathname in the conflicts block */
1688 } else if (boc) {
1689 /* the previous was not trailing comment */
1690 boc = 0;
1691 in_old_conflicts_block = 0;
1692 }
1693 bol = next_line - sb->buf;
1694 }
1695 return boc ? sb->len - boc : 0;
1696}