From nobody Tue Apr 08 11:00:04 2025 X-Original-To: dev-commits-src-main@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 4ZX3504Mfyz5sChV; Tue, 08 Apr 2025 11:00:04 +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 4ZX3503HFHz3rvT; Tue, 08 Apr 2025 11:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744110004; 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=u/olVQTJn54EgygyXrORJl1btXt0CSH4N+sDbqoWwvc=; b=q8tFnuMZBx7a22hj5GE5IT2FRp7DKVWTtbfnSJ5bxJDTHMxlyyhageNLCZy5E+oE4fGbdW CwuhWGkgq0CBZybn0asQkBUMduB9tsQtFBf1ijO+M6/byewCk1xE0JqsRhsQTTxn5UCTU7 Tm0wBS/2KorkbVx572HkQW37eI5wGB8siu4Y0LTAPXfGdnJ1aCK+bkutqHVIx02Kn5eIvu ce4YpYCJaZCBOy92JdmzkQ3axYf52af1BgGSXj9FqLyzg9wENgXIkHyjRnMUyzG5GoDSBX +7Xrpbdeb5oJ7qxFTzatSKMB8oQmFVq6ClxjyFS7EvC4l4kZQo1aGCTovfDPcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744110004; a=rsa-sha256; cv=none; b=V14KdBWvCDn01R3OmsQS+Qs1xpRsEHjhNGMoMYJBsRcQ1Fs6vzDfebOT7fLr/TXFmm1hAf 8JvicslL5yKVAQKGZKpQC9g3SJfAoq7vNy7AL9lXppU8BwbV5KcuaRCExNd3hltW8ezlXC A/9haH8eRGSdwK14/62/ZYRkTF1saGBQOHk3IEpHURjWKCNg9dB2B0sbHzY/efDJqmkDKY qga4UZ53G3Zz3mDN0kHp60zEH6hLxqYQ8uhiEKsKS2E2PY7jkp6bKQ/KqCpo+OpxSjYNOX srX1Lx6D1YQhT9EFVZsJA6PvRUV6qir7rFoiq9ANfRtGdHf66ewxUXyfYgEwtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744110004; 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=u/olVQTJn54EgygyXrORJl1btXt0CSH4N+sDbqoWwvc=; b=YQ9ZAtuAZo2AybYjelma6bMdryNSBc9zvdcSWhisqFpbELDZc1hHYU2WJAE7FkxhXfqMpt US8aqjD+//YoPNHRQ548y5kur45G86uRyOzcADFu91+6r9EG9gvNcl6iiz7/n5sODog83N GmmQ2hqd+OcTYX+h4+j+H8fkc9CvAtvEUBUPgeDafM4p4aiYp9S4RKSaOMo2IbZ6QJoYqf dJwRkbNL+HQm6QcisOUdHPLtvp5TqUFL4Z6caNLzqmKexOwn+gCb5RjeuKC1Umh1myC25e 4lLQ/jTivpwzdLm/Ww74v1Y2BUlkDSpdx7YiGVrB+M3d4+Zq2Sd9HbvTdgvbTQ== 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 4ZX3502sGpzChF; Tue, 08 Apr 2025 11:00:04 +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 538B04wS024390; Tue, 8 Apr 2025 11:00:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538B0492024385; Tue, 8 Apr 2025 11:00:04 GMT (envelope-from git) Date: Tue, 8 Apr 2025 11:00:04 GMT Message-Id: <202504081100.538B0492024385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 960c12f7d5aa - main - Revert "WIP: Cross-user git arc stage" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 960c12f7d5aab90f6963f7f629f8ec55ce767af2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=960c12f7d5aab90f6963f7f629f8ec55ce767af2 commit 960c12f7d5aab90f6963f7f629f8ec55ce767af2 Author: Andrew Turner AuthorDate: 2025-04-08 10:59:26 +0000 Commit: Andrew Turner CommitDate: 2025-04-08 10:59:26 +0000 Revert "WIP: Cross-user git arc stage" It shouldn't have been pushed This reverts commit 4ed2c3f9ce28df401fc427bd60a8e3d9ecb40f4d. --- tools/tools/git/git-arc.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 9bee35831844..7d2387565b9a 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -243,18 +243,12 @@ title2diff() local title title=$(echo $1 | sed 's/"/\\"/g') - #arc_list --no-ansi | - # awk -F': ' '{ - # if (substr($0, index($0, FS) + length(FS)) == "'"$title"'") { - # print substr($1, match($1, "D[1-9][0-9]*")) - # } - # }' - - echo "{ - \"queryKey\": \"all\", - \"constraints\": { \"query\": \"title:${title}\" } }" | - arc_call_conduit -- differential.revision.search | - jq -r ".response.data[] | select(.fields.title=\"${title}\") | @text \"D\( .id )\"" + arc_list --no-ansi | + awk -F': ' '{ + if (substr($0, index($0, FS) + length(FS)) == "'"$title"'") { + print substr($1, match($1, "D[1-9][0-9]*")) + } + }' } commit2diff()