Re: Make time-based commit filtering work with topological ordering

From: Linus Torvalds <torvalds@osdl.org>
Date: Sep 21, 2005, 00:55 UTC
Message-ID: <Pine.LNX.4.58.0509201745050.2553@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.58.0509201543140.2553@g5.osdl.org>

On Tue, 20 Sep 2005, Linus Torvalds wrote:

> 
> Merge-order doesn't use the normal limit rules, but does its own home-brew
> limiting.  It could do the date-limiting on its own, if it wanted to, but 
> I doubt it would make sense.

Actually, looking closely, merge-order actually had it's own hack in the old filter_commit() code to make it work sanely.

This is an updated patch that allows merge-order to continue to work.

		Linus

---
Subject: 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>
---

diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c
@@ -86,7 +86,7 @@ static int filter_commit(struct 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(st
 		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(st
 				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")) {