mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rev-list: pass "int flags" as last argument of "show_bisect_vars"

Browse Source 
Instead of "int show_all, int show_tried" we now only pass "int flags",
because we will add one more flag in a later patch.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder
2009-03-29 11:55:43 +02:00
committed by Junio C Hamano
parent b74d7efb10
commit 37c4c38d73
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bisect.c
View File

@ -547,5 +547,5 @@ int bisect_next_vars(const char *prefix)
revs.commits = find_bisection(revs.commits, &reaches, &all, revs.commits = find_bisection(revs.commits, &reaches, &all,
!!skipped_sha1_nr); !!skipped_sha1_nr);
return show_bisect_vars(&revs, reaches, all, 0, 1); return show_bisect_vars(&revs, reaches, all, BISECT_SHOW_TRIED);
} }

8
bisect.h
View File

@ -9,13 +9,17 @@ extern struct commit_list *filter_skipped(struct commit_list *list,
struct commit_list **tried, struct commit_list **tried,
int show_all); int show_all);
/* show_bisect_vars flags */
#define BISECT_SHOW_ALL (1<<0)
#define BISECT_SHOW_TRIED (1<<1)
/* /*
* The "show_all" parameter should be 0 if this function is called * The flag BISECT_SHOW_ALL should not be set if this function is called
* from outside "builtin-rev-list.c" as otherwise it would use * from outside "builtin-rev-list.c" as otherwise it would use
* static "revs" from this file. * static "revs" from this file.
*/ */
extern int show_bisect_vars(struct rev_info *revs, int reaches, int all, extern int show_bisect_vars(struct rev_info *revs, int reaches, int all,
int show_all, int show_tried); int flags);
extern int bisect_next_vars(const char *prefix); extern int bisect_next_vars(const char *prefix);

13
builtin-rev-list.c
View File

@ -236,17 +236,16 @@ static void show_tried_revs(struct commit_list *tried)
printf("'\n"); printf("'\n");
} }
int show_bisect_vars(struct rev_info *revs, int reaches, int all, int show_bisect_vars(struct rev_info *revs, int reaches, int all, int flags)
int show_all, int show_tried)
{ {
int cnt; int cnt;
char hex[41] = ""; char hex[41] = "";
struct commit_list *tried; struct commit_list *tried;
if (!revs->commits && !show_tried) if (!revs->commits && !(flags & BISECT_SHOW_TRIED))
return 1; return 1;
revs->commits = filter_skipped(revs->commits, &tried, show_all); revs->commits = filter_skipped(revs->commits, &tried, flags & BISECT_SHOW_ALL);
/* /*
* revs->commits can reach "reaches" commits among * revs->commits can reach "reaches" commits among
@ -264,12 +263,12 @@ int show_bisect_vars(struct rev_info *revs, int reaches, int all,
if (revs->commits) if (revs->commits)
strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1)); strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1));
if (show_all) { if (flags & BISECT_SHOW_ALL) {
traverse_commit_list(revs, show_commit, show_object); traverse_commit_list(revs, show_commit, show_object);
printf("------\n"); printf("------\n");
} }
if (show_tried) if (flags & BISECT_SHOW_TRIED)
show_tried_revs(tried); show_tried_revs(tried);
printf("bisect_rev=%s\n" printf("bisect_rev=%s\n"
"bisect_nr=%d\n" "bisect_nr=%d\n"
@ -379,7 +378,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
if (bisect_show_vars) if (bisect_show_vars)
return show_bisect_vars(&revs, reaches, all, return show_bisect_vars(&revs, reaches, all,
bisect_show_all, 0); bisect_show_all ? BISECT_SHOW_ALL : 0);
} }
traverse_commit_list(&revs, traverse_commit_list(&revs,