apply: fix infinite loop with multiple patches with --index
[git/jrn.git] / rev-list.c
bloba8fe83c5d805ea8944a07be3832977487b41080d
1 #include "cache.h"
2 #include "refs.h"
3 #include "tag.h"
4 #include "commit.h"
5 #include "tree.h"
6 #include "blob.h"
7 #include "tree-walk.h"
8 #include "diff.h"
9 #include "revision.h"
11 /* bits #0-15 in revision.h */
13 #define COUNTED (1u<<16)
15 static const char rev_list_usage[] =
16 "git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
17 " limiting output:\n"
18 " --max-count=nr\n"
19 " --max-age=epoch\n"
20 " --min-age=epoch\n"
21 " --sparse\n"
22 " --no-merges\n"
23 " --remove-empty\n"
24 " --all\n"
25 " ordering output:\n"
26 " --topo-order\n"
27 " --date-order\n"
28 " formatting output:\n"
29 " --parents\n"
30 " --objects | --objects-edge\n"
31 " --unpacked\n"
32 " --header | --pretty\n"
33 " --abbrev=nr | --no-abbrev\n"
34 " --abbrev-commit\n"
35 " special purpose:\n"
36 " --bisect"
39 struct rev_info revs;
41 static int bisect_list = 0;
42 static int verbose_header = 0;
43 static int abbrev = DEFAULT_ABBREV;
44 static int abbrev_commit = 0;
45 static int show_timestamp = 0;
46 static int hdr_termination = 0;
47 static const char *commit_prefix = "";
48 static enum cmit_fmt commit_format = CMIT_FMT_RAW;
50 static void show_commit(struct commit *commit)
52 if (show_timestamp)
53 printf("%lu ", commit->date);
54 if (commit_prefix[0])
55 fputs(commit_prefix, stdout);
56 if (commit->object.flags & BOUNDARY)
57 putchar('-');
58 if (abbrev_commit && abbrev)
59 fputs(find_unique_abbrev(commit->object.sha1, abbrev), stdout);
60 else
61 fputs(sha1_to_hex(commit->object.sha1), stdout);
62 if (revs.parents) {
63 struct commit_list *parents = commit->parents;
64 while (parents) {
65 struct object *o = &(parents->item->object);
66 parents = parents->next;
67 if (o->flags & TMP_MARK)
68 continue;
69 printf(" %s", sha1_to_hex(o->sha1));
70 o->flags |= TMP_MARK;
72 /* TMP_MARK is a general purpose flag that can
73 * be used locally, but the user should clean
74 * things up after it is done with them.
76 for (parents = commit->parents;
77 parents;
78 parents = parents->next)
79 parents->item->object.flags &= ~TMP_MARK;
81 if (commit_format == CMIT_FMT_ONELINE)
82 putchar(' ');
83 else
84 putchar('\n');
86 if (verbose_header) {
87 static char pretty_header[16384];
88 pretty_print_commit(commit_format, commit, ~0, pretty_header, sizeof(pretty_header), abbrev);
89 printf("%s%c", pretty_header, hdr_termination);
91 fflush(stdout);
94 static struct object_list **process_blob(struct blob *blob,
95 struct object_list **p,
96 struct name_path *path,
97 const char *name)
99 struct object *obj = &blob->object;
101 if (!revs.blob_objects)
102 return p;
103 if (obj->flags & (UNINTERESTING | SEEN))
104 return p;
105 obj->flags |= SEEN;
106 return add_object(obj, p, path, name);
109 static struct object_list **process_tree(struct tree *tree,
110 struct object_list **p,
111 struct name_path *path,
112 const char *name)
114 struct object *obj = &tree->object;
115 struct tree_entry_list *entry;
116 struct name_path me;
118 if (!revs.tree_objects)
119 return p;
120 if (obj->flags & (UNINTERESTING | SEEN))
121 return p;
122 if (parse_tree(tree) < 0)
123 die("bad tree object %s", sha1_to_hex(obj->sha1));
124 obj->flags |= SEEN;
125 p = add_object(obj, p, path, name);
126 me.up = path;
127 me.elem = name;
128 me.elem_len = strlen(name);
129 entry = tree->entries;
130 tree->entries = NULL;
131 while (entry) {
132 struct tree_entry_list *next = entry->next;
133 if (entry->directory)
134 p = process_tree(entry->item.tree, p, &me, entry->name);
135 else
136 p = process_blob(entry->item.blob, p, &me, entry->name);
137 free(entry);
138 entry = next;
140 return p;
143 static void show_commit_list(struct rev_info *revs)
145 struct commit *commit;
146 struct object_list *objects = NULL, **p = &objects, *pending;
148 while ((commit = get_revision(revs)) != NULL) {
149 p = process_tree(commit->tree, p, NULL, "");
150 show_commit(commit);
152 for (pending = revs->pending_objects; pending; pending = pending->next) {
153 struct object *obj = pending->item;
154 const char *name = pending->name;
155 if (obj->flags & (UNINTERESTING | SEEN))
156 continue;
157 if (obj->type == tag_type) {
158 obj->flags |= SEEN;
159 p = add_object(obj, p, NULL, name);
160 continue;
162 if (obj->type == tree_type) {
163 p = process_tree((struct tree *)obj, p, NULL, name);
164 continue;
166 if (obj->type == blob_type) {
167 p = process_blob((struct blob *)obj, p, NULL, name);
168 continue;
170 die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
172 while (objects) {
173 /* An object with name "foo\n0000000..." can be used to
174 * confuse downstream git-pack-objects very badly.
176 const char *ep = strchr(objects->name, '\n');
177 if (ep) {
178 printf("%s %.*s\n", sha1_to_hex(objects->item->sha1),
179 (int) (ep - objects->name),
180 objects->name);
182 else
183 printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name);
184 objects = objects->next;
189 * This is a truly stupid algorithm, but it's only
190 * used for bisection, and we just don't care enough.
192 * We care just barely enough to avoid recursing for
193 * non-merge entries.
195 static int count_distance(struct commit_list *entry)
197 int nr = 0;
199 while (entry) {
200 struct commit *commit = entry->item;
201 struct commit_list *p;
203 if (commit->object.flags & (UNINTERESTING | COUNTED))
204 break;
205 if (!revs.prune_fn || (commit->object.flags & TREECHANGE))
206 nr++;
207 commit->object.flags |= COUNTED;
208 p = commit->parents;
209 entry = p;
210 if (p) {
211 p = p->next;
212 while (p) {
213 nr += count_distance(p);
214 p = p->next;
219 return nr;
222 static void clear_distance(struct commit_list *list)
224 while (list) {
225 struct commit *commit = list->item;
226 commit->object.flags &= ~COUNTED;
227 list = list->next;
231 static struct commit_list *find_bisection(struct commit_list *list)
233 int nr, closest;
234 struct commit_list *p, *best;
236 nr = 0;
237 p = list;
238 while (p) {
239 if (!revs.prune_fn || (p->item->object.flags & TREECHANGE))
240 nr++;
241 p = p->next;
243 closest = 0;
244 best = list;
246 for (p = list; p; p = p->next) {
247 int distance;
249 if (revs.prune_fn && !(p->item->object.flags & TREECHANGE))
250 continue;
252 distance = count_distance(p);
253 clear_distance(list);
254 if (nr - distance < distance)
255 distance = nr - distance;
256 if (distance > closest) {
257 best = p;
258 closest = distance;
261 if (best)
262 best->next = NULL;
263 return best;
266 static void mark_edge_parents_uninteresting(struct commit *commit)
268 struct commit_list *parents;
270 for (parents = commit->parents; parents; parents = parents->next) {
271 struct commit *parent = parents->item;
272 if (!(parent->object.flags & UNINTERESTING))
273 continue;
274 mark_tree_uninteresting(parent->tree);
275 if (revs.edge_hint && !(parent->object.flags & SHOWN)) {
276 parent->object.flags |= SHOWN;
277 printf("-%s\n", sha1_to_hex(parent->object.sha1));
282 static void mark_edges_uninteresting(struct commit_list *list)
284 for ( ; list; list = list->next) {
285 struct commit *commit = list->item;
287 if (commit->object.flags & UNINTERESTING) {
288 mark_tree_uninteresting(commit->tree);
289 continue;
291 mark_edge_parents_uninteresting(commit);
295 int main(int argc, const char **argv)
297 struct commit_list *list;
298 int i;
300 argc = setup_revisions(argc, argv, &revs, NULL);
302 for (i = 1 ; i < argc; i++) {
303 const char *arg = argv[i];
305 /* accept -<digit>, like traditilnal "head" */
306 if ((*arg == '-') && isdigit(arg[1])) {
307 revs.max_count = atoi(arg + 1);
308 continue;
310 if (!strcmp(arg, "-n")) {
311 if (++i >= argc)
312 die("-n requires an argument");
313 revs.max_count = atoi(argv[i]);
314 continue;
316 if (!strncmp(arg,"-n",2)) {
317 revs.max_count = atoi(arg + 2);
318 continue;
320 if (!strcmp(arg, "--header")) {
321 verbose_header = 1;
322 continue;
324 if (!strcmp(arg, "--no-abbrev")) {
325 abbrev = 0;
326 continue;
328 if (!strcmp(arg, "--abbrev")) {
329 abbrev = DEFAULT_ABBREV;
330 continue;
332 if (!strcmp(arg, "--abbrev-commit")) {
333 abbrev_commit = 1;
334 continue;
336 if (!strncmp(arg, "--abbrev=", 9)) {
337 abbrev = strtoul(arg + 9, NULL, 10);
338 if (abbrev && abbrev < MINIMUM_ABBREV)
339 abbrev = MINIMUM_ABBREV;
340 else if (40 < abbrev)
341 abbrev = 40;
342 continue;
344 if (!strncmp(arg, "--pretty", 8)) {
345 commit_format = get_commit_format(arg+8);
346 verbose_header = 1;
347 hdr_termination = '\n';
348 if (commit_format == CMIT_FMT_ONELINE)
349 commit_prefix = "";
350 else
351 commit_prefix = "commit ";
352 continue;
354 if (!strcmp(arg, "--timestamp")) {
355 show_timestamp = 1;
356 continue;
358 if (!strcmp(arg, "--bisect")) {
359 bisect_list = 1;
360 continue;
362 usage(rev_list_usage);
366 list = revs.commits;
368 if (!list &&
369 (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && !revs.pending_objects))
370 usage(rev_list_usage);
372 save_commit_buffer = verbose_header;
373 track_object_refs = 0;
374 if (bisect_list)
375 revs.limited = 1;
377 prepare_revision_walk(&revs);
378 if (revs.tree_objects)
379 mark_edges_uninteresting(revs.commits);
381 if (bisect_list)
382 revs.commits = find_bisection(revs.commits);
384 show_commit_list(&revs);
386 return 0;