From: Nickolai Belakovski <nbelakovski@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, "Rafael Ascensão" <rafa.almas@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v3 1/3] ref-filter: add worktreepath atom
Date: Wed, 19 Dec 2018 23:09:59 -0800 [thread overview]
Message-ID: <CAC05384H1LgsGMO=ggUyfFTXrXAFcjUXDSdcmev9ActPt5081A@mail.gmail.com> (raw)
In-Reply-To: <20181218172236.GA28455@sigill.intra.peff.net>
On Tue, Dec 18, 2018 at 9:22 AM Jeff King <peff@peff.net> wrote:
>
> On Sun, Dec 16, 2018 at 01:57:57PM -0800, nbelakovski@gmail.com wrote:
>
> > From: Nickolai Belakovski <nbelakovski@gmail.com>
> >
> > Add an atom proving the path of the linked worktree where this ref is
> > checked out, if it is checked out in any linked worktrees, and empty
> > string otherwise.
>
> I stumbled over the word "proving" here. Maybe "showing" would be more
> clear?
Oops, providing
> > +worktreepath::
> > + The absolute path to the worktree in which the ref is checked
> > + out, if it is checked out in any linked worktree. ' ' otherwise.
> > +
>
> Also, why are we replacing it with a single space? Wouldn't the empty
> string be more customary (and work with the other "if empty, then do
> this" formatting options)?
I was just following what was done for HEAD, but overall I agree that
empty is preferable to single space, will change.
> Minor style nit: we put the "*" in a pointer declaration next to the
> variable name, without intervening whitespace. Like:
>
> static struct worktree **worktrees;
Gotcha, will do, thanks for pointing it out.
To sum up the hashmap comments:
-I hadn't thought to re-use the head_ref of worktree as the key.
That's clever. I like the readability of having separate entries for
key and value, but I can see the benefit of not having to do an extra
allocation. I can make up for the readability hit with a comment.
-Actually, for any valid use case there will only be one instance of
the map since the entries of used_atom are cached, but regardless it
makes sense to keep per-atom info in used_atom and global context
somewhere else, so I'll make that change to make it a static variable
outside of used_atom.
-Will change the lookup logic to remove the extra allocation. Since
I'm letting the hashmap use its internal comparison function on the
hash, I don't need to provide a comparison function.
> What's this extra strncmp about? If we're _not_ a worktreepath atom,
> we'd still do the lookup only to put nothing in the string?
Leftover from an earlier iteration where I was going to support
getting more info out of the worktree struct. I decided to limit scope
to just the info I really needed for the branch change. I left it like
this because I thought it would make the code more readable for
someone who wanted to come in and add that extra info, but I think
you're right that it ends up just reading kind of awkwardly.
>
> > @@ -2013,7 +2076,14 @@ void ref_array_clear(struct ref_array *array)
> > int i;
> >
> > for (i = 0; i < used_atom_cnt; i++)
> > + {
> > + if (!strncmp(used_atom[i].name, "worktreepath", strlen("worktreepath")))
> > + {
> > + hashmap_free(&(used_atom[i].u.reftoworktreeinfo_map), 1);
> > + free_worktrees(worktrees);
> > + }
>
> And if we move the mapping out to a static global, then this only has to
> be done once, not once per atom. In fact, I think this could double-free
> "worktrees" with your current patch if you have two "%(worktree)"
> placeholders, since "worktrees" already is a global.
Only if someone put a colon on one of the %(worktree) atoms, otherwise
they're all cached, but as you say moot point anyway if the map is
moved outside the used_atom structure.
>
> It's probably worth testing that the path we get is actually sane, too.
> I.e., expect something more like:
>
> cat >expect <<-\EOF
> master: $PWD
> master: $PWD/worktree
> side: not checked out
> EOF
> git for-each-ref \
> --format="%(refname:short): %(if)%(worktreepath)%(then)%(worktreepath)%(else)not checked %out%(end)
>
> (I wish there was a way to avoid that really long line, but I don't
> think there is).
>
Yea good call, can do.
Thanks for all the feedback, will try to turn these around quickly.
next prev parent reply other threads:[~2018-12-20 7:10 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <"<CAC05386q2iGoiJ_fRgwoOTF23exEN2D1+oh4VjajEvYQ58O1TQ@mail.gmail.com>
2018-09-27 15:13 ` [PATCH] branch: colorize branches checked out in a linked working tree the same way as the current branch is colorized Nickolai Belakovski
2018-09-27 15:33 ` Ævar Arnfjörð Bjarmason
2018-09-27 17:46 ` Nickolai Belakovski
[not found] ` <CAC05387S9P+w8yqqcjkQDnURYSgQmqtukxS4KvqJu-kDA+_o0g@mail.gmail.com>
2018-09-27 17:59 ` Ævar Arnfjörð Bjarmason
2018-10-02 20:41 ` Johannes Schindelin
2018-09-27 17:58 ` Duy Nguyen
2018-09-27 18:17 ` Jeff King
2018-09-27 18:39 ` Nickolai Belakovski
2018-09-27 18:51 ` Jeff King
2018-09-27 19:28 ` Rafael Ascensão
2018-09-27 19:35 ` Jeff King
2018-09-27 19:41 ` Jeff King
2018-09-27 21:22 ` Junio C Hamano
2018-09-28 1:05 ` Jeff King
2018-09-28 1:28 ` Junio C Hamano
2018-09-27 21:35 ` Rafael Ascensão
2018-09-28 1:07 ` Jeff King
2018-09-27 20:02 ` Ævar Arnfjörð Bjarmason
2018-09-27 20:16 ` Nickolai Belakovski
2018-09-27 20:40 ` Rafael Ascensão
2018-11-11 23:58 ` [PATCH v2 0/2] refactoring branch colorization to ref-filter nbelakovski
2018-11-11 23:58 ` [PATCH v2 1/2] ref-filter: add worktree atom nbelakovski
2018-11-12 10:11 ` Junio C Hamano
2018-11-12 12:22 ` Jeff King
2018-11-13 1:38 ` Junio C Hamano
2018-11-21 14:05 ` Nickolai Belakovski
2018-11-21 14:08 ` Jeff King
2018-11-12 12:23 ` Jeff King
2018-11-11 23:58 ` [PATCH v2 2/2] branch: Mark and colorize a branch differently if it is checked out in a linked worktree nbelakovski
2018-11-12 10:20 ` Junio C Hamano
2018-11-12 12:14 ` Jeff King
2018-11-12 18:07 ` Rafael Ascensão
2018-11-13 1:45 ` Junio C Hamano
2018-11-13 14:49 ` Jeff King
2018-11-21 14:07 ` Nickolai Belakovski
2018-12-16 21:57 ` [PATCH v3 0/3] nbelakovski
2018-12-16 21:57 ` [PATCH v3 1/3] ref-filter: add worktreepath atom nbelakovski
2018-12-18 17:22 ` Jeff King
2018-12-20 7:09 ` Nickolai Belakovski [this message]
2018-12-20 14:59 ` Jeff King
2018-12-24 8:47 ` [PATCH v4 0/3] nbelakovski
2018-12-24 8:47 ` [PATCH v4 1/3] ref-filter: add worktreepath atom nbelakovski
2019-01-03 5:40 ` Jeff King
2019-01-03 9:31 ` Eric Sunshine
2018-12-24 8:47 ` [PATCH v4 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree nbelakovski
2018-12-24 8:47 ` [PATCH v4 3/3] branch: Add an extra verbose output displaying worktree path for refs " nbelakovski
2019-01-03 5:42 ` Jeff King
2019-01-03 5:22 ` [PATCH v4 0/3] Jeff King
2018-12-16 21:57 ` [PATCH v3 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree nbelakovski
2018-12-16 21:57 ` [PATCH v3 3/3] branch: Add an extra verbose output displaying worktree path for refs " nbelakovski
2018-12-18 17:25 ` [PATCH v3 0/3] Jeff King
2019-01-06 0:26 ` [PATCH v5 0/3] nbelakovski
2019-01-06 0:26 ` [PATCH v5 1/3] ref-filter: add worktreepath atom nbelakovski
2019-01-07 18:20 ` Junio C Hamano
2019-01-18 22:17 ` Nickolai Belakovski
2019-01-18 22:20 ` Nickolai Belakovski
2019-01-06 0:26 ` [PATCH v5 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree nbelakovski
2019-01-07 19:04 ` Junio C Hamano
2019-01-10 21:42 ` Philip Oakley
2019-01-13 1:41 ` Nickolai Belakovski
2019-01-14 18:18 ` Junio C Hamano
2019-01-18 22:18 ` Nickolai Belakovski
2019-01-06 0:26 ` [PATCH v5 3/3] branch: Add an extra verbose output displaying worktree path for refs " nbelakovski
2019-01-07 19:09 ` Junio C Hamano
2019-01-22 23:22 ` [PATCH v6 0/3] nbelakovski
2019-01-22 23:22 ` [PATCH v6 1/3] ref-filter: add worktreepath atom nbelakovski
2019-01-23 18:57 ` Junio C Hamano
2019-01-23 23:34 ` Nickolai Belakovski
2019-01-24 18:26 ` Junio C Hamano
2019-01-24 18:32 ` Jeff King
2019-01-24 19:27 ` Junio C Hamano
2019-01-24 19:34 ` Jeff King
2019-01-24 19:30 ` Junio C Hamano
2019-01-24 21:26 ` Jeff King
2019-01-31 20:53 ` Nickolai Belakovski
2019-01-31 23:21 ` Jeff King
2019-01-31 21:42 ` Junio C Hamano
2019-01-31 23:20 ` Jeff King
2019-01-22 23:23 ` [PATCH v6 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree nbelakovski
2019-01-22 23:23 ` [PATCH v6 3/3] branch: Add an extra verbose output displaying worktree path for refs " nbelakovski
2019-02-01 22:04 ` [PATCH v7 0/3] nbelakovski
2019-02-01 22:28 ` Junio C Hamano
2019-02-01 23:31 ` Nickolai Belakovski
2019-02-01 22:04 ` [PATCH v7 1/3] ref-filter: add worktreepath atom nbelakovski
2019-02-01 22:20 ` Eric Sunshine
2019-02-01 22:41 ` Nickolai Belakovski
2019-02-04 18:14 ` Junio C Hamano
2019-02-18 10:09 ` Nickolai Belakovski
2019-02-01 22:31 ` Junio C Hamano
2019-02-01 22:04 ` [PATCH v7 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree nbelakovski
2019-02-01 22:34 ` Junio C Hamano
2019-02-01 23:12 ` Nickolai Belakovski
2019-02-04 18:18 ` Junio C Hamano
2019-02-01 22:04 ` [PATCH v7 3/3] branch: Add an extra verbose output displaying worktree path for refs " nbelakovski
2019-02-01 22:27 ` Eric Sunshine
2019-02-01 22:45 ` Nickolai Belakovski
2019-02-01 22:53 ` Junio C Hamano
2019-02-01 23:06 ` Nickolai Belakovski
2019-02-02 1:22 ` [RFC] Sample of test for git branch -vv nbelakovski
2019-02-19 8:31 ` [PATCH v8 0/3] nbelakovski
2019-02-19 8:31 ` [PATCH v8 1/3] ref-filter: add worktreepath atom nbelakovski
2019-02-19 8:31 ` [PATCH v8 2/3] branch: update output to include worktree info nbelakovski
2019-02-21 12:44 ` Jeff King
2019-03-14 5:45 ` Nickolai Belakovski
2019-02-19 8:31 ` [PATCH v8 3/3] branch: add worktree info on verbose output nbelakovski
2019-02-21 12:59 ` Jeff King
2019-03-14 5:58 ` Nickolai Belakovski
2019-03-18 2:12 ` Junio C Hamano
2019-02-21 12:36 ` [PATCH v8 0/3] Jeff King
2019-03-14 6:10 ` Nickolai Belakovski
2019-03-16 1:38 ` [PATCH v9 0/3] nbelakovski
2019-03-16 1:38 ` [PATCH v9 1/3] ref-filter: add worktreepath atom nbelakovski
2019-03-16 1:38 ` [PATCH v9 2/3] branch: update output to include worktree info nbelakovski
2019-03-16 1:38 ` [PATCH v9 3/3] branch: add worktree info on verbose output nbelakovski
2019-03-18 12:10 ` SZEDER Gábor
2019-03-18 5:30 ` [PATCH v9 0/3] Junio C Hamano
2019-04-29 5:19 ` [PATCH v10 0/3] nbelakovski
2019-04-29 5:19 ` [PATCH v10 1/3] ref-filter: add worktreepath atom nbelakovski
2019-04-29 5:19 ` [PATCH v10 2/3] branch: update output to include worktree info nbelakovski
2019-04-29 5:19 ` [PATCH v10 3/3] branch: add worktree info on verbose output nbelakovski
2019-04-29 14:12 ` [PATCH v10 0/3] SZEDER Gábor
2019-04-29 19:27 ` Nickolai Belakovski
2019-04-29 20:57 ` Johannes Schindelin
2019-04-29 21:33 ` Nickolai Belakovski
[not found] ` <CAC05385Mc7pqiCd5mb+1c4WM+v7K=h=GMHuvkw9xizhRFJXXBA@mail.gmail.com>
2019-04-30 21:46 ` 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='CAC05384H1LgsGMO=ggUyfFTXrXAFcjUXDSdcmev9ActPt5081A@mail.gmail.com' \
--to=nbelakovski@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=rafa.almas@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).