commit.c 11.5 KB
Newer Older
1
/*
Edward Thomson committed
2
 * Copyright (C) the libgit2 contributors. All rights reserved.
3
 *
Vicent Marti committed
4 5
 * This file is part of libgit2, distributed under the GNU GPL v2 with
 * a Linking Exception. For full terms see the included COPYING file.
6 7
 */

8 9 10
#include "git2/common.h"
#include "git2/object.h"
#include "git2/repository.h"
11
#include "git2/signature.h"
12
#include "git2/sys/commit.h"
13

14
#include "common.h"
Vicent Marti committed
15
#include "odb.h"
16
#include "commit.h"
17
#include "signature.h"
18
#include "message.h"
19

20
void git_commit__free(void *_commit)
21
{
22 23
	git_commit *commit = _commit;

24
	git_array_clear(commit->parent_ids);
25

26 27
	git_signature_free(commit->author);
	git_signature_free(commit->committer);
28

29
	git__free(commit->raw_header);
30
	git__free(commit->raw_message);
31
	git__free(commit->message_encoding);
32
	git__free(commit->summary);
33

34
	git__free(commit);
35 36
}

37 38
int git_commit_create_from_callback(
	git_oid *id,
39 40 41 42 43 44 45
	git_repository *repo,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_oid *tree,
46 47
	git_commit_parent_callback parent_cb,
	void *parent_payload)
Vicent Marti committed
48
{
49
	git_buf commit = GIT_BUF_INIT;
50
	size_t i = 0;
51
	git_odb *odb;
52
	const git_oid *parent;
Vicent Marti committed
53

54
	assert(id && repo && tree && parent_cb);
55

56
	git_oid__writebuf(&commit, "tree ", tree);
57

58 59
	while ((parent = parent_cb(i++, parent_payload)) != NULL)
		git_oid__writebuf(&commit, "parent ", parent);
60

61 62
	git_signature__writebuf(&commit, "author ", author);
	git_signature__writebuf(&commit, "committer ", committer);
63

64 65 66
	if (message_encoding != NULL)
		git_buf_printf(&commit, "encoding %s\n", message_encoding);

67
	git_buf_putc(&commit, '\n');
68

69
	if (git_buf_puts(&commit, message) < 0)
70 71
		goto on_error;

72 73
	if (git_repository_odb__weakptr(&odb, repo) < 0)
		goto on_error;
74

75
	if (git_odb_write(id, odb, commit.ptr, commit.size, GIT_OBJ_COMMIT) < 0)
76
		goto on_error;
Vicent Marti committed
77

78
	git_buf_free(&commit);
79

80 81 82 83 84 85
	if (update_ref != NULL) {
		int error;
		git_commit *c;
		const char *shortmsg;
		git_buf reflog_msg = GIT_BUF_INIT;

86
		if (git_commit_lookup(&c, repo, id) < 0)
87 88 89 90 91 92 93 94
			goto on_error;

		shortmsg = git_commit_summary(c);
		git_buf_printf(&reflog_msg, "commit%s: %s",
				git_commit_parentcount(c) == 0 ? " (initial)" : "",
				shortmsg);
		git_commit_free(c);

95
		error = git_reference__update_terminal(repo, update_ref, id,
96 97 98 99 100
				committer, git_buf_cstr(&reflog_msg));

		git_buf_free(&reflog_msg);
		return error;
	}
Vicent Marti committed
101

102
	return 0;
103

104
on_error:
105
	git_buf_free(&commit);
106
	giterr_set(GITERR_OBJECT, "Failed to create commit.");
107
	return -1;
108 109
}

110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202
typedef struct {
	size_t total;
	va_list args;
} commit_parent_varargs;

static const git_oid *commit_parent_from_varargs(size_t curr, void *payload)
{
	commit_parent_varargs *data = payload;
	const git_commit *commit;
	if (curr >= data->total)
		return NULL;
	commit = va_arg(data->args, const git_commit *);
	return commit ? git_commit_id(commit) : NULL;
}

int git_commit_create_v(
	git_oid *id,
	git_repository *repo,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_tree *tree,
	size_t parent_count,
	...)
{
	int error = 0;
	commit_parent_varargs data;

	assert(tree && git_tree_owner(tree) == repo);

	data.total = parent_count;
	va_start(data.args, parent_count);

	error = git_commit_create_from_callback(
		id, repo, update_ref, author, committer,
		message_encoding, message, git_tree_id(tree),
		commit_parent_from_varargs, &data);

	va_end(data.args);
	return error;
}

typedef struct {
	size_t total;
	const git_oid **parents;
} commit_parent_oids;

static const git_oid *commit_parent_from_ids(size_t curr, void *payload)
{
	commit_parent_oids *data = payload;
	return (curr < data->total) ? data->parents[curr] : NULL;
}

int git_commit_create_from_ids(
	git_oid *id,
	git_repository *repo,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_oid *tree,
	size_t parent_count,
	const git_oid *parents[])
{
	commit_parent_oids data = { parent_count, parents };

	return git_commit_create_from_callback(
		id, repo, update_ref, author, committer,
		message_encoding, message, tree,
		commit_parent_from_ids, &data);
}

