# 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.
-
+# USA.
set -e
+set -u
usage() {
bn=$(basename $0)
$bn exec repository_name command [arg1 arg2...]
COMMANDS
- init
+ init
create ~/.moveinrc, create/update ~/.mrconfig
ls
checkout one or more repositories from the remote host and add it to
mr's configuration
- new repository_name file1 [file2 file3...]
+ new repository_name file1 [file2 file3...]
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
[ $# -ge 1 ] || usage
-GIT_HOST=git.vireo.org
+GIT_HOST=git.$(hostname -d)
REMOTE_REPOS=~/git
LOCAL_REPOS=~/.movein
MRCONFIG=~/.mrconfig
init() {
- if [ $# -ne 0 ]; then
- usage
- fi
-
- if [ -e $MOVEINRC ]; then
- echo $MOVEINRC already exists
- exit 1
+ if [ $# -ne 0 ]; then
+ usage
fi
- if ! which mr > /dev/null; then
- echo '"mr" not found in the PATH'
+ if [ -e $MOVEINRC ]; then
+ echo $MOVEINRC already exists
exit 1
fi
- echo -n "git server hostname? [git.vireo.org] "
+ echo -n "git server hostname? [${GIT_HOST}] "
read GIT_HOST
- if [ -z "$GIT_HOST" ]; then
- GIT_HOST=git.vireo.org
+ if [ -z "$GIT_HOST" ]; then
+ GIT_HOST=git.$(hostname -d)
fi
- echo -n "path to remote repositories? [~/git] "
+ echo -n "path to remote repositories? [~/git] "
read REMOTE_REPOS
- if [ -z "$REMOTE_REPOS" ]; then
- REMOTE_REPOS=~/git
+ if [ -z "$REMOTE_REPOS" ]; then
+ REMOTE_REPOS=~/git
fi
- echo -n "Local repository directory? [~/.movein] "
+ echo -n "Local repository directory? [~/.movein] "
read LOCAL_REPOS
- if [ -z "$LOCAL_REPOS" ]; then
- LOCAL_REPOS=~/.movein
+ if [ -z "$LOCAL_REPOS" ]; then
+ LOCAL_REPOS=~/.movein
fi
- echo -n "Location of .mrconfig file? [~/.mrconfig] "
+ echo -n "Location of .mrconfig file? [~/.mrconfig] "
read MRCONFIG
- if [ -z "$MRCONFIG" ]; then
- MRCONFIG=~/.mrconfig
+ if [ -z "$MRCONFIG" ]; then
+ MRCONFIG=~/.mrconfig
fi
cat <<EOF > $MOVEINRC
MRCONFIG=$MRCONFIG
EOF
- if [ ! -d "$LOCAL_REPOS" ]; then
- mkdir -p "$LOCAL_REPOS"
+ 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
+ if [ $# -ne 1 ]; then
+ usage
fi
export GIT_DIR="$LOCAL_REPOS/${1}.git"
execin() {
local REPO
- if [ $# -lt 1 ]; then
- usage
+ if [ $# -lt 2 ]; then
+ usage
fi
REPO=$1;shift
}
add() {
- if [ $# -lt 1 ]; then
- usage
+ 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
+ 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
}
locate() {
local REPO
for REPO in $($0 list); do
- (cd /; $0 exec "$REPO" git ls-files | sed -nr "/$1/{s/^/$REPO:/p}")
+ (cd /; $0 exec "$REPO" git ls-files | sed -nr "/$1/{s/^/$REPO:/p}")
done
}
new() {
- if [ $# -lt 2 ]; then
- usage
+ if [ $# -lt 2 ]; 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 "$1" ]; then
- echo $1 not found
- exit 1
+ echo $1 not found
+ exit 1
fi
if [ -e "$LOCAL_REPO" ]; then
- echo $LOCAL_REPO already exists
- exit 1
+ echo $LOCAL_REPO already exists
+ exit 1
else
- trap "rm -rf $LOCAL_REPO" 0
- mkdir -p "$LOCAL_REPO"
+ trap "rm -rf $LOCAL_REPO" 0
+ mkdir -p "$LOCAL_REPO"
- ssh $GIT_HOST "
- GIT_DIR=$REMOTE_REPOS/$REPO_NAME git --bare init
+ ssh $GIT_HOST "
+ GIT_DIR=$REMOTE_REPOS/$REPO_NAME git --bare init
" </dev/null
- 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
- export GIT_WORK_TREE="$LOCAL_REPO/../../"
- git add "$@"
- git commit -m "initial checkin"
- git push --all
-
- trap - 0
-
- mr -c "$MRCONFIG" config "$LOCAL_REPO" checkout="git_fake_bare_checkout '$REPO_URL' 'REPO_NAME' '../../'"
+ 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
+ export GIT_WORK_TREE="$LOCAL_REPO/../../"
+ git add "$@"
+ git commit -m "initial checkin"
+ git push --all
+
+ trap - 0
+
+ mr -c "$MRCONFIG" config "$LOCAL_REPO" checkout="git_fake_bare_checkout '$REPO_URL' 'REPO_NAME' '../../'"
fi
}
+preflight() {
+ # Check a few requirements before doing any work
+ errors=0
+ set +e
+ for binary in mr git; do
+ bin=$(which ${binary})
+ if [ -z "${bin}" ]; then
+ echo "Missing required program: ${binary}"
+ errors=$(( errors + 1 ))
+ fi
+ done
+ set -e
+ if [ $errors -ne 0 ]; then
+ echo "Errors found, exiting"
+ exit 2
+ fi
+}
+
+if [ $# -lt 1 ]; then
+ usage
+ exit 1
+fi
command=$1 ; shift
-case "$command" in
+case "$command" in
init)
- init "$@"
- ;;
+ preflight
+ init "$@"
+ ;;
add)
- add "$@"
- ;;
+ preflight
+ add "$@"
+ ;;
new)
- new "$@"
- ;;
+ preflight
+ new "$@"
+ ;;
login)
- login "$@"
- ;;
+ login "$@"
+ ;;
exec)
- execin "$@"
- ;;
+ execin "$@"
+ ;;
ls)
- list
- ;;
+ list
+ ;;
list)
- list
- ;;
+ list
+ ;;
ls-r)
- listremote
- ;;
+ listremote
+ ;;
list-remote)
- listremote
- ;;
+ listremote
+ ;;
locate)
- locate "$@"
- ;;
+ locate "$@"
+ ;;
*)
- usage
- exit 1
- ;;
+ usage
+ exit 1
+ ;;
esac
ToastFreeware / gregoa / movein.git / blobdiff