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                         status_printf_ln(s, color,
 955                                          _("  (use \"git merge --abort\" to abort the merge)"));
 956                 }
 957         } else {
 958                 s-> commitable = 1;
 959                 status_printf_ln(s, color,
 960                         _("All conflicts fixed but you are still merging."));
 961                 if (s->hints)
 962                         status_printf_ln(s, color,
 963                                 _("  (use \"git commit\" to conclude merge)"));
 964         }
 965         wt_status_print_trailer(s);
 966 }
 967
 968 static void show_am_in_progress(struct wt_status *s,
 969                                 struct wt_status_state *state,
 970                                 const char *color)
 971 {
 972         status_printf_ln(s, color,
 973                 _("You are in the middle of an am session."));
 974         if (state->am_empty_patch)
 975                 status_printf_ln(s, color,
 976                         _("The current patch is empty."));
 977         if (s->hints) {
 978                 if (!state->am_empty_patch)
 979                         status_printf_ln(s, color,
 980                                 _("  (fix conflicts and then run \"git am --continue\")"));
 981                 status_printf_ln(s, color,
 982                         _("  (use \"git am --skip\" to skip this patch)"));
 983                 status_printf_ln(s, color,
 984                         _("  (use \"git am --abort\" to restore the original branch)"));
 985         }
 986         wt_status_print_trailer(s);
 987 }
 988
 989 static char *read_line_from_git_path(const char *filename)
 990 {
 991         struct strbuf buf = STRBUF_INIT;
 992         FILE *fp = fopen(git_path("%s", filename), "r");
 993         if (!fp) {
 994                 strbuf_release(&buf);
 995                 return NULL;
 996         }
 997         strbuf_getline_lf(&buf, fp);
 998         if (!fclose(fp)) {
 999                 return strbuf_detach(&buf, NULL);
1000         } else {
1001                 strbuf_release(&buf);
1002                 return NULL;
1003         }
1004 }
1005
1006 static int split_commit_in_progress(struct wt_status *s)
1007 {
1008         int split_in_progress = 0;
1009         char *head = read_line_from_git_path("HEAD");
1010         char *orig_head = read_line_from_git_path("ORIG_HEAD");
1011         char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
1012         char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1013
1014         if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
1015             !s->branch || strcmp(s->branch, "HEAD"))
1016                 return split_in_progress;
1017
1018         if (!strcmp(rebase_amend, rebase_orig_head)) {
1019                 if (strcmp(head, rebase_amend))
1020                         split_in_progress = 1;
1021         } else if (strcmp(orig_head, rebase_orig_head)) {
1022                 split_in_progress = 1;
1023         }
1024
1025         if (!s->amend && !s->nowarn && !s->workdir_dirty)
1026                 split_in_progress = 0;
1027
1028         free(head);
1029         free(orig_head);
1030         free(rebase_amend);
1031         free(rebase_orig_head);
1032         return split_in_progress;
1033 }
1034
1035 /*
1036  * Turn
1037  * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1038  * into
1039  * "pick d6a2f03 some message"
1040  *
1041  * The function assumes that the line does not contain useless spaces
1042  * before or after the command.
1043  */
1044 static void abbrev_sha1_in_line(struct strbuf *line)
1045 {
1046         struct strbuf **split;
1047         int i;
1048
1049         if (starts_with(line->buf, "exec ") ||
1050             starts_with(line->buf, "x "))
1051                 return;
1052
1053         split = strbuf_split_max(line, ' ', 3);
1054         if (split[0] && split[1]) {
1055                 unsigned char sha1[20];
1056                 const char *abbrev;
1057
1058                 /*
1059                  * strbuf_split_max left a space. Trim it and re-add
1060                  * it after abbreviation.
1061                  */
1062                 strbuf_trim(split[1]);
1063                 if (!get_sha1(split[1]->buf, sha1)) {
1064                         abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1065                         strbuf_reset(split[1]);
1066                         strbuf_addf(split[1], "%s ", abbrev);
1067                         strbuf_reset(line);
1068                         for (i = 0; split[i]; i++)
1069                                 strbuf_addbuf(line, split[i]);
1070                 }
1071         }
1072         strbuf_list_free(split);
1073 }
1074
1075 static void read_rebase_todolist(const char *fname, struct string_list *lines)
1076 {
1077         struct strbuf line = STRBUF_INIT;
1078         FILE *f = fopen(git_path("%s", fname), "r");
1079
1080         if (!f)
1081                 die_errno("Could not open file %s for reading",
1082                           git_path("%s", fname));
1083         while (!strbuf_getline_lf(&line, f)) {
1084                 if (line.len && line.buf[0] == comment_line_char)
1085                         continue;
1086                 strbuf_trim(&line);
1087                 if (!line.len)
1088                         continue;
1089                 abbrev_sha1_in_line(&line);
1090                 string_list_append(lines, line.buf);
1091         }
1092 }
1093
1094 static void show_rebase_information(struct wt_status *s,
1095                                         struct wt_status_state *state,
1096                                         const char *color)
1097 {
1098         if (state->rebase_interactive_in_progress) {
1099                 int i;
1100                 int nr_lines_to_show = 2;
1101
1102                 struct string_list have_done = STRING_LIST_INIT_DUP;
1103                 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1104
1105                 read_rebase_todolist("rebase-merge/done", &have_done);
1106                 read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
1107
1108                 if (have_done.nr == 0)
1109                         status_printf_ln(s, color, _("No commands done."));
1110                 else {
1111                         status_printf_ln(s, color,
1112                                 Q_("Last command done (%d command done):",
1113                                         "Last commands done (%d commands done):",
1114                                         have_done.nr),
1115                                 have_done.nr);
1116                         for (i = (have_done.nr > nr_lines_to_show)
1117                                 ? have_done.nr - nr_lines_to_show : 0;
1118                                 i < have_done.nr;
1119                                 i++)
1120                                 status_printf_ln(s, color, "   %s", have_done.items[i].string);
1121                         if (have_done.nr > nr_lines_to_show && s->hints)
1122                                 status_printf_ln(s, color,
1123                                         _("  (see more in file %s)"), git_path("rebase-merge/done"));
1124                 }
1125
1126                 if (yet_to_do.nr == 0)
1127                         status_printf_ln(s, color,
1128                                          _("No commands remaining."));
1129                 else {
1130                         status_printf_ln(s, color,
1131                                 Q_("Next command to do (%d remaining command):",
1132                                         "Next commands to do (%d remaining commands):",
1133                                         yet_to_do.nr),
1134                                 yet_to_do.nr);
1135                         for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1136                                 status_printf_ln(s, color, "   %s", yet_to_do.items[i].string);
1137                         if (s->hints)
1138                                 status_printf_ln(s, color,
1139                                         _("  (use \"git rebase --edit-todo\" to view and edit)"));
1140                 }
1141                 string_list_clear(&yet_to_do, 0);
1142                 string_list_clear(&have_done, 0);
1143         }
1144 }
1145
1146 static void print_rebase_state(struct wt_status *s,
1147                                 struct wt_status_state *state,
1148                                 const char *color)
1149 {
1150         if (state->branch)
1151                 status_printf_ln(s, color,
1152                                  _("You are currently rebasing branch '%s' on '%s'."),
1153                                  state->branch,
1154                                  state->onto);
1155         else
1156                 status_printf_ln(s, color,
1157                                  _("You are currently rebasing."));
1158 }
1159
1160 static void show_rebase_in_progress(struct wt_status *s,
1161                                 struct wt_status_state *state,
1162                                 const char *color)
1163 {
1164         struct stat st;
1165
1166         show_rebase_information(s, state, color);
1167         if (has_unmerged(s)) {
1168                 print_rebase_state(s, state, color);
1169                 if (s->hints) {
1170                         status_printf_ln(s, color,
1171                                 _("  (fix conflicts and then run \"git rebase --continue\")"));
1172                         status_printf_ln(s, color,
1173                                 _("  (use \"git rebase --skip\" to skip this patch)"));
1174                         status_printf_ln(s, color,
1175                                 _("  (use \"git rebase --abort\" to check out the original branch)"));
1176                 }
1177         } else if (state->rebase_in_progress || !stat(git_path_merge_msg(), &st)) {
1178                 print_rebase_state(s, state, color);
1179                 if (s->hints)
1180                         status_printf_ln(s, color,
1181                                 _("  (all conflicts fixed: run \"git rebase --continue\")"));
1182         } else if (split_commit_in_progress(s)) {
1183                 if (state->branch)
1184                         status_printf_ln(s, color,
1185                                          _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1186                                          state->branch,
1187                                          state->onto);
1188                 else
1189                         status_printf_ln(s, color,
1190                                          _("You are currently splitting a commit during a rebase."));
1191                 if (s->hints)
1192                         status_printf_ln(s, color,
1193                                 _("  (Once your working directory is clean, run \"git rebase --continue\")"));
1194         } else {
1195                 if (state->branch)
1196                         status_printf_ln(s, color,
1197                                          _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1198                                          state->branch,
1199                                          state->onto);
1200                 else
1201                         status_printf_ln(s, color,
1202                                          _("You are currently editing a commit during a rebase."));
1203                 if (s->hints && !s->amend) {
1204                         status_printf_ln(s, color,
1205                                 _("  (use \"git commit --amend\" to amend the current commit)"));
1206                         status_printf_ln(s, color,
1207                                 _("  (use \"git rebase --continue\" once you are satisfied with your changes)"));
1208                 }
1209         }
1210         wt_status_print_trailer(s);
1211 }
1212
1213 static void show_cherry_pick_in_progress(struct wt_status *s,
1214                                         struct wt_status_state *state,
1215                                         const char *color)
1216 {
1217         status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1218                         find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
1219         if (s->hints) {
1220                 if (has_unmerged(s))
1221                         status_printf_ln(s, color,
1222                                 _("  (fix conflicts and run \"git cherry-pick --continue\")"));
1223                 else
1224                         status_printf_ln(s, color,
1225                                 _("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
1226                 status_printf_ln(s, color,
1227                         _("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1228         }
1229         wt_status_print_trailer(s);
1230 }
1231
1232 static void show_revert_in_progress(struct wt_status *s,
1233                                         struct wt_status_state *state,
1234                                         const char *color)
1235 {
1236         status_printf_ln(s, color, _("You are currently reverting commit %s."),
1237                          find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
1238         if (s->hints) {
1239                 if (has_unmerged(s))
1240                         status_printf_ln(s, color,
1241                                 _("  (fix conflicts and run \"git revert --continue\")"));
1242                 else
1243                         status_printf_ln(s, color,
1244                                 _("  (all conflicts fixed: run \"git revert --continue\")"));
1245                 status_printf_ln(s, color,
1246                         _("  (use \"git revert --abort\" to cancel the revert operation)"));
1247         }
1248         wt_status_print_trailer(s);
1249 }
1250
1251 static void show_bisect_in_progress(struct wt_status *s,
1252                                 struct wt_status_state *state,
1253                                 const char *color)
1254 {
1255         if (state->branch)
1256                 status_printf_ln(s, color,
1257                                  _("You are currently bisecting, started from branch '%s'."),
1258                                  state->branch);
1259         else
1260                 status_printf_ln(s, color,
1261                                  _("You are currently bisecting."));
1262         if (s->hints)
1263                 status_printf_ln(s, color,
1264                         _("  (use \"git bisect reset\" to get back to the original branch)"));
1265         wt_status_print_trailer(s);
1266 }
1267
1268 /*
1269  * Extract branch information from rebase/bisect
1270  */
1271 static char *get_branch(const struct worktree *wt, const char *path)
1272 {
1273         struct strbuf sb = STRBUF_INIT;
1274         unsigned char sha1[20];
1275         const char *branch_name;
1276
1277         if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1278                 goto got_nothing;
1279
1280         while (sb.len && sb.buf[sb.len - 1] == '\n')
1281                 strbuf_setlen(&sb, sb.len - 1);
1282         if (!sb.len)
1283                 goto got_nothing;
1284         if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1285                 strbuf_remove(&sb, 0, branch_name - sb.buf);
1286         else if (starts_with(sb.buf, "refs/"))
1287                 ;
1288         else if (!get_sha1_hex(sb.buf, sha1)) {
1289                 const char *abbrev;
1290                 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
1291                 strbuf_reset(&sb);
1292                 strbuf_addstr(&sb, abbrev);
1293         } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1294                 goto got_nothing;
1295         else                    /* bisect */
1296                 ;
1297         return strbuf_detach(&sb, NULL);
1298
1299 got_nothing:
1300         strbuf_release(&sb);
1301         return NULL;
1302 }
1303
1304 struct grab_1st_switch_cbdata {
1305         struct strbuf buf;
1306         unsigned char nsha1[20];
1307 };
1308
1309 static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
1310                            const char *email, unsigned long timestamp, int tz,
1311                            const char *message, void *cb_data)
1312 {
1313         struct grab_1st_switch_cbdata *cb = cb_data;
1314         const char *target = NULL, *end;
1315
1316         if (!skip_prefix(message, "checkout: moving from ", &message))
1317                 return 0;
1318         target = strstr(message, " to ");
1319         if (!target)
1320                 return 0;
1321         target += strlen(" to ");
1322         strbuf_reset(&cb->buf);
1323         hashcpy(cb->nsha1, nsha1);
1324         end = strchrnul(target, '\n');
1325         strbuf_add(&cb->buf, target, end - target);
1326         if (!strcmp(cb->buf.buf, "HEAD")) {
1327                 /* HEAD is relative. Resolve it to the right reflog entry. */
1328                 strbuf_reset(&cb->buf);
1329                 strbuf_addstr(&cb->buf,
1330                               find_unique_abbrev(nsha1, DEFAULT_ABBREV));
1331         }
1332         return 1;
1333 }
1334
1335 static void wt_status_get_detached_from(struct wt_status_state *state)
1336 {
1337         struct grab_1st_switch_cbdata cb;
1338         struct commit *commit;
1339         unsigned char sha1[20];
1340         char *ref = NULL;
1341
1342         strbuf_init(&cb.buf, 0);
1343         if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1344                 strbuf_release(&cb.buf);
1345                 return;
1346         }
1347
1348         if (dwim_ref(cb.buf.buf, cb.buf.len, sha1, &ref) == 1 &&
1349             /* sha1 is a commit? match without further lookup */
1350             (!hashcmp(cb.nsha1, sha1) ||
1351              /* perhaps sha1 is a tag, try to dereference to a commit */
1352              ((commit = lookup_commit_reference_gently(sha1, 1)) != NULL &&
1353               !hashcmp(cb.nsha1, commit->object.oid.hash)))) {
1354                 const char *from = ref;
1355                 if (!skip_prefix(from, "refs/tags/", &from))
1356                         skip_prefix(from, "refs/remotes/", &from);
1357                 state->detached_from = xstrdup(from);
1358         } else
1359                 state->detached_from =
1360                         xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV));
1361         hashcpy(state->detached_sha1, cb.nsha1);
1362         state->detached_at = !get_sha1("HEAD", sha1) &&
1363                              !hashcmp(sha1, state->detached_sha1);
1364
1365         free(ref);
1366         strbuf_release(&cb.buf);
1367 }
1368
1369 int wt_status_check_rebase(const struct worktree *wt,
1370                            struct wt_status_state *state)
1371 {
1372         struct stat st;
1373
1374         if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1375                 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1376                         state->am_in_progress = 1;
1377                         if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1378                                 state->am_empty_patch = 1;
1379                 } else {
1380                         state->rebase_in_progress = 1;
1381                         state->branch = get_branch(wt, "rebase-apply/head-name");
1382                         state->onto = get_branch(wt, "rebase-apply/onto");
1383                 }
1384         } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1385                 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1386                         state->rebase_interactive_in_progress = 1;
1387                 else
1388                         state->rebase_in_progress = 1;
1389                 state->branch = get_branch(wt, "rebase-merge/head-name");
1390                 state->onto = get_branch(wt, "rebase-merge/onto");
1391         } else
1392                 return 0;
1393         return 1;
1394 }
1395
1396 int wt_status_check_bisect(const struct worktree *wt,
1397                            struct wt_status_state *state)
1398 {
1399         struct stat st;
1400
1401         if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1402                 state->bisect_in_progress = 1;
1403                 state->branch = get_branch(wt, "BISECT_START");
1404                 return 1;
1405         }
1406         return 0;
1407 }
1408
1409 void wt_status_get_state(struct wt_status_state *state,
1410                          int get_detached_from)
1411 {
1412         struct stat st;
1413         unsigned char sha1[20];
1414
1415         if (!stat(git_path_merge_head(), &st)) {
1416                 state->merge_in_progress = 1;
1417         } else if (wt_status_check_rebase(NULL, state)) {
1418                 ;               /* all set */
1419         } else if (!stat(git_path_cherry_pick_head(), &st) &&
1420                         !get_sha1("CHERRY_PICK_HEAD", sha1)) {
1421                 state->cherry_pick_in_progress = 1;
1422                 hashcpy(state->cherry_pick_head_sha1, sha1);
1423         }
1424         wt_status_check_bisect(NULL, state);
1425         if (!stat(git_path_revert_head(), &st) &&
1426             !get_sha1("REVERT_HEAD", sha1)) {
1427                 state->revert_in_progress = 1;
1428                 hashcpy(state->revert_head_sha1, sha1);
1429         }
1430
1431         if (get_detached_from)
1432                 wt_status_get_detached_from(state);
1433 }
1434
1435 static void wt_status_print_state(struct wt_status *s,
1436                                   struct wt_status_state *state)
1437 {
1438         const char *state_color = color(WT_STATUS_HEADER, s);
1439         if (state->merge_in_progress)
1440                 show_merge_in_progress(s, state, state_color);
1441         else if (state->am_in_progress)
1442                 show_am_in_progress(s, state, state_color);
1443         else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1444                 show_rebase_in_progress(s, state, state_color);
1445         else if (state->cherry_pick_in_progress)
1446                 show_cherry_pick_in_progress(s, state, state_color);
1447         else if (state->revert_in_progress)
1448                 show_revert_in_progress(s, state, state_color);
1449         if (state->bisect_in_progress)
1450                 show_bisect_in_progress(s, state, state_color);
1451 }
1452
1453 void wt_status_print(struct wt_status *s)
1454 {
1455         const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1456         const char *branch_status_color = color(WT_STATUS_HEADER, s);
1457         struct wt_status_state state;
1458
1459         memset(&state, 0, sizeof(state));
1460         wt_status_get_state(&state,
1461                             s->branch && !strcmp(s->branch, "HEAD"));
1462
1463         if (s->branch) {
1464                 const char *on_what = _("On branch ");
1465                 const char *branch_name = s->branch;
1466                 if (!strcmp(branch_name, "HEAD")) {
1467                         branch_status_color = color(WT_STATUS_NOBRANCH, s);
1468                         if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
1469                                 if (state.rebase_interactive_in_progress)
1470                                         on_what = _("interactive rebase in progress; onto ");
1471                                 else
1472                                         on_what = _("rebase in progress; onto ");
1473                                 branch_name = state.onto;
1474                         } else if (state.detached_from) {
1475                                 branch_name = state.detached_from;
1476                                 if (state.detached_at)
1477                                         on_what = _("HEAD detached at ");
1478                                 else
1479                                         on_what = _("HEAD detached from ");
1480                         } else {
1481                                 branch_name = "";
1482                                 on_what = _("Not currently on any branch.");
1483                         }
1484                 } else
1485                         skip_prefix(branch_name, "refs/heads/", &branch_name);
1486                 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1487                 status_printf_more(s, branch_status_color, "%s", on_what);
1488                 status_printf_more(s, branch_color, "%s\n", branch_name);
1489                 if (!s->is_initial)
1490                         wt_status_print_tracking(s);
1491         }
1492
1493         wt_status_print_state(s, &state);
1494         free(state.branch);
1495         free(state.onto);
1496         free(state.detached_from);
1497
1498         if (s->is_initial) {
1499                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1500                 status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
1501                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1502         }
1503
1504         wt_status_print_updated(s);
1505         wt_status_print_unmerged(s);
1506         wt_status_print_changed(s);
1507         if (s->submodule_summary &&
1508             (!s->ignore_submodule_arg ||
1509              strcmp(s->ignore_submodule_arg, "all"))) {
1510                 wt_status_print_submodule_summary(s, 0);  /* staged */
1511                 wt_status_print_submodule_summary(s, 1);  /* unstaged */
1512         }
1513         if (s->show_untracked_files) {
1514                 wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
1515                 if (s->show_ignored_files)
1516                         wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1517                 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1518                         status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1519                         status_printf_ln(s, GIT_COLOR_NORMAL,
1520                                          _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1521                                            "may speed it up, but you have to be careful not to forget to add\n"
1522                                            "new files yourself (see 'git help status')."),
1523                                          s->untracked_in_ms / 1000.0);
1524                 }
1525         } else if (s->commitable)
1526                 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1527                         s->hints
1528                         ? _(" (use -u option to show untracked files)") : "");
1529
1530         if (s->verbose)
1531                 wt_status_print_verbose(s);
1532         if (!s->commitable) {
1533                 if (s->amend)
1534                         status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1535                 else if (s->nowarn)
1536                         ; /* nothing */
1537                 else if (s->workdir_dirty) {
1538                         if (s->hints)
1539                                 printf(_("no changes added to commit "
1540                                          "(use \"git add\" and/or \"git commit -a\")\n"));
1541                         else
1542                                 printf(_("no changes added to commit\n"));
1543                 } else if (s->untracked.nr) {
1544                         if (s->hints)
1545                                 printf(_("nothing added to commit but untracked files "
1546                                          "present (use \"git add\" to track)\n"));
1547                         else
1548                                 printf(_("nothing added to commit but untracked files present\n"));
1549                 } else if (s->is_initial) {
1550                         if (s->hints)
1551                                 printf(_("nothing to commit (create/copy files "
1552                                          "and use \"git add\" to track)\n"));
1553                         else
1554                                 printf(_("nothing to commit\n"));
1555                 } else if (!s->show_untracked_files) {
1556                         if (s->hints)
1557                                 printf(_("nothing to commit (use -u to show untracked files)\n"));
1558                         else
1559                                 printf(_("nothing to commit\n"));
1560                 } else
1561                         printf(_("nothing to commit, working tree clean\n"));
1562         }
1563 }
1564
1565 static void wt_shortstatus_unmerged(struct string_list_item *it,
1566                            struct wt_status *s)
1567 {
1568         struct wt_status_change_data *d = it->util;
1569         const char *how = "??";
1570
1571         switch (d->stagemask) {
1572         case 1: how = "DD"; break; /* both deleted */
1573         case 2: how = "AU"; break; /* added by us */
1574         case 3: how = "UD"; break; /* deleted by them */
1575         case 4: how = "UA"; break; /* added by them */
1576         case 5: how = "DU"; break; /* deleted by us */
1577         case 6: how = "AA"; break; /* both added */
1578         case 7: how = "UU"; break; /* both modified */
1579         }
1580         color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1581         if (s->null_termination) {
1582                 fprintf(stdout, " %s%c", it->string, 0);
1583         } else {
1584                 struct strbuf onebuf = STRBUF_INIT;
1585                 const char *one;
1586                 one = quote_path(it->string, s->prefix, &onebuf);
1587                 printf(" %s\n", one);
1588                 strbuf_release(&onebuf);
1589         }
1590 }
1591
1592 static void wt_shortstatus_status(struct string_list_item *it,
1593                          struct wt_status *s)
1594 {
1595         struct wt_status_change_data *d = it->util;
1596
1597         if (d->index_status)
1598                 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1599         else
1600                 putchar(' ');
1601         if (d->worktree_status)
1602                 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1603         else
1604                 putchar(' ');
1605         putchar(' ');
1606         if (s->null_termination) {
1607                 fprintf(stdout, "%s%c", it->string, 0);
1608                 if (d->head_path)
1609                         fprintf(stdout, "%s%c", d->head_path, 0);
1610         } else {
1611                 struct strbuf onebuf = STRBUF_INIT;
1612                 const char *one;
1613                 if (d->head_path) {
1614                         one = quote_path(d->head_path, s->prefix, &onebuf);
1615                         if (*one != '"' && strchr(one, ' ') != NULL) {
1616                                 putchar('"');
1617                                 strbuf_addch(&onebuf, '"');
1618                                 one = onebuf.buf;
1619                         }
1620                         printf("%s -> ", one);
1621                         strbuf_release(&onebuf);
1622                 }
1623                 one = quote_path(it->string, s->prefix, &onebuf);
1624                 if (*one != '"' && strchr(one, ' ') != NULL) {
1625                         putchar('"');
1626                         strbuf_addch(&onebuf, '"');
1627                         one = onebuf.buf;
1628                 }
1629                 printf("%s\n", one);
1630                 strbuf_release(&onebuf);
1631         }
1632 }
1633
1634 static void wt_shortstatus_other(struct string_list_item *it,
1635                                  struct wt_status *s, const char *sign)
1636 {
1637         if (s->null_termination) {
1638                 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1639         } else {
1640                 struct strbuf onebuf = STRBUF_INIT;
1641                 const char *one;
1642                 one = quote_path(it->string, s->prefix, &onebuf);
1643                 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1644                 printf(" %s\n", one);
1645                 strbuf_release(&onebuf);
1646         }
1647 }
1648
1649 static void wt_shortstatus_print_tracking(struct wt_status *s)
1650 {
1651         struct branch *branch;
1652         const char *header_color = color(WT_STATUS_HEADER, s);
1653         const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1654         const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1655
1656         const char *base;
1657         const char *branch_name;
1658         int num_ours, num_theirs;
1659         int upstream_is_gone = 0;
1660
1661         color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1662
1663         if (!s->branch)
1664                 return;
1665         branch_name = s->branch;
1666
1667         if (s->is_initial)
1668                 color_fprintf(s->fp, header_color, _("Initial commit on "));
1669
1670         if (!strcmp(s->branch, "HEAD")) {
1671                 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1672                               _("HEAD (no branch)"));
1673                 goto conclude;
1674         }
1675
1676         skip_prefix(branch_name, "refs/heads/", &branch_name);
1677
1678         branch = branch_get(branch_name);
1679
1680         color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1681
1682         if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
1683                 if (!base)
1684                         goto conclude;
1685
1686                 upstream_is_gone = 1;
1687         }
1688
1689         base = shorten_unambiguous_ref(base, 0);
1690         color_fprintf(s->fp, header_color, "...");
1691         color_fprintf(s->fp, branch_color_remote, "%s", base);
1692         free((char *)base);
1693
1694         if (!upstream_is_gone && !num_ours && !num_theirs)
1695                 goto conclude;
1696
1697 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1698
1699         color_fprintf(s->fp, header_color, " [");
1700         if (upstream_is_gone) {
1701                 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1702         } else if (!num_ours) {
1703                 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1704                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1705         } else if (!num_theirs) {
1706                 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1707                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1708         } else {
1709                 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1710                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1711                 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1712                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1713         }
1714
1715         color_fprintf(s->fp, header_color, "]");
1716  conclude:
1717         fputc(s->null_termination ? '\0' : '\n', s->fp);
1718 }
1719
1720 void wt_shortstatus_print(struct wt_status *s)
1721 {
1722         int i;
1723
1724         if (s->show_branch)
1725                 wt_shortstatus_print_tracking(s);
1726
1727         for (i = 0; i < s->change.nr; i++) {
1728                 struct wt_status_change_data *d;
1729                 struct string_list_item *it;
1730
1731                 it = &(s->change.items[i]);
1732                 d = it->util;
1733                 if (d->stagemask)
1734                         wt_shortstatus_unmerged(it, s);
1735                 else
1736                         wt_shortstatus_status(it, s);
1737         }
1738         for (i = 0; i < s->untracked.nr; i++) {
1739                 struct string_list_item *it;
1740
1741                 it = &(s->untracked.items[i]);
1742                 wt_shortstatus_other(it, s, "??");
1743         }
1744         for (i = 0; i < s->ignored.nr; i++) {
1745                 struct string_list_item *it;
1746
1747                 it = &(s->ignored.items[i]);
1748                 wt_shortstatus_other(it, s, "!!");
1749         }
1750 }
1751
1752 void wt_porcelain_print(struct wt_status *s)
1753 {
1754         s->use_color = 0;
1755         s->relative_paths = 0;
1756         s->prefix = NULL;
1757         s->no_gettext = 1;
1758         wt_shortstatus_print(s);
1759 }