Fix bug when remembering failed commands in offline mode.

diff --git a/debian/changelog b/debian/changelog
index 934c37ec1afd2574714c099392d65442d31f6ae1..0067088e2396d725a60284aef9e4770877b599dd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (0.34) unstable; urgency=low
+
+  * Fix bug when remembering failed commands in offline mode.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 02 Aug 2008 12:27:21 -0400
+

 mr (0.33) unstable; urgency=low
 
   * Add a push subcommand, which pushes committed changes for DCVS, and 
 mr (0.33) unstable; urgency=low
 
   * Add a push subcommand, which pushes committed changes for DCVS, and 

diff --git a/mr b/mr
index e76887ee60eb5bc9a1a30433d9a87497cd9c4136..883f4fbf6bbeb1c348362dcba3aa9fc84bff4831 100755 (executable)
--- a/mr
+++ b/mr
@@ -451,7 +451,7 @@ sub findcommand { #{{{
 
 sub action { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
 
 sub action { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;

-
+       

        $ENV{MR_CONFIG}=$configfiles{$topdir};
        my $lib=exists $config{$topdir}{$subdir}{lib} ?
                       $config{$topdir}{$subdir}{lib}."\n" : "";
        $ENV{MR_CONFIG}=$configfiles{$topdir};
        my $lib=exists $config{$topdir}{$subdir}{lib} ?
                       $config{$topdir}{$subdir}{lib}."\n" : "";


@@ -546,8 +546,10 @@ sub action { #{{{
                                if (-e "$ENV{HOME}/.mrlog" && $action ne 'remember') {
                                        # recreate original command line to
                                        # remember, and avoid recursing
                                if (-e "$ENV{HOME}/.mrlog" && $action ne 'remember') {
                                        # recreate original command line to
                                        # remember, and avoid recursing

-                                       @ARGV=('-n', $action, @ARGV);
+                                       my @orig=@ARGV;
+                                       @ARGV=('-n', $action, @orig);

                                        action("remember", $dir, $topdir, $subdir);
                                        action("remember", $dir, $topdir, $subdir);

+                                       @ARGV=@orig;

                                }
                        }
                        elsif ($ret != 0) {
                                }
                        }
                        elsif ($ret != 0) {