From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "René Scharfe" <l.s.r@web.de>, "Taylor Blau" <me@ttaylorr.com>,
"Derrick Stolee" <stolee@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
rsbecker@nexbridge.com,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: [PATCH v6 0/7] scalar: implement the subcommand "diagnose"
Date: Sat, 21 May 2022 15:08:09 +0000 [thread overview]
Message-ID: <pull.1128.v6.git.1653145696.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1128.v5.git.1652984283.gitgitgadget@gmail.com>
Over the course of the years, we developed a sub-command that gathers
diagnostic data into a .zip file that can then be attached to bug reports.
This sub-command turned out to be very useful in helping Scalar developers
identify and fix issues.
Changes since v5:
* Reworded the missed mentions of the old name of the --add-virtual-file
option (thanks René!).
* Renamed misleading variable name from $QUOTED to $PATHNAME (thanks
Junio!).
Changes since v4:
* Squashed in Junio's suggested fixups
* Renamed the option from --add-file-with-content=<name>:<content> to
--add-virtual-file=<name>:<content>
* Fixed one instance where I had used error() instead of error_errno().
Changes since v3:
* We're now using unquote_c_style() instead of rolling our own unquoter.
* Fixed the added regression test.
* As pointed out by Scalar's Functional Tests, the
add_directory_to_archiver() function should not fail when scalar diagnose
encounters FSMonitor's Unix socket, but only warn instead.
* Related: add_directory_to_archiver() needs to propagate errors from
processing subdirectories so that the top-level call returns an error,
too.
Changes since v2:
* Clarified in the commit message what the biggest benefit of
--add-file-with-content is.
* The <path> part of the -add-file-with-content argument can now contain
colons. To do this, the path needs to start and end in double-quote
characters (which are stripped), and the backslash serves as escape
character in that case (to allow the path to contain both colons and
double-quotes).
* Fixed incorrect grammar.
* Instead of strcmp(<what-we-don't-want>), we now say
!strcmp(<what-we-want>).
* The help text for --add-file-with-content was improved a tiny bit.
* Adjusted the commit message that still talked about spawning plenty of
processes and about a throw-away repository for the sake of generating a
.zip file.
* Simplified the code that shows the diagnostics and adds them to the .zip
file.
* The final message that reports that the archive is complete is now
printed to stderr instead of stdout.
Changes since v1:
* Instead of creating a throw-away repository, staging the contents of the
.zip file and then using git write-tree and git archive to write the .zip
file, the patch series now introduces a new option to git archive and
uses write_archive() directly (avoiding any separate process).
* Since the command avoids separate processes, it is now blazing fast on
Windows, and I dropped the spinner() function because it's no longer
needed.
* While reworking the test case, I noticed that scalar [...] <enlistment>
failed to verify that the specified directory exists, and would happily
"traverse to its parent directory" on its quest to find a Scalar
enlistment. That is of course incorrect, and has been fixed as a "while
at it" sort of preparatory commit.
* I had forgotten to sign off on all the commits, which has been fixed.
* Instead of some "home-grown" readdir()-based function, the code now uses
for_each_file_in_pack_dir() to look through the pack directories.
* If any alternates are configured, their pack directories are now included
in the output.
* The commit message that might be interpreted to promise information about
large loose files has been corrected to no longer promise that.
* The test cases have been adjusted to test a little bit more (e.g.
verifying that specific paths are mentioned in the output, instead of
merely verifying that the output is non-empty).
Johannes Schindelin (5):
archive: optionally add "virtual" files
archive --add-virtual-file: allow paths containing colons
scalar: validate the optional enlistment argument
Implement `scalar diagnose`
scalar diagnose: include disk space information
Matthew John Cheetham (2):
scalar: teach `diagnose` to gather packfile info
scalar: teach `diagnose` to gather loose objects information
Documentation/git-archive.txt | 17 ++
archive.c | 63 ++++++-
contrib/scalar/scalar.c | 292 ++++++++++++++++++++++++++++++-
contrib/scalar/scalar.txt | 12 ++
contrib/scalar/t/t9099-scalar.sh | 27 +++
t/t5003-archive-zip.sh | 20 +++
6 files changed, 421 insertions(+), 10 deletions(-)
base-commit: ddc35d833dd6f9e8946b09cecd3311b8aa18d295
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1128%2Fdscho%2Fscalar-diagnose-v6
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1128/dscho/scalar-diagnose-v6
Pull-Request: https://github.com/gitgitgadget/git/pull/1128
Range-diff vs v5:
1: 42e73fb0aac ! 1: 0005cfae31d archive: optionally add "virtual" files
@@ Metadata
## Commit message ##
archive: optionally add "virtual" files
- With the `--add-file-with-content=<path>:<content>` option, `git
- archive` now supports use cases where relatively trivial files need to
- be added that do not exist on disk.
+ With the `--add-virtual-file=<path>:<content>` option, `git archive` now
+ supports use cases where relatively trivial files need to be added that
+ do not exist on disk.
This will allow us to generate `.zip` files with generated content,
without having to add said content to the object database and without
2: b5ebd61066a ! 2: 7eebcf27b45 archive --add-file-with-contents: allow paths containing colons
@@ Metadata
Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
## Commit message ##
- archive --add-file-with-contents: allow paths containing colons
+ archive --add-virtual-file: allow paths containing colons
By allowing the path to be enclosed in double-quotes, we can avoid
the limitation that paths cannot contain colons.
@@ t/t5003-archive-zip.sh: check_zip with_untracked
test_expect_success UNZIP 'git archive --format=zip --add-virtual-file' '
+ if test_have_prereq FUNNYNAMES
+ then
-+ QUOTED=quoted:colon
++ PATHNAME=quoted:colon
+ else
-+ QUOTED=quoted
++ PATHNAME=quoted
+ fi &&
git archive --format=zip >with_file_with_content.zip \
-+ --add-virtual-file=\"$QUOTED\": \
++ --add-virtual-file=\"$PATHNAME\": \
--add-virtual-file=hello:world $EMPTY_TREE &&
test_when_finished "rm -rf tmp-unpack" &&
mkdir tmp-unpack && (
cd tmp-unpack &&
"$GIT_UNZIP" ../with_file_with_content.zip &&
test_path_is_file hello &&
-+ test_path_is_file $QUOTED &&
++ test_path_is_file $PATHNAME &&
test world = $(cat hello)
)
'
3: f1ba69c02d7 = 3: ca83ddd5eed scalar: validate the optional enlistment argument
4: 3fb90194744 = 4: 89c13a45e00 Implement `scalar diagnose`
5: 2e645b08a9e = 5: 8ffbaad3086 scalar diagnose: include disk space information
6: 0fa20d73750 = 6: 15cd7f17896 scalar: teach `diagnose` to gather packfile info
7: 62e173b47cf = 7: a4a74d5ef58 scalar: teach `diagnose` to gather loose objects information
--
gitgitgadget
next prev parent reply other threads:[~2022-05-21 15:08 UTC|newest]
Thread overview: 140+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-26 8:41 [PATCH 0/5] scalar: implement the subcommand "diagnose" Johannes Schindelin via GitGitGadget
2022-01-26 8:41 ` [PATCH 1/5] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-01-26 9:34 ` René Scharfe
2022-01-26 22:20 ` Taylor Blau
2022-02-06 21:34 ` Johannes Schindelin
2022-01-27 19:38 ` Elijah Newren
2022-01-26 8:41 ` [PATCH 2/5] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-01-26 8:41 ` [PATCH 3/5] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-01-26 22:43 ` Taylor Blau
2022-01-27 15:14 ` Derrick Stolee
2022-02-06 21:38 ` Johannes Schindelin
2022-01-26 8:41 ` [PATCH 4/5] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-01-26 22:50 ` Taylor Blau
2022-01-27 15:17 ` Derrick Stolee
2022-01-27 18:59 ` Elijah Newren
2022-02-06 21:25 ` Johannes Schindelin
2022-01-26 8:41 ` [PATCH 5/5] scalar diagnose: show a spinner while staging content Johannes Schindelin via GitGitGadget
2022-01-27 15:19 ` [PATCH 0/5] scalar: implement the subcommand "diagnose" Derrick Stolee
2022-02-06 21:13 ` Johannes Schindelin
2022-02-06 22:39 ` [PATCH v2 0/6] " Johannes Schindelin via GitGitGadget
2022-02-06 22:39 ` [PATCH v2 1/6] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget
2022-02-07 19:55 ` René Scharfe
2022-02-07 23:30 ` Junio C Hamano
2022-02-08 13:12 ` Johannes Schindelin
2022-02-08 17:44 ` Junio C Hamano
2022-02-08 20:58 ` René Scharfe
2022-02-09 22:48 ` Junio C Hamano
2022-02-10 19:10 ` René Scharfe
2022-02-10 19:23 ` Junio C Hamano
2022-02-11 19:16 ` René Scharfe
2022-02-11 21:27 ` Junio C Hamano
2022-02-12 9:12 ` René Scharfe
2022-02-13 6:25 ` Junio C Hamano
2022-02-13 9:02 ` René Scharfe
2022-02-14 17:22 ` Junio C Hamano
2022-02-08 12:54 ` Johannes Schindelin
2022-02-06 22:39 ` [PATCH v2 2/6] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget
2022-02-06 22:39 ` [PATCH v2 3/6] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-02-07 19:55 ` René Scharfe
2022-02-08 12:08 ` Johannes Schindelin
2022-02-06 22:39 ` [PATCH v2 4/6] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-02-06 22:39 ` [PATCH v2 5/6] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-02-06 22:39 ` [PATCH v2 6/6] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 0/7] scalar: implement the subcommand "diagnose" Johannes Schindelin via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 2/7] archive --add-file-with-contents: allow paths containing colons Johannes Schindelin via GitGitGadget
2022-05-07 2:06 ` Elijah Newren
2022-05-09 21:04 ` Johannes Schindelin
2022-05-04 15:25 ` [PATCH v3 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-05-07 2:23 ` [PATCH v3 0/7] scalar: implement the subcommand "diagnose" Elijah Newren
2022-05-10 19:26 ` [PATCH v4 " Johannes Schindelin via GitGitGadget
2022-05-10 19:26 ` [PATCH v4 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget
2022-05-10 21:48 ` Junio C Hamano
2022-05-10 22:06 ` rsbecker
2022-05-10 23:21 ` Junio C Hamano
2022-05-11 16:14 ` René Scharfe
2022-05-11 19:27 ` Junio C Hamano
2022-05-12 16:16 ` René Scharfe
2022-05-12 18:15 ` Junio C Hamano
2022-05-12 21:31 ` Junio C Hamano
2022-05-14 7:06 ` René Scharfe
2022-05-12 22:31 ` [PATCH] fixup! " Junio C Hamano
2022-05-10 19:26 ` [PATCH v4 2/7] archive --add-file-with-contents: allow paths containing colons Johannes Schindelin via GitGitGadget
2022-05-10 21:56 ` Junio C Hamano
2022-05-10 22:23 ` rsbecker
2022-05-19 18:12 ` Johannes Schindelin
2022-05-19 18:09 ` Johannes Schindelin
2022-05-19 18:44 ` Junio C Hamano
2022-05-10 19:27 ` [PATCH v4 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget
2022-05-17 14:51 ` Ævar Arnfjörð Bjarmason
2022-05-18 17:35 ` Junio C Hamano
2022-05-20 7:30 ` Ævar Arnfjörð Bjarmason
2022-05-20 15:55 ` Johannes Schindelin
2022-05-21 9:54 ` Ævar Arnfjörð Bjarmason
2022-05-22 5:50 ` Junio C Hamano
2022-05-24 12:25 ` Johannes Schindelin
2022-05-24 18:11 ` Ævar Arnfjörð Bjarmason
2022-05-24 19:29 ` Junio C Hamano
2022-05-25 10:31 ` Johannes Schindelin
2022-05-10 19:27 ` [PATCH v4 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-05-17 14:53 ` Ævar Arnfjörð Bjarmason
2022-05-10 19:27 ` [PATCH v4 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-05-10 19:27 ` [PATCH v4 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-05-10 19:27 ` [PATCH v4 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-05-17 15:03 ` [PATCH v4 0/7] scalar: implement the subcommand "diagnose" Ævar Arnfjörð Bjarmason
2022-05-17 15:28 ` rsbecker
2022-05-19 18:17 ` Johannes Schindelin
2022-05-19 18:17 ` [PATCH v5 " Johannes Schindelin via GitGitGadget
2022-05-19 18:17 ` [PATCH v5 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget
2022-05-20 14:41 ` René Scharfe
2022-05-20 16:21 ` Junio C Hamano
2022-05-19 18:17 ` [PATCH v5 2/7] archive --add-file-with-contents: allow paths containing colons Johannes Schindelin via GitGitGadget
2022-05-19 18:17 ` [PATCH v5 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget
2022-05-19 18:18 ` [PATCH v5 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-05-19 18:18 ` [PATCH v5 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-05-19 18:18 ` [PATCH v5 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-05-19 18:18 ` [PATCH v5 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-05-19 19:23 ` [PATCH v5 0/7] scalar: implement the subcommand "diagnose" Junio C Hamano
2022-05-21 15:08 ` Johannes Schindelin via GitGitGadget [this message]
2022-05-21 15:08 ` [PATCH v6 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget
2022-05-25 21:11 ` Junio C Hamano
2022-05-26 9:09 ` René Scharfe
2022-05-26 17:10 ` Junio C Hamano
2022-05-26 18:57 ` René Scharfe
2022-05-26 20:16 ` Junio C Hamano
2022-05-27 17:02 ` René Scharfe
2022-05-27 19:01 ` Junio C Hamano
2022-05-28 6:57 ` René Scharfe
2022-05-21 15:08 ` [PATCH v6 2/7] archive --add-virtual-file: allow paths containing colons Johannes Schindelin via GitGitGadget
2022-05-25 20:22 ` Junio C Hamano
2022-05-25 21:42 ` Junio C Hamano
2022-05-25 22:34 ` Junio C Hamano
2022-05-21 15:08 ` [PATCH v6 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget
2022-05-21 15:08 ` [PATCH v6 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-05-21 15:08 ` [PATCH v6 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-05-21 15:08 ` [PATCH v6 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-05-21 15:08 ` [PATCH v6 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-05-28 23:11 ` [PATCH v6+ 0/7] js/scalar-diagnose rebased Junio C Hamano
2022-05-28 23:11 ` [PATCH v6+ 1/7] archive: optionally add "virtual" files Junio C Hamano
2022-05-28 23:11 ` [PATCH v6+ 2/7] archive --add-virtual-file: allow paths containing colons Junio C Hamano
2022-06-15 18:16 ` Adam Dinwoodie
2022-06-15 20:00 ` Junio C Hamano
2022-06-15 21:36 ` Adam Dinwoodie
2022-06-18 20:19 ` Johannes Schindelin
2022-06-18 22:05 ` Junio C Hamano
2022-06-20 9:41 ` Adam Dinwoodie
2022-05-28 23:11 ` [PATCH v6+ 3/7] scalar: validate the optional enlistment argument Junio C Hamano
2022-05-28 23:11 ` [PATCH v6+ 4/7] scalar: implement `scalar diagnose` Junio C Hamano
2022-06-10 2:08 ` Ævar Arnfjörð Bjarmason
2022-06-10 16:44 ` Junio C Hamano
2022-06-10 17:35 ` Ævar Arnfjörð Bjarmason
2022-05-28 23:11 ` [PATCH v6+ 5/7] scalar diagnose: include disk space information Junio C Hamano
2022-05-28 23:11 ` [PATCH v6+ 6/7] scalar: teach `diagnose` to gather packfile info Junio C Hamano
2022-05-28 23:11 ` [PATCH v6+ 7/7] scalar: teach `diagnose` to gather loose objects information Junio C Hamano
2022-05-30 10:12 ` [PATCH v6+ 0/7] js/scalar-diagnose rebased Johannes Schindelin
2022-05-30 17:37 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1128.v6.git.1653145696.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=l.s.r@web.de \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
--cc=rsbecker@nexbridge.com \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).