Skip to content

status: add --json output format to git status #1937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

status: add --json output format to git status #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion builtin/commit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1540,6 +1540,9 @@ struct repository *repo UNUSED)
OPT_SET_INT(0, "long", &status_format,
N_("show status in long format (default)"),
STATUS_FORMAT_LONG),
OPT_SET_INT(0, "json", &status_format,
N_("show status in JSON format"),
STATUS_FORMAT_JSON),
OPT_BOOL('z', "null", &s.null_termination,
N_("terminate entries with NUL")),
{
Expand Down Expand Up @@ -1603,7 +1606,8 @@ struct repository *repo UNUSED)
prefix, argv);

if (status_format != STATUS_FORMAT_PORCELAIN &&
status_format != STATUS_FORMAT_PORCELAIN_V2)
status_format != STATUS_FORMAT_PORCELAIN_V2 &&
status_format != STATUS_FORMAT_JSON)
progress_flag = REFRESH_PROGRESS;
repo_read_index(the_repository);
refresh_index(the_repository->index,
Expand Down Expand Up @@ -1735,6 +1739,9 @@ int cmd_commit(int argc,
OPT_SET_INT(0, "long", &status_format,
N_("show status in long format (default)"),
STATUS_FORMAT_LONG),
OPT_SET_INT(0, "json", &status_format,
N_("show status in JSON format"),
STATUS_FORMAT_JSON),
OPT_BOOL('z', "null", &s.null_termination,
N_("terminate entries with NUL")),
OPT_BOOL(0, "amend", &amend, N_("amend previous commit")),
Expand Down
98 changes: 98 additions & 0 deletions wt-status.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2564,6 +2564,101 @@ static void wt_porcelain_v2_print(struct wt_status *s)
}
}


static void wt_json_print_string_array(struct wt_status *s, const char *name, struct string_list *list)
{
int i;
fprintf(s->fp, " \"%s\": [", name);
for (i = 0; i < list->nr; i++) {
if (i > 0)
fprintf(s->fp, ", ");
fprintf(s->fp, "\"%s\"", list->items[i].string);
}
fprintf(s->fp, "]");
}

static void wt_json_print_change_array(struct wt_status *s, const char *name, int change_type)
{
int i;
struct string_list files = STRING_LIST_INIT_DUP;

for (i = 0; i < s->change.nr; i++) {
struct wt_status_change_data *d;
struct string_list_item *it;
it = &(s->change.items[i]);
d = it->util;

if ((change_type == WT_STATUS_UPDATED && d->index_status &&
d->index_status != DIFF_STATUS_UNMERGED) ||
(change_type == WT_STATUS_CHANGED && d->worktree_status &&
d->worktree_status != DIFF_STATUS_UNMERGED)) {
string_list_append(&files, it->string);
}
}

wt_json_print_string_array(s, name, &files);
string_list_clear(&files, 0);
}

static void wt_json_print_branch_info(struct wt_status *s)
{
struct branch *branch;
const char *branch_name;
int ahead = 0, behind = 0;

fprintf(s->fp, " \"branch\": {\n");

if (s->branch && !s->is_initial) {
if (!strcmp(s->branch, "HEAD")) {
fprintf(s->fp, " \"current\": \"HEAD\",\n");
fprintf(s->fp, " \"detached\": true");
} else {
if (skip_prefix(s->branch, "refs/heads/", &branch_name)) {
fprintf(s->fp, " \"current\": \"%s\",\n", branch_name);
fprintf(s->fp, " \"detached\": false");

branch = branch_get(branch_name);
if (branch && branch->merge && branch->merge[0] && branch->merge[0]->dst) {
if (!stat_tracking_info(branch, &ahead, &behind, NULL, 0, 0)) {
fprintf(s->fp, ",\n \"ahead\": %d,\n \"behind\": %d", ahead, behind);
}
}
} else {
fprintf(s->fp, " \"current\": \"%s\",\n", s->branch);
fprintf(s->fp, " \"detached\": false");
}
}
} else {
fprintf(s->fp, " \"current\": null,\n");
fprintf(s->fp, " \"detached\": false");
}

fprintf(s->fp, "\n }");
}

static void wt_json_status_print(struct wt_status *s)
{
fprintf(s->fp, "{\n");

wt_json_print_branch_info(s);
fprintf(s->fp, ",\n");

wt_json_print_change_array(s, "staged", WT_STATUS_UPDATED);
fprintf(s->fp, ",\n");

wt_json_print_change_array(s, "unstaged", WT_STATUS_CHANGED);
fprintf(s->fp, ",\n");

wt_json_print_string_array(s, "untracked", &s->untracked);

if (s->ignored.nr > 0) {
fprintf(s->fp, ",\n");
wt_json_print_string_array(s, "ignored", &s->ignored);
}

fprintf(s->fp, "\n}\n");
}

void wt_status_print(struct wt_status *s)
{
trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
Expand All @@ -2583,6 +2678,9 @@ void wt_status_print(struct wt_status *s)
case STATUS_FORMAT_PORCELAIN_V2:
wt_porcelain_v2_print(s);
break;
case STATUS_FORMAT_JSON:
wt_json_status_print(s);
break;
case STATUS_FORMAT_UNSPECIFIED:
BUG("finalize_deferred_config() should have been called");
break;
Expand Down
1 change: 1 addition & 0 deletions wt-status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ enum wt_status_format {
STATUS_FORMAT_SHORT,
STATUS_FORMAT_PORCELAIN,
STATUS_FORMAT_PORCELAIN_V2,
STATUS_FORMAT_JSON,

STATUS_FORMAT_UNSPECIFIED
};
Expand Down
Loading