Revert "graph.c: mark private file-scope symbols as static"
This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb. CGit uses these symbols to output the correct HTML around graph elements. Making these symbols private means that CGit cannot be updated to use Git 1.8.0 or newer, so let's not do that. On top of the revert, also add comments so that we avoid reintroducing this problem in the future and suggest to those modifying this API that they might want to discuss it with the CGit developers. Signed-off-by: John Keeping <john@keeping.me.uk> Acked-by: Jason A. Donenfeld <Jason@zx2c4.com> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Mar 4, 2013 at 00:03 UTC
ac751a0b4332268ad9ba69c7dd48768dbdbd25c8
2 files changed
+35
-30
graph.c
+2
-30
@@ -7,34 +7,6 @@
7
8
/* Internal API */
9
10
-/*
11
- * Output the next line for a graph.
12
- * This formats the next graph line into the specified strbuf. It is not
13
- * terminated with a newline.
14
- *
15
- * Returns 1 if the line includes the current commit, and 0 otherwise.
16
- * graph_next_line() will return 1 exactly once for each time
17
- * graph_update() is called.
18
- */
19
-static int graph_next_line(struct git_graph *graph, struct strbuf *sb);
20
-
21
-/*
22
- * Set up a custom scheme for column colors.
23
- *
24
- * The default column color scheme inserts ANSI color escapes to colorize
25
- * the graph. The various color escapes are stored in an array of strings
26
- * where each entry corresponds to a color, except for the last entry,
27
- * which denotes the escape for resetting the color back to the default.
28
- * When generating the graph, strings from this array are inserted before
29
- * and after the various column characters.
30
- *
31
- * This function allows you to enable a custom array of color escapes.
32
- * The 'colors_max' argument is the index of the last "reset" entry.
33
- *
34
- * This functions must be called BEFORE graph_init() is called.
35
- */
36
-static void graph_set_column_colors(const char **colors, unsigned short colors_max);
37
-
10
/*
11
* Output a padding line in the graph.
12
* This is similar to graph_next_line(). However, it is guaranteed to
@@ -90,7 +62,7 @@ enum graph_state {
62
static const char **column_colors;
63
static unsigned short column_colors_max;
64
93
-static void graph_set_column_colors(const char **colors, unsigned short colors_max)
65
+void graph_set_column_colors(const char **colors, unsigned short colors_max)
66
{
67
column_colors = colors;
68
column_colors_max = colors_max;
@@ -1144,7 +1116,7 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
1116
graph_update_state(graph, GRAPH_PADDING);
1117
}
1118
1147
-static int graph_next_line(struct git_graph *graph, struct strbuf *sb)
1119
+int graph_next_line(struct git_graph *graph, struct strbuf *sb)
1120
{
1121
switch (graph->state) {
1122
case GRAPH_PADDING:
graph.h
+33
@@ -4,6 +4,25 @@
4
/* A graph is a pointer to this opaque structure */
5
struct git_graph;
6
7
+/*
8
+ * Set up a custom scheme for column colors.
9
+ *
10
+ * The default column color scheme inserts ANSI color escapes to colorize
11
+ * the graph. The various color escapes are stored in an array of strings
12
+ * where each entry corresponds to a color, except for the last entry,
13
+ * which denotes the escape for resetting the color back to the default.
14
+ * When generating the graph, strings from this array are inserted before
15
+ * and after the various column characters.
16
+ *
17
+ * This function allows you to enable a custom array of color escapes.
18
+ * The 'colors_max' argument is the index of the last "reset" entry.
19
+ *
20
+ * This functions must be called BEFORE graph_init() is called.
21
+ *
22
+ * NOTE: This function isn't used in Git outside graph.c but it is used
23
+ * by CGit (http://git.zx2c4.com/cgit/) to use HTML for colors.
24
+ */
25
+void graph_set_column_colors(const char **colors, unsigned short colors_max);
26
27
/*
28
* Create a new struct git_graph.
@@ -33,6 +52,20 @@ void graph_update(struct git_graph *graph, struct commit *commit);
52
*/
53
int graph_is_commit_finished(struct git_graph const *graph);
54
55
+/*
56
+ * Output the next line for a graph.
57
+ * This formats the next graph line into the specified strbuf. It is not
58
+ * terminated with a newline.
59
+ *
60
+ * Returns 1 if the line includes the current commit, and 0 otherwise.
61
+ * graph_next_line() will return 1 exactly once for each time
62
+ * graph_update() is called.
63
+ *
64
+ * NOTE: This function isn't used in Git outside graph.c but it is used
65
+ * by CGit (http://git.zx2c4.com/cgit/) to wrap HTML around graph lines.
66
+ */
67
+int graph_next_line(struct git_graph *graph, struct strbuf *sb);
68
+
69
70
/*
71
* graph_show_*: helper functions for printing to stdout