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