Merge lp:~mhall119/devscripts/fixes-947180 into lp:devscripts

[Michael Hall]

Currently edit-patch does not take into consideration the currently applied/unapplied patches on a branch, it just applied them all and then unapplied them all. This can lead to more changes that the developer intends.

Before pushing unapplied patches, first save the top patch. Then, instead of popping all applied patches, pop back only to the patch that was on top before running edit-patch. This should minimize the branch changes caused by edit-patch to only those made in the quilt shell.

[Michael Hall (mhall119)]

Submitted upstream: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662689

[Michael Vogt (mvo)]

Thanks, this change looks fine. I am not actually a commiter to devscripts but as the original author of
edit-patch a +1 from me for this merge.

review: Approve

=== modified file 'scripts/edit-patch.sh'
--- scripts/edit-patch.sh	2011-05-21 21:35:20 +0000
+++ scripts/edit-patch.sh	2012-03-05 16:16:17 +0000
@@ -121,6 +121,8 @@
 
 edit_patch_quilt() {
     export QUILT_PATCHES=debian/patches
+    top_patch=$(quilt top)
+    echo "Top patch: $top_patch"
     if [ -e $PREFIX/$1 ]; then
         # if its a existing patch and we are at the end of the stack,
         # go back at the beginning
@@ -138,7 +140,8 @@
     # use a sub-shell
     quilt shell
     quilt refresh
-    quilt pop -a
+    echo "Reverting quilt back to $top_patch"
+    quilt pop $top_patch
     vcs_add $PREFIX/$1 $PREFIX/series
 }