Add a ls-r / list-remote command.

[gregoa/movein.git] / movein

diff --git a/movein b/movein
index a8f19433284796e7d9afa1943795812aec404487..3e21387de67ee844fadaa76fd8b972a57e479484 100755 (executable)
--- a/movein
+++ b/movein
@@ -1,14 +1,29 @@
 #!/bin/sh
 #
 # Copyright © 2008 Mike O'Connor <stew@vireo.org>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any
+# later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.  
 
-set -e
 
+set -e
 
 usage() {
     bn=$(basename $0)
     cat <<EOF
-$0: manage .mrconfig
+$0: manage home directory using mr
 
 NAME
   $bn - a command to manage detached git repositories using mr
@@ -17,12 +32,25 @@ SYNOPSIS
   $bn command [options]
 
   $bn init
+  $bn ls
+  $bn list
+  $bn ls-r
+  $bn list-remote
   $bn add repository_name
   $bn new repository_name file1 [file2 file3...]
+  $bn login repository_name
 
 COMMANDS
   init 
-      create .mrconfig  
+      create ~/.moveinrc, create/update  ~/.mrconfig
+
+  ls
+  list
+      show a list of local repositories
+
+  ls-r
+  list-remote
+      show a list of remote repositories
 
   add repository_name
       checkout the repository from the remote host and add it to
@@ -32,16 +60,23 @@ COMMANDS
       create a new repository on the remote host, and checkin the
       listed files to the new repository.   Add the new repository
       to mr's configuration
+
+  login repository_name
+      start a subshell in repository_name
+
 EOF
 
     exit 1
 }
 
 
-GIT_HOST=flounder.vireo.org
+GIT_HOST=git.vireo.org
 REMOTE_REPOS=~/git
-LOCAL_REPOS=.fgits
+LOCAL_REPOS=~/.movein
+MRCONFIG=~/.mrconfig
+MOVEINRC=~/.moveinrc
 
+[ -e "$MOVEINRC" ] && . "$MOVEINRC"
 
 init() {
 
@@ -49,18 +84,60 @@ init() {
        usage
     fi
     
-    if [ -e .mrconfig ]; then
-       echo .mrconfig already exists
+    if [ -e $MOVEINRC ]; then
+       echo $MOVEINRC already exists
        exit 1
     fi
 
-    mkdir $LOCAL_REPOS
-    cat <<END > .mrconfig
-[DEFAULT]
-include = cat /usr/share/mr/git-fake-bare
-END
+    echo -n "git server hostname? [git.vireo.org] " 
+    read GIT_HOST
+    if [ -z "$GIT_HOST" ]; then 
+       GIT_HOST=git.vireo.org
+    fi
+
+    echo -n "path to remote repositories? [~/git] " 
+    read REMOTE_REPOS
+    if [ -z "$REMOTE_REPOS" ]; then 
+       REMOTE_REPOS=~/git
+    fi
+
+    echo -n "Local repository directory? [~/.movein] " 
+    read LOCAL_REPOS
+    if [ -z "$LOCAL_REPOS" ]; then 
+       LOCAL_REPOS=~/.movein
+    fi
+
+    echo -n "Location of .mrconfig file? [~/.mrconfig] " 
+    read MRCONFIG
+    if [ -z "$MRCONFIG" ]; then 
+       MRCONFIG=~/.mrconfig
+    fi
+
+    cat <<EOF > $MOVEINRC
+GIT_HOST=$GIT_HOST
+REMOTE_REPOS=$REMOTE_REPOS
+LOCAL_REPOS=$LOCAL_REPOS
+MRCONFIG=$MRCONFIG
+EOF
+
+    if [ ! -d "$LOCAL_REPOS" ]; then 
+       mkdir -p "$LOCAL_REPOS"
+    fi
+
+    mr -c "$MRCONFIG" config DEFAULT include="cat /usr/share/mr/git-fake-bare"
+    
 }
 
+login() {
+    if [ $# -ne 1 ]; then 
+       usage
+    fi
+
+    export GIT_DIR="$LOCAL_REPOS/${1}.git"
+    export GIT_WORK_TREE="$GIT_DIR/$(git config --get core.worktree)"
+
+    GIT_PS1_SHOWUNTRACKEDFILES= PSMOVEIN="movein:${1}" $SHELL -i || :
+}
 
 add() {
     if [ $# -ne 1 ]; then 
@@ -81,17 +158,24 @@ add() {
        git remote add origin $REPO_URL
        git config branch.master.remote origin
        git config branch.master.merge refs/heads/master
-       git config core.worktree ../../
        git config core.bare false
-       GIT_WORK_TREE="$PWD" git pull
+       git config core.worktree ../../
+       git config status.showUntrackedFiles no
+       GIT_WORK_TREE="$LOCAL_REPO/../../" git pull
        trap - 0
-       cat <<END >> .mrconfig
 
-[$LOCAL_REPO]
-checkout = git_fake_bare_checkout '$REPO_URL' '$REPO_NAME' '../../'
-END
+       mr -c "$MRCONFIG" config "$LOCAL_REPO" checkout="git_fake_bare_checkout '$REPO_URL' 'REPO_NAME' '../../'"
     fi
+}
+
+list() {
+    find "${LOCAL_REPOS}" -mindepth 1 -maxdepth 1 -type d | sed 's,^.*/\([^/]*\).git$,\1,'
+}
 
+listremote() {
+    ssh $GIT_HOST "
+        find '${REMOTE_REPOS}' -mindepth 1 -maxdepth 1 -type d | sed 's,^.*/\([^/]*\).git$,\1,'
+    " </dev/null
 }
 
 new() {
@@ -123,34 +207,51 @@ new() {
        git remote add origin $REPO_URL
        git config branch.master.remote origin
        git config branch.master.merge refs/heads/master
-       git config core.worktree ../../
        git config core.bare false
-#      for file in  ; do 
-       export GIT_WORK_TREE="$PWD"
-           git add "$@"
-#      done
+       git config core.worktree ../../
+       git config status.showUntrackedFiles no
+       export GIT_WORK_TREE="$LOCAL_REPO/../../"
+       git add "$@"
        git commit -m "initial checkin"
        git push --all
        
        trap - 0
-       cat <<END >> .mrconfig
 
-[$LOCAL_REPO]
-checkout = git_fake_bare_checkout '$REPO_URL' '$REPO_NAME' '../../'
-END
+       mr -c "$MRCONFIG" config "$LOCAL_REPO" checkout="git_fake_bare_checkout '$REPO_URL' 'REPO_NAME' '../../'"
     fi
 
 }
 
+
 command=$1 ; shift
 case "$command" in 
     init)
        init $@
        ;;
     add)
-        add $@
+       add $@
        ;;
     new)
-        new $@
+       new $@
+       ;;
+    login)
+       login $@
+       ;;
+    ls)
+       list
+       ;;
+    list)
+       list
+       ;;
+    ls-r)
+       listremote
+       ;;
+    list-remote)
+       listremote
+       ;;
+
+    *)
+       usage
+       exit 1
        ;;
-esac
\ No newline at end of file
+esac