]> git.madduck.net Git - code/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

command storing fixes
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 27 Jun 2008 00:20:38 +0000 (20:20 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 27 Jun 2008 00:20:38 +0000 (20:20 -0400)
Preserve switches passed to mr.

mr

diff --git a/mr b/mr
index 2e5b03dc983a3f9f64e997eb2569b5cab10c2b0b..a6b5975d8a8d8b0816eb0c14e2aada8e9ecf3578 100755 (executable)
--- a/mr
+++ b/mr
@@ -381,7 +381,6 @@ my %configfiles;
 my %knownactions;
 my %alias;
 my (@ok, @failed, @skipped);
 my %knownactions;
 my %alias;
 my (@ok, @failed, @skipped);
-my @switches=@ARGV;
 
 main();
 
 
 main();
 
@@ -540,7 +539,9 @@ sub action { #{{{
                        if ($ret >> 8 != 0) {
                                print STDERR "mr $action: command failed\n";
                                if (-e "$ENV{HOME}/.mrlog" && $action ne 'remember') {
                        if ($ret >> 8 != 0) {
                                print STDERR "mr $action: command failed\n";
                                if (-e "$ENV{HOME}/.mrlog" && $action ne 'remember') {
-                                       @ARGV=(@switches, $action, @ARGV);
+                                       # recreate original command line to
+                                       # remember, and avoid recursing
+                                       @ARGV=('-n', $action, @ARGV);
                                        action("remember", $dir, $topdir, $subdir);
                                }
                        }
                                        action("remember", $dir, $topdir, $subdir);
                                }
                        }
@@ -1005,7 +1006,9 @@ sub dispatch { #{{{
        elsif ($action eq 'register') {
                register(@ARGV);
        }
        elsif ($action eq 'register') {
                register(@ARGV);
        }
-       elsif ($action eq 'remember') {
+       elsif ($action eq 'remember' ||
+              $action eq 'offline' ||
+              $action eq 'online') {
                my @repos=selectrepos;
                action($action, @{$repos[0]}) if @repos;
                exit 0;
                my @repos=selectrepos;
                action($action, @{$repos[0]}) if @repos;
                exit 0;
@@ -1133,6 +1136,7 @@ sub expandaction { #{{{
 } #}}}
 
 sub getopts { #{{{
 } #}}}
 
 sub getopts { #{{{
+       my @saved=@ARGV;
        Getopt::Long::Configure("bundling", "no_permute");
        my $result=GetOptions(
                "d|directory=s" => sub { $directory=abs_path($_[1]) },
        Getopt::Long::Configure("bundling", "no_permute");
        my $result=GetOptions(
                "d|directory=s" => sub { $directory=abs_path($_[1]) },
@@ -1148,6 +1152,12 @@ sub getopts { #{{{
                die("Usage: mr [-d directory] action [params ...]\n".
                    "(Use mr help for man page.)\n");
        }
                die("Usage: mr [-d directory] action [params ...]\n".
                    "(Use mr help for man page.)\n");
        }
+       
+       $ENV{MR_SWITCHES}="";
+       foreach my $option (@saved) {
+               last if $option eq $ARGV[0];
+               $ENV{MR_SWITCHES}.="$option ";
+       }
 } #}}}
 
 sub init { #{{{
 } #}}}
 
 sub init { #{{{
@@ -1182,10 +1192,7 @@ sub main { #{{{
        loadconfig($ENV{MR_CONFIG});
        #use Data::Dumper; print Dumper(\%config);
        
        loadconfig($ENV{MR_CONFIG});
        #use Data::Dumper; print Dumper(\%config);
        
-       my $action=shift @ARGV;
-       @switches = grep { $_ ne $action } @SWITCHES;
-       $action=expandaction($action);
-
+       my $action=expandaction(shift @ARGV);
        dispatch($action);
        showstats($action);
 
        dispatch($action);
        showstats($action);
 
@@ -1353,7 +1360,7 @@ list = true
 config = 
 
 online =
 config = 
 
 online =
-       if [ -e ~/.mrlog ]; then
+       if [ -s ~/.mrlog ]; then
                info "running offline commands"
                mv -f ~/.mrlog ~/.mrlog.old
                if ! sh ~/.mrlog.old; then
                info "running offline commands"
                mv -f ~/.mrlog ~/.mrlog.old
                if ! sh ~/.mrlog.old; then
@@ -1368,7 +1375,7 @@ offline =
        info "offline mode enabled"
 remember =
        info "remembering command: 'mr $@'"
        info "offline mode enabled"
 remember =
        info "remembering command: 'mr $@'"
-       command="mr -d '$(pwd)'"
+       command="mr -d '$(pwd)' $MR_SWITCHES"
        for w in "$@"; do
                command="$command '$w'"
        done
        for w in "$@"; do
                command="$command '$w'"
        done