rev-list.c 8.6 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 23
static int tree_objects = 0;
static int blob_objects = 0;
24 25 26 27 28 29 30
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;
31
static enum cmit_fmt commit_format = CMIT_FMT_RAW;
32 33
static int merge_order = 0;
static int show_breaks = 0;
34
static int stop_traversal = 0;
35 36 37

static void show_commit(struct commit *commit)
{
38
	commit->object.flags |= SHOWN;
39 40 41 42 43 44 45 46
	if (show_breaks) {
		prefix = "| ";
		if (commit->object.flags & DISCONTINUITY) {
			prefix = "^ ";     
		} else if (commit->object.flags & BOUNDARY) {
			prefix = "= ";
		} 
        }        		
47 48 49 50 51 52 53 54 55 56
	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) {
57 58 59
		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);
60 61 62 63 64
	}	
}

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

	show_commit(commit);

	return CONTINUE;
99 100
}

101 102 103 104 105 106 107 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
static struct object_list **add_object(struct object *obj, struct object_list **p)
{
	struct object_list *entry = xmalloc(sizeof(*entry));
	entry->item = obj;
	entry->next = NULL;
	*p = entry;
	return &entry->next;
}

static struct object_list **process_blob(struct blob *blob, struct object_list **p)
{
	struct object *obj = &blob->object;

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

static struct object_list **process_tree(struct tree *tree, struct object_list **p)
{
	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;
	p = add_object(obj, p);
	for (entry = tree->entries ; entry ; entry = entry->next) {
		if (entry->directory)
			p = process_tree(entry->item.tree, p);
		else
			p = process_blob(entry->item.blob, p);
	}
	return p;
}

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

150
		p = process_tree(commit->tree, p);
151
		if (process_commit(commit) == STOP)
152 153
			break;
	}
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
	while (objects) {
		puts(sha1_to_hex(objects->item->sha1));
		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;
	}
189 190
}

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

195 196
	if (tree_objects)
		mark_tree_uninteresting(commit->tree);
197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215
	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;
}

216 217 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
/*
 * 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;
}

248
static void clear_distance(struct commit_list *list)
249 250 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
{
	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;
}

288
struct commit_list *limit_list(struct commit_list *list)
289 290 291 292 293 294 295
{
	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;

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

309 310 311 312 313 314 315 316 317 318 319 320 321 322
static 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;
	usage(rev_list_usage);	
}			


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

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

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

379 380 381 382 383 384
		flags = 0;
		if (*arg == '^') {
			flags = UNINTERESTING;
			arg++;
			limited = 1;
		}
385
		if (get_sha1(arg, sha1) || (show_breaks && !merge_order))
386
			usage(rev_list_usage);
387 388 389 390 391
		commit = lookup_commit_reference(sha1);
		if (!commit || parse_commit(commit) < 0)
			die("bad commit object %s", arg);
		commit->object.flags |= flags;
		commit_list_insert(commit, &list);
392 393
	}

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

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

407 408
	return 0;
}