renaming

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 6fc5d576cb1582a224e5c60eab2402ca597d2566..435fabbf77853205e631a35a57f21a40ab9f2755 100755 (executable)
--- a/mr
+++ b/mr
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
 
 =head1 NAME
 

-mr - a Multiple Repository management tool
+mr - a tool to manage all your version control repos

 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 


@@ -16,6 +16,8 @@ B<mr> [options] commit [-m "message"]
 
 B<mr> [options] record [-m "message"]
 
 
 B<mr> [options] record [-m "message"]
 

+B<mr> [options] fetch
+

 B<mr> [options] push
 
 B<mr> [options] diff
 B<mr> [options] push
 
 B<mr> [options] diff


@@ -38,11 +40,11 @@ B<mr> [options] remember action [params ...]
 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 

-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
-repository. It supports any combination of subversion, git, cvs, mercurial,
-bzr, darcs, fossil and veracity repositories, and support for other version
-control systems can easily be added.
+B<mr> is a tool to manage all your version control repos. It can checkout,
+update, or perform other actions on a set of repositories as if they were
+one combined repository. It supports any combination of subversion, git,
+cvs, mercurial, bzr, darcs, fossil and veracity repositories, and support
+for other version 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


@@ -73,7 +75,8 @@ If a repository isn't checked out yet, it will first check it out.
 =item status
 
 Displays a status report for each repository, showing what
 =item status
 
 Displays a status report for each repository, showing what

-uncommitted changes are present in the repository.
+uncommitted changes are present in the repository. For distributed version
+control systems, also shows unpushed local branches.

 
 =item commit (or ci)
 
 
 =item commit (or ci)
 


@@ -91,6 +94,12 @@ remote repository. Only supported for distributed version control systems.
 
 The optional -m parameter allows specifying a commit message.
 
 
 The optional -m parameter allows specifying a commit message.
 

+=item fetch
+
+Fetches from each repository's remote repository, but does not
+update the working copy. Only supported for some distributed version
+control systems.
+

 =item push
 
 Pushes committed local changes to the remote repository. A no-op for
 =item push
 
 Pushes committed local changes to the remote repository. A no-op for


@@ -116,8 +125,10 @@ These commands are also available:
 
 =item bootstrap url [directory]
 
 
 =item bootstrap url [directory]
 

-Causes mr to download the url, and use it as a .mrconfig file
-to checkout the repositories listed in it, into the specified directory.
+Causes mr to download the url, and use it as a .mrconfig file to checkout
+the repositories listed in it, into the specified directory.
+
+To use scp to download, the url may have the form ssh://[user@]host:file

 
 The directory will be created if it does not exist. If no directory is
 specified, the current directory will be used.
 
 The directory will be created if it does not exist. If no directory is
 specified, the current directory will be used.


