git.oblomov.eu Git - git/blob - wt-status.c

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