better cvs handling approach

diff --git a/debian/control b/debian/control
index 7874c672d6df493c3cf9b8b3affd5b31197fb826..d125ef9e59cc643cf25731b175246418fbea2cf6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: mr
 Architecture: all
 Section: utils
 Depends: 
 Architecture: all
 Section: utils
 Depends: 

-Suggests: subversion, git-core
+Suggests: subversion, git-core, cvs

 Description: a Multiple Repository management tool
  The mr(1) command allows you to register a set of repositories in 
  a .mrconfig file, and then checkout, update, or perform other actions on
 Description: a Multiple Repository management tool
  The mr(1) command allows you to register a set of repositories in 
  a .mrconfig file, and then checkout, update, or perform other actions on

diff --git a/mr b/mr
index 441c2e299e90cd4c4425d9eb4c513f1e342e94ad..856de11f4121f112f9377d6f308096ef5c091248 100755 (executable)
--- a/mr
+++ b/mr
@@ -490,7 +490,7 @@ status = \
        elif [ -d "$MR_REPO"/.git ]; then \
                git status "$@" || true; \
        elif [ -d "$MR_REPO"/CVS ]; then \
        elif [ -d "$MR_REPO"/.git ]; then \
                git status "$@" || true; \
        elif [ -d "$MR_REPO"/CVS ]; then \

-               echo "cvs status not run (too ugly)"; \
+               cvs status "$@"; \

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

diff --git a/mrconfig b/mrconfig
index db9fb588b1c7dae9e6f1998c568d393511469678..e4ae9a0887448f2239bdfffdbf6105aa91d037f8 100644 (file)
--- a/mrconfig
+++ b/mrconfig
@@ -24,6 +24,10 @@ commit = git push kite
 checkout = \
        CVSROOT=:ext:joeyh@cvs.debian.org:/cvs/webwml \
        cvs co -d www.debian.org webwml
 checkout = \
        CVSROOT=:ext:joeyh@cvs.debian.org:/cvs/webwml \
        cvs co -d www.debian.org webwml

+# cvs sucks sufficiently that I prefer to run these commands by hand,
+# and only rarely
+update = echo "skipping cvs update (too slow)"
+status = echo "skipping cvs status (too ugly)"

 
 # My home directory, which I keep in svn.
 []
 
 # My home directory, which I keep in svn.
 []