Add --keep option to pop

[stgit] / stgit / stack.py

diff --git a/stgit/stack.py b/stgit/stack.py
index 914c1e3..c1071b5 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -65,7 +65,7 @@ def __clean_comments(f):
     f.writelines(lines)
 
 def edit_file(series, line, comment, show_patch = True):
-    fname = '.stgit.msg'
+    fname = '.stgitmsg.txt'
     tmpl = templates.get_template('patchdescr.tmpl')
 
     f = file(fname, 'w+')
@@ -925,7 +925,7 @@ class Series:
         self.pop_patch(name)
         return patch.restore_old_boundaries()
 
-    def pop_patch(self, name):
+    def pop_patch(self, name, keep = False):
         """Pops the top patch from the stack
         """
         applied = self.get_applied()
@@ -934,7 +934,7 @@ class Series:
 
         patch = Patch(name, self.__patch_dir, self.__refs_dir)
 
-        git.switch(patch.get_bottom())
+        git.switch(patch.get_bottom(), keep)
 
         # save the new applied list
         idx = applied.index(name) + 1