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