X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-list.c;h=2d97cdb64bdad56046c1dfd2fd784af54d420ca5;hb=e1ccf53a60657930ae7892387736c8b6a91ec610;hp=17995c34c4eae779caa36e525e9ffb72e22d87f3;hpb=7620d39fcbff834d00320d295fbdbd9b7006d66a;p=git.git diff --git a/rev-list.c b/rev-list.c index 17995c34..2d97cdb6 100644 --- a/rev-list.c +++ b/rev-list.c @@ -8,19 +8,22 @@ #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" + " --parents\n" " --bisect\n" " --objects\n" " --unpacked\n" " --header\n" " --pretty\n" - " --merge-order [ --show-breaks ]"; + " --no-merges\n" + " --merge-order [ --show-breaks ]\n" + " --topo-order"; static int unpacked = 0; static int bisect_list = 0; @@ -30,7 +33,7 @@ static int blob_objects = 0; static int verbose_header = 0; static int show_parents = 0; static int hdr_termination = 0; -static const char *prefix = ""; +static const char *commit_prefix = ""; static unsigned long max_age = -1; static unsigned long min_age = -1; static int max_count = -1; @@ -38,19 +41,21 @@ 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 int no_merges = 0; static void show_commit(struct commit *commit) { commit->object.flags |= SHOWN; if (show_breaks) { - prefix = "| "; + commit_prefix = "| "; if (commit->object.flags & DISCONTINUITY) { - prefix = "^ "; + commit_prefix = "^ "; } else if (commit->object.flags & BOUNDARY) { - prefix = "= "; + commit_prefix = "= "; } } - printf("%s%s", prefix, sha1_to_hex(commit->object.sha1)); + printf("%s%s", commit_prefix, sha1_to_hex(commit->object.sha1)); if (show_parents) { struct commit_list *parents = commit->parents; while (parents) { @@ -58,7 +63,11 @@ static void show_commit(struct commit *commit) parents = parents->next; } } - putchar('\n'); + if (commit_format == CMIT_FMT_ONELINE) + putchar(' '); + else + putchar('\n'); + if (verbose_header) { static char pretty_header[16384]; pretty_print_commit(commit_format, commit->buffer, ~0, pretty_header, sizeof(pretty_header)); @@ -69,22 +78,20 @@ static void show_commit(struct commit *commit) 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; + if (no_merges && (commit->parents && commit->parents->next)) + return CONTINUE; return DO; } @@ -206,6 +213,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; @@ -227,12 +236,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; @@ -240,6 +272,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; } @@ -357,12 +412,14 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags) /* * Tag object? Look what it points to.. */ - if (object->type == tag_type) { + 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 = tag->tagged; + object = parse_object(tag->tagged->sha1); + if (!object) + die("bad object %s", sha1_to_hex(tag->tagged->sha1)); } /* @@ -374,6 +431,8 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags) object->flags |= flags; if (parse_commit(commit) < 0) die("unable to parse commit %s", name); + if (flags & UNINTERESTING) + mark_parents_uninteresting(commit); return commit; } @@ -410,14 +469,25 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags) die("%s is unknown object", name); } +static void handle_one_commit(struct commit *com, struct commit_list **lst) +{ + if (!com || com->object.flags & SEEN) + return; + com->object.flags |= SEEN; + commit_list_insert(com, lst); +} + + int main(int argc, char **argv) { struct commit_list *list = NULL; int i, limited = 0; + setup_git_directory(); for (i = 1 ; i < argc; i++) { int flags; char *arg = argv[i]; + char *dotdot; struct commit *commit; if (!strncmp(arg, "--max-count=", 12)) { @@ -440,7 +510,14 @@ int main(int argc, char **argv) commit_format = get_commit_format(arg+8); verbose_header = 1; hdr_termination = '\n'; - prefix = "commit "; + if (commit_format == CMIT_FMT_ONELINE) + commit_prefix = ""; + else + commit_prefix = "commit "; + continue; + } + if (!strncmp(arg, "--no-merges", 11)) { + no_merges = 1; continue; } if (!strcmp(arg, "--parents")) { @@ -462,37 +539,64 @@ int main(int argc, char **argv) limited = 1; continue; } - if (!strncmp(arg, "--merge-order", 13)) { + 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; + } + + if (show_breaks && !merge_order) + usage(rev_list_usage); flags = 0; + dotdot = strstr(arg, ".."); + if (dotdot) { + char *next = dotdot + 2; + struct commit *exclude = NULL; + struct commit *include = NULL; + *dotdot = 0; + exclude = get_commit_reference(arg, UNINTERESTING); + include = get_commit_reference(next, 0); + if (exclude && include) { + limited = 1; + handle_one_commit(exclude, &list); + handle_one_commit(include, &list); + continue; + } + *next = '.'; + } if (*arg == '^') { flags = UNINTERESTING; arg++; limited = 1; } - if (show_breaks && !merge_order) - usage(rev_list_usage); commit = get_commit_reference(arg, flags); - if (!commit) - continue; - commit_list_insert(commit, &list); + handle_one_commit(commit, &list); } 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;