wt-status.con commit index-pack: correct --keep[=<msg>] (0e94242)
   1#include "cache.h"
   2#include "pathspec.h"
   3#include "wt-status.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#include "quote.h"
  11#include "run-command.h"
  12#include "argv-array.h"
  13#include "remote.h"
  14#include "refs.h"
  15#include "submodule.h"
  16#include "column.h"
  17#include "strbuf.h"
  18#include "utf8.h"
  19
  20static const char cut_line[] =
  21"------------------------ >8 ------------------------\n";
  22
  23static char default_wt_status_colors[][COLOR_MAXLEN] = {
  24        GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
  25        GIT_COLOR_GREEN,  /* WT_STATUS_UPDATED */
  26        GIT_COLOR_RED,    /* WT_STATUS_CHANGED */
  27        GIT_COLOR_RED,    /* WT_STATUS_UNTRACKED */
  28        GIT_COLOR_RED,    /* WT_STATUS_NOBRANCH */
  29        GIT_COLOR_RED,    /* WT_STATUS_UNMERGED */
  30        GIT_COLOR_GREEN,  /* WT_STATUS_LOCAL_BRANCH */
  31        GIT_COLOR_RED,    /* WT_STATUS_REMOTE_BRANCH */
  32        GIT_COLOR_NIL,    /* WT_STATUS_ONBRANCH */
  33};
  34
  35static const char *color(int slot, struct wt_status *s)
  36{
  37        const char *c = "";
  38        if (want_color(s->use_color))
  39                c = s->color_palette[slot];
  40        if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
  41                c = s->color_palette[WT_STATUS_HEADER];
  42        return c;
  43}
  44
  45static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
  46                const char *fmt, va_list ap, const char *trail)
  47{
  48        struct strbuf sb = STRBUF_INIT;
  49        struct strbuf linebuf = STRBUF_INIT;
  50        const char *line, *eol;
  51
  52        strbuf_vaddf(&sb, fmt, ap);
  53        if (!sb.len) {
  54                if (s->display_comment_prefix) {
  55                        strbuf_addch(&sb, comment_line_char);
  56                        if (!trail)
  57                                strbuf_addch(&sb, ' ');
  58                }
  59                color_print_strbuf(s->fp, color, &sb);
  60                if (trail)
  61                        fprintf(s->fp, "%s", trail);
  62                strbuf_release(&sb);
  63                return;
  64        }
  65        for (line = sb.buf; *line; line = eol + 1) {
  66                eol = strchr(line, '\n');
  67
  68                strbuf_reset(&linebuf);
  69                if (at_bol && s->display_comment_prefix) {
  70                        strbuf_addch(&linebuf, comment_line_char);
  71                        if (*line != '\n' && *line != '\t')
  72                                strbuf_addch(&linebuf, ' ');
  73                }
  74                if (eol)
  75                        strbuf_add(&linebuf, line, eol - line);
  76                else
  77                        strbuf_addstr(&linebuf, line);
  78                color_print_strbuf(s->fp, color, &linebuf);
  79                if (eol)
  80                        fprintf(s->fp, "\n");
  81                else
  82                        break;
  83                at_bol = 1;
  84        }
  85        if (trail)
  86                fprintf(s->fp, "%s", trail);
  87        strbuf_release(&linebuf);
  88        strbuf_release(&sb);
  89}
  90
  91void status_printf_ln(struct wt_status *s, const char *color,
  92                        const char *fmt, ...)
  93{
  94        va_list ap;
  95
  96        va_start(ap, fmt);
  97        status_vprintf(s, 1, color, fmt, ap, "\n");
  98        va_end(ap);
  99}
 100
 101void status_printf(struct wt_status *s, const char *color,
 102                        const char *fmt, ...)
 103{
 104        va_list ap;
 105
 106        va_start(ap, fmt);
 107        status_vprintf(s, 1, color, fmt, ap, NULL);
 108        va_end(ap);
 109}
 110
 111static void status_printf_more(struct wt_status *s, const char *color,
 112                               const char *fmt, ...)
 113{
 114        va_list ap;
 115
 116        va_start(ap, fmt);
 117        status_vprintf(s, 0, color, fmt, ap, NULL);
 118        va_end(ap);
 119}
 120
 121void wt_status_prepare(struct wt_status *s)
 122{
 123        unsigned char sha1[20];
 124
 125        memset(s, 0, sizeof(*s));
 126        memcpy(s->color_palette, default_wt_status_colors,
 127               sizeof(default_wt_status_colors));
 128        s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
 129        s->use_color = -1;
 130        s->relative_paths = 1;
 131        s->branch = resolve_refdup("HEAD", sha1, 0, NULL);
 132        s->reference = "HEAD";
 133        s->fp = stdout;
 134        s->index_file = get_index_file();
 135        s->change.strdup_strings = 1;
 136        s->untracked.strdup_strings = 1;
 137        s->ignored.strdup_strings = 1;
 138        s->show_branch = -1;  /* unspecified */
 139        s->display_comment_prefix = 0;
 140}
 141
 142static void wt_status_print_unmerged_header(struct wt_status *s)
 143{
 144        int i;
 145        int del_mod_conflict = 0;
 146        int both_deleted = 0;
 147        int not_deleted = 0;
 148        const char *c = color(WT_STATUS_HEADER, s);
 149
 150        status_printf_ln(s, c, _("Unmerged paths:"));
 151
 152        for (i = 0; i < s->change.nr; i++) {
 153                struct string_list_item *it = &(s->change.items[i]);
 154                struct wt_status_change_data *d = it->util;
 155
 156                switch (d->stagemask) {
 157                case 0:
 158                        break;
 159                case 1:
 160                        both_deleted = 1;
 161                        break;
 162                case 3:
 163                case 5:
 164                        del_mod_conflict = 1;
 165                        break;
 166                default:
 167                        not_deleted = 1;
 168                        break;
 169                }
 170        }
 171
 172        if (!s->hints)
 173                return;
 174        if (s->whence != FROM_COMMIT)
 175                ;
 176        else if (!s->is_initial)
 177                status_printf_ln(s, c, _("  (use \"git reset %s <file>...\" to unstage)"), s->reference);
 178        else
 179                status_printf_ln(s, c, _("  (use \"git rm --cached <file>...\" to unstage)"));
 180
 181        if (!both_deleted) {
 182                if (!del_mod_conflict)
 183                        status_printf_ln(s, c, _("  (use \"git add <file>...\" to mark resolution)"));
 184                else
 185                        status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
 186        } else if (!del_mod_conflict && !not_deleted) {
 187                status_printf_ln(s, c, _("  (use \"git rm <file>...\" to mark resolution)"));
 188        } else {
 189                status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
 190        }
 191        status_printf_ln(s, c, "");
 192}
 193
 194static void wt_status_print_cached_header(struct wt_status *s)
 195{
 196        const char *c = color(WT_STATUS_HEADER, s);
 197
 198        status_printf_ln(s, c, _("Changes to be committed:"));
 199        if (!s->hints)
 200                return;
 201        if (s->whence != FROM_COMMIT)
 202                ; /* NEEDSWORK: use "git reset --unresolve"??? */
 203        else if (!s->is_initial)
 204                status_printf_ln(s, c, _("  (use \"git reset %s <file>...\" to unstage)"), s->reference);
 205        else
 206                status_printf_ln(s, c, _("  (use \"git rm --cached <file>...\" to unstage)"));
 207        status_printf_ln(s, c, "");
 208}
 209
 210static void wt_status_print_dirty_header(struct wt_status *s,
 211                                         int has_deleted,
 212                                         int has_dirty_submodules)
 213{
 214        const char *c = color(WT_STATUS_HEADER, s);
 215
 216        status_printf_ln(s, c, _("Changes not staged for commit:"));
 217        if (!s->hints)
 218                return;
 219        if (!has_deleted)
 220                status_printf_ln(s, c, _("  (use \"git add <file>...\" to update what will be committed)"));
 221        else
 222                status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" to update what will be committed)"));
 223        status_printf_ln(s, c, _("  (use \"git checkout -- <file>...\" to discard changes in working directory)"));
 224        if (has_dirty_submodules)
 225                status_printf_ln(s, c, _("  (commit or discard the untracked or modified content in submodules)"));
 226        status_printf_ln(s, c, "");
 227}
 228
 229static void wt_status_print_other_header(struct wt_status *s,
 230                                         const char *what,
 231                                         const char *how)
 232{
 233        const char *c = color(WT_STATUS_HEADER, s);
 234        status_printf_ln(s, c, "%s:", what);
 235        if (!s->hints)
 236                return;
 237        status_printf_ln(s, c, _("  (use \"git %s <file>...\" to include in what will be committed)"), how);
 238        status_printf_ln(s, c, "");
 239}
 240
 241static void wt_status_print_trailer(struct wt_status *s)
 242{
 243        status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
 244}
 245
 246#define quote_path quote_path_relative
 247
 248static const char *wt_status_unmerged_status_string(int stagemask)
 249{
 250        switch (stagemask) {
 251        case 1:
 252                return _("both deleted:");
 253        case 2:
 254                return _("added by us:");
 255        case 3:
 256                return _("deleted by them:");
 257        case 4:
 258                return _("added by them:");
 259        case 5:
 260                return _("deleted by us:");
 261        case 6:
 262                return _("both added:");
 263        case 7:
 264                return _("both modified:");
 265        default:
 266                die(_("bug: unhandled unmerged status %x"), stagemask);
 267        }
 268}
 269
 270static const char *wt_status_diff_status_string(int status)
 271{
 272        switch (status) {
 273        case DIFF_STATUS_ADDED:
 274                return _("new file:");
 275        case DIFF_STATUS_COPIED:
 276                return _("copied:");
 277        case DIFF_STATUS_DELETED:
 278                return _("deleted:");
 279        case DIFF_STATUS_MODIFIED:
 280                return _("modified:");
 281        case DIFF_STATUS_RENAMED:
 282                return _("renamed:");
 283        case DIFF_STATUS_TYPE_CHANGED:
 284                return _("typechange:");
 285        case DIFF_STATUS_UNKNOWN:
 286                return _("unknown:");
 287        case DIFF_STATUS_UNMERGED:
 288                return _("unmerged:");
 289        default:
 290                return NULL;
 291        }
 292}
 293
 294static int maxwidth(const char *(*label)(int), int minval, int maxval)
 295{
 296        int result = 0, i;
 297
 298        for (i = minval; i <= maxval; i++) {
 299                const char *s = label(i);
 300                int len = s ? utf8_strwidth(s) : 0;
 301                if (len > result)
 302                        result = len;
 303        }
 304        return result;
 305}
 306
 307static void wt_status_print_unmerged_data(struct wt_status *s,
 308                                          struct string_list_item *it)
 309{
 310        const char *c = color(WT_STATUS_UNMERGED, s);
 311        struct wt_status_change_data *d = it->util;
 312        struct strbuf onebuf = STRBUF_INIT;
 313        static char *padding;
 314        static int label_width;
 315        const char *one, *how;
 316        int len;
 317
 318        if (!padding) {
 319                label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
 320                label_width += strlen(" ");
 321                padding = xmallocz(label_width);
 322                memset(padding, ' ', label_width);
 323        }
 324
 325        one = quote_path(it->string, s->prefix, &onebuf);
 326        status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 327
 328        how = wt_status_unmerged_status_string(d->stagemask);
 329        len = label_width - utf8_strwidth(how);
 330        status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
 331        strbuf_release(&onebuf);
 332}
 333
 334static void wt_status_print_change_data(struct wt_status *s,
 335                                        int change_type,
 336                                        struct string_list_item *it)
 337{
 338        struct wt_status_change_data *d = it->util;
 339        const char *c = color(change_type, s);
 340        int status;
 341        char *one_name;
 342        char *two_name;
 343        const char *one, *two;
 344        struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
 345        struct strbuf extra = STRBUF_INIT;
 346        static char *padding;
 347        static int label_width;
 348        const char *what;
 349        int len;
 350
 351        if (!padding) {
 352                /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
 353                label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
 354                label_width += strlen(" ");
 355                padding = xmallocz(label_width);
 356                memset(padding, ' ', label_width);
 357        }
 358
 359        one_name = two_name = it->string;
 360        switch (change_type) {
 361        case WT_STATUS_UPDATED:
 362                status = d->index_status;
 363                if (d->head_path)
 364                        one_name = d->head_path;
 365                break;
 366        case WT_STATUS_CHANGED:
 367                if (d->new_submodule_commits || d->dirty_submodule) {
 368                        strbuf_addstr(&extra, " (");
 369                        if (d->new_submodule_commits)
 370                                strbuf_addf(&extra, _("new commits, "));
 371                        if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
 372                                strbuf_addf(&extra, _("modified content, "));
 373                        if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
 374                                strbuf_addf(&extra, _("untracked content, "));
 375                        strbuf_setlen(&extra, extra.len - 2);
 376                        strbuf_addch(&extra, ')');
 377                }
 378                status = d->worktree_status;
 379                break;
 380        default:
 381                die("BUG: unhandled change_type %d in wt_status_print_change_data",
 382                    change_type);
 383        }
 384
 385        one = quote_path(one_name, s->prefix, &onebuf);
 386        two = quote_path(two_name, s->prefix, &twobuf);
 387
 388        status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 389        what = wt_status_diff_status_string(status);
 390        if (!what)
 391                die(_("bug: unhandled diff status %c"), status);
 392        len = label_width - utf8_strwidth(what);
 393        assert(len >= 0);
 394        if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
 395                status_printf_more(s, c, "%s%.*s%s -> %s",
 396                                   what, len, padding, one, two);
 397        else
 398                status_printf_more(s, c, "%s%.*s%s",
 399                                   what, len, padding, one);
 400        if (extra.len) {
 401                status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
 402                strbuf_release(&extra);
 403        }
 404        status_printf_more(s, GIT_COLOR_NORMAL, "\n");
 405        strbuf_release(&onebuf);
 406        strbuf_release(&twobuf);
 407}
 408
 409static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
 410                                         struct diff_options *options,
 411                                         void *data)
 412{
 413        struct wt_status *s = data;
 414        int i;
 415
 416        if (!q->nr)
 417                return;
 418        s->workdir_dirty = 1;
 419        for (i = 0; i < q->nr; i++) {
 420                struct diff_filepair *p;
 421                struct string_list_item *it;
 422                struct wt_status_change_data *d;
 423
 424                p = q->queue[i];
 425                it = string_list_insert(&s->change, p->one->path);
 426                d = it->util;
 427                if (!d) {
 428                        d = xcalloc(1, sizeof(*d));
 429                        it->util = d;
 430                }
 431                if (!d->worktree_status)
 432                        d->worktree_status = p->status;
 433                d->dirty_submodule = p->two->dirty_submodule;
 434                if (S_ISGITLINK(p->two->mode))
 435                        d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
 436        }
 437}
 438
 439static int unmerged_mask(const char *path)
 440{
 441        int pos, mask;
 442        const struct cache_entry *ce;
 443
 444        pos = cache_name_pos(path, strlen(path));
 445        if (0 <= pos)
 446                return 0;
 447
 448        mask = 0;
 449        pos = -pos-1;
 450        while (pos < active_nr) {
 451                ce = active_cache[pos++];
 452                if (strcmp(ce->name, path) || !ce_stage(ce))
 453                        break;
 454                mask |= (1 << (ce_stage(ce) - 1));
 455        }
 456        return mask;
 457}
 458
 459static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
 460                                         struct diff_options *options,
 461                                         void *data)
 462{
 463        struct wt_status *s = data;
 464        int i;
 465
 466        for (i = 0; i < q->nr; i++) {
 467                struct diff_filepair *p;
 468                struct string_list_item *it;
 469                struct wt_status_change_data *d;
 470
 471                p = q->queue[i];
 472                it = string_list_insert(&s->change, p->two->path);
 473                d = it->util;
 474                if (!d) {
 475                        d = xcalloc(1, sizeof(*d));
 476                        it->util = d;
 477                }
 478                if (!d->index_status)
 479                        d->index_status = p->status;
 480                switch (p->status) {
 481                case DIFF_STATUS_COPIED:
 482                case DIFF_STATUS_RENAMED:
 483                        d->head_path = xstrdup(p->one->path);
 484                        break;
 485                case DIFF_STATUS_UNMERGED:
 486                        d->stagemask = unmerged_mask(p->two->path);
 487                        break;
 488                }
 489        }
 490}
 491
 492static void wt_status_collect_changes_worktree(struct wt_status *s)
 493{
 494        struct rev_info rev;
 495
 496        init_revisions(&rev, NULL);
 497        setup_revisions(0, NULL, &rev, NULL);
 498        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 499        DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
 500        if (!s->show_untracked_files)
 501                DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
 502        if (s->ignore_submodule_arg) {
 503                DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 504                handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 505        }
 506        rev.diffopt.format_callback = wt_status_collect_changed_cb;
 507        rev.diffopt.format_callback_data = s;
 508        copy_pathspec(&rev.prune_data, &s->pathspec);
 509        run_diff_files(&rev, 0);
 510}
 511
 512static void wt_status_collect_changes_index(struct wt_status *s)
 513{
 514        struct rev_info rev;
 515        struct setup_revision_opt opt;
 516
 517        init_revisions(&rev, NULL);
 518        memset(&opt, 0, sizeof(opt));
 519        opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 520        setup_revisions(0, NULL, &rev, &opt);
 521
 522        DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 523        if (s->ignore_submodule_arg) {
 524                handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 525        } else {
 526                /*
 527                 * Unless the user did explicitly request a submodule ignore
 528                 * mode by passing a command line option we do not ignore any
 529                 * changed submodule SHA-1s when comparing index and HEAD, no
 530                 * matter what is configured. Otherwise the user won't be
 531                 * shown any submodules she manually added (and which are
 532                 * staged to be committed), which would be really confusing.
 533                 */
 534                handle_ignore_submodules_arg(&rev.diffopt, "dirty");
 535        }
 536
 537        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 538        rev.diffopt.format_callback = wt_status_collect_updated_cb;
 539        rev.diffopt.format_callback_data = s;
 540        rev.diffopt.detect_rename = 1;
 541        rev.diffopt.rename_limit = 200;
 542        rev.diffopt.break_opt = 0;
 543        copy_pathspec(&rev.prune_data, &s->pathspec);
 544        run_diff_index(&rev, 1);
 545}
 546
 547static void wt_status_collect_changes_initial(struct wt_status *s)
 548{
 549        int i;
 550
 551        for (i = 0; i < active_nr; i++) {
 552                struct string_list_item *it;
 553                struct wt_status_change_data *d;
 554                const struct cache_entry *ce = active_cache[i];
 555
 556                if (!ce_path_match(ce, &s->pathspec, NULL))
 557                        continue;
 558                it = string_list_insert(&s->change, ce->name);
 559                d = it->util;
 560                if (!d) {
 561                        d = xcalloc(1, sizeof(*d));
 562                        it->util = d;
 563                }
 564                if (ce_stage(ce)) {
 565                        d->index_status = DIFF_STATUS_UNMERGED;
 566                        d->stagemask |= (1 << (ce_stage(ce) - 1));
 567                }
 568                else
 569                        d->index_status = DIFF_STATUS_ADDED;
 570        }
 571}
 572
 573static void wt_status_collect_untracked(struct wt_status *s)
 574{
 575        int i;
 576        struct dir_struct dir;
 577        struct timeval t_begin;
 578
 579        if (!s->show_untracked_files)
 580                return;
 581
 582        if (advice_status_u_option)
 583                gettimeofday(&t_begin, NULL);
 584
 585        memset(&dir, 0, sizeof(dir));
 586        if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
 587                dir.flags |=
 588                        DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
 589        if (s->show_ignored_files)
 590                dir.flags |= DIR_SHOW_IGNORED_TOO;
 591        setup_standard_excludes(&dir);
 592
 593        fill_directory(&dir, &s->pathspec);
 594
 595        for (i = 0; i < dir.nr; i++) {
 596                struct dir_entry *ent = dir.entries[i];
 597                if (cache_name_is_other(ent->name, ent->len) &&
 598                    dir_path_match(ent, &s->pathspec, 0, NULL))
 599                        string_list_insert(&s->untracked, ent->name);
 600                free(ent);
 601        }
 602
 603        for (i = 0; i < dir.ignored_nr; i++) {
 604                struct dir_entry *ent = dir.ignored[i];
 605                if (cache_name_is_other(ent->name, ent->len) &&
 606                    dir_path_match(ent, &s->pathspec, 0, NULL))
 607                        string_list_insert(&s->ignored, ent->name);
 608                free(ent);
 609        }
 610
 611        free(dir.entries);
 612        free(dir.ignored);
 613        clear_directory(&dir);
 614
 615        if (advice_status_u_option) {
 616                struct timeval t_end;
 617                gettimeofday(&t_end, NULL);
 618                s->untracked_in_ms =
 619                        (uint64_t)t_end.tv_sec * 1000 + t_end.tv_usec / 1000 -
 620                        ((uint64_t)t_begin.tv_sec * 1000 + t_begin.tv_usec / 1000);
 621        }
 622}
 623
 624void wt_status_collect(struct wt_status *s)
 625{
 626        wt_status_collect_changes_worktree(s);
 627
 628        if (s->is_initial)
 629                wt_status_collect_changes_initial(s);
 630        else
 631                wt_status_collect_changes_index(s);
 632        wt_status_collect_untracked(s);
 633}
 634
 635static void wt_status_print_unmerged(struct wt_status *s)
 636{
 637        int shown_header = 0;
 638        int i;
 639
 640        for (i = 0; i < s->change.nr; i++) {
 641                struct wt_status_change_data *d;
 642                struct string_list_item *it;
 643                it = &(s->change.items[i]);
 644                d = it->util;
 645                if (!d->stagemask)
 646                        continue;
 647                if (!shown_header) {
 648                        wt_status_print_unmerged_header(s);
 649                        shown_header = 1;
 650                }
 651                wt_status_print_unmerged_data(s, it);
 652        }
 653        if (shown_header)
 654                wt_status_print_trailer(s);
 655
 656}
 657
 658static void wt_status_print_updated(struct wt_status *s)
 659{
 660        int shown_header = 0;
 661        int i;
 662
 663        for (i = 0; i < s->change.nr; i++) {
 664                struct wt_status_change_data *d;
 665                struct string_list_item *it;
 666                it = &(s->change.items[i]);
 667                d = it->util;
 668                if (!d->index_status ||
 669                    d->index_status == DIFF_STATUS_UNMERGED)
 670                        continue;
 671                if (!shown_header) {
 672                        wt_status_print_cached_header(s);
 673                        s->commitable = 1;
 674                        shown_header = 1;
 675                }
 676                wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
 677        }
 678        if (shown_header)
 679                wt_status_print_trailer(s);
 680}
 681
 682/*
 683 * -1 : has delete
 684 *  0 : no change
 685 *  1 : some change but no delete
 686 */
 687static int wt_status_check_worktree_changes(struct wt_status *s,
 688                                             int *dirty_submodules)
 689{
 690        int i;
 691        int changes = 0;
 692
 693        *dirty_submodules = 0;
 694
 695        for (i = 0; i < s->change.nr; i++) {
 696                struct wt_status_change_data *d;
 697                d = s->change.items[i].util;
 698                if (!d->worktree_status ||
 699                    d->worktree_status == DIFF_STATUS_UNMERGED)
 700                        continue;
 701                if (!changes)
 702                        changes = 1;
 703                if (d->dirty_submodule)
 704                        *dirty_submodules = 1;
 705                if (d->worktree_status == DIFF_STATUS_DELETED)
 706                        changes = -1;
 707        }
 708        return changes;
 709}
 710
 711static void wt_status_print_changed(struct wt_status *s)
 712{
 713        int i, dirty_submodules;
 714        int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
 715
 716        if (!worktree_changes)
 717                return;
 718
 719        wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
 720
 721        for (i = 0; i < s->change.nr; i++) {
 722                struct wt_status_change_data *d;
 723                struct string_list_item *it;
 724                it = &(s->change.items[i]);
 725                d = it->util;
 726                if (!d->worktree_status ||
 727                    d->worktree_status == DIFF_STATUS_UNMERGED)
 728                        continue;
 729                wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
 730        }
 731        wt_status_print_trailer(s);
 732}
 733
 734static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
 735{
 736        struct child_process sm_summary;
 737        char summary_limit[64];
 738        char index[PATH_MAX];
 739        const char *env[] = { NULL, NULL };
 740        struct argv_array argv = ARGV_ARRAY_INIT;
 741        struct strbuf cmd_stdout = STRBUF_INIT;
 742        struct strbuf summary = STRBUF_INIT;
 743        char *summary_content;
 744        size_t len;
 745
 746        sprintf(summary_limit, "%d", s->submodule_summary);
 747        snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
 748
 749        env[0] = index;
 750        argv_array_push(&argv, "submodule");
 751        argv_array_push(&argv, "summary");
 752        argv_array_push(&argv, uncommitted ? "--files" : "--cached");
 753        argv_array_push(&argv, "--for-status");
 754        argv_array_push(&argv, "--summary-limit");
 755        argv_array_push(&argv, summary_limit);
 756        if (!uncommitted)
 757                argv_array_push(&argv, s->amend ? "HEAD^" : "HEAD");
 758
 759        memset(&sm_summary, 0, sizeof(sm_summary));
 760        sm_summary.argv = argv.argv;
 761        sm_summary.env = env;
 762        sm_summary.git_cmd = 1;
 763        sm_summary.no_stdin = 1;
 764        fflush(s->fp);
 765        sm_summary.out = -1;
 766
 767        run_command(&sm_summary);
 768        argv_array_clear(&argv);
 769
 770        len = strbuf_read(&cmd_stdout, sm_summary.out, 1024);
 771
 772        /* prepend header, only if there's an actual output */
 773        if (len) {
 774                if (uncommitted)
 775                        strbuf_addstr(&summary, _("Submodules changed but not updated:"));
 776                else
 777                        strbuf_addstr(&summary, _("Submodule changes to be committed:"));
 778                strbuf_addstr(&summary, "\n\n");
 779        }
 780        strbuf_addbuf(&summary, &cmd_stdout);
 781        strbuf_release(&cmd_stdout);
 782
 783        if (s->display_comment_prefix) {
 784                summary_content = strbuf_detach(&summary, &len);
 785                strbuf_add_commented_lines(&summary, summary_content, len);
 786                free(summary_content);
 787        }
 788
 789        fputs(summary.buf, s->fp);
 790        strbuf_release(&summary);
 791}
 792
 793static void wt_status_print_other(struct wt_status *s,
 794                                  struct string_list *l,
 795                                  const char *what,
 796                                  const char *how)
 797{
 798        int i;
 799        struct strbuf buf = STRBUF_INIT;
 800        static struct string_list output = STRING_LIST_INIT_DUP;
 801        struct column_options copts;
 802
 803        if (!l->nr)
 804                return;
 805
 806        wt_status_print_other_header(s, what, how);
 807
 808        for (i = 0; i < l->nr; i++) {
 809                struct string_list_item *it;
 810                const char *path;
 811                it = &(l->items[i]);
 812                path = quote_path(it->string, s->prefix, &buf);
 813                if (column_active(s->colopts)) {
 814                        string_list_append(&output, path);
 815                        continue;
 816                }
 817                status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 818                status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
 819                                   "%s\n", path);
 820        }
 821
 822        strbuf_release(&buf);
 823        if (!column_active(s->colopts))
 824                goto conclude;
 825
 826        strbuf_addf(&buf, "%s%s\t%s",
 827                    color(WT_STATUS_HEADER, s),
 828                    s->display_comment_prefix ? "#" : "",
 829                    color(WT_STATUS_UNTRACKED, s));
 830        memset(&copts, 0, sizeof(copts));
 831        copts.padding = 1;
 832        copts.indent = buf.buf;
 833        if (want_color(s->use_color))
 834                copts.nl = GIT_COLOR_RESET "\n";
 835        print_columns(&output, s->colopts, &copts);
 836        string_list_clear(&output, 0);
 837        strbuf_release(&buf);
 838conclude:
 839        status_printf_ln(s, GIT_COLOR_NORMAL, "");
 840}
 841
 842void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
 843{
 844        const char *p;
 845        struct strbuf pattern = STRBUF_INIT;
 846
 847        strbuf_addf(&pattern, "%c %s", comment_line_char, cut_line);
 848        p = strstr(buf->buf, pattern.buf);
 849        if (p && (p == buf->buf || p[-1] == '\n'))
 850                strbuf_setlen(buf, p - buf->buf);
 851        strbuf_release(&pattern);
 852}
 853
 854void wt_status_add_cut_line(FILE *fp)
 855{
 856        const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
 857        struct strbuf buf = STRBUF_INIT;
 858
 859        fprintf(fp, "%c %s", comment_line_char, cut_line);
 860        strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
 861        fputs(buf.buf, fp);
 862        strbuf_release(&buf);
 863}
 864
 865static void wt_status_print_verbose(struct wt_status *s)
 866{
 867        struct rev_info rev;
 868        struct setup_revision_opt opt;
 869
 870        init_revisions(&rev, NULL);
 871        DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
 872
 873        memset(&opt, 0, sizeof(opt));
 874        opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 875        setup_revisions(0, NULL, &rev, &opt);
 876
 877        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 878        rev.diffopt.detect_rename = 1;
 879        rev.diffopt.file = s->fp;
 880        rev.diffopt.close_file = 0;
 881        /*
 882         * If we're not going to stdout, then we definitely don't
 883         * want color, since we are going to the commit message
 884         * file (and even the "auto" setting won't work, since it
 885         * will have checked isatty on stdout). But we then do want
 886         * to insert the scissor line here to reliably remove the
 887         * diff before committing.
 888         */
 889        if (s->fp != stdout) {
 890                rev.diffopt.use_color = 0;
 891                wt_status_add_cut_line(s->fp);
 892        }
 893        run_diff_index(&rev, 1);
 894}
 895
 896static void wt_status_print_tracking(struct wt_status *s)
 897{
 898        struct strbuf sb = STRBUF_INIT;
 899        const char *cp, *ep;
 900        struct branch *branch;
 901        char comment_line_string[3];
 902        int i;
 903
 904        assert(s->branch && !s->is_initial);
 905        if (!starts_with(s->branch, "refs/heads/"))
 906                return;
 907        branch = branch_get(s->branch + 11);
 908        if (!format_tracking_info(branch, &sb))
 909                return;
 910
 911        i = 0;
 912        if (s->display_comment_prefix) {
 913                comment_line_string[i++] = comment_line_char;
 914                comment_line_string[i++] = ' ';
 915        }
 916        comment_line_string[i] = '\0';
 917
 918        for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
 919                color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
 920                                 "%s%.*s", comment_line_string,
 921                                 (int)(ep - cp), cp);
 922        if (s->display_comment_prefix)
 923                color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
 924                                 comment_line_char);
 925        else
 926                fprintf_ln(s->fp, "");
 927}
 928
 929static int has_unmerged(struct wt_status *s)
 930{
 931        int i;
 932
 933        for (i = 0; i < s->change.nr; i++) {
 934                struct wt_status_change_data *d;
 935                d = s->change.items[i].util;
 936                if (d->stagemask)
 937                        return 1;
 938        }
 939        return 0;
 940}
 941
 942static void show_merge_in_progress(struct wt_status *s,
 943                                struct wt_status_state *state,
 944                                const char *color)
 945{
 946        if (has_unmerged(s)) {
 947                status_printf_ln(s, color, _("You have unmerged paths."));
 948                if (s->hints)
 949                        status_printf_ln(s, color,
 950                                _("  (fix conflicts and run \"git commit\")"));
 951        } else {
 952                status_printf_ln(s, color,
 953                        _("All conflicts fixed but you are still merging."));
 954                if (s->hints)
 955                        status_printf_ln(s, color,
 956                                _("  (use \"git commit\" to conclude merge)"));
 957        }
 958        wt_status_print_trailer(s);
 959}
 960
 961static void show_am_in_progress(struct wt_status *s,
 962                                struct wt_status_state *state,
 963                                const char *color)
 964{
 965        status_printf_ln(s, color,
 966                _("You are in the middle of an am session."));
 967        if (state->am_empty_patch)
 968                status_printf_ln(s, color,
 969                        _("The current patch is empty."));
 970        if (s->hints) {
 971                if (!state->am_empty_patch)
 972                        status_printf_ln(s, color,
 973                                _("  (fix conflicts and then run \"git am --continue\")"));
 974                status_printf_ln(s, color,
 975                        _("  (use \"git am --skip\" to skip this patch)"));
 976                status_printf_ln(s, color,
 977                        _("  (use \"git am --abort\" to restore the original branch)"));
 978        }
 979        wt_status_print_trailer(s);
 980}
 981
 982static char *read_line_from_git_path(const char *filename)
 983{
 984        struct strbuf buf = STRBUF_INIT;
 985        FILE *fp = fopen(git_path("%s", filename), "r");
 986        if (!fp) {
 987                strbuf_release(&buf);
 988                return NULL;
 989        }
 990        strbuf_getline(&buf, fp, '\n');
 991        if (!fclose(fp)) {
 992                return strbuf_detach(&buf, NULL);
 993        } else {
 994                strbuf_release(&buf);
 995                return NULL;
 996        }
 997}
 998
 999static int split_commit_in_progress(struct wt_status *s)
