remove guilt dependency

Signed-off-by: MORITA Kazutaka <[email protected]>

Author: kazum

Makefile

@@ -1,6 +1,7 @@
 INSTALL?=install
 
-SCRIPTS = $(filter-out $(wildcard *~),$(wildcard git-q*))
+SETUP_SCRIPT = git-qsh-setup
+GITQ_SCRIPTS = $(filter-out $(wildcard *~) $(SETUP_SCRIPT), $(wildcard git-q*))
 GIT_EXEC_PATH = $(shell git --exec-path)
 
 .PHONY: all 
@@ -10,4 +11,5 @@ all:
 
 .PHONY: install
 install:
-	$(INSTALL) -m 755 $(SCRIPTS) $(GIT_EXEC_PATH)
+	$(INSTALL) -m 755 $(GITQ_SCRIPTS) $(GIT_EXEC_PATH)
+	$(INSTALL) -m 644 $(SETUP_SCRIPT) $(GIT_EXEC_PATH)

README

@@ -1 +1,22 @@
-This repository includes some tiny wrappers for guilt (quilt for git).
+This repository includes a series of bash scripts which help to manage
+patch emails based on a Mercurial queues-like functionality.
+
+The distinguishing features from other quilt-like tools are:
+
+ - Optimized for managing patch emails; a patch name is automaticaly
+   generated from an email subject, and git-am is used instead of
+   git-apply to push a patch.
+
+ - New and refresh are not provided for simplicity; we can do the same
+   things more easily with git branch and rebase.
+
+Example:
+
+ $ git qinit          # initialize
+ $ git qimport *.eml  # import patch emails
+ $ git qseries -e     # arrange the patches in order
+ $ git qpush          # apply the patch
+ $ git qcommit -a     # commit the patch
+
+--
+Copyright (C) 2013, MORITA Kazutaka <[email protected]>

bash_completion

@@ -6,7 +6,7 @@ _git_qpop()
 		return
 	esac
 
-	__gitcomp "`guilt applied`"
+	__gitcomp "`git qapplied`"
 }
 
 _git_qpush()
@@ -17,7 +17,7 @@ _git_qpush()
 		return
 	esac
 
-	__gitcomp "`guilt unapplied`"
+	__gitcomp "`git qunapplied`"
 }
 
 _git_qcommit()
@@ -80,10 +80,10 @@ _git_qinit()
 
 _git_qshow()
 {
-	__gitcomp "`guilt series`"
+	__gitcomp "`git qseries`"
 }
 
 _git_qrename()
 {
-	__gitcomp "`guilt series`"
+	__gitcomp "`git qseries`"
 }

git-qapplied

@@ -1,3 +1,32 @@
 #!/bin/bash
+#
+# Copyright (C) 2013 MORITA Kazutaka <[email protected]>
+#
+# This code is based on guilt-applied from Guilt (Git Quilt):
+#   Copyright (c) Josef "Jeff" Sipek, 2006-2011
+#
 
-guilt applied $@
+. git-qsh-setup
+
+USAGE="[-c]"
+
+case $# in
+    0)
+	# just output the regular series-style applied list
+	cat "$applied"
+	;;
+
+    1)
+	if [ "$1" != "-c" ]; then
+	    usage
+	fi
+
+	for pname in $(cat "$applied"); do
+	    git show-ref refs/patches/$branch/$pname | sed -e "s,refs/patches/$branch/,,"
+	done
+	;;
+
+    *)
+	usage
+	;;
+esac

git-qcommit

@@ -1,8 +1,30 @@
 #!/bin/bash
+#
+# Copyright (C) 2013 MORITA Kazutaka <[email protected]>
+#
+# This code is based on guilt-commit from Guilt (Git Quilt):
+#   Copyright (c) Josef "Jeff" Sipek, 2008-2011
+#
 
-set -e
+. git-qsh-setup
 
