diff options
author | Guido Günther <agx@sigxcpu.org> | 2009-07-23 20:49:22 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2009-07-23 20:49:22 +0200 |
commit | 8ea47477233c2f810c7310118f0a717e16ab940e (patch) | |
tree | 85ba96824c937065398d70d2efef261415e6b9b0 | |
parent | e1bdfdb3917cb371fcc74744e90b1f7a0e78efc0 (diff) | |
download | git-buildpackage-8ea47477233c2f810c7310118f0a717e16ab940e.tar.gz git-buildpackage-8ea47477233c2f810c7310118f0a717e16ab940e.tar.bz2 git-buildpackage-8ea47477233c2f810c7310118f0a717e16ab940e.zip |
add gbp-pq to examples
Closes: #537212
-rwxr-xr-x | examples/gbp-pq | 119 |
1 files changed, 119 insertions, 0 deletions
diff --git a/examples/gbp-pq b/examples/gbp-pq new file mode 100755 index 00000000..93ebc45f --- /dev/null +++ b/examples/gbp-pq @@ -0,0 +1,119 @@ +#!/bin/sh +# +# Convert a patch-queue branch into a patch series in debian/patches and vice +# versa. +# +# assumes you have your quilt patch queue for $branch on patch-queue/$branch +# +# See: https://honk.sigxcpu.org/piki/development/debian_packages_in_git/ + +is_patch_queue() +{ + local branch=$1 + + if expr $branch : patch-queue/ >/dev/null; then + return 0 + else + return 1 + fi +} + +pq_export() +{ + local branch=$1 + local pq="patch-queue/$branch" + + if is_patch_queue $branch; then + echo "On a patch-queue branch, can't redo patches." + return 1 + fi + + rm -f debian/patches/* + PATCHES=`git format-patch -N -o debian/patches $branch...$pq` + if [ -n "$PATCHES" ]; then + echo "Regenerationg patch queue in \"debian/patches\"." + > debian/patches/series + for PATCH in $PATCHES; do + # delete the first line (from sha1) and last two lines (git version + # info) of the patch file + sed -i -e '1d' -e 'N;$!P;$!D;$d' $PATCH + sed -i -e 's/^-- \n[0-9\.]+$//' $PATCH + echo $PATCH | sed -e 's%debian/patches/%%' >> debian/patches/series + done + git status -- debian/patches + else + echo "No patches on \"$pq\"." + fi +} + +pq_rebase() +{ + local branch=$1 + local pq="patch-queue/$branch" + + if ! is_patch_queue $branch; then + echo "Switching to \"$pq\"" + git checkout $pq + else + echo "Already on \"$branch\"" + fi + git rebase $branch +} + +pq_import() +{ + local branch=$1 + local pq="patch-queue/$branch" + local patches=debian/patches/ + + if is_patch_queue $branch; then + echo "Already on a patch-queue branch \"$branch\" - doing nothing." + return 1 + fi + + if [ ! -r ${patches}series ]; then + echo "Found no series file at \"$patches\"." + return 1 + fi + + if ! git checkout -b $pq; then + echo "Cannot create patch-queue branch \"$pq\"." + return 1 + fi + QUILT_PATCHES=$patches git quiltimport +} + +usage () +{ + cat <<EOF +$0 [ACTION] + +Options: + export Export the associated patch-queue branch into + debian/patches and update the series file. + + import Create a patch-queue branch from debian/patches. + + rebase Switch to associated patch-queue branch and rebase + against current branch. +EOF +} + +branch=$(git branch --no-color | awk '/^\*/ { print $2 }') + +case "$1" in + export) + pq_export $branch + ;; + import) + pq_import $branch + ;; + rebase) + pq_rebase $branch + ;; + *) + usage + exit 1 + ;; +esac + |