]> git.madduck.net Git - code/myrepos.git/blobdiff - mr

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / code / myrepos.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix fake-bare worktree checkout
[code/myrepos.git] / mr
diff --git a/mr b/mr
index 357b2d2cba649b96c6d96bc6606ea7036c6ab665..1b73639bd43686bf6cc707cc51df3b51967ee562 100755 (executable)
--- a/mr
+++ b/mr
@@ -30,9 +30,9 @@ B<mr> [options] action [params ...]
 
 B<mr> is a Multiple Repository management tool. It can checkout, update, or
 perform other actions on a set of repositories as if they were one combined
 
 B<mr> is a Multiple Repository management tool. It can checkout, update, or
 perform other actions on a set of repositories as if they were one combined
-respository. It supports any combination of subversion, git, cvs, mecurial and
-bzr repositories, and support for other revision control systems can easily be
-added.
+respository. It supports any combination of subversion, git, cvs, mecurial,
+bzr and darcs repositories, and support for other revision control systems can
+easily be added.
 
 B<mr> cds into and operates on all registered repositories at or below your
 working directory. Or, if you are in a subdirectory of a repository that
 
 B<mr> cds into and operates on all registered repositories at or below your
 working directory. Or, if you are in a subdirectory of a repository that
@@ -563,7 +563,9 @@ sub action { #{{{
                        print "mr $action: $topdir$subdir\n";
                }
                else {
                        print "mr $action: $topdir$subdir\n";
                }
                else {
-                       print "mr $action: $topdir$subdir (in subdir $directory)\n";
+                       my $s=$directory;
+                       $s=~s/^\Q$topdir$subdir\E\/?//;
+                       print "mr $action: $topdir$subdir (in subdir $s)\n";
                }
                my $command="set -e; ".$lib.
                        "my_action(){ $config{$topdir}{$subdir}{$action}\n }; my_action ".
                }
                my $command="set -e; ".$lib.
                        "my_action(){ $config{$topdir}{$subdir}{$action}\n }; my_action ".
@@ -929,15 +931,22 @@ ls = list
 [DEFAULT]
 order = 10
 lib =
 [DEFAULT]
 order = 10
 lib =
+       PWD="$pwd"
        error() {
                echo "mr: $@" >&2
                exit 1
        }
        error() {
                echo "mr: $@" >&2
                exit 1
        }
+       warning() {
+               echo "mr (warning): $@" >&2
+       }
+       info() {
+               echo "mr: $@" >&2
+       }
        hours_since() {
                if [ -z "$1" ] || [ -z "$2" ]; then
                        error "mr: usage: hours_since action num"
                fi
        hours_since() {
                if [ -z "$1" ] || [ -z "$2" ]; then
                        error "mr: usage: hours_since action num"
                fi
-               for dir in .git .svn .bzr CVS .hg; do
+               for dir in .git .svn .bzr CVS .hg _darcs; do
                        if [ -e "$MR_REPO/$dir" ]; then
                                flagfile="$MR_REPO/$dir/.mr_last$1"
                                break
                        if [ -e "$MR_REPO/$dir" ]; then
                                flagfile="$MR_REPO/$dir/.mr_last$1"
                                break
@@ -954,124 +963,206 @@ lib =
                        exit 1
                fi
        }
                        exit 1
                fi
        }
-
-update =
-       if [ -d "$MR_REPO"/.svn ]; then
-               svn update "$@"
-       elif [ -d "$MR_REPO"/.git ]; then
-               if [ -z "$@" ]; then
-                       git pull -t origin master
+       get_git_repo_type()
+       {
+               if [ -d "$1"/.git ] && [ -d "$1"/.git/refs/heads ] &&
+                       [ -d "$1"/.git/objects ] && [ -f "$1"/.git/config ];
+                       then
+                       echo non-bare
+               elif [ -d "$1"/refs/heads ] && [ -d "$1"/refs/tags ] &&
+                       [ -d "$1"/objects ] && [ -f "$1"/config ]; then
+                       local bare
+                       bare="$(GIT_CONFIG="$1"/config git-config --get core.bare)"
+                       case "$bare" in
+                               true) echo bare;;
+                               false) echo fake-bare;;
+                               *) return 255;;
+                       esac
                else
                else
