mirror of
https://github.com/git/git.git
synced 2024-12-19 06:43:52 +08:00
4d2292e9a9
The current code reads the config and command-line options into a separate "colopts" variable, and then copies the contents of that variable into the "struct wt_status". We can eliminate the extra variable and copy just write straight into the wt_status struct. This simplifies the "status" code a little bit. Unfortunately, it makes the "commit" code one line more complex; a side effect of the separate variable was that "commit" did not copy the colopts variable, so any column.status configuration had no effect. The result still ends up cleaner, though. In the previous version, it was unclear whether commit simply forgot to copy the colopt variable, or whether it was intentional. Now it explicitly turns off column options. Furthermore, if commit later learns to respect column.status, this will make the end result simpler. I punted on just adding that feature now, because it was sufficiently non-obvious that it should not go into a refactoring patch. Signed-off-by: Jeff King <peff@peff.net>
89 lines
2.1 KiB
C
89 lines
2.1 KiB
C
#ifndef STATUS_H
|
|
#define STATUS_H
|
|
|
|
#include <stdio.h>
|
|
#include "string-list.h"
|
|
#include "color.h"
|
|
|
|
enum color_wt_status {
|
|
WT_STATUS_HEADER = 0,
|
|
WT_STATUS_UPDATED,
|
|
WT_STATUS_CHANGED,
|
|
WT_STATUS_UNTRACKED,
|
|
WT_STATUS_NOBRANCH,
|
|
WT_STATUS_UNMERGED,
|
|
WT_STATUS_LOCAL_BRANCH,
|
|
WT_STATUS_REMOTE_BRANCH,
|
|
WT_STATUS_ONBRANCH,
|
|
WT_STATUS_MAXSLOT
|
|
};
|
|
|
|
enum untracked_status_type {
|
|
SHOW_NO_UNTRACKED_FILES,
|
|
SHOW_NORMAL_UNTRACKED_FILES,
|
|
SHOW_ALL_UNTRACKED_FILES
|
|
};
|
|
|
|
/* from where does this commit originate */
|
|
enum commit_whence {
|
|
FROM_COMMIT, /* normal */
|
|
FROM_MERGE, /* commit came from merge */
|
|
FROM_CHERRY_PICK /* commit came from cherry-pick */
|
|
};
|
|
|
|
struct wt_status_change_data {
|
|
int worktree_status;
|
|
int index_status;
|
|
int stagemask;
|
|
char *head_path;
|
|
unsigned dirty_submodule : 2;
|
|
unsigned new_submodule_commits : 1;
|
|
};
|
|
|
|
struct wt_status {
|
|
int is_initial;
|
|
char *branch;
|
|
const char *reference;
|
|
const char **pathspec;
|
|
int verbose;
|
|
int amend;
|
|
enum commit_whence whence;
|
|
int nowarn;
|
|
int use_color;
|
|
int relative_paths;
|
|
int submodule_summary;
|
|
int show_ignored_files;
|
|
enum untracked_status_type show_untracked_files;
|
|
const char *ignore_submodule_arg;
|
|
char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN];
|
|
unsigned colopts;
|
|
int null_termination;
|
|
int show_branch;
|
|
|
|
/* These are computed during processing of the individual sections */
|
|
int commitable;
|
|
int workdir_dirty;
|
|
const char *index_file;
|
|
FILE *fp;
|
|
const char *prefix;
|
|
struct string_list change;
|
|
struct string_list untracked;
|
|
struct string_list ignored;
|
|
};
|
|
|
|
void wt_status_prepare(struct wt_status *s);
|
|
void wt_status_print(struct wt_status *s);
|
|
void wt_status_collect(struct wt_status *s);
|
|
|
|
void wt_shortstatus_print(struct wt_status *s);
|
|
void wt_porcelain_print(struct wt_status *s);
|
|
|
|
void status_printf_ln(struct wt_status *s, const char *color, const char *fmt, ...)
|
|
;
|
|
void status_printf(struct wt_status *s, const char *color, const char *fmt, ...)
|
|
;
|
|
void status_printf_more(struct wt_status *s, const char *color, const char *fmt, ...)
|
|
__attribute__((format(printf, 3, 4)));
|
|
|
|
#endif /* STATUS_H */
|