thodg/got/regress/cmdline/add.sh

Tag - branch -mainorigin/HEADorigin/gotwebdorigin/main- tag -0.90.80.720.710.700.70.690.680.670.660.650.640.630.620.610.600.60.590.580.570.560.550.540.530.520.510.500.50.490.480.470.460.450.440.430.420.410.400.40.390.380.370.360.350.340.330.320.310.300.30.290.280.270.260.250.240.230.220.210.200.20.190.180.170.160.150.140.130.120.110.100.1

• Show log

  Commit

• Hash : 6d022e97
  Author :
  Date : 2019-08-04T12:45:17
  

  use get_worktree_paths_from_argv consistently; improves add/rm edge cases Double 'got rm' becomes a no-op like double 'got add' already is, and 'got add' of an already staged file is now an error.

Download

• regress/cmdline/add.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_add_basic {
  	local testroot=`test_init add_basic`
  
  	got checkout $testroot/repo $testroot/wt > /dev/null
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo "new file" > $testroot/wt/foo
  
  	echo 'A  foo' > $testroot/stdout.expected
  	(cd $testroot/wt && got add foo > $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_double_add {
  	local testroot=`test_init double_add`
  
  	got checkout $testroot/repo $testroot/wt > /dev/null
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo "new file" > $testroot/wt/foo
  	(cd $testroot/wt && got add foo > /dev/null)
  
  	(cd $testroot/wt && got add foo)
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		echo "got add failed unexpectedly" >&2
  		test_done "$testroot" 1
  		return 1
  	fi
  
  	test_done "$testroot" "$ret"
  }
  
  function test_add_multiple {
  	local testroot=`test_init multiple_add`
  
  	got checkout $testroot/repo $testroot/wt > /dev/null
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo "new file" > $testroot/wt/foo
  	echo "new file" > $testroot/wt/bar
  	echo "new file" > $testroot/wt/baz
  	(cd $testroot/wt && got add foo bar baz > $testroot/stdout)
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		echo "got add failed unexpectedly" >&2
  		test_done "$testroot" 1
  		return 1
  	fi
  
  	echo "A  foo" > $testroot/stdout.expected
  	echo "A  bar" >> $testroot/stdout.expected
  	echo "A  baz" >> $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_add_file_in_new_subdir {
  	local testroot=`test_init add_file_in_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/new
  	echo "new file" > $testroot/wt/new/foo
  
  	echo 'A  new/foo' > $testroot/stdout.expected
  	(cd $testroot/wt && got add new/foo > $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_add_deleted {
  	local testroot=`test_init add_deleted`
  
  	got checkout $testroot/repo $testroot/wt > /dev/null
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/wt && got rm beta > /dev/null)
  
  	echo -n > $testroot/stdout.expected
  	(cd $testroot/wt && got add beta > $testroot/stdout 2> $testroot/stderr)
  	ret="$?"
  	if [ "$ret" == "0" ]; then
  		echo "got add command succeeded unexpectedly" >&2
  		diff -u $testroot/stdout.expected $testroot/stdout
  		test_done "$testroot" "1"
  		return 1
  	fi
  
  	echo "got: beta: file has unexpected status" > $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_add_basic
  run_test test_double_add
  run_test test_add_multiple
  run_test test_add_file_in_new_subdir
  run_test test_add_deleted
  

Download