summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2006-07-23 05:24:18 -0400
committerJunio C Hamano <junkio@cox.net>2006-07-24 00:04:41 -0700
commitce43697379ad8ffcaf061a4709489728c1dbe911 (patch)
tree74db6123dc3f7d8547436f27c5e07b2c2ce81b0d /diff.h
parentcbd64afbb3b1ad5433585ac71d94bd0c63270e38 (diff)
downloadgit-ce43697379ad8ffcaf061a4709489728c1dbe911.tar.gz
Colorize 'commit' lines in log ui
When paging through the output of git-whatchanged, the color cues help to visually navigate within a diff. However, it is difficult to notice when a new commit starts, because the commit and log are shown in the "normal" color. This patch colorizes the 'commit' line, customizable through diff.colors.commit and defaulting to yellow. As a side effect, some of the diff color engine (slot enum, get_color) has become accessible outside of diff.c. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index a06f959938..2cced530fa 100644
--- a/diff.h
+++ b/diff.h
@@ -69,6 +69,17 @@ struct diff_options {
add_remove_fn_t add_remove;
};
+enum color_diff {
+ DIFF_RESET = 0,
+ DIFF_PLAIN = 1,
+ DIFF_METAINFO = 2,
+ DIFF_FRAGINFO = 3,
+ DIFF_FILE_OLD = 4,
+ DIFF_FILE_NEW = 5,
+ DIFF_COMMIT = 6,
+};
+const char *diff_get_color(int diff_use_color, enum color_diff ix);
+
extern const char mime_boundary_leader[];
extern void diff_tree_setup_paths(const char **paths, struct diff_options *);