Add "locate" command to movein

[gregoa/movein.git] / movein

diff --git a/movein b/movein
index 2fbdd551b9c0660b0be36ed445c83494c9fea8ab..8030ee318869aeee1b6c13561cca5c9551712bbd 100755 (executable)
--- a/movein
+++ b/movein
@@ -34,20 +34,30 @@ SYNOPSIS
   $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
+  $bn exec repository_name command [arg1 arg2...]
 
 COMMANDS
   init 
-      create ~/.mrconfig
+      create ~/.moveinrc, create/update  ~/.mrconfig
 
   ls
   list
-      show a list of repositories
+      show a list of local repositories
+
+  ls-r
+  list-remote
+      show a list of remote repositories
+
+  locate pattern
+      locate which repositories contain files matching pattern
 
   add repository_name
-      checkout the repository from the remote host and add it to
+      checkout one or more repositories from the remote host and add it to
       mr's configuration
 
   new repository_name file1 [file2 file3...]  
@@ -58,11 +68,17 @@ COMMANDS
   login repository_name
       start a subshell in repository_name
 
+  exec repository_name command [arg1 arg2...]
+      execute a command in the context of repository_name, for example:
+        $bn exec myrepo git status
+        $bn exec myrepo git ls-files
+
 EOF
 
     exit 1
 }
 
+[ $# -ge 1 ] || usage
 
 GIT_HOST=git.vireo.org
 REMOTE_REPOS=~/git
@@ -78,16 +94,16 @@ init() {
        usage
     fi
     
-    if [ -e $MRCONFIG ]; then
-       echo $MRCONFIG already exists
-       exit 1
-    fi
-    
     if [ -e $MOVEINRC ]; then
        echo $MOVEINRC already exists
        exit 1
     fi
 
+    if ! which mr > /dev/null; then
+        echo '"mr" not found in the PATH'
+        exit 1
+    fi
+
     echo -n "git server hostname? [git.vireo.org] " 
     read GIT_HOST
     if [ -z "$GIT_HOST" ]; then 
@@ -123,11 +139,7 @@ EOF
        mkdir -p "$LOCAL_REPOS"
     fi
 
-    cat <<END > $MRCONFIG
-[DEFAULT]
-include = cat /usr/share/mr/git-fake-bare
-END
-
+    mr -c "$MRCONFIG" config DEFAULT include="cat /usr/share/mr/git-fake-bare"
     
 }
 
@@ -139,45 +151,71 @@ login() {
     export GIT_DIR="$LOCAL_REPOS/${1}.git"
     export GIT_WORK_TREE="$GIT_DIR/$(git config --get core.worktree)"
 
-    $SHELL -i || :
+    GIT_PS1_SHOWUNTRACKEDFILES= PSMOVEIN="movein:${1}" $SHELL -i || :
 }
 
-add() {
-    if [ $# -ne 1 ]; then 
+execin() {
+    local REPO
+    if [ $# -lt 1 ]; then
        usage
     fi
-    REPO_NAME=$1.git ; shift
-    LOCAL_REPO=$LOCAL_REPOS/$REPO_NAME
-    REPO_URL=ssh://$GIT_HOST/$REMOTE_REPOS/$REPO_NAME
 
-    if [ -e "$LOCAL_REPO" ]; then
-       echo $LOCAL_REPO already exists
-       exit 1
-    else
-       trap "rm -rf $LOCAL_REPO" 0
-       mkdir "$LOCAL_REPO"
-       export GIT_DIR="$LOCAL_REPO"
-       git init --bare
-       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
-       trap - 0
-       cat <<END >> $MRCONFIG
+    REPO=$1;shift
 
-[$LOCAL_REPO]
-checkout = git_fake_bare_checkout '$REPO_URL' '$REPO_NAME' '../../'
-END
+    export GIT_DIR="$LOCAL_REPOS/${REPO}.git"
+    export GIT_WORK_TREE="$GIT_DIR/$(git config --get core.worktree)"
+
+    "$@"
+}
+
+add() {
+    if [ $# -lt 1 ]; then 
+       usage
     fi
 
+    for REPO in "$@"; do
+      REPO_NAME=$REPO.git 
+      LOCAL_REPO=$LOCAL_REPOS/$REPO_NAME
+      REPO_URL=ssh://$GIT_HOST/$REMOTE_REPOS/$REPO_NAME
+      if [ -e "$LOCAL_REPO" ]; then
+          echo $LOCAL_REPO already exists
+          exit 1
+      else
+          trap "rm -rf $LOCAL_REPO" 0
+          mkdir "$LOCAL_REPO"
+          export GIT_DIR="$LOCAL_REPO"
+          git init --bare
+          git remote add origin $REPO_URL
+          git config branch.master.remote origin
+          git config branch.master.merge refs/heads/master
+          git config core.bare false
+          git config core.worktree ../../
+          git config status.showUntrackedFiles no
+          GIT_WORK_TREE="$LOCAL_REPO/../../" git pull
+          trap - 0
+
+          mr -c "$MRCONFIG" config "$LOCAL_REPO" checkout="git_fake_bare_checkout '$REPO_URL' 'REPO_NAME' '../../'"
+      fi
+    done
 }
 
 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
+}
+
+locate() {
+    local REPO
+    for REPO in $($0 list); do
+      (cd /; $0 exec "$REPO" git ls-files | sed -nr "/$1/{s/^/$REPO:/p}")
+    done
+}
+
 new() {
     if [ $# -lt 2 ]; then 
        usage
@@ -207,21 +245,17 @@ new() {
        git remote add origin $REPO_URL
        git config branch.master.remote origin
        git config branch.master.merge refs/heads/master
+       git config core.bare false
        git config core.worktree ../../
-#      git config core.bare false
-#      for file in  ; do 
-       export GIT_WORK_TREE="$PWD"
-           git add "$@"
-#      done
+       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
 
 }
@@ -230,22 +264,34 @@ END
 command=$1 ; shift
 case "$command" in 
     init)
-       init $@
+       init "$@"
        ;;
     add)
-        add $@
+       add "$@"
        ;;
     new)
-        new $@
+       new "$@"
        ;;
     login)
-        login $@
+       login "$@"
+       ;;
+    exec)
+       execin "$@"
        ;;
     ls)
-        list
+       list
        ;;
     list)
-        list
+       list
+       ;;
+    ls-r)
+       listremote
+       ;;
+    list-remote)
+       listremote
+       ;;
+    locate)
+       locate "$@"
        ;;
 
     *)