about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2017-03-10 11:02:40 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2017-03-14 11:14:12 +0000
commit56ef4f62c424db4b9c93e44a918e25651de03855 (patch)
treef85fce315a7a81b2e505b8710eb14d07d52aa9a5
parent5fa422b246d3fa8be5b1c876525e415d8c4834b1 (diff)
downloadzsh-56ef4f62c424db4b9c93e44a918e25651de03855.tar.gz
zsh-56ef4f62c424db4b9c93e44a918e25651de03855.tar.xz
zsh-56ef4f62c424db4b9c93e44a918e25651de03855.zip
40822: vcs_info quilt: Document the '.quilt-foo' zstyle context element. (Compare users/20807.)
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/contrib.yo21
2 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d305d06f..225f7312f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-14  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 40822: Doc/Zsh/contrib.yo: vcs_info quilt: Document the
+	'.quilt-foo' zstyle context element. (Compare users/20807.)
+
 2017-03-12  Oliver Kiddle  <opk@zsh.org>
 
 	* Wieland Hoffmann: 40837: Completion/Unix/Command/_pgrep:
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index 5d0696dcc..ed33a4a0c 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -944,11 +944,17 @@ example(:vcs_info:var(vcs-string):var(user-context):var(repo-root-name))
 
 startitem()
 item(var(vcs-string))(
-is one of: bf(git), bf(git-svn), bf(git-p4), bf(hg), bf(hg-git),
-bf(hg-hgsubversion), bf(hg-hgsvn), bf(darcs), bf(bzr), bf(cdv), bf(mtn),
-bf(svn), bf(cvs), bf(svk), bf(tla), bf(p4) or bf(fossil). When hooks are
-active the hooks name is added after a `+'. (See bf(Hooks in vcs_info)
-below.)
+is one of: tt(git), tt(git-svn), tt(git-p4), tt(hg), tt(hg-git),
+tt(hg-hgsubversion), tt(hg-hgsvn), tt(darcs), tt(bzr), tt(cdv), tt(mtn),
+tt(svn), tt(cvs), tt(svk), tt(tla), tt(p4) or tt(fossil).
+This is followed by `tt(.quilt-)var(quilt-mode)' in Quilt mode
+(see bf(Quilt Support) for details)
+and by `tt(+)var(hook-name)' while hooks are active
+(see bf(Hooks in vcs_info) for details).
+
+COMMENT(users/20807)
+Currently, hooks in quilt mode don't add the `tt(.quilt-)var(quilt-mode)' information.
+This may change in the future.
 )
 item(var(user-context))(
 is a freely configurable string, assignable by
@@ -1369,6 +1375,11 @@ Quilt integration is off by default; to enable it, set the tt(use-quilt) style,
 and add tt(%Q) to your tt(formats) or tt(actionformats) style:
 example(zstyle ':vcs_info:*' use-quilt true)
 
+Styles looked up from the Quilt support code include `tt(.quilt-)var(quilt-mode)'
+in the var(vcs-string) part of the context, where var(quilt-mode) is either
+tt(addon) or tt(standalone).
+Example: tt(:vcs_info:git.quilt-addon:default:)var(repo-root-name).
+
 For `addon' mode to become active tt(vcs_info) must have already detected a
 real version control system controlling the directory. If that is the case,
 a directory that holds quilt's patches needs to be found. That directory is