commit.c 14.7 KB
Newer Older
1
#include "cache.h"
2
#include "tag.h"
3 4
#include "commit.h"

5 6
int save_commit_buffer = 1;

7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
struct sort_node
{
	/*
         * the number of children of the associated commit
         * that also occur in the list being sorted.
         */
	unsigned int indegree;

	/*
         * reference to original list item that we will re-use
         * on output.
         */
	struct commit_list * list_item;

};

23 24
const char *commit_type = "commit";

25 26 27 28 29 30 31 32 33 34 35 36
enum cmit_fmt get_commit_format(const char *arg)
{
	if (!*arg)
		return CMIT_FMT_DEFAULT;
	if (!strcmp(arg, "=raw"))
		return CMIT_FMT_RAW;
	if (!strcmp(arg, "=medium"))
		return CMIT_FMT_MEDIUM;
	if (!strcmp(arg, "=short"))
		return CMIT_FMT_SHORT;
	if (!strcmp(arg, "=full"))
		return CMIT_FMT_FULL;
J
Junio C Hamano 已提交
37 38
	if (!strcmp(arg, "=fuller"))
		return CMIT_FMT_FULLER;
39 40
	if (!strcmp(arg, "=oneline"))
		return CMIT_FMT_ONELINE;
41 42 43
	die("invalid --pretty format");
}

J
Junio C Hamano 已提交
44 45 46
static struct commit *check_commit(struct object *obj,
				   const unsigned char *sha1,
				   int quiet)
47 48
{
	if (obj->type != commit_type) {
J
Junio C Hamano 已提交
49 50 51
		if (!quiet)
			error("Object %s is a %s, not a commit",
			      sha1_to_hex(sha1), obj->type);
52 53 54 55 56
		return NULL;
	}
	return (struct commit *) obj;
}

J
Junio C Hamano 已提交
57 58
struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
					      int quiet)
59
{
60
	struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
61 62 63

	if (!obj)
		return NULL;
J
Junio C Hamano 已提交
64 65 66 67 68 69
	return check_commit(obj, sha1, quiet);
}

struct commit *lookup_commit_reference(const unsigned char *sha1)
{
	return lookup_commit_reference_gently(sha1, 0);
70 71
}

72
struct commit *lookup_commit(const unsigned char *sha1)
73 74 75
{
	struct object *obj = lookup_object(sha1);
	if (!obj) {
76
		struct commit *ret = xmalloc(sizeof(struct commit));
77 78
		memset(ret, 0, sizeof(struct commit));
		created_object(sha1, &ret->object);
79
		ret->object.type = commit_type;
80 81
		return ret;
	}
N
Nicolas Pitre 已提交
82 83
	if (!obj->type)
		obj->type = commit_type;
J
Junio C Hamano 已提交
84
	return check_commit(obj, sha1, 0);
85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104
}

static unsigned long parse_commit_date(const char *buf)
{
	unsigned long date;

	if (memcmp(buf, "author", 6))
		return 0;
	while (*buf++ != '\n')
		/* nada */;
	if (memcmp(buf, "committer", 9))
		return 0;
	while (*buf++ != '>')
		/* nada */;
	date = strtoul(buf, NULL, 10);
	if (date == ULONG_MAX)
		date = 0;
	return date;
}

105 106 107
static struct commit_graft {
	unsigned char sha1[20];
	int nr_parent;
108
	unsigned char parent[0][20]; /* more */
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
} **commit_graft;
static int commit_graft_alloc, commit_graft_nr;

static int commit_graft_pos(const unsigned char *sha1)
{
	int lo, hi;
	lo = 0;
	hi = commit_graft_nr;
	while (lo < hi) {
		int mi = (lo + hi) / 2;
		struct commit_graft *graft = commit_graft[mi];
		int cmp = memcmp(sha1, graft->sha1, 20);
		if (!cmp)
			return mi;
		if (cmp < 0)
			hi = mi;
		else
			lo = mi + 1;
	}
	return -lo - 1;
}

