mirror of
https://github.com/git/git.git
synced 2024-05-21 22:06:20 +02:00
strbuf: accept a comment string for strbuf_commented_addf()
As part of our transition to multi-byte comment characters, let's take a NUL-terminated string pointer for strbuf_commented_addf() rather than a single character. All of the callers have to be adjusted, but they can just pass comment_line_str rather than comment_line_char. Note that we rely on strbuf_add_commented_lines() under the hood, so we'll cheat a bit to squeeze our string into a single character (for now the two are equivalent, and we'll address this TODO in the next patch). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2982b65690
commit
3a35d96284
|
@ -1105,11 +1105,11 @@ static int edit_hunk_manually(struct add_p_state *s, struct hunk *hunk)
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
strbuf_reset(&s->buf);
|
strbuf_reset(&s->buf);
|
||||||
strbuf_commented_addf(&s->buf, comment_line_char,
|
strbuf_commented_addf(&s->buf, comment_line_str,
|
||||||
_("Manual hunk edit mode -- see bottom for "
|
_("Manual hunk edit mode -- see bottom for "
|
||||||
"a quick guide.\n"));
|
"a quick guide.\n"));
|
||||||
render_hunk(s, hunk, 0, 0, &s->buf);
|
render_hunk(s, hunk, 0, 0, &s->buf);
|
||||||
strbuf_commented_addf(&s->buf, comment_line_char,
|
strbuf_commented_addf(&s->buf, comment_line_str,
|
||||||
_("---\n"
|
_("---\n"
|
||||||
"To remove '%c' lines, make them ' ' lines "
|
"To remove '%c' lines, make them ' ' lines "
|
||||||
"(context).\n"
|
"(context).\n"
|
||||||
|
@ -1118,13 +1118,13 @@ static int edit_hunk_manually(struct add_p_state *s, struct hunk *hunk)
|
||||||
s->mode->is_reverse ? '+' : '-',
|
s->mode->is_reverse ? '+' : '-',
|
||||||
s->mode->is_reverse ? '-' : '+',
|
s->mode->is_reverse ? '-' : '+',
|
||||||
comment_line_char);
|
comment_line_char);
|
||||||
strbuf_commented_addf(&s->buf, comment_line_char, "%s",
|
strbuf_commented_addf(&s->buf, comment_line_str, "%s",
|
||||||
_(s->mode->edit_hunk_hint));
|
_(s->mode->edit_hunk_hint));
|
||||||
/*
|
/*
|
||||||
* TRANSLATORS: 'it' refers to the patch mentioned in the previous
|
* TRANSLATORS: 'it' refers to the patch mentioned in the previous
|
||||||
* messages.
|
* messages.
|
||||||
*/
|
*/
|
||||||
strbuf_commented_addf(&s->buf, comment_line_char,
|
strbuf_commented_addf(&s->buf, comment_line_str,
|
||||||
_("If it does not apply cleanly, you will be "
|
_("If it does not apply cleanly, you will be "
|
||||||
"given an opportunity to\n"
|
"given an opportunity to\n"
|
||||||
"edit again. If all lines of the hunk are "
|
"edit again. If all lines of the hunk are "
|
||||||
|
|
|
@ -667,7 +667,7 @@ static int edit_branch_description(const char *branch_name)
|
||||||
exists = !read_branch_desc(&buf, branch_name);
|
exists = !read_branch_desc(&buf, branch_name);
|
||||||
if (!buf.len || buf.buf[buf.len-1] != '\n')
|
if (!buf.len || buf.buf[buf.len-1] != '\n')
|
||||||
strbuf_addch(&buf, '\n');
|
strbuf_addch(&buf, '\n');
|
||||||
strbuf_commented_addf(&buf, comment_line_char,
|
strbuf_commented_addf(&buf, comment_line_str,
|
||||||
_("Please edit the description for the branch\n"
|
_("Please edit the description for the branch\n"
|
||||||
" %s\n"
|
" %s\n"
|
||||||
"Lines starting with '%c' will be stripped.\n"),
|
"Lines starting with '%c' will be stripped.\n"),
|
||||||
|
|
|
@ -852,15 +852,15 @@ static void prepare_to_commit(struct commit_list *remoteheads)
|
||||||
strbuf_addch(&msg, '\n');
|
strbuf_addch(&msg, '\n');
|
||||||
if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) {
|
if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) {
|
||||||
wt_status_append_cut_line(&msg);
|
wt_status_append_cut_line(&msg);
|
||||||
strbuf_commented_addf(&msg, comment_line_char, "\n");
|
strbuf_commented_addf(&msg, comment_line_str, "\n");
|
||||||
}
|
}
|
||||||
strbuf_commented_addf(&msg, comment_line_char,
|
strbuf_commented_addf(&msg, comment_line_str,
|
||||||
_(merge_editor_comment));
|
_(merge_editor_comment));
|
||||||
if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
|
if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
|
||||||
strbuf_commented_addf(&msg, comment_line_char,
|
strbuf_commented_addf(&msg, comment_line_str,
|
||||||
_(scissors_editor_comment));
|
_(scissors_editor_comment));
|
||||||
else
|
else
|
||||||
strbuf_commented_addf(&msg, comment_line_char,
|
strbuf_commented_addf(&msg, comment_line_str,
|
||||||
_(no_scissors_editor_comment), comment_line_char);
|
_(no_scissors_editor_comment), comment_line_char);
|
||||||
}
|
}
|
||||||
if (signoff)
|
if (signoff)
|
||||||
|
|
|
@ -291,10 +291,10 @@ static void create_tag(const struct object_id *object, const char *object_ref,
|
||||||
struct strbuf buf = STRBUF_INIT;
|
struct strbuf buf = STRBUF_INIT;
|
||||||
strbuf_addch(&buf, '\n');
|
strbuf_addch(&buf, '\n');
|
||||||
if (opt->cleanup_mode == CLEANUP_ALL)
|
if (opt->cleanup_mode == CLEANUP_ALL)
|
||||||
strbuf_commented_addf(&buf, comment_line_char,
|
strbuf_commented_addf(&buf, comment_line_str,
|
||||||
_(tag_template), tag, comment_line_char);
|
_(tag_template), tag, comment_line_char);
|
||||||
else
|
else
|
||||||
strbuf_commented_addf(&buf, comment_line_char,
|
strbuf_commented_addf(&buf, comment_line_str,
|
||||||
_(tag_template_nocleanup), tag, comment_line_char);
|
_(tag_template_nocleanup), tag, comment_line_char);
|
||||||
write_or_die(fd, buf.buf, buf.len);
|
write_or_die(fd, buf.buf, buf.len);
|
||||||
strbuf_release(&buf);
|
strbuf_release(&buf);
|
||||||
|
|
|
@ -71,7 +71,7 @@ void append_todo_help(int command_count,
|
||||||
|
|
||||||
if (!edit_todo) {
|
if (!edit_todo) {
|
||||||
strbuf_addch(buf, '\n');
|
strbuf_addch(buf, '\n');
|
||||||
strbuf_commented_addf(buf, comment_line_char,
|
strbuf_commented_addf(buf, comment_line_str,
|
||||||
Q_("Rebase %s onto %s (%d command)",
|
Q_("Rebase %s onto %s (%d command)",
|
||||||
"Rebase %s onto %s (%d commands)",
|
"Rebase %s onto %s (%d commands)",
|
||||||
command_count),
|
command_count),
|
||||||
|
|
|
@ -667,11 +667,11 @@ void append_conflicts_hint(struct index_state *istate,
|
||||||
}
|
}
|
||||||
|
|
||||||
strbuf_addch(msgbuf, '\n');
|
strbuf_addch(msgbuf, '\n');
|
||||||
strbuf_commented_addf(msgbuf, comment_line_char, "Conflicts:\n");
|
strbuf_commented_addf(msgbuf, comment_line_str, "Conflicts:\n");
|
||||||
for (i = 0; i < istate->cache_nr;) {
|
for (i = 0; i < istate->cache_nr;) {
|
||||||
const struct cache_entry *ce = istate->cache[i++];
|
const struct cache_entry *ce = istate->cache[i++];
|
||||||
if (ce_stage(ce)) {
|
if (ce_stage(ce)) {
|
||||||
strbuf_commented_addf(msgbuf, comment_line_char,
|
strbuf_commented_addf(msgbuf, comment_line_str,
|
||||||
"\t%s\n", ce->name);
|
"\t%s\n", ce->name);
|
||||||
while (i < istate->cache_nr &&
|
while (i < istate->cache_nr &&
|
||||||
!strcmp(ce->name, istate->cache[i]->name))
|
!strcmp(ce->name, istate->cache[i]->name))
|
||||||
|
|
10
strbuf.c
10
strbuf.c
|
@ -368,7 +368,7 @@ void strbuf_add_commented_lines(struct strbuf *out, const char *buf,
|
||||||
add_lines(out, prefix, buf, size, 1);
|
add_lines(out, prefix, buf, size, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void strbuf_commented_addf(struct strbuf *sb, char comment_prefix,
|
void strbuf_commented_addf(struct strbuf *sb, const char *comment_prefix,
|
||||||
const char *fmt, ...)
|
const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list params;
|
va_list params;
|
||||||
|
@ -379,7 +379,13 @@ void strbuf_commented_addf(struct strbuf *sb, char comment_prefix,
|
||||||
strbuf_vaddf(&buf, fmt, params);
|
strbuf_vaddf(&buf, fmt, params);
|
||||||
va_end(params);
|
va_end(params);
|
||||||
|
|
||||||
strbuf_add_commented_lines(sb, buf.buf, buf.len, comment_prefix);
|
/*
|
||||||
|
* TODO Our commented_lines helper does not yet understand
|
||||||
|
* comment strings. But since we know that the strings are
|
||||||
|
* always single-char, we can cheat for the moment, and
|
||||||
|
* fix this later.
|
||||||
|
*/
|
||||||
|
strbuf_add_commented_lines(sb, buf.buf, buf.len, comment_prefix[0]);
|
||||||
if (incomplete_line)
|
if (incomplete_line)
|
||||||
sb->buf[--sb->len] = '\0';
|
sb->buf[--sb->len] = '\0';
|
||||||
|
|
||||||
|
|
2
strbuf.h
2
strbuf.h
|
@ -379,7 +379,7 @@ void strbuf_addf(struct strbuf *sb, const char *fmt, ...);
|
||||||
* blank to the buffer.
|
* blank to the buffer.
|
||||||
*/
|
*/
|
||||||
__attribute__((format (printf, 3, 4)))
|
__attribute__((format (printf, 3, 4)))
|
||||||
void strbuf_commented_addf(struct strbuf *sb, char comment_prefix, const char *fmt, ...);
|
void strbuf_commented_addf(struct strbuf *sb, const char *comment_prefix, const char *fmt, ...);
|
||||||
|
|
||||||
__attribute__((format (printf,2,0)))
|
__attribute__((format (printf,2,0)))
|
||||||
void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap);
|
void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap);
|
||||||
|
|
|
@ -1103,7 +1103,7 @@ void wt_status_append_cut_line(struct strbuf *buf)
|
||||||
{
|
{
|
||||||
const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
|
const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
|
||||||
|
|
||||||
strbuf_commented_addf(buf, comment_line_char, "%s", cut_line);
|
strbuf_commented_addf(buf, comment_line_str, "%s", cut_line);
|
||||||
strbuf_add_commented_lines(buf, explanation, strlen(explanation), comment_line_char);
|
strbuf_add_commented_lines(buf, explanation, strlen(explanation), comment_line_char);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue