[PATCH v2 1/4] diff: export diffstat interface
- From
Daniel Ferreira <bnmvco@gmail.com>
- Date
- May 16, 2017, 04:00 UTC
- Message-ID
- <1494907234-28903-2-git-send-email-bnmvco@gmail.com>
- In-Reply-To
- <1494907234-28903-1-git-send-email-bnmvco@gmail.com>
Make the diffstat interface (namely, the diffstat_t struct and diff_flush_stat) no longer be internal to diff.c and allow it to be used by other parts of git.
This is helpful for code that may want to easily extract information from files using the diff machinery, while flushing it differently from how the show_* functions used by diff_flush() do it. One example is the builtin implementation of git-add--interactive's status.
Signed-off-by: Daniel Ferreira <bnmvco@gmail.com> --- diff.c | 17 +---------------- diff.h | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/diff.c b/diff.c index 74283d9..7c073c2 100644 --- a/diff.c +++ b/diff.c @@ -1460,21 +1460,6 @@ static char *pprint_rename(const char *a, const char *b) return strbuf_detach(&name, NULL); } -struct diffstat_t { - int nr; - int alloc; - struct diffstat_file { - char *from_name; - char *name; - char *print_name; - unsigned is_unmerged:1; - unsigned is_binary:1; - unsigned is_renamed:1; - unsigned is_interesting:1; - uintmax_t added, deleted; - } **files; -}; - static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat, const char *name_a, const char *name_b) @@ -4310,7 +4295,7 @@ static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o) run_diff(p, o); } -static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o, +void diff_flush_stat(struct diff_filepair *p, struct diff_options *o, struct diffstat_t *diffstat) { if (diff_unmodified_pair(p)) diff --git a/diff.h b/diff.h index 5be1ee7..4cdc72d 100644 --- a/diff.h +++ b/diff.h @@ -188,6 +188,21 @@ struct diff_options { int diff_path_counter; }; +struct diffstat_t { + int nr; + int alloc; + struct diffstat_file { + char *from_name; + char *name; + char *print_name; + unsigned is_unmerged:1; + unsigned is_binary:1; + unsigned is_renamed:1; + unsigned is_interesting:1; + uintmax_t added, deleted; + } **files; +}; + enum color_diff { DIFF_RESET = 0, DIFF_CONTEXT = 1, @@ -206,7 +221,6 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix); const char *diff_line_prefix(struct diff_options *); - extern const char mime_boundary_leader[]; extern struct combine_diff_path *diff_tree_paths( @@ -262,6 +276,9 @@ extern void diff_change(struct diff_options *, extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path); +void diff_flush_stat(struct diff_filepair *p, struct diff_options *o, + struct diffstat_t *diffstat); + #define DIFF_SETUP_REVERSE 1 #define DIFF_SETUP_USE_CACHE 2 #define DIFF_SETUP_USE_SIZE_CACHE 4
-- 2.7.4 (Apple Git-66)