Merge branch 'maint-1.7.4' into maint-1.7.5
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:08:14 +0000 (16:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:08:14 +0000 (16:08 -0700)
* maint-1.7.4:
  make the sample pre-commit hook script reject names with newlines, too
  Reindent closing bracket using tab instead of spaces
  Documentation/git-update-index: refer to 'ls-files'

1  2 
Documentation/git-update-index.txt
wt-status.c

@@@ -264,7 -264,9 +264,9 @@@ tree files, you have to explicitly tel
  "assume unchanged" bit, either before or after you modify them.
  
  In order to set "assume unchanged" bit, use `--assume-unchanged`
- option.  To unset, use `--no-assume-unchanged`.
+ option.  To unset, use `--no-assume-unchanged`. To see which files
+ have the "assume unchanged" bit set, use `git ls-files -v`
+ (see linkgit:git-ls-files[1]).
  
  The command looks at `core.ignorestat` configuration variable.  When
  this is true, paths updated with `git update-index paths...` and
@@@ -363,8 -365,18 +365,9 @@@ ctime for marking files processed) (se
  SEE ALSO
  --------
  linkgit:git-config[1],
- linkgit:git-add[1]
+ linkgit:git-add[1],
+ linkgit:git-ls-files[1]
  
 -
 -Author
 -------
 -Written by Linus Torvalds <torvalds@osdl.org>
 -
 -Documentation
 ---------------
 -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
 -
  GIT
  ---
  Part of the linkgit:git[1] suite
diff --combined wt-status.c
@@@ -32,80 -32,6 +32,80 @@@ static const char *color(int slot, stru
        return c;
  }
  
 +static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
 +              const char *fmt, va_list ap, const char *trail)
 +{
 +      struct strbuf sb = STRBUF_INIT;
 +      struct strbuf linebuf = STRBUF_INIT;
 +      const char *line, *eol;
 +
 +      strbuf_vaddf(&sb, fmt, ap);
 +      if (!sb.len) {
 +              strbuf_addch(&sb, '#');
 +              if (!trail)
 +                      strbuf_addch(&sb, ' ');
 +              color_print_strbuf(s->fp, color, &sb);
 +              if (trail)
 +                      fprintf(s->fp, "%s", trail);
 +              strbuf_release(&sb);
 +              return;
 +      }
 +      for (line = sb.buf; *line; line = eol + 1) {
 +              eol = strchr(line, '\n');
 +
 +              strbuf_reset(&linebuf);
 +              if (at_bol) {
 +                      strbuf_addch(&linebuf, '#');
 +                      if (*line != '\n' && *line != '\t')
 +                              strbuf_addch(&linebuf, ' ');
 +              }
 +              if (eol)
 +                      strbuf_add(&linebuf, line, eol - line);
 +              else
 +                      strbuf_addstr(&linebuf, line);
 +              color_print_strbuf(s->fp, color, &linebuf);
 +              if (eol)
 +                      fprintf(s->fp, "\n");
 +              else
 +                      break;
 +              at_bol = 1;
 +      }
 +      if (trail)
 +              fprintf(s->fp, "%s", trail);
 +      strbuf_release(&linebuf);
 +      strbuf_release(&sb);
 +}
 +
 +void status_printf_ln(struct wt_status *s, const char *color,
 +                      const char *fmt, ...)
 +{
 +      va_list ap;
 +
 +      va_start(ap, fmt);
 +      status_vprintf(s, 1, color, fmt, ap, "\n");
 +      va_end(ap);
 +}
 +
 +void status_printf(struct wt_status *s, const char *color,
 +                      const char *fmt, ...)
 +{
 +      va_list ap;
 +
 +      va_start(ap, fmt);
 +      status_vprintf(s, 1, color, fmt, ap, NULL);
 +      va_end(ap);
 +}
 +
 +void status_printf_more(struct wt_status *s, const char *color,
 +                      const char *fmt, ...)
 +{
 +      va_list ap;
 +
 +      va_start(ap, fmt);
 +      status_vprintf(s, 0, color, fmt, ap, NULL);
 +      va_end(ap);
 +}
 +
  void wt_status_prepare(struct wt_status *s)
  {
        unsigned char sha1[20];
@@@ -131,33 -57,33 +131,33 @@@ static void wt_status_print_unmerged_he
  {
        const char *c = color(WT_STATUS_HEADER, s);
  
 -      color_fprintf_ln(s->fp, c, "# Unmerged paths:");
 +      status_printf_ln(s, c, _("Unmerged paths:"));
        if (!advice_status_hints)
                return;
 -      if (s->in_merge)
 +      if (s->whence != FROM_COMMIT)
                ;
        else if (!s->is_initial)
 -              color_fprintf_ln(s->fp, c, "#   (use \"git reset %s <file>...\" to unstage)", s->reference);
 +              status_printf_ln(s, c, _("  (use \"git reset %s <file>...\" to unstage)"), s->reference);
        else
 -              color_fprintf_ln(s->fp, c, "#   (use \"git rm --cached <file>...\" to unstage)");
 -      color_fprintf_ln(s->fp, c, "#   (use \"git add/rm <file>...\" as appropriate to mark resolution)");
 -      color_fprintf_ln(s->fp, c, "#");
 +              status_printf_ln(s, c, _("  (use \"git rm --cached <file>...\" to unstage)"));
 +      status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
 +      status_printf_ln(s, c, "");
  }
  
  static void wt_status_print_cached_header(struct wt_status *s)
  {
        const char *c = color(WT_STATUS_HEADER, s);
  
 -      color_fprintf_ln(s->fp, c, "# Changes to be committed:");
 +      status_printf_ln(s, c, _("Changes to be committed:"));
        if (!advice_status_hints)
                return;
 -      if (s->in_merge)
 +      if (s->whence != FROM_COMMIT)
                ; /* NEEDSWORK: use "git reset --unresolve"??? */
        else if (!s->is_initial)
 -              color_fprintf_ln(s->fp, c, "#   (use \"git reset %s <file>...\" to unstage)", s->reference);
 +              status_printf_ln(s, c, _("  (use \"git reset %s <file>...\" to unstage)"), s->reference);
        else
 -              color_fprintf_ln(s->fp, c, "#   (use \"git rm --cached <file>...\" to unstage)");
 -      color_fprintf_ln(s->fp, c, "#");
 +              status_printf_ln(s, c, _("  (use \"git rm --cached <file>...\" to unstage)"));
 +      status_printf_ln(s, c, "");
  }
  
  static void wt_status_print_dirty_header(struct wt_status *s,
  {
        const char *c = color(WT_STATUS_HEADER, s);
  
 -      color_fprintf_ln(s->fp, c, "# Changes not staged for commit:");
 +      status_printf_ln(s, c, _("Changes not staged for commit:"));
        if (!advice_status_hints)
                return;
        if (!has_deleted)
 -              color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to update what will be committed)");
 +              status_printf_ln(s, c, _("  (use \"git add <file>...\" to update what will be committed)"));
        else
 -              color_fprintf_ln(s->fp, c, "#   (use \"git add/rm <file>...\" to update what will be committed)");
 -      color_fprintf_ln(s->fp, c, "#   (use \"git checkout -- <file>...\" to discard changes in working directory)");
 +              status_printf_ln(s, c, _("  (use \"git add/rm <file>...\" to update what will be committed)"));
 +      status_printf_ln(s, c, _("  (use \"git checkout -- <file>...\" to discard changes in working directory)"));
        if (has_dirty_submodules)
 -              color_fprintf_ln(s->fp, c, "#   (commit or discard the untracked or modified content in submodules)");
 -      color_fprintf_ln(s->fp, c, "#");
 +              status_printf_ln(s, c, _("  (commit or discard the untracked or modified content in submodules)"));
 +      status_printf_ln(s, c, "");
  }
  
  static void wt_status_print_other_header(struct wt_status *s,
                                         const char *how)
  {
        const char *c = color(WT_STATUS_HEADER, s);
 -      color_fprintf_ln(s->fp, c, "# %s files:", what);
 +      status_printf_ln(s, c, _("%s files:"), what);
        if (!advice_status_hints)
                return;
 -      color_fprintf_ln(s->fp, c, "#   (use \"git %s <file>...\" to include in what will be committed)", how);
 -      color_fprintf_ln(s->fp, c, "#");
 +      status_printf_ln(s, c, _("  (use \"git %s <file>...\" to include in what will be committed)"), how);
 +      status_printf_ln(s, c, "");
  }
  
  static void wt_status_print_trailer(struct wt_status *s)
  {
 -      color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
 +      status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
  }
  
  #define quote_path quote_path_relative
@@@ -204,20 -130,20 +204,20 @@@ static void wt_status_print_unmerged_da
        const char *c = color(WT_STATUS_UNMERGED, s);
        struct wt_status_change_data *d = it->util;
        struct strbuf onebuf = STRBUF_INIT;
 -      const char *one, *how = "bug";
 +      const char *one, *how = _("bug");
  
        one = quote_path(it->string, -1, &onebuf, s->prefix);
 -      color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
 +      status_printf(s, color(WT_STATUS_HEADER, s), "\t");
        switch (d->stagemask) {
 -      case 1: how = "both deleted:"; break;
 -      case 2: how = "added by us:"; break;
 -      case 3: how = "deleted by them:"; break;
 -      case 4: how = "added by them:"; break;
 -      case 5: how = "deleted by us:"; break;
 -      case 6: how = "both added:"; break;
 -      case 7: how = "both modified:"; break;
 +      case 1: how = _("both deleted:"); break;
 +      case 2: how = _("added by us:"); break;
 +      case 3: how = _("deleted by them:"); break;
 +      case 4: how = _("added by them:"); break;
 +      case 5: how = _("deleted by us:"); break;
 +      case 6: how = _("both added:"); break;
 +      case 7: how = _("both modified:"); break;
        }
 -      color_fprintf(s->fp, c, "%-20s%s\n", how, one);
 +      status_printf_more(s, c, "%-20s%s\n", how, one);
        strbuf_release(&onebuf);
  }
  
