This makes it easier to script operations on the entire queue, for
example run the test suite on each patch in the queue:
guilt pop -a;while guilt push; do make test||break; done
This brings "guilt push" in line with the push operation in Mercurial
Queues (hg qpush), which fails when there are no patches to apply.
Updated the test suite.
"guilt push -a" still does not fail. (It successfully manages to
ensure that all patches are pushed, even if it did not have to do
anything to make it so.)
Signed-off-by: Per Cederqvist <cederp@xxxxxxxxx>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@xxxxxxxxxxxxxx>
---
guilt-push | 19 ++++++-----
regression/t-020.out | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++
regression/t-020.sh | 13 +++++++-
3 files changed, 113 insertions(+), 8 deletions(-)
diff --git a/guilt-push b/guilt-push
index 67687e7..39c125e 100755
--- a/guilt-push
+++ b/guilt-push
@@ -56,6 +56,12 @@ fi
patch="$1"
[ ! -z "$all" ] && patch="-a"
+# Treat "guilt push" as "guilt push -n 1".
+if [ -z "$patch" ]; then
+ patch=1
+ num=t
+fi
+
if [ "$patch" = "-a" ]; then
# we are supposed to push all patches, get the last one out of
# series
@@ -65,7 +71,7 @@ if [ "$patch" = "-a" ]; then
die "There are no patches to push."
fi
elif [ ! -z "$num" ]; then
- # we are supposed to pop a set number of patches
+ # we are supposed to push a set number of patches
[ "$patch" -lt 0 ] && die "Invalid number of patches to push."
@@ -78,11 +84,6 @@ elif [ ! -z "$num" ]; then
# clamp to minimum
[ $tidx -lt $eidx ] && eidx=$tidx
-elif [ -z "$patch" ]; then
- # we are supposed to push only the next patch onto the stack
-
- eidx=`wc -l < "$applied"`
- eidx=`expr $eidx + 1`
else
# we're supposed to push only up to a patch, make sure the patch is
# in the series
@@ -109,7 +110,11 @@ if [ "$sidx" -gt "$eidx" ]; then
else
disp "File series fully applied, ends at patch `get_series | tail -n 1`"
fi
- exit 0
+ if [ -n "$all" ]; then
+ exit 0
+ else
+ exit 1
+ fi
fi
get_series | sed -n -e "${sidx},${eidx}p" | while read p
diff --git a/regression/t-020.out b/regression/t-020.out
index 42433dc..bcb8797 100644
--- a/regression/t-020.out
+++ b/regression/t-020.out
@@ -270,6 +270,95 @@ index 0000000..8baef1b
+++ b/def
@@ -0,0 +1 @@
+abc
+% guilt push
+File series fully applied, ends at patch mode
+% guilt push -a
+File series fully applied, ends at patch mode
+% list_files
+d .git/patches
+d .git/patches/master
+d .git/refs/patches
+d .git/refs/patches/master
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
+f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/master/status
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
+r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add
+r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode
+r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove
+% git log -p
+commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
+Author: Author Name <author@email>
+Date: Mon Jan 1 00:00:00 2007 +0000
+
+ patch mode
+
+diff --git a/def b/def
+old mode 100644
+new mode 100755
+
+commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
+Author: Author Name <author@email>
+Date: Mon Jan 1 00:00:00 2007 +0000
+
+ patch remove
+
+diff --git a/abd b/abd
+deleted file mode 100644
+index fd3896d..0000000
+--- a/abd
++++ /dev/null
+@@ -1 +0,0 @@
+-‰öuؽáZâñeÏÈE„£ WÀV¼/›U?Ú<|¢@6¤8'H¸1G_˜Í§*·ðRÒ™¤
ªÂ~·
+\ No newline at end of file
+
+commit 37d588cc39848368810e88332bd03b083f2ce3ac
+Author: Author Name <author@email>
+Date: Mon Jan 1 00:00:00 2007 +0000
+
+ patch add
+
+diff --git a/abd b/abd
+new file mode 100644
+index 0000000..fd3896d
+--- /dev/null
++++ b/abd
+@@ -0,0 +1 @@
++‰öuؽáZâñeÏÈE„£ WÀV¼/›U?Ú<|¢@6¤8'H¸1G_˜Í§*·ðRÒ™¤
ªÂ~·
+\ No newline at end of file
+
+commit 33633e7a1aa31972f125878baf7807be57b1672d
+Author: Author Name <author@email>
+Date: Mon Jan 1 00:00:00 2007 +0000
+
+ patch modify
+
+diff --git a/def b/def
+index 8baef1b..7d69c2f 100644
+--- a/def
++++ b/def
+@@ -1 +1,2 @@
+ abc
++asjhfksad
+
+commit d4850419ccc1146c7169f500725ce504b9774ed0
+Author: Author Name <author@email>
+Date: Mon Jan 1 00:00:00 2007 +0000
+
+ initial
+
+ Signed-off-by: Commiter Name <commiter@email>
+
+diff --git a/def b/def
+new file mode 100644
+index 0000000..8baef1b
+--- /dev/null
++++ b/def
+@@ -0,0 +1 @@
++abc
% guilt pop --all
All patches popped.
% guilt push
diff --git a/regression/t-020.sh b/regression/t-020.sh
index c165884..3f70c26 100755
--- a/regression/t-020.sh
+++ b/regression/t-020.sh
@@ -26,6 +26,17 @@ guilt series | while read n ; do
done
#
+# pushing when there is nothing to push
+#
+
+shouldfail guilt push
+cmd guilt push -a
+
+cmd list_files
+
+cmd git log -p
+
+#
# pop all
#
cmd guilt pop --all
@@ -61,7 +72,7 @@ cmd guilt pop --all
npatches=`guilt series | wc -l`
for n in `_seq -2 $npatches`; do
- if [ $n -ge 0 ]; then
+ if [ $n -gt 0 ]; then
cmd guilt push -n $n
else
shouldfail guilt push -n $n
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html