From nobody Mon Feb 14 15:07:05 2022 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 BD1D119B42F8; Mon, 14 Feb 2022 15:07:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jy6yL2q9Mz3DJ2; Mon, 14 Feb 2022 15:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644851226; 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=7uHYN97W3vu16Q6bQH+V5rcA5DpWhzu3cYkI0sVXDHA=; b=GHgPaXA99P5xmLzB8BCRPgvTRB4qksXl/7dcM59+QhzRweN88zmdIzOt5ouyXGtLYV+0Nm fz2aUziDYsMT1/Yb0XxPh09BnLxzDVKrOXx8rV9dwG14Hgt9JfQpd+eEeHN6/56T2x7i6P w+K/ve76V/GHTlkVV+21SJPKABBhA+2WHn7rfv97/K+yt6bZqeu6nU6HALbPwNTNzr2vpJ 92rYvgnFFTx33IkGj2hcxd3AXiNHZSHOAfj1zPAsylW9jnvQKD2H89y+e+p812rHtuhpt6 M/WO134x4yuJzESbveiCeCzr0NM/RJ2mM+bYan2cYOD2jMQWxYKoYqh+EZXAMg== 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 004A910FC3; Mon, 14 Feb 2022 15:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21EF756Y060132; Mon, 14 Feb 2022 15:07:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21EF75rC060131; Mon, 14 Feb 2022 15:07:05 GMT (envelope-from git) Date: Mon, 14 Feb 2022 15:07:05 GMT Message-Id: <202202141507.21EF75rC060131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 99589993ceb5 - main - git-arc: Fix review title matching 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99589993ceb5e6ec2511f29899e75bab1ef2f325 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644851226; 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=7uHYN97W3vu16Q6bQH+V5rcA5DpWhzu3cYkI0sVXDHA=; b=Np+8vHRXo0/oOUuePhQ422PM0gUTLZZXfpjXz7ybCiff2QkZ6qTCX+2Q4I2uvf0bxH0jFU UvcbuK81coCMUs9w2q5Y4j4ScOkHwuTWQee1CPfyAr4bhp7qlFA9w80+VFMy+iESw8DvQg tE1iUHTCowFrHabimKPdtnbXYSu4PT/3Z/eWOOXiHeTvv6gQqkNpR58iKIa7xSJaF8cqBO S2iZgIFdb4PIj/Q3Ym+ctfTaQHYzGLd4K8jVjfOvx51r2OtHvfAeAyC39EA9RTQcbvjOWO csoJTRCK1LnzbyldKbmScHMTPhN2DQPnMbgsWDPf8iZ6h1ICHI2JqwPDzBU7zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644851226; a=rsa-sha256; cv=none; b=thW6OEiVBRmXTqjqBYrjx6vzOtN1AKofusZQAYobpLK2iSYJPPcUcXbxKJh27ngEUL/O+S YpEO2kxr+tgzVK8XIsJgQZox7PrCXeCAkYlJiggcEfPfeGBnKuHhr8479FBrd7XoDk7ITY IoH0gIyFP6UfSAytfMs6v+O2E9lgbYflcN9mq+VWZEQmj9jD2qaiLhVtRTuP+xxgl3141l 4p4VMslMw8XUro9xz0mD8VNZ4M6nMVTztC6GfWq5eA+C8UQoiDqS7niv41h4dMbw7Y3JKB 5o11y/dG3f2dhHGlDpxUYAeWmVYFe8EsmHEhDFJGBTZ7SLglFU/PN07O1oS60g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=99589993ceb5e6ec2511f29899e75bab1ef2f325 commit 99589993ceb5e6ec2511f29899e75bab1ef2f325 Author: Mark Johnston AuthorDate: 2022-02-14 14:41:49 +0000 Commit: Mark Johnston CommitDate: 2022-02-14 15:06:47 +0000 git-arc: Fix review title matching Properly handle the case where the title of one commit is a suffix or prefix of the title of a second commit, and one wishes to create reviews for both. Reported by: chuck --- tools/tools/git/git-arc.sh | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 35a815ece137..835fbd91a7a1 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -187,6 +187,22 @@ log2diff() fi } +# Look for an open revision with a title equal to the input string. Return +# a possibly empty list of Differential revision IDs. +title2diff() +{ + local title + + title=$1 + # arc list output always includes ANSI escape sequences, strip them. + arc list | sed 's/\x1b\[[0-9;]*m//g' | \ + awk -F': ' '{ + if (substr($0, index($0, FS) + length(FS)) == "'"$title"'") { + print substr($1, match($1, "D[1-9][0-9]*")) + } + }' +} + commit2diff() { local commit diff title @@ -204,7 +220,7 @@ commit2diff() # Second, search the open reviews returned by 'arc list' looking # for a subject match. title=$(git show -s --format=%s "$commit") - diff=$(arc list | grep -F "$title" | grep -E -o 'D[1-9][0-9]*:' | tr -d ':') + diff=$(title2diff "$title") if [ -z "$diff" ]; then err "could not find review for '${title}'" elif [ "$(echo "$diff" | wc -l)" -ne 1 ]; then @@ -408,9 +424,10 @@ gitarc__create() gitarc__list() { - local chash commit commits diff title + local chash commit commits diff openrevs title commits=$(build_commit_list "$@") + openrevs=$(arc list) for commit in $commits; do chash=$(git show -s --format='%C(auto)%h' "$commit") @@ -423,10 +440,10 @@ gitarc__list() fi # This does not use commit2diff as it needs to handle errors - # differently and keep the entire status. The extra 'cat' - # after 'fgrep' avoids erroring due to -e. + # differently and keep the entire status. title=$(git show -s --format=%s "$commit") - diff=$(arc list | grep -F "$title" | cat) + diff=$(echo "$openrevs" | \ + awk -F'D[1-9][0-9]*:\.\\[m ' '{if ($2 == "'"$title"'") print $0}') if [ -z "$diff" ]; then echo "No Review : $title" elif [ "$(echo "$diff" | wc -l)" -ne 1 ]; then @@ -456,7 +473,7 @@ gitarc__patch() gitarc__stage() { - local author branch commit commits diff reviewers tmp + local author branch commit commits diff reviewers title tmp branch=main while getopts b: o; do @@ -482,8 +499,8 @@ gitarc__stage() tmp=$(mktemp) for commit in $commits; do git show -s --format=%B "$commit" > "$tmp" - diff=$(arc list | grep -F "$(git show -s --format=%s "$commit")" | - grep -E -o 'D[1-9][0-9]*:' | tr -d ':') + title=$(git show -s --format=%s "$commit") + diff=$(title2diff "$title") if [ -n "$diff" ]; then # XXX this leaves an extra newline in some cases. reviewers=$(diff2reviewers "$diff" | sed '/^$/d' | paste -sd ',' - | sed 's/,/, /g')