@@@ -245,11 -171,11 +245,11 @@@ static void wt_status_print_change_data
                if (d->new_submodule_commits || d->dirty_submodule) {
                        strbuf_addstr(&extra, " (");
                        if (d->new_submodule_commits)
 -                              strbuf_addf(&extra, "new commits, ");
 +                              strbuf_addf(&extra, _("new commits, "));
                        if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
 -                              strbuf_addf(&extra, "modified content, ");
 +                              strbuf_addf(&extra, _("modified content, "));
                        if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
 -                              strbuf_addf(&extra, "untracked content, ");
 +                              strbuf_addf(&extra, _("untracked content, "));
                        strbuf_setlen(&extra, extra.len - 2);
                        strbuf_addch(&extra, ')');
                }
        one = quote_path(one_name, -1, &onebuf, s->prefix);
        two = quote_path(two_name, -1, &twobuf, s->prefix);
  
 -      color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
 +      status_printf(s, color(WT_STATUS_HEADER, s), "\t");
        switch (status) {
        case DIFF_STATUS_ADDED:
 -              color_fprintf(s->fp, c, "new file:   %s", one);
 +              status_printf_more(s, c, _("new file:   %s"), one);
                break;
        case DIFF_STATUS_COPIED:
 -              color_fprintf(s->fp, c, "copied:     %s -> %s", one, two);
 +              status_printf_more(s, c, _("copied:     %s -> %s"), one, two);
                break;
        case DIFF_STATUS_DELETED:
 -              color_fprintf(s->fp, c, "deleted:    %s", one);
 +              status_printf_more(s, c, _("deleted:    %s"), one);
                break;
        case DIFF_STATUS_MODIFIED:
 -              color_fprintf(s->fp, c, "modified:   %s", one);
 +              status_printf_more(s, c, _("modified:   %s"), one);
                break;
        case DIFF_STATUS_RENAMED:
 -              color_fprintf(s->fp, c, "renamed:    %s -> %s", one, two);
 +              status_printf_more(s, c, _("renamed:    %s -> %s"), one, two);
                break;
        case DIFF_STATUS_TYPE_CHANGED:
 -              color_fprintf(s->fp, c, "typechange: %s", one);
 +              status_printf_more(s, c, _("typechange: %s"), one);
                break;
        case DIFF_STATUS_UNKNOWN:
 -              color_fprintf(s->fp, c, "unknown:    %s", one);
 +              status_printf_more(s, c, _("unknown:    %s"), one);
                break;
        case DIFF_STATUS_UNMERGED:
 -              color_fprintf(s->fp, c, "unmerged:   %s", one);
 +              status_printf_more(s, c, _("unmerged:   %s"), one);
                break;
        default:
 -              die("bug: unhandled diff status %c", status);
 +              die(_("bug: unhandled diff status %c"), status);
        }
        if (extra.len) {
 -              color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "%s", extra.buf);
 +              status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
                strbuf_release(&extra);
        }
 -      fprintf(s->fp, "\n");
 +      status_printf_more(s, GIT_COLOR_NORMAL, "\n");
        strbuf_release(&onebuf);
        strbuf_release(&twobuf);
  }
