Export PERL_PATH

diff --git a/wt-status.c b/wt-status.c
index 674284415ec5669d767fe6257187436112ee79c0..6e9414dbb07f1457eb436907a77d14476a6e6b1f 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);
        }
@@ -126,7 +163,7 @@ static void wt_status_print_changed_cb(struct diff_queue_struct *q,
        int i;
        if (q->nr)
                wt_status_print_header("Changed but not updated",
-                               "use git-update-index to mark for commit");
+                               "use git-add on files to include for commit");
        for (i = 0; i < q->nr; i++)
                wt_status_print_filepair(WT_STATUS_CHANGED, q->queue[i]);
        if (q->nr)
@@ -136,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;
@@ -145,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();
@@ -257,11 +297,11 @@ void wt_status_print(struct wt_status *s)
 
 int git_status_config(const char *k, const char *v)
 {
-       if (!strcmp(k, "status.color")) {
+       if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
                wt_status_use_color = git_config_colorbool(k, v);
                return 0;
        }
-       if (!strncmp(k, "status.color.", 13)) {
+       if (!strncmp(k, "status.color.", 13) || !strncmp(k, "color.status", 13)) {
                int slot = parse_status_slot(k, 13);
                color_parse(v, k, wt_status_colors[slot]);
        }