mr register: default to registering the current directory

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 96f3a16cbd4f2332194823ae9126dcb1ba16faf6..b65e623f09192d7703d883190e335e7662463f5e 100755 (executable)
--- a/mr
+++ b/mr
@@ -18,7 +18,7 @@ B<mr> [options] diff
 
 B<mr> [options] log
 
-B<mr> [options] register repository
+B<mr> [options] register [repository]
 
 B<mr> [options] config section [parameter=[value] ...]
 
@@ -80,8 +80,9 @@ List the repositories that mr will act on.
 
 =item register
 
-The next parameter is the directory of an existing repository. The
-repository will be registered in the mrconfig file.
+Register an existing repository in the mrconfig file. By default, the
+epository in the current directory is registered, or you can specify a
+directory to register.
 
 =item config
 
@@ -710,13 +711,12 @@ log =                                                     \
                error "unknown repo type"               \
        fi
 register =                                                             \
-       if [ -z "$1" ]; then                                            \
-               error "repository directory not specified"              \
+       if [ -n "$1" ]; then                                            \
+               cd "$1"                                                 \
        fi                                                              \
-       cd "$1"                                                         \
        basedir="$(basename $(pwd))"                                    \
        if [ -d .svn ]; then                                            \
-               url=$(svn info . |                                      \
+               url=$(LANG=C svn info . |                               \
                      grep -i ^URL: | cut -d ' ' -f 2)                  \
                if [ -z "$url" ]; then                                  \
                        error "cannot determine svn url"                \
@@ -724,12 +724,19 @@ register =                                                                \
                echo "Registering svn url: $url"                        \
                mr config "$(pwd)" checkout="svn co $url $basedir"      \
        elif [ -d .git ]; then                                          \
-               url=$(git-config --get remote.origin.url)               \
+               url=$(LANG=C git-config --get remote.origin.url)        \
                if [ -z "$url" ]; then                                  \
                        error "cannot determine git url"                \
                fi                                                      \
                echo "Registering git url: $url"                        \
                mr config "$(pwd)" checkout="git clone $url $basedir"   \
+       elif [ -d .bzr ]; then                                          \
+               url=$(cat .bzr/branch/parent)                           \
+               if [ -z "$url" ]; then                                  \
+                       error "cannot determine bzr url"                \
+               fi                                                      \
+               echo "Registering bzr url: $url"                        \
+               mr config "$(pwd)" checkout="bzr clone $url $basedir"   \
        else                                                            \
                error "unable to register this repo type"               \
        fi