@@@ -394,10 -320,10 +394,10 @@@ static void wt_status_collect_changes_w
        if (s->ignore_submodule_arg) {
                DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
                handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
-     }
+       }
        rev.diffopt.format_callback = wt_status_collect_changed_cb;
        rev.diffopt.format_callback_data = s;
 -      rev.prune_data = s->pathspec;
 +      init_pathspec(&rev.prune_data, s->pathspec);
        run_diff_files(&rev, 0);
  }
  
@@@ -422,22 -348,20 +422,22 @@@ static void wt_status_collect_changes_i
        rev.diffopt.detect_rename = 1;
        rev.diffopt.rename_limit = 200;
        rev.diffopt.break_opt = 0;
 -      rev.prune_data = s->pathspec;
 +      init_pathspec(&rev.prune_data, s->pathspec);
        run_diff_index(&rev, 1);
  }
  
  static void wt_status_collect_changes_initial(struct wt_status *s)
  {
 +      struct pathspec pathspec;
        int i;
  
 +      init_pathspec(&pathspec, s->pathspec);
        for (i = 0; i < active_nr; i++) {
                struct string_list_item *it;
                struct wt_status_change_data *d;
                struct cache_entry *ce = active_cache[i];
  
 -              if (!ce_path_match(ce, s->pathspec))
 +              if (!ce_path_match(ce, &pathspec))
                        continue;
                it = string_list_insert(&s->change, ce->name);
                d = it->util;
                else
                        d->index_status = DIFF_STATUS_ADDED;
        }
 +      free_pathspec(&pathspec);
  }
  
  static void wt_status_collect_untracked(struct wt_status *s)
