From: "René Scharfe" <l.s.r@web.de>
To: Jeff King <peff@peff.net>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] fast-export: factor out print_oid()
Date: Thu, 13 Aug 2020 19:17:18 +0200 [thread overview]
Message-ID: <153a34a4-f0c9-6105-75d7-68f940a1cb39@web.de> (raw)
In-Reply-To: <20200813115815.GA3098633@coredump.intra.peff.net>
Am 13.08.20 um 13:58 schrieb Jeff King:
> On Thu, Aug 13, 2020 at 01:11:18PM +0200, René Scharfe wrote:
>
>> Simplify the output code by splitting it up and reducing duplication.
>> Reuse the logic for printing object IDs -- anonymized if needed -- by
>> moving it to its own function, print_oid().
>
> Looks sane overall, though somehow we added 4 extra lines while reducing
> duplication. ;)
Yeah, but they are shorter. :)
>
>> +static void print_oid(const struct object_id *oid, int anonymize)
>> +{
>> + const char *oid_hex = oid_to_hex(oid);
>> + if (anonymize)
>> + oid_hex = anonymize_oid(oid_hex);
>> + fputs(oid_hex, stdout);
>> +}
>
> Would anyone ever pass anything except the global "anonymize" into this
> function (certainly neither of the new callers does). I get that it
> takes us on a possible road towards moving the globals to locals, but in
> the meantime, shadowing the global name just seems more confusing to me.
Good point.
>
>> @@ -470,21 +478,19 @@ static void show_filemodify(struct diff_queue_struct *q,
>> case DIFF_STATUS_TYPE_CHANGED:
>> case DIFF_STATUS_MODIFIED:
>> case DIFF_STATUS_ADDED:
>> + printf("M %06o ", spec->mode);
>
> This makes the output a bit more lego-like (i.e., hard to see what the
> full line will look like from the code), but it already was pretty
> bad because of using print_path(). I think that's fine.
Yes, it was almost halfway to all-out lego style before, and the
patch moves it further in that direction.
>
>> @@ -724,12 +730,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev,
>> else
>> printf("merge ");
>> if (mark)
>> - printf(":%d\n", mark);
>> + printf(":%d", mark);
>
> This line gets repeated, too. I guess we could have a print_mark(), but
> there is really no logic here except "put a colon in front of it", so
> probably not worthwhile.
Right.
René
next prev parent reply other threads:[~2020-08-13 17:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-13 11:11 [PATCH] fast-export: factor out print_oid() René Scharfe
2020-08-13 11:58 ` Jeff King
2020-08-13 17:17 ` René Scharfe [this message]
2020-08-13 15:18 ` Taylor Blau
2020-08-13 17:17 ` René Scharfe
2020-08-13 17:25 ` Jeff King
2020-08-15 7:14 ` René Scharfe
2020-08-17 22:08 ` Jeff King
2020-08-17 22:53 ` Junio C Hamano
2020-08-13 18:19 ` 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=153a34a4-f0c9-6105-75d7-68f940a1cb39@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).