status: print per-file porcelain v2 status data
Print per-file information in porcelain v2 format. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
Jeff Hostetler
Junio C Hamano
parent
1ecdecce62
commit
24959bad5d
285
wt-status.c
285
wt-status.c
|
|
@ -1812,6 +1812,289 @@ static void wt_porcelain_print(struct wt_status *s)
|
||||||
wt_shortstatus_print(s);
|
wt_shortstatus_print(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Convert various submodule status values into a
|
||||||
|
* fixed-length string of characters in the buffer provided.
|
||||||
|
*/
|
||||||
|
static void wt_porcelain_v2_submodule_state(
|
||||||
|
struct wt_status_change_data *d,
|
||||||
|
char sub[5])
|
||||||
|
{
|
||||||
|
if (S_ISGITLINK(d->mode_head) ||
|
||||||
|
S_ISGITLINK(d->mode_index) ||
|
||||||
|
S_ISGITLINK(d->mode_worktree)) {
|
||||||
|
sub[0] = 'S';
|
||||||
|
sub[1] = d->new_submodule_commits ? 'C' : '.';
|
||||||
|
sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
|
||||||
|
sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
|
||||||
|
} else {
|
||||||
|
sub[0] = 'N';
|
||||||
|
sub[1] = '.';
|
||||||
|
sub[2] = '.';
|
||||||
|
sub[3] = '.';
|
||||||
|
}
|
||||||
|
sub[4] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Fix-up changed entries before we print them.
|
||||||
|
*/
|
||||||
|
static void wt_porcelain_v2_fix_up_changed(
|
||||||
|
struct string_list_item *it,
|
||||||
|
struct wt_status *s)
|
||||||
|
{
|
||||||
|
struct wt_status_change_data *d = it->util;
|
||||||
|
|
||||||
|
if (!d->index_status) {
|
||||||
|
/*
|
||||||
|
* This entry is unchanged in the index (relative to the head).
|
||||||
|
* Therefore, the collect_updated_cb was never called for this
|
||||||
|
* entry (during the head-vs-index scan) and so the head column
|
||||||
|
* fields were never set.
|
||||||
|
*
|
||||||
|
* We must have data for the index column (from the
|
||||||
|
* index-vs-worktree scan (otherwise, this entry should not be
|
||||||
|
* in the list of changes)).
|
||||||
|
*
|
||||||
|
* Copy index column fields to the head column, so that our
|
||||||
|
* output looks complete.
|
||||||
|
*/
|
||||||
|
assert(d->mode_head == 0);
|
||||||
|
d->mode_head = d->mode_index;
|
||||||
|
oidcpy(&d->oid_head, &d->oid_index);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!d->worktree_status) {
|
||||||
|
/*
|
||||||
|
* This entry is unchanged in the worktree (relative to the index).
|
||||||
|
* Therefore, the collect_changed_cb was never called for this entry
|
||||||
|
* (during the index-vs-worktree scan) and so the worktree column
|
||||||
|
* fields were never set.
|
||||||
|
*
|
||||||
|
* We must have data for the index column (from the head-vs-index
|
||||||
|
* scan).
|
||||||
|
*
|
||||||
|
* Copy the index column fields to the worktree column so that
|
||||||
|
* our output looks complete.
|
||||||
|
*
|
||||||
|
* Note that we only have a mode field in the worktree column
|
||||||
|
* because the scan code tries really hard to not have to compute it.
|
||||||
|
*/
|
||||||
|
assert(d->mode_worktree == 0);
|
||||||
|
d->mode_worktree = d->mode_index;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Print porcelain v2 info for tracked entries with changes.
|
||||||
|
*/
|
||||||
|
static void wt_porcelain_v2_print_changed_entry(
|
||||||
|
struct string_list_item *it,
|
||||||
|
struct wt_status *s)
|
||||||
|
{
|
||||||
|
struct wt_status_change_data *d = it->util;
|
||||||
|
struct strbuf buf_index = STRBUF_INIT;
|
||||||
|
struct strbuf buf_head = STRBUF_INIT;
|
||||||
|
const char *path_index = NULL;
|
||||||
|
const char *path_head = NULL;
|
||||||
|
char key[3];
|
||||||
|
char submodule_token[5];
|
||||||
|
char sep_char, eol_char;
|
||||||
|
|
||||||
|
wt_porcelain_v2_fix_up_changed(it, s);
|
||||||
|
wt_porcelain_v2_submodule_state(d, submodule_token);
|
||||||
|
|
||||||
|
key[0] = d->index_status ? d->index_status : '.';
|
||||||
|
key[1] = d->worktree_status ? d->worktree_status : '.';
|
||||||
|
key[2] = 0;
|
||||||
|
|
||||||
|
if (s->null_termination) {
|
||||||
|
/*
|
||||||
|
* In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
|
||||||
|
* A single NUL character separates them.
|
||||||
|
*/
|
||||||
|
sep_char = '\0';
|
||||||
|
eol_char = '\0';
|
||||||
|
path_index = it->string;
|
||||||
|
path_head = d->head_path;
|
||||||
|
} else {
|
||||||
|
/*
|
||||||
|
* Path(s) are C-quoted if necessary. Current path is ALWAYS first.
|
||||||
|
* The source path is only present when necessary.
|
||||||
|
* A single TAB separates them (because paths can contain spaces
|
||||||
|
* which are not escaped and C-quoting does escape TAB characters).
|
||||||
|
*/
|
||||||
|
sep_char = '\t';
|
||||||
|
eol_char = '\n';
|
||||||
|
path_index = quote_path(it->string, s->prefix, &buf_index);
|
||||||
|
if (d->head_path)
|
||||||
|
path_head = quote_path(d->head_path, s->prefix, &buf_head);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (path_head)
|
||||||
|
fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
|
||||||
|
key, submodule_token,
|
||||||
|
d->mode_head, d->mode_index, d->mode_worktree,
|
||||||
|
oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
|
||||||
|
key[0], d->score,
|
||||||
|
path_index, sep_char, path_head, eol_char);
|
||||||
|
else
|
||||||
|
fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
|
||||||
|
key, submodule_token,
|
||||||
|
d->mode_head, d->mode_index, d->mode_worktree,
|
||||||
|
oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
|
||||||
|
path_index, eol_char);
|
||||||
|
|
||||||
|
strbuf_release(&buf_index);
|
||||||
|
strbuf_release(&buf_head);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Print porcelain v2 status info for unmerged entries.
|
||||||
|
*/
|
||||||
|
static void wt_porcelain_v2_print_unmerged_entry(
|
||||||
|
struct string_list_item *it,
|
||||||
|
struct wt_status *s)
|
||||||
|
{
|
||||||
|
struct wt_status_change_data *d = it->util;
|
||||||
|
const struct cache_entry *ce;
|
||||||
|
struct strbuf buf_index = STRBUF_INIT;
|
||||||
|
const char *path_index = NULL;
|
||||||
|
int pos, stage, sum;
|
||||||
|
struct {
|
||||||
|
int mode;
|
||||||
|
struct object_id oid;
|
||||||
|
} stages[3];
|
||||||
|
char *key;
|
||||||
|
char submodule_token[5];
|
||||||
|
char unmerged_prefix = 'u';
|
||||||
|
char eol_char = s->null_termination ? '\0' : '\n';
|
||||||
|
|
||||||
|
wt_porcelain_v2_submodule_state(d, submodule_token);
|
||||||
|
|
||||||
|
switch (d->stagemask) {
|
||||||
|
case 1: key = "DD"; break; /* both deleted */
|
||||||
|
case 2: key = "AU"; break; /* added by us */
|
||||||
|
case 3: key = "UD"; break; /* deleted by them */
|
||||||
|
case 4: key = "UA"; break; /* added by them */
|
||||||
|
case 5: key = "DU"; break; /* deleted by us */
|
||||||
|
case 6: key = "AA"; break; /* both added */
|
||||||
|
case 7: key = "UU"; break; /* both modified */
|
||||||
|
default:
|
||||||
|
die("BUG: unhandled unmerged status %x", d->stagemask);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Disregard d.aux.porcelain_v2 data that we accumulated
|
||||||
|
* for the head and index columns during the scans and
|
||||||
|
* replace with the actual stage data.
|
||||||
|
*
|
||||||
|
* Note that this is a last-one-wins for each the individual
|
||||||
|
* stage [123] columns in the event of multiple cache entries
|
||||||
|
* for same stage.
|
||||||
|
*/
|
||||||
|
memset(stages, 0, sizeof(stages));
|
||||||
|
sum = 0;
|
||||||
|
pos = cache_name_pos(it->string, strlen(it->string));
|
||||||
|
assert(pos < 0);
|
||||||
|
pos = -pos-1;
|
||||||
|
while (pos < active_nr) {
|
||||||
|
ce = active_cache[pos++];
|
||||||
|
stage = ce_stage(ce);
|
||||||
|
if (strcmp(ce->name, it->string) || !stage)
|
||||||
|
break;
|
||||||
|
stages[stage - 1].mode = ce->ce_mode;
|
||||||
|
hashcpy(stages[stage - 1].oid.hash, ce->sha1);
|
||||||
|
sum |= (1 << (stage - 1));
|
||||||
|
}
|
||||||
|
if (sum != d->stagemask)
|
||||||
|
die("BUG: observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
|
||||||
|
|
||||||
|
if (s->null_termination)
|
||||||
|
path_index = it->string;
|
||||||
|
else
|
||||||
|
path_index = quote_path(it->string, s->prefix, &buf_index);
|
||||||
|
|
||||||
|
fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
|
||||||
|
unmerged_prefix, key, submodule_token,
|
||||||
|
stages[0].mode, /* stage 1 */
|
||||||
|
stages[1].mode, /* stage 2 */
|
||||||
|
stages[2].mode, /* stage 3 */
|
||||||
|
d->mode_worktree,
|
||||||
|
oid_to_hex(&stages[0].oid), /* stage 1 */
|
||||||
|
oid_to_hex(&stages[1].oid), /* stage 2 */
|
||||||
|
oid_to_hex(&stages[2].oid), /* stage 3 */
|
||||||
|
path_index,
|
||||||
|
eol_char);
|
||||||
|
|
||||||
|
strbuf_release(&buf_index);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Print porcelain V2 status info for untracked and ignored entries.
|
||||||
|
*/
|
||||||
|
static void wt_porcelain_v2_print_other(
|
||||||
|
struct string_list_item *it,
|
||||||
|
struct wt_status *s,
|
||||||
|
char prefix)
|
||||||
|
{
|
||||||
|
struct strbuf buf = STRBUF_INIT;
|
||||||
|
const char *path;
|
||||||
|
char eol_char;
|
||||||
|
|
||||||
|
if (s->null_termination) {
|
||||||
|
path = it->string;
|
||||||
|
eol_char = '\0';
|
||||||
|
} else {
|
||||||
|
path = quote_path(it->string, s->prefix, &buf);
|
||||||
|
eol_char = '\n';
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
|
||||||
|
|
||||||
|
strbuf_release(&buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Print porcelain V2 status.
|
||||||
|
*
|
||||||
|
* [<v2_changed_items>]*
|
||||||
|
* [<v2_unmerged_items>]*
|
||||||
|
* [<v2_untracked_items>]*
|
||||||
|
* [<v2_ignored_items>]*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
static void wt_porcelain_v2_print(struct wt_status *s)
|
||||||
|
{
|
||||||
|
struct wt_status_change_data *d;
|
||||||
|
struct string_list_item *it;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < s->change.nr; i++) {
|
||||||
|
it = &(s->change.items[i]);
|
||||||
|
d = it->util;
|
||||||
|
if (!d->stagemask)
|
||||||
|
wt_porcelain_v2_print_changed_entry(it, s);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < s->change.nr; i++) {
|
||||||
|
it = &(s->change.items[i]);
|
||||||
|
d = it->util;
|
||||||
|
if (d->stagemask)
|
||||||
|
wt_porcelain_v2_print_unmerged_entry(it, s);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < s->untracked.nr; i++) {
|
||||||
|
it = &(s->untracked.items[i]);
|
||||||
|
wt_porcelain_v2_print_other(it, s, '?');
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < s->ignored.nr; i++) {
|
||||||
|
it = &(s->ignored.items[i]);
|
||||||
|
wt_porcelain_v2_print_other(it, s, '!');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void wt_status_print(struct wt_status *s)
|
void wt_status_print(struct wt_status *s)
|
||||||
{
|
{
|
||||||
switch (s->status_format) {
|
switch (s->status_format) {
|
||||||
|
|
@ -1822,7 +2105,7 @@ void wt_status_print(struct wt_status *s)
|
||||||
wt_porcelain_print(s);
|
wt_porcelain_print(s);
|
||||||
break;
|
break;
|
||||||
case STATUS_FORMAT_PORCELAIN_V2:
|
case STATUS_FORMAT_PORCELAIN_V2:
|
||||||
/* TODO */
|
wt_porcelain_v2_print(s);
|
||||||
break;
|
break;
|
||||||
case STATUS_FORMAT_UNSPECIFIED:
|
case STATUS_FORMAT_UNSPECIFIED:
|
||||||
die("BUG: finalize_deferred_config() should have been called");
|
die("BUG: finalize_deferred_config() should have been called");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue