Refactor output handling to break circular dependency

[stgit] / stgit / commands / commit.py

diff --git a/stgit/commands/commit.py b/stgit/commands/commit.py
index ec3de72462fe42858fe934c89068415fc3b8446e..0b76c564699b197a687a34c2f76f0229529f505c 100644 (file)
--- a/stgit/commands/commit.py
+++ b/stgit/commands/commit.py
@@ -20,6 +20,7 @@ from optparse import OptionParser, make_option
 
 from stgit.commands.common import *
 from stgit.utils import *
+from stgit.out import *
 from stgit import stack, git
 
 help = 'permanently store the applied patches into stack base'
@@ -49,9 +50,12 @@ def func(parser, options, args):
     if not applied:
         raise CmdException, 'No patches applied'
 
+    if crt_series.get_protected():
+        raise CmdException, 'This branch is protected.  Commit is not permitted'
+
     crt_head = git.get_head()
 
-    print 'Committing %d patches...' % len(applied),
+    out.start('Committing %d patches' % len(applied))
 
     crt_series.pop_patch(applied[0])
     git.switch(crt_head)
@@ -59,4 +63,4 @@ def func(parser, options, args):
     for patch in applied:
         crt_series.delete_patch(patch)
 
-    print 'done'
+    out.done()