diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-05 08:49:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-06 17:36:53 +0200 |
| commit | 50b7e70f338e54f3534ee1b14c3bdb4c80d0dcf7 (patch) | |
| tree | 9a3a4ccb881d90fc2a03326222d1420526292825 /wt-status.h | |
| parent | diff-index: keep the original index intact (diff) | |
| download | git-50b7e70f338e54f3534ee1b14c3bdb4c80d0dcf7.tar.xz git-50b7e70f338e54f3534ee1b14c3bdb4c80d0dcf7.zip | |
wt-status.c: rework the way changes to the index and work tree are summarized
Introduce a new infrastructure to find and summarize changes in a single
string list, and rewrite wt_status_print_{updated,changed} functions using
it.
The goal of this change is to give more information on conflicted paths in
the status output.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | wt-status.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h index 78add09bd6..82a602b3bb 100644 --- a/wt-status.h +++ b/wt-status.h @@ -2,6 +2,7 @@ #define STATUS_H #include <stdio.h> +#include "string-list.h" enum color_wt_status { WT_STATUS_HEADER, @@ -18,6 +19,13 @@ enum untracked_status_type { }; extern enum untracked_status_type show_untracked_files; +struct wt_status_change_data { + int worktree_status; + int index_status; + int stagemask; + char *head_path; +}; + struct wt_status { int is_initial; char *branch; @@ -33,6 +41,7 @@ struct wt_status { const char *index_file; FILE *fp; const char *prefix; + struct string_list change; }; int git_status_config(const char *var, const char *value, void *cb); @@ -40,5 +49,6 @@ extern int wt_status_use_color; extern int wt_status_relative_paths; 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); #endif /* STATUS_H */ |