thodg/got/regress/cmdline/integrate.sh

• Show log

  Commit

• Hash : 73529b9f
  Author :
  Date : 2019-10-15T16:31:50
  

  set the executable bit on integrate.sh

Download

• regress/cmdline/integrate.sh

• #!/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_integrate_basic {
  	local testroot=`test_init integrate_basic`
  
  	(cd $testroot/repo && git checkout -q -b newbranch)
  	echo "modified delta on branch" > $testroot/repo/gamma/delta
  	git_commit $testroot/repo -m "committing to delta on newbranch"
  
  	echo "modified alpha on branch" > $testroot/repo/alpha
  	(cd $testroot/repo && git rm -q beta)
  	echo "new file on branch" > $testroot/repo/epsilon/new
  	(cd $testroot/repo && git add epsilon/new)
  	git_commit $testroot/repo -m "committing more changes on newbranch"
  
  	local orig_commit1=`git_show_parent_commit $testroot/repo`
  	local orig_commit2=`git_show_head $testroot/repo`
  
  	(cd $testroot/repo && git checkout -q master)
  	echo "modified zeta on master" > $testroot/repo/epsilon/zeta
  	git_commit $testroot/repo -m "committing to zeta on master"
  	local master_commit=`git_show_head $testroot/repo`
  
  	got checkout $testroot/repo $testroot/wt > /dev/null
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/wt && got rebase newbranch > /dev/null)
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		echo "got rebase failed unexpectedly"
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/repo && git checkout -q newbranch)
  	local new_commit1=`git_show_parent_commit $testroot/repo`
  	local new_commit2=`git_show_head $testroot/repo`
  
  	(cd $testroot/wt && got update -b master > /dev/null)
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		echo "got update failed unexpectedly"
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/wt && got integrate newbranch > $testroot/stdout)
  
  	echo "U  alpha" > $testroot/stdout.expected
  	echo "D  beta" >> $testroot/stdout.expected
  	echo "A  epsilon/new" >> $testroot/stdout.expected
  	echo "U  gamma/delta" >> $testroot/stdout.expected
  	echo "Integrated refs/heads/newbranch into refs/heads/master" \
  		>> $testroot/stdout.expected
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo "modified delta on branch" > $testroot/content.expected
  	cat $testroot/wt/gamma/delta > $testroot/content
  	cmp -s $testroot/content.expected $testroot/content
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/content.expected $testroot/content
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo "modified alpha on branch" > $testroot/content.expected
  	cat $testroot/wt/alpha > $testroot/content
  	cmp -s $testroot/content.expected $testroot/content
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/content.expected $testroot/content
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	if [ -e $testroot/wt/beta ]; then
  		echo "removed file beta still exists on disk" >&2
  		test_done "$testroot" "1"
  		return 1
  	fi
  
  	echo "new file on branch" > $testroot/content.expected
  	cat $testroot/wt/epsilon/new > $testroot/content
  	cmp -s $testroot/content.expected $testroot/content
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/content.expected $testroot/content
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/wt && got status > $testroot/stdout)
  
  	echo -n > $testroot/stdout.expected
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
  	echo "commit $new_commit2 (master, newbranch)" \
  		> $testroot/stdout.expected
  	echo "commit $new_commit1" >> $testroot/stdout.expected
  	echo "commit $master_commit" >> $testroot/stdout.expected
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  	fi
  	test_done "$testroot" "$ret"
  }
  
  function test_integrate_requires_rebase_first {
  	local testroot=`test_init integrate_requires_rebase_first`
  	local init_commit=`git_show_head $testroot/repo`
  
  	(cd $testroot/repo && git checkout -q -b newbranch)
  	echo "modified delta on branch" > $testroot/repo/gamma/delta
  	git_commit $testroot/repo -m "committing to delta on newbranch"
  
  	echo "modified alpha on branch" > $testroot/repo/alpha
  	(cd $testroot/repo && git rm -q beta)
  	echo "new file on branch" > $testroot/repo/epsilon/new
  	(cd $testroot/repo && git add epsilon/new)
  	git_commit $testroot/repo -m "committing more changes on newbranch"
  
  	local orig_commit1=`git_show_parent_commit $testroot/repo`
  	local orig_commit2=`git_show_head $testroot/repo`
  
  	(cd $testroot/repo && git checkout -q master)
  	echo "modified zeta on master" > $testroot/repo/epsilon/zeta
  	git_commit $testroot/repo -m "committing to zeta on master"
  	local master_commit=`git_show_head $testroot/repo`
  
  	(cd $testroot/repo && git checkout -q newbranch)
  	local new_commit1=`git_show_parent_commit $testroot/repo`
  	local new_commit2=`git_show_head $testroot/repo`
  
  	got checkout -b master $testroot/repo $testroot/wt > /dev/null
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/wt && got integrate newbranch \
  		> $testroot/stdout 2> $testroot/stderr)
  	ret="$?"
  	if [ "$ret" == "0" ]; then
  		echo "got integrate succeeded unexpectedly"
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo -n > $testroot/stdout.expected
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo "got: specified branch must be rebased first" \
  		> $testroot/stderr.expected
  	cmp -s $testroot/stderr.expected $testroot/stderr
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stderr.expected $testroot/stderr
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/repo && got log -c master | \
  		grep ^commit > $testroot/stdout)
  	echo "commit $master_commit (master)" > $testroot/stdout.expected
  	echo "commit $init_commit" >> $testroot/stdout.expected
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/repo && got log -c newbranch | \
  		grep ^commit > $testroot/stdout)
  	echo "commit $new_commit2 (newbranch)" \
  		> $testroot/stdout.expected
  	echo "commit $new_commit1" >> $testroot/stdout.expected
  	echo "commit $init_commit" >> $testroot/stdout.expected
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  	fi
  	test_done "$testroot" "$ret"
  }
  
  function test_integrate_path_prefix {
  	local testroot=`test_init integrate_path_prefix`
  
  	(cd $testroot/repo && git checkout -q -b newbranch)
  	echo "modified delta on branch" > $testroot/repo/gamma/delta
  	git_commit $testroot/repo -m "committing to delta on newbranch"
  
  	echo "modified alpha on branch" > $testroot/repo/alpha
  	(cd $testroot/repo && git rm -q beta)
  	echo "new file on branch" > $testroot/repo/epsilon/new
  	(cd $testroot/repo && git add epsilon/new)
  	git_commit $testroot/repo -m "committing more changes on newbranch"
  
  	local orig_commit1=`git_show_parent_commit $testroot/repo`
  	local orig_commit2=`git_show_head $testroot/repo`
  
  	(cd $testroot/repo && git checkout -q master)
  	echo "modified zeta on master" > $testroot/repo/epsilon/zeta
  	git_commit $testroot/repo -m "committing to zeta on master"
  	local master_commit=`git_show_head $testroot/repo`
  
  	got checkout $testroot/repo $testroot/wt > /dev/null
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/wt && got rebase newbranch > /dev/null)
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		echo "got rebase failed unexpectedly"
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/repo && git checkout -q newbranch)
  	local new_commit1=`git_show_parent_commit $testroot/repo`
  	local new_commit2=`git_show_head $testroot/repo`
  
  	rm -r $testroot/wt
  	got checkout -b master -p epsilon $testroot/repo $testroot/wt \
  		> /dev/null
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		echo "got checkout failed unexpectedly"
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/wt && got integrate newbranch > $testroot/stdout)
  
  	echo "A  new" > $testroot/stdout.expected
  	echo "Integrated refs/heads/newbranch into refs/heads/master" \
  		>> $testroot/stdout.expected
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  	fi
  	test_done "$testroot" "$ret"
  }
  
  function test_integrate_backwards_in_time {
  	local testroot=`test_init integrate_backwards_in_time`
  
  	(cd $testroot/repo && git checkout -q -b newbranch)
  	echo "modified delta on branch" > $testroot/repo/gamma/delta
  	git_commit $testroot/repo -m "committing to delta on newbranch"
  
  	echo "modified alpha on branch" > $testroot/repo/alpha
  	(cd $testroot/repo && git rm -q beta)
  	echo "new file on branch" > $testroot/repo/epsilon/new
  	(cd $testroot/repo && git add epsilon/new)
  	git_commit $testroot/repo -m "committing more changes on newbranch"
  
  	local orig_commit1=`git_show_parent_commit $testroot/repo`
  	local orig_commit2=`git_show_head $testroot/repo`
  
  	(cd $testroot/repo && git checkout -q master)
  	echo "modified zeta on master" > $testroot/repo/epsilon/zeta
  	git_commit $testroot/repo -m "committing to zeta on master"
  	local master_commit=`git_show_head $testroot/repo`
  
  	got checkout $testroot/repo $testroot/wt > /dev/null
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/wt && got rebase newbranch > /dev/null)
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		echo "got rebase failed unexpectedly"
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/repo && git checkout -q newbranch)
  	local new_commit1=`git_show_parent_commit $testroot/repo`
  	local new_commit2=`git_show_head $testroot/repo`
  
  	# attempt to integrate master into newbranch (wrong way around)
  	(cd $testroot/wt && got update -b newbranch > /dev/null)
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		echo "got update failed unexpectedly"
  		test_done "$testroot" "$ret"
  	 return 1
  	fi
  
  	(cd $testroot/wt && got integrate master \
  		> $testroot/stdout 2> $testroot/stderr)
  	ret="$?"
  	if [ "$ret" == "0" ]; then
  		echo "got integrate succeeded unexpectedly"
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo -n > $testroot/stdout.expected
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo "got: specified branch must be rebased first" \
  		> $testroot/stderr.expected
  	cmp -s $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_integrate_basic
  run_test test_integrate_requires_rebase_first
  run_test test_integrate_path_prefix
  run_test test_integrate_backwards_in_time
  

Download