static void prepare_commit_graft(void)
{
	char *graft_file = get_graft_file();
	FILE *fp = fopen(graft_file, "r");
	char buf[1024];
	if (!fp) {
		commit_graft = (struct commit_graft **) "hack";
		return;
	}
	while (fgets(buf, sizeof(buf), fp)) {
		/* The format is just "Commit Parent1 Parent2 ...\n" */
		int len = strlen(buf);
		int i;
		struct commit_graft *graft = NULL;

		if (buf[len-1] == '\n')
			buf[--len] = 0;
		if (buf[0] == '#')
			continue;
		if ((len + 1) % 41) {
		bad_graft_data:
			error("bad graft data: %s", buf);
			free(graft);
			continue;
		}
		i = (len + 1) / 41 - 1;
		graft = xmalloc(sizeof(*graft) + 20 * i);
		graft->nr_parent = i;
		if (get_sha1_hex(buf, graft->sha1))
			goto bad_graft_data;
		for (i = 40; i < len; i += 41) {
			if (buf[i] != ' ')
				goto bad_graft_data;
			if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
				goto bad_graft_data;
		}
		i = commit_graft_pos(graft->sha1);
		if (0 <= i) {
			error("duplicate graft data: %s", buf);
			free(graft);
			continue;
		}
		i = -i - 1;
		if (commit_graft_alloc <= ++commit_graft_nr) {
			commit_graft_alloc = alloc_nr(commit_graft_alloc);
			commit_graft = xrealloc(commit_graft,
						sizeof(*commit_graft) *
						commit_graft_alloc);
		}
		if (i < commit_graft_nr)
			memmove(commit_graft + i + 1,
				commit_graft + i,
				(commit_graft_nr - i - 1) *
				sizeof(*commit_graft));
		commit_graft[i] = graft;
	}
	fclose(fp);
}

static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
{
	int pos;
	if (!commit_graft)
		prepare_commit_graft();
	pos = commit_graft_pos(sha1);
	if (pos < 0)
		return NULL;
	return commit_graft[pos];
}

201
int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
202
{
203
	char *bufptr = buffer;
204
	unsigned char parent[20];
205
	struct commit_list **pptr;
206
	struct commit_graft *graft;
J
Junio C Hamano 已提交
207
	unsigned n_refs = 0;
208

209 210 211
	if (item->object.parsed)
		return 0;
	item->object.parsed = 1;
212 213 214 215
	if (memcmp(bufptr, "tree ", 5))
		return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
	if (get_sha1_hex(bufptr + 5, parent) < 0)
		return error("bad tree pointer in commit %s\n", sha1_to_hex(item->object.sha1));
216
	item->tree = lookup_tree(parent);
217
	if (item->tree)
J
Junio C Hamano 已提交
218
		n_refs++;
219
	bufptr += 46; /* "tree " + "hex sha1" + "\n" */
220
	pptr = &item->parents;
221 222

	graft = lookup_commit_graft(item->object.sha1);
223 224 225 226 227
	while (!memcmp(bufptr, "parent ", 7)) {
		struct commit *new_parent;

		if (get_sha1_hex(bufptr + 7, parent) || bufptr[47] != '\n')
			return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
228 229 230
		bufptr += 48;
		if (graft)
			continue;
231
		new_parent = lookup_commit(parent);
232
		if (new_parent) {
233
			pptr = &commit_list_insert(new_parent, pptr)->next;
J
Junio C Hamano 已提交
234
			n_refs++;
235
		}
236 237 238 239 240 241 242 243 244
	}
	if (graft) {
		int i;
		struct commit *new_parent;
		for (i = 0; i < graft->nr_parent; i++) {
			new_parent = lookup_commit(graft->parent[i]);
			if (!new_parent)
				continue;
			pptr = &commit_list_insert(new_parent, pptr)->next;
J
Junio C Hamano 已提交
245
			n_refs++;
246
		}
247 248
	}
	item->date = parse_commit_date(bufptr);
J
Junio C Hamano 已提交
249 250 251 252 253 254 255 256 257 258 259 260

	if (track_object_refs) {
		unsigned i = 0;
		struct commit_list *p;
		struct object_refs *refs = alloc_object_refs(n_refs);
		if (item->tree)
			refs->ref[i++] = &item->tree->object;
		for (p = item->parents; p; p = p->next)
			refs->ref[i++] = &p->item->object;
		set_object_refs(&item->object, refs);
	}

261 262 263
	return 0;
}

264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282
int parse_commit(struct commit *item)
{
	char type[20];
	void *buffer;
	unsigned long size;
	int ret;

	if (item->object.parsed)
		return 0;
	buffer = read_sha1_file(item->object.sha1, type, &size);
	if (!buffer)
		return error("Could not read %s",
			     sha1_to_hex(item->object.sha1));
	if (strcmp(type, commit_type)) {
		free(buffer);
		return error("Object %s not a commit",
			     sha1_to_hex(item->object.sha1));
	}
	ret = parse_commit_buffer(item, buffer, size);
283
	if (save_commit_buffer && !ret) {
284 285 286
		item->buffer = buffer;
		return 0;
	}
287 288 289 290
	free(buffer);
	return ret;
}

291
struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
292
{
293
	struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
294 295 296
	new_list->item = item;
	new_list->next = *list_p;
	*list_p = new_list;
297
	return new_list;
298 299
}

300 301 302 303 304 305 306 307
void free_commit_list(struct commit_list *list)
{
	while (list) {
		struct commit_list *temp = list;
		list = temp->next;
		free(temp);
	}
}
308

309
struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
310 311 312 313 314 315 316 317 318
{
	struct commit_list **pp = list;
	struct commit_list *p;
	while ((p = *pp) != NULL) {
		if (p->item->date < item->date) {
			break;
		}
		pp = &p->next;
	}
319
	return commit_list_insert(item, pp);
320 321 322 323 324 325 326
}

	
void sort_by_date(struct commit_list **list)
{
	struct commit_list *ret = NULL;
	while (*list) {
327
		insert_by_date((*list)->item, &ret);
328 329 330 331 332
		*list = (*list)->next;
	}
	*list = ret;
}

333 334
struct commit *pop_most_recent_commit(struct commit_list **list,
				      unsigned int mark)
335 336 337 338 339 340 341 342 343
{
	struct commit *ret = (*list)->item;
	struct commit_list *parents = ret->parents;
	struct commit_list *old = *list;

	*list = (*list)->next;
	free(old);

	while (parents) {
344
		struct commit *commit = parents->item;
345 346 347
		parse_commit(commit);
		if (!(commit->object.flags & mark)) {
			commit->object.flags |= mark;
348
			insert_by_date(commit, list);
349
		}
350 351 352 353
		parents = parents->next;
	}
	return ret;
}
354

355 356 357 358 359 360 361
void clear_commit_marks(struct commit *commit, unsigned int mark)
{
	struct commit_list *parents;

	parents = commit->parents;
	commit->object.flags &= ~mark;
	while (parents) {
362 363 364 365
		struct commit *parent = parents->item;
		if (parent && parent->object.parsed &&
		    (parent->object.flags & mark))
			clear_commit_marks(parent, mark);
366 367 368 369
		parents = parents->next;
	}
}

370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387
/*
 * Generic support for pretty-printing the header
 */
static int get_one_line(const char *msg, unsigned long len)
{
	int ret = 0;

	while (len--) {
		char c = *msg++;
		ret++;
		if (c == '\n')
			break;
		if (!c)
			return 0;
	}
	return ret;
}

388
static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
389 390
{
	char *date;
J
Junio C Hamano 已提交
391
	int namelen;
392
	unsigned long time;
393
	int tz, ret;
J
Junio C Hamano 已提交
394
	const char *filler = "    ";
395

396 397
	if (fmt == CMIT_FMT_ONELINE)
		return 0;
398 399 400 401 402 403 404
	date = strchr(line, '>');
	if (!date)
		return 0;
	namelen = ++date - line;
	time = strtoul(date, &date, 10);
	tz = strtol(date, NULL, 10);

J
Junio C Hamano 已提交
405 406 407 408 409
	ret = sprintf(buf, "%s: %.*s%.*s\n", what,
		      (fmt == CMIT_FMT_FULLER) ? 4 : 0,
		      filler, namelen, line);
	switch (fmt) {
	case CMIT_FMT_MEDIUM:
410
		ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz));
J
Junio C Hamano 已提交
411 412 413 414 415 416 417 418
		break;
	case CMIT_FMT_FULLER:
		ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
		break;
	default:
		/* notin' */
		break;
	}
419 420 421 422 423 424 425 426
	return ret;
}

static int is_empty_line(const char *line, int len)
{
	while (len && isspace(line[len-1]))
		len--;
	return !len;
427 428
}

429 430 431
static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int parents)
{
	int offset = 0;
432 433 434

	if (fmt == CMIT_FMT_ONELINE)
		return offset;
435 436 437 438 439 440 441 442 443 444 445 446 447 448 449
	switch (parents) {
	case 1:
		break;
	case 2:
		/* Go back to the previous line: 40 characters of previous parent, and one '\n' */
		offset = sprintf(buf, "Merge: %.40s\n", line-41);
		/* Fallthrough */
	default:
		/* Replace the previous '\n' with a space */
		buf[offset-1] = ' ';
		offset += sprintf(buf + offset, "%.40s\n", line+7);
	}
	return offset;
}

