status: add --porcelain output format

diff --git a/builtin-commit.c b/builtin-commit.c
index 6cb0e40484dce73224c156d0c54b4f0628e57bc6..ffdee31bbfe1f123dd4e0868f1cc75578fb33521 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -966,16 +966,45 @@ static void short_untracked(int null_termination, struct string_list_item *it,
        }
 }
 
+static void short_print(struct wt_status *s, int null_termination)
+{
+       int i;
+       for (i = 0; i < s->change.nr; i++) {
+               struct wt_status_change_data *d;
+               struct string_list_item *it;
+
+               it = &(s->change.items[i]);
+               d = it->util;
+               if (d->stagemask)
+                       short_unmerged(null_termination, it, s);
+               else
+                       short_status(null_termination, it, s);
+       }
+       for (i = 0; i < s->untracked.nr; i++) {
+               struct string_list_item *it;
+
+               it = &(s->untracked.items[i]);
+               short_untracked(null_termination, it, s);
+       }
+}
+
 int cmd_status(int argc, const char **argv, const char *prefix)
 {
        struct wt_status s;
-       static int null_termination, shortstatus;
-       int i;
+       static int null_termination;
+       static enum {
+               STATUS_FORMAT_LONG,
+               STATUS_FORMAT_SHORT,
+               STATUS_FORMAT_PORCELAIN,
+       } status_format = STATUS_FORMAT_LONG;
        unsigned char sha1[20];
        static struct option builtin_status_options[] = {
                OPT__VERBOSE(&verbose),
-               OPT_BOOLEAN('s', "short", &shortstatus,
-                           "show status concicely"),
+               OPT_SET_INT('s', "short", &status_format,
+                           "show status concisely", STATUS_FORMAT_SHORT),
+               OPT_SET_INT(0, "porcelain", &status_format,
+                           "show porcelain output format",
+                           STATUS_FORMAT_PORCELAIN),
                OPT_BOOLEAN('z', "null", &null_termination,
                            "terminate entries with NUL"),
                { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg,
@@ -985,8 +1014,8 @@ int cmd_status(int argc, const char **argv, const char *prefix)
                OPT_END(),
        };
 
-       if (null_termination)
-               shortstatus = 1;
+       if (null_termination && status_format == STATUS_FORMAT_LONG)
+               status_format = STATUS_FORMAT_PORCELAIN;
 
        wt_status_prepare(&s);
        git_config(git_status_config, &s);
@@ -1003,25 +1032,14 @@ int cmd_status(int argc, const char **argv, const char *prefix)
        s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
        wt_status_collect(&s);
 
-       if (shortstatus) {
-               for (i = 0; i < s.change.nr; i++) {
-                       struct wt_status_change_data *d;
-                       struct string_list_item *it;
-
-                       it = &(s.change.items[i]);
-                       d = it->util;
-                       if (d->stagemask)
-                               short_unmerged(null_termination, it, &s);
-                       else
-                               short_status(null_termination, it, &s);
-               }
-               for (i = 0; i < s.untracked.nr; i++) {
-                       struct string_list_item *it;
-
-                       it = &(s.untracked.items[i]);
-                       short_untracked(null_termination, it, &s);
-               }
-       } else {
+       switch (status_format) {
+       case STATUS_FORMAT_SHORT:
+               short_print(&s, null_termination);
+               break;
+       case STATUS_FORMAT_PORCELAIN:
+               short_print(&s, null_termination);
+               break;
+       case STATUS_FORMAT_LONG:
                s.verbose = verbose;
                if (s.relative_paths)
                        s.prefix = prefix;
@@ -1030,6 +1048,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
                if (diff_use_color_default == -1)
                        diff_use_color_default = git_use_color_default;
                wt_status_print(&s);
+               break;
        }
        return 0;
 }