From owner-freebsd-git@freebsd.org Wed Jul 22 21:05:24 2020 Return-Path: Delivered-To: freebsd-git@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 89B2E360AFF for ; Wed, 22 Jul 2020 21:05:24 +0000 (UTC) (envelope-from dan@langille.org) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BBnzl2NT7z4lgK; Wed, 22 Jul 2020 21:05:23 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id C1F645C00FC; Wed, 22 Jul 2020 17:05:22 -0400 (EDT) Received: from imap36 ([10.202.2.86]) by compute2.internal (MEProxy); Wed, 22 Jul 2020 17:05:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= mime-version:message-id:in-reply-to:references:date:from:to:cc :subject:content-type:content-transfer-encoding; s=fm1; bh=xLwC0 ElQEg0ZWBcTBsXS931uHQNE377H34jTNBqs9fg=; b=ViJk8iAwMPfFoO0XZ1jvi AY1cH/Uy/oJKCbxPUN1EJTV7EFwCpGeEFyfywAq2ix+uElNSb6+Ek4jKjO0zwHlc H2IfgciRiNt4II0JDzdmlX4dzmCa2SxVBqWY6YHXMAXNYYKDMy8XNccFEb5xKJeG iTq/cAWdgznWcAdQ+mJiKpg/t+dspcI8I7D8SKMo8IgfGgRk5G+95Dv1FLNkvhi8 Qifdm7B/1K0sUZFqM43BZtaFCGMBLETnbyEL7uyZMWxPCDUkDnZ6PPhsV8XGHqRs C+l2Xm4Xxx83EtfEq+eYbsrJVvm0ilbB0aKz/qB0J+612BE17meoasPCXKKNe7Ya A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=xLwC0ElQEg0ZWBcTBsXS931uHQNE377H34jTNBqs9 fg=; b=eBV//okq2j1teRF4kXl7cLTuJhf73VjaQQfaA0RJ9ZD8hRAKk7xNAeXNO 7IYvFfaNeH9UsKJ7kHGInDvfI0LWEptcLNC/V5Fp33HeP6gRrCTTNideXOi/VJjL RKOxC5TPA6+1B0Gk97diQrcSGXocIprvdmDGltNsR8fOctYzFA+qwlwRyooU2Ry3 1xFYg+XP/0asPyTnsK7599YOURvAvFg0ILCVjtLDyy2BvWnxeMjvlDkik4c1VbOD uv9b0JBha9YNlBLEkpAjAnTkSXU82An8DVQsnISSyPexhV7ZklnR75fPUEJ+XVl8 jw0B4perTefN4Oiya7G6yunWm2IPQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrgeelgdduheegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvufgtgfesth hqredtreerjeenucfhrhhomhepfdffrghnucfnrghnghhilhhlvgdfuceouggrnheslhgr nhhgihhllhgvrdhorhhgqeenucggtffrrghtthgvrhhnpeeuffeuheelledttdfhudefge efgefhvdeigeeuudegledvleelhfeftddvfffhgeenucffohhmrghinhepfhhrvghshhhp ohhrthhsrdhorhhgpdhgihhthhhusgdrtghomhdpfhhrvggvsghsugdrohhrghenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegurghnsehlrghn ghhilhhlvgdrohhrgh X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 54F171880067; Wed, 22 Jul 2020 17:05:22 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.0-92-g11c785d-fm-20200721.004-g11c785d5 Mime-Version: 1.0 Message-Id: <33a7ddfa-224e-4834-af59-f0794e6232d7@www.fastmail.com> In-Reply-To: <20200722171717.GG16439@acme.spoerlein.net> References: <3c7b8854-f5e8-4c72-acb3-f1147eae9df3@www.fastmail.com> <20200722171717.GG16439@acme.spoerlein.net> Date: Wed, 22 Jul 2020 17:05:02 -0400 From: "Dan Langille" To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: freebsd-git@freebsd.org Subject: Re: FreshPorts status update 2020.07.21 Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4BBnzl2NT7z4lgK X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm1 header.b=ViJk8iAw; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=eBV//okq; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 66.111.4.25 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-2.65 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.96)[-0.961]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm1,messagingengine.com:s=fm3]; XM_UA_NO_VERSION(0.01)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.25]; NEURAL_HAM_LONG(-0.98)[-0.984]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.25:from]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-0.62)[-0.617]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; MID_RHS_WWW(0.50)[]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.25:from] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2020 21:05:24 -0000 On Wed, Jul 22, 2020, at 1:17 PM, Ulrich Sp=C3=B6rlein wrote: > On Tue, 2020-07-21 at 20:02:48 -0400, Dan Langille wrote: > > Hello, > >=20 > > At present, devgit.FreshPorts.org is keeping up with all port commit= s. =20 > >=20 > > Processing is initiated manually. I run a script to set some flags. = This could be run by a commit-hook pulling a URL. FreshPorts can do the= rest. I welcome discussion on how to do this. > >=20 > > I'd rather keep the URL private, for less abuse-potential. We could= add in some auth or ACL. Invoking the URL will get FreshPorts to query= the FreeBSD repo. > >=20 > >=20 > > I've posted the following issue at https://github.com/FreshPorts/git= _proc_commit/issues/23 > >=20 > > ### > > I am having trouble detecting a port delete or copy. Under subversio= n, as seen at https://svnweb.freebsd.org/ports?view=3Drevision&revision=3D= 542761, you get a deleted notice. > >=20 > > In the email (https://docs.freebsd.org/cgi/getmsg.cgi?fetch=3D132696= 0+0+current/svn-ports-head) this turns up as: head/net/kdav/ under Delet= ed. > >=20 > > In git, it does not, from what I can tell. I can find: > >=20 > > $ grep net/kda 2020.07.21.17.15.38.000000.d016c9140a6e4b7627d2648592= 6a659f2686185d.xml > > - net/kdav became a framework and was therefore moved to net/kf5-kda= v. > > > > > > > >=20 > > (Sorry, the above is the XML generated by https://github.com/FreshPo= rts/git_proc_commit/blob/master/git-to-freshports/git-to-freshports-xml.= py) > >=20 > > Knowing that a file has been deleted within a commit is vital. Detec= ting it from within the commit log is the optimal approach. Does anythin= g have a suggestion here? > >=20 > > I can see that the Makefile & pkg-plist have been renamed, and disti= nfo has been deleted. Perhaps it's just a matter of changing my approach= . However, this does not yet sound like a solid plan. > >=20 > > I welcome suggestions for something I have missed in the git interfa= ce please. >=20 > I don't know how stable these interfaces and outputs are in git over > time, but you can get the full diff with git log -p or git show -p and= > could feed that through, say diffstat. >=20 > A better approach might be to use --compact-summary (see the git log > manpage for some possible outputs and variants of it). >=20 > (I'm using --format here to suppress printing of the commit message, > which might mess up parsing the output we're actually interested in) >=20 > $ git show --compact-summary --format=3D%h=20 > 44b2876caf1f56d6e940a329a2f8e06724fd621f > 44b2876caf1f >=20 > MOVED | 1 + > devel/Makefile | 1 - > devel/py-trio/Makefile (gone) | 38 ---------------------------------= ----- > devel/py-trio/distinfo (gone) | 3 --- > devel/py-trio/pkg-descr (gone) | 13 ------------- > 5 files changed, 1 insertion(+), 55 deletions(-) >=20 > Probably even better is this: > $ git show --summary --format=3D%h 44b2876caf1f56d6e940a329a2f8e06724f= d621f > 44b2876caf1f >=20 > delete mode 100644 devel/py-trio/Makefile > delete mode 100644 devel/py-trio/distinfo > delete mode 100644 devel/py-trio/pkg-descr >=20 > (why does this drop the changes to MOVED and devel/Makefile though? Th= e=20 > manpage entry is cryptic enough: > Output a condensed summary of extended header information such as=20= > creations, renames and mode changes. > ) I think the rule so far is: * if cat/port/Makefile is deleted or renamed, that port has been deleted= I could reproduce what you did here, with the beta repo: [dan@pro02:~/src/freebsd-ports-beta] $ git show --summary --format=3D%h = 44b2876caf1f56d6e940a329a2f8e06724fd621f 44b2876caf1f delete mode 100644 devel/py-trio/Makefile delete mode 100644 devel/py-trio/distinfo delete mode 100644 devel/py-trio/pkg-descr [dan@pro02:~/src/freebsd-ports-beta] $=20 Now, moving over to Github repo with the comment I mentioned above: [dan@pro02:~/src/freebsd-ports] $ git show --summary --format=3D%h d016c= 9140a6e4b7627d26485926a659f2686185d d016c9140a6e delete mode 100644 devel/kf5-kcrash/files/patch-src_kcrash.cpp delete mode 100644 devel/kf5-solid/files/patch-CMakeLists.txt delete mode 100644 net/kdav/distinfo rename net/{kdav =3D> kf5-kdav}/Makefile (82%) create mode 100644 net/kf5-kdav/distinfo rename net/{kdav =3D> kf5-kdav}/pkg-plist (92%) [dan@pro02:~/src/freebsd-ports] $=20 That is very similar to what Adriaan de Groot showed me via https://docs= .freebsd.org/cgi/getmsg.cgi?fetch=3D2171670+0+current/svn-ports-head ### git tells me: delete mode 100644 net/kdav/distinfo rename net/{kdav =3D> kf5-kdav}/Makefile (82%) create mode 100644 net/kf5-kdav/distinfo rename net/{kdav =3D> kf5-kdav}/pkg-plist (92%) ### That output 'rename net/{kdav =3D> kf5-kdav}/Makefile' may proof non-tri= vial to parse. I think so far the above rule is the best option. Thank you. --=20 Dan Langille dan@langille.org