Merge branch 'jn/status-translatable'
* jn/status-translatable:
commit, status: use status_printf{,_ln,_more} helpers
commit: refer to commit template as s->fp
wt-status: add helpers for printing wt-status lines
Conflicts:
builtin/commit.c
This commit is contained in:
Junio C Hamano
commit
f4784b3eab
@ -612,7 +612,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||
int commitable, saved_color_setting;
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
char *buffer;
|
||||
FILE *fp;
|
||||
const char *hook_arg1 = NULL;
|
||||
const char *hook_arg2 = NULL;
|
||||
int ident_shown = 0;
|
||||
@ -705,8 +704,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||
hook_arg2 = "";
|
||||
}
|
||||
|
||||
fp = fopen(git_path(commit_editmsg), "w");
|
||||
if (fp == NULL)
|
||||
s->fp = fopen(git_path(commit_editmsg), "w");
|
||||
if (s->fp == NULL)
|
||||
die_errno("could not open '%s'", git_path(commit_editmsg));
|
||||
|
||||
if (cleanup_mode != CLEANUP_NONE)
|
||||
@ -730,7 +729,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||
strbuf_release(&sob);
|
||||
}
|
||||
|
||||
if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
|
||||
if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
|
||||
die_errno("could not write commit template");
|
||||
|
||||
strbuf_release(&sb);
|
||||
@ -743,56 +742,58 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||
if (use_editor && include_status) {
|
||||
char *ai_tmp, *ci_tmp;
|
||||
if (whence != FROM_COMMIT)
|
||||
fprintf(fp,
|
||||
"#\n"
|
||||
"# It looks like you may be committing a %s.\n"
|
||||
"# If this is not correct, please remove the file\n"
|
||||
"# %s\n"
|
||||
"# and try again.\n"
|
||||
"#\n",
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL,
|
||||
"\n"
|
||||
"It looks like you may be committing a %s.\n"
|
||||
"If this is not correct, please remove the file\n"
|
||||
" %s\n"
|
||||
"and try again.\n"
|
||||
"",
|
||||
whence_s(),
|
||||
git_path(whence == FROM_MERGE
|
||||
? "MERGE_HEAD"
|
||||
: "CHERRY_PICK_HEAD"));
|
||||
fprintf(fp,
|
||||
"\n"
|
||||
"# Please enter the commit message for your changes.");
|
||||
|
||||
fprintf(s->fp, "\n");
|
||||
status_printf(s, GIT_COLOR_NORMAL,
|
||||
"Please enter the commit message for your changes.");
|
||||
if (cleanup_mode == CLEANUP_ALL)
|
||||
fprintf(fp,
|
||||
status_printf_more(s, GIT_COLOR_NORMAL,
|
||||
" Lines starting\n"
|
||||
"# with '#' will be ignored, and an empty"
|
||||
"with '#' will be ignored, and an empty"
|
||||
" message aborts the commit.\n");
|
||||
else /* CLEANUP_SPACE, that is. */
|
||||
fprintf(fp,
|
||||
status_printf_more(s, GIT_COLOR_NORMAL,
|
||||
" Lines starting\n"
|
||||
"# with '#' will be kept; you may remove them"
|
||||
"with '#' will be kept; you may remove them"
|
||||
" yourself if you want to.\n"
|
||||
"# An empty message aborts the commit.\n");
|
||||
"An empty message aborts the commit.\n");
|
||||
if (only_include_assumed)
|
||||
fprintf(fp, "# %s\n", only_include_assumed);
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL,
|
||||
"%s", only_include_assumed);
|
||||
|
||||
ai_tmp = cut_ident_timestamp_part(author_ident->buf);
|
||||
ci_tmp = cut_ident_timestamp_part(committer_ident.buf);
|
||||
if (strcmp(author_ident->buf, committer_ident.buf))
|
||||
fprintf(fp,
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL,
|
||||
"%s"
|
||||
"# Author: %s\n",
|
||||
ident_shown++ ? "" : "#\n",
|
||||
"Author: %s",
|
||||
ident_shown++ ? "" : "\n",
|
||||
author_ident->buf);
|
||||
|
||||
if (!user_ident_sufficiently_given())
|
||||
fprintf(fp,
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL,
|
||||
"%s"
|
||||
"# Committer: %s\n",
|
||||
ident_shown++ ? "" : "#\n",
|
||||
"Committer: %s",
|
||||
ident_shown++ ? "" : "\n",
|
||||
committer_ident.buf);
|
||||
|
||||
if (ident_shown)
|
||||
fprintf(fp, "#\n");
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL, "");
|
||||
|
||||
saved_color_setting = s->use_color;
|
||||
s->use_color = 0;
|
||||
commitable = run_status(fp, index_file, prefix, 1, s);
|
||||
commitable = run_status(s->fp, index_file, prefix, 1, s);
|
||||
s->use_color = saved_color_setting;
|
||||
|
||||
*ai_tmp = ' ';
|
||||
@ -814,7 +815,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||
}
|
||||
strbuf_release(&committer_ident);
|
||||
|
||||
fclose(fp);
|
||||
fclose(s->fp);
|
||||
|
||||
/*
|
||||
* Reject an attempt to record a non-merge empty commit without
|
||||
|
||||
9
color.c
9
color.c
@ -175,6 +175,15 @@ int git_color_default_config(const char *var, const char *value, void *cb)
|
||||
return git_default_config(var, value, cb);
|
||||
}
|
||||
|
||||
void color_print_strbuf(FILE *fp, const char *color, const struct strbuf *sb)
|
||||
{
|
||||
if (*color)
|
||||
fprintf(fp, "%s", color);
|
||||
fprintf(fp, "%s", sb->buf);
|
||||
if (*color)
|
||||
fprintf(fp, "%s", GIT_COLOR_RESET);
|
||||
}
|
||||
|
||||
static int color_vfprintf(FILE *fp, const char *color, const char *fmt,
|
||||
va_list args, const char *trail)
|
||||
{
|
||||
|
||||
3
color.h
3
color.h
@ -1,6 +1,8 @@
|
||||
#ifndef COLOR_H
|
||||
#define COLOR_H
|
||||
|
||||
struct strbuf;
|
||||
|
||||
/* 2 + (2 * num_attrs) + 8 + 1 + 8 + 'm' + NUL */
|
||||
/* "\033[1;2;4;5;7;38;5;2xx;48;5;2xxm\0" */
|
||||
/*
|
||||
@ -64,6 +66,7 @@ __attribute__((format (printf, 3, 4)))
|
||||
int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
|
||||
__attribute__((format (printf, 3, 4)))
|
||||
int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
|
||||
void color_print_strbuf(FILE *fp, const char *color, const struct strbuf *sb);
|
||||
|
||||
int color_is_nil(const char *color);
|
||||
|
||||
|
||||
160
wt-status.c
160
wt-status.c
@ -32,6 +32,80 @@ static const char *color(int slot, struct wt_status *s)
|
||||
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];
|
||||
@ -57,33 +131,33 @@ static void wt_status_print_unmerged_header(struct wt_status *s)
|
||||
{
|
||||
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->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->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,
|
||||
@ -92,17 +166,17 @@ 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,
|
||||
@ -110,16 +184,16 @@ 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
|
||||
@ -133,7 +207,7 @@ static void wt_status_print_unmerged_data(struct wt_status *s,
|
||||
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;
|
||||
@ -143,7 +217,7 @@ static void wt_status_print_unmerged_data(struct wt_status *s,
|
||||
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);
|
||||
}
|
||||
|
||||
@ -186,40 +260,40 @@ static void wt_status_print_change_data(struct wt_status *s,
|
||||
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);
|
||||
}
|
||||
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);
|
||||
}
|
||||
@ -576,9 +650,9 @@ static void wt_status_print_other(struct wt_status *s,
|
||||
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);
|
||||
@ -645,17 +719,17 @@ void wt_status_print(struct wt_status *s)
|
||||
branch_status_color = color(WT_STATUS_NOBRANCH, s);
|
||||
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);
|
||||
@ -672,7 +746,7 @@ void wt_status_print(struct wt_status *s)
|
||||
if (s->show_ignored_files)
|
||||
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)" : "");
|
||||
|
||||
@ -680,7 +754,7 @@ void wt_status_print(struct wt_status *s)
|
||||
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)
|
||||
|
||||
@ -75,4 +75,11 @@ void wt_status_collect(struct wt_status *s);
|
||||
void wt_shortstatus_print(struct wt_status *s, int null_termination, int show_branch);
|
||||
void wt_porcelain_print(struct wt_status *s, int null_termination);
|
||||
|
||||
void status_printf_ln(struct wt_status *s, const char *color, const char *fmt, ...)
|
||||
;
|
||||
void status_printf(struct wt_status *s, const char *color, const char *fmt, ...)
|
||||
;
|
||||
void status_printf_more(struct wt_status *s, const char *color, const char *fmt, ...)
|
||||
__attribute__((format(printf, 3, 4)));
|
||||
|
||||
#endif /* STATUS_H */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user