From 19b4e0426d12b36770810e502be86ff2ec1aa6f0 Mon Sep 17 00:00:00 2001 From: Lorenzo Cappelletti Date: Fri, 25 Apr 2014 14:49:20 +0200 Subject: [PATCH 1/1] bootstrap: fix documentation to reflect new capability --- mr | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/mr b/mr index 8601aeb..b606736 100755 --- a/mr +++ b/mr @@ -28,7 +28,7 @@ B [options] grep pattern B [options] run command [param ...] -B [options] bootstrap url [directory] +B [options] bootstrap src [directory] B [options] register [repository] @@ -130,17 +130,34 @@ These commands are also available: =over 4 -=item bootstrap url [directory] +=item bootstrap src [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 retrieve the source C 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 +B understands several types of sources: + +=over 4 + +=item URL for curl + +C may be an URL understood by B. + +=item copy via ssh + +To use B to download, the C may have the form +C. + +=item local file + +You can retrieve the config file by other means and pass its B as C. + +=back The directory will be created if it does not exist. If no directory is specified, the current directory will be used. -If the .mrconfig file includes a repository named ".", that +As a special case, if source C includes a repository named ".", that is checked out into the top of the specified directory. =item list (or ls) @@ -1676,7 +1693,7 @@ sub bootstrap { my $dir=shift @ARGV || "."; if (! defined $url || ! length $url) { - die "mr: bootstrap requires url\n"; + die "mr: bootstrap requires source\n"; } # Retrieve config file. -- 2.39.5