From nobody Thu Dec 12 18:29:17 2024 X-Original-To: dev-commits-ports-all@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 4Y8LbL1sDdz5gbQK; Thu, 12 Dec 2024 18:29:18 +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 4Y8LbL15bNz42Pm; Thu, 12 Dec 2024 18:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734028158; 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=Zb1FOb4KHcaTZg0nw5OdsJtLY5GSAeLXpgTbNalDkn4=; b=ZTcw80FAfOoujwMpKIIF6QUQJpazmgxBbs12RJcvdubN7Ib/+DRrSSJtoU1PRyny7vtJS/ 9i7NgwrkuwssQd16q/87KrjEBh/h+lb7yGikAGGOrUEWqLI0xM4rLy3yYHpQHOq3pubySE UfzXNBt2S5HF02OjC9Z8DXe/Uy8F8ROcTSay7n83GOS2yu/RHMvX1DTbtAtXWhGTXOpAQr zA54G49lJibM0CDmwLhfhtqCs4zHeeXq/Qvew49ZZzC48yPjEgJSugAM++l5brOiE98Hyr DYlcQbdqGFDaf+rPIsZH4PqUrLOHN22ixBNiJmBt1Y/lKcAXGDjhNW9XjOfVXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734028158; 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=Zb1FOb4KHcaTZg0nw5OdsJtLY5GSAeLXpgTbNalDkn4=; b=u1zAgZ5qPPDnpHNSti/7nWSyT+G16MbD7Rb9GtaIwO+OMWXqMTov7JsITgytE+xTP5Wixt iYGwI9cE35ZN3R2yex+2ULz8cpENLFc3bKsKtN0XOmsvrYr2AvczI20ccRiLIYf68g7LAP T0TBMN7ngQDHcRCnkVa/dglE7zG34QQ96deBAWS7K1CPeHGRuNV8v5wzaAWPtb+NhrRzea up65kIzGWVcfUzMRY2NM5PpHdqyy0TNNKYlf39fOYspFd8sWtVtIjmPWfuIVvyaMrAIgVB D6A8pbaxtfwYQ9F5jRhsYXLSDwP38QkXREWuCGtrVr4yzdagUQvSsOYjGzVKew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734028158; a=rsa-sha256; cv=none; b=fOQosN+z02gDUExtl14uG9KmLNXpGKSFmwRqbXuECvzMEmzQ17U0xairzoaJMEuZHAqaoE HWhFmV+Etlh8r24yRVHG4N3ZOI3lAvjbM9KbxRzvus9lytGV+NqzjlX01Z2JNP0meSi/PP QOxP9Ks2v9zoAu7Eb7X7M4T557slVIzOTEFIkJsxnDS2koHvuGoDFxdJmgLBKXVK5GQj+p fKByyu1E05DhsUuRjzpy2qNJQLIJWSvKJMVNut9QK4pow2imC55J6n6mph6soNmYwWfMdK 6rAuQo/enVgUw45mBZX1QTJIBDEIs41dcLBERwiGONJBV6G++D0Eriyuqe9KNw== 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 4Y8LbL0g9nz13lv; Thu, 12 Dec 2024 18:29:18 +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 4BCITHbT016420; Thu, 12 Dec 2024 18:29:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCITHon016417; Thu, 12 Dec 2024 18:29:17 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:29:17 GMT Message-Id: <202412121829.4BCITHon016417@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 0c3c67e5ec37 - main - devel/freebsd-git-devtools: Update to 2024-12-03 snapshot, d6ed5ff4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c3c67e5ec37b528bf21fd9828f3be98203169d0 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c3c67e5ec37b528bf21fd9828f3be98203169d0 commit 0c3c67e5ec37b528bf21fd9828f3be98203169d0 Author: Joseph Mingrone AuthorDate: 2024-12-12 15:56:50 +0000 Commit: Joseph Mingrone CommitDate: 2024-12-12 18:26:08 +0000 devel/freebsd-git-devtools: Update to 2024-12-03 snapshot, d6ed5ff4 Base commits since last update: d6ed5ff4ac7d - git-arc: fix diff2reviewers() with multiple reviewers 976ab1425da4 - git-arc: Document how a reviewer group can be referenced 2c2f741363a9 - mfc-candidates: Improve hash expansion 586c651f2baa - mfc_candidates: remove leftover message 48f3fcabea80 - mfc-candidates: Convert to Lua 9e84289f2c7e - git-arc: Prefer echo over printf 2377c19a8c37 - git-arc: Trap on every mktemp 019981e00f23 - git-arc: Fix typo s/Truning/Turning/ aa90b92ac289 - git-arc: Fix find_author() for external users 66a56e411ced - mfc-candidates: Support GitHub mirror naming conventions 3ab8697d9e45 - git-arc: Do not echo unescaped literals to jq 7d875598fc9f - git-arc: Make patch with reviewers more portable c008b8f585b6 - git-arc: minor manpage edits 87e5b17c149e - prepare-commit-msg: add 50 column marker a2c88e0d47ac - git-arc: Use a helper function to fetch boolean config variables 41d6858ebd6a - git-arc.1: list width typo 2f68f6474e41 - git-arc: Add list mode support for the update command While here, update pkg-descr. Sponsored by: The FreeBSD Foundation --- devel/freebsd-git-devtools/Makefile | 31 +++++++++++++------------------ devel/freebsd-git-devtools/distinfo | 18 +++++++++--------- devel/freebsd-git-devtools/pkg-descr | 20 ++++++-------------- 3 files changed, 28 insertions(+), 41 deletions(-) diff --git a/devel/freebsd-git-devtools/Makefile b/devel/freebsd-git-devtools/Makefile index 071b5ffd2108..68b0bee4a6e2 100644 --- a/devel/freebsd-git-devtools/Makefile +++ b/devel/freebsd-git-devtools/Makefile @@ -1,15 +1,15 @@ PORTNAME= freebsd-git-devtools -PORTVERSION= 20240422 +PORTVERSION= 20241203 CATEGORIES= devel -MASTER_SITES= https://cgit.freebsd.org/src/plain/tools/tools/git/ -DISTFILES= candidatematch.lua?id=${_REV} \ - git-arc.sh?id=${_REV} \ - git-arc.1?id=${_REV} \ - mfc-candidates.sh?id=${_REV} -DIST_SUBDIR= ${PORTNAME} +MASTER_SITES= https://raw.githubusercontent.com/freebsd/freebsd-src/${_REV}/tools/tools/git/ +DISTFILES= git-arc.sh \ + git-arc.1 \ + mfc-candidates.lua \ + mfc-candidates.sh +DIST_SUBDIR= ${PORTNAME}_${_REV} MAINTAINER= jrm@FreeBSD.org -COMMENT= Simple Git tools from the FreeBSD src tree +COMMENT= Simple Git tools from the FreeBSD src repository LICENSE= BSD2CLAUSE @@ -18,7 +18,7 @@ RUN_DEPENDS= arc:devel/arcanist \ jq:textproc/jq USES= lua shebangfix -SHEBANG_FILES= candidatematch.lua?id=${_REV} +SHEBANG_FILES= mfc-candidates.lua lua_OLD_CMD= /usr/libexec/flua EXTRACT_CMD= ${CP} @@ -29,21 +29,16 @@ NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_FILES= bin/candidatematch.lua \ - bin/git-arc \ +PLIST_FILES= bin/git-arc \ bin/mfc-candidates \ + bin/mfc-candidates.lua \ share/man/man1/git-arc.1.gz -_REV= 76a8625bc71da3fa63eef5abb4782553d2588f5c - -post-patch: - for f in ${WRKSRC}/*\?id=*; do \ - nn=$$(${ECHO_CMD} $$f | ${SED} -e s/\?id=.*//); ${MV} $$f $$nn; \ - done +_REV= d6ed5ff4ac7d9610385b35f77539ccf5bae8cc65 do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/candidatematch.lua ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKSRC}/git-arc.sh ${STAGEDIR}${PREFIX}/bin/git-arc + ${INSTALL_SCRIPT} ${WRKSRC}/mfc-candidates.lua ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKSRC}/mfc-candidates.sh ${STAGEDIR}${PREFIX}/bin/mfc-candidates ${INSTALL_MAN} ${WRKSRC}/git-arc.1 ${STAGEDIR}${PREFIX}/share/man/man1/ diff --git a/devel/freebsd-git-devtools/distinfo b/devel/freebsd-git-devtools/distinfo index 05109017e881..6c5f5bf29d0f 100644 --- a/devel/freebsd-git-devtools/distinfo +++ b/devel/freebsd-git-devtools/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1715004431 -SHA256 (freebsd-git-devtools/candidatematch.lua?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 36098f6871d1ed79ed588bd8a7bb906a5f5ab291e2e3fe32aad2adf096142918 -SIZE (freebsd-git-devtools/candidatematch.lua?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 1748 -SHA256 (freebsd-git-devtools/git-arc.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 2125d0a57c522ab24a43091f851dbdd9b33633699eef84195c480630301335da -SIZE (freebsd-git-devtools/git-arc.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 23024 -SHA256 (freebsd-git-devtools/git-arc.1?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 3b7660960d39bbe310194f985d5cbc08836cad249e29da0692dfe7945275dc8e -SIZE (freebsd-git-devtools/git-arc.1?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 7469 -SHA256 (freebsd-git-devtools/mfc-candidates.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = adc38b6815d3ba672fc0fc108a79ef76e0e5ce97d027a30b21a189951f3cb1d4 -SIZE (freebsd-git-devtools/mfc-candidates.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 4190 +TIMESTAMP = 1734016872 +SHA256 (freebsd-git-devtools_d6ed5ff4ac7d9610385b35f77539ccf5bae8cc65/git-arc.sh) = 4b00675bb46ab2203df24e35ee7e821f65e437e3c0582b311e4644ce87b81800 +SIZE (freebsd-git-devtools_d6ed5ff4ac7d9610385b35f77539ccf5bae8cc65/git-arc.sh) = 24211 +SHA256 (freebsd-git-devtools_d6ed5ff4ac7d9610385b35f77539ccf5bae8cc65/git-arc.1) = 17059970426de8fdf7a85aaa09e08ab84a90475a9c225301cfb31c62fcdd6fe5 +SIZE (freebsd-git-devtools_d6ed5ff4ac7d9610385b35f77539ccf5bae8cc65/git-arc.1) = 7907 +SHA256 (freebsd-git-devtools_d6ed5ff4ac7d9610385b35f77539ccf5bae8cc65/mfc-candidates.lua) = 0dd5ce88326076dea8ecc625c7d98621a70dba8057038ad17a2b770ddd7cc8ef +SIZE (freebsd-git-devtools_d6ed5ff4ac7d9610385b35f77539ccf5bae8cc65/mfc-candidates.lua) = 5703 +SHA256 (freebsd-git-devtools_d6ed5ff4ac7d9610385b35f77539ccf5bae8cc65/mfc-candidates.sh) = ebc801b5159b5d49fd293838115ae725fe924084c1add4ff5fadf4b6970cdedb +SIZE (freebsd-git-devtools_d6ed5ff4ac7d9610385b35f77539ccf5bae8cc65/mfc-candidates.sh) = 1547 diff --git a/devel/freebsd-git-devtools/pkg-descr b/devel/freebsd-git-devtools/pkg-descr index 0d40d1473097..1a7ab61b6858 100644 --- a/devel/freebsd-git-devtools/pkg-descr +++ b/devel/freebsd-git-devtools/pkg-descr @@ -1,16 +1,8 @@ -The git-arc utility creates and manages FreeBSD Phabricator reviews -based on git commits. It is a git plugin that provides a wrapper around -arc. +freebsd-git-devtools includes tools under tools/tools/git/ in the FreeBSD src +repository: -The arc command has a few limitations that make it awkward for FreeBSD -development: + - git-arc is a git plugin around arc that simplifies the creation and + management of FreeBSD Phabricator reviews. -- Arcanist uses its own commit log template with a format does not match - FreeBSD's template. - -- Arcanist presumes a model where all the commits in a development - branch are uploaded for review as a single Differential revision. - When working on a feature branch with multiple commits, it is usually - more efficient to review each commit individually. - -git-arc mitigates these limitations. + - mfc-candidates compares git commit hashes between branches to identify + potential MFC candidates.