# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1262999134 18000
# Node ID 48b02f459ac04d4e6ebf2c5bde2186b71c0d6fc2
# Parent  187b25ff6e1afad6494923d14c3d9b44a219ba8d
Add the --angle-brackets option to keep zsh users sane.

diff -r 187b25ff6e1a -r 48b02f459ac0 prompt.py
--- a/prompt.py	Tue Dec 15 20:42:27 2009 -0500
+++ b/prompt.py	Fri Jan 08 20:05:34 2010 -0500
@@ -40,6 +40,7 @@
     if any(out_groups) and not all(out_groups):
         print 'Error parsing prompt string.  Mismatched braces?'
     
+    out = out.replace('%', '%%')
     return ("%s" + out + "%s") % (out_groups[0][:-1] if out_groups[0] else '',
                                   out_groups[1][1:] if out_groups[1] else '')    
 
@@ -291,8 +292,16 @@
                 return ''
         return _r
     
-    tag_start = r'\{([^{}]*?\{)?'
-    tag_end = r'(\}[^{}]*?)?\}'
+    
+    if opts.get("angle_brackets"):
+        tag_start = r'\<([^><]*?\<)?'
+        tag_end = r'(\>[^><]*?)?>'
+        brackets = '<>'
+    else:
+        tag_start = r'\{([^{}]*?\{)?'
+        tag_end = r'(\}[^{}]*?)?\}'
+        brackets = '{}'
+    
     patterns = {
         'bookmark': _bookmark,
         'branch(\|quiet)?': _branch,
@@ -306,15 +315,15 @@
             '|(\|count)'
             '|(\|quiet)'
             ')*': _patch,
-        'patches(?:'
-            '(\|join\(.*?\))'
-            '|(\|reverse)'
-            '|(\|hide_applied)'
-            '|(\|hide_unapplied)'
-            '|(\|pre_applied\(.*?\))'
-            '|(\|post_applied\(.*?\))'
-            '|(\|pre_unapplied\(.*?\))'
-            '|(\|post_unapplied\(.*?\))'
+        'patches(?:' +
+            '(\|join\([^%s]*?\))' % brackets[-1] +
+            '|(\|reverse)' +
+            '|(\|hide_applied)' +
+            '|(\|hide_unapplied)' +
+            '|(\|pre_applied\([^%s]*?\))' % brackets[-1] +
+            '|(\|post_applied\([^%s]*?\))' % brackets[-1] +
+            '|(\|pre_unapplied\([^%s]*?\))' % brackets[-1] +
+            '|(\|post_unapplied\([^%s]*?\))' % brackets[-1] +
             ')*': _patches,
         'rev(\|merge)?': _rev,
         'root': _root,
@@ -323,7 +332,7 @@
             '(\|modified)'
             '|(\|unknown)'
             ')*': _status,
-        'tags(\|[^}]*)?': _tags,
+        'tags(\|[^%s]*?)?' % brackets[-1]: _tags,
         'task': _task,
         'tip(?:'
             '(\|node)'
@@ -368,6 +377,7 @@
 cmdtable = {
     "prompt": 
     (prompt, [
+        ('', 'angle-brackets', None, 'use angle brackets (<>) for keywords'),
         ('', 'cache-incoming', None, 'used internally by hg-prompt'),
         ('', 'cache-outgoing', None, 'used internally by hg-prompt'),
     ],