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=-3.9 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, SPF_HELO_NONE,SPF_NONE 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 D2ED61F4B5 for ; Wed, 13 Nov 2019 12:41:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726418AbfKMMlL (ORCPT ); Wed, 13 Nov 2019 07:41:11 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:40628 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726339AbfKMMlL (ORCPT ); Wed, 13 Nov 2019 07:41:11 -0500 Received: by mail-wm1-f67.google.com with SMTP id f3so1831893wmc.5 for ; Wed, 13 Nov 2019 04:41:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=rFMaUJqcvtNZv6SXcUG484Xgjg/pJ3HxwuEagPqFxzA=; b=E/dJpzc/aUZsALGyjR2eILib6vojZkzZ2E4zQFuVb/0eGVHSpaxGz7zVdwHFbyO1oK xkqKLT54xRACdOInfvKQYc8MBYHO4tTFXXEW9nKdwEW9ObWZV4qDcHih89YqCSyIMBqa vfUZloUzC5I3lugmFaO/brL+I3lRBJdgtiXODKZFSbMIkxSr5pu8Vukcl1EWm7Q61QPg ljQankGIAj6iyS0Qwjb5TbIj5fSjEtvhth1QMlOuUqP/BkZql+ctD0PvynMyPjD3+fvS LSBASzneNSLeLFQegRmu9pG/OrjIODoQJzcxJHbz6huAytJ5hEAnaJF0mPkz0wutODNJ II5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=rFMaUJqcvtNZv6SXcUG484Xgjg/pJ3HxwuEagPqFxzA=; b=nfW/02S55O1H5lCWxqfqc5lwGuo63u9oAOLDKoZbtB8ND74NkhAmUU/OFUtUwOk6+V xA01beftT0xV5xD6MBow+aO2PY6Kgk5bxrarVff7JQ7Jj1+kS7T2RO5aLtWsDU8oOxp1 lfeNVFRaI8yinGXQaU//IRS7CvUb8HWjUBq6NOksqwOlIhWUzi/FATbyGD1D1eQ4c/3K mkyv8O0ebc9GGnXuTdk0QrL0RFojfADWh/kcJ0ooVrex0O9Wq2zJgTcfCzYuevsyvEUr aN3+buF7EPeeSg5PLVKaHMs3wQ3Bcrw8kMju2mPlwpmWQyGtiOin7H26Vxs+pm78j+6E zTuA== X-Gm-Message-State: APjAAAWG1zEFthoNj0HU5XMmt4w9NbyWIZwZ7kBKtD3q3znhwf2xF6yA t/Fwh96lR9wZt2OAWtEJoesPk5in X-Google-Smtp-Source: APXvYqxCcijYzT6mlXamT1dW9K3wAVjD037zKp2mHjeP4Ce+Jl9XGpomCz679hHAhkJlNDFITHwmEA== X-Received: by 2002:a1c:7d94:: with SMTP id y142mr2815453wmc.168.1573648869349; Wed, 13 Nov 2019 04:41:09 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id h16sm2489316wrs.48.2019.11.13.04.41.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Nov 2019 04:41:08 -0800 (PST) Message-Id: In-Reply-To: References: From: "Daniel Ferreira via GitGitGadget" Date: Wed, 13 Nov 2019 12:40:58 +0000 Subject: [PATCH v6 2/9] diff: export diffstat interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fcc: Sent To: git@vger.kernel.org Cc: Jeff Hostetler , Jeff King , Johannes Schindelin , 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 Đukić Signed-off-by: Johannes Schindelin --- diff.c | 39 ++++++++++++++++----------------------- diff.h | 20 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/diff.c b/diff.c index afe4400a60..5703a9b78f 100644 --- a/diff.c +++ b/diff.c @@ -2495,22 +2495,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) @@ -3157,7 +3141,7 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o gather_dirstat(options, &dir, changed, "", 0); } -static void free_diffstat_info(struct diffstat_t *diffstat) +void free_diffstat_info(struct diffstat_t *diffstat) { int i; for (i = 0; i < diffstat->nr; i++) { @@ -6283,12 +6267,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, q); if (output_format & DIFF_FORMAT_NUMSTAT) show_numstat(&diffstat, options); if (output_format & DIFF_FORMAT_DIFFSTAT) @@ -6621,6 +6600,20 @@ 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, + struct diff_queue_struct *q) +{ + int i; + + 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 7f8f024feb..d986ddc3b5 100644 --- a/diff.h +++ b/diff.h @@ -245,6 +245,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, @@ -334,6 +350,10 @@ 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, + struct diff_queue_struct *q); +void free_diffstat_info(struct diffstat_t *diffstat); + #define DIFF_SETUP_REVERSE 1 #define DIFF_SETUP_USE_SIZE_CACHE 4 -- gitgitgadget