summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2017-02-01 17:36:54 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2017-02-03 18:13:57 +0000
commit49bc46946e93e55fd74c8b5a7109e49e41820725 (patch)
treeab6225a2d919ba597802981f799ac1044222732e
parenta32fb005d6bf12f010fe9219a66a244e56eff7b2 (diff)
downloadzsh-49bc46946e93e55fd74c8b5a7109e49e41820725.tar.gz
zsh-49bc46946e93e55fd74c8b5a7109e49e41820725.zip
40476: vcs_info $backend_misc: Document at the right point, provide in quilt 'standalone' mode.
-rw-r--r--ChangeLog6
-rw-r--r--Doc/Zsh/contrib.yo6
-rw-r--r--Functions/VCS_Info/VCS_INFO_quilt1
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 302f70662..647ae5ca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-02-03 Daniel Shahaf <d.s@daniel.shahaf.name>
+
+ * 40476: Doc/Zsh/contrib.yo, Functions/VCS_Info/VCS_INFO_quilt:
+ vcs_info $backend_misc: Document at the right point, provide
+ in quilt 'standalone' mode.
+
2017-02-02 Peter Stephenson <p.stephenson@samsung.com>
* 40486: Src/Modules/regex.c, Src/params.c: don't warn on
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index 8f79694e0..79e02628a 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -1207,6 +1207,8 @@ item(tt(nopatch-format))(
This pair of styles format the patch information used by the tt(%m) expando in
formats and actionformats for the tt(git) and tt(hg) backends. The value is
subject to certain tt(%)-expansions described below.
+The expanded value is made available in the global tt(backend_misc) array as
+tt(${backend_misc[patches]}) (also if a tt(set-patch-format) hook is used).
)
kindex(get-unapplied)
item(tt(get-unapplied))(
@@ -1612,9 +1614,7 @@ so far in the opposite order, which means that the first argument is the
top-most patch and so forth.
When setting tt(ret) to non-zero, the string in
-tt(${hook_com[applied-string]}) will be used in the tt(%m) escape in
-tt(formats) and tt(actionformats); it will be available in the global
-tt(backend_misc) array as tt($backend_misc[patches]}); and it will be
+tt(${hook_com[applied-string]}) will be
available as tt(%p) in the tt(patch-format) and tt(nopatch-format) styles.
)
item(tt(gen-unapplied-string))(
diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt
index aed9f0c33..d6b7c2f72 100644
--- a/Functions/VCS_Info/VCS_INFO_quilt
+++ b/Functions/VCS_Info/VCS_INFO_quilt
@@ -184,6 +184,7 @@ function VCS_INFO_quilt() {
case ${mode} in
(standalone)
+ backend_misc[patches]=${qstring}
VCS_INFO_formats '' '' "${root}" '' '' '' "${qstring}"
VCS_INFO_set
;;