wt-status.con commit Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' (8e83d05)
   1#include "cache.h"
   2#include "wt-status.h"
   3#include "object.h"
   4#include "dir.h"
   5#include "commit.h"
   6#include "diff.h"
   7#include "revision.h"
   8#include "diffcore.h"
   9#include "quote.h"
  10#include "run-command.h"
  11#include "argv-array.h"
  12#include "remote.h"
  13#include "refs.h"
  14#include "submodule.h"
  15#include "column.h"
  16#include "strbuf.h"
  17#include "utf8.h"
  18#include "worktree.h"
  19#include "lockfile.h"
  20
  21static const char cut_line[] =
  22"------------------------ >8 ------------------------\n";
  23
  24static char default_wt_status_colors[][COLOR_MAXLEN] = {
  25        GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
  26        GIT_COLOR_GREEN,  /* WT_STATUS_UPDATED */
  27        GIT_COLOR_RED,    /* WT_STATUS_CHANGED */
  28        GIT_COLOR_RED,    /* WT_STATUS_UNTRACKED */
  29        GIT_COLOR_RED,    /* WT_STATUS_NOBRANCH */
  30        GIT_COLOR_RED,    /* WT_STATUS_UNMERGED */
  31        GIT_COLOR_GREEN,  /* WT_STATUS_LOCAL_BRANCH */
  32        GIT_COLOR_RED,    /* WT_STATUS_REMOTE_BRANCH */
  33        GIT_COLOR_NIL,    /* WT_STATUS_ONBRANCH */
  34};
  35
  36static const char *color(int slot, struct wt_status *s)
  37{
  38        const char *c = "";
  39        if (want_color(s->use_color))
  40                c = s->color_palette[slot];
  41        if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
  42                c = s->color_palette[WT_STATUS_HEADER];
  43        return c;
  44}
  45
  46static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
  47                const char *fmt, va_list ap, const char *trail)
  48{
  49        struct strbuf sb = STRBUF_INIT;
  50        struct strbuf linebuf = STRBUF_INIT;
  51        const char *line, *eol;
  52
  53        strbuf_vaddf(&sb, fmt, ap);
  54        if (!sb.len) {
  55                if (s->display_comment_prefix) {
  56                        strbuf_addch(&sb, comment_line_char);
  57                        if (!trail)
  58                                strbuf_addch(&sb, ' ');
  59                }
  60                color_print_strbuf(s->fp, color, &sb);
  61                if (trail)
  62                        fprintf(s->fp, "%s", trail);
  63                strbuf_release(&sb);
  64                return;
  65        }
  66        for (line = sb.buf; *line; line = eol + 1) {
  67                eol = strchr(line, '\n');
  68
  69                strbuf_reset(&linebuf);
  70                if (at_bol && s->display_comment_prefix) {
  71                        strbuf_addch(&linebuf, comment_line_char);
  72                        if (*line != '\n' && *line != '\t')
  73                                strbuf_addch(&linebuf, ' ');
  74                }
  75                if (eol)
  76                        strbuf_add(&linebuf, line, eol - line);
  77                else
  78                        strbuf_addstr(&linebuf, line);
  79                color_print_strbuf(s->fp, color, &linebuf);
  80                if (eol)
  81                        fprintf(s->fp, "\n");
  82                else
  83                        break;
  84                at_bol = 1;
  85        }
  86        if (trail)
  87                fprintf(s->fp, "%s", trail);
  88        strbuf_release(&linebuf);
  89        strbuf_release(&sb);
  90}
  91
  92void status_printf_ln(struct wt_status *s, const char *color,
  93                        const char *fmt, ...)
  94{
  95        va_list ap;
  96
  97        va_start(ap, fmt);
  98        status_vprintf(s, 1, color, fmt, ap, "\n");
  99        va_end(ap);
 100}
 101
 102void status_printf(struct wt_status *s, const char *color,
 103                        const char *fmt, ...)
 104{
 105        va_list ap;
 106
 107        va_start(ap, fmt);
 108        status_vprintf(s, 1, color, fmt, ap, NULL);
 109        va_end(ap);
 110}
 111
 112static void status_printf_more(struct wt_status *s, const char *color,
 113                               const char *fmt, ...)
 114{
 115        va_list ap;
 116
 117        va_start(ap, fmt);
 118        status_vprintf(s, 0, color, fmt, ap, NULL);
 119        va_end(ap);
 120}
 121
 122void wt_status_prepare(struct wt_status *s)
 123{
 124        unsigned char sha1[20];
 125
 126        memset(s, 0, sizeof(*s));
 127        memcpy(s->color_palette, default_wt_status_colors,
 128               sizeof(default_wt_status_colors));
 129        s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
 130        s->use_color = -1;
 131        s->relative_paths = 1;
 132        s->branch = resolve_refdup("HEAD", 0, sha1, NULL);
 133        s->reference = "HEAD";
 134        s->fp = stdout;
 135        s->index_file = get_index_file();
 136        s->change.strdup_strings = 1;
 137        s->untracked.strdup_strings = 1;
 138        s->ignored.strdup_strings = 1;
 139        s->show_branch = -1;  /* unspecified */
 140        s->display_comment_prefix = 0;
 141}
 142
 143static void wt_longstatus_print_unmerged_header(struct wt_status *s)
 144{
 145        int i;
 146        int del_mod_conflict = 0;
 147        int both_deleted = 0;
 148        int not_deleted = 0;
 149        const char *c = color(WT_STATUS_HEADER, s);
 150
 151        status_printf_ln(s, c, _("Unmerged paths:"));
 152
 153        for (i = 0; i < s->change.nr; i++) {
 154                struct string_list_item *it = &(s->change.items[i]);
 155                struct wt_status_change_data *d = it->util;
 156
 157                switch (d->stagemask) {
 158                case 0:
 159                        break;
 160                case 1:
 161                        both_deleted = 1;
 162                        break;
 163                case 3:
 164                case 5:
 165                        del_mod_conflict = 1;
 166                        break;
 167                default:
 168                        not_deleted = 1;
 169                        break;
 170                }
 171        }
 172
 173        if (!s->hints)
 174                return;
 175        if (s->whence != FROM_COMMIT)
 176                ;
 177        else if (!s->is_initial)
 178                status_printf_ln(s, c, _("  (use \"git reset %s <file>...\" to unstage)"), s->reference);
 179        else
 180                status_printf_ln(s, c, _("  (use \"git rm --cached <file>...\" to unstage)"));
 181
 182        if (!both_deleted) {
 183                if (!del_mod_conflict)
 184                        status_printf_ln(s, c, _("  (use \"git add <file>...\" to mark resolution)"));
 185                else
 186                        status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
 187        } else if (!del_mod_conflict && !not_deleted) {
 188                status_printf_ln(s, c, _("  (use \"git rm <file>...\" to mark resolution)"));
 189        } else {
 190                status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
 191        }
 192        status_printf_ln(s, c, "%s", "");
 193}
 194
 195static void wt_longstatus_print_cached_header(struct wt_status *s)
 196{
 197        const char *c = color(WT_STATUS_HEADER, s);
 198
 199        status_printf_ln(s, c, _("Changes to be committed:"));
 200        if (!s->hints)
 201                return;
 202        if (s->whence != FROM_COMMIT)
 203                ; /* NEEDSWORK: use "git reset --unresolve"??? */
 204        else if (!s->is_initial)
 205                status_printf_ln(s, c, _("  (use \"git reset %s <file>...\" to unstage)"), s->reference);
 206        else
 207                status_printf_ln(s, c, _("  (use \"git rm --cached <file>...\" to unstage)"));
 208        status_printf_ln(s, c, "%s", "");
 209}
 210
 211static void wt_longstatus_print_dirty_header(struct wt_status *s,
 212                                             int has_deleted,
 213                                             int has_dirty_submodules)
 214{
 215        const char *c = color(WT_STATUS_HEADER, s);
 216
 217        status_printf_ln(s, c, _("Changes not staged for commit:"));
 218        if (!s->hints)
 219                return;
 220        if (!has_deleted)
 221                status_printf_ln(s, c, _("  (use \"git add <file>...\" to update what will be committed)"));
 222        else
 223                status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" to update what will be committed)"));
 224        status_printf_ln(s, c, _("  (use \"git checkout -- <file>...\" to discard changes in working directory)"));
 225        if (has_dirty_submodules)
 226                status_printf_ln(s, c, _("  (commit or discard the untracked or modified content in submodules)"));
 227        status_printf_ln(s, c, "%s", "");
 228}
 229
 230static void wt_longstatus_print_other_header(struct wt_status *s,
 231                                             const char *what,
 232                                             const char *how)
 233{
 234        const char *c = color(WT_STATUS_HEADER, s);
 235        status_printf_ln(s, c, "%s:", what);
 236        if (!s->hints)
 237                return;
 238        status_printf_ln(s, c, _("  (use \"git %s <file>...\" to include in what will be committed)"), how);
 239        status_printf_ln(s, c, "%s", "");
 240}
 241
 242static void wt_longstatus_print_trailer(struct wt_status *s)
 243{
 244        status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
 245}
 246
 247#define quote_path quote_path_relative
 248
 249static const char *wt_status_unmerged_status_string(int stagemask)
 250{
 251        switch (stagemask) {
 252        case 1:
 253                return _("both deleted:");
 254        case 2:
 255                return _("added by us:");
 256        case 3:
 257                return _("deleted by them:");
 258        case 4:
 259                return _("added by them:");
 260        case 5:
 261                return _("deleted by us:");
 262        case 6:
 263                return _("both added:");
 264        case 7:
 265                return _("both modified:");
 266        default:
 267                die("BUG: unhandled unmerged status %x", stagemask);
 268        }
 269}
 270
 271static const char *wt_status_diff_status_string(int status)
 272{
 273        switch (status) {
 274        case DIFF_STATUS_ADDED:
 275                return _("new file:");
 276        case DIFF_STATUS_COPIED:
 277                return _("copied:");
 278        case DIFF_STATUS_DELETED:
 279                return _("deleted:");
 280        case DIFF_STATUS_MODIFIED:
 281                return _("modified:");
 282        case DIFF_STATUS_RENAMED:
 283                return _("renamed:");
 284        case DIFF_STATUS_TYPE_CHANGED:
 285                return _("typechange:");
 286        case DIFF_STATUS_UNKNOWN:
 287                return _("unknown:");
 288        case DIFF_STATUS_UNMERGED:
 289                return _("unmerged:");
 290        default:
 291                return NULL;
 292        }
 293}
 294
 295static int maxwidth(const char *(*label)(int), int minval, int maxval)
 296{
 297        int result = 0, i;
 298
 299        for (i = minval; i <= maxval; i++) {
 300                const char *s = label(i);
 301                int len = s ? utf8_strwidth(s) : 0;
 302                if (len > result)
 303                        result = len;
 304        }
 305        return result;
 306}
 307
 308static void wt_longstatus_print_unmerged_data(struct wt_status *s,
 309                                              struct string_list_item *it)
 310{
 311        const char *c = color(WT_STATUS_UNMERGED, s);
 312        struct wt_status_change_data *d = it->util;
 313        struct strbuf onebuf = STRBUF_INIT;
 314        static char *padding;
 315        static int label_width;
 316        const char *one, *how;
 317        int len;
 318
 319        if (!padding) {
 320                label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
 321                label_width += strlen(" ");
 322                padding = xmallocz(label_width);
 323                memset(padding, ' ', label_width);
 324        }
 325
 326        one = quote_path(it->string, s->prefix, &onebuf);
 327        status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 328
 329        how = wt_status_unmerged_status_string(d->stagemask);
 330        len = label_width - utf8_strwidth(how);
 331        status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
 332        strbuf_release(&onebuf);
 333}
 334
 335static void wt_longstatus_print_change_data(struct wt_status *s,
 336                                            int change_type,
 337                                            struct string_list_item *it)
 338{
 339        struct wt_status_change_data *d = it->util;
 340        const char *c = color(change_type, s);
 341        int status;
 342        char *one_name;
 343        char *two_name;
 344        const char *one, *two;
 345        struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
 346        struct strbuf extra = STRBUF_INIT;
 347        static char *padding;
 348        static int label_width;
 349        const char *what;
 350        int len;
 351
 352        if (!padding) {
 353                /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
 354                label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
 355                label_width += strlen(" ");
 356                padding = xmallocz(label_width);
 357                memset(padding, ' ', label_width);
 358        }
 359
 360        one_name = two_name = it->string;
 361        switch (change_type) {
 362        case WT_STATUS_UPDATED:
 363                status = d->index_status;
 364                if (d->head_path)
 365                        one_name = d->head_path;
 366                break;
 367        case WT_STATUS_CHANGED:
 368                if (d->new_submodule_commits || d->dirty_submodule) {
 369                        strbuf_addstr(&extra, " (");
 370                        if (d->new_submodule_commits)
 371                                strbuf_addstr(&extra, _("new commits, "));
 372                        if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
 373                                strbuf_addstr(&extra, _("modified content, "));
 374                        if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
 375                                strbuf_addstr(&extra, _("untracked content, "));
 376                        strbuf_setlen(&extra, extra.len - 2);
 377                        strbuf_addch(&extra, ')');
 378                }
 379                status = d->worktree_status;
 380                break;
 381        default:
 382                die("BUG: unhandled change_type %d in wt_longstatus_print_change_data",
 383                    change_type);
 384        }
 385
 386        one = quote_path(one_name, s->prefix, &onebuf);
 387        two = quote_path(two_name, s->prefix, &twobuf);
 388
 389        status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 390        what = wt_status_diff_status_string(status);
 391        if (!what)
 392                die("BUG: unhandled diff status %c", status);
 393        len = label_width - utf8_strwidth(what);
 394        assert(len >= 0);
 395        if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
 396                status_printf_more(s, c, "%s%.*s%s -> %s",
 397                                   what, len, padding, one, two);
 398        else
 399                status_printf_more(s, c, "%s%.*s%s",
 400                                   what, len, padding, one);
 401        if (extra.len) {
 402                status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
 403                strbuf_release(&extra);
 404        }
 405        status_printf_more(s, GIT_COLOR_NORMAL, "\n");
 406        strbuf_release(&onebuf);
 407        strbuf_release(&twobuf);
 408}
 409
 410static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
 411                                         struct diff_options *options,
 412                                         void *data)
 413{
 414        struct wt_status *s = data;
 415        int i;
 416
 417        if (!q->nr)
 418                return;
 419        s->workdir_dirty = 1;
 420        for (i = 0; i < q->nr; i++) {
 421                struct diff_filepair *p;
 422                struct string_list_item *it;
 423                struct wt_status_change_data *d;
 424
 425                p = q->queue[i];
 426                it = string_list_insert(&s->change, p->one->path);
 427                d = it->util;
 428                if (!d) {
 429                        d = xcalloc(1, sizeof(*d));
 430                        it->util = d;
 431                }
 432                if (!d->worktree_status)
 433                        d->worktree_status = p->status;
 434                d->dirty_submodule = p->two->dirty_submodule;
 435                if (S_ISGITLINK(p->two->mode))
 436                        d->new_submodule_commits = !!oidcmp(&p->one->oid,
 437                                                            &p->two->oid);
 438
 439                switch (p->status) {
 440                case DIFF_STATUS_ADDED:
 441                        die("BUG: worktree status add???");
 442                        break;
 443
 444                case DIFF_STATUS_DELETED:
 445                        d->mode_index = p->one->mode;
 446                        oidcpy(&d->oid_index, &p->one->oid);
 447                        /* mode_worktree is zero for a delete. */
 448                        break;
 449
 450                case DIFF_STATUS_MODIFIED:
 451                case DIFF_STATUS_TYPE_CHANGED:
 452                case DIFF_STATUS_UNMERGED:
 453                        d->mode_index = p->one->mode;
 454                        d->mode_worktree = p->two->mode;
 455                        oidcpy(&d->oid_index, &p->one->oid);
 456                        break;
 457
 458                case DIFF_STATUS_UNKNOWN:
 459                        die("BUG: worktree status unknown???");
 460                        break;
 461                }
 462
 463        }
 464}
 465
 466static int unmerged_mask(const char *path)
 467{
 468        int pos, mask;
 469        const struct cache_entry *ce;
 470
 471        pos = cache_name_pos(path, strlen(path));
 472        if (0 <= pos)
 473                return 0;
 474
 475        mask = 0;
 476        pos = -pos-1;
 477        while (pos < active_nr) {
 478                ce = active_cache[pos++];
 479                if (strcmp(ce->name, path) || !ce_stage(ce))
 480                        break;
 481                mask |= (1 << (ce_stage(ce) - 1));
 482        }
 483        return mask;
 484}
 485
 486static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
 487                                         struct diff_options *options,
 488                                         void *data)
 489{
 490        struct wt_status *s = data;
 491        int i;
 492
 493        for (i = 0; i < q->nr; i++) {
 494                struct diff_filepair *p;
 495                struct string_list_item *it;
 496                struct wt_status_change_data *d;
 497
 498                p = q->queue[i];
 499                it = string_list_insert(&s->change, p->two->path);
 500                d = it->util;
 501                if (!d) {
 502                        d = xcalloc(1, sizeof(*d));
 503                        it->util = d;
 504                }
 505                if (!d->index_status)
 506                        d->index_status = p->status;
 507                switch (p->status) {
 508                case DIFF_STATUS_ADDED:
 509                        /* Leave {mode,oid}_head zero for an add. */
 510                        d->mode_index = p->two->mode;
 511                        oidcpy(&d->oid_index, &p->two->oid);
 512                        break;
 513                case DIFF_STATUS_DELETED:
 514                        d->mode_head = p->one->mode;
 515                        oidcpy(&d->oid_head, &p->one->oid);
 516                        /* Leave {mode,oid}_index zero for a delete. */
 517                        break;
 518
 519                case DIFF_STATUS_COPIED:
 520                case DIFF_STATUS_RENAMED:
 521                        d->head_path = xstrdup(p->one->path);
 522                        d->score = p->score * 100 / MAX_SCORE;
 523                        /* fallthru */
 524                case DIFF_STATUS_MODIFIED:
 525                case DIFF_STATUS_TYPE_CHANGED:
 526                        d->mode_head = p->one->mode;
 527                        d->mode_index = p->two->mode;
 528                        oidcpy(&d->oid_head, &p->one->oid);
 529                        oidcpy(&d->oid_index, &p->two->oid);
 530                        break;
 531                case DIFF_STATUS_UNMERGED:
 532                        d->stagemask = unmerged_mask(p->two->path);
 533                        /*
 534                         * Don't bother setting {mode,oid}_{head,index} since the print
 535                         * code will output the stage values directly and not use the
 536                         * values in these fields.
 537                         */
 538                        break;
 539                }
 540        }
 541}
 542
 543static void wt_status_collect_changes_worktree(struct wt_status *s)
 544{
 545        struct rev_info rev;
 546
 547        init_revisions(&rev, NULL);
 548        setup_revisions(0, NULL, &rev, NULL);
 549        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 550        DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
 551        if (!s->show_untracked_files)
 552                DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
 553        if (s->ignore_submodule_arg) {
 554                DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 555                handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 556        }
 557        rev.diffopt.format_callback = wt_status_collect_changed_cb;
 558        rev.diffopt.format_callback_data = s;
 559        copy_pathspec(&rev.prune_data, &s->pathspec);
 560        run_diff_files(&rev, 0);
 561}
 562
 563static void wt_status_collect_changes_index(struct wt_status *s)
 564{
 565        struct rev_info rev;
 566        struct setup_revision_opt opt;
 567
 568        init_revisions(&rev, NULL);
 569        memset(&opt, 0, sizeof(opt));
 570        opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 571        setup_revisions(0, NULL, &rev, &opt);
 572
 573        DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 574        if (s->ignore_submodule_arg) {
 575                handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 576        } else {
 577                /*
 578                 * Unless the user did explicitly request a submodule ignore
 579                 * mode by passing a command line option we do not ignore any
 580                 * changed submodule SHA-1s when comparing index and HEAD, no
 581                 * matter what is configured. Otherwise the user won't be
 582                 * shown any submodules she manually added (and which are
 583                 * staged to be committed), which would be really confusing.
 584                 */
 585                handle_ignore_submodules_arg(&rev.diffopt, "dirty");
 586        }
 587
 588        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 589        rev.diffopt.format_callback = wt_status_collect_updated_cb;
 590        rev.diffopt.format_callback_data = s;
 591        rev.diffopt.detect_rename = 1;
 592        rev.diffopt.rename_limit = 200;
 593        rev.diffopt.break_opt = 0;
 594        copy_pathspec(&rev.prune_data, &s->pathspec);
 595        run_diff_index(&rev, 1);
 596}
 597
 598static void wt_status_collect_changes_initial(struct wt_status *s)
 599{
 600        int i;
 601
 602        for (i = 0; i < active_nr; i++) {
 603                struct string_list_item *it;
 604                struct wt_status_change_data *d;
 605                const struct cache_entry *ce = active_cache[i];
 606
 607                if (!ce_path_match(ce, &s->pathspec, NULL))
 608                        continue;
 609                it = string_list_insert(&s->change, ce->name);
 610                d = it->util;
 611                if (!d) {
 612                        d = xcalloc(1, sizeof(*d));
 613                        it->util = d;
 614                }
 615                if (ce_stage(ce)) {
 616                        d->index_status = DIFF_STATUS_UNMERGED;
 617                        d->stagemask |= (1 << (ce_stage(ce) - 1));
 618                        /*
 619                         * Don't bother setting {mode,oid}_{head,index} since the print
 620                         * code will output the stage values directly and not use the
 621                         * values in these fields.
 622                         */
 623                } else {
 624                        d->index_status = DIFF_STATUS_ADDED;
 625                        /* Leave {mode,oid}_head zero for adds. */
 626                        d->mode_index = ce->ce_mode;
 627                        hashcpy(d->oid_index.hash, ce->oid.hash);
 628                }
 629        }
 630}
 631
 632static void wt_status_collect_untracked(struct wt_status *s)
 633{
 634        int i;
 635        struct dir_struct dir;
 636        uint64_t t_begin = getnanotime();
 637
 638        if (!s->show_untracked_files)
 639                return;
 640
 641        memset(&dir, 0, sizeof(dir));
 642        if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
 643                dir.flags |=
 644                        DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
 645        if (s->show_ignored_files)
 646                dir.flags |= DIR_SHOW_IGNORED_TOO;
 647        else
 648                dir.untracked = the_index.untracked;
 649        setup_standard_excludes(&dir);
 650
 651        fill_directory(&dir, &s->pathspec);
 652
 653        for (i = 0; i < dir.nr; i++) {
 654                struct dir_entry *ent = dir.entries[i];
 655                if (cache_name_is_other(ent->name, ent->len) &&
 656                    dir_path_match(ent, &s->pathspec, 0, NULL))
 657                        string_list_insert(&s->untracked, ent->name);
 658                free(ent);
 659        }
 660
 661        for (i = 0; i < dir.ignored_nr; i++) {
 662                struct dir_entry *ent = dir.ignored[i];
 663                if (cache_name_is_other(ent->name, ent->len) &&
 664                    dir_path_match(ent, &s->pathspec, 0, NULL))
 665                        string_list_insert(&s->ignored, ent->name);
 666                free(ent);
 667        }
 668
 669        free(dir.entries);
 670        free(dir.ignored);
 671        clear_directory(&dir);
 672
 673        if (advice_status_u_option)
 674                s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
 675}
 676
 677void wt_status_collect(struct wt_status *s)
 678{
 679        wt_status_collect_changes_worktree(s);
 680
 681        if (s->is_initial)
 682                wt_status_collect_changes_initial(s);
 683        else
 684                wt_status_collect_changes_index(s);
 685        wt_status_collect_untracked(s);
 686}
 687
 688static void wt_longstatus_print_unmerged(struct wt_status *s)
 689{
 690        int shown_header = 0;
 691        int i;
 692
 693        for (i = 0; i < s->change.nr; i++) {
 694                struct wt_status_change_data *d;
 695                struct string_list_item *it;
 696                it = &(s->change.items[i]);
 697                d = it->util;
 698                if (!d->stagemask)
 699                        continue;
 700                if (!shown_header) {
 701                        wt_longstatus_print_unmerged_header(s);
 702                        shown_header = 1;
 703                }
 704                wt_longstatus_print_unmerged_data(s, it);
 705        }
 706        if (shown_header)
 707                wt_longstatus_print_trailer(s);
 708
 709}
 710
 711static void wt_longstatus_print_updated(struct wt_status *s)
 712{
 713        int shown_header = 0;
 714        int i;
 715
 716        for (i = 0; i < s->change.nr; i++) {
 717                struct wt_status_change_data *d;
 718                struct string_list_item *it;
 719                it = &(s->change.items[i]);
 720                d = it->util;
 721                if (!d->index_status ||
 722                    d->index_status == DIFF_STATUS_UNMERGED)
 723                        continue;
 724                if (!shown_header) {
 725                        wt_longstatus_print_cached_header(s);
 726                        s->commitable = 1;
 727                        shown_header = 1;
 728                }
 729                wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
 730        }
 731        if (shown_header)
 732                wt_longstatus_print_trailer(s);
 733}
 734
 735/*
 736 * -1 : has delete
 737 *  0 : no change
 738 *  1 : some change but no delete
 739 */
 740static int wt_status_check_worktree_changes(struct wt_status *s,
 741                                             int *dirty_submodules)
 742{
 743        int i;
 744        int changes = 0;
 745
 746        *dirty_submodules = 0;
 747
 748        for (i = 0; i < s->change.nr; i++) {
 749                struct wt_status_change_data *d;
 750                d = s->change.items[i].util;
 751                if (!d->worktree_status ||
 752                    d->worktree_status == DIFF_STATUS_UNMERGED)
 753                        continue;
 754                if (!changes)
 755                        changes = 1;
 756                if (d->dirty_submodule)
 757                        *dirty_submodules = 1;
 758                if (d->worktree_status == DIFF_STATUS_DELETED)
 759                        changes = -1;
 760        }
 761        return changes;
 762}
 763
 764static void wt_longstatus_print_changed(struct wt_status *s)
 765{
 766        int i, dirty_submodules;
 767        int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
 768
 769        if (!worktree_changes)
 770                return;
 771
 772        wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
 773
 774        for (i = 0; i < s->change.nr; i++) {
 775                struct wt_status_change_data *d;
 776                struct string_list_item *it;
 777                it = &(s->change.items[i]);
 778                d = it->util;
 779                if (!d->worktree_status ||
 780                    d->worktree_status == DIFF_STATUS_UNMERGED)
 781                        continue;
 782                wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
 783        }
 784        wt_longstatus_print_trailer(s);
 785}
 786
 787static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
 788{
 789        struct child_process sm_summary = CHILD_PROCESS_INIT;
 790        struct strbuf cmd_stdout = STRBUF_INIT;
 791        struct strbuf summary = STRBUF_INIT;
 792        char *summary_content;
 793
 794        argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
 795                         s->index_file);
 796
 797        argv_array_push(&sm_summary.args, "submodule");
 798        argv_array_push(&sm_summary.args, "summary");
 799        argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
 800        argv_array_push(&sm_summary.args, "--for-status");
 801        argv_array_push(&sm_summary.args, "--summary-limit");
 802        argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
 803        if (!uncommitted)
 804                argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
 805
 806        sm_summary.git_cmd = 1;
 807        sm_summary.no_stdin = 1;
 808
 809        capture_command(&sm_summary, &cmd_stdout, 1024);
 810
 811        /* prepend header, only if there's an actual output */
 812        if (cmd_stdout.len) {
 813                if (uncommitted)
 814                        strbuf_addstr(&summary, _("Submodules changed but not updated:"));
 815                else
 816                        strbuf_addstr(&summary, _("Submodule changes to be committed:"));
 817                strbuf_addstr(&summary, "\n\n");
 818        }
 819        strbuf_addbuf(&summary, &cmd_stdout);
 820        strbuf_release(&cmd_stdout);
 821
 822        if (s->display_comment_prefix) {
 823                size_t len;
 824                summary_content = strbuf_detach(&summary, &len);
 825                strbuf_add_commented_lines(&summary, summary_content, len);
 826                free(summary_content);
 827        }
 828
 829        fputs(summary.buf, s->fp);
 830        strbuf_release(&summary);
 831}
 832
 833static void wt_longstatus_print_other(struct wt_status *s,
 834                                      struct string_list *l,
 835                                      const char *what,
 836                                      const char *how)
 837{
 838        int i;
 839        struct strbuf buf = STRBUF_INIT;
 840        static struct string_list output = STRING_LIST_INIT_DUP;
 841        struct column_options copts;
 842
 843        if (!l->nr)
 844                return;
 845
 846        wt_longstatus_print_other_header(s, what, how);
 847
 848        for (i = 0; i < l->nr; i++) {
 849                struct string_list_item *it;
 850                const char *path;
 851                it = &(l->items[i]);
 852                path = quote_path(it->string, s->prefix, &buf);
 853                if (column_active(s->colopts)) {
 854                        string_list_append(&output, path);
 855                        continue;
 856                }
 857                status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 858                status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
 859                                   "%s\n", path);
 860        }
 861
 862        strbuf_release(&buf);
 863        if (!column_active(s->colopts))
 864                goto conclude;
 865
 866        strbuf_addf(&buf, "%s%s\t%s",
 867                    color(WT_STATUS_HEADER, s),
 868                    s->display_comment_prefix ? "#" : "",
 869                    color(WT_STATUS_UNTRACKED, s));
 870        memset(&copts, 0, sizeof(copts));
 871        copts.padding = 1;
 872        copts.indent = buf.buf;
 873        if (want_color(s->use_color))
 874                copts.nl = GIT_COLOR_RESET "\n";
 875        print_columns(&output, s->colopts, &copts);
 876        string_list_clear(&output, 0);
 877        strbuf_release(&buf);
 878conclude:
 879        status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
 880}
 881
 882void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
 883{
 884        const char *p;
 885        struct strbuf pattern = STRBUF_INIT;
 886
 887        strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
 888        if (starts_with(buf->buf, pattern.buf + 1))
 889                strbuf_setlen(buf, 0);
 890        else if ((p = strstr(buf->buf, pattern.buf)))
 891                strbuf_setlen(buf, p - buf->buf + 1);
 892        strbuf_release(&pattern);
 893}
 894
 895void wt_status_add_cut_line(FILE *fp)
 896{
 897        const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
 898        struct strbuf buf = STRBUF_INIT;
 899
 900        fprintf(fp, "%c %s", comment_line_char, cut_line);
 901        strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
 902        fputs(buf.buf, fp);
 903        strbuf_release(&buf);
 904}
 905
 906static void wt_longstatus_print_verbose(struct wt_status *s)
 907{
 908        struct rev_info rev;
 909        struct setup_revision_opt opt;
 910        int dirty_submodules;
 911        const char *c = color(WT_STATUS_HEADER, s);
 912
 913        init_revisions(&rev, NULL);
 914        DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
 915
 916        memset(&opt, 0, sizeof(opt));
 917        opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 918        setup_revisions(0, NULL, &rev, &opt);
 919
 920        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 921        rev.diffopt.detect_rename = 1;
 922        rev.diffopt.file = s->fp;
 923        rev.diffopt.close_file = 0;
 924        /*
 925         * If we're not going to stdout, then we definitely don't
 926         * want color, since we are going to the commit message
 927         * file (and even the "auto" setting won't work, since it
 928         * will have checked isatty on stdout). But we then do want
 929         * to insert the scissor line here to reliably remove the
 930         * diff before committing.
 931         */
 932        if (s->fp != stdout) {
 933                rev.diffopt.use_color = 0;
 934                wt_status_add_cut_line(s->fp);
 935        }
 936        if (s->verbose > 1 && s->commitable) {
 937                /* print_updated() printed a header, so do we */
 938                if (s->fp != stdout)
 939                        wt_longstatus_print_trailer(s);
 940                status_printf_ln(s, c, _("Changes to be committed:"));
 941                rev.diffopt.a_prefix = "c/";
 942                rev.diffopt.b_prefix = "i/";
 943        } /* else use prefix as per user config */
 944        run_diff_index(&rev, 1);
 945        if (s->verbose > 1 &&
 946            wt_status_check_worktree_changes(s, &dirty_submodules)) {
 947                status_printf_ln(s, c,
 948                        "--------------------------------------------------");
 949                status_printf_ln(s, c, _("Changes not staged for commit:"));
 950                setup_work_tree();
 951                rev.diffopt.a_prefix = "i/";
 952                rev.diffopt.b_prefix = "w/";
 953                run_diff_files(&rev, 0);
 954        }
 955}
 956
 957static void wt_longstatus_print_tracking(struct wt_status *s)
 958{
 959        struct strbuf sb = STRBUF_INIT;
 960        const char *cp, *ep, *branch_name;
 961        struct branch *branch;
 962        char comment_line_string[3];
 963        int i;
 964
 965        assert(s->branch && !s->is_initial);
 966        if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
 967                return;
 968        branch = branch_get(branch_name);
 969        if (!format_tracking_info(branch, &sb))
 970                return;
 971
 972        i = 0;
 973        if (s->display_comment_prefix) {
 974                comment_line_string[i++] = comment_line_char;
 975                comment_line_string[i++] = ' ';
 976        }
 977        comment_line_string[i] = '\0';
 978
 979        for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
 980                color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
 981                                 "%s%.*s", comment_line_string,
 982                                 (int)(ep - cp), cp);
 983        if (s->display_comment_prefix)
 984                color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
 985                                 comment_line_char);
 986        else
 987                fputs("", s->fp);
 988}
 989
 990static int has_unmerged(struct wt_status *s)
 991{
 992        int i;
 993
 994        for (i = 0; i < s->change.nr; i++) {
 995                struct wt_status_change_data *d;
 996                d = s->change.items[i].util;
 997                if (d->stagemask)
 998                        return 1;
 999        }
1000        return 0;
1001}
1002
1003static void show_merge_in_progress(struct wt_status *s,
1004                                struct wt_status_state *state,
1005                                const char *color)
1006{
1007        if (has_unmerged(s)) {
1008                status_printf_ln(s, color, _("You have unmerged paths."));
1009                if (s->hints) {
1010                        status_printf_ln(s, color,
1011                                         _("  (fix conflicts and run \"git commit\")"));
1012                        status_printf_ln(s, color,
1013                                         _("  (use \"git merge --abort\" to abort the merge)"));
1014                }
1015        } else {
1016                s-> commitable = 1;
1017                status_printf_ln(s, color,
1018                        _("All conflicts fixed but you are still merging."));
1019                if (s->hints)
1020                        status_printf_ln(s, color,
1021                                _("  (use \"git commit\" to conclude merge)"));
1022        }
1023        wt_longstatus_print_trailer(s);
1024}
1025
1026static void show_am_in_progress(struct wt_status *s,
1027                                struct wt_status_state *state,
1028                                const char *color)
1029{
1030        status_printf_ln(s, color,
1031                _("You are in the middle of an am session."));
1032        if (state->am_empty_patch)
1033                status_printf_ln(s, color,
1034                        _("The current patch is empty."));
1035        if (s->hints) {
1036                if (!state->am_empty_patch)
1037                        status_printf_ln(s, color,
1038                                _("  (fix conflicts and then run \"git am --continue\")"));
1039                status_printf_ln(s, color,
1040                        _("  (use \"git am --skip\" to skip this patch)"));
1041                status_printf_ln(s, color,
1042                        _("  (use \"git am --abort\" to restore the original branch)"));
1043        }
1044        wt_longstatus_print_trailer(s);
1045}
1046
1047static char *read_line_from_git_path(const char *filename)
1048{
1049        struct strbuf buf = STRBUF_INIT;
1050        FILE *fp = fopen(git_path("%s", filename), "r");
1051        if (!fp) {
1052                strbuf_release(&buf);
1053                return NULL;
1054        }
1055        strbuf_getline_lf(&buf, fp);
1056        if (!fclose(fp)) {
1057                return strbuf_detach(&buf, NULL);
1058        } else {
1059                strbuf_release(&buf);
1060                return NULL;
1061        }
1062}
1063
1064static int split_commit_in_progress(struct wt_status *s)
1065{
1066        int split_in_progress = 0;
1067        char *head = read_line_from_git_path("HEAD");
1068        char *orig_head = read_line_from_git_path("ORIG_HEAD");
1069        char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1070        char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1071
1072        if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1073            !s->branch || strcmp(s->branch, "HEAD"))
1074                return split_in_progress;
1075
1076        if (!strcmp(rebase_amend, rebase_orig_head)) {
1077                if (strcmp(head, rebase_amend))
1078                        split_in_progress = 1;
1079        } else if (strcmp(orig_head, rebase_orig_head)) {
1080                split_in_progress = 1;
1081        }
1082
1083        if (!s->amend && !s->nowarn && !s->workdir_dirty)
1084                split_in_progress = 0;
1085
1086        free(head);
1087        free(orig_head);
1088        free(rebase_amend);
1089        free(rebase_orig_head);
1090        return split_in_progress;
1091}
1092
1093/*
1094 * Turn
1095 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1096 * into
1097 * "pick d6a2f03 some message"
1098 *
1099 * The function assumes that the line does not contain useless spaces
1100 * before or after the command.
1101 */
1102static void abbrev_sha1_in_line(struct strbuf *line)
1103{
1104        struct strbuf **split;
1105        int i;
1106
1107        if (starts_with(line->buf, "exec ") ||
1108            starts_with(line->buf, "x "))
1109                return;
1110
1111        split = strbuf_split_max(line, ' ', 3);
1112        if (split[0] && split[1]) {
1113                unsigned char sha1[20];
1114
1115                /*
1116                 * strbuf_split_max left a space. Trim it and re-add
1117                 * it after abbreviation.
1118                 */
1119                strbuf_trim(split[1]);
1120                if (!get_sha1(split[1]->buf, sha1)) {
1121                        strbuf_reset(split[1]);
1122                        strbuf_add_unique_abbrev(split[1], sha1,
1123                                                 DEFAULT_ABBREV);
1124                        strbuf_addch(split[1], ' ');
1125                        strbuf_reset(line);
1126                        for (i = 0; split[i]; i++)
1127                                strbuf_addbuf(line, split[i]);
1128                }
1129        }
1130        strbuf_list_free(split);
1131}
1132
1133static void read_rebase_todolist(const char *fname, struct string_list *lines)
1134{
1135        struct strbuf line = STRBUF_INIT;
1136        FILE *f = fopen(git_path("%s", fname), "r");
1137
1138        if (!f)
1139                die_errno("Could not open file %s for reading",
1140                          git_path("%s", fname));
1141        while (!strbuf_getline_lf(&line, f)) {
1142                if (line.len && line.buf[0] == comment_line_char)
1143                        continue;
1144                strbuf_trim(&line);
1145                if (!line.len)
1146                        continue;
1147                abbrev_sha1_in_line(&line);
1148                string_list_append(lines, line.buf);
1149        }
1150}
1151
1152static void show_rebase_information(struct wt_status *s,
1153                                        struct wt_status_state *state,
1154                                        const char *color)
1155{
1156        if (state->rebase_interactive_in_progress) {
1157                int i;
1158                int nr_lines_to_show = 2;
1159
1160                struct string_list have_done = STRING_LIST_INIT_DUP;
1161                struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1162
1163                read_rebase_todolist("rebase-merge/done", &have_done);
1164                read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
1165
1166                if (have_done.nr == 0)
1167                        status_printf_ln(s, color, _("No commands done."));
1168                else {
1169                        status_printf_ln(s, color,
1170                                Q_("Last command done (%d command done):",
1171                                        "Last commands done (%d commands done):",
1172                                        have_done.nr),
1173                                have_done.nr);
1174                        for (i = (have_done.nr > nr_lines_to_show)
1175                                ? have_done.nr - nr_lines_to_show : 0;
1176                                i < have_done.nr;
1177                                i++)
1178                                status_printf_ln(s, color, "   %s", have_done.items[i].string);
1179                        if (have_done.nr > nr_lines_to_show && s->hints)
1180                                status_printf_ln(s, color,
1181                                        _("  (see more in file %s)"), git_path("rebase-merge/done"));
1182                }
1183
1184                if (yet_to_do.nr == 0)
1185                        status_printf_ln(s, color,
1186                                         _("No commands remaining."));
1187                else {
1188                        status_printf_ln(s, color,
1189                                Q_("Next command to do (%d remaining command):",
1190                                        "Next commands to do (%d remaining commands):",
1191                                        yet_to_do.nr),
1192                                yet_to_do.nr);
1193                        for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1194                                status_printf_ln(s, color, "   %s", yet_to_do.items[i].string);
1195                        if (s->hints)
1196                                status_printf_ln(s, color,
1197                                        _("  (use \"git rebase --edit-todo\" to view and edit)"));
1198                }
1199                string_list_clear(&yet_to_do, 0);
1200                string_list_clear(&have_done, 0);
1201        }
1202}
1203
1204static void print_rebase_state(struct wt_status *s,
1205                                struct wt_status_state *state,
1206                                const char *color)
1207{
1208        if (state->branch)
1209                status_printf_ln(s, color,
1210                                 _("You are currently rebasing branch '%s' on '%s'."),
1211                                 state->branch,
1212                                 state->onto);
1213        else
1214                status_printf_ln(s, color,
1215                                 _("You are currently rebasing."));
1216}
1217
1218static void show_rebase_in_progress(struct wt_status *s,
1219                                struct wt_status_state *state,
1220                                const char *color)
1221{
1222        struct stat st;
1223
1224        show_rebase_information(s, state, color);
1225        if (has_unmerged(s)) {
1226                print_rebase_state(s, state, color);
1227                if (s->hints) {
1228                        status_printf_ln(s, color,
1229                                _("  (fix conflicts and then run \"git rebase --continue\")"));
1230                        status_printf_ln(s, color,
1231                                _("  (use \"git rebase --skip\" to skip this patch)"));
1232                        status_printf_ln(s, color,
1233                                _("  (use \"git rebase --abort\" to check out the original branch)"));
1234                }
1235        } else if (state->rebase_in_progress || !stat(git_path_merge_msg(), &st)) {
1236                print_rebase_state(s, state, color);
1237                if (s->hints)
1238                        status_printf_ln(s, color,
1239                                _("  (all conflicts fixed: run \"git rebase --continue\")"));
1240        } else if (split_commit_in_progress(s)) {
1241                if (state->branch)
1242                        status_printf_ln(s, color,
1243                                         _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1244                                         state->branch,
1245                                         state->onto);
1246                else
1247                        status_printf_ln(s, color,
1248                                         _("You are currently splitting a commit during a rebase."));
1249                if (s->hints)
1250                        status_printf_ln(s, color,
1251                                _("  (Once your working directory is clean, run \"git rebase --continue\")"));
1252        } else {
1253                if (state->branch)
1254                        status_printf_ln(s, color,
1255                                         _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1256                                         state->branch,
1257                                         state->onto);
1258                else
1259                        status_printf_ln(s, color,
1260                                         _("You are currently editing a commit during a rebase."));
1261                if (s->hints && !s->amend) {
1262                        status_printf_ln(s, color,
1263                                _("  (use \"git commit --amend\" to amend the current commit)"));
1264                        status_printf_ln(s, color,
1265                                _("  (use \"git rebase --continue\" once you are satisfied with your changes)"));
1266                }
1267        }
1268        wt_longstatus_print_trailer(s);
1269}
1270
1271static void show_cherry_pick_in_progress(struct wt_status *s,
1272                                        struct wt_status_state *state,
1273                                        const char *color)
1274{
1275        status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1276                        find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1277        if (s->hints) {
1278                if (has_unmerged(s))
1279                        status_printf_ln(s, color,
1280                                _("  (fix conflicts and run \"git cherry-pick --continue\")"));
1281                else
1282                        status_printf_ln(s, color,
1283                                _("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
1284                status_printf_ln(s, color,
1285                        _("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1286        }
1287        wt_longstatus_print_trailer(s);
1288}
1289
1290static void show_revert_in_progress(struct wt_status *s,
1291                                        struct wt_status_state *state,
1292                                        const char *color)
1293{
1294        status_printf_ln(s, color, _("You are currently reverting commit %s."),
1295                         find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1296        if (s->hints) {
1297                if (has_unmerged(s))
1298                        status_printf_ln(s, color,
1299                                _("  (fix conflicts and run \"git revert --continue\")"));
1300                else
1301                        status_printf_ln(s, color,
1302                                _("  (all conflicts fixed: run \"git revert --continue\")"));
1303                status_printf_ln(s, color,
1304                        _("  (use \"git revert --abort\" to cancel the revert operation)"));
1305        }
1306        wt_longstatus_print_trailer(s);
1307}
1308
1309static void show_bisect_in_progress(struct wt_status *s,
1310                                struct wt_status_state *state,
1311                                const char *color)
1312{
1313        if (state->branch)
1314                status_printf_ln(s, color,
1315                                 _("You are currently bisecting, started from branch '%s'."),
1316                                 state->branch);
1317        else
1318                status_printf_ln(s, color,
1319                                 _("You are currently bisecting."));
1320        if (s->hints)
1321                status_printf_ln(s, color,
1322                        _("  (use \"git bisect reset\" to get back to the original branch)"));
1323        wt_longstatus_print_trailer(s);
1324}
1325
1326/*
1327 * Extract branch information from rebase/bisect
1328 */
1329static char *get_branch(const struct worktree *wt, const char *path)
1330{
1331        struct strbuf sb = STRBUF_INIT;
1332        unsigned char sha1[20];
1333        const char *branch_name;
1334
1335        if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1336                goto got_nothing;
1337
1338        while (sb.len && sb.buf[sb.len - 1] == '\n')
1339                strbuf_setlen(&sb, sb.len - 1);
1340        if (!sb.len)
1341                goto got_nothing;
1342        if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1343                strbuf_remove(&sb, 0, branch_name - sb.buf);
1344        else if (starts_with(sb.buf, "refs/"))
1345                ;
1346        else if (!get_sha1_hex(sb.buf, sha1)) {
1347                strbuf_reset(&sb);
1348                strbuf_add_unique_abbrev(&sb, sha1, DEFAULT_ABBREV);
1349        } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1350                goto got_nothing;
1351        else                    /* bisect */
1352                ;
1353        return strbuf_detach(&sb, NULL);
1354
1355got_nothing:
1356        strbuf_release(&sb);
1357        return NULL;
1358}
1359
1360struct grab_1st_switch_cbdata {
1361        struct strbuf buf;
1362        unsigned char nsha1[20];
1363};
1364
1365static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1366                           const char *email, unsigned long timestamp, int tz,
1367                           const char *message, void *cb_data)
1368{
1369        struct grab_1st_switch_cbdata *cb = cb_data;
1370        const char *target = NULL, *end;
1371
1372        if (!skip_prefix(message, "checkout: moving from ", &message))
1373                return 0;
1374        target = strstr(message, " to ");
1375        if (!target)
1376                return 0;
1377        target += strlen(" to ");
1378        strbuf_reset(&cb->buf);
1379        hashcpy(cb->nsha1, nsha1);
1380        end = strchrnul(target, '\n');
1381        strbuf_add(&cb->buf, target, end - target);
1382        if (!strcmp(cb->buf.buf, "HEAD")) {
1383                /* HEAD is relative. Resolve it to the right reflog entry. */
1384                strbuf_reset(&cb->buf);
1385                strbuf_add_unique_abbrev(&cb->buf, nsha1, DEFAULT_ABBREV);
1386        }
1387        return 1;
1388}
1389
1390static void wt_status_get_detached_from(struct wt_status_state *state)
1391{
1392        struct grab_1st_switch_cbdata cb;
1393        struct commit *commit;
1394        unsigned char sha1[20];
1395        char *ref = NULL;
1396
1397        strbuf_init(&cb.buf, 0);
1398        if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1399                strbuf_release(&cb.buf);
1400                return;
1401        }
1402
1403        if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1404            /* sha1 is a commit? match without further lookup */
1405            (!hashcmp(cb.nsha1, sha1) ||
1406             /* perhaps sha1 is a tag, try to dereference to a commit */
1407             ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1408              !hashcmp(cb.nsha1, commit->object.oid.hash)))) {
1409                const char *from = ref;
1410                if (!skip_prefix(from, "refs/tags/", &from))
1411                        skip_prefix(from, "refs/remotes/", &from);
1412                state->detached_from = xstrdup(from);
1413        } else
1414                state->detached_from =
1415                        xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1416        hashcpy(state->detached_sha1, cb.nsha1);
1417        state->detached_at = !get_sha1("HEAD", sha1) &&
1418                             !hashcmp(sha1, state->detached_sha1);
1419
1420        free(ref);
1421        strbuf_release(&cb.buf);
1422}
1423
1424int wt_status_check_rebase(const struct worktree *wt,
1425                           struct wt_status_state *state)
1426{
1427        struct stat st;
1428
1429        if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1430                if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1431                        state->am_in_progress = 1;
1432                        if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1433                                state->am_empty_patch = 1;
1434                } else {
1435                        state->rebase_in_progress = 1;
1436                        state->branch = get_branch(wt, "rebase-apply/head-name");
1437                        state->onto = get_branch(wt, "rebase-apply/onto");
1438                }
1439        } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1440                if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1441                        state->rebase_interactive_in_progress = 1;
1442                else
1443                        state->rebase_in_progress = 1;
1444                state->branch = get_branch(wt, "rebase-merge/head-name");
1445                state->onto = get_branch(wt, "rebase-merge/onto");
1446        } else
1447                return 0;
1448        return 1;
1449}
1450
1451int wt_status_check_bisect(const struct worktree *wt,
1452                           struct wt_status_state *state)
1453{
1454        struct stat st;
1455
1456        if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1457                state->bisect_in_progress = 1;
1458                state->branch = get_branch(wt, "BISECT_START");
1459                return 1;
1460        }
1461        return 0;
1462}
1463
1464void wt_status_get_state(struct wt_status_state *state,
1465                         int get_detached_from)
1466{
1467        struct stat st;
1468        unsigned char sha1[20];
1469
1470        if (!stat(git_path_merge_head(), &st)) {
1471                state->merge_in_progress = 1;
1472        } else if (wt_status_check_rebase(NULL, state)) {
1473                ;               /* all set */
1474        } else if (!stat(git_path_cherry_pick_head(), &st) &&
1475                        !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1476                state->cherry_pick_in_progress = 1;
1477                hashcpy(state->cherry_pick_head_sha1, sha1);
1478        }
1479        wt_status_check_bisect(NULL, state);
1480        if (!stat(git_path_revert_head(), &st) &&
1481            !get_sha1("REVERT_HEAD", sha1)) {
1482                state->revert_in_progress = 1;
1483                hashcpy(state->revert_head_sha1, sha1);
1484        }
1485
1486        if (get_detached_from)
1487                wt_status_get_detached_from(state);
1488}
1489
1490static void wt_longstatus_print_state(struct wt_status *s,
1491                                      struct wt_status_state *state)
1492{
1493        const char *state_color = color(WT_STATUS_HEADER, s);
1494        if (state->merge_in_progress)
1495                show_merge_in_progress(s, state, state_color);
1496        else if (state->am_in_progress)
1497                show_am_in_progress(s, state, state_color);
1498        else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1499                show_rebase_in_progress(s, state, state_color);
1500        else if (state->cherry_pick_in_progress)
1501                show_cherry_pick_in_progress(s, state, state_color);
1502        else if (state->revert_in_progress)
1503                show_revert_in_progress(s, state, state_color);
1504        if (state->bisect_in_progress)
1505                show_bisect_in_progress(s, state, state_color);
1506}
1507
1508static void wt_longstatus_print(struct wt_status *s)
1509{
1510        const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1511        const char *branch_status_color = color(WT_STATUS_HEADER, s);
1512        struct wt_status_state state;
1513
1514        memset(&state, 0, sizeof(state));
1515        wt_status_get_state(&state,
1516                            s->branch && !strcmp(s->branch, "HEAD"));
1517
1518        if (s->branch) {
1519                const char *on_what = _("On branch ");
1520                const char *branch_name = s->branch;
1521                if (!strcmp(branch_name, "HEAD")) {
1522                        branch_status_color = color(WT_STATUS_NOBRANCH, s);
1523                        if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1524                                if (state.rebase_interactive_in_progress)
1525                                        on_what = _("interactive rebase in progress; onto ");
1526                                else
1527                                        on_what = _("rebase in progress; onto ");
1528                                branch_name = state.onto;
1529                        } else if (state.detached_from) {
1530                                branch_name = state.detached_from;
1531                                if (state.detached_at)
1532                                        on_what = _("HEAD detached at ");
1533                                else
1534                                        on_what = _("HEAD detached from ");
1535                        } else {
1536                                branch_name = "";
1537                                on_what = _("Not currently on any branch.");
1538                        }
1539                } else
1540                        skip_prefix(branch_name, "refs/heads/", &branch_name);
1541                status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1542                status_printf_more(s, branch_status_color, "%s", on_what);
1543                status_printf_more(s, branch_color, "%s\n", branch_name);
1544                if (!s->is_initial)
1545                        wt_longstatus_print_tracking(s);
1546        }
1547
1548        wt_longstatus_print_state(s, &state);
1549        free(state.branch);
1550        free(state.onto);
1551        free(state.detached_from);
1552
1553        if (s->is_initial) {
1554                status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1555                status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1556                status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1557        }
1558
1559        wt_longstatus_print_updated(s);
1560        wt_longstatus_print_unmerged(s);
1561        wt_longstatus_print_changed(s);
1562        if (s->submodule_summary &&
1563            (!s->ignore_submodule_arg ||
1564             strcmp(s->ignore_submodule_arg, "all"))) {
1565                wt_longstatus_print_submodule_summary(s, 0);  /* staged */
1566                wt_longstatus_print_submodule_summary(s, 1);  /* unstaged */
1567        }
1568        if (s->show_untracked_files) {
1569                wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
1570                if (s->show_ignored_files)
1571                        wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1572                if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1573                        status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1574                        status_printf_ln(s, GIT_COLOR_NORMAL,
1575                                         _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1576                                           "may speed it up, but you have to be careful not to forget to add\n"
1577                                           "new files yourself (see 'git help status')."),
1578                                         s->untracked_in_ms / 1000.0);
1579                }
1580        } else if (s->commitable)
1581                status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1582                        s->hints
1583                        ? _(" (use -u option to show untracked files)") : "");
1584
1585        if (s->verbose)
1586                wt_longstatus_print_verbose(s);
1587        if (!s->commitable) {
1588                if (s->amend)
1589                        status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1590                else if (s->nowarn)
1591                        ; /* nothing */
1592                else if (s->workdir_dirty) {
1593                        if (s->hints)
1594                                printf(_("no changes added to commit "
1595                                         "(use \"git add\" and/or \"git commit -a\")\n"));
1596                        else
1597                                printf(_("no changes added to commit\n"));
1598                } else if (s->untracked.nr) {
1599                        if (s->hints)
1600                                printf(_("nothing added to commit but untracked files "
1601                                         "present (use \"git add\" to track)\n"));
1602                        else
1603                                printf(_("nothing added to commit but untracked files present\n"));
1604                } else if (s->is_initial) {
1605                        if (s->hints)
1606                                printf(_("nothing to commit (create/copy files "
1607                                         "and use \"git add\" to track)\n"));
1608                        else
1609                                printf(_("nothing to commit\n"));
1610                } else if (!s->show_untracked_files) {
1611                        if (s->hints)
1612                                printf(_("nothing to commit (use -u to show untracked files)\n"));
1613                        else
1614                                printf(_("nothing to commit\n"));
1615                } else
1616                        printf(_("nothing to commit, working tree clean\n"));
1617        }
1618}
1619
1620static void wt_shortstatus_unmerged(struct string_list_item *it,
1621                           struct wt_status *s)
1622{
1623        struct wt_status_change_data *d = it->util;
1624        const char *how = "??";
1625
1626        switch (d->stagemask) {
1627        case 1: how = "DD"; break; /* both deleted */
1628        case 2: how = "AU"; break; /* added by us */
1629        case 3: how = "UD"; break; /* deleted by them */
1630        case 4: how = "UA"; break; /* added by them */
1631        case 5: how = "DU"; break; /* deleted by us */
1632        case 6: how = "AA"; break; /* both added */
1633        case 7: how = "UU"; break; /* both modified */
1634        }
1635        color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1636        if (s->null_termination) {
1637                fprintf(stdout, " %s%c", it->string, 0);
1638        } else {
1639                struct strbuf onebuf = STRBUF_INIT;
1640                const char *one;
1641                one = quote_path(it->string, s->prefix, &onebuf);
1642                printf(" %s\n", one);
1643                strbuf_release(&onebuf);
1644        }
1645}
1646
1647static void wt_shortstatus_status(struct string_list_item *it,
1648                         struct wt_status *s)
1649{
1650        struct wt_status_change_data *d = it->util;
1651
1652        if (d->index_status)
1653                color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1654        else
1655                putchar(' ');
1656        if (d->worktree_status)
1657                color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1658        else
1659                putchar(' ');
1660        putchar(' ');
1661        if (s->null_termination) {
1662                fprintf(stdout, "%s%c", it->string, 0);
1663                if (d->head_path)
1664                        fprintf(stdout, "%s%c", d->head_path, 0);
1665        } else {
1666                struct strbuf onebuf = STRBUF_INIT;
1667                const char *one;
1668                if (d->head_path) {
1669                        one = quote_path(d->head_path, s->prefix, &onebuf);
1670                        if (*one != '"' && strchr(one, ' ') != NULL) {
1671                                putchar('"');
1672                                strbuf_addch(&onebuf, '"');
1673                                one = onebuf.buf;
1674                        }
1675                        printf("%s -> ", one);
1676                        strbuf_release(&onebuf);
1677                }
1678                one = quote_path(it->string, s->prefix, &onebuf);
1679                if (*one != '"' && strchr(one, ' ') != NULL) {
1680                        putchar('"');
1681                        strbuf_addch(&onebuf, '"');
1682                        one = onebuf.buf;
1683                }
1684                printf("%s\n", one);
1685                strbuf_release(&onebuf);
1686        }
1687}
1688
1689static void wt_shortstatus_other(struct string_list_item *it,
1690                                 struct wt_status *s, const char *sign)
1691{
1692        if (s->null_termination) {
1693                fprintf(stdout, "%s %s%c", sign, it->string, 0);
1694        } else {
1695                struct strbuf onebuf = STRBUF_INIT;
1696                const char *one;
1697                one = quote_path(it->string, s->prefix, &onebuf);
1698                color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1699                printf(" %s\n", one);
1700                strbuf_release(&onebuf);
1701        }
1702}
1703
1704static void wt_shortstatus_print_tracking(struct wt_status *s)
1705{
1706        struct branch *branch;
1707        const char *header_color = color(WT_STATUS_HEADER, s);
1708        const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1709        const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1710
1711        const char *base;
1712        const char *branch_name;
1713        int num_ours, num_theirs;
1714        int upstream_is_gone = 0;
1715
1716        color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1717
1718        if (!s->branch)
1719                return;
1720        branch_name = s->branch;
1721
1722        if (s->is_initial)
1723                color_fprintf(s->fp, header_color, _("Initial commit on "));
1724
1725        if (!strcmp(s->branch, "HEAD")) {
1726                color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1727                              _("HEAD (no branch)"));
1728                goto conclude;
1729        }
1730
1731        skip_prefix(branch_name, "refs/heads/", &branch_name);
1732
1733        branch = branch_get(branch_name);
1734
1735        color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1736
1737        if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
1738                if (!base)
1739                        goto conclude;
1740
1741                upstream_is_gone = 1;
1742        }
1743
1744        base = shorten_unambiguous_ref(base, 0);
1745        color_fprintf(s->fp, header_color, "...");
1746        color_fprintf(s->fp, branch_color_remote, "%s", base);
1747        free((char *)base);
1748
1749        if (!upstream_is_gone && !num_ours && !num_theirs)
1750                goto conclude;
1751
1752#define LABEL(string) (s->no_gettext ? (string) : _(string))
1753
1754        color_fprintf(s->fp, header_color, " [");
1755        if (upstream_is_gone) {
1756                color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1757        } else if (!num_ours) {
1758                color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1759                color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1760        } else if (!num_theirs) {
1761                color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1762                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1763        } else {
1764                color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1765                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1766                color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1767                color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1768        }
1769
1770        color_fprintf(s->fp, header_color, "]");
1771 conclude:
1772        fputc(s->null_termination ? '\0' : '\n', s->fp);
1773}
1774
1775static void wt_shortstatus_print(struct wt_status *s)
1776{
1777        int i;
1778
1779        if (s->show_branch)
1780                wt_shortstatus_print_tracking(s);
1781
1782        for (i = 0; i < s->change.nr; i++) {
1783                struct wt_status_change_data *d;
1784                struct string_list_item *it;
1785
1786                it = &(s->change.items[i]);
1787                d = it->util;
1788                if (d->stagemask)
1789                        wt_shortstatus_unmerged(it, s);
1790                else
1791                        wt_shortstatus_status(it, s);
1792        }
1793        for (i = 0; i < s->untracked.nr; i++) {
1794                struct string_list_item *it;
1795
1796                it = &(s->untracked.items[i]);
1797                wt_shortstatus_other(it, s, "??");
1798        }
1799        for (i = 0; i < s->ignored.nr; i++) {
1800                struct string_list_item *it;
1801
1802                it = &(s->ignored.items[i]);
1803                wt_shortstatus_other(it, s, "!!");
1804        }
1805}
1806
1807static void wt_porcelain_print(struct wt_status *s)
1808{
1809        s->use_color = 0;
1810        s->relative_paths = 0;
1811        s->prefix = NULL;
1812        s->no_gettext = 1;
1813        wt_shortstatus_print(s);
1814}
1815
1816/*
1817 * Print branch information for porcelain v2 output.  These lines
1818 * are printed when the '--branch' parameter is given.
1819 *
1820 *    # branch.oid <commit><eol>
1821 *    # branch.head <head><eol>
1822 *   [# branch.upstream <upstream><eol>
1823 *   [# branch.ab +<ahead> -<behind><eol>]]
1824 *
1825 *      <commit> ::= the current commit hash or the the literal
1826 *                   "(initial)" to indicate an initialized repo
1827 *                   with no commits.
1828 *
1829 *        <head> ::= <branch_name> the current branch name or
1830 *                   "(detached)" literal when detached head or
1831 *                   "(unknown)" when something is wrong.
1832 *
1833 *    <upstream> ::= the upstream branch name, when set.
1834 *
1835 *       <ahead> ::= integer ahead value, when upstream set
1836 *                   and the commit is present (not gone).
1837 *
1838 *      <behind> ::= integer behind value, when upstream set
1839 *                   and commit is present.
1840 *
1841 *
1842 * The end-of-line is defined by the -z flag.
1843 *
1844 *                 <eol> ::= NUL when -z,
1845 *                           LF when NOT -z.
1846 *
1847 */
1848static void wt_porcelain_v2_print_tracking(struct wt_status *s)
1849{
1850        struct branch *branch;
1851        const char *base;
1852        const char *branch_name;
1853        struct wt_status_state state;
1854        int ab_info, nr_ahead, nr_behind;
1855        char eol = s->null_termination ? '\0' : '\n';
1856
1857        memset(&state, 0, sizeof(state));
1858        wt_status_get_state(&state, s->branch && !strcmp(s->branch, "HEAD"));
1859
1860        fprintf(s->fp, "# branch.oid %s%c",
1861                        (s->is_initial ? "(initial)" : sha1_to_hex(s->sha1_commit)),
1862                        eol);
1863
1864        if (!s->branch)
1865                fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
1866        else {
1867                if (!strcmp(s->branch, "HEAD")) {
1868                        fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
1869
1870                        if (state.rebase_in_progress || state.rebase_interactive_in_progress)
1871                                branch_name = state.onto;
1872                        else if (state.detached_from)
1873                                branch_name = state.detached_from;
1874                        else
1875                                branch_name = "";
1876                } else {
1877                        branch_name = NULL;
1878                        skip_prefix(s->branch, "refs/heads/", &branch_name);
1879
1880                        fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
1881                }
1882
1883                /* Lookup stats on the upstream tracking branch, if set. */
1884                branch = branch_get(branch_name);
1885                base = NULL;
1886                ab_info = (stat_tracking_info(branch, &nr_ahead, &nr_behind, &base) == 0);
1887                if (base) {
1888                        base = shorten_unambiguous_ref(base, 0);
1889                        fprintf(s->fp, "# branch.upstream %s%c", base, eol);
1890                        free((char *)base);
1891
1892                        if (ab_info)
1893                                fprintf(s->fp, "# branch.ab +%d -%d%c", nr_ahead, nr_behind, eol);
1894                }
1895        }
1896
1897        free(state.branch);
1898        free(state.onto);
1899        free(state.detached_from);
1900}
1901
1902/*
1903 * Convert various submodule status values into a
1904 * fixed-length string of characters in the buffer provided.
1905 */
1906static void wt_porcelain_v2_submodule_state(
1907        struct wt_status_change_data *d,
1908        char sub[5])
1909{
1910        if (S_ISGITLINK(d->mode_head) ||
1911                S_ISGITLINK(d->mode_index) ||
1912                S_ISGITLINK(d->mode_worktree)) {
1913                sub[0] = 'S';
1914                sub[1] = d->new_submodule_commits ? 'C' : '.';
1915                sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
1916                sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
1917        } else {
1918                sub[0] = 'N';
1919                sub[1] = '.';
1920                sub[2] = '.';
1921                sub[3] = '.';
1922        }
1923        sub[4] = 0;
1924}
1925
1926/*
1927 * Fix-up changed entries before we print them.
1928 */
1929static void wt_porcelain_v2_fix_up_changed(
1930        struct string_list_item *it,
1931        struct wt_status *s)
1932{
1933        struct wt_status_change_data *d = it->util;
1934
1935        if (!d->index_status) {
1936                /*
1937                 * This entry is unchanged in the index (relative to the head).
1938                 * Therefore, the collect_updated_cb was never called for this
1939                 * entry (during the head-vs-index scan) and so the head column
1940                 * fields were never set.
1941                 *
1942                 * We must have data for the index column (from the
1943                 * index-vs-worktree scan (otherwise, this entry should not be
1944                 * in the list of changes)).
1945                 *
1946                 * Copy index column fields to the head column, so that our
1947                 * output looks complete.
1948                 */
1949                assert(d->mode_head == 0);
1950                d->mode_head = d->mode_index;
1951                oidcpy(&d->oid_head, &d->oid_index);
1952        }
1953
1954        if (!d->worktree_status) {
1955                /*
1956                 * This entry is unchanged in the worktree (relative to the index).
1957                 * Therefore, the collect_changed_cb was never called for this entry
1958                 * (during the index-vs-worktree scan) and so the worktree column
1959                 * fields were never set.
1960                 *
1961                 * We must have data for the index column (from the head-vs-index
1962                 * scan).
1963                 *
1964                 * Copy the index column fields to the worktree column so that
1965                 * our output looks complete.
1966                 *
1967                 * Note that we only have a mode field in the worktree column
1968                 * because the scan code tries really hard to not have to compute it.
1969                 */
1970                assert(d->mode_worktree == 0);
1971                d->mode_worktree = d->mode_index;
1972        }
1973}
1974
1975/*
1976 * Print porcelain v2 info for tracked entries with changes.
1977 */
1978static void wt_porcelain_v2_print_changed_entry(
1979        struct string_list_item *it,
1980        struct wt_status *s)
1981{
1982        struct wt_status_change_data *d = it->util;
1983        struct strbuf buf_index = STRBUF_INIT;
1984        struct strbuf buf_head = STRBUF_INIT;
1985        const char *path_index = NULL;
1986        const char *path_head = NULL;
1987        char key[3];
1988        char submodule_token[5];
1989        char sep_char, eol_char;
1990
1991        wt_porcelain_v2_fix_up_changed(it, s);
1992        wt_porcelain_v2_submodule_state(d, submodule_token);
1993
1994        key[0] = d->index_status ? d->index_status : '.';
1995        key[1] = d->worktree_status ? d->worktree_status : '.';
1996        key[2] = 0;
1997
1998        if (s->null_termination) {
1999                /*
2000                 * In -z mode, we DO NOT C-quote pathnames.  Current path is ALWAYS first.
2001                 * A single NUL character separates them.
2002                 */
2003                sep_char = '\0';
2004                eol_char = '\0';
2005                path_index = it->string;
2006                path_head = d->head_path;
2007        } else {
2008                /*
2009                 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2010                 * The source path is only present when necessary.
2011                 * A single TAB separates them (because paths can contain spaces
2012                 * which are not escaped and C-quoting does escape TAB characters).
2013                 */
2014                sep_char = '\t';
2015                eol_char = '\n';
2016                path_index = quote_path(it->string, s->prefix, &buf_index);
2017                if (d->head_path)
2018                        path_head = quote_path(d->head_path, s->prefix, &buf_head);
2019        }
2020
2021        if (path_head)
2022                fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2023                                key, submodule_token,
2024                                d->mode_head, d->mode_index, d->mode_worktree,
2025                                oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2026                                key[0], d->score,
2027                                path_index, sep_char, path_head, eol_char);
2028        else
2029                fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2030                                key, submodule_token,
2031                                d->mode_head, d->mode_index, d->mode_worktree,
2032                                oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2033                                path_index, eol_char);
2034
2035        strbuf_release(&buf_index);
2036        strbuf_release(&buf_head);
2037}
2038
2039/*
2040 * Print porcelain v2 status info for unmerged entries.
2041 */
2042static void wt_porcelain_v2_print_unmerged_entry(
2043        struct string_list_item *it,
2044        struct wt_status *s)
2045{
2046        struct wt_status_change_data *d = it->util;
2047        const struct cache_entry *ce;
2048        struct strbuf buf_index = STRBUF_INIT;
2049        const char *path_index = NULL;
2050        int pos, stage, sum;
2051        struct {
2052                int mode;
2053                struct object_id oid;
2054        } stages[3];
2055        char *key;
2056        char submodule_token[5];
2057        char unmerged_prefix = 'u';
2058        char eol_char = s->null_termination ? '\0' : '\n';
2059
2060        wt_porcelain_v2_submodule_state(d, submodule_token);
2061
2062        switch (d->stagemask) {
2063        case 1: key = "DD"; break; /* both deleted */
2064        case 2: key = "AU"; break; /* added by us */
2065        case 3: key = "UD"; break; /* deleted by them */
2066        case 4: key = "UA"; break; /* added by them */
2067        case 5: key = "DU"; break; /* deleted by us */
2068        case 6: key = "AA"; break; /* both added */
2069        case 7: key = "UU"; break; /* both modified */
2070        default:
2071                die("BUG: unhandled unmerged status %x", d->stagemask);
2072        }
2073
2074        /*
2075         * Disregard d.aux.porcelain_v2 data that we accumulated
2076         * for the head and index columns during the scans and
2077         * replace with the actual stage data.
2078         *
2079         * Note that this is a last-one-wins for each the individual
2080         * stage [123] columns in the event of multiple cache entries
2081         * for same stage.
2082         */
2083        memset(stages, 0, sizeof(stages));
2084        sum = 0;
2085        pos = cache_name_pos(it->string, strlen(it->string));
2086        assert(pos < 0);
2087        pos = -pos-1;
2088        while (pos < active_nr) {
2089                ce = active_cache[pos++];
2090                stage = ce_stage(ce);
2091                if (strcmp(ce->name, it->string) || !stage)
2092                        break;
2093                stages[stage - 1].mode = ce->ce_mode;
2094                hashcpy(stages[stage - 1].oid.hash, ce->oid.hash);
2095                sum |= (1 << (stage - 1));
2096        }
2097        if (sum != d->stagemask)
2098                die("BUG: observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
2099
2100        if (s->null_termination)
2101                path_index = it->string;
2102        else
2103                path_index = quote_path(it->string, s->prefix, &buf_index);
2104
2105        fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2106                        unmerged_prefix, key, submodule_token,
2107                        stages[0].mode, /* stage 1 */
2108                        stages[1].mode, /* stage 2 */
2109                        stages[2].mode, /* stage 3 */
2110                        d->mode_worktree,
2111                        oid_to_hex(&stages[0].oid), /* stage 1 */
2112                        oid_to_hex(&stages[1].oid), /* stage 2 */
2113                        oid_to_hex(&stages[2].oid), /* stage 3 */
2114                        path_index,
2115                        eol_char);
2116
2117        strbuf_release(&buf_index);
2118}
2119
2120/*
2121 * Print porcelain V2 status info for untracked and ignored entries.
2122 */
2123static void wt_porcelain_v2_print_other(
2124        struct string_list_item *it,
2125        struct wt_status *s,
2126        char prefix)
2127{
2128        struct strbuf buf = STRBUF_INIT;
2129        const char *path;
2130        char eol_char;
2131
2132        if (s->null_termination) {
2133                path = it->string;
2134                eol_char = '\0';
2135        } else {
2136                path = quote_path(it->string, s->prefix, &buf);
2137                eol_char = '\n';
2138        }
2139
2140        fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2141
2142        strbuf_release(&buf);
2143}
2144
2145/*
2146 * Print porcelain V2 status.
2147 *
2148 * [<v2_branch>]
2149 * [<v2_changed_items>]*
2150 * [<v2_unmerged_items>]*
2151 * [<v2_untracked_items>]*
2152 * [<v2_ignored_items>]*
2153 *
2154 */
2155static void wt_porcelain_v2_print(struct wt_status *s)
2156{
2157        struct wt_status_change_data *d;
2158        struct string_list_item *it;
2159        int i;
2160
2161        if (s->show_branch)
2162                wt_porcelain_v2_print_tracking(s);
2163
2164        for (i = 0; i < s->change.nr; i++) {
2165                it = &(s->change.items[i]);
2166                d = it->util;
2167                if (!d->stagemask)
2168                        wt_porcelain_v2_print_changed_entry(it, s);
2169        }
2170
2171        for (i = 0; i < s->change.nr; i++) {
2172                it = &(s->change.items[i]);
2173                d = it->util;
2174                if (d->stagemask)
2175                        wt_porcelain_v2_print_unmerged_entry(it, s);
2176        }
2177
2178        for (i = 0; i < s->untracked.nr; i++) {
2179                it = &(s->untracked.items[i]);
2180                wt_porcelain_v2_print_other(it, s, '?');
2181        }
2182
2183        for (i = 0; i < s->ignored.nr; i++) {
2184                it = &(s->ignored.items[i]);
2185                wt_porcelain_v2_print_other(it, s, '!');
2186        }
2187}
2188
2189void wt_status_print(struct wt_status *s)
2190{
2191        switch (s->status_format) {
2192        case STATUS_FORMAT_SHORT:
2193                wt_shortstatus_print(s);
2194                break;
2195        case STATUS_FORMAT_PORCELAIN:
2196                wt_porcelain_print(s);
2197                break;
2198        case STATUS_FORMAT_PORCELAIN_V2:
2199                wt_porcelain_v2_print(s);
2200                break;
2201        case STATUS_FORMAT_UNSPECIFIED:
2202                die("BUG: finalize_deferred_config() should have been called");
2203                break;
2204        case STATUS_FORMAT_NONE:
2205        case STATUS_FORMAT_LONG:
2206                wt_longstatus_print(s);
2207                break;
2208        }
2209}
2210
2211/**
2212 * Returns 1 if there are unstaged changes, 0 otherwise.
2213 */
2214int has_unstaged_changes(int ignore_submodules)
2215{
2216        struct rev_info rev_info;
2217        int result;
2218
2219        init_revisions(&rev_info, NULL);
2220        if (ignore_submodules)
2221                DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
2222        DIFF_OPT_SET(&rev_info.diffopt, QUICK);
2223        diff_setup_done(&rev_info.diffopt);
2224        result = run_diff_files(&rev_info, 0);
2225        return diff_result_code(&rev_info.diffopt, result);
2226}
2227
2228/**
2229 * Returns 1 if there are uncommitted changes, 0 otherwise.
2230 */
2231int has_uncommitted_changes(int ignore_submodules)
2232{
2233        struct rev_info rev_info;
2234        int result;
2235
2236        if (is_cache_unborn())
2237                return 0;
2238
2239        init_revisions(&rev_info, NULL);
2240        if (ignore_submodules)
2241                DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
2242        DIFF_OPT_SET(&rev_info.diffopt, QUICK);
2243        add_head_to_pending(&rev_info);
2244        diff_setup_done(&rev_info.diffopt);
2245        result = run_diff_index(&rev_info, 1);
2246        return diff_result_code(&rev_info.diffopt, result);
2247}
2248
2249/**
2250 * If the work tree has unstaged or uncommitted changes, dies with the
2251 * appropriate message.
2252 */
2253int require_clean_work_tree(const char *action, const char *hint, int ignore_submodules, int gently)
2254{
2255        struct lock_file *lock_file = xcalloc(1, sizeof(*lock_file));
2256        int err = 0;
2257
2258        hold_locked_index(lock_file, 0);
2259        refresh_cache(REFRESH_QUIET);
2260        update_index_if_able(&the_index, lock_file);
2261        rollback_lock_file(lock_file);
2262
2263        if (has_unstaged_changes(ignore_submodules)) {
2264                /* TRANSLATORS: the action is e.g. "pull with rebase" */
2265                error(_("cannot %s: You have unstaged changes."), _(action));
2266                err = 1;
2267        }
2268
2269        if (has_uncommitted_changes(ignore_submodules)) {
2270                if (err)
2271                        error(_("additionally, your index contains uncommitted changes."));
2272                else
2273                        error(_("cannot %s: Your index contains uncommitted changes."),
2274                              _(action));
2275                err = 1;
2276        }
2277
2278        if (err) {
2279                if (hint)
2280                        error("%s", hint);
2281                if (!gently)
2282                        exit(128);
2283        }
2284
2285        return err;
2286}