X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/dd5d92a7eea054973cbfe58987387b5eb788610e..2f80d6c39305c42561d5c3a564cbe48d191ccd5c:/mr?ds=sidebyside

diff --git a/mr b/mr
index 872343b..8de26f8 100755
--- a/mr
+++ b/mr
@@ -20,7 +20,7 @@ B<mr> [options] diff
 
 B<mr> [options] log
 
-B<mr> [options] bootstrap url
+B<mr> [options] bootstrap url [directory]
 
 B<mr> [options] register [repository]
 
@@ -36,7 +36,7 @@ B<mr> [options] remember 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
-repository. It supports any combination of subversion, git, cvs, mecurial,
+repository. It supports any combination of subversion, git, cvs, mercurial,
 bzr and darcs repositories, and support for other revision control systems can
 easily be added.
 
@@ -104,10 +104,16 @@ These commands are also available:
 
 =over 4
 
-=item bootstrap url
+=item bootstrap url [directory]
 
-Causes mr to download the url, save it to a .mrconfig file in the
-current directory, and then check out all repositories listed in it.
+Causes mr to download the url, and use it as a .mrconfig file
+to checkout the repositories listed in it, into the specified directory.
+
+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
+is checked out into the top of the specified directory.
 
 =item list (or ls)
 
@@ -183,39 +189,55 @@ system.
 
 =item -d directory
 
+=item --directory directory
+
 Specifies the topmost directory that B<mr> should work in. The default is
 the current working directory.
 
 =item -c mrconfig
 
+=item --config mrconfig
+
 Use the specified mrconfig file. The default is B<~/.mrconfig>
 
 =item -p
 
+=item --path
+
 Search in the current directory, and its parent directories and use
 the first B<.mrconfig> found, instead of the default B<~/.mrconfig>.
 
 =item -v
 
+=item --verbose
+
 Be verbose.
 
 =item -q
 
+=item --quiet
+
 Be quiet.
 
 =item -s
 
+=item --stats
+
 Expand the statistics line displayed at the end to include information
 about exactly which repositories failed and were skipped, if any.
 
 =item -i
 
+=item --interactive
+
 Interactive mode. If a repository fails to be processed, a subshell will be
 started which you can use to resolve or investigate the problem. Exit the
 subshell to continue the mr run.
 
 =item -n [number]
 
+=item --no-recurse [number]
+
 If no number if specified, just operate on the repository for the current
 directory, do not recurse into deeper repositories.
 
@@ -225,6 +247,8 @@ but not ./src/packages/bar.
 
 =item -j [number]
 
+=item --jobs [number]
+
 Run the specified number of jobs in parallel, or an unlimited number of jobs
 with no number specified. This can greatly speed up operations such as updates.
 It is not recommended for interactive operations.
@@ -235,6 +259,8 @@ a good speedup in updates without loading the machine too much.
 
 =item -t
 
+=item --trust-all
+
 Trust all mrconfig files even if they are not listed in ~/.mrtrust.
 Use with caution.
 
@@ -485,7 +511,7 @@ sub findcommand {
 }
 
 sub action {
-	my ($action, $dir, $topdir, $subdir) = @_;
+	my ($action, $dir, $topdir, $subdir, $force_checkout) = @_;
 	
 	$ENV{MR_CONFIG}=$configfiles{$topdir};
 	my $lib=exists $config{$topdir}{$subdir}{lib} ?
@@ -495,12 +521,14 @@ sub action {
 	$ENV{MR_REPO}=$dir;
 
 	if ($is_checkout) {
-		if (-d $dir) {
-			print "mr $action: $dir already exists, skipping checkout\n" if $verbose;
-			return SKIPPED;
+		if (! $force_checkout) {
+			if (-d $dir) {
+				print "mr $action: $dir already exists, skipping checkout\n" if $verbose;
+				return SKIPPED;
+			}
+	
+			$dir=~s/^(.*)\/[^\/]+\/?$/$1/;
 		}
-
-		$dir=~s/^(.*)\/[^\/]+\/?$/$1/;
 	}
 	elsif ($action =~ /update/) {
 		if (! -d $dir) {
@@ -919,11 +947,11 @@ sub is_trusted_checkout {
 my %loaded;
 sub loadconfig {
 	my $f=shift;
+	my $dir=shift;
 
 	my @toload;
 
 	my $in;
-	my $dir;
 	my $trusted;
 	if (ref $f eq 'GLOB') {
 		$dir="";
@@ -943,10 +971,13 @@ sub loadconfig {
 
 		$trusted=is_trusted_config($absf);
 
-		($dir)=$f=~/^(.*\/)[^\/]+$/;
 		if (! defined $dir) {
-			$dir=".";
+			($dir)=$f=~/^(.*\/)[^\/]+$/;
+			if (! defined $dir) {
+				$dir=".";
+			}
 		}
+
 		$dir=abs_path($dir)."/";
 		
 		if (! exists $configfiles{$dir}) {
@@ -1295,17 +1326,38 @@ sub register {
 
 sub bootstrap {
 	my $url=shift @ARGV;
-
+	my $dir=shift @ARGV || ".";
+	
 	if (! defined $url || ! length $url) {
 		die "mr: bootstrap requires url\n";
 	}
+	
+	# Download the config file to a temporary location.
+	eval q{use File::Temp};
+	die $@ if $@;
+	my $tmpconfig=File::Temp->new();
+	if (system("curl", "-A", "mr", "-s", $url, "-o", $tmpconfig) != 0) {
+		die "mr: download of $url failed\n";
+	}
 
-	if (-e ".mrconfig") {
-		die "mr: .mrconfig file already exists, not overwriting with $url\n";
+	if (! -e $dir) {
+		system("mkdir", "-p", $dir);
 	}
+	chdir($dir) || die "chdir $dir: $!";
 
-	if (system("curl", "-s", $url, "-o", ".mrconfig") != 0) {
-		die "mr: download of $url failed\n";
+	# Special case to handle checkout of the "." repo, which 
+	# would normally be skipped.
+	my $topdir=abs_path(".")."/";
+	my @repo=($topdir, $topdir, ".");
+	loadconfig($tmpconfig, $topdir);
+	record(\@repo, action("checkout", @repo, 1))
+		if exists $config{$topdir}{"."}{"checkout"};
+
+	if (-e ".mrconfig") {
+		print STDERR "mr: .mrconfig file already exists, not overwriting with $url\n";
+	}
+	else {
+		rename($tmpconfig, ".mrconfig") || die "rename: $!";
 	}
 
 	exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout");