From: Jeff King <peff@peff.net>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 1/3] fast-export: allow dumping the refname mapping
Date: Fri, 19 Jun 2020 12:01:29 -0400 [thread overview]
Message-ID: <20200619160129.GA1843858@coredump.intra.peff.net> (raw)
In-Reply-To: <CAPig+cRNem-S5LGX=v=1Tid64sXWBxNyWH4ffgLgF0o1yN=mtw@mail.gmail.com>
On Fri, Jun 19, 2020 at 11:51:06AM -0400, Eric Sunshine wrote:
> > +static void maybe_dump_anon(FILE *out, struct seen_set *seen,
> > + const char *orig, const char *anon)
> > +{
> > + if (!out)
> > + return;
> > + if (!check_and_mark_seen(seen, orig))
> > + fprintf(out, "%s %s\n", orig, anon);
> > +}
>
> Nit: For a function which has only a single caller in this patch and
> one more caller added in 3/3, I wonder if the, um, convenience of this
> function short-circuiting as the very first thing it does outweighs
> the loss of clarity of having the callers make the check themselves.
> That is, have the caller do this instead:
>
> if (anonymized_refnames_handle)
> dump_anon(anonymized_refnames_handle, ...);
<shrug> The names were long enough that I thought it was more clear not
to repeat myself. I actually wrote originally:
if (anonymized_refnames_handle &&
check_and_mark_seen(&seen, full_refname))
fprintf(anonymized_refnames_handle, "%s %s\n",
full_refname, anon.buf));
but I wasn't sure if it was better not to duplicate the output format.
OTOH, we _could_ be using quote_path() for the path dumping, in which
case the formats would start to differ.
> > @@ -1213,6 +1249,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
> > + if (anonymized_refnames_file)
> > + anonymized_refnames_handle = xfopen(anonymized_refnames_file, "w");
>
> For completeness, do you want to close this file at some point?
My thought was to just let it auto-close at exit() time, since it's
effectively process-length.
> > diff --git a/t/t9351-fast-export-anonymize.sh b/t/t9351-fast-export-anonymize.sh
> > @@ -46,6 +46,18 @@ test_expect_success 'stream omits tag message' '
> > +test_expect_success 'refname mapping can be dumped' '
> > + git fast-export --anonymize --all \
> > + --dump-anonymized-refnames=refs.out >/dev/null &&
> > + # we make no guarantees of the exact anonymized names,
> > + # so just check that we have the right number and
> > + # that a sample line looks sane.
> > + # Note that master is not anonymized, and so not included
> > + # in the mapping.
> > + test_line_count = 6 refs.out &&
>
> This hard-coded "6" seems rather fragile, causing the test to break if
> other refs are ever added or removed. Perhaps just count the refs
> dynamically?
>
> git show-ref >refs &&
> nrefs=$(wc -l refs) &&
> # Note that master is not anonymized, and so not included
> # in the mapping.
> nrefs=$((nrefs - 1))
> test_line_count = $nrefs refs.out &&
>
> and then drop the 'nrefs=$((nrefs - 1))' line and associated comment
> in patch 2/3 which removes the "master" special case.
That's exactly what I wrote originally, but it failed on macos due to
extra spaces in the "wc" output. There are other tests nearby that also
count the refs (e.g., exactly 2 branches), so I didn't think it was
worth trying to deal with the portability issue.
-Peff
next prev parent reply other threads:[~2020-06-19 16:01 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-19 13:23 [PATCH 0/3] fast-export: allow dumping anonymization mappings Jeff King
2020-06-19 13:25 ` [PATCH 1/3] fast-export: allow dumping the refname mapping Jeff King
2020-06-19 15:51 ` Eric Sunshine
2020-06-19 16:01 ` Jeff King [this message]
2020-06-19 16:18 ` Eric Sunshine
2020-06-19 17:45 ` Jeff King
2020-06-19 18:00 ` Eric Sunshine
2020-06-22 21:30 ` Jeff King
2020-06-19 19:20 ` Junio C Hamano
2020-06-22 21:32 ` Jeff King
2020-06-19 13:26 ` [PATCH 2/3] fast-export: anonymize "master" refname Jeff King
2020-06-19 13:29 ` [PATCH 3/3] fast-export: allow dumping the path mapping Jeff King
2020-06-19 16:00 ` Eric Sunshine
2020-06-19 19:24 ` Junio C Hamano
2020-06-22 21:38 ` Jeff King
2020-06-19 13:51 ` [PATCH 0/3] fast-export: allow dumping anonymization mappings Johannes Schindelin
2020-06-22 16:35 ` Junio C Hamano
2020-06-22 21:47 ` [PATCH v2 0/4] " Jeff King
2020-06-22 21:47 ` [PATCH v2 1/4] fast-export: allow dumping the refname mapping Jeff King
2020-06-22 21:48 ` [PATCH v2 2/4] fast-export: anonymize "master" refname Jeff King
2020-06-22 21:48 ` [PATCH v2 3/4] fast-export: refactor path printing to not rely on stdout Jeff King
2020-06-22 21:48 ` [PATCH v2 4/4] fast-export: allow dumping the path mapping Jeff King
2020-06-23 15:24 ` [alternative 0/10] fast-export: allow seeding the anonymized mapping Jeff King
2020-06-23 15:24 ` [PATCH 01/10] t9351: derive anonymized tree checks from original repo Jeff King
2020-06-23 15:24 ` [PATCH 02/10] fast-export: use xmemdupz() for anonymizing oids Jeff King
2020-06-23 15:24 ` [PATCH 03/10] fast-export: store anonymized oids as hex strings Jeff King
2020-06-24 11:43 ` SZEDER Gábor
2020-06-24 15:54 ` Jeff King
2020-06-25 15:49 ` Jeff King
2020-06-25 20:45 ` SZEDER Gábor
2020-06-25 21:15 ` Jeff King
2020-06-29 13:17 ` Johannes Schindelin
2020-06-30 19:35 ` Jeff King
2020-06-23 15:24 ` [PATCH 04/10] fast-export: tighten anonymize_mem() interface to handle only strings Jeff King
2020-06-23 15:24 ` [PATCH 05/10] fast-export: stop storing lengths in anonymized hashmaps Jeff King
2020-06-23 15:24 ` [PATCH 06/10] fast-export: use a flex array to store anonymized entries Jeff King
2020-06-23 15:25 ` [PATCH 07/10] fast-export: move global "idents" anonymize hashmap into function Jeff King
2020-06-23 15:25 ` [PATCH 08/10] fast-export: add a "data" callback parameter to anonymize_str() Jeff King
2020-06-24 19:58 ` Junio C Hamano
2020-06-23 15:25 ` [PATCH 09/10] fast-export: allow seeding the anonymized mapping Jeff King
2020-06-23 17:16 ` Eric Sunshine
2020-06-23 18:30 ` Jeff King
2020-06-23 20:30 ` Eric Sunshine
2020-06-24 15:47 ` Jeff King
2020-06-23 18:11 ` Eric Sunshine
2020-06-23 18:35 ` Jeff King
2020-06-23 20:35 ` Eric Sunshine
2020-06-24 15:48 ` Jeff King
2020-06-23 15:25 ` [PATCH 10/10] fast-export: anonymize "master" refname Jeff King
2020-06-23 19:34 ` [alternative 0/10] fast-export: allow seeding the anonymized mapping Junio C Hamano
2020-06-23 19:44 ` Jeff King
2020-06-25 19:48 ` [PATCH v2 0/11] " Jeff King
2020-06-25 19:48 ` [PATCH v2 01/11] t9351: derive anonymized tree checks from original repo Jeff King
2020-06-25 19:48 ` [PATCH v2 02/11] fast-export: use xmemdupz() for anonymizing oids Jeff King
2020-06-25 19:48 ` [PATCH v2 03/11] fast-export: store anonymized oids as hex strings Jeff King
2020-06-25 19:48 ` [PATCH v2 04/11] fast-export: tighten anonymize_mem() interface to handle only strings Jeff King
2020-06-25 19:48 ` [PATCH v2 05/11] fast-export: stop storing lengths in anonymized hashmaps Jeff King
2020-06-25 19:48 ` [PATCH v2 06/11] fast-export: use a flex array to store anonymized entries Jeff King
2020-06-25 19:48 ` [PATCH v2 07/11] fast-export: move global "idents" anonymize hashmap into function Jeff King
2020-06-25 19:48 ` [PATCH v2 08/11] fast-export: add a "data" callback parameter to anonymize_str() Jeff King
2020-06-25 19:48 ` [PATCH v2 09/11] fast-export: allow seeding the anonymized mapping Jeff King
2020-06-25 19:48 ` [PATCH v2 10/11] fast-export: anonymize "master" refname Jeff King
2020-06-25 19:48 ` [PATCH v2 11/11] fast-export: use local array to store anonymized oid Jeff King
2020-06-25 21:22 ` [PATCH v2 0/11] fast-export: allow seeding the anonymized mapping 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=20200619160129.GA1843858@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.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).