]> git.madduck.net Git - code/myrepos.git/blobdiff - mr

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:

Add webcheckout command. See http://kitenet.net/~joey/rfc/rel-vcs/
[code/myrepos.git] / mr
diff --git a/mr b/mr
index a6b5975d8a8d8b0816eb0c14e2aada8e9ecf3578..182e6b3c1b93c0717c67a6dc8edaa9c242869bb1 100755 (executable)
--- a/mr
+++ b/mr
@@ -7,7 +7,7 @@
 mr - a Multiple Repository management tool
 
 =head1 SYNOPSIS
-/
+
 B<mr> [options] checkout
 
 B<mr> [options] update
@@ -81,6 +81,11 @@ remote repository. Only supported for distributed revision control systems.
 
 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.
@@ -446,7 +451,7 @@ sub findcommand { #{{{
 
 sub action { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
-
+       
        $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
-                                       @ARGV=('-n', $action, @ARGV);
+                                       my @orig=@ARGV;
+                                       @ARGV=('-n', $action, @orig);
                                        action("remember", $dir, $topdir, $subdir);
+                                       @ARGV=@orig;
                                }
                        }
                        elsif ($ret != 0) {
@@ -841,6 +848,9 @@ sub loadconfig { #{{{
                        if ($parameter eq "include") {
                                print "mr: including output of \"$value\"\n" if $verbose;
                                unshift @lines, `$value`;
+                               if ($?) {
+                                       print STDERR "mr: include command exited nonzero ($?)\n";
+                               }
                                next;
                        }
 
@@ -1288,6 +1298,13 @@ bzr_record = bzr commit "$@"
 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 "$@"
@@ -1363,14 +1380,15 @@ online =
        if [ -s ~/.mrlog ]; then
                info "running offline commands"
                mv -f ~/.mrlog ~/.mrlog.old
-               if ! sh ~/.mrlog.old; then
-                       error "offline commands failed; left in ~/.mrlog.old"
+               if ! sh -e ~/.mrlog.old; then
+                       error "offline command failed; left in ~/.mrlog.old"
                fi
                rm -f ~/.mrlog.old
        else
                info "no offline commands to run"
        fi
 offline =
+       umask 077
        touch ~/.mrlog
        info "offline mode enabled"
 remember =