]> 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
Add info() and warning() akin to error()
[code/myrepos.git] / mr
diff --git a/mr b/mr
index c646a3bbbcc2b49c8f06e579285dc80648a2d7b1..a8d864fd5bc2b04440146df2456418892e422ed0 100755 (executable)
--- a/mr
+++ b/mr
@@ -931,10 +931,17 @@ 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"
        hours_since() {
                if [ -z "$1" ] || [ -z "$2" ]; then
                        error "mr: usage: hours_since action num"
@@ -978,11 +985,28 @@ lib =
        is_git_repo() {
                get_git_repo_type "$1" >/dev/null
        }
        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 =
 
 update =
-       if [ -d "$MR_REPO"/.svn ]; then
-               svn update "$@"
-       elif is_git_repo "$MR_REPO"; then
+       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
                # 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
@@ -991,108 +1015,90 @@ update =
                args="$@"
                [ -z "$args" ] && args="-t origin master"
                eval GIT_DIR="$git_dir_override" git pull "$args"
                args="$@"
                [ -z "$args" ] && args="-t origin master"
                eval GIT_DIR="$git_dir_override" git pull "$args"
-       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 "$@"
-       elif [ -d "$MR_REPO"/_darcs ]; then
-               darcs pull -a "$@"
-       else
-               error "unknown repo type"
-       fi
+               ;;
+       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 is_git_repo "$MR_REPO"; 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 "$@"
-       elif [ -d "$MR_REPO"/_darcs ]; then
-               darcs whatsnew -ls "$@"
-       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 is_git_repo "$MR_REPO"; 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
                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
-       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
-       elif [ -d "$MR_REPO"/_darcs ]; then
-               darcs commit -a -m "$@" && darcs push -a
-       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 is_git_repo "$MR_REPO"; 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 "$@"
                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 "$@"
-       elif [ -d "$MR_REPO"/.bzr ]; then
-               bzr diff "$@"
-       elif [ -d "$MR_REPO"/CVS ]; then
-               cvs diff "$@"
-       elif [ -d "$MR_REPO"/.hg ]; then
-               hg diff "$@"
-       elif [ -d "$MR_REPO"/_darcs ]; then
-               darcs 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 is_git_repo "$MR_REPO"; 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 "$@"
-       elif [ -d "$MR_REPO"/_darcs ]; then
-               darcs changes "$@"
-       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="$(basename $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 is_git_repo .; then
+               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;;
                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;;
-                       *) error "unknown git repository type: $repo_type"
                esac
                url="$(LANG=C GIT_CONFIG="$config" git-config --get remote.origin.url)"
                if [ -z "$url" ]; then
                esac
                url="$(LANG=C GIT_CONFIG="$config" git-config --get remote.origin.url)"
                if [ -z "$url" ]; then
@@ -1108,41 +1114,46 @@ register =
                                        error "git worktree $work_tree does not exist"
                                fi
                                suffix=" (with worktree $work_tree)"
                                        error "git worktree $work_tree does not exist"
                                fi
                                suffix=" (with worktree $work_tree)"
-                               mr -c "$MR_CONFIG" config "$(pwd)" \
+                               mr -c "$MR_CONFIG" config "$PWD" \
                                        lib="GIT_WORK_TREE=$work_tree; export GIT_WORK_TREE"
                                ;;
                esac
                echo "Registering git url: $url in $MR_CONFIG${suffix:-}"
                                        lib="GIT_WORK_TREE=$work_tree; export GIT_WORK_TREE"
                                ;;
                esac
                echo "Registering git url: $url in $MR_CONFIG${suffix:-}"
-               mr -c "$MR_CONFIG" config "$(pwd)" checkout="git clone $url $basedir"
-       elif [ -d .bzr ]; then
+               mr -c "$MR_CONFIG" config "$PWD" checkout="git clone $url $basedir"
+               ;;
+       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"
-       elif [ -d _darcs ]; then
+               ;;
+       darcs)
                url=$(cat _darcs/prefs/defaultrepo)
                echo "Registering darcs repository $url in $MR_CONFIG"
                url=$(cat _darcs/prefs/defaultrepo)
                echo "Registering darcs repository $url in $MR_CONFIG"
-               mr -c "$MR_CONFIG" config "$(pwd)" \
+               mr -c "$MR_CONFIG" config "$PWD" \
                        checkout="darcs get $url $basedir"
                        checkout="darcs get $url $basedir"
-       else
-               error "unable to register this repo type"
-       fi
+               ;;
+       *) 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"
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.