commit 46f87436943043a275185ab51e86b849d9f27229
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Sat Jan 28 15:18:01 2023 UTC

uppercase cherrypick/backout -X progress output

ok jamsek

commit - eb5dc07888e8e878e5ef3fa2cf3ee77c4e902d13
commit + 46f87436943043a275185ab51e86b849d9f27229
blob - db0b51471a774f72fbcb9b3b7f40ee506dae91eb
blob + 7a447bce3639ee65e3fa19a58c84e4049de3e13c
--- got/got.c
+++ got/got.c
@@ -9897,7 +9897,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
blob + bf66824996f21369543f644f760e178198b0d78a
--- 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 - 8a861780333557633bdd015da7d42bc5120d69fb
blob + 1ebdbbbe9c9da6b114aecf7543f38a54648be240
--- 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