@@@ -650,9 -573,9 +650,9 @@@ static void wt_status_print_other(struc
        for (i = 0; i < l->nr; i++) {
                struct string_list_item *it;
                it = &(l->items[i]);
 -              color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "#\t");
 -              color_fprintf_ln(s->fp, color(WT_STATUS_UNTRACKED, s), "%s",
 -                               quote_path(it->string, strlen(it->string),
 +              status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 +              status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
 +                      "%s\n", quote_path(it->string, strlen(it->string),
                                            &buf, s->prefix));
        }
        strbuf_release(&buf);
@@@ -710,26 -633,26 +710,26 @@@ void wt_status_print(struct wt_status *
        const char *branch_status_color = color(WT_STATUS_HEADER, s);
  
        if (s->branch) {
 -              const char *on_what = "On branch ";
 +              const char *on_what = _("On branch ");
                const char *branch_name = s->branch;
                if (!prefixcmp(branch_name, "refs/heads/"))
                        branch_name += 11;
                else if (!strcmp(branch_name, "HEAD")) {
                        branch_name = "";
                        branch_status_color = color(WT_STATUS_NOBRANCH, s);
 -                      on_what = "Not currently on any branch.";
 +                      on_what = _("Not currently on any branch.");
                }
 -              color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "# ");
 -              color_fprintf(s->fp, branch_status_color, "%s", on_what);
 -              color_fprintf_ln(s->fp, branch_color, "%s", branch_name);
 +              status_printf(s, color(WT_STATUS_HEADER, s), "");
 +              status_printf_more(s, branch_status_color, "%s", on_what);
 +              status_printf_more(s, branch_color, "%s\n", branch_name);
                if (!s->is_initial)
                        wt_status_print_tracking(s);
        }
  
        if (s->is_initial) {
 -              color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
 -              color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "# Initial commit");
 -              color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
 +              status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
 +              status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
 +              status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
        }
  
        wt_status_print_updated(s);
                wt_status_print_submodule_summary(s, 1);  /* unstaged */
        }
        if (s->show_untracked_files) {
 -              wt_status_print_other(s, &s->untracked, "Untracked", "add");
 +              wt_status_print_other(s, &s->untracked, _("Untracked"), "add");
                if (s->show_ignored_files)
 -                      wt_status_print_other(s, &s->ignored, "Ignored", "add -f");
 +                      wt_status_print_other(s, &s->ignored, _("Ignored"), "add -f");
        } else if (s->commitable)
 -              fprintf(s->fp, "# Untracked files not listed%s\n",
 +              status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
                        advice_status_hints
 -                      ? " (use -u option to show untracked files)" : "");
 +                      ? _(" (use -u option to show untracked files)") : "");
  
        if (s->verbose)
                wt_status_print_verbose(s);
        if (!s->commitable) {
                if (s->amend)
 -                      fprintf(s->fp, "# No changes\n");
 +                      status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
                else if (s->nowarn)
                        ; /* nothing */
                else if (s->workdir_dirty)
 -                      printf("no changes added to commit%s\n",
 +                      printf(_("no changes added to commit%s\n"),
                                advice_status_hints
 -                              ? " (use \"git add\" and/or \"git commit -a\")" : "");
 +                              ? _(" (use \"git add\" and/or \"git commit -a\")") : "");
                else if (s->untracked.nr)
 -                      printf("nothing added to commit but untracked files present%s\n",
 +                      printf(_("nothing added to commit but untracked files present%s\n"),
                                advice_status_hints
 -                              ? " (use \"git add\" to track)" : "");
 +                              ? _(" (use \"git add\" to track)") : "");
                else if (s->is_initial)
 -                      printf("nothing to commit%s\n", advice_status_hints
 -                              ? " (create/copy files and use \"git add\" to track)" : "");
 +                      printf(_("nothing to commit%s\n"), advice_status_hints
 +                              ? _(" (create/copy files and use \"git add\" to track)") : "");
                else if (!s->show_untracked_files)
 -                      printf("nothing to commit%s\n", advice_status_hints
 -                              ? " (use -u to show untracked files)" : "");
 +                      printf(_("nothing to commit%s\n"), advice_status_hints
 +                              ? _(" (use -u to show untracked files)") : "");
                else
 -                      printf("nothing to commit%s\n", advice_status_hints
 -                              ? " (working directory clean)" : "");
 +                      printf(_("nothing to commit%s\n"), advice_status_hints
 +                              ? _(" (working directory clean)") : "");
        }
  }
  
