X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=rev-list.c;h=83a604ae9bc382953ebd0167fd86bbc813ce9156;hb=20f6633112c2a95b4907b4ff2e41e3c450395d34;hp=ca8cc92fc05712498f6a7bf186ae98b55fc7d497;hpb=3c90f03d3206cb2c2bff6e20f7477bbfcd624887;p=git.git diff --git a/rev-list.c b/rev-list.c index ca8cc92f..83a604ae 100644 --- a/rev-list.c +++ b/rev-list.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "tag.h" #include "commit.h" #include "tree.h" #include "blob.h" @@ -7,17 +8,21 @@ #define SEEN (1u << 0) #define INTERESTING (1u << 1) #define COUNTED (1u << 2) -#define SHOWN (LAST_EPOCH_FLAG << 2) +#define SHOWN (1u << 3) static const char rev_list_usage[] = - "usage: git-rev-list [OPTION] commit-id \n" + "git-rev-list [OPTION] commit-id \n" " --max-count=nr\n" " --max-age=epoch\n" " --min-age=epoch\n" + " --bisect\n" + " --objects\n" + " --unpacked\n" " --header\n" " --pretty\n" " --merge-order [ --show-breaks ]"; +static int unpacked = 0; static int bisect_list = 0; static int tag_objects = 0; static int tree_objects = 0; @@ -33,6 +38,7 @@ static enum cmit_fmt commit_format = CMIT_FMT_RAW; static int merge_order = 0; static int show_breaks = 0; static int stop_traversal = 0; +static int topo_order = 0; static void show_commit(struct commit *commit) { @@ -58,24 +64,21 @@ static void show_commit(struct commit *commit) 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); - } + } + fflush(stdout); } static int filter_commit(struct commit * commit) { - if (merge_order && stop_traversal && commit->object.flags & BOUNDARY) + if (stop_traversal && (commit->object.flags & BOUNDARY)) return STOP; if (commit->object.flags & (UNINTERESTING|SHOWN)) return CONTINUE; if (min_age != -1 && (commit->date > min_age)) return CONTINUE; if (max_age != -1 && (commit->date < max_age)) { - if (!merge_order) - return STOP; - else { - stop_traversal = 1; - return CONTINUE; - } + stop_traversal=1; + return merge_order?CONTINUE:STOP; } if (max_count != -1 && !max_count--) return STOP; @@ -103,7 +106,7 @@ static struct object_list **add_object(struct object *obj, struct object_list ** { struct object_list *entry = xmalloc(sizeof(*entry)); entry->item = obj; - entry->next = NULL; + entry->next = *p; entry->name = name; *p = entry; return &entry->next; @@ -143,9 +146,11 @@ static struct object_list **process_tree(struct tree *tree, struct object_list * return p; } +static struct object_list *pending_objects = NULL; + static void show_commit_list(struct commit_list *list) { - struct object_list *objects = NULL, **p = &objects; + struct object_list *objects = NULL, **p = &objects, *pending; while (list) { struct commit *commit = pop_most_recent_commit(&list, SEEN); @@ -153,6 +158,26 @@ static void show_commit_list(struct commit_list *list) if (process_commit(commit) == STOP) break; } + for (pending = pending_objects; pending; pending = pending->next) { + struct object *obj = pending->item; + const char *name = pending->name; + if (obj->flags & (UNINTERESTING | SEEN)) + continue; + if (obj->type == tag_type) { + obj->flags |= SEEN; + p = add_object(obj, p, name); + continue; + } + if (obj->type == tree_type) { + p = process_tree((struct tree *)obj, p, name); + continue; + } + if (obj->type == blob_type) { + p = process_blob((struct blob *)obj, p, name); + continue; + } + die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name); + } while (objects) { printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name); objects = objects->next; @@ -178,6 +203,8 @@ static void mark_tree_uninteresting(struct tree *tree) if (obj->flags & UNINTERESTING) return; obj->flags |= UNINTERESTING; + if (!has_sha1_file(obj->sha1)) + return; if (parse_tree(tree) < 0) die("bad tree %s", sha1_to_hex(obj->sha1)); entry = tree->entries; @@ -199,12 +226,35 @@ static void mark_parents_uninteresting(struct commit *commit) while (parents) { struct commit *commit = parents->item; commit->object.flags |= UNINTERESTING; + + /* + * Normally we haven't parsed the parent + * yet, so we won't have a parent of a parent + * here. However, it may turn out that we've + * reached this commit some other way (where it + * wasn't uninteresting), in which case we need + * to mark its parents recursively too.. + */ + if (commit->parents) + mark_parents_uninteresting(commit); + + /* + * A missing commit is ok iff its parent is marked + * uninteresting. + * + * We just mark such a thing parsed, so that when + * it is popped next time around, we won't be trying + * to parse it and get an error. + */ + if (!has_sha1_file(commit->object.sha1)) + commit->object.parsed = 1; parents = parents->next; } } -static int everybody_uninteresting(struct commit_list *list) +static int everybody_uninteresting(struct commit_list *orig) { + struct commit_list *list = orig; while (list) { struct commit *commit = list->item; list = list->next; @@ -212,6 +262,29 @@ static int everybody_uninteresting(struct commit_list *list) continue; return 0; } + + /* + * Ok, go back and mark all the edge trees uninteresting, + * since otherwise we can have situations where a parent + * that was marked uninteresting (and we never even had + * to look at) had lots of objects that we don't want to + * include. + * + * NOTE! This still doesn't mean that the object list is + * "correct", since we may end up listing objects that + * even older commits (that we don't list) do actually + * reference, but it gets us to a minimal list (or very + * close) in practice. + */ + if (!tree_objects) + return 1; + + while (orig) { + struct commit *commit = orig->item; + if (!parse_commit(commit) && commit->tree) + mark_tree_uninteresting(commit->tree); + orig = orig->next; + } return 1; } @@ -287,14 +360,16 @@ static struct commit_list *find_bisection(struct commit_list *list) return best; } -struct commit_list *limit_list(struct commit_list *list) +static struct commit_list *limit_list(struct commit_list *list) { struct commit_list *newlist = NULL; struct commit_list **p = &newlist; - do { + while (list) { struct commit *commit = pop_most_recent_commit(&list, SEEN); struct object *obj = &commit->object; + if (unpacked && has_sha1_pack(obj->sha1)) + obj->flags |= UNINTERESTING; if (obj->flags & UNINTERESTING) { mark_parents_uninteresting(commit); if (everybody_uninteresting(list)) @@ -302,24 +377,84 @@ struct commit_list *limit_list(struct commit_list *list) continue; } p = &commit_list_insert(commit, p)->next; - } while (list); + } if (bisect_list) newlist = find_bisection(newlist); return newlist; } +static void add_pending_object(struct object *obj, const char *name) +{ + add_object(obj, &pending_objects, name); +} + static struct commit *get_commit_reference(const char *name, unsigned int flags) { unsigned char sha1[20]; - struct commit *commit; + struct object *object; 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; + object = parse_object(sha1); + if (!object) + die("bad object %s", name); + + /* + * Tag object? Look what it points to.. + */ + while (object->type == tag_type) { + struct tag *tag = (struct tag *) object; + object->flags |= flags; + if (tag_objects && !(object->flags & UNINTERESTING)) + add_pending_object(object, tag->tag); + object = parse_object(tag->tagged->sha1); + } + + /* + * Commit object? Just return it, we'll do all the complex + * reachability crud. + */ + if (object->type == commit_type) { + struct commit *commit = (struct commit *)object; + object->flags |= flags; + if (parse_commit(commit) < 0) + die("unable to parse commit %s", name); + if (flags & UNINTERESTING) + mark_parents_uninteresting(commit); + return commit; + } + + /* + * Tree object? Either mark it uniniteresting, or add it + * to the list of objects to look at later.. + */ + if (object->type == tree_type) { + struct tree *tree = (struct tree *)object; + if (!tree_objects) + return NULL; + if (flags & UNINTERESTING) { + mark_tree_uninteresting(tree); + return NULL; + } + add_pending_object(object, ""); + return NULL; + } + + /* + * Blob object? You know the drill by now.. + */ + if (object->type == blob_type) { + struct blob *blob = (struct blob *)object; + if (!blob_objects) + return NULL; + if (flags & UNINTERESTING) { + mark_blob_uninteresting(blob); + return NULL; + } + add_pending_object(object, ""); + return NULL; + } + die("%s is unknown object", name); } int main(int argc, char **argv) @@ -369,14 +504,24 @@ int main(int argc, char **argv) blob_objects = 1; continue; } - if (!strncmp(arg, "--merge-order", 13)) { + if (!strcmp(arg, "--unpacked")) { + unpacked = 1; + limited = 1; + continue; + } + if (!strcmp(arg, "--merge-order")) { merge_order = 1; continue; } - if (!strncmp(arg, "--show-breaks", 13)) { + if (!strcmp(arg, "--show-breaks")) { show_breaks = 1; continue; } + if (!strcmp(arg, "--topo-order")) { + topo_order = 1; + limited = 1; + continue; + } flags = 0; if (*arg == '^') { @@ -389,20 +534,27 @@ int main(int argc, char **argv) commit = get_commit_reference(arg, flags); if (!commit) continue; + if (commit->object.flags & SEEN) + continue; + commit->object.flags |= SEEN; commit_list_insert(commit, &list); } - if (!list) - usage(rev_list_usage); - if (!merge_order) { + sort_by_date(&list); if (limited) list = limit_list(list); + if (topo_order) + sort_in_topological_order(&list); show_commit_list(list); } else { +#ifndef NO_OPENSSL if (sort_list_in_merge_order(list, &process_commit)) { - die("merge order sort failed\n"); + die("merge order sort failed\n"); } +#else + die("merge order sort unsupported, OpenSSL not linked"); +#endif } return 0;