ports/Tools, branch 2021Q2 FreeBSD ports tree https://cgit-dev.freebsd.org/ports/atom?h=2021Q2 2021-04-06T20:56:09Z rmport: ready for git 2021-04-06T20:56:09Z Rene Ladan rene@FreeBSD.org 2021-04-06T20:56:09Z urn:sha1:578d48f1bc1949bd03d0ea4b6ae9750eb9aed43e - 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 rmport: fix and simplify workflow 2021-04-06T15:07:06Z Rene Ladan rene@FreeBSD.org 2021-04-06T15:04:22Z urn:sha1:6d299fa340def7265630d8c2e8343b3bfaf7134b - gather information about the deleted port for the commit message before removing the port. I somehow missed that when testing the script. - Instead of a temporary branch, just operate on the current branch and incorporate upstream changes with git pull --rebase. This prevents one from being stranded on a temporary branch if the script crashes and oblivates the need for a squash merge [1] Suggested by: mat [1] all: Remove all other $FreeBSD keywords. 2021-04-06T14:31:13Z Mathieu Arnold mat@FreeBSD.org 2021-04-06T14:21:47Z urn:sha1:135fdeebb99c3569e42d8162b265e15d29bd937d framework: Remove $FreeBSD$ 2021-04-06T14:27:10Z Mathieu Arnold mat@FreeBSD.org 2021-04-06T11:32:08Z urn:sha1:5d33e045968104ac678d8b4b4ec1e8956bbf68e0 Where appropriate fiddle with a few other things. Tools/scripts/rmport: convert workflow to git. 2021-04-06T10:39:47Z Rene Ladan rene@FreeBSD.org 2021-04-06T10:37:15Z urn:sha1:297cd655811ca6374660d466c2bae8a5887f6b3b Do not push the final result automatically yet, unlike its previous Subversion version. Reviewed by: emaste, mat, uqs Approved by: crees (maintainer, implicit) Differential Revision: https://reviews.freebsd.org/D29451 Tools/scripts/chkversion.pl: remove svn compatibility 2021-04-06T10:39:46Z Rene Ladan rene@FreeBSD.org 2021-04-06T10:35:55Z urn:sha1:88917e9f46660b4839f40f73c01d63f56b613174 Differential Revision: https://reviews.freebsd.org/D29451 Tools/scripts/MOVEDlint.awk: remove svn compatibility 2021-04-06T10:39:46Z Rene Ladan rene@FreeBSD.org 2021-04-06T10:34:04Z urn:sha1:ba2871e5f55530d5087401add7a5bf4d5fa4d671 Reviewed by: uqs Differential Revision: https://reviews.freebsd.org/D29451 Tools/scripts/search_lib_depends_and_bump.sh: remove svn in an echo 2021-04-06T10:39:46Z Rene Ladan rene@FreeBSD.org 2021-04-06T10:32:03Z urn:sha1:68c56c1b4a84e5af10dcd58a691aeb0d435894e1 Differential Revision: https://reviews.freebsd.org/D29451 Remove two tools that are no longer useful with Git. 2021-04-06T10:39:46Z Rene Ladan rene@FreeBSD.org 2021-04-06T10:28:35Z urn:sha1:a4c3b6f622b81ac9a0848c782b4645e0e9dcfcd0 - mfh: this is replaced by 'git cherry-pick -x HASH' - psvn: unlike svn, git has no per-file properties Adjust README accordingly. Differential Revision: https://reviews.freebsd.org/D29451 With hat: portmgr Tools/scripts/tindex: update for git 2021-04-06T09:01:21Z Rene Ladan rene@FreeBSD.org 2021-04-06T09:01:21Z urn:sha1:88a97c47423cfefc85efd108ec31cadef59c19af Reviewed by: uqs Differential Revision: https://reviews.freebsd.org/D29451