add support for cvs

diff --git a/mr b/mr
index 2b5c65643a5962c6b05258098f2c84bfdbc88ca9..441c2e299e90cd4c4425d9eb4c513f1e342e94ad 100755 (executable)
--- a/mr
+++ b/mr
@@ -323,9 +323,10 @@ sub action {
                my $command="set -e; ".$lib.
                        "my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
                        join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
                my $command="set -e; ".$lib.
                        "my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
                        join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);

+               print STDERR "mr $action: running $command\n" if $verbose;

                my $ret=system($command);
                if ($ret != 0) {
                my $ret=system($command);
                if ($ret != 0) {

-                       print STDERR "mr $action: failed to run: $command\n" if $verbose;
+                       print STDERR "mr $action: failed ($ret)\n" if $verbose;

                        push @failed, $topdir.$subdir;
                        if ($ret >> 8 != 0) {
                                print STDERR "mr $action: command failed\n";
                        push @failed, $topdir.$subdir;
                        if ($ret >> 8 != 0) {
                                print STDERR "mr $action: command failed\n";


@@ -478,6 +479,8 @@ update = \
                svn update "$@"; \
        elif [ -d "$MR_REPO"/.git ]; then \
                git pull origin master "$@"; \
                svn update "$@"; \
        elif [ -d "$MR_REPO"/.git ]; then \
                git pull origin master "$@"; \

+       elif [ -d "$MR_REPO"/CVS ]; then \
+               cvs update "$@"; \

        else \
                error "unknown repo type"; \
        fi
        else \
                error "unknown repo type"; \
        fi


@@ -486,6 +489,8 @@ status = \
                svn status "$@"; \
        elif [ -d "$MR_REPO"/.git ]; then \
                git status "$@" || true; \
                svn status "$@"; \
        elif [ -d "$MR_REPO"/.git ]; then \
                git status "$@" || true; \

+       elif [ -d "$MR_REPO"/CVS ]; then \
+               echo "cvs status not run (too ugly)"; \

        else \
                error "unknown repo type"; \
        fi
        else \
                error "unknown repo type"; \
        fi


@@ -494,6 +499,8 @@ commit = \
                svn commit "$@"; \
        elif [ -d "$MR_REPO"/.git ]; then \
                git commit -a "$@" && git push --all; \
                svn commit "$@"; \
        elif [ -d "$MR_REPO"/.git ]; then \
                git commit -a "$@" && git push --all; \

+       elif [ -d "$MR_REPO"/CVS ]; then \
+               cvs commit "$@"; \

        else \
                error "unknown repo type"; \
        fi
        else \
                error "unknown repo type"; \
        fi


@@ -502,6 +509,8 @@ diff = \
                svn diff "$@"; \
        elif [ -d "$MR_REPO"/.git ]; then \
                git diff "$@"; \
                svn diff "$@"; \
        elif [ -d "$MR_REPO"/.git ]; then \
                git diff "$@"; \

+       elif [ -d "$MR_REPO"/CVS ]; then \
+               cvs diff "$@"; \

        else \
                error "unknown repo type"; \
        fi
        else \
                error "unknown repo type"; \
        fi


@@ -510,6 +519,8 @@ log = \
                svn log"$@"; \
        elif [ -d "$MR_REPO"/.git ]; then \
                git log "$@"; \
                svn log"$@"; \
        elif [ -d "$MR_REPO"/.git ]; then \
                git log "$@"; \

+       elif [ -d "$MR_REPO"/CVS ]; then \
+               cvs log "$@"; \

        else \
                error "unknown repo type"; \
        fi
        else \
                error "unknown repo type"; \
        fi

diff --git a/mrconfig b/mrconfig
index 5c1d8c239ab7bab75395475a1f8e3867a546b9bd..db9fb588b1c7dae9e6f1998c568d393511469678 100644 (file)
--- a/mrconfig
+++ b/mrconfig
@@ -10,7 +10,8 @@ skip = test $(hostname) != kodama
 
 [src/dpkg]
 # A merge of the upstream dpkg git repo and my own personal branch.
 
 [src/dpkg]
 # A merge of the upstream dpkg git repo and my own personal branch.

-checkout = git clone git://git.debian.org/git/dpkg/dpkg.git && \
+checkout = \
+       git clone git://git.debian.org/git/dpkg/dpkg.git && \

        cd dpkg && \
        git remote add kite ssh://kitenet.net/srv/git/kitenet.net/dpkg && \
        git fetch kite && \
        cd dpkg && \
        git remote add kite ssh://kitenet.net/srv/git/kitenet.net/dpkg && \
        git fetch kite && \


@@ -18,6 +19,12 @@ checkout = git clone git://git.debian.org/git/dpkg/dpkg.git && \
 update = git pull origin master && git pull kite sourcev3
 commit = git push kite
 
 update = git pull origin master && git pull kite sourcev3
 commit = git push kite
 

+[html/www.debian.org]
+# Still in CVS..urk!
+checkout = \
+       CVSROOT=:ext:joeyh@cvs.debian.org:/cvs/webwml \
+       cvs co -d www.debian.org webwml
+

 # My home directory, which I keep in svn.
 []
 checkout = svn co svn+ssh://svn.kitenet.net/srv/svn/joey/trunk/home-$(hostname) joey
 # My home directory, which I keep in svn.
 []
 checkout = svn co svn+ssh://svn.kitenet.net/srv/svn/joey/trunk/home-$(hostname) joey