From owner-freebsd-git@freebsd.org Mon Jun 29 15:41:27 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 B1D5A34C70C for ; Mon, 29 Jun 2020 15:41:27 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49wWtb0Lydz3gCD for ; Mon, 29 Jun 2020 15:41:26 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.15.2/8.15.2) with ESMTPS id 05TFfHOr099567 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Mon, 29 Jun 2020 17:41:18 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Mon, 29 Jun 2020 17:41:17 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: freebsd-git@freebsd.org Subject: Value of old "vendor" branches vs. linear history Message-ID: <20200629154117.GA96323@acme.spoerlein.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 49wWtb0Lydz3gCD X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; local_wl_from(0.00)[freebsd.org] 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: Mon, 29 Jun 2020 15:41:27 -0000 Dear all, I'm running out of things to do for the conversion, so I'm looking at streamlining some of the history in the repo. Please see https://github.com/freebsd/git_conv/blob/master/history.md for some of the examples as well as before and after pictures (use the links to see the colorized version, which is easier to follow). So unless someone objects and can convince me that `vendor/unknown` or `unlabeled-1.1.1` branches must be represented as they currently are in SVN , I'll go forward with this and splice in these commits directly into the mainline, where feasible. I think this will mostly affect: - vendor/games/dist - vendor/unknown - cvs2svn/branches/unlabeled-x.y.z - vendor/misc-GNU/dist - vendor/CSRG/dist and vendor-crypto/eBones/dist and potentially parts of vendor/NetBSD/dist and vendor/OpenBSD/dist. As well as numerous one-off cvs2svn/branches/foo "branches" (or rather random CVS import tags). Cheers Uli From owner-freebsd-git@freebsd.org Wed Jul 1 21:51:20 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 7600335CAB6 for ; Wed, 1 Jul 2020 21:51:20 +0000 (UTC) (envelope-from dan@langille.org) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) (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 49xw0R1qF0z3b21 for ; Wed, 1 Jul 2020 21:51:18 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id CE2244D9 for ; Wed, 1 Jul 2020 17:51:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 01 Jul 2020 17:51:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= from:content-type:content-transfer-encoding:mime-version:subject :message-id:date:to; s=fm1; bh=w+uE0gfBZSmJKnHBxVy2AVjuz2GZPvLHF GrHJ6YHeCM=; b=TPq5OeLErQ1TYlRvllQM814JuIan6WqQdjOHEKI5pjKoyECke VEDjIO3XM4hqb1hrVoqsluhPGCq4dxK0bsxil3F1uzzjLEJLzOD4MuJ1YQCMfbt6 MyqzM2368YKwuoBfWRZsfXc1SEkoFpIXERhrn08t9JL27vf4a1kk1MJMvfMrJpIF h5LBF088W7dI7lO0cjy0kGh+dhIZM9A/sD1ajNgdvRxP4m6Zb7NPepl27pjapezz Pl+zuezKGjZfQpfmOumZPFvtAjzI/3lMe9Atix6AUUn/1xnHARtYT3u/jJBats5+ C8hkexFVCGpsycnbmVTMy/6sTOLX9jeBLC6WQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=w+uE0g fBZSmJKnHBxVy2AVjuz2GZPvLHFGrHJ6YHeCM=; b=d92NYEFVxG4k5p4QjJQ1hd tjd2Gbj12VpNq1pl/zHmHDDKf3tI/9FRcXWFqu1i0+KSlMKE8H61TElNAEINh4X9 w0ikIzV2fPrIH5xx8RoUUTrDoiYIad79DKLGlXOLwGczsclhe0IranmG4oJcTs1c UC915w2jFTNlxdXx5JmekW5Zti1BYQoIxtkMbjrD33Pf++SFV0bw1E1qqPuDZEjp VNXBzvGHv1v+vIpztn2jY/PWvnT4euX2hMferagUX5UuDomCLGapOS6Ea59GqdH/ kDgb71Hefckq1PvC4NYjcEZIXhfxI8KoWpJBU6oUxarZo+DPdJbfUPZK6XlPCdxg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrtdefgddtvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephfgtgfgguffkfffvofesthhqmhdthh dtjeenucfhrhhomhepffgrnhcunfgrnhhgihhllhgvuceouggrnheslhgrnhhgihhllhgv rdhorhhgqeenucggtffrrghtthgvrhhnpeehtefhgfevhfffieeitdejhefhudejjeegue ejvedtieetteekvedtfedtudejkeenucffohhmrghinhepfhhrvghshhhpohhrthhsrdho rhhgpdhfrhgvvggsshgurdhorhhgpdhlrghnghhilhhlvgdrohhrghenucfkphepudejfe druddvtddruddtkedrudefleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpegurghnsehlrghnghhilhhlvgdrohhrgh X-ME-Proxy: Received: from [192.168.1.9] (ip-173-120-108-139.ekrgmd.spcsdns.net [173.120.108.139]) by mail.messagingengine.com (Postfix) with ESMTPA id ECD41328005A for ; Wed, 1 Jul 2020 17:51:15 -0400 (EDT) From: Dan Langille Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: discovering new commits: FreshPorts Message-Id: <30741857-E21A-4EB9-9C01-81D1E8B8AC03@langille.org> Date: Wed, 1 Jul 2020 17:51:14 -0400 To: freebsd-git@freebsd.org X-Mailer: Apple Mail (2.3608.80.23.2.2) X-Rspamd-Queue-Id: 49xw0R1qF0z3b21 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm1 header.b=TPq5OeLE; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=d92NYEFV; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 64.147.123.24 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-2.67 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm1,messagingengine.com:s=fm3]; RECEIVED_SPAMHAUS_PBL(0.00)[173.120.108.139:received]; FROM_HAS_DN(0.00)[]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.97)[-0.969]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_MEDIUM(-1.02)[-1.016]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.24]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-0.09)[-0.089]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:64.147.123.0/24, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_VERYGOOD(0.00)[64.147.123.24:from]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.24: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, 01 Jul 2020 21:51:20 -0000 FreshPorts currently works off email. Receive a commit email, parse that = email, do some database work. The subversion revision number is contained in the email. That makes it = easy for the code to do: svn up -r X make -V FYI: FreshPorts stores all commits, just not the ports tree. They're all = in there. The technical work of converting a git log message into a FreshPorts = database entry is done: That works. re: https://news.freshports.org/category/development/git/ The biggest remaining issue: what method should FreshPorts use to start = working on a new commit? What process replaces the incoming svn commit = email? At present, there is no email for the git commits (re = https://lists.freebsd.org/mailman/listinfo). It's only the svn commits. I see these choices: 1- continue to process based upon incoming email, but use that only as = the reason to wake up and check git for new commits.=20 I don't know how commits arriving in svn relate to commits arriving in = git - will they be there? 2 - repeatedly run 'git fetch origin' to check for new commits We won't miss a thing - but that's rather DDosS-ish. 3 - a commit hook. =20 The git repo hits up a FreshPorts url on each commit. Insights welcomed. =E2=80=94=20 Dan Langille http://langille.org/ From owner-freebsd-git@freebsd.org Thu Jul 2 14:08:29 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 18CA535707D for ; Thu, 2 Jul 2020 14:08:29 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49yKgv4njbz3cl6 for ; Thu, 2 Jul 2020 14:08:27 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f49.google.com with SMTP id y2so29012818ioy.3 for ; Thu, 02 Jul 2020 07:08:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Yp4GVI8StwkXvVa1AkV96V6BQnhGCzjm21dN2KGajY0=; b=KcnZC82GcjzTFc5HSZDsAx3b2qkmUKt/iEtpYleJLtEmEcfV7ufzcE2Mkj6cV7Mo02 Xg09scMKoaXnFoheee5hugQiLT9tpXUuqs7Zmc/nNgz9wUVH5bmhr1zlanJET1BoVDdd RSoYdZ2cr1/0VvSsBSarK1FPSaNJVfTGw+TbrC3foHuK8r2AQlhNiVK7NmTDJyRDrXpR mJw+UAqRZYtgwdmbtSNfurBu2rC5noNWJd6ohkeb0sdsNXwalyFCXcFpZn1DaFkBhOVM 1XC7kHwpVSqK5gM4DSUg8khPhvTIydzPzuu5CKblzuKhuJ7kEptdcjflpawk/LdfOE8D Zy3Q== X-Gm-Message-State: AOAM533pulNxft6dpz8szt/avUtiOuWxAf/9S9R2iwPfsZeOLqc3zJK/ jPeIGhbE2Rn50+yaWQuaBAWrVoeNBLsEDawfWNgENP4x X-Google-Smtp-Source: ABdhPJyutRqKMiE/dwCDOJbD3qcp/Yg81ykfF8udIABCq7TK60oUtG7R/6Fl3Y3LEsRohfzURv7REHmd2Jqwp4mJL7M= X-Received: by 2002:a5d:9c44:: with SMTP id 4mr7665110iof.15.1593698906456; Thu, 02 Jul 2020 07:08:26 -0700 (PDT) MIME-Version: 1.0 References: <30741857-E21A-4EB9-9C01-81D1E8B8AC03@langille.org> In-Reply-To: <30741857-E21A-4EB9-9C01-81D1E8B8AC03@langille.org> From: Ed Maste Date: Thu, 2 Jul 2020 10:08:14 -0400 Message-ID: Subject: Re: discovering new commits: FreshPorts To: Dan Langille Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49yKgv4njbz3cl6 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.49 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-1.96 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.89)[-0.892]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; NEURAL_HAM_LONG(-0.97)[-0.965]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.10)[-0.104]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.49:from]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.49:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2] 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: Thu, 02 Jul 2020 14:08:29 -0000 On Wed, 1 Jul 2020 at 17:51, Dan Langille wrote: > > The biggest remaining issue: what method should FreshPorts use to start working on a new commit? What process replaces the incoming svn commit email? > > At present, there is no email for the git commits (re https://lists.freebsd.org/mailman/listinfo). It's only the svn commits. We will have a git commit mailing list by the time we're ready to make the switch, but indeed it's not there yet. > I see these choices: > > 1- continue to process based upon incoming email, but use that only as the reason to wake up and check git for new commits. > > I don't know how commits arriving in svn relate to commits arriving in git - will they be there? There's usually 0-15 minutes of latency between a commit to svn and the same change appearing in the (GitHub) git mirror, but sometimes it's a bit longer. This might work some of the time but isn't going to be reliable. > 2 - repeatedly run 'git fetch origin' to check for new commits > > We won't miss a thing - but that's rather DDosS-ish. As long as the polling frequency is not too high this should be fine. > 3 - a commit hook. > > The git repo hits up a FreshPorts url on each commit. This sounds like the best approach, and I'd be happy for us to add this to the new git repo config.