Add --keep option to pop

[stgit] / stgit / commands / common.py

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index b8ea3bb..a073b29 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -194,7 +194,7 @@ def push_patches(patches, check_merged = False):
             else:
                 print 'done'
 
             else:
                 print 'done'
 

-def pop_patches(patches):
+def pop_patches(patches, keep = False):

     """Pop the patches in the list from the stack. It is assumed that
     the patches are listed in the stack reverse order.
     """
     """Pop the patches in the list from the stack. It is assumed that
     the patches are listed in the stack reverse order.
     """


@@ -205,7 +205,7 @@ def pop_patches(patches):
         print 'Popping "%s" - "%s" patches...' % (patches[0], p),
     sys.stdout.flush()
 
         print 'Popping "%s" - "%s" patches...' % (patches[0], p),
     sys.stdout.flush()
 

-    crt_series.pop_patch(p)
+    crt_series.pop_patch(p, keep)

 
     print 'done'
 
 
     print 'done'