pretty: prepare format_commit_message to handle arbitrary repositories

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
index f5b42cfc629dc1c974a704ad27e2e9ce68bb2a75..2ee702ecf7fe9d45c2c28faa7eccc79cba38e184 100644 (file)
--- a/contrib/coccinelle/the_repository.pending.cocci
+++ b/contrib/coccinelle/the_repository.pending.cocci
@@ -132,3 +132,13 @@ expression G;
 - logmsg_reencode(
 + repo_logmsg_reencode(the_repository,
   E, F, G);
 - logmsg_reencode(
 + repo_logmsg_reencode(the_repository,
   E, F, G);

+
+@@
+expression E;
+expression F;
+expression G;
+expression H;
+@@
+- format_commit_message(
++ repo_format_commit_message(the_repository,
+  E, F, G, H);

diff --git a/pretty.c b/pretty.c
index b359b68750c1b161ed4e1d2865a13960a14fe68d..32404953089e98409a93b3720cc3d9f20792f60d 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1508,9 +1508,10 @@ void userformat_find_requirements(const char *fmt, struct userformat_want *w)
        strbuf_release(&dummy);
 }
 
        strbuf_release(&dummy);
 }
 

-void format_commit_message(const struct commit *commit,
-                          const char *format, struct strbuf *sb,
-                          const struct pretty_print_context *pretty_ctx)
+void repo_format_commit_message(struct repository *r,
+                               const struct commit *commit,
+                               const char *format, struct strbuf *sb,
+                               const struct pretty_print_context *pretty_ctx)

 {
        struct format_commit_context context;
        const char *output_enc = pretty_ctx->output_encoding;
 {
        struct format_commit_context context;
        const char *output_enc = pretty_ctx->output_encoding;


@@ -1524,9 +1525,9 @@ void format_commit_message(const struct commit *commit,
         * convert a commit message to UTF-8 first
         * as far as 'format_commit_item' assumes it in UTF-8
         */
         * convert a commit message to UTF-8 first
         * as far as 'format_commit_item' assumes it in UTF-8
         */

-       context.message = logmsg_reencode(commit,
-                                         &context.commit_encoding,
-                                         utf8);
+       context.message = repo_logmsg_reencode(r, commit,
+                                              &context.commit_encoding,
+                                              utf8);

 
        strbuf_expand(sb, format, format_commit_item, &context);
        rewrap_message_tail(sb, &context, 0, 0, 0);
 
        strbuf_expand(sb, format, format_commit_item, &context);
        rewrap_message_tail(sb, &context, 0, 0, 0);


@@ -1550,7 +1551,7 @@ void format_commit_message(const struct commit *commit,
        }
 
        free(context.commit_encoding);
        }
 
        free(context.commit_encoding);

-       unuse_commit_buffer(commit, context.message);
+       repo_unuse_commit_buffer(r, commit, context.message);

 }
 
 static void pp_header(struct pretty_print_context *pp,
 }
 
 static void pp_header(struct pretty_print_context *pp,

diff --git a/pretty.h b/pretty.h
index 7359d318a92c167e0f36eabf73fdd1142f0e9031..e6625269cffed0b5aa178696c71c0ceb3acc6a18 100644 (file)
--- a/pretty.h
+++ b/pretty.h
@@ -103,9 +103,14 @@ void pp_remainder(struct pretty_print_context *pp, const char **msg_p,
  * Put the result to "sb".
  * Please use this function for custom formats.
  */
  * Put the result to "sb".
  * Please use this function for custom formats.
  */

-void format_commit_message(const struct commit *commit,
+void repo_format_commit_message(struct repository *r,
+                       const struct commit *commit,

                        const char *format, struct strbuf *sb,
                        const struct pretty_print_context *context);
                        const char *format, struct strbuf *sb,
                        const struct pretty_print_context *context);

+#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#define format_commit_message(c, f, s, con) \
+       repo_format_commit_message(the_repository, c, f, s, con)
+#endif

 
 /*
  * Parse given arguments from "arg", check it for correctness and
 
 /*
  * Parse given arguments from "arg", check it for correctness and