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 #include "lockfile.h"
  20
  21 static const char cut_line[] =
  22 "------------------------ >8 ------------------------\n";
  23
  24 static char default_wt_status_colors[][COLOR_MAXLEN] = {
  25         GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
  26         GIT_COLOR_GREEN,  /* WT_STATUS_UPDATED */
  27         GIT_COLOR_RED,    /* WT_STATUS_CHANGED */
  28         GIT_COLOR_RED,    /* WT_STATUS_UNTRACKED */
  29         GIT_COLOR_RED,    /* WT_STATUS_NOBRANCH */
  30         GIT_COLOR_RED,    /* WT_STATUS_UNMERGED */
  31         GIT_COLOR_GREEN,  /* WT_STATUS_LOCAL_BRANCH */
  32         GIT_COLOR_RED,    /* WT_STATUS_REMOTE_BRANCH */
  33         GIT_COLOR_NIL,    /* WT_STATUS_ONBRANCH */
  34 };
  35
  36 static const char *color(int slot, struct wt_status *s)
  37 {
  38         const char *c = "";
  39         if (want_color(s->use_color))
  40                 c = s->color_palette[slot];
  41         if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
  42                 c = s->color_palette[WT_STATUS_HEADER];
  43         return c;
  44 }
  45
  46 static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
  47                 const char *fmt, va_list ap, const char *trail)
  48 {
  49         struct strbuf sb = STRBUF_INIT;
  50         struct strbuf linebuf = STRBUF_INIT;
  51         const char *line, *eol;
  52
  53         strbuf_vaddf(&sb, fmt, ap);
  54         if (!sb.len) {
  55                 if (s->display_comment_prefix) {
  56                         strbuf_addch(&sb, comment_line_char);
  57                         if (!trail)
  58                                 strbuf_addch(&sb, ' ');
  59                 }
  60                 color_print_strbuf(s->fp, color, &sb);
  61                 if (trail)
  62                         fprintf(s->fp, "%s", trail);
  63                 strbuf_release(&sb);
  64                 return;
  65         }
  66         for (line = sb.buf; *line; line = eol + 1) {
  67                 eol = strchr(line, '\n');
  68
  69                 strbuf_reset(&linebuf);
  70                 if (at_bol && s->display_comment_prefix) {
  71                         strbuf_addch(&linebuf, comment_line_char);
  72                         if (*line != '\n' && *line != '\t')
  73                                 strbuf_addch(&linebuf, ' ');
  74                 }
  75                 if (eol)
  76                         strbuf_add(&linebuf, line, eol - line);
  77                 else
  78                         strbuf_addstr(&linebuf, line);
  79                 color_print_strbuf(s->fp, color, &linebuf);
  80                 if (eol)
  81                         fprintf(s->fp, "\n");
  82                 else
  83                         break;
  84                 at_bol = 1;
  85         }
  86         if (trail)
  87                 fprintf(s->fp, "%s", trail);
  88         strbuf_release(&linebuf);
  89         strbuf_release(&sb);
  90 }
  91
  92 void status_printf_ln(struct wt_status *s, const char *color,
  93                         const char *fmt, ...)
  94 {
  95         va_list ap;
  96
  97         va_start(ap, fmt);
  98         status_vprintf(s, 1, color, fmt, ap, "\n");
  99         va_end(ap);
 100 }
 101
 102 void status_printf(struct wt_status *s, const char *color,
 103                         const char *fmt, ...)
 104 {
 105         va_list ap;
 106
 107         va_start(ap, fmt);
 108         status_vprintf(s, 1, color, fmt, ap, NULL);
 109         va_end(ap);
 110 }
 111
 112 static void status_printf_more(struct wt_status *s, const char *color,
 113                                const char *fmt, ...)
 114 {
 115         va_list ap;
 116
 117         va_start(ap, fmt);
 118         status_vprintf(s, 0, color, fmt, ap, NULL);
 119         va_end(ap);
 120 }
 121
 122 void wt_status_prepare(struct repository *r, struct wt_status *s)
 123 {
 124         memset(s, 0, sizeof(*s));
 125         s->repo = r;
 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, NULL, 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->show_stash = 0;
 140         s->ahead_behind_flags = AHEAD_BEHIND_UNSPECIFIED;
 141         s->display_comment_prefix = 0;
 142         s->detect_rename = -1;
 143         s->rename_score = -1;
 144         s->rename_limit = -1;
 145 }
 146
 147 static void wt_longstatus_print_unmerged_header(struct wt_status *s)
 148 {
 149         int i;
 150         int del_mod_conflict = 0;
 151         int both_deleted = 0;
 152         int not_deleted = 0;
 153         const char *c = color(WT_STATUS_HEADER, s);
 154
 155         status_printf_ln(s, c, _("Unmerged paths:"));
 156
 157         for (i = 0; i < s->change.nr; i++) {
 158                 struct string_list_item *it = &(s->change.items[i]);
 159                 struct wt_status_change_data *d = it->util;
 160
 161                 switch (d->stagemask) {
 162                 case 0:
 163                         break;
 164                 case 1:
 165                         both_deleted = 1;
 166                         break;
 167                 case 3:
 168                 case 5:
 169                         del_mod_conflict = 1;
 170                         break;
 171                 default:
 172                         not_deleted = 1;
 173                         break;
 174                 }
 175         }
 176
 177         if (!s->hints)
 178                 return;
 179         if (s->whence != FROM_COMMIT)
 180                 ;
 181         else if (!s->is_initial)
 182                 status_printf_ln(s, c, _("  (use \"git reset %s <file>...\" to unstage)"), s->reference);
 183         else
 184                 status_printf_ln(s, c, _("  (use \"git rm --cached <file>...\" to unstage)"));
 185
 186         if (!both_deleted) {
 187                 if (!del_mod_conflict)
 188                         status_printf_ln(s, c, _("  (use \"git add <file>...\" to mark resolution)"));
 189                 else
 190                         status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
 191         } else if (!del_mod_conflict && !not_deleted) {
 192                 status_printf_ln(s, c, _("  (use \"git rm <file>...\" to mark resolution)"));
 193         } else {
 194                 status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
 195         }
 196         status_printf_ln(s, c, "%s", "");
 197 }
 198
 199 static void wt_longstatus_print_cached_header(struct wt_status *s)
 200 {
 201         const char *c = color(WT_STATUS_HEADER, s);
 202
 203         status_printf_ln(s, c, _("Changes to be committed:"));
 204         if (!s->hints)
 205                 return;
 206         if (s->whence != FROM_COMMIT)
 207                 ; /* NEEDSWORK: use "git reset --unresolve"??? */
 208         else if (!s->is_initial)
 209                 status_printf_ln(s, c, _("  (use \"git reset %s <file>...\" to unstage)"), s->reference);
 210         else
 211                 status_printf_ln(s, c, _("  (use \"git rm --cached <file>...\" to unstage)"));
 212         status_printf_ln(s, c, "%s", "");
 213 }
 214
 215 static void wt_longstatus_print_dirty_header(struct wt_status *s,
 216                                              int has_deleted,
 217                                              int has_dirty_submodules)
 218 {
 219         const char *c = color(WT_STATUS_HEADER, s);
 220
 221         status_printf_ln(s, c, _("Changes not staged for commit:"));
 222         if (!s->hints)
 223                 return;
 224         if (!has_deleted)
 225                 status_printf_ln(s, c, _("  (use \"git add <file>...\" to update what will be committed)"));
 226         else
 227                 status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" to update what will be committed)"));
 228         status_printf_ln(s, c, _("  (use \"git checkout -- <file>...\" to discard changes in working directory)"));
 229         if (has_dirty_submodules)
 230                 status_printf_ln(s, c, _("  (commit or discard the untracked or modified content in submodules)"));
 231         status_printf_ln(s, c, "%s", "");
 232 }
 233
 234 static void wt_longstatus_print_other_header(struct wt_status *s,
 235                                              const char *what,
 236                                              const char *how)
 237 {
 238         const char *c = color(WT_STATUS_HEADER, s);
 239         status_printf_ln(s, c, "%s:", what);
 240         if (!s->hints)
 241                 return;
 242         status_printf_ln(s, c, _("  (use \"git %s <file>...\" to include in what will be committed)"), how);
 243         status_printf_ln(s, c, "%s", "");
 244 }
 245
 246 static void wt_longstatus_print_trailer(struct wt_status *s)
 247 {
 248         status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
 249 }
 250
 251 #define quote_path quote_path_relative
 252
 253 static const char *wt_status_unmerged_status_string(int stagemask)
 254 {
 255         switch (stagemask) {
 256         case 1:
 257                 return _("both deleted:");
 258         case 2:
 259                 return _("added by us:");
 260         case 3:
 261                 return _("deleted by them:");
 262         case 4:
 263                 return _("added by them:");
 264         case 5:
 265                 return _("deleted by us:");
 266         case 6:
 267                 return _("both added:");
 268         case 7:
 269                 return _("both modified:");
 270         default:
 271                 BUG("unhandled unmerged status %x", stagemask);
 272         }
 273 }
 274
 275 static const char *wt_status_diff_status_string(int status)
 276 {
 277         switch (status) {
 278         case DIFF_STATUS_ADDED:
 279                 return _("new file:");
 280         case DIFF_STATUS_COPIED:
 281                 return _("copied:");
 282         case DIFF_STATUS_DELETED:
 283                 return _("deleted:");
 284         case DIFF_STATUS_MODIFIED:
 285                 return _("modified:");
 286         case DIFF_STATUS_RENAMED:
 287                 return _("renamed:");
 288         case DIFF_STATUS_TYPE_CHANGED:
 289                 return _("typechange:");
 290         case DIFF_STATUS_UNKNOWN:
 291                 return _("unknown:");
 292         case DIFF_STATUS_UNMERGED:
 293                 return _("unmerged:");
 294         default:
 295                 return NULL;
 296         }
 297 }
 298
 299 static int maxwidth(const char *(*label)(int), int minval, int maxval)
 300 {
 301         int result = 0, i;
 302
 303         for (i = minval; i <= maxval; i++) {
 304                 const char *s = label(i);
 305                 int len = s ? utf8_strwidth(s) : 0;
 306                 if (len > result)
 307                         result = len;
 308         }
 309         return result;
 310 }
 311
 312 static void wt_longstatus_print_unmerged_data(struct wt_status *s,
 313                                               struct string_list_item *it)
 314 {
 315         const char *c = color(WT_STATUS_UNMERGED, s);
 316         struct wt_status_change_data *d = it->util;
 317         struct strbuf onebuf = STRBUF_INIT;
 318         static char *padding;
 319         static int label_width;
 320         const char *one, *how;
 321         int len;
 322
 323         if (!padding) {
 324                 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
 325                 label_width += strlen(" ");
 326                 padding = xmallocz(label_width);
 327                 memset(padding, ' ', label_width);
 328         }
 329
 330         one = quote_path(it->string, s->prefix, &onebuf);
 331         status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 332
 333         how = wt_status_unmerged_status_string(d->stagemask);
 334         len = label_width - utf8_strwidth(how);
 335         status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
 336         strbuf_release(&onebuf);
 337 }
 338
 339 static void wt_longstatus_print_change_data(struct wt_status *s,
 340                                             int change_type,
 341                                             struct string_list_item *it)
 342 {
 343         struct wt_status_change_data *d = it->util;
 344         const char *c = color(change_type, s);
 345         int status;
 346         char *one_name;
 347         char *two_name;
 348         const char *one, *two;
 349         struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
 350         struct strbuf extra = STRBUF_INIT;
 351         static char *padding;
 352         static int label_width;
 353         const char *what;
 354         int len;
 355
 356         if (!padding) {
 357                 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
 358                 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
 359                 label_width += strlen(" ");
 360                 padding = xmallocz(label_width);
 361                 memset(padding, ' ', label_width);
 362         }
 363
 364         one_name = two_name = it->string;
 365         switch (change_type) {
 366         case WT_STATUS_UPDATED:
 367                 status = d->index_status;
 368                 break;
 369         case WT_STATUS_CHANGED:
 370                 if (d->new_submodule_commits || d->dirty_submodule) {
 371                         strbuf_addstr(&extra, " (");
 372                         if (d->new_submodule_commits)
 373                                 strbuf_addstr(&extra, _("new commits, "));
 374                         if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
 375                                 strbuf_addstr(&extra, _("modified content, "));
 376                         if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
 377                                 strbuf_addstr(&extra, _("untracked content, "));
 378                         strbuf_setlen(&extra, extra.len - 2);
 379                         strbuf_addch(&extra, ')');
 380                 }
 381                 status = d->worktree_status;
 382                 break;
 383         default:
 384                 BUG("unhandled change_type %d in wt_longstatus_print_change_data",
 385                     change_type);
 386         }
 387
 388         /*
 389          * Only pick up the rename it's relevant. If the rename is for
 390          * the changed section and we're printing the updated section,
 391          * ignore it.
 392          */
 393         if (d->rename_status == status)
 394                 one_name = d->rename_source;
 395
 396         one = quote_path(one_name, s->prefix, &onebuf);
 397         two = quote_path(two_name, s->prefix, &twobuf);
 398
 399         status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 400         what = wt_status_diff_status_string(status);
 401         if (!what)
 402                 BUG("unhandled diff status %c", status);
 403         len = label_width - utf8_strwidth(what);
 404         assert(len >= 0);
 405         if (one_name != two_name)
 406                 status_printf_more(s, c, "%s%.*s%s -> %s",
 407                                    what, len, padding, one, two);
 408         else
 409                 status_printf_more(s, c, "%s%.*s%s",
 410                                    what, len, padding, one);
 411         if (extra.len) {
 412                 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
 413                 strbuf_release(&extra);
 414         }
 415         status_printf_more(s, GIT_COLOR_NORMAL, "\n");
 416         strbuf_release(&onebuf);
 417         strbuf_release(&twobuf);
 418 }
 419
 420 static char short_submodule_status(struct wt_status_change_data *d)
 421 {
 422         if (d->new_submodule_commits)
 423                 return 'M';
 424         if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
 425                 return 'm';
 426         if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
 427                 return '?';
 428         return d->worktree_status;
 429 }
 430
 431 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
 432                                          struct diff_options *options,
 433                                          void *data)
 434 {
 435         struct wt_status *s = data;
 436         int i;
 437
 438         if (!q->nr)
 439                 return;
 440         s->workdir_dirty = 1;
 441         for (i = 0; i < q->nr; i++) {
 442                 struct diff_filepair *p;
 443                 struct string_list_item *it;
 444                 struct wt_status_change_data *d;
 445
 446                 p = q->queue[i];
 447                 it = string_list_insert(&s->change, p->two->path);
 448                 d = it->util;
 449                 if (!d) {
 450                         d = xcalloc(1, sizeof(*d));
 451                         it->util = d;
 452                 }
 453                 if (!d->worktree_status)
 454                         d->worktree_status = p->status;
 455                 if (S_ISGITLINK(p->two->mode)) {
 456                         d->dirty_submodule = p->two->dirty_submodule;
 457                         d->new_submodule_commits = !oideq(&p->one->oid,
 458                                                           &p->two->oid);
 459                         if (s->status_format == STATUS_FORMAT_SHORT)
 460                                 d->worktree_status = short_submodule_status(d);
 461                 }
 462
 463                 switch (p->status) {
 464                 case DIFF_STATUS_ADDED:
 465                         d->mode_worktree = p->two->mode;
 466                         break;
 467
 468                 case DIFF_STATUS_DELETED:
 469                         d->mode_index = p->one->mode;
 470                         oidcpy(&d->oid_index, &p->one->oid);
 471                         /* mode_worktree is zero for a delete. */
 472                         break;
 473
 474                 case DIFF_STATUS_COPIED:
 475                 case DIFF_STATUS_RENAMED:
 476                         if (d->rename_status)
 477                                 BUG("multiple renames on the same target? how?");
 478                         d->rename_source = xstrdup(p->one->path);
 479                         d->rename_score = p->score * 100 / MAX_SCORE;
 480                         d->rename_status = p->status;
 481                         /* fallthru */
 482                 case DIFF_STATUS_MODIFIED:
 483                 case DIFF_STATUS_TYPE_CHANGED:
 484                 case DIFF_STATUS_UNMERGED:
 485                         d->mode_index = p->one->mode;
 486                         d->mode_worktree = p->two->mode;
 487                         oidcpy(&d->oid_index, &p->one->oid);
 488                         break;
 489
 490                 default:
 491                         BUG("unhandled diff-files status '%c'", p->status);
 492                         break;
 493                 }
 494
 495         }
 496 }
 497
 498 static int unmerged_mask(struct index_state *istate, const char *path)
 499 {
 500         int pos, mask;
 501         const struct cache_entry *ce;
 502
 503         pos = index_name_pos(istate, path, strlen(path));
 504         if (0 <= pos)
 505                 return 0;
 506
 507         mask = 0;
 508         pos = -pos-1;
 509         while (pos < istate->cache_nr) {
 510                 ce = istate->cache[pos++];
 511                 if (strcmp(ce->name, path) || !ce_stage(ce))
 512                         break;
 513                 mask |= (1 << (ce_stage(ce) - 1));
 514         }
 515         return mask;
 516 }
 517
 518 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
 519                                          struct diff_options *options,
 520                                          void *data)
 521 {
 522         struct wt_status *s = data;
 523         int i;
 524
 525         for (i = 0; i < q->nr; i++) {
 526                 struct diff_filepair *p;
 527                 struct string_list_item *it;
 528                 struct wt_status_change_data *d;
 529
 530                 p = q->queue[i];
 531                 it = string_list_insert(&s->change, p->two->path);
 532                 d = it->util;
 533                 if (!d) {
 534                         d = xcalloc(1, sizeof(*d));
 535                         it->util = d;
 536                 }
 537                 if (!d->index_status)
 538                         d->index_status = p->status;
 539                 switch (p->status) {
 540                 case DIFF_STATUS_ADDED:
 541                         /* Leave {mode,oid}_head zero for an add. */
 542                         d->mode_index = p->two->mode;
 543                         oidcpy(&d->oid_index, &p->two->oid);
 544                         s->committable = 1;
 545                         break;
 546                 case DIFF_STATUS_DELETED:
 547                         d->mode_head = p->one->mode;
 548                         oidcpy(&d->oid_head, &p->one->oid);
 549                         s->committable = 1;
 550                         /* Leave {mode,oid}_index zero for a delete. */
 551                         break;
 552
 553                 case DIFF_STATUS_COPIED:
 554                 case DIFF_STATUS_RENAMED:
 555                         if (d->rename_status)
 556                                 BUG("multiple renames on the same target? how?");
 557                         d->rename_source = xstrdup(p->one->path);
 558                         d->rename_score = p->score * 100 / MAX_SCORE;
 559                         d->rename_status = p->status;
 560                         /* fallthru */
 561                 case DIFF_STATUS_MODIFIED:
 562                 case DIFF_STATUS_TYPE_CHANGED:
 563                         d->mode_head = p->one->mode;
 564                         d->mode_index = p->two->mode;
 565                         oidcpy(&d->oid_head, &p->one->oid);
 566                         oidcpy(&d->oid_index, &p->two->oid);
 567                         s->committable = 1;
 568                         break;
 569                 case DIFF_STATUS_UNMERGED:
 570                         d->stagemask = unmerged_mask(s->repo->index,
 571                                                      p->two->path);
 572                         /*
 573                          * Don't bother setting {mode,oid}_{head,index} since the print
 574                          * code will output the stage values directly and not use the
 575                          * values in these fields.
 576                          */
 577                         break;
 578
 579                 default:
 580                         BUG("unhandled diff-index status '%c'", p->status);
 581                         break;
 582                 }
 583         }
 584 }
 585
 586 static void wt_status_collect_changes_worktree(struct wt_status *s)
 587 {
 588         struct rev_info rev;
 589
 590         repo_init_revisions(s->repo, &rev, NULL);
 591         setup_revisions(0, NULL, &rev, NULL);
 592         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 593         rev.diffopt.flags.dirty_submodules = 1;
 594         rev.diffopt.ita_invisible_in_index = 1;
 595         if (!s->show_untracked_files)
 596                 rev.diffopt.flags.ignore_untracked_in_submodules = 1;
 597         if (s->ignore_submodule_arg) {
 598                 rev.diffopt.flags.override_submodule_config = 1;
 599                 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 600         }
 601         rev.diffopt.format_callback = wt_status_collect_changed_cb;
 602         rev.diffopt.format_callback_data = s;
 603         rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
 604         rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
 605         rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
 606         copy_pathspec(&rev.prune_data, &s->pathspec);
 607         run_diff_files(&rev, 0);
 608 }
 609
 610 static void wt_status_collect_changes_index(struct wt_status *s)
 611 {
 612         struct rev_info rev;
 613         struct setup_revision_opt opt;
 614
 615         repo_init_revisions(s->repo, &rev, NULL);
 616         memset(&opt, 0, sizeof(opt));
 617         opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
 618         setup_revisions(0, NULL, &rev, &opt);
 619
 620         rev.diffopt.flags.override_submodule_config = 1;
 621         rev.diffopt.ita_invisible_in_index = 1;
 622         if (s->ignore_submodule_arg) {
 623                 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
 624         } else {
 625                 /*
 626                  * Unless the user did explicitly request a submodule ignore
 627                  * mode by passing a command line option we do not ignore any
 628                  * changed submodule SHA-1s when comparing index and HEAD, no
 629                  * matter what is configured. Otherwise the user won't be
 630                  * shown any submodules she manually added (and which are
 631                  * staged to be committed), which would be really confusing.
 632                  */
 633                 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
 634         }
 635
 636         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 637         rev.diffopt.format_callback = wt_status_collect_updated_cb;
 638         rev.diffopt.format_callback_data = s;
 639         rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
 640         rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
 641         rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
 642         copy_pathspec(&rev.prune_data, &s->pathspec);
 643         run_diff_index(&rev, 1);
 644 }
 645
 646 static void wt_status_collect_changes_initial(struct wt_status *s)
 647 {
 648         struct index_state *istate = s->repo->index;
 649         int i;
 650
 651         for (i = 0; i < istate->cache_nr; i++) {
 652                 struct string_list_item *it;
 653                 struct wt_status_change_data *d;
 654                 const struct cache_entry *ce = istate->cache[i];
 655
 656                 if (!ce_path_match(istate, ce, &s->pathspec, NULL))
 657                         continue;
 658                 if (ce_intent_to_add(ce))
 659                         continue;
 660                 it = string_list_insert(&s->change, ce->name);
 661                 d = it->util;
 662                 if (!d) {
 663                         d = xcalloc(1, sizeof(*d));
 664                         it->util = d;
 665                 }
 666                 if (ce_stage(ce)) {
 667                         d->index_status = DIFF_STATUS_UNMERGED;
 668                         d->stagemask |= (1 << (ce_stage(ce) - 1));
 669                         /*
 670                          * Don't bother setting {mode,oid}_{head,index} since the print
 671                          * code will output the stage values directly and not use the
 672                          * values in these fields.
 673                          */
 674                         s->committable = 1;
 675                 } else {
 676                         d->index_status = DIFF_STATUS_ADDED;
 677                         /* Leave {mode,oid}_head zero for adds. */
 678                         d->mode_index = ce->ce_mode;
 679                         oidcpy(&d->oid_index, &ce->oid);
 680                         s->committable = 1;
 681                 }
 682         }
 683 }
 684
 685 static void wt_status_collect_untracked(struct wt_status *s)
 686 {
 687         int i;
 688         struct dir_struct dir;
 689         uint64_t t_begin = getnanotime();
 690         struct index_state *istate = s->repo->index;
 691
 692         if (!s->show_untracked_files)
 693                 return;
 694
 695         memset(&dir, 0, sizeof(dir));
 696         if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
 697                 dir.flags |=
 698                         DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
 699         if (s->show_ignored_mode) {
 700                 dir.flags |= DIR_SHOW_IGNORED_TOO;
 701
 702                 if (s->show_ignored_mode == SHOW_MATCHING_IGNORED)
 703                         dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
 704         } else {
 705                 dir.untracked = istate->untracked;
 706         }
 707
 708         setup_standard_excludes(&dir);
 709
 710         fill_directory(&dir, istate, &s->pathspec);
 711
 712         for (i = 0; i < dir.nr; i++) {
 713                 struct dir_entry *ent = dir.entries[i];
 714                 if (index_name_is_other(istate, ent->name, ent->len) &&
 715                     dir_path_match(istate, ent, &s->pathspec, 0, NULL))
 716                         string_list_insert(&s->untracked, ent->name);
 717                 free(ent);
 718         }
 719
 720         for (i = 0; i < dir.ignored_nr; i++) {
 721                 struct dir_entry *ent = dir.ignored[i];
 722                 if (index_name_is_other(istate, ent->name, ent->len) &&
 723                     dir_path_match(istate, ent, &s->pathspec, 0, NULL))
 724                         string_list_insert(&s->ignored, ent->name);
 725                 free(ent);
 726         }
 727
 728         free(dir.entries);
 729         free(dir.ignored);
 730         clear_directory(&dir);
 731
 732         if (advice_status_u_option)
 733                 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
 734 }
 735
 736 static int has_unmerged(struct wt_status *s)
 737 {
 738         int i;
 739
 740         for (i = 0; i < s->change.nr; i++) {
 741                 struct wt_status_change_data *d;
 742                 d = s->change.items[i].util;
 743                 if (d->stagemask)
 744                         return 1;
 745         }
 746         return 0;
 747 }
 748
 749 void wt_status_collect(struct wt_status *s)
 750 {
 751         wt_status_collect_changes_worktree(s);
 752         if (s->is_initial)
 753                 wt_status_collect_changes_initial(s);
 754         else
 755                 wt_status_collect_changes_index(s);
 756         wt_status_collect_untracked(s);
 757
 758         wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
 759         if (s->state.merge_in_progress && !has_unmerged(s))
 760                 s->committable = 1;
 761 }
 762
 763 void wt_status_collect_free_buffers(struct wt_status *s)
 764 {
 765         free(s->state.branch);
 766         free(s->state.onto);
 767         free(s->state.detached_from);
 768 }
 769
 770 static void wt_longstatus_print_unmerged(struct wt_status *s)
 771 {
 772         int shown_header = 0;
 773         int i;
 774
 775         for (i = 0; i < s->change.nr; i++) {
 776                 struct wt_status_change_data *d;
 777                 struct string_list_item *it;
 778                 it = &(s->change.items[i]);
 779                 d = it->util;
 780                 if (!d->stagemask)
 781                         continue;
 782                 if (!shown_header) {
 783                         wt_longstatus_print_unmerged_header(s);
 784                         shown_header = 1;
 785                 }
 786                 wt_longstatus_print_unmerged_data(s, it);
 787         }
 788         if (shown_header)
 789                 wt_longstatus_print_trailer(s);
 790
 791 }
 792
 793 static void wt_longstatus_print_updated(struct wt_status *s)
 794 {
 795         int shown_header = 0;
 796         int i;
 797
 798         for (i = 0; i < s->change.nr; i++) {
 799                 struct wt_status_change_data *d;
 800                 struct string_list_item *it;
 801                 it = &(s->change.items[i]);
 802                 d = it->util;
 803                 if (!d->index_status ||
 804                     d->index_status == DIFF_STATUS_UNMERGED)
 805                         continue;
 806                 if (!shown_header) {
 807                         wt_longstatus_print_cached_header(s);
 808                         shown_header = 1;
 809                 }
 810                 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
 811         }
 812         if (shown_header)
 813                 wt_longstatus_print_trailer(s);
 814 }
 815
 816 /*
 817  * -1 : has delete
 818  *  0 : no change
 819  *  1 : some change but no delete
 820  */
 821 static int wt_status_check_worktree_changes(struct wt_status *s,
 822                                              int *dirty_submodules)
 823 {
 824         int i;
 825         int changes = 0;
 826
 827         *dirty_submodules = 0;
 828
 829         for (i = 0; i < s->change.nr; i++) {
 830                 struct wt_status_change_data *d;
 831                 d = s->change.items[i].util;
 832                 if (!d->worktree_status ||
 833                     d->worktree_status == DIFF_STATUS_UNMERGED)
 834                         continue;
 835                 if (!changes)
 836                         changes = 1;
 837                 if (d->dirty_submodule)
 838                         *dirty_submodules = 1;
 839                 if (d->worktree_status == DIFF_STATUS_DELETED)
 840                         changes = -1;
 841         }
 842         return changes;
 843 }
 844
 845 static void wt_longstatus_print_changed(struct wt_status *s)
 846 {
 847         int i, dirty_submodules;
 848         int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
 849
 850         if (!worktree_changes)
 851                 return;
 852
 853         wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
 854
 855         for (i = 0; i < s->change.nr; i++) {
 856                 struct wt_status_change_data *d;
 857                 struct string_list_item *it;
 858                 it = &(s->change.items[i]);
 859                 d = it->util;
 860                 if (!d->worktree_status ||
 861                     d->worktree_status == DIFF_STATUS_UNMERGED)
 862                         continue;
 863                 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
 864         }
 865         wt_longstatus_print_trailer(s);
 866 }
 867
 868 static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
 869                             const char *email, timestamp_t timestamp, int tz,
 870                             const char *message, void *cb_data)
 871 {
 872         int *c = cb_data;
 873         (*c)++;
 874         return 0;
 875 }
 876
 877 static void wt_longstatus_print_stash_summary(struct wt_status *s)
 878 {
 879         int stash_count = 0;
 880
 881         for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
 882         if (stash_count > 0)
 883                 status_printf_ln(s, GIT_COLOR_NORMAL,
 884                                  Q_("Your stash currently has %d entry",
 885                                     "Your stash currently has %d entries", stash_count),
 886                                  stash_count);
 887 }
 888
 889 static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
 890 {
 891         struct child_process sm_summary = CHILD_PROCESS_INIT;
 892         struct strbuf cmd_stdout = STRBUF_INIT;
 893         struct strbuf summary = STRBUF_INIT;
 894         char *summary_content;
 895
 896         argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
 897                          s->index_file);
 898
 899         argv_array_push(&sm_summary.args, "submodule");
 900         argv_array_push(&sm_summary.args, "summary");
 901         argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
 902         argv_array_push(&sm_summary.args, "--for-status");
 903         argv_array_push(&sm_summary.args, "--summary-limit");
 904         argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
 905         if (!uncommitted)
 906                 argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
 907
 908         sm_summary.git_cmd = 1;
 909         sm_summary.no_stdin = 1;
 910
 911         capture_command(&sm_summary, &cmd_stdout, 1024);
 912
 913         /* prepend header, only if there's an actual output */
 914         if (cmd_stdout.len) {
 915                 if (uncommitted)
 916                         strbuf_addstr(&summary, _("Submodules changed but not updated:"));
 917                 else
 918                         strbuf_addstr(&summary, _("Submodule changes to be committed:"));
 919                 strbuf_addstr(&summary, "\n\n");
 920         }
 921         strbuf_addbuf(&summary, &cmd_stdout);
 922         strbuf_release(&cmd_stdout);
 923
 924         if (s->display_comment_prefix) {
 925                 size_t len;
 926                 summary_content = strbuf_detach(&summary, &len);
 927                 strbuf_add_commented_lines(&summary, summary_content, len);
 928                 free(summary_content);
 929         }
 930
 931         fputs(summary.buf, s->fp);
 932         strbuf_release(&summary);
 933 }
 934
 935 static void wt_longstatus_print_other(struct wt_status *s,
 936                                       struct string_list *l,
 937                                       const char *what,
 938                                       const char *how)
 939 {
 940         int i;
 941         struct strbuf buf = STRBUF_INIT;
 942         static struct string_list output = STRING_LIST_INIT_DUP;
 943         struct column_options copts;
 944
 945         if (!l->nr)
 946                 return;
 947
 948         wt_longstatus_print_other_header(s, what, how);
 949
 950         for (i = 0; i < l->nr; i++) {
 951                 struct string_list_item *it;
 952                 const char *path;
 953                 it = &(l->items[i]);
 954                 path = quote_path(it->string, s->prefix, &buf);
 955                 if (column_active(s->colopts)) {
 956                         string_list_append(&output, path);
 957                         continue;
 958                 }
 959                 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 960                 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
 961                                    "%s\n", path);
 962         }
 963
 964         strbuf_release(&buf);
 965         if (!column_active(s->colopts))
 966                 goto conclude;
 967
 968         strbuf_addf(&buf, "%s%s\t%s",
 969                     color(WT_STATUS_HEADER, s),
 970                     s->display_comment_prefix ? "#" : "",
 971                     color(WT_STATUS_UNTRACKED, s));
 972         memset(&copts, 0, sizeof(copts));
 973         copts.padding = 1;
 974         copts.indent = buf.buf;
 975         if (want_color(s->use_color))
 976                 copts.nl = GIT_COLOR_RESET "\n";
 977         print_columns(&output, s->colopts, &copts);
 978         string_list_clear(&output, 0);
 979         strbuf_release(&buf);
 980 conclude:
 981         status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
 982 }
 983
 984 size_t wt_status_locate_end(const char *s, size_t len)
 985 {
 986         const char *p;
 987         struct strbuf pattern = STRBUF_INIT;
 988
 989         strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
 990         if (starts_with(s, pattern.buf + 1))
 991                 len = 0;
 992         else if ((p = strstr(s, pattern.buf)))
 993                 len = p - s + 1;
 994         strbuf_release(&pattern);
 995         return len;
 996 }
 997
 998 void wt_status_add_cut_line(FILE *fp)
 999 {
1000         const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
1001         struct strbuf buf = STRBUF_INIT;
1002
1003         fprintf(fp, "%c %s", comment_line_char, cut_line);
1004         strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
1005         fputs(buf.buf, fp);
1006         strbuf_release(&buf);
1007 }
1008
1009 static void wt_longstatus_print_verbose(struct wt_status *s)
1010 {
1011         struct rev_info rev;
1012         struct setup_revision_opt opt;
1013         int dirty_submodules;
1014         const char *c = color(WT_STATUS_HEADER, s);
1015
1016         repo_init_revisions(s->repo, &rev, NULL);
1017         rev.diffopt.flags.allow_textconv = 1;
1018         rev.diffopt.ita_invisible_in_index = 1;
1019
1020         memset(&opt, 0, sizeof(opt));
1021         opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
1022         setup_revisions(0, NULL, &rev, &opt);
1023
1024         rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
1025         rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1026         rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1027         rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
1028         rev.diffopt.file = s->fp;
1029         rev.diffopt.close_file = 0;
1030         /*
1031          * If we're not going to stdout, then we definitely don't
1032          * want color, since we are going to the commit message
1033          * file (and even the "auto" setting won't work, since it
1034          * will have checked isatty on stdout). But we then do want
1035          * to insert the scissor line here to reliably remove the
1036          * diff before committing.
1037          */
1038         if (s->fp != stdout) {
1039                 rev.diffopt.use_color = 0;
1040                 wt_status_add_cut_line(s->fp);
1041         }
1042         if (s->verbose > 1 && s->committable) {
1043                 /* print_updated() printed a header, so do we */
1044                 if (s->fp != stdout)
1045                         wt_longstatus_print_trailer(s);
1046                 status_printf_ln(s, c, _("Changes to be committed:"));
1047                 rev.diffopt.a_prefix = "c/";
1048                 rev.diffopt.b_prefix = "i/";
1049         } /* else use prefix as per user config */
1050         run_diff_index(&rev, 1);
1051         if (s->verbose > 1 &&
1052             wt_status_check_worktree_changes(s, &dirty_submodules)) {
1053                 status_printf_ln(s, c,
1054                         "--------------------------------------------------");
1055                 status_printf_ln(s, c, _("Changes not staged for commit:"));
1056                 setup_work_tree();
1057                 rev.diffopt.a_prefix = "i/";
1058                 rev.diffopt.b_prefix = "w/";
1059                 run_diff_files(&rev, 0);
1060         }
1061 }
1062
1063 static void wt_longstatus_print_tracking(struct wt_status *s)
1064 {
1065         struct strbuf sb = STRBUF_INIT;
1066         const char *cp, *ep, *branch_name;
1067         struct branch *branch;
1068         char comment_line_string[3];
1069         int i;
1070
1071         assert(s->branch && !s->is_initial);
1072         if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
1073                 return;
1074         branch = branch_get(branch_name);
1075         if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
1076                 return;
1077
1078         i = 0;
1079         if (s->display_comment_prefix) {
1080                 comment_line_string[i++] = comment_line_char;
1081                 comment_line_string[i++] = ' ';
1082         }
1083         comment_line_string[i] = '\0';
1084
1085         for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
1086                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
1087                                  "%s%.*s", comment_line_string,
1088                                  (int)(ep - cp), cp);
1089         if (s->display_comment_prefix)
1090                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1091                                  comment_line_char);
1092         else
1093                 fputs("\n", s->fp);
1094         strbuf_release(&sb);
1095 }
1096
1097 static void show_merge_in_progress(struct wt_status *s,
1098                                    const char *color)
1099 {
1100         if (has_unmerged(s)) {
1101                 status_printf_ln(s, color, _("You have unmerged paths."));
1102                 if (s->hints) {
1103                         status_printf_ln(s, color,
1104                                          _("  (fix conflicts and run \"git commit\")"));
1105                         status_printf_ln(s, color,
1106                                          _("  (use \"git merge --abort\" to abort the merge)"));
1107                 }
1108         } else {
1109                 status_printf_ln(s, color,
1110                         _("All conflicts fixed but you are still merging."));
1111                 if (s->hints)
1112                         status_printf_ln(s, color,
1113                                 _("  (use \"git commit\" to conclude merge)"));
1114         }
1115         wt_longstatus_print_trailer(s);
1116 }
1117
1118 static void show_am_in_progress(struct wt_status *s,
1119                                 const char *color)
1120 {
1121         status_printf_ln(s, color,
1122                 _("You are in the middle of an am session."));
1123         if (s->state.am_empty_patch)
1124                 status_printf_ln(s, color,
1125                         _("The current patch is empty."));
1126         if (s->hints) {
1127                 if (!s->state.am_empty_patch)
1128                         status_printf_ln(s, color,
1129                                 _("  (fix conflicts and then run \"git am --continue\")"));
1130                 status_printf_ln(s, color,
1131                         _("  (use \"git am --skip\" to skip this patch)"));
1132                 status_printf_ln(s, color,
1133                         _("  (use \"git am --abort\" to restore the original branch)"));
1134         }
1135         wt_longstatus_print_trailer(s);
1136 }
1137
1138 static char *read_line_from_git_path(const char *filename)
1139 {
1140         struct strbuf buf = STRBUF_INIT;
1141         FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1142
1143         if (!fp) {
1144                 strbuf_release(&buf);
1145                 return NULL;
1146         }
1147         strbuf_getline_lf(&buf, fp);
1148         if (!fclose(fp)) {
1149                 return strbuf_detach(&buf, NULL);
1150         } else {
1151                 strbuf_release(&buf);
1152                 return NULL;
1153         }
1154 }
1155
1156 static int split_commit_in_progress(struct wt_status *s)
1157 {
1158         int split_in_progress = 0;
1159         char *head, *orig_head, *rebase_amend, *rebase_orig_head;
1160
1161         if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
1162             !s->branch || strcmp(s->branch, "HEAD"))
1163                 return 0;
1164
1165         head = read_line_from_git_path("HEAD");
1166         orig_head = read_line_from_git_path("ORIG_HEAD");
1167         rebase_amend = read_line_from_git_path("rebase-merge/amend");
1168         rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1169
1170         if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1171                 ; /* fall through, no split in progress */
1172         else if (!strcmp(rebase_amend, rebase_orig_head))
1173                 split_in_progress = !!strcmp(head, rebase_amend);
1174         else if (strcmp(orig_head, rebase_orig_head))
1175                 split_in_progress = 1;
1176
1177         free(head);
1178         free(orig_head);
1179         free(rebase_amend);
1180         free(rebase_orig_head);
1181
1182         return split_in_progress;
1183 }
1184
1185 /*
1186  * Turn
1187  * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1188  * into
1189  * "pick d6a2f03 some message"
1190  *
1191  * The function assumes that the line does not contain useless spaces
1192  * before or after the command.
1193  */
1194 static void abbrev_sha1_in_line(struct strbuf *line)
1195 {
1196         struct strbuf **split;
1197         int i;
1198
1199         if (starts_with(line->buf, "exec ") ||
1200             starts_with(line->buf, "x "))
1201                 return;
1202
1203         split = strbuf_split_max(line, ' ', 3);
1204         if (split[0] && split[1]) {
1205                 struct object_id oid;
1206
1207                 /*
1208                  * strbuf_split_max left a space. Trim it and re-add
1209                  * it after abbreviation.
1210                  */
1211                 strbuf_trim(split[1]);
1212                 if (!get_oid(split[1]->buf, &oid)) {
1213                         strbuf_reset(split[1]);
1214                         strbuf_add_unique_abbrev(split[1], &oid,
1215                                                  DEFAULT_ABBREV);
1216                         strbuf_addch(split[1], ' ');
1217                         strbuf_reset(line);
1218                         for (i = 0; split[i]; i++)
1219                                 strbuf_addbuf(line, split[i]);
1220                 }
1221         }
1222         strbuf_list_free(split);
1223 }
1224
1225 static int read_rebase_todolist(const char *fname, struct string_list *lines)
1226 {
1227         struct strbuf line = STRBUF_INIT;
1228         FILE *f = fopen(git_path("%s", fname), "r");
1229
1230         if (!f) {
1231                 if (errno == ENOENT)
1232                         return -1;
1233                 die_errno("Could not open file %s for reading",
1234                           git_path("%s", fname));
1235         }
1236         while (!strbuf_getline_lf(&line, f)) {
1237                 if (line.len && line.buf[0] == comment_line_char)
1238                         continue;
1239                 strbuf_trim(&line);
1240                 if (!line.len)
1241                         continue;
1242                 abbrev_sha1_in_line(&line);
1243                 string_list_append(lines, line.buf);
1244         }
1245         fclose(f);
1246         strbuf_release(&line);
1247         return 0;
1248 }
1249
1250 static void show_rebase_information(struct wt_status *s,
1251                                     const char *color)
1252 {
1253         if (s->state.rebase_interactive_in_progress) {
1254                 int i;
1255                 int nr_lines_to_show = 2;
1256
1257                 struct string_list have_done = STRING_LIST_INIT_DUP;
1258                 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1259
1260                 read_rebase_todolist("rebase-merge/done", &have_done);
1261                 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1262                                          &yet_to_do))
1263                         status_printf_ln(s, color,
1264                                 _("git-rebase-todo is missing."));
1265                 if (have_done.nr == 0)
1266                         status_printf_ln(s, color, _("No commands done."));
1267                 else {
1268                         status_printf_ln(s, color,
1269                                 Q_("Last command done (%d command done):",
1270                                         "Last commands done (%d commands done):",
1271                                         have_done.nr),
1272                                 have_done.nr);
1273                         for (i = (have_done.nr > nr_lines_to_show)
1274                                 ? have_done.nr - nr_lines_to_show : 0;
1275                                 i < have_done.nr;
1276                                 i++)
1277                                 status_printf_ln(s, color, "   %s", have_done.items[i].string);
1278                         if (have_done.nr > nr_lines_to_show && s->hints)
1279                                 status_printf_ln(s, color,
1280                                         _("  (see more in file %s)"), git_path("rebase-merge/done"));
1281                 }
1282
1283                 if (yet_to_do.nr == 0)
1284                         status_printf_ln(s, color,
1285                                          _("No commands remaining."));
1286                 else {
1287                         status_printf_ln(s, color,
1288                                 Q_("Next command to do (%d remaining command):",
1289                                         "Next commands to do (%d remaining commands):",
1290                                         yet_to_do.nr),
1291                                 yet_to_do.nr);
1292                         for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1293                                 status_printf_ln(s, color, "   %s", yet_to_do.items[i].string);
1294                         if (s->hints)
1295                                 status_printf_ln(s, color,
1296                                         _("  (use \"git rebase --edit-todo\" to view and edit)"));
1297                 }
1298                 string_list_clear(&yet_to_do, 0);
1299                 string_list_clear(&have_done, 0);
1300         }
1301 }
1302
1303 static void print_rebase_state(struct wt_status *s,
1304                                const char *color)
1305 {
1306         if (s->state.branch)
1307                 status_printf_ln(s, color,
1308                                  _("You are currently rebasing branch '%s' on '%s'."),
1309                                  s->state.branch,
1310                                  s->state.onto);
1311         else
1312                 status_printf_ln(s, color,
1313                                  _("You are currently rebasing."));
1314 }
1315
1316 static void show_rebase_in_progress(struct wt_status *s,
1317                                     const char *color)
1318 {
1319         struct stat st;
1320
1321         show_rebase_information(s, color);
1322         if (has_unmerged(s)) {
1323                 print_rebase_state(s, color);
1324                 if (s->hints) {
1325                         status_printf_ln(s, color,
1326                                 _("  (fix conflicts and then run \"git rebase --continue\")"));
1327                         status_printf_ln(s, color,
1328                                 _("  (use \"git rebase --skip\" to skip this patch)"));
1329                         status_printf_ln(s, color,
1330                                 _("  (use \"git rebase --abort\" to check out the original branch)"));
1331                 }
1332         } else if (s->state.rebase_in_progress ||
1333                    !stat(git_path_merge_msg(s->repo), &st)) {
1334                 print_rebase_state(s, color);
1335                 if (s->hints)
1336                         status_printf_ln(s, color,
1337                                 _("  (all conflicts fixed: run \"git rebase --continue\")"));
1338         } else if (split_commit_in_progress(s)) {
1339                 if (s->state.branch)
1340                         status_printf_ln(s, color,
1341                                          _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1342                                          s->state.branch,
1343                                          s->state.onto);
1344                 else
1345                         status_printf_ln(s, color,
1346                                          _("You are currently splitting a commit during a rebase."));
1347                 if (s->hints)
1348                         status_printf_ln(s, color,
1349                                 _("  (Once your working directory is clean, run \"git rebase --continue\")"));
1350         } else {
1351                 if (s->state.branch)
1352                         status_printf_ln(s, color,
1353                                          _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1354                                          s->state.branch,
1355                                          s->state.onto);
1356                 else
1357                         status_printf_ln(s, color,
1358                                          _("You are currently editing a commit during a rebase."));
1359                 if (s->hints && !s->amend) {
1360                         status_printf_ln(s, color,
1361                                 _("  (use \"git commit --amend\" to amend the current commit)"));
1362                         status_printf_ln(s, color,
1363                                 _("  (use \"git rebase --continue\" once you are satisfied with your changes)"));
1364                 }
1365         }
1366         wt_longstatus_print_trailer(s);
1367 }
1368
1369 static void show_cherry_pick_in_progress(struct wt_status *s,
1370                                          const char *color)
1371 {
1372         status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
1373                         find_unique_abbrev(&s->state.cherry_pick_head_oid, DEFAULT_ABBREV));
1374         if (s->hints) {
1375                 if (has_unmerged(s))
1376                         status_printf_ln(s, color,
1377                                 _("  (fix conflicts and run \"git cherry-pick --continue\")"));
1378                 else
1379                         status_printf_ln(s, color,
1380                                 _("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
1381                 status_printf_ln(s, color,
1382                         _("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1383         }
1384         wt_longstatus_print_trailer(s);
1385 }
1386
1387 static void show_revert_in_progress(struct wt_status *s,
1388                                     const char *color)
1389 {
1390         status_printf_ln(s, color, _("You are currently reverting commit %s."),
1391                          find_unique_abbrev(&s->state.revert_head_oid, DEFAULT_ABBREV));
1392         if (s->hints) {
1393                 if (has_unmerged(s))
1394                         status_printf_ln(s, color,
1395                                 _("  (fix conflicts and run \"git revert --continue\")"));
1396                 else
1397                         status_printf_ln(s, color,
1398                                 _("  (all conflicts fixed: run \"git revert --continue\")"));
1399                 status_printf_ln(s, color,
1400                         _("  (use \"git revert --abort\" to cancel the revert operation)"));
1401         }
1402         wt_longstatus_print_trailer(s);
1403 }
1404
1405 static void show_bisect_in_progress(struct wt_status *s,
1406                                     const char *color)
1407 {
1408         if (s->state.branch)
1409                 status_printf_ln(s, color,
1410                                  _("You are currently bisecting, started from branch '%s'."),
1411                                  s->state.branch);
1412         else
1413                 status_printf_ln(s, color,
1414                                  _("You are currently bisecting."));
1415         if (s->hints)
1416                 status_printf_ln(s, color,
1417                         _("  (use \"git bisect reset\" to get back to the original branch)"));
1418         wt_longstatus_print_trailer(s);
1419 }
1420
1421 /*
1422  * Extract branch information from rebase/bisect
1423  */
1424 static char *get_branch(const struct worktree *wt, const char *path)
1425 {
1426         struct strbuf sb = STRBUF_INIT;
1427         struct object_id oid;
1428         const char *branch_name;
1429
1430         if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1431                 goto got_nothing;
1432
1433         while (sb.len && sb.buf[sb.len - 1] == '\n')
1434                 strbuf_setlen(&sb, sb.len - 1);
1435         if (!sb.len)
1436                 goto got_nothing;
1437         if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1438                 strbuf_remove(&sb, 0, branch_name - sb.buf);
1439         else if (starts_with(sb.buf, "refs/"))
1440                 ;
1441         else if (!get_oid_hex(sb.buf, &oid)) {
1442                 strbuf_reset(&sb);
1443                 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
1444         } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1445                 goto got_nothing;
1446         else                    /* bisect */
1447                 ;
1448         return strbuf_detach(&sb, NULL);
1449
1450 got_nothing:
1451         strbuf_release(&sb);
1452         return NULL;
1453 }
1454
1455 struct grab_1st_switch_cbdata {
1456         struct strbuf buf;
1457         struct object_id noid;
1458 };
1459
1460 static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
1461                            const char *email, timestamp_t timestamp, int tz,
1462                            const char *message, void *cb_data)
1463 {
1464         struct grab_1st_switch_cbdata *cb = cb_data;
1465         const char *target = NULL, *end;
1466
1467         if (!skip_prefix(message, "checkout: moving from ", &message))
1468                 return 0;
1469         target = strstr(message, " to ");
1470         if (!target)
1471                 return 0;
1472         target += strlen(" to ");
1473         strbuf_reset(&cb->buf);
1474         oidcpy(&cb->noid, noid);
1475         end = strchrnul(target, '\n');
1476         strbuf_add(&cb->buf, target, end - target);
1477         if (!strcmp(cb->buf.buf, "HEAD")) {
1478                 /* HEAD is relative. Resolve it to the right reflog entry. */
1479                 strbuf_reset(&cb->buf);
1480                 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
1481         }
1482         return 1;
1483 }
1484
1485 static void wt_status_get_detached_from(struct repository *r,
1486                                         struct wt_status_state *state)
1487 {
1488         struct grab_1st_switch_cbdata cb;
1489         struct commit *commit;
1490         struct object_id oid;
1491         char *ref = NULL;
1492
1493         strbuf_init(&cb.buf, 0);
1494         if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1495                 strbuf_release(&cb.buf);
1496                 return;
1497         }
1498
1499         if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref) == 1 &&
1500             /* sha1 is a commit? match without further lookup */
1501             (oideq(&cb.noid, &oid) ||
1502              /* perhaps sha1 is a tag, try to dereference to a commit */
1503              ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
1504               oideq(&cb.noid, &commit->object.oid)))) {
1505                 const char *from = ref;
1506                 if (!skip_prefix(from, "refs/tags/", &from))
1507                         skip_prefix(from, "refs/remotes/", &from);
1508                 state->detached_from = xstrdup(from);
1509         } else
1510                 state->detached_from =
1511                         xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
1512         oidcpy(&state->detached_oid, &cb.noid);
1513         state->detached_at = !get_oid("HEAD", &oid) &&
1514                              oideq(&oid, &state->detached_oid);
1515
1516         free(ref);
1517         strbuf_release(&cb.buf);
1518 }
1519
1520 int wt_status_check_rebase(const struct worktree *wt,
1521                            struct wt_status_state *state)
1522 {
1523         struct stat st;
1524
1525         if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1526                 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1527                         state->am_in_progress = 1;
1528                         if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1529                                 state->am_empty_patch = 1;
1530                 } else {
1531                         state->rebase_in_progress = 1;
1532                         state->branch = get_branch(wt, "rebase-apply/head-name");
1533                         state->onto = get_branch(wt, "rebase-apply/onto");
1534                 }
1535         } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1536                 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1537                         state->rebase_interactive_in_progress = 1;
1538                 else
1539                         state->rebase_in_progress = 1;
1540                 state->branch = get_branch(wt, "rebase-merge/head-name");
1541                 state->onto = get_branch(wt, "rebase-merge/onto");
1542         } else
1543                 return 0;
1544         return 1;
1545 }
1546
1547 int wt_status_check_bisect(const struct worktree *wt,
1548                            struct wt_status_state *state)
1549 {
1550         struct stat st;
1551
1552         if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1553                 state->bisect_in_progress = 1;
1554                 state->branch = get_branch(wt, "BISECT_START");
1555                 return 1;
1556         }
1557         return 0;
1558 }
1559
1560 void wt_status_get_state(struct repository *r,
1561                          struct wt_status_state *state,
1562                          int get_detached_from)
1563 {
1564         struct stat st;
1565         struct object_id oid;
1566
1567         if (!stat(git_path_merge_head(r), &st)) {
1568                 state->merge_in_progress = 1;
1569         } else if (wt_status_check_rebase(NULL, state)) {
1570                 ;               /* all set */
1571         } else if (!stat(git_path_cherry_pick_head(r), &st) &&
1572                         !get_oid("CHERRY_PICK_HEAD", &oid)) {
1573                 state->cherry_pick_in_progress = 1;
1574                 oidcpy(&state->cherry_pick_head_oid, &oid);
1575         }
1576         wt_status_check_bisect(NULL, state);
1577         if (!stat(git_path_revert_head(r), &st) &&
1578             !get_oid("REVERT_HEAD", &oid)) {
1579                 state->revert_in_progress = 1;
1580                 oidcpy(&state->revert_head_oid, &oid);
1581         }
1582
1583         if (get_detached_from)
1584                 wt_status_get_detached_from(r, state);
1585 }
1586
1587 static void wt_longstatus_print_state(struct wt_status *s)
1588 {
1589         const char *state_color = color(WT_STATUS_HEADER, s);
1590         struct wt_status_state *state = &s->state;
1591
1592         if (state->merge_in_progress)
1593                 show_merge_in_progress(s, state_color);
1594         else if (state->am_in_progress)
1595                 show_am_in_progress(s, state_color);
1596         else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1597                 show_rebase_in_progress(s, state_color);
1598         else if (state->cherry_pick_in_progress)
1599                 show_cherry_pick_in_progress(s, state_color);
1600         else if (state->revert_in_progress)
1601                 show_revert_in_progress(s, state_color);
1602         if (state->bisect_in_progress)
1603                 show_bisect_in_progress(s, state_color);
1604 }
1605
1606 static void wt_longstatus_print(struct wt_status *s)
1607 {
1608         const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1609         const char *branch_status_color = color(WT_STATUS_HEADER, s);
1610
1611         if (s->branch) {
1612                 const char *on_what = _("On branch ");
1613                 const char *branch_name = s->branch;
1614                 if (!strcmp(branch_name, "HEAD")) {
1615                         branch_status_color = color(WT_STATUS_NOBRANCH, s);
1616                         if (s->state.rebase_in_progress ||
1617                             s->state.rebase_interactive_in_progress) {
1618                                 if (s->state.rebase_interactive_in_progress)
1619                                         on_what = _("interactive rebase in progress; onto ");
1620                                 else
1621                                         on_what = _("rebase in progress; onto ");
1622                                 branch_name = s->state.onto;
1623                         } else if (s->state.detached_from) {
1624                                 branch_name = s->state.detached_from;
1625                                 if (s->state.detached_at)
1626                                         on_what = _("HEAD detached at ");
1627                                 else
1628                                         on_what = _("HEAD detached from ");
1629                         } else {
1630                                 branch_name = "";
1631                                 on_what = _("Not currently on any branch.");
1632                         }
1633                 } else
1634                         skip_prefix(branch_name, "refs/heads/", &branch_name);
1635                 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1636                 status_printf_more(s, branch_status_color, "%s", on_what);
1637                 status_printf_more(s, branch_color, "%s\n", branch_name);
1638                 if (!s->is_initial)
1639                         wt_longstatus_print_tracking(s);
1640         }
1641
1642         wt_longstatus_print_state(s);
1643
1644         if (s->is_initial) {
1645                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1646                 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1647                                  s->commit_template
1648                                  ? _("Initial commit")
1649                                  : _("No commits yet"));
1650                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1651         }
1652
1653         wt_longstatus_print_updated(s);
1654         wt_longstatus_print_unmerged(s);
1655         wt_longstatus_print_changed(s);
1656         if (s->submodule_summary &&
1657             (!s->ignore_submodule_arg ||
1658              strcmp(s->ignore_submodule_arg, "all"))) {
1659                 wt_longstatus_print_submodule_summary(s, 0);  /* staged */
1660                 wt_longstatus_print_submodule_summary(s, 1);  /* unstaged */
1661         }
1662         if (s->show_untracked_files) {
1663                 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
1664                 if (s->show_ignored_mode)
1665                         wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1666                 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1667                         status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1668                         status_printf_ln(s, GIT_COLOR_NORMAL,
1669                                          _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1670                                            "may speed it up, but you have to be careful not to forget to add\n"
1671                                            "new files yourself (see 'git help status')."),
1672                                          s->untracked_in_ms / 1000.0);
1673                 }
1674         } else if (s->committable)
1675                 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1676                         s->hints
1677                         ? _(" (use -u option to show untracked files)") : "");
1678
1679         if (s->verbose)
1680                 wt_longstatus_print_verbose(s);
1681         if (!s->committable) {
1682                 if (s->amend)
1683                         status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1684                 else if (s->nowarn)
1685                         ; /* nothing */
1686                 else if (s->workdir_dirty) {
1687                         if (s->hints)
1688                                 printf(_("no changes added to commit "
1689                                          "(use \"git add\" and/or \"git commit -a\")\n"));
1690                         else
1691                                 printf(_("no changes added to commit\n"));
1692                 } else if (s->untracked.nr) {
1693                         if (s->hints)
1694                                 printf(_("nothing added to commit but untracked files "
1695                                          "present (use \"git add\" to track)\n"));
1696                         else
1697                                 printf(_("nothing added to commit but untracked files present\n"));
1698                 } else if (s->is_initial) {
1699                         if (s->hints)
1700                                 printf(_("nothing to commit (create/copy files "
1701                                          "and use \"git add\" to track)\n"));
1702                         else
1703                                 printf(_("nothing to commit\n"));
1704                 } else if (!s->show_untracked_files) {
1705                         if (s->hints)
1706                                 printf(_("nothing to commit (use -u to show untracked files)\n"));
1707                         else
1708                                 printf(_("nothing to commit\n"));
1709                 } else
1710                         printf(_("nothing to commit, working tree clean\n"));
1711         }
1712         if(s->show_stash)
1713                 wt_longstatus_print_stash_summary(s);
1714 }
1715
1716 static void wt_shortstatus_unmerged(struct string_list_item *it,
1717                            struct wt_status *s)
1718 {
1719         struct wt_status_change_data *d = it->util;
1720         const char *how = "??";
1721
1722         switch (d->stagemask) {
1723         case 1: how = "DD"; break; /* both deleted */
1724         case 2: how = "AU"; break; /* added by us */
1725         case 3: how = "UD"; break; /* deleted by them */
1726         case 4: how = "UA"; break; /* added by them */
1727         case 5: how = "DU"; break; /* deleted by us */
1728         case 6: how = "AA"; break; /* both added */
1729         case 7: how = "UU"; break; /* both modified */
1730         }
1731         color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1732         if (s->null_termination) {
1733                 fprintf(stdout, " %s%c", it->string, 0);
1734         } else {
1735                 struct strbuf onebuf = STRBUF_INIT;
1736                 const char *one;
1737                 one = quote_path(it->string, s->prefix, &onebuf);
1738                 printf(" %s\n", one);
1739                 strbuf_release(&onebuf);
1740         }
1741 }
1742
1743 static void wt_shortstatus_status(struct string_list_item *it,
1744                          struct wt_status *s)
1745 {
1746         struct wt_status_change_data *d = it->util;
1747
1748         if (d->index_status)
1749                 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1750         else
1751                 putchar(' ');
1752         if (d->worktree_status)
1753                 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1754         else
1755                 putchar(' ');
1756         putchar(' ');
1757         if (s->null_termination) {
1758                 fprintf(stdout, "%s%c", it->string, 0);
1759                 if (d->rename_source)
1760                         fprintf(stdout, "%s%c", d->rename_source, 0);
1761         } else {
1762                 struct strbuf onebuf = STRBUF_INIT;
1763                 const char *one;
1764
1765                 if (d->rename_source) {
1766                         one = quote_path(d->rename_source, s->prefix, &onebuf);
1767                         if (*one != '"' && strchr(one, ' ') != NULL) {
1768                                 putchar('"');
1769                                 strbuf_addch(&onebuf, '"');
1770                                 one = onebuf.buf;
1771                         }
1772                         printf("%s -> ", one);
1773                         strbuf_release(&onebuf);
1774                 }
1775                 one = quote_path(it->string, s->prefix, &onebuf);
1776                 if (*one != '"' && strchr(one, ' ') != NULL) {
1777                         putchar('"');
1778                         strbuf_addch(&onebuf, '"');
1779                         one = onebuf.buf;
1780                 }
1781                 printf("%s\n", one);
1782                 strbuf_release(&onebuf);
1783         }
1784 }
1785
1786 static void wt_shortstatus_other(struct string_list_item *it,
1787                                  struct wt_status *s, const char *sign)
1788 {
1789         if (s->null_termination) {
1790                 fprintf(stdout, "%s %s%c", sign, it->string, 0);
1791         } else {
1792                 struct strbuf onebuf = STRBUF_INIT;
1793                 const char *one;
1794                 one = quote_path(it->string, s->prefix, &onebuf);
1795                 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1796                 printf(" %s\n", one);
1797                 strbuf_release(&onebuf);
1798         }
1799 }
1800
1801 static void wt_shortstatus_print_tracking(struct wt_status *s)
1802 {
1803         struct branch *branch;
1804         const char *header_color = color(WT_STATUS_HEADER, s);
1805         const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1806         const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1807
1808         const char *base;
1809         char *short_base;
1810         const char *branch_name;
1811         int num_ours, num_theirs, sti;
1812         int upstream_is_gone = 0;
1813
1814         color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1815
1816         if (!s->branch)
1817                 return;
1818         branch_name = s->branch;
1819
1820 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1821
1822         if (s->is_initial)
1823                 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
1824
1825         if (!strcmp(s->branch, "HEAD")) {
1826                 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1827                               LABEL(N_("HEAD (no branch)")));
1828                 goto conclude;
1829         }
1830
1831         skip_prefix(branch_name, "refs/heads/", &branch_name);
1832
1833         branch = branch_get(branch_name);
1834
1835         color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1836
1837         sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
1838                                  s->ahead_behind_flags);
1839         if (sti < 0) {
1840                 if (!base)
1841                         goto conclude;
1842
1843                 upstream_is_gone = 1;
1844         }
1845
1846         short_base = shorten_unambiguous_ref(base, 0);
1847         color_fprintf(s->fp, header_color, "...");
1848         color_fprintf(s->fp, branch_color_remote, "%s", short_base);
1849         free(short_base);
1850
1851         if (!upstream_is_gone && !sti)
1852                 goto conclude;
1853
1854         color_fprintf(s->fp, header_color, " [");
1855         if (upstream_is_gone) {
1856                 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1857         } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
1858                 color_fprintf(s->fp, header_color, LABEL(N_("different")));
1859         } else if (!num_ours) {
1860                 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1861                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1862         } else if (!num_theirs) {
1863                 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1864                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1865         } else {
1866                 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1867                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1868                 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1869                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1870         }
1871
1872         color_fprintf(s->fp, header_color, "]");
1873  conclude:
1874         fputc(s->null_termination ? '\0' : '\n', s->fp);
1875 }
1876
1877 static void wt_shortstatus_print(struct wt_status *s)
1878 {
1879         struct string_list_item *it;
1880
1881         if (s->show_branch)
1882                 wt_shortstatus_print_tracking(s);
1883
1884         for_each_string_list_item(it, &s->change) {
1885                 struct wt_status_change_data *d = it->util;
1886
1887                 if (d->stagemask)
1888                         wt_shortstatus_unmerged(it, s);
1889                 else
1890                         wt_shortstatus_status(it, s);
1891         }
1892         for_each_string_list_item(it, &s->untracked)
1893                 wt_shortstatus_other(it, s, "??");
1894
1895         for_each_string_list_item(it, &s->ignored)
1896                 wt_shortstatus_other(it, s, "!!");
1897 }
1898
1899 static void wt_porcelain_print(struct wt_status *s)
1900 {
1901         s->use_color = 0;
1902         s->relative_paths = 0;
1903         s->prefix = NULL;
1904         s->no_gettext = 1;
1905         wt_shortstatus_print(s);
1906 }
1907
1908 /*
1909  * Print branch information for porcelain v2 output.  These lines
1910  * are printed when the '--branch' parameter is given.
1911  *
1912  *    # branch.oid <commit><eol>
1913  *    # branch.head <head><eol>
1914  *   [# branch.upstream <upstream><eol>
1915  *   [# branch.ab +<ahead> -<behind><eol>]]
1916  *
1917  *      <commit> ::= the current commit hash or the the literal
1918  *                   "(initial)" to indicate an initialized repo
1919  *                   with no commits.
1920  *
1921  *        <head> ::= <branch_name> the current branch name or
1922  *                   "(detached)" literal when detached head or
1923  *                   "(unknown)" when something is wrong.
1924  *
1925  *    <upstream> ::= the upstream branch name, when set.
1926  *
1927  *       <ahead> ::= integer ahead value or '?'.
1928  *
1929  *      <behind> ::= integer behind value or '?'.
1930  *
1931  * The end-of-line is defined by the -z flag.
1932  *
1933  *                 <eol> ::= NUL when -z,
1934  *                           LF when NOT -z.
1935  *
1936  * When an upstream is set and present, the 'branch.ab' line will
1937  * be printed with the ahead/behind counts for the branch and the
1938  * upstream.  When AHEAD_BEHIND_QUICK is requested and the branches
1939  * are different, '?' will be substituted for the actual count.
1940  */
1941 static void wt_porcelain_v2_print_tracking(struct wt_status *s)
1942 {
1943         struct branch *branch;
1944         const char *base;
1945         const char *branch_name;
1946         int ab_info, nr_ahead, nr_behind;
1947         char eol = s->null_termination ? '\0' : '\n';
1948
1949         fprintf(s->fp, "# branch.oid %s%c",
1950                         (s->is_initial ? "(initial)" : sha1_to_hex(s->sha1_commit)),
1951                         eol);
1952
1953         if (!s->branch)
1954                 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
1955         else {
1956                 if (!strcmp(s->branch, "HEAD")) {
1957                         fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
1958
1959                         if (s->state.rebase_in_progress ||
1960                             s->state.rebase_interactive_in_progress)
1961                                 branch_name = s->state.onto;
1962                         else if (s->state.detached_from)
1963                                 branch_name = s->state.detached_from;
1964                         else
1965                                 branch_name = "";
1966                 } else {
1967                         branch_name = NULL;
1968                         skip_prefix(s->branch, "refs/heads/", &branch_name);
1969
1970                         fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
1971                 }
1972
1973                 /* Lookup stats on the upstream tracking branch, if set. */
1974                 branch = branch_get(branch_name);
1975                 base = NULL;
1976                 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
1977                                              &base, s->ahead_behind_flags);
1978                 if (base) {
1979                         base = shorten_unambiguous_ref(base, 0);
1980                         fprintf(s->fp, "# branch.upstream %s%c", base, eol);
1981                         free((char *)base);
1982
1983                         if (ab_info > 0) {
1984                                 /* different */
1985                                 if (nr_ahead || nr_behind)
1986                                         fprintf(s->fp, "# branch.ab +%d -%d%c",
1987                                                 nr_ahead, nr_behind, eol);
1988                                 else
1989                                         fprintf(s->fp, "# branch.ab +? -?%c",
1990                                                 eol);
1991                         } else if (!ab_info) {
1992                                 /* same */
1993                                 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
1994                         }
1995                 }
1996         }
1997 }
1998
1999 /*
2000  * Convert various submodule status values into a
2001  * fixed-length string of characters in the buffer provided.
2002  */
2003 static void wt_porcelain_v2_submodule_state(
2004         struct wt_status_change_data *d,
2005         char sub[5])
2006 {
2007         if (S_ISGITLINK(d->mode_head) ||
2008                 S_ISGITLINK(d->mode_index) ||
2009                 S_ISGITLINK(d->mode_worktree)) {
2010                 sub[0] = 'S';
2011                 sub[1] = d->new_submodule_commits ? 'C' : '.';
2012                 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2013                 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2014         } else {
2015                 sub[0] = 'N';
2016                 sub[1] = '.';
2017                 sub[2] = '.';
2018                 sub[3] = '.';
2019         }
2020         sub[4] = 0;
2021 }
2022
2023 /*
2024  * Fix-up changed entries before we print them.
2025  */
2026 static void wt_porcelain_v2_fix_up_changed(
2027         struct string_list_item *it,
2028         struct wt_status *s)
2029 {
2030         struct wt_status_change_data *d = it->util;
2031
2032         if (!d->index_status) {
2033                 /*
2034                  * This entry is unchanged in the index (relative to the head).
2035                  * Therefore, the collect_updated_cb was never called for this
2036                  * entry (during the head-vs-index scan) and so the head column
2037                  * fields were never set.
2038                  *
2039                  * We must have data for the index column (from the
2040                  * index-vs-worktree scan (otherwise, this entry should not be
2041                  * in the list of changes)).
2042                  *
2043                  * Copy index column fields to the head column, so that our
2044                  * output looks complete.
2045                  */
2046                 assert(d->mode_head == 0);
2047                 d->mode_head = d->mode_index;
2048                 oidcpy(&d->oid_head, &d->oid_index);
2049         }
2050
2051         if (!d->worktree_status) {
2052                 /*
2053                  * This entry is unchanged in the worktree (relative to the index).
2054                  * Therefore, the collect_changed_cb was never called for this entry
2055                  * (during the index-vs-worktree scan) and so the worktree column
2056                  * fields were never set.
2057                  *
2058                  * We must have data for the index column (from the head-vs-index
2059                  * scan).
2060                  *
2061                  * Copy the index column fields to the worktree column so that
2062                  * our output looks complete.
2063                  *
2064                  * Note that we only have a mode field in the worktree column
2065                  * because the scan code tries really hard to not have to compute it.
2066                  */
2067                 assert(d->mode_worktree == 0);
2068                 d->mode_worktree = d->mode_index;
2069         }
2070 }
2071
2072 /*
2073  * Print porcelain v2 info for tracked entries with changes.
2074  */
2075 static void wt_porcelain_v2_print_changed_entry(
2076         struct string_list_item *it,
2077         struct wt_status *s)
2078 {
2079         struct wt_status_change_data *d = it->util;
2080         struct strbuf buf = STRBUF_INIT;
2081         struct strbuf buf_from = STRBUF_INIT;
2082         const char *path = NULL;
2083         const char *path_from = NULL;
2084         char key[3];
2085         char submodule_token[5];
2086         char sep_char, eol_char;
2087
2088         wt_porcelain_v2_fix_up_changed(it, s);
2089         wt_porcelain_v2_submodule_state(d, submodule_token);
2090
2091         key[0] = d->index_status ? d->index_status : '.';
2092         key[1] = d->worktree_status ? d->worktree_status : '.';
2093         key[2] = 0;
2094
2095         if (s->null_termination) {
2096                 /*
2097                  * In -z mode, we DO NOT C-quote pathnames.  Current path is ALWAYS first.
2098                  * A single NUL character separates them.
2099                  */
2100                 sep_char = '\0';
2101                 eol_char = '\0';
2102                 path = it->string;
2103                 path_from = d->rename_source;
2104         } else {
2105                 /*
2106                  * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2107                  * The source path is only present when necessary.
2108                  * A single TAB separates them (because paths can contain spaces
2109                  * which are not escaped and C-quoting does escape TAB characters).
2110                  */
2111                 sep_char = '\t';
2112                 eol_char = '\n';
2113                 path = quote_path(it->string, s->prefix, &buf);
2114                 if (d->rename_source)
2115                         path_from = quote_path(d->rename_source, s->prefix, &buf_from);
2116         }
2117
2118         if (path_from)
2119                 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2120                                 key, submodule_token,
2121                                 d->mode_head, d->mode_index, d->mode_worktree,
2122                                 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2123                                 d->rename_status, d->rename_score,
2124                                 path, sep_char, path_from, eol_char);
2125         else
2126                 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2127                                 key, submodule_token,
2128                                 d->mode_head, d->mode_index, d->mode_worktree,
2129                                 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2130                                 path, eol_char);
2131
2132         strbuf_release(&buf);
2133         strbuf_release(&buf_from);
2134 }
2135
2136 /*
2137  * Print porcelain v2 status info for unmerged entries.
2138  */
2139 static void wt_porcelain_v2_print_unmerged_entry(
2140         struct string_list_item *it,
2141         struct wt_status *s)
2142 {
2143         struct wt_status_change_data *d = it->util;
2144         struct index_state *istate = s->repo->index;
2145         const struct cache_entry *ce;
2146         struct strbuf buf_index = STRBUF_INIT;
2147         const char *path_index = NULL;
2148         int pos, stage, sum;
2149         struct {
2150                 int mode;
2151                 struct object_id oid;
2152         } stages[3];
2153         char *key;
2154         char submodule_token[5];
2155         char unmerged_prefix = 'u';
2156         char eol_char = s->null_termination ? '\0' : '\n';
2157
2158         wt_porcelain_v2_submodule_state(d, submodule_token);
2159
2160         switch (d->stagemask) {
2161         case 1: key = "DD"; break; /* both deleted */
2162         case 2: key = "AU"; break; /* added by us */
2163         case 3: key = "UD"; break; /* deleted by them */
2164         case 4: key = "UA"; break; /* added by them */
2165         case 5: key = "DU"; break; /* deleted by us */
2166         case 6: key = "AA"; break; /* both added */
2167         case 7: key = "UU"; break; /* both modified */
2168         default:
2169                 BUG("unhandled unmerged status %x", d->stagemask);
2170         }
2171
2172         /*
2173          * Disregard d.aux.porcelain_v2 data that we accumulated
2174          * for the head and index columns during the scans and
2175          * replace with the actual stage data.
2176          *
2177          * Note that this is a last-one-wins for each the individual
2178          * stage [123] columns in the event of multiple cache entries
2179          * for same stage.
2180          */
2181         memset(stages, 0, sizeof(stages));
2182         sum = 0;
2183         pos = index_name_pos(istate, it->string, strlen(it->string));
2184         assert(pos < 0);
2185         pos = -pos-1;
2186         while (pos < istate->cache_nr) {
2187                 ce = istate->cache[pos++];
2188                 stage = ce_stage(ce);
2189                 if (strcmp(ce->name, it->string) || !stage)
2190                         break;
2191                 stages[stage - 1].mode = ce->ce_mode;
2192                 oidcpy(&stages[stage - 1].oid, &ce->oid);
2193                 sum |= (1 << (stage - 1));
2194         }
2195         if (sum != d->stagemask)
2196                 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
2197
2198         if (s->null_termination)
2199                 path_index = it->string;
2200         else
2201                 path_index = quote_path(it->string, s->prefix, &buf_index);
2202
2203         fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2204                         unmerged_prefix, key, submodule_token,
2205                         stages[0].mode, /* stage 1 */
2206                         stages[1].mode, /* stage 2 */
2207                         stages[2].mode, /* stage 3 */
2208                         d->mode_worktree,
2209                         oid_to_hex(&stages[0].oid), /* stage 1 */
2210                         oid_to_hex(&stages[1].oid), /* stage 2 */
2211                         oid_to_hex(&stages[2].oid), /* stage 3 */
2212                         path_index,
2213                         eol_char);
2214
2215         strbuf_release(&buf_index);
2216 }
2217
2218 /*
2219  * Print porcelain V2 status info for untracked and ignored entries.
2220  */
2221 static void wt_porcelain_v2_print_other(
2222         struct string_list_item *it,
2223         struct wt_status *s,
2224         char prefix)
2225 {
2226         struct strbuf buf = STRBUF_INIT;
2227         const char *path;
2228         char eol_char;
2229
2230         if (s->null_termination) {
2231                 path = it->string;
2232                 eol_char = '\0';
2233         } else {
2234                 path = quote_path(it->string, s->prefix, &buf);
2235                 eol_char = '\n';
2236         }
2237
2238         fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2239
2240         strbuf_release(&buf);
2241 }
2242
2243 /*
2244  * Print porcelain V2 status.
2245  *
2246  * [<v2_branch>]
2247  * [<v2_changed_items>]*
2248  * [<v2_unmerged_items>]*
2249  * [<v2_untracked_items>]*
2250  * [<v2_ignored_items>]*
2251  *
2252  */
2253 static void wt_porcelain_v2_print(struct wt_status *s)
2254 {
2255         struct wt_status_change_data *d;
2256         struct string_list_item *it;
2257         int i;
2258
2259         if (s->show_branch)
2260                 wt_porcelain_v2_print_tracking(s);
2261
2262         for (i = 0; i < s->change.nr; i++) {
2263                 it = &(s->change.items[i]);
2264                 d = it->util;
2265                 if (!d->stagemask)
2266                         wt_porcelain_v2_print_changed_entry(it, s);
2267         }
2268
2269         for (i = 0; i < s->change.nr; i++) {
2270                 it = &(s->change.items[i]);
2271                 d = it->util;
2272                 if (d->stagemask)
2273                         wt_porcelain_v2_print_unmerged_entry(it, s);
2274         }
2275
2276         for (i = 0; i < s->untracked.nr; i++) {
2277                 it = &(s->untracked.items[i]);
2278                 wt_porcelain_v2_print_other(it, s, '?');
2279         }
2280
2281         for (i = 0; i < s->ignored.nr; i++) {
2282                 it = &(s->ignored.items[i]);
2283                 wt_porcelain_v2_print_other(it, s, '!');
2284         }
2285 }
2286
2287 void wt_status_print(struct wt_status *s)
2288 {
2289         switch (s->status_format) {
2290         case STATUS_FORMAT_SHORT:
2291                 wt_shortstatus_print(s);
2292                 break;
2293         case STATUS_FORMAT_PORCELAIN:
2294                 wt_porcelain_print(s);
2295                 break;
2296         case STATUS_FORMAT_PORCELAIN_V2:
2297                 wt_porcelain_v2_print(s);
2298                 break;
2299         case STATUS_FORMAT_UNSPECIFIED:
2300                 BUG("finalize_deferred_config() should have been called");
2301                 break;
2302         case STATUS_FORMAT_NONE:
2303         case STATUS_FORMAT_LONG:
2304                 wt_longstatus_print(s);
2305                 break;
2306         }
2307 }
2308
2309 /**
2310  * Returns 1 if there are unstaged changes, 0 otherwise.
2311  */
2312 int has_unstaged_changes(struct repository *r, int ignore_submodules)
2313 {
2314         struct rev_info rev_info;
2315         int result;
2316
2317         repo_init_revisions(r, &rev_info, NULL);
2318         if (ignore_submodules) {
2319                 rev_info.diffopt.flags.ignore_submodules = 1;
2320                 rev_info.diffopt.flags.override_submodule_config = 1;
2321         }
2322         rev_info.diffopt.flags.quick = 1;
2323         diff_setup_done(&rev_info.diffopt);
2324         result = run_diff_files(&rev_info, 0);
2325         return diff_result_code(&rev_info.diffopt, result);
2326 }
2327
2328 /**
2329  * Returns 1 if there are uncommitted changes, 0 otherwise.
2330  */
2331 int has_uncommitted_changes(struct repository *r,
2332                             int ignore_submodules)
2333 {
2334         struct rev_info rev_info;
2335         int result;
2336
2337         if (is_index_unborn(r->index))
2338                 return 0;
2339
2340         repo_init_revisions(r, &rev_info, NULL);
2341         if (ignore_submodules)
2342                 rev_info.diffopt.flags.ignore_submodules = 1;
2343         rev_info.diffopt.flags.quick = 1;
2344
2345         add_head_to_pending(&rev_info);
2346         if (!rev_info.pending.nr) {
2347                 /*
2348                  * We have no head (or it's corrupt); use the empty tree,
2349                  * which will complain if the index is non-empty.
2350                  */
2351                 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
2352                 add_pending_object(&rev_info, &tree->object, "");
2353         }
2354
2355         diff_setup_done(&rev_info.diffopt);
2356         result = run_diff_index(&rev_info, 1);
2357         return diff_result_code(&rev_info.diffopt, result);
2358 }
2359
2360 /**
2361  * If the work tree has unstaged or uncommitted changes, dies with the
2362  * appropriate message.
2363  */
2364 int require_clean_work_tree(struct repository *r,
2365                             const char *action,
2366                             const char *hint,
2367                             int ignore_submodules,
2368                             int gently)
2369 {
2370         struct lock_file lock_file = LOCK_INIT;
2371         int err = 0, fd;
2372
2373         fd = hold_locked_index(&lock_file, 0);
2374         refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
2375         if (0 <= fd)
2376                 update_index_if_able(r->index, &lock_file);
2377         rollback_lock_file(&lock_file);
2378
2379         if (has_unstaged_changes(r, ignore_submodules)) {
2380                 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2381                 error(_("cannot %s: You have unstaged changes."), _(action));
2382                 err = 1;
2383         }
2384
2385         if (has_uncommitted_changes(r, ignore_submodules)) {
2386                 if (err)
2387                         error(_("additionally, your index contains uncommitted changes."));
2388                 else
2389                         error(_("cannot %s: Your index contains uncommitted changes."),
2390                               _(action));
2391                 err = 1;
2392         }
2393
2394         if (err) {
2395                 if (hint)
2396                         error("%s", hint);
2397                 if (!gently)
2398                         exit(128);
2399         }
2400
2401         return err;
2402 }