From: Thomas Gummerer <t.gummerer@gmail.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Jeff King" <peff@peff.net>, "Derrick Stolee" <stolee@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2 01/10] ls-files: add --json to dump the index
Date: Tue, 25 Jun 2019 10:05:54 +0100 [thread overview]
Message-ID: <20190625090554.GA2423@hank.intra.tgummerer.com> (raw)
In-Reply-To: <20190624130226.17293-2-pclouds@gmail.com>
On 06/24, Nguyễn Thái Ngọc Duy wrote:
> So far we don't have a command to basically dump the index file out,
> with all its glory details. Checking some info, for example, stat
> time, usually involves either writing new code or firing up "xxd" and
> decoding values by yourself.
>
> This --json is supposed to help that. It dumps the index in a human
> readable format but also easy to be processed with tools. And it will
> print almost enough info to reconstruct the index later.
>
> In this patch we only dump the main part, not extensions. But at the
> end of the series, the entire index is dumped. The end result could be
> very verbose even on a small repository such as git.git.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> Documentation/git-ls-files.txt | 5 +++
> builtin/ls-files.c | 38 +++++++++++++---
> cache.h | 2 +
> json-writer.c | 22 ++++++++++
> json-writer.h | 23 ++++++++++
> read-cache.c | 72 ++++++++++++++++++++++++++++++-
> t/t3011-ls-files-json.sh (new +x) | 44 +++++++++++++++++++
> t/t3011/basic (new) | 67 ++++++++++++++++++++++++++++
> 8 files changed, 265 insertions(+), 8 deletions(-)
>
> [...]
>
> diff --git a/t/t3011-ls-files-json.sh b/t/t3011-ls-files-json.sh
> new file mode 100755
> index 0000000000..97bcd814be
> --- /dev/null
> +++ b/t/t3011-ls-files-json.sh
> @@ -0,0 +1,44 @@
> +#!/bin/sh
> +
> +test_description='ls-files dumping json'
> +
> +. ./test-lib.sh
> +
> +strip_number() {
> + for name; do
> + echo 's/\("'$name'":\) [0-9]\+/\1 <number>/' >>filter.sed
> + done
> +}
> +
> +strip_string() {
> + for name; do
> + echo 's/\("'$name'":\) ".*"/\1 <string>/' >>filter.sed
> + done
> +}
> +
> +compare_json() {
> + git ls-files --debug-json >json &&
> + sed -f filter.sed json >filtered &&
> + test_cmp "$TEST_DIRECTORY"/t3011/"$1" filtered
> +}
> +
> +test_expect_success 'setup' '
> + mkdir sub &&
> + echo one >one &&
> + git add one &&
> + echo 2 >sub/two &&
> + git add sub/two &&
> +
> + echo intent-to-add >ita &&
> + git add -N ita &&
> +
> + strip_number ctime_sec ctime_nsec mtime_sec mtime_nsec &&
> + strip_number device inode uid gid file_offset ext_size &&
> + strip_string oid ident
> +'
> +
> +test_expect_success 'ls-files --json, main entries' '
> + compare_json basic
> +'
> +
> +test_done
> diff --git a/t/t3011/basic b/t/t3011/basic
> new file mode 100644
> index 0000000000..9436445d90
> --- /dev/null
> +++ b/t/t3011/basic
> @@ -0,0 +1,67 @@
> +{
> + "version": 3,
This will break the test suite when 'GIT_TEST_INDEX_VERSION' is set to
4 for example. I think this applies to a few other tests in later
patches as well.
> + "oid": <string>,
> + "mtime_sec": <number>,
> + "mtime_nsec": <number>,
> + "entries": [
> + {
> + "id": 0,
> + "name": "ita",
> + "mode": "100644",
> + "flags": 536887296,
> + "extended_flags": true,
> + "intent_to_add": true,
> + "oid": <string>,
> + "stat": {
> + "ctime_sec": <number>,
> + "ctime_nsec": <number>,
> + "mtime_sec": <number>,
> + "mtime_nsec": <number>,
> + "device": <number>,
> + "inode": <number>,
> + "uid": <number>,
> + "gid": <number>,
> + "size": 0
> + },
> + "file_offset": <number>
> + },
> + {
> + "id": 1,
> + "name": "one",
> + "mode": "100644",
> + "flags": 0,
> + "oid": <string>,
> + "stat": {
> + "ctime_sec": <number>,
> + "ctime_nsec": <number>,
> + "mtime_sec": <number>,
> + "mtime_nsec": <number>,
> + "device": <number>,
> + "inode": <number>,
> + "uid": <number>,
> + "gid": <number>,
> + "size": 4
> + },
> + "file_offset": <number>
> + },
> + {
> + "id": 2,
> + "name": "sub/two",
> + "mode": "100644",
> + "flags": 0,
> + "oid": <string>,
> + "stat": {
> + "ctime_sec": <number>,
> + "ctime_nsec": <number>,
> + "mtime_sec": <number>,
> + "mtime_nsec": <number>,
> + "device": <number>,
> + "inode": <number>,
> + "uid": <number>,
> + "gid": <number>,
> + "size": 2
> + },
> + "file_offset": <number>
> + }
> + ]
> +}
> --
> 2.22.0.rc0.322.g2b0371e29a
>
next prev parent reply other threads:[~2019-06-25 9:06 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 13:02 [PATCH v2 00/10] Add 'ls-files --debug-json' to dump the index in json Nguyễn Thái Ngọc Duy
2019-06-24 13:02 ` [PATCH v2 01/10] ls-files: add --json to dump the index Nguyễn Thái Ngọc Duy
2019-06-24 19:15 ` Jeff Hostetler
2019-06-24 20:04 ` Junio C Hamano
2019-06-25 9:21 ` Johannes Schindelin
2019-06-25 9:52 ` Duy Nguyen
2019-06-25 15:37 ` Jeff Hostetler
2019-06-25 9:05 ` Thomas Gummerer [this message]
2019-06-25 9:44 ` Johannes Schindelin
2019-06-25 11:31 ` Johannes Schindelin
2019-06-25 13:57 ` Johannes Schindelin
2019-06-25 22:28 ` Junio C Hamano
2019-06-26 19:51 ` Junio C Hamano
2019-06-24 13:02 ` [PATCH v2 02/10] read-cache.c: dump common extension info in json Nguyễn Thái Ngọc Duy
2019-06-24 13:02 ` [PATCH v2 03/10] cache-tree.c: dump "TREE" extension as json Nguyễn Thái Ngọc Duy
2019-06-24 13:02 ` [PATCH v2 04/10] dir.c: dump "UNTR" " Nguyễn Thái Ngọc Duy
2019-06-24 19:32 ` Jeff Hostetler
2019-06-24 13:02 ` [PATCH v2 05/10] split-index.c: dump "link" " Nguyễn Thái Ngọc Duy
2019-06-24 20:06 ` Jeff Hostetler
2019-06-25 10:29 ` Duy Nguyen
2019-06-25 12:40 ` Derrick Stolee
2019-06-27 10:48 ` Duy Nguyen
2019-06-27 13:24 ` Jeff Hostetler
2019-06-27 13:42 ` Derrick Stolee
2019-06-27 13:47 ` Duy Nguyen
2019-07-03 9:08 ` SZEDER Gábor
2019-07-04 20:01 ` SZEDER Gábor
2019-07-04 23:54 ` Duy Nguyen
2019-07-08 17:58 ` Junio C Hamano
2019-06-24 13:02 ` [PATCH v2 06/10] fsmonitor.c: dump "FSMN" " Nguyễn Thái Ngọc Duy
2019-06-24 13:02 ` [PATCH v2 07/10] resolve-undo.c: dump "REUC" " Nguyễn Thái Ngọc Duy
2019-06-24 13:02 ` [PATCH v2 08/10] read-cache.c: dump "EOIE" " Nguyễn Thái Ngọc Duy
2019-06-24 13:02 ` [PATCH v2 09/10] read-cache.c: dump "IEOT" " Nguyễn Thái Ngọc Duy
2019-06-24 13:02 ` [PATCH v2 10/10] t3008: use the new SINGLE_CPU prereq Nguyễn Thái Ngọc Duy
2019-06-24 18:00 ` [PATCH v2 00/10] Add 'ls-files --debug-json' to dump the index in json Johannes Schindelin
2019-06-24 18:39 ` Jeff Hostetler
2019-06-25 9:05 ` Duy Nguyen
2019-06-25 9:38 ` Thomas Gummerer
2019-06-25 11:27 ` Johannes Schindelin
2019-06-25 12:06 ` Duy Nguyen
2019-06-25 14:10 ` Johannes Schindelin
2019-06-25 17:08 ` Ramsay Jones
2019-06-26 15:05 ` Johannes Schindelin
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=20190625090554.GA2423@hank.intra.tgummerer.com \
--to=t.gummerer@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--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).