Since the delete command now supports multiple patches (and a ".." would
remove the whole stack), it is safer to copy the commit ids to
.git/patches/<branch>/trash/ in case a restore is needed. There is no
command allowing the restoring yet.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
for patch in self.get_applied() + self.get_unapplied():
self.get_patch(patch).update_top_ref()
for patch in self.get_applied() + self.get_unapplied():
self.get_patch(patch).update_top_ref()
+ # trash directory
+ self.__trash_dir = os.path.join(self.__series_dir, 'trash')
+ if self.is_initialised() and not os.path.isdir(self.__trash_dir):
+ os.makedirs(self.__trash_dir)
+
def get_branch(self):
"""Return the branch name for the Series object
"""
def get_branch(self):
"""Return the branch name for the Series object
"""
for p in patches:
Patch(p, self.__patch_dir, self.__refs_dir).delete()
for p in patches:
Patch(p, self.__patch_dir, self.__refs_dir).delete()
+ # remove the trash directory
+ for fname in os.listdir(self.__trash_dir):
+ os.remove(fname)
+ os.rmdir(self.__trash_dir)
+
if os.path.exists(self.__applied_file):
os.remove(self.__applied_file)
if os.path.exists(self.__unapplied_file):
if os.path.exists(self.__applied_file):
os.remove(self.__applied_file)
if os.path.exists(self.__unapplied_file):
elif not name in self.get_unapplied():
raise StackException, 'Unknown patch "%s"' % name
elif not name in self.get_unapplied():
raise StackException, 'Unknown patch "%s"' % name
+ # save the commit id to a trash file
+ write_string(os.path.join(self.__trash_dir, name), patch.get_top())
+
patch.delete()
unapplied = self.get_unapplied()
patch.delete()
unapplied = self.get_unapplied()