l10n: fr : v2.26.0 rnd 2

[thirdparty/git.git] / bisect.h

diff --git a/bisect.h b/bisect.h
index 821d16e4ddad71d177190a0e05012c5a509fa17b..8bad8d8391546f347ec91324eca21f74bda8e68f 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -11,14 +11,14 @@ struct repository;
  * Otherwise, it will be either all non-SAMETREE commits or the single
  * best commit, as chosen by `find_all`.
  */
-extern void find_bisection(struct commit_list **list, int *reaches, int *all,
-                          int find_all);
+void find_bisection(struct commit_list **list, int *reaches, int *all,
+                   int find_all);
 
-extern struct commit_list *filter_skipped(struct commit_list *list,
-                                         struct commit_list **tried,
-                                         int show_all,
-                                         int *count,
-                                         int *skipped_first);
+struct commit_list *filter_skipped(struct commit_list *list,
+                                  struct commit_list **tried,
+                                  int show_all,
+                                  int *count,
+                                  int *skipped_first);
 
 #define BISECT_SHOW_ALL                (1<<0)
 #define REV_LIST_QUIET         (1<<1)
@@ -31,14 +31,41 @@ struct rev_list_info {
        const char *header_prefix;
 };
 
-extern int bisect_next_all(struct repository *r,
-                          const char *prefix,
-                          int no_checkout);
+/*
+ * enum bisect_error represents the following return codes:
+ * BISECT_OK: success code. Internally, it means that next
+ * commit has been found (and possibly checked out) and it
+ * should be tested.
+ * BISECT_FAILED error code: default error code.
+ * BISECT_ONLY_SKIPPED_LEFT error code: only skipped
+ * commits left to be tested.
+ * BISECT_MERGE_BASE_CHECK error code: merge base check failed.
+ * BISECT_NO_TESTABLE_COMMIT error code: no testable commit found.
+ * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND early success code:
+ * first term_bad commit found.
+ * BISECT_INTERNAL_SUCCESS_MERGE_BASE early success
+ * code: found merge base that should be tested.
+ * Early success codes BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND and
+ * BISECT_INTERNAL_SUCCESS_MERGE_BASE should be only internal codes.
+ */
+enum bisect_error {
+       BISECT_OK = 0,
+       BISECT_FAILED = -1,
+       BISECT_ONLY_SKIPPED_LEFT = -2,
+       BISECT_MERGE_BASE_CHECK = -3,
+       BISECT_NO_TESTABLE_COMMIT = -4,
+       BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND = -10,
+       BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
+};
+
+enum bisect_error bisect_next_all(struct repository *r,
+                   const char *prefix,
+                   int no_checkout);
 
-extern int estimate_bisect_steps(int all);
+int estimate_bisect_steps(int all);
 
-extern void read_bisect_terms(const char **bad, const char **good);
+void read_bisect_terms(const char **bad, const char **good);
 
-extern int bisect_clean_state(void);
+int bisect_clean_state(void);
 
 #endif