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

pretty: split color parsing into a separate function

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
2013-04-19 09:08:48 +10:00
committed by Junio C Hamano
parent 7e77df39bf
commit fcabc2d91c
1 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pretty.c
View File

@ -954,19 +954,10 @@ static int format_reflog_person(struct strbuf *sb,
return format_person_part(sb, part, ident, strlen(ident), dmode); return format_person_part(sb, part, ident, strlen(ident), dmode);
} }
static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ static size_t parse_color(struct strbuf *sb, /* in UTF-8 */
const char *placeholder, const char *placeholder,
void *context) struct format_commit_context *c)
{ {
struct format_commit_context *c = context;
const struct commit *commit = c->commit;
const char *msg = c->message;
struct commit_list *p;
int h1, h2;
/* these are independent of the commit */
switch (placeholder[0]) {
case 'C':
if (placeholder[1] == '(') { if (placeholder[1] == '(') {
const char *begin = placeholder + 2; const char *begin = placeholder + 2;
const char *end = strchr(begin, ')'); const char *end = strchr(begin, ')');
@ -999,6 +990,22 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
return 6; return 6;
} else } else
return 0; return 0;
}
static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
const char *placeholder,
void *context)
{
struct format_commit_context *c = context;
const struct commit *commit = c->commit;
const char *msg = c->message;
struct commit_list *p;
int h1, h2;
/* these are independent of the commit */
switch (placeholder[0]) {
case 'C':
return parse_color(sb, placeholder, c);
case 'n': /* newline */ case 'n': /* newline */
strbuf_addch(sb, '\n'); strbuf_addch(sb, '\n');
return 1; return 1;