"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
Mark Jamsek <mark@jamsek.com>
Subject:
Re: uppercase for got cy/bo -X output
To:
gameoftrees@openbsd.org
Date:
Sat, 28 Jan 2023 23:23:41 +1100

Download raw body.

Thread
On 23-01-28 12:29PM, Stefan Sperling wrote:
> This is more consistent with other commands such as ref -d.
> 
> ok?

ok

> diff /home/stsp/src/got
> commit - 9a8e357c727600cb61ac6ec4c83259fa6d9a3081
> path + /home/stsp/src/got
> blob - 326ea521fa760c8c7507f7ebcb14de2cc202defc
> file + got/got.c
> --- got/got.c
> +++ got/got.c
> @@ -9867,7 +9867,7 @@ process_logmsg_refs(const char *ref_prefix, size_t pre
>  				err = got_ref_delete(re->ref, repo);
>  				if (err)
>  					goto done;
> -				printf("deleted: ");
> +				printf("Deleted: ");
>  				err = print_commit_oneline(commit, id, repo,
>  				    refs_idmap);
>  			} else {
> blob - 60c2fe2112e4894fe1de34af7dbac25645575419
> file + regress/cmdline/backout.sh
> --- regress/cmdline/backout.sh
> +++ regress/cmdline/backout.sh
> @@ -297,7 +297,7 @@ test_backout_logmsg_ref() {
>  			printf "$changeset\n\n" >> $testroot/stdout.expected
>  
>  			# for forthcoming wt 'backout -X' test
> -			echo "deleted: $ymd $short_id $logmsg" >> \
> +			echo "Deleted: $ymd $short_id $logmsg" >> \
>  			    $testroot/stdout.wt_deleted
>  		else
>  			echo "commit $r (newbranch)" \
> @@ -308,7 +308,7 @@ test_backout_logmsg_ref() {
>  			printf "$changeset2\n\n" >> $testroot/stdout.expected
>  
>  			# for forthcoming wt 'backout -X' test
> -			echo "deleted: $ymd2 $short_id2 $logmsg2" >> \
> +			echo "Deleted: $ymd2 $short_id2 $logmsg2" >> \
>  			    $testroot/stdout.wt_deleted
>  		fi
>  	done
> @@ -453,7 +453,7 @@ test_backout_logmsg_ref() {
>  	ymd=`date -u -r $b2_commit_time +"%F"`
>  	short_id=$(printf '%.7s' $branch2_rev)
>  
> -	echo "deleted: $ymd $short_id $b2_logmsg" > $testroot/stdout.expected
> +	echo "Deleted: $ymd $short_id $b2_logmsg" > $testroot/stdout.expected
>  	(cd $testroot/wt2 && got backout -X $branch2_rev > $testroot/stdout)
>  
>  	cmp -s $testroot/stdout.expected $testroot/stdout
> @@ -508,7 +508,7 @@ test_backout_logmsg_ref() {
>  
>  	# ensure we can delete work tree refs from the repository dir
>  	ymd=`date -u -r $b2_commit_time2 +"%F"`
> -	echo "deleted: $ymd newbranch2 $b2_logmsg2" > $testroot/stdout.expected
> +	echo "Deleted: $ymd newbranch2 $b2_logmsg2" > $testroot/stdout.expected
>  	(cd $testroot/repo && got backout -X > $testroot/stdout)
>  
>  	cmp -s $testroot/stdout.expected $testroot/stdout
> blob - d36bcf4ddec05c9f151ca0e3e270926eb27b2b2c
> file + regress/cmdline/cherrypick.sh
> --- regress/cmdline/cherrypick.sh
> +++ regress/cmdline/cherrypick.sh
> @@ -1780,7 +1780,7 @@ test_cherrypick_logmsg_ref() {
>  			printf "$changeset\n\n" >> $testroot/stdout.expected
>  
>  			# for forthcoming wt 'cherrypick -X' test
> -			echo "deleted: $ymd $short_id $logmsg" >> \
> +			echo "Deleted: $ymd $short_id $logmsg" >> \
>  			    $testroot/stdout.wt_deleted
>  		else
>  			echo "commit $r (newbranch)" \
> @@ -1791,7 +1791,7 @@ test_cherrypick_logmsg_ref() {
>  			printf "$changeset2\n\n" >> $testroot/stdout.expected
>  
>  			# for forthcoming wt 'cherrypick -X' test
> -			echo "deleted: $ymd2 $short_id2 $logmsg2" >> \
> +			echo "Deleted: $ymd2 $short_id2 $logmsg2" >> \
>  			    $testroot/stdout.wt_deleted
>  		fi
>  	done
> @@ -1936,7 +1936,7 @@ test_cherrypick_logmsg_ref() {
>  	ymd=`date -u -r $b2_commit_time +"%F"`
>  	short_id=$(printf '%.7s' $branch2_rev)
>  
> -	echo "deleted: $ymd $short_id $b2_logmsg" > $testroot/stdout.expected
> +	echo "Deleted: $ymd $short_id $b2_logmsg" > $testroot/stdout.expected
>  	(cd $testroot/wt2 && got cherrypick -X $branch2_rev > $testroot/stdout)
>  
>  	cmp -s $testroot/stdout.expected $testroot/stdout
> @@ -1991,7 +1991,7 @@ test_cherrypick_logmsg_ref() {
>  
>  	# ensure we can delete work tree refs from the repository dir
>  	ymd=`date -u -r $b2_commit_time2 +"%F"`
> -	echo "deleted: $ymd newbranch2 $b2_logmsg2" > $testroot/stdout.expected
> +	echo "Deleted: $ymd newbranch2 $b2_logmsg2" > $testroot/stdout.expected
>  	(cd $testroot/repo && got cherrypick -X > $testroot/stdout)
>  
>  	cmp -s $testroot/stdout.expected $testroot/stdout
> 

-- 
Mark Jamsek <fnc.bsdbox.org>
GPG: F2FF 13DE 6A06 C471 CA80  E6E2 2930 DC66 86EE CF68