-guilt commit $@
+USAGE=""
+
+if [ $# -ne 0 ]; then
+    usage
+fi
+
+# if nothing's applied, exit
+[ `wc -l < "$applied"` -eq 0 ] && exit 0
+
+# remove patch refs for what's being committed, and update series
+for pname in $(sed -n -e "1,\$p" "$applied"); do
+    grep -v "^$pname$" < "$series" > "$series.tmp"
+    mv "$series.tmp" "$series"
+    echo "$pname" | remove_patch_refs
+done
+
+truncate -s 0 "$applied"
 
 # run gseries to cleanup merged patches
 rest=$(git qseries)

git-qimport

@@ -1,10 +1,52 @@
 #!/bin/bash
+#
+# Copyright (C) 2013 MORITA Kazutaka <[email protected]>
+#
+# This code is based on guilt-import from Guilt (Git Quilt):
+#   Copyright (c) Josef "Jeff" Sipek, 2007-2011
+#
+
+. git-qsh-setup
+
+USAGE="<file>..."
+
+if [ $# -lt 1 ]; then
+    usage
+fi
+
+_import() {
+
+    newname="$1"
+    oldname="$2"
+
+    # make sure that there are no unapplied changes
+    if ! must_commit_first; then
+	die "Uncommited changes detected. Refresh first."
+    fi
+
+    if [ ! -e "$oldname" ]; then
+	die "Specified file does not exist."
+    fi
+
+    if [ -e "$GITQ_DIR/$branch/$newname" ]; then
+	die "Already tracking a patch under that name."
+    fi
+
+    cp "$oldname" "$GITQ_DIR/$branch/$newname"
+
+    # insert the patch into the series file
+    cp "$series" "$series.tmp"
+    echo "$newname" >> "$series.tmp"
+    mv "$series.tmp" "$series"
+
+    echo "import $newname"
+}
 
 for f in $@; do
     name=$(sed ':loop; N; $!b loop; ;s/\n\t/,/g' $f | \
 	grep ^Subject: | \
 	sed -e 's/Subject: \(\[[^]]*\] \)*\[PATCH[^/]*\( \([0-9]*\/\)[0-9]*\)*\] /\3/' | \
 	sed 's/Subject: //' | \
 	tr ' /' '_' | sed 's/[^a-zA-Z0-9_]//g')
-    guilt import -P $name $f
+    _import $name $f
 done

git-qinit

@@ -1,3 +1,26 @@
 #!/bin/bash
+#
+# Copyright (C) 2013 MORITA Kazutaka <[email protected]>
+#
+# This code is based on guilt-init from Guilt (Git Quilt):
+#   Copyright (c) Josef "Jeff" Sipek, 2006-2011
+#
 
-guilt init $@
+DO_NOT_CHECK_BRANCH_EXISTENCE=1
+
+. git-qsh-setup
+
+USAGE=""
+
+if [ $# -ne 0 ]; then
+    usage
+fi
+
+if [ -d "$GITQ_DIR/$branch" ]; then
+    die "Branch $branch appears to be already initialized (GIT_DIR=$GIT_DIR)"
+fi
+
+[ ! -d "$GITQ_DIR" ] && mkdir "$GITQ_DIR"
+mkdir -p "$GITQ_DIR/$branch"
+touch "$GITQ_DIR/$branch/series"
+touch "$GITQ_DIR/$branch/status"

git-qnext

@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Copyright (C) 2013 MORITA Kazutaka <[email protected]>
+#
+# This code is based on guilt-next from Guilt (Git Quilt):
+#   Copyright (c) Josef "Jeff" Sipek, 2006-2011
+#
+
+. git-qsh-setup
+
+USAGE="[-p|--path]"
+
+while [ $# -ne 0 ]; do
+    case "$1" in
+	-p|--path)
+	    path="$GITQ_DIR/$branch/" ;;
+	*)
+	    usage ;;
+    esac
+    shift
+done
+
+n=`wc -l < "$applied"`
+n=$(($n + 1))
+
+p=`awk "{ if (NR == $n) print \\$0}" "$series"`
+
+if [ -n "$p" ]; then
+    echo $path$p
+fi

git-qpick

@@ -1,24 +1,24 @@
 #!/bin/bash
+#
+# Copyright (C) 2013 MORITA Kazutaka <[email protected]>
+#
 
-set -e
+. git-qsh-setup
 
-must_commit_first()
-{
-    git update-index --refresh --unmerged -q > /dev/null
-    [ `git diff-files | wc -l` -eq 0 ] || return $?
-    [ `git diff-index HEAD | wc -l` -eq 0 ]
-    return $?
-}
+USAGE="[<hash> | <since>..[<until>] | ..<until>]"
 
+if [ $# -ne 1 ] || [ -z "$1" ]; then
+    usage
+fi
+
+rhash=`munge_hash_range $1`
+
+# make sure that there are no unapplied changes
 if ! must_commit_first; then
-    echo "Uncommited changes detected."
-    return 1
+    die "Uncommited changes detected."
 fi
 
 DIR=$(mktemp -d)
-
-c=$(git rev-list --no-walk $@)
-git format-patch -o $DIR --quiet $c^..$c
+git format-patch -o $DIR --quiet $rhash
 git qimport $DIR/*
-
 rm -r $DIR

git-qpop

@@ -1,3 +1,101 @@
 #!/bin/bash
+#
+# Copyright (C) 2013 MORITA Kazutaka <[email protected]>
+#
+# This code is based on guilt-pop from Guilt (Git Quilt):
+#   Copyright (c) Josef "Jeff" Sipek, 2006-2011
+#
 
-guilt pop $@
+. git-qsh-setup
+
+USAGE="[-f] [-a | --all | -n <num> | <patchname>]"
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+	-f)
+	    force=t
+	    ;;
+	-a|--all)
+	    all=t
+	    ;;
+	-n)
+	    num=t
+	    ;;
+	*)
+	    break
+	    ;;
+    esac
+    shift
+done
+
+# "git qpop" or "git qpop foo" or "git qpop -n foo"
+if [ -z "$all" ] && [ $# -gt 1 ]; then
+    usage
+fi
+
+# "git qpop -n foo"
+if [ ! -z "$num" ]; then
+    if [ $# -gt 1 ] || [ $# -eq 0 ]; then
+	usage
+    fi
+fi
+
+# "git qpop -a"
+if [ ! -z "$all" ] && [ $# -gt 0 ]; then
+    usage
+fi
+
+patch="$1"
+[ ! -z "$all" ] && patch="-a"
+
+if [ ! -s "$applied" ]; then
+    echo "No patches applied."
+    exit 0
+elif [ "$patch" = "-a" ]; then
+    # we are supposed to pop all patches
+
+    sidx=`wc -l < "$applied"`
+    eidx=0
+elif [ ! -z "$num" ]; then
+    # we are supposed to pop a set number of patches
+
+    [ "$patch" -lt 0 ] && die "Invalid number of patches to pop."
+
+    sidx=`wc -l < "$applied"`
+    eidx=`expr $sidx - $patch`
+
+    # catch underflow
+    [ $eidx -lt 0 ] && eidx=0
+    [ $eidx -eq $sidx ] && die "No patches requested to be removed."
+elif [ -z "$patch" ]; then
+    # we are supposed to pop only the current patch on the stack
+
+    sidx=`wc -l < "$applied"`
+    eidx=`expr $sidx - 1`
+else
+    # we're supposed to pop only up to a patch, make sure the patch is
+    # in the series
+
+    eidx=`cat "$applied" | grep -ne "^$patch$" | cut -d: -f 1`
+    if [ -z "$eidx" ]; then
+	die "Patch $patch is not in the series/is not applied"
+    fi
+
+    eidx=`expr $eidx - 1`
+    sidx=`wc -l < "$applied"`
+fi
+
+# make sure that there are no unapplied changes
+# if we are forcing the pop, reset first
+if [ ! -z "$force" ]; then
+    git reset --hard
+elif ! must_commit_first; then
+    die "Uncommited changes detected. Refresh first."
+fi
+
+l=`awk "BEGIN{n=0}(n==$eidx){print \\$0; exit}{n=n+1}END{}" < "$applied"`
+
+pop_many_patches `git rev-parse refs/patches/$branch/$l^` `expr $sidx - $eidx`
+
+p=`get_top`
+[ ! -z "$p" ] && echo "Now at $p." || echo "All patches popped."