-                       git pull "$@"
+                       return 1
                fi
                fi
-       elif [ -d "$MR_REPO"/.bzr ]; then
-               bzr merge "$@"
-       elif [ -d "$MR_REPO"/CVS ]; then
-               cvs update "$@"
-       elif [ -d "$MR_REPO"/.hg ]; then
-               hg pull "$@" && hg update "$@"
-       else
-               error "unknown repo type"
-       fi
+       }
+       is_git_repo() {
+               get_git_repo_type "$1" >/dev/null
+       }
+       get_repo_type() {
+               if [ -d "$1"/.svn ]; then
+                       echo svn
+               elif is_git_repo "$1"; then
+                       echo git
+               elif [ -d "$1"/.bzr ]; then
+                       echo bzr
+               elif [ -d "$1"/CVS ]; then
+                       echo CVS
+               elif [ -d "$1"/.hg ]; then
+                       echo hg
+               elif [ -d "$1"/_darcs ]; then
+                       echo darcs
+               else
+                       echo unknown
+               fi
+       }
+
+update =
+       case "$(get_repo_type "$MR_REPO")" in
+       svn) svn update "$@";;
+       git)
+               # all this is because of a bug in git-fetch, which requires GIT_DIR set
+               local git_dir_override; git_dir_override=.git
+               case "$(get_git_repo_type "$MR_REPO")" in
+                       fake-bare) git_dir_override="$MR_REPO";;
+               esac
+               args="$@"
+               [ -z "$args" ] && args="-t origin master"
+               eval GIT_DIR="$git_dir_override" git pull "$args"
+               ;;
+       bzr) bzr merge "$@";;
+       CVS) cvs update "$@";;
+       hg) hg pull "$@" && hg update "$@";;
+       darcs) darcs pull -a "$@";;
+       *) error "unknown repo type";;
+       esac
+
 status =
 status =
-       if [ -d "$MR_REPO"/.svn ]; then
-               svn status "$@"
-       elif [ -d "$MR_REPO"/.git ]; then
-               git status "$@" || true
-       elif [ -d "$MR_REPO"/.bzr ]; then
-               bzr status "$@"
-       elif [ -d "$MR_REPO"/CVS ]; then
-               cvs status "$@"
-       elif [ -d "$MR_REPO"/.hg ]; then
-               hg status "$@"
-       else
-               error "unknown repo type"
-       fi
+       case "$(get_repo_type "$MR_REPO")" in
+       svn) svn status "$@";;
+       git) git status "$@" || :;;
+       bzr) bzr status "$@";;
+       CVS) cvs status "$@";;
+       hg) hg status "$@";;
+       darcs) darcs whatsnew -ls "$@";;
+       *) error "unknown repo type";;
+       esac
+
 commit =
 commit =
-       if [ -d "$MR_REPO"/.svn ]; then
-               svn commit "$@"
-       elif [ -d "$MR_REPO"/.git ]; then
+       case "$(get_repo_type "$MR_REPO")" in
+       svn) svn commit "$@";;
+       git)
+               case "$(get_git_repo_type "$MR_REPO")" in
+                       bare) error "cannot commit to bare git repositories";;
+                       fake-bare) error "commit does not work for fake bare git repositories (yet).";;
+               esac
                git commit -a "$@" && git push --all
                git commit -a "$@" && git push --all
-       elif [ -d "$MR_REPO"/.bzr ]; then
-               bzr commit "$@" && bzr push
-       elif [ -d "$MR_REPO"/CVS ]; then
-               cvs commit "$@"
-       elif [ -d "$MR_REPO"/.hg ]; then
-               hg commit -m "$@" && hg push
-       else
-               error "unknown repo type"
-       fi
+               ;;
+       bzr) bzr commit "$@" && bzr push;;
+       CVS) cvs commit "$@";;
+       hg) hg commit -m "$@" && hg push;;
+       darcs) darcs commit -a -m "$@" && darcs push -a;;
+       *) error "unknown repo type";;
+       esac
+
 diff =
 diff =
