git.oblomov.eu Git - git/blob - 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 "argv-array.h"
  12 #include "remote.h"
  13 #include "refs.h"
  14 #include "submodule.h"
  15 #include "column.h"
  16 #include "strbuf.h"
  17 #include "utf8.h"
  18 #include "worktree.h"
  19
  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", 0, sha1, 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 = !!oidcmp(&p->one->oid,
 436                                                             &p->two->oid);
 437         }
 438 }
 439
 440 static int unmerged_mask(const char *path)
 441 {
 442         int pos, mask;
 443         const struct cache_entry *ce;
 444
 445         pos = cache_name_pos(path, strlen(path));
 446         if (0 <= pos)
 447                 return 0;
 448
 449         mask = 0;
 450         pos = -pos-1;
 451         while (pos < active_nr) {
 452                 ce = active_cache[pos++];
 453                 if (strcmp(ce->name, path) || !ce_stage(ce))
 454                         break;
 455                 mask |= (1 << (ce_stage(ce) - 1));
 456         }
 457         return mask;
 458 }
 459
 460 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
 461                                          struct diff_options *options,
 462                                          void *data)
 463 {
 464         struct wt_status *s = data;
 465         int i;
 466
 467         for (i = 0; i < q->nr; i++) {
 468                 struct diff_filepair *p;
 469                 struct string_list_item *it;
 470                 struct wt_status_change_data *d;
 471
 472                 p = q->queue[i];
 473                 it = string_list_insert(&s->change, p->two->path);
 474                 d = it->util;
 475                 if (!d) {
 476                         d = xcalloc(1, sizeof(*d));
 477                         it->util = d;
 478                 }
 479                 if (!d->index_status)
 480                         d->index_status = p->status;
 481                 switch (p->status) {
 482                 case DIFF_STATUS_COPIED:
 483                 case DIFF_STATUS_RENAMED:
 484                         d->head_path = xstrdup(p->one->path);
 485                         break;
 486                 case DIFF_STATUS_UNMERGED:
 487                         d->stagemask = unmerged_mask(p->two->path);
 488                         break;
 489                 }
 490         }
 491 }
 492
 493 static void wt_status_collect_changes_worktree(struct wt_status *s)
 494 {
 495         struct rev_info rev;
 496
 497         init_revisions(&rev, NULL);
 498         setup_revisions(0, NULL, &rev, NULL);
 499         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 500         DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
 501         if (!s->show_untracked_files)
 502                 DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
 503         if (s->ignore_submodule_arg) {
 504                 DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 505                 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 506         }
 507         rev.diffopt.format_callback = wt_status_collect_changed_cb;
 508         rev.diffopt.format_callback_data = s;
 509         copy_pathspec(&rev.prune_data, &s->pathspec);
 510         run_diff_files(&rev, 0);
 511 }
 512
 513 static void wt_status_collect_changes_index(struct wt_status *s)
 514 {
 515         struct rev_info rev;
 516         struct setup_revision_opt opt;
 517
 518         init_revisions(&rev, NULL);
 519         memset(&opt, 0, sizeof(opt));
 520         opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 521         setup_revisions(0, NULL, &rev, &opt);
 522
 523         DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 524         if (s->ignore_submodule_arg) {
 525                 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 526         } else {
 527                 /*
 528                  * Unless the user did explicitly request a submodule ignore
 529                  * mode by passing a command line option we do not ignore any
 530                  * changed submodule SHA-1s when comparing index and HEAD, no
 531                  * matter what is configured. Otherwise the user won't be
 532                  * shown any submodules she manually added (and which are
 533                  * staged to be committed), which would be really confusing.
 534                  */
 535                 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
 536         }
 537
 538         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 539         rev.diffopt.format_callback = wt_status_collect_updated_cb;
 540         rev.diffopt.format_callback_data = s;
 541         rev.diffopt.detect_rename = 1;
 542         rev.diffopt.rename_limit = 200;
 543         rev.diffopt.break_opt = 0;
 544         copy_pathspec(&rev.prune_data, &s->pathspec);
 545         run_diff_index(&rev, 1);
 546 }
 547
 548 static void wt_status_collect_changes_initial(struct wt_status *s)
 549 {
 550         int i;
 551
 552         for (i = 0; i < active_nr; i++) {
 553                 struct string_list_item *it;
 554                 struct wt_status_change_data *d;
 555                 const struct cache_entry *ce = active_cache[i];
 556
 557                 if (!ce_path_match(ce, &s->pathspec, NULL))
 558                         continue;
 559                 it = string_list_insert(&s->change, ce->name);
 560                 d = it->util;
 561                 if (!d) {
 562                         d = xcalloc(1, sizeof(*d));
 563                         it->util = d;
 564                 }
 565                 if (ce_stage(ce)) {
 566                         d->index_status = DIFF_STATUS_UNMERGED;
 567                         d->stagemask |= (1 << (ce_stage(ce) - 1));
 568                 }
 569                 else
 570                         d->index_status = DIFF_STATUS_ADDED;
 571         }
 572 }
 573
 574 static void wt_status_collect_untracked(struct wt_status *s)
 575 {
 576         int i;
 577         struct dir_struct dir;
 578         uint64_t t_begin = getnanotime();
 579
 580         if (!s->show_untracked_files)
 581                 return;
 582
 583         memset(&dir, 0, sizeof(dir));
 584         if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
 585                 dir.flags |=
 586                         DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
 587         if (s->show_ignored_files)
 588                 dir.flags |= DIR_SHOW_IGNORED_TOO;
 589         else
 590                 dir.untracked = the_index.untracked;
 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                 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
 617 }
 618
 619 void wt_status_collect(struct wt_status *s)
 620 {
 621         wt_status_collect_changes_worktree(s);
 622
 623         if (s->is_initial)
 624                 wt_status_collect_changes_initial(s);
 625         else
 626                 wt_status_collect_changes_index(s);
 627         wt_status_collect_untracked(s);
 628 }
 629
 630 static void wt_status_print_unmerged(struct wt_status *s)
 631 {
 632         int shown_header = 0;
 633         int i;
 634
 635         for (i = 0; i < s->change.nr; i++) {
 636                 struct wt_status_change_data *d;
 637                 struct string_list_item *it;
 638                 it = &(s->change.items[i]);
 639                 d = it->util;
 640                 if (!d->stagemask)
 641                         continue;
 642                 if (!shown_header) {
 643                         wt_status_print_unmerged_header(s);
 644                         shown_header = 1;
 645                 }
 646                 wt_status_print_unmerged_data(s, it);
 647         }
 648         if (shown_header)
 649                 wt_status_print_trailer(s);
 650
 651 }
 652
 653 static void wt_status_print_updated(struct wt_status *s)
 654 {
 655         int shown_header = 0;
 656         int i;
 657
 658         for (i = 0; i < s->change.nr; i++) {
 659                 struct wt_status_change_data *d;
 660                 struct string_list_item *it;
 661                 it = &(s->change.items[i]);
 662                 d = it->util;
 663                 if (!d->index_status ||
 664                     d->index_status == DIFF_STATUS_UNMERGED)
 665                         continue;
 666                 if (!shown_header) {
 667                         wt_status_print_cached_header(s);
 668                         s->commitable = 1;
 669                         shown_header = 1;
 670                 }
 671                 wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
 672         }
 673         if (shown_header)
 674                 wt_status_print_trailer(s);
 675 }
 676
 677 /*
 678  * -1 : has delete
 679  *  0 : no change
 680  *  1 : some change but no delete
 681  */
 682 static int wt_status_check_worktree_changes(struct wt_status *s,
 683                                              int *dirty_submodules)
 684 {
 685         int i;
 686         int changes = 0;
 687
 688         *dirty_submodules = 0;
 689
 690         for (i = 0; i < s->change.nr; i++) {
 691                 struct wt_status_change_data *d;
 692                 d = s->change.items[i].util;
 693                 if (!d->worktree_status ||
 694                     d->worktree_status == DIFF_STATUS_UNMERGED)
 695                         continue;
 696                 if (!changes)
 697                         changes = 1;
 698                 if (d->dirty_submodule)
 699                         *dirty_submodules = 1;
 700                 if (d->worktree_status == DIFF_STATUS_DELETED)
 701                         changes = -1;
 702         }
 703         return changes;
 704 }
 705
 706 static void wt_status_print_changed(struct wt_status *s)
 707 {
 708         int i, dirty_submodules;
 709         int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
 710
 711         if (!worktree_changes)
 712                 return;
 713
 714         wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
 715
 716         for (i = 0; i < s->change.nr; i++) {
 717                 struct wt_status_change_data *d;
 718                 struct string_list_item *it;
 719                 it = &(s->change.items[i]);
 720                 d = it->util;
 721                 if (!d->worktree_status ||
 722                     d->worktree_status == DIFF_STATUS_UNMERGED)
 723                         continue;
 724                 wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
 725         }
 726         wt_status_print_trailer(s);
 727 }
 728
 729 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
 730 {
 731         struct child_process sm_summary = CHILD_PROCESS_INIT;
 732         struct strbuf cmd_stdout = STRBUF_INIT;
 733         struct strbuf summary = STRBUF_INIT;
 734         char *summary_content;
 735
 736         argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
 737                          s->index_file);
 738
 739         argv_array_push(&sm_summary.args, "submodule");
 740         argv_array_push(&sm_summary.args, "summary");
 741         argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
 742         argv_array_push(&sm_summary.args, "--for-status");
 743         argv_array_push(&sm_summary.args, "--summary-limit");
 744         argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
 745         if (!uncommitted)
 746                 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
 747
 748         sm_summary.git_cmd = 1;
 749         sm_summary.no_stdin = 1;
 750
 751         capture_command(&sm_summary, &cmd_stdout, 1024);
 752
 753         /* prepend header, only if there's an actual output */
 754         if (cmd_stdout.len) {
 755                 if (uncommitted)
 756                         strbuf_addstr(&summary, _("Submodules changed but not updated:"));
 757                 else
 758                         strbuf_addstr(&summary, _("Submodule changes to be committed:"));
 759                 strbuf_addstr(&summary, "\n\n");
 760         }
 761         strbuf_addbuf(&summary, &cmd_stdout);
 762         strbuf_release(&cmd_stdout);
 763
 764         if (s->display_comment_prefix) {
 765                 size_t len;
 766                 summary_content = strbuf_detach(&summary, &len);
 767                 strbuf_add_commented_lines(&summary, summary_content, len);
 768                 free(summary_content);
 769         }
 770
 771         fputs(summary.buf, s->fp);
 772         strbuf_release(&summary);
 773 }
 774
 775 static void wt_status_print_other(struct wt_status *s,
 776                                   struct string_list *l,
 777                                   const char *what,
 778                                   const char *how)
 779 {
 780         int i;
 781         struct strbuf buf = STRBUF_INIT;
 782         static struct string_list output = STRING_LIST_INIT_DUP;
 783         struct column_options copts;
 784
 785         if (!l->nr)
 786                 return;
 787
 788         wt_status_print_other_header(s, what, how);
 789
 790         for (i = 0; i < l->nr; i++) {
 791                 struct string_list_item *it;
 792                 const char *path;
 793                 it = &(l->items[i]);
 794                 path = quote_path(it->string, s->prefix, &buf);
 795                 if (column_active(s->colopts)) {
 796                         string_list_append(&output, path);
 797                         continue;
 798                 }
 799                 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 800                 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
 801                                    "%s\n", path);
 802         }
 803
 804         strbuf_release(&buf);
 805         if (!column_active(s->colopts))
 806                 goto conclude;
 807
 808         strbuf_addf(&buf, "%s%s\t%s",
 809                     color(WT_STATUS_HEADER, s),
 810                     s->display_comment_prefix ? "#" : "",
 811                     color(WT_STATUS_UNTRACKED, s));
 812         memset(&copts, 0, sizeof(copts));
 813         copts.padding = 1;
 814         copts.indent = buf.buf;
 815         if (want_color(s->use_color))
 816                 copts.nl = GIT_COLOR_RESET "\n";
 817         print_columns(&output, s->colopts, &copts);
 818         string_list_clear(&output, 0);
 819         strbuf_release(&buf);
 820 conclude:
 821         status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
 822 }
 823
 824 void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
 825 {
 826         const char *p;
 827         struct strbuf pattern = STRBUF_INIT;
 828
 829         strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
 830         if (starts_with(buf->buf, pattern.buf + 1))
 831                 strbuf_setlen(buf, 0);
 832         else if ((p = strstr(buf->buf, pattern.buf)))
 833                 strbuf_setlen(buf, p - buf->buf + 1);
 834         strbuf_release(&pattern);
 835 }
 836
 837 void wt_status_add_cut_line(FILE *fp)
 838 {
 839         const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
 840         struct strbuf buf = STRBUF_INIT;
 841
 842         fprintf(fp, "%c %s", comment_line_char, cut_line);
 843         strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
 844         fputs(buf.buf, fp);
 845         strbuf_release(&buf);
 846 }
 847
 848 static void wt_status_print_verbose(struct wt_status *s)
 849 {
 850         struct rev_info rev;
 851         struct setup_revision_opt opt;
 852         int dirty_submodules;
 853         const char *c = color(WT_STATUS_HEADER, s);
 854
 855         init_revisions(&rev, NULL);
 856         DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
 857
 858         memset(&opt, 0, sizeof(opt));
 859         opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
 860         setup_revisions(0, NULL, &rev, &opt);
 861
 862         rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 863         rev.diffopt.detect_rename = 1;
 864         rev.diffopt.file = s->fp;
 865         rev.diffopt.close_file = 0;
 866         /*
 867          * If we're not going to stdout, then we definitely don't
 868          * want color, since we are going to the commit message
 869          * file (and even the "auto" setting won't work, since it
 870          * will have checked isatty on stdout). But we then do want
 871          * to insert the scissor line here to reliably remove the
 872          * diff before committing.
 873          */
 874         if (s->fp != stdout) {
 875                 rev.diffopt.use_color = 0;
 876                 wt_status_add_cut_line(s->fp);
 877         }
 878         if (s->verbose > 1 && s->commitable) {
 879                 /* print_updated() printed a header, so do we */
 880                 if (s->fp != stdout)
 881                         wt_status_print_trailer(s);
 882                 status_printf_ln(s, c, _("Changes to be committed:"));
 883                 rev.diffopt.a_prefix = "c/";
 884                 rev.diffopt.b_prefix = "i/";
 885         } /* else use prefix as per user config */
 886         run_diff_index(&rev, 1);
 887         if (s->verbose > 1 &&
 888             wt_status_check_worktree_changes(s, &dirty_submodules)) {
 889                 status_printf_ln(s, c,
 890                         "--------------------------------------------------");
 891                 status_printf_ln(s, c, _("Changes not staged for commit:"));
 892                 setup_work_tree();
 893                 rev.diffopt.a_prefix = "i/";
 894                 rev.diffopt.b_prefix = "w/";
 895                 run_diff_files(&rev, 0);
 896         }
 897 }
 898
 899 static void wt_status_print_tracking(struct wt_status *s)
 900 {
 901         struct strbuf sb = STRBUF_INIT;
 902         const char *cp, *ep, *branch_name;
 903         struct branch *branch;
 904         char comment_line_string[3];
 905         int i;
 906
 907         assert(s->branch && !s->is_initial);
 908         if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
 909                 return;
 910         branch = branch_get(branch_name);
 911         if (!format_tracking_info(branch, &sb))
 912                 return;
 913
 914         i = 0;
 915         if (s->display_comment_prefix) {
 916                 comment_line_string[i++] = comment_line_char;
 917                 comment_line_string[i++] = ' ';
 918         }
 919         comment_line_string[i] = '\0';
 920
 921         for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
 922                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
 923                                  "%s%.*s", comment_line_string,
 924                                  (int)(ep - cp), cp);
 925         if (s->display_comment_prefix)
 926                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
 927                                  comment_line_char);
 928         else
 929                 fputs("", s->fp);
 930 }
 931
 932 static int has_unmerged(struct wt_status *s)
 933 {
 934         int i;
 935
 936         for (i = 0; i < s->change.nr; i++) {
 937                 struct wt_status_change_data *d;
 938                 d = s->change.items[i].util;
 939                 if (d->stagemask)
 940                         return 1;
 941         }
 942         return 0;
 943 }
 944
 945 static void show_merge_in_progress(struct wt_status *s,
 946                                 struct wt_status_state *state,
 947                                 const char *color)
 948 {
 949         if (has_unmerged(s)) {
 950                 status_printf_ln(s, color, _("You have unmerged paths."));
 951                 if (s->hints)
 952                         status_printf_ln(s, color,
 953                                 _("  (fix conflicts and run \"git commit\")"));
 954         } else {
 955                 s-> commitable = 1;
 956                 status_printf_ln(s, color,
 957                         _("All conflicts fixed but you are still merging."));
 958                 if (s->hints)
 959                         status_printf_ln(s, color,
 960                                 _("  (use \"git commit\" to conclude merge)"));
 961         }
 962         wt_status_print_trailer(s);
 963 }
 964
 965 static void show_am_in_progress(struct wt_status *s,
 966                                 struct wt_status_state *state,
 967                                 const char *color)
 968 {
 969         status_printf_ln(s, color,
 970                 _("You are in the middle of an am session."));
 971         if (state->am_empty_patch)
 972                 status_printf_ln(s, color,
 973                         _("The current patch is empty."));
 974         if (s->hints) {
 975                 if (!state->am_empty_patch)
 976                         status_printf_ln(s, color,
 977                                 _("  (fix conflicts and then run \"git am --continue\")"));
 978                 status_printf_ln(s, color,
 979                         _("  (use \"git am --skip\" to skip this patch)"));
 980                 status_printf_ln(s, color,
 981                         _("  (use \"git am --abort\" to restore the original branch)"));
 982         }
 983         wt_status_print_trailer(s);
 984 }
 985
 986 static char *read_line_from_git_path(const char *filename)
 987 {
 988         struct strbuf buf = STRBUF_INIT;
 989         FILE *fp = fopen(git_path("%s", filename), "r");
 990         if (!fp) {
 991                 strbuf_release(&buf);
 992                 return NULL;
 993         }
 994         strbuf_getline_lf(&buf, fp);
 995         if (!fclose(fp)) {
 996                 return strbuf_detach(&buf, NULL);
 997         } else {
 998                 strbuf_release(&buf);
 999                 return NULL;
1000         }
1001 }
1002
1003 static int split_commit_in_progress(struct wt_status *s)
1004 {
1005         int split_in_progress = 0;
1006         char *head = read_line_from_git_path("HEAD");
1007         char *orig_head = read_line_from_git_path("ORIG_HEAD");
1008         char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1009         char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1010
1011         if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1012             !s->branch || strcmp(s->branch, "HEAD"))
1013                 return split_in_progress;
1014
1015         if (!strcmp(rebase_amend, rebase_orig_head)) {
1016                 if (strcmp(head, rebase_amend))
1017                         split_in_progress = 1;
1018         } else if (strcmp(orig_head, rebase_orig_head)) {
1019                 split_in_progress = 1;
1020         }
1021
1022         if (!s->amend && !s->nowarn && !s->workdir_dirty)
1023                 split_in_progress = 0;
1024
1025         free(head);
1026         free(orig_head);
1027         free(rebase_amend);
1028         free(rebase_orig_head);
1029         return split_in_progress;
1030 }
1031
1032 /*
1033  * Turn
1034  * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1035  * into
1036  * "pick d6a2f03 some message"
1037  *
1038  * The function assumes that the line does not contain useless spaces
1039  * before or after the command.
1040  */
1041 static void abbrev_sha1_in_line(struct strbuf *line)
1042 {
1043         struct strbuf **split;
1044         int i;
1045
1046         if (starts_with(line->buf, "exec ") ||
1047             starts_with(line->buf, "x "))
1048                 return;
1049
1050         split = strbuf_split_max(line, ' ', 3);
1051         if (split[0] && split[1]) {
1052                 unsigned char sha1[20];
1053                 const char *abbrev;
1054
1055                 /*
1056                  * strbuf_split_max left a space. Trim it and re-add
1057                  * it after abbreviation.
1058                  */
1059                 strbuf_trim(split[1]);
1060                 if (!get_sha1(split[1]->buf, sha1)) {
1061                         abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1062                         strbuf_reset(split[1]);
1063                         strbuf_addf(split[1], "%s ", abbrev);
1064                         strbuf_reset(line);
1065                         for (i = 0; split[i]; i++)
1066                                 strbuf_addbuf(line, split[i]);
1067                 }
1068         }
1069         strbuf_list_free(split);
1070 }
1071
1072 static void read_rebase_todolist(const char *fname, struct string_list *lines)
1073 {
1074         struct strbuf line = STRBUF_INIT;
1075         FILE *f = fopen(git_path("%s", fname), "r");
1076
1077         if (!f)
1078                 die_errno("Could not open file %s for reading",
1079                           git_path("%s", fname));
1080         while (!strbuf_getline_lf(&line, f)) {
1081                 if (line.len && line.buf[0] == comment_line_char)
1082                         continue;
1083                 strbuf_trim(&line);
1084                 if (!line.len)
1085                         continue;
1086                 abbrev_sha1_in_line(&line);
1087                 string_list_append(lines, line.buf);
1088         }
1089 }
1090
1091 static void show_rebase_information(struct wt_status *s,
1092                                         struct wt_status_state *state,
1093                                         const char *color)
1094 {
1095         if (state->rebase_interactive_in_progress) {
1096                 int i;
1097                 int nr_lines_to_show = 2;
1098
1099                 struct string_list have_done = STRING_LIST_INIT_DUP;
1100                 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1101
1102                 read_rebase_todolist("rebase-merge/done", &have_done);
1103                 read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
1104
1105                 if (have_done.nr == 0)
1106                         status_printf_ln(s, color, _("No commands done."));
1107                 else {
1108                         status_printf_ln(s, color,
1109                                 Q_("Last command done (%d command done):",
1110                                         "Last commands done (%d commands done):",
1111                                         have_done.nr),
1112                                 have_done.nr);
1113                         for (i = (have_done.nr > nr_lines_to_show)
1114                                 ? have_done.nr - nr_lines_to_show : 0;
1115                                 i < have_done.nr;
1116                                 i++)
1117                                 status_printf_ln(s, color, "   %s", have_done.items[i].string);
1118                         if (have_done.nr > nr_lines_to_show && s->hints)
1119                                 status_printf_ln(s, color,
1120                                         _("  (see more in file %s)"), git_path("rebase-merge/done"));
1121                 }
1122
1123                 if (yet_to_do.nr == 0)
1124                         status_printf_ln(s, color,
1125                                          _("No commands remaining."));
1126                 else {
1127                         status_printf_ln(s, color,
1128                                 Q_("Next command to do (%d remaining command):",
1129                                         "Next commands to do (%d remaining commands):",
1130                                         yet_to_do.nr),
1131                                 yet_to_do.nr);
1132                         for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1133                                 status_printf_ln(s, color, "   %s", yet_to_do.items[i].string);
1134                         if (s->hints)
1135                                 status_printf_ln(s, color,
1136                                         _("  (use \"git rebase --edit-todo\" to view and edit)"));
1137                 }
1138                 string_list_clear(&yet_to_do, 0);
1139                 string_list_clear(&have_done, 0);
1140         }
1141 }
1142
1143 static void print_rebase_state(struct wt_status *s,
1144                                 struct wt_status_state *state,
1145                                 const char *color)
1146 {
1147         if (state->branch)
1148                 status_printf_ln(s, color,
1149                                  _("You are currently rebasing branch '%s' on '%s'."),
1150                                  state->branch,
1151                                  state->onto);
1152         else
1153                 status_printf_ln(s, color,
1154                                  _("You are currently rebasing."));
1155 }
1156
1157 static void show_rebase_in_progress(struct wt_status *s,
1158                                 struct wt_status_state *state,
1159                                 const char *color)
1160 {
1161         struct stat st;
1162
1163         show_rebase_information(s, state, color);
1164         if (has_unmerged(s)) {
1165                 print_rebase_state(s, state, color);
1166                 if (s->hints) {
1167                         status_printf_ln(s, color,
1168                                 _("  (fix conflicts and then run \"git rebase --continue\")"));
1169                         status_printf_ln(s, color,
1170                                 _("  (use \"git rebase --skip\" to skip this patch)"));
1171                         status_printf_ln(s, color,
1172                                 _("  (use \"git rebase --abort\" to check out the original branch)"));
1173                 }
1174         } else if (state->rebase_in_progress || !stat(git_path_merge_msg(), &st)) {
1175                 print_rebase_state(s, state, color);
1176                 if (s->hints)
1177                         status_printf_ln(s, color,
1178                                 _("  (all conflicts fixed: run \"git rebase --continue\")"));
1179         } else if (split_commit_in_progress(s)) {
1180                 if (state->branch)
1181                         status_printf_ln(s, color,
1182                                          _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1183                                          state->branch,
1184                                          state->onto);
1185                 else
1186                         status_printf_ln(s, color,
1187                                          _("You are currently splitting a commit during a rebase."));
1188                 if (s->hints)
1189                         status_printf_ln(s, color,
1190                                 _("  (Once your working directory is clean, run \"git rebase --continue\")"));
1191         } else {
1192                 if (state->branch)
1193                         status_printf_ln(s, color,
1194                                          _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1195                                          state->branch,
1196                                          state->onto);
1197                 else
1198                         status_printf_ln(s, color,
1199                                          _("You are currently editing a commit during a rebase."));
1200                 if (s->hints && !s->amend) {
1201                         status_printf_ln(s, color,
1202                                 _("  (use \"git commit --amend\" to amend the current commit)"));
1203                         status_printf_ln(s, color,
1204                                 _("  (use \"git rebase --continue\" once you are satisfied with your changes)"));
1205                 }
1206         }
1207         wt_status_print_trailer(s);
1208 }
1209
1210 static void show_cherry_pick_in_progress(struct wt_status *s,
1211                                         struct wt_status_state *state,
1212                                         const char *color)
1213 {
1214         status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1215                         find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1216         if (s->hints) {
1217                 if (has_unmerged(s))
1218                         status_printf_ln(s, color,
1219                                 _("  (fix conflicts and run \"git cherry-pick --continue\")"));
1220                 else
1221                         status_printf_ln(s, color,
1222                                 _("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
1223                 status_printf_ln(s, color,
1224                         _("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1225         }
1226         wt_status_print_trailer(s);
1227 }
1228
1229 static void show_revert_in_progress(struct wt_status *s,
1230                                         struct wt_status_state *state,
1231                                         const char *color)
1232 {
1233         status_printf_ln(s, color, _("You are currently reverting commit %s."),
1234                          find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1235         if (s->hints) {
1236                 if (has_unmerged(s))
1237                         status_printf_ln(s, color,
1238                                 _("  (fix conflicts and run \"git revert --continue\")"));
1239                 else
1240                         status_printf_ln(s, color,
1241                                 _("  (all conflicts fixed: run \"git revert --continue\")"));
1242                 status_printf_ln(s, color,
1243                         _("  (use \"git revert --abort\" to cancel the revert operation)"));
1244         }
1245         wt_status_print_trailer(s);
1246 }
1247
1248 static void show_bisect_in_progress(struct wt_status *s,
1249                                 struct wt_status_state *state,
1250                                 const char *color)
1251 {
1252         if (state->branch)
1253                 status_printf_ln(s, color,
1254                                  _("You are currently bisecting, started from branch '%s'."),
1255                                  state->branch);
1256         else
1257                 status_printf_ln(s, color,
1258                                  _("You are currently bisecting."));
1259         if (s->hints)
1260                 status_printf_ln(s, color,
1261                         _("  (use \"git bisect reset\" to get back to the original branch)"));
1262         wt_status_print_trailer(s);
1263 }
1264
1265 /*
1266  * Extract branch information from rebase/bisect
1267  */
1268 static char *get_branch(const struct worktree *wt, const char *path)
1269 {
1270         struct strbuf sb = STRBUF_INIT;
1271         unsigned char sha1[20];
1272         const char *branch_name;
1273
1274         if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1275                 goto got_nothing;
1276
1277         while (sb.len && sb.buf[sb.len - 1] == '\n')
1278                 strbuf_setlen(&sb, sb.len - 1);
1279         if (!sb.len)
1280                 goto got_nothing;
1281         if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1282                 strbuf_remove(&sb, 0, branch_name - sb.buf);
1283         else if (starts_with(sb.buf, "refs/"))
1284                 ;
1285         else if (!get_sha1_hex(sb.buf, sha1)) {
1286                 const char *abbrev;
1287                 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1288                 strbuf_reset(&sb);
1289                 strbuf_addstr(&sb, abbrev);
1290         } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1291                 goto got_nothing;
1292         else                    /* bisect */
1293                 ;
1294         return strbuf_detach(&sb, NULL);
1295
1296 got_nothing:
1297         strbuf_release(&sb);
1298         return NULL;
1299 }
1300
1301 struct grab_1st_switch_cbdata {
1302         struct strbuf buf;
1303         unsigned char nsha1[20];
1304 };
1305
1306 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1307                            const char *email, unsigned long timestamp, int tz,
1308                            const char *message, void *cb_data)
1309 {
1310         struct grab_1st_switch_cbdata *cb = cb_data;
1311         const char *target = NULL, *end;
1312
1313         if (!skip_prefix(message, "checkout: moving from ", &message))
1314                 return 0;
1315         target = strstr(message, " to ");
1316         if (!target)
1317                 return 0;
1318         target += strlen(" to ");
1319         strbuf_reset(&cb->buf);
1320         hashcpy(cb->nsha1, nsha1);
1321         end = strchrnul(target, '\n');
1322         strbuf_add(&cb->buf, target, end - target);
1323         if (!strcmp(cb->buf.buf, "HEAD")) {
1324                 /* HEAD is relative. Resolve it to the right reflog entry. */
1325                 strbuf_reset(&cb->buf);
1326                 strbuf_addstr(&cb->buf,
1327                               find_unique_abbrev(nsha1, DEFAULT_ABBREV));
1328         }
1329         return 1;
1330 }
1331
1332 static void wt_status_get_detached_from(struct wt_status_state *state)
1333 {
1334         struct grab_1st_switch_cbdata cb;
1335         struct commit *commit;
1336         unsigned char sha1[20];
1337         char *ref = NULL;
1338
1339         strbuf_init(&cb.buf, 0);
1340         if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1341                 strbuf_release(&cb.buf);
1342                 return;
1343         }
1344
1345         if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1346             /* sha1 is a commit? match without further lookup */
1347             (!hashcmp(cb.nsha1, sha1) ||
1348              /* perhaps sha1 is a tag, try to dereference to a commit */
1349              ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1350               !hashcmp(cb.nsha1, commit->object.oid.hash)))) {
1351                 const char *from = ref;
1352                 if (!skip_prefix(from, "refs/tags/", &from))
1353                         skip_prefix(from, "refs/remotes/", &from);
1354                 state->detached_from = xstrdup(from);
1355         } else
1356                 state->detached_from =
1357                         xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1358         hashcpy(state->detached_sha1, cb.nsha1);
1359         state->detached_at = !get_sha1("HEAD", sha1) &&
1360                              !hashcmp(sha1, state->detached_sha1);
1361
1362         free(ref);
1363         strbuf_release(&cb.buf);
1364 }
1365
1366 int wt_status_check_rebase(const struct worktree *wt,
1367                            struct wt_status_state *state)
1368 {
1369         struct stat st;
1370
1371         if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1372                 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1373                         state->am_in_progress = 1;
1374                         if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1375                                 state->am_empty_patch = 1;
1376                 } else {
1377                         state->rebase_in_progress = 1;
1378                         state->branch = get_branch(wt, "rebase-apply/head-name");
1379                         state->onto = get_branch(wt, "rebase-apply/onto");
1380                 }
1381         } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1382                 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1383                         state->rebase_interactive_in_progress = 1;
1384                 else
1385                         state->rebase_in_progress = 1;
1386                 state->branch = get_branch(wt, "rebase-merge/head-name");
1387                 state->onto = get_branch(wt, "rebase-merge/onto");
1388         } else
1389                 return 0;
1390         return 1;
1391 }
1392
1393 int wt_status_check_bisect(const struct worktree *wt,
1394                            struct wt_status_state *state)
1395 {
1396         struct stat st;
1397
1398         if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1399                 state->bisect_in_progress = 1;
1400                 state->branch = get_branch(wt, "BISECT_START");
1401                 return 1;
1402         }
1403         return 0;
1404 }
1405
1406 void wt_status_get_state(struct wt_status_state *state,
1407                          int get_detached_from)
1408 {
1409         struct stat st;
1410         unsigned char sha1[20];
1411
1412         if (!stat(git_path_merge_head(), &st)) {
1413                 state->merge_in_progress = 1;
1414         } else if (wt_status_check_rebase(NULL, state)) {
1415                 ;               /* all set */
1416         } else if (!stat(git_path_cherry_pick_head(), &st) &&
1417                         !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1418                 state->cherry_pick_in_progress = 1;
1419                 hashcpy(state->cherry_pick_head_sha1, sha1);
1420         }
1421         wt_status_check_bisect(NULL, state);
1422         if (!stat(git_path_revert_head(), &st) &&
1423             !get_sha1("REVERT_HEAD", sha1)) {
1424                 state->revert_in_progress = 1;
1425                 hashcpy(state->revert_head_sha1, sha1);
1426         }
1427
1428         if (get_detached_from)
1429                 wt_status_get_detached_from(state);
1430 }
1431
1432 static void wt_status_print_state(struct wt_status *s,
1433                                   struct wt_status_state *state)
1434 {
1435         const char *state_color = color(WT_STATUS_HEADER, s);
1436         if (state->merge_in_progress)
1437                 show_merge_in_progress(s, state, state_color);
1438         else if (state->am_in_progress)
1439                 show_am_in_progress(s, state, state_color);
1440         else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1441                 show_rebase_in_progress(s, state, state_color);
1442         else if (state->cherry_pick_in_progress)
1443                 show_cherry_pick_in_progress(s, state, state_color);
1444         else if (state->revert_in_progress)
1445                 show_revert_in_progress(s, state, state_color);
1446         if (state->bisect_in_progress)
1447                 show_bisect_in_progress(s, state, state_color);
1448 }
1449
1450 void wt_status_print(struct wt_status *s)
1451 {
1452         const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1453         const char *branch_status_color = color(WT_STATUS_HEADER, s);
1454         struct wt_status_state state;
1455
1456         memset(&state, 0, sizeof(state));
1457         wt_status_get_state(&state,
1458                             s->branch && !strcmp(s->branch, "HEAD"));
1459
1460         if (s->branch) {
1461                 const char *on_what = _("On branch ");
1462                 const char *branch_name = s->branch;
1463                 if (!strcmp(branch_name, "HEAD")) {
1464                         branch_status_color = color(WT_STATUS_NOBRANCH, s);
1465                         if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1466                                 if (state.rebase_interactive_in_progress)
1467                                         on_what = _("interactive rebase in progress; onto ");
1468                                 else
1469                                         on_what = _("rebase in progress; onto ");
1470                                 branch_name = state.onto;
1471                         } else if (state.detached_from) {
1472                                 branch_name = state.detached_from;
1473                                 if (state.detached_at)
1474                                         on_what = _("HEAD detached at ");
1475                                 else
1476                                         on_what = _("HEAD detached from ");
1477                         } else {
1478                                 branch_name = "";
1479                                 on_what = _("Not currently on any branch.");
1480                         }
1481                 } else
1482                         skip_prefix(branch_name, "refs/heads/", &branch_name);
1483                 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1484                 status_printf_more(s, branch_status_color, "%s", on_what);
1485                 status_printf_more(s, branch_color, "%s\n", branch_name);
1486                 if (!s->is_initial)
1487                         wt_status_print_tracking(s);
1488         }
1489
1490         wt_status_print_state(s, &state);
1491         free(state.branch);
1492         free(state.onto);
1493         free(state.detached_from);
1494
1495         if (s->is_initial) {
1496                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1497                 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1498                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1499         }
1500
1501         wt_status_print_updated(s);
1502         wt_status_print_unmerged(s);
1503         wt_status_print_changed(s);
1504         if (s->submodule_summary &&
1505             (!s->ignore_submodule_arg ||
1506              strcmp(s->ignore_submodule_arg, "all"))) {
1507                 wt_status_print_submodule_summary(s, 0);  /* staged */
1508                 wt_status_print_submodule_summary(s, 1);  /* unstaged */
1509         }
1510         if (s->show_untracked_files) {
1511                 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1512                 if (s->show_ignored_files)
1513                         wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1514                 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1515                         status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1516                         status_printf_ln(s, GIT_COLOR_NORMAL,
1517                                          _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1518                                            "may speed it up, but you have to be careful not to forget to add\n"
1519                                            "new files yourself (see 'git help status')."),
1520                                          s->untracked_in_ms / 1000.0);
1521                 }
1522         } else if (s->commitable)
1523                 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1524                         s->hints
1525                         ? _(" (use -u option to show untracked files)") : "");
1526
1527         if (s->verbose)
1528                 wt_status_print_verbose(s);
1529         if (!s->commitable) {
1530                 if (s->amend)
1531                         status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1532                 else if (s->nowarn)
1533                         ; /* nothing */
1534                 else if (s->workdir_dirty) {
1535                         if (s->hints)
1536                                 printf(_("no changes added to commit "
1537                                          "(use \"git add\" and/or \"git commit -a\")\n"));
1538                         else
1539                                 printf(_("no changes added to commit\n"));
1540                 } else if (s->untracked.nr) {
1541                         if (s->hints)
1542                                 printf(_("nothing added to commit but untracked files "
1543                                          "present (use \"git add\" to track)\n"));
1544                         else
1545                                 printf(_("nothing added to commit but untracked files present\n"));
1546                 } else if (s->is_initial) {
1547                         if (s->hints)
1548                                 printf(_("nothing to commit (create/copy files "
1549                                          "and use \"git add\" to track)\n"));
1550                         else
1551                                 printf(_("nothing to commit\n"));
1552                 } else if (!s->show_untracked_files) {
1553                         if (s->hints)
1554                                 printf(_("nothing to commit (use -u to show untracked files)\n"));
1555                         else
1556                                 printf(_("nothing to commit\n"));
1557                 } else
1558                         printf(_("nothing to commit, working tree clean\n"));
1559         }
1560 }
1561
1562 static void wt_shortstatus_unmerged(struct string_list_item *it,
1563                            struct wt_status *s)
1564 {
1565         struct wt_status_change_data *d = it->util;
1566         const char *how = "??";
1567
1568         switch (d->stagemask) {
1569         case 1: how = "DD"; break; /* both deleted */
1570         case 2: how = "AU"; break; /* added by us */
1571         case 3: how = "UD"; break; /* deleted by them */
1572         case 4: how = "UA"; break; /* added by them */
1573         case 5: how = "DU"; break; /* deleted by us */
1574         case 6: how = "AA"; break; /* both added */
1575         case 7: how = "UU"; break; /* both modified */
1576         }
1577         color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1578         if (s->null_termination) {
1579                 fprintf(stdout, " %s%c", it->string, 0);
1580         } else {
1581                 struct strbuf onebuf = STRBUF_INIT;
1582                 const char *one;
1583                 one = quote_path(it->string, s->prefix, &onebuf);
1584                 printf(" %s\n", one);
1585                 strbuf_release(&onebuf);
1586         }
1587 }
1588
1589 static void wt_shortstatus_status(struct string_list_item *it,
1590                          struct wt_status *s)
1591 {
1592         struct wt_status_change_data *d = it->util;
1593
1594         if (d->index_status)
1595                 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1596         else
1597                 putchar(' ');
1598         if (d->worktree_status)
1599                 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1600         else
1601                 putchar(' ');
1602         putchar(' ');
1603         if (s->null_termination) {
1604                 fprintf(stdout, "%s%c", it->string, 0);
1605                 if (d->head_path)
1606                         fprintf(stdout, "%s%c", d->head_path, 0);
1607         } else {
1608                 struct strbuf onebuf = STRBUF_INIT;
1609                 const char *one;
1610                 if (d->head_path) {
1611                         one = quote_path(d->head_path, s->prefix, &onebuf);
1612                         if (*one != '"' && strchr(one, ' ') != NULL) {
1613                                 putchar('"');
1614                                 strbuf_addch(&onebuf, '"');
1615                                 one = onebuf.buf;
1616                         }
1617                         printf("%s -> ", one);
1618                         strbuf_release(&onebuf);
1619                 }
1620                 one = quote_path(it->string, s->prefix, &onebuf);
1621                 if (*one != '"' && strchr(one, ' ') != NULL) {
1622                         putchar('"');
1623                         strbuf_addch(&onebuf, '"');
1624                         one = onebuf.buf;
1625                 }
1626                 printf("%s\n", one);
1627                 strbuf_release(&onebuf);
1628         }
1629 }
1630
1631 static void wt_shortstatus_other(struct string_list_item *it,
1632                                  struct wt_status *s, const char *sign)
1633 {
1634         if (s->null_termination) {
1635                 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1636         } else {
1637                 struct strbuf onebuf = STRBUF_INIT;
1638                 const char *one;
1639                 one = quote_path(it->string, s->prefix, &onebuf);
1640                 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1641                 printf(" %s\n", one);
1642                 strbuf_release(&onebuf);
1643         }
1644 }
1645
1646 static void wt_shortstatus_print_tracking(struct wt_status *s)
1647 {
1648         struct branch *branch;
1649         const char *header_color = color(WT_STATUS_HEADER, s);
1650         const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1651         const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1652
1653         const char *base;
1654         const char *branch_name;
1655         int num_ours, num_theirs;
1656         int upstream_is_gone = 0;
1657
1658         color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1659
1660         if (!s->branch)
1661                 return;
1662         branch_name = s->branch;
1663
1664         if (s->is_initial)
1665                 color_fprintf(s->fp, header_color, _("Initial commit on "));
1666
1667         if (!strcmp(s->branch, "HEAD")) {
1668                 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1669                               _("HEAD (no branch)"));
1670                 goto conclude;
1671         }
1672
1673         skip_prefix(branch_name, "refs/heads/", &branch_name);
1674
1675         branch = branch_get(branch_name);
1676
1677         color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1678
1679         if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
1680                 if (!base)
1681                         goto conclude;
1682
1683                 upstream_is_gone = 1;
1684         }
1685
1686         base = shorten_unambiguous_ref(base, 0);
1687         color_fprintf(s->fp, header_color, "...");
1688         color_fprintf(s->fp, branch_color_remote, "%s", base);
1689         free((char *)base);
1690
1691         if (!upstream_is_gone && !num_ours && !num_theirs)
1692                 goto conclude;
1693
1694 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1695
1696         color_fprintf(s->fp, header_color, " [");
1697         if (upstream_is_gone) {
1698                 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1699         } else if (!num_ours) {
1700                 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1701                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1702         } else if (!num_theirs) {
1703                 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1704                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1705         } else {
1706                 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1707                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1708                 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1709                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1710         }
1711
1712         color_fprintf(s->fp, header_color, "]");
1713  conclude:
1714         fputc(s->null_termination ? '\0' : '\n', s->fp);
1715 }
1716
1717 void wt_shortstatus_print(struct wt_status *s)
1718 {
1719         int i;
1720
1721         if (s->show_branch)
1722                 wt_shortstatus_print_tracking(s);
1723
1724         for (i = 0; i < s->change.nr; i++) {
1725                 struct wt_status_change_data *d;
1726                 struct string_list_item *it;
1727
1728                 it = &(s->change.items[i]);
1729                 d = it->util;
1730                 if (d->stagemask)
1731                         wt_shortstatus_unmerged(it, s);
1732                 else
1733                         wt_shortstatus_status(it, s);
1734         }
1735         for (i = 0; i < s->untracked.nr; i++) {
1736                 struct string_list_item *it;
1737
1738                 it = &(s->untracked.items[i]);
1739                 wt_shortstatus_other(it, s, "??");
1740         }
1741         for (i = 0; i < s->ignored.nr; i++) {
1742                 struct string_list_item *it;
1743
1744                 it = &(s->ignored.items[i]);
1745                 wt_shortstatus_other(it, s, "!!");
1746         }
1747 }
1748
1749 void wt_porcelain_print(struct wt_status *s)
1750 {
1751         s->use_color = 0;
1752         s->relative_paths = 0;
1753         s->prefix = NULL;
1754         s->no_gettext = 1;
1755         wt_shortstatus_print(s);
1756 }