changeset 17979:b3ec0b5fd777 stable

phases: fix missing "error" module import (issue3707)
author André Sintzoff <andre.sintzoff@gmail.com>
date Sun, 25 Nov 2012 20:39:37 +0100
parents 2c63896783e3
children 83aa4359c49f e689b0d91546
files mercurial/phases.py tests/test-phases.t
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/phases.py	Mon Nov 26 17:48:39 2012 -0600
+++ b/mercurial/phases.py	Sun Nov 25 20:39:37 2012 +0100
@@ -103,7 +103,7 @@
 import errno
 from node import nullid, nullrev, bin, hex, short
 from i18n import _
-import util
+import util, error
 import obsolete
 
 allphases = public, draft, secret = range(3)
--- a/tests/test-phases.t	Mon Nov 26 17:48:39 2012 -0600
+++ b/tests/test-phases.t	Sun Nov 25 20:39:37 2012 +0100
@@ -337,8 +337,17 @@
   description:
   A
   
+
+
+(Issue3707)
+test invalid phase name
+
+  $ mkcommit I --config phases.new-commit='babar'
+  transaction abort!
+  rollback completed
+  abort: phases.new-commit: not a valid phase name ('babar')
+  [255]
   
-
 Test phase command
 ===================