wt-status.con commit Merge branch 'jc/combine-diff-many-parents' into maint (d49f9f1)
   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 "remote.h"
  12#include "refs.h"
  13#include "submodule.h"
  14#include "column.h"
  15#include "strbuf.h"
  16
  17static char default_wt_status_colors[][COLOR_MAXLEN] = {
  18        GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
  19        GIT_COLOR_GREEN,  /* WT_STATUS_UPDATED */
  20        GIT_COLOR_RED,    /* WT_STATUS_CHANGED */
  21        GIT_COLOR_RED,    /* WT_STATUS_UNTRACKED */
  22        GIT_COLOR_RED,    /* WT_STATUS_NOBRANCH */
  23        GIT_COLOR_RED,    /* WT_STATUS_UNMERGED */
  24        GIT_COLOR_GREEN,  /* WT_STATUS_LOCAL_BRANCH */
  25        GIT_COLOR_RED,    /* WT_STATUS_REMOTE_BRANCH */
  26        GIT_COLOR_NIL,    /* WT_STATUS_ONBRANCH */
  27};
  28
  29static const char *color(int slot, struct wt_status *s)
  30{
  31        const char *c = "";
  32        if (want_color(s->use_color))
  33                c = s->color_palette[slot];
  34        if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
  35                c = s->color_palette[WT_STATUS_HEADER];
  36        return c;
  37}
  38
  39static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
  40                const char *fmt, va_list ap, const char *trail)
  41{
  42        struct strbuf sb = STRBUF_INIT;
  43        struct strbuf linebuf = STRBUF_INIT;
  44        const char *line, *eol;
  45
  46        strbuf_vaddf(&sb, fmt, ap);
  47        if (!sb.len) {
  48                strbuf_addch(&sb, '#');
  49                if (!trail)
  50                        strbuf_addch(&sb, ' ');
  51                color_print_strbuf(s->fp, color, &sb);
  52                if (trail)
  53                        fprintf(s->fp, "%s", trail);
  54                strbuf_release(&sb);
  55                return;
  56        }
  57        for (line = sb.buf; *line; line = eol + 1) {
  58                eol = strchr(line, '\n');
  59
  60                strbuf_reset(&linebuf);
  61                if (at_bol) {
  62                        strbuf_addch(&linebuf, '#');
  63                        if (*line != '\n' && *line != '\t')
  64                                strbuf_addch(&linebuf, ' ');
  65                }
  66                if (eol)
  67                        strbuf_add(&linebuf, line, eol - line);
  68                else
  69                        strbuf_addstr(&linebuf, line);
  70                color_print_strbuf(s->fp, color, &linebuf);
  71                if (eol)
  72                        fprintf(s->fp, "\n");
  73                else
  74                        break;
  75                at_bol = 1;
  76        }
  77        if (trail)
  78                fprintf(s->fp, "%s", trail);
  79        strbuf_release(&linebuf);
  80        strbuf_release(&sb);
  81}
  82
  83void status_printf_ln(struct wt_status *s, const char *color,
  84                        const char *fmt, ...)
  85{
  86        va_list ap;
  87
  88        va_start(ap, fmt);
  89        status_vprintf(s, 1, color, fmt, ap, "\n");
  90        va_end(ap);
  91}
  92
  93void status_printf(struct wt_status *s, const char *color,
  94                        const char *fmt, ...)
  95{
  96        va_list ap;
  97
  98        va_start(ap, fmt);
  99        status_vprintf(s, 1, color, fmt, ap, NULL);
 100        va_end(ap);
 101}
 102
 103static void status_printf_more(struct wt_status *s, const char *color,
 104                               const char *fmt, ...)
 105{
 106        va_list ap;
 107
 108        va_start(ap, fmt);
 109        status_vprintf(s, 0, color, fmt, ap, NULL);
 110        va_end(ap);
 111}
 112
 113void wt_status_prepare(struct wt_status *s)
 114{
 115        unsigned char sha1[20];
 116
 117        memset(s, 0, sizeof(*s));
 118        memcpy(s->color_palette, default_wt_status_colors,
 119               sizeof(default_wt_status_colors));
 120        s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
 121        s->use_color = -1;
 122        s->relative_paths = 1;
 123        s->branch = resolve_refdup("HEAD", sha1, 0, NULL);
 124        s->reference = "HEAD";
 125        s->fp = stdout;
 126        s->index_file = get_index_file();
 127        s->change.strdup_strings = 1;
 128        s->untracked.strdup_strings = 1;
 129        s->ignored.strdup_strings = 1;
 130}
 131
 132static void wt_status_print_unmerged_header(struct wt_status *s)
 133{
 134        int i;
 135        int del_mod_conflict = 0;
 136        int both_deleted = 0;
 137        int not_deleted = 0;
 138        const char *c = color(WT_STATUS_HEADER, s);
 139
 140        status_printf_ln(s, c, _("Unmerged paths:"));
 141
 142        for (i = 0; i < s->change.nr; i++) {
 143                struct string_list_item *it = &(s->change.items[i]);
 144                struct wt_status_change_data *d = it->util;
 145
 146                switch (d->stagemask) {
 147                case 0:
 148                        break;
 149                case 1:
 150                        both_deleted = 1;
 151                        break;
 152                case 3:
 153                case 5:
 154                        del_mod_conflict = 1;
 155                        break;
 156                default:
 157                        not_deleted = 1;
 158                        break;
 159                }
 160        }
 161
 162        if (!advice_status_hints)
 163                return;
 164        if (s->whence != FROM_COMMIT)
 165                ;
 166        else if (!s->is_initial)
 167                status_printf_ln(s, c, _("  (use \"git reset %s <file>...\" to unstage)"), s->reference);
 168        else
 169                status_printf_ln(s, c, _("  (use \"git rm --cached <file>...\" to unstage)"));
 170
 171        if (!both_deleted) {
 172                if (!del_mod_conflict)
 173                        status_printf_ln(s, c, _("  (use \"git add <file>...\" to mark resolution)"));
 174                else
 175                        status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
 176        } else if (!del_mod_conflict && !not_deleted) {
 177                status_printf_ln(s, c, _("  (use \"git rm <file>...\" to mark resolution)"));
 178        } else {
 179                status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
 180        }
 181        status_printf_ln(s, c, "");
 182}
 183
 184static void wt_status_print_cached_header(struct wt_status *s)
 185{
 186        const char *c = color(WT_STATUS_HEADER, s);
 187
 188        status_printf_ln(s, c, _("Changes to be committed:"));
 189        if (!advice_status_hints)
 190                return;
 191        if (s->whence != FROM_COMMIT)
 192                ; /* NEEDSWORK: use "git reset --unresolve"??? */
 193        else if (!s->is_initial)
 194                status_printf_ln(s, c, _("  (use \"git reset %s <file>...\" to unstage)"), s->reference);
 195        else
 196                status_printf_ln(s, c, _("  (use \"git rm --cached <file>...\" to unstage)"));
 197        status_printf_ln(s, c, "");
 198}
 199
 200static void wt_status_print_dirty_header(struct wt_status *s,
 201                                         int has_deleted,
 202                                         int has_dirty_submodules)
 203{
 204        const char *c = color(WT_STATUS_HEADER, s);
 205
 206        status_printf_ln(s, c, _("Changes not staged for commit:"));
 207        if (!advice_status_hints)
 208                return;
 209        if (!has_deleted)
 210                status_printf_ln(s, c, _("  (use \"git add <file>...\" to update what will be committed)"));
 211        else
 212                status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" to update what will be committed)"));
 213        status_printf_ln(s, c, _("  (use \"git checkout -- <file>...\" to discard changes in working directory)"));
 214        if (has_dirty_submodules)
 215                status_printf_ln(s, c, _("  (commit or discard the untracked or modified content in submodules)"));
 216        status_printf_ln(s, c, "");
 217}
 218
 219static void wt_status_print_other_header(struct wt_status *s,
 220                                         const char *what,
 221                                         const char *how)
 222{
 223        const char *c = color(WT_STATUS_HEADER, s);
 224        status_printf_ln(s, c, "%s:", what);
 225        if (!advice_status_hints)
 226                return;
 227        status_printf_ln(s, c, _("  (use \"git %s <file>...\" to include in what will be committed)"), how);
 228        status_printf_ln(s, c, "");
 229}
 230
 231static void wt_status_print_trailer(struct wt_status *s)
 232{
 233        status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
 234}
 235
 236#define quote_path quote_path_relative
 237
 238static void wt_status_print_unmerged_data(struct wt_status *s,
 239                                          struct string_list_item *it)
 240{
 241        const char *c = color(WT_STATUS_UNMERGED, s);
 242        struct wt_status_change_data *d = it->util;
 243        struct strbuf onebuf = STRBUF_INIT;
 244        const char *one, *how = _("bug");
 245
 246        one = quote_path(it->string, -1, &onebuf, s->prefix);
 247        status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 248        switch (d->stagemask) {
 249        case 1: how = _("both deleted:"); break;
 250        case 2: how = _("added by us:"); break;
 251        case 3: how = _("deleted by them:"); break;
 252        case 4: how = _("added by them:"); break;
 253        case 5: how = _("deleted by us:"); break;
 254        case 6: how = _("both added:"); break;
 255        case 7: how = _("both modified:"); break;
 256        }
 257        status_printf_more(s, c, "%-20s%s\n", how, one);
 258        strbuf_release(&onebuf);
 259}
 260
 261static void wt_status_print_change_data(struct wt_status *s,
 262                                        int change_type,
 263                                        struct string_list_item *it)
 264{
 265        struct wt_status_change_data *d = it->util;
 266        const char *c = color(change_type, s);
 267        int status = status;
 268        char *one_name;
 269        char *two_name;
 270        const char *one, *two;
 271        struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
 272        struct strbuf extra = STRBUF_INIT;
 273
 274        one_name = two_name = it->string;
 275        switch (change_type) {
 276        case WT_STATUS_UPDATED:
 277                status = d->index_status;
 278                if (d->head_path)
 279                        one_name = d->head_path;
 280                break;
 281        case WT_STATUS_CHANGED:
 282                if (d->new_submodule_commits || d->dirty_submodule) {
 283                        strbuf_addstr(&extra, " (");
 284                        if (d->new_submodule_commits)
 285                                strbuf_addf(&extra, _("new commits, "));
 286                        if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
 287                                strbuf_addf(&extra, _("modified content, "));
 288                        if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
 289                                strbuf_addf(&extra, _("untracked content, "));
 290                        strbuf_setlen(&extra, extra.len - 2);
 291                        strbuf_addch(&extra, ')');
 292                }
 293                status = d->worktree_status;
 294                break;
 295        }
 296
 297        one = quote_path(one_name, -1, &onebuf, s->prefix);
 298        two = quote_path(two_name, -1, &twobuf, s->prefix);
 299
 300        status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 301        switch (status) {
 302        case DIFF_STATUS_ADDED:
 303                status_printf_more(s, c, _("new file:   %s"), one);
 304                break;
 305        case DIFF_STATUS_COPIED:
 306                status_printf_more(s, c, _("copied:     %s -> %s"), one, two);
 307                break;
 308        case DIFF_STATUS_DELETED:
 309                status_printf_more(s, c, _("deleted:    %s"), one);
 310                break;
 311        case DIFF_STATUS_MODIFIED:
 312                status_printf_more(s, c, _("modified:   %s"), one);
 313                break;
 314        case DIFF_STATUS_RENAMED:
 315                status_printf_more(s, c, _("renamed:    %s -> %s"), one, two);
 316                break;
 317        case DIFF_STATUS_TYPE_CHANGED:
 318                status_printf_more(s, c, _("typechange: %s"), one);
 319                break;
 320        case DIFF_STATUS_UNKNOWN:
 321                status_printf_more(s, c, _("unknown:    %s"), one);
 322                break;
 323        case DIFF_STATUS_UNMERGED:
 324                status_printf_more(s, c, _("unmerged:   %s"), one);
 325                break;
 326        default:
 327                die(_("bug: unhandled diff status %c"), status);
 328        }
 329        if (extra.len) {
 330                status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
 331                strbuf_release(&extra);
 332        }
 333        status_printf_more(s, GIT_COLOR_NORMAL, "\n");
 334        strbuf_release(&onebuf);
 335        strbuf_release(&twobuf);
 336}
 337
 338static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
 339                                         struct diff_options *options,
 340                                         void *data)
 341{
 342        struct wt_status *s = data;
 343        int i;
 344
 345        if (!q->nr)
 346                return;
 347        s->workdir_dirty = 1;
 348        for (i = 0; i < q->nr; i++) {
 349                struct diff_filepair *p;
 350                struct string_list_item *it;
 351                struct wt_status_change_data *d;
 352
 353                p = q->queue[i];
 354                it = string_list_insert(&s->change, p->one->path);
 355                d = it->util;
 356                if (!d) {
 357                        d = xcalloc(1, sizeof(*d));
 358                        it->util = d;
 359                }
 360                if (!d->worktree_status)
 361                        d->worktree_status = p->status;
 362                d->dirty_submodule = p->two->dirty_submodule;
 363                if (S_ISGITLINK(p->two->mode))
 364                        d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
 365        }
 366}
 367
 368static int unmerged_mask(const char *path)
 369{
 370        int pos, mask;
 371        struct cache_entry *ce;
 372
 373        pos = cache_name_pos(path, strlen(path));
 374        if (0 <= pos)
 375                return 0;
 376
 377        mask = 0;
 378        pos = -pos-1;
 379        while (pos < active_nr) {
 380                ce = active_cache[pos++];
 381                if (strcmp(ce->name, path) || !ce_stage(ce))
 382                        break;
 383                mask |= (1 << (ce_stage(ce) - 1));
 384        }
 385        return mask;
 386}
 387
 388static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
 389                                         struct diff_options *options,
 390                                         void *data)
 391{
 392        struct wt_status *s = data;
 393        int i;
 394
 395        for (i = 0; i < q->nr; i++) {
 396                struct diff_filepair *p;
 397                struct string_list_item *it;
 398                struct wt_status_change_data *d;
 399
 400                p = q->queue[i];
 401                it = string_list_insert(&s->change, p->two->path);
 402                d = it->util;
 403                if (!d) {
 404                        d = xcalloc(1, sizeof(*d));
 405                        it->util = d;
 406                }
 407                if (!d->index_status)
 408                        d->index_status = p->status;
 409                switch (p->status) {
 410                case DIFF_STATUS_COPIED:
 411                case DIFF_STATUS_RENAMED:
 412                        d->head_path = xstrdup(p->one->path);
 413                        break;
 414                case DIFF_STATUS_UNMERGED:
 415                        d->stagemask = unmerged_mask(p->two->path);
 416                        break;
 417                }
 418        }
 419}
 420
 421static void wt_status_collect_changes_worktree(struct wt_status *s)
 422{
 423        struct rev_info rev;
 424
 425        init_revisions(&rev, NULL);
 426        setup_revisions(0, NULL, &rev, NULL);
 427        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 428        DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
 429        if (!s->show_untracked_files)
 430                DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
 431        if (s->ignore_submodule_arg) {
 432                DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 433                handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 434        }
 435        rev.diffopt.format_callback = wt_status_collect_changed_cb;
 436        rev.diffopt.format_callback_data = s;
 437        init_pathspec(&rev.prune_data, s->pathspec);
 438        run_diff_files(&rev, 0);
 439}
 440
 441static void wt_status_collect_changes_index(struct wt_status *s)
 442{
 443        struct rev_info rev;
 444        struct setup_revision_opt opt;
 445
 446        init_revisions(&rev, NULL);
 447        memset(&opt, 0, sizeof(opt));
 448        opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 449        setup_revisions(0, NULL, &rev, &opt);
 450
 451        if (s->ignore_submodule_arg) {
 452                DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 453                handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 454        }
 455
 456        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 457        rev.diffopt.format_callback = wt_status_collect_updated_cb;
 458        rev.diffopt.format_callback_data = s;
 459        rev.diffopt.detect_rename = 1;
 460        rev.diffopt.rename_limit = 200;
 461        rev.diffopt.break_opt = 0;
 462        init_pathspec(&rev.prune_data, s->pathspec);
 463        run_diff_index(&rev, 1);
 464}
 465
 466static void wt_status_collect_changes_initial(struct wt_status *s)
 467{
 468        struct pathspec pathspec;
 469        int i;
 470
 471        init_pathspec(&pathspec, s->pathspec);
 472        for (i = 0; i < active_nr; i++) {
 473                struct string_list_item *it;
 474                struct wt_status_change_data *d;
 475                struct cache_entry *ce = active_cache[i];
 476
 477                if (!ce_path_match(ce, &pathspec))
 478                        continue;
 479                it = string_list_insert(&s->change, ce->name);
 480                d = it->util;
 481                if (!d) {
 482                        d = xcalloc(1, sizeof(*d));
 483                        it->util = d;
 484                }
 485                if (ce_stage(ce)) {
 486                        d->index_status = DIFF_STATUS_UNMERGED;
 487                        d->stagemask |= (1 << (ce_stage(ce) - 1));
 488                }
 489                else
 490                        d->index_status = DIFF_STATUS_ADDED;
 491        }
 492        free_pathspec(&pathspec);
 493}
 494
 495static void wt_status_collect_untracked(struct wt_status *s)
 496{
 497        int i;
 498        struct dir_struct dir;
 499
 500        if (!s->show_untracked_files)
 501                return;
 502        memset(&dir, 0, sizeof(dir));
 503        if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
 504                dir.flags |=
 505                        DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
 506        setup_standard_excludes(&dir);
 507
 508        fill_directory(&dir, s->pathspec);
 509        for (i = 0; i < dir.nr; i++) {
 510                struct dir_entry *ent = dir.entries[i];
 511                if (cache_name_is_other(ent->name, ent->len) &&
 512                    match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
 513                        string_list_insert(&s->untracked, ent->name);
 514                free(ent);
 515        }
 516
 517        if (s->show_ignored_files) {
 518                dir.nr = 0;
 519                dir.flags = DIR_SHOW_IGNORED;
 520                if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
 521                        dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
 522                fill_directory(&dir, s->pathspec);
 523                for (i = 0; i < dir.nr; i++) {
 524                        struct dir_entry *ent = dir.entries[i];
 525                        if (cache_name_is_other(ent->name, ent->len) &&
 526                            match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
 527                                string_list_insert(&s->ignored, ent->name);
 528                        free(ent);
 529                }
 530        }
 531
 532        free(dir.entries);
 533}
 534
 535void wt_status_collect(struct wt_status *s)
 536{
 537        wt_status_collect_changes_worktree(s);
 538
 539        if (s->is_initial)
 540                wt_status_collect_changes_initial(s);
 541        else
 542                wt_status_collect_changes_index(s);
 543        wt_status_collect_untracked(s);
 544}
 545
 546static void wt_status_print_unmerged(struct wt_status *s)
 547{
 548        int shown_header = 0;
 549        int i;
 550
 551        for (i = 0; i < s->change.nr; i++) {
 552                struct wt_status_change_data *d;
 553                struct string_list_item *it;
 554                it = &(s->change.items[i]);
 555                d = it->util;
 556                if (!d->stagemask)
 557                        continue;
 558                if (!shown_header) {
 559                        wt_status_print_unmerged_header(s);
 560                        shown_header = 1;
 561                }
 562                wt_status_print_unmerged_data(s, it);
 563        }
 564        if (shown_header)
 565                wt_status_print_trailer(s);
 566
 567}
 568
 569static void wt_status_print_updated(struct wt_status *s)
 570{
 571        int shown_header = 0;
 572        int i;
 573
 574        for (i = 0; i < s->change.nr; i++) {
 575                struct wt_status_change_data *d;
 576                struct string_list_item *it;
 577                it = &(s->change.items[i]);
 578                d = it->util;
 579                if (!d->index_status ||
 580                    d->index_status == DIFF_STATUS_UNMERGED)
 581                        continue;
 582                if (!shown_header) {
 583                        wt_status_print_cached_header(s);
 584                        s->commitable = 1;
 585                        shown_header = 1;
 586                }
 587                wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
 588        }
 589        if (shown_header)
 590                wt_status_print_trailer(s);
 591}
 592
 593/*
 594 * -1 : has delete
 595 *  0 : no change
 596 *  1 : some change but no delete
 597 */
 598static int wt_status_check_worktree_changes(struct wt_status *s,
 599                                             int *dirty_submodules)
 600{
 601        int i;
 602        int changes = 0;
 603
 604        *dirty_submodules = 0;
 605
 606        for (i = 0; i < s->change.nr; i++) {
 607                struct wt_status_change_data *d;
 608                d = s->change.items[i].util;
 609                if (!d->worktree_status ||
 610                    d->worktree_status == DIFF_STATUS_UNMERGED)
 611                        continue;
 612                if (!changes)
 613                        changes = 1;
 614                if (d->dirty_submodule)
 615                        *dirty_submodules = 1;
 616                if (d->worktree_status == DIFF_STATUS_DELETED)
 617                        changes = -1;
 618        }
 619        return changes;
 620}
 621
 622static void wt_status_print_changed(struct wt_status *s)
 623{
 624        int i, dirty_submodules;
 625        int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
 626
 627        if (!worktree_changes)
 628                return;
 629
 630        wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
 631
 632        for (i = 0; i < s->change.nr; i++) {
 633                struct wt_status_change_data *d;
 634                struct string_list_item *it;
 635                it = &(s->change.items[i]);
 636                d = it->util;
 637                if (!d->worktree_status ||
 638                    d->worktree_status == DIFF_STATUS_UNMERGED)
 639                        continue;
 640                wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
 641        }
 642        wt_status_print_trailer(s);
 643}
 644
 645static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
 646{
 647        struct child_process sm_summary;
 648        char summary_limit[64];
 649        char index[PATH_MAX];
 650        const char *env[] = { NULL, NULL };
 651        const char *argv[8];
 652
 653        env[0] =        index;
 654        argv[0] =       "submodule";
 655        argv[1] =       "summary";
 656        argv[2] =       uncommitted ? "--files" : "--cached";
 657        argv[3] =       "--for-status";
 658        argv[4] =       "--summary-limit";
 659        argv[5] =       summary_limit;
 660        argv[6] =       uncommitted ? NULL : (s->amend ? "HEAD^" : "HEAD");
 661        argv[7] =       NULL;
 662
 663        sprintf(summary_limit, "%d", s->submodule_summary);
 664        snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
 665
 666        memset(&sm_summary, 0, sizeof(sm_summary));
 667        sm_summary.argv = argv;
 668        sm_summary.env = env;
 669        sm_summary.git_cmd = 1;
 670        sm_summary.no_stdin = 1;
 671        fflush(s->fp);
 672        sm_summary.out = dup(fileno(s->fp));    /* run_command closes it */
 673        run_command(&sm_summary);
 674}
 675
 676static void wt_status_print_other(struct wt_status *s,
 677                                  struct string_list *l,
 678                                  const char *what,
 679                                  const char *how)
 680{
 681        int i;
 682        struct strbuf buf = STRBUF_INIT;
 683        static struct string_list output = STRING_LIST_INIT_DUP;
 684        struct column_options copts;
 685
 686        if (!l->nr)
 687                return;
 688
 689        wt_status_print_other_header(s, what, how);
 690
 691        for (i = 0; i < l->nr; i++) {
 692                struct string_list_item *it;
 693                const char *path;
 694                it = &(l->items[i]);
 695                path = quote_path(it->string, strlen(it->string),
 696                                  &buf, s->prefix);
 697                if (column_active(s->colopts)) {
 698                        string_list_append(&output, path);
 699                        continue;
 700                }
 701                status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 702                status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
 703                                   "%s\n", path);
 704        }
 705
 706        strbuf_release(&buf);
 707        if (!column_active(s->colopts))
 708                return;
 709
 710        strbuf_addf(&buf, "%s#\t%s",
 711                    color(WT_STATUS_HEADER, s),
 712                    color(WT_STATUS_UNTRACKED, s));
 713        memset(&copts, 0, sizeof(copts));
 714        copts.padding = 1;
 715        copts.indent = buf.buf;
 716        if (want_color(s->use_color))
 717                copts.nl = GIT_COLOR_RESET "\n";
 718        print_columns(&output, s->colopts, &copts);
 719        string_list_clear(&output, 0);
 720        strbuf_release(&buf);
 721}
 722
 723static void wt_status_print_verbose(struct wt_status *s)
 724{
 725        struct rev_info rev;
 726        struct setup_revision_opt opt;
 727
 728        init_revisions(&rev, NULL);
 729        DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
 730
 731        memset(&opt, 0, sizeof(opt));
 732        opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 733        setup_revisions(0, NULL, &rev, &opt);
 734
 735        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 736        rev.diffopt.detect_rename = 1;
 737        rev.diffopt.file = s->fp;
 738        rev.diffopt.close_file = 0;
 739        /*
 740         * If we're not going to stdout, then we definitely don't
 741         * want color, since we are going to the commit message
 742         * file (and even the "auto" setting won't work, since it
 743         * will have checked isatty on stdout).
 744         */
 745        if (s->fp != stdout)
 746                rev.diffopt.use_color = 0;
 747        run_diff_index(&rev, 1);
 748}
 749
 750static void wt_status_print_tracking(struct wt_status *s)
 751{
 752        struct strbuf sb = STRBUF_INIT;
 753        const char *cp, *ep;
 754        struct branch *branch;
 755
 756        assert(s->branch && !s->is_initial);
 757        if (prefixcmp(s->branch, "refs/heads/"))
 758                return;
 759        branch = branch_get(s->branch + 11);
 760        if (!format_tracking_info(branch, &sb))
 761                return;
 762
 763        for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
 764                color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
 765                                 "# %.*s", (int)(ep - cp), cp);
 766        color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
 767}
 768
 769static int has_unmerged(struct wt_status *s)
 770{
 771        int i;
 772
 773        for (i = 0; i < s->change.nr; i++) {
 774                struct wt_status_change_data *d;
 775                d = s->change.items[i].util;
 776                if (d->stagemask)
 777                        return 1;
 778        }
 779        return 0;
 780}
 781
 782static void show_merge_in_progress(struct wt_status *s,
 783                                struct wt_status_state *state,
 784                                const char *color)
 785{
 786        if (has_unmerged(s)) {
 787                status_printf_ln(s, color, _("You have unmerged paths."));
 788                if (advice_status_hints)
 789                        status_printf_ln(s, color,
 790                                _("  (fix conflicts and run \"git commit\")"));
 791        } else {
 792                status_printf_ln(s, color,
 793                        _("All conflicts fixed but you are still merging."));
 794                if (advice_status_hints)
 795                        status_printf_ln(s, color,
 796                                _("  (use \"git commit\" to conclude merge)"));
 797        }
 798        wt_status_print_trailer(s);
 799}
 800
 801static void show_am_in_progress(struct wt_status *s,
 802                                struct wt_status_state *state,
 803                                const char *color)
 804{
 805        status_printf_ln(s, color,
 806                _("You are in the middle of an am session."));
 807        if (state->am_empty_patch)
 808                status_printf_ln(s, color,
 809                        _("The current patch is empty."));
 810        if (advice_status_hints) {
 811                if (!state->am_empty_patch)
 812                        status_printf_ln(s, color,
 813                                _("  (fix conflicts and then run \"git am --resolved\")"));
 814                status_printf_ln(s, color,
 815                        _("  (use \"git am --skip\" to skip this patch)"));
 816                status_printf_ln(s, color,
 817                        _("  (use \"git am --abort\" to restore the original branch)"));
 818        }
 819        wt_status_print_trailer(s);
 820}
 821
 822static char *read_line_from_git_path(const char *filename)
 823{
 824        struct strbuf buf = STRBUF_INIT;
 825        FILE *fp = fopen(git_path("%s", filename), "r");
 826        if (!fp) {
 827                strbuf_release(&buf);
 828                return NULL;
 829        }
 830        strbuf_getline(&buf, fp, '\n');
 831        if (!fclose(fp)) {
 832                return strbuf_detach(&buf, NULL);
 833        } else {
 834                strbuf_release(&buf);
 835                return NULL;
 836        }
 837}
 838
 839static int split_commit_in_progress(struct wt_status *s)
 840{
 841        int split_in_progress = 0;
 842        char *head = read_line_from_git_path("HEAD");
 843        char *orig_head = read_line_from_git_path("ORIG_HEAD");
 844        char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
 845        char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
 846
 847        if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
 848            !s->branch || strcmp(s->branch, "HEAD"))
 849                return split_in_progress;
 850
 851        if (!strcmp(rebase_amend, rebase_orig_head)) {
 852                if (strcmp(head, rebase_amend))
 853                        split_in_progress = 1;
 854        } else if (strcmp(orig_head, rebase_orig_head)) {
 855                split_in_progress = 1;
 856        }
 857
 858        if (!s->amend && !s->nowarn && !s->workdir_dirty)
 859                split_in_progress = 0;
 860
 861        free(head);
 862        free(orig_head);
 863        free(rebase_amend);
 864        free(rebase_orig_head);
 865        return split_in_progress;
 866}
 867
 868static void show_rebase_in_progress(struct wt_status *s,
 869                                struct wt_status_state *state,
 870                                const char *color)
 871{
 872        struct stat st;
 873
 874        if (has_unmerged(s)) {
 875                status_printf_ln(s, color, _("You are currently rebasing."));
 876                if (advice_status_hints) {
 877                        status_printf_ln(s, color,
 878                                _("  (fix conflicts and then run \"git rebase --continue\")"));
 879                        status_printf_ln(s, color,
 880                                _("  (use \"git rebase --skip\" to skip this patch)"));
 881                        status_printf_ln(s, color,
 882                                _("  (use \"git rebase --abort\" to check out the original branch)"));
 883                }
 884        } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
 885                status_printf_ln(s, color, _("You are currently rebasing."));
 886                if (advice_status_hints)
 887                        status_printf_ln(s, color,
 888                                _("  (all conflicts fixed: run \"git rebase --continue\")"));
 889        } else if (split_commit_in_progress(s)) {
 890                status_printf_ln(s, color, _("You are currently splitting a commit during a rebase."));
 891                if (advice_status_hints)
 892                        status_printf_ln(s, color,
 893                                _("  (Once your working directory is clean, run \"git rebase --continue\")"));
 894        } else {
 895                status_printf_ln(s, color, _("You are currently editing a commit during a rebase."));
 896                if (advice_status_hints && !s->amend) {
 897                        status_printf_ln(s, color,
 898                                _("  (use \"git commit --amend\" to amend the current commit)"));
 899                        status_printf_ln(s, color,
 900                                _("  (use \"git rebase --continue\" once you are satisfied with your changes)"));
 901                }
 902        }
 903        wt_status_print_trailer(s);
 904}
 905
 906static void show_cherry_pick_in_progress(struct wt_status *s,
 907                                        struct wt_status_state *state,
 908                                        const char *color)
 909{
 910        status_printf_ln(s, color, _("You are currently cherry-picking."));
 911        if (advice_status_hints) {
 912                if (has_unmerged(s))
 913                        status_printf_ln(s, color,
 914                                _("  (fix conflicts and run \"git commit\")"));
 915                else
 916                        status_printf_ln(s, color,
 917                                _("  (all conflicts fixed: run \"git commit\")"));
 918        }
 919        wt_status_print_trailer(s);
 920}
 921
 922static void show_bisect_in_progress(struct wt_status *s,
 923                                struct wt_status_state *state,
 924                                const char *color)
 925{
 926        status_printf_ln(s, color, _("You are currently bisecting."));
 927        if (advice_status_hints)
 928                status_printf_ln(s, color,
 929                        _("  (use \"git bisect reset\" to get back to the original branch)"));
 930        wt_status_print_trailer(s);
 931}
 932
 933static void wt_status_print_state(struct wt_status *s)
 934{
 935        const char *state_color = color(WT_STATUS_HEADER, s);
 936        struct wt_status_state state;
 937        struct stat st;
 938
 939        memset(&state, 0, sizeof(state));
 940
 941        if (!stat(git_path("MERGE_HEAD"), &st)) {
 942                state.merge_in_progress = 1;
 943        } else if (!stat(git_path("rebase-apply"), &st)) {
 944                if (!stat(git_path("rebase-apply/applying"), &st)) {
 945                        state.am_in_progress = 1;
 946                        if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
 947                                state.am_empty_patch = 1;
 948                } else {
 949                        state.rebase_in_progress = 1;
 950                }
 951        } else if (!stat(git_path("rebase-merge"), &st)) {
 952                if (!stat(git_path("rebase-merge/interactive"), &st))
 953                        state.rebase_interactive_in_progress = 1;
 954                else
 955                        state.rebase_in_progress = 1;
 956        } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st)) {
 957                state.cherry_pick_in_progress = 1;
 958        }
 959        if (!stat(git_path("BISECT_LOG"), &st))
 960                state.bisect_in_progress = 1;
 961
 962        if (state.merge_in_progress)
 963                show_merge_in_progress(s, &state, state_color);
 964        else if (state.am_in_progress)
 965                show_am_in_progress(s, &state, state_color);
 966        else if (state.rebase_in_progress || state.rebase_interactive_in_progress)
 967                show_rebase_in_progress(s, &state, state_color);
 968        else if (state.cherry_pick_in_progress)
 969                show_cherry_pick_in_progress(s, &state, state_color);
 970        if (state.bisect_in_progress)
 971                show_bisect_in_progress(s, &state, state_color);
 972}
 973
 974void wt_status_print(struct wt_status *s)
 975{
 976        const char *branch_color = color(WT_STATUS_ONBRANCH, s);
 977        const char *branch_status_color = color(WT_STATUS_HEADER, s);
 978
 979        if (s->branch) {
 980                const char *on_what = _("On branch ");
 981                const char *branch_name = s->branch;
 982                if (!prefixcmp(branch_name, "refs/heads/"))
 983                        branch_name += 11;
 984                else if (!strcmp(branch_name, "HEAD")) {
 985                        branch_name = "";
 986                        branch_status_color = color(WT_STATUS_NOBRANCH, s);
 987                        on_what = _("Not currently on any branch.");
 988                }
 989                status_printf(s, color(WT_STATUS_HEADER, s), "");
 990                status_printf_more(s, branch_status_color, "%s", on_what);
 991                status_printf_more(s, branch_color, "%s\n", branch_name);
 992                if (!s->is_initial)
 993                        wt_status_print_tracking(s);
 994        }
 995
 996        wt_status_print_state(s);
 997        if (s->is_initial) {
 998                status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
 999                status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1000                status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
1001        }
1002
1003        wt_status_print_updated(s);
1004        wt_status_print_unmerged(s);
1005        wt_status_print_changed(s);
1006        if (s->submodule_summary &&
1007            (!s->ignore_submodule_arg ||
1008             strcmp(s->ignore_submodule_arg, "all"))) {
1009                wt_status_print_submodule_summary(s, 0);  /* staged */
1010                wt_status_print_submodule_summary(s, 1);  /* unstaged */
1011        }
1012        if (s->show_untracked_files) {
1013                wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1014                if (s->show_ignored_files)
1015                        wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1016        } else if (s->commitable)
1017                status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1018                        advice_status_hints
1019                        ? _(" (use -u option to show untracked files)") : "");
1020
1021        if (s->verbose)
1022                wt_status_print_verbose(s);
1023        if (!s->commitable) {
1024                if (s->amend)
1025                        status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1026                else if (s->nowarn)
1027                        ; /* nothing */
1028                else if (s->workdir_dirty) {
1029                        if (advice_status_hints)
1030                                printf(_("no changes added to commit "
1031                                         "(use \"git add\" and/or \"git commit -a\")\n"));
1032                        else
1033                                printf(_("no changes added to commit\n"));
1034                } else if (s->untracked.nr) {
1035                        if (advice_status_hints)
1036                                printf(_("nothing added to commit but untracked files "
1037                                         "present (use \"git add\" to track)\n"));
1038                        else
1039                                printf(_("nothing added to commit but untracked files present\n"));
1040                } else if (s->is_initial) {
1041                        if (advice_status_hints)
1042                                printf(_("nothing to commit (create/copy files "
1043                                         "and use \"git add\" to track)\n"));
1044                        else
1045                                printf(_("nothing to commit\n"));
1046                } else if (!s->show_untracked_files) {
1047                        if (advice_status_hints)
1048                                printf(_("nothing to commit (use -u to show untracked files)\n"));
1049                        else
1050                                printf(_("nothing to commit\n"));
1051                } else
1052                        printf(_("nothing to commit, working directory clean\n"));
1053        }
1054}
1055
1056static void wt_shortstatus_unmerged(struct string_list_item *it,
1057                           struct wt_status *s)
1058{
1059        struct wt_status_change_data *d = it->util;
1060        const char *how = "??";
1061
1062        switch (d->stagemask) {
1063        case 1: how = "DD"; break; /* both deleted */
1064        case 2: how = "AU"; break; /* added by us */
1065        case 3: how = "UD"; break; /* deleted by them */
1066        case 4: how = "UA"; break; /* added by them */
1067        case 5: how = "DU"; break; /* deleted by us */
1068        case 6: how = "AA"; break; /* both added */
1069        case 7: how = "UU"; break; /* both modified */
1070        }
1071        color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1072        if (s->null_termination) {
1073                fprintf(stdout, " %s%c", it->string, 0);
1074        } else {
1075                struct strbuf onebuf = STRBUF_INIT;
1076                const char *one;
1077                one = quote_path(it->string, -1, &onebuf, s->prefix);
1078                printf(" %s\n", one);
1079                strbuf_release(&onebuf);
1080        }
1081}
1082
1083static void wt_shortstatus_status(struct string_list_item *it,
1084                         struct wt_status *s)
1085{
1086        struct wt_status_change_data *d = it->util;
1087
1088        if (d->index_status)
1089                color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1090        else
1091                putchar(' ');
1092        if (d->worktree_status)
1093                color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1094        else
1095                putchar(' ');
1096        putchar(' ');
1097        if (s->null_termination) {
1098                fprintf(stdout, "%s%c", it->string, 0);
1099                if (d->head_path)
1100                        fprintf(stdout, "%s%c", d->head_path, 0);
1101        } else {
1102                struct strbuf onebuf = STRBUF_INIT;
1103                const char *one;
1104                if (d->head_path) {
1105                        one = quote_path(d->head_path, -1, &onebuf, s->prefix);
1106                        if (*one != '"' && strchr(one, ' ') != NULL) {
1107                                putchar('"');
1108                                strbuf_addch(&onebuf, '"');
1109                                one = onebuf.buf;
1110                        }
1111                        printf("%s -> ", one);
1112                        strbuf_release(&onebuf);
1113                }
1114                one = quote_path(it->string, -1, &onebuf, s->prefix);
1115                if (*one != '"' && strchr(one, ' ') != NULL) {
1116                        putchar('"');
1117                        strbuf_addch(&onebuf, '"');
1118                        one = onebuf.buf;
1119                }
1120                printf("%s\n", one);
1121                strbuf_release(&onebuf);
1122        }
1123}
1124
1125static void wt_shortstatus_other(struct string_list_item *it,
1126                                 struct wt_status *s, const char *sign)
1127{
1128        if (s->null_termination) {
1129                fprintf(stdout, "%s %s%c", sign, it->string, 0);
1130        } else {
1131                struct strbuf onebuf = STRBUF_INIT;
1132                const char *one;
1133                one = quote_path(it->string, -1, &onebuf, s->prefix);
1134                color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1135                printf(" %s\n", one);
1136                strbuf_release(&onebuf);
1137        }
1138}
1139
1140static void wt_shortstatus_print_tracking(struct wt_status *s)
1141{
1142        struct branch *branch;
1143        const char *header_color = color(WT_STATUS_HEADER, s);
1144        const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1145        const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1146
1147        const char *base;
1148        const char *branch_name;
1149        int num_ours, num_theirs;
1150
1151        color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1152
1153        if (!s->branch)
1154                return;
1155        branch_name = s->branch;
1156
1157        if (!prefixcmp(branch_name, "refs/heads/"))
1158                branch_name += 11;
1159        else if (!strcmp(branch_name, "HEAD")) {
1160                branch_name = _("HEAD (no branch)");
1161                branch_color_local = color(WT_STATUS_NOBRANCH, s);
1162        }
1163
1164        branch = branch_get(s->branch + 11);
1165        if (s->is_initial)
1166                color_fprintf(s->fp, header_color, _("Initial commit on "));
1167        if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
1168                color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1169                fputc(s->null_termination ? '\0' : '\n', s->fp);
1170                return;
1171        }
1172
1173        base = branch->merge[0]->dst;
1174        base = shorten_unambiguous_ref(base, 0);
1175        color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1176        color_fprintf(s->fp, header_color, "...");
1177        color_fprintf(s->fp, branch_color_remote, "%s", base);
1178
1179        color_fprintf(s->fp, header_color, " [");
1180        if (!num_ours) {
1181                color_fprintf(s->fp, header_color, _("behind "));
1182                color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1183        } else if (!num_theirs) {
1184                color_fprintf(s->fp, header_color, _("ahead "));
1185                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1186        } else {
1187                color_fprintf(s->fp, header_color, _("ahead "));
1188                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1189                color_fprintf(s->fp, header_color, _(", behind "));
1190                color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1191        }
1192
1193        color_fprintf(s->fp, header_color, "]");
1194        fputc(s->null_termination ? '\0' : '\n', s->fp);
1195}
1196
1197void wt_shortstatus_print(struct wt_status *s)
1198{
1199        int i;
1200
1201        if (s->show_branch)
1202                wt_shortstatus_print_tracking(s);
1203
1204        for (i = 0; i < s->change.nr; i++) {
1205                struct wt_status_change_data *d;
1206                struct string_list_item *it;
1207
1208                it = &(s->change.items[i]);
1209                d = it->util;
1210                if (d->stagemask)
1211                        wt_shortstatus_unmerged(it, s);
1212                else
1213                        wt_shortstatus_status(it, s);
1214        }
1215        for (i = 0; i < s->untracked.nr; i++) {
1216                struct string_list_item *it;
1217
1218                it = &(s->untracked.items[i]);
1219                wt_shortstatus_other(it, s, "??");
1220        }
1221        for (i = 0; i < s->ignored.nr; i++) {
1222                struct string_list_item *it;
1223
1224                it = &(s->ignored.items[i]);
1225                wt_shortstatus_other(it, s, "!!");
1226        }
1227}
1228
1229void wt_porcelain_print(struct wt_status *s)
1230{
1231        s->use_color = 0;
1232        s->relative_paths = 0;
1233        s->prefix = NULL;
1234        wt_shortstatus_print(s);
1235}