[PATCH V3 (add a test)] phases: fix missing "error" module import (issue3707)

André Sintzoff andre.sintzoff at gmail.com
Sun Nov 25 13:42:51 CST 2012


# HG changeset patch
# User André Sintzoff <andre.sintzoff at gmail.com>
# Date 1353872377 -3600
# Branch stable
# Node ID cf9384939f6e37c066d0c5910f4a865c1473897e
# Parent  54cedee86e5126188b0dcfbd7015bcdca7f6c2e2
phases: fix missing "error" module import (issue3707)

diff -r 54cedee86e51 -r cf9384939f6e mercurial/phases.py
--- a/mercurial/phases.py	Ven nov 16 15:39:12 2012 -0800
+++ b/mercurial/phases.py	Dim 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)
diff -r 54cedee86e51 -r cf9384939f6e tests/test-phases.t
--- a/tests/test-phases.t	Ven nov 16 15:39:12 2012 -0800
+++ b/tests/test-phases.t	Dim nov 25 20:39:37 2012 +0100
@@ -336,6 +336,15 @@
   extra:       branch=default
   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]
   
   
 


More information about the Mercurial-devel mailing list