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