Let "stg clean" use the new transaction primitives

[stgit] / stgit / commands / clean.py

diff --git a/stgit/commands/clean.py b/stgit/commands/clean.py
index efd85c27b2c74bf10dcc611548e2e3d3befeeb25..3805eb08cac15ab04d23e8860a00a35e7c8408b7 100644 (file)
--- a/stgit/commands/clean.py
+++ b/stgit/commands/clean.py
@@ -15,17 +15,19 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 

-import sys, os
-from optparse import OptionParser, make_option
-
-from stgit.commands.common import *
-from stgit.utils import *
-from stgit import stack, git
-
+from optparse import make_option
+from stgit.out import *
+from stgit.commands import common
+from stgit.lib import transaction

 
 help = 'delete the empty patches in the series'
 
 help = 'delete the empty patches in the series'

-usage = """%prog [options]"""
+usage = """%prog [options]

 
 

+Delete the empty patches in the whole series or only those applied or
+unapplied. A patch is considered empty if the two commit objects
+representing its boundaries refer to the same tree object."""
+
+directory = common.DirectoryHasRepositoryLib()

 options = [make_option('-a', '--applied',
                        help = 'delete the empty applied patches',
                        action = 'store_true'),
 options = [make_option('-a', '--applied',
                        help = 'delete the empty applied patches',
                        action = 'store_true'),


@@ -34,17 +36,16 @@ options = [make_option('-a', '--applied',
                        action = 'store_true')]
 
 
                        action = 'store_true')]
 
 

-def __delete_empty(patches, push = False):
-    """Delete the empty patches
-    """
-    for p in patches:
-        if crt_series.empty_patch(p):
-            print 'Deleting patch "%s"...' % p,
-            sys.stdout.flush()
-            crt_series.delete_patch(p)
-            print 'done'
-        elif push:
-            crt_series.push_patch(p)
+def _clean(stack, clean_applied, clean_unapplied):
+    trans = transaction.StackTransaction(stack, 'clean')
+    def del_patch(pn):
+        if pn in stack.patchorder.applied:
+            return clean_applied and trans.patches[pn].data.is_nochange()
+        elif pn in stack.patchorder.unapplied:
+            return clean_unapplied and trans.patches[pn].data.is_nochange()
+    for pn in trans.delete_patches(del_patch):
+        trans.push_patch(pn)
+    trans.run()

 
 def func(parser, options, args):
     """Delete the empty patches in the series
 
 def func(parser, options, args):
     """Delete the empty patches in the series


@@ -52,20 +53,8 @@ def func(parser, options, args):
     if len(args) != 0:
         parser.error('incorrect number of arguments')
 
     if len(args) != 0:
         parser.error('incorrect number of arguments')
 

-    check_local_changes()
-    check_conflicts()
-    check_head_top_equal()
-

     if not (options.applied or options.unapplied):
         options.applied = options.unapplied = True
 
     if not (options.applied or options.unapplied):
         options.applied = options.unapplied = True
 

-    if options.applied:
-        applied = crt_series.get_applied()
-        crt_series.pop_patch(applied[0])
-        __delete_empty(applied, True)
-
-    if options.unapplied:
-        unapplied = crt_series.get_unapplied()
-        __delete_empty(unapplied, False)
-
-    print_crt_patch()
+    _clean(directory.repository.current_stack,
+           options.applied, options.unapplied)