chiark / gitweb /
tg import -d: Explicitly specify base dependency of the created branches
authorPetr Baudis <pasky@suse.cz>
Thu, 25 Sep 2008 18:11:38 +0000 (20:11 +0200)
committerPetr Baudis <pasky@suse.cz>
Thu, 25 Sep 2008 18:11:38 +0000 (20:11 +0200)
README
tg-import.sh

diff --git a/README b/README
index 8129f91..35a9f98 100644 (file)
--- a/README
+++ b/README
@@ -417,7 +417,8 @@ tg import
 ~~~~~~~~~
        Import commits within the given revision range into TopGit,
        creating one topic branch per commit, the dependencies forming
-       a linear sequence starting on your current branch.
+       a linear sequence starting on your current branch (or a branch
+       specified by the '-d' parameter).
 
        The branch names are auto-guessed from the commit messages
        and prefixed by t/ by default; use '-p PREFIX' to specify
index 6f8c8da..9f03c3f 100644 (file)
@@ -7,6 +7,7 @@
 branch_prefix=t/
 single=
 ranges=
+basedep=
 
 
 ## Parse options
@@ -14,12 +15,14 @@ ranges=
 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 {[-p PREFIX] RANGE...|-s NAME COMMIT}" >&2
+               echo "Usage: tg [...] import [-d BASE_BRANCH] {[-p PREFIX] RANGE...|-s NAME COMMIT}" >&2
                exit 1;;
        *)
                ranges="$ranges $arg";;
@@ -63,7 +66,8 @@ process_commit()
        commit="$1"
        branch_name="$2"
        info "---- Importing $commit to $branch_name"
-       tg create "$branch_name"
+       tg create "$branch_name" $basedep
+       basedep=
        git cherry-pick --no-commit "$commit"
        get_commit_msg "$commit" > .topmsg
        git add -f .topmsg .topdeps