@@ -1661,11 +1672,18 @@ sub bootstrap {
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();

-       my @curlargs = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);
-       push(@curlargs, "-k") if $insecure;
-       my $curlstatus = system(@curlargs);
-       die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n" if $curlstatus >> 8 == 60;
-       die "mr bootstrap: download of $url failed\n" if $curlstatus != 0;
+       my @downloader;
+       if ($url =~ m!^ssh://(.*)!) {
+               @downloader = ("scp", $1, $tmpconfig);
+       }
+       else {
+               @downloader = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);
+               push(@downloader, "-k") if $insecure;
+       }
+       my $status = system(@downloader);
+       die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n"
+               if $downloader[0] eq 'curl' && $status >> 8 == 60;
+       die "mr bootstrap: download of $url failed\n" if $status != 0;

 
        if (! -e $dir) {
                system("mkdir", "-p", $dir);
 
        if (! -e $dir) {
                system("mkdir", "-p", $dir);


@@ -1890,21 +1908,26 @@ bzr_update =
        else
                bzr merge --pull "$@"
        fi
        else
                bzr merge --pull "$@"
        fi

-cvs_update = cvs update "$@"
+cvs_update = cvs -q update "$@"

 hg_update  = hg pull "$@"; hg update "$@"
 darcs_update = darcs pull -a "$@"
 fossil_update = fossil pull "$@"
 vcsh_update = vcsh run "$MR_REPO" git pull "$@"
 veracity_update = vv pull "$@" && vv update "$@"
 
 hg_update  = hg pull "$@"; hg update "$@"
 darcs_update = darcs pull -a "$@"
 fossil_update = fossil pull "$@"
 vcsh_update = vcsh run "$MR_REPO" git pull "$@"
 veracity_update = vv pull "$@" && vv update "$@"
 

+git_fetch = git fetch --all --prune --tags
+git_svn_fetch = git svn fetch
+darcs_fetch = darcs fetch
+hg_fetch = hg pull
+

 svn_status = svn status "$@"
 svn_status = svn status "$@"

-git_status = git status -s "$@" || true
-bzr_status = bzr status --short "$@"
-cvs_status = cvs status "$@"
-hg_status  = hg status "$@"
+git_status = git status -s "$@" || true; git --no-pager log --branches --not --remotes --simplify-by-decoration --decorate --oneline || true
+bzr_status = bzr status --short "$@"; bzr missing
+cvs_status = cvs -q status | grep -E '^(File:.*Status:|\?)' | grep -v 'Status: Up-to-date'
+hg_status  = hg status "$@"; hg summary --quiet | grep -v 'parent: 0:'

 darcs_status = darcs whatsnew -ls "$@" || true
 fossil_status = fossil changes "$@"
 darcs_status = darcs whatsnew -ls "$@" || true
 fossil_status = fossil changes "$@"

-vcsh_status = cd $(vcsh run "$MR_REPO" git config --get core.worktree); vcsh run "$MR_REPO" git status -s "$@" || true
+vcsh_status = vcsh run "$MR_REPO" git -c status.relativePaths=false status -s "$@" || true

 veracity_status = vv status "$@"
 
 svn_commit = svn commit "$@"
 veracity_status = vv status "$@"
 
 svn_commit = svn commit "$@"


@@ -1916,11 +1939,11 @@ bzr_commit =
                bzr commit "$@" && bzr push
        fi
 cvs_commit = cvs commit "$@"
                bzr commit "$@" && bzr push
        fi
 cvs_commit = cvs commit "$@"

-hg_commit  = hg commit -m "$@" && hg push
-darcs_commit = darcs record -a -m "$@" && darcs push -a
+hg_commit  = hg commit "$@" && hg push
+darcs_commit = darcs record -a "$@" && darcs push -a

 fossil_commit = fossil commit "$@"
 vcsh_commit = vcsh run "$MR_REPO" git commit -a "$@" && vcsh run "$MR_REPO" git push --all
 fossil_commit = fossil commit "$@"
 vcsh_commit = vcsh run "$MR_REPO" git commit -a "$@" && vcsh run "$MR_REPO" git push --all

-veracity_commit = vv commit -m "@" && vv push
+veracity_commit = vv commit "$@" && vv push

 
 git_record = git commit -a "$@"
 bzr_record =
 
 git_record = git commit -a "$@"
 bzr_record =


@@ -1929,11 +1952,11 @@ bzr_record =
        else
                bzr commit "$@"
        fi
        else
                bzr commit "$@"
        fi

-hg_record  = hg commit -m "$@"
-darcs_record = darcs record -a -m "$@"
+hg_record  = hg commit "$@"
+darcs_record = darcs record -a "$@"

 fossil_record = fossil commit "$@"
 vcsh_record = vcsh run "$MR_REPO" git commit -a "$@"
 fossil_record = fossil commit "$@"
 vcsh_record = vcsh run "$MR_REPO" git commit -a "$@"

-veracity_record = vv commit -m "@"
+veracity_record = vv commit "$@"

 
 svn_push = :
 git_push = git push "$@"
 
 svn_push = :
 git_push = git push "$@"


@@ -1948,7 +1971,7 @@ veracity_push = vv push "$@"
 svn_diff = svn diff "$@"
 git_diff = git diff "$@"
 bzr_diff = bzr diff "$@"
 svn_diff = svn diff "$@"
 git_diff = git diff "$@"
 bzr_diff = bzr diff "$@"

-cvs_diff = cvs diff "$@"
+cvs_diff = cvs -q diff "$@"

 hg_diff  = hg diff "$@"
 darcs_diff = darcs diff -u "$@"
 fossil_diff = fossil diff "$@"
 hg_diff  = hg diff "$@"
 darcs_diff = darcs diff -u "$@"
 fossil_diff = fossil diff "$@"


@@ -1966,6 +1989,13 @@ fossil_log = fossil timeline "$@"
 vcsh_log = vcsh run "$MR_REPO" git log "$@"
 veracity_log = vv log "$@"
 
 vcsh_log = vcsh run "$MR_REPO" git log "$@"
 veracity_log = vv log "$@"
 

+hg_grep = hg grep "$@"
+cvs_grep = ack-grep "$@"
+svn_grep = ack-grep "$@"
+git_svn_grep = git grep "$@"
+git_grep = git grep "$@"
+bzr_grep = ack-grep "$@"
+

 run = "$@"
 
 svn_register =
 run = "$@"
 
 svn_register =


@@ -1983,7 +2013,7 @@ git_register =
        echo "Registering git url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =
        echo "Registering git url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =

-       url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}'`"
+       url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}' | head -n 1`"

        if [ -z "$url" ]; then
                error "cannot determine bzr url"
        fi
        if [ -z "$url" ]; then
                error "cannot determine bzr url"
        fi