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

pretty: add pp_commit_easy function for simple callers

Browse Source 
Many callers don't actually care about the pretty print
context at all; let's just give them a simple way of
pretty-printing a commit without having to create a context
struct.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2011-05-26 18:27:24 -04:00
committed by Junio C Hamano
parent 5b38456ec7
commit 8b8a53744f
7 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/branch.c
View File

@ -436,9 +436,7 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
commit = item->commit; commit = item->commit;
if (commit && !parse_commit(commit)) { if (commit && !parse_commit(commit)) {
struct pretty_print_context ctx = {0}; pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject);
pretty_print_commit(CMIT_FMT_ONELINE, commit,
&subject, &ctx);
sub = subject.buf; sub = subject.buf;
} }

3
builtin/checkout.c
View File

@ -300,9 +300,8 @@ static void show_local_changes(struct object *head, struct diff_options *opts)
static void describe_detached_head(char *msg, struct commit *commit) static void describe_detached_head(char *msg, struct commit *commit)
{ {
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
struct pretty_print_context ctx = {0};
parse_commit(commit); parse_commit(commit);
pretty_print_commit(CMIT_FMT_ONELINE, commit, &sb, &ctx); pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb);
fprintf(stderr, "%s %s... %s\n", msg, fprintf(stderr, "%s %s... %s\n", msg,
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf); find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf);
strbuf_release(&sb); strbuf_release(&sb);

4
builtin/log.c
View File

@ -1439,9 +1439,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
if (verbose) { if (verbose) {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct pretty_print_context ctx = {0}; pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
pretty_print_commit(CMIT_FMT_ONELINE, commit,
&buf, &ctx);
printf("%c %s %s\n", sign, printf("%c %s %s\n", sign,
find_unique_abbrev(commit->object.sha1, abbrev), find_unique_abbrev(commit->object.sha1, abbrev),
buf.buf); buf.buf);

3
builtin/shortlog.c
View File

@ -141,9 +141,8 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
const char *author = NULL, *buffer; const char *author = NULL, *buffer;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct strbuf ufbuf = STRBUF_INIT; struct strbuf ufbuf = STRBUF_INIT;
struct pretty_print_context ctx = {0};
pretty_print_commit(CMIT_FMT_RAW, commit, &buf, &ctx); pp_commit_easy(CMIT_FMT_RAW, commit, &buf);
buffer = buf.buf; buffer = buf.buf;
while (*buffer && *buffer != '\n') { while (*buffer && *buffer != '\n') {
const char *eol = strchr(buffer, '\n'); const char *eol = strchr(buffer, '\n');

3
builtin/show-branch.c
View File

@ -293,8 +293,7 @@ static void show_one_commit(struct commit *commit, int no_name)
struct commit_name *name = commit->util; struct commit_name *name = commit->util;
if (commit->object.parsed) { if (commit->object.parsed) {
struct pretty_print_context ctx = {0}; pp_commit_easy(CMIT_FMT_ONELINE, commit, &pretty);
pretty_print_commit(CMIT_FMT_ONELINE, commit, &pretty, &ctx);
pretty_str = pretty.buf; pretty_str = pretty.buf;
} }
if (!prefixcmp(pretty_str, "[PATCH] ")) if (!prefixcmp(pretty_str, "[PATCH] "))

2
commit.h
View File

@ -98,6 +98,8 @@ extern void format_commit_message(const struct commit *commit,
extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
struct strbuf *sb, struct strbuf *sb,
const struct pretty_print_context *context); const struct pretty_print_context *context);
extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
struct strbuf *sb);
void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb, void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
const char *line, enum date_mode dmode, const char *line, enum date_mode dmode,
const char *encoding); const char *encoding);

7
pretty.c
View File

@ -1288,3 +1288,10 @@ void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
free(reencoded); free(reencoded);
} }
void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
struct strbuf *sb)
{
struct pretty_print_context pp = {0};
pretty_print_commit(fmt, commit, sb, &pp);
}