1000{
1001        int split_in_progress = 0;
1002        char *head = read_line_from_git_path("HEAD");
1003        char *orig_head = read_line_from_git_path("ORIG_HEAD");
1004        char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1005        char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1006
1007        if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1008            !s->branch || strcmp(s->branch, "HEAD"))
1009                return split_in_progress;
1010
1011        if (!strcmp(rebase_amend, rebase_orig_head)) {
1012                if (strcmp(head, rebase_amend))
1013                        split_in_progress = 1;
1014        } else if (strcmp(orig_head, rebase_orig_head)) {
1015                split_in_progress = 1;
1016        }
1017
1018        if (!s->amend && !s->nowarn && !s->workdir_dirty)
1019                split_in_progress = 0;
1020
1021        free(head);
1022        free(orig_head);
1023        free(rebase_amend);
1024        free(rebase_orig_head);
1025        return split_in_progress;
1026}
1027
1028static void show_rebase_in_progress(struct wt_status *s,
1029                                struct wt_status_state *state,
1030                                const char *color)
1031{
1032        struct stat st;
1033
1034        if (has_unmerged(s)) {
1035                if (state->branch)
1036                        status_printf_ln(s, color,
1037                                         _("You are currently rebasing branch '%s' on '%s'."),
1038                                         state->branch,
1039                                         state->onto);
1040                else
1041                        status_printf_ln(s, color,
1042                                         _("You are currently rebasing."));
1043                if (s->hints) {
1044                        status_printf_ln(s, color,
1045                                _("  (fix conflicts and then run \"git rebase --continue\")"));
1046                        status_printf_ln(s, color,
1047                                _("  (use \"git rebase --skip\" to skip this patch)"));
1048                        status_printf_ln(s, color,
1049                                _("  (use \"git rebase --abort\" to check out the original branch)"));
1050                }
1051        } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
1052                if (state->branch)
1053                        status_printf_ln(s, color,
1054                                         _("You are currently rebasing branch '%s' on '%s'."),
1055                                         state->branch,
1056                                         state->onto);
1057                else
1058                        status_printf_ln(s, color,
1059                                         _("You are currently rebasing."));
1060                if (s->hints)
1061                        status_printf_ln(s, color,
1062                                _("  (all conflicts fixed: run \"git rebase --continue\")"));
1063        } else if (split_commit_in_progress(s)) {
1064                if (state->branch)
1065                        status_printf_ln(s, color,
1066                                         _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1067                                         state->branch,
1068                                         state->onto);
1069                else
1070                        status_printf_ln(s, color,
1071                                         _("You are currently splitting a commit during a rebase."));
1072                if (s->hints)
1073                        status_printf_ln(s, color,
1074                                _("  (Once your working directory is clean, run \"git rebase --continue\")"));
1075        } else {
1076                if (state->branch)
1077                        status_printf_ln(s, color,
1078                                         _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1079                                         state->branch,
1080                                         state->onto);
1081                else
1082                        status_printf_ln(s, color,
1083                                         _("You are currently editing a commit during a rebase."));
1084                if (s->hints && !s->amend) {
1085                        status_printf_ln(s, color,
1086                                _("  (use \"git commit --amend\" to amend the current commit)"));
1087                        status_printf_ln(s, color,
1088                                _("  (use \"git rebase --continue\" once you are satisfied with your changes)"));
1089                }
1090        }
1091        wt_status_print_trailer(s);
1092}
1093
1094static void show_cherry_pick_in_progress(struct wt_status *s,
1095                                        struct wt_status_state *state,
1096                                        const char *color)
1097{
1098        status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1099                        find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1100        if (s->hints) {
1101                if (has_unmerged(s))
1102                        status_printf_ln(s, color,
1103                                _("  (fix conflicts and run \"git cherry-pick --continue\")"));
1104                else
1105                        status_printf_ln(s, color,
1106                                _("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
1107                status_printf_ln(s, color,
1108                        _("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1109        }
1110        wt_status_print_trailer(s);
1111}
1112
1113static void show_revert_in_progress(struct wt_status *s,
1114                                        struct wt_status_state *state,
1115                                        const char *color)
1116{
1117        status_printf_ln(s, color, _("You are currently reverting commit %s."),
1118                         find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1119        if (s->hints) {
1120                if (has_unmerged(s))
1121                        status_printf_ln(s, color,
1122                                _("  (fix conflicts and run \"git revert --continue\")"));
1123                else
1124                        status_printf_ln(s, color,
1125                                _("  (all conflicts fixed: run \"git revert --continue\")"));
1126                status_printf_ln(s, color,
1127                        _("  (use \"git revert --abort\" to cancel the revert operation)"));
1128        }
1129        wt_status_print_trailer(s);
1130}
1131
1132static void show_bisect_in_progress(struct wt_status *s,
1133                                struct wt_status_state *state,
1134                                const char *color)
1135{
1136        if (state->branch)
1137                status_printf_ln(s, color,
1138                                 _("You are currently bisecting, started from branch '%s'."),
1139                                 state->branch);
1140        else
1141                status_printf_ln(s, color,
1142                                 _("You are currently bisecting."));
1143        if (s->hints)
1144                status_printf_ln(s, color,
1145                        _("  (use \"git bisect reset\" to get back to the original branch)"));
1146        wt_status_print_trailer(s);
1147}
1148
1149/*
1150 * Extract branch information from rebase/bisect
1151 */
1152static char *read_and_strip_branch(const char *path)
1153{
1154        struct strbuf sb = STRBUF_INIT;
1155        unsigned char sha1[20];
1156
1157        if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
1158                goto got_nothing;
1159
1160        while (&sb.len && sb.buf[sb.len - 1] == '\n')
1161                strbuf_setlen(&sb, sb.len - 1);
1162        if (!sb.len)
1163                goto got_nothing;
1164        if (starts_with(sb.buf, "refs/heads/"))
1165                strbuf_remove(&sb,0, strlen("refs/heads/"));
1166        else if (starts_with(sb.buf, "refs/"))
1167                ;
1168        else if (!get_sha1_hex(sb.buf, sha1)) {
1169                const char *abbrev;
1170                abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1171                strbuf_reset(&sb);
1172                strbuf_addstr(&sb, abbrev);
1173        } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1174                goto got_nothing;
1175        else                    /* bisect */
1176                ;
1177        return strbuf_detach(&sb, NULL);
1178
1179got_nothing:
1180        strbuf_release(&sb);
1181        return NULL;
1182}
1183
1184struct grab_1st_switch_cbdata {
1185        struct strbuf buf;
1186        unsigned char nsha1[20];
1187};
1188
1189static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1190                           const char *email, unsigned long timestamp, int tz,
1191                           const char *message, void *cb_data)
1192{
1193        struct grab_1st_switch_cbdata *cb = cb_data;
1194        const char *target = NULL, *end;
1195
1196        if (!starts_with(message, "checkout: moving from "))
1197                return 0;
1198        message += strlen("checkout: moving from ");
1199        target = strstr(message, " to ");
1200        if (!target)
1201                return 0;
1202        target += strlen(" to ");
1203        strbuf_reset(&cb->buf);
1204        hashcpy(cb->nsha1, nsha1);
1205        for (end = target; *end && *end != '\n'; end++)
1206                ;
1207        strbuf_add(&cb->buf, target, end - target);
1208        return 1;
1209}
1210
1211static void wt_status_get_detached_from(struct wt_status_state *state)
1212{
1213        struct grab_1st_switch_cbdata cb;
1214        struct commit *commit;
1215        unsigned char sha1[20];
1216        char *ref = NULL;
1217
1218        strbuf_init(&cb.buf, 0);
1219        if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1220                strbuf_release(&cb.buf);
1221                return;
1222        }
1223
1224        if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1225            /* sha1 is a commit? match without further lookup */
1226            (!hashcmp(cb.nsha1, sha1) ||
1227             /* perhaps sha1 is a tag, try to dereference to a commit */
1228             ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1229              !hashcmp(cb.nsha1, commit->object.sha1)))) {
1230                int ofs;
1231                if (starts_with(ref, "refs/tags/"))
1232                        ofs = strlen("refs/tags/");
1233                else if (starts_with(ref, "refs/remotes/"))
1234                        ofs = strlen("refs/remotes/");
1235                else
1236                        ofs = 0;
1237                state->detached_from = xstrdup(ref + ofs);
1238        } else
1239                state->detached_from =
1240                        xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1241        hashcpy(state->detached_sha1, cb.nsha1);
1242
1243        free(ref);
1244        strbuf_release(&cb.buf);
1245}
1246
1247void wt_status_get_state(struct wt_status_state *state,
1248                         int get_detached_from)
1249{
1250        struct stat st;
1251        unsigned char sha1[20];
1252
1253        if (!stat(git_path("MERGE_HEAD"), &st)) {
1254                state->merge_in_progress = 1;
1255        } else if (!stat(git_path("rebase-apply"), &st)) {
1256                if (!stat(git_path("rebase-apply/applying"), &st)) {
1257                        state->am_in_progress = 1;
1258                        if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
1259                                state->am_empty_patch = 1;
1260                } else {
1261                        state->rebase_in_progress = 1;
1262                        state->branch = read_and_strip_branch("rebase-apply/head-name");
1263                        state->onto = read_and_strip_branch("rebase-apply/onto");
1264                }
1265        } else if (!stat(git_path("rebase-merge"), &st)) {
1266                if (!stat(git_path("rebase-merge/interactive"), &st))
1267                        state->rebase_interactive_in_progress = 1;
1268                else
1269                        state->rebase_in_progress = 1;
1270                state->branch = read_and_strip_branch("rebase-merge/head-name");
1271                state->onto = read_and_strip_branch("rebase-merge/onto");
1272        } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st) &&
1273                        !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1274                state->cherry_pick_in_progress = 1;
1275                hashcpy(state->cherry_pick_head_sha1, sha1);
1276        }
1277        if (!stat(git_path("BISECT_LOG"), &st)) {
1278                state->bisect_in_progress = 1;
1279                state->branch = read_and_strip_branch("BISECT_START");
1280        }
1281        if (!stat(git_path("REVERT_HEAD"), &st) &&
1282            !get_sha1("REVERT_HEAD", sha1)) {
1283                state->revert_in_progress = 1;
1284                hashcpy(state->revert_head_sha1, sha1);
1285        }
1286
1287        if (get_detached_from)
1288                wt_status_get_detached_from(state);
1289}
1290
1291static void wt_status_print_state(struct wt_status *s,
1292                                  struct wt_status_state *state)
1293{
1294        const char *state_color = color(WT_STATUS_HEADER, s);
1295        if (state->merge_in_progress)
1296                show_merge_in_progress(s, state, state_color);
1297        else if (state->am_in_progress)
1298                show_am_in_progress(s, state, state_color);
1299        else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1300                show_rebase_in_progress(s, state, state_color);
1301        else if (state->cherry_pick_in_progress)
1302                show_cherry_pick_in_progress(s, state, state_color);
1303        else if (state->revert_in_progress)
1304                show_revert_in_progress(s, state, state_color);
1305        if (state->bisect_in_progress)
1306                show_bisect_in_progress(s, state, state_color);
1307}
1308
1309void wt_status_print(struct wt_status *s)
1310{
1311        const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1312        const char *branch_status_color = color(WT_STATUS_HEADER, s);
1313        struct wt_status_state state;
1314
1315        memset(&state, 0, sizeof(state));
1316        wt_status_get_state(&state,
1317                            s->branch && !strcmp(s->branch, "HEAD"));
1318
1319        if (s->branch) {
1320                const char *on_what = _("On branch ");
1321                const char *branch_name = s->branch;
1322                if (starts_with(branch_name, "refs/heads/"))
1323                        branch_name += 11;
1324                else if (!strcmp(branch_name, "HEAD")) {
1325                        branch_status_color = color(WT_STATUS_NOBRANCH, s);
1326                        if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1327                                on_what = _("rebase in progress; onto ");
1328                                branch_name = state.onto;
1329                        } else if (state.detached_from) {
1330                                unsigned char sha1[20];
1331                                branch_name = state.detached_from;
1332                                if (!get_sha1("HEAD", sha1) &&
1333                                    !hashcmp(sha1, state.detached_sha1))
1334                                        on_what = _("HEAD detached at ");
1335                                else
1336                                        on_what = _("HEAD detached from ");
1337                        } else {
1338                                branch_name = "";
1339                                on_what = _("Not currently on any branch.");
1340                        }
1341                }
1342                status_printf(s, color(WT_STATUS_HEADER, s), "");
1343                status_printf_more(s, branch_status_color, "%s", on_what);
1344                status_printf_more(s, branch_color, "%s\n", branch_name);
1345                if (!s->is_initial)
1346                        wt_status_print_tracking(s);
1347        }
1348
1349        wt_status_print_state(s, &state);
1350        free(state.branch);
1351        free(state.onto);
1352        free(state.detached_from);
1353
1354        if (s->is_initial) {
1355                status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
1356                status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1357                status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
1358        }
1359
1360        wt_status_print_updated(s);
1361        wt_status_print_unmerged(s);
1362        wt_status_print_changed(s);
1363        if (s->submodule_summary &&
1364            (!s->ignore_submodule_arg ||
1365             strcmp(s->ignore_submodule_arg, "all"))) {
1366                wt_status_print_submodule_summary(s, 0);  /* staged */
1367                wt_status_print_submodule_summary(s, 1);  /* unstaged */
1368        }
1369        if (s->show_untracked_files) {
1370                wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1371                if (s->show_ignored_files)
1372                        wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1373                if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1374                        status_printf_ln(s, GIT_COLOR_NORMAL, "");
1375                        status_printf_ln(s, GIT_COLOR_NORMAL,
1376                                         _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1377                                           "may speed it up, but you have to be careful not to forget to add\n"
1378                                           "new files yourself (see 'git help status')."),
1379                                         s->untracked_in_ms / 1000.0);
1380                }
1381        } else if (s->commitable)
1382                status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1383                        s->hints
1384                        ? _(" (use -u option to show untracked files)") : "");
1385
1386        if (s->verbose)
1387                wt_status_print_verbose(s);
1388        if (!s->commitable) {
1389                if (s->amend)
1390                        status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1391                else if (s->nowarn)
1392                        ; /* nothing */
1393                else if (s->workdir_dirty) {
1394                        if (s->hints)
1395                                printf(_("no changes added to commit "
1396                                         "(use \"git add\" and/or \"git commit -a\")\n"));
1397                        else
1398                                printf(_("no changes added to commit\n"));
1399                } else if (s->untracked.nr) {
1400                        if (s->hints)
1401                                printf(_("nothing added to commit but untracked files "
1402                                         "present (use \"git add\" to track)\n"));
1403                        else
1404                                printf(_("nothing added to commit but untracked files present\n"));
1405                } else if (s->is_initial) {
1406                        if (s->hints)
1407                                printf(_("nothing to commit (create/copy files "
1408                                         "and use \"git add\" to track)\n"));
1409                        else
1410                                printf(_("nothing to commit\n"));
1411                } else if (!s->show_untracked_files) {
1412                        if (s->hints)
1413                                printf(_("nothing to commit (use -u to show untracked files)\n"));
1414                        else
1415                                printf(_("nothing to commit\n"));
1416                } else
1417                        printf(_("nothing to commit, working directory clean\n"));
1418        }
1419}
1420
1421static void wt_shortstatus_unmerged(struct string_list_item *it,
1422                           struct wt_status *s)
1423{
1424        struct wt_status_change_data *d = it->util;
1425        const char *how = "??";
1426
1427        switch (d->stagemask) {
1428        case 1: how = "DD"; break; /* both deleted */
1429        case 2: how = "AU"; break; /* added by us */
1430        case 3: how = "UD"; break; /* deleted by them */
1431        case 4: how = "UA"; break; /* added by them */
1432        case 5: how = "DU"; break; /* deleted by us */
1433        case 6: how = "AA"; break; /* both added */
1434        case 7: how = "UU"; break; /* both modified */
1435        }
1436        color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1437        if (s->null_termination) {
1438                fprintf(stdout, " %s%c", it->string, 0);
1439        } else {
1440                struct strbuf onebuf = STRBUF_INIT;
1441                const char *one;
1442                one = quote_path(it->string, s->prefix, &onebuf);
1443                printf(" %s\n", one);
1444                strbuf_release(&onebuf);
1445        }
1446}
1447
1448static void wt_shortstatus_status(struct string_list_item *it,
1449                         struct wt_status *s)
1450{
1451        struct wt_status_change_data *d = it->util;
1452
1453        if (d->index_status)
1454                color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1455        else
1456                putchar(' ');
1457        if (d->worktree_status)
1458                color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1459        else
1460                putchar(' ');
1461        putchar(' ');
1462        if (s->null_termination) {
1463                fprintf(stdout, "%s%c", it->string, 0);
1464                if (d->head_path)
1465                        fprintf(stdout, "%s%c", d->head_path, 0);
1466        } else {
1467                struct strbuf onebuf = STRBUF_INIT;
1468                const char *one;
1469                if (d->head_path) {
1470                        one = quote_path(d->head_path, s->prefix, &onebuf);
1471                        if (*one != '"' && strchr(one, ' ') != NULL) {
1472                                putchar('"');
1473                                strbuf_addch(&onebuf, '"');
1474                                one = onebuf.buf;
1475                        }
1476                        printf("%s -> ", one);
1477                        strbuf_release(&onebuf);
1478                }
1479                one = quote_path(it->string, s->prefix, &onebuf);
1480                if (*one != '"' && strchr(one, ' ') != NULL) {
1481                        putchar('"');
1482                        strbuf_addch(&onebuf, '"');
1483                        one = onebuf.buf;
1484                }
1485                printf("%s\n", one);
1486                strbuf_release(&onebuf);
1487        }
1488}
1489
1490static void wt_shortstatus_other(struct string_list_item *it,
1491                                 struct wt_status *s, const char *sign)
1492{
1493        if (s->null_termination) {
1494                fprintf(stdout, "%s %s%c", sign, it->string, 0);
1495        } else {
1496                struct strbuf onebuf = STRBUF_INIT;
1497                const char *one;
1498                one = quote_path(it->string, s->prefix, &onebuf);
1499                color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1500                printf(" %s\n", one);
1501                strbuf_release(&onebuf);
1502        }
1503}
1504
1505static void wt_shortstatus_print_tracking(struct wt_status *s)
1506{
1507        struct branch *branch;
1508        const char *header_color = color(WT_STATUS_HEADER, s);
1509        const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1510        const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1511
1512        const char *base;
1513        const char *branch_name;
1514        int num_ours, num_theirs;
1515        int upstream_is_gone = 0;
1516
1517        color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1518
1519        if (!s->branch)
1520                return;
1521        branch_name = s->branch;
1522
1523        if (starts_with(branch_name, "refs/heads/"))
1524                branch_name += 11;
1525        else if (!strcmp(branch_name, "HEAD")) {
1526                branch_name = _("HEAD (no branch)");
1527                branch_color_local = color(WT_STATUS_NOBRANCH, s);
1528        }
1529
1530        branch = branch_get(s->branch + 11);
1531        if (s->is_initial)
1532                color_fprintf(s->fp, header_color, _("Initial commit on "));
1533
1534        color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1535
1536        switch (stat_tracking_info(branch, &num_ours, &num_theirs)) {
1537        case 0:
1538                /* no base */
1539                fputc(s->null_termination ? '\0' : '\n', s->fp);
1540                return;
1541        case -1:
1542                /* with "gone" base */
1543                upstream_is_gone = 1;
1544                break;
1545        default:
1546                /* with base */
1547                break;
1548        }
1549
1550        base = branch->merge[0]->dst;
1551        base = shorten_unambiguous_ref(base, 0);
1552        color_fprintf(s->fp, header_color, "...");
1553        color_fprintf(s->fp, branch_color_remote, "%s", base);
1554
1555        if (!upstream_is_gone && !num_ours && !num_theirs) {
1556                fputc(s->null_termination ? '\0' : '\n', s->fp);
1557                return;
1558        }
1559
1560#define LABEL(string) (s->no_gettext ? (string) : _(string))
1561
1562        color_fprintf(s->fp, header_color, " [");
1563        if (upstream_is_gone) {
1564                color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1565        } else if (!num_ours) {
1566                color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1567                color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1568        } else if (!num_theirs) {
1569                color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
1570                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1571        } else {
1572                color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
1573                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1574                color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1575                color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1576        }
1577
1578        color_fprintf(s->fp, header_color, "]");
1579        fputc(s->null_termination ? '\0' : '\n', s->fp);
1580}
1581
1582void wt_shortstatus_print(struct wt_status *s)
1583{
1584        int i;
1585
1586        if (s->show_branch)
1587                wt_shortstatus_print_tracking(s);
1588
1589        for (i = 0; i < s->change.nr; i++) {
1590                struct wt_status_change_data *d;
1591                struct string_list_item *it;
1592
1593                it = &(s->change.items[i]);
1594                d = it->util;
1595                if (d->stagemask)
1596                        wt_shortstatus_unmerged(it, s);
1597                else
1598                        wt_shortstatus_status(it, s);
1599        }
1600        for (i = 0; i < s->untracked.nr; i++) {
1601                struct string_list_item *it;
1602
1603                it = &(s->untracked.items[i]);
1604                wt_shortstatus_other(it, s, "??");
1605        }
1606        for (i = 0; i < s->ignored.nr; i++) {
1607                struct string_list_item *it;
1608
1609                it = &(s->ignored.items[i]);
1610                wt_shortstatus_other(it, s, "!!");
1611        }
1612}
1613
1614void wt_porcelain_print(struct wt_status *s)
1615{
1616        s->use_color = 0;
1617        s->relative_paths = 0;
1618        s->prefix = NULL;
1619        s->no_gettext = 1;
1620        wt_shortstatus_print(s);
1621}