typedef struct {
	size_t total;
	const git_commit **parents;
	git_repository *repo;
} commit_parent_data;

static const git_oid *commit_parent_from_array(size_t curr, void *payload)
{
	commit_parent_data *data = payload;
	const git_commit *commit;
	if (curr >= data->total)
		return NULL;
	commit = data->parents[curr];
	if (git_commit_owner(commit) != data->repo)
		return NULL;
	return git_commit_id(commit);
}

203
int git_commit_create(
204
	git_oid *id,
205 206 207 208 209 210 211
	git_repository *repo,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_tree *tree,
212
	size_t parent_count,
213
	const git_commit *parents[])
214
{
215
	commit_parent_data data = { parent_count, parents, repo };
216

217
	assert(tree && git_tree_owner(tree) == repo);
218

219 220 221 222 223
	return git_commit_create_from_callback(
		id, repo, update_ref, author, committer,
		message_encoding, message, git_tree_id(tree),
		commit_parent_from_array, &data);
}
224

225 226 227 228 229 230 231
static const git_oid *commit_parent_for_amend(size_t curr, void *payload)
{
	const git_commit *commit_to_amend = payload;
	if (curr >= git_array_size(commit_to_amend->parent_ids))
		return NULL;
	return git_array_get(commit_to_amend->parent_ids, curr);
}
232

233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267
int git_commit_amend(
	git_oid *id,
	const git_commit *commit_to_amend,
	const char *update_ref,
	const git_signature *author,
	const git_signature *committer,
	const char *message_encoding,
	const char *message,
	const git_tree *tree)
{
	git_repository *repo;
	git_oid tree_id;

	assert(id && commit_to_amend);

	repo = git_commit_owner(commit_to_amend);

	if (!author)
		author = git_commit_author(commit_to_amend);
	if (!committer)
		committer = git_commit_committer(commit_to_amend);
	if (!message_encoding)
		message_encoding = git_commit_message_encoding(commit_to_amend);
	if (!message)
		message = git_commit_message(commit_to_amend);

	if (!tree) {
		git_tree *old_tree;
		GITERR_CHECK_ERROR( git_commit_tree(&old_tree, commit_to_amend) );
		git_oid_cpy(&tree_id, git_tree_id(old_tree));
		git_tree_free(old_tree);
	} else {
		assert(git_tree_owner(tree) == repo);
		git_oid_cpy(&tree_id, git_tree_id(tree));
	}
268

269 270 271
	return git_commit_create_from_callback(
		id, repo, update_ref, author, committer, message_encoding, message,
		&tree_id, commit_parent_for_amend, (void *)commit_to_amend);
272 273
}

274
int git_commit__parse(void *_commit, git_odb_object *odb_obj)
275
{
276
	git_commit *commit = _commit;
277 278
	const char *buffer_start = git_odb_object_data(odb_obj), *buffer;
	const char *buffer_end = buffer_start + git_odb_object_size(odb_obj);
Vicent Marti committed
279
	git_oid parent_id;
Russell Belfer committed
280
	size_t header_len;
281

282
	buffer = buffer_start;
283

284 285
	/* Allocate for one, which will allow not to realloc 90% of the time  */
	git_array_init_to_size(commit->parent_ids, 1);
286
	GITERR_CHECK_ARRAY(commit->parent_ids);
287

288
	/* The tree is always the first field */
Vicent Marti committed
289
	if (git_oid__parse(&commit->tree_id, &buffer, buffer_end, "tree ") < 0)
290
		goto bad_buffer;
291

292 293 294
	/*
	 * TODO: commit grafts!
	 */
295

Vicent Marti committed
296
	while (git_oid__parse(&parent_id, &buffer, buffer_end, "parent ") == 0) {
297
		git_oid *new_id = git_array_alloc(commit->parent_ids);
Vicent Marti committed
298
		GITERR_CHECK_ALLOC(new_id);
299

Vicent Marti committed
300
		git_oid_cpy(new_id, &parent_id);
301
	}
302

303
	commit->author = git__malloc(sizeof(git_signature));
304 305 306 307
	GITERR_CHECK_ALLOC(commit->author);

	if (git_signature__parse(commit->author, &buffer, buffer_end, "author ", '\n') < 0)
		return -1;
308

309
	/* Always parse the committer; we need the commit time */
310
	commit->committer = git__malloc(sizeof(git_signature));
311 312 313 314
	GITERR_CHECK_ALLOC(commit->committer);

	if (git_signature__parse(commit->committer, &buffer, buffer_end, "committer ", '\n') < 0)
		return -1;
315

316 317
	/* Parse add'l header entries */
	while (buffer < buffer_end) {
318
		const char *eoln = buffer;
319 320 321
		if (buffer[-1] == '\n' && buffer[0] == '\n')
			break;

322 323
		while (eoln < buffer_end && *eoln != '\n')
			++eoln;
324

325 326
		if (git__prefixcmp(buffer, "encoding ") == 0) {
			buffer += strlen("encoding ");
327

328 329 330
			commit->message_encoding = git__strndup(buffer, eoln - buffer);
			GITERR_CHECK_ALLOC(commit->message_encoding);
		}
331

332 333
		if (eoln < buffer_end && *eoln == '\n')
			++eoln;
334
		buffer = eoln;
335
	}
336

337 338 339
	header_len = buffer - buffer_start;
	commit->raw_header = git__strndup(buffer_start, header_len);
	GITERR_CHECK_ALLOC(commit->raw_header);
340

341 342
	/* point "buffer" to data after header, +1 for the final LF */
	buffer = buffer_start + header_len + 1;
343

344
	/* extract commit message */
345
	if (buffer <= buffer_end) {
346 347
		commit->raw_message = git__strndup(buffer, buffer_end - buffer);
		GITERR_CHECK_ALLOC(commit->raw_message);
348
	}
349

350 351 352 353 354
	return 0;

bad_buffer:
	giterr_set(GITERR_OBJECT, "Failed to parse bad commit object");
	return -1;
355
}
356

