wt-status.c

   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
  17 static 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
  29 static 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
  39 static 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, comment_line_char);
  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, comment_line_char);
  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
  83 void 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
  93 void 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
 103 static 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
 113 void 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
 132 static 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
 184 static 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
 200 static 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
 219 static 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
 231 static 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
 238 static 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
 261 static 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;
 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         default:
 296                 die("BUG: unhandled change_type %d in wt_status_print_change_data",
 297                     change_type);
 298         }
 299
 300         one = quote_path(one_name, -1, &onebuf, s->prefix);
 301         two = quote_path(two_name, -1, &twobuf, s->prefix);
 302
 303         status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 304         switch (status) {
 305         case DIFF_STATUS_ADDED:
 306                 status_printf_more(s, c, _("new file:   %s"), one);
 307                 break;
 308         case DIFF_STATUS_COPIED:
 309                 status_printf_more(s, c, _("copied:     %s -> %s"), one, two);
 310                 break;
 311         case DIFF_STATUS_DELETED:
 312                 status_printf_more(s, c, _("deleted:    %s"), one);
 313                 break;
 314         case DIFF_STATUS_MODIFIED:
 315                 status_printf_more(s, c, _("modified:   %s"), one);
 316                 break;
 317         case DIFF_STATUS_RENAMED:
 318                 status_printf_more(s, c, _("renamed:    %s -> %s"), one, two);
 319                 break;
 320         case DIFF_STATUS_TYPE_CHANGED:
 321                 status_printf_more(s, c, _("typechange: %s"), one);
 322                 break;
 323         case DIFF_STATUS_UNKNOWN:
 324                 status_printf_more(s, c, _("unknown:    %s"), one);
 325                 break;
 326         case DIFF_STATUS_UNMERGED:
 327                 status_printf_more(s, c, _("unmerged:   %s"), one);
 328                 break;
 329         default:
 330                 die(_("bug: unhandled diff status %c"), status);
 331         }
 332         if (extra.len) {
 333                 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
 334                 strbuf_release(&extra);
 335         }
 336         status_printf_more(s, GIT_COLOR_NORMAL, "\n");
 337         strbuf_release(&onebuf);
 338         strbuf_release(&twobuf);
 339 }
 340
 341 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
 342                                          struct diff_options *options,
 343                                          void *data)
 344 {
 345         struct wt_status *s = data;
 346         int i;
 347
 348         if (!q->nr)
 349                 return;
 350         s->workdir_dirty = 1;
 351         for (i = 0; i < q->nr; i++) {
 352                 struct diff_filepair *p;
 353                 struct string_list_item *it;
 354                 struct wt_status_change_data *d;
 355
 356                 p = q->queue[i];
 357                 it = string_list_insert(&s->change, p->one->path);
 358                 d = it->util;
 359                 if (!d) {
 360                         d = xcalloc(1, sizeof(*d));
 361                         it->util = d;
 362                 }
 363                 if (!d->worktree_status)
 364                         d->worktree_status = p->status;
 365                 d->dirty_submodule = p->two->dirty_submodule;
 366                 if (S_ISGITLINK(p->two->mode))
 367                         d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
 368         }
 369 }
 370
 371 static int unmerged_mask(const char *path)
 372 {
 373         int pos, mask;
 374         struct cache_entry *ce;
 375
 376         pos = cache_name_pos(path, strlen(path));
 377         if (0 <= pos)
 378                 return 0;
 379
 380         mask = 0;
 381         pos = -pos-1;
 382         while (pos < active_nr) {
 383                 ce = active_cache[pos++];
 384                 if (strcmp(ce->name, path) || !ce_stage(ce))
 385                         break;
 386                 mask |= (1 << (ce_stage(ce) - 1));
 387         }
 388         return mask;
 389 }
 390
 391 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
 392                                          struct diff_options *options,
 393                                          void *data)
 394 {
 395         struct wt_status *s = data;
 396         int i;
 397
 398         for (i = 0; i < q->nr; i++) {
 399                 struct diff_filepair *p;
 400                 struct string_list_item *it;
 401                 struct wt_status_change_data *d;
 402
 403                 p = q->queue[i];
 404                 it = string_list_insert(&s->change, p->two->path);
 405                 d = it->util;
 406                 if (!d) {
 407                         d = xcalloc(1, sizeof(*d));
 408                         it->util = d;
 409                 }
 410                 if (!d->index_status)
 411                         d->index_status = p->status;
 412                 switch (p->status) {
 413                 case DIFF_STATUS_COPIED:
 414                 case DIFF_STATUS_RENAMED:
 415                         d->head_path = xstrdup(p->one->path);
 416                         break;
 417                 case DIFF_STATUS_UNMERGED:
 418                         d->stagemask = unmerged_mask(p->two->path);
 419                         break;
 420                 }
 421         }
 422 }
 423
 424 static void wt_status_collect_changes_worktree(struct wt_status *s)
 425 {
 426         struct rev_info rev;
 427
 428         init_revisions(&rev, NULL);
 429         setup_revisions(0, NULL, &rev, NULL);
 430         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 431         DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
 432         if (!s->show_untracked_files)
 433                 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
 434         if (s->ignore_submodule_arg) {
 435                 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 436                 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 437         }
 438         rev.diffopt.format_callback = wt_status_collect_changed_cb;
 439         rev.diffopt.format_callback_data = s;
 440         init_pathspec(&rev.prune_data, s->pathspec);
 441         run_diff_files(&rev, 0);
 442 }
 443
 444 static void wt_status_collect_changes_index(struct wt_status *s)
 445 {
 446         struct rev_info rev;
 447         struct setup_revision_opt opt;
 448
 449         init_revisions(&rev, NULL);
 450         memset(&opt, 0, sizeof(opt));
 451         opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 452         setup_revisions(0, NULL, &rev, &opt);
 453
 454         if (s->ignore_submodule_arg) {
 455                 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 456                 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 457         }
 458
 459         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 460         rev.diffopt.format_callback = wt_status_collect_updated_cb;
 461         rev.diffopt.format_callback_data = s;
 462         rev.diffopt.detect_rename = 1;
 463         rev.diffopt.rename_limit = 200;
 464         rev.diffopt.break_opt = 0;
 465         init_pathspec(&rev.prune_data, s->pathspec);
 466         run_diff_index(&rev, 1);
 467 }
 468
 469 static void wt_status_collect_changes_initial(struct wt_status *s)
 470 {
 471         struct pathspec pathspec;
 472         int i;
 473
 474         init_pathspec(&pathspec, s->pathspec);
 475         for (i = 0; i < active_nr; i++) {
 476                 struct string_list_item *it;
 477                 struct wt_status_change_data *d;
 478                 struct cache_entry *ce = active_cache[i];
 479
 480                 if (!ce_path_match(ce, &pathspec))
 481                         continue;
 482                 it = string_list_insert(&s->change, ce->name);
 483                 d = it->util;
 484                 if (!d) {
 485                         d = xcalloc(1, sizeof(*d));
 486                         it->util = d;
 487                 }
 488                 if (ce_stage(ce)) {
 489                         d->index_status = DIFF_STATUS_UNMERGED;
 490                         d->stagemask |= (1 << (ce_stage(ce) - 1));
 491                 }
 492                 else
 493                         d->index_status = DIFF_STATUS_ADDED;
 494         }
 495         free_pathspec(&pathspec);
 496 }
 497
 498 static void wt_status_collect_untracked(struct wt_status *s)
 499 {
 500         int i;
 501         struct dir_struct dir;
 502         struct timeval t_begin;
 503
 504         if (!s->show_untracked_files)
 505                 return;
 506
 507         if (advice_status_u_option)
 508                 gettimeofday(&t_begin, NULL);
 509
 510         memset(&dir, 0, sizeof(dir));
 511         if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
 512                 dir.flags |=
 513                         DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
 514         setup_standard_excludes(&dir);
 515
 516         fill_directory(&dir, s->pathspec);
 517         for (i = 0; i < dir.nr; i++) {
 518                 struct dir_entry *ent = dir.entries[i];
 519                 if (cache_name_is_other(ent->name, ent->len) &&
 520                     match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
 521                         string_list_insert(&s->untracked, ent->name);
 522                 free(ent);
 523         }
 524
 525         if (s->show_ignored_files) {
 526                 dir.nr = 0;
 527                 dir.flags = DIR_SHOW_IGNORED;
 528                 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
 529                         dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
 530                 fill_directory(&dir, s->pathspec);
 531                 for (i = 0; i < dir.nr; i++) {
 532                         struct dir_entry *ent = dir.entries[i];
 533                         if (cache_name_is_other(ent->name, ent->len) &&
 534                             match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
 535                                 string_list_insert(&s->ignored, ent->name);
 536                         free(ent);
 537                 }
 538         }
 539
 540         free(dir.entries);
 541
 542         if (advice_status_u_option) {
 543                 struct timeval t_end;
 544                 gettimeofday(&t_end, NULL);
 545                 s->untracked_in_ms =
 546                         (uint64_t)t_end.tv_sec * 1000 + t_end.tv_usec / 1000 -
 547                         ((uint64_t)t_begin.tv_sec * 1000 + t_begin.tv_usec / 1000);
 548         }
 549 }
 550
 551 void wt_status_collect(struct wt_status *s)
 552 {
 553         wt_status_collect_changes_worktree(s);
 554
 555         if (s->is_initial)
 556                 wt_status_collect_changes_initial(s);
 557         else
 558                 wt_status_collect_changes_index(s);
 559         wt_status_collect_untracked(s);
 560 }
 561
 562 static void wt_status_print_unmerged(struct wt_status *s)
 563 {
 564         int shown_header = 0;
 565         int i;
 566
 567         for (i = 0; i < s->change.nr; i++) {
 568                 struct wt_status_change_data *d;
 569                 struct string_list_item *it;
 570                 it = &(s->change.items[i]);
 571                 d = it->util;
 572                 if (!d->stagemask)
 573                         continue;
 574                 if (!shown_header) {
 575                         wt_status_print_unmerged_header(s);
 576                         shown_header = 1;
 577                 }
 578                 wt_status_print_unmerged_data(s, it);
 579         }
 580         if (shown_header)
 581                 wt_status_print_trailer(s);
 582
 583 }
 584
 585 static void wt_status_print_updated(struct wt_status *s)
 586 {
 587         int shown_header = 0;
 588         int i;
 589
 590         for (i = 0; i < s->change.nr; i++) {
 591                 struct wt_status_change_data *d;
 592                 struct string_list_item *it;
 593                 it = &(s->change.items[i]);
 594                 d = it->util;
 595                 if (!d->index_status ||
 596                     d->index_status == DIFF_STATUS_UNMERGED)
 597                         continue;
 598                 if (!shown_header) {
 599                         wt_status_print_cached_header(s);
 600                         s->commitable = 1;
 601                         shown_header = 1;
 602                 }
 603                 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
 604         }
 605         if (shown_header)
 606                 wt_status_print_trailer(s);
 607 }
 608
 609 /*
 610  * -1 : has delete
 611  *  0 : no change
 612  *  1 : some change but no delete
 613  */
 614 static int wt_status_check_worktree_changes(struct wt_status *s,
 615                                              int *dirty_submodules)
 616 {
 617         int i;
 618         int changes = 0;
 619
 620         *dirty_submodules = 0;
 621
 622         for (i = 0; i < s->change.nr; i++) {
 623                 struct wt_status_change_data *d;
 624                 d = s->change.items[i].util;
 625                 if (!d->worktree_status ||
 626                     d->worktree_status == DIFF_STATUS_UNMERGED)
 627                         continue;
 628                 if (!changes)
 629                         changes = 1;
 630                 if (d->dirty_submodule)
 631                         *dirty_submodules = 1;
 632                 if (d->worktree_status == DIFF_STATUS_DELETED)
 633                         changes = -1;
 634         }
 635         return changes;
 636 }
 637
 638 static void wt_status_print_changed(struct wt_status *s)
 639 {
 640         int i, dirty_submodules;
 641         int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
 642
 643         if (!worktree_changes)
 644                 return;
 645
 646         wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
 647
 648         for (i = 0; i < s->change.nr; i++) {
 649                 struct wt_status_change_data *d;
 650                 struct string_list_item *it;
 651                 it = &(s->change.items[i]);
 652                 d = it->util;
 653                 if (!d->worktree_status ||
 654                     d->worktree_status == DIFF_STATUS_UNMERGED)
 655                         continue;
 656                 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
 657         }
 658         wt_status_print_trailer(s);
 659 }
 660
 661 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
 662 {
 663         struct child_process sm_summary;
 664         char summary_limit[64];
 665         char index[PATH_MAX];
 666         const char *env[] = { NULL, NULL };
 667         const char *argv[8];
 668
 669         env[0] =        index;
 670         argv[0] =       "submodule";
 671         argv[1] =       "summary";
 672         argv[2] =       uncommitted ? "--files" : "--cached";
 673         argv[3] =       "--for-status";
 674         argv[4] =       "--summary-limit";
 675         argv[5] =       summary_limit;
 676         argv[6] =       uncommitted ? NULL : (s->amend ? "HEAD^" : "HEAD");
 677         argv[7] =       NULL;
 678
 679         sprintf(summary_limit, "%d", s->submodule_summary);
 680         snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
 681
 682         memset(&sm_summary, 0, sizeof(sm_summary));
 683         sm_summary.argv = argv;
 684         sm_summary.env = env;
 685         sm_summary.git_cmd = 1;
 686         sm_summary.no_stdin = 1;
 687         fflush(s->fp);
 688         sm_summary.out = dup(fileno(s->fp));    /* run_command closes it */
 689         run_command(&sm_summary);
 690 }
 691
 692 static void wt_status_print_other(struct wt_status *s,
 693                                   struct string_list *l,
 694                                   const char *what,
 695                                   const char *how)
 696 {
 697         int i;
 698         struct strbuf buf = STRBUF_INIT;
 699         static struct string_list output = STRING_LIST_INIT_DUP;
 700         struct column_options copts;
 701
 702         if (!l->nr)
 703                 return;
 704
 705         wt_status_print_other_header(s, what, how);
 706
 707         for (i = 0; i < l->nr; i++) {
 708                 struct string_list_item *it;
 709                 const char *path;
 710                 it = &(l->items[i]);
 711                 path = quote_path(it->string, strlen(it->string),
 712                                   &buf, s->prefix);
 713                 if (column_active(s->colopts)) {
 714                         string_list_append(&output, path);
 715                         continue;
 716                 }
 717                 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 718                 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
 719                                    "%s\n", path);
 720         }
 721
 722         strbuf_release(&buf);
 723         if (!column_active(s->colopts))
 724                 return;
 725
 726         strbuf_addf(&buf, "%s#\t%s",
 727                     color(WT_STATUS_HEADER, s),
 728                     color(WT_STATUS_UNTRACKED, s));
 729         memset(&copts, 0, sizeof(copts));
 730         copts.padding = 1;
 731         copts.indent = buf.buf;
 732         if (want_color(s->use_color))
 733                 copts.nl = GIT_COLOR_RESET "\n";
 734         print_columns(&output, s->colopts, &copts);
 735         string_list_clear(&output, 0);
 736         strbuf_release(&buf);
 737 }
 738
 739 static void wt_status_print_verbose(struct wt_status *s)
 740 {
 741         struct rev_info rev;
 742         struct setup_revision_opt opt;
 743
 744         init_revisions(&rev, NULL);
 745         DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
 746
 747         memset(&opt, 0, sizeof(opt));
 748         opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 749         setup_revisions(0, NULL, &rev, &opt);
 750
 751         rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 752         rev.diffopt.detect_rename = 1;
 753         rev.diffopt.file = s->fp;
 754         rev.diffopt.close_file = 0;
 755         /*
 756          * If we're not going to stdout, then we definitely don't
 757          * want color, since we are going to the commit message
 758          * file (and even the "auto" setting won't work, since it
 759          * will have checked isatty on stdout).
 760          */
 761         if (s->fp != stdout)
 762                 rev.diffopt.use_color = 0;
 763         run_diff_index(&rev, 1);
 764 }
 765
 766 static void wt_status_print_tracking(struct wt_status *s)
 767 {
 768         struct strbuf sb = STRBUF_INIT;
 769         const char *cp, *ep;
 770         struct branch *branch;
 771
 772         assert(s->branch && !s->is_initial);
 773         if (prefixcmp(s->branch, "refs/heads/"))
 774                 return;
 775         branch = branch_get(s->branch + 11);
 776         if (!format_tracking_info(branch, &sb))
 777                 return;
 778
 779         for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
 780                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
 781                                  "%c %.*s", comment_line_char,
 782                                  (int)(ep - cp), cp);
 783         color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
 784                          comment_line_char);
 785 }
 786
 787 static int has_unmerged(struct wt_status *s)
 788 {
 789         int i;
 790
 791         for (i = 0; i < s->change.nr; i++) {
 792                 struct wt_status_change_data *d;
 793                 d = s->change.items[i].util;
 794                 if (d->stagemask)
 795                         return 1;
 796         }
 797         return 0;
 798 }
 799
 800 static void show_merge_in_progress(struct wt_status *s,
 801                                 struct wt_status_state *state,
 802                                 const char *color)
 803 {
 804         if (has_unmerged(s)) {
 805                 status_printf_ln(s, color, _("You have unmerged paths."));
 806                 if (advice_status_hints)
 807                         status_printf_ln(s, color,
 808                                 _("  (fix conflicts and run \"git commit\")"));
 809         } else {
 810                 status_printf_ln(s, color,
 811                         _("All conflicts fixed but you are still merging."));
 812                 if (advice_status_hints)
 813                         status_printf_ln(s, color,
 814                                 _("  (use \"git commit\" to conclude merge)"));
 815         }
 816         wt_status_print_trailer(s);
 817 }
 818
 819 static void show_am_in_progress(struct wt_status *s,
 820                                 struct wt_status_state *state,
 821                                 const char *color)
 822 {
 823         status_printf_ln(s, color,
 824                 _("You are in the middle of an am session."));
 825         if (state->am_empty_patch)
 826                 status_printf_ln(s, color,
 827                         _("The current patch is empty."));
 828         if (advice_status_hints) {
 829                 if (!state->am_empty_patch)
 830                         status_printf_ln(s, color,
 831                                 _("  (fix conflicts and then run \"git am --resolved\")"));
 832                 status_printf_ln(s, color,
 833                         _("  (use \"git am --skip\" to skip this patch)"));
 834                 status_printf_ln(s, color,
 835                         _("  (use \"git am --abort\" to restore the original branch)"));
 836         }
 837         wt_status_print_trailer(s);
 838 }
 839
 840 static char *read_line_from_git_path(const char *filename)
 841 {
 842         struct strbuf buf = STRBUF_INIT;
 843         FILE *fp = fopen(git_path("%s", filename), "r");
 844         if (!fp) {
 845                 strbuf_release(&buf);
 846                 return NULL;
 847         }
 848         strbuf_getline(&buf, fp, '\n');
 849         if (!fclose(fp)) {
 850                 return strbuf_detach(&buf, NULL);
 851         } else {
 852                 strbuf_release(&buf);
 853                 return NULL;
 854         }
 855 }
 856
 857 static int split_commit_in_progress(struct wt_status *s)
 858 {
 859         int split_in_progress = 0;
 860         char *head = read_line_from_git_path("HEAD");
 861         char *orig_head = read_line_from_git_path("ORIG_HEAD");
 862         char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
 863         char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
 864
 865         if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
 866             !s->branch || strcmp(s->branch, "HEAD"))
 867                 return split_in_progress;
 868
 869         if (!strcmp(rebase_amend, rebase_orig_head)) {
 870                 if (strcmp(head, rebase_amend))
 871                         split_in_progress = 1;
 872         } else if (strcmp(orig_head, rebase_orig_head)) {
 873                 split_in_progress = 1;
 874         }
 875
 876         if (!s->amend && !s->nowarn && !s->workdir_dirty)
 877                 split_in_progress = 0;
 878
 879         free(head);
 880         free(orig_head);
 881         free(rebase_amend);
 882         free(rebase_orig_head);
 883         return split_in_progress;
 884 }
 885
 886 static void show_rebase_in_progress(struct wt_status *s,
 887                                 struct wt_status_state *state,
 888                                 const char *color)
 889 {
 890         struct stat st;
 891
 892         if (has_unmerged(s)) {
 893                 if (state->branch)
 894                         status_printf_ln(s, color,
 895                                          _("You are currently rebasing branch '%s' on '%s'."),
 896                                          state->branch,
 897                                          state->onto);
 898                 else
 899                         status_printf_ln(s, color,
 900                                          _("You are currently rebasing."));
 901                 if (advice_status_hints) {
 902                         status_printf_ln(s, color,
 903                                 _("  (fix conflicts and then run \"git rebase --continue\")"));
 904                         status_printf_ln(s, color,
 905                                 _("  (use \"git rebase --skip\" to skip this patch)"));
 906                         status_printf_ln(s, color,
 907                                 _("  (use \"git rebase --abort\" to check out the original branch)"));
 908                 }
 909         } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
 910                 if (state->branch)
 911                         status_printf_ln(s, color,
 912                                          _("You are currently rebasing branch '%s' on '%s'."),
 913                                          state->branch,
 914                                          state->onto);
 915                 else
 916                         status_printf_ln(s, color,
 917                                          _("You are currently rebasing."));
 918                 if (advice_status_hints)
 919                         status_printf_ln(s, color,
 920                                 _("  (all conflicts fixed: run \"git rebase --continue\")"));
 921         } else if (split_commit_in_progress(s)) {
 922                 if (state->branch)
 923                         status_printf_ln(s, color,
 924                                          _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
 925                                          state->branch,
 926                                          state->onto);
 927                 else
 928                         status_printf_ln(s, color,
 929                                          _("You are currently splitting a commit during a rebase."));
 930                 if (advice_status_hints)
 931                         status_printf_ln(s, color,
 932                                 _("  (Once your working directory is clean, run \"git rebase --continue\")"));
 933         } else {
 934                 if (state->branch)
 935                         status_printf_ln(s, color,
 936                                          _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
 937                                          state->branch,
 938                                          state->onto);
 939                 else
 940                         status_printf_ln(s, color,
 941                                          _("You are currently editing a commit during a rebase."));
 942                 if (advice_status_hints && !s->amend) {
 943                         status_printf_ln(s, color,
 944                                 _("  (use \"git commit --amend\" to amend the current commit)"));
 945                         status_printf_ln(s, color,
 946                                 _("  (use \"git rebase --continue\" once you are satisfied with your changes)"));
 947                 }
 948         }
 949         wt_status_print_trailer(s);
 950 }
 951
 952 static void show_cherry_pick_in_progress(struct wt_status *s,
 953                                         struct wt_status_state *state,
 954                                         const char *color)
 955 {
 956         status_printf_ln(s, color, _("You are currently cherry-picking."));
 957         if (advice_status_hints) {
 958                 if (has_unmerged(s))
 959                         status_printf_ln(s, color,
 960                                 _("  (fix conflicts and run \"git commit\")"));
 961                 else
 962                         status_printf_ln(s, color,
 963                                 _("  (all conflicts fixed: run \"git commit\")"));
 964         }
 965         wt_status_print_trailer(s);
 966 }
 967
 968 static void show_revert_in_progress(struct wt_status *s,
 969                                         struct wt_status_state *state,
 970                                         const char *color)
 971 {
 972         status_printf_ln(s, color, _("You are currently reverting commit %s."),
 973                          find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
 974         if (advice_status_hints) {
 975                 if (has_unmerged(s))
 976                         status_printf_ln(s, color,
 977                                 _("  (fix conflicts and run \"git revert --continue\")"));
 978                 else
 979                         status_printf_ln(s, color,
 980                                 _("  (all conflicts fixed: run \"git revert --continue\")"));
 981                 status_printf_ln(s, color,
 982                         _("  (use \"git revert --abort\" to cancel the revert operation)"));
 983         }
 984         wt_status_print_trailer(s);
 985 }
 986
 987 static void show_bisect_in_progress(struct wt_status *s,
 988                                 struct wt_status_state *state,
 989                                 const char *color)
 990 {
 991         if (state->branch)
 992                 status_printf_ln(s, color,
 993                                  _("You are currently bisecting, started from branch '%s'."),
 994                                  state->branch);
 995         else
 996                 status_printf_ln(s, color,
 997                                  _("You are currently bisecting."));
 998         if (advice_status_hints)
 999                 status_printf_ln(s, color,
1000                         _("  (use \"git bisect reset\" to get back to the original branch)"));
1001         wt_status_print_trailer(s);
1002 }
1003
1004 /*
1005  * Extract branch information from rebase/bisect
1006  */
1007 static char *read_and_strip_branch(const char *path)
1008 {
1009         struct strbuf sb = STRBUF_INIT;
1010         unsigned char sha1[20];
1011
1012         if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
1013                 goto got_nothing;
1014
1015         while (&sb.len && sb.buf[sb.len - 1] == '\n')
1016                 strbuf_setlen(&sb, sb.len - 1);
1017         if (!sb.len)
1018                 goto got_nothing;
1019         if (!prefixcmp(sb.buf, "refs/heads/"))
1020                 strbuf_remove(&sb,0, strlen("refs/heads/"));
1021         else if (!prefixcmp(sb.buf, "refs/"))
1022                 ;
1023         else if (!get_sha1_hex(sb.buf, sha1)) {
1024                 const char *abbrev;
1025                 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1026                 strbuf_reset(&sb);
1027                 strbuf_addstr(&sb, abbrev);
1028         } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1029                 goto got_nothing;
1030         else                    /* bisect */
1031                 ;
1032         return strbuf_detach(&sb, NULL);
1033
1034 got_nothing:
1035         strbuf_release(&sb);
1036         return NULL;
1037 }
1038
1039 struct grab_1st_switch_cbdata {
1040         int found;
1041         struct strbuf buf;
1042         unsigned char nsha1[20];
1043 };
1044
1045 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1046                            const char *email, unsigned long timestamp, int tz,
1047                            const char *message, void *cb_data)
1048 {
1049         struct grab_1st_switch_cbdata *cb = cb_data;
1050         const char *target = NULL, *end;
1051
1052         if (prefixcmp(message, "checkout: moving from "))
1053                 return 0;
1054         message += strlen("checkout: moving from ");
1055         target = strstr(message, " to ");
1056         if (!target)
1057                 return 0;
1058         target += strlen(" to ");
1059         strbuf_reset(&cb->buf);
1060         hashcpy(cb->nsha1, nsha1);
1061         for (end = target; *end && *end != '\n'; end++)
1062                 ;
1063         strbuf_add(&cb->buf, target, end - target);
1064         cb->found = 1;
1065         return 1;
1066 }
1067
1068 static void wt_status_get_detached_from(struct wt_status_state *state)
1069 {
1070         struct grab_1st_switch_cbdata cb;
1071         struct commit *commit;
1072         unsigned char sha1[20];
1073         char *ref = NULL;
1074
1075         strbuf_init(&cb.buf, 0);
1076         if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1077                 strbuf_release(&cb.buf);
1078                 return;
1079         }
1080
1081         if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1082             /* sha1 is a commit? match without further lookup */
1083             (!hashcmp(cb.nsha1, sha1) ||
1084              /* perhaps sha1 is a tag, try to dereference to a commit */
1085              ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1086               !hashcmp(cb.nsha1, commit->object.sha1)))) {
1087                 int ofs;
1088                 if (!prefixcmp(ref, "refs/tags/"))
1089                         ofs = strlen("refs/tags/");
1090                 else if (!prefixcmp(ref, "refs/remotes/"))
1091                         ofs = strlen("refs/remotes/");
1092                 else
1093                         ofs = 0;
1094                 state->detached_from = xstrdup(ref + ofs);
1095         } else
1096                 state->detached_from =
1097                         xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1098         hashcpy(state->detached_sha1, cb.nsha1);
1099
1100         free(ref);
1101         strbuf_release(&cb.buf);
1102 }
1103
1104 void wt_status_get_state(struct wt_status_state *state,
1105                          int get_detached_from)
1106 {
1107         struct stat st;
1108         unsigned char sha1[20];
1109
1110         if (!stat(git_path("MERGE_HEAD"), &st)) {
1111                 state->merge_in_progress = 1;
1112         } else if (!stat(git_path("rebase-apply"), &st)) {
1113                 if (!stat(git_path("rebase-apply/applying"), &st)) {
1114                         state->am_in_progress = 1;
1115                         if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
1116                                 state->am_empty_patch = 1;
1117                 } else {
1118                         state->rebase_in_progress = 1;
1119                         state->branch = read_and_strip_branch("rebase-apply/head-name");
1120                         state->onto = read_and_strip_branch("rebase-apply/onto");
1121                 }
1122         } else if (!stat(git_path("rebase-merge"), &st)) {
1123                 if (!stat(git_path("rebase-merge/interactive"), &st))
1124                         state->rebase_interactive_in_progress = 1;
1125                 else
1126                         state->rebase_in_progress = 1;
1127                 state->branch = read_and_strip_branch("rebase-merge/head-name");
1128                 state->onto = read_and_strip_branch("rebase-merge/onto");
1129         } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st)) {
1130                 state->cherry_pick_in_progress = 1;
1131         }
1132         if (!stat(git_path("BISECT_LOG"), &st)) {
1133                 state->bisect_in_progress = 1;
1134                 state->branch = read_and_strip_branch("BISECT_START");
1135         }
1136         if (!stat(git_path("REVERT_HEAD"), &st) &&
1137             !get_sha1("REVERT_HEAD", sha1)) {
1138                 state->revert_in_progress = 1;
1139                 hashcpy(state->revert_head_sha1, sha1);
1140         }
1141
1142         if (get_detached_from)
1143                 wt_status_get_detached_from(state);
1144 }
1145
1146 static void wt_status_print_state(struct wt_status *s,
1147                                   struct wt_status_state *state)
1148 {
1149         const char *state_color = color(WT_STATUS_HEADER, s);
1150         if (state->merge_in_progress)
1151                 show_merge_in_progress(s, state, state_color);
1152         else if (state->am_in_progress)
1153                 show_am_in_progress(s, state, state_color);
1154         else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1155                 show_rebase_in_progress(s, state, state_color);
1156         else if (state->cherry_pick_in_progress)
1157                 show_cherry_pick_in_progress(s, state, state_color);
1158         else if (state->revert_in_progress)
1159                 show_revert_in_progress(s, state, state_color);
1160         if (state->bisect_in_progress)
1161                 show_bisect_in_progress(s, state, state_color);
1162 }
1163
1164 void wt_status_print(struct wt_status *s)
1165 {
1166         const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1167         const char *branch_status_color = color(WT_STATUS_HEADER, s);
1168         struct wt_status_state state;
1169
1170         memset(&state, 0, sizeof(state));
1171         wt_status_get_state(&state,
1172                             s->branch && !strcmp(s->branch, "HEAD"));
1173
1174         if (s->branch) {
1175                 const char *on_what = _("On branch ");
1176                 const char *branch_name = s->branch;
1177                 if (!prefixcmp(branch_name, "refs/heads/"))
1178                         branch_name += 11;
1179                 else if (!strcmp(branch_name, "HEAD")) {
1180                         branch_status_color = color(WT_STATUS_NOBRANCH, s);
1181                         if (state.detached_from) {
1182                                 unsigned char sha1[20];
1183                                 branch_name = state.detached_from;
1184                                 if (!get_sha1("HEAD", sha1) &&
1185                                     !hashcmp(sha1, state.detached_sha1))
1186                                         on_what = _("HEAD detached at ");
1187                                 else
1188                                         on_what = _("HEAD detached from ");
1189                         } else {
1190                                 branch_name = "";
1191                                 on_what = _("Not currently on any branch.");
1192                         }
1193                 }
1194                 status_printf(s, color(WT_STATUS_HEADER, s), "");
1195                 status_printf_more(s, branch_status_color, "%s", on_what);
1196                 status_printf_more(s, branch_color, "%s\n", branch_name);
1197                 if (!s->is_initial)
1198                         wt_status_print_tracking(s);
1199         }
1200
1201         wt_status_print_state(s, &state);
1202         free(state.branch);
1203         free(state.onto);
1204         free(state.detached_from);
1205
1206         if (s->is_initial) {
1207                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
1208                 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1209                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
1210         }
1211
1212         wt_status_print_updated(s);
1213         wt_status_print_unmerged(s);
1214         wt_status_print_changed(s);
1215         if (s->submodule_summary &&
1216             (!s->ignore_submodule_arg ||
1217              strcmp(s->ignore_submodule_arg, "all"))) {
1218                 wt_status_print_submodule_summary(s, 0);  /* staged */
1219                 wt_status_print_submodule_summary(s, 1);  /* unstaged */
1220         }
1221         if (s->show_untracked_files) {
1222                 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1223                 if (s->show_ignored_files)
1224                         wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1225                 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1226                         status_printf_ln(s, GIT_COLOR_NORMAL, "");
1227                         status_printf_ln(s, GIT_COLOR_NORMAL,
1228                                          _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1229                                            "may speed it up, but you have to be careful not to forget to add\n"
1230                                            "new files yourself (see 'git help status')."),
1231                                          s->untracked_in_ms / 1000.0);
1232                 }
1233         } else if (s->commitable)
1234                 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1235                         advice_status_hints
1236                         ? _(" (use -u option to show untracked files)") : "");
1237
1238         if (s->verbose)
1239                 wt_status_print_verbose(s);
1240         if (!s->commitable) {
1241                 if (s->amend)
1242                         status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1243                 else if (s->nowarn)
1244                         ; /* nothing */
1245                 else if (s->workdir_dirty) {
1246                         if (advice_status_hints)
1247                                 printf(_("no changes added to commit "
1248                                          "(use \"git add\" and/or \"git commit -a\")\n"));
1249                         else
1250                                 printf(_("no changes added to commit\n"));
1251                 } else if (s->untracked.nr) {
1252                         if (advice_status_hints)
1253                                 printf(_("nothing added to commit but untracked files "
1254                                          "present (use \"git add\" to track)\n"));
1255                         else
1256                                 printf(_("nothing added to commit but untracked files present\n"));
1257                 } else if (s->is_initial) {
1258                         if (advice_status_hints)
1259                                 printf(_("nothing to commit (create/copy files "
1260                                          "and use \"git add\" to track)\n"));
1261                         else
1262                                 printf(_("nothing to commit\n"));
1263                 } else if (!s->show_untracked_files) {
1264                         if (advice_status_hints)
1265                                 printf(_("nothing to commit (use -u to show untracked files)\n"));
1266                         else
1267                                 printf(_("nothing to commit\n"));
1268                 } else
1269                         printf(_("nothing to commit, working directory clean\n"));
1270         }
1271 }
1272
1273 static void wt_shortstatus_unmerged(struct string_list_item *it,
1274                            struct wt_status *s)
1275 {
1276         struct wt_status_change_data *d = it->util;
1277         const char *how = "??";
1278
1279         switch (d->stagemask) {
1280         case 1: how = "DD"; break; /* both deleted */
1281         case 2: how = "AU"; break; /* added by us */
1282         case 3: how = "UD"; break; /* deleted by them */
1283         case 4: how = "UA"; break; /* added by them */
1284         case 5: how = "DU"; break; /* deleted by us */
1285         case 6: how = "AA"; break; /* both added */
1286         case 7: how = "UU"; break; /* both modified */
1287         }
1288         color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1289         if (s->null_termination) {
1290                 fprintf(stdout, " %s%c", it->string, 0);
1291         } else {
1292                 struct strbuf onebuf = STRBUF_INIT;
1293                 const char *one;
1294                 one = quote_path(it->string, -1, &onebuf, s->prefix);
1295                 printf(" %s\n", one);
1296                 strbuf_release(&onebuf);
1297         }
1298 }
1299
1300 static void wt_shortstatus_status(struct string_list_item *it,
1301                          struct wt_status *s)
1302 {
1303         struct wt_status_change_data *d = it->util;
1304
1305         if (d->index_status)
1306                 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1307         else
1308                 putchar(' ');
1309         if (d->worktree_status)
1310                 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1311         else
1312                 putchar(' ');
1313         putchar(' ');
1314         if (s->null_termination) {
1315                 fprintf(stdout, "%s%c", it->string, 0);
1316                 if (d->head_path)
1317                         fprintf(stdout, "%s%c", d->head_path, 0);
1318         } else {
1319                 struct strbuf onebuf = STRBUF_INIT;
1320                 const char *one;
1321                 if (d->head_path) {
1322                         one = quote_path(d->head_path, -1, &onebuf, s->prefix);
1323                         if (*one != '"' && strchr(one, ' ') != NULL) {
1324                                 putchar('"');
1325                                 strbuf_addch(&onebuf, '"');
1326                                 one = onebuf.buf;
1327                         }
1328                         printf("%s -> ", one);
1329                         strbuf_release(&onebuf);
1330                 }
1331                 one = quote_path(it->string, -1, &onebuf, s->prefix);
1332                 if (*one != '"' && strchr(one, ' ') != NULL) {
1333                         putchar('"');
1334                         strbuf_addch(&onebuf, '"');
1335                         one = onebuf.buf;
1336                 }
1337                 printf("%s\n", one);
1338                 strbuf_release(&onebuf);
1339         }
1340 }
1341
1342 static void wt_shortstatus_other(struct string_list_item *it,
1343                                  struct wt_status *s, const char *sign)
1344 {
1345         if (s->null_termination) {
1346                 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1347         } else {
1348                 struct strbuf onebuf = STRBUF_INIT;
1349                 const char *one;
1350                 one = quote_path(it->string, -1, &onebuf, s->prefix);
1351                 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1352                 printf(" %s\n", one);
1353                 strbuf_release(&onebuf);
1354         }
1355 }
1356
1357 static void wt_shortstatus_print_tracking(struct wt_status *s)
1358 {
1359         struct branch *branch;
1360         const char *header_color = color(WT_STATUS_HEADER, s);
1361         const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1362         const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1363
1364         const char *base;
1365         const char *branch_name;
1366         int num_ours, num_theirs;
1367
1368         color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1369
1370         if (!s->branch)
1371                 return;
1372         branch_name = s->branch;
1373
1374         if (!prefixcmp(branch_name, "refs/heads/"))
1375                 branch_name += 11;
1376         else if (!strcmp(branch_name, "HEAD")) {
1377                 branch_name = _("HEAD (no branch)");
1378                 branch_color_local = color(WT_STATUS_NOBRANCH, s);
1379         }
1380
1381         branch = branch_get(s->branch + 11);
1382         if (s->is_initial)
1383                 color_fprintf(s->fp, header_color, _("Initial commit on "));
1384         if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
1385                 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1386                 fputc(s->null_termination ? '\0' : '\n', s->fp);
1387                 return;
1388         }
1389
1390         base = branch->merge[0]->dst;
1391         base = shorten_unambiguous_ref(base, 0);
1392         color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1393         color_fprintf(s->fp, header_color, "...");
1394         color_fprintf(s->fp, branch_color_remote, "%s", base);
1395
1396         color_fprintf(s->fp, header_color, " [");
1397         if (!num_ours) {
1398                 color_fprintf(s->fp, header_color, _("behind "));
1399                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1400         } else if (!num_theirs) {
1401                 color_fprintf(s->fp, header_color, _("ahead "));
1402                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1403         } else {
1404                 color_fprintf(s->fp, header_color, _("ahead "));
1405                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1406                 color_fprintf(s->fp, header_color, _(", behind "));
1407                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1408         }
1409
1410         color_fprintf(s->fp, header_color, "]");
1411         fputc(s->null_termination ? '\0' : '\n', s->fp);
1412 }
1413
1414 void wt_shortstatus_print(struct wt_status *s)
1415 {
1416         int i;
1417
1418         if (s->show_branch)
1419                 wt_shortstatus_print_tracking(s);
1420
1421         for (i = 0; i < s->change.nr; i++) {
1422                 struct wt_status_change_data *d;
1423                 struct string_list_item *it;
1424
1425                 it = &(s->change.items[i]);
1426                 d = it->util;
1427                 if (d->stagemask)
1428                         wt_shortstatus_unmerged(it, s);
1429                 else
1430                         wt_shortstatus_status(it, s);
1431         }
1432         for (i = 0; i < s->untracked.nr; i++) {
1433                 struct string_list_item *it;
1434
1435                 it = &(s->untracked.items[i]);
1436                 wt_shortstatus_other(it, s, "??");
1437         }
1438         for (i = 0; i < s->ignored.nr; i++) {
1439                 struct string_list_item *it;
1440
1441                 it = &(s->ignored.items[i]);
1442                 wt_shortstatus_other(it, s, "!!");
1443         }
1444 }
1445
1446 void wt_porcelain_print(struct wt_status *s)
1447 {
1448         s->use_color = 0;
1449         s->relative_paths = 0;
1450         s->prefix = NULL;
1451         wt_shortstatus_print(s);
1452 }