wt-status.con commit Remove unnecessary git-rm --cached reference from status output (3368d11)
   1#include "cache.h"
   2#include "wt-status.h"
   3#include "color.h"
   4#include "object.h"
   5#include "dir.h"
   6#include "commit.h"
   7#include "diff.h"
   8#include "revision.h"
   9#include "diffcore.h"
  10
  11int wt_status_use_color = 0;
  12static char wt_status_colors[][COLOR_MAXLEN] = {
  13        "",         /* WT_STATUS_HEADER: normal */
  14        "\033[32m", /* WT_STATUS_UPDATED: green */
  15        "\033[31m", /* WT_STATUS_CHANGED: red */
  16        "\033[31m", /* WT_STATUS_UNTRACKED: red */
  17};
  18static const char* use_add_msg = "use \"git add <file>...\" to incrementally add content to commit";
  19
  20static int parse_status_slot(const char *var, int offset)
  21{
  22        if (!strcasecmp(var+offset, "header"))
  23                return WT_STATUS_HEADER;
  24        if (!strcasecmp(var+offset, "updated")
  25                || !strcasecmp(var+offset, "added"))
  26                return WT_STATUS_UPDATED;
  27        if (!strcasecmp(var+offset, "changed"))
  28                return WT_STATUS_CHANGED;
  29        if (!strcasecmp(var+offset, "untracked"))
  30                return WT_STATUS_UNTRACKED;
  31        die("bad config variable '%s'", var);
  32}
  33
  34static const char* color(int slot)
  35{
  36        return wt_status_use_color ? wt_status_colors[slot] : "";
  37}
  38
  39void wt_status_prepare(struct wt_status *s)
  40{
  41        unsigned char sha1[20];
  42        const char *head;
  43
  44        head = resolve_ref("HEAD", sha1, 0, NULL);
  45        s->branch = head ? xstrdup(head) : NULL;
  46
  47        s->reference = "HEAD";
  48        s->amend = 0;
  49        s->verbose = 0;
  50        s->commitable = 0;
  51        s->untracked = 0;
  52
  53        s->workdir_clean = 1;
  54}
  55
  56static void wt_status_print_cached_header(const char *reference)
  57{
  58        const char *c = color(WT_STATUS_HEADER);
  59        color_printf_ln(c, "# Changes to be committed:");
  60        if (reference) {
  61                color_printf_ln(c, "#   (use \"git reset %s <file>...\" to unstage)", reference);
  62        } else {
  63                color_printf_ln(c, "#   (use \"git rm --cached <file>...\" to unstage)");
  64        }
  65        color_printf_ln(c, "#");
  66}
  67
  68static void wt_status_print_header(const char *main, const char *sub)
  69{
  70        const char *c = color(WT_STATUS_HEADER);
  71        color_printf_ln(c, "# %s:", main);
  72        color_printf_ln(c, "#   (%s)", sub);
  73        color_printf_ln(c, "#");
  74}
  75
  76static void wt_status_print_trailer(void)
  77{
  78        color_printf_ln(color(WT_STATUS_HEADER), "#");
  79}
  80
  81static const char *quote_crlf(const char *in, char *buf, size_t sz)
  82{
  83        const char *scan;
  84        char *out;
  85        const char *ret = in;
  86
  87        for (scan = in, out = buf; *scan; scan++) {
  88                int ch = *scan;
  89                int quoted;
  90
  91                switch (ch) {
  92                case '\n':
  93                        quoted = 'n';
  94                        break;
  95                case '\r':
  96                        quoted = 'r';
  97                        break;
  98                default:
  99                        *out++ = ch;
 100                        continue;
 101                }
 102                *out++ = '\\';
 103                *out++ = quoted;
 104                ret = buf;
 105        }
 106        *out = '\0';
 107        return ret;
 108}
 109
 110static void wt_status_print_filepair(int t, struct diff_filepair *p)
 111{
 112        const char *c = color(t);
 113        const char *one, *two;
 114        char onebuf[PATH_MAX], twobuf[PATH_MAX];
 115
 116        one = quote_crlf(p->one->path, onebuf, sizeof(onebuf));
 117        two = quote_crlf(p->two->path, twobuf, sizeof(twobuf));
 118
 119        color_printf(color(WT_STATUS_HEADER), "#\t");
 120        switch (p->status) {
 121        case DIFF_STATUS_ADDED:
 122                color_printf(c, "new file:   %s", one);
 123                break;
 124        case DIFF_STATUS_COPIED:
 125                color_printf(c, "copied:     %s -> %s", one, two);
 126                break;
 127        case DIFF_STATUS_DELETED:
 128                color_printf(c, "deleted:    %s", one);
 129                break;
 130        case DIFF_STATUS_MODIFIED:
 131                color_printf(c, "modified:   %s", one);
 132                break;
 133        case DIFF_STATUS_RENAMED:
 134                color_printf(c, "renamed:    %s -> %s", one, two);
 135                break;
 136        case DIFF_STATUS_TYPE_CHANGED:
 137                color_printf(c, "typechange: %s", one);
 138                break;
 139        case DIFF_STATUS_UNKNOWN:
 140                color_printf(c, "unknown:    %s", one);
 141                break;
 142        case DIFF_STATUS_UNMERGED:
 143                color_printf(c, "unmerged:   %s", one);
 144                break;
 145        default:
 146                die("bug: unhandled diff status %c", p->status);
 147        }
 148        printf("\n");
 149}
 150
 151static void wt_status_print_updated_cb(struct diff_queue_struct *q,
 152                struct diff_options *options,
 153                void *data)
 154{
 155        struct wt_status *s = data;
 156        int shown_header = 0;
 157        int i;
 158        for (i = 0; i < q->nr; i++) {
 159                if (q->queue[i]->status == 'U')
 160                        continue;
 161                if (!shown_header) {
 162                        wt_status_print_cached_header(s->reference);
 163                        s->commitable = 1;
 164                        shown_header = 1;
 165                }
 166                wt_status_print_filepair(WT_STATUS_UPDATED, q->queue[i]);
 167        }
 168        if (shown_header)
 169                wt_status_print_trailer();
 170}
 171
 172static void wt_status_print_changed_cb(struct diff_queue_struct *q,
 173                        struct diff_options *options,
 174                        void *data)
 175{
 176        struct wt_status *s = data;
 177        int i;
 178        if (q->nr) {
 179                s->workdir_clean = 0;
 180                wt_status_print_header("Changed but not added", use_add_msg);
 181        }
 182        for (i = 0; i < q->nr; i++)
 183                wt_status_print_filepair(WT_STATUS_CHANGED, q->queue[i]);
 184        if (q->nr)
 185                wt_status_print_trailer();
 186}
 187
 188void wt_status_print_initial(struct wt_status *s)
 189{
 190        int i;
 191        char buf[PATH_MAX];
 192
 193        read_cache();
 194        if (active_nr) {
 195                s->commitable = 1;
 196                wt_status_print_cached_header(NULL);
 197        }
 198        for (i = 0; i < active_nr; i++) {
 199                color_printf(color(WT_STATUS_HEADER), "#\t");
 200                color_printf_ln(color(WT_STATUS_UPDATED), "new file: %s",
 201                                quote_crlf(active_cache[i]->name,
 202                                           buf, sizeof(buf)));
 203        }
 204        if (active_nr)
 205                wt_status_print_trailer();
 206}
 207
 208static void wt_status_print_updated(struct wt_status *s)
 209{
 210        struct rev_info rev;
 211        init_revisions(&rev, NULL);
 212        setup_revisions(0, NULL, &rev, s->reference);
 213        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 214        rev.diffopt.format_callback = wt_status_print_updated_cb;
 215        rev.diffopt.format_callback_data = s;
 216        rev.diffopt.detect_rename = 1;
 217        run_diff_index(&rev, 1);
 218}
 219
 220static void wt_status_print_changed(struct wt_status *s)
 221{
 222        struct rev_info rev;
 223        init_revisions(&rev, "");
 224        setup_revisions(0, NULL, &rev, NULL);
 225        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 226        rev.diffopt.format_callback = wt_status_print_changed_cb;
 227        rev.diffopt.format_callback_data = s;
 228        run_diff_files(&rev, 0);
 229}
 230
 231static void wt_status_print_untracked(struct wt_status *s)
 232{
 233        struct dir_struct dir;
 234        const char *x;
 235        int i;
 236        int shown_header = 0;
 237
 238        memset(&dir, 0, sizeof(dir));
 239
 240        dir.exclude_per_dir = ".gitignore";
 241        if (!s->untracked) {
 242                dir.show_other_directories = 1;
 243                dir.hide_empty_directories = 1;
 244        }
 245        x = git_path("info/exclude");
 246        if (file_exists(x))
 247                add_excludes_from_file(&dir, x);
 248
 249        read_directory(&dir, ".", "", 0);
 250        for(i = 0; i < dir.nr; i++) {
 251                /* check for matching entry, which is unmerged; lifted from
 252                 * builtin-ls-files:show_other_files */
 253                struct dir_entry *ent = dir.entries[i];
 254                int pos = cache_name_pos(ent->name, ent->len);
 255                struct cache_entry *ce;
 256                if (0 <= pos)
 257                        die("bug in wt_status_print_untracked");
 258                pos = -pos - 1;
 259                if (pos < active_nr) {
 260                        ce = active_cache[pos];
 261                        if (ce_namelen(ce) == ent->len &&
 262                            !memcmp(ce->name, ent->name, ent->len))
 263                                continue;
 264                }
 265                if (!shown_header) {
 266                        s->workdir_clean = 0;
 267                        wt_status_print_header("Untracked files", use_add_msg);
 268                        shown_header = 1;
 269                }
 270                color_printf(color(WT_STATUS_HEADER), "#\t");
 271                color_printf_ln(color(WT_STATUS_UNTRACKED), "%.*s",
 272                                ent->len, ent->name);
 273        }
 274}
 275
 276static void wt_status_print_verbose(struct wt_status *s)
 277{
 278        struct rev_info rev;
 279        init_revisions(&rev, NULL);
 280        setup_revisions(0, NULL, &rev, s->reference);
 281        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 282        rev.diffopt.detect_rename = 1;
 283        run_diff_index(&rev, 1);
 284}
 285
 286void wt_status_print(struct wt_status *s)
 287{
 288        unsigned char sha1[20];
 289        s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
 290
 291        if (s->branch)
 292                color_printf_ln(color(WT_STATUS_HEADER),
 293                        "# On branch %s", s->branch);
 294
 295        if (s->is_initial) {
 296                color_printf_ln(color(WT_STATUS_HEADER), "#");
 297                color_printf_ln(color(WT_STATUS_HEADER), "# Initial commit");
 298                color_printf_ln(color(WT_STATUS_HEADER), "#");
 299                wt_status_print_initial(s);
 300        }
 301        else {
 302                wt_status_print_updated(s);
 303                discard_cache();
 304        }
 305
 306        wt_status_print_changed(s);
 307        wt_status_print_untracked(s);
 308
 309        if (s->verbose && !s->is_initial)
 310                wt_status_print_verbose(s);
 311        if (!s->commitable) {
 312                if (s->amend)
 313                        printf("# No changes\n");
 314                else if (s->workdir_clean)
 315                        printf(s->is_initial
 316                               ? "nothing to commit\n"
 317                               : "nothing to commit (working directory matches HEAD)\n");
 318                else
 319                        printf("no changes added to commit (use \"git add\" and/or \"git commit [-a|-i|-o]\")\n");
 320        }
 321}
 322
 323int git_status_config(const char *k, const char *v)
 324{
 325        if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
 326                wt_status_use_color = git_config_colorbool(k, v);
 327                return 0;
 328        }
 329        if (!strncmp(k, "status.color.", 13) || !strncmp(k, "color.status", 13)) {
 330                int slot = parse_status_slot(k, 13);
 331                color_parse(v, k, wt_status_colors[slot]);
 332        }
 333        return git_default_config(k, v);
 334}