357
#define GIT_COMMIT_GETTER(_rvalue, _name, _return) \
Vicent Marti committed
358
	_rvalue git_commit_##_name(const git_commit *commit) \
359
	{\
360
		assert(commit); \
361
		return _return; \
362 363
	}

364 365
GIT_COMMIT_GETTER(const git_signature *, author, commit->author)
GIT_COMMIT_GETTER(const git_signature *, committer, commit->committer)
366
GIT_COMMIT_GETTER(const char *, message_raw, commit->raw_message)
367
GIT_COMMIT_GETTER(const char *, message_encoding, commit->message_encoding)
368
GIT_COMMIT_GETTER(const char *, raw_header, commit->raw_header)
369
GIT_COMMIT_GETTER(git_time_t, time, commit->committer->when.time)
370
GIT_COMMIT_GETTER(int, time_offset, commit->committer->when.offset)
371
GIT_COMMIT_GETTER(unsigned int, parentcount, (unsigned int)git_array_size(commit->parent_ids))
Vicent Marti committed
372
GIT_COMMIT_GETTER(const git_oid *, tree_id, &commit->tree_id);
373

374 375
const char *git_commit_message(const git_commit *commit)
{
376
	const char *message;
377 378 379

	assert(commit);

380 381
	message = commit->raw_message;

382 383 384 385 386 387 388
	/* trim leading newlines from raw message */
	while (*message && *message == '\n')
		++message;

	return message;
}

389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410
const char *git_commit_summary(git_commit *commit)
{
	git_buf summary = GIT_BUF_INIT;
	const char *msg, *space;

	assert(commit);

	if (!commit->summary) {
		for (msg = git_commit_message(commit), space = NULL; *msg; ++msg) {
			if (msg[0] == '\n' && (!msg[1] || msg[1] == '\n'))
				break;
			else if (msg[0] == '\n')
				git_buf_putc(&summary, ' ');
			else if (git__isspace(msg[0]))
				space = space ? space : msg;
			else if (space) {
				git_buf_put(&summary, space, (msg - space) + 1);
				space = NULL;
			} else
				git_buf_putc(&summary, *msg);
		}

411 412
		commit->summary = git_buf_detach(&summary);
		if (!commit->summary)
413
			commit->summary = git__strdup("");
414 415 416 417 418
	}

	return commit->summary;
}

Vicent Marti committed
419
int git_commit_tree(git_tree **tree_out, const git_commit *commit)
420 421
{
	assert(commit);
Vicent Marti committed
422
	return git_tree_lookup(tree_out, commit->object.repo, &commit->tree_id);
423
}
424

425 426
const git_oid *git_commit_parent_id(
	const git_commit *commit, unsigned int n)
427 428 429
{
	assert(commit);

430
	return git_array_get(commit->parent_ids, n);
431 432
}

433 434
int git_commit_parent(
	git_commit **parent, const git_commit *commit, unsigned int n)
435
{
Vicent Marti committed
436
	const git_oid *parent_id;
437 438
	assert(commit);

Vicent Marti committed
439 440
	parent_id = git_commit_parent_id(commit, n);
	if (parent_id == NULL) {
441 442 443
		giterr_set(GITERR_INVALID, "Parent %u does not exist", n);
		return GIT_ENOTFOUND;
	}
444

Vicent Marti committed
445
	return git_commit_lookup(parent, commit->object.repo, parent_id);
446
}
447 448 449 450 451 452

int git_commit_nth_gen_ancestor(
	git_commit **ancestor,
	const git_commit *commit,
	unsigned int n)
{
453
	git_commit *current, *parent = NULL;
454 455 456 457
	int error;

	assert(ancestor && commit);

458 459
	if (git_object_dup((git_object **) &current, (git_object *) commit) < 0)
		return -1;
460

461 462 463 464
	if (n == 0) {
		*ancestor = current;
		return 0;
	}
465 466

	while (n--) {
467
		error = git_commit_parent(&parent, current, 0);
468

469
		git_commit_free(current);
470 471 472 473 474 475 476 477 478 479

		if (error < 0)
			return error;

		current = parent;
	}

	*ancestor = parent;
	return 0;
}