@@@ -881,13 -804,13 +881,13 @@@ static void wt_shortstatus_print_tracki
        if (!prefixcmp(branch_name, "refs/heads/"))
                branch_name += 11;
        else if (!strcmp(branch_name, "HEAD")) {
 -              branch_name = "HEAD (no branch)";
 +              branch_name = _("HEAD (no branch)");
                branch_color_local = color(WT_STATUS_NOBRANCH, s);
        }
  
        branch = branch_get(s->branch + 11);
        if (s->is_initial)
 -              color_fprintf(s->fp, header_color, "Initial commit on ");
 +              color_fprintf(s->fp, header_color, _("Initial commit on "));
        if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
                color_fprintf_ln(s->fp, branch_color_local,
                        "%s", branch_name);
  
        color_fprintf(s->fp, header_color, " [");
        if (!num_ours) {
 -              color_fprintf(s->fp, header_color, "behind ");
 +              color_fprintf(s->fp, header_color, _("behind "));
                color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
        } else if (!num_theirs) {
 -              color_fprintf(s->fp, header_color, "ahead ");
 +              color_fprintf(s->fp, header_color, _("ahead "));
                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
        } else {
 -              color_fprintf(s->fp, header_color, "ahead ");
 +              color_fprintf(s->fp, header_color, _("ahead "));
                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
 -              color_fprintf(s->fp, header_color, ", behind ");
 +              color_fprintf(s->fp, header_color, _(", behind "));
                color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
        }