{"thread":{"id":"42934","subject":"[PATCH v3 0/8] status: V2 porcelain status","startedAt":"2016-07-26T21:13:45Z","lastAt":"2016-08-02T16:34:00Z","messageCount":13,"participants":["Jeff Hostetler","Jakub Narębski"],"isPatch":true,"patchVersion":3,"patchTotal":8},"messages":[{"id":"292272","messageId":"1469567483-58794-1-git-send-email-git@jeffhostetler.com","threadId":"42934","inReplyTo":null,"subject":"[PATCH v3 0/8] status: V2 porcelain status","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-07-26T21:11:15Z","receivedAt":"2016-07-26T21:13:45Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"This patch series adds porcelain V2 format to status.\nThis provides detailed information about file changes\nand about the current branch.\n\nThe new output is accessed via:\n git status --porcelain=v2 [--branch]\n\nRelative to the v2 patch series, in this v3 patch series\nI have changed the format of the lines for ordinary changes\nto make it easier to distinguish renames and copies from\nnormal entries. I also split the --branch header information\nonto separate lines, since we're not bound by any requirement\nto have a single ## header line. I document the argument\nas --porcelain=v2, but silently also allow --porcelain=2.\n\n\nJeff Hostetler (8):\n status: rename long-format print routines\n status: cleanup API to wt_status_print\n status: support --porcelain[=]\n status: per-file data collection for --porcelain=v2\n status: print per-file porcelain v2 status data\n status: print branch info with --porcelain=v2 --branch\n status: update git-status.txt for --porcelain=v2\n status: tests for --porcelain=v2\n\n Documentation/git-status.txt | 100 +++++++-\n builtin/commit.c | 78 +++---\n t/t7060-wtstatus.sh | 21 ++\n t/t7064-wtstatus-pv2.sh | 585 +++++++++++++++++++++++++++++++++++++++++++\n wt-status.c | 567 ++++++++++++++++++++++++++++++++++++-----\n wt-status.h | 19 +-\n 6 files changed, 1260 insertions(+), 110 deletions(-)\n create mode 100755 t/t7064-wtstatus-pv2.sh\n\n-- \n2.8.0.rc4.17.gac42084.dirty\n\n"},{"id":"292273","messageId":"1469567483-58794-3-git-send-email-git@jeffhostetler.com","threadId":"42934","inReplyTo":"1469567483-58794-1-git-send-email-git@jeffhostetler.com","subject":"[PATCH v3 2/8] status: cleanup API to wt_status_print","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-07-26T21:11:17Z","receivedAt":"2016-07-26T21:13:48Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nRefactor the API between builtin/commit.c and wt-status.[ch].\nHide details of the various wt_*status_print() routines inside\nwt-status.c behind a single (new) wt_status_print() routine\nand eliminate the switch statements from builtin/commit.c\n\nThis will allow us to more easily add new status formats\nand isolate that within wt-status.c\n\nSigned-off-by: Jeff Hostetler \nSigned-off-by: Jeff Hostetler \n---\n builtin/commit.c | 51 +++++++++------------------------------------------\n wt-status.c | 25 ++++++++++++++++++++++---\n wt-status.h | 16 ++++++++++++----\n 3 files changed, 43 insertions(+), 49 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex b80273b..a792deb 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -142,14 +142,7 @@ static int show_ignored_in_status, have_option_m;\n static const char *only_include_assumed;\n static struct strbuf message = STRBUF_INIT;\n \n-static enum status_format {\n-\tSTATUS_FORMAT_NONE = 0,\n-\tSTATUS_FORMAT_LONG,\n-\tSTATUS_FORMAT_SHORT,\n-\tSTATUS_FORMAT_PORCELAIN,\n-\n-\tSTATUS_FORMAT_UNSPECIFIED\n-} status_format = STATUS_FORMAT_UNSPECIFIED;\n+static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;\n \n static int opt_parse_m(const struct option *opt, const char *arg, int unset)\n {\n@@ -500,24 +493,11 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int\n \ts->fp = fp;\n \ts->nowarn = nowarn;\n \ts->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;\n+\ts->status_format = status_format;\n+\ts->ignore_submodule_arg = ignore_submodule_arg;\n \n \twt_status_collect(s);\n-\n-\tswitch (status_format) {\n-\tcase STATUS_FORMAT_SHORT:\n-\t\twt_shortstatus_print(s);\n-\t\tbreak;\n-\tcase STATUS_FORMAT_PORCELAIN:\n-\t\twt_porcelain_print(s);\n-\t\tbreak;\n-\tcase STATUS_FORMAT_UNSPECIFIED:\n-\t\tdie(\"BUG: finalize_deferred_config() should have been called\");\n-\t\tbreak;\n-\tcase STATUS_FORMAT_NONE:\n-\tcase STATUS_FORMAT_LONG:\n-\t\twt_longstatus_print(s);\n-\t\tbreak;\n-\t}\n+\twt_status_print(s);\n \n \treturn s->commitable;\n }\n@@ -1099,7 +1079,7 @@ static const char *read_commit_message(const char *name)\n * is not in effect here.\n */\n static struct status_deferred_config {\n-\tenum status_format status_format;\n+\tenum wt_status_format status_format;\n \tint show_branch;\n } status_deferred_config = {\n \tSTATUS_FORMAT_UNSPECIFIED,\n@@ -1381,6 +1361,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)\n \n \ts.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;\n \ts.ignore_submodule_arg = ignore_submodule_arg;\n+\ts.status_format = status_format;\n+\ts.verbose = verbose;\n+\n \twt_status_collect(&s);\n \n \tif (0 <= fd)\n@@ -1389,23 +1372,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)\n \tif (s.relative_paths)\n \t\ts.prefix = prefix;\n \n-\tswitch (status_format) {\n-\tcase STATUS_FORMAT_SHORT:\n-\t\twt_shortstatus_print(&s);\n-\t\tbreak;\n-\tcase STATUS_FORMAT_PORCELAIN:\n-\t\twt_porcelain_print(&s);\n-\t\tbreak;\n-\tcase STATUS_FORMAT_UNSPECIFIED:\n-\t\tdie(\"BUG: finalize_deferred_config() should have been called\");\n-\t\tbreak;\n-\tcase STATUS_FORMAT_NONE:\n-\tcase STATUS_FORMAT_LONG:\n-\t\ts.verbose = verbose;\n-\t\ts.ignore_submodule_arg = ignore_submodule_arg;\n-\t\twt_longstatus_print(&s);\n-\t\tbreak;\n-\t}\n+\twt_status_print(&s);\n \treturn 0;\n }\n \ndiff --git a/wt-status.c b/wt-status.c\nindex b9a58fd..a9031e4 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -1447,7 +1447,7 @@ static void wt_longstatus_print_state(struct wt_status *s,\n \t\tshow_bisect_in_progress(s, state, state_color);\n }\n \n-void wt_longstatus_print(struct wt_status *s)\n+static void wt_longstatus_print(struct wt_status *s)\n {\n \tconst char *branch_color = color(WT_STATUS_ONBRANCH, s);\n \tconst char *branch_status_color = color(WT_STATUS_HEADER, s);\n@@ -1714,7 +1714,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)\n \tfputc(s->null_termination ? '\\0' : '\\n', s->fp);\n }\n \n-void wt_shortstatus_print(struct wt_status *s)\n+static void wt_shortstatus_print(struct wt_status *s)\n {\n \tint i;\n \n@@ -1746,7 +1746,7 @@ void wt_shortstatus_print(struct wt_status *s)\n \t}\n }\n \n-void wt_porcelain_print(struct wt_status *s)\n+static void wt_porcelain_print(struct wt_status *s)\n {\n \ts->use_color = 0;\n \ts->relative_paths = 0;\n@@ -1754,3 +1754,22 @@ void wt_porcelain_print(struct wt_status *s)\n \ts->no_gettext = 1;\n \twt_shortstatus_print(s);\n }\n+\n+void wt_status_print(struct wt_status *s)\n+{\n+\tswitch (s->status_format) {\n+\tcase STATUS_FORMAT_SHORT:\n+\t\twt_shortstatus_print(s);\n+\t\tbreak;\n+\tcase STATUS_FORMAT_PORCELAIN:\n+\t\twt_porcelain_print(s);\n+\t\tbreak;\n+\tcase STATUS_FORMAT_UNSPECIFIED:\n+\t\tdie(\"BUG: finalize_deferred_config() should have been called\");\n+\t\tbreak;\n+\tcase STATUS_FORMAT_NONE:\n+\tcase STATUS_FORMAT_LONG:\n+\t\twt_longstatus_print(s);\n+\t\tbreak;\n+\t}\n+}\ndiff --git a/wt-status.h b/wt-status.h\nindex 2023a3c..a859a12 100644\n--- a/wt-status.h\n+++ b/wt-status.h\n@@ -43,6 +43,15 @@ struct wt_status_change_data {\n \tunsigned new_submodule_commits : 1;\n };\n \n+ enum wt_status_format {\n+\tSTATUS_FORMAT_NONE = 0,\n+\tSTATUS_FORMAT_LONG,\n+\tSTATUS_FORMAT_SHORT,\n+\tSTATUS_FORMAT_PORCELAIN,\n+\n+\tSTATUS_FORMAT_UNSPECIFIED\n+ };\n+\n struct wt_status {\n \tint is_initial;\n \tchar *branch;\n@@ -66,6 +75,8 @@ struct wt_status {\n \tint show_branch;\n \tint hints;\n \n+\tenum wt_status_format status_format;\n+\n \t/* These are computed during processing of the individual sections */\n \tint commitable;\n \tint workdir_dirty;\n@@ -99,6 +110,7 @@ struct wt_status_state {\n void wt_status_truncate_message_at_cut_line(struct strbuf *);\n void wt_status_add_cut_line(FILE *fp);\n void wt_status_prepare(struct wt_status *s);\n+void wt_status_print(struct wt_status *s);\n void wt_status_collect(struct wt_status *s);\n void wt_status_get_state(struct wt_status_state *state, int get_detached_from);\n int wt_status_check_rebase(const struct worktree *wt,\n@@ -106,10 +118,6 @@ int wt_status_check_rebase(const struct worktree *wt,\n int wt_status_check_bisect(const struct worktree *wt,\n \t\t\t struct wt_status_state *state);\n \n-void wt_longstatus_print(struct wt_status *s);\n-void wt_shortstatus_print(struct wt_status *s);\n-void wt_porcelain_print(struct wt_status *s);\n-\n __attribute__((format (printf, 3, 4)))\n void status_printf_ln(struct wt_status *s, const char *color, const char *fmt, ...);\n __attribute__((format (printf, 3, 4)))\n-- \n2.8.0.rc4.17.gac42084.dirty\n\n"},{"id":"292275","messageId":"1469567483-58794-4-git-send-email-git@jeffhostetler.com","threadId":"42934","inReplyTo":"1469567483-58794-1-git-send-email-git@jeffhostetler.com","subject":"[PATCH v3 3/8] status: support --porcelain[=]","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-07-26T21:11:18Z","receivedAt":"2016-07-26T21:13:56Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nUpdate --porcelain argument to take optional version parameter\nto allow multiple porcelain formats to be supported in the future.\n\nThe token \"v1\" is the default value and indicates the traditional\nporcelain format. (The token \"1\" is an alias for that.)\n\nSigned-off-by: Jeff Hostetler \nSigned-off-by: Jeff Hostetler \n---\n Documentation/git-status.txt | 7 +++++--\n builtin/commit.c | 21 ++++++++++++++++++---\n t/t7060-wtstatus.sh | 21 +++++++++++++++++++++\n 3 files changed, 44 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex e1e8f57..6b1454b 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -32,11 +32,14 @@ OPTIONS\n --branch::\n \tShow the branch and tracking info even in short-format.\n \n---porcelain::\n+--porcelain[=]::\n \tGive the output in an easy-to-parse format for scripts.\n \tThis is similar to the short output, but will remain stable\n \tacross Git versions and regardless of user configuration. See\n \tbelow for details.\n++\n+The version parameter is used to specify the format version.\n+This is optional and defaults to the original version 'v1' format.\n \n --long::\n \tGive the output in the long-format. This is the default.\n@@ -96,7 +99,7 @@ configuration variable documented in linkgit:git-config[1].\n \n -z::\n \tTerminate entries with NUL, instead of LF. This implies\n-\tthe `--porcelain` output format if no other format is given.\n+\tthe `--porcelain=v1` output format if no other format is given.\n \n --column[=]::\n --no-column::\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex a792deb..c3ae2c3 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -144,6 +144,21 @@ static struct strbuf message = STRBUF_INIT;\n \n static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;\n \n+static int opt_parse_porcelain(const struct option *opt, const char *arg, int unset)\n+{\n+\tenum wt_status_format *value = (enum wt_status_format *)opt->value;\n+\tif (unset)\n+\t\t*value = STATUS_FORMAT_NONE;\n+\telse if (!arg)\n+\t\t*value = STATUS_FORMAT_PORCELAIN;\n+\telse if (!strcmp(arg, \"v1\") || !strcmp(arg,\"1\"))\n+\t\t*value = STATUS_FORMAT_PORCELAIN;\n+\telse\n+\t\tdie(\"unsupported porcelain version '%s'\", arg);\n+\n+\treturn 0;\n+}\n+\n static int opt_parse_m(const struct option *opt, const char *arg, int unset)\n {\n \tstruct strbuf *buf = opt->value;\n@@ -1316,9 +1331,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)\n \t\t\t N_(\"show status concisely\"), STATUS_FORMAT_SHORT),\n \t\tOPT_BOOL('b', \"branch\", &s.show_branch,\n \t\t\t N_(\"show branch information\")),\n-\t\tOPT_SET_INT(0, \"porcelain\", &status_format,\n-\t\t\t N_(\"machine-readable output\"),\n-\t\t\t STATUS_FORMAT_PORCELAIN),\n+\t\t{ OPTION_CALLBACK, 0, \"porcelain\", &status_format,\n+\t\t N_(\"version\"), N_(\"machine-readable output\"),\n+\t\t PARSE_OPT_OPTARG, opt_parse_porcelain },\n \t\tOPT_SET_INT(0, \"long\", &status_format,\n \t\t\t N_(\"show status in long format (default)\"),\n \t\t\t STATUS_FORMAT_LONG),\ndiff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh\nindex 44bf1d8..00e0ceb 100755\n--- a/t/t7060-wtstatus.sh\n+++ b/t/t7060-wtstatus.sh\n@@ -228,4 +228,25 @@ test_expect_success 'status --branch with detached HEAD' '\n \ttest_i18ncmp expected actual\n '\n \n+## Duplicate the above test and verify --porcelain=v1 arg parsing.\n+test_expect_success 'status --porcelain=v1 --branch with detached HEAD' '\n+\tgit reset --hard &&\n+\tgit checkout master^0 &&\n+\tgit status --branch --porcelain=v1 >actual &&\n+\tcat >expected <<-EOF &&\n+\t## HEAD (no branch)\n+\t?? .gitconfig\n+\t?? actual\n+\t?? expect\n+\t?? expected\n+\t?? mdconflict/\n+\tEOF\n+\ttest_i18ncmp expected actual\n+'\n+\n+## Verify parser error on invalid --porcelain argument.\n+test_expect_success 'status --porcelain=bogus' '\n+\ttest_must_fail git status --porcelain=bogus\n+'\n+\n test_done\n-- \n2.8.0.rc4.17.gac42084.dirty\n\n"},{"id":"292276","messageId":"1469567483-58794-5-git-send-email-git@jeffhostetler.com","threadId":"42934","inReplyTo":"1469567483-58794-1-git-send-email-git@jeffhostetler.com","subject":"[PATCH v3 4/8] status: per-file data collection for --porcelain=v2","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-07-26T21:11:19Z","receivedAt":"2016-07-26T21:13:58Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nThe output of `git status --porcelain` leaves out many details\nabout the current status that clients might like to have. This\ncan force them to be less efficient as they may need to launch\nsecondary commands (and try to match the logic within git) to\naccumulate this extra information. For example, a GUI IDE might\nwant the file mode to display the correct icon for a changed\nitem (without having to stat it afterwards).\n\nSigned-off-by: Jeff Hostetler \nSigned-off-by: Jeff Hostetler \n---\n builtin/commit.c | 3 +++\n wt-status.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-\n wt-status.h | 4 ++++\n 3 files changed, 69 insertions(+), 1 deletion(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex c3ae2c3..93ce28c 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -153,6 +153,8 @@ static int opt_parse_porcelain(const struct option *opt, const char *arg, int un\n \t\t*value = STATUS_FORMAT_PORCELAIN;\n \telse if (!strcmp(arg, \"v1\") || !strcmp(arg,\"1\"))\n \t\t*value = STATUS_FORMAT_PORCELAIN;\n+\telse if (!strcmp(arg, \"v2\") || !strcmp(arg, \"2\"))\n+\t\t*value = STATUS_FORMAT_PORCELAIN_V2;\n \telse\n \t\tdie(\"unsupported porcelain version '%s'\", arg);\n \n@@ -1104,6 +1106,7 @@ static struct status_deferred_config {\n static void finalize_deferred_config(struct wt_status *s)\n {\n \tint use_deferred_config = (status_format != STATUS_FORMAT_PORCELAIN &&\n+\t\t\t\t status_format != STATUS_FORMAT_PORCELAIN_V2 &&\n \t\t\t\t !s->null_termination);\n \n \tif (s->null_termination) {\ndiff --git a/wt-status.c b/wt-status.c\nindex a9031e4..15d3349 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -434,6 +434,31 @@ static void wt_status_collect_changed_cb(struct diff_queue_struct *q,\n \t\tif (S_ISGITLINK(p->two->mode))\n \t\t\td->new_submodule_commits = !!oidcmp(&p->one->oid,\n \t\t\t\t\t\t\t &p->two->oid);\n+\n+\t\tswitch (p->status) {\n+\t\tcase DIFF_STATUS_ADDED:\n+\t\t\tdie(\"BUG: worktree status add???\");\n+\t\t\tbreak;\n+\n+\t\tcase DIFF_STATUS_DELETED:\n+\t\t\td->mode_index = p->one->mode;\n+\t\t\toidcpy(&d->oid_index, &p->one->oid);\n+\t\t\t/* mode_worktree is zero for a delete. */\n+\t\t\tbreak;\n+\n+\t\tcase DIFF_STATUS_MODIFIED:\n+\t\tcase DIFF_STATUS_TYPE_CHANGED:\n+\t\tcase DIFF_STATUS_UNMERGED:\n+\t\t\td->mode_index = p->one->mode;\n+\t\t\td->mode_worktree = p->two->mode;\n+\t\t\toidcpy(&d->oid_index, &p->one->oid);\n+\t\t\tbreak;\n+\n+\t\tcase DIFF_STATUS_UNKNOWN:\n+\t\t\tdie(\"BUG: worktree status unknown???\");\n+\t\t\tbreak;\n+\t\t}\n+\n \t}\n }\n \n@@ -479,12 +504,36 @@ static void wt_status_collect_updated_cb(struct diff_queue_struct *q,\n \t\tif (!d->index_status)\n \t\t\td->index_status = p->status;\n \t\tswitch (p->status) {\n+\t\tcase DIFF_STATUS_ADDED:\n+\t\t\t/* Leave {mode,oid}_head zero for an add. */\n+\t\t\td->mode_index = p->two->mode;\n+\t\t\toidcpy(&d->oid_index, &p->two->oid);\n+\t\t\tbreak;\n+\t\tcase DIFF_STATUS_DELETED:\n+\t\t\td->mode_head = p->one->mode;\n+\t\t\toidcpy(&d->oid_head, &p->one->oid);\n+\t\t\t/* Leave {mode,oid}_index zero for a delete. */\n+\t\t\tbreak;\n+\t\t\t\n \t\tcase DIFF_STATUS_COPIED:\n \t\tcase DIFF_STATUS_RENAMED:\n \t\t\td->head_path = xstrdup(p->one->path);\n+\t\t\td->score = p->score * 100 / MAX_SCORE;\n+\t\t\t/* fallthru */\n+\t\tcase DIFF_STATUS_MODIFIED:\n+\t\tcase DIFF_STATUS_TYPE_CHANGED:\n+\t\t\td->mode_head = p->one->mode;\n+\t\t\td->mode_index = p->two->mode;\n+\t\t\toidcpy(&d->oid_head, &p->one->oid);\n+\t\t\toidcpy(&d->oid_index, &p->two->oid);\n \t\t\tbreak;\n \t\tcase DIFF_STATUS_UNMERGED:\n \t\t\td->stagemask = unmerged_mask(p->two->path);\n+\t\t\t/*\n+\t\t\t * Don't bother setting {mode,oid}_{head,index} since the print\n+\t\t\t * code will output the stage values directly and not use the\n+\t\t\t * values in these fields.\n+\t\t\t */\n \t\t\tbreak;\n \t\t}\n \t}\n@@ -565,9 +614,18 @@ static void wt_status_collect_changes_initial(struct wt_status *s)\n \t\tif (ce_stage(ce)) {\n \t\t\td->index_status = DIFF_STATUS_UNMERGED;\n \t\t\td->stagemask |= (1 << (ce_stage(ce) - 1));\n+\t\t\t/*\n+\t\t\t * Don't bother setting {mode,oid}_{head,index} since the print\n+\t\t\t * code will output the stage values directly and not use the\n+\t\t\t * values in these fields.\n+\t\t\t */\n \t\t}\n-\t\telse\n+\t\telse {\n \t\t\td->index_status = DIFF_STATUS_ADDED;\n+\t\t\t/* Leave {mode,oid}_head zero for adds. */\n+\t\t\td->mode_index = ce->ce_mode;\n+\t\t\thashcpy(d->oid_index.hash, ce->sha1);\n+\t\t}\n \t}\n }\n \n@@ -1764,6 +1822,9 @@ void wt_status_print(struct wt_status *s)\n \tcase STATUS_FORMAT_PORCELAIN:\n \t\twt_porcelain_print(s);\n \t\tbreak;\n+\tcase STATUS_FORMAT_PORCELAIN_V2:\n+\t\t/* TODO */\n+\t\tbreak;\n \tcase STATUS_FORMAT_UNSPECIFIED:\n \t\tdie(\"BUG: finalize_deferred_config() should have been called\");\n \t\tbreak;\ndiff --git a/wt-status.h b/wt-status.h\nindex a859a12..89a6d43 100644\n--- a/wt-status.h\n+++ b/wt-status.h\n@@ -38,6 +38,9 @@ struct wt_status_change_data {\n \tint worktree_status;\n \tint index_status;\n \tint stagemask;\n+\tint score;\n+\tint mode_head, mode_index, mode_worktree;\n+\tstruct object_id oid_head, oid_index;\n \tchar *head_path;\n \tunsigned dirty_submodule : 2;\n \tunsigned new_submodule_commits : 1;\n@@ -48,6 +51,7 @@ struct wt_status_change_data {\n \tSTATUS_FORMAT_LONG,\n \tSTATUS_FORMAT_SHORT,\n \tSTATUS_FORMAT_PORCELAIN,\n+\tSTATUS_FORMAT_PORCELAIN_V2,\n \n \tSTATUS_FORMAT_UNSPECIFIED\n };\n-- \n2.8.0.rc4.17.gac42084.dirty\n\n"},{"id":"292277","messageId":"1469567483-58794-6-git-send-email-git@jeffhostetler.com","threadId":"42934","inReplyTo":"1469567483-58794-1-git-send-email-git@jeffhostetler.com","subject":"[PATCH v3 5/8] status: print per-file porcelain v2 status data","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-07-26T21:11:20Z","receivedAt":"2016-07-26T21:14:00Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nPrint per-file information in porcelain v2 format.\n\nSigned-off-by: Jeff Hostetler \nSigned-off-by: Jeff Hostetler \n---\n wt-status.c | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-\n 1 file changed, 282 insertions(+), 1 deletion(-)\n\ndiff --git a/wt-status.c b/wt-status.c\nindex 15d3349..46061d4 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -1813,6 +1813,287 @@ static void wt_porcelain_print(struct wt_status *s)\n \twt_shortstatus_print(s);\n }\n \n+/*\n+ * Convert various submodule status values into a\n+ * fixed-length string of characters in the buffer provided.\n+ */\n+static void wt_porcelain_v2_submodule_state(\n+\tstruct wt_status_change_data *d,\n+\tchar sub[5])\n+{\n+\tif (S_ISGITLINK(d->mode_head) ||\n+\t\tS_ISGITLINK(d->mode_index) ||\n+\t\tS_ISGITLINK(d->mode_worktree)) {\n+\t\tsub[0] = 'S';\n+\t\tsub[1] = d->new_submodule_commits ? 'C' : '.';\n+\t\tsub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';\n+\t\tsub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';\n+\t} else {\n+\t\tsub[0] = 'N';\n+\t\tsub[1] = '.';\n+\t\tsub[2] = '.';\n+\t\tsub[3] = '.';\n+\t}\n+\tsub[4] = 0;\n+}\n+\n+/*\n+ * Fix-up changed entries before we print them.\n+ */\n+static void wt_porcelain_v2_fix_up_changed(\n+\tstruct string_list_item *it,\n+\tstruct wt_status *s)\n+{\n+\tstruct wt_status_change_data *d = it->util;\n+\n+\tif (!d->index_status) {\n+\t\t/*\n+\t\t * This entry is unchanged in the index (relative to the head).\n+\t\t * Therefore, the collect_updated_cb was never called for this\n+\t\t * entry (during the head-vs-index scan) and so the head column\n+\t\t * fields were never set.\n+\t\t *\n+\t\t * We must have data for the index column (from the\n+\t\t * index-vs-worktree scan (otherwise, this entry should not be\n+\t\t * in the list of changes)).\n+\t\t *\n+\t\t * Copy index column fields to the head column, so that our\n+\t\t * output looks complete.\n+\t\t */\n+\t\tassert(d->mode_head == 0);\n+\t\td->mode_head = d->mode_index;\n+\t\toidcpy(&d->oid_head, &d->oid_index);\n+\t}\n+\n+\tif (!d->worktree_status) {\n+\t\t/*\n+\t\t * This entry is unchanged in the worktree (relative to the index).\n+\t\t * Therefore, the collect_changed_cb was never called for this entry\n+\t\t * (during the index-vs-worktree scan) and so the worktree column\n+\t\t * fields were never set.\n+\t\t *\n+\t\t * We must have data for the index column (from the head-vs-index\n+\t\t * scan).\n+\t\t *\n+\t\t * Copy the index column fields to the worktree column so that\n+\t\t * our output looks complete.\n+\t\t *\n+\t\t * Note that we only have a mode field in the worktree column\n+\t\t * because the scan code tries really hard to not have to compute it.\n+\t\t */\n+\t\tassert(d->mode_worktree == 0);\n+\t\td->mode_worktree = d->mode_index;\n+\t}\n+}\n+\n+/*\n+ * Print porcelain v2 info for tracked entries with changes.\n+ */\n+static void wt_porcelain_v2_print_changed_entry(\n+\tstruct string_list_item *it,\n+\tstruct wt_status *s)\n+{\n+\tstruct wt_status_change_data *d = it->util;\n+\tstruct strbuf buf_current = STRBUF_INIT;\n+\tstruct strbuf buf_src = STRBUF_INIT;\n+\tconst char *path_current = NULL;\n+\tconst char *path_src = NULL;\n+\tchar key[3];\n+\tchar submodule_token[5];\n+\tchar sep_char, eol_char;\n+\n+\twt_porcelain_v2_fix_up_changed(it, s);\n+\twt_porcelain_v2_submodule_state(d, submodule_token);\n+\n+\tkey[0] = d->index_status ? d->index_status : '.';\n+\tkey[1] = d->worktree_status ? d->worktree_status : '.';\n+\tkey[2] = 0;\n+\n+\tif (s->null_termination) {\n+\t\t/*\n+\t\t * In -z mode, we DO NOT C-Quote pathnames. Current path is ALWAYS first.\n+\t\t * A single NUL character separates them.\n+\t\t */\n+\t\tsep_char = '\\0';\n+\t\teol_char = '\\0';\n+\t\tpath_current = it->string;\n+\t\tpath_src = d->head_path;\n+\t} else {\n+\t\t/*\n+\t\t * Path(s) are C-Quoted if necessary. Current path is ALWAYS first.\n+\t\t * The source path is only present when necessary.\n+\t\t * A single TAB separates them (because paths can contain spaces\n+\t\t * which are not escaped and C-Quoting does escape TAB characters).\n+\t\t */\n+\t\tsep_char = '\\t';\n+\t\teol_char = '\\n';\n+\t\tpath_current = quote_path(it->string, s->prefix, &buf_current);\n+\t\tif (d->head_path)\n+\t\t\tpath_src = quote_path(d->head_path, s->prefix, &buf_src);\n+\t}\n+\n+\tif (path_src)\n+\t\tfprintf(s->fp, \"2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c\",\n+\t\t\t\tkey, submodule_token,\n+\t\t\t\td->mode_head, d->mode_index, d->mode_worktree,\n+\t\t\t\toid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),\n+\t\t\t\tkey[0], d->score,\n+\t\t\t\tpath_current, sep_char, path_src, eol_char);\n+\telse\n+\t\tfprintf(s->fp, \"1 %s %s %06o %06o %06o %s %s %s%c\",\n+\t\t\t\tkey, submodule_token,\n+\t\t\t\td->mode_head, d->mode_index, d->mode_worktree,\n+\t\t\t\toid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),\n+\t\t\t\tpath_current, eol_char);\n+\t\n+\tstrbuf_release(&buf_current);\n+\tstrbuf_release(&buf_src);\n+}\n+\n+/*\n+ * Print porcelain v2 status info for unmerged entries.\n+ */\n+static void wt_porcelain_v2_print_unmerged_entry(\n+\tstruct string_list_item *it,\n+\tstruct wt_status *s)\n+{\n+\tstruct wt_status_change_data *d = it->util;\n+\tconst struct cache_entry *ce;\n+\tstruct strbuf buf_current = STRBUF_INIT;\n+\tconst char *path_current = NULL;\n+\tint pos, stage, sum;\n+\tstruct {\n+\t\tint mode;\n+\t\tstruct object_id oid;\n+\t} stages[3];\n+\tchar *key;\n+\tchar submodule_token[5];\n+\tchar unmerged_prefix = 'u';\n+\tchar eol_char = s->null_termination ? '\\0' : '\\n';\n+\n+\twt_porcelain_v2_submodule_state(d, submodule_token);\n+\n+\tswitch (d->stagemask) {\n+\tcase 1: key = \"DD\"; break; /* both deleted */\n+\tcase 2: key = \"AU\"; break; /* added by us */\n+\tcase 3: key = \"UD\"; break; /* deleted by them */\n+\tcase 4: key = \"UA\"; break; /* added by them */\n+\tcase 5: key = \"DU\"; break; /* deleted by us */\n+\tcase 6: key = \"AA\"; break; /* both added */\n+\tcase 7: key = \"UU\"; break; /* both modified */\n+\t}\n+\n+\t/*\n+\t * Disregard d.aux.porcelain_v2 data that we accumulated\n+\t * for the head and index columns during the scans and\n+\t * replace with the actual stage data.\n+\t *\n+\t * Note that this is a last-one-wins for each the individual\n+\t * stage [123] columns in the event of multiple cache entries\n+\t * for same stage.\n+\t */\n+\tmemset(stages, 0, sizeof(stages));\n+\tsum = 0;\n+\tpos = cache_name_pos(it->string, strlen(it->string));\n+\tassert(pos < 0);\n+\tpos = -pos-1;\n+\twhile (pos < active_nr) {\n+\t\tce = active_cache[pos++];\n+\t\tstage = ce_stage(ce);\n+\t\tif (strcmp(ce->name, it->string) || !stage)\n+\t\t\tbreak;\n+\t\tstages[stage - 1].mode = ce->ce_mode;\n+\t\thashcpy(stages[stage - 1].oid.hash, ce->sha1);\n+\t\tsum |= (1 << (stage - 1));\n+\t}\n+\tif (sum != d->stagemask)\n+\t\tdie(\"BUG: observed stagemask 0x%x != expected stagemask 0x%x\", sum, d->stagemask);\n+\n+\tif (s->null_termination)\n+\t\tpath_current = it->string;\n+\telse\n+\t\tpath_current = quote_path(it->string, s->prefix, &buf_current);\n+\n+\tfprintf(s->fp, \"%c %s %s %06o %06o %06o %06o %s %s %s %s%c\",\n+\t\t\tunmerged_prefix, key, submodule_token,\n+\t\t\tstages[0].mode, /* stage 1 */\n+\t\t\tstages[1].mode, /* stage 2 */\n+\t\t\tstages[2].mode, /* stage 3 */\n+\t\t\td->mode_worktree,\n+\t\t\toid_to_hex(&stages[0].oid), /* stage 1 */\n+\t\t\toid_to_hex(&stages[1].oid), /* stage 2 */\n+\t\t\toid_to_hex(&stages[2].oid), /* stage 3 */\n+\t\t\tpath_current,\n+\t\t\teol_char);\n+\n+\tstrbuf_release(&buf_current);\n+}\n+\n+/*\n+ * Print porcelain V2 status info for untracked and ignored entries.\n+ */\n+static void wt_porcelain_v2_print_other(\n+\tstruct string_list_item *it,\n+\tstruct wt_status *s,\n+\tchar prefix)\n+{\n+\tstruct strbuf buf = STRBUF_INIT;\n+\tconst char *path;\n+\tchar eol_char;\n+\n+\tif (s->null_termination) {\n+\t\tpath = it->string;\n+\t\teol_char = '\\0';\n+\t} else {\n+\t\tpath = quote_path(it->string, s->prefix, &buf);\n+\t\teol_char = '\\n';\n+\t}\n+\n+\tfprintf(s->fp, \"%c %s%c\", prefix, path, eol_char);\n+\n+\tstrbuf_release(&buf);\n+}\n+\n+/*\n+ * Print porcelain V2 status.\n+ *\n+ * []*\n+ * []*\n+ * []*\n+ * []*\n+ *\n+ */\n+void wt_porcelain_v2_print(struct wt_status *s)\n+{\n+\tstruct wt_status_change_data *d;\n+\tstruct string_list_item *it;\n+\tint i;\n+\n+\tfor (i = 0; i < s->change.nr; i++) {\n+\t\tit = &(s->change.items[i]);\n+\t\td = it->util;\n+\t\tif (!d->stagemask)\n+\t\t\twt_porcelain_v2_print_changed_entry(it, s);\n+\t}\n+\n+\tfor (i = 0; i < s->change.nr; i++) {\n+\t\tit = &(s->change.items[i]);\n+\t\td = it->util;\n+\t\tif (d->stagemask)\n+\t\t\twt_porcelain_v2_print_unmerged_entry(it, s);\n+\t}\n+\n+\tfor (i = 0; i < s->untracked.nr; i++) {\n+\t\tit = &(s->untracked.items[i]);\n+\t\twt_porcelain_v2_print_other(it, s, '?');\n+\t}\n+\n+\tfor (i = 0; i < s->ignored.nr; i++) {\n+\t\tit = &(s->ignored.items[i]);\n+\t\twt_porcelain_v2_print_other(it, s, '!');\n+\t}\n+}\n+\n void wt_status_print(struct wt_status *s)\n {\n \tswitch (s->status_format) {\n@@ -1823,7 +2104,7 @@ void wt_status_print(struct wt_status *s)\n \t\twt_porcelain_print(s);\n \t\tbreak;\n \tcase STATUS_FORMAT_PORCELAIN_V2:\n-\t\t/* TODO */\n+\t\twt_porcelain_v2_print(s);\n \t\tbreak;\n \tcase STATUS_FORMAT_UNSPECIFIED:\n \t\tdie(\"BUG: finalize_deferred_config() should have been called\");\n-- \n2.8.0.rc4.17.gac42084.dirty\n\n"},{"id":"292278","messageId":"1469567483-58794-8-git-send-email-git@jeffhostetler.com","threadId":"42934","inReplyTo":"1469567483-58794-1-git-send-email-git@jeffhostetler.com","subject":"[PATCH v3 7/8] status: update git-status.txt for --porcelain=v2","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-07-26T21:11:22Z","receivedAt":"2016-07-26T21:14:02Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nUpdate status manpage to include information about\nporcelain v2 format.\n\nSigned-off-by: Jeff Hostetler \nSigned-off-by: Jeff Hostetler \n---\n Documentation/git-status.txt | 93 ++++++++++++++++++++++++++++++++++++++++++--\n 1 file changed, 90 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex 6b1454b..ed3590d 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -185,10 +185,10 @@ If -b is used the short-format status is preceded by a line\n \n ## branchname tracking info\n \n-Porcelain Format\n-~~~~~~~~~~~~~~~~\n+Porcelain Format Version 1\n+~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n-The porcelain format is similar to the short format, but is guaranteed\n+Version 1 porcelain format is similar to the short format, but is guaranteed\n not to change in a backwards-incompatible way between Git versions or\n based on user configuration. This makes it ideal for parsing by scripts.\n The description of the short format above also describes the porcelain\n@@ -210,6 +210,93 @@ field from the first filename). Third, filenames containing special\n characters are not specially formatted; no quoting or\n backslash-escaping is performed.\n \n+Porcelain Format Version 2\n+~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n+Version 2 format adds more detailed information about the state of\n+the worktree and changed items.\n+\n+If `--branch` is given, a series of header lines are printed with\n+information about the current branch.\n+\n+ Line Notes\n+ --------------------------------------------------------\n+ # branch.oid | (initial) Current commit\n+ # branch.head | (detached) Current branch\n+ # branch.upstream If set\n+ # branch.ab + - If set and present\n+ --------------------------------------------------------\n+\n+A series of lines are then displayed for the tracked entries.\n+Ordinary changed entries have the following format:\n+\n+ 1 \n+\n+Renamed or copied entries have the following format:\n+\n+ 2 \\t\n+\n+ Field Meaning\n+ --------------------------------------------------------\n+ A 2 character field containing the staged and\n+ unstaged XY values described in the short format,\n+ with unchanged indicated by a \".\" rather than\n+ a space.\n+ A 4 character field describing the submodule state.\n+ \"N...\" when the entry is not a submodule.\n+ \"S\" when the entry is a submodule.\n+ is \"C\" if the commit changed; otherwise \".\".\n+ is \"M\" if it has tracked changes; otherwise \".\".\n+ is \"U\" if there are untracked changes; otherwise \".\".\n+ The 6 character octal file mode in the HEAD.\n+ The octal file mode in the index.\n+ The octal file mode in the worktree.\n+ The SHA1 value in the HEAD.\n+ The SHA1 value in the index.\n+ The rename or copied percentage score. For example \"R100\"\n+ or \"C75\".\n+ The current pathname.\n+ The original path. This is only present when the entry\n+ has been renamed or copied.\n+ --------------------------------------------------------\n+\n+Unmerged entries have the following format; the first character is\n+a \"u\" to distinguish from ordinary changed entries.\n+\n+ u

\n+\n+ Field Meaning\n+ --------------------------------------------------------\n+ A 2 character field describing the conflict type\n+ as described in the short format.\n+ A 4 character field describing the submodule state\n+ as described above.\n+ The octal file mode for stage 1.\n+ The octal file mode for stage 2.\n+ The octal file mode for stage 3.\n+ The octal file mode in the worktree.\n+

The SHA1 value for stage 1.\n+

The SHA1 value for stage 2.\n+

The SHA1 value for stage 3.\n+ The current pathname.\n+ --------------------------------------------------------\n+\n+A series of lines are then displayed for untracked and ignored entries.\n+\n+ \n+\n+Where is \"?\" for untracked entries and \"!\" for ignored entries.\n+\n+In all 3 line formats, pathnames will be \"C Quoted\" if they contain\n+any of the following characters: TAB, LF, double quotes, or backslashes.\n+These characters will be replaced with \\t, \\n, \\\", and \\\\, respectively,\n+and the pathname will be enclosed in double quotes.\n+\n+When the `-z` option is given, a NUL (zero) byte follows each pathname;\n+serving as both a separator and line termination. No pathname quoting\n+or backslash escaping is performed. All fields are output in the same\n+order.\n+\n CONFIGURATION\n -------------\n \n-- \n2.8.0.rc4.17.gac42084.dirty\n\n"},{"id":"292279","messageId":"1469567483-58794-7-git-send-email-git@jeffhostetler.com","threadId":"42934","inReplyTo":"1469567483-58794-1-git-send-email-git@jeffhostetler.com","subject":"[PATCH v3 6/8] status: print branch info with --porcelain=v2 --branch","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-07-26T21:11:21Z","receivedAt":"2016-07-26T21:14:04Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nExpand porcelain v2 output to include branch and tracking\nbranch information. This includes the commit SHA, the branch,\nthe upstream branch, and the ahead and behind counts.\n\nSigned-off-by: Jeff Hostetler \nSigned-off-by: Jeff Hostetler \n---\n builtin/commit.c | 5 ++++\n wt-status.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n wt-status.h | 1 +\n 3 files changed, 96 insertions(+)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 93ce28c..b1fd2d1 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -510,6 +510,8 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int\n \ts->fp = fp;\n \ts->nowarn = nowarn;\n \ts->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;\n+\tif (!s->is_initial)\n+\t\thashcpy(s->sha1_commit, sha1);\n \ts->status_format = status_format;\n \ts->ignore_submodule_arg = ignore_submodule_arg;\n \n@@ -1378,6 +1380,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)\n \tfd = hold_locked_index(&index_lock, 0);\n \n \ts.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;\n+\tif (!s.is_initial)\n+\t\thashcpy(s.sha1_commit, sha1);\n+\n \ts.ignore_submodule_arg = ignore_submodule_arg;\n \ts.status_format = status_format;\n \ts.verbose = verbose;\ndiff --git a/wt-status.c b/wt-status.c\nindex 46061d4..592fbd2 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -1814,6 +1814,92 @@ static void wt_porcelain_print(struct wt_status *s)\n }\n \n /*\n+ * Print branch information for porcelain v2 output. These lines\n+ * are printed when the '--branch' parameter is given.\n+ *\n+ * # branch.oid \n+ * # branch.head \n+ * [# branch.upstream \n+ * [# branch.ab + -]]\n+ *\n+ * ::= the current commit hash or the the literal\n+ * \"(initial)\" to indicate an initialized repo\n+ * with no commits.\n+ *\n+ * ::= the current branch name or\n+ * \"(detached)\" literal when detached head or\n+ * \"(unknown)\" when something is wrong.\n+ *\n+ * ::= the upstream branch name, when set.\n+ *\n+ * ::= integer ahead value, when upstream set\n+ * and the commit is present (not gone).\n+ *\n+ * ::= integer behind value, when upstream set\n+ * and commit is present.\n+ *\n+ *\n+ * The end-of-line is defined by the -z flag.\n+ *\n+ * ::= NUL when -z,\n+ * LF when NOT -z.\n+ *\n+ */\n+static void wt_porcelain_v2_print_tracking(struct wt_status *s)\n+{\n+\tstruct branch *branch;\n+\tconst char *base;\n+\tconst char *branch_name;\n+\tstruct wt_status_state state;\n+\tint ab_info, nr_ahead, nr_behind;\n+\tchar eol = s->null_termination ? '\\0' : '\\n';\n+\n+\tmemset(&state, 0, sizeof(state));\n+\twt_status_get_state(&state, s->branch && !strcmp(s->branch, \"HEAD\"));\n+\n+\tfprintf(s->fp, \"# branch.oid %s%c\",\n+\t\t\t(s->is_initial ? \"(initial)\" : sha1_to_hex(s->sha1_commit)),\n+\t\t\teol);\n+\n+\tif (!s->branch)\n+\t\tfprintf(s->fp, \"# branch.head %s%c\", \"(unknown)\", eol);\n+\telse {\n+\t\tif (!strcmp(s->branch, \"HEAD\")) {\n+\t\t\tfprintf(s->fp, \"# branch.head %s%c\", \"(detached)\", eol);\n+\n+\t\t\tif (state.rebase_in_progress || state.rebase_interactive_in_progress)\n+\t\t\t\tbranch_name = state.onto;\n+\t\t\telse if (state.detached_from)\n+\t\t\t\tbranch_name = state.detached_from;\n+\t\t\telse\n+\t\t\t\tbranch_name = \"\";\n+\t\t} else {\n+\t\t\tbranch_name = NULL;\n+\t\t\tskip_prefix(s->branch, \"refs/heads/\", &branch_name);\n+\n+\t\t\tfprintf(s->fp, \"# branch.head %s%c\", branch_name, eol);\n+\t\t}\n+\n+\t\t/* Lookup stats on the upstream tracking branch, if set. */\n+\t\tbranch = branch_get(branch_name);\n+\t\tbase = NULL;\n+\t\tab_info = (stat_tracking_info(branch, &nr_ahead, &nr_behind, &base) == 0);\n+\t\tif (base) {\n+\t\t\tbase = shorten_unambiguous_ref(base, 0);\n+\t\t\tfprintf(s->fp, \"# branch.upstream %s%c\", base, eol);\n+\t\t\tfree((char *)base);\n+\n+\t\t\tif (ab_info)\n+\t\t\t\tfprintf(s->fp, \"# branch.ab +%d -%d%c\", nr_ahead, nr_behind, eol);\n+\t\t}\n+\t}\n+\n+\tfree(state.branch);\n+\tfree(state.onto);\n+\tfree(state.detached_from);\n+}\n+\n+/*\n * Convert various submodule status values into a\n * fixed-length string of characters in the buffer provided.\n */\n@@ -2057,6 +2143,7 @@ static void wt_porcelain_v2_print_other(\n /*\n * Print porcelain V2 status.\n *\n+ * []\n * []*\n * []*\n * []*\n@@ -2069,6 +2156,9 @@ void wt_porcelain_v2_print(struct wt_status *s)\n \tstruct string_list_item *it;\n \tint i;\n \n+\tif (s->show_branch)\n+\t\twt_porcelain_v2_print_tracking(s);\n+\n \tfor (i = 0; i < s->change.nr; i++) {\n \t\tit = &(s->change.items[i]);\n \t\td = it->util;\ndiff --git a/wt-status.h b/wt-status.h\nindex 89a6d43..baedfe3 100644\n--- a/wt-status.h\n+++ b/wt-status.h\n@@ -80,6 +80,7 @@ struct wt_status {\n \tint hints;\n \n \tenum wt_status_format status_format;\n+\tunsigned char sha1_commit[GIT_SHA1_RAWSZ]; /* when not Initial */\n \n \t/* These are computed during processing of the individual sections */\n \tint commitable;\n-- \n2.8.0.rc4.17.gac42084.dirty\n\n"},{"id":"292280","messageId":"1469567483-58794-9-git-send-email-git@jeffhostetler.com","threadId":"42934","inReplyTo":"1469567483-58794-1-git-send-email-git@jeffhostetler.com","subject":"[PATCH v3 8/8] status: tests for --porcelain=v2","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-07-26T21:11:23Z","receivedAt":"2016-07-26T21:14:07Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nUnit tests for porcelain v2 status format.\n\nSigned-off-by: Jeff Hostetler \nSigned-off-by: Jeff Hostetler \n---\n t/t7064-wtstatus-pv2.sh | 585 ++++++++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 585 insertions(+)\n create mode 100755 t/t7064-wtstatus-pv2.sh\n\ndiff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh\nnew file mode 100755\nindex 0000000..ff0dd3d\n--- /dev/null\n+++ b/t/t7064-wtstatus-pv2.sh\n@@ -0,0 +1,585 @@\n+#!/bin/sh\n+\n+test_description='git status --porcelain=v2\n+\n+This test exercises porcelain V2 output for git status.'\n+\n+\n+. ./test-lib.sh\n+\n+test_expect_success setup '\n+\ttest_tick &&\n+\tgit config --local core.autocrlf false &&\n+\techo x >file_x &&\n+\techo y >file_y &&\n+\techo z >file_z &&\n+\tmkdir dir1 &&\n+\techo a >dir1/file_a &&\n+\techo b >dir1/file_b\n+'\n+\n+\n+##################################################################\n+## Confirm output prior to initial commit.\n+##################################################################\n+\n+test_expect_success pre_initial_commit_0 '\n+\tcat >expected <<-EOF &&\n+\t# branch.oid (initial)\n+\t# branch.head master\n+\t? actual\n+\t? dir1/\n+\t? expected\n+\t? file_x\n+\t? file_y\n+\t? file_z\n+\tEOF\n+\n+\tgit status --porcelain=v2 --branch --ignored --untracked-files=normal >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+\n+test_expect_success pre_initial_commit_1 '\n+\tgit add file_x file_y file_z dir1 &&\n+\tSHA_A=`git hash-object -t blob -- dir1/file_a` &&\n+\tSHA_B=`git hash-object -t blob -- dir1/file_b` &&\n+\tSHA_X=`git hash-object -t blob -- file_x` &&\n+\tSHA_Y=`git hash-object -t blob -- file_y` &&\n+\tSHA_Z=`git hash-object -t blob -- file_z` &&\n+\tSHA_ZERO=0000000000000000000000000000000000000000 &&\n+\n+\tcat >expected <<-EOF &&\n+\t# branch.oid (initial)\n+\t# branch.head master\n+\t1 A. N... 000000 100644 100644 $SHA_ZERO $SHA_A dir1/file_a\n+\t1 A. N... 000000 100644 100644 $SHA_ZERO $SHA_B dir1/file_b\n+\t1 A. N... 000000 100644 100644 $SHA_ZERO $SHA_X file_x\n+\t1 A. N... 000000 100644 100644 $SHA_ZERO $SHA_Y file_y\n+\t1 A. N... 000000 100644 100644 $SHA_ZERO $SHA_Z file_z\n+\t? actual\n+\t? expected\n+\tEOF\n+\n+\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+## Try -z on the above\n+test_expect_success pre_initial_commit_2 '\n+\tcat >expected.lf <<-EOF &&\n+\t# branch.oid (initial)\n+\t# branch.head master\n+\t1 A. N... 000000 100644 100644 $SHA_ZERO $SHA_A dir1/file_a\n+\t1 A. N... 000000 100644 100644 $SHA_ZERO $SHA_B dir1/file_b\n+\t1 A. N... 000000 100644 100644 $SHA_ZERO $SHA_X file_x\n+\t1 A. N... 000000 100644 100644 $SHA_ZERO $SHA_Y file_y\n+\t1 A. N... 000000 100644 100644 $SHA_ZERO $SHA_Z file_z\n+\t? actual\n+\t? expected\n+\tEOF\n+\tperl -pe y/\\\\012/\\\\000/ expected &&\n+\trm expected.lf &&\n+\n+\tgit status -z --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+##################################################################\n+## Create first commit. Confirm commit sha in new track header.\n+## Then make some changes on top of it.\n+##################################################################\n+\n+test_expect_success initial_commit_0 '\n+\tgit commit -m initial &&\n+\tH0=`git rev-parse HEAD` &&\n+\tcat >expected <<-EOF &&\n+\t# branch.oid $H0\n+\t# branch.head master\n+\t? actual\n+\t? expected\n+\tEOF\n+\n+\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+\n+test_expect_success initial_commit_1 '\n+\techo x >>file_x &&\n+\tSHA_X1=`git hash-object -t blob -- file_x` &&\n+\trm file_z &&\n+\tH0=`git rev-parse HEAD` &&\n+\n+\tcat >expected <<-EOF &&\n+\t# branch.oid $H0\n+\t# branch.head master\n+\t1 .M N... 100644 100644 100644 $SHA_X $SHA_X file_x\n+\t1 .D N... 100644 100644 000000 $SHA_Z $SHA_Z file_z\n+\t? actual\n+\t? expected\n+\tEOF\n+\n+\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+\n+test_expect_success initial_commit_2 '\n+\tgit add file_x &&\n+\tgit rm file_z &&\n+\tH0=`git rev-parse HEAD` &&\n+\n+\tcat >expected <<-EOF &&\n+\t# branch.oid $H0\n+\t# branch.head master\n+\t1 M. N... 100644 100644 100644 $SHA_X $SHA_X1 file_x\n+\t1 D. N... 100644 000000 000000 $SHA_Z $SHA_ZERO file_z\n+\t? actual\n+\t? expected\n+\tEOF\n+\n+\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+\n+test_expect_success initial_commit_3 '\n+\tgit mv file_y renamed_y &&\n+\tH0=`git rev-parse HEAD` &&\n+\n+\tcat >expected.q <<-EOF &&\n+\t# branch.oid $H0\n+\t# branch.head master\n+\t1 M. N... 100644 100644 100644 $SHA_X $SHA_X1 file_x\n+\t1 D. N... 100644 000000 000000 $SHA_Z $SHA_ZERO file_z\n+\t2 R. N... 100644 100644 100644 $SHA_Y $SHA_Y R100 renamed_yQfile_y\n+\t? actual\n+\t? expected\n+\tEOF\n+\tq_to_tab expected &&\n+\trm expected.q &&\n+\n+\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+\n+##################################################################\n+## Create second commit.\n+##################################################################\n+\n+test_expect_success second_commit_0 '\n+\tgit commit -m second &&\n+\tH1=`git rev-parse HEAD` &&\n+\n+\tcat >expected <<-EOF &&\n+\t# branch.oid $H1\n+\t# branch.head master\n+\t? actual\n+\t? expected\n+\tEOF\n+\n+\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+\n+##################################################################\n+## Ignore a file\n+##################################################################\n+\n+test_expect_success ignore_file_0 '\n+\techo x.ign >.gitignore &&\n+\techo \"ignore me\" >x.ign &&\n+\tH1=`git rev-parse HEAD` &&\n+\n+\tcat >expected <<-EOF &&\n+\t# branch.oid $H1\n+\t# branch.head master\n+\t? .gitignore\n+\t? actual\n+\t? expected\n+\t! x.ign\n+\tEOF\n+\n+\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\trm x.ign &&\n+\trm .gitignore &&\n+\ttest_cmp expected actual\n+'\n+\n+\n+##################################################################\n+## Create some conflicts.\n+##################################################################\n+\n+test_expect_success conflict_AA '\n+\tgit branch AA_A master &&\n+\tgit checkout AA_A &&\n+\techo \"Branch AA_A\" >conflict.txt &&\n+\tSHA_AA_A=`git hash-object -t blob -- conflict.txt` &&\n+\tgit add conflict.txt &&\n+\tgit commit -m \"branch aa_a\" &&\n+\n+\tgit branch AA_B master &&\n+\tgit checkout AA_B &&\n+\techo \"Branch AA_B\" >conflict.txt &&\n+\tSHA_AA_B=`git hash-object -t blob -- conflict.txt` &&\n+\tgit add conflict.txt &&\n+\tgit commit -m \"branch aa_b\" &&\n+\n+\tgit branch AA_M AA_B &&\n+\tgit checkout AA_M &&\n+\ttest_must_fail git merge AA_A &&\n+\n+\tHM=`git rev-parse HEAD` &&\n+\n+\tcat >expected <<-EOF &&\n+\t# branch.oid $HM\n+\t# branch.head AA_M\n+\tu AA N... 000000 100644 100644 100644 $SHA_ZERO $SHA_AA_B $SHA_AA_A conflict.txt\n+\t? actual\n+\t? expected\n+\tEOF\n+\n+\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\tgit reset --hard &&\n+\ttest_cmp expected actual\n+'\n+\n+\n+test_expect_success conflict_UU '\n+\tgit branch UU_ANC master &&\n+\tgit checkout UU_ANC &&\n+\techo \"Ancestor\" >conflict.txt &&\n+\tSHA_UU_ANC=`git hash-object -t blob -- conflict.txt` &&\n+\tgit add conflict.txt &&\n+\tgit commit -m \"UU_ANC\" &&\n+\n+\tgit branch UU_A UU_ANC &&\n+\tgit checkout UU_A &&\n+\techo \"Branch UU_A\" >conflict.txt &&\n+\tSHA_UU_A=`git hash-object -t blob -- conflict.txt` &&\n+\tgit add conflict.txt &&\n+\tgit commit -m \"branch uu_a\" &&\n+\n+\tgit branch UU_B UU_ANC &&\n+\tgit checkout UU_B &&\n+\techo \"Branch UU_B\" >conflict.txt &&\n+\tSHA_UU_B=`git hash-object -t blob -- conflict.txt` &&\n+\tgit add conflict.txt &&\n+\tgit commit -m \"branch uu_b\" &&\n+\n+\tgit branch UU_M UU_B &&\n+\tgit checkout UU_M &&\n+\ttest_must_fail git merge UU_A &&\n+\n+\tHM=`git rev-parse HEAD` &&\n+\n+\tcat >expected <<-EOF &&\n+\t# branch.oid $HM\n+\t# branch.head UU_M\n+\tu UU N... 100644 100644 100644 100644 $SHA_UU_ANC $SHA_UU_B $SHA_UU_A conflict.txt\n+\t? actual\n+\t? expected\n+\tEOF\n+\n+\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\tgit reset --hard &&\n+\ttest_cmp expected actual\n+'\n+\n+\n+##################################################################\n+## Test upstream fields in branch header\n+##################################################################\n+\n+test_expect_success 'upstream_fields_0' '\n+\tgit checkout master &&\n+\tgit clone . sub_repo &&\n+\t(\n+\t\t## Confirm local master tracks remote master.\n+\t\tcd sub_repo &&\n+\t\tHUF=`git rev-parse HEAD` &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HUF\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t# branch.ab +0 -0\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual &&\n+\n+\t\t## Test ahead/behind.\n+\t\techo xyz >file_xyz &&\n+\t\tgit add file_xyz &&\n+\t\tgit commit -m xyz &&\n+\n+\t\tHUF=`git rev-parse HEAD` &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HUF\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t# branch.ab +1 -0\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual &&\n+\n+\t\t## Test upstream-gone case. Fake this by pointing origin/master at\n+\t\t## a non-existing commit.\n+\t\tOLD=`git rev-parse origin/master` &&\n+\t\tNEW=$SHA_ZERO &&\n+\t\tmv .git/packed-refs .git/old-packed-refs &&\n+\t\tsed \"s/$OLD/$NEW/g\" <.git/old-packed-refs >.git/packed-refs &&\n+\n+\t\tHUF=`git rev-parse HEAD` &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HUF\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual\n+\t) &&\n+\trm -rf sub_repo\n+'\n+\n+\n+##################################################################\n+## Test submodule status flags.\n+##################################################################\n+\n+test_expect_success 'submodule_flags_0' '\n+\tgit checkout master &&\n+\tgit clone . sub_repo &&\n+\tgit clone . super_repo &&\n+\t(\tcd super_repo &&\n+\t\tgit submodule add ../sub_repo sub1 &&\n+\n+\t\t## Confirm stage/add of clean submodule.\n+\t\tHMOD=`git hash-object -t blob -- .gitmodules` &&\n+\t\tHSUP=`git rev-parse HEAD` &&\n+\t\tHSUB=$HSUP &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HSUP\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t# branch.ab +0 -0\n+\t\t1 A. N... 000000 100644 100644 $SHA_ZERO $HMOD .gitmodules\n+\t\t1 A. S... 000000 160000 160000 $SHA_ZERO $HSUB sub1\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual\n+\t)\n+'\n+\n+test_expect_success 'submodule_flags_1' '\n+\t(\tcd super_repo &&\n+\t\t## Make some untracked dirt in the submodule.\n+\t\t(\tcd sub1 &&\n+\t\t\techo \"dirt\" >file_in_sub\n+\t\t) &&\n+\n+\t\tHMOD=`git hash-object -t blob -- .gitmodules` &&\n+\t\tHSUP=`git rev-parse HEAD` &&\n+\t\tHSUB=$HSUP &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HSUP\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t# branch.ab +0 -0\n+\t\t1 A. N... 000000 100644 100644 $SHA_ZERO $HMOD .gitmodules\n+\t\t1 AM S..U 000000 160000 160000 $SHA_ZERO $HSUB sub1\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual\n+\t)\n+'\n+\n+test_expect_success 'submodule_flags_2' '\n+\t(\tcd super_repo &&\n+\t\t## Make some staged dirt in the submodule.\n+\t\t(\tcd sub1 &&\n+\t\t\tgit add file_in_sub\n+\t\t) &&\n+\n+\t\tHMOD=`git hash-object -t blob -- .gitmodules` &&\n+\t\tHSUP=`git rev-parse HEAD` &&\n+\t\tHSUB=$HSUP &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HSUP\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t# branch.ab +0 -0\n+\t\t1 A. N... 000000 100644 100644 $SHA_ZERO $HMOD .gitmodules\n+\t\t1 AM S.M. 000000 160000 160000 $SHA_ZERO $HSUB sub1\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual\n+\t)\n+'\n+\n+test_expect_success 'submodule_flags_3' '\n+\t(\tcd super_repo &&\n+\t\t## Make some staged and unstaged dirt (on the same file) in the submodule.\n+\t\t## This does not cause us to get S.MU (because the submodule does not report\n+\t\t## a \"?\" line for the unstaged changes).\n+\t\t(\tcd sub1 &&\n+\t\t\techo \"more dirt\" >>file_in_sub\n+\t\t) &&\n+\n+\t\tHMOD=`git hash-object -t blob -- .gitmodules` &&\n+\t\tHSUP=`git rev-parse HEAD` &&\n+\t\tHSUB=$HSUP &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HSUP\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t# branch.ab +0 -0\n+\t\t1 A. N... 000000 100644 100644 $SHA_ZERO $HMOD .gitmodules\n+\t\t1 AM S.M. 000000 160000 160000 $SHA_ZERO $HSUB sub1\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual\n+\t)\n+'\n+\n+test_expect_success 'submodule_flags_4' '\n+\t(\tcd super_repo &&\n+\t\t## Make some staged and untracked dirt (on different files) in the submodule.\n+\t\t(\tcd sub1 &&\n+\t\t\tgit add file_in_sub &&\n+\t\t\techo \"dirt\" >>another_file_in_sub\n+\t\t) &&\n+\n+\t\tHMOD=`git hash-object -t blob -- .gitmodules` &&\n+\t\tHSUP=`git rev-parse HEAD` &&\n+\t\tHSUB=$HSUP &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HSUP\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t# branch.ab +0 -0\n+\t\t1 A. N... 000000 100644 100644 $SHA_ZERO $HMOD .gitmodules\n+\t\t1 AM S.MU 000000 160000 160000 $SHA_ZERO $HSUB sub1\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual\n+\t)\n+'\n+\n+test_expect_success 'submodule_flags_5' '\n+\t(\tcd super_repo &&\n+\t\t## Make a new commit in the submodule.\n+\t\t(\tcd sub1 &&\n+\t\t\tgit add file_in_sub &&\n+\t\t\trm -f another_file_in_sub &&\n+\t\t\tgit commit -m \"new commit\"\n+\t\t) &&\n+\n+\t\tHMOD=`git hash-object -t blob -- .gitmodules` &&\n+\t\tHSUP=`git rev-parse HEAD` &&\n+\t\tHSUB=$HSUP &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HSUP\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t# branch.ab +0 -0\n+\t\t1 A. N... 000000 100644 100644 $SHA_ZERO $HMOD .gitmodules\n+\t\t1 AM SC.. 000000 160000 160000 $SHA_ZERO $HSUB sub1\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual\n+\t)\n+'\n+\n+test_expect_success 'submodule_flags_6' '\n+\t(\tcd super_repo &&\n+\t\t## Commit the new submodule commit in the super.\n+\t\tgit add sub1 &&\n+\t\tgit commit -m \"super commit\" &&\n+\n+\t\tHSUP=`git rev-parse HEAD` &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HSUP\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t# branch.ab +1 -0\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual\n+\t)\n+'\n+\n+test_expect_success 'submodule_flags_7' '\n+\t(\tcd super_repo &&\n+\t\t## Make some untracked dirt in the submodule.\n+\t\t(\tcd sub1 &&\n+\t\t\techo \"yet more dirt\" >>file_in_sub\n+\t\t) &&\n+\n+\t\tHMOD=`git hash-object -t blob -- .gitmodules` &&\n+\t\tHSUP=`git rev-parse HEAD` &&\n+\t\tHSUB=`(cd sub1 && git rev-parse HEAD)` &&\n+\n+\t\tcat >expected <<-EOF &&\n+\t\t# branch.oid $HSUP\n+\t\t# branch.head master\n+\t\t# branch.upstream origin/master\n+\t\t# branch.ab +1 -0\n+\t\t1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1\n+\t\t? actual\n+\t\t? expected\n+\t\tEOF\n+\n+\t\tgit status --porcelain=v2 --branch --ignored --untracked-files=all >actual &&\n+\t\ttest_cmp expected actual\n+\t)\n+'\n+\n+##################################################################\n+## The end.\n+##################################################################\n+\n+test_done\n-- \n2.8.0.rc4.17.gac42084.dirty\n\n"},{"id":"292281","messageId":"1469567483-58794-2-git-send-email-git@jeffhostetler.com","threadId":"42934","inReplyTo":"1469567483-58794-1-git-send-email-git@jeffhostetler.com","subject":"[PATCH v3 1/8] status: rename long-format print routines","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-07-26T21:11:16Z","receivedAt":"2016-07-26T21:14:11Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nRenamed the various wt_status_print*() routines to be\nwt_longstatus_print*() to make it clear that these\nroutines are only concerned with the normal/long\nstatus output.\n\nThis will hopefully reduce confusion as other status\nformats are added in the future.\n\nSigned-off-by: Jeff Hostetler \nSigned-off-by: Jeff Hostetler \n---\n builtin/commit.c | 4 +-\n wt-status.c | 110 +++++++++++++++++++++++++++----------------------------\n wt-status.h | 2 +-\n 3 files changed, 58 insertions(+), 58 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 1f6dbcd..b80273b 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -515,7 +515,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int\n \t\tbreak;\n \tcase STATUS_FORMAT_NONE:\n \tcase STATUS_FORMAT_LONG:\n-\t\twt_status_print(s);\n+\t\twt_longstatus_print(s);\n \t\tbreak;\n \t}\n \n@@ -1403,7 +1403,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)\n \tcase STATUS_FORMAT_LONG:\n \t\ts.verbose = verbose;\n \t\ts.ignore_submodule_arg = ignore_submodule_arg;\n-\t\twt_status_print(&s);\n+\t\twt_longstatus_print(&s);\n \t\tbreak;\n \t}\n \treturn 0;\ndiff --git a/wt-status.c b/wt-status.c\nindex de62ab2..b9a58fd 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -139,7 +139,7 @@ void wt_status_prepare(struct wt_status *s)\n \ts->display_comment_prefix = 0;\n }\n \n-static void wt_status_print_unmerged_header(struct wt_status *s)\n+static void wt_longstatus_print_unmerged_header(struct wt_status *s)\n {\n \tint i;\n \tint del_mod_conflict = 0;\n@@ -191,7 +191,7 @@ static void wt_status_print_unmerged_header(struct wt_status *s)\n \tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n-static void wt_status_print_cached_header(struct wt_status *s)\n+static void wt_longstatus_print_cached_header(struct wt_status *s)\n {\n \tconst char *c = color(WT_STATUS_HEADER, s);\n \n@@ -207,9 +207,9 @@ static void wt_status_print_cached_header(struct wt_status *s)\n \tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n-static void wt_status_print_dirty_header(struct wt_status *s,\n-\t\t\t\t\t int has_deleted,\n-\t\t\t\t\t int has_dirty_submodules)\n+static void wt_longstatus_print_dirty_header(struct wt_status *s,\n+\t\t\t\t\t int has_deleted,\n+\t\t\t\t\t int has_dirty_submodules)\n {\n \tconst char *c = color(WT_STATUS_HEADER, s);\n \n@@ -226,9 +226,9 @@ static void wt_status_print_dirty_header(struct wt_status *s,\n \tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n-static void wt_status_print_other_header(struct wt_status *s,\n-\t\t\t\t\t const char *what,\n-\t\t\t\t\t const char *how)\n+static void wt_longstatus_print_other_header(struct wt_status *s,\n+\t\t\t\t\t const char *what,\n+\t\t\t\t\t const char *how)\n {\n \tconst char *c = color(WT_STATUS_HEADER, s);\n \tstatus_printf_ln(s, c, \"%s:\", what);\n@@ -238,7 +238,7 @@ static void wt_status_print_other_header(struct wt_status *s,\n \tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n-static void wt_status_print_trailer(struct wt_status *s)\n+static void wt_longstatus_print_trailer(struct wt_status *s)\n {\n \tstatus_printf_ln(s, color(WT_STATUS_HEADER, s), \"%s\", \"\");\n }\n@@ -304,8 +304,8 @@ static int maxwidth(const char *(*label)(int), int minval, int maxval)\n \treturn result;\n }\n \n-static void wt_status_print_unmerged_data(struct wt_status *s,\n-\t\t\t\t\t struct string_list_item *it)\n+static void wt_longstatus_print_unmerged_data(struct wt_status *s,\n+\t\t\t\t\t struct string_list_item *it)\n {\n \tconst char *c = color(WT_STATUS_UNMERGED, s);\n \tstruct wt_status_change_data *d = it->util;\n@@ -331,9 +331,9 @@ static void wt_status_print_unmerged_data(struct wt_status *s,\n \tstrbuf_release(&onebuf);\n }\n \n-static void wt_status_print_change_data(struct wt_status *s,\n-\t\t\t\t\tint change_type,\n-\t\t\t\t\tstruct string_list_item *it)\n+static void wt_longstatus_print_change_data(struct wt_status *s,\n+\t\t\t\t\t int change_type,\n+\t\t\t\t\t struct string_list_item *it)\n {\n \tstruct wt_status_change_data *d = it->util;\n \tconst char *c = color(change_type, s);\n@@ -378,7 +378,7 @@ static void wt_status_print_change_data(struct wt_status *s,\n \t\tstatus = d->worktree_status;\n \t\tbreak;\n \tdefault:\n-\t\tdie(\"BUG: unhandled change_type %d in wt_status_print_change_data\",\n+\t\tdie(\"BUG: unhandled change_type %d in wt_longstatus_print_change_data\",\n \t\t change_type);\n \t}\n \n@@ -627,7 +627,7 @@ void wt_status_collect(struct wt_status *s)\n \twt_status_collect_untracked(s);\n }\n \n-static void wt_status_print_unmerged(struct wt_status *s)\n+static void wt_longstatus_print_unmerged(struct wt_status *s)\n {\n \tint shown_header = 0;\n \tint i;\n@@ -640,17 +640,17 @@ static void wt_status_print_unmerged(struct wt_status *s)\n \t\tif (!d->stagemask)\n \t\t\tcontinue;\n \t\tif (!shown_header) {\n-\t\t\twt_status_print_unmerged_header(s);\n+\t\t\twt_longstatus_print_unmerged_header(s);\n \t\t\tshown_header = 1;\n \t\t}\n-\t\twt_status_print_unmerged_data(s, it);\n+\t\twt_longstatus_print_unmerged_data(s, it);\n \t}\n \tif (shown_header)\n-\t\twt_status_print_trailer(s);\n+\t\twt_longstatus_print_trailer(s);\n \n }\n \n-static void wt_status_print_updated(struct wt_status *s)\n+static void wt_longstatus_print_updated(struct wt_status *s)\n {\n \tint shown_header = 0;\n \tint i;\n@@ -664,14 +664,14 @@ static void wt_status_print_updated(struct wt_status *s)\n \t\t d->index_status == DIFF_STATUS_UNMERGED)\n \t\t\tcontinue;\n \t\tif (!shown_header) {\n-\t\t\twt_status_print_cached_header(s);\n+\t\t\twt_longstatus_print_cached_header(s);\n \t\t\ts->commitable = 1;\n \t\t\tshown_header = 1;\n \t\t}\n-\t\twt_status_print_change_data(s, WT_STATUS_UPDATED, it);\n+\t\twt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);\n \t}\n \tif (shown_header)\n-\t\twt_status_print_trailer(s);\n+\t\twt_longstatus_print_trailer(s);\n }\n \n /*\n@@ -703,7 +703,7 @@ static int wt_status_check_worktree_changes(struct wt_status *s,\n \treturn changes;\n }\n \n-static void wt_status_print_changed(struct wt_status *s)\n+static void wt_longstatus_print_changed(struct wt_status *s)\n {\n \tint i, dirty_submodules;\n \tint worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);\n@@ -711,7 +711,7 @@ static void wt_status_print_changed(struct wt_status *s)\n \tif (!worktree_changes)\n \t\treturn;\n \n-\twt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);\n+\twt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);\n \n \tfor (i = 0; i < s->change.nr; i++) {\n \t\tstruct wt_status_change_data *d;\n@@ -721,12 +721,12 @@ static void wt_status_print_changed(struct wt_status *s)\n \t\tif (!d->worktree_status ||\n \t\t d->worktree_status == DIFF_STATUS_UNMERGED)\n \t\t\tcontinue;\n-\t\twt_status_print_change_data(s, WT_STATUS_CHANGED, it);\n+\t\twt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);\n \t}\n-\twt_status_print_trailer(s);\n+\twt_longstatus_print_trailer(s);\n }\n \n-static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)\n+static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)\n {\n \tstruct child_process sm_summary = CHILD_PROCESS_INIT;\n \tstruct strbuf cmd_stdout = STRBUF_INIT;\n@@ -772,10 +772,10 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt\n \tstrbuf_release(&summary);\n }\n \n-static void wt_status_print_other(struct wt_status *s,\n-\t\t\t\t struct string_list *l,\n-\t\t\t\t const char *what,\n-\t\t\t\t const char *how)\n+static void wt_longstatus_print_other(struct wt_status *s,\n+\t\t\t\t struct string_list *l,\n+\t\t\t\t const char *what,\n+\t\t\t\t const char *how)\n {\n \tint i;\n \tstruct strbuf buf = STRBUF_INIT;\n@@ -785,7 +785,7 @@ static void wt_status_print_other(struct wt_status *s,\n \tif (!l->nr)\n \t\treturn;\n \n-\twt_status_print_other_header(s, what, how);\n+\twt_longstatus_print_other_header(s, what, how);\n \n \tfor (i = 0; i < l->nr; i++) {\n \t\tstruct string_list_item *it;\n@@ -845,7 +845,7 @@ void wt_status_add_cut_line(FILE *fp)\n \tstrbuf_release(&buf);\n }\n \n-static void wt_status_print_verbose(struct wt_status *s)\n+static void wt_longstatus_print_verbose(struct wt_status *s)\n {\n \tstruct rev_info rev;\n \tstruct setup_revision_opt opt;\n@@ -878,7 +878,7 @@ static void wt_status_print_verbose(struct wt_status *s)\n \tif (s->verbose > 1 && s->commitable) {\n \t\t/* print_updated() printed a header, so do we */\n \t\tif (s->fp != stdout)\n-\t\t\twt_status_print_trailer(s);\n+\t\t\twt_longstatus_print_trailer(s);\n \t\tstatus_printf_ln(s, c, _(\"Changes to be committed:\"));\n \t\trev.diffopt.a_prefix = \"c/\";\n \t\trev.diffopt.b_prefix = \"i/\";\n@@ -896,7 +896,7 @@ static void wt_status_print_verbose(struct wt_status *s)\n \t}\n }\n \n-static void wt_status_print_tracking(struct wt_status *s)\n+static void wt_longstatus_print_tracking(struct wt_status *s)\n {\n \tstruct strbuf sb = STRBUF_INIT;\n \tconst char *cp, *ep, *branch_name;\n@@ -959,7 +959,7 @@ static void show_merge_in_progress(struct wt_status *s,\n \t\t\tstatus_printf_ln(s, color,\n \t\t\t\t_(\" (use \\\"git commit\\\" to conclude merge)\"));\n \t}\n-\twt_status_print_trailer(s);\n+\twt_longstatus_print_trailer(s);\n }\n \n static void show_am_in_progress(struct wt_status *s,\n@@ -980,7 +980,7 @@ static void show_am_in_progress(struct wt_status *s,\n \t\tstatus_printf_ln(s, color,\n \t\t\t_(\" (use \\\"git am --abort\\\" to restore the original branch)\"));\n \t}\n-\twt_status_print_trailer(s);\n+\twt_longstatus_print_trailer(s);\n }\n \n static char *read_line_from_git_path(const char *filename)\n@@ -1204,7 +1204,7 @@ static void show_rebase_in_progress(struct wt_status *s,\n \t\t\t\t_(\" (use \\\"git rebase --continue\\\" once you are satisfied with your changes)\"));\n \t\t}\n \t}\n-\twt_status_print_trailer(s);\n+\twt_longstatus_print_trailer(s);\n }\n \n static void show_cherry_pick_in_progress(struct wt_status *s,\n@@ -1223,7 +1223,7 @@ static void show_cherry_pick_in_progress(struct wt_status *s,\n \t\tstatus_printf_ln(s, color,\n \t\t\t_(\" (use \\\"git cherry-pick --abort\\\" to cancel the cherry-pick operation)\"));\n \t}\n-\twt_status_print_trailer(s);\n+\twt_longstatus_print_trailer(s);\n }\n \n static void show_revert_in_progress(struct wt_status *s,\n@@ -1242,7 +1242,7 @@ static void show_revert_in_progress(struct wt_status *s,\n \t\tstatus_printf_ln(s, color,\n \t\t\t_(\" (use \\\"git revert --abort\\\" to cancel the revert operation)\"));\n \t}\n-\twt_status_print_trailer(s);\n+\twt_longstatus_print_trailer(s);\n }\n \n static void show_bisect_in_progress(struct wt_status *s,\n@@ -1259,7 +1259,7 @@ static void show_bisect_in_progress(struct wt_status *s,\n \tif (s->hints)\n \t\tstatus_printf_ln(s, color,\n \t\t\t_(\" (use \\\"git bisect reset\\\" to get back to the original branch)\"));\n-\twt_status_print_trailer(s);\n+\twt_longstatus_print_trailer(s);\n }\n \n /*\n@@ -1429,8 +1429,8 @@ void wt_status_get_state(struct wt_status_state *state,\n \t\twt_status_get_detached_from(state);\n }\n \n-static void wt_status_print_state(struct wt_status *s,\n-\t\t\t\t struct wt_status_state *state)\n+static void wt_longstatus_print_state(struct wt_status *s,\n+\t\t\t\t struct wt_status_state *state)\n {\n \tconst char *state_color = color(WT_STATUS_HEADER, s);\n \tif (state->merge_in_progress)\n@@ -1447,7 +1447,7 @@ static void wt_status_print_state(struct wt_status *s,\n \t\tshow_bisect_in_progress(s, state, state_color);\n }\n \n-void wt_status_print(struct wt_status *s)\n+void wt_longstatus_print(struct wt_status *s)\n {\n \tconst char *branch_color = color(WT_STATUS_ONBRANCH, s);\n \tconst char *branch_status_color = color(WT_STATUS_HEADER, s);\n@@ -1484,10 +1484,10 @@ void wt_status_print(struct wt_status *s)\n \t\tstatus_printf_more(s, branch_status_color, \"%s\", on_what);\n \t\tstatus_printf_more(s, branch_color, \"%s\\n\", branch_name);\n \t\tif (!s->is_initial)\n-\t\t\twt_status_print_tracking(s);\n+\t\t\twt_longstatus_print_tracking(s);\n \t}\n \n-\twt_status_print_state(s, &state);\n+\twt_longstatus_print_state(s, &state);\n \tfree(state.branch);\n \tfree(state.onto);\n \tfree(state.detached_from);\n@@ -1498,19 +1498,19 @@ void wt_status_print(struct wt_status *s)\n \t\tstatus_printf_ln(s, color(WT_STATUS_HEADER, s), \"%s\", \"\");\n \t}\n \n-\twt_status_print_updated(s);\n-\twt_status_print_unmerged(s);\n-\twt_status_print_changed(s);\n+\twt_longstatus_print_updated(s);\n+\twt_longstatus_print_unmerged(s);\n+\twt_longstatus_print_changed(s);\n \tif (s->submodule_summary &&\n \t (!s->ignore_submodule_arg ||\n \t strcmp(s->ignore_submodule_arg, \"all\"))) {\n-\t\twt_status_print_submodule_summary(s, 0); /* staged */\n-\t\twt_status_print_submodule_summary(s, 1); /* unstaged */\n+\t\twt_longstatus_print_submodule_summary(s, 0); /* staged */\n+\t\twt_longstatus_print_submodule_summary(s, 1); /* unstaged */\n \t}\n \tif (s->show_untracked_files) {\n-\t\twt_status_print_other(s, &s->untracked, _(\"Untracked files\"), \"add\");\n+\t\twt_longstatus_print_other(s, &s->untracked, _(\"Untracked files\"), \"add\");\n \t\tif (s->show_ignored_files)\n-\t\t\twt_status_print_other(s, &s->ignored, _(\"Ignored files\"), \"add -f\");\n+\t\t\twt_longstatus_print_other(s, &s->ignored, _(\"Ignored files\"), \"add -f\");\n \t\tif (advice_status_u_option && 2000 < s->untracked_in_ms) {\n \t\t\tstatus_printf_ln(s, GIT_COLOR_NORMAL, \"%s\", \"\");\n \t\t\tstatus_printf_ln(s, GIT_COLOR_NORMAL,\n@@ -1525,7 +1525,7 @@ void wt_status_print(struct wt_status *s)\n \t\t\t? _(\" (use -u option to show untracked files)\") : \"\");\n \n \tif (s->verbose)\n-\t\twt_status_print_verbose(s);\n+\t\twt_longstatus_print_verbose(s);\n \tif (!s->commitable) {\n \t\tif (s->amend)\n \t\t\tstatus_printf_ln(s, GIT_COLOR_NORMAL, _(\"No changes\"));\ndiff --git a/wt-status.h b/wt-status.h\nindex 2ca93f6..2023a3c 100644\n--- a/wt-status.h\n+++ b/wt-status.h\n@@ -99,7 +99,6 @@ struct wt_status_state {\n void wt_status_truncate_message_at_cut_line(struct strbuf *);\n void wt_status_add_cut_line(FILE *fp);\n void wt_status_prepare(struct wt_status *s);\n-void wt_status_print(struct wt_status *s);\n void wt_status_collect(struct wt_status *s);\n void wt_status_get_state(struct wt_status_state *state, int get_detached_from);\n int wt_status_check_rebase(const struct worktree *wt,\n@@ -107,6 +106,7 @@ int wt_status_check_rebase(const struct worktree *wt,\n int wt_status_check_bisect(const struct worktree *wt,\n \t\t\t struct wt_status_state *state);\n \n+void wt_longstatus_print(struct wt_status *s);\n void wt_shortstatus_print(struct wt_status *s);\n void wt_porcelain_print(struct wt_status *s);\n \n-- \n2.8.0.rc4.17.gac42084.dirty\n\n"},{"id":"292610","messageId":"fe5d1dd7-11da-e09b-5880-cf103e34fb9a@gmail.com","threadId":"42934","inReplyTo":"1469567483-58794-8-git-send-email-git@jeffhostetler.com","subject":"Re: [PATCH v3 7/8] status: update git-status.txt for --porcelain=v2","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2016-07-30T17:22:54Z","receivedAt":"2016-07-30T17:23:28Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"W dniu 26.07.2016 o 23:11, Jeff Hostetler pisze:\n\n> +Porcelain Format Version 2\n> +~~~~~~~~~~~~~~~~~~~~~~~~~~\n> +\n> +Version 2 format adds more detailed information about the state of\n> +the worktree and changed items.\n> +\n> +If `--branch` is given, a series of header lines are printed with\n> +information about the current branch.\n> +\n> + Line Notes\n> + --------------------------------------------------------\n> + # branch.oid | (initial) Current commit\n> + # branch.head | (detached) Current branch\n> + # branch.upstream If set\n> + # branch.ab + - If set and present\n\n\"If set and present\" means \"If upstream set and present\", isn't it?\nWell, it is a shortcut, and I think easy to understand.\n\n> + --------------------------------------------------------\n\nThis is a nice change, available because of lack of backward\ncompatibility with v1. The porcelain v2 format branch-related\ninformation could be enhanced without risk of breaking parsers,\nor having new information put at the end even if it does not fit\nthere (like in previous iteration).\n\nOne thing that can serve as goal for the series is using the\nquestion: would it make __git_ps1() from git-prompt.sh be able\nto render fully decorated prompt with all bells and whistles,\nand with all combinations of options. Thus beside upstream\nin the future we might want SVN upstream, and/or pushed-to\nremote branch (and remote push upstream repository), etc.\n\nBut that's for the future (and it is possible for the future)...\n\n> +\n> +A series of lines are then displayed for the tracked entries.\n> +Ordinary changed entries have the following format:\n> +\n> + 1 \n> +\n> +Renamed or copied entries have the following format:\n> +\n> + 2 \\t\n\nNice solution to avoid those all zeros / null-SHA1s\n\n> +\n> + Field Meaning\n> + --------------------------------------------------------\n> + A 2 character field containing the staged and\n> + unstaged XY values described in the short format,\n> + with unchanged indicated by a \".\" rather than\n> + a space.\n> + A 4 character field describing the submodule state.\n> + \"N...\" when the entry is not a submodule.\n> + \"S\" when the entry is a submodule.\n> + is \"C\" if the commit changed; otherwise \".\".\n> + is \"M\" if it has tracked changes; otherwise \".\".\n> + is \"U\" if there are untracked changes; otherwise \".\".\n> + The 6 character octal file mode in the HEAD.\n> + The octal file mode in the index.\n> + The octal file mode in the worktree.\n> + The SHA1 value in the HEAD.\n> + The SHA1 value in the index.\n> + The rename or copied percentage score. For example \"R100\"\n> + or \"C75\".\n> + The current pathname.\n> + The original path. This is only present when the entry\n> + has been renamed or copied.\n> + --------------------------------------------------------\n> +\n> +Unmerged entries have the following format; the first character is\n> +a \"u\" to distinguish from ordinary changed entries.\n> +\n> + u

\n> +\n> + Field Meaning\n> + --------------------------------------------------------\n> + A 2 character field describing the conflict type\n> + as described in the short format.\n> + A 4 character field describing the submodule state\n> + as described above.\n> + The octal file mode for stage 1.\n> + The octal file mode for stage 2.\n> + The octal file mode for stage 3.\n> + The octal file mode in the worktree.\n> +

The SHA1 value for stage 1.\n> +

The SHA1 value for stage 2.\n> +

The SHA1 value for stage 3.\n> + The current pathname.\n> + --------------------------------------------------------\n\nA question: do unmerged entries always have only one single filename?\nOr unmerged entries are always only about CONFLICT(contents), and no\nother?\n\nWould a note (or a link to other documentation) about octopus merges\nbe out of place here?\n\n> +\n> +A series of lines are then displayed for untracked and ignored entries.\n> +\n> + \n> +\n> +Where is \"?\" for untracked entries and \"!\" for ignored entries.\n\nA question: are they displayed in that order, i.e. first all untracked,\nthen all ignored, or it is something one cannot rely about?\n\n> +\n> +In all 3 line formats, pathnames will be \"C Quoted\" if they contain\n\n\"C Quoted\" or \"C-Quoted\"? How it is described in other places of\nthe Git documentation?\n\n> +any of the following characters: TAB, LF, double quotes, or backslashes.\n> +These characters will be replaced with \\t, \\n, \\\", and \\\\, respectively,\n> +and the pathname will be enclosed in double quotes.\n> +\n> +When the `-z` option is given, a NUL (zero) byte follows each pathname;\n> +serving as both a separator and line termination. No pathname quoting\n> +or backslash escaping is performed. All fields are output in the same\n> +order.\n\nDoes it mean that\n\n 2 [...] \\t\\n\n\nline (including line terminator) is replaced with\n\n 2 [...] \\0\\0\n\nthat is, it replaces a separator (TAB, \"\\t\") and line termination (LF, \"\\n\");\nhere spelled in full?\n\nBTW. do we have name for \"C-Quoted\" paths?\n\n> +\n> CONFIGURATION\n> -------------\n \n\n"},{"id":"292745","messageId":"579F6D3A.3010704@jeffhostetler.com","threadId":"42934","inReplyTo":"fe5d1dd7-11da-e09b-5880-cf103e34fb9a@gmail.com","subject":"Re: [PATCH v3 7/8] status: update git-status.txt for --porcelain=v2","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-08-01T15:39:38Z","receivedAt":"2016-08-01T15:51:39Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"\n\nOn 07/30/2016 01:22 PM, Jakub Narębski wrote:\n> W dniu 26.07.2016 o 23:11, Jeff Hostetler pisze:\n>\n> This is a nice change, available because of lack of backward\n> compatibility with v1. The porcelain v2 format branch-related\n> information could be enhanced without risk of breaking parsers,\n> or having new information put at the end even if it does not fit\n> there (like in previous iteration).\n>\n> One thing that can serve as goal for the series is using the\n> question: would it make __git_ps1() from git-prompt.sh be able\n> to render fully decorated prompt with all bells and whistles,\n> and with all combinations of options. Thus beside upstream\n> in the future we might want SVN upstream, and/or pushed-to\n> remote branch (and remote push upstream repository), etc.\n>\n> But that's for the future (and it is possible for the future)...\n>\n\nYes, I was hoping to be able to simplify and/or speed up\n__git_ps1() with this data. \"Namespacing\" the branch data\nhere. And then later add the state data (in a merge,\nin a rebase, and etc.) in a series of \"# state.*\" headers.\nAnd so on, until we get everything that __git_ps1() needs.\nHowever, to really make that work, we might want to add\na --no-scan (or minimial scan) option, to just return the\nheader data, since __git_ps1() doesn't care about the list\nof changes.\n\n\n>> +\n>> +A series of lines are then displayed for the tracked entries.\n>> +Ordinary changed entries have the following format:\n>> +\n>> + 1 \n>> +\n>> +Renamed or copied entries have the following format:\n>> +\n>> + 2 \\t\n>\n> Nice solution to avoid those all zeros / null-SHA1s\n\nThanks.\n\n\n>> +Unmerged entries have the following format; the first character is\n>> +a \"u\" to distinguish from ordinary changed entries.\n>> +\n>> + u

\n>> +\n>> + Field Meaning\n>> + --------------------------------------------------------\n>> + A 2 character field describing the conflict type\n>> + as described in the short format.\n>> + A 4 character field describing the submodule state\n>> + as described above.\n>> + The octal file mode for stage 1.\n>> + The octal file mode for stage 2.\n>> + The octal file mode for stage 3.\n>> + The octal file mode in the worktree.\n>> +

The SHA1 value for stage 1.\n>> +

The SHA1 value for stage 2.\n>> +

The SHA1 value for stage 3.\n>> + The current pathname.\n>> + --------------------------------------------------------\n>\n> A question: do unmerged entries always have only one single filename?\n> Or unmerged entries are always only about CONFLICT(contents), and no\n> other?\n\nAs far as I could tell, unmerged rename conflicts appear with a single\nfilename.\n\nWhen I did a divergent rename (in both branches), merge creates\n a stage-1 \"DD\" entry,\n a stage-2 \"AU\" entry, and\n a stage-3 with a \"UA\" entry.\n Status reports it as 3 rows.\n\nWhen I did a rename in one branch and an edits in both, merge\ncreates: either a \"DU\" or \"UD\" conflict (depending on the direction\nof the merge).\n\nGiven that the index is ordered and accessed by path (and there is\nno pathname field in a cache entry to link it to a different one),\nI have to say that this is true.\n\n>\n> Would a note (or a link to other documentation) about octopus merges\n> be out of place here?\n\nI put a note in the code about it reporting the last entry at each\nstage that are present in the index, but I'm not sure about how much\nwe want to say here.\n\nIf octopus finds conflicts, the worktree will probably be in a\nfunky state anyway.\n\n>\n>> +\n>> +A series of lines are then displayed for untracked and ignored entries.\n>> +\n>> + \n>> +\n>> +Where is \"?\" for untracked entries and \"!\" for ignored entries.\n>\n> A question: are they displayed in that order, i.e. first all untracked,\n> then all ignored, or it is something one cannot rely about?\n\nWith the unique prefix character it shouldn't matter. I do print\nall the '?' lines first then all the '!' lines, so the manpage\ncould be clarified if we wanted. I was just trying to save another\nparagraph in the manpage.\n\n>\n>> +\n>> +In all 3 line formats, pathnames will be \"C Quoted\" if they contain\n>\n> \"C Quoted\" or \"C-Quoted\"? How it is described in other places of\n> the Git documentation?\n>\n\nI was probably inconsistent, I think it should be \"c-quoted\" (with the\nhypen) providing we like this term.\n\nEach of the git-diff*.txt and diff-format.txt files talk about\nthis quoting scheme, but none give it an explicit name.\n\n\n>> +any of the following characters: TAB, LF, double quotes, or backslashes.\n>> +These characters will be replaced with \\t, \\n, \\\", and \\\\, respectively,\n>> +and the pathname will be enclosed in double quotes.\n>> +\n>> +When the `-z` option is given, a NUL (zero) byte follows each pathname;\n>> +serving as both a separator and line termination. No pathname quoting\n>> +or backslash escaping is performed. All fields are output in the same\n>> +order.\n>\n> Does it mean that\n>\n> 2 [...] \\t\\n\n>\n> line (including line terminator) is replaced with\n>\n> 2 [...] \\0\\0\n>\n> that is, it replaces a separator (TAB, \"\\t\") and line termination (LF, \"\\n\");\n> here spelled in full?\n>\n\nYes. Let me try to clarify that in the manpage.\n\nThanks,\nJeff\n\n\n"},{"id":"292839","messageId":"4afec4ce-ecb4-dcce-b8f5-c37844d963d8@gmail.com","threadId":"42934","inReplyTo":"579F6D3A.3010704@jeffhostetler.com","subject":"Re: [PATCH v3 7/8] status: update git-status.txt for --porcelain=v2","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2016-08-02T15:19:39Z","receivedAt":"2016-08-02T15:22:06Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"W dniu 01.08.2016 o 17:39, Jeff Hostetler pisze:\n> On 07/30/2016 01:22 PM, Jakub Narębski wrote:\n>> W dniu 26.07.2016 o 23:11, Jeff Hostetler pisze:\n>>\n>> This is a nice change, available because of lack of backward\n>> compatibility with v1. The porcelain v2 format branch-related\n>> information could be enhanced without risk of breaking parsers,\n>> or having new information put at the end even if it does not fit\n>> there (like in previous iteration).\n>>\n>> One thing that can serve as goal for the series is using the\n>> question: would it make __git_ps1() from git-prompt.sh be able\n>> to render fully decorated prompt with all bells and whistles,\n>> and with all combinations of options. Thus beside upstream\n>> in the future we might want SVN upstream, and/or pushed-to\n>> remote branch (and remote push upstream repository), etc.\n>>\n>> But that's for the future (and it is possible for the future)...\n>>\n> \n> Yes, I was hoping to be able to simplify and/or speed up\n> __git_ps1() with this data. \"Namespacing\" the branch data\n> here. And then later add the state data (in a merge,\n> in a rebase, and etc.) in a series of \"# state.*\" headers.\n> And so on, until we get everything that __git_ps1() needs.\n> However, to really make that work, we might want to add\n> a --no-scan (or minimial scan) option, to just return the\n> header data, since __git_ps1() doesn't care about the list\n> of changes.\n\nBut __git_ps1() with GIT_PS1_SHOWDIRTYSTATE would want to know\nif there are unstaged and staged changes, and with\nGIT_PS1_SHOWUNTRACKEDFILES it would want to know if there\nare untracked (unknown) files, isn't it?\n\nAnd GIT_PS1_SHOWSTASHSTATE would want to know if there is\nsomething stashed, but I guess it is outside the remit of\ngit-status...\n \nAlso, __git_ps1() uses colors from git-status, so if it\nis switched to use --porcelain=v2, then there should be an\noption to turn the color on, isn't it?\n\n-- \nJakub Narębski\n\n"},{"id":"292841","messageId":"57A0CA79.7040809@jeffhostetler.com","threadId":"42934","inReplyTo":"4afec4ce-ecb4-dcce-b8f5-c37844d963d8@gmail.com","subject":"Re: [PATCH v3 7/8] status: update git-status.txt for --porcelain=v2","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2016-08-02T16:29:45Z","receivedAt":"2016-08-02T16:34:00Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"\n\nOn 08/02/2016 11:19 AM, Jakub Narębski wrote:\n> W dniu 01.08.2016 o 17:39, Jeff Hostetler pisze:\n>> On 07/30/2016 01:22 PM, Jakub Narębski wrote:\n>>> W dniu 26.07.2016 o 23:11, Jeff Hostetler pisze:\n>>>\n>>> This is a nice change, available because of lack of backward\n>>> compatibility with v1. The porcelain v2 format branch-related\n>>> information could be enhanced without risk of breaking parsers,\n>>> or having new information put at the end even if it does not fit\n>>> there (like in previous iteration).\n>>>\n>>> One thing that can serve as goal for the series is using the\n>>> question: would it make __git_ps1() from git-prompt.sh be able\n>>> to render fully decorated prompt with all bells and whistles,\n>>> and with all combinations of options. Thus beside upstream\n>>> in the future we might want SVN upstream, and/or pushed-to\n>>> remote branch (and remote push upstream repository), etc.\n>>>\n>>> But that's for the future (and it is possible for the future)...\n>>>\n>>\n>> Yes, I was hoping to be able to simplify and/or speed up\n>> __git_ps1() with this data. \"Namespacing\" the branch data\n>> here. And then later add the state data (in a merge,\n>> in a rebase, and etc.) in a series of \"# state.*\" headers.\n>> And so on, until we get everything that __git_ps1() needs.\n>> However, to really make that work, we might want to add\n>> a --no-scan (or minimial scan) option, to just return the\n>> header data, since __git_ps1() doesn't care about the list\n>> of changes.\n>\n> But __git_ps1() with GIT_PS1_SHOWDIRTYSTATE would want to know\n> if there are unstaged and staged changes, and with\n> GIT_PS1_SHOWUNTRACKEDFILES it would want to know if there\n> are untracked (unknown) files, isn't it?\n>\n> And GIT_PS1_SHOWSTASHSTATE would want to know if there is\n> something stashed, but I guess it is outside the remit of\n> git-status...\n>\n> Also, __git_ps1() uses colors from git-status, so if it\n> is switched to use --porcelain=v2, then there should be an\n> option to turn the color on, isn't it?\n>\n\nAll of these are good questions. But __git_ps1() is outside my\nscope right now. All I was saying above is that by making\nthe branch details available here and, later, extending V2\noutput by adding other such headers to the output, we could\ntry to remove much of the business logic in __git_ps1() and\nhopefully reduce it to just formatting and coloring the prompt\nusing the computed result from status.\n\nBut I've only skimmed __git_ps1() (and it's a little dense),\nso I'd have to study it more before I could answer all of your\nquestions.\n\nThanks,\nJeff\n\n\n\n\n"}]}