mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wt-status.c: move cut-line print code out to wt_status_add_cut_line

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2014-02-17 19:15:31 +07:00
committed by Junio C Hamano
parent 983dc69748
commit fcef9312a4
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wt-status.c
View File

@ -808,6 +808,17 @@ void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
strbuf_release(&pattern); strbuf_release(&pattern);
} }
void wt_status_add_cut_line(FILE *fp)
{
const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
struct strbuf buf = STRBUF_INIT;
fprintf(fp, "%c %s", comment_line_char, cut_line);
strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
fputs(buf.buf, fp);
strbuf_release(&buf);
}
static void wt_status_print_verbose(struct wt_status *s) static void wt_status_print_verbose(struct wt_status *s)
{ {
struct rev_info rev; struct rev_info rev;
@ -833,14 +844,8 @@ static void wt_status_print_verbose(struct wt_status *s)
* diff before committing. * diff before committing.
*/ */
if (s->fp != stdout) { if (s->fp != stdout) {
const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
struct strbuf buf = STRBUF_INIT;
rev.diffopt.use_color = 0; rev.diffopt.use_color = 0;
fprintf(s->fp, "%c %s", comment_line_char, cut_line); wt_status_add_cut_line(s->fp);
strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
fputs(buf.buf, s->fp);
strbuf_release(&buf);
} }
run_diff_index(&rev, 1); run_diff_index(&rev, 1);
} }

1
wt-status.h
View File

@ -92,6 +92,7 @@ struct wt_status_state {
}; };
void wt_status_truncate_message_at_cut_line(struct strbuf *); void wt_status_truncate_message_at_cut_line(struct strbuf *);
void wt_status_add_cut_line(FILE *fp);
void wt_status_prepare(struct wt_status *s); void wt_status_prepare(struct wt_status *s);
void wt_status_print(struct wt_status *s); void wt_status_print(struct wt_status *s);
void wt_status_collect(struct wt_status *s); void wt_status_collect(struct wt_status *s);