rev-list.c 8.8 KB
Newer Older
1 2
#include "cache.h"
#include "commit.h"
3 4
#include "tree.h"
#include "blob.h"
5
#include "epoch.h"
6

7 8
#define SEEN		(1u << 0)
#define INTERESTING	(1u << 1)
9
#define COUNTED		(1u << 2)
10
#define SHOWN		(LAST_EPOCH_FLAG << 2)
11

12 13 14 15 16
static const char rev_list_usage[] =
	"usage: git-rev-list [OPTION] commit-id <commit-id>\n"
		      "  --max-count=nr\n"
		      "  --max-age=epoch\n"
		      "  --min-age=epoch\n"
17
		      "  --header\n"
18 19
		      "  --pretty\n"
		      "  --merge-order [ --show-breaks ]";
20

21
static int bisect_list = 0;
22
static int tag_objects = 0;
23 24
static int tree_objects = 0;
static int blob_objects = 0;
25 26 27 28 29 30 31
static int verbose_header = 0;
static int show_parents = 0;
static int hdr_termination = 0;
static const char *prefix = "";
static unsigned long max_age = -1;
static unsigned long min_age = -1;
static int max_count = -1;
32
static enum cmit_fmt commit_format = CMIT_FMT_RAW;
33 34
static int merge_order = 0;
static int show_breaks = 0;
35
static int stop_traversal = 0;
36 37 38

static void show_commit(struct commit *commit)
{
39
	commit->object.flags |= SHOWN;
40 41 42 43 44 45 46 47
	if (show_breaks) {
		prefix = "| ";
		if (commit->object.flags & DISCONTINUITY) {
			prefix = "^ ";     
		} else if (commit->object.flags & BOUNDARY) {
			prefix = "= ";
		} 
        }        		
48 49 50 51 52 53 54 55 56 57
	printf("%s%s", prefix, sha1_to_hex(commit->object.sha1));
	if (show_parents) {
		struct commit_list *parents = commit->parents;
		while (parents) {
			printf(" %s", sha1_to_hex(parents->item->object.sha1));
			parents = parents->next;
		}
	}
	putchar('\n');
	if (verbose_header) {
58 59 60
		static char pretty_header[16384];
		pretty_print_commit(commit_format, commit->buffer, ~0, pretty_header, sizeof(pretty_header));
		printf("%s%c", pretty_header, hdr_termination);
61 62 63 64 65
	}	
}

static int filter_commit(struct commit * commit)
{
66 67
	if (merge_order && stop_traversal && commit->object.flags & BOUNDARY)
		return STOP;
68
	if (commit->object.flags & (UNINTERESTING|SHOWN))
69 70 71
		return CONTINUE;
	if (min_age != -1 && (commit->date > min_age))
		return CONTINUE;
72 73 74 75 76 77 78 79
	if (max_age != -1 && (commit->date < max_age)) {
		if (!merge_order)
			return STOP;
		else {
			stop_traversal = 1;
			return CONTINUE;
		}
	}
80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
	if (max_count != -1 && !max_count--)
		return STOP;
	return DO;
}

static int process_commit(struct commit * commit)
{
	int action=filter_commit(commit);

	if (action == STOP) {
		return STOP;
	}

	if (action == CONTINUE) {
		return CONTINUE;
95
	}
96 97 98 99

	show_commit(commit);

	return CONTINUE;
100 101
}

102
static struct object_list **add_object(struct object *obj, struct object_list **p, const char *name)
103 104 105 106
{
	struct object_list *entry = xmalloc(sizeof(*entry));
	entry->item = obj;
	entry->next = NULL;
107
	entry->name = name;
108 109 110 111
	*p = entry;
	return &entry->next;
}

112
static struct object_list **process_blob(struct blob *blob, struct object_list **p, const char *name)
113 114 115 116 117 118 119 120
{
	struct object *obj = &blob->object;

	if (!blob_objects)
		return p;
	if (obj->flags & (UNINTERESTING | SEEN))
		return p;
	obj->flags |= SEEN;
121
	return add_object(obj, p, name);
122 123
}

