From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17903 invoked by alias); 10 Mar 2017 11:07:36 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 40822 Received: (qmail 13615 invoked from network); 10 Mar 2017 11:07:36 -0000 X-Qmail-Scanner-Diagnostics: from out1-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(66.111.4.25):SA:0(-0.7/5.0):. Processed in 1.038247 secs); 10 Mar 2017 11:07:36 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at daniel.shahaf.name does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=aFVRvwgObyNYQJl0QnyxwkJXYL8=; b=rfA97d fx+7a8lvpGGAhtSpAaUmI4GJBJM75LIJMpScGtMM+5e5Bpp2EZWtf2extRtX/vtE D5HElVoL3I5Agpd48qlwzE0DaVuy56c7QRvaRZg04aljI5/UYgI4KebdHntqcYQa xhMbQ23PqBhyPZ450P65ylXkZ8wUlQtDtvuK8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=smtpout; bh=aFVRvwgObyNYQJl0QnyxwkJXYL8=; b=CSqLf BBC5S3s1SCNQ6FOjqm/FHcL3RW2X6s4sLL0W9Lvp8x/gfEHV5PqADyLZI6VNqa43 13ZseE2FGTorKD3rLC2BgbqGwyNNkbPS+wUzXGQzQe3yi0EnQmr7/f7IXY/9S509 QN/QQKOmof0w+Ih4z4+iilpvi+zlX5TCi6mU9A= X-ME-Sender: X-Sasl-enc: G+rch/L1d0W7aZaL5XegCOHpqAP5P/b6/TWnwr3E+mXj 1489144050 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH] vcs_info quilt: Document the '.quilt-foo' zstyle context element. (Compare users/20807.) Date: Fri, 10 Mar 2017 11:02:40 +0000 Message-Id: <1489143760-32282-1-git-send-email-danielsh@fujitsu.shahaf.local2> X-Mailer: git-send-email 2.1.4 In-Reply-To: <20151022123138.GH7173@tarsus.local2> References: <20151022123138.GH7173@tarsus.local2> --- This documents the '.quilt-foo' element of vcs_info zstyle contexts. The first hunk doesn't change the list of VCS identifiers, but applies s/bf/tt/g to it in order to follow the `tt(literal)var(replaceable)' convention, which is used by the two `tt(foo)var(bar)' instances added. For context, users/20807 pointed out that hooks in quilt mode don't have .quilt in their zstyle context. I haven't changed it yet (even though it's a simple patch: just change the assignment to $context in VCS_INFO_hook) in order not to gratuitously break people's dotfiles; I just added a warning about it. Cheers, Daniel Doc/Zsh/contrib.yo | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index 5d0696d..b71e0fb 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