X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=wt-status.h;h=a0e75177bec925e95b4257811aae0bdee93c41f1;hb=c51f6ceed6a9a436f16f8b4f17eab1a3d17cffed;hp=cd06a4d955208962de6df37cfe1ff452918d12f1;hpb=d249b098893809c6de6e5e20063a22ac2c629ce7;p=git.git

diff --git a/wt-status.h b/wt-status.h
index cd06a4d95..a0e75177b 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -3,9 +3,10 @@
 
 #include <stdio.h>
 #include "string-list.h"
+#include "color.h"
 
 enum color_wt_status {
-	WT_STATUS_HEADER,
+	WT_STATUS_HEADER = 0,
 	WT_STATUS_UPDATED,
 	WT_STATUS_CHANGED,
 	WT_STATUS_UNTRACKED,
@@ -37,6 +38,7 @@ struct wt_status {
 	int relative_paths;
 	int submodule_summary;
 	enum untracked_status_type show_untracked_files;
+	char color_palette[WT_STATUS_UNMERGED+1][COLOR_MAXLEN];
 
 	/* These are computed during processing of the individual sections */
 	int commitable;
@@ -46,11 +48,11 @@ struct wt_status {
 	FILE *fp;
 	const char *prefix;
 	struct string_list change;
+	struct string_list untracked;
 };
 
-int git_status_config(const char *var, const char *value, void *cb);
 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);
-void wt_status_collect_changes(struct wt_status *s);
+void wt_status_collect(struct wt_status *s);
 
 #endif /* STATUS_H */