1 234035bc 2019-06-01 stsp #!/bin/sh
  2 234035bc 2019-06-01 stsp #
  3 234035bc 2019-06-01 stsp # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
  4 234035bc 2019-06-01 stsp #
  5 234035bc 2019-06-01 stsp # Permission to use, copy, modify, and distribute this software for any
  6 234035bc 2019-06-01 stsp # purpose with or without fee is hereby granted, provided that the above
  7 234035bc 2019-06-01 stsp # copyright notice and this permission notice appear in all copies.
  8 234035bc 2019-06-01 stsp #
  9 234035bc 2019-06-01 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 10 234035bc 2019-06-01 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 11 234035bc 2019-06-01 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 12 234035bc 2019-06-01 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 13 234035bc 2019-06-01 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 14 234035bc 2019-06-01 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 15 234035bc 2019-06-01 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 16 234035bc 2019-06-01 stsp 
 17 234035bc 2019-06-01 stsp . ./common.sh
 18 234035bc 2019-06-01 stsp 
 19 234035bc 2019-06-01 stsp function test_cherrypick_basic {
 20 234035bc 2019-06-01 stsp 	local testroot=`test_init cherrypick_basic`
 21 234035bc 2019-06-01 stsp 
 22 234035bc 2019-06-01 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 23 234035bc 2019-06-01 stsp 	ret="$?"
 24 234035bc 2019-06-01 stsp 	if [ "$ret" != "0" ]; then
 25 234035bc 2019-06-01 stsp 		test_done "$testroot" "$ret"
 26 234035bc 2019-06-01 stsp 		return 1
 27 234035bc 2019-06-01 stsp 	fi
 28 234035bc 2019-06-01 stsp 
 29 234035bc 2019-06-01 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
 30 234035bc 2019-06-01 stsp 	echo "modified delta on branch" > $testroot/repo/gamma/delta
 31 234035bc 2019-06-01 stsp 	git_commit $testroot/repo -m "committing to delta on newbranch"
 32 234035bc 2019-06-01 stsp 
 33 234035bc 2019-06-01 stsp 	echo "modified alpha on branch" > $testroot/repo/alpha
 34 234035bc 2019-06-01 stsp 	(cd $testroot/repo && git rm -q beta)
 35 234035bc 2019-06-01 stsp 	echo "new file on branch" > $testroot/repo/epsilon/new
 36 234035bc 2019-06-01 stsp 	(cd $testroot/repo && git add epsilon/new)
 37 234035bc 2019-06-01 stsp 	git_commit $testroot/repo -m "committing more changes on newbranch"
 38 234035bc 2019-06-01 stsp 
 39 234035bc 2019-06-01 stsp 	local branch_rev=`git_show_head $testroot/repo`
 40 234035bc 2019-06-01 stsp 
 41 234035bc 2019-06-01 stsp 	(cd $testroot/wt && got cherrypick $branch_rev > $testroot/stdout)
 42 234035bc 2019-06-01 stsp 
 43 234035bc 2019-06-01 stsp 	echo "G  alpha" > $testroot/stdout.expected
 44 234035bc 2019-06-01 stsp 	echo "D  beta" >> $testroot/stdout.expected
 45 234035bc 2019-06-01 stsp 	echo "A  epsilon/new" >> $testroot/stdout.expected
 46 a7648d7a 2019-06-02 stsp 	echo "Merged commit $branch_rev" >> $testroot/stdout.expected
 47 234035bc 2019-06-01 stsp 
 48 234035bc 2019-06-01 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 49 234035bc 2019-06-01 stsp 	ret="$?"
 50 234035bc 2019-06-01 stsp 	if [ "$ret" != "0" ]; then
 51 234035bc 2019-06-01 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 52 234035bc 2019-06-01 stsp 		test_done "$testroot" "$ret"
 53 234035bc 2019-06-01 stsp 		return 1
 54 234035bc 2019-06-01 stsp 	fi
 55 234035bc 2019-06-01 stsp 
 56 234035bc 2019-06-01 stsp 	echo "modified alpha on branch" > $testroot/content.expected
 57 234035bc 2019-06-01 stsp 	cat $testroot/wt/alpha > $testroot/content
 58 234035bc 2019-06-01 stsp 	cmp -s $testroot/content.expected $testroot/content
 59 234035bc 2019-06-01 stsp 	ret="$?"
 60 234035bc 2019-06-01 stsp 	if [ "$ret" != "0" ]; then
 61 234035bc 2019-06-01 stsp 		diff -u $testroot/content.expected $testroot/content
 62 234035bc 2019-06-01 stsp 		test_done "$testroot" "$ret"
 63 234035bc 2019-06-01 stsp 		return 1
 64 234035bc 2019-06-01 stsp 	fi
 65 234035bc 2019-06-01 stsp 
 66 234035bc 2019-06-01 stsp 	if [ -e $testroot/wt/beta ]; then
 67 234035bc 2019-06-01 stsp 		echo "removed file beta still exists on disk" >&2
 68 234035bc 2019-06-01 stsp 		test_done "$testroot" "1"
 69 234035bc 2019-06-01 stsp 		return 1
 70 234035bc 2019-06-01 stsp 	fi
 71 234035bc 2019-06-01 stsp 
 72 234035bc 2019-06-01 stsp 	echo "new file on branch" > $testroot/content.expected
 73 234035bc 2019-06-01 stsp 	cat $testroot/wt/epsilon/new > $testroot/content
 74 234035bc 2019-06-01 stsp 	cmp -s $testroot/content.expected $testroot/content
 75 234035bc 2019-06-01 stsp 	ret="$?"
 76 234035bc 2019-06-01 stsp 	if [ "$ret" != "0" ]; then
 77 234035bc 2019-06-01 stsp 		diff -u $testroot/content.expected $testroot/content
 78 234035bc 2019-06-01 stsp 		test_done "$testroot" "$ret"
 79 234035bc 2019-06-01 stsp 		return 1
 80 234035bc 2019-06-01 stsp 	fi
 81 234035bc 2019-06-01 stsp 
 82 2b92fad7 2019-06-02 stsp 	echo 'M  alpha' > $testroot/stdout.expected
 83 2b92fad7 2019-06-02 stsp 	echo 'D  beta' >> $testroot/stdout.expected
 84 2b92fad7 2019-06-02 stsp 	echo 'A  epsilon/new' >> $testroot/stdout.expected
 85 2b92fad7 2019-06-02 stsp 
 86 2b92fad7 2019-06-02 stsp 	(cd $testroot/wt && got status > $testroot/stdout)
 87 2b92fad7 2019-06-02 stsp 
 88 2b92fad7 2019-06-02 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 89 2b92fad7 2019-06-02 stsp 	ret="$?"
 90 2b92fad7 2019-06-02 stsp 	if [ "$ret" != "0" ]; then
 91 2b92fad7 2019-06-02 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 92 2b92fad7 2019-06-02 stsp 	fi
 93 234035bc 2019-06-01 stsp 	test_done "$testroot" "$ret"
 94 234035bc 2019-06-01 stsp }
 95 234035bc 2019-06-01 stsp 
 96 03415a1a 2019-06-02 stsp function test_cherrypick_root_commit {
 97 03415a1a 2019-06-02 stsp 	local testroot=`test_init cherrypick_root_commit`
 98 03415a1a 2019-06-02 stsp 
 99 03415a1a 2019-06-02 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
100 03415a1a 2019-06-02 stsp 	ret="$?"
101 03415a1a 2019-06-02 stsp 	if [ "$ret" != "0" ]; then
102 03415a1a 2019-06-02 stsp 		test_done "$testroot" "$ret"
103 03415a1a 2019-06-02 stsp 		return 1
104 03415a1a 2019-06-02 stsp 	fi
105 03415a1a 2019-06-02 stsp 
106 03415a1a 2019-06-02 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
107 03415a1a 2019-06-02 stsp 	(cd $testroot/repo && git rm -q alpha)
108 03415a1a 2019-06-02 stsp 	(cd $testroot/repo && git rm -q beta)
109 03415a1a 2019-06-02 stsp 	(cd $testroot/repo && git rm -q epsilon/zeta)
110 03415a1a 2019-06-02 stsp 	(cd $testroot/repo && git rm -q gamma/delta)
111 03415a1a 2019-06-02 stsp 	mkdir -p $testroot/repo/epsilon
112 03415a1a 2019-06-02 stsp 	echo "new file on branch" > $testroot/repo/epsilon/new
113 03415a1a 2019-06-02 stsp 	(cd $testroot/repo && git add epsilon/new)
114 03415a1a 2019-06-02 stsp 	git_commit $testroot/repo -m "committing on newbranch"
115 03415a1a 2019-06-02 stsp 
116 03415a1a 2019-06-02 stsp 	echo "modified new file on branch" >> $testroot/repo/epsilon/new
117 03415a1a 2019-06-02 stsp 	git_commit $testroot/repo -m "committing on newbranch again"
118 03415a1a 2019-06-02 stsp 
119 03415a1a 2019-06-02 stsp 	tree=`git_show_tree $testroot/repo`
120 03415a1a 2019-06-02 stsp 	root_commit=`git_commit_tree $testroot/repo "new root commit" $tree`
121 03415a1a 2019-06-02 stsp 
122 03415a1a 2019-06-02 stsp 	(cd $testroot/wt && got cherrypick $root_commit > $testroot/stdout)
123 03415a1a 2019-06-02 stsp 
124 03415a1a 2019-06-02 stsp 	echo "A  epsilon/new" > $testroot/stdout.expected
125 a7648d7a 2019-06-02 stsp 	echo "Merged commit $root_commit" >> $testroot/stdout.expected
126 03415a1a 2019-06-02 stsp 
127 03415a1a 2019-06-02 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
128 03415a1a 2019-06-02 stsp 	ret="$?"
129 03415a1a 2019-06-02 stsp 	if [ "$ret" != "0" ]; then
130 03415a1a 2019-06-02 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
131 03415a1a 2019-06-02 stsp 		test_done "$testroot" "$ret"
132 03415a1a 2019-06-02 stsp 		return 1
133 03415a1a 2019-06-02 stsp 	fi
134 03415a1a 2019-06-02 stsp 
135 03415a1a 2019-06-02 stsp 	echo "new file on branch" > $testroot/content.expected
136 03415a1a 2019-06-02 stsp 	echo "modified new file on branch" >> $testroot/content.expected
137 03415a1a 2019-06-02 stsp 	cat $testroot/wt/epsilon/new > $testroot/content
138 03415a1a 2019-06-02 stsp 	cmp -s $testroot/content.expected $testroot/content
139 03415a1a 2019-06-02 stsp 	ret="$?"
140 03415a1a 2019-06-02 stsp 	if [ "$ret" != "0" ]; then
141 03415a1a 2019-06-02 stsp 		diff -u $testroot/content.expected $testroot/content
142 03415a1a 2019-06-02 stsp 		test_done "$testroot" "$ret"
143 03415a1a 2019-06-02 stsp 		return 1
144 03415a1a 2019-06-02 stsp 	fi
145 03415a1a 2019-06-02 stsp 
146 03415a1a 2019-06-02 stsp 	echo 'A  epsilon/new' > $testroot/stdout.expected
147 03415a1a 2019-06-02 stsp 
148 03415a1a 2019-06-02 stsp 	(cd $testroot/wt && got status > $testroot/stdout)
149 03415a1a 2019-06-02 stsp 
150 03415a1a 2019-06-02 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
151 03415a1a 2019-06-02 stsp 	ret="$?"
152 03415a1a 2019-06-02 stsp 	if [ "$ret" != "0" ]; then
153 03415a1a 2019-06-02 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
154 03415a1a 2019-06-02 stsp 	fi
155 03415a1a 2019-06-02 stsp 	test_done "$testroot" "$ret"
156 03415a1a 2019-06-02 stsp }
157 03415a1a 2019-06-02 stsp 
158 234035bc 2019-06-01 stsp run_test test_cherrypick_basic
159 03415a1a 2019-06-02 stsp run_test test_cherrypick_root_commit