From: Joey Hess Date: Fri, 27 Nov 2009 17:47:46 +0000 (-0500) Subject: bootstrap: Improve stats display. X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/29fed14147b460b1c873afc005ecc99698c97caf?ds=inline bootstrap: Improve stats display. --- diff --git a/debian/changelog b/debian/changelog index a4e84ba..a17308a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mr (0.45) UNRELEASED; urgency=low * Fix pod error. Closes: #558012 + * bootstrap: Improve stats display. -- Joey Hess Wed, 25 Nov 2009 17:27:23 -0500 diff --git a/mr b/mr index f4af3c7..abfbfaa 100755 --- a/mr +++ b/mr @@ -1001,7 +1001,7 @@ sub loadconfig { open($in, "<", $f) || die "mr: open $f: $!\n"; } my @lines=<$in>; - close $in; + close $in unless ref $f eq 'GLOB'; my $section; my $line=0; @@ -1106,6 +1106,13 @@ sub loadconfig { } } +sub startingconfig { + %alias=%config=%configfiles=%knownactions=%loaded=(); + my $datapos=tell(DATA); + loadconfig(\*DATA); + seek(DATA,$datapos,0); # rewind +} + sub modifyconfig { my $f=shift; # the section to modify or add @@ -1362,8 +1369,13 @@ sub bootstrap { move($tmpconfig, ".mrconfig") || die "rename: $!"; } - exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout"); - die "failed to run mr checkout"; + # Load the config file and checkout everything else. + startingconfig(); + loadconfig(".mrconfig"); + dispatch("checkout"); + @skipped=grep { abs_path($_) ne abs_path($topdir) } @skipped; + showstats("bootstrap"); + exitstats(); } # alias expansion and command stemming @@ -1451,28 +1463,32 @@ sub init { $ENV{MR_PATH}=$Bin."/".$Script; }; } + +sub exitstats { + if (@failed) { + exit 1; + } + elsif (! @ok && @skipped) { + exit 1; + } + else { + exit 0; + } +} sub main { getopts(); init(); - loadconfig(\*DATA); + startingconfig(); loadconfig($ENV{MR_CONFIG}); #use Data::Dumper; print Dumper(\%config); my $action=expandaction(shift @ARGV); dispatch($action); - showstats($action); - if (@failed) { - exit 1; - } - elsif (! @ok && @skipped) { - exit 1; - } - else { - exit 0; - } + showstats($action); + exitstats(); } # Finally, some useful actions that mr knows about by default.