From nobody Tue Nov 05 02:11:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjBfj0rL7z5crwY; Tue, 05 Nov 2024 02:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjBfh6KMSz42qc; Tue, 5 Nov 2024 02:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730772716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pMqqipZEaqu4DjP4lVUzAJIKKsKKBdRxyasVQud7QAw=; b=oy7dKZ2rTQ/8tE60ypv/cn4F8DlCXjeHIc9j8q23VrUuC3u+7qUT6DmyzfqWd8oYHv3eZH 5tEeCG5BSrxLXwsxoIqGiqXeDm3VLJ4G+m6Scq35TAYy1WyhfZND1HAXGJTxC7vHAkMvr4 ioN+Gf0CHo1A5bFw8VvhlY6IAkLNjD9LDMMaXTgk0Mfi88HdtTk/h3wxZ2UnebYs+aDwmi B3c3ieJHrI8GIK3z4caCAKnDdmrGVyE1m4yBYCLlFjANUmdsrGbEpD8If/gIBhzYsdUNb9 l6H4J/3QSpnTHjc0zCkZvqMK4w0yOb33Zx+FsWt3lqd9oR9GVLQt9z4W2MuceQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730772716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pMqqipZEaqu4DjP4lVUzAJIKKsKKBdRxyasVQud7QAw=; b=l4M3JyVhSnDAkYbG2iJXZo98S4D0elvq5MlzcLdMmU7ztCq363DaC3RK87ZkxQ0YzTOB+j Zzd3ICzLletRKKhh3UKY+HkG9ZqG87o9eA7tgTcP1PMN6QGi75cjnxLYKcaHgqjmDp8Eqy G9RdMmeSu/otK+s7zrh6ZsXaY6L8wODtqQv2gIfOayOb5n/y/V8NDgIhiKhKpJAamOuSwR fxKIDBDCZ9OuGJ8jBobG5DLXkhOMHC7vVdkwLlSPtzqVSY7zOJwcJdN1wheeUds9NXe1TP ORNO5x1OI8ModSbcNWuQP59aGUGT/TyzxZ+lQ1fItrkGXoViOjceiBBc42s9GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730772716; a=rsa-sha256; cv=none; b=O+RVEIEk+VEQ7kPfN9qZF6IfSNxxAh0UQ0xAt3MiUTXgZY8mnsKgiZjE1VD3hthh4K6shE BJNzSvTu1wlJSUB5dfFjB7C++TQYnE5YDQZHLzGqd4E71vHSR4cE0FjGb+7HTicqhEDhEG 0NxWPnsoPkYxdpfHgnnphSeXNmwYtHeNSY2YaKyzjEpVDML4qRYxhoODMY0aQhn5XEut9Y cAfljWsfooDF1uWYvJFusE487iPQIfuVLjy7XXPzTcBBfMpM9GlLMirMGGxL4ZmnBdM9lH WqVBNwheILE+rHaElZQtKYGrOI/q7Leca2Wwyn6hOv7XK1FXPHbE+zQRtshmlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjBfh5wj3zy8b; Tue, 5 Nov 2024 02:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A52BuNL019904; Tue, 5 Nov 2024 02:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A52BuYr019901; Tue, 5 Nov 2024 02:11:56 GMT (envelope-from git) Date: Tue, 5 Nov 2024 02:11:56 GMT Message-Id: <202411050211.4A52BuYr019901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 019981e00f23 - main - git-arc: Fix typo s/Truning/Turning/ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 019981e00f23b0458067cbd91007f9f03b3b0b7e Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=019981e00f23b0458067cbd91007f9f03b3b0b7e commit 019981e00f23b0458067cbd91007f9f03b3b0b7e Author: Jose Luis Duran AuthorDate: 2024-11-05 01:13:20 +0000 Commit: Jose Luis Duran CommitDate: 2024-11-05 02:10:16 +0000 git-arc: Fix typo s/Truning/Turning/ While here standardize white space. No functional change. Approved by: emaste (mentor) --- tools/tools/git/git-arc.sh | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index f3cae28e3009..0df4ac4cd5fc 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -101,10 +101,10 @@ Config Variables: Defaults to false. arc.list [bool] -- Always use "list mode" (-l) with create and update. - In this mode, the list of git revisions to use + In this mode, the list of git revisions to use is listed with a single prompt before creating or updating reviews. The diffs for individual commits - are not shown. + are not shown. arc.verbose [bool] -- Verbose output. Equivalent to the -v flag. @@ -205,7 +205,7 @@ diff2status() arc_call_conduit -- phid.lookup > "$tmp" status=$(jq -r "select(.response != []) | .response.${diff}.status" < "$tmp") summary=$(jq -r "select(.response != []) | - .response.${diff}.fullName" < "$tmp") + .response.${diff}.fullName" < "$tmp") printf "%-14s %s\n" "${status}" "${summary}" } @@ -305,7 +305,7 @@ create_one_review() "type": "parents.add", "value": ["'"${parentphid}"'"] } - ]}' | + ]}' | arc_call_conduit -- differential.revision.edit >&3 fi rm -f "$msg" @@ -321,15 +321,15 @@ diff2reviewers() reviewid=$(diff2phid "$diff") userids=$( \ echo '{ - "constraints": {"phids": ["'"$reviewid"'"]}, - "attachments": {"reviewers": true} - }' | + "constraints": {"phids": ["'"$reviewid"'"]}, + "attachments": {"reviewers": true} + }' | arc_call_conduit -- differential.revision.search | jq '.response.data[0].attachments.reviewers.reviewers[] | select(.status == "accepted").reviewerPHID') if [ -n "$userids" ]; then echo '{ - "constraints": {"phids": ['"$(printf "%s" "$userids" | tr '[:space:]' ',')"']} - }' | + "constraints": {"phids": ['"$(printf "%s" "$userids" | tr '[:space:]' ',')"']} + }' | arc_call_conduit -- user.search | jq -r '.response.data[].fields.username' fi @@ -427,7 +427,7 @@ gitarc__create() for commit in ${commits}; do if create_one_review "$commit" "$reviewers" "$subscribers" "$prev" \ - "$doprompt"; then + "$doprompt"; then prev=$(commit2diff "$commit") else prev="" @@ -448,8 +448,8 @@ gitarc__list() diff=$(log2diff "$commit") if [ -n "$diff" ]; then - diff2status "$diff" - continue + diff2status "$diff" + continue fi # This does not use commit2diff as it needs to handle errors @@ -457,7 +457,7 @@ gitarc__list() title=$(git show -s --format=%s "$commit") diff=$(echo "$openrevs" | \ awk -F'D[1-9][0-9]*: ' \ - '{if ($2 == "'"$(echo $title | sed 's/"/\\"/g')"'") print $0}') + '{if ($2 == "'"$(echo $title | sed 's/"/\\"/g')"'") print $0}') if [ -z "$diff" ]; then echo "No Review : $title" elif [ "$(echo "$diff" | wc -l)" -ne 1 ]; then @@ -491,7 +491,7 @@ find_author() # freebsd.org (which isn't surprising for ports committers getting src # commits reviewed). case "${addr}" in - *.*) ;; # external user + *.*) ;; # external user *) echo "${name} <${addr}@FreeBSD.org>" return @@ -532,7 +532,7 @@ find_author() # don't know if the prior _ are _ or + or any number of other characters. # Since there's issues here, prompt a=$(printf "%s <%s>\n" "${name}" $(echo "$addr" | sed -e 's/\(.*\)_/\1@/')) - echo "Making best guess: Truning ${addr} to ${a}" + echo "Making best guess: Turning ${addr} to ${a}" if ! prompt; then echo "ABORT" return @@ -587,8 +587,8 @@ patch_commit() # If we had to guess, and the user didn't want to guess, abort if [ "${author}" = "ABORT" ]; then - warn "Not committing due to uncertainty over author name" - exit 1 + warn "Not committing due to uncertainty over author name" + exit 1 fi tmp=$(mktemp) @@ -620,7 +620,7 @@ gitarc__patch() while getopts c o; do case "$o" in c) - require_clean_work_tree "patch -c" + require_clean_work_tree "patch -c" commit=true ;; *) @@ -634,9 +634,9 @@ gitarc__patch() arc patch --skip-dependencies --nocommit --nobranch --force "$rev" echo "Applying ${rev}..." [ $? -eq 0 ] || break - if ${commit}; then - patch_commit $rev - fi + if ${commit}; then + patch_commit $rev + fi done }