X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=rev-list.c;h=16920ef69e844697628ca3775403f86cc1c13945;hb=180926636e47ecfe28d03cec493af75899994f0f;hp=56dd814c0e029c0ac6fe2fffa3f65a2d52187b53;hpb=3b42a63cb5845ef1c818f6b00e693c61469ee966;p=git.git diff --git a/rev-list.c b/rev-list.c index 56dd814c..16920ef6 100644 --- a/rev-list.c +++ b/rev-list.c @@ -1,9 +1,11 @@ #include "cache.h" #include "commit.h" +#include "epoch.h" #define SEEN (1u << 0) #define INTERESTING (1u << 1) -#define UNINTERESTING (1u << 2) +#define COUNTED (1u << 2) +#define SHOWN (LAST_EPOCH_FLAG << 2) static const char rev_list_usage[] = "usage: git-rev-list [OPTION] commit-id \n" @@ -11,19 +13,33 @@ static const char rev_list_usage[] = " --max-age=epoch\n" " --min-age=epoch\n" " --header\n" - " --pretty"; + " --pretty\n" + " --merge-order [ --show-breaks ]"; +static int bisect_list = 0; static int verbose_header = 0; static int show_parents = 0; -static int pretty_print = 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; +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 void show_commit(struct commit *commit) { + commit->object.flags |= SHOWN; + if (show_breaks) { + prefix = "| "; + if (commit->object.flags & DISCONTINUITY) { + prefix = "^ "; + } else if (commit->object.flags & BOUNDARY) { + prefix = "= "; + } + } printf("%s%s", prefix, sha1_to_hex(commit->object.sha1)); if (show_parents) { struct commit_list *parents = commit->parents; @@ -34,14 +50,48 @@ static void show_commit(struct commit *commit) } putchar('\n'); if (verbose_header) { - const char *buf = commit->buffer; - if (pretty_print) { - static char pretty_header[16384]; - pretty_print_commit(commit->buffer, ~0, pretty_header, sizeof(pretty_header)); - buf = pretty_header; + 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); + } +} + +static int filter_commit(struct commit * commit) +{ + if (merge_order && 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; } - printf("%s%c", buf, hdr_termination); } + 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; + } + + show_commit(commit); + + return CONTINUE; } static void show_commit_list(struct commit_list *list) @@ -49,15 +99,8 @@ static void show_commit_list(struct commit_list *list) while (list) { struct commit *commit = pop_most_recent_commit(&list, SEEN); - if (commit->object.flags & UNINTERESTING) - continue; - if (min_age != -1 && (commit->date > min_age)) - continue; - if (max_age != -1 && (commit->date < max_age)) + if (process_commit(commit) == STOP) break; - if (max_count != -1 && !max_count--) - break; - show_commit(commit); } } @@ -84,7 +127,79 @@ static int everybody_uninteresting(struct commit_list *list) return 1; } -struct commit_list *limit_list(struct commit_list *list, struct commit *end) +/* + * 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; +} + +static void clear_distance(struct commit_list *list) +{ + 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; +} + +struct commit_list *limit_list(struct commit_list *list) { struct commit_list *newlist = NULL; struct commit_list **p = &newlist; @@ -92,7 +207,7 @@ struct commit_list *limit_list(struct commit_list *list, struct commit *end) struct commit *commit = pop_most_recent_commit(&list, SEEN); struct object *obj = &commit->object; - if (commit == end || (obj->flags & UNINTERESTING)) { + if (obj->flags & UNINTERESTING) { mark_parents_uninteresting(commit); if (everybody_uninteresting(list)) break; @@ -100,20 +215,35 @@ struct commit_list *limit_list(struct commit_list *list, struct commit *end) } p = &commit_list_insert(commit, p)->next; } while (list); + if (bisect_list) + newlist = find_bisection(newlist); return newlist; } +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); +} + + int main(int argc, char **argv) { - int nr_sha; - unsigned char sha1[2][20]; struct commit_list *list = NULL; - struct commit *commit, *end; - int i; + int i, limited = 0; - nr_sha = 0; for (i = 1 ; i < argc; i++) { + int flags; char *arg = argv[i]; + unsigned char sha1[20]; + struct commit *commit; if (!strncmp(arg, "--max-count=", 12)) { max_count = atoi(arg + 12); @@ -131,9 +261,9 @@ int main(int argc, char **argv) verbose_header = 1; continue; } - if (!strcmp(arg, "--pretty")) { + if (!strncmp(arg, "--pretty", 8)) { + commit_format = get_commit_format(arg+8); verbose_header = 1; - pretty_print = 1; hdr_termination = '\n'; prefix = "commit "; continue; @@ -142,30 +272,46 @@ int main(int argc, char **argv) show_parents = 1; continue; } + if (!strcmp(arg, "--bisect")) { + bisect_list = 1; + continue; + } + if (!strncmp(arg, "--merge-order", 13)) { + merge_order = 1; + continue; + } + if (!strncmp(arg, "--show-breaks", 13)) { + show_breaks = 1; + continue; + } - if (nr_sha > 2 || get_sha1(arg, sha1[nr_sha])) + flags = 0; + if (*arg == '^') { + flags = UNINTERESTING; + arg++; + limited = 1; + } + if (get_sha1(arg, sha1) || (show_breaks && !merge_order)) usage(rev_list_usage); - nr_sha++; + 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); } - if (!nr_sha) + if (!list) usage(rev_list_usage); - commit = lookup_commit_reference(sha1[0]); - if (!commit || parse_commit(commit) < 0) - die("bad starting commit object"); - - end = NULL; - if (nr_sha > 1) { - end = lookup_commit_reference(sha1[1]); - if (!end || parse_commit(end) < 0) - die("bad ending commit object"); + if (!merge_order) { + if (limited) + list = limit_list(list); + show_commit_list(list); + } else { + if (sort_list_in_merge_order(list, &process_commit)) { + die("merge order sort failed\n"); + } } - commit_list_insert(commit, &list); - if (end) - list = limit_list(list, end); - - show_commit_list(list); return 0; }