Permalink
Browse files

30366: Misc/vcs_info-examples: Fix outdated quilt examples.

  • Loading branch information...
1 parent 6985875 commit d5db14e3c99f6fb11d839bea017c76276f98cb81 Simon Ruderich committed Mar 23, 2012
Showing with 11 additions and 7 deletions.
  1. +5 −1 ChangeLog
  2. +6 −6 Misc/vcs_info-examples
View
6 ChangeLog
@@ -1,3 +1,7 @@
+2012-03-23 Simon Ruderich <simon@ruderich.org>
+
+ * 30366: Misc/vcs_info-examples: Fix outdated quilt examples.
+
2012-03-13 Peter Stephenson <pws@csr.com>
* Luka Perkov: 30354: Completion/Unix/Command/_quilt: update
@@ -16102,5 +16106,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5609 $
+* $Revision: 1.5610 $
*****************************************************
View
12 Misc/vcs_info-examples
@@ -392,9 +392,9 @@ function foobar() {
}
# In standalone-mode, vcs_info pretends as if quilt actually was a VCS.
-# Well, kind of. The vcs string is set to '-quilt-'. So let's define a
-# format just for that mode:
-zstyle ':vcs_info:-quilt-:*' formats " [%s%Q]-"
+# Well, kind of. The vcs string is set to '-quilt-.quilt-standalone'. So let's
+# define a format just for that mode:
+zstyle ':vcs_info:-quilt-.quilt-standalone:*' formats " [%s%Q]-"
# As with other format insertions, you got total control over what is being
# inserted. The `%Q' insertion is controlled by the `quiltformat' and
@@ -411,16 +411,16 @@ zstyle ':vcs_info:-quilt-:*' formats " [%s%Q]-"
# There are two hooks you can use to setup what these contain. Those would be
# `gen-applied-string' and `gen-unapplied-string'. We'll go with the default
# here... ...no need to go into every insane detail.
-zstyle ':vcs_info:*' quiltformat '#%p [%n|%c]'
+zstyle ':vcs_info:*' patch-format '#%p [%n|%c]'
# quilt-nopatch-format (default: "no patch applied")
-zstyle ':vcs_info:*' quilt-nopatch-format '#cleeaaaaan!1!!'
+zstyle ':vcs_info:*' nopatch-format '#cleeaaaaan!1!!'
# To retrieve information about unapplied patches, vcs_info invokes `quilt'
# itself. Even though that's pretty quick, it's not needed for the default
# behaviour. If we want to have `%c' and `%u' to contain meaningful data,
# we have to enable retrieval of unapplied data:
-zstyle ':vcs_info:*' quilt-get-unapplied true
+zstyle ':vcs_info:*' get-unapplied true
# With quilt, the location of its patches are configurable. It's either
# $QUILT_PATCHES or `patches' if that's unset. Let's assume we're a debian

0 comments on commit d5db14e

Please sign in to comment.