From owner-dev-commits-src-main@freebsd.org Wed Mar 3 22:01:26 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CCB5D55239F; Wed, 3 Mar 2021 22:01:26 +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 4DrSd23Y8wz3NmN; Wed, 3 Mar 2021 22:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6ABD31174A; Wed, 3 Mar 2021 22:01:26 +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 123M1Qe2088307; Wed, 3 Mar 2021 22:01:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 123M1Qah088306; Wed, 3 Mar 2021 22:01:26 GMT (envelope-from git) Date: Wed, 3 Mar 2021 22:01:26 GMT Message-Id: <202103032201.123M1Qah088306@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: c49b075305a7 - main - git-arc: Handle commit ranges in the "update" verb 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: c49b075305a7aa1c7f500db1672cd1d2b8066b55 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Mar 2021 22:01:26 -0000 The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c49b075305a7aa1c7f500db1672cd1d2b8066b55 commit c49b075305a7aa1c7f500db1672cd1d2b8066b55 Author: Mark Johnston AuthorDate: 2021-03-03 22:00:58 +0000 Commit: Mark Johnston CommitDate: 2021-03-03 22:00:58 +0000 git-arc: Handle commit ranges in the "update" verb Reported by: imp --- tools/tools/git/git-arc.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 07b042ceb151..c3541e438c9f 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -53,7 +53,7 @@ Commands: list | patch [ ...] stage [-b branch] [|] - update + update [|] Description: Create or manage FreeBSD Phabricator reviews based on git commits. There @@ -500,24 +500,24 @@ gitarc::stage() gitarc::update() { - local commit diff - - commit=$1 - diff=$(commit2diff $commit) - - if ! show_and_prompt $commit; then - return - fi + local commit commits diff + commits=$(build_commit_list $@) save_head + for commit in ${commits}; do + diff=$(commit2diff $commit) - git checkout -q $commit + if ! show_and_prompt $commit; then + break + fi - # The linter is stupid and applies patches to the working copy. - # This would be tolerable if it didn't try to correct "misspelled" variable - # names. - arc diff --allow-untracked --never-apply-patches --update $diff HEAD~ + git checkout -q $commit + # The linter is stupid and applies patches to the working copy. + # This would be tolerable if it didn't try to correct "misspelled" variable + # names. + arc diff --allow-untracked --never-apply-patches --update $diff HEAD~ + done restore_head }