Andrew's git / gitweb.git / wt-status.c
?
wt-status.con commit cvsserver: split up long lines in req_{status,diff,log} (4d804c0)
   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 | DIR_SHOW_OTHER_DIRECTORIES;
 520                fill_directory(&dir, s->pathspec);
 521                for (i = 0; i < dir.nr; i++) {
 522                        struct dir_entry *ent = dir.entries[i];
 523                        if (cache_name_is_other(ent->name, ent->len) &&
 524                            match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
 525                                string_list_insert(&s->ignored, ent->name);
 526                        free(ent);
 527                }
 528        }
 529
 530        free(dir.entries);
 531}
 532
 533void wt_status_collect(struct wt_status *s)
 534{
 535        wt_status_collect_changes_worktree(s);
 536
 537        if (s->is_initial)
 538                wt_status_collect_changes_initial(s);
 539        else
 540                wt_status_collect_changes_index(s);
 541        wt_status_collect_untracked(s);
 542}
 543
 544static void wt_status_print_unmerged(struct wt_status *s)
 545{
 546        int shown_header = 0;
 547        int i;
 548
 549        for (i = 0; i < s->change.nr; i++) {
 550                struct wt_status_change_data *d;
 551                struct string_list_item *it;
 552                it = &(s->change.items[i]);
 553                d = it->util;
 554                if (!d->stagemask)
 555                        continue;
 556                if (!shown_header) {
 557                        wt_status_print_unmerged_header(s);
 558                        shown_header = 1;
 559                }
 560                wt_status_print_unmerged_data(s, it);
 561        }
 562        if (shown_header)
 563                wt_status_print_trailer(s);
 564
 565}
 566
 567static void wt_status_print_updated(struct wt_status *s)
 568{
 569        int shown_header = 0;
 570        int i;
 571
 572        for (i = 0; i < s->change.nr; i++) {
 573                struct wt_status_change_data *d;
 574                struct string_list_item *it;
 575                it = &(s->change.items[i]);
 576                d = it->util;
 577                if (!d->index_status ||
 578                    d->index_status == DIFF_STATUS_UNMERGED)
 579                        continue;
 580                if (!shown_header) {
 581                        wt_status_print_cached_header(s);
 582                        s->commitable = 1;
 583                        shown_header = 1;
 584                }
 585                wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
 586        }
 587        if (shown_header)
 588                wt_status_print_trailer(s);
 589}
 590
 591/*
 592 * -1 : has delete
 593 *  0 : no change
 594 *  1 : some change but no delete
 595 */
 596static int wt_status_check_worktree_changes(struct wt_status *s,
 597                                             int *dirty_submodules)
 598{
 599        int i;
 600        int changes = 0;
 601
 602        *dirty_submodules = 0;
 603
 604        for (i = 0; i < s->change.nr; i++) {
 605                struct wt_status_change_data *d;
 606                d = s->change.items[i].util;
 607                if (!d->worktree_status ||
 608                    d->worktree_status == DIFF_STATUS_UNMERGED)
 609                        continue;
 610                if (!changes)
 611                        changes = 1;
 612                if (d->dirty_submodule)
 613                        *dirty_submodules = 1;
 614                if (d->worktree_status == DIFF_STATUS_DELETED)
 615                        changes = -1;
 616        }
 617        return changes;
 618}
 619
 620static void wt_status_print_changed(struct wt_status *s)
 621{
 622        int i, dirty_submodules;
 623        int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
 624
 625        if (!worktree_changes)
 626                return;
 627
 628        wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
 629
 630        for (i = 0; i < s->change.nr; i++) {
 631                struct wt_status_change_data *d;
 632                struct string_list_item *it;
 633                it = &(s->change.items[i]);
 634                d = it->util;
 635                if (!d->worktree_status ||
 636                    d->worktree_status == DIFF_STATUS_UNMERGED)
 637                        continue;
 638                wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
 639        }
 640        wt_status_print_trailer(s);
 641}
 642
 643static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
 644{
 645        struct child_process sm_summary;
 646        char summary_limit[64];
 647        char index[PATH_MAX];
 648        const char *env[] = { NULL, NULL };
 649        const char *argv[8];
 650
 651        env[0] =        index;
 652        argv[0] =       "submodule";
 653        argv[1] =       "summary";
 654        argv[2] =       uncommitted ? "--files" : "--cached";
 655        argv[3] =       "--for-status";
 656        argv[4] =       "--summary-limit";
 657        argv[5] =       summary_limit;
 658        argv[6] =       uncommitted ? NULL : (s->amend ? "HEAD^" : "HEAD");
 659        argv[7] =       NULL;
 660
 661        sprintf(summary_limit, "%d", s->submodule_summary);
 662        snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
 663
 664        memset(&sm_summary, 0, sizeof(sm_summary));
 665        sm_summary.argv = argv;
 666        sm_summary.env = env;
 667        sm_summary.git_cmd = 1;
 668        sm_summary.no_stdin = 1;
 669        fflush(s->fp);
 670        sm_summary.out = dup(fileno(s->fp));    /* run_command closes it */
 671        run_command(&sm_summary);
 672}
 673
 674static void wt_status_print_other(struct wt_status *s,
 675                                  struct string_list *l,
 676                                  const char *what,
 677                                  const char *how)
 678{
 679        int i;
 680        struct strbuf buf = STRBUF_INIT;
 681        static struct string_list output = STRING_LIST_INIT_DUP;
 682        struct column_options copts;
 683
 684        if (!l->nr)
 685                return;
 686
 687        wt_status_print_other_header(s, what, how);
 688
 689        for (i = 0; i < l->nr; i++) {
 690                struct string_list_item *it;
 691                const char *path;
 692                it = &(l->items[i]);
 693                path = quote_path(it->string, strlen(it->string),
 694                                  &buf, s->prefix);
 695                if (column_active(s->colopts)) {
 696                        string_list_append(&output, path);
 697                        continue;
 698                }
 699                status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 700                status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
 701                                   "%s\n", path);
 702        }
 703
 704        strbuf_release(&buf);
 705        if (!column_active(s->colopts))
 706                return;
 707
 708        strbuf_addf(&buf, "%s#\t%s",
 709                    color(WT_STATUS_HEADER, s),
 710                    color(WT_STATUS_UNTRACKED, s));
 711        memset(&copts, 0, sizeof(copts));
 712        copts.padding = 1;
 713        copts.indent = buf.buf;
 714        if (want_color(s->use_color))
 715                copts.nl = GIT_COLOR_RESET "\n";
 716        print_columns(&output, s->colopts, &copts);
 717        string_list_clear(&output, 0);
 718        strbuf_release(&buf);
 719}
 720
 721static void wt_status_print_verbose(struct wt_status *s)
 722{
 723        struct rev_info rev;
 724        struct setup_revision_opt opt;
 725
 726        init_revisions(&rev, NULL);
 727        DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
 728
 729        memset(&opt, 0, sizeof(opt));
 730        opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 731        setup_revisions(0, NULL, &rev, &opt);
 732
 733        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 734        rev.diffopt.detect_rename = 1;
 735        rev.diffopt.file = s->fp;
 736        rev.diffopt.close_file = 0;
 737        /*
 738         * If we're not going to stdout, then we definitely don't
 739         * want color, since we are going to the commit message
 740         * file (and even the "auto" setting won't work, since it
 741         * will have checked isatty on stdout).
 742         */
 743        if (s->fp != stdout)
 744                rev.diffopt.use_color = 0;
 745        run_diff_index(&rev, 1);
 746}
 747
 748static void wt_status_print_tracking(struct wt_status *s)
 749{
 750        struct strbuf sb = STRBUF_INIT;
 751        const char *cp, *ep;
 752        struct branch *branch;
 753
 754        assert(s->branch && !s->is_initial);
 755        if (prefixcmp(s->branch, "refs/heads/"))
 756                return;
 757        branch = branch_get(s->branch + 11);
 758        if (!format_tracking_info(branch, &sb))
 759                return;
 760
 761        for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
 762                color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
 763                                 "# %.*s", (int)(ep - cp), cp);
 764        color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
 765}
 766
 767static int has_unmerged(struct wt_status *s)
 768{
 769        int i;
 770
 771        for (i = 0; i < s->change.nr; i++) {
 772                struct wt_status_change_data *d;
 773                d = s->change.items[i].util;
 774                if (d->stagemask)
 775                        return 1;
 776        }
 777        return 0;
 778}
 779
 780static void show_merge_in_progress(struct wt_status *s,
 781                                struct wt_status_state *state,
 782                                const char *color)
 783{
 784        if (has_unmerged(s)) {
 785                status_printf_ln(s, color, _("You have unmerged paths."));
 786                if (advice_status_hints)
 787                        status_printf_ln(s, color,
 788                                _("  (fix conflicts and run \"git commit\")"));
 789        } else {
 790                status_printf_ln(s, color,
 791                        _("All conflicts fixed but you are still merging."));
 792                if (advice_status_hints)
 793                        status_printf_ln(s, color,
 794                                _("  (use \"git commit\" to conclude merge)"));
 795        }
 796        wt_status_print_trailer(s);
 797}
 798
 799static void show_am_in_progress(struct wt_status *s,
 800                                struct wt_status_state *state,
 801                                const char *color)
 802{
 803        status_printf_ln(s, color,
 804                _("You are in the middle of an am session."));
 805        if (state->am_empty_patch)
 806                status_printf_ln(s, color,
 807                        _("The current patch is empty."));
 808        if (advice_status_hints) {
 809                if (!state->am_empty_patch)
 810                        status_printf_ln(s, color,
 811                                _("  (fix conflicts and then run \"git am --resolved\")"));
 812                status_printf_ln(s, color,
 813                        _("  (use \"git am --skip\" to skip this patch)"));
 814                status_printf_ln(s, color,
 815                        _("  (use \"git am --abort\" to restore the original branch)"));
 816        }
 817        wt_status_print_trailer(s);
 818}
 819
 820static char *read_line_from_git_path(const char *filename)
 821{
 822        struct strbuf buf = STRBUF_INIT;
 823        FILE *fp = fopen(git_path("%s", filename), "r");
 824        if (!fp) {
 825                strbuf_release(&buf);
 826                return NULL;
 827        }
 828        strbuf_getline(&buf, fp, '\n');
 829        if (!fclose(fp)) {
 830                return strbuf_detach(&buf, NULL);
 831        } else {
 832                strbuf_release(&buf);
 833                return NULL;
 834        }
 835}
 836
 837static int split_commit_in_progress(struct wt_status *s)
 838{
 839        int split_in_progress = 0;
 840        char *head = read_line_from_git_path("HEAD");
 841        char *orig_head = read_line_from_git_path("ORIG_HEAD");
 842        char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
 843        char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
 844
 845        if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
 846            !s->branch || strcmp(s->branch, "HEAD"))
 847                return split_in_progress;
 848
 849        if (!strcmp(rebase_amend, rebase_orig_head)) {
 850                if (strcmp(head, rebase_amend))
 851                        split_in_progress = 1;
 852        } else if (strcmp(orig_head, rebase_orig_head)) {
 853                split_in_progress = 1;
 854        }
 855
 856        if (!s->amend && !s->nowarn && !s->workdir_dirty)
 857                split_in_progress = 0;
 858
 859        free(head);
 860        free(orig_head);
 861        free(rebase_amend);
 862        free(rebase_orig_head);
 863        return split_in_progress;
 864}
 865
 866static void show_rebase_in_progress(struct wt_status *s,
 867                                struct wt_status_state *state,
 868                                const char *color)
 869{
 870        struct stat st;
 871
 872        if (has_unmerged(s)) {
 873                status_printf_ln(s, color, _("You are currently rebasing."));
 874                if (advice_status_hints) {
 875                        status_printf_ln(s, color,
 876                                _("  (fix conflicts and then run \"git rebase --continue\")"));
 877                        status_printf_ln(s, color,
 878                                _("  (use \"git rebase --skip\" to skip this patch)"));
 879                        status_printf_ln(s, color,
 880                                _("  (use \"git rebase --abort\" to check out the original branch)"));
 881                }
 882        } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
 883                status_printf_ln(s, color, _("You are currently rebasing."));
 884                if (advice_status_hints)
 885                        status_printf_ln(s, color,
 886                                _("  (all conflicts fixed: run \"git rebase --continue\")"));
 887        } else if (split_commit_in_progress(s)) {
 888                status_printf_ln(s, color, _("You are currently splitting a commit during a rebase."));
 889                if (advice_status_hints)
 890                        status_printf_ln(s, color,
 891                                _("  (Once your working directory is clean, run \"git rebase --continue\")"));
 892        } else {
 893                status_printf_ln(s, color, _("You are currently editing a commit during a rebase."));
 894                if (advice_status_hints && !s->amend) {
 895                        status_printf_ln(s, color,
 896                                _("  (use \"git commit --amend\" to amend the current commit)"));
 897                        status_printf_ln(s, color,
 898                                _("  (use \"git rebase --continue\" once you are satisfied with your changes)"));
 899                }
 900        }
 901        wt_status_print_trailer(s);
 902}
 903
 904static void show_cherry_pick_in_progress(struct wt_status *s,
 905                                        struct wt_status_state *state,
 906                                        const char *color)
 907{
 908        status_printf_ln(s, color, _("You are currently cherry-picking."));
 909        if (advice_status_hints) {
 910                if (has_unmerged(s))
 911                        status_printf_ln(s, color,
 912                                _("  (fix conflicts and run \"git commit\")"));
 913                else
 914                        status_printf_ln(s, color,
 915                                _("  (all conflicts fixed: run \"git commit\")"));
 916        }
 917        wt_status_print_trailer(s);
 918}
 919
 920static void show_bisect_in_progress(struct wt_status *s,
 921                                struct wt_status_state *state,
 922                                const char *color)
 923{
 924        status_printf_ln(s, color, _("You are currently bisecting."));
 925        if (advice_status_hints)
 926                status_printf_ln(s, color,
 927                        _("  (use \"git bisect reset\" to get back to the original branch)"));
 928        wt_status_print_trailer(s);
 929}
 930
 931static void wt_status_print_state(struct wt_status *s)
 932{
 933        const char *state_color = color(WT_STATUS_HEADER, s);
 934        struct wt_status_state state;
 935        struct stat st;
 936
 937        memset(&state, 0, sizeof(state));
 938
 939        if (!stat(git_path("MERGE_HEAD"), &st)) {
 940                state.merge_in_progress = 1;
 941        } else if (!stat(git_path("rebase-apply"), &st)) {
 942                if (!stat(git_path("rebase-apply/applying"), &st)) {
 943                        state.am_in_progress = 1;
 944                        if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
 945                                state.am_empty_patch = 1;
 946                } else {
 947                        state.rebase_in_progress = 1;
 948                }
 949        } else if (!stat(git_path("rebase-merge"), &st)) {
 950                if (!stat(git_path("rebase-merge/interactive"), &st))
 951                        state.rebase_interactive_in_progress = 1;
 952                else
 953                        state.rebase_in_progress = 1;
 954        } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st)) {
 955                state.cherry_pick_in_progress = 1;
 956        }
 957        if (!stat(git_path("BISECT_LOG"), &st))
 958                state.bisect_in_progress = 1;
 959
 960        if (state.merge_in_progress)
 961                show_merge_in_progress(s, &state, state_color);
 962        else if (state.am_in_progress)
 963                show_am_in_progress(s, &state, state_color);
 964        else if (state.rebase_in_progress || state.rebase_interactive_in_progress)
 965                show_rebase_in_progress(s, &state, state_color);
 966        else if (state.cherry_pick_in_progress)
 967                show_cherry_pick_in_progress(s, &state, state_color);
 968        if (state.bisect_in_progress)
 969                show_bisect_in_progress(s, &state, state_color);
 970}
 971
 972void wt_status_print(struct wt_status *s)
 973{
 974        const char *branch_color = color(WT_STATUS_ONBRANCH, s);
 975        const char *branch_status_color = color(WT_STATUS_HEADER, s);
 976
 977        if (s->branch) {
 978                const char *on_what = _("On branch ");
 979                const char *branch_name = s->branch;
 980                if (!prefixcmp(branch_name, "refs/heads/"))
 981                        branch_name += 11;
 982                else if (!strcmp(branch_name, "HEAD")) {
 983                        branch_name = "";
 984                        branch_status_color = color(WT_STATUS_NOBRANCH, s);
 985                        on_what = _("Not currently on any branch.");
 986                }
 987                status_printf(s, color(WT_STATUS_HEADER, s), "");
 988                status_printf_more(s, branch_status_color, "%s", on_what);
 989                status_printf_more(s, branch_color, "%s\n", branch_name);
 990                if (!s->is_initial)
 991                        wt_status_print_tracking(s);
 992        }
 993
 994        wt_status_print_state(s);
 995        if (s->is_initial) {
 996                status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
 997                status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
 998                status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
 999        }
1000
1001        wt_status_print_updated(s);
1002        wt_status_print_unmerged(s);
1003        wt_status_print_changed(s);
1004        if (s->submodule_summary &&
1005            (!s->ignore_submodule_arg ||
1006             strcmp(s->ignore_submodule_arg, "all"))) {
1007                wt_status_print_submodule_summary(s, 0);  /* staged */
1008                wt_status_print_submodule_summary(s, 1);  /* unstaged */
1009        }
1010        if (s->show_untracked_files) {
1011                wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1012                if (s->show_ignored_files)
1013                        wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1014        } else if (s->commitable)
1015                status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1016                        advice_status_hints
1017                        ? _(" (use -u option to show untracked files)") : "");
1018
1019        if (s->verbose)
1020                wt_status_print_verbose(s);
1021        if (!s->commitable) {
1022                if (s->amend)
1023                        status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1024                else if (s->nowarn)
1025                        ; /* nothing */
1026                else if (s->workdir_dirty) {
1027                        if (advice_status_hints)
1028                                printf(_("no changes added to commit "
1029                                         "(use \"git add\" and/or \"git commit -a\")\n"));
1030                        else
1031                                printf(_("no changes added to commit\n"));
1032                } else if (s->untracked.nr) {
1033                        if (advice_status_hints)
1034                                printf(_("nothing added to commit but untracked files "
1035                                         "present (use \"git add\" to track)\n"));
1036                        else
1037                                printf(_("nothing added to commit but untracked files present\n"));
1038                } else if (s->is_initial) {
1039                        if (advice_status_hints)
1040                                printf(_("nothing to commit (create/copy files "
1041                                         "and use \"git add\" to track)\n"));
1042                        else
1043                                printf(_("nothing to commit\n"));
1044                } else if (!s->show_untracked_files) {
1045                        if (advice_status_hints)
1046                                printf(_("nothing to commit (use -u to show untracked files)\n"));
1047                        else
1048                                printf(_("nothing to commit\n"));
1049                } else
1050                        printf(_("nothing to commit, working directory clean\n"));
1051        }
1052}
1053
1054static void wt_shortstatus_unmerged(struct string_list_item *it,
1055                           struct wt_status *s)
1056{
1057        struct wt_status_change_data *d = it->util;
1058        const char *how = "??";
1059
1060        switch (d->stagemask) {
1061        case 1: how = "DD"; break; /* both deleted */
1062        case 2: how = "AU"; break; /* added by us */
1063        case 3: how = "UD"; break; /* deleted by them */
1064        case 4: how = "UA"; break; /* added by them */
1065        case 5: how = "DU"; break; /* deleted by us */
1066        case 6: how = "AA"; break; /* both added */
1067        case 7: how = "UU"; break; /* both modified */
1068        }
1069        color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1070        if (s->null_termination) {
1071                fprintf(stdout, " %s%c", it->string, 0);
1072        } else {
1073                struct strbuf onebuf = STRBUF_INIT;
1074                const char *one;
1075                one = quote_path(it->string, -1, &onebuf, s->prefix);
1076                printf(" %s\n", one);
1077                strbuf_release(&onebuf);
1078        }
1079}
1080
1081static void wt_shortstatus_status(struct string_list_item *it,
1082                         struct wt_status *s)
1083{
1084        struct wt_status_change_data *d = it->util;
1085
1086        if (d->index_status)
1087                color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1088        else
1089                putchar(' ');
1090        if (d->worktree_status)
1091                color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1092        else
1093                putchar(' ');
1094        putchar(' ');
1095        if (s->null_termination) {
1096                fprintf(stdout, "%s%c", it->string, 0);
1097                if (d->head_path)
1098                        fprintf(stdout, "%s%c", d->head_path, 0);
1099        } else {
1100                struct strbuf onebuf = STRBUF_INIT;
1101                const char *one;
1102                if (d->head_path) {
1103                        one = quote_path(d->head_path, -1, &onebuf, s->prefix);
1104                        if (*one != '"' && strchr(one, ' ') != NULL) {
1105                                putchar('"');
1106                                strbuf_addch(&onebuf, '"');
1107                                one = onebuf.buf;
1108                        }
1109                        printf("%s -> ", one);
1110                        strbuf_release(&onebuf);
1111                }
1112                one = quote_path(it->string, -1, &onebuf, s->prefix);
1113                if (*one != '"' && strchr(one, ' ') != NULL) {
1114                        putchar('"');
1115                        strbuf_addch(&onebuf, '"');
1116                        one = onebuf.buf;
1117                }
1118                printf("%s\n", one);
1119                strbuf_release(&onebuf);
1120        }
1121}
1122
1123static void wt_shortstatus_other(struct string_list_item *it,
1124                                 struct wt_status *s, const char *sign)
1125{
1126        if (s->null_termination) {
1127                fprintf(stdout, "%s %s%c", sign, it->string, 0);
1128        } else {
1129                struct strbuf onebuf = STRBUF_INIT;
1130                const char *one;
1131                one = quote_path(it->string, -1, &onebuf, s->prefix);
1132                color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1133                printf(" %s\n", one);
1134                strbuf_release(&onebuf);
1135        }
1136}
1137
1138static void wt_shortstatus_print_tracking(struct wt_status *s)
1139{
1140        struct branch *branch;
1141        const char *header_color = color(WT_STATUS_HEADER, s);
1142        const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1143        const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1144
1145        const char *base;
1146        const char *branch_name;
1147        int num_ours, num_theirs;
1148
1149        color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1150
1151        if (!s->branch)
1152                return;
1153        branch_name = s->branch;
1154
1155        if (!prefixcmp(branch_name, "refs/heads/"))
1156                branch_name += 11;
1157        else if (!strcmp(branch_name, "HEAD")) {
1158                branch_name = _("HEAD (no branch)");
1159                branch_color_local = color(WT_STATUS_NOBRANCH, s);
1160        }
1161
1162        branch = branch_get(s->branch + 11);
1163        if (s->is_initial)
1164                color_fprintf(s->fp, header_color, _("Initial commit on "));
1165        if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
1166                color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1167                fputc(s->null_termination ? '\0' : '\n', s->fp);
1168                return;
1169        }
1170
1171        base = branch->merge[0]->dst;
1172        base = shorten_unambiguous_ref(base, 0);
1173        color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1174        color_fprintf(s->fp, header_color, "...");
1175        color_fprintf(s->fp, branch_color_remote, "%s", base);
1176
1177        color_fprintf(s->fp, header_color, " [");
1178        if (!num_ours) {
1179                color_fprintf(s->fp, header_color, _("behind "));
1180                color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1181        } else if (!num_theirs) {
1182                color_fprintf(s->fp, header_color, _("ahead "));
1183                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1184        } else {
1185                color_fprintf(s->fp, header_color, _("ahead "));
1186                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1187                color_fprintf(s->fp, header_color, _(", behind "));
1188                color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1189        }
1190
1191        color_fprintf(s->fp, header_color, "]");
1192        fputc(s->null_termination ? '\0' : '\n', s->fp);
1193}
1194
1195void wt_shortstatus_print(struct wt_status *s)
1196{
1197        int i;
1198
1199        if (s->show_branch)
1200                wt_shortstatus_print_tracking(s);
1201
1202        for (i = 0; i < s->change.nr; i++) {
1203                struct wt_status_change_data *d;
1204                struct string_list_item *it;
1205
1206                it = &(s->change.items[i]);
1207                d = it->util;
1208                if (d->stagemask)
1209                        wt_shortstatus_unmerged(it, s);
1210                else
1211                        wt_shortstatus_status(it, s);
1212        }
1213        for (i = 0; i < s->untracked.nr; i++) {
1214                struct string_list_item *it;
1215
1216                it = &(s->untracked.items[i]);
1217                wt_shortstatus_other(it, s, "??");
1218        }
1219        for (i = 0; i < s->ignored.nr; i++) {
1220                struct string_list_item *it;
1221
1222                it = &(s->ignored.items[i]);
1223                wt_shortstatus_other(it, s, "!!");
1224        }
1225}
1226
1227void wt_porcelain_print(struct wt_status *s)
1228{
1229        s->use_color = 0;
1230        s->relative_paths = 0;
1231        s->prefix = NULL;
1232        wt_shortstatus_print(s);
1233}