From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 52D221F453 for ; Mon, 21 Jan 2019 09:13:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726857AbfAUJNo (ORCPT ); Mon, 21 Jan 2019 04:13:44 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:45928 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726058AbfAUJNn (ORCPT ); Mon, 21 Jan 2019 04:13:43 -0500 Received: by mail-ed1-f65.google.com with SMTP id d39so15918209edb.12 for ; Mon, 21 Jan 2019 01:13:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=jWQp+OnjGGR/qjsHpDv/5/slcc6yYLWT9gs2Yk2rhoo=; b=RD6lMHtHtxa/EEcLNFkYVrxoxqRM9ppOopDk1lZs6ddfOQi6VITQMz24PUFtBVUKv8 NB/FJo7M8qOgf1ogY0TpcHuRp7lIigopSqYiKcLeT0+mDcS5Qccmf/r6djE2ITAx8i6P UOZg3j5pMKXo1eX5Ob7I71SRg5qQle6sEbF6QElqqAYA9QZGr338GK8HEM3nTUp+Se2k VNy9vezQ88cEVpm/PQ2jQK0BymXhNkaxtyyrdWPdRDi9s40QdmeVQZ+78yHWjbP1lbJ/ c0bSNr6RZsLEG7843jMPkxY64wflX9UYxRL7GWds/8/DuLu1oxPpw8rsi+NG8z0e6sJO 2aMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=jWQp+OnjGGR/qjsHpDv/5/slcc6yYLWT9gs2Yk2rhoo=; b=JkI62ywmJuSm25/rpXhHHgKFPBG7r37XiXng9J8SOUd1Hvw8IvX+3gT/09t1nx8Y8n 7A07gIp8sbbPaN5iWqin3a8c16Suw4i4oS2eLVTSly3lm6a8aHei7T6A4MWYAl/Oq1Gs udj+2QRupj+OIhfQyT3vBnQWxQYTadwr3ThD3nMY8WfVUvWdUDzARV/JQYJQLqHauHSm zG6I1obuJhbC15gBj1GPv3RhiYmxr+OzIJ6hn3lhCFaY7pau7tlWs7fh7XdISt7ATRdt Omz+i+JUrPUyQgt3NM5a7F4iITKa+/tgdJlQlQHkHfKOvjklcK8BPgpweXTyoUZkUg3v lM5g== X-Gm-Message-State: AJcUukdLgtGhossj38yCx20pcz5WDBIQ9eYDW1j/Nvw8c2GnOiwRENkC cWuXTEAPr1DlfyOySma/rlY82wk2 X-Google-Smtp-Source: ALg8bN7IaDHQQHaRT/1bmUvmPEc+IMKwOzlzdyJKCekio6qENt+jKw0N97DAaqOIEazN+xnyw8PwKA== X-Received: by 2002:a50:82c7:: with SMTP id 65mr26292930edg.94.1548062021540; Mon, 21 Jan 2019 01:13:41 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c53sm9684613ede.26.2019.01.21.01.13.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 01:13:40 -0800 (PST) Date: Mon, 21 Jan 2019 01:13:40 -0800 (PST) X-Google-Original-Date: Mon, 21 Jan 2019 09:13:33 GMT Message-Id: <737767b6f4e0367a7797020bd07a6b4357a47413.1548062019.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Daniel Ferreira via GitGitGadget" Subject: [PATCH v3 1/7] diff: export diffstat interface Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Junio C Hamano , Daniel Ferreira Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Daniel Ferreira Make the diffstat interface (namely, the diffstat_t struct and compute_diffstat) 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 Signed-off-by: Slavica Djukic --- diff.c | 36 ++++++++++++++---------------------- diff.h | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/diff.c b/diff.c index dc9965e836..46a7d8cf29 100644 --- a/diff.c +++ b/diff.c @@ -2421,22 +2421,6 @@ static void pprint_rename(struct strbuf *name, const char *a, const char *b) } } -struct diffstat_t { - int nr; - int alloc; - struct diffstat_file { - char *from_name; - char *name; - char *print_name; - const char *comments; - 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) @@ -5922,12 +5906,7 @@ void diff_flush(struct diff_options *options) dirstat_by_line) { struct diffstat_t diffstat; - memset(&diffstat, 0, sizeof(struct diffstat_t)); - for (i = 0; i < q->nr; i++) { - struct diff_filepair *p = q->queue[i]; - if (check_pair_status(p)) - diff_flush_stat(p, options, &diffstat); - } + compute_diffstat(options, &diffstat); if (output_format & DIFF_FORMAT_NUMSTAT) show_numstat(&diffstat, options); if (output_format & DIFF_FORMAT_DIFFSTAT) @@ -6227,6 +6206,19 @@ static int is_submodule_ignored(const char *path, struct diff_options *options) return ignored; } +void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat) +{ + int i; + struct diff_queue_struct *q = &diff_queued_diff; + + memset(diffstat, 0, sizeof(struct diffstat_t)); + for (i = 0; i < q->nr; i++) { + struct diff_filepair *p = q->queue[i]; + if (check_pair_status(p)) + diff_flush_stat(p, options, diffstat); + } +} + void diff_addremove(struct diff_options *options, int addremove, unsigned mode, const struct object_id *oid, diff --git a/diff.h b/diff.h index ce5e8a8183..7809db3039 100644 --- a/diff.h +++ b/diff.h @@ -239,6 +239,22 @@ void diff_emit_submodule_error(struct diff_options *o, const char *err); void diff_emit_submodule_pipethrough(struct diff_options *o, const char *line, int len); +struct diffstat_t { + int nr; + int alloc; + struct diffstat_file { + char *from_name; + char *name; + char *print_name; + const char *comments; + 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, @@ -327,6 +343,8 @@ void diff_change(struct diff_options *, struct diff_filepair *diff_unmerge(struct diff_options *, const char *path); +void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat); + #define DIFF_SETUP_REVERSE 1 #define DIFF_SETUP_USE_SIZE_CACHE 4 -- gitgitgadget