1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181
#!/bin/sh
#
# Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
. ./common.sh
function test_commit_basic {
local testroot=`test_init commit_basic`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "modified alpha" > $testroot/wt/alpha
(cd $testroot/wt && got rm beta >/dev/null)
echo "new file" > $testroot/wt/new
(cd $testroot/wt && got add new >/dev/null)
(cd $testroot/wt && got commit -m 'test commit_basic' > $testroot/stdout)
local head_rev=`git_show_head $testroot/repo`
echo "A new" > $testroot/stdout.expected
echo "M alpha" >> $testroot/stdout.expected
echo "D beta" >> $testroot/stdout.expected
echo "created commit $head_rev" >> $testroot/stdout.expected
cmp $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
function test_commit_new_subdir {
local testroot=`test_init commit_new_subdir`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
mkdir -p $testroot/wt/d
echo "new file" > $testroot/wt/d/new
echo "another new file" > $testroot/wt/d/new2
(cd $testroot/wt && got add d/new >/dev/null)
(cd $testroot/wt && got add d/new2 >/dev/null)
(cd $testroot/wt && \
got commit -m 'test commit_new_subdir' > $testroot/stdout)
local head_rev=`git_show_head $testroot/repo`
echo "A d/new" > $testroot/stdout.expected
echo "A d/new2" >> $testroot/stdout.expected
echo "created commit $head_rev" >> $testroot/stdout.expected
cmp $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
function test_commit_subdir {
local testroot=`test_init commit_subdir`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "modified alpha" > $testroot/wt/alpha
echo "modified zeta" > $testroot/wt/epsilon/zeta
(cd $testroot/wt && \
got commit -m 'test commit_subdir' epsilon > $testroot/stdout)
local head_rev=`git_show_head $testroot/repo`
echo "M epsilon/zeta" >> $testroot/stdout.expected
echo "created commit $head_rev" >> $testroot/stdout.expected
cmp $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
function test_commit_single_file {
local testroot=`test_init commit_single_file`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "modified alpha" > $testroot/wt/alpha
echo "modified zeta" > $testroot/wt/epsilon/zeta
(cd $testroot/wt && got commit -m 'test commit_subdir' epsilon/zeta \
> $testroot/stdout)
local head_rev=`git_show_head $testroot/repo`
echo "M epsilon/zeta" >> $testroot/stdout.expected
echo "created commit $head_rev" >> $testroot/stdout.expected
cmp $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
function test_commit_out_of_date {
local testroot=`test_init commit_out_of_date`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "modified alpha" > $testroot/repo/alpha
git_commit $testroot/repo -m "modified alpha"
echo "modified alpha" > $testroot/wt/alpha
(cd $testroot/wt && got commit -m 'test commit_out_of_date' \
> $testroot/stdout 2> $testroot/stderr)
local head_rev=`git_show_head $testroot/repo`
echo -n > $testroot/stdout.expected
echo "got: work tree must be updated before these" \
"changes can be committed" > $testroot/stderr.expected
cmp $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
cmp $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
fi
test_done "$testroot" "$ret"
}
run_test test_commit_basic
run_test test_commit_new_subdir
run_test test_commit_subdir
run_test test_commit_single_file
run_test test_commit_out_of_date