From: Antonio Russo <antonio.e.russo@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git-ml <git@vger.kernel.org>,
Michael Haggerty <mhagger@alum.mit.edu>,
Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH 1/3 v3] Clean up t6016-rev-list-graph-simplify-history
Date: Sat, 2 May 2020 09:27:46 -0600 [thread overview]
Message-ID: <01dc74f9-8bc6-cb8d-4eca-6495ffb04826@gmail.com> (raw)
In-Reply-To: <xmqq4kszoa2w.fsf@gitster.c.googlers.com>
On 5/1/20 11:10 AM, Junio C Hamano wrote:
> Antonio Russo <antonio.e.russo@gmail.com> writes:
>
>> +check_graph () {
>> + cat >expected &&
>
> Not a new issue, but we may want to fix this to align to majority of
> tests by calling it "expect".
>
>> + git rev-list --graph "$@" | sed "$(cat sedscript)" > actual &&
>
> Style. No SP between > (or < for that matter) and the filename.
>
> The "sed" utility can be told to read its script from a file with
> its "-f" option.
>
> Correctness. Never run "git" command that is the target being
> tested on the left side of a pipe. It will hide the exit status.
>> - '
>> + echo "s/ *$//;" > sedscript &&
>> + ( for tag in $(git tag -l) ; do echo "s/$(git rev-parse --verify $tag)/$tag/;" >> sedscript ; done )
>
> Avoid unreadable one-liner with needless subshell.
>
> I suspect that this is a task for-each-ref was designed for,
> something along the lines of...
>
> git for-each-ref --format='s|%(objectname)|%(refname:short)|' \
> refs/tags/ >>sedScript
>
Thanks, I've fixed these.
>
> Much nicer to see.
>
> Having said all that, I am not sure if this change of design is
> sound.
>
> The original approach would have worked even if two or more of these
> tags pointed at the same object. Your version will pick one of
> them. If two tags, say A5 and C8, pointed at the same commit, and
> the illustration given to check_graph helper from its standard
> output labeled a commit as C8, wouldn't the actual output converted
> to show A5 with your sedScript approach?
>
> I think it is salvageable by changing the direction you munge.
> Instead of munging the rev-list output, you can store it as-is in
> "actual", and instead pass the illustration that comes from the
> standard input of the check_graph helper through sed to expand the
> symbolic names to actual object names before comparing. i.e.
>
> check_graph () {
> sed -f expand_tag_to_objects.sed >expect &&
> git rev-list --graph "$@" >actual &&
> test_cmp expect actual
> }
>
> Note that I renamed the overly generic "sedscript" to a name that
> reflects the purpose of the file (and the contents being of a
> certain type is conveyed by .sed suffix, just like you'd use
> suffixes like .c, .txt). A good discipline to learn, I would say.
I also fixed these. I originally chose the other direction
(oid->refname) to make the output more human readable.
If you think that's a worthwhile goal, I can figure something out.
That said, the patchset as it stands scratches my immediate need,
and addressing D. Stolee's comments (in particular, making it work
with revs->limited==0) unfortunately has to be a lower priority
for me.
I am not abandoning the patchset, but may be more delayed
responding to review.
Thanks,
Antonio
next prev parent reply other threads:[~2020-05-02 15:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 5:07 [PATCH] Teach git-rev-list --simplify-forks Antonio Russo
2020-04-27 10:55 ` Derrick Stolee
2020-04-28 12:49 ` Antonio Russo
2020-04-28 14:11 ` Derrick Stolee
2020-04-29 8:01 ` [PATCH v2] " Antonio Russo
2020-04-29 10:08 ` Philip Oakley
2020-04-29 13:04 ` Antonio Russo
2020-04-29 13:12 ` Derrick Stolee
2020-05-01 14:13 ` Antonio Russo
2020-05-01 15:44 ` Derrick Stolee
2020-05-01 14:21 ` [PATCH 1/3 v3] Clean up t6016-rev-list-graph-simplify-history Antonio Russo
2020-05-01 17:10 ` Junio C Hamano
2020-05-02 15:27 ` Antonio Russo [this message]
2020-05-01 14:22 ` [PATCH 2/3 v3] Teach git-rev-list --ignore-merge-bases Antonio Russo
2020-05-02 13:25 ` Johannes Sixt
2020-05-02 14:21 ` Antonio Russo
2020-05-01 14:23 ` [PATCH 3/3 v3] Add new tests of ignore-merge-bases Antonio Russo
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=01dc74f9-8bc6-cb8d-4eca-6495ffb04826@gmail.com \
--to=antonio.e.russo@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
/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).