124
static struct object_list **process_tree(struct tree *tree, struct object_list **p, const char *name)
125 126 127 128 129 130 131 132 133 134 135
{
	struct object *obj = &tree->object;
	struct tree_entry_list *entry;

	if (!tree_objects)
		return p;
	if (obj->flags & (UNINTERESTING | SEEN))
		return p;
	if (parse_tree(tree) < 0)
		die("bad tree object %s", sha1_to_hex(obj->sha1));
	obj->flags |= SEEN;
136
	p = add_object(obj, p, name);
137 138
	for (entry = tree->entries ; entry ; entry = entry->next) {
		if (entry->directory)
139
			p = process_tree(entry->item.tree, p, entry->name);
140
		else
141
			p = process_blob(entry->item.blob, p, entry->name);
142 143 144 145
	}
	return p;
}

146 147
static void show_commit_list(struct commit_list *list)
{
148
	struct object_list *objects = NULL, **p = &objects;
149 150 151
	while (list) {
		struct commit *commit = pop_most_recent_commit(&list, SEEN);

152
		p = process_tree(commit->tree, p, "");
153
		if (process_commit(commit) == STOP)
154 155
			break;
	}
156
	while (objects) {
157
		printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name);
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
		objects = objects->next;
	}
}

static void mark_blob_uninteresting(struct blob *blob)
{
	if (!blob_objects)
		return;
	if (blob->object.flags & UNINTERESTING)
		return;
	blob->object.flags |= UNINTERESTING;
}

static void mark_tree_uninteresting(struct tree *tree)
{
	struct object *obj = &tree->object;
	struct tree_entry_list *entry;

	if (!tree_objects)
		return;
	if (obj->flags & UNINTERESTING)
		return;
	obj->flags |= UNINTERESTING;
	if (parse_tree(tree) < 0)
		die("bad tree %s", sha1_to_hex(obj->sha1));
	entry = tree->entries;
	while (entry) {
		if (entry->directory)
			mark_tree_uninteresting(entry->item.tree);
		else
			mark_blob_uninteresting(entry->item.blob);
		entry = entry->next;
	}
191 192
}

193 194 195 196
static void mark_parents_uninteresting(struct commit *commit)
{
	struct commit_list *parents = commit->parents;

197 198
	if (tree_objects)
		mark_tree_uninteresting(commit->tree);
199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217
	while (parents) {
		struct commit *commit = parents->item;
		commit->object.flags |= UNINTERESTING;
		parents = parents->next;
	}
}

static int everybody_uninteresting(struct commit_list *list)
{
	while (list) {
		struct commit *commit = list->item;
		list = list->next;
		if (commit->object.flags & UNINTERESTING)
			continue;
		return 0;
	}
	return 1;
}

218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249
/*
 * This is a truly stupid algorithm, but it's only
 * used for bisection, and we just don't care enough.
 *
 * We care just barely enough to avoid recursing for
 * non-merge entries.
 */
static int count_distance(struct commit_list *entry)
{
	int nr = 0;

	while (entry) {
		struct commit *commit = entry->item;
		struct commit_list *p;

		if (commit->object.flags & (UNINTERESTING | COUNTED))
			break;
		nr++;
		commit->object.flags |= COUNTED;
		p = commit->parents;
		entry = p;
		if (p) {
			p = p->next;
			while (p) {
				nr += count_distance(p);
				p = p->next;
			}
		}
	}
	return nr;
}

250
static void clear_distance(struct commit_list *list)
251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289
{
	while (list) {
		struct commit *commit = list->item;
		commit->object.flags &= ~COUNTED;
		list = list->next;
	}
}

static struct commit_list *find_bisection(struct commit_list *list)
{
	int nr, closest;
	struct commit_list *p, *best;

	nr = 0;
	p = list;
	while (p) {
		nr++;
		p = p->next;
	}
	closest = 0;
	best = list;

