[patch 06/11] Avoid allowing --undo if it doesn't change anything
From: Paolo 'Blaisorblade' Giarrusso <hidden>
Date: 2016-06-15 22:42:06
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Paolo 'Blaisorblade' Giarrusso <redacted> Avoid top/bottom backup files identical to current ones. Simply remove them. Also, change restore_old_boundaries() to handle gracefully the new situation rather than print an exception. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <redacted> --- stgit/commands/push.py | 6 ++++-- stgit/stack.py | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/stgit/commands/push.py b/stgit/commands/push.py
--- a/stgit/commands/push.py
+++ b/stgit/commands/push.py@@ -66,8 +66,10 @@ def func(parser, options, args): print 'Undoing the "%s" push...' % patch, sys.stdout.flush() resolved_all() - crt_series.undo_push() - print 'done' + if crt_series.undo_push(): + print 'done' + else: + print 'done (patch unchanged)' print_crt_patch() return
diff --git a/stgit/stack.py b/stgit/stack.py
--- a/stgit/stack.py
+++ b/stgit/stack.py@@ -170,7 +170,11 @@ class Patch: def set_bottom(self, string, backup = False): if backup: - self.__set_field('bottom.old', self.__get_field('bottom')) + curr = self.__get_field('bottom') + if curr != string: + self.__set_field('bottom.old', curr) + else: + self.__set_field('bottom.old', None) self.__set_field('bottom', string) def get_top(self):
@@ -178,7 +182,11 @@ class Patch: def set_top(self, string, backup = False): if backup: - self.__set_field('top.old', self.__get_field('top')) + curr = self.__get_field('top') + if curr != string: + self.__set_field('top.old', curr) + else: + self.__set_field('top.old', None) self.__set_field('top', string) def restore_old_boundaries(self):
@@ -188,8 +196,9 @@ class Patch: if top and bottom: self.__set_field('bottom', bottom) self.__set_field('top', top) + return True else: - raise StackException, 'No patch undo information' + return False def get_description(self): return self.__get_field('description', True)
@@ -571,7 +580,7 @@ class Series: patch = Patch(name, self.__patch_dir) git.reset() self.pop_patch(name) - patch.restore_old_boundaries() + return patch.restore_old_boundaries() def pop_patch(self, name): """Pops the top patch from the stack