Split Series.push_patch in two

[stgit] / stgit / commands / assimilate.py

diff --git a/stgit/commands/assimilate.py b/stgit/commands/assimilate.py
index a8b3bfe..c5f4340 100644 (file)
--- a/stgit/commands/assimilate.py
+++ b/stgit/commands/assimilate.py
@@ -22,6 +22,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 = 'StGIT-ify any GIT commits made on top of your StGIT stack'
@@ -42,7 +43,7 @@ def func(parser, options, args):
     """
 
     def nothing_to_do():
-        print 'No commits to assimilate'
+        out.info('No commits to assimilate')
 
     top_patch = crt_series.get_current_patch()
     if not top_patch:
@@ -79,13 +80,13 @@ def func(parser, options, args):
 
     victims.reverse()
     for victim in victims:
-        print ('Creating patch "%s" from commit %s'
-               % (patch2name[victim], victim))
+        out.info('Creating patch "%s" from commit %s'
+                 % (patch2name[victim], victim))
         aname, amail, adate = name_email_date(victim.get_author())
         cname, cmail, cdate = name_email_date(victim.get_committer())
         crt_series.new_patch(
             patch2name[victim],
-            can_edit = False, before_existing = False, refresh = False,
+            can_edit = False, before_existing = False, commit = False,
             top = victim.get_id_hash(), bottom = victim.get_parent(),
             message = victim.get_log(),
             author_name = aname, author_email = amail, author_date = adate,