rev-list.c 6.3 KB
Newer Older
1 2
#include "cache.h"
#include "commit.h"
3
#include "epoch.h"
4

5 6
#define SEEN		(1u << 0)
#define INTERESTING	(1u << 1)
7
#define COUNTED		(1u << 2)
8

9 10 11 12 13
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"
14
		      "  --header\n"
15 16
		      "  --pretty\n"
		      "  --merge-order [ --show-breaks ]";
17

18
static int bisect_list = 0;
19 20 21 22 23 24 25
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;
26
static enum cmit_fmt commit_format = CMIT_FMT_RAW;
27 28
static int merge_order = 0;
static int show_breaks = 0;
29 30 31

static void show_commit(struct commit *commit)
{
32 33 34 35 36 37 38 39
	if (show_breaks) {
		prefix = "| ";
		if (commit->object.flags & DISCONTINUITY) {
			prefix = "^ ";     
		} else if (commit->object.flags & BOUNDARY) {
			prefix = "= ";
		} 
        }        		
40 41 42 43 44 45 46 47 48 49
	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) {
50 51 52
		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);
53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
	}	
}

static int filter_commit(struct commit * commit)
{
	if (commit->object.flags & UNINTERESTING)
		return CONTINUE;
	if (min_age != -1 && (commit->date > min_age))
		return CONTINUE;
	if (max_age != -1 && (commit->date < max_age))
		return STOP;
	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;
80
	}
81 82 83 84

	show_commit(commit);

	return CONTINUE;
85 86 87 88 89 90 91
}

static void show_commit_list(struct commit_list *list)
{
	while (list) {
		struct commit *commit = pop_most_recent_commit(&list, SEEN);

92
		if (process_commit(commit) == STOP)
93 94 95 96
			break;
	}
}

97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119
static void mark_parents_uninteresting(struct commit *commit)
{
	struct commit_list *parents = commit->parents;

	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;
}

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

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

192
struct commit_list *limit_list(struct commit_list *list)
193 194 195 196 197 198 199
{
	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;

200
		if (obj->flags & UNINTERESTING) {
201 202 203 204 205 206 207
			mark_parents_uninteresting(commit);
			if (everybody_uninteresting(list))
				break;
			continue;
		}
		p = &commit_list_insert(commit, p)->next;
	} while (list);
208 209
	if (bisect_list)
		newlist = find_bisection(newlist);
210 211 212
	return newlist;
}

213 214 215 216 217 218 219 220 221 222 223 224 225 226
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);	
}			


227 228 229
int main(int argc, char **argv)
{
	struct commit_list *list = NULL;
230
	int i, limited = 0;
231

232
	for (i = 1 ; i < argc; i++) {
233
		int flags;
234
		char *arg = argv[i];
235 236
		unsigned char sha1[20];
		struct commit *commit;
237 238 239

		if (!strncmp(arg, "--max-count=", 12)) {
			max_count = atoi(arg + 12);
240 241 242
			continue;
		}
		if (!strncmp(arg, "--max-age=", 10)) {
243
			max_age = atoi(arg + 10);
244 245 246
			continue;
		}
		if (!strncmp(arg, "--min-age=", 10)) {
247
			min_age = atoi(arg + 10);
248
			continue;
249
		}
250 251 252 253
		if (!strcmp(arg, "--header")) {
			verbose_header = 1;
			continue;
		}
254 255
		if (!strncmp(arg, "--pretty", 8)) {
			commit_format = get_commit_format(arg+8);
256 257 258 259 260
			verbose_header = 1;
			hdr_termination = '\n';
			prefix = "commit ";
			continue;
		}
261 262 263 264
		if (!strcmp(arg, "--parents")) {
			show_parents = 1;
			continue;
		}
265 266 267 268
		if (!strcmp(arg, "--bisect")) {
			bisect_list = 1;
			continue;
		}
269 270 271 272 273 274 275 276
		if (!strncmp(arg, "--merge-order", 13)) {
		        merge_order = 1;
			continue;
		}
		if (!strncmp(arg, "--show-breaks", 13)) {
			show_breaks = 1;
			continue;
		}
277

278 279 280 281 282 283
		flags = 0;
		if (*arg == '^') {
			flags = UNINTERESTING;
			arg++;
			limited = 1;
		}
284
		if (get_sha1(arg, sha1) || (show_breaks && !merge_order))
285
			usage(rev_list_usage);
286 287 288 289 290
		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);
291 292
	}

293
	if (!list)
294
		usage(rev_list_usage);
295

296
	if (!merge_order) {		
297
	        if (limited)
298 299 300 301 302 303 304
			list = limit_list(list);
		show_commit_list(list);
	} else {
		if (sort_list_in_merge_order(list, &process_commit)) {
			  die("merge order sort failed\n");
		}
	}
305

306 307
	return 0;
}