From: Stephan Beyer Date: Sun, 10 Apr 2016 13:19:10 GMT Subject: [PATCH v2 17/21] bisect: rename count_distance() to compute_weight() Message-ID: <1460294354-7031-18-git-send-email-s-beyer@gmx.net> In-Reply-To: <1460294354-7031-1-git-send-email-s-beyer@gmx.net> Let us use the term "weight" for the number of ancestors of each commit, and "distance" for the number min{weight, #commits - weight}. (Bisect finds the commit with maximum distance.) In these terms, "count_distance()" is the wrong name of the function. So it is renamed to "compute_weight()", and it also directly sets the computed weight. Signed-off-by: Stephan Beyer --- bisect.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bisect.c b/bisect.c index 2b415ad..a254f28 100644 --- a/bisect.c +++ b/bisect.c @@ -70,7 +70,7 @@ static inline int distance_direction(struct commit *commit) return 0; } -static int count_distance(struct commit *elem) +static int compute_weight(struct commit *elem) { int nr = 0; struct commit_list *todo = NULL; @@ -93,6 +93,7 @@ static int count_distance(struct commit *elem) } } + node_data(elem)->weight = nr; return nr; } @@ -241,7 +242,7 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list) * be computed. * * weight = -2 means it has more than one parent and its distance is - * unknown. After running count_distance() first, they will get zero + * unknown. After running compute_weight() first, they will get zero * or positive distance. */ static struct commit_list *do_find_bisection(struct commit_list *list, @@ -286,7 +287,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list, * If you have only one parent in the resulting set * then you can reach one commit more than that parent * can reach. So we do not have to run the expensive - * count_distance() for single strand of pearls. + * compute_weight() for single strand of pearls. * * However, if you have more than one parent, you cannot * just add their distance and one for yourself, since @@ -299,7 +300,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list, for (p = list; p; p = p->next) { if (!(p->item->object.flags & UNINTERESTING) && (node_data(p->item)->weight == -2)) { - node_data(p->item)->weight = count_distance(p->item); + compute_weight(p->item); /* Does it happen to be at exactly half-way? */ if (!find_all && halfway(p->item)) @@ -308,7 +309,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list, } } - show_list("bisection 2 count_distance", counted, list); + show_list("bisection 2 compute_weight", counted, list); while (counted < total) { for (p = list; p; p = p->next) { -- 2.8.1.137.g522756c