Fix push --undo to remove the local changes

Without this patch, the command would fail if there are local changes
because of git-read-tree -m -u.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/git.py b/stgit/git.py
index fb75a8535bda2a8f5f82233bb4e929fcc4d70394..5abe902eda354f704d4258223e2a21758a54621c 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -434,6 +434,22 @@ def switch(tree_id):
 
     __set_head(tree_id)
 
 
     __set_head(tree_id)
 

+def reset(tree_id = None):
+    """Revert the tree changes relative to the given tree_id. It removes
+    any local changes
+    """
+    if not tree_id:
+        tree_id = get_head()
+
+    cache_files = __tree_status(tree_id = tree_id)
+    rm_files =  [x[1] for x in cache_files if x[0] in ['D']]
+
+    checkout(tree_id = tree_id, force = True)
+    __set_head(tree_id)
+
+    # checkout doesn't remove files
+    map(os.remove, rm_files)
+

 def pull(location, head = None, tag = None):
     """Fetch changes from the remote repository. At the moment, just
     use the 'git fetch' scripts
 def pull(location, head = None, tag = None):
     """Fetch changes from the remote repository. At the moment, just
     use the 'git fetch' scripts

diff --git a/stgit/stack.py b/stgit/stack.py
index 46d6ee5fc7ba3b1df835f53934354c7777c42366..1e68b9906b41eb2f52cc2037e9e4f9be49246833 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -496,6 +496,7 @@ class Series:
         assert(name)
 
         patch = Patch(name, self.__patch_dir)
         assert(name)
 
         patch = Patch(name, self.__patch_dir)

+        git.reset()

         self.pop_patch(name)
         patch.restore_old_boundaries()
 
         self.pop_patch(name)
         patch.restore_old_boundaries()