Merge branch 'stable'

[stgit] / stgit / commands / clean.py

diff --git a/stgit/commands/clean.py b/stgit/commands/clean.py
index dbbc961127f8cac57db6a8c613b44efbcdf4b534..9b48e7b75ae546d7e3cafe92ba10447d9ba1e43c 100644 (file)
--- a/stgit/commands/clean.py
+++ b/stgit/commands/clean.py
@@ -15,29 +15,30 @@ 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
 """
 

-from optparse import make_option
+from stgit.argparse import opt

 from stgit.out import *
 from stgit.commands import common
 from stgit.lib import transaction
 
 from stgit.out import *
 from stgit.commands import common
 from stgit.lib import transaction
 

-help = 'delete the empty patches in the series'
-usage = """%prog [options]
-
+help = 'Delete the empty patches in the series'
+kind = 'stack'
+usage = ['']
+description = """

 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."""
 
 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'),
-           make_option('-u', '--unapplied',
-                       help = 'delete the empty unapplied patches',
-                       action = 'store_true')]
+args = []
+options = [
+    opt('-a', '--applied', action = 'store_true',
+        short = 'Delete the empty applied patches'),
+    opt('-u', '--unapplied', action = 'store_true',
+        short = 'Delete the empty unapplied patches')]

 
 

+directory = common.DirectoryHasRepositoryLib()

 
 def _clean(stack, clean_applied, clean_unapplied):
 
 def _clean(stack, clean_applied, clean_unapplied):

-    trans = transaction.StackTransaction(stack, 'clean')
+    trans = transaction.StackTransaction(stack, 'clean', allow_conflicts = True)

     def del_patch(pn):
         if pn in stack.patchorder.applied:
             if pn == stack.patchorder.applied[-1]:
     def del_patch(pn):
         if pn in stack.patchorder.applied:
             if pn == stack.patchorder.applied[-1]: