From: Daniel Shahaf <danielsh@apache.org>
To: zsh-workers@zsh.org
Subject: [PATCH 2/5] vcs_info examples: Make the quilt-patch-dir example friendlier.
Date: Sat, 21 Dec 2019 15:58:25 +0000 [thread overview]
Message-ID: <20191221155828.25950-2-danielsh@apache.org> (raw)
In-Reply-To: <20191221155828.25950-1-danielsh@apache.org>
- Document that no code at all is necessary for Pareto correctness
- Remove a recommendation to rely on implementation details (${rrn});
instead, rely only on ${context}, which is a documented API.
---
Misc/vcs_info-examples | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/Misc/vcs_info-examples b/Misc/vcs_info-examples
index 028fe62b0..456b3a85b 100644
--- a/Misc/vcs_info-examples
+++ b/Misc/vcs_info-examples
@@ -468,8 +468,16 @@ zstyle ':vcs_info:-quilt-.quilt-standalone:*:*' quilt-patch-dir debian/patches
# and so we want addon mode to also use a $QUILT_PATCHES value of
# `debian/patches' in some directories. In the other directories we never
# want the default `patches' though but a dedicated place for them.
-# Say `~/patches/<repository-name>'. Now we'll use some evaluated-style
-# magic to achieve all that:
+# Say `~/patches/<repository-name>'.
+#
+# First of all, even without any configuration, vcs_info will do the right
+# thing most of the time. Whenever quilt has already run in a directory,
+# vcs_info will figure out whether that directory uses `patches' or
+# `debian/patches' by interrogating metadata in the `.pc/' subdirectory,
+# which quilt creates. To make vcs_info find the patches dir correctly even
+# when the `.pc/' directory doesn't exist, read on.
+#
+# We'll use some evaluated-style magic to achieve that:
zstyle -e ':vcs_info:*.quilt-addon:*:*' quilt-patch-dir 'my-patches-func'
# That runs something called `my-patches-func', and the value of $reply is
@@ -486,19 +494,17 @@ function my-patches-func() {
fi
# Now the part about the dedicated directory is a little trickier.
- # It requires some knowledge of vcs_info's internals. Not much though.
- # Everything about this is described in the manual because this
- # variable (plus a few others) may be of interest in hooks, where
- # they are available, too.
- #
- # The variable in question here is `$rrn' which is an abbreviation
- # of repository-root-name. if you're in
+ # The variable in question here is `$context', which is the zstyle
+ # context used for lookups. Its last component is the repository-root-name,
+ # or ${rrn} for short. If you're in
# /usr/src/zsh/Functions
# and the repository being
# /usr/src/zsh
- # then the value of `$rrn' is `zsh'. Now in case the variable is
- # empty (it shouldn't at this point, but you never know), let's
- # drop back to quilt's default "patches".
+ # then the value of `$rrn' would be `zsh'.
+ local rrn=${context##*:}
+
+ # Now, in case the variable is empty (it shouldn't at this point, but you
+ # never know), let's drop back to quilt's default value, "patches".
if [[ -z ${rrn} ]]; then
reply=( patches )
return 0
next prev parent reply other threads:[~2019-12-21 21:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-21 15:58 [PATCH 1/5] vcs_info examples: Add an example of showing Git environment variables Daniel Shahaf
2019-12-21 15:58 ` Daniel Shahaf [this message]
2019-12-21 15:58 ` [PATCH 3/5] vcs_info quilt: Improve support for svn-style patch headers Daniel Shahaf
2019-12-21 15:58 ` [PATCH 4/5] vcs_info docs: Clarify documentation of the %p/%u/%a patch-format expandos Daniel Shahaf
2019-12-21 15:58 ` [PATCH 5/5] zshmodules: Explicitly document the return values of the 'zstyle' getters -s, -b, and -a Daniel Shahaf
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191221155828.25950-2-danielsh@apache.org \
--to=danielsh@apache.org \
--cc=zsh-workers@zsh.org \
/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://git.vuxu.org/mirror/zsh/
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 NNTP newsgroup(s).