	p = list;
	while (p) {
		int distance = count_distance(p);
		clear_distance(list);
		if (nr - distance < distance)
			distance = nr - distance;
		if (distance > closest) {
			best = p;
			closest = distance;
		}
		p = p->next;
	}
	if (best)
		best->next = NULL;
	return best;
}

290
struct commit_list *limit_list(struct commit_list *list)
291 292 293 294 295 296 297
{
	struct commit_list *newlist = NULL;
	struct commit_list **p = &newlist;
	do {
		struct commit *commit = pop_most_recent_commit(&list, SEEN);
		struct object *obj = &commit->object;

298
		if (obj->flags & UNINTERESTING) {
299 300 301 302 303 304 305
			mark_parents_uninteresting(commit);
			if (everybody_uninteresting(list))
				break;
			continue;
		}
		p = &commit_list_insert(commit, p)->next;
	} while (list);
306 307
	if (bisect_list)
		newlist = find_bisection(newlist);
308 309 310
	return newlist;
}

311 312 313 314 315 316 317 318 319 320 321 322 323 324
static struct commit *get_commit_reference(const char *name, unsigned int flags)
{
	unsigned char sha1[20];
	struct commit *commit;

	if (get_sha1(name, sha1))
		usage(rev_list_usage);
	commit = lookup_commit_reference(sha1);
	if (!commit || parse_commit(commit) < 0)
		die("bad commit object %s", name);
	commit->object.flags |= flags;
	return commit;
}

325 326 327
int main(int argc, char **argv)
{
	struct commit_list *list = NULL;
328
	int i, limited = 0;
329

330
	for (i = 1 ; i < argc; i++) {
331
		int flags;
332
		char *arg = argv[i];
333
		struct commit *commit;
334 335 336

		if (!strncmp(arg, "--max-count=", 12)) {
			max_count = atoi(arg + 12);
337 338 339
			continue;
		}
		if (!strncmp(arg, "--max-age=", 10)) {
340
			max_age = atoi(arg + 10);
341 342 343
			continue;
		}
		if (!strncmp(arg, "--min-age=", 10)) {
344
			min_age = atoi(arg + 10);
345
			continue;
346
		}
347 348 349 350
		if (!strcmp(arg, "--header")) {
			verbose_header = 1;
			continue;
		}
351 352
		if (!strncmp(arg, "--pretty", 8)) {
			commit_format = get_commit_format(arg+8);
353 354 355 356 357
			verbose_header = 1;
			hdr_termination = '\n';
			prefix = "commit ";
			continue;
		}
358 359 360 361
		if (!strcmp(arg, "--parents")) {
			show_parents = 1;
			continue;
		}
362 363 364 365
		if (!strcmp(arg, "--bisect")) {
			bisect_list = 1;
			continue;
		}
366
		if (!strcmp(arg, "--objects")) {
367
			tag_objects = 1;
368 369 370 371
			tree_objects = 1;
			blob_objects = 1;
			continue;
		}
372 373 374 375 376 377 378 379
		if (!strncmp(arg, "--merge-order", 13)) {
		        merge_order = 1;
			continue;
		}
		if (!strncmp(arg, "--show-breaks", 13)) {
			show_breaks = 1;
			continue;
		}
380

381 382 383 384 385 386
		flags = 0;
		if (*arg == '^') {
			flags = UNINTERESTING;
			arg++;
			limited = 1;
		}
387
		if (show_breaks && !merge_order)
388
			usage(rev_list_usage);
389 390 391
		commit = get_commit_reference(arg, flags);
		if (!commit)
			continue;
392
		commit_list_insert(commit, &list);
393 394
	}

395
	if (!list)
396
		usage(rev_list_usage);
397

398
	if (!merge_order) {		
399
	        if (limited)
400 401 402 403 404 405 406
			list = limit_list(list);
		show_commit_list(list);
	} else {
		if (sort_list_in_merge_order(list, &process_commit)) {
			  die("merge order sort failed\n");
		}
	}
407

408 409
	return 0;
}