# (c) Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> 2008
# GPLv2
+branch_prefix=t/
+single=
ranges=
+basedep=
## Parse options
while [ -n "$1" ]; do
arg="$1"; shift
case "$arg" in
+ -d)
+ basedep="$1"; shift;;
+ -p)
+ branch_prefix="$1"; shift;;
+ -s)
+ single="$1"; shift;;
-*)
- echo "Usage: tg [...] import RANGE..." >&2
+ echo "Usage: tg [...] import [-d BASE_BRANCH] {[-p PREFIX] RANGE...|-s NAME COMMIT}" >&2
exit 1;;
*)
ranges="$ranges $arg";;
done
+## Make sure our tree is clean
+
+git update-index --ignore-submodules --refresh || exit
+[ -z "$(git diff-index --cached --name-status -r --ignore-submodules HEAD --)" ] ||
+ die "the index is not clean"
+
+
+## Perform import
+
get_commit_msg()
{
commit="$1"
process_commit()
{
commit="$1"
- branch_name=$(get_branch_name "$commit")
- echo "Importing $commit to $branch_name"
- tg create tp/"$branch_name"
- git read-tree "$commit"
+ branch_name="$2"
+ info "---- Importing $commit to $branch_name"
+ tg create "$branch_name" $basedep
+ basedep=
+ git cherry-pick --no-commit "$commit"
get_commit_msg "$commit" > .topmsg
git add -f .topmsg .topdeps
git commit -C "$commit"
+ info "++++ Importing $commit finished"
}
+if [ -n "$single" ]; then
+ process_commit "$ranges" "$single"
+ exit
+fi
+
# nice arg verification stolen from git-format-patch.sh
for revpair in $ranges
do
info "Merged already: $comment"
;;
*)
- process_commit "$rev"
+ process_commit "$rev" "$branch_prefix$(get_branch_name "$rev")"
;;
esac
done