Teach git-status to report the sequencer state in short form
using a new --sequencer (-S) switch. Output zero or more
simple state token strings indicating the deduced state of the
git sequencer.
Sequencer state info tokens are displayed in "short"
form. 'git status --short -S' will show the normal short
status including the sequencer tokens. 'git status -S'
without --short will show only the new sequencer information
tokens in whatever the requested format is.
State token strings which may be emitted and their meanings:
merge a merge is in progress
am an am is in progress
am-is-empty the am patch is empty
rebase a rebase is in progress
rebase-interactive an interactive rebase is in progress
cherry-pick a cherry-pick is in progress
bisect a bisect is in progress
conflicted there are unresolved conflicts
commit-pending a commit operation is waiting to be completed
splitting interactive rebase, commit is being split
I also considered adding these tokens, but I decided it was not
appropriate since these changes are not sequencer-related. But
it is possible I am being too short-sighted or have chosen the
switch name poorly.
changed-index Changes exist in the index
changed-files Changes exist in the working directory
untracked New files exist in the working directory
Signed-off-by: Phil Hord <[email protected]>
---
Documentation/git-status.txt | 20 ++++++++++++++++++++
builtin/commit.c | 14 ++++++++++++++
wt-status.c | 34 ++++++++++++++++++++++++++++++++++
wt-status.h | 7 +++++++
4 files changed, 75 insertions(+)
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 67e5f53..bdacf08 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -38,6 +38,26 @@ OPTIONS
across git versions and regardless of user configuration. See
below for details.
+-S::
+--sequence::
+ Show the git sequencer status. This shows zero or more words
+ describing the state of the git sequencer. If --short is also
+ given, the words are shown at the beginning of the short-format
+ display after the one-line branch information, if present. If
+ --short is not given, then only the sequencer words are shown
+ with no other status information.
++
+ merge a merge is in progress
+ am an am is in progress
+ am-is-empty the am patch is empty
+ rebase a rebase is in progress
+ rebase-interactive an interactive rebase is in progress
+ cherry-pick a cherry-pick is in progress
+ bisect a bisect is in progress
+ conflicted there are unresolved conflicts
+ commit-pending a commit operation is waiting to be completed
+ splitting interactive rebase, commit is being split
+
-u[<mode>]::
--untracked-files[=<mode>]::
Show untracked files.
diff --git a/builtin/commit.c b/builtin/commit.c
index a17a5df..bf16cc6 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1060,6 +1060,11 @@ static int parse_and_validate_options(int argc, const
char *argv[],
if (s->null_termination && status_format == STATUS_FORMAT_LONG)
status_format = STATUS_FORMAT_PORCELAIN;
+ if (s->show_sequencer && status_format != STATUS_FORMAT_SHORT) {
+ s->show_sequencer = SHOW_SEQUENCER_ONLY;
+ if (status_format == STATUS_FORMAT_LONG)
+ status_format = STATUS_FORMAT_SHORT;
+ }
if (status_format != STATUS_FORMAT_LONG)
dry_run = 1;
@@ -1156,6 +1161,8 @@ int cmd_status(int argc, const char **argv, const char
*prefix)
N_("show status concisely"), STATUS_FORMAT_SHORT),
OPT_BOOLEAN('b', "branch", &s.show_branch,
N_("show branch information")),
+ OPT_SET_INT('S', "sequencer", &s.show_sequencer,
+ N_("show sequencer state information"),
SHOW_SEQUENCER_YES),
OPT_SET_INT(0, "porcelain", &status_format,
N_("machine-readable output"),
STATUS_FORMAT_PORCELAIN),
@@ -1188,6 +1195,11 @@ int cmd_status(int argc, const char **argv, const char
*prefix)
if (s.null_termination && status_format == STATUS_FORMAT_LONG)
status_format = STATUS_FORMAT_PORCELAIN;
+ if (s.show_sequencer && status_format != STATUS_FORMAT_SHORT) {
+ s.show_sequencer = SHOW_SEQUENCER_ONLY;
+ if (status_format == STATUS_FORMAT_LONG)
+ status_format = STATUS_FORMAT_SHORT;
+ }
handle_untracked_files_arg(&s);
if (show_ignored_in_status)
@@ -1384,6 +1396,8 @@ int cmd_commit(int argc, const char **argv, const char
*prefix)
OPT_SET_INT(0, "short", &status_format, N_("show status
concisely"),
STATUS_FORMAT_SHORT),
OPT_BOOLEAN(0, "branch", &s.show_branch, N_("show branch
information")),
+ OPT_SET_INT(0, "sequencer", &s.show_sequencer,
+ N_("show sequencer state information"),
SHOW_SEQUENCER_YES),
OPT_SET_INT(0, "porcelain", &status_format,
N_("machine-readable output"),
STATUS_FORMAT_PORCELAIN),
OPT_BOOLEAN('z', "null", &s.null_termination,
diff --git a/wt-status.c b/wt-status.c
index a888120..71da1fb 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1201,6 +1201,33 @@ static void wt_shortstatus_print_tracking(struct
wt_status *s)
fputc(s->null_termination ? '\0' : '\n', s->fp);
}
+static void wt_print_token(struct wt_status *s, const char *token, int active)
+{
+ if (active) {
+ color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## %s",
prefix, token);
+ fputc(s->null_termination ? '\0' : '\n', s->fp);
+ }
+}
+
+static void wt_sequencer_print(struct wt_status *s)
+{
+ struct wt_status_state state;
+
+ wt_status_get_state(s, &state);
+
+ wt_print_token(s, "merge", state.merge_in_progress);
+ wt_print_token(s, "am", state.am_in_progress);
+ wt_print_token(s, "rebase", state.rebase_in_progress);
+ wt_print_token(s, "rebase-interactive",
state.rebase_interactive_in_progress);
+ wt_print_token(s, "cherry-pick", state.cherry_pick_in_progress);
+ wt_print_token(s, "bisect", state.bisect_in_progress);
+ wt_print_token(s, "am-empty", state.am_empty_patch);
+
+ wt_print_token(s, "conflicted", state.has_unmerged);
+ wt_print_token(s, "commit-pending", state.commit_is_pending);
+ wt_print_token(s, "splitting", state.split_in_progress);
+}
+
void wt_shortstatus_print(struct wt_status *s)
{
int i;
@@ -1208,6 +1235,13 @@ void wt_shortstatus_print(struct wt_status *s)
if (s->show_branch)
wt_shortstatus_print_tracking(s);
+ if (s->show_sequencer)
+ {
+ wt_sequencer_print(s);
+ if (s->show_sequencer == SHOW_SEQUENCER_ONLY)
+ return;
+ }
+
for (i = 0; i < s->change.nr; i++) {
struct wt_status_change_data *d;
struct string_list_item *it;
diff --git a/wt-status.h b/wt-status.h
index 0b866a2..df4b36d 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -24,6 +24,12 @@ enum untracked_status_type {
SHOW_ALL_UNTRACKED_FILES
};
+enum sequencer_status_type {
+ SHOW_SEQUENCER_NO=0,
+ SHOW_SEQUENCER_YES,
+ SHOW_SEQUENCER_ONLY
+};
+
/* from where does this commit originate */
enum commit_whence {
FROM_COMMIT, /* normal */
@@ -59,6 +65,7 @@ struct wt_status {
unsigned colopts;
int null_termination;
int show_branch;
+ enum sequencer_status_type show_sequencer;
/* These are computed during processing of the individual sections */
int commitable;
--
1.8.0.3.gde9c7d5.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