-       if [ -d "$MR_REPO"/.svn ]; then
-               svn diff "$@"
-       elif [ -d "$MR_REPO"/.git ]; then
+       case "$(get_repo_type "$MR_REPO")" in
+       svn) svn diff "$@";;
+       git)
+               case "$(get_git_repo_type "$MR_REPO")" in
+                       bare) error "cannot diff in bare git repositories";;
+                       fake-bare) error "diff does not work for fake bare git repositories (yet).";;
+               esac
                git diff "$@"
                git diff "$@"
-       elif [ -d "$MR_REPO"/.bzr ]; then
-               bzr diff "$@"
-       elif [ -d "$MR_REPO"/CVS ]; then
-               cvs diff "$@"
-       elif [ -d "$MR_REPO"/.hg ]; then
-               hg diff "$@"
-       else
-               error "unknown repo type"
-       fi
+               ;;
+       bzr) bzr diff "$@";;
+       CVS) cvs diff "$@";;
+       hg) hg diff "$@";;
+       darcs) darcs diff "$@";;
+       *) error "unknown repo type";;
+       esac
+
 log =
 log =
-       if [ -d "$MR_REPO"/.svn ]; then
-               svn log"$@"
-       elif [ -d "$MR_REPO"/.git ]; then
-               git log "$@"
-       elif [ -d "$MR_REPO"/.bzr ]; then
-               bzr log "$@"
-       elif [ -d "$MR_REPO"/CVS ]; then
-               cvs log "$@"
-       elif [ -d "$MR_REPO"/.hg ]; then
-               hg log "$@"
-       else
-               error "unknown repo type"
-       fi
+       case "$(get_repo_type "$MR_REPO")" in
+       svn) svn log"$@";;
+       git) git log "$@";;
+       bzr) bzr log "$@";;
+       CVS) cvs log "$@";;
+       hg) hg log "$@";;
+       darcs) darcs changes "$@";;
+       *) error "unknown repo type";;
+       esac
+
 register =
        if [ -n "$1" ]; then
                cd "$1"
        fi
 register =
        if [ -n "$1" ]; then
                cd "$1"
        fi
-       basedir="$(basename $(pwd))"
-       if [ -d .svn ]; then
+       basedir="${PWD##*/}"
+       case "$(get_repo_type .)" in
+       svn)
                url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
                if [ -z "$url" ]; then
                        error "cannot determine svn url"
                fi
                echo "Registering svn url: $url in $MR_CONFIG"
                url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
                if [ -z "$url" ]; then
                        error "cannot determine svn url"
                fi
                echo "Registering svn url: $url in $MR_CONFIG"
-               mr -c "$MR_CONFIG" config "$(pwd)" checkout="svn co $url $basedir"
-       elif [ -d .git ]; then
-               url=$(LANG=C git-config --get remote.origin.url)
+               mr -c "$MR_CONFIG" config "$PWD" checkout="svn co $url $basedir"
+               ;;
+       git)
+               local repo_type; repo_type="$(get_git_repo_type .)"
+               local config;
+               case "$repo_type" in
+                       non-bare) config=.git/config;;
+                       bare|fake-bare) config=config;;
+               esac
+               url="$(LANG=C GIT_CONFIG="$config" git-config --get remote.origin.url)" || :
                if [ -z "$url" ]; then
                        error "cannot determine git url"
                fi
                if [ -z "$url" ]; then
                        error "cannot determine git url"
                fi
