From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8DFBC43603 for ; Wed, 11 Dec 2019 20:53:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B278F21556 for ; Wed, 11 Dec 2019 20:53:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LOs2ZNrU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726826AbfLKUw7 (ORCPT ); Wed, 11 Dec 2019 15:52:59 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:35561 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726368AbfLKUw5 (ORCPT ); Wed, 11 Dec 2019 15:52:57 -0500 Received: by mail-pg1-f193.google.com with SMTP id l24so11324967pgk.2 for ; Wed, 11 Dec 2019 12:52:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=pQOd0TxitCKQLphvs2Erzqe2qKNff1NohEbHOIbym4U=; b=LOs2ZNrUktDjRZu6D6U92R7qWgxpLDws9GWJNFf41ZzY+tNc5XO1BhcacEcR5D03JF ctWdWVpnQnlr9EmEGT0bZWU4IeK1UzLjL8k/7BO21ryCBHp7BF2ibbx6kkWbadwSqcLH p2CxBiQavIWghC2F6nzYz4Ma4fn2nX574CuDi1gz4xvHjyWUjznAzizv2scOQrCua6Ad rM1sXDdVyqcW2JrOLB5qOFKMwYkvFScUTgq8IPQmivqSGZ/of0m8VkUYow/vB4vYlc95 FdGkH/1jFaCa78CmAAnYXkYKW3ofwgR8Y9YwcJ4tA+vlb6z+tlRqhM5qIUpE1Gqznu7r qcuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=pQOd0TxitCKQLphvs2Erzqe2qKNff1NohEbHOIbym4U=; b=DadZuqjKZbYmJcul7Ed6ziZfTr/O2PQiQbDsAvSRjrUTA3QebKc4jCRripp2oKZ8RA LqO9GDuTfzzdlFp5idwOiQ7dtOgg7tdxdp5JjW69lwWWcAWpn83RxYdRlyiSeWYTrFOJ HK2bbNwtVkF3upAjGZQwO0pxgkf56B5C4QqQSldNKboR3qDg7eEaxEfbHjbHXp6LKQKy Ww/7UyoX5B4/WJDL1eeEgcc3wve/y+dzvRsElm8s6AxQUh8eyXZSh2KVhuNOaMIHESis XgkcfEWzYH4ZnSyAioR4Vb3HUNcZDAWjfjfbG7iHB2Qhp/zk+UoQ+HoosyIw6vDViZ2w rZOQ== X-Gm-Message-State: APjAAAXU1bAstq8nGdpzkliLRhW3t3y2yVX8DJFO9zhYpTkxiG660qdT 3pOdusGtDoCHshnEPCNdAyJjTw== X-Google-Smtp-Source: APXvYqyj6o8aw/Xs2LH8PazyG8wxwuhKtHiAR4xXilVTpVAOGfMbSCBvKqSbMfcoGQTr84PGmelvTg== X-Received: by 2002:a63:4d4c:: with SMTP id n12mr6522468pgl.212.1576097576573; Wed, 11 Dec 2019 12:52:56 -0800 (PST) Received: from google.com ([2620:15c:2ce:0:231c:11cc:aa0a:6dc5]) by smtp.gmail.com with ESMTPSA id a26sm4209046pfo.5.2019.12.11.12.52.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 12:52:56 -0800 (PST) Date: Wed, 11 Dec 2019 12:52:51 -0800 From: Emily Shaffer To: Johannes Schindelin Cc: git@vger.kernel.org Subject: Re: [PATCH v3 7/9] bugreport: add packed object summary Message-ID: <20191211205251.GE107889@google.com> References: <20191025025129.250049-1-emilyshaffer@google.com> <20191025025129.250049-8-emilyshaffer@google.com> <20191211002934.GB107889@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Dec 11, 2019 at 02:37:10PM +0100, Johannes Schindelin wrote: > Hi Emily, > > On Tue, 10 Dec 2019, Emily Shaffer wrote: > > > On Mon, Oct 28, 2019 at 04:43:50PM +0100, Johannes Schindelin wrote: > > > Hi Emily, > > > > > > On Thu, 24 Oct 2019, Emily Shaffer wrote: > > > > > > > Alongside the list of loose objects, it's useful to see the list of > > > > object packs as well. It can help us to examine what Git did and did not > > > > pack. > > > > > > Yes, I was write! Packs are next ;-) > > > > > > > > > > > Signed-off-by: Emily Shaffer > > > > --- > > > > bugreport.c | 21 +++++++++++++++++++++ > > > > bugreport.h | 6 ++++++ > > > > builtin/bugreport.c | 4 ++++ > > > > 3 files changed, 31 insertions(+) > > > > > > > > diff --git a/bugreport.c b/bugreport.c > > > > index 54e1d47103..79ddb8baaa 100644 > > > > --- a/bugreport.c > > > > +++ b/bugreport.c > > > > @@ -219,3 +219,24 @@ void get_loose_object_summary(struct strbuf *obj_info) > > > > objects.nr); > > > > } > > > > } > > > > + > > > > +void get_packed_object_summary(struct strbuf *obj_info) > > > > +{ > > > > + struct strbuf dirpath = STRBUF_INIT; > > > > + struct string_list contents = STRING_LIST_INIT_DUP; > > > > + struct string_list_item *entry; > > > > + > > > > + strbuf_reset(obj_info); > > > > + > > > > + strbuf_addstr(&dirpath, get_object_directory()); > > > > + strbuf_complete(&dirpath, '/'); > > > > + strbuf_addstr(&dirpath, "pack/"); > > > > + list_contents_of_dir(&contents, &dirpath, 0, 0); > > > > + > > > > + // list full contents of $GIT_OBJECT_DIRECTORY/pack/ > > > > + for_each_string_list_item(entry, &contents) { > > > > + strbuf_addbuf(obj_info, &dirpath); > > > > + strbuf_addstr(obj_info, entry->string); > > > > + strbuf_complete_line(obj_info); > > > > + } > > > > +} > > > > > > Okay, but I think that you will want to discern between regular `.pack` > > > files, `.idx` files and `tmp_*` files. > > > > Discern in what way? How would you like to see them treated separately? > > They're all being listed here, not just counted, so it seems to me like > > I can read the generated bugreport and see which files are index, pack, > > or temporary here. > > I take your word for it (sorry, it's been half an eternity since I wrapped > my head around the diff, I forgotten pretty much all about it ;-)) That makes two of us. :) > > Ciao, > Dscho > > > > > > > > > > diff --git a/bugreport.h b/bugreport.h > > > > index 09ad0c2599..11ff7df41b 100644 > > > > --- a/bugreport.h > > > > +++ b/bugreport.h > > > > @@ -24,3 +24,9 @@ void get_populated_hooks(struct strbuf *hook_info); > > > > * will be discarded. > > > > */ > > > > void get_loose_object_summary(struct strbuf *obj_info); > > > > + > > > > +/** > > > > + * Adds a list of the contents of '.git/objects/pack'. The previous contents of > > > > + * hook_info will be discarded. > > > > + */ > > > > +void get_packed_object_summary(struct strbuf *obj_info); > > > > diff --git a/builtin/bugreport.c b/builtin/bugreport.c > > > > index b2ab194207..da91a3944e 100644 > > > > --- a/builtin/bugreport.c > > > > +++ b/builtin/bugreport.c > > > > @@ -68,6 +68,10 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix) > > > > get_loose_object_summary(&buffer); > > > > strbuf_write(&buffer, report); > > > > > > > > + add_header(report, "Packed Object Summary"); > > > > + get_packed_object_summary(&buffer); > > > > + strbuf_write(&buffer, report); > > > > + > > > > > > Hmm. At this point, I am unclear whether you want to write into an > > > `strbuf`, or directly into a `FILE *`? I would rather have only one, not > > > a mix. > > > > > > Ciao, > > > Dscho > > > > > > > fclose(report); > > > > > > > > launch_editor(report_path.buf, NULL, NULL); > > > > -- > > > > 2.24.0.rc0.303.g954a862665-goog > > > > > > > > > >