[PATCH 0/3] Convert run_status to a builtin

Jeff King· Sep 7, 2006, 06:29 UTC · lore

This series of patches converts the run_status function from git-commit.sh to a C builtin. Hopefully we can use this as a starting point for further improvements (the only feature I added was colorization). I haven't had a chance to look closely at the simultaneous traversal code in pu, but that would be the nice next place to take this concept.

Patch 1/3 adds the necessary diff callback infrastructure, which may be of value regardless of whether the final patch is accepted.

Patch 2/3 lib-ifies the diff color support so it can be reused by run-status. Again, I think this is worth doing anyway from a code cleanup standpoint.

Patch 3/3 does the actual conversion.

-Peff

Jeff King· Sep 7, 2006, 06:35 UTC · re: Jeff King · lore

[PATCH 1/3] diff: support custom callbacks for output

Users can request the DIFF_FORMAT_CALLBACK output format to get a callback
consisting of the whole diff_queue_struct.
---
 diff.c |    3 +++
 diff.h |    8 ++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

Show changes to 2 files +11 −0

diff.c, diff.h

diff --git a/diff.c b/diff.c
index 9dcbda3..a3ebc62 100644
--- a/diff.c
+++ b/diff.c
@@ -2587,6 +2587,9 @@ void diff_flush(struct diff_options *opt
 		}
 	}
 
+	if (output_format & DIFF_FORMAT_CALLBACK)
+		options->format_callback(q, options, options->format_callback_data);
+
 	for (i = 0; i < q->nr; i++)
 		diff_free_filepair(q->queue[i]);
 free_queue:
diff --git a/diff.h b/diff.h
index b007240..b60a02e 100644
--- a/diff.h
+++ b/diff.h
@@ -8,6 +8,7 @@ #include "tree-walk.h"
 
 struct rev_info;
 struct diff_options;
+struct diff_queue_struct;
 
 typedef void (*change_fn_t)(struct diff_options *options,
 		 unsigned old_mode, unsigned new_mode,
@@ -20,6 +21,9 @@ typedef void (*add_remove_fn_t)(struct d
 		    const unsigned char *sha1,
 		    const char *base, const char *path);
 
+typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
+		struct diff_options *options, void *data);
+
 #define DIFF_FORMAT_RAW		0x0001
 #define DIFF_FORMAT_DIFFSTAT	0x0002
 #define DIFF_FORMAT_SUMMARY	0x0004
@@ -35,6 +39,8 @@ #define DIFF_FORMAT_CHECKDIFF	0x0040
  */
 #define DIFF_FORMAT_NO_OUTPUT	0x0080
 
+#define DIFF_FORMAT_CALLBACK	0x0100
+
 struct diff_options {
 	const char *filter;
 	const char *orderfile;
@@ -68,6 +74,8 @@ struct diff_options {
 	int *pathlens;
 	change_fn_t change;
 	add_remove_fn_t add_remove;
+	diff_format_fn_t format_callback;
+	void *format_callback_data;
 };
 
 enum color_diff {

-- 
1.4.2.ge490e-dirty

patch, 3 partsConvert run_status to a builtin