-               echo "Registering git url: $url in $MR_CONFIG"
-               mr -c "$MR_CONFIG" config "$(pwd)" checkout="git clone $url $basedir"
-       elif [ -d .bzr ]; then
+               set -x
+               local clone_opts add_cmd work_tree suffix
+               case "$repo_type" in
+                       fake-bare)
+                               # this seems like a fake bare repo and needs a worktree
+                               work_tree="$(git-config --get core.worktree)" || :
+                               work_tree="${work_tree%%/}/"
+                               if [ ! -d "$work_tree" ]; then
+                                       error "git worktree '$work_tree' does not exist"
+                               fi
+                               clone_opts=" --no-checkout"
+                               add_cmd="$add_cmd && cd $basedir"
+                               add_cmd="$add_cmd && git read-tree HEAD"
+                               add_cmd="$add_cmd && git checkout-index -a --prefix='$work_tree' || :"
+                               add_cmd="$add_cmd; git config core.worktree '$work_tree'"
+                               add_cmd="$add_cmd && mv .git/* . && rmdir .git"
+                               suffix=" (with worktree $work_tree)"
+                               ;;
+                       bare)
+                               clone_opts=" --bare"
+                               suffix=" (bare repository)"
+                               ;;
+               esac
+               echo "Registering git url: $url in $MR_CONFIG${suffix:-}"
+               mr -c "$MR_CONFIG" config "$PWD" checkout="git clone${clone_opts:-} $url $basedir${add_cmd:-}"
+               ;;
+       bzr)
                url=$(cat .bzr/branch/parent)
                if [ -z "$url" ]; then
                        error "cannot determine bzr url"
                fi
                echo "Registering bzr url: $url in $MR_CONFIG"
                url=$(cat .bzr/branch/parent)
                if [ -z "$url" ]; then
                        error "cannot determine bzr url"
                fi
                echo "Registering bzr url: $url in $MR_CONFIG"
-               mr -c "$MR_CONFIG" config "$(pwd)" checkout="bzr clone $url $basedir"
-       elif [ -d CVS ]; then
+               mr -c "$MR_CONFIG" config "$PWD" checkout="bzr clone $url $basedir"
+               ;;
+       CVS)
                repo=$(cat CVS/Repository)
                root=$(cat CVS/Root)
                if [ -z "$root" ]; then
                        error "cannot determine cvs root"
                fi
                echo "Registering cvs repository $repo at root $root"
                repo=$(cat CVS/Repository)
                root=$(cat CVS/Root)
                if [ -z "$root" ]; then
                        error "cannot determine cvs root"
                fi
                echo "Registering cvs repository $repo at root $root"
-               mr -c "$MR_CONFIG" config "$(pwd)" \
+               mr -c "$MR_CONFIG" config "$PWD" \
                        checkout="cvs -d '$root' co -d $basedir $repo"
                        checkout="cvs -d '$root' co -d $basedir $repo"
-       elif [ -d .hg ]; then
+               ;;
+       hg)
                url=$(hg showconfig paths.default)
                echo "Registering mercurial repo url: $url in $MR_CONFIG"
                url=$(hg showconfig paths.default)
                echo "Registering mercurial repo url: $url in $MR_CONFIG"
-               mr -c "$MR_CONFIG" config "$(pwd)" \
+               mr -c "$MR_CONFIG" config "$PWD" \
                        checkout="hg clone $url $basedir"
                        checkout="hg clone $url $basedir"
-       else
-               error "unable to register this repo type"
-       fi
+               ;;
+       darcs)
+               url=$(cat _darcs/prefs/defaultrepo)
+               echo "Registering darcs repository $url in $MR_CONFIG"
+               mr -c "$MR_CONFIG" config "$PWD" \
+                       checkout="darcs get $url $basedir"
+               ;;
+       *) error "unable to register this repo type";;
+       esac
+
 help =
        if [ ! -e "$MR_PATH" ]; then
                error "cannot find program path"
 help =
        if [ ! -e "$MR_PATH" ]; then
                error "cannot find program path"
@@ -1084,3 +1175,5 @@ ed = echo "A horse is a horse, of course, of course.."
 T = echo "I pity the fool."
 right = echo "Not found."
 #}}}
 T = echo "I pity the fool."
 right = echo "Not found."
 #}}}
+
+# vim:sw=8:sts=0:ts=8:noet
hacking on myrepos

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.