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

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>

diff --git a/bisect.c b/bisect.c
index 3279fb12b2abcdd90fd58d30d1694f9d7a0d36a6..285bf146c13c8be387c7254ec756c0a78c89239e 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -547,5 +547,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(&revs, reaches, all, 0, 1);
+       return show_bisect_vars(&revs, reaches, all, BISECT_SHOW_TRIED);

 }
 }

diff --git a/bisect.h b/bisect.h
index 05eea175f792ad3944b6e6584c4380318e4b2489..b9aa88482eea7b797d978b58b99aba9a4f059ccc 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -9,13 +9,17 @@ 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 */
+#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
  * static "revs" from this file.
  */
 extern int show_bisect_vars(struct rev_info *revs, int reaches, int all,
  * from outside "builtin-rev-list.c" as otherwise it would use
  * static "revs" from this file.
  */
 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);
 

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 925d64356c1ece431bdc131531e7a8239635dd17..69dca631d9fe2480af544acfb3a2b1880dedb934 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -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_all, int show_tried)
+int show_bisect_vars(struct rev_info *revs, int reaches, int all, int flags)

 {
        int cnt;
        char hex[41] = "";
        struct commit_list *tried;
 
 {
        int cnt;
        char hex[41] = "";
        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)
                strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1));
 
        if (revs->commits)
                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);
                printf("------\n");
        }
 
                traverse_commit_list(revs, show_commit, show_object);
                printf("------\n");
        }
 

-       if (show_tried)
+       if (flags & BISECT_SHOW_TRIED)

                show_tried_revs(tried);
        printf("bisect_rev=%s\n"
               "bisect_nr=%d\n"
                show_tried_revs(tried);
        printf("bisect_rev=%s\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)
                        return show_bisect_vars(&revs, reaches, all,
 
                if (bisect_show_vars)
                        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,