From owner-freebsd-git@freebsd.org Sun Dec 13 10:42:14 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 5CABB4B4DD6 for ; Sun, 13 Dec 2020 10:42:14 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cv1LF72mfz3hYJ for ; Sun, 13 Dec 2020 10:42:13 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id F1B6C4B4E28; Sun, 13 Dec 2020 10:42:13 +0000 (UTC) Delivered-To: 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 F17C84B4CD7 for ; Sun, 13 Dec 2020 10:42:13 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cv1LF6brcz3hKN; Sun, 13 Dec 2020 10:42:13 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1607856133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QVPNDN9q+hURdgUdv/QF8u6+IIlWKxD696mnHbmetYs=; b=A4CEximvT1XQAlqTefDZfS/sor+qiQtb4L/HaMKjBdSGasXaxV4OKFjpRYdOppefHKGSFH ErcHTRaLx0NGVgvFgAYeBchsOhTHmPMo+2OqU3h0S1/Y5LxCLhSCTQ0CIBoZSMKnNVfxAS dGRoTsQjyjrduVRcCC1BhPay+qPUnk3xmhi6RbrKApP5s19voEv6QUGZfY4DBscz33FeL0 YgLIL+Hfttz9HV+DL2wEwRBwH/4ozgDGstaqoiYxkXpvBaUhWNYODu9oRVR7qUpTcX840+ XWYQ9LhdrpLmZSysoFtAQJIExvbYdYvleNDkbUYFuvaImD8DqFxxUCpXqgmZTg== Received: by freefall.freebsd.org (Postfix, from userid 1185) id D7CC6C88C; Sun, 13 Dec 2020 10:42:13 +0000 (UTC) Date: Sun, 13 Dec 2020 10:42:13 +0000 From: Rene Ladan To: Li-Wen Hsu Cc: git@freebsd.org Subject: Re: svnadmin equivalent? Message-ID: <20201213104213.GA82804@freefall.freebsd.org> References: <20201210223443.GA64504@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1607856133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QVPNDN9q+hURdgUdv/QF8u6+IIlWKxD696mnHbmetYs=; b=sFGpCGxzmbXk63FhB6pK+m/0aV+zWBgB+UrvtVnhh2b0VE32grYiN3gYqaCgLjxfD9lwyG UzgQjLSebGQ2VdS3NwYC5u0qGoIgaKT5TqsZvqqQNKXaETqG4rmRlcw5eLsQAvN/re7bI3 eYu50esHa0yMjaXcKvnOLaF0nXX36+6bEkUsMme+F/JWhhW0Ug7OeG2KHpgiSYcZAQLqHA 6GeueGuQvF8TymOCJh/eSwL4DNwNMtC2KONElIdIVmulx+CMBEaUyJD2jSQJWkiql1l5kn aYDIG8Zti0JpuUpFbMEgt1SR9LXU+HWvlqO6B2QD0mQV2+wHYJNRBAFHkoZPRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1607856133; a=rsa-sha256; cv=none; b=vlRnVo++GIwtjWhNANuQutXjfcwxaVfZBD9S6y8HTMRM24Uma6H62Q5pvGfQFK0Ylw7Gxr Xq2dj3HXlc654t88rnnecm3/XucilwhSvfwVl2j0TUDG15T1xPeE0ClBcdsz9RvHwJRWZY SKC9CtB34i3W5CflJIT6z5Fp2c5pSjiacDjjcrMiE7LuSNbyfmSGiXGY7Av3i87e0F7rpj 8kkSYCkThTXTWCNNF04pF5pH02dOMErbn5yt39oIy9gHHVZ+1tM4dMWCC2a667r6vPF9c6 mv1n11uE6VbYTJQU2rIULJ4KT7Vg+e1R2h6+Ej4EE7SVUCHtFIlJULGR7lSwtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Sun, 13 Dec 2020 10:42:14 -0000 On Fri, Dec 11, 2020 at 09:58:08AM +0800, Li-Wen Hsu wrote: > On Fri, Dec 11, 2020 at 6:34 AM Rene Ladan wrote: > > where did the equivalent of svnadmin end up for the doc repository > > now that it has been converted to git? > > Most of the content in svnadmin is not so useful in git, so only > access and mentors files (including their history) are preserved in an > "orphan branch" in git, internal/admin. > > Other config files like approvers will be converted to a new format to > match the philosophy and the hooks under development. They will be > added to the internal/admin branch when we open more workflows. > > > I tend to use this with my Grim Reaper hat on to see if former > > ports committers are also active in doc or src, and for ports when > > they became ports committer for the Developer Alumni section in the > > Contributors Guide. > > Full information is available at > https://github.com/freebsd/git_conv#gimme-the-repo > > Here is how I check out the internal/admin branch (to "admin" local branch): > > git config --add remote.origin.fetch '+refs/internal/*:refs/internal/*' > git fetch > git checkout -b admin internal/admin > > For browsing in cgit: https://cgit-dev.freebsd.org/doc/log/?h=internal/admin > Ah, thanks. Fetching this locally worked fine. René From owner-freebsd-git@freebsd.org Sun Dec 13 16:15:36 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 E3AF04BD64E for ; Sun, 13 Dec 2020 16:15:36 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cv8kw59QYz4bnw for ; Sun, 13 Dec 2020 16:15:36 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mailman.nyi.freebsd.org (Postfix) id AF9D34BD78A; Sun, 13 Dec 2020 16:15:36 +0000 (UTC) Delivered-To: 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 AF63F4BD5B8 for ; Sun, 13 Dec 2020 16:15:36 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 4Cv8kv41Dsz4c35 for ; Sun, 13 Dec 2020 16:15:35 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-il1-x12c.google.com with SMTP id k8so13577406ilr.4 for ; Sun, 13 Dec 2020 08:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:from:date:message-id:subject:to; bh=sECoeR2YKiAFF2kXkvfPgwo3m9wRSryw3tLquRJ4CN4=; b=IBW/DX5aGByetMTCER9ObfM/ATidMQlTPxD8TDck4AtB5wVHnnX60897DyJ8bkSfUU GZ5S0pvyLM7Ga6LPXxCLxMYDgwMtJ67U86vDPOK3LnO6Tb/4taPvKHdoo9FOPsIF0MLx IV7RBvYZFCJbASZWWGo+Mf9pYHYv8sDIb6MfU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=sECoeR2YKiAFF2kXkvfPgwo3m9wRSryw3tLquRJ4CN4=; b=A6KXR+okiPCnUB2jRny1ytnYkJz8JA2oygocPJTLemSR09KVzxNCJP5lNkGS+GAOg2 4JE2bK+VEYc33sBeOvkmNpQxpfyZAHW00ZR8SnYVjIgVcu9tZUVjaeX021L9bbCWV7Tf WSg8nubU45Xrtmk5/DIaWW6T+ZPpu4z10oXdqyGd5KhIXMOhONKsrnb2G6MGUm7AasX1 8PMrkIW2BzFs2k+kpQt7UuY6r0sjjpGa/GhLaFqB+MjqWu43tQNan/tuH00+Gae2jRqZ JVpTnzoZCoE/kjnPdjPGqMkWRWBbbNL41JQXbyqY11UcFgHc7gOmiTt3dso0hn4nyjDZ SiWw== X-Gm-Message-State: AOAM530/xLjD1HkjEp0xU27pnPgWOwfRYRKfFcfzzug56Zy3rMy1Iyxd trXMVMCrdntJzo2iOVIQLz0LUxE4wjFw0jXyVKt8w9//5Yc= X-Google-Smtp-Source: ABdhPJw+Pf52MzSuZaUC0vPXiPfDnB/lFMFMQp9rEwaCeoSTTaVFLUyU1rkbbr+w0EuXHKWFkUcTyoES/lOXqbNS1WI= X-Received: by 2002:a92:d11:: with SMTP id 17mr29440854iln.84.1607876133644; Sun, 13 Dec 2020 08:15:33 -0800 (PST) MIME-Version: 1.0 From: Eitan Adler Date: Sun, 13 Dec 2020 08:15:07 -0800 Message-ID: Subject: code review in git: git & phabricator? To: git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Cv8kv41Dsz4c35 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=eitanadler.com header.s=0xdeadbeef header.b=IBW/DX5a; dmarc=none; spf=pass (mx1.freebsd.org: domain of lists@eitanadler.com designates 2607:f8b0:4864:20::12c as permitted sender) smtp.mailfrom=lists@eitanadler.com X-Spamd-Result: default: False [-0.50 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[eitanadler.com:s=0xdeadbeef]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::12c:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::12c:from:127.0.2.255]; DMARC_NA(0.00)[eitanadler.com]; NEURAL_SPAM_SHORT(1.00)[0.999]; DKIM_TRACE(0.00)[eitanadler.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::12c:from]; NEURAL_HAM_LONG(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; SUBJECT_ENDS_QUESTION(1.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Sun, 13 Dec 2020 16:15:36 -0000 Hi all, What's the plan for git & phabricator? Will we continue to be supporting the phabricator workflow when we use git? Is this short term or long term? Either way phabric-admin@ has some configuration to do so a heads up during the conversion of future repos would be appreciated. -- Eitan Adler From owner-freebsd-git@freebsd.org Sun Dec 13 18:28:22 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 E05344C01D2 for ; Sun, 13 Dec 2020 18:28:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CvCh6520vz4k3l for ; Sun, 13 Dec 2020 18:28:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id AAA1A4C01D1; Sun, 13 Dec 2020 18:28:22 +0000 (UTC) Delivered-To: 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 AA55A4C043D for ; Sun, 13 Dec 2020 18:28:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) (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 4CvCh64G3pz4jky for ; Sun, 13 Dec 2020 18:28:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf30.google.com with SMTP id d11so6824355qvo.11 for ; Sun, 13 Dec 2020 10:28:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=w+u/B0ABC2WBWhITzW3rwbuVIodfiH+lu7QrBtubHHI=; b=aI8WgIN9KFjAD5a/4++c+Jk4BaC0T2hbIv4gT2uhvyEh5O0z2bMfnEXxMVf9/NaDaH lo/DuoUr5klPLFvi4aA9dd0iSMUnCe5hBxmwk4fTDmD64+P6NQI0qytqv8RyBLEU+kDl FPFpBZa36Jd6aRzvy1Z8HKIN+gS+bLzTMQBPRDsIVAXgD0HRxTLXiO2gfXYKy/rr3uD4 UwtJFSzCp/uol56xLQYC32jzKmH1F0LD9x5SmpYqNVJdOYPuv2hCgdx7+pHuDFoJRFQ3 QoJFGtdBLxUvoXJp0GzW4VCjH8GKr2kTewqcp7GgKOY9rWEFLwpNgPDwSSlk9zhO2GN2 OmNA== 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=w+u/B0ABC2WBWhITzW3rwbuVIodfiH+lu7QrBtubHHI=; b=RmyxbLDL44ao4Stnk3As3I7LExGnu7lz1rTVTSV4NwGnyS8ttDBpmfypCTJ+eBcdkW 5MLH+vVuirkpI2oMcdDRqL136O/eKMTxfwWOb+jwAwkqdzG3us6lG1Cru3508NdlIm5N f5awSlII5Zs8qgP4A9pwvZcCosLLea4yeDUngzwBNRdSZC4hipwkJ5GG4AL9VQA6NMUt 1EIY7C5u02Yo1JmdLooTsAQqbHVJy087fhcVzHp4BUolHJHcY15G2y9xUTgXFOC+vPBN +kXu8wa2OKWbcwUX43pExY/B/amokJ83EBNuqC2BJQTLDFnlEz1n3v+xFTHWKLHQvdoh CQKQ== X-Gm-Message-State: AOAM531I9MNJMg+3/mYTgKkrmI+IeM/F8oSge+brNBivgQjZiUVsHtGP 8SN6NEh4AKeNoguayc85RNSpBrc8cAM7U55qJDBoWJeDPcyh3Q== X-Google-Smtp-Source: ABdhPJx7yk/TD4qEfzjUlY3t6VdgNA5kC+XE9NiHJZ06ivuOIIbMRxek6RSNOQ4rJn0EV3JhLt2Pdpr9TT536tLvIZI= X-Received: by 2002:a0c:bf0f:: with SMTP id m15mr28228029qvi.23.1607884101541; Sun, 13 Dec 2020 10:28:21 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sun, 13 Dec 2020 11:28:10 -0700 Message-ID: Subject: Re: code review in git: git & phabricator? To: Eitan Adler Cc: git@freebsd.org X-Rspamd-Queue-Id: 4CvCh64G3pz4jky X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Sun, 13 Dec 2020 18:28:22 -0000 On Sun, Dec 13, 2020 at 9:15 AM Eitan Adler wrote: > Hi all, > > What's the plan for git & phabricator? Will we continue to be > supporting the phabricator workflow when we use git? Is this short > term or long term? > > Either way phabric-admin@ has some configuration to do so a heads up > during the conversion of future repos would be appreciated. > Short term: no change. We're just switching from svn to git which is disruptive enough in a 'death of a thousand cuts' kind of way. Long term: who knows, but there will almost certainly be changes as different workflows are worked out. There's such a huge diversity of options and opinions, I'm unsure if we'll reach consensus on change quickly and a period of experimentation likely will follow. Warner From owner-freebsd-git@freebsd.org Tue Dec 15 08:30: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 448E64AD9F5 for ; Tue, 15 Dec 2020 08:30:29 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CwBKK08xvz3KJ2 for ; Tue, 15 Dec 2020 08:30:29 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mailman.nyi.freebsd.org (Postfix) id 037114ADAC8; Tue, 15 Dec 2020 08:30:29 +0000 (UTC) Delivered-To: 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 033624AD847 for ; Tue, 15 Dec 2020 08:30:29 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 4CwBKJ2lHnz3KJ1 for ; Tue, 15 Dec 2020 08:30:28 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-il1-x136.google.com with SMTP id x15so18443418ilq.1 for ; Tue, 15 Dec 2020 00:30:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=EtSBxxas63PVbcSNiLrDOjPrzBU4efM+L3AXj2eowew=; b=fOh9NwWIYuyBPSjd6Vi5KkAqxasaL9ELFyZgakFwGJIVwO0y5xG2apJiEwO3Jve2bw idWMri1x40jh3RxIdrU1VXO94RAFOgjH+KpJa+beB+Rhy6veRUevinYB3VcI46BPTRRP hR+1vhRR9vz52FJjQvYni1aUPuR8kY94ioVxU= 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:content-transfer-encoding; bh=EtSBxxas63PVbcSNiLrDOjPrzBU4efM+L3AXj2eowew=; b=Lr35A5yu/D5LXOPNWMa6dtBBzEIW4GKxGcRWALmJT3Bogx2bvvUcFFAzS4ru0mus6Y at0ToLSNY5XbmLdsvXJYszPB2Udl5RrbLHAVAUoMp12BGenMn4pwvb3ArjbVO8+buRPb q+KT4QwE38PUR3jr1cpdNUDbFJK4DtK89vl2eWUdt4BDjmlelnZQgK7WZA7qDWfSV/sB lc7y8myN7r4ksBkT1769PTYqTPIU4/qPTCag+Vpb1CAFvK1VWSzBJDSM1NzM9Fafhc2E VPqjU4+bpTZFdJ+j0T0v+eOlQcEnBVfTQ2N0oo9b9n2iaVzuKXR82xGUb+13OscXfshS j+Sg== X-Gm-Message-State: AOAM532U/gC/RjA6c8tWgitTBmA0kWOM+OUU7NINd2FKj+Kx1DtQTNoN jDFFPy+P6H2GRfYjwtN3La7TCeXV4zqJiHEUAk75jPcTYFE= X-Google-Smtp-Source: ABdhPJxzQj4iQRMqrlB7pcTiAQ9xgTYa8NS13tDN1ZucoBDXezBZfYoBwnd1st9Ikkqnmi4NIgiF3nr1zUqzGhHZPY8= X-Received: by 2002:a92:c6c3:: with SMTP id v3mr9686980ilm.281.1608021027451; Tue, 15 Dec 2020 00:30:27 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Eitan Adler Date: Tue, 15 Dec 2020 00:30:01 -0800 Message-ID: Subject: Re: code review in git: git & phabricator? To: Warner Losh Cc: git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4CwBKJ2lHnz3KJ1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=eitanadler.com header.s=0xdeadbeef header.b=fOh9NwWI; dmarc=none; spf=pass (mx1.freebsd.org: domain of lists@eitanadler.com designates 2607:f8b0:4864:20::136 as permitted sender) smtp.mailfrom=lists@eitanadler.com X-Spamd-Result: default: False [-2.50 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::136:from]; R_DKIM_ALLOW(-0.20)[eitanadler.com:s=0xdeadbeef]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[eitanadler.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::136:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[eitanadler.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::136:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; SUBJECT_ENDS_QUESTION(1.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Tue, 15 Dec 2020 08:30:29 -0000 On Sun, 13 Dec 2020 at 10:28, Warner Losh wrote: > On Sun, Dec 13, 2020 at 9:15 AM Eitan Adler wrote: >> >> Hi all, >> >> What's the plan for git & phabricator? Will we continue to be >> supporting the phabricator workflow when we use git? Is this short >> term or long term? >> >> Either way phabric-admin@ has some configuration to do so a heads up >> during the conversion of future repos would be appreciated. > > > Short term: no change. We're just switching from svn to git which is disr= uptive enough in a 'death of a thousand cuts' kind of way. > Long term: who knows, but there will almost certainly be changes as diffe= rent workflows are worked out. There's such a huge diversity of options and= opinions, I'm unsure if we'll reach consensus on change quickly and a peri= od of experimentation likely will follow. Thanks for the info! While I've been less active lately as a comitter I do have experience with both the project as well as the capabilities of the various tooling (phabricator, github, git, jenkins, etc.). Feel free to CC me if you y'all ever need help figuring out what makes sense or what's possible. --=20 Eitan Adler From owner-freebsd-git@freebsd.org Tue Dec 15 23:59:00 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 1216A4A8BCE for ; Tue, 15 Dec 2020 23:59:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CwZwg6vMPz3NXx for ; Tue, 15 Dec 2020 23:58:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id ECD024A8E1D; Tue, 15 Dec 2020 23:58:59 +0000 (UTC) Delivered-To: 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 EC9904A8A52 for ; Tue, 15 Dec 2020 23:58:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CwZwg6CVRz3NkN for ; Tue, 15 Dec 2020 23:58:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (unknown [IPv6:2601:648:8681:1cb0:a4c5:833e:8ae:3fad]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 9A28A2525 for ; Tue, 15 Dec 2020 23:58:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) From: John Baldwin Subject: Existing project/user branches in svn To: git@FreeBSD.org Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <97469514-737f-09a7-3ed7-50cf71846cec@FreeBSD.org> Date: Tue, 15 Dec 2020 15:58:58 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Tue, 15 Dec 2020 23:59:00 -0000 One thing I haven't seen mentioned is what is the plan for handling existing user/project branches from svn? And in particular, it doesn't seem it has been sufficiently communicated in that a new projects branch was added to svn this weekend with the conversion less than a week away. :( For branches that are actual branches of src, it seems like we should really be encouraging people to move that work into a git clone instead, and we probably need to let people now they need to be doing that this week since they won't be able to use svn for it going forward? (Will we be turning off commits to ^/user and ^/project when it converts?) This may require direct communications to people using svn this way (e.g. Rick Macklem still has an active NFS over TLS branch in ^/projects). For things in ^/user that aren't branches of src like freebsd-update bits, presumably those should be split out into separate repositories? -- John Baldwin From owner-freebsd-git@freebsd.org Tue Dec 15 23:59:04 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 ECC304A8F8C for ; Tue, 15 Dec 2020 23:59:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CwZwm5yjzz3Nv4 for ; Tue, 15 Dec 2020 23:59:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id CAB2F4A8A56; Tue, 15 Dec 2020 23:59:04 +0000 (UTC) Delivered-To: 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 C83A74A8A53 for ; Tue, 15 Dec 2020 23:59:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CwZwm4LNWz3Ndy for ; Tue, 15 Dec 2020 23:59:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (unknown [IPv6:2601:648:8681:1cb0:a4c5:833e:8ae:3fad]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 228E62015 for ; Tue, 15 Dec 2020 23:59:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) From: John Baldwin Subject: Thoughts on git commit mail To: git@FreeBSD.org Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: Date: Tue, 15 Dec 2020 15:59:03 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Tue, 15 Dec 2020 23:59:05 -0000 So far I have a few possible suggestions on the git commit mail that I would find useful. Mostly it consists of making it a bit leaner: 1) I would only display Author/AuthorDate. The committer we can infer from the e-mail sender. This is what the gdb git commit mails do. In this case you can also just use 'Date' instead of AuthorDate, e.g.: commit d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 Author: Glen Barber AuthorDate: 2020-12-13 21:31:39 +0000 Commit: Glen Barber CommitDate: 2020-12-13 21:31:39 +0000 could become: commit d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 Author: Glen Barber Date: 2020-12-13 21:31:39 +0000 2) I would drop the first sentence. It's a bit redundant to list the committer an extra time. The branch name is useful, but it might be nicer as metadata if possible, e.g.: Branch: main The one thing this does lose is when a commit is a "cross-repo" commit (e.g. docs committer committing to src or vice versa). The best way to handle this might be to add a new optional metadata field. I don't have any good ideas on what to call it. It could either list the repositories a committer has a bit for, or it could just be some kind of boolean (Cross-Commit: yes). 3) Perhaps put the URL in the metadata section as well to reduce extra blank lines at the start of the mail. Putting 1-3 together for the commit in question would give the header below which I think is a bit more compact and similar to svn formatting in that all the metadata is in a single block without additional whitespace. commit d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 Author: Glen Barber Date: 2020-12-13 21:31:39 +0000 Branch: main URL: https://cgit.FreeBSD.org/doc/commit/?id=d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 4) Some repository-specific things I would find helpful based on how I have filtered svn commits: - For doc, some kind of mail header ('X-Git-Foo') to indicate commits that only touch translations as separate from English and top-level shared areas. Previously I used some pattern matches on paths in svn subjects to do this. - For src, some kind of mail header to indicate commits that touch the kernel vs only touching userland. -- John Baldwin From owner-freebsd-git@freebsd.org Wed Dec 16 00:01:56 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 BC1804A8BE4 for ; Wed, 16 Dec 2020 00:01:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cwb043ynyz3PNC for ; Wed, 16 Dec 2020 00:01:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 87E3E4A8FB2; Wed, 16 Dec 2020 00:01:56 +0000 (UTC) Delivered-To: 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 8797D4A8F1D for ; Wed, 16 Dec 2020 00:01:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (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 4Cwb043DDxz3PNB for ; Wed, 16 Dec 2020 00:01:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x831.google.com with SMTP id 7so16089083qtp.1 for ; Tue, 15 Dec 2020 16:01:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=6DSbClOjTNBkxWxrbaYKSn1FcLHBN31kO0pElpX4VfY=; b=X8B2ptaA2VGMggyiDj1gZ0xPMyPsd4I8VVjSit1hsdvWb9T1g+ubXbGZuvsSXKnO2X HP6geL5A4g4Y6Rb0HWhkH2fa2ME8W/I9KC1QOnj/f74t7c0ZRSlxOCtdEgFhYrnkf6a9 PWDEREndx/ezyACeBGFf+KGj0UHMSvZTwBFVxfN3xpWJZWxi6B5Cs/3EBJkxPRJq7/tc qk1uMphbD9DjCp8qg8qaSWdHSBU0SuTCAXhevQlYnrK9EyDpQo33Iky+V/pjvZvpLvUB fevRhThC24Wwjec2iR4IOjVmkUgjW2sld4u+YPfcrUepY4UfR8mi6iCc9zNsNdL7OWZ3 9X8g== 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=6DSbClOjTNBkxWxrbaYKSn1FcLHBN31kO0pElpX4VfY=; b=ryr7AGti6bmThyACpjULVPAQBuKwBZJytW47HRTVOIJMG9hIZkt/tV97wI/BcCVgNY VjnJ/fxjhsSqpLFsNPgGpMjq7ZtuyVv4XvjGFB2RDgoV6ULf3eyZIwghUJTZzD14/WIW kmyk9NfBnaJQnlBXiDhtqr+fJdQkvJXF9f85UdzskvsYzlgI6msrUGzJW3BfS9/ncC9X oy5LNZ34OZlH2pV66wnDbTumR/iIV2q0uYMDm4vJ2nznEkmd8mVnamv3KUAAonWfGe3D AtVoR+7IPHN2c4SMQyASbHGMoBO5xgTk+1MsvBLNBm4LyJzQwDuRCRngaYbgZqsCvlQ0 1cqA== X-Gm-Message-State: AOAM531FnvojPk9asz+iy2QecB1DLQ+UXn9eip6108tUCTQXDtvykkoC dPnkqKKrcRWQOfM5VByNsWdrz8d+6NMgVI/8y4ok1w== X-Google-Smtp-Source: ABdhPJxhJwbWmwmAF1N5WWiqBeTR7IoHFxKpnAfoNoqLa3g+T2DIIjt1sP7Vdd7Z8/wzYBgavbmS5gBDXGXVHvre4Mc= X-Received: by 2002:ac8:51d8:: with SMTP id d24mr38686457qtn.73.1608076914796; Tue, 15 Dec 2020 16:01:54 -0800 (PST) MIME-Version: 1.0 References: <97469514-737f-09a7-3ed7-50cf71846cec@FreeBSD.org> In-Reply-To: <97469514-737f-09a7-3ed7-50cf71846cec@FreeBSD.org> From: Warner Losh Date: Tue, 15 Dec 2020 17:01:44 -0700 Message-ID: Subject: Re: Existing project/user branches in svn To: John Baldwin Cc: git@freebsd.org X-Rspamd-Queue-Id: 4Cwb043DDxz3PNB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 00:01:56 -0000 On Tue, Dec 15, 2020 at 4:59 PM John Baldwin wrote: > One thing I haven't seen mentioned is what is the plan for handling > existing user/project branches from svn? And in particular, it doesn't > seem it has been sufficiently communicated in that a new projects > branch was added to svn this weekend with the conversion less than a > week away. :( > Yes. Agreed. > For branches that are actual branches of src, it seems like we should > really be encouraging people to move that work into a git clone instead, > and we probably need to let people now they need to be doing that this > week since they won't be able to use svn for it going forward? (Will > we be turning off commits to ^/user and ^/project when it converts?) > This may require direct communications to people using svn this way > (e.g. Rick Macklem still has an active NFS over TLS branch in ^/projects). > Yes. I've sent email to Rick, but haven't heard back yet. I've talked to Alan and he's good to go. We're transporting the projects and user branches over, but they will be read-only and in a quirky, weird place. I'll write up the docs. We won't allow new branches to be created. So users will have local branches only. Or they will need to create a fork on github/gitlab for now. > For things in ^/user that aren't branches of src like freebsd-update > bits, presumably those should be split out into separate repositories? > We'll provide the history here, but don't provide a service Warner From owner-freebsd-git@freebsd.org Wed Dec 16 00:20:57 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 254B04A98D7 for ; Wed, 16 Dec 2020 00:20:57 +0000 (UTC) (envelope-from dan@langille.org) Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (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 4CwbPz6pZqz3QMK for ; Wed, 16 Dec 2020 00:20:55 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id ECBC7D41 for ; Tue, 15 Dec 2020 19:20:53 -0500 (EST) Received: from imap36 ([10.202.2.86]) by compute4.internal (MEProxy); Tue, 15 Dec 2020 19:20:54 -0500 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 :subject:content-type; s=fm3; bh=vw33gc5vi8cY5MjzW2t8CA0GC7b+rdc V1cVuKFmqSGw=; b=e5eWjksRLFMbp1RhlIAMtV5vxq3oiUEF75sujj3zqdXLnKx rYbacE+faDq//A/XQtSOSAVV4yRnqt1wGR5dH3DYj5gZUYEHskqLnbGv5dGBtRd1 DUXEljEG2nYkhYPDVuWdetOFTOHVN2N99WVAPih8oInMLWzdKbQH/hGftFP4icqy 0Pjx+6lnTub1vjphH6GRc8GFuB226xnYwR5XacLqgjYjs3282fdXDD8RICkS4fHe FuMBlX+noMt8PobPRUz90MIh79jGmE4y8ubqJOLVffvcCkxcM3xKjtWaz7exH+D0 itKR+lDKzJVUsfAy3VdtreOyLuo7A9mapKTz3ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=fm1; bh=vw33gc 5vi8cY5MjzW2t8CA0GC7b+rdcV1cVuKFmqSGw=; b=jwUhPZ1MWmEgS+npvsfLiW os5wkFOCr1swttAlY8hIsMGidaYncDz+/FSWhNKjB/OEyjTHdl5hVRmh4nZsEeyc OSD3dS802S+IiLyJe0e1vT1DMnmNrJ7nTqswDrkGYTM/7rBeSKcE9ecQmTFvpmNi 9vPwCXgYf0U4lyTSDeLipxLdW1g/YsFsSL+fbIfrD/XOGRTrTHSrEPDVlZ7Z5N7j QzSp3G57wOnDxHgZ5ZsIJwtlngY04Lip5fEmyNapew55JpM+kNJJ9YxPTADXwPHB /hOYf+ES765nhKsQ3VLaHWqoZ2TQbXG52JU7B0Hk/xkHM8/BBWJSOmQDaQau0wdA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudeluddgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgesthdtredtreertdenucfhrhhomhepfdffrghn ucfnrghnghhilhhlvgdfuceouggrnheslhgrnhhgihhllhgvrdhorhhgqeenucggtffrrg htthgvrhhnpeeljefggeeuheeuieevledvjeevgfduteeukefggfffieevhedugfffveeh jeevffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe gurghnsehlrghnghhilhhlvgdrohhrgh X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id C3E7D18805D3; Tue, 15 Dec 2020 19:20:52 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.1-61-gb52c239-fm-20201210.001-gb52c2396 Mime-Version: 1.0 Message-Id: In-Reply-To: References: Date: Tue, 15 Dec 2020 19:20:32 -0500 From: "Dan Langille" To: "John Mehr via freebsd-git" Subject: Re: Thoughts on git commit mail Content-Type: text/plain X-Rspamd-Queue-Id: 4CwbPz6pZqz3QMK X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm3 header.b=e5eWjksR; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=jwUhPZ1M; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 64.147.123.19 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-1.09 / 15.00]; XM_UA_NO_VERSION(0.01)[]; RWL_MAILSPIKE_GOOD(0.00)[64.147.123.19:from]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.19]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.19:from]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.147.123.19:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:11403, ipnet:64.147.123.0/24, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm3,messagingengine.com:s=fm1]; FREEFALL_USER(0.00)[dan]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[64.147.123.19:from:127.0.2.255]; NEURAL_SPAM_SHORT(1.00)[1.000]; MAILMAN_DEST(0.00)[freebsd-git]; MID_RHS_WWW(0.50)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 00:20:57 -0000 On Tue, Dec 15, 2020, at 6:59 PM, John Baldwin wrote: > 2) I would drop the first sentence. It's a bit redundant to list > the committer an extra time. The branch name is useful, but it > might be nicer as metadata if possible, e.g.: > > Branch: main When you say meta-data, do you mean email headers? Anything we can put into machine parsable headers will greatly help anyone doing email parsing. This is what FreshPorts has done for 20 years. I'm thinking X- headers. This isn't so much only for FreshPorts, but for anything else which may come along. -- Dan Langille dan@langille.org From owner-freebsd-git@freebsd.org Wed Dec 16 08:12:12 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 2FCC64B462E for ; Wed, 16 Dec 2020 08:12:12 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cwnsl0JF2z4YcQ for ; Wed, 16 Dec 2020 08:12:10 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id pRuqkD2fg34axpRurkVAWk; Wed, 16 Dec 2020 01:12:09 -0700 X-Authority-Analysis: v=2.4 cv=LvQsdlRc c=1 sm=1 tr=0 ts=5fd9c159 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=zTNgK-yGK50A:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=Af8sf-uLK4BzcU1_pUcA:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 060A5668 for ; Wed, 16 Dec 2020 00:12:07 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 0BG8C7iT006176 for ; Wed, 16 Dec 2020 00:12:07 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202012160812.0BG8C7iT006176@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: freebsd-git@freebsd.org Subject: Vendor Imports Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 16 Dec 2020 00:12:07 -0800 X-CMAE-Envelope: MS4xfMdJInK8K0T8EY9HrQELrZ/RDpHdGr8sBxCPqN1CLgQw1YHqtTpIEDAdfjn1bkAPewOWBAaGjyCjNmE0RWVIWLa6vRO7ztHMJKXBKKduMxoQbFnfNQKQ 8xCWTkzDmTz2zX8eV2Bgq1ImEeu4VuopBHiti2kRubMUDbzjHShOi21LmETZlG0fQSo5/qN/e3xUkCjoM9mpFYJghz/k+oQcfzo= X-Rspamd-Queue-Id: 4Cwnsl0JF2z4YcQ X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.12) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-1.70 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.134.12:from]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.229.168:received]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.59.134.12:from]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[64.59.134.12:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.134.12:from]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 08:12:12 -0000 Can we extrapolate that multilevel vendor trees, those with subdirectories, would need a cp -R or rsync? The example shown says: % cd ../mtree % cp ~/git/NetBSD/usr.sbin/mtree/* . % cp -R would be appropriate for more complex software like openssl, unbound, and the like. Is this correct? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Wed Dec 16 10:23:54 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 D15124B7CB8 for ; Wed, 16 Dec 2020 10:23:54 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cwrnk5VpMz4jZt for ; Wed, 16 Dec 2020 10:23:54 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id BCF0E4B7E85; Wed, 16 Dec 2020 10:23:54 +0000 (UTC) Delivered-To: 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 BCB954B787A for ; Wed, 16 Dec 2020 10:23:54 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cwrnk4ycmz4jm3; Wed, 16 Dec 2020 10:23:54 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 983176F4B; Wed, 16 Dec 2020 10:23:54 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f174.google.com with SMTP id w139so21906916ybe.4; Wed, 16 Dec 2020 02:23:54 -0800 (PST) X-Gm-Message-State: AOAM532deskVUNc8uZhZRgLKHobi+wt8D7ZqJGQmyM88cZcJG/qf9KxC Jl2AL/MUCIzwZwX7Utt7eagaVHJcXjra+K7jIEQ= X-Google-Smtp-Source: ABdhPJwBlQTD8FkuZUwBYDm1ljdX78yySlbcEd3+yONu7YInvwxspG8Mtqwk6QR0r0sQn55yOEf81bkBx/7SH3H66i8= X-Received: by 2002:a25:3206:: with SMTP id y6mr49500971yby.127.1608114233791; Wed, 16 Dec 2020 02:23:53 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Li-Wen Hsu Date: Wed, 16 Dec 2020 18:23:42 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Thoughts on git commit mail To: John Baldwin Cc: git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 10:23:54 -0000 On Wed, Dec 16, 2020 at 7:59 AM John Baldwin wrote: > > So far I have a few possible suggestions on the git commit mail > that I would find useful. Mostly it consists of making it a bit > leaner: Thanks for the inputs and I'll try to squeeze time to implement them, and/or find a suitable place to put the insensitive config files and scripts for let more people to join the development. > 1) I would only display Author/AuthorDate. The committer we can > infer from the e-mail sender. This is what the gdb git commit > mails do. In this case you can also just use 'Date' instead > of AuthorDate, e.g.: > > commit d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 > Author: Glen Barber > AuthorDate: 2020-12-13 21:31:39 +0000 > Commit: Glen Barber > CommitDate: 2020-12-13 21:31:39 +0000 > > could become: > > commit d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 > Author: Glen Barber > Date: 2020-12-13 21:31:39 +0000 > > 2) I would drop the first sentence. It's a bit redundant to list > the committer an extra time. The branch name is useful, but it > might be nicer as metadata if possible, e.g.: > > Branch: main > > The one thing this does lose is when a commit is a "cross-repo" > commit (e.g. docs committer committing to src or vice versa). > The best way to handle this might be to add a new optional > metadata field. I don't have any good ideas on what to call > it. It could either list the repositories a committer has a > bit for, or it could just be some kind of boolean > (Cross-Commit: yes). > > 3) Perhaps put the URL in the metadata section as well to reduce > extra blank lines at the start of the mail. > > Putting 1-3 together for the commit in question would give the > header below which I think is a bit more compact and similar to > svn formatting in that all the metadata is in a single block > without additional whitespace. > > commit d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 > Author: Glen Barber > Date: 2020-12-13 21:31:39 +0000 > Branch: main > URL: https://cgit.FreeBSD.org/doc/commit/?id=d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 This sounds good to me, the reason I have both Author and Committer fields because I was thinking if we have pull request / merge workflow, there will be more commits and pushes with different author/committer/pusher, and the date of these three will be different, the From and Date fields in mail header can only cover the pusher. BTW, the current commit hook does check all the commits in a push and verify all the committer fields are the same with pusher, so the above issue might not happen. I was just preserving some flexibility. > 4) Some repository-specific things I would find helpful based on how > I have filtered svn commits: > > - For doc, some kind of mail header ('X-Git-Foo') to indicate commits that > only touch translations as separate from English and top-level shared > areas. Previously I used some pattern matches on paths in svn subjects > to do this. > > - For src, some kind of mail header to indicate commits that touch the > kernel vs only touching userland. I don't quite get these, can you provide some examples to help me understand them thoroughly? Do you mean we can have something like we have in svn, there are the paths (directories) touched in the subject and headers? This was not implemented when the doc migration due to the time constraint, but I'll look into them after the higher priority items in the migration are done. Best, Li-Wen From owner-freebsd-git@freebsd.org Wed Dec 16 12:52:15 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 8EACE4BBDD1 for ; Wed, 16 Dec 2020 12:52:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (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 4Cww4v0qj1z4rvj for ; Wed, 16 Dec 2020 12:52:14 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x731.google.com with SMTP id c7so22331335qke.1 for ; Wed, 16 Dec 2020 04:52:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ziyVXlrOu9YFo072/2KxY5pI6eT9BRnW0+YtwuNlmTA=; b=LxBJOyDfs07P2chqTDXPs4cxRUbPgb2s9L6uxEF13wNqFjeYmCV9QLA43p6MJrLYin 9A6nIXye867WRONmu3v4SUUlO6QwdqAdAhSwOsA3ERKfPgV99lTdMDC5CikKmqG9priU 7gVAql/afEm4LrNNImmSz5WgWVzmW+5fSHLHBBVDydtIciG7sfDExK2yxiE7mjtxTT55 Yci8Yv41dbThrFOiHfiZWR6vMtdCVqUmQ4xG0fqBHN6VI0AI7TkZt//9d1zmUXQxYNyh axFvQ5rMb6nX1GxviMSKc/GWqcaBrCZ7zLXzvm/xrPptEDavdJWwXYdzHZ4Ni1IJa4VA M+qg== 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=ziyVXlrOu9YFo072/2KxY5pI6eT9BRnW0+YtwuNlmTA=; b=cIerDYwfmFucOhGK8Ts/PIUCp7iZgBqyhRUnfDY9fsHrwHzMrMLcTqTwiCEDjjan98 65ZSstt/Q42vO1ivkb6k86//MzHDdt3JUUZVi0T0bnC4HZgw9mY8AaTMcURSwu2bMMjJ BQYHzyxhJjgTT4rUATVPRRYKhKkhDEnenezY2JkFpLOCQ9dSz84e4GQepz/8XXs1YytF SWXwvLpzUfMwFWmqZL7zG6biBbHGAyUn8IeEASIUUbcKqmkoyKRVCAO8rRzpuB1DzYQ+ 465PHlhSj33VaJLGNv05m3kV1+h9vd9nLh63lW0Us2kSeRdDEW9fxiV597lREPO+g2rA IPig== X-Gm-Message-State: AOAM531F/oceZojsWfAXQMwtXB054ItAMYgfL8wb5U0jG3lxtTM58RUt 640qDUKGB25n1UzXkqj5b//MMA2wdtz3pbcVHiNVWnxOHXA= X-Google-Smtp-Source: ABdhPJzzawMTcmd6ZxVPVWitvWDEgDIBRm7aoSyHcaDkInZjiqoaoFCg9JDSS4ZuAYzA5aA9JiHGammyEC+tbOLi0go= X-Received: by 2002:a37:306:: with SMTP id 6mr23059884qkd.206.1608123134446; Wed, 16 Dec 2020 04:52:14 -0800 (PST) MIME-Version: 1.0 References: <202012160812.0BG8C7iT006176@slippy.cwsent.com> In-Reply-To: <202012160812.0BG8C7iT006176@slippy.cwsent.com> From: Warner Losh Date: Wed, 16 Dec 2020 05:52:03 -0700 Message-ID: Subject: Re: Vendor Imports To: Cy Schubert Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4Cww4v0qj1z4rvj X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=LxBJOyDf; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::731) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::731:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::731:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::731:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 12:52:15 -0000 On Wed, Dec 16, 2020 at 1:12 AM Cy Schubert wrote: > Can we extrapolate that multilevel vendor trees, those with > subdirectories, > would need a cp -R or rsync? > It would. > The example shown says: > > % cd ../mtree > % cp ~/git/NetBSD/usr.sbin/mtree/* . > % > > cp -R would be appropriate for more complex software like openssl, > unbound, > and the like. Is this correct? > Yes. You're right. rsync with delete has been suggested, but I've not had time to update the example. Warner From owner-freebsd-git@freebsd.org Wed Dec 16 16:09:08 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 681AE4C0C9C for ; Wed, 16 Dec 2020 16:09:08 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cx0S34kwgz3LcB for ; Wed, 16 Dec 2020 16:09:07 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id pZMNkIzSXbYg3pZMOkgAlI; Wed, 16 Dec 2020 09:09:05 -0700 X-Authority-Analysis: v=2.4 cv=Q4RsX66a c=1 sm=1 tr=0 ts=5fda3121 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=zTNgK-yGK50A:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=QiusiZUvnxUlgqmC-J0A:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 6E775CC5; Wed, 16 Dec 2020 08:09:02 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 0BGG910P018294; Wed, 16 Dec 2020 08:09:02 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202012161609.0BGG910P018294@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: Cy Schubert , freebsd-git@freebsd.org Subject: Re: Vendor Imports In-reply-to: References: <202012160812.0BG8C7iT006176@slippy.cwsent.com> Comments: In-reply-to Warner Losh message dated "Wed, 16 Dec 2020 05:52:03 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 16 Dec 2020 08:09:01 -0800 X-CMAE-Envelope: MS4xfPFGdaWAVMxJomMAFiwH6ObNt3oDfOYS4wFJwAOLXWOncDHKB0xx4Iflng8uxwC5TTn/0qnu1ubr0YZiW6yDolT0mjGlyA8O4PRHGL8q8Ab5fsJEb3ue H9bQminnyXo5LQ7FFETXgDO662DXRzREcj5nvh6qHl2LO792lt3kmRf+dxHA8nJJjbL/RZEl8mT476kGmOtaKeaygcyHTdAHoHIMXKB3zpTz9XapuAi/1Uho X-Rspamd-Queue-Id: 4Cx0S34kwgz3LcB X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.136.139) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-1.70 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_SHORT(-1.00)[-0.999]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.229.168:received]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.136.139:from]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; AUTH_NA(1.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; RWL_MAILSPIKE_VERYGOOD(0.00)[64.59.136.139:from]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 16:09:08 -0000 In message , Warner Losh writes: > --0000000000002f35bf05b6945830 > Content-Type: text/plain; charset="UTF-8" > > On Wed, Dec 16, 2020 at 1:12 AM Cy Schubert > wrote: > > > Can we extrapolate that multilevel vendor trees, those with > > subdirectories, > > would need a cp -R or rsync? > > > > It would. > > > > The example shown says: > > > > % cd ../mtree > > % cp ~/git/NetBSD/usr.sbin/mtree/* . > > % > > > > cp -R would be appropriate for more complex software like openssl, > > unbound, > > and the like. Is this correct? > > > > Yes. You're right. rsync with delete has been suggested, but I've not had > time to update the example. Except that rsync duplicates hard link relationships whereas cp -R copies them as if they are independent files in their own right. An rsync without the -a or -H options should be suggested. Or does git treat hard links to the same file as different files? (Meaning I'm talking through my hat?) -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Wed Dec 16 16:58:58 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 089194C1578 for ; Wed, 16 Dec 2020 16:58:58 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) (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 4Cx1YY0YFQz3PML for ; Wed, 16 Dec 2020 16:58:56 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f169.google.com with SMTP id q1so23208599ilt.6 for ; Wed, 16 Dec 2020 08:58:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=sT8+iLbNUcwSnuk/maitUCZWDWytAGA0whVapT4nG00=; b=cipXuwrn7HYNs3UDgWhIpjuaeUsZLnTVRPFL/frgmepYAWGHbttMGpaqCVrtfIzULF 5wUM59brzWbEVXWN4pKQAeGMK/vVb0fprdvTc0w8yEc5hcHGTKvRyX8ws0WPHfjHFLau vK2HVSfWvaIBRQipG1WdQEzoV+1jsveQDqnVUbTO8VJCPqK0ZunJmrO8a++7G476GQ0G l9if4gx68K7MA3Mvx8LHohFprdSwakTQFoPsaaM8aCNj0RUNgFbFZR2JHbMUxp+s2gzr G+PWjHyN6I/cu+wRBGHfg4RrTYg9NEcKZBjhu62A+hGyLBQsVSWK+hal2cm/mdpyfcyt o6qA== X-Gm-Message-State: AOAM533fc8IcVD9hD4/SoO49TAnSoOd4Hs/q0PYVp7JrF0/oclonzBu4 49ZpfBrGKipb5wS8GmdWM8GpE6xaI/hBUX/fncuthuF5HD+Dpg== X-Google-Smtp-Source: ABdhPJzLdyBD1dge9cNy61yfv0+eHgZfJd82UUtbo1qFI+9GJ/URlE40vjwyaHBRrCO1BpLKw+HjRni9MJg5o3ws4s8= X-Received: by 2002:a92:b694:: with SMTP id m20mr39696784ill.182.1608137934889; Wed, 16 Dec 2020 08:58:54 -0800 (PST) MIME-Version: 1.0 From: Ed Maste Date: Wed, 16 Dec 2020 11:58:43 -0500 Message-ID: Subject: Git commit message templates To: freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Cx1YY0YFQz3PML 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.169 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.166.169:from]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DOM_EQ_FROM_DOM(0.00)[]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[209.85.166.169:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.169:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.169:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 16:58:58 -0000 I've written up an article on commit messages that's now incorporated into Warner's doc collection, with an intended final destination of the handbook. The current version of that document is here: https://github.com/bsdimp/freebsd-git-docs/blob/main/commit.md One outstanding Git transition item is work on commit message templates. We currently have an SVN template that lists the metadata fields we use, such as PR:, Reviewed by:, and such. Git supports local commit hooks (in .git/hooks) and I've made a trivial port of that to a git commit message preparation hook. I imagine we'd have these in the tree (in tools/tools/git/hooks/) and provide either documentation or a script to install or symlink them into the user's .git/hooks/ directory. The current trivial hook is open in https://reviews.freebsd.org/D27633. From owner-freebsd-git@freebsd.org Wed Dec 16 19:49:16 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 199064C5802 for ; Wed, 16 Dec 2020 19:49:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (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 4Cx5L26fkkz3qsg for ; Wed, 16 Dec 2020 19:49:14 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72a.google.com with SMTP id 22so13814289qkf.9 for ; Wed, 16 Dec 2020 11:49:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=5tD8XSHw1muCxYizZu6X+R53l9FvqPcWARvuG7dXZJY=; b=IaLdQrGtftNRHHsugvjNlJkxo2h+YmF877hpVigd0Ulk/RRSAjb0Uerybfz6CaSic2 Lx2WZPLZWhd2j9RAIODxvrayTMfEbCw20bCykRsCHt6TSc+FcKlAaPL7dfy+70C9/76R gFI6jfm9/8jxKigtTyexd7+Vnb3OyWA4SC4pHx6Ad0mx10WjSZ63Z1lRh9lsRCVKODNk hQAvaEL3ISEI4mdvTFToT7i+5BOL5kWOvjlLrUiZ/zRnvHMCY1fECbf8fTrN0QiWscwR 7Gf7FtJi9VKojZzH+qpEQlzvE6FZq2zuCJ70PFFX1tdHHs7grrNvYHzXCwoFV0RxbDaI jmrQ== 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=5tD8XSHw1muCxYizZu6X+R53l9FvqPcWARvuG7dXZJY=; b=W0bsmtswQ8Q7hvFcqOtKz6qNLGlSqNsKxKdBJ7fKb+BeaDxIOIDepMbMBGHrKWL/IQ qlICqKnoJmewZ8mC0Yefuqb3vVrZ6m1tgE25jxs/IvpaXPmhBybEJVHe0KbIfxrUNS2C /BF+2zY6G/gyFPT98KQ/lU7ZmteHXsFl0FY8GT7VLOhUePtrrLcL6noOSnYFzIbjGteE UZ3jQWUlChIcOzgIZQ+cUJxxKEaRwad2AZXxRqzim01sADrLZ4owYWLBrX81Z0qqUrNi vVTi3MzhO6ygF7nEk52/0T326YSsxNSsIt8nkmqzugfNHQW0puaFgxY5Wq/l1JB1Z3cf HVmA== X-Gm-Message-State: AOAM53082ThA2vaeCfSrj4X8dR+DfnKEhaDuNJSIq+xBQWJuu1dO0W7m AlnPxwPwQ8bwxrf2MFkc7H22UmHRh4prb+yEXKlbm+xHPkpuaQ== X-Google-Smtp-Source: ABdhPJz74SNpmuF1VtvvFf1iu2IKlvmMLulEqsIsRXOAlGCuEYREWJL/B4qzyrX0n2etvy2Vzp/3X0IYxTuKIY/8m/o= X-Received: by 2002:a37:4a4e:: with SMTP id x75mr35017892qka.89.1608148153648; Wed, 16 Dec 2020 11:49:13 -0800 (PST) MIME-Version: 1.0 References: <202012160812.0BG8C7iT006176@slippy.cwsent.com> <202012161609.0BGG910P018294@slippy.cwsent.com> In-Reply-To: <202012161609.0BGG910P018294@slippy.cwsent.com> From: Warner Losh Date: Wed, 16 Dec 2020 12:49:02 -0700 Message-ID: Subject: Re: Vendor Imports To: Cy Schubert Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4Cx5L26fkkz3qsg X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=IaLdQrGt; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72a) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72a:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72a:from]; NEURAL_HAM_SHORT(-1.00)[-0.998]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72a:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 19:49:16 -0000 On Wed, Dec 16, 2020 at 9:09 AM Cy Schubert wrote: > In message > om> > , Warner Losh writes: > > --0000000000002f35bf05b6945830 > > Content-Type: text/plain; charset="UTF-8" > > > > On Wed, Dec 16, 2020 at 1:12 AM Cy Schubert > > wrote: > > > > > Can we extrapolate that multilevel vendor trees, those with > > > subdirectories, > > > would need a cp -R or rsync? > > > > > > > It would. > > > > > > > The example shown says: > > > > > > % cd ../mtree > > > % cp ~/git/NetBSD/usr.sbin/mtree/* . > > > % > > > > > > cp -R would be appropriate for more complex software like openssl, > > > unbound, > > > and the like. Is this correct? > > > > > > > Yes. You're right. rsync with delete has been suggested, but I've not had > > time to update the example. > > Except that rsync duplicates hard link relationships whereas cp -R copies > them as if they are independent files in their own right. An rsync without > the -a or -H options should be suggested. Or does git treat hard links to > the same file as different files? (Meaning I'm talking through my hat?) > I'm unsure. An experiment is in order. Warner From owner-freebsd-git@freebsd.org Wed Dec 16 21:31:53 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 0EF6D4C6DEE for ; Wed, 16 Dec 2020 21:31:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cx7cS4QxKz4R1T for ; Wed, 16 Dec 2020 21:31:52 +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.16.1/8.15.2) with ESMTPS id 0BGLVjsH047553 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 16 Dec 2020 22:31:45 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Wed, 16 Dec 2020 22:31:45 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Warner Losh Cc: Cy Schubert , freebsd-git@freebsd.org Subject: Re: Vendor Imports Message-ID: References: <202012160812.0BG8C7iT006176@slippy.cwsent.com> <202012161609.0BGG910P018294@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4Cx7cS4QxKz4R1T 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.34 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, 16 Dec 2020 21:31:53 -0000 On Wed, 2020-12-16 at 12:49:02 -0700, Warner Losh wrote: >On Wed, Dec 16, 2020 at 9:09 AM Cy Schubert >wrote: > >> In message >> > om> >> , Warner Losh writes: >> > --0000000000002f35bf05b6945830 >> > Content-Type: text/plain; charset="UTF-8" >> > >> > On Wed, Dec 16, 2020 at 1:12 AM Cy Schubert >> > wrote: >> > >> > > Can we extrapolate that multilevel vendor trees, those with >> > > subdirectories, >> > > would need a cp -R or rsync? >> > > >> > >> > It would. >> > >> > >> > > The example shown says: >> > > >> > > % cd ../mtree >> > > % cp ~/git/NetBSD/usr.sbin/mtree/* . >> > > % >> > > >> > > cp -R would be appropriate for more complex software like openssl, >> > > unbound, >> > > and the like. Is this correct? >> > > >> > >> > Yes. You're right. rsync with delete has been suggested, but I've not had >> > time to update the example. >> >> Except that rsync duplicates hard link relationships whereas cp -R copies >> them as if they are independent files in their own right. An rsync without >> the -a or -H options should be suggested. Or does git treat hard links to >> the same file as different files? (Meaning I'm talking through my hat?) >> > >I'm unsure. An experiment is in order. Git only knows soft links, hard links are handled implicitly, as they have the same content hash, so the blob is the same and you end up with 2 tree entries pointing to the same blob. (To my knowledge a checkout will *not* hard link files, think about supporting Windows and all that, even though NTFS supposedly has links too?) To handle deletes, you either need to: - rm -rf * && cp -R ~/some/src/ . - rsync -a --del ~/some/src/ . or anything in between. Just make sure that file deletions are also being done :) Cheers Uli From owner-freebsd-git@freebsd.org Wed Dec 16 22:18:18 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 5E6974C7F65 for ; Wed, 16 Dec 2020 22:18:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cx8f221bSz4THG; Wed, 16 Dec 2020 22:18:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (unknown [IPv6:2601:648:8681:1cb0:891d:fb18:e1d8:8a71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id E5DE2CDB3; Wed, 16 Dec 2020 22:18:17 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: Thoughts on git commit mail To: Dan Langille , John Mehr via freebsd-git References: From: John Baldwin Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <60a3340f-4b49-6285-54a5-5c177af03cff@FreeBSD.org> Date: Wed, 16 Dec 2020 14:18:16 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 22:18:18 -0000 On 12/15/20 4:20 PM, Dan Langille wrote: > On Tue, Dec 15, 2020, at 6:59 PM, John Baldwin wrote: > >> 2) I would drop the first sentence. It's a bit redundant to list >> the committer an extra time. The branch name is useful, but it >> might be nicer as metadata if possible, e.g.: >> >> Branch: main > > When you say meta-data, do you mean email headers? No, I mean the part of the mail contents before the actual commit log that contains 'Key: value' fields. There are also mail headers (X-Git-foo) that you can use already. -- John Baldwin From owner-freebsd-git@freebsd.org Wed Dec 16 22:29:09 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 DD5624C88B2 for ; Wed, 16 Dec 2020 22:29:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cx8tY5jF4z4VC5 for ; Wed, 16 Dec 2020 22:29:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id C22094C86C6; Wed, 16 Dec 2020 22:29:09 +0000 (UTC) Delivered-To: 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 C1DC64C87D1 for ; Wed, 16 Dec 2020 22:29:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cx8tY4wVNz4TtJ; Wed, 16 Dec 2020 22:29:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (unknown [IPv6:2601:648:8681:1cb0:891d:fb18:e1d8:8a71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 3F9D9CEB1; Wed, 16 Dec 2020 22:29:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: Thoughts on git commit mail To: Li-Wen Hsu Cc: git@freebsd.org References: From: John Baldwin Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <22b040fa-6afa-2453-3d84-f26bce0e5132@FreeBSD.org> Date: Wed, 16 Dec 2020 14:29:08 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 22:29:09 -0000 On 12/16/20 2:23 AM, Li-Wen Hsu wrote: > On Wed, Dec 16, 2020 at 7:59 AM John Baldwin wrote: >> >> So far I have a few possible suggestions on the git commit mail >> that I would find useful. Mostly it consists of making it a bit >> leaner: > > Thanks for the inputs and I'll try to squeeze time to implement them, > and/or find a suitable place to put the insensitive config files and > scripts for let more people to join the development. Certainly we should get some consensus on the format and if we make changes, batch them up and only make them once. I was trying to kick start that discussion. >> Putting 1-3 together for the commit in question would give the >> header below which I think is a bit more compact and similar to >> svn formatting in that all the metadata is in a single block >> without additional whitespace. >> >> commit d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 >> Author: Glen Barber >> Date: 2020-12-13 21:31:39 +0000 >> Branch: main >> URL: https://cgit.FreeBSD.org/doc/commit/?id=d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 > > This sounds good to me, the reason I have both Author and Committer > fields because I was thinking if we have pull request / merge > workflow, there will be more commits and pushes with different > author/committer/pusher, and the date of these three will be > different, the From and Date fields in mail header can only cover the > pusher. FWIW, to keep a clean liner history, GDB's policy is that committers always do a 'git rebase --ignore-date' prior to pushing to master which results in only a single effective date. It also means that dates and times are monotonic in 'git log' which I find to be a feature. >> 4) Some repository-specific things I would find helpful based on how >> I have filtered svn commits: >> >> - For doc, some kind of mail header ('X-Git-Foo') to indicate commits that >> only touch translations as separate from English and top-level shared >> areas. Previously I used some pattern matches on paths in svn subjects >> to do this. >> >> - For src, some kind of mail header to indicate commits that touch the >> kernel vs only touching userland. > > I don't quite get these, can you provide some examples to help me > understand them thoroughly? Do you mean we can have something like we > have in svn, there are the paths (directories) touched in the subject > and headers? This was not implemented when the doc migration due to > the time constraint, but I'll look into them after the higher priority > items in the migration are done. So I'm not sure what the best approach to follow here is. I think trying to list all the subdirectories affected in separate headers (e.g. X-Git-Subdir) would be expensive to generate, but maybe that wouldn't be the worst thing (e.g. my kernel-request could then just match on if there's an 'X-Git-Subdir' header that matches 'sys*'). The other options might be to add specific custom headers such as 'X-Git-Kernel: yes' for commits that touch the kernel. To be clear, this also falls more under "would be nice to have" than a "must". -- John Baldwin From owner-freebsd-git@freebsd.org Wed Dec 16 22:35:58 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 680A44C8E0A for ; Wed, 16 Dec 2020 22:35:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cx92Q0wBwz4VT6; Wed, 16 Dec 2020 22:35:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (unknown [IPv6:2601:648:8681:1cb0:891d:fb18:e1d8:8a71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id BD3ACCCF3; Wed, 16 Dec 2020 22:35:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: Git commit message templates To: Ed Maste , freebsd-git References: From: John Baldwin Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: Date: Wed, 16 Dec 2020 14:35:56 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 16 Dec 2020 22:35:58 -0000 On 12/16/20 8:58 AM, Ed Maste wrote: > I've written up an article on commit messages that's now incorporated > into Warner's doc collection, with an intended final destination of > the handbook. The current version of that document is here: > https://github.com/bsdimp/freebsd-git-docs/blob/main/commit.md The only one I'm not a fan of is the lack of punctuation for the first sentence. Newspaper headlines also use additional capitalization (e.g. last word and "significant words"), so the current recommendation is a mix of things and not fully consistent with either one. Given our previous practice to date in CVS and SVN, using a full sentence and formatting it as a sentence seems more consistent. I suspect in practice though that trailing punctuation might just vary by committer. (That seems to be what happens in some other projects I've looked at.) -- John Baldwin From owner-freebsd-git@freebsd.org Thu Dec 17 20:48:15 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 5A85C4C4123 for ; Thu, 17 Dec 2020 20:48:15 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (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 "anubis.delphij.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cxkbf1rgSz4mCl; Thu, 17 Dec 2020 20:48:13 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from odin.corp.delphij.net (unknown [IPv6:2601:646:8601:f4a:9886:3dcc:c5b5:773]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id B48A547717; Thu, 17 Dec 2020 12:48:06 -0800 (PST) Reply-To: d@delphij.net To: freebsd-git@freebsd.org Cc: Cy Schubert , uqs@FreeBSD.org, Warner Losh From: Xin Li Subject: Intention to import a vendor change to contrib/unbound Message-ID: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> Date: Thu, 17 Dec 2020 12:48:05 -0800 User-Agent: Thunderbird MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="FaTLd6DhcN0TthV5QRe3f3FL1kYP5LaFP" X-Rspamd-Queue-Id: 4Cxkbf1rgSz4mCl X-Spamd-Bar: ------ X-Spamd-Result: default: False [-6.09 / 15.00]; HAS_REPLYTO(0.00)[d@delphij.net]; RCVD_VIA_SMTP_AUTH(0.00)[]; XM_UA_NO_VERSION(0.01)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; HAS_ATTACHMENT(0.00)[]; DKIM_TRACE(0.00)[delphij.net:+]; DMARC_POLICY_ALLOW(-0.50)[delphij.net,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.62.153.212:from]; ASN(0.00)[asn:6939, ipnet:64.62.128.0/18, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[delphij.net:s=m7e2]; FREEFALL_USER(0.00)[delphij]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; SPAMHAUS_ZRD(0.00)[64.62.153.212:from:127.0.2.255]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 17 Dec 2020 20:48:15 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --FaTLd6DhcN0TthV5QRe3f3FL1kYP5LaFP Content-Type: multipart/mixed; boundary="0bhGmWmlsfFe8LIkTd9izlGc2sw0EQYlD"; protected-headers="v1" From: Xin Li Reply-To: d@delphij.net To: freebsd-git@freebsd.org Cc: Cy Schubert , uqs@FreeBSD.org, Warner Losh Message-ID: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> Subject: Intention to import a vendor change to contrib/unbound --0bhGmWmlsfFe8LIkTd9izlGc2sw0EQYlD Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi, There is a bugfix that needs to be applied to contrib/unbound (and subsequently MFC'ed to stable/12) and I'd like to check with you before proceeding. Basically what I would propose to do is: 1) Apply 08968baec1122a58bb90d8f97ad948a75f8a5d69 on vendor/unbound/dist This fixes a relatively serious reliability bug that would make unbound crash when udp-connect is used. 2) Perform a regular svn merge from vendor/unbound/dist to head/contrib/unbound, with that revision only. After merge, check the svn:mergeinfo change contained only: /vendor/unbound/dist: X where X is the revision number. 3) Regular test, etc., then commit. The alternative to a full vendor import would be to commit the change to head/contrib/unbound directly without merge, but it might require a little bit more work for future imports. Cheers, --0bhGmWmlsfFe8LIkTd9izlGc2sw0EQYlD-- --FaTLd6DhcN0TthV5QRe3f3FL1kYP5LaFP Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEceNg5NEMZIki80nQQHl/fJX0g08FAl/bxAUFAwAAAAAACgkQQHl/fJX0g0+q 4A/+KsSHQTwMpzF2xl4StvcN0uwOFUyylQ23erR+MnhZ9+dhOLRk4boG09HQu+9KUq6HGjIDa3mD YjrDtZ66HqzDf6Z7x5bbUCNrou7hMetT74YrMbJ7/PrOQupfTGu1lg7QkxRwrmvY3IM7E0PLpdy1 fAjtDfwYxmmfTfJiqtDTrn153t5SdCzBSKMZFegVUdObhsHB36yBkcnxTFsjbpk+Shyx+s0SpzoJ JKhO+6z4PtNCjWJUuQnKBkPCmhu2nuNZXWRYIqdmR5TysFp8v+lYlTMx21bl7EVKsOW1WdyOc6bb avUoG10R0A53izYxoYyOVrDkuC4Wiu97TPJNfkUBmQUz4bbAgB7Sws6G481Fe0OLA+R6soO1Hy8A 3P1YqEkHgPbRIQg9iZcJhCSJErbG4ZIkQDSgUZi31i5jv8BjT7MF+jreMr2Re7Yuvd0v6iTJSsJf paC0KXhuPRzTDcyQ99DzSTt4j69u0YZYZy50SA31E6J0jhteXNlXEbCvz6a/qtmyS483QqxbQ5ZE Aa7rBNOnmGbUxR1fnhx/K3n9rBT55Q6ue7bBgqpGulpPGPjB4wmdSauR7XYXTAFa/XwIAX9ZeYw3 6GM82vJvuxn/rOTWcQEoa2Rhwpi42syXD7JZEUuLL8LJOBsEnVhClOt3q7JM06DxFNTv+K/XMDmy pcE= =jmtv -----END PGP SIGNATURE----- --FaTLd6DhcN0TthV5QRe3f3FL1kYP5LaFP-- From owner-freebsd-git@freebsd.org Thu Dec 17 20:48:47 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 AE9044C4283 for ; Thu, 17 Dec 2020 20:48:47 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) (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 4CxkcG5RdTz4mFk for ; Thu, 17 Dec 2020 20:48:46 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f53.google.com with SMTP id z5so28864183iob.11 for ; Thu, 17 Dec 2020 12:48:46 -0800 (PST) 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; bh=qWm/rtUtb939VjAxHTzGY0Ls3OgxMLtHGMrzS7P1tnc=; b=kVxGXf8nKBiBLtOEyF9gyZrr/y6S6/+kD5F5Ihxt/zdTOMoWbhhXYBcbZmTVdQAMWs 1CgNuwem6vFSqXXdaHa+pIFJYl/wFt+ZkT1Di5idY6PjpO2ELVrmBziwNgmy8/Md/t0R 7Fzm/L8tZ8+OGyxhHfOZb6HvU89pDk7mqpLthvPNHcAKo7JI4UwWzYun6Jdq8Lh8oxRH 6wBFZHPeNApHJmBS5sxT+spun4Nv/1yzZ3JfygGLoFO6X1rEu5wSozCfFpD2nTIWnxBJ vuvKc6sD9idfb8TFBaXwMZ+U/X/VJDuctEUa4ujIeCmF+veWgQE83SsSZr01xaBRsT06 yOGw== X-Gm-Message-State: AOAM532DWlVxDuwSPRhDe1ajoolQhTZQe8AdKZruijoheOHmal2EZUUV tBF9wk0tb672RYQYz8pztr29ro8IvL9KDayKqD3impTupBw8kQ== X-Google-Smtp-Source: ABdhPJyLf2bNgyLLuhQbDk5sQwC+80vmoNKEAegX/1XGT1dSaWcaUJ2rrxVPrfyBjs93cceU0aUt90EERMysu+BVXOQ= X-Received: by 2002:a6b:b5d2:: with SMTP id e201mr951218iof.111.1608238124838; Thu, 17 Dec 2020 12:48:44 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 17 Dec 2020 15:48:32 -0500 Message-ID: Subject: Re: Git commit message templates To: freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4CxkcG5RdTz4mFk 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.53 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.166.53:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[carpeddiem]; R_DKIM_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[209.85.166.53:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.53:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.53:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 17 Dec 2020 20:48:47 -0000 On Wed, 16 Dec 2020 at 11:58, Ed Maste wrote: > > One outstanding Git transition item is work on commit message > templates. We currently have an SVN template that lists the metadata > fields we use, such as PR:, Reviewed by:, and such. Git supports local > commit hooks (in .git/hooks) and I've made a trivial port of that to a > git commit message preparation hook. I imagine we'd have these in the > tree (in tools/tools/git/hooks/) and provide either documentation or a > script to install or symlink them into the user's .git/hooks/ > directory. > > The current trivial hook is open in https://reviews.freebsd.org/D27633. I've now committed this to tools/tools/git/hooks, and it can be installed by placing it in .git/hooks of a doc/src/ports repository. (If you're using worktrees then it's the .git directory of the main repository, and the same hook will be used for all worktrees.) To install it you could run: % cp -p tools/tools/git/hooks/prepare-commit-msg .git/hooks/ From owner-freebsd-git@freebsd.org Thu Dec 17 20:57:25 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 C141A4C4397 for ; Thu, 17 Dec 2020 20:57:25 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CxkpF2jkWz4mbC; Thu, 17 Dec 2020 20:57:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id q0KwkTWsatdldq0KxkTTt9; Thu, 17 Dec 2020 13:57:24 -0700 X-Authority-Analysis: v=2.4 cv=INe8tijG c=1 sm=1 tr=0 ts=5fdbc634 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=zTNgK-yGK50A:10 a=SWg00rOMAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=P223rL09e3ntA5xNHM4A:9 a=CjuIK1q_8ugA:10 a=uT1z2e2TMlQA:10 a=nWvTgx2JuP7DHgfbJPXu:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 60DBD6F3; Thu, 17 Dec 2020 12:57:22 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 0BHKvLGq027689; Thu, 17 Dec 2020 12:57:21 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202012172057.0BHKvLGq027689@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: d@delphij.net cc: freebsd-git@freebsd.org, Cy Schubert , uqs@FreeBSD.org, Warner Losh Subject: Re: Intention to import a vendor change to contrib/unbound In-reply-to: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> References: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> Comments: In-reply-to Xin Li message dated "Thu, 17 Dec 2020 12:48:05 -0800." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 17 Dec 2020 12:57:21 -0800 X-CMAE-Envelope: MS4xfEF+0IsWtFh+UYZvKVSfEMAlVW76aivAIAgLO6BiiwLpvpJvwhl8DV/z8cPRHEtZnw7MmOm3DXQ0mZ6MOjXOuamesrYcuIvarXuLvjmetUBqxw6pHkDP B3u3M9A4NxWG5E7ksgKEI/PKp8MgoQ6v6kMmdM3w92z2k5+ZuvfbaZOu6anNqOA2wRmAwUDnxN4tMpS1+we8KVkR7EANjnx++5R2adaxacB5jtzfQ3CkOyK0 6lrNwX8IX9ls1I5kfh5pjiBbW6FHzEVf/9GCNSrl4Sq3YT7zl/QOMuIwdpmCRRHVWgXu2fXJ/bP8wSyoniTtSQ== X-Rspamd-Queue-Id: 4CxkpF2jkWz4mbC X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 17 Dec 2020 20:57:25 -0000 In message <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net>, Xin Li writes: > This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > --FaTLd6DhcN0TthV5QRe3f3FL1kYP5LaFP > Content-Type: multipart/mixed; boundary="0bhGmWmlsfFe8LIkTd9izlGc2sw0EQYlD"; > protected-headers="v1" > From: Xin Li > Reply-To: d@delphij.net > To: freebsd-git@freebsd.org > Cc: Cy Schubert , uqs@FreeBSD.org, > Warner Losh > Message-ID: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> > Subject: Intention to import a vendor change to contrib/unbound > > --0bhGmWmlsfFe8LIkTd9izlGc2sw0EQYlD > Content-Type: text/plain; charset=utf-8 > Content-Language: en-US > Content-Transfer-Encoding: quoted-printable > > Hi, > > There is a bugfix that needs to be applied to contrib/unbound (and > subsequently MFC'ed to stable/12) and I'd like to check with you before > proceeding. Basically what I would propose to do is: > > 1) Apply 08968baec1122a58bb90d8f97ad948a75f8a5d69 on vendor/unbound/dist > > This fixes a relatively serious reliability bug that would make unbound > crash when udp-connect is used. > > 2) Perform a regular svn merge from vendor/unbound/dist to > head/contrib/unbound, with that revision only. After merge, check the > svn:mergeinfo change contained only: > > /vendor/unbound/dist: X > > where X is the revision number. > > 3) Regular test, etc., then commit. > > The alternative to a full vendor import would be to commit the change to > head/contrib/unbound directly without merge, but it might require a > little bit more work for future imports. Thanks. I was just about to do this myself. Thanks for taking are of this for us. cc'd you on the email to the person who notified me of it. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Thu Dec 17 20:58:46 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 BF33A4C43A7 for ; Thu, 17 Dec 2020 20:58:46 +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 4Cxkqp4q3Rz4myf; Thu, 17 Dec 2020 20:58:46 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f49.google.com with SMTP id z136so28918419iof.3; Thu, 17 Dec 2020 12:58:46 -0800 (PST) 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=nt6mdLXR3608CS5pCQzC51C4VC+rG/q2zjyABzBHJsc=; b=uAh2rfhTPx2qJSZXD3mbxWt8I7R6CqWpSo0wVH8WMIbpic2v50i6caOLvZPgcKCHPt ti6UnyttZ2oieNNsluHo7AhROsY3KOXtsl+WOQyr5kfX+9sc4W7FOw1mR1YjWZPtvgL3 1jqObADJ6bN85yt0QBrHXEswduqi+H/Gn5pOOvkWf/2AkFE6yetRt1GkTpKX8spJkqGF t9efcITsBCRm8iHvcfuoQ0Zsw5mT4IYwNWD9Fp5ygW5vaGAtgzxe+HStZiQ8nzRd+iv9 Bv/n/hotsavwMaHiddvOxLfPrqjccJymhqanfCEksAowf1jsiWSv8PioClYER/eP2DC4 JSSQ== X-Gm-Message-State: AOAM533ICyM36hB9FAz4GdWec3AMT0wOsnHw34pzXlKmM+gNjxZGOJ0G cwAYWwhS4gwEry8UzdsprJDdbTjbQRfuXyBSwwrb+jRzqN4= X-Google-Smtp-Source: ABdhPJzOOyKrq3yJQU+cvkdPYKr+UST2dGak/2y2boooQ+Q2aNE6vELLYvUxXaGnZRPTFR2ldsU0Mwd3W9X9cweX7os= X-Received: by 2002:a6b:1451:: with SMTP id 78mr1046063iou.102.1608238724393; Thu, 17 Dec 2020 12:58:44 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 17 Dec 2020 15:58:31 -0500 Message-ID: Subject: Re: Git commit message templates To: John Baldwin Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Cxkqp4q3Rz4myf X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 17 Dec 2020 20:58:46 -0000 On Wed, 16 Dec 2020 at 17:35, John Baldwin wrote: > > The only one I'm not a fan of is the lack of punctuation for the first > sentence. Newspaper headlines also use additional capitalization > (e.g. last word and "significant words"), so the current recommendation > is a mix of things and not fully consistent with either one. Fair point - considering the first line as one would an email subject is probably the best approach. If I look over the last year I see (using egrep -c on git log --since=1year --oneline): 8383 commits 3715 end in . 4668 do not end in . Of the 6372 commits less than 80 characters (including the short hash): 2416 end in . 4316 do not end in . > I suspect in > practice though that trailing punctuation might just vary by committer. > (That seems to be what happens in some other projects I've looked > at.) Yes, I expect this will happen in our repository as well. From owner-freebsd-git@freebsd.org Thu Dec 17 21:03:08 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 C8DF74C45D4 for ; Thu, 17 Dec 2020 21:03:08 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cxkwr0w3xz4nQZ for ; Thu, 17 Dec 2020 21:03:07 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 9E7B24C4623; Thu, 17 Dec 2020 21:03:06 +0000 (UTC) Delivered-To: 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 9520F4C480B for ; Thu, 17 Dec 2020 21:03:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cxkwn3jc3z4nLC for ; Thu, 17 Dec 2020 21:03:05 +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.16.1/8.15.2) with ESMTPS id 0BHL32tU034049 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Thu, 17 Dec 2020 22:03:02 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Thu, 17 Dec 2020 22:03:02 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: git@freebsd.org Subject: HEADS UP: src and ports hashes will respin, doc partially affected Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4Cxkwn3jc3z4nLC 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.34 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, 17 Dec 2020 21:03:09 -0000 Hey folks due to some late breaking authormap changes, we will have to redo the conversion of the not-ready src and ports repos (doc will remain unaltered of course, as that horse has bolted ...) Sometime tomorrow, I will push the changes and as a result - most refs in src - most refs in ports will need to be force pushed and you'll need to rebase your work on top of that. You probably have practiced this already by now :/ Sorry for the inconvenience, if you think you lost some part of your work due to that, please reach out to me (and stop touching your clone!) as git is very good at actually _not_ losing your work. As for doc, it will have a force-push to the refs/notes/commits "branch" which will result in the total repo going from 110k commits down to 55k commits. src and ports will undergo the same treatment as part of the final conversion run and push. As no one branches or checks out refs/notes/commits, this should be rather uneventful. Regards Uli From owner-freebsd-git@freebsd.org Thu Dec 17 21:31:16 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 E38884C5500 for ; Thu, 17 Dec 2020 21:31:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CxlYJ510Dz4qD5; Thu, 17 Dec 2020 21:31:16 +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.16.1/8.15.2) with ESMTPS id 0BHLV2hx035885 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 17 Dec 2020 22:31:02 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Thu, 17 Dec 2020 22:31:02 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Xin Li Cc: freebsd-git@freebsd.org, Cy Schubert , Warner Losh Subject: Re: Intention to import a vendor change to contrib/unbound Message-ID: References: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4CxlYJ510Dz4qD5 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.34 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, 17 Dec 2020 21:31:16 -0000 On Thu, 2020-12-17 at 12:48:05 -0800, Xin Li wrote: >Hi, > >There is a bugfix that needs to be applied to contrib/unbound (and >subsequently MFC'ed to stable/12) and I'd like to check with you before >proceeding. Basically what I would propose to do is: > >1) Apply 08968baec1122a58bb90d8f97ad948a75f8a5d69 on vendor/unbound/dist > >This fixes a relatively serious reliability bug that would make unbound >crash when udp-connect is used. > >2) Perform a regular svn merge from vendor/unbound/dist to >head/contrib/unbound, with that revision only. After merge, check the >svn:mergeinfo change contained only: > >/vendor/unbound/dist: X > >where X is the revision number. > >3) Regular test, etc., then commit. > >The alternative to a full vendor import would be to commit the change to >head/contrib/unbound directly without merge, but it might require a >little bit more work for future imports. Consider this approved, as long as it happens within the next 18h or so. As for a direct commit to head, I don't think it'll make a later merge harder, as git doesn't track what has and hasn't been merged anyway and will have to make a conflict-merge happen either way. Good luck! Uli From owner-freebsd-git@freebsd.org Fri Dec 18 03:36:56 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 25E254ADCB5 for ; Fri, 18 Dec 2020 03:36:56 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CxvgD0S0wz3hRv for ; Fri, 18 Dec 2020 03:36:56 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 0F6924ADCB2; Fri, 18 Dec 2020 03:36:56 +0000 (UTC) Delivered-To: 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 0F2FE4ADBB9 for ; Fri, 18 Dec 2020 03:36:56 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CxvgC6yYkz3hMx; Fri, 18 Dec 2020 03:36:55 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from weatherwax.trouble.is (weatherwax.trouble.is [IPv6:2a00:1098:82:3a::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "weatherwax.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id CB7BF29BE4; Fri, 18 Dec 2020 03:36:55 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from rincewind.trouble.is (rincewind.trouble.is [95.216.22.234]) (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 "rincewind.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) by weatherwax.trouble.is (Postfix) with ESMTPS id 4CxvgB6gt7z1VHL; Fri, 18 Dec 2020 03:36:54 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4Cxvg85rWdz5wgG; Fri, 18 Dec 2020 03:36:52 +0000 (UTC) From: "Philip Paeps" To: "Warner Losh" Cc: git@freebsd.org Subject: Re: Imminent tzdata import (was: Re: Vendor Imports in Subversion) Date: Fri, 18 Dec 2020 11:36:49 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5754) Message-ID: In-Reply-To: <385AFFEC-CBBD-4715-B6B2-3D06F67B4969@freebsd.org> References: <385AFFEC-CBBD-4715-B6B2-3D06F67B4969@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Fri, 18 Dec 2020 03:36:56 -0000 On 2020-12-10 00:18:23 (+0800), Philip Paeps wrote: > On 2020-12-09 23:48:37 (+0800), Warner Losh wrote: >> On Wed, Dec 9, 2020 at 1:16 AM Philip Paeps >> wrote: >>> On 2020-12-09 14:47:18 (+0800), Warner Losh wrote: >>>> The git working group is making final preparations for the cut over >>>> in two weeks (currently planned to start December 19). There's one >>>> item that's caused some recent problems that we'd like to ask the >>>> committer's help on: vendor imports. We've had a few vendor imports >>>> of late that have caused problems for the git converter. Imports >>>> should be done from the top level so that the merge info winds up >>>> in the right place. uqs@ has added code to defensive code to >>>> detect the recent problems, but we're not sure it will catch >>>> everything. >>>> >>>> So, over the next two weeks, we'd like to ask that committers >>>> refrain >>>> from doing vendor imports in the src tree for those cases where >>>> delay is possible. For vendor imports that can't wait, due to >>>> security or other serious issues, please coordinate with >>>> git@freebsd.org before doing the vendor import. If there's a >>>> confidential matter, you can contact me (imp@freebsd.org) or the >>>> core team instead. >>>> >>>> Thanks for your understanding... >>> >>> I expect there will be one more tzdata import this year. Probably >>> in the next week or so. >>> >>> I could potentially hold this one off, but one of the timezones in >>> Russia is changing at short notice and we do have a sizeable number >>> of users in Russia. >>> >>> https://mm.icann.org/pipermail/tz/2020-December/029607.html >>> >>> It sounds like the timezone is changing on 27 December 2020 (argh) >>> but we won't know for sure until next week (argh argh). >>> >>> Given that tzdata imports are exceedingly trivial, perhaps this is >>> actually a best-case first import to try out the process? Happy to >>> coordinate with you guys. >> >> Thanks Philip for the heads up. This is the sort of timely data that >> makes sense not to delay. You've done a number of these in the past, >> so this should be OK. Please take extra care to ensure that the >> mergeinfo properties are done correctly at the high level. >> Unless someone else pipes up, please consider this approved. We're >> planning to start the conversion of December 19, so please try to >> have it done well ahead of that, iana willing :). > > Thank you! > > I'll merge the new tzdata (with extra care and double checking) on the > same day it comes out if it's before the 19th. If it comes out early > next week, I'll give it the usual couple of days in HEAD before I MFC > it. If it comes out closer to the 19th, I'll MFC it a bit sooner so > 1) the dust has a bit of time to settle before the Git migration and > 2) affected users get it sooner. I'm cautiously optimistic it'll come > out next week, so it'll be business as usual for me. > > If the tzdata release does end up only happening after the 19th ... > well ... we'll attack that dragon when it shows its tail. :-) > > I'll keep git@ posted whatever happens. It looks like the tzdata release won't happen before we move to Git. It will probably happen shortly after we move. Is there some documentation (in the works) about how to do a vendor import in the Git world? Thanks. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From owner-freebsd-git@freebsd.org Fri Dec 18 04:38:40 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 3213B4AF010 for ; Fri, 18 Dec 2020 04:38:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cxx2S0p5nz3kqB for ; Fri, 18 Dec 2020 04:38:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 197954AF00F; Fri, 18 Dec 2020 04:38:40 +0000 (UTC) Delivered-To: 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 193D44AF100 for ; Fri, 18 Dec 2020 04:38:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cxx2S09Tvz3l34; Fri, 18 Dec 2020 04:38:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f176.google.com (mail-yb1-f176.google.com [209.85.219.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id E822F2A7C4; Fri, 18 Dec 2020 04:38:39 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f176.google.com with SMTP id y4so835912ybn.3; Thu, 17 Dec 2020 20:38:39 -0800 (PST) X-Gm-Message-State: AOAM533S0hF+s0+f/bxKxv5iEMSQZr5U15vOC6BmI+We+mRnyz4wCWAf fpm+V/3+IfqMzDQkYNs5BijOEBeAp4svBXNdhdM= X-Google-Smtp-Source: ABdhPJzUnCc0Kzl3lS4jIZdCqd0+MP6Tbyrq+xh45haMBk5lGYouAaNjH5B/i8tOX9Ix+K7FnnqB1rdhWSTNciPjxMo= X-Received: by 2002:a25:9981:: with SMTP id p1mr3641936ybo.241.1608266319506; Thu, 17 Dec 2020 20:38:39 -0800 (PST) MIME-Version: 1.0 References: <385AFFEC-CBBD-4715-B6B2-3D06F67B4969@freebsd.org> In-Reply-To: From: Li-Wen Hsu Date: Fri, 18 Dec 2020 12:38:28 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Imminent tzdata import (was: Re: Vendor Imports in Subversion) To: Philip Paeps Cc: Warner Losh , git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Fri, 18 Dec 2020 04:38:40 -0000 On Fri, Dec 18, 2020 at 11:36 Philip Paeps wrote: > On 2020-12-10 00:18:23 (+0800), Philip Paeps wrote: > > On 2020-12-09 23:48:37 (+0800), Warner Losh wrote: > >> On Wed, Dec 9, 2020 at 1:16 AM Philip Paeps > >> wrote: > >>> On 2020-12-09 14:47:18 (+0800), Warner Losh wrote: > >>>> The git working group is making final preparations for the cut over > >>>> in two weeks (currently planned to start December 19). There's one > >>>> item that's caused some recent problems that we'd like to ask the > >>>> committer's help on: vendor imports. We've had a few vendor imports > >>>> of late that have caused problems for the git converter. Imports > >>>> should be done from the top level so that the merge info winds up > >>>> in the right place. uqs@ has added code to defensive code to > >>>> detect the recent problems, but we're not sure it will catch > >>>> everything. > >>>> > >>>> So, over the next two weeks, we'd like to ask that committers > >>>> refrain > >>>> from doing vendor imports in the src tree for those cases where > >>>> delay is possible. For vendor imports that can't wait, due to > >>>> security or other serious issues, please coordinate with > >>>> git@freebsd.org before doing the vendor import. If there's a > >>>> confidential matter, you can contact me (imp@freebsd.org) or the > >>>> core team instead. > >>>> > >>>> Thanks for your understanding... > >>> > >>> I expect there will be one more tzdata import this year. Probably > >>> in the next week or so. > >>> > >>> I could potentially hold this one off, but one of the timezones in > >>> Russia is changing at short notice and we do have a sizeable number > >>> of users in Russia. > >>> > >>> https://mm.icann.org/pipermail/tz/2020-December/029607.html > >>> > >>> It sounds like the timezone is changing on 27 December 2020 (argh) > >>> but we won't know for sure until next week (argh argh). > >>> > >>> Given that tzdata imports are exceedingly trivial, perhaps this is > >>> actually a best-case first import to try out the process? Happy to > >>> coordinate with you guys. > >> > >> Thanks Philip for the heads up. This is the sort of timely data that > >> makes sense not to delay. You've done a number of these in the past, > >> so this should be OK. Please take extra care to ensure that the > >> mergeinfo properties are done correctly at the high level. > >> Unless someone else pipes up, please consider this approved. We're > >> planning to start the conversion of December 19, so please try to > >> have it done well ahead of that, iana willing :). > > > > Thank you! > > > > I'll merge the new tzdata (with extra care and double checking) on the > > same day it comes out if it's before the 19th. If it comes out early > > next week, I'll give it the usual couple of days in HEAD before I MFC > > it. If it comes out closer to the 19th, I'll MFC it a bit sooner so > > 1) the dust has a bit of time to settle before the Git migration and > > 2) affected users get it sooner. I'm cautiously optimistic it'll come > > out next week, so it'll be business as usual for me. > > > > If the tzdata release does end up only happening after the 19th ... > > well ... we'll attack that dragon when it shows its tail. :-) > > > > I'll keep git@ posted whatever happens. > > It looks like the tzdata release won't happen before we move to Git. It > will probably happen shortly after we move. > > Is there some documentation (in the works) about how to do a vendor > import in the Git world? The WIP doc is at https://github.com/bsdimp/freebsd-git-docs/blob/main/vendor.md And if possible, I encourage you test the workflow with the test/develop area, described in the =E2=80=9Cclone=E2=80=9D section of https://cgit-dev.= FreeBSD.org/src. Best, Li-Wen > From owner-freebsd-git@freebsd.org Sat Dec 19 20:20:10 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 599CC4A893B for ; Sat, 19 Dec 2020 20:20:10 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CyxtK1L3vz4mXS for ; Sat, 19 Dec 2020 20:20:08 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 2D98F4A8874; Sat, 19 Dec 2020 20:20:07 +0000 (UTC) Delivered-To: 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 2C4E04A8656 for ; Sat, 19 Dec 2020 20:20:07 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CyxtD6yYBz4mMQ; Sat, 19 Dec 2020 20:20:04 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1608409206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=txMsMrRJTSCv8SeXBeiTkIYP9fmrY2CyGOYKeKemph0=; b=yVPl3Zyh5d+cDi/3tCjm9XY81lXj16Qn6frhC7e9SJ3KLc7qAJYDkQPqQviSVld+r/Sk4K TU6n7N32UuEAKnoSYi+N/e9E7IkG0k7lnI642zMXAKSpVGq1iGsM5UNC7k6HpMAyT1ElZk BuKCZWe6EXeBHYSFQN+pNbCBj4VqEnDklc5+rfZnUXBPyLr1BK351QWIWhd9uNEus5n8BF ULnJJ6JnVEs/PKqq/iyCfgg1l2Ck4YaZRm+V6CrzOcLlJ59cAo1W7gM4FFTpOk6nWiOimm c43end+aWsJx5aLTA54zSILeE3+P+6/AUNxbWAHscUHrQhCB3AMOcHfKzJW3Xg== Received: by freefall.freebsd.org (Postfix, from userid 1185) id E4C054657; Sat, 19 Dec 2020 20:18:42 +0000 (UTC) Date: Sat, 19 Dec 2020 20:18:42 +0000 From: Rene Ladan To: Adam Weinberger Cc: crees@freebsd.org, git@freebsd.org, "portmgr@FreeBSD.org" Subject: Re: converting rmport to git Message-ID: <20201219201842.GA29125@freefall.freebsd.org> References: <20201129164707.GA31739@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1608409206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=txMsMrRJTSCv8SeXBeiTkIYP9fmrY2CyGOYKeKemph0=; b=aHa+CXMWn1UBtiyE7QWzpJugxPdrKiQF74CbTYnhnuXaDJStCaqZdjEDrnUTxzti+5/Lxd b7HcIqb7Y9hplsT/sfagQarbCu9v97AREkLHX0tFEhhn6BNcKGZxAYbk5JANKq+UFvhyHw qulLqi1vu8xJR1T8YwKyG19E68N7rjRYoN5xoWvV/Cc3LVSXPTXvLm4OXptvmEnSa3H0A7 Fvtdi227DkQX5LiT/RrzZXUx/mUSokgN5hHp4ECGMsLVIU7KVMv3bvLsAMWeykfNcGGLBa WLfjcgKVIVafu8wIWHjdxVl8IhEf5QK42eBB5qbj7GShVHyGLyDJdbUS3Uzxtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1608409206; a=rsa-sha256; cv=none; b=TGp1miHY1x3f+3pBUDXH1mRsi8IEwyRoRjj2dzYbakFJeuWA51Wi2dzJa92/SbdbOXOjkV atLOAdhN7440tggfEUalA7+KrlEyTiigFWy9zd9IjwPYP+NsPJCY766ngXipfUvWY1JAcp 7Jzogy603DOdDYHvvJxX0PqIdJggKRjw5wStPivarueOT/gfC2FG4g3vRI9lLUYnXWefeq 8u6FDdXjW6voOY56mW8fhf/udoH/73yIvkgKz3Od/gtT/b1RIYjDXZrWfHZHr4+7nG1bAB I2oNd5mHauq0ZSqAU0CGGTeMdIxIA7MhioBuexkEEXjN00HIuEoHGKlOUYJYpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Sat, 19 Dec 2020 20:20:10 -0000 On Sun, Nov 29, 2020 at 10:12:21AM -0700, Adam Weinberger wrote: > On Sun, Nov 29, 2020 at 9:47 AM Rene Ladan wrote: > > > > Hello, > > > > I started converting some scripts in the port tree to git, and hit a design > > decision with Tools/scripts/rmport. I finished the draft for rmport today, I'll test it against the toy repo at git@repo-dev.freebsd.org:ports.git tomorrow. In short, I went for the temporary branch solution, squash-merging it back to main. I also took advantage of `git grep` . Regards, René