Man page typo. Closes: #545412

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 0c34e46c0c62fe61135e2591a1adbed8a5b52a32..91eb151c909f5318f7de4f1464e9dca99ff5e95c 100755 (executable)
--- a/mr
+++ b/mr
@@ -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.
 
@@ -183,39 +183,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 +241,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.
@@ -233,6 +251,13 @@ Note that running more than 10 jobs at a time is likely to run afoul of
 ssh connection limits. Running between 3 and 5 jobs at a time will yield
 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.
+
 =back
 
 =head1 "MRCONFIG FILES"
@@ -357,10 +382,11 @@ present, mr assumes it is in offline mode.
 Since mrconfig files can contain arbitrary shell commands, they can do
 anything. This flexability is good, but it also allows a malicious mrconfig
 file to delete your whole home directory. Such a file might be contained
-inside a repository that your main ~/.mrconfig checks out. To avoid worries
-about a malicious change being committed to such a file, mr has the ability
-to read mrconfig files in untrusted mode. Such files are limited to running
-only known safe commands (like "git clone").
+inside a repository that your main ~/.mrconfig checks out and chains to. To
+avoid worries about evil commands in a mrconfig file, mr
+has the ability to read mrconfig files in untrusted mode. Such files are
+limited to running only known safe commands (like "git clone") in a
+carefully checked manner.
 
 By default, mr trusts all mrconfig files. (This default will change in a
 future release!) But if you have a ~/.mrtrust file, mr will only trust
@@ -405,6 +431,7 @@ my $interactive=0;
 my $max_depth;
 my $no_chdir=0;
 my $jobs=1;
+my $trust_all=0;
 my $directory=getcwd();
 $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";
 
@@ -806,6 +833,8 @@ sub is_trusted_config {
        # We always trust ~/.mrconfig.
        return 1 if $config eq abs_path("$ENV{HOME}/.mrconfig");
 
+       return 1 if $trust_all;
+
        my $trustfile=$ENV{HOME}."/.mrtrust";
 
        if (! -e $trustfile) {
@@ -1295,7 +1324,7 @@ sub bootstrap {
                die "mr: .mrconfig file already exists, not overwriting with $url\n";
        }
 
-       if (system("curl", "-s", $url, "-o", ".mrconfig") != 0) {
+       if (system("curl", "-A", "mr", "-s", $url, "-o", ".mrconfig") != 0) {
                die "mr: download of $url failed\n";
        }
 
@@ -1351,6 +1380,7 @@ sub getopts {
                "i|interactive" => \$interactive,
                "n|no-recurse:i" => \$max_depth,
                "j|jobs:i" => \$jobs,
+               "t|trust-all" => \$trust_all,
        );
        if (! $result || @ARGV < 1) {
                die("Usage: mr [options] action [params ...]\n".