Patchwork logstyle: Show the style list when I try to use a wrong one

login
register
mail settings
Submitter Iulian Stana
Date April 17, 2013, 8:51 p.m.
Message ID <bad7be3c4b0fd88bf593.1366231913@doppler>
Download mbox | patch
Permalink /patch/1404/
State Superseded, archived
Headers show

Comments

Iulian Stana - April 17, 2013, 8:51 p.m.
# HG changeset patch
# User Iulian Stana <julian.stana@gmail.com>
# Date 1366228237 -10800
#      Wed Apr 17 22:50:37 2013 +0300
# Node ID bad7be3c4b0fd88bf5930b8f67d2134c076cd0b6
# Parent  186c1300c10d40b4d6871e851b57d8d44368dcb0
logstyle: Show the style list when I try to use a wrong one.
***
log-style: change print/sys.exit to util.Abort
log-style: add a test for the wrong style

Patch

diff -r 186c1300c10d -r bad7be3c4b0f mercurial/templater.py
--- a/mercurial/templater.py	Tue Apr 16 22:09:28 2013 +0300
+++ b/mercurial/templater.py	Wed Apr 17 22:50:37 2013 +0300
@@ -391,6 +391,16 @@ 
 
 engines = {'default': engine}
 
+def stylelist(mapfile):
+    path = templatepath()[0]
+    dirlist =  os.listdir(path)
+    stylelist = 'The "%s" style is not found try: \n\n' % mapfile
+    for file in dirlist:
+        split = file.split(".")
+        if split[0] == "map-cmdline":
+            stylelist = stylelist + '\t' + split[1] + '\n'
+    return stylelist
+
 class templater(object):
 
     def __init__(self, mapfile, filters={}, defaults={}, cache={},
@@ -412,7 +422,7 @@ 
         if not mapfile:
             return
         if not os.path.exists(mapfile):
-            raise util.Abort(_('style not found: %s') % mapfile)
+            raise util.Abort(stylelist(mapfile))
 
         conf = config.config()
         conf.read(mapfile)
diff -r 186c1300c10d -r bad7be3c4b0f tests/test-log.t
--- a/tests/test-log.t	Tue Apr 16 22:09:28 2013 +0300
+++ b/tests/test-log.t	Wed Apr 17 22:50:37 2013 +0300
@@ -67,7 +67,7 @@ 
   abort: cannot follow file not in parent revision: "dir"
   [255]
 
--f, one
+-f, phases style
 
   $ hg log -f -l1 --style phases
   changeset:   4:7e4639b4691b
@@ -78,6 +78,23 @@ 
   summary:     e
   
 
+-f, a wrong style
+
+  $ hg log -f -l1 --style something
+  abort: The "something" style is not found try: 
+  
+  	changelog
+  	bisect
+  	default
+  	xml
+  	phases
+  	compact
+  
+  [255]
+
+
+
+
 -f, but no args
 
   $ hg log -f