From e310676b26108a011602b4bd9e8eb51e92e7b9aa Mon Sep 17 00:00:00 2001
From: David Caldwell <david@porkrind.org>
Date: Wed, 15 May 2013 19:00:15 -0700
Subject: [PATCH] [test] Move VC rm out into individual vc.sh files, since it's
 no longer such a special case.

---
 test/main.test    | 5 +----
 test/vcs/bzr.sh   | 1 +
 test/vcs/cvs.sh   | 1 +
 test/vcs/darcs.sh | 1 +
 test/vcs/git.sh   | 1 +
 test/vcs/hg.sh    | 1 +
 test/vcs/mtn.sh   | 1 +
 test/vcs/svn.sh   | 1 +
 8 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/main.test b/test/main.test
index 622ff3a..d3a7764 100644
--- a/test/main.test
+++ b/test/main.test
@@ -15,10 +15,7 @@ $COMMIT_PATCH -m "changed" changed.patch
 rm a
 
 # Some VCSes won't show diffs for removed files unless you tell it they are removed:
-[ $VC == 'cvs' ] && cvs rm a
-[ $VC == 'hg'  ] && hg rm a
-[ $VC == 'mtn' ] && mtn drop a
-[ $VC == 'svn' ] && svn rm a
+$VC_RM a
 
 $VC_DIFF > removed.patch || true
 
diff --git a/test/vcs/bzr.sh b/test/vcs/bzr.sh
index 2b0c277..a176083 100644
--- a/test/vcs/bzr.sh
+++ b/test/vcs/bzr.sh
@@ -4,6 +4,7 @@ bzr_init () {
     (cd "$WD" && bzr init)
 
     export VC_DIFF="bzr diff"
+    export VC_RM="true"
     export DIFF_PREFIX=""
 }
 
diff --git a/test/vcs/cvs.sh b/test/vcs/cvs.sh
index 92d2e3d..8f5985c 100644
--- a/test/vcs/cvs.sh
+++ b/test/vcs/cvs.sh
@@ -8,6 +8,7 @@ cvs_init () {
     cvs checkout -d "$WD" test
 
     export VC_DIFF="cvs diff -N"
+    export VC_RM="cvs rm"
     export DIFF_PREFIX=""
 }
 
diff --git a/test/vcs/darcs.sh b/test/vcs/darcs.sh
index d0fdf3b..4d2b79c 100644
--- a/test/vcs/darcs.sh
+++ b/test/vcs/darcs.sh
@@ -4,6 +4,7 @@ darcs_init () {
     (cd "$WD" && darcs init)
 
     export VC_DIFF="darcs diff"
+    export VC_RM="true"
     export DIFF_PREFIX="a/"
 }
 
diff --git a/test/vcs/git.sh b/test/vcs/git.sh
index e0923f6..64fdda6 100644
--- a/test/vcs/git.sh
+++ b/test/vcs/git.sh
@@ -4,6 +4,7 @@ git_init () {
     (cd "$WD" && git init)
 
     export VC_DIFF="git diff"
+    export VC_RM="true"
     export DIFF_PREFIX="b/"
 }
 
diff --git a/test/vcs/hg.sh b/test/vcs/hg.sh
index 29e1d71..df23b4a 100644
--- a/test/vcs/hg.sh
+++ b/test/vcs/hg.sh
@@ -4,6 +4,7 @@ hg_init () {
     (cd "$WD" && hg init)
 
     export VC_DIFF="hg diff"
+    export VC_RM="hg rm"
     export DIFF_PREFIX="a/"
 }
 
diff --git a/test/vcs/mtn.sh b/test/vcs/mtn.sh
index 2bd1664..857a3cc 100644
--- a/test/vcs/mtn.sh
+++ b/test/vcs/mtn.sh
@@ -12,6 +12,7 @@ mtn_init () {
     (cd "$WD" && mtn automate generate_key commit-patch-automated-tester@example.com '')
 
     export VC_DIFF="mtn diff --without-header"
+    export VC_RM="mtn drop"
     export DIFF_PREFIX=""
 }
 
diff --git a/test/vcs/svn.sh b/test/vcs/svn.sh
index 79cec7e..e748e25 100644
--- a/test/vcs/svn.sh
+++ b/test/vcs/svn.sh
@@ -8,6 +8,7 @@ svn_init () {
     svn checkout file://"$REPO"/test/trunk "$WD"
 
     export VC_DIFF="svn diff"
+    export VC_RM="svn rm"
     export DIFF_PREFIX=""
 }
 
-- 
2.51.2