Skip to content

Commit e310676

Browse files
committed
[test] Move VC rm out into individual vc.sh files, since it's no longer such a special case.
1 parent 149c2c3 commit e310676

8 files changed

Lines changed: 8 additions & 4 deletions

File tree

test/main.test

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ $COMMIT_PATCH -m "changed" changed.patch
1515
rm a
1616

1717
# Some VCSes won't show diffs for removed files unless you tell it they are removed:
18-
[ $VC == 'cvs' ] && cvs rm a
19-
[ $VC == 'hg' ] && hg rm a
20-
[ $VC == 'mtn' ] && mtn drop a
21-
[ $VC == 'svn' ] && svn rm a
18+
$VC_RM a
2219

2320
$VC_DIFF > removed.patch || true
2421

test/vcs/bzr.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ bzr_init () {
44
(cd "$WD" && bzr init)
55

66
export VC_DIFF="bzr diff"
7+
export VC_RM="true"
78
export DIFF_PREFIX=""
89
}
910

test/vcs/cvs.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cvs_init () {
88
cvs checkout -d "$WD" test
99

1010
export VC_DIFF="cvs diff -N"
11+
export VC_RM="cvs rm"
1112
export DIFF_PREFIX=""
1213
}
1314

test/vcs/darcs.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ darcs_init () {
44
(cd "$WD" && darcs init)
55

66
export VC_DIFF="darcs diff"
7+
export VC_RM="true"
78
export DIFF_PREFIX="a/"
89
}
910

test/vcs/git.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ git_init () {
44
(cd "$WD" && git init)
55

66
export VC_DIFF="git diff"
7+
export VC_RM="true"
78
export DIFF_PREFIX="b/"
89
}
910

test/vcs/hg.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ hg_init () {
44
(cd "$WD" && hg init)
55

66
export VC_DIFF="hg diff"
7+
export VC_RM="hg rm"
78
export DIFF_PREFIX="a/"
89
}
910

test/vcs/mtn.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ mtn_init () {
1212
(cd "$WD" && mtn automate generate_key commit-patch-automated-tester@example.com '')
1313

1414
export VC_DIFF="mtn diff --without-header"
15+
export VC_RM="mtn drop"
1516
export DIFF_PREFIX=""
1617
}
1718

test/vcs/svn.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ svn_init () {
88
svn checkout file://"$REPO"/test/trunk "$WD"
99

1010
export VC_DIFF="svn diff"
11+
export VC_RM="svn rm"
1112
export DIFF_PREFIX=""
1213
}
1314

0 commit comments

Comments
 (0)