Fix bug when remembering failed commands in offline mode.

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 7eaadddd21e3fd223ed67d5ad0da1fee053e158c..883f4fbf6bbeb1c348362dcba3aa9fc84bff4831 100755 (executable)
--- a/mr
+++ b/mr
@@ -81,6 +81,11 @@ remote repository. Only supported for distributed revision control systems.
 
 The optional -m parameter allows specifying a commit message.
 
 
 The optional -m parameter allows specifying a commit message.
 

+=item push
+
+Pushes committed local changes to the remote repository. A no-op for
+centralized revision control systems.
+

 =item diff
 
 Show a diff of uncommitted changes.
 =item diff
 
 Show a diff of uncommitted changes.


@@ -446,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" : "";


@@ -541,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) {


@@ -1288,6 +1295,13 @@ bzr_record = bzr commit "$@"
 hg_record  = hg commit -m "$@"
 darcs_record = darcs record -a -m "$@"
 
 hg_record  = hg commit -m "$@"
 darcs_record = darcs record -a -m "$@"
 

+svn_push = :
+git_push = git push "$@"
+bzr_push = bzr push "$@"
+cvs_push = :
+hg_push = hg push "$@"
+darcs_push = darcs push -a
+

 svn_diff = svn diff "$@"
 git_diff = git diff "$@"
 bzr_diff = bzr diff "$@"
 svn_diff = svn diff "$@"
 git_diff = git diff "$@"
 bzr_diff = bzr diff "$@"