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

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>

diff --git a/bisect.c b/bisect.c
index 4d2a150df2da769a20a70b909fdc905fc5000583..58f7e6f7738def184072247f934cce06d349c91d 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -540,6 +540,7 @@ int bisect_next_vars(const char *prefix)
 
        memset(&info, 0, sizeof(info));
        info.revs = &revs;
 
        memset(&info, 0, sizeof(info));
        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,
                                      !!skipped_sha1_nr);
 
        revs.commits = find_bisection(revs.commits, &reaches, &all,
                                      !!skipped_sha1_nr);
 

-       return show_bisect_vars(&info, reaches, all,
-                               BISECT_SHOW_TRIED | BISECT_SHOW_STRINGED);
+       return show_bisect_vars(&info, reaches, all);

 }
 }

diff --git a/bisect.h b/bisect.h
index b1c334d3492ca9097f97d72487ca531b4244d1ec..fdba9138773f6f6a4f36655f81965e955e79b3bc 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -9,20 +9,20 @@ extern struct commit_list *filter_skipped(struct commit_list *list,
                                          struct commit_list **tried,
                                          int show_all);
 
                                          struct commit_list **tried,
                                          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_TRIED      (1<<1)
 #define BISECT_SHOW_STRINGED   (1<<2)
 
 struct rev_list_info {
        struct rev_info *revs;
 #define BISECT_SHOW_ALL                (1<<0)
 #define BISECT_SHOW_TRIED      (1<<1)
 #define BISECT_SHOW_STRINGED   (1<<2)
 
 struct rev_list_info {
        struct rev_info *revs;

+       int bisect_show_flags;

        int show_timestamp;
        int hdr_termination;
        const char *header_prefix;
 };
 
        int show_timestamp;
        int hdr_termination;
        const char *header_prefix;
 };
 

-extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all,
-                           int flags);
+extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all);

 
 extern int bisect_next_vars(const char *prefix);
 
 
 extern int bisect_next_vars(const char *prefix);
 

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 244b73eaeb7a985ea8f73acbb99ffe930df9f785..193993cf4494aca98d5e57ce80bc2c99b5cba948 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -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 flags)
+int show_bisect_vars(struct rev_list_info *info, int reaches, int all)

 {
 {

-       int cnt;
+       int cnt, flags = info->bisect_show_flags;

        char hex[41] = "", *format;
        struct commit_list *tried;
        struct rev_info *revs = info->revs;
        char hex[41] = "", *format;
        struct commit_list *tried;
        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_show_vars = 0;
        int bisect_find_all = 0;
        int bisect_list = 0;
        int bisect_show_vars = 0;
        int bisect_find_all = 0;

-       int bisect_show_all = 0;

        int quiet = 0;
 
        git_config(git_default_config, NULL);
        int quiet = 0;
 
        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")) {
                        bisect_list = 1;
                        bisect_find_all = 1;
                if (!strcmp(arg, "--bisect-all")) {
                        bisect_list = 1;
                        bisect_find_all = 1;

-                       bisect_show_all = 1;
+                       info.bisect_show_flags = BISECT_SHOW_ALL;

                        revs.show_decorations = 1;
                        continue;
                }
                        revs.show_decorations = 1;
                        continue;
                }


@@ -387,8 +385,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
                                              bisect_find_all);
 
                if (bisect_show_vars)
                                              bisect_find_all);
 
                if (bisect_show_vars)

-                       return show_bisect_vars(&info, reaches, all,
-                                               bisect_show_all ? BISECT_SHOW_ALL : 0);
+                       return show_bisect_vars(&info, reaches, all);

        }
 
        traverse_commit_list(&revs,
        }
 
        traverse_commit_list(&revs,