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

rev-list: add "int bisect_show_flags" in "struct rev_list_info"

Browse Source 
This is a cleanup patch to make it easier to use the
"show_bisect_vars" function and take advantage of the rev_list_info
struct.

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-04-07 05:08:42 +02:00
committed by Junio C Hamano
parent d797257eb2
commit 13858e5770
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bisect.c
View File

@@ -540,6 +540,7 @@ int bisect_next_vars(const char *prefix)
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.revs = &revs; info.revs = &revs;
info.bisect_show_flags = BISECT_SHOW_TRIED | BISECT_SHOW_STRINGED;
bisect_rev_setup(&revs, prefix); bisect_rev_setup(&revs, prefix);
@@ -551,6 +552,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(&info, reaches, all, return show_bisect_vars(&info, reaches, all);
BISECT_SHOW_TRIED | BISECT_SHOW_STRINGED);
} }

6
bisect.h
View File

@@ -9,20 +9,20 @@ 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 */ /* bisect_show_flags flags in struct rev_list_info */
#define BISECT_SHOW_ALL (1<<0) #define BISECT_SHOW_ALL (1<<0)
#define BISECT_SHOW_TRIED (1<<1) #define BISECT_SHOW_TRIED (1<<1)
#define BISECT_SHOW_STRINGED (1<<2) #define BISECT_SHOW_STRINGED (1<<2)
struct rev_list_info { struct rev_list_info {
struct rev_info *revs; struct rev_info *revs;
int bisect_show_flags;
int show_timestamp; int show_timestamp;
int hdr_termination; int hdr_termination;
const char *header_prefix; const char *header_prefix;
}; };
extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all, extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all);
int flags);
extern int bisect_next_vars(const char *prefix); extern int bisect_next_vars(const char *prefix);

11
builtin-rev-list.c
View File

@@ -233,10 +233,9 @@ static void show_tried_revs(struct commit_list *tried, int stringed)
printf(stringed ? "' &&\n" : "'\n"); printf(stringed ? "' &&\n" : "'\n");
} }
int show_bisect_vars(struct rev_list_info *info, int reaches, int all, int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
int flags)
{ {
int cnt; int cnt, flags = info->bisect_show_flags;
char hex[41] = "", *format; char hex[41] = "", *format;
struct commit_list *tried; struct commit_list *tried;
struct rev_info *revs = info->revs; struct rev_info *revs = info->revs;
@@ -303,7 +302,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
int bisect_list = 0; int bisect_list = 0;
int bisect_show_vars = 0; int bisect_show_vars = 0;
int bisect_find_all = 0; int bisect_find_all = 0;
int bisect_show_all = 0;
int quiet = 0; int quiet = 0;
git_config(git_default_config, NULL); git_config(git_default_config, NULL);
@@ -334,7 +332,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
if (!strcmp(arg, "--bisect-all")) { if (!strcmp(arg, "--bisect-all")) {
bisect_list = 1; bisect_list = 1;
bisect_find_all = 1; bisect_find_all = 1;
bisect_show_all = 1; info.bisect_show_flags = BISECT_SHOW_ALL;
revs.show_decorations = 1; revs.show_decorations = 1;
continue; continue;
} }
@@ -387,8 +385,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
bisect_find_all); bisect_find_all);
if (bisect_show_vars) if (bisect_show_vars)
return show_bisect_vars(&info, reaches, all, return show_bisect_vars(&info, reaches, all);
bisect_show_all ? BISECT_SHOW_ALL : 0);
} }
traverse_commit_list(&revs, traverse_commit_list(&revs,