vcsh: Fix `vcsh rename`

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index e6b93778e7f928f6eda9aabfc186207b178ec556..c3d90db202277e646d448c7537e0ea7ecd588cbb 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -101,6 +101,7 @@ help() {
    list-tracked-by \\
         <repo>          List files tracked by a repository
    pull                 Pull from all vcsh remotes
+   push                 Push to vcsh remotes
    rename <repo> \\
           <newname>     Rename repository
    run <repo> \\
@@ -234,11 +235,28 @@ pull() {
        hook post-pull
 }
 
+push() {
+       hook pre-push
+       for VCSH_REPO_NAME in $(list); do
+               echo -n "$VCSH_REPO_NAME: "
+               export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
+               use
+               git push
+       done
+       hook post-push
+}
+
 rename() {
        git_dir_exists
        [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
        mv -f "$GIT_DIR" "$GIT_DIR_NEW" || fatal "Could not mv '$GIT_DIR' '$GIT_DIR_NEW'" 52
 
+       # Now that the repository has been renamed, we need to fix up its configuration
+       # Overwrite old name..
+       GIT_DIR="$GIT_DIR_NEW"
+       $VCSH_REPO_NAME="$VCSH_REPO_NAME_NEW"
+       # ..and clobber all old configuration
+       upgrade
 }
 
 run() {
@@ -332,16 +350,18 @@ elif [ "$1" = 'delete' ]           ||
      [ "$1" = 'write-gitignore' ]; then
        [ -z $2 ]                      && fatal "$1: please specify repository to work on" 1
        [ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1
-       [ "$1" = 'run' -a -z "$3" ]    && fatal "$1: please specify a command" 1
+       [ "$1" = 'run'    -a -z "$3" ] && fatal "$1: please specify a command" 1
        export VCSH_COMMAND="$1"
        export VCSH_REPO_NAME="$2"
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
-       [ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_REPO_D/$3.git"
-       [ "$VCSH_COMMAND" = 'run' ] && shift 2
+       [ "$VCSH_COMMAND" = 'rename' ] && { export VCSH_REPO_NAME_NEW="$3";
+                                           export GIT_DIR_NEW="$VCSH_REPO_D/$VCSH_REPO_NAME_NEW.git" }
+       [ "$VCSH_COMMAND" = 'run' ]    && shift 2
        [ "$VCSH_COMMAND" = 'write-gitignore' ]
 elif [ "$1" = 'list' ] ||
      [ "$1" = 'list-tracked' ] ||
-     [ "$1" = 'pull' ]; then
+     [ "$1" = 'pull' ] ||
+     [ "$1" = 'push' ]; then
        export VCSH_COMMAND="$1"
 elif [ -n "$2" ]; then
        export VCSH_COMMAND='run'