From owner-dev-commits-ports-all@freebsd.org Tue Apr 6 20:59:23 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 98CEA5BE158; Tue, 6 Apr 2021 20:59:23 +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 4FFKdl3cNHz4vKv; Tue, 6 Apr 2021 20:59:23 +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 6EE0F13208; Tue, 6 Apr 2021 20:59:23 +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 136KxNRF031657; Tue, 6 Apr 2021 20:59:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136KxNqm031656; Tue, 6 Apr 2021 20:59:23 GMT (envelope-from git) Date: Tue, 6 Apr 2021 20:59:23 GMT Message-Id: <202104062059.136KxNqm031656@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 578d48f1bc19 - main - rmport: ready for git MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 578d48f1bc1949bd03d0ea4b6ae9750eb9aed43e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 20:59:23 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=578d48f1bc1949bd03d0ea4b6ae9750eb9aed43e commit 578d48f1bc1949bd03d0ea4b6ae9750eb9aed43e Author: Rene Ladan AuthorDate: 2021-04-06 20:56:09 +0000 Commit: Rene Ladan CommitDate: 2021-04-06 20:56:09 +0000 rmport: ready for git - do not remove ports immediately but store them in a temporary file and remove them once the script has iterated over all ports to be removed. This prevents failed searches. The Subversion version used a temporary worktree so the main tree was unaffected. - remove a "merge" from a question, we use rebase now. - check if INDEX is readable and exit if not --- Tools/scripts/rmport | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Tools/scripts/rmport b/Tools/scripts/rmport index 840bb2d5ddb5..2b4a1c579150 100755 --- a/Tools/scripts/rmport +++ b/Tools/scripts/rmport @@ -307,9 +307,9 @@ rm_port() { catport=${1} - log "${catport}: removing port's files" + log "${catport}: scheduling port removal" - ${GIT} rm -r ${catport} + echo ${catport} >> ${gitrmlist} } append_Template() @@ -337,7 +337,7 @@ append_Template() commit() { ${GIT} commit --file=${gitlog} - answer=$(ask "Do you want to merge and tweak the commit message") + answer=$(ask "Do you want to tweak the commit message") if [ "${answer}" = "y" ] ; then ${GIT} pull --ff-only --rebase 2>&1 ${GIT} commit 2>&1 # modify final commit message @@ -349,7 +349,7 @@ cleanup() { log "cleaning up" - rm -f ${gitlog} + rm -f ${gitlog} ${gitrmlist} } usage() @@ -380,6 +380,11 @@ if ! ${GIT} diff --exit-code remotes/origin/main ; then echo "you have local commits, exiting" >&2 exit fi +if [ ! -r ${INDEX} ] ; then + echo "${INDEX} not readable, exiting" >&2 + exit +fi + git_dir="$(${GIT} rev-parse --git-dir)" exitcode=$? if [ ${exitcode} -ne 0 ] ; then @@ -427,6 +432,10 @@ if [ ${1} = "-a" ] ; then fi gitlog=$(mktemp -t gitlog) +gitrmlist=$(mktemp -t gitrmlist) + +echo "Remove expired ports:" > ${gitlog} +echo "" >> ${gitlog} for catport in $* ; do # convert to category/port @@ -458,6 +467,12 @@ for catport in $* ; do rm_port ${catport} done +if [ -s ${gitrmlist} ] ; then + ${GIT} rm -r $(cat ${gitrmlist}) +else + log "No port directories to remove" +fi + # give a chance to the committer to edit files by hand and recreate/review # the diff afterwards answer=y