This is a quick hack to make these functions available for
the lua code. It would be way cleaner to move all of the
incremental parsing bits to format-commit.[ch] and clean up
the names (e.g., "struct chunk" is not nearly descriptive
enough for a global).
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
commit.h | 36 ++++++++++++++++++++++++++++++++++++
pretty.c | 38 ++------------------------------------
2 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/commit.h b/commit.h
index 9f21313..71cd4af 100644
--- a/commit.h
+++ b/commit.h
@@ -126,6 +126,42 @@ void pp_remainder(const struct pretty_print_context *pp,
struct strbuf *sb,
int indent);
+struct chunk {
+ size_t off;
+ size_t len;
+};
+
+struct format_commit_context {
+ const struct commit *commit;
+ const struct pretty_print_context *pretty_ctx;
+ unsigned commit_header_parsed:1;
+ unsigned commit_message_parsed:1;
+ unsigned commit_signature_parsed:1;
+ struct {
+ char *gpg_output;
+ char good_bad;
+ char *signer;
+ } signature;
+ char *message;
+ size_t width, indent1, indent2;
+
+ /* These offsets are relative to the start of the commit message. */
+ struct chunk author;
+ struct chunk committer;
+ struct chunk encoding;
+ size_t message_off;
+ size_t subject_off;
+ size_t body_off;
+
+ /* The following ones are relative to the result struct strbuf. */
+ struct chunk abbrev_commit_hash;
+ struct chunk abbrev_tree_hash;
+ struct chunk abbrev_parent_hashes;
+ size_t wrap_start;
+};
+
+void parse_commit_header(struct format_commit_context *);
+void parse_commit_message(struct format_commit_context *);
/** Removes the first commit from a list sorted by date, and adds all
* of its parents.
diff --git a/pretty.c b/pretty.c
index 8b1ea9f..0d4eb3d 100644
--- a/pretty.c
+++ b/pretty.c
@@ -612,40 +612,6 @@ skip:
return 0; /* unknown placeholder */
}
-struct chunk {
- size_t off;
- size_t len;
-};
-
-struct format_commit_context {
- const struct commit *commit;
- const struct pretty_print_context *pretty_ctx;
- unsigned commit_header_parsed:1;
- unsigned commit_message_parsed:1;
- unsigned commit_signature_parsed:1;
- struct {
- char *gpg_output;
- char good_bad;
- char *signer;
- } signature;
- char *message;
- size_t width, indent1, indent2;
-
- /* These offsets are relative to the start of the commit message. */
- struct chunk author;
- struct chunk committer;
- struct chunk encoding;
- size_t message_off;
- size_t subject_off;
- size_t body_off;
-
- /* The following ones are relative to the result struct strbuf. */
- struct chunk abbrev_commit_hash;
- struct chunk abbrev_tree_hash;
- struct chunk abbrev_parent_hashes;
- size_t wrap_start;
-};
-
static int add_again(struct strbuf *sb, struct chunk *chunk)
{
if (chunk->len) {
@@ -663,7 +629,7 @@ static int add_again(struct strbuf *sb, struct chunk *chunk)
return 0;
}
-static void parse_commit_header(struct format_commit_context *context)
+void parse_commit_header(struct format_commit_context *context)
{
const char *msg = context->message;
int i;
@@ -749,7 +715,7 @@ const char *format_subject(struct strbuf *sb, const char *msg,
return msg;
}
-static void parse_commit_message(struct format_commit_context *c)
+void parse_commit_message(struct format_commit_context *c)
{
const char *msg = c->message + c->message_off;
const char *start = c->message;
--
1.7.12.1.10.g6537447
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html