Use .git/config for storing "origin" shortcut repository

[git.git] / wt-status.c

diff --git a/wt-status.c b/wt-status.c
index 4b74e6858400108fe4967cfd371d20915d806379..de1be5bc66de634e41c7ef3dee08209631249e13 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -41,10 +41,8 @@ void wt_status_prepare(struct wt_status *s)
 
        s->is_initial = get_sha1("HEAD", sha1) ? 1 : 0;
 
-       head = resolve_ref(git_path("HEAD"), sha1, 0);
-       s->branch = head ?
-                   strdup(head + strlen(get_git_dir()) + 1) :
-                   NULL;
+       head = resolve_ref("HEAD", sha1, 0, NULL);
+       s->branch = head ? xstrdup(head) : NULL;
 
        s->reference = "HEAD";
        s->amend = 0;
@@ -66,31 +64,70 @@ static void wt_status_print_trailer(void)
        color_printf_ln(color(WT_STATUS_HEADER), "#");
 }
 
+static const char *quote_crlf(const char *in, char *buf, size_t sz)
+{
+       const char *scan;
+       char *out;
+       const char *ret = in;
+
+       for (scan = in, out = buf; *scan; scan++) {
+               int ch = *scan;
+               int quoted;
+
+               switch (ch) {
+               case '\n':
+                       quoted = 'n';
+                       break;
+               case '\r':
+                       quoted = 'r';
+                       break;
+               default:
+                       *out++ = ch;
+                       continue;
+               }
+               *out++ = '\\';
+               *out++ = quoted;
+               ret = buf;
+       }
+       *out = '\0';
+       return ret;
+}
+
 static void wt_status_print_filepair(int t, struct diff_filepair *p)
 {
        const char *c = color(t);
+       const char *one, *two;
+       char onebuf[PATH_MAX], twobuf[PATH_MAX];
+
+       one = quote_crlf(p->one->path, onebuf, sizeof(onebuf));
+       two = quote_crlf(p->two->path, twobuf, sizeof(twobuf));
+
        color_printf(color(WT_STATUS_HEADER), "#\t");
        switch (p->status) {
        case DIFF_STATUS_ADDED:
-               color_printf(c, "new file: %s", p->one->path); break;
+               color_printf(c, "new file:   %s", one);
+               break;
        case DIFF_STATUS_COPIED:
-               color_printf(c, "copied: %s -> %s",
-                               p->one->path, p->two->path);
+               color_printf(c, "copied:     %s -> %s", one, two);
                break;
        case DIFF_STATUS_DELETED:
-               color_printf(c, "deleted: %s", p->one->path); break;
+               color_printf(c, "deleted:    %s", one);
+               break;
        case DIFF_STATUS_MODIFIED:
-               color_printf(c, "modified: %s", p->one->path); break;
+               color_printf(c, "modified:   %s", one);
+               break;
        case DIFF_STATUS_RENAMED:
-               color_printf(c, "renamed: %s -> %s",
-                               p->one->path, p->two->path);
+               color_printf(c, "renamed:    %s -> %s", one, two);
                break;
        case DIFF_STATUS_TYPE_CHANGED:
-               color_printf(c, "typechange: %s", p->one->path); break;
+               color_printf(c, "typechange: %s", one);
+               break;
        case DIFF_STATUS_UNKNOWN:
-               color_printf(c, "unknown: %s", p->one->path); break;
+               color_printf(c, "unknown:    %s", one);
+               break;
        case DIFF_STATUS_UNMERGED:
-               color_printf(c, "unmerged: %s", p->one->path); break;
+               color_printf(c, "unmerged:   %s", one);
+               break;
        default:
                die("bug: unhandled diff status %c", p->status);
        }
@@ -104,8 +141,6 @@ static void wt_status_print_updated_cb(struct diff_queue_struct *q,
        struct wt_status *s = data;
        int shown_header = 0;
        int i;
-       if (q->nr) {
-       }
        for (i = 0; i < q->nr; i++) {
                if (q->queue[i]->status == 'U')
                        continue;
@@ -138,6 +173,8 @@ static void wt_status_print_changed_cb(struct diff_queue_struct *q,
 void wt_status_print_initial(struct wt_status *s)
 {
        int i;
+       char buf[PATH_MAX];
+
        read_cache();
        if (active_nr) {
                s->commitable = 1;
@@ -147,7 +184,8 @@ void wt_status_print_initial(struct wt_status *s)
        for (i = 0; i < active_nr; i++) {
                color_printf(color(WT_STATUS_HEADER), "#\t");
                color_printf_ln(color(WT_STATUS_UPDATED), "new file: %s",
-                               active_cache[i]->name);
+                               quote_crlf(active_cache[i]->name,
+                                          buf, sizeof(buf)));
        }
        if (active_nr)
                wt_status_print_trailer();
@@ -156,10 +194,8 @@ void wt_status_print_initial(struct wt_status *s)
 static void wt_status_print_updated(struct wt_status *s)
 {
        struct rev_info rev;
-       const char *argv[] = { NULL, NULL, NULL };
-       argv[1] = s->reference;
        init_revisions(&rev, NULL);
-       setup_revisions(2, argv, &rev, NULL);
+       setup_revisions(0, NULL, &rev, s->reference);
        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
        rev.diffopt.format_callback = wt_status_print_updated_cb;
        rev.diffopt.format_callback_data = s;
@@ -170,9 +206,8 @@ static void wt_status_print_updated(struct wt_status *s)
 static void wt_status_print_changed(struct wt_status *s)
 {
        struct rev_info rev;
-       const char *argv[] = { NULL, NULL };
        init_revisions(&rev, "");
-       setup_revisions(1, argv, &rev, NULL);
+       setup_revisions(0, NULL, &rev, NULL);
        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
        rev.diffopt.format_callback = wt_status_print_changed_cb;
        rev.diffopt.format_callback_data = s;
@@ -227,10 +262,8 @@ static void wt_status_print_untracked(const struct wt_status *s)
 static void wt_status_print_verbose(struct wt_status *s)
 {
        struct rev_info rev;
-       const char *argv[] = { NULL, NULL, NULL };
-       argv[1] = s->reference;
        init_revisions(&rev, NULL);
-       setup_revisions(2, argv, &rev, NULL);
+       setup_revisions(0, NULL, &rev, s->reference);
        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
        rev.diffopt.detect_rename = 1;
        run_diff_index(&rev, 1);