Merge lp:~mhall119/devscripts/allow-edit-patch-sh into lp:devscripts

[Michael Hall]

Running scripts/edit-patch.sh, because it checks if basename $0 is "edit-patch", which it will be when installed to /usr/bin, but not prior.

This patch will strip any trailing .sh from the filename before matching, so /usr/bin/edit-patch or ./devscripts/scripts/edit-patch.sh will match, but edit-patch.sh.foo will not.

[Benjamin Drung (bdrung)]

It's merged in Debian

Unmerged revisions

2348. By Michael Hall on 2012-03-09

Remove trailing .sh when checking if the script is being run as edit-patch or add-patch

2347. By Michael Hall on 2012-03-05

Save the top patch on the quilt stack, and go back to that after adding/editing a patch before committing changes to vcs

=== modified file 'scripts/edit-patch.sh'
--- scripts/edit-patch.sh	2011-05-21 21:35:20 +0000
+++ scripts/edit-patch.sh	2012-03-09 01:00:25 +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
 }
 
@@ -290,9 +293,11 @@
     normalize_patch_path
     normalize_patch_extension
     handle_file_patch
-    if [ "$(basename $0)" = "edit-patch" ]; then
+    if [ "$(basename $0|sed -e s/.sh\$//)" = "edit-patch" ]; then
+        echo "Found edit-patch"
         edit_patch_$PATCHSYSTEM $PATCHNAME
-    elif [ "$(basename $0)" = "add-patch" ]; then
+    elif [ "$(basename $0|sed -e s/.sh\$//)" = "add-patch" ]; then
+        echo "Found add-patch"
         add_patch_$PATCHSYSTEM $1 $PATCHNAME
     fi
     add_patch_tagging $PATCHNAME