X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.c;h=728b6d111dd3e11de6f5a6a0baa940d54d621e6a;hb=23091e954c968282d4d9087da00f60c2f02aecc5;hp=745b0d2e10b0b712731b84ccb9337d7c82cba043;hpb=384e99a4a99820c34fe3600b2aad3f0185dd43db;p=git.git diff --git a/revision.c b/revision.c index 745b0d2e..728b6d11 100644 --- a/revision.c +++ b/revision.c @@ -420,24 +420,33 @@ static void limit_list(struct rev_info *revs) p = &commit_list_insert(commit, p)->next; } if (revs->boundary) { - list = newlist; - while (list) { + /* mark the ones that are on the result list first */ + for (list = newlist; list; list = list->next) { + struct commit *commit = list->item; + commit->object.flags |= TMP_MARK; + } + for (list = newlist; list; list = list->next) { struct commit *commit = list->item; struct object *obj = &commit->object; - struct commit_list *parent = commit->parents; - if (obj->flags & (UNINTERESTING|BOUNDARY)) { - list = list->next; + struct commit_list *parent; + if (obj->flags & UNINTERESTING) continue; - } - while (parent) { + for (parent = commit->parents; + parent; + parent = parent->next) { struct commit *pcommit = parent->item; - parent = parent->next; if (!(pcommit->object.flags & UNINTERESTING)) continue; pcommit->object.flags |= BOUNDARY; + if (pcommit->object.flags & TMP_MARK) + continue; + pcommit->object.flags |= TMP_MARK; p = &commit_list_insert(pcommit, p)->next; } - list = list->next; + } + for (list = newlist; list; list = list->next) { + struct commit *commit = list->item; + commit->object.flags &= ~TMP_MARK; } } revs->commits = newlist; @@ -543,32 +552,26 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch } if (!strncmp(arg, "--max-age=", 10)) { revs->max_age = atoi(arg + 10); - revs->limited = 1; - continue; - } - if (!strncmp(arg, "--min-age=", 10)) { - revs->min_age = atoi(arg + 10); - revs->limited = 1; continue; } if (!strncmp(arg, "--since=", 8)) { revs->max_age = approxidate(arg + 8); - revs->limited = 1; continue; } if (!strncmp(arg, "--after=", 8)) { revs->max_age = approxidate(arg + 8); - revs->limited = 1; + continue; + } + if (!strncmp(arg, "--min-age=", 10)) { + revs->min_age = atoi(arg + 10); continue; } if (!strncmp(arg, "--before=", 9)) { revs->min_age = approxidate(arg + 9); - revs->limited = 1; continue; } if (!strncmp(arg, "--until=", 8)) { revs->min_age = approxidate(arg + 8); - revs->limited = 1; continue; } if (!strcmp(arg, "--all")) { @@ -587,13 +590,15 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch } if (!strcmp(arg, "--topo-order")) { revs->topo_order = 1; - revs->limited = 1; continue; } if (!strcmp(arg, "--date-order")) { revs->lifo = 0; revs->topo_order = 1; - revs->limited = 1; + continue; + } + if (!strcmp(arg, "--parents")) { + revs->parents = 1; continue; } if (!strcmp(arg, "--dense")) { @@ -631,7 +636,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch } if (!strcmp(arg, "--unpacked")) { revs->unpacked = 1; - revs->limited = 1; continue; } *unrecognized++ = arg; @@ -641,15 +645,19 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch dotdot = strstr(arg, ".."); if (dotdot) { unsigned char from_sha1[20]; - char *next = dotdot + 2; + const char *next = dotdot + 2; + const char *this = arg; *dotdot = 0; if (!*next) next = "HEAD"; - if (!get_sha1(arg, from_sha1) && !get_sha1(next, sha1)) { + if (dotdot == arg) + this = "HEAD"; + if (!get_sha1(this, from_sha1) && + !get_sha1(next, sha1)) { struct commit *exclude; struct commit *include; - exclude = get_commit_reference(revs, arg, from_sha1, flags ^ UNINTERESTING); + exclude = get_commit_reference(revs, this, from_sha1, flags ^ UNINTERESTING); include = get_commit_reference(revs, next, sha1, flags); if (!exclude || !include) die("Invalid revision range %s..%s", arg, next); @@ -691,10 +699,19 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch add_one_commit(commit, revs); } + if (revs->topo_order || revs->unpacked) + revs->limited = 1; + if (revs->prune_data) { diff_tree_setup_paths(revs->prune_data); revs->prune_fn = try_to_simplify_commit; - revs->limited = 1; + + /* + * If we fix up parent data, we currently cannot + * do that on-the-fly. + */ + if (revs->parents) + revs->limited = 1; } return left; @@ -756,41 +773,39 @@ struct commit *get_revision(struct rev_info *revs) do { struct commit *commit = revs->commits->item; + revs->commits = revs->commits->next; + + /* + * If we haven't done the list limiting, we need to look at + * the parents here. We also need to do the date-based limiting + * that we'd otherwise have done in limit_list(). + */ + if (!revs->limited) { + if ((revs->unpacked && + has_sha1_pack(commit->object.sha1)) || + (revs->max_age != -1 && + (commit->date < revs->max_age))) + continue; + add_parents_to_list(revs, commit, &revs->commits); + } if (commit->object.flags & SHOWN) - goto next; + continue; if (!(commit->object.flags & BOUNDARY) && (commit->object.flags & UNINTERESTING)) - goto next; + continue; if (revs->min_age != -1 && (commit->date > revs->min_age)) - goto next; - if (revs->max_age != -1 && (commit->date < revs->max_age)) - return NULL; + continue; if (revs->no_merges && commit->parents && commit->parents->next) - goto next; + continue; if (revs->prune_fn && revs->dense) { if (!(commit->object.flags & TREECHANGE)) - goto next; - rewrite_parents(commit); - } - /* More to go? */ - if (revs->max_count) { - if (commit->object.flags & BOUNDARY) { - /* this is already uninteresting, - * so there is no point popping its - * parents into the list. - */ - struct commit_list *it = revs->commits; - revs->commits = it->next; - free(it); - } - else - pop_most_recent_commit(&revs->commits, SEEN); + continue; + if (revs->parents) + rewrite_parents(commit); } commit->object.flags |= SHOWN; return commit; -next: - pop_most_recent_commit(&revs->commits, SEEN); } while (revs->commits); return NULL; }