450
unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space)
451
{
452
	int hdr = 1, body = 0;
453
	unsigned long offset = 0;
454
	int parents = 0;
455
	int indent = (fmt == CMIT_FMT_ONELINE) ? 0 : 4;
456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476

	for (;;) {
		const char *line = msg;
		int linelen = get_one_line(msg, len);

		if (!linelen)
			break;

		/*
		 * We want some slop for indentation and a possible
		 * final "...". Thus the "+ 20".
		 */
		if (offset + linelen + 20 > space) {
			memcpy(buf + offset, "    ...\n", 8);
			offset += 8;
			break;
		}

		msg += linelen;
		len -= linelen;
		if (hdr) {
477 478
			if (linelen == 1) {
				hdr = 0;
479 480
				if (fmt != CMIT_FMT_ONELINE)
					buf[offset++] = '\n';
481 482 483 484 485 486 487
				continue;
			}
			if (fmt == CMIT_FMT_RAW) {
				memcpy(buf + offset, line, linelen);
				offset += linelen;
				continue;
			}
488 489 490 491 492
			if (!memcmp(line, "parent ", 7)) {
				if (linelen != 48)
					die("bad parent line in commit");
				offset += add_parent_info(fmt, buf + offset, line, ++parents);
			}
J
Junio C Hamano 已提交
493 494 495 496 497 498

			/*
			 * MEDIUM == DEFAULT shows only author with dates.
			 * FULL shows both authors but not dates.
			 * FULLER shows both authors and dates.
			 */
499
			if (!memcmp(line, "author ", 7))
J
Junio C Hamano 已提交
500 501 502 503 504 505 506 507
				offset += add_user_info("Author", fmt,
							buf + offset,
							line + 7);
			if (!memcmp(line, "committer ", 10) &&
			    (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
				offset += add_user_info("Commit", fmt,
							buf + offset,
							line + 10);
508 509
			continue;
		}
510 511 512 513 514 515 516 517 518

		if (is_empty_line(line, linelen)) {
			if (!body)
				continue;
			if (fmt == CMIT_FMT_SHORT)
				break;
		} else {
			body = 1;
		}
519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534

		memset(buf + offset, ' ', indent);
		memcpy(buf + offset + indent, line, linelen);
		offset += linelen + indent;
		if (fmt == CMIT_FMT_ONELINE)
			break;
	}
	if (fmt == CMIT_FMT_ONELINE) {
		/* We do not want the terminating newline */
		if (buf[offset - 1] == '\n')
			offset--;
	}
	else {
		/* Make sure there is an EOLN */
		if (buf[offset - 1] != '\n')
			buf[offset++] = '\n';
535 536 537 538
	}
	buf[offset] = '\0';
	return offset;
}
539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560

struct commit *pop_commit(struct commit_list **stack)
{
	struct commit_list *top = *stack;
	struct commit *item = top ? top->item : NULL;

	if (top) {
		*stack = top->next;
		free(top);
	}
	return item;
}

int count_parents(struct commit * commit)
{
        int count = 0;
        struct commit_list * parents = commit->parents;
        for (count=0;parents; parents=parents->next,count++)
          ;
        return count;
}

561 562 563 564 565 566
/*
 * Performs an in-place topological sort on the list supplied.
 */
void sort_in_topological_order(struct commit_list ** list)
{
	struct commit_list * next = *list;
567
	struct commit_list * work = NULL, **insert;
568 569 570 571 572 573 574 575 576 577
	struct commit_list ** pptr = list;
	struct sort_node * nodes;
	struct sort_node * next_nodes;
	int count = 0;

	/* determine the size of the list */
	while (next) {
		next = next->next;
		count++;
	}
578 579 580
	
	if (!count)
		return;
581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613
	/* allocate an array to help sort the list */
	nodes = xcalloc(count, sizeof(*nodes));
	/* link the list to the array */
	next_nodes = nodes;
	next=*list;
	while (next) {
		next_nodes->list_item = next;
		next->item->object.util = next_nodes;
		next_nodes++;
		next = next->next;
	}
	/* update the indegree */
	next=*list;
	while (next) {
		struct commit_list * parents = next->item->parents;
		while (parents) {
			struct commit * parent=parents->item;
			struct sort_node * pn = (struct sort_node *)parent->object.util;
			
			if (pn)
				pn->indegree++;
			parents=parents->next;
		}
		next=next->next;
	}
	/* 
         * find the tips
         *
         * tips are nodes not reachable from any other node in the list 
         * 
         * the tips serve as a starting set for the work queue.
         */
	next=*list;
614
	insert = &work;
615 616 617 618
	while (next) {
		struct sort_node * node = (struct sort_node *)next->item->object.util;

		if (node->indegree == 0) {
619
			insert = &commit_list_insert(next->item, insert)->next;
620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655
		}
		next=next->next;
	}
	/* process the list in topological order */
	while (work) {
		struct commit * work_item = pop_commit(&work);
		struct sort_node * work_node = (struct sort_node *)work_item->object.util;
		struct commit_list * parents = work_item->parents;

		while (parents) {
			struct commit * parent=parents->item;
			struct sort_node * pn = (struct sort_node *)parent->object.util;
			
			if (pn) {
				/* 
				 * parents are only enqueued for emission 
                                 * when all their children have been emitted thereby
                                 * guaranteeing topological order.
                                 */
				pn->indegree--;
				if (!pn->indegree) 
					commit_list_insert(parent, &work);
			}
			parents=parents->next;
		}
		/*
                 * work_item is a commit all of whose children
                 * have already been emitted. we can emit it now.
                 */
		*pptr = work_node->list_item;
		pptr = &(*pptr)->next;
		*pptr = NULL;
		work_item->object.util = NULL;
	}
	free(nodes);
}