diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2005-09-20 17:55:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-20 18:11:34 -0700 |
| commit | 27cfe2e2dcbfc4f6c6288ed4eafd077e232c2ab1 (patch) | |
| tree | 0b24fa129f9241fc0081f2979d46f05acedb506b /rev-list.c | |
| parent | c1babb1d65e034a058c14379eabec8eb374757ca (diff) | |
| download | git-27cfe2e2dcbfc4f6c6288ed4eafd077e232c2ab1.tar.gz git-27cfe2e2dcbfc4f6c6288ed4eafd077e232c2ab1.tar.xz | |
Make time-based commit filtering work with topological ordering.
The trick is to consider the time-based filtering a limiter, the same way
we do for release ranges.
That means that the time-based filtering runs _before_ the topological
sorting, which makes it meaningful again. It also simplifies the code
logic.
This makes "gitk" useful with time ranges.
[ Second version: --merge-order now unaffected by the re-org ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'rev-list.c')
| -rw-r--r-- | rev-list.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/rev-list.c b/rev-list.c index e41d5a045..523fda07e 100644 --- a/rev-list.c +++ b/rev-list.c @@ -86,7 +86,7 @@ static int filter_commit(struct commit * commit) return CONTINUE; if (max_age != -1 && (commit->date < max_age)) { stop_traversal=1; - return merge_order?CONTINUE:STOP; + return CONTINUE; } if (max_count != -1 && !max_count--) return STOP; @@ -374,6 +374,8 @@ static struct commit_list *limit_list(struct commit_list *list) struct commit *commit = pop_most_recent_commit(&list, SEEN); struct object *obj = &commit->object; + if (max_age != -1 && (commit->date < max_age)) + obj->flags |= UNINTERESTING; if (unpacked && has_sha1_pack(obj->sha1)) obj->flags |= UNINTERESTING; if (obj->flags & UNINTERESTING) { @@ -382,6 +384,8 @@ static struct commit_list *limit_list(struct commit_list *list) break; continue; } + if (min_age != -1 && (commit->date > min_age)) + continue; p = &commit_list_insert(commit, p)->next; } if (tree_objects) @@ -494,10 +498,12 @@ int main(int argc, char **argv) } if (!strncmp(arg, "--max-age=", 10)) { max_age = atoi(arg + 10); + limited = 1; continue; } if (!strncmp(arg, "--min-age=", 10)) { min_age = atoi(arg + 10); + limited = 1; continue; } if (!strcmp(arg, "--header")) { |