microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bisect: combine args passed to find_bisection() 

Now that find_bisection() accepts multiple boolean arguments, these may
be combined into a single unsigned integer in order to declutter some of
the code in bisect.c

Also, rename the existing "flags" bitfield to "commit_flags", to
explicitly differentiate it from the new "bisect_flags" bitfield.

Based-on-patch-by: Harald Nordgren <haraldnordgren@gmail.com>
Signed-off-by: Aaron Lipman <alipman88@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Aaron Lipman 2020-08-07 17:58:38 -04:00 коммит произвёл Junio C Hamano
Родитель e8861ffc20
Коммит ad464a4e84
3 изменённых файлов: 49 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

67
bisect.c
Просмотреть файл

@ -89,7 +89,7 @@ static inline void weight_set(struct commit_list *elem, int weight)
**commit_weight_at(&commit_weight, elem->item) = weight; **commit_weight_at(&commit_weight, elem->item) = weight;
} }
static int count_interesting_parents(struct commit *commit, int first_parent_only) static int count_interesting_parents(struct commit *commit, unsigned bisect_flags)
{ {
struct commit_list *p; struct commit_list *p;
int count; int count;
@ -97,7 +97,7 @@ static int count_interesting_parents(struct commit *commit, int first_parent_onl
for (count = 0, p = commit->parents; p; p = p->next) { for (count = 0, p = commit->parents; p; p = p->next) {
if (!(p->item->object.flags & UNINTERESTING)) if (!(p->item->object.flags & UNINTERESTING))
count++; count++;
if (first_parent_only) if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY)
break; break;
} }
return count; return count;
@ -137,7 +137,7 @@ static void show_list(const char *debug, int counted, int nr,
for (p = list; p; p = p->next) { for (p = list; p; p = p->next) {
struct commit_list *pp; struct commit_list *pp;
struct commit *commit = p->item; struct commit *commit = p->item;
unsigned flags = commit->object.flags; unsigned commit_flags = commit->object.flags;
enum object_type type; enum object_type type;
unsigned long size; unsigned long size;
char *buf = read_object_file(&commit->object.oid, &type, char *buf = read_object_file(&commit->object.oid, &type,
@ -146,9 +146,9 @@ static void show_list(const char *debug, int counted, int nr,
int subject_len; int subject_len;
fprintf(stderr, "%c%c%c ", fprintf(stderr, "%c%c%c ",
(flags & TREESAME) ? ' ' : 'T', (commit_flags & TREESAME) ? ' ' : 'T',
(flags & UNINTERESTING) ? 'U' : ' ', (commit_flags & UNINTERESTING) ? 'U' : ' ',
(flags & COUNTED) ? 'C' : ' '); (commit_flags & COUNTED) ? 'C' : ' ');
if (*commit_weight_at(&commit_weight, p->item)) if (*commit_weight_at(&commit_weight, p->item))
fprintf(stderr, "%3d", weight(p)); fprintf(stderr, "%3d", weight(p));
else else
@ -173,9 +173,9 @@ static struct commit_list *best_bisection(struct commit_list *list, int nr)
best = list; best = list;
for (p = list; p; p = p->next) { for (p = list; p; p = p->next) {
int distance; int distance;
unsigned flags = p->item->object.flags; unsigned commit_flags = p->item->object.flags;
if (flags & TREESAME) if (commit_flags & TREESAME)
continue; continue;
distance = weight(p); distance = weight(p);
if (nr - distance < distance) if (nr - distance < distance)
@ -214,9 +214,9 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list, int n
for (p = list, cnt = 0; p; p = p->next) { for (p = list, cnt = 0; p; p = p->next) {
int distance; int distance;
unsigned flags = p->item->object.flags; unsigned commit_flags = p->item->object.flags;
if (flags & TREESAME) if (commit_flags & TREESAME)
continue; continue;
distance = weight(p); distance = weight(p);
if (nr - distance < distance) if (nr - distance < distance)
@ -261,7 +261,7 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list, int n
*/ */
static struct commit_list *do_find_bisection(struct commit_list *list, static struct commit_list *do_find_bisection(struct commit_list *list,
int nr, int *weights, int nr, int *weights,
int find_all, int first_parent_only) unsigned bisect_flags)
{ {
int n, counted; int n, counted;
struct commit_list *p; struct commit_list *p;
@ -270,12 +270,12 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
for (n = 0, p = list; p; p = p->next) { for (n = 0, p = list; p; p = p->next) {
struct commit *commit = p->item; struct commit *commit = p->item;
unsigned flags = commit->object.flags; unsigned commit_flags = commit->object.flags;
*commit_weight_at(&commit_weight, p->item) = &weights[n++]; *commit_weight_at(&commit_weight, p->item) = &weights[n++];
switch (count_interesting_parents(commit, first_parent_only)) { switch (count_interesting_parents(commit, bisect_flags)) {
case 0: case 0:
if (!(flags & TREESAME)) { if (!(commit_flags & TREESAME)) {
weight_set(p, 1); weight_set(p, 1);
counted++; counted++;
show_list("bisection 2 count one", show_list("bisection 2 count one",
@ -316,13 +316,13 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
continue; continue;
if (weight(p) != -2) if (weight(p) != -2)
continue; continue;
if (first_parent_only) if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY)
BUG("shouldn't be calling count-distance in fp mode"); BUG("shouldn't be calling count-distance in fp mode");
weight_set(p, count_distance(p)); weight_set(p, count_distance(p));
clear_distance(list); clear_distance(list);
/* Does it happen to be at exactly half-way? */ /* Does it happen to be at exactly half-way? */
if (!find_all && halfway(p, nr)) if (!(bisect_flags & FIND_BISECTION_ALL) && halfway(p, nr))
return p; return p;
counted++; counted++;
} }
@ -332,14 +332,14 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
while (counted < nr) { while (counted < nr) {
for (p = list; p; p = p->next) { for (p = list; p; p = p->next) {
struct commit_list *q; struct commit_list *q;
unsigned flags = p->item->object.flags; unsigned commit_flags = p->item->object.flags;
if (0 <= weight(p)) if (0 <= weight(p))
continue; continue;
for (q = p->item->parents; for (q = p->item->parents;
q; q;
q = first_parent_only ? NULL : q->next) { q = bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY ? NULL : q->next) {
if (q->item->object.flags & UNINTERESTING) if (q->item->object.flags & UNINTERESTING)
continue; continue;
if (0 <= weight(q)) if (0 <= weight(q))
@ -353,7 +353,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
* add one for p itself if p is to be counted, * add one for p itself if p is to be counted,
* otherwise inherit it from q directly. * otherwise inherit it from q directly.
*/ */
if (!(flags & TREESAME)) { if (!(commit_flags & TREESAME)) {
weight_set(p, weight(q)+1); weight_set(p, weight(q)+1);
counted++; counted++;
show_list("bisection 2 count one", show_list("bisection 2 count one",
@ -363,21 +363,21 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
weight_set(p, weight(q)); weight_set(p, weight(q));
/* Does it happen to be at exactly half-way? */ /* Does it happen to be at exactly half-way? */
if (!find_all && halfway(p, nr)) if (!(bisect_flags & FIND_BISECTION_ALL) && halfway(p, nr))
return p; return p;
} }
} }
show_list("bisection 2 counted all", counted, nr, list); show_list("bisection 2 counted all", counted, nr, list);
if (!find_all) if (!(bisect_flags & FIND_BISECTION_ALL))
return best_bisection(list, nr); return best_bisection(list, nr);
else else
return best_bisection_sorted(list, nr); return best_bisection_sorted(list, nr);
} }
void find_bisection(struct commit_list **commit_list, int *reaches, void find_bisection(struct commit_list **commit_list, int *reaches,
int *all, int find_all, int first_parent_only) int *all, unsigned bisect_flags)
{ {
int nr, on_list; int nr, on_list;
struct commit_list *list, *p, *best, *next, *last; struct commit_list *list, *p, *best, *next, *last;
@ -393,16 +393,16 @@ void find_bisection(struct commit_list **commit_list, int *reaches,
for (nr = on_list = 0, last = NULL, p = *commit_list; for (nr = on_list = 0, last = NULL, p = *commit_list;
p; p;
p = next) { p = next) {
unsigned flags = p->item->object.flags; unsigned commit_flags = p->item->object.flags;
next = p->next; next = p->next;
if (flags & UNINTERESTING) { if (commit_flags & UNINTERESTING) {
free(p); free(p);
continue; continue;
} }
p->next = last; p->next = last;
last = p; last = p;
if (!(flags & TREESAME)) if (!(commit_flags & TREESAME))
nr++; nr++;
on_list++; on_list++;
} }
@ -413,9 +413,9 @@ void find_bisection(struct commit_list **commit_list, int *reaches,
weights = xcalloc(on_list, sizeof(*weights)); weights = xcalloc(on_list, sizeof(*weights));
/* Do the real work of finding bisection commit. */ /* Do the real work of finding bisection commit. */
best = do_find_bisection(list, nr, weights, find_all, first_parent_only); best = do_find_bisection(list, nr, weights, bisect_flags);
if (best) { if (best) {
if (!find_all) { if (!(bisect_flags & FIND_BISECTION_ALL)) {
list->item = best->item; list->item = best->item;
free_commit_list(list->next); free_commit_list(list->next);
best = list; best = list;
@ -1000,23 +1000,30 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
struct object_id *bisect_rev; struct object_id *bisect_rev;
char *steps_msg; char *steps_msg;
int no_checkout = ref_exists("BISECT_HEAD"); int no_checkout = ref_exists("BISECT_HEAD");
int first_parent_only = file_exists(git_path_bisect_first_parent()); unsigned bisect_flags = 0;
read_bisect_terms(&term_bad, &term_good); read_bisect_terms(&term_bad, &term_good);
if (read_bisect_refs()) if (read_bisect_refs())
die(_("reading bisect refs failed")); die(_("reading bisect refs failed"));
if (file_exists(git_path_bisect_first_parent()))
bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY;
if (skipped_revs.nr)
bisect_flags |= FIND_BISECTION_ALL;
res = check_good_are_ancestors_of_bad(r, prefix, no_checkout); res = check_good_are_ancestors_of_bad(r, prefix, no_checkout);
if (res) if (res)
return res; return res;
bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1); bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1);
revs.first_parent_only = first_parent_only;
revs.first_parent_only = !!(bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY);
revs.limited = 1; revs.limited = 1;
bisect_common(&revs); bisect_common(&revs);
find_bisection(&revs.commits, &reaches, &all, !!skipped_revs.nr, first_parent_only); find_bisection(&revs.commits, &reaches, &all, bisect_flags);
revs.commits = managed_skipped(revs.commits, &tried); revs.commits = managed_skipped(revs.commits, &tried);
if (!revs.commits) { if (!revs.commits) {

5
bisect.h
Просмотреть файл

@ -12,7 +12,7 @@ struct repository;
* best commit, as chosen by `find_all`. * best commit, as chosen by `find_all`.
*/ */
void find_bisection(struct commit_list **list, int *reaches, int *all, void find_bisection(struct commit_list **list, int *reaches, int *all,
int find_all, int first_parent_only); unsigned bisect_flags);
struct commit_list *filter_skipped(struct commit_list *list, struct commit_list *filter_skipped(struct commit_list *list,
struct commit_list **tried, struct commit_list **tried,
@ -23,6 +23,9 @@ struct commit_list *filter_skipped(struct commit_list *list,
#define BISECT_SHOW_ALL (1<<0) #define BISECT_SHOW_ALL (1<<0)
#define REV_LIST_QUIET (1<<1) #define REV_LIST_QUIET (1<<1)
#define FIND_BISECTION_ALL (1u<<0)
#define FIND_BISECTION_FIRST_PARENT_ONLY (1u<<1)
struct rev_list_info { struct rev_list_info {
struct rev_info *revs; struct rev_info *revs;
int flags; int flags;

9
builtin/rev-list.c
Просмотреть файл

@ -637,8 +637,15 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
if (bisect_list) { if (bisect_list) {
int reaches, all; int reaches, all;
unsigned bisect_flags = 0;
find_bisection(&revs.commits, &reaches, &all, bisect_find_all, revs.first_parent_only); if (bisect_find_all)
bisect_flags |= FIND_BISECTION_ALL;
if (revs.first_parent_only)
bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY;
find_bisection(&revs.commits, &reaches, &all, bisect_flags);
if (bisect_show_vars) if (bisect_show_vars)
return show_bisect_vars(&info, reaches, all); return show_bisect_vars(&info, reaches, all);