From patchwork Thu Nov 22 13:28:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 10694155 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4196E14BD for ; Thu, 22 Nov 2018 13:28:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3294D2BEA9 for ; Thu, 22 Nov 2018 13:28:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 266E42BECA; Thu, 22 Nov 2018 13:28:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B72532BEA9 for ; Thu, 22 Nov 2018 13:28:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436859AbeKWAIE (ORCPT ); Thu, 22 Nov 2018 19:08:04 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:50690 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436841AbeKWAIE (ORCPT ); Thu, 22 Nov 2018 19:08:04 -0500 Received: by mail-wm1-f67.google.com with SMTP id 125so9018393wmh.0 for ; Thu, 22 Nov 2018 05:28:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iHMPppvw2cwK1TwF/gwukbkSuetWwFrHCi6J8hzYy14=; b=bqr7GwnyPLW9NYsmIgGC9Z33h4feZEYUzLiQllZAUCqFyI0vhIgy7TMkW9jhfQBf3+ 1sPtvF42FIHwmdrCzBtfxLae4GZgsRIV+6u9jAB5DttTyoquhoz3CjRw5UGm88yN1bdx MtsTz+zrsjVznyC72CJis9UsfpqCFY1ZPYx8YLl2NTeSZQfUswyO8Ofl12gpC0H1QzVs imty+OuVYS5ErgWc3RXHh4yBVZ8gfOthtl3+6tFGBJo1jFbHPnHcqDCIFruyWHemMUee Ttp+ztgiTU2l4eWlFK8HbpegeB1fhOS+4B6dMjTwCkuU4Q1v1X7BMC/D2OEB19prJ7ZF t1FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iHMPppvw2cwK1TwF/gwukbkSuetWwFrHCi6J8hzYy14=; b=jWwTDdhK/tyfuOywx15mY+ZeLvz4LoCsX2Vj7DdCRuJMhz/sA50Bc20sUtbwWqIHq9 XXUJJcDY7JFMlE1ESQg21N+iJ0o60c+S/KUBXWslt6ipkVkPT5WqrmOsujpFuQwcxisL JsCRiNElkJsikHvVJNu3abeCi/nn7yPDNB2k8wcjvzzkoFis/GrUuirtX1onEr3uwCP+ FgmowM1EdNeUZ5TXd8JEJcfjXxJpyRyVW96ImMhFYW4MYvbdpZgsvAjsrY8apYBFHyyK qeEWfzl0d2k67F8axBWZlW0Z2gVB3mAu9rBgzdwf78O01JcFWS4fg5BZhy3IWR/PmUNU lb4Q== X-Gm-Message-State: AGRZ1gLesVQmPagang5DJpMp8qW8es4GGzPVwnEYfkDbPHXsAaYOWiao D2APBSr6uHnFyH3DsdU5M9OfB11U X-Google-Smtp-Source: AJdET5eoqhPSZPz8e/o18hgwvdfkGsDZfGEldtMX16xj59VmdDsyBjZ3ImqXNeKyE33xUs5q972LVw== X-Received: by 2002:a1c:9f8f:: with SMTP id i137mr9414190wme.30.1542893320154; Thu, 22 Nov 2018 05:28:40 -0800 (PST) Received: from u.nix.is ([2a01:4f8:190:5095::2]) by smtp.gmail.com with ESMTPSA id t82-v6sm5418165wme.30.2018.11.22.05.28.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 05:28:39 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= , =?utf-8?q?SZEDER_G=C3=A1bor?= , Eric Sunshine , Derrick Stolee , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v3 05/10] commit-graph write: more descriptive "writing out" output Date: Thu, 22 Nov 2018 13:28:18 +0000 Message-Id: <20181122132823.9883-6-avarab@gmail.com> X-Mailer: git-send-email 2.20.0.rc0.387.gc7a69e6b6c In-Reply-To: <20181121012600.26951-1-szeder.dev@gmail.com> References: <20181121012600.26951-1-szeder.dev@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make the "Writing out" part of the progress output more descriptive. Depending on the shape of the graph we either make 4 or 5 passes over it. Let's present this information to the user in case they're wondering what this number, which is much larger than their number of commits, has to do with writing out the commit graph. Now e.g. on linux.git we emit: $ ~/g/git/git --exec-path=$HOME/g/git commit-graph write Finding commits for commit graph: 6365442, done. Computing commit graph generation numbers: 100% (797222/797222), done. Writing out commit graph in 5 passes: 100% (3986110/3986110), done. A note on i18n: Why are we using the Q_() function and passing a number & English text for a singular which'll never be used? Because the plural rules of translated languages may not match those of English, and to use the plural function we need to use this format. Signed-off-by: Ævar Arnfjörð Bjarmason --- commit-graph.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/commit-graph.c b/commit-graph.c index e32a5cc1bc..8e5970f0b9 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -780,6 +780,7 @@ void write_commit_graph(const char *obj_dir, struct commit_list *parent; struct progress *progress = NULL; uint64_t progress_cnt = 0; + struct strbuf progress_title = STRBUF_INIT; if (!commit_graph_compatible(the_repository)) return; @@ -962,8 +963,13 @@ void write_commit_graph(const char *obj_dir, int graph_passes = 4; if (num_large_edges) graph_passes++; + strbuf_addf(&progress_title, + Q_("Writing out commit graph in %d pass", + "Writing out commit graph in %d passes", + graph_passes), + graph_passes); progress = start_delayed_progress( - _("Writing out commit graph"), + progress_title.buf, graph_passes * commits.nr); } write_graph_chunk_fanout(f, commits.list, commits.nr, progress, &progress_cnt); @@ -973,6 +979,8 @@ void write_commit_graph(const char *obj_dir, write_graph_chunk_large_edges(f, commits.list, commits.nr, progress, &progress_cnt); stop_progress(&progress); + strbuf_release(&progress_title); + close_commit_graph(the_repository); finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_FSYNC); commit_lock_file(&lk);