From owner-freebsd-git@freebsd.org Sun Apr 4 20:32:27 2021 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 C2BC65B3DC0 for ; Sun, 4 Apr 2021 20:32:27 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic317-20.consmr.mail.gq1.yahoo.com (sonic317-20.consmr.mail.gq1.yahoo.com [98.137.66.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FD57Z50qBz3wP2 for ; Sun, 4 Apr 2021 20:32:25 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1617568344; bh=RIQ8/fv6xGY128sdoXaqHgmc2oyTG5T3E6NucGyAuML=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=eHZ3TDG0bjcPoJyufkQXVGc+EiY+PEGJBDBqbtVK2uT7hY6tr8o2ev2AIo0IzuG8hMP25eb86CuJ+BJLIal+wRjgBxpW0olOrCXRwpeB+QNCGD4SQ+TX/c+OqMn/uCesNRwFEmXMQ5JzmWlPv6UY138sqG73El70PEcpxuSJdXgGt0yAcmFe1XJ4YZRSgCgX2bCC43qagpiWd07OolOhvbXSQkbRAgopggtoABqHj17DkGxDcdMMr0ancfRDWy0MED7JUQVPK/r3A9wSbArramsJd/xwLvFiWJ9qvuaTEv5ozXPkNBDRRgLl0O/0GkZQz5P5GiAgPxjeICejVPpeqQ== X-YMail-OSG: eREKCjAVM1nQdDB704gdWA8ml4xE9jsXhOuahaPdV.i3YZTEZ7wp4zRdKphDt9c 1iO57yxlFDGkEgZ4BrusD7VW8h5StSyjGECscwS00wwvITF.ie5vG4l2SmkTntiZNIuuWpj22P5O W0tFVLqASQS5RMAJx.A9s2A5zA74pgZr8MCV.ErEeHDUTRTbVAO82NIn46kXcDmXupyeOgWo_lAq HTLw.aqaOWKGb_6l8zCfykDoZMmNEWoZPmDI20JCEZGRCDACb2BA6KFMKB8qVZotMtyDCHM1uDPT wDLuf1kkEni6_rTDMom8WxOaeyRyRrokI89168YL246gy92Qxfrf1H4lu5__yM2F2FZd3G4MbUL6 taAQH7QWMldOAclc4dmR0IygPpFpQYGdr2FYiLpXjOAWcWB_MpVaE4kCbCbq5lQuulWQu78T00HP Rs4pxAY3iIOdKxyXvb35DB4yf6OSQhnHbZkNeN1MUnFJ6Ch0Ixla7IwGBJxymK8kqGLelxDg2U6h kEYZ857K4CdQWQDVMQMk_jlb9UtcqfzoKr.QlqL6oBMzngLd30BEUwrYIbzjjp98iB52IOBiUKmU SvYernMHdqKYETyQEqDe.yt9qfJzlS5wrsJu43QmIfs6lMXzapLIhit1j0e0p9U1jJ9KweTCVwKX O3.oAeU3sXqIsMjx4baXC4SgCen9AvSO42iCCqvpGj7yJUf1.1W6j5e87NU1NKCrZXaVHtCgPsQm f7DcS9X2uydGK8QHesZq_6AD2owawy25veRKEO2bl0Cyqe75TFLDoJspWhg0aeFC8uCbo1IJpQRS y8CEzE.G5mBfl0t3NnZbNZ8JEAPTSIJIlPF9oVDqi2LjacbooIsNvOc1igWMPDOyV1hHamV_LTxn jN5030nSXTRjFSsnG2URsCBaMRocEXbdjMeRdfVh.g_wvAJgUoRkuuhJ3G.re54OnF8m.I_hhWh6 Qe_aAPWJphS53KwyEkyBWWot5PRbKX5VuKh5QJ0T7pjVd4UKNIfDYX6HYa2Zsfdbo0phZEn3z8qN jTBuYF2rxETT7G0O_tMnlncHmW0qQcGBQQYmVtpK.nLnHaBjcsueMn9iiq6B2swI6PTJzK7eGfK4 qqqgOVseKBg2pZQpsN.zFc0Wo77FJ4DksaKkczppRs5ipux4hWbnRxRnhJjmTIjbOjZriiN0uu_H rDI1OLaB9Dh1N86_vBrA2oZx4ccDTTjubE4wxb8vm8LCQbTbPka5_OiiYdgioiNWn3L9RWzWkmcJ YWmuLURsRRruMtR7btHvPS3j9Y8hg_dK3icMOyvn4PNx7oDYZeKkEzZFGN.ZMfTrG.hLrHm1_CZS I82ThFI7ajg7jjtPXQ8NWAIMEcHktUeAylkea1l9AQn_LcQCNTe4byLHB7g9ip32yB2xXcze11LK wqJeR1jXbUk9LqkTgJKKZ1EGUzqcWzKwhzs8CsNrtcuBYQoqHhA68yVP3_oztWhGyaxOu_BOrM.E l5k0hRofr.2IRnl5K9QgNqLvI7QvwrMGQ4TjjVMbq2aPjLWYNEtwvKPcDXQkR8hXq3LgOT4a.Zws 5BgtUQqPjw7HYRmV8vbaNesidnfay6OI45WxWmW1D9eEMeaaJ3qQDdpXmnmCf1XMifUMZWRp9OGx C1vRDja2lWTPAFEcDd86rbZeTOBGSvpTRzq6UdQdfUvryMVp0_fjKZcF7c0qkUIJkQAX_auTGnUe HO9xjMw1tfT3TjVgLcThfNndVRqOFND38j5QfLbaqXVUy01mIqbMlwex7Z8BIPbq09frz2jrP.AT Src3EsK9IkU0ow9FN5MMCTSvh9YdAdwu3_kRXJuqoOxtG7M3J5LylAKj1.zP_ZZtB9MGgS34zRa_ l5EHLAIKE1COIGYaJgb2zZ0PvK8FKIG6i3BF4xXZCxF_LBjYW6IWKkTi5x2QYCNX1wVVuB_WyDGM VpJYoCqjq26jxw6QPzCQIqmnbRhXcZm3Rh._8w45rXFZqGh8HpAdLOvC3hIw1428p.NSKbyM2mBh N9zGwu0PTG6karELEz8dv89l.mkBBWqKi1Tty37h78zk2IiCD0XJbrm8pRrmzPKP4gQjRFKK1MUD ZkMdvCw3eHZD..r2UucWLCxOwRaNbx.R_LCriLQRcorC08gxlbGBN4QdOdTORIKOsrA4KIN3kfpE vX7P_GKcaqLCZVJrmMTmQAkY8VVx6xatqPk6m7UxXgVY7aNjHriafCQrgevlPnp3Ko0lzs5h7CWV Yi8QTxpoDF7mDTfVVFESE848CQ8M_oKrqqS4KrSDidopP6t02TizrDOJtIqkJ99FTkGeXoNSt6iv O65_Z_UHJKqnmYb6uuk56vfxumQuXY0VSKvY6JMg3ohPTaJnHbjUNlYShNpEA0Fh0Cc23Bn5RyJc 035mS_2vrSf1qpZQX47Me6uspJA5hTd52KaoxfY4ritDgr1JLA_113pirFfETogOr6CjuiGaHw5o g76hHva8dk6Ph33U- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.gq1.yahoo.com with HTTP; Sun, 4 Apr 2021 20:32:24 +0000 Received: by kubenode548.mail-prod1.omega.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID db6575e8707a95168af52234eab9467e; Sun, 04 Apr 2021 20:32:22 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: FreeBSD ports git switch vs. github and the like? Message-Id: Date: Sun, 4 Apr 2021 13:32:21 -0700 To: freebsd-git X-Mailer: Apple Mail (2.3654.60.0.2.21) References: X-Rspamd-Queue-Id: 4FD57Z50qBz3wP2 X-Spamd-Bar: - X-Spamd-Result: default: False [-1.87 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-0.37)[-0.374]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.66.146:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; SUBJECT_ENDS_QUESTION(1.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MID_RHS_MATCH_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]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[98.137.66.146:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[98.137.66.146:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.66.146:from]; RCVD_COUNT_TWO(0.00)[2]; 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: Sun, 04 Apr 2021 20:32:27 -0000 Unlike for src, the ports schedule at: https://wiki.freebsd.org/git makes no mention of the likes of "Starting pushing to external mirrors (github, gitlab, etc.)". But there is activity like: https://lists.freebsd.org/pipermail/freebsd-ports/2021-April/120698.html where folks are assuming github bindings for gitup and the like. (People are attempting to figure out how to avoid portsnap.) Could https://wiki.freebsd.org/git use some more notes for these aspects of the svn->git conviersion? (Note: I do not use portsnap or github for freebsd materials. I'm just noting what is going on by some folks that do.) === Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Sun Apr 4 20:55:17 2021 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 6780F5B4866 for ; Sun, 4 Apr 2021 20:55:17 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FD5dw2jJMz4SKw for ; Sun, 4 Apr 2021 20:55:15 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by maybe.home.utahime.org (Postfix) with ESMTPS id 9AC1616683 for ; Mon, 5 Apr 2021 05:55:06 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1617569706; bh=HDfHL1PzunrtVLpeFclv5ghlRbDmjXr+HZhyiXNCiyk=; h=Date:To:Subject:From:In-Reply-To:References; b=Cc+AC2tB0QO0ga8YOKk9oGfN0iBfUragqSloBdEVT4uHs7PkwEHzmydUGkmGe+FGL f3jWq1hOOeWXKVSVZVU6GQpI41KfRJUQtYZrBAKi+4bnrNN2aU9CpCN86ekJUNSC8i 31UqBmxLjfSUlEqn9gHkBXUZfwkXm9sv1qBh0UPH8mE2evwn/TgyvHXBn8exYQoyxx Rx1zaG4gIiXwP6Ipv11CiljRLvyjR6Gq5Sc2WcRzXQTqBrZIfSuANueNTmOnQZcavu DHdD+tFTNnb+DpFR+GYUJhtPzq2OwsLGjf7vSJRuT+QA6j5suFjx6tQm/zioCNzuNr UrIcF5D1+QQkQ== Received: from localhost (rolling.home.utahime.org [192.168.174.11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id E3AF42DA50; Mon, 5 Apr 2021 05:55:05 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.1 at eastasia.home.utahime.org Date: Mon, 05 Apr 2021 05:54:19 +0900 (JST) Message-Id: <20210405.055419.1566802084610746676.yasu@utahime.org> To: freebsd-git@freebsd.org Subject: Re: FreeBSD ports git switch vs. github and the like? From: Yasuhiro Kimura In-Reply-To: References: X-Mailer: Mew version 6.8 on Emacs 27.2 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FD5dw2jJMz4SKw X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=utahime.org header.s=maybe2019112701 header.b=Cc+AC2tB; dmarc=none; spf=pass (mx1.freebsd.org: domain of yasu@utahime.org designates 183.180.29.210 as permitted sender) smtp.mailfrom=yasu@utahime.org X-Spamd-Result: default: False [0.30 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org]; TO_DN_NONE(0.00)[]; HFILTER_HELO_IP_A(1.00)[maybe.home.utahime.org]; HFILTER_HELO_NORES_A_OR_MX(0.30)[maybe.home.utahime.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[utahime.org:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[183.180.29.210:from]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[utahime.org]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[183.180.29.210:from:127.0.2.255]; MID_CONTAINS_FROM(1.00)[]; 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: Sun, 04 Apr 2021 20:55:17 -0000 From: Mark Millard via freebsd-git Subject: FreeBSD ports git switch vs. github and the like? Date: Sun, 4 Apr 2021 13:32:21 -0700 > Unlike for src, the ports schedule at: > > https://wiki.freebsd.org/git > > makes no mention of the likes of "Starting pushing > to external mirrors (github, gitlab, etc.)". > > But there is activity like: > > https://lists.freebsd.org/pipermail/freebsd-ports/2021-April/120698.html > > where folks are assuming github bindings for gitup > and the like. (People are attempting to figure out > how to avoid portsnap.) > > Could https://wiki.freebsd.org/git use some more > notes for these aspects of the svn->git conviersion? > > (Note: I do not use portsnap or github for freebsd > materials. I'm just noting what is going on by > some folks that do.) Right now there is following new repository on GitHub, and it seems to be the copy of GitHub ports mirror before the start of migration. https://github.com/freebsd/freebsd-ports-legacy And ports mirror repository is updated. Current status seem to be same as that of ports repository on cgit-beta. I'm not sure if this is final result of the conversion. --- Yasuhiro Kimura From owner-freebsd-git@freebsd.org Tue Apr 6 01:49:52 2021 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 AA0135CD3C1 for ; Tue, 6 Apr 2021 01:49:52 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) (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 4FDr7M51wgz4Yyt for ; Tue, 6 Apr 2021 01:49:51 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: by mail-wm1-x330.google.com with SMTP id f22-20020a7bc8d60000b029010c024a1407so8432633wml.2 for ; Mon, 05 Apr 2021 18:49:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=8YlLangVa9XpgcPd7uFwvZ7Ws2haJyZIEuXQF1hw0eE=; b=NktYWhB9YSU9ekXs3kgPNBmWwnMlPA+e588ieCJsz2DQrfMfUtGl5dK5DqA5wBXrNH aDPoXvyO0NnKaDN+eBQQRhiKaXmylD/R9j5oPUOP8KwVyqE23TgZqsYcGNcQXeXoTcsn 8N8v74KxVMQiKeD5wECUhB8VP85Xpjqc2CEwncJdDEQP90/BQDsrpdCcAaDcFK9QCAL+ OVjMJC7vG5d6h6oFUdsESWMdczVQ/sGAjxOCwkWA5qcUh8e1jfFt0ni7c6b9jBx9TzBZ s9oezhL/dGPxb3yauS8Py3BQ0m+oaan1RVMJ+kQsfsZ6KMwRHYEXFng0n1AV3zoamCzf dTOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=8YlLangVa9XpgcPd7uFwvZ7Ws2haJyZIEuXQF1hw0eE=; b=IXEHqgyIlvDq7E2nMnTizBZvPFgbqWViIASopfHRDplYTBC0BrVkCgUSHsuqHZpREB dFvTENpRHnbCW26c5d+Tl6X3hs6IUwKu7HvpeNMLveMtaU6Nc7NUqNzD0PwzySn1nX9+ GH7z6l/V2zN37Q+zPayQjcVcMn+2o14lppm0PjdeuVwcCYllI7S+FZpaBUWZumY9Lk9e XQABlPNIRvm8dA6ZvU1DAD+5zeYhY4Ece8Pdjmafy3wzGk6+G/sHjrBxRcN6s8YTqEau sZkLMcS12uV3/t8v6dFIcKKGbpww4XN+aAntGRByds2kQWs36auE8NbfEBwxdSqgj5hp E/5w== X-Gm-Message-State: AOAM5336Ug5IH72WMrkCEQtqucVVYKa0gl9b9zE0MzfM2P3Z5r5wS1CF 2ginIzKYzA0Rg3Jnnnjc2YRXBii6KqkVDg== X-Google-Smtp-Source: ABdhPJz3U0jdf3P3wRhj1SgWXhigNfadmS5fYO3Emz6N7JxNRGSVT0u+ivKu5lBtN7ucTv93lgueKg== X-Received: by 2002:a05:600c:2247:: with SMTP id a7mr1687091wmm.181.1617673788262; Mon, 05 Apr 2021 18:49:48 -0700 (PDT) Received: from [192.168.1.13] (88-105-96-80.dynamic.dsl.as9105.com. [88.105.96.80]) by smtp.gmail.com with ESMTPSA id g16sm32283479wrs.76.2021.04.05.18.49.47 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Apr 2021 18:49:47 -0700 (PDT) To: freebsd-git@freebsd.org From: Graham Perrin Subject: cgit: linked phrases beneath the 'Clone' subheading Message-ID: Date: Tue, 6 Apr 2021 02:49:47 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB X-Rspamd-Queue-Id: 4FDr7M51wgz4Yyt X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=NktYWhB9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::330 as permitted sender) smtp.mailfrom=grahamperrin@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::330:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RECEIVED_SPAMHAUS_PBL(0.00)[88.105.96.80:received]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; 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)[2a00:1450:4864:20::330:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::330:from]; 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: Tue, 06 Apr 2021 01:49:52 -0000 A nit. Beneath the 'Clone' subheadings at , and the phrases '(public-mirror)' and '(developers-only)' are linked. Resulting URLs such as may be a source of confusion to newcomers who find themselves at the page for ports. From owner-freebsd-git@freebsd.org Tue Apr 6 02:49:14 2021 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 C2C085CE2E8 for ; Tue, 6 Apr 2021 02:49:14 +0000 (UTC) (envelope-from lwhsu@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FDsRt506sz4dQ5 for ; Tue, 6 Apr 2021 02:49:14 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com [209.85.219.173]) (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 94C736877 for ; Tue, 6 Apr 2021 02:49:14 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f173.google.com with SMTP id g38so14562285ybi.12 for ; Mon, 05 Apr 2021 19:49:14 -0700 (PDT) X-Gm-Message-State: AOAM530knJiOnqlfeacm61mol8/YfhZx1gwuQD3kQbCovylnz3N5LEMC NhfC55kqOdM5fY6H6N7R8afAsLO3FXOLH4fX1xI= X-Google-Smtp-Source: ABdhPJxK6bSRl2reMAR2Gwv0PgEH4bVkX8Fw05yQcUIcELCxrPSY6yZLzA1nrf3M4JV5lsEcsP9dgBHfpHDBJctimUA= X-Received: by 2002:a25:5cd:: with SMTP id 196mr30700840ybf.241.1617677354042; Mon, 05 Apr 2021 19:49:14 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Li-Wen Hsu Date: Tue, 6 Apr 2021 10:49:03 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: cgit: linked phrases beneath the 'Clone' subheading To: Graham Perrin Cc: freebsd-git 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: Tue, 06 Apr 2021 02:49:14 -0000 On Tue, Apr 6, 2021 at 9:49 AM Graham Perrin wrote: > > A nit. > > Beneath the 'Clone' subheadings at , > and the > phrases '(public-mirror)' and '(developers-only)' are linked. > > Resulting URLs such as may be > a source of confusion to newcomers who find themselves at the page for > ports. Yes I also don't like this, but I cannot find a better clone-url setting in cgitrc. If you know how to improve this, please let me know. Thanks, Li-Wen From owner-freebsd-git@freebsd.org Tue Apr 6 08:56:01 2021 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 E493A5C57DB for ; Tue, 6 Apr 2021 08:56:01 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FF1b55xC1z3nTt for ; Tue, 6 Apr 2021 08:56:01 +0000 (UTC) (envelope-from mat@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id C9A2F5C5B10; Tue, 6 Apr 2021 08:56:01 +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 C94DB5C57DA for ; Tue, 6 Apr 2021 08:56:01 +0000 (UTC) (envelope-from mat@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FF1b558glz3nMM for ; Tue, 6 Apr 2021 08:56:01 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [IPv6:2a01:678:4:1::228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "R3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 31BAB9EE5 for ; Tue, 6 Apr 2021 08:56:01 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:ab:0:7030:948c:eeeb:dcce]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 90E69942D80 for ; Tue, 6 Apr 2021 08:55:58 +0000 (UTC) Date: Tue, 6 Apr 2021 10:55:57 +0200 From: Mathieu Arnold To: git@freebsd.org Subject: [rene@FreeBSD.org: git: 1227b53ed1c5 - main - www/chromium: update to 89.0.4389.114] Message-ID: <20210406085557.5apkd6kxgcv5f7a3@aching.in.mat.cc> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="s367zzqm42xuuyag" Content-Disposition: inline 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, 06 Apr 2021 08:56:02 -0000 --s367zzqm42xuuyag Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Is it possible to have the 'status' be a bit more wide? The emails generated when we used svn would never clobber the list of changed files like that. ----- Forwarded message from Rene Ladan ----- Date: Tue, 6 Apr 2021 08:48:41 GMT =46rom: Rene Ladan Subject: git: 1227b53ed1c5 - main - www/chromium: update to 89.0.4389.114 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=3D1227b53ed1c53ea13efeac2bfe= 3fae5532c529ec commit 1227b53ed1c53ea13efeac2bfe3fae5532c529ec Author: Rene Ladan AuthorDate: 2021-04-06 08:40:01 +0000 Commit: Rene Ladan CommitDate: 2021-04-06 08:46:52 +0000 www/chromium: update to 89.0.4389.114 =20 Submitted by: Matthias Wolf via github Security: https://www.vuxml.org/freebsd/bddadaa4-9227-11eb-99c5-e= 09467587c17.html --- www/chromium/Makefile | 23 +- www/chromium/Makefile.tests | 2 +- www/chromium/distinfo | 10 +- www/chromium/files/audio_manager_openbsd.cc | 8 +- .../extra-patch-build_config_compiler_pgo_pgo.gni | 14 +- ...__allocator_page__allocator__internals__posix.h | 2 +- www/chromium/files/patch-BUILD.gn | 22 +- ...atch-apps_app__restore__service__browsertest.cc | 2 +- ...patch-apps_ui_views_app__window__frame__view.cc | 4 +- ...patch-ash_display_mirror__window__controller.cc | 2 +- www/chromium/files/patch-base_BUILD.gn | 44 ++-- .../files/patch-base_allocator_allocator.gni | 11 + ...llocator__shim__default__dispatch__to__glibc.cc | 2 +- ...ator_allocator__shim__override__libc__symbols.h | 2 +- ...tch-base_allocator_allocator__shim__unittest.cc | 12 +- ..._partition__allocator_address__pool__manager.cc | 31 +++ ...__allocator_page__allocator__internals__posix.h | 51 +++- ...ocator_partition__allocator_partition__alloc.cc | 17 +- ...tition__allocator_partition__alloc__unittest.cc | 38 ++- ...cator_partition__allocator_partition__bucket.cc | 36 +++ ...locator_partition__allocator_spinning__mutex.cc | 49 ++++ ...llocator_partition__allocator_spinning__mutex.h | 33 +++ www/chromium/files/patch-base_base__switches.cc | 16 +- www/chromium/files/patch-base_base__switches.h | 16 +- www/chromium/files/patch-base_cpu.cc | 20 +- www/chromium/files/patch-base_cpu.h | 6 +- .../files/patch-base_debug_debugger__posix.cc | 2 +- www/chromium/files/patch-base_debug_elf__reader.cc | 2 +- .../files/patch-base_debug_proc__maps__linux.cc | 26 +- .../files/patch-base_debug_stack__trace.cc | 2 +- www/chromium/files/patch-base_debug_stack__trace.h | 2 +- .../files/patch-base_debug_stack__trace__posix.cc | 26 +- .../patch-base_debug_stack__trace__unittest.cc | 11 +- .../files/patch-base_files_file__path__unittest.cc | 2 +- ...atch-base_files_file__path__watcher__freebsd.cc | 64 +++++ .../patch-base_files_file__path__watcher__kqueue.h | 2 +- .../patch-base_files_file__path__watcher__stub.cc | 53 ----- ...tch-base_files_file__path__watcher__unittest.cc | 21 +- www/chromium/files/patch-base_files_file__util.h | 6 +- .../files/patch-base_files_file__util__posix.cc | 32 ++- .../files/patch-base_files_file__util__unittest.cc | 2 +- .../files/patch-base_files_scoped__file.cc | 2 +- www/chromium/files/patch-base_i18n_icu__util.cc | 2 +- www/chromium/files/patch-base_linux__util.cc | 8 +- .../files/patch-base_location__unittest.cc | 2 +- www/chromium/files/patch-base_logging__unittest.cc | 6 +- .../files/patch-base_memory_discardable__memory.cc | 2 +- ...tch-base_memory_discardable__memory__internal.h | 2 +- ...emory_madv__free__discardable__memory__posix.cc | 2 +- ...-base_memory_platform__shared__memory__region.h | 2 +- ...mory_platform__shared__memory__region__posix.cc | 88 ++++++- ...base_memory_shared__memory__region__unittest.cc | 2 +- ...patch-base_message__loop_message__pump__glib.cc | 2 +- .../files/patch-base_native__library__posix.cc | 2 +- .../files/patch-base_native__library__unittest.cc | 2 +- .../patch-base_numerics_safe__math__shared__impl.h | 2 +- .../files/patch-base_path__service__unittest.cc | 2 +- .../files/patch-base_posix_can__lower__nice__to.cc | 2 +- .../files/patch-base_posix_unix__domain__socket.cc | 2 +- ...ch-base_posix_unix__domain__socket__unittest.cc | 2 +- .../files/patch-base_process_internal__linux.cc | 2 +- .../files/patch-base_process_internal__linux.h | 2 +- www/chromium/files/patch-base_process_kill.h | 2 +- .../files/patch-base_process_kill__posix.cc | 2 +- www/chromium/files/patch-base_process_launch.cc | 2 +- www/chromium/files/patch-base_process_launch.h | 8 +- .../files/patch-base_process_launch__posix.cc | 47 +++- www/chromium/files/patch-base_process_memory.cc | 2 +- www/chromium/files/patch-base_process_memory.h | 2 +- .../files/patch-base_process_memory__unittest.cc | 2 +- .../files/patch-base_process_process__handle.cc | 2 +- .../files/patch-base_process_process__handle.h | 2 +- .../patch-base_process_process__handle__freebsd.cc | 2 +- ...atch-base_process_process__iterator__freebsd.cc | 2 +- .../files/patch-base_process_process__linux.cc | 10 +- .../files/patch-base_process_process__metrics.cc | 10 +- .../files/patch-base_process_process__metrics.h | 6 +- ...patch-base_process_process__metrics__freebsd.cc | 2 +- .../patch-base_process_process__metrics__posix.cc | 2 +- .../files/patch-base_process_process__unittest.cc | 4 +- .../patch-base_process_process__util__unittest.cc | 2 +- .../files/patch-base_profiler_register__context.h | 2 +- ...e_profiler_sampling__profiler__thread__token.cc | 2 +- ...se_profiler_sampling__profiler__thread__token.h | 2 +- .../patch-base_profiler_stack__copier__signal.cc | 8 +- ...ofiler_stack__sampling__profiler__test__util.cc | 2 +- ...profiler_stack__sampling__profiler__unittest.cc | 2 +- .../patch-base_profiler_thread__delegate__posix.cc | 2 +- ...ing__heap__profiler_sampling__heap__profiler.cc | 2 +- .../files/patch-base_security__unittest.cc | 2 +- ...e_strings_sys__string__conversions__unittest.cc | 2 +- .../files/patch-base_synchronization_lock__impl.h | 2 +- www/chromium/files/patch-base_syslog__logging.cc | 2 +- www/chromium/files/patch-base_system_sys__info.cc | 6 +- www/chromium/files/patch-base_system_sys__info.h | 6 +- .../files/patch-base_system_sys__info__freebsd.cc | 2 +- .../files/patch-base_system_sys__info__posix.cc | 16 +- .../files/patch-base_system_sys__info__unittest.cc | 12 +- ...k_thread__pool_environment__config__unittest.cc | 2 +- www/chromium/files/patch-base_test_BUILD.gn | 4 +- .../patch-base_test_launcher_test__launcher.cc | 8 +- .../patch-base_test_test__file__util__posix.cc | 2 +- www/chromium/files/patch-base_test_test__suite.cc | 2 +- .../patch-base_third__party_libevent_BUILD.gn | 2 +- .../files/patch-base_threading_platform__thread.h | 4 +- ...e_threading_platform__thread__internal__posix.h | 2 +- ...patch-base_threading_platform__thread__linux.cc | 8 +- ...patch-base_threading_platform__thread__posix.cc | 6 +- ...ch-base_threading_platform__thread__unittest.cc | 2 +- ...e_threading_scoped__blocking__call__unittest.cc | 2 +- ...-base_threading_thread__task__runner__handle.cc | 20 +- .../files/patch-base_time_time__unittest.cc | 2 +- ...heap__profiler__allocation__context__tracker.cc | 38 +++ ...tch-base_trace__event_malloc__dump__provider.cc | 4 +- ...atch-base_trace__event_process__memory__dump.cc | 4 +- ...patch-base_trace__event_process__memory__dump.h | 11 - ...pressure_system__memory__pressure__evaluator.cc | 22 +- www/chromium/files/patch-build_config_BUILD.gn | 4 +- .../files/patch-build_config_BUILDCONFIG.gn | 8 +- .../files/patch-build_config_compiler_BUILD.gn | 53 +++-- .../files/patch-build_config_compiler_compiler.gni | 16 +- www/chromium/files/patch-build_config_features.gni | 2 +- .../files/patch-build_config_freetype_freetype.gni | 2 +- .../files/patch-build_config_linux_BUILD.gn | 6 +- .../files/patch-build_config_linux_pkg-config.py | 2 +- www/chromium/files/patch-build_config_ozone.gni | 6 +- www/chromium/files/patch-build_config_sysroot.gni | 2 +- .../files/patch-build_detect__host__arch.py | 2 +- www/chromium/files/patch-build_gn__run__binary.py | 2 +- www/chromium/files/patch-build_linux_chrome.map | 8 +- .../files/patch-build_linux_libpci_BUILD.gn | 2 +- .../files/patch-build_linux_unbundle_libusb.gn | 2 +- ...atch-build_linux_unbundle_replace__gn__files.py | 2 +- .../files/patch-build_toolchain_gcc__toolchain.gni | 6 +- ...patch-build_toolchain_get__concurrent__links.py | 2 +- .../files/patch-build_toolchain_linux_BUILD.gn | 2 +- www/chromium/files/patch-cc_BUILD.gn | 6 +- ...patch-cc_layers_scrollbar__layer__impl__base.cc | 2 +- .../files/patch-cc_test_layer__tree__test.cc | 4 +- www/chromium/files/patch-cc_test_pixel__test.cc | 2 +- .../files/patch-cc_trees_frame__rate__estimator.cc | 2 +- .../files/patch-cc_trees_property__tree.cc | 4 +- www/chromium/files/patch-chrome_BUILD.gn | 6 +- www/chromium/files/patch-chrome_app_BUILD.gn | 2 +- .../files/patch-chrome_app_chrome__command__ids.h | 10 +- .../files/patch-chrome_app_chrome__main.cc | 4 +- .../patch-chrome_app_chrome__main__delegate.cc | 75 +++--- .../files/patch-chrome_app_chromium__strings.grd | 8 +- .../patch-chrome_app_generated__resources.grd | 16 +- .../patch-chrome_app_google__chrome__strings.grd | 8 +- .../files/patch-chrome_app_profiles__strings.grdp | 2 +- .../files/patch-chrome_app_settings__strings.grdp | 14 +- ...chrome_app_shutdown__signal__handlers__posix.cc | 2 +- ...hrome_app_theme_chrome__unscaled__resources.grd | 2 +- .../patch-chrome_app_theme_theme__resources.grd | 2 +- www/chromium/files/patch-chrome_browser_BUILD.gn | 4 +- .../files/patch-chrome_browser_about__flags.cc | 84 +++---- ...h-chrome_browser_after__startup__task__utils.cc | 26 +- ...i_media__galleries_media__galleries__apitest.cc | 20 ++ ...__galleries_media__galleries__watch__apitest.cc | 11 + ...pi_music__manager__private_device__id__linux.cc | 2 +- ...ete_chrome__autocomplete__scheme__classifier.cc | 2 +- ...browser_background_background__mode__manager.cc | 4 +- ...owser_background_background__mode__optimizer.cc | 2 +- .../patch-chrome_browser_browser__resources.grd | 4 +- ..._browser_chrome__browser__interface__binders.cc | 10 +- .../patch-chrome_browser_chrome__browser__main.cc | 32 +-- ...-chrome_browser_chrome__browser__main__linux.cc | 16 +- ...-chrome_browser_chrome__browser__main__posix.cc | 12 +- ...ome_browser_chrome__content__browser__client.cc | 86 +++---- ...rome_browser_chrome__content__browser__client.h | 4 +- ...wser_crash__upload__list_crash__upload__list.cc | 8 +- ...__upload__list_crash__upload__list__crashpad.cc | 2 +- ...custom__handlers_protocol__handler__registry.cc | 4 +- .../files/patch-chrome_browser_defaults.cc | 12 +- ...-chrome_browser_dev__ui__browser__resources.grd | 8 +- ...tity_device__oauth2__token__service__factory.cc | 10 +- ...rome_browser_devtools_devtools__eye__dropper.cc | 2 +- ...hrome_browser_diagnostics_diagnostics__writer.h | 2 +- ...download_chrome__download__manager__delegate.cc | 8 +- ...h-chrome_browser_download_download__commands.cc | 2 +- ...ch-chrome_browser_download_download__commands.h | 2 +- ...hrome_browser_download_download__item__model.cc | 2 +- ...atch-chrome_browser_download_download__prefs.cc | 18 +- ...patch-chrome_browser_download_download__prefs.h | 2 +- ...atch-chrome_browser_download_download__query.cc | 2 +- ...wser_download_download__shelf__context__menu.cc | 2 +- .../patch-chrome_browser_error__reporting_BUILD.gn | 10 +- .../files/patch-chrome_browser_extensions_BUILD.gn | 6 +- ...owser_extensions_activity__log_activity__log.cc | 2 +- ...se__reporting__private_device__info__fetcher.cc | 2 +- ...orting__private_device__info__fetcher__linux.cc | 2 +- ...api_erp_chrome_desktop_report_request_helper.cc | 2 +- ...n__action_browser__action__interactive__test.cc | 4 +- ...writer__private_removable__storage__provider.cc | 2 +- ...s_api_runtime_chrome__runtime__api__delegate.cc | 4 +- ...extensions_api_settings__private_prefs__util.cc | 22 +- ...gging__private_webrtc__logging__private__api.cc | 2 +- ..._browser__context__keyed__service__factories.cc | 4 +- ..._browser_extensions_external__provider__impl.cc | 14 +- ...__file__system__access__permission__context.cc} | 6 +- ...-chrome_browser_first__run_first__run__dialog.h | 12 +- ...hrome_browser_first__run_first__run__internal.h | 17 +- ...owser_first__run_first__run__internal__posix.cc | 14 +- .../patch-chrome_browser_flag__descriptions.cc | 38 +-- .../patch-chrome_browser_flag__descriptions.h | 40 ++-- ...h-chrome_browser_intranet__redirect__detector.h | 2 +- ..._galleries_fileapi_mtp__device__map__service.cc | 6 +- ...dia__galleries_media__file__system__registry.cc | 4 +- ...ch-chrome_browser_media_audio__service__util.cc | 11 + ...er_discovery_discovery__network__list__posix.cc | 2 +- ...covery_discovery__network__list__wifi__linux.cc | 2 +- ...splay_wired__display__media__route__provider.cc | 6 +- ...er_media_webrtc_webrtc__event__log__uploader.cc | 6 +- ...e_browser_media_webrtc_webrtc__log__uploader.cc | 6 +- ...ser_media_webrtc_webrtc__logging__controller.cc | 2 +- ...wser_media_webrtc_webrtc__logging__controller.h | 2 +- .../files/patch-chrome_browser_memory__details.cc | 2 +- .../patch-chrome_browser_memory__details__linux.cc | 4 +- ...chrome__browser__main__extra__parts__metrics.cc | 14 +- ...ser_metrics_chrome__metrics__service__client.cc | 29 ++- ...er_metrics_process__memory__metrics__emitter.cc | 6 +- ...rowser_net_system__network__context__manager.cc | 32 +-- ...cations_notification__display__service__impl.cc | 16 +- ...ns_notification__platform__bridge__delegator.cc | 8 +- ...d__manager_chrome__password__manager__client.cc | 26 +- ...r_password__manager_password__store__factory.cc | 12 +- ...atch-chrome_browser_pdf_pdf__extension__test.cc | 21 +- ...rformance__manager_policies_policy__features.cc | 2 +- ...rformance__monitor_process__metrics__history.cc | 2 +- ...erformance__monitor_process__metrics__history.h | 2 +- ...ome_browser_plugins_plugin__info__host__impl.cc | 4 +- ...e_browser_plugins_plugins__resource__service.cc | 8 +- ...wser_policy_browser__signin__policy__handler.cc | 2 +- ...wser__cloud__management__controller__desktop.cc | 2 +- ...onfiguration__policy__handler__list__factory.cc | 22 +- ...y_device__management__service__configuration.cc | 18 +- .../patch-chrome_browser_prefs_browser__prefs.cc | 22 +- ...er_prefs_pref__service__incognito__allowlist.cc | 10 +- ...h-chrome_browser_printing_print__job__worker.cc | 16 +- ...tch-chrome_browser_process__singleton__posix.cc | 19 +- ...hrome__browser__main__extra__parts__profiles.cc | 12 +- .../files/patch-chrome_browser_profiles_profile.cc | 12 +- ..._browser_profiles_profile__attributes__entry.cc | 4 +- ...atch-chrome_browser_profiles_profiles__state.cc | 4 +- ...r__context__menu_render__view__context__menu.cc | 4 +- ...h-chrome_browser_renderer__preferences__util.cc | 16 +- ..._appearance__page_appearance__browser__proxy.js | 2 +- ...settings_appearance__page_appearance__page.html | 16 +- ...s_settings_appearance__page_appearance__page.js | 10 +- ..._incident__reporting_incident__handler__util.cc | 2 +- ...dent__reporting_incident__reporting__service.cc | 2 +- ...rch_search__suggest_search__suggest__service.cc | 2 +- ...b__to__self_receiving__ui__handler__registry.cc | 2 +- ...o__self_send__tab__to__self__client__service.cc | 2 +- ...ser_sharing_shared__clipboard_feature__flags.cc | 2 +- ...wser_sharing_shared__clipboard_feature__flags.h | 2 +- ...rowser_sharing_sharing__device__registration.cc | 4 +- ...ser_sharing_sharing__handler__registry__impl.cc | 12 +- .../patch-chrome_browser_signin_signin__util.cc | 4 +- ...tch-chrome_browser_sync_chrome__sync__client.cc | 8 +- ...er_sync_device__info__sync__service__factory.cc | 20 +- ...browser_sync_profile__sync__service__factory.cc | 22 +- ...e_browser_task__manager_sampling_task__group.cc | 10 +- ...me_browser_task__manager_sampling_task__group.h | 10 +- ..._task__manager_sampling_task__group__sampler.cc | 14 +- ...r_task__manager_sampling_task__group__sampler.h | 2 +- ...r_task__manager_sampling_task__manager__impl.cc | 4 +- ...browser_task__manager_task__manager__observer.h | 2 +- ...hrome_browser_themes_theme__service__factory.cc | 32 +-- ...ome_browser_tracing_crash__service__uploader.cc | 4 +- .../files/patch-chrome_browser_ui_BUILD.gn | 4 +- ...rome_browser_ui_browser__command__controller.cc | 42 ++-- ...patch-chrome_browser_ui_browser__view__prefs.cc | 28 +-- ..._exclusive__access_exclusive__access__bubble.cc | 2 +- .../files/patch-chrome_browser_ui_sad__tab.cc | 2 +- ...chrome_browser_ui_startup_bad__flags__prompt.cc | 12 +- .../files/patch-chrome_browser_ui_tab__helpers.cc | 14 +- ...wser_ui_task__manager_task__manager__columns.cc | 4 +- ...ui_task__manager_task__manager__table__model.cc | 2 +- ...chrome_browser_ui_test_test__browser__dialog.cc | 12 +- ...tch-chrome_browser_ui_test_test__browser__ui.cc | 32 +-- ...h-chrome_browser_ui_views_accelerator__table.cc | 30 +-- ...pps_chrome__native__app__window__views__aura.cc | 28 +-- ...ui_views_bookmarks_bookmark__bar__view__test.cc | 4 +- ...s_chrome__browser__main__extra__parts__views.cc | 34 +-- ...rome_browser_ui_views_chrome__views__delegate.h | 12 +- ...owser_ui_views_download_download__item__view.cc | 13 +- ...h-chrome_browser_ui_views_first__run__dialog.cc | 14 -- ...chrome_browser_ui_views_frame_browser__frame.cc | 33 +-- ...er__non__client__frame__view__factory__views.cc | 22 +- ...-chrome_browser_ui_views_frame_browser__view.cc | 22 +- ..._ui_views_frame_opaque__browser__frame__view.cc | 16 +- ...ue__browser__frame__view__platform__specific.cc | 2 +- ..._ui_views_frame_system__menu__model__builder.cc | 32 +-- ...ui_views_frame_system__menu__model__delegate.cc | 32 +-- ...chrome_browser_ui_views_hung__renderer__view.cc | 4 +- ..._ui_views_profiles_profile__menu__view__base.cc | 11 + ...hrome_browser_ui_views_tabs_new__tab__button.cc | 12 +- .../patch-chrome_browser_ui_views_tabs_tab.cc | 4 +- ..._browser_ui_views_tabs_tab__drag__controller.cc | 24 +- ...ws_web__apps_pwa__confirmation__bubble__view.cc | 11 - .../patch-chrome_browser_ui_webui_about__ui.cc | 6 +- ...i_webui_chrome__web__ui__controller__factory.cc | 32 +-- ...rowser_ui_webui_settings_appearance__handler.cc | 22 +- ...browser_ui_webui_settings_appearance__handler.h | 12 +- ...tings_settings__localized__strings__provider.cc | 21 +- ..._webui_webui__js__error_webui__js__error__ui.cc | 11 + ...ponents_web__app__file__handler__registration.h | 2 +- ...ions_components_web__app__run__on__os__login.cc | 11 + ...__applications_components_web__app__shortcut.cc | 2 +- ...s_extensions_bookmark__app__finalizer__utils.cc | 12 +- www/chromium/files/patch-chrome_common_BUILD.gn | 6 +- .../files/patch-chrome_common_channel__info.h | 12 +- .../patch-chrome_common_channel__info__posix.cc | 18 +- .../files/patch-chrome_common_chrome__features.cc | 22 +- .../files/patch-chrome_common_chrome__features.h | 22 +- .../files/patch-chrome_common_chrome__paths.cc | 32 +-- .../files/patch-chrome_common_chrome__paths.h | 28 ++- .../patch-chrome_common_chrome__paths__internal.h | 2 +- .../files/patch-chrome_common_chrome__switches.cc | 4 +- .../files/patch-chrome_common_chrome__switches.h | 4 +- .../patch-chrome_common_extensions_command.cc | 10 +- .../files/patch-chrome_common_features.gni | 6 +- .../files/patch-chrome_common_pref__names.cc | 36 +-- .../files/patch-chrome_common_pref__names.h | 36 +-- .../patch-chrome_common_webui__url__constants.cc | 28 ++- .../patch-chrome_common_webui__url__constants.h | 22 +- ...e_renderer_chrome__content__renderer__client.cc | 4 +- ...derer_pepper_pepper__flash__font__file__host.cc | 2 +- ...nderer_pepper_pepper__flash__font__file__host.h | 2 +- ...ch-chrome_service_cloud__print_print__system.cc | 2 +- www/chromium/files/patch-chrome_test_BUILD.gn | 4 +- ...atch-chrome_test_base_chrome__test__launcher.cc | 38 --- ...-chrome_test_base_in__process__browser__test.cc | 8 +- ...hrome_test_base_interactive__ui__tests__main.cc | 14 +- .../patch-chrome_test_base_test__browser__window.h | 2 +- ...ch-chrome_test_base_testing__browser__process.h | 13 - ...ch-chrome_test_chromedriver_chrome__launcher.cc | 2 +- ...rome_test_chromedriver_chrome_chrome__finder.cc | 2 +- ...e_test_chromedriver_key__converter__unittest.cc | 2 +- ...est_chromedriver_server_chromedriver__server.cc | 4 +- .../files/patch-chrome_utility_services.cc | 29 +++ .../patch-chromecast_app_cast__main__delegate.cc | 11 + ...hromecast_browser_cast__browser__main__parts.cc | 20 +- ...chromecast_browser_cast__browser__main__parts.h | 11 + ...ecast_browser_cast__content__browser__client.cc | 6 +- ...content__browser__client__receiver__bindings.cc | 20 ++ ...ecast_browser_metrics_cast__browser__metrics.cc | 87 +++++++ ...mecast_browser_metrics_cast__browser__metrics.h | 15 ++ ...rnal__mojo_public_cpp_external__mojo__broker.cc | 8 +- ...omecast_media_base_default__monotonic__clock.cc | 2 +- ...ast_renderer_cast__content__renderer__client.cc | 2 +- www/chromium/files/patch-components_BUILD.gn | 4 +- ...t_renderer_password__form__conversion__utils.cc | 2 +- ...ll_core_browser_autofill__external__delegate.cc | 4 +- ...utofill_core_browser_personal__data__manager.cc | 20 +- ...ill_core_common_autofill__payments__features.cc | 12 +- ...mponents_autofill_core_common_autofill__util.cc | 2 +- ...ngs_core_browser_website__settings__registry.cc | 12 +- ...omponents_cookie__config_cookie__store__util.cc | 2 +- ...patch-components_crash_content_browser_BUILD.gn | 6 +- ...crash_content_browser_error__reporting_BUILD.gn | 2 +- .../files/patch-components_crash_core_app_BUILD.gn | 2 +- .../patch-components_crash_core_common_BUILD.gn | 2 +- ...service_discardable__shared__memory__manager.cc | 11 +- ...mponents_download_internal_common_base__file.cc | 2 +- ..._feature__engagement_public_event__constants.cc | 8 +- ...s_feature__engagement_public_event__constants.h | 8 +- ...e__engagement_public_feature__configurations.cc | 2 +- ...eature__engagement_public_feature__constants.cc | 2 +- ...feature__engagement_public_feature__constants.h | 2 +- ...nts_feature__engagement_public_feature__list.cc | 6 +- ...ents_feature__engagement_public_feature__list.h | 10 +- ...omponents_feed_core_proto_v2_wire_version.proto | 2 +- ...h-components_feed_core_proto_wire_version.proto | 2 +- .../patch-components_feed_core_v2_proto__util.cc | 2 +- .../patch-components_flags__ui_flags__state.cc | 12 +- .../patch-components_gcm__driver_gcm__client.h | 2 +- ...tch-components_gcm__driver_gcm__client__impl.cc | 2 +- .../files/patch-components_gwp__asan_BUILD.gn | 2 +- ...nts_invalidation_impl_invalidation__switches.cc | 2 +- ...ed__service_core_dependency__graph__unittest.cc | 2 +- .../files/patch-components_metrics_BUILD.gn | 4 +- ...ents_metrics_drive__metrics__provider__linux.cc | 2 +- .../files/patch-components_metrics_metrics__log.cc | 8 +- ...patch-components_neterror_resources_neterror.js | 2 +- ...rator_browser_network__session__configurator.cc | 2 +- ...atch-components_new__or__sad__tab__strings.grdp | 2 +- .../files/patch-components_os__crypt_os__crypt.h | 53 +++-- ...tch-components_os__crypt_os__crypt__unittest.cc | 12 +- ...diction__service_prediction__service__common.cc | 8 +- ...ponents_plugins_renderer_plugin__placeholder.cc | 2 +- ...icy_core_browser_policy__pref__mapping__test.cc | 6 +- ...policy_core_common_cloud_cloud__policy__util.cc | 57 ++--- .../patch-components_policy_core_common_schema.cc | 2 +- ...ponents_policy_resources_policy__templates.json | 20 +- ...onents_policy_tools_generate__policy__source.py | 2 +- ...-components_previews_core_previews__features.cc | 4 +- ...ing_core_realtime_url__lookup__service__base.cc | 8 +- ...owsing_core_resources_gen__file__type__proto.py | 2 +- ...ials_content_captive__portal__blocking__page.cc | 2 +- ...onents_security__interstitials_content_utils.cc | 4 +- ...paint__preview__compositor__collection__impl.cc | 2 +- ..._paint__preview__compositor__collection__impl.h | 2 +- .../patch-components_storage__monitor_BUILD.gn | 4 +- ...torage__monitor_removable__device__constants.cc | 2 +- ...storage__monitor_removable__device__constants.h | 2 +- ...s_storage__monitor_storage__monitor__freebsd.cc | 2 +- ...ts_storage__monitor_storage__monitor__freebsd.h | 2 +- ...sync__device__info_local__device__info__util.cc | 10 +- ...evice__info_local__device__info__util__linux.cc | 6 +- ...ponents_update__client_update__query__params.cc | 4 +- ..._formatter_spoof__checks_idn__spoof__checker.cc | 4 +- ...-components_url__matcher_regex__set__matcher.cc | 2 +- ...omponents_url__matcher_url__matcher__factory.cc | 2 +- .../files/patch-components_viz_common_features.cc | 12 +- ...nents_viz_common_gpu_dawn__context__provider.cc | 2 +- ...ch-components_viz_host_host__display__client.cc | 12 +- ...tch-components_viz_host_host__display__client.h | 12 +- ..._display__embedder_software__output__surface.cc | 22 +- ...e_display__embedder_software__output__surface.h | 22 +- ...e__sinks_root__compositor__frame__sink__impl.cc | 22 +- ...me__sinks_root__compositor__frame__sink__impl.h | 12 +- ...ch-components_viz_test_fake__output__surface.cc | 12 +- ...tch-components_viz_test_fake__output__surface.h | 12 +- ...tch-components_viz_test_mock__display__client.h | 12 +- ...omponents_webcrypto_algorithms_test__helpers.cc | 2 +- .../files/patch-content_app_content__main.cc | 2 +- ...atch-content_app_content__main__runner__impl.cc | 16 +- www/chromium/files/patch-content_browser_BUILD.gn | 6 +- .../patch-content_browser_browser__main__loop.cc | 16 +- ...wser_child__process__launcher__helper__linux.cc | 2 +- ..._compositor_viz__process__transport__factory.cc | 12 +- ...wser_devtools_protocol_system__info__handler.cc | 14 +- ...ent_browser_download_download__manager__impl.cc | 8 +- ...browser_font__access_font__enumeration__cache.h | 2 +- .../patch-content_browser_gpu_compositor__util.cc | 16 +- ...patch-content_browser_gpu_gpu__process__host.cc | 16 +- ...er_memory_swap__metrics__driver__impl__linux.cc | 2 +- ...content_browser_ppapi__plugin__process__host.cc | 4 +- ...i__plugin__process__host__receiver__bindings.cc | 2 +- ...rowser_renderer__host_delegated__frame__host.cc | 4 +- ...__host_input_input__device__change__observer.cc | 2 +- ...renderer__host_pepper_pepper__file__io__host.cc | 2 +- ...owser_renderer__host_render__message__filter.cc | 2 +- ...rowser_renderer__host_render__message__filter.h | 2 +- ...r_renderer__host_render__process__host__impl.cc | 18 +- ...wser_renderer__host_render__view__host__impl.cc | 4 +- ...derer__host_render__widget__host__view__aura.cc | 8 +- ...t_render__widget__host__view__event__handler.cc | 4 +- ...scheduler_responsiveness_jank__monitor__impl.cc | 8 +- ...duler_responsiveness_native__event__observer.cc | 2 +- ...eduler_responsiveness_native__event__observer.h | 2 +- ...patch-content_browser_utility__process__host.cc | 13 +- ...r_utility__process__host__receiver__bindings.cc | 2 +- .../patch-content_browser_v8__snapshot__files.cc | 2 +- ...wser_web__contents_web__contents__view__aura.cc | 22 +- ...browser_webui_web__ui__main__frame__observer.cc | 28 --- ..._browser_webui_web__ui__main__frame__observer.h | 20 -- ...owser_zygote__host_zygote__host__impl__linux.cc | 2 +- ...rowser_zygote__host_zygote__host__impl__linux.h | 2 +- .../files/patch-content_child_child__process.cc | 2 +- www/chromium/files/patch-content_common_BUILD.gn | 8 +- ...ntent_common_common__sandbox__support__linux.cc | 2 +- ...-content_common_mojo__core__library__support.cc | 2 +- .../files/patch-content_common_user__agent.cc | 2 +- www/chromium/files/patch-content_gpu_BUILD.gn | 8 +- www/chromium/files/patch-content_gpu_gpu__main.cc | 6 +- .../patch-content_gpu_gpu__sandbox__hook__linux.cc | 6 +- ...t_ppapi__plugin_ppapi__blink__platform__impl.cc | 2 +- ...nt_ppapi__plugin_ppapi__blink__platform__impl.h | 2 +- ...h-content_public_app_content__main__delegate.cc | 2 +- ...ch-content_public_app_content__main__delegate.h | 2 +- ...-content_public_browser_font__access__context.h | 11 + ...blic_browser_zygote__host_zygote__host__linux.h | 2 +- ...ch-content_public_common_child__process__host.h | 2 +- ...t_public_common_common__param__traits__macros.h | 6 +- ...tch-content_public_common_content__constants.cc | 2 +- ...atch-content_public_common_content__constants.h | 2 +- ...atch-content_public_common_content__features.cc | 24 +- ...atch-content_public_common_content__switches.cc | 21 +- ...patch-content_public_common_content__switches.h | 16 +- ...nt_public_common_use__zoom__for__dsf__policy.cc | 2 +- ...patch-content_public_common_zygote_features.gni | 2 +- ...atch-content_public_test_browser__test__base.cc | 4 +- ...h-content_public_test_content__browser__test.cc | 32 +-- ...tch-content_public_test_mock__render__thread.cc | 2 +- ...patch-content_renderer_render__process__impl.cc | 4 +- .../patch-content_renderer_render__thread__impl.cc | 26 +- ...ent_renderer_renderer__blink__platform__impl.cc | 12 +- ...tent_renderer_renderer__blink__platform__impl.h | 15 +- ...er_renderer__main__platform__delegate__linux.cc | 2 +- www/chromium/files/patch-content_shell_BUILD.gn | 12 +- ...atch-content_shell_app_shell__main__delegate.cc | 2 +- ...ontent_shell_browser_shell__browser__context.cc | 2 +- ...nt_shell_browser_shell__browser__main__parts.cc | 16 +- www/chromium/files/patch-content_test_BUILD.gn | 8 +- .../patch-content_test_content__test__suite.cc | 2 +- www/chromium/files/patch-content_utility_BUILD.gn | 4 +- ...link__platform__with__sandbox__support__impl.cc | 2 +- ...blink__platform__with__sandbox__support__impl.h | 2 +- .../files/patch-content_zygote_zygote__linux.cc | 4 +- .../patch-content_zygote_zygote__main__linux.cc | 2 +- www/chromium/files/patch-device_bluetooth_BUILD.gn | 6 +- .../patch-device_gamepad_gamepad__provider.cc | 2 +- .../patch-device_gamepad_hid__writer__linux.cc | 2 +- ...i_declarative__webrequest_webrequest__action.cc | 2 +- ...sions_browser_api_messaging_message__service.cc | 2 +- ...ivate_networking__private__delegate__factory.cc | 2 +- ..._browser_api_web__request_form__data__parser.cc | 2 +- ..._browser__context__keyed__service__factories.cc | 4 +- ...tensions_common_api___permission__features.json | 2 +- .../files/patch-extensions_common_api_runtime.json | 2 +- .../patch-extensions_common_feature__switch.cc | 2 +- .../patch-extensions_common_features_feature.cc | 2 +- .../files/patch-extensions_common_image__util.cc | 2 +- .../files/patch-extensions_common_stack__frame.cc | 2 +- ...ensions_renderer_bindings_api__binding__util.cc | 2 +- www/chromium/files/patch-extensions_shell_BUILD.gn | 4 +- ...h-extensions_shell_app_shell__main__delegate.cc | 6 +- ...er_api_runtime_shell__runtime__api__delegate.cc | 4 +- ...shell_browser_shell__extensions__api__client.cc | 2 +- ..._shell_browser_shell__extensions__api__client.h | 2 +- ...h-google__apis_gcm_engine_heartbeat__manager.cc | 26 +- ...__buffer_common_gpu__memory__buffer__support.cc | 2 +- ..._command__buffer_service_external__semaphore.cc | 2 +- ..._buffer_service_external__vk__image__backing.cc | 8 +- ...gpu_command__buffer_service_program__manager.cc | 2 +- ...ommand__buffer_service_webgpu__decoder__impl.cc | 4 +- ..._tests_gl__copy__texture__CHROMIUM__unittest.cc | 2 +- ...ch-gpu_command__buffer_tests_gl__test__utils.cc | 2 +- ...tch-gpu_command__buffer_tests_gl__test__utils.h | 2 +- ...patch-gpu_command__buffer_tests_webgpu__test.cc | 2 +- .../files/patch-gpu_config_gpu__control__list.cc | 4 +- .../files/patch-gpu_config_gpu__test__config.cc | 4 +- ...-gpu_ipc_common_gpu__memory__buffer__support.cc | 2 +- ...h-gpu_ipc_common_gpu__memory__buffer__support.h | 2 +- .../files/patch-gpu_ipc_service_gpu__init.cc | 50 ++-- ...gpu_ipc_service_gpu__memory__buffer__factory.cc | 2 +- .../patch-gpu_ipc_service_gpu__watchdog__thread.cc | 12 +- .../patch-gpu_ipc_service_gpu__watchdog__thread.h | 6 +- .../patch-gpu_vulkan_vulkan__function__pointers.cc | 28 ++- .../patch-gpu_vulkan_vulkan__function__pointers.h | 41 +++- .../files/patch-gpu_vulkan_vulkan__image.cc | 11 + .../files/patch-gpu_vulkan_vulkan__image.h | 20 ++ www/chromium/files/patch-headless_BUILD.gn | 8 +- ...ss_lib_browser_headless__browser__main__parts.h | 4 +- ...rowser_headless__browser__main__parts__linux.cc | 8 +- ...b_browser_headless__content__browser__client.cc | 4 +- ..._browser_headless__request__context__manager.cc | 37 ++- ...adless_lib_headless__content__main__delegate.cc | 2 +- .../files/patch-headless_lib_headless__macros.h | 2 +- www/chromium/files/patch-ipc_ipc__channel.h | 2 +- .../files/patch-ipc_ipc__channel__common.cc | 2 +- www/chromium/files/patch-ipc_ipc__channel__mojo.cc | 2 +- .../files/patch-ipc_ipc__message__utils.cc | 2 +- www/chromium/files/patch-ipc_ipc__message__utils.h | 2 +- www/chromium/files/patch-media_BUILD.gn | 2 +- www/chromium/files/patch-media_audio_BUILD.gn | 2 +- .../patch-media_audio_alsa_audio__manager__alsa.cc | 2 +- .../files/patch-media_audio_audio__features.cc | 2 +- .../patch-media_audio_audio__input__device.cc | 2 +- .../files/patch-media_audio_audio__manager.cc | 2 +- .../files/patch-media_audio_audio__manager.h | 2 +- ...h-media_audio_audio__output__proxy__unittest.cc | 2 +- .../files/patch-media_base_audio__latency.cc | 2 +- .../files/patch-media_base_media__switches.cc | 10 +- .../files/patch-media_base_scopedfd__helper.h | 2 +- www/chromium/files/patch-media_base_status.cc | 12 - .../files/patch-media_base_vector__math.cc | 11 + .../files/patch-media_base_video__frame.cc | 16 +- www/chromium/files/patch-media_base_video__frame.h | 4 +- ...ideo_create__video__capture__device__factory.cc | 14 +- ..._video_fake__video__capture__device__factory.cc | 2 +- ..._video_file__video__capture__device__factory.cc | 2 +- ..._capture_video_linux_v4l2__capture__delegate.cc | 2 +- ...ure_video_video__capture__buffer__pool__impl.cc | 2 +- ...capture_video_video__capture__device__client.cc | 2 +- .../files/patch-media_filters_vp9__parser.h | 2 +- ...tch-media_formats_common_offset__byte__queue.cc | 2 +- ...atch-media_formats_common_offset__byte__queue.h | 2 +- .../patch-media_formats_mp2t_es__parser__adts.cc | 2 +- ...ch-media_formats_mp2t_es__parser__mpeg1audio.cc | 2 +- .../files/patch-media_gpu_buffer__validation.cc | 2 +- www/chromium/files/patch-media_media__options.gni | 2 +- ...ojo_clients_mojo__video__encode__accelerator.cc | 2 +- ...media_mojo_mojom_video__frame__mojom__traits.cc | 2 +- ...media_mojo_services_gpu__mojo__media__client.cc | 6 +- .../patch-media_video_fake__gpu__memory__buffer.cc | 2 +- ...ideo_gpu__memory__buffer__video__frame__pool.cc | 4 +- ...ia_video_video__encode__accelerator__adapter.cc | 20 +- ...eo_video__encode__accelerator__adapter__test.cc | 11 + .../files/patch-mojo_public_c_system_thunks.cc | 2 +- ...ch-mojo_public_js_mojo__bindings__resources.grd | 6 +- www/chromium/files/patch-net_BUILD.gn | 16 +- .../patch-net_base_address__tracker__linux.cc | 20 +- .../files/patch-net_base_address__tracker__linux.h | 2 +- ...h-net_base_address__tracker__linux__unittest.cc | 2 +- .../patch-net_base_network__change__notifier.cc | 30 +-- ...ch-net_base_network__change__notifier__posix.cc | 11 + .../patch-net_base_network__interfaces__posix.cc | 17 ++ .../patch-net_base_network__interfaces__posix.h | 11 - .../files/patch-net_cert_cert__verifier.cc | 2 +- .../files/patch-net_cert_cert__verify__proc.cc | 2 +- .../files/patch-net_cert_cert__verify__proc.h | 2 +- .../files/patch-net_cert_test__root__certs.h | 2 +- .../patch-net_disk__cache_blockfile_disk__format.h | 2 +- .../files/patch-net_dns_address__sorter__posix.cc | 2 +- ...et_dns_dns__config__service__posix__unittest.cc | 2 +- www/chromium/files/patch-net_dns_dns__reloader.cc | 2 +- www/chromium/files/patch-net_dns_dns__util.cc | 2 +- .../files/patch-net_dns_host__resolver__proc.cc | 2 +- .../patch-net_http_http__auth__gssapi__posix.cc | 2 +- .../patch-net_http_http__auth__gssapi__posix.h | 2 +- .../patch-net_nqe_network__quality__estimator.cc | 4 +- ...et_nqe_network__quality__estimator__unittest.cc | 16 +- ...ution_configured__proxy__resolution__service.cc | 28 +-- ...xy__resolution_proxy__config__service__linux.cc | 2 +- .../files/patch-net_socket_socket__posix.cc | 2 +- .../patch-net_socket_socks5__client__socket.cc | 2 +- .../files/patch-net_socket_tcp__socket__posix.cc | 2 +- .../files/patch-net_socket_udp__socket__posix.cc | 10 +- .../files/patch-net_socket_udp__socket__posix.h | 2 +- ...t_socket_unix__domain__client__socket__posix.cc | 2 +- ..._tools_cert__verify__tool_cert__verify__tool.cc | 2 +- ...ch-net_tools_quic_quic__http__proxy__backend.cc | 2 +- ...ffic__annotation_network__traffic__annotation.h | 16 +- .../files/patch-net_url__request_url__fetcher.cc | 12 +- .../files/patch-net_url__request_url__fetcher.h | 16 +- ...patch-net_url__request_url__request__context.cc | 12 +- .../patch-net_url__request_url__request__context.h | 12 +- ..._url__request_url__request__context__builder.cc | 6 +- .../files/patch-pdf_pdfium_pdfium__engine.cc | 14 +- .../files/patch-ppapi_proxy_file__io__resource.cc | 2 +- .../files/patch-printing_cups__config__helper.py | 2 +- .../files/patch-printing_print__settings.cc | 4 +- .../files/patch-printing_print__settings.h | 6 +- .../patch-printing_print__settings__conversion.cc | 25 +- .../files/patch-printing_printing__features.cc | 2 +- .../files/patch-printing_printing__features.h | 2 +- .../files/patch-remoting_base_chromoting__event.cc | 6 +- .../patch-remoting_client_display_sys__opengl.h | 2 +- ...h-remoting_codec_webrtc__video__encoder__vpx.cc | 16 ++ .../patch-remoting_host_desktop__resizer__ozone.cc | 2 +- .../patch-remoting_host_evaluate__capability.cc | 4 +- .../files/patch-remoting_host_heartbeat__sender.cc | 12 +- .../files/patch-remoting_host_host__attributes.cc | 2 +- .../files/patch-remoting_host_host__details.cc | 12 +- .../files/patch-remoting_host_host__main.cc | 21 +- ...t_it2me_it2me__native__messaging__host__main.cc | 8 +- ...ch-remoting_host_me2me__desktop__environment.cc | 2 +- .../patch-remoting_host_remoting__me2me__host.cc | 22 +- www/chromium/files/patch-remoting_host_switches.cc | 2 +- www/chromium/files/patch-remoting_host_switches.h | 2 +- .../patch-remoting_resources_remoting__strings.grd | 6 +- .../patch-remoting_test_it2me__standalone__host.cc | 2 +- ...-remoting_test_it2me__standalone__host__main.cc | 2 +- www/chromium/files/patch-sandbox_BUILD.gn | 2 +- www/chromium/files/patch-sandbox_features.gni | 2 +- www/chromium/files/patch-sandbox_linux_BUILD.gn | 2 +- ...sandbox_linux_services_init__process__reaper.cc | 2 +- ...tch-sandbox_linux_services_libc__interceptor.cc | 2 +- www/chromium/files/patch-sandbox_policy_BUILD.gn | 2 +- .../files/patch-sandbox_policy_switches.cc | 2 +- www/chromium/files/patch-sandbox_policy_switches.h | 2 +- www/chromium/files/patch-services_audio_BUILD.gn | 2 +- ...ices_device_geolocation_location__arbitrator.cc | 2 +- .../files/patch-services_device_hid_BUILD.gn | 4 +- ...services_device_hid_hid__connection__freebsd.cc | 9 +- ...-services_device_hid_hid__connection__freebsd.h | 7 +- .../patch-services_device_hid_hid__service.cc | 6 +- ...ch-services_device_hid_hid__service__freebsd.cc | 17 +- ...tch-services_device_hid_hid__service__freebsd.h | 5 +- .../files/patch-services_device_serial_BUILD.gn | 2 +- ...ces_device_serial_serial__device__enumerator.cc | 2 +- ...ces_device_serial_serial__io__handler__posix.cc | 2 +- ...me__zone__monitor_time__zone__monitor__linux.cc | 2 +- .../files/patch-services_device_usb_BUILD.gn | 2 +- www/chromium/files/patch-services_network_BUILD.gn | 6 +- .../patch-services_network_network__context.cc | 11 - ...rvices_network_network__sandbox__hook__linux.cc | 2 +- .../patch-services_network_network__service.cc | 14 +- .../patch-services_network_network__service.h | 6 +- ..._cpp_cert__verifier_cert__verifier__creation.cc | 2 +- ..._instrumentation_queued__request__dispatcher.cc | 2 +- ...ublic_cpp_memory__instrumentation_os__metrics.h | 2 +- ...p_memory__instrumentation_os__metrics__linux.cc | 2 +- .../files/patch-services_service__manager_BUILD.gn | 2 +- ...manager_public_cpp_service__executable_BUILD.gn | 2 +- ...ices_tracing_public_cpp_perfetto_trace__time.cc | 2 +- ...p_stack__sampling_tracing__sampler__profiler.cc | 2 +- ...rvices_video__capture_broadcasting__receiver.cc | 2 +- .../patch-skia_ext_SkMemory__new__handler.cpp | 2 +- .../files/patch-third__party_angle_BUILD.gn | 39 +-- .../patch-third__party_angle_src_common_debug.h | 11 + ...ngle_src_gpu__info__util_SystemInfo__internal.h | 2 +- ...ngle_src_gpu__info__util_SystemInfo__libpci.cpp | 2 +- ...angle_src_gpu__info__util_SystemInfo__linux.cpp | 2 +- ...y_angle_src_gpu__info__util_SystemInfo__x11.cpp | 2 +- ...tch-third__party_angle_src_libANGLE_Display.cpp | 4 +- ...y_angle_src_libANGLE_renderer_driver__utils.cpp | 2 +- ...rty_angle_src_libANGLE_renderer_driver__utils.h | 2 +- ...e_src_libANGLE_renderer_vulkan_DisplayVk__api.h | 10 +- ...vulkan-loader_src_loader_vk__loader__platform.h | 11 - ...erences_renderer__preferences__mojom__traits.cc | 2 +- ...n_renderer__preferences_renderer__preferences.h | 2 +- ...ferences_renderer__preferences__mojom__traits.h | 2 +- ...h-third__party_blink_public_platform_platform.h | 11 + .../patch-third__party_blink_renderer_BUILD.gn | 18 +- ...rer_bindings_scripts_bind__gen_style__format.py | 2 +- ...blink_renderer_controller_blink__initializer.cc | 8 +- ...rer_controller_memory__usage__monitor__posix.cc | 2 +- ...erer_controller_memory__usage__monitor__posix.h | 2 +- ...nk_renderer_core_clipboard_system__clipboard.cc | 12 +- ...link_renderer_core_editing_editing__behavior.cc | 2 +- ...blink_renderer_core_exported_web__view__impl.cc | 4 +- ...ore_html_canvas_canvas__async__blob__creator.cc | 2 +- ...nderer_core_html_forms_internal__popup__menu.cc | 2 +- ...erer_core_inspector_inspector__memory__agent.cc | 2 +- ...arty_blink_renderer_core_layout_layout__view.cc | 2 +- ...party_blink_renderer_core_paint_paint__layer.cc | 2 +- ..._renderer_core_scroll_scrollbar__theme__aura.cc | 2 +- ...ules_media_audio_web__audio__device__factory.cc | 4 +- ..._mediastream_processed__local__audio__source.cc | 6 +- ...peerconnection_webrtc__audio__renderer__test.cc | 6 +- ...odules_webaudio_audio__worklet__thread__test.cc | 4 +- ...modules_webgl_webgl__webcodecs__video__frame.cc | 11 + ...h-third__party_blink_renderer_platform_BUILD.gn | 4 +- ...ty_blink_renderer_platform_fonts_font__cache.cc | 2 +- ...rty_blink_renderer_platform_fonts_font__cache.h | 2 +- ...nk_renderer_platform_fonts_font__description.cc | 2 +- ..._blink_renderer_platform_fonts_font__metrics.cc | 2 +- ...er_platform_fonts_font__unique__name__lookup.cc | 2 +- ...latform_fonts_shaping_harfbuzz__shaper__test.cc | 2 +- ...nderer_platform_fonts_skia_font__cache__skia.cc | 2 +- ...tform_graphics_image__frame__generator__test.cc | 2 +- ...er_platform_graphics_video__frame__submitter.cc | 2 +- ...nk_renderer_platform_scheduler_common_thread.cc | 11 + ..._renderer_platform_wtf_container__annotations.h | 2 +- ...arty_blink_renderer_platform_wtf_stack__util.cc | 2 +- ...nk_renderer_platform_wtf_threading__pthreads.cc | 2 +- ..._party_boringssl_src_crypto_cpu-aarch64-linux.c | 2 +- ...ch-third__party_boringssl_src_crypto_ex__data.c | 2 +- ...reakpad_src_common_simple__string__dictionary.h | 2 +- ...-third__party_crashpad_crashpad_client_BUILD.gn | 2 +- ...hpad_crashpad_client_crashpad__client__posix.cc | 2 +- ...crashpad_crashpad_util_posix_close__multiple.cc | 2 +- ...__party_crashpad_crashpad_util_posix_signals.cc | 2 +- ...ty_crc32c_src_src_crc32c__arm64__linux__check.h | 2 +- .../patch-third__party_ffmpeg_libavutil_mem.c | 2 +- ..._googletest_include_gtest_internal_gtest-port.h | 2 +- ...rty_googletest_src_googletest_src_gtest-port.cc | 2 +- ...d__party_googletest_src_googletest_src_gtest.cc | 2 +- .../patch-third__party_harfbuzz-ng_harfbuzz.gni | 2 +- ...tch-third__party_leveldatabase_env__chromium.cc | 4 +- .../files/patch-third__party_libXNVCtrl_NVCtrl.c | 2 +- ...st_cpp_src_phonenumbers_base_memory_singleton.h | 2 +- ...pp_src_phonenumbers_base_synchronization_lock.h | 2 +- ...ist_cpp_src_phonenumbers_base_thread__checker.h | 2 +- .../files/patch-third__party_libpng_pnglibconf.h | 2 +- ...va__protected__content_va__protected__content.h | 34 +++ .../patch-third__party_libyuv_include_libyuv_row.h | 2 +- .../patch-third__party_nasm_config_config-linux.h | 2 +- www/chromium/files/patch-third__party_node_node.py | 2 +- ...nscreen_src_platform_impl_udp__socket__posix.cc | 2 +- ...hird__party_pdfium_core_fxcrt_cfx__datetime.cpp | 2 +- ...ird__party_pdfium_core_fxge_cfx__fontmapper.cpp | 2 +- ...third__party_pdfium_core_fxge_fx__ge__linux.cpp | 2 +- ...third__party_pdfium_fxjs_cjs__publicmethods.cpp | 2 +- ...-third__party_pdfium_fxjs_fx__date__helpers.cpp | 2 +- .../files/patch-third__party_perfetto_gn_BUILD.gn | 19 ++ ..._perfetto_include_perfetto_base_build__config.h | 4 +- ..._perfetto_include_perfetto_base_thread__utils.h | 2 +- ...rd__party_perfetto_include_perfetto_base_time.h | 6 +- ..._perfetto_include_perfetto_ext_base_event__fd.h | 13 - ...fetto_include_perfetto_ext_base_thread__utils.h | 24 +- ...rd__party_perfetto_src_base_ctrl__c__handler.cc | 12 + ...h-third__party_perfetto_src_base_file__utils.cc | 14 ++ ...ch-third__party_perfetto_src_base_subprocess.cc | 24 -- ...d__party_perfetto_src_base_subprocess__posix.cc | 37 +++ ...party_perfetto_src_base_thread__task__runner.cc | 11 - ...-third__party_perfetto_src_base_unix__socket.cc | 25 +- .../patch-third__party_perfetto_src_base_utils.cc | 34 +++ ...ird__party_perfetto_src_base_watchdog__posix.cc | 14 ++ ...ty_perfetto_src_trace__processor_read__trace.cc | 12 + ...src_trace__processor_trace__processor__shell.cc | 22 ++ ...d__party_perfetto_src_traced_service_service.cc | 12 + ...etto_src_tracing_core_tracing__service__impl.cc | 14 +- ...rty_perfetto_src_tracing_ipc_default__socket.cc | 12 + ...-third__party_perfetto_src_tracing_ipc_memfd.cc | 16 ++ ...rfetto_src_tracing_ipc_posix__shared__memory.cc | 18 ++ ...erfetto_src_tracing_ipc_posix__shared__memory.h | 19 ++ ...__party_perfetto_src_tracing_platform__posix.cc | 28 +++ ...y_perfetto_tools_busy__threads_busy__threads.cc | 12 + ...uf_src_google_protobuf_stubs_platform__macros.h | 2 +- .../patch-third__party_skia_src_core_SkCpu.cpp | 4 +- ...-third__party_skia_src_gpu_GrAutoLocaleSetter.h | 2 +- ...-third__party_skia_src_images_SkJpegEncoder.cpp | 2 +- ...third__party_skia_src_ports_SkOSFile__stdio.cpp | 2 +- .../patch-third__party_skia_src_sksl_SkSLString.h | 2 +- .../files/patch-third__party_sqlite_BUILD.gn | 2 +- .../files/patch-third__party_swiftshader_BUILD.gn | 6 +- ...rd__party_swiftshader_include_vulkan_vulkan.hpp | 2 +- ...__party_swiftshader_src_Common_Configurator.cpp | 2 +- ...ird__party_swiftshader_src_Common_MutexLock.hpp | 2 +- ..._party_swiftshader_src_Common_SharedLibrary.hpp | 2 +- ...ird__party_swiftshader_src_Main_SwiftConfig.cpp | 2 +- ...party_swiftshader_src_OpenGL_libEGL_Display.cpp | 2 +- ...party_swiftshader_src_OpenGL_libEGL_Surface.cpp | 2 +- ..._party_swiftshader_src_OpenGL_libEGL_libEGL.cpp | 2 +- ..._party_swiftshader_src_OpenGL_libEGL_libEGL.hpp | 2 +- ...ftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp | 2 +- ..._swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp | 2 +- ...-third__party_swiftshader_src_Reactor_Debug.cpp | 2 +- ...h-third__party_swiftshader_src_System_Debug.cpp | 2 +- ...10.0_configs_linux_include_llvm_Config_config.h | 2 +- ...ubzero_build_Linux_include_llvm_Config_config.h | 2 +- ...party_llvm-subzero_lib_Support_Unix_Process.inc | 2 +- ...h-third__party_vulkan-deps_glslang_src_BUILD.gn | 15 ++ ..._vulkan-deps_vulkan-loader_src_loader_loader.c} | 4 +- ...vulkan-loader_src_loader_vk__loader__platform.h | 42 ++++ ...ation-layers_src_layers_vk__loader__platform.h} | 4 +- .../files/patch-third__party_webrtc_BUILD.gn | 4 +- ...rd__party_webrtc_modules_audio__device_BUILD.gn | 2 +- ..._rtp__rtcp_source_forward__error__correction.cc | 2 +- ...tch-third__party_webrtc_rtc__base_byte__order.h | 2 +- ...rd__party_webrtc_rtc__base_ifaddrs__converter.h | 2 +- ...ch-third__party_webrtc_rtc__base_ip__address.cc | 2 +- ...tch-third__party_webrtc_rtc__base_ip__address.h | 2 +- .../patch-third__party_webrtc_rtc__base_network.cc | 2 +- .../patch-third__party_webrtc_rtc__base_network.h | 2 +- ...ty_webrtc_rtc__base_physical__socket__server.cc | 4 +- ...rty_webrtc_rtc__base_physical__socket__server.h | 2 +- ...rty_webrtc_rtc__base_platform__thread__types.cc | 2 +- ...webrtc_rtc__base_third__party_sigslot_sigslot.h | 2 +- ...h-third__party_webrtc_system__wrappers_BUILD.gn | 2 +- .../files/patch-third__party_zlib_BUILD.gn | 11 - .../files/patch-third__party_zlib_cpu__features.c | 3 +- www/chromium/files/patch-tools_gn_build_gen.py | 2 +- .../patch-tools_gn_src_base_files_file__posix.cc | 2 +- .../patch-tools_gn_src_base_files_scoped__file.cc | 11 + .../files/patch-tools_gn_src_gn_exec__process.cc | 2 +- ...ls_gn_src_gn_function__write__file__unittest.cc | 2 +- www/chromium/files/patch-tools_gn_src_gn_version.h | 2 +- .../files/patch-tools_gn_src_util_sys__info.cc | 6 +- ...ols_json__schema__compiler_feature__compiler.py | 4 +- .../patch-tools_json__schema__compiler_model.py | 4 +- ...ch-tools_perf_chrome__telemetry__build_BUILD.gn | 4 +- ...atch-tools_variations_fieldtrial__to__struct.py | 6 +- .../files/patch-ui_aura_test_aura__test__helper.cc | 6 +- .../patch-ui_aura_test_ui__controls__ozone.cc | 4 +- ...patch-ui_base_clipboard_clipboard__constants.cc | 2 +- .../patch-ui_base_clipboard_clipboard__constants.h | 2 +- .../patch-ui_base_clipboard_clipboard__ozone.cc | 14 +- ...ta__transfer__policy_data__transfer__endpoint.h | 14 -- ...ui_base_dragdrop_os__exchange__data__provider.h | 2 +- ...agdrop_os__exchange__data__provider__factory.cc | 2 +- ...op_os__exchange__data__provider__non__backed.cc | 6 +- ...rop_os__exchange__data__provider__non__backed.h | 4 +- ...-ui_base_ime_init_input__method__initializer.cc | 32 +-- .../patch-ui_base_resource_resource__bundle.cc | 6 +- ...h-ui_base_resource_resource__bundle__freebsd.cc | 2 +- .../patch-ui_base_test_skia__gold__pixel__diff.cc | 12 +- .../files/patch-ui_base_ui__base__features.cc | 29 ++- .../files/patch-ui_base_ui__base__features.h | 4 +- .../files/patch-ui_base_webui_web__ui__util.cc | 12 +- .../files/patch-ui_base_x_x11__shm__image__pool.cc | 6 +- .../files/patch-ui_compositor_compositor.cc | 12 +- .../files/patch-ui_compositor_compositor.h | 12 +- .../patch-ui_compositor_compositor__observer.h | 12 +- ...vents_devices_x11_device__data__manager__x11.cc | 6 +- www/chromium/files/patch-ui_events_event.cc | 4 +- .../files/patch-ui_events_event__switches.cc | 2 +- .../files/patch-ui_events_event__switches.h | 2 +- ...ch-ui_events_keycodes_dom_keycode__converter.cc | 2 +- .../patch-ui_events_ozone_keyboard__hook__ozone.cc | 2 +- www/chromium/files/patch-ui_gfx_BUILD.gn | 4 +- www/chromium/files/patch-ui_gfx_canvas__skia.cc | 4 +- .../files/patch-ui_gfx_codec_jpeg__codec.cc | 2 +- .../files/patch-ui_gfx_font__fallback__linux.cc | 2 +- www/chromium/files/patch-ui_gfx_font__list.cc | 2 +- .../files/patch-ui_gfx_font__names__testing.cc | 2 +- .../files/patch-ui_gfx_font__render__params.h | 2 +- www/chromium/files/patch-ui_gfx_font__util.cc | 2 +- .../files/patch-ui_gfx_gpu__memory__buffer.cc | 2 +- .../files/patch-ui_gfx_gpu__memory__buffer.h | 10 +- .../patch-ui_gfx_ipc_gfx__param__traits__macros.h | 2 +- ...-ui_gfx_linux_client__native__pixmap__dmabuf.cc | 4 +- ...ch-ui_gfx_mojom_buffer__types__mojom__traits.cc | 2 +- ...x_mojom_native__handle__types__mojom__traits.cc | 2 +- ...fx_mojom_native__handle__types__mojom__traits.h | 2 +- .../files/patch-ui_gfx_native__pixmap__handle.cc | 2 +- .../files/patch-ui_gfx_native__pixmap__handle.h | 2 +- .../files/patch-ui_gfx_native__widget__types.h | 22 +- www/chromium/files/patch-ui_gfx_render__text.cc | 4 +- www/chromium/files/patch-ui_gl_BUILD.gn | 4 +- .../files/patch-ui_gl_generate__bindings.py | 2 +- .../patch-ui_gl_gl__bindings__api__autogen__glx.h | 2 +- .../patch-ui_gl_gl__bindings__autogen__glx.cc | 2 +- .../files/patch-ui_gl_gl__bindings__autogen__glx.h | 2 +- www/chromium/files/patch-ui_gl_gl__features.cc | 14 +- www/chromium/files/patch-ui_gl_gl__fence.cc | 2 +- .../patch-ui_gl_sync__control__vsync__provider.cc | 2 +- .../patch-ui_gl_sync__control__vsync__provider.h | 2 +- .../patch-ui_gtk_printing_print__dialog__gtk.cc | 2 +- ...i_message__center_views_message__popup__view.cc | 12 +- .../files/patch-ui_native__theme_native__theme.h | 12 +- .../patch-ui_native__theme_native__theme__base.cc | 12 +- ...rm__window_platform__window__init__properties.h | 2 +- .../patch-ui_strings_app__locale__settings.grd | 6 +- .../files/patch-ui_views_controls_label.cc | 22 +- .../patch-ui_views_controls_textfield_textfield.cc | 56 ++--- .../files/patch-ui_views_corewm_tooltip__aura.cc | 12 +- .../patch-ui_views_examples_widget__example.cc | 2 +- .../files/patch-ui_views_focus_focus__manager.cc | 22 +- .../files/patch-ui_views_selection__controller.cc | 12 +- .../files/patch-ui_views_style_platform__style.cc | 14 +- .../files/patch-ui_views_views__delegate.cc | 8 +- .../files/patch-ui_views_views__delegate.h | 8 +- ..._widget_desktop__aura_desktop__screen__ozone.cc | 2 +- ...__aura_desktop__window__tree__host__platform.cc | 4 +- .../patch-ui_views_widget_native__widget__aura.cc | 8 +- .../patch-ui_views_window_custom__frame__view.cc | 12 +- .../patch-ui_views_window_dialog__delegate.cc | 4 +- .../patch-ui_views_window_frame__background.cc | 2 +- .../files/patch-ui_webui_resources_js_cr.js | 2 +- www/chromium/files/patch-v8_BUILD.gn | 6 +- www/chromium/files/patch-v8_include_v8config.h | 8 +- www/chromium/files/patch-v8_src_api_api.cc | 4 +- www/chromium/files/patch-v8_src_base_cpu.cc | 6 +- .../patch-v8_src_base_platform_platform-freebsd.cc | 2 +- .../patch-v8_src_base_platform_platform-posix.cc | 2 +- www/chromium/files/patch-v8_src_d8_d8.cc | 12 +- www/chromium/files/patch-weblayer_BUILD.gn | 4 +- ...h-weblayer_app_content__main__delegate__impl.cc | 10 +- ...-weblayer_browser_browser__main__parts__impl.cc | 14 +- ...layer_browser_content__browser__client__impl.cc | 12 +- ...blayer_browser_content__browser__client__impl.h | 17 -- ...er_browser_system__network__context__manager.cc | 10 +- .../files/patch-weblayer_common_weblayer__paths.cc | 10 +- www/chromium/files/sndio_input.cc | 2 +- www/chromium/files/sndio_output.cc | 2 +- www/chromium/pkg-plist | 264 ++++++++++++++---= ---- 944 files changed, 4635 insertions(+), 3410 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index abcfdbbb72ea..9f713534e2df 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,8 +1,8 @@ # Created by: Florent Thoumie -# $FreeBSD$ +# $FreeBSD: head/www/chromium/Makefile 563913 2021-02-03 19:46:35Z sunpoet= $ =20 PORTNAME=3D chromium -PORTVERSION=3D 88.0.4324.182 +PORTVERSION=3D 89.0.4389.114 CATEGORIES=3D www java MASTER_SITES=3D https://commondatastorage.googleapis.com/chromium-browser-= official/ \ LOCAL/rene/chromium/:fonts @@ -60,12 +60,13 @@ LIB_DEPENDS=3D libatk-bridge-2.0.so:accessibility/at-sp= i2-atk \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ - libxkbcommon.so:x11/libxkbcommon + libxkbcommon.so:x11/libxkbcommon \ + libxshmfence.so:x11/libxshmfence =20 RUN_DEPENDS=3D xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic =20 *** 20170 LINES SKIPPED *** ----- End forwarded message ----- --=20 Mathieu Arnold --s367zzqm42xuuyag Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmBsIhhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgKcPQ/6AzPgXdxgghKj36TknjIXANCFKJNT5d3hmPETlj8zOD+SXsQndVFY6Ldx /Vc3Uj9fHwKq4lH9FarCg1vih2LEK9LnGmCRgc9WiQNPwMMAhe+80+wOlVelGQhm raZ5hPADuPxglqyUkUPbBCtnuirOIj8drIh4hq8oDBlxtgTu6UVSZEgDGSJOhEHa FJD8/VhWlSohc5g25BD86PV07x8XlHbkEiBNCCJ8c1J5sGvdEswkQ15eENjBYG1Z 4vCIW2JlZpKyy6KQ94x3i/W0e+5fa+eW5Rmx3NzWeVJnSAGDr+CABrCtU7dVGym+ q5OS0ggHuaMo2gx1/NfrzaOEPJYHFkZHsFdRWaVpyFBXHVE2Nh53kQRNZBb40odj GDXMS981Dwm4GDxWOzk988sp67igh2ZwmlL/uJ8RnUVPXZwe/9MXwlJr3MJcUgg/ lQiPJWIoU5VmNRaSlwmxMjb1X0w/fVDfbEkxFZRGtv8ZI0Tl41U9TwnHcHJdfYC3 pLA3pw2WYQCE5uSpinC853BIVjp19fpOAYX+WKnEYFwksA8T81CksdjbAauu/Q6f qgCC/hCDtPFEhHmP/3Xse8VSkuElWyK7H5NXrZMq0V3w0dAAzqxX2dlW3/TFJBoP gQlVLQnKX6kOnMrJim9GqcLsFbklT+oTVdD8Q42ZIHbzdPJ7PLY= =ggPP -----END PGP SIGNATURE----- --s367zzqm42xuuyag-- From owner-freebsd-git@freebsd.org Tue Apr 6 09:10:42 2021 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 924FD5C63CE for ; Tue, 6 Apr 2021 09:10:42 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FF1w22cGgz3ppk for ; Tue, 6 Apr 2021 09:10:42 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 595DC5C6881; Tue, 6 Apr 2021 09:10:42 +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 591355C6433 for ; Tue, 6 Apr 2021 09:10:42 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-yb1-f170.google.com (mail-yb1-f170.google.com [209.85.219.170]) (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 4FF1w21vCLz3pmF; Tue, 6 Apr 2021 09:10:42 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-yb1-f170.google.com with SMTP id e188so4396158ybb.13; Tue, 06 Apr 2021 02:10:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=cgt/aUH2WDZb1P/bW/iXWfkOGtdcbeXhVPo4W0JJCNs=; b=cPmLvFBEg1dwdzt7lRwP7uv5/tnQu6EkFsaWuCk1Np9JUS67LDxnjAi/SvmvuV+UtD Gy1Z537BE4g2mDfnYDz85awOayRcAmz85UhE2Bnx1Jzmqqsa1TcsfLMYzJvBY97BF/ZH rpaX6RulYCj0Nb6HTHV9Y38+UqhAMfBr4qVapYR6K6lfCRoM91XQb6JWuiqY0v9A7Dmt rtGxQakis16w+6J9pyw38cvP7oQbB5MjJ9mlLcEDeqW+Lxlif/DW57rB5FgItXlC4TIz sjw45G/nZlYgEZjHrydXzGifxL6VU7pjXAsn3tleEz/jvNDPvbEdBRvvfRRCRg0nyPsa h5pA== X-Gm-Message-State: AOAM533NHB/D5KCnoiAGIPtmlnEwvzzhBGqfTAu3o+eTCp3HFfzG+42S Usobt+Bf//EBYBtCEcnd2zTlGCaoYzT0IE4NG6oYppDfQFE= X-Google-Smtp-Source: ABdhPJycPUltkrc/Mn65iYCMBT8BLKEMx0qVYbBt0MlbJCgSR08I+a5x6xjDeSm0b7h9Q0bAN4rPm3yeS3MFV19Gw4U= X-Received: by 2002:a25:5cd:: with SMTP id 196mr32194300ybf.241.1617700240603; Tue, 06 Apr 2021 02:10:40 -0700 (PDT) MIME-Version: 1.0 References: <20210406085557.5apkd6kxgcv5f7a3@aching.in.mat.cc> In-Reply-To: <20210406085557.5apkd6kxgcv5f7a3@aching.in.mat.cc> From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Tue, 6 Apr 2021 11:10:29 +0200 Message-ID: Subject: Re: [rene@FreeBSD.org: git: 1227b53ed1c5 - main - www/chromium: update to 89.0.4389.114] To: Mathieu Arnold Cc: git@freebsd.org X-Rspamd-Queue-Id: 4FF1w21vCLz3pmF 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: Tue, 06 Apr 2021 09:10:42 -0000 How though? Can we set COLUMNS=9999 in the environment? (or however that is spelled?) On Tue, Apr 6, 2021 at 10:56 AM Mathieu Arnold wrote: > Is it possible to have the 'status' be a bit more wide? > > The emails generated when we used svn would never clobber the list of > changed files like that. > > ----- Forwarded message from Rene Ladan ----- > > From owner-freebsd-git@freebsd.org Tue Apr 6 11:00:29 2021 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 B77835CB557 for ; Tue, 6 Apr 2021 11:00:29 +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 4FF4Lj4YL3z4WYc for ; Tue, 6 Apr 2021 11:00:29 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 9C37F5CB556; Tue, 6 Apr 2021 11:00: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 9C0245CB6B2 for ; Tue, 6 Apr 2021 11:00:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FF4Lj42l1z4Wdg; Tue, 6 Apr 2021 11:00:29 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1617706829; 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=OubWSxQoVOUcxJlMqk13kVzY3Eqt9BC/PMLvhQqTPC4=; b=HBZ3Z07ORjK3VCynbOvKRVQPcdeI0k8Twa1J+b8QGjtMUKy7Ttnu+vaKFur1npum5zIZ3/ W6xfEThbXZr4NewwJY86QLxPgQDVoBQay33r2cqWzJP3sZj522aRd/S1prftPFv5GGiygk wAr2r7qzSQHa13N7g5jXOiatyHJgmzeVyS4Br9y7mhbPAfjlRZI4qNcNdazWCIoudg+qPf bn4UMV/JP96hv0BqZatnAFPZW9XEIVjnXcyuydIa36c+mlw8MuzZdsgQREkdH0OqFNi+Lg zdgYcRp4fXpex+9IgqKj+iKtegakMW+l7zZH7yiIgk994KGtvahubSzV09QRhg== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 785771DCDD; Tue, 6 Apr 2021 11:00:29 +0000 (UTC) Date: Tue, 6 Apr 2021 11:00:29 +0000 From: Rene Ladan To: Mathieu Arnold Cc: git@freebsd.org Subject: Re: [rene@FreeBSD.org: git: 1227b53ed1c5 - main - www/chromium: update to 89.0.4389.114] Message-ID: <20210406110029.GA4156@freefall.freebsd.org> References: <20210406085557.5apkd6kxgcv5f7a3@aching.in.mat.cc> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210406085557.5apkd6kxgcv5f7a3@aching.in.mat.cc> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1617706829; 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=OubWSxQoVOUcxJlMqk13kVzY3Eqt9BC/PMLvhQqTPC4=; b=qrPV1Bc9okmF8l2hzpsHZuec/B6I1CTkuhz7TFw6HjsIFfocYG6exPUzS02MvJtv+BL/My +GG37fh8/nBxQ8xficZXxGbVw6IL/etZiVVYa/GJekBjnx9/RMHRnfq50k1X1cmbT3WpqJ Qq8YjYkk3xlFbAoUfMv/b5U50PjniElhu1vZQ1jGFN1WVN/c3emfzmLyHPAEUFapmlynrj +GmFh9uTdOSjAscqhsePpG83vFBeq+cPhG1jskcWr6J1wG9sZ9EKbnQ2djzjtXanmPR7q9 EI5WoIqR2l97ATq7n7wWsFARy4QQw7Xz9BZV/ccv8Ez1ZMuYU9wHm7WI6EjBlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1617706829; a=rsa-sha256; cv=none; b=P77dlqgYBaIcLo4xhAeS1Bsusbh8gFOF4954H5i+E96s2Z25aGOSGdhBgKm4J3I69gTmfm Eoa9mwvPG2I9D3ccxXVdGOG9AUG7uyRsf/opnGMZWGuoyRW12uWl7v2M3uTW1wp68NA9Qx 5vC9fGS+nxFEdijudWYADzeA/xlQsNOpjXPEkZNwVkE5Qa8j0gr7WQlZcJwC5MzN+5BuWw Bk928gvfjqAXlYYW0GgxR/+ZSlNgVlwgaCQXebp9AHi1V6kdkwOGQOPLBLWjrSu5i1ktiP Dj6ZtKn5Jb0kPR4txgkkpY8b9Y/K53E3a1foWluqBIidth2aTjtK+tceljGPhg== 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: Tue, 06 Apr 2021 11:00:29 -0000 On Tue, Apr 06, 2021 at 10:55:57AM +0200, Mathieu Arnold wrote: > Is it possible to have the 'status' be a bit more wide? > > The emails generated when we used svn would never clobber the list of > changed files like that. > Compressing the file names is also a "feature" of 'git status' when used on the command line. It might be the same logic as used in whatever command is used to generate these mails ;) René From owner-freebsd-git@freebsd.org Tue Apr 6 15:16:16 2021 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 6D0445D4A5D for ; Tue, 6 Apr 2021 15:16:16 +0000 (UTC) (envelope-from thierry@pompo.net) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FFB1r1npmz3MM3 for ; Tue, 6 Apr 2021 15:16:16 +0000 (UTC) (envelope-from thierry@pompo.net) Received: by mailman.nyi.freebsd.org (Postfix) id 3D8225D4A5C; Tue, 6 Apr 2021 15:16:16 +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 3D4875D4F89 for ; Tue, 6 Apr 2021 15:16:16 +0000 (UTC) (envelope-from thierry@pompo.net) Received: from erza.lautre.net (erza.lautre.net [80.67.160.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "lautre.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFB1q2kfpz3MP7 for ; Tue, 6 Apr 2021 15:16:15 +0000 (UTC) (envelope-from thierry@pompo.net) Received: from graf.pompo.net (graf.pompo.net [78.225.128.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by erza.lautre.net (Postfix) with ESMTPSA id 3D239FD7CE for ; Tue, 6 Apr 2021 17:16:13 +0200 (CEST) Received: by graf.pompo.net (Postfix, from userid 1001) id 8EC9284937D; Tue, 6 Apr 2021 17:16:11 +0200 (CEST) Date: Tue, 6 Apr 2021 17:16:11 +0200 From: Thierry Thomas To: git@freebsd.org Subject: git@git.freebsd.org: Permission denied (publickey) Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="WrtBDSsLKHA1MEKE" Content-Disposition: inline X-Operating-System: FreeBSD 12.2-STABLE amd64 Organization: Kabbale Eros X-Face: (hRbQnK~Pt7$ct`!fupO(`y_WL4^-Iwn4@ly-.,[4xC4xc; y=\ipKMNm<1J>lv@PP~7Z<.tKjAnXLs: X-PGP: 0xF1C516B3C8359753 X-Rspamd-Queue-Id: 4FFB1q2kfpz3MP7 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of thierry@pompo.net has no SPF policy when checking 80.67.160.89) smtp.mailfrom=thierry@pompo.net X-Spamd-Result: default: False [-1.90 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_NONE(0.00)[]; HAS_ORG_HEADER(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[thierry@freebsd.org,thierry@pompo.net]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[80.67.160.89:from]; ASN(0.00)[asn:20766, ipnet:80.67.160.0/19, country:FR]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[thierry@freebsd.org,thierry@pompo.net]; TO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[thierry]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[80.67.160.89:from:127.0.2.255]; RBL_VIRUSFREE_BOTNET(2.00)[80.67.160.89:from]; R_SPF_NA(0.00)[no SPF record]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; 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, 06 Apr 2021 15:16:16 -0000 --WrtBDSsLKHA1MEKE Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello, Trying to push my first commit, I get this error: git@git.freebsd.org: Permission denied (publickey). fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. Any clue? --=20 Th. Thomas. --WrtBDSsLKHA1MEKE Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJ8BAEBCgBmBQJgbHs5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFNTM2QkU4NTM4NTM5OUQwMEI2RkFBNzZG MUM1MTZCM0M4MzU5NzUzAAoJEPHFFrPINZdTPcsQALTi0EF9foQ26DrcrkgExRjY rMWPNnPN1bbvoKzqq0Xv5Tr7KE/R5Rnv8MKm1kphGck2ObHqrFxalyUomrGC+0eE tdyHd8aEUMxTliSEeHAHb9rgGGx9FhzRaUozJhr1C0GTmtjxKsusASZJCCtXAXCt OfTRuTgYXumuqZ5IGKdxmL210l/CSzqQG54XhDNNGVQf3CFhHnx1mTLvi5FWWj4l VqiHu3SfHhxBHfE1EkrpFrcyihaDWBeqBtpvHUstkM8grgKwZNyD9DqOxM57QENZ 4hj8UeNfxkWAeUxcSZDOSb/WLSUB6JkvTjLK1yoYBoqWwVAub3BWyHMLIL6OaZOJ iW4+1C+Xlg6axpUpx5S5ZntTx0lXD5vsH8sYHbZKwCZeB2/juxD/Gfomt05pVfCC ofKQBf7wUGytANNvrlgRreC+nmFrS4xQNSIIy3EhoKULgTNlhoU8EHaY6i9+/BrW u1/kxRs34crT05a8fRgg1ca1MEskXDlv3TESpcbbQ955f5DCVZ2iLNIBg6x4+7La S9faFBtiaP4OcteMpBPa/tAME49TjTbTdvqGGi3zKjD1OnZptQPU06RMsrEeIjMD +W2WZ6NUsbFz6qFc46lHlAIMueCl99+S4kliw4r/jS6cpm5OGWkB2UYRfJEq+nCX fNcXp/xBhXFhWcausND2 =lnau -----END PGP SIGNATURE----- --WrtBDSsLKHA1MEKE-- From owner-freebsd-git@freebsd.org Tue Apr 6 15:26:56 2021 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 B2F855D52C8 for ; Tue, 6 Apr 2021 15:26:56 +0000 (UTC) (envelope-from mfechner@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFBG84pKxz3Nt4 for ; Tue, 6 Apr 2021 15:26:56 +0000 (UTC) (envelope-from mfechner@freebsd.org) Received: from [IPv6:2a02:6d40:36b1:f201:b138:1b29:127e:eb4e] (unknown [IPv6:2a02:6d40:36b1:f201:b138:1b29:127e:eb4e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: mfechner) by smtp.freebsd.org (Postfix) with ESMTPSA id 6315FDC09 for ; Tue, 6 Apr 2021 15:26:56 +0000 (UTC) (envelope-from mfechner@freebsd.org) Subject: Re: git@git.freebsd.org: Permission denied (publickey) To: freebsd-git@freebsd.org References: From: Matthias Fechner Message-ID: Date: Tue, 6 Apr 2021 17:26:54 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US 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, 06 Apr 2021 15:26:56 -0000 Am 06.04.2021 um 17:16 schrieb Thierry Thomas: > Trying to push my first commit, I get this error: > > git@git.freebsd.org: Permission denied (publickey). > fatal: Could not read from remote repository. > use: git@gitrepo.freebsd.org:ports.git Gruß Matthias -- "Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning." -- Rich Cook From owner-freebsd-git@freebsd.org Tue Apr 6 18:29:01 2021 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 B88315B375E for ; Tue, 6 Apr 2021 18:29:01 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FFGJF4tVhz4X34 for ; Tue, 6 Apr 2021 18:29:01 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id A79825B36C7; Tue, 6 Apr 2021 18:29:01 +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 A76015B34D6 for ; Tue, 6 Apr 2021 18:29:01 +0000 (UTC) (envelope-from ehaupt@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFGJF48YTz4XGK; Tue, 6 Apr 2021 18:29:01 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from beaver (unknown [81.6.39.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: ehaupt) by smtp.freebsd.org (Postfix) with ESMTPSA id 0793FF3B3; Tue, 6 Apr 2021 18:29:00 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Date: Tue, 6 Apr 2021 20:28:59 +0200 From: Emanuel Haupt To: Thierry Thomas Cc: git@freebsd.org Subject: Re: git@git.freebsd.org: Permission denied (publickey) Message-Id: <20210406202859.682d393f4ba25bf13d55b203@FreeBSD.org> In-Reply-To: References: X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII 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, 06 Apr 2021 18:29:01 -0000 Thierry Thomas wrote: > Hello, > > Trying to push my first commit, I get this error: > > git@git.freebsd.org: Permission denied (publickey). > fatal: Could not read from remote repository. > > Please make sure you have the correct access rights > and the repository exists. > > Any clue? Setup your work tree like this: https://github.com/lwhsu/freebsd-git-docs/blob/main/URLs.md Emanuel From owner-freebsd-git@freebsd.org Tue Apr 6 20:01:43 2021 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 7255B5B7195 for ; Tue, 6 Apr 2021 20:01:43 +0000 (UTC) (envelope-from thierry@pompo.net) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FFJMB6R4kz4kCt for ; Tue, 6 Apr 2021 20:01:42 +0000 (UTC) (envelope-from thierry@pompo.net) Received: by mailman.nyi.freebsd.org (Postfix) id DC83F5B7194; Tue, 6 Apr 2021 20:01:42 +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 DC3A05B7389 for ; Tue, 6 Apr 2021 20:01:42 +0000 (UTC) (envelope-from thierry@pompo.net) Received: from erza.lautre.net (erza.lautre.net [80.67.160.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "lautre.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFJMB5NHWz4k9n; Tue, 6 Apr 2021 20:01:42 +0000 (UTC) (envelope-from thierry@pompo.net) Received: from graf.pompo.net (graf.pompo.net [78.225.128.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by erza.lautre.net (Postfix) with ESMTPSA id 214AEFDAFF; Tue, 6 Apr 2021 22:01:41 +0200 (CEST) Received: by graf.pompo.net (Postfix, from userid 1001) id 8A9BA8498DB; Tue, 6 Apr 2021 22:01:40 +0200 (CEST) Date: Tue, 6 Apr 2021 22:01:40 +0200 From: Thierry Thomas To: Emanuel Haupt Cc: git@freebsd.org Subject: Re: git@git.freebsd.org: Permission denied (publickey) Message-ID: References: <20210406202859.682d393f4ba25bf13d55b203@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="UhzzshoCk3D1XLgt" Content-Disposition: inline In-Reply-To: <20210406202859.682d393f4ba25bf13d55b203@FreeBSD.org> X-Operating-System: FreeBSD 12.2-STABLE amd64 Organization: Kabbale Eros X-Face: (hRbQnK~Pt7$ct`!fupO(`y_WL4^-Iwn4@ly-.,[4xC4xc; y=\ipKMNm<1J>lv@PP~7Z<.tKjAnXLs: X-PGP: 0xF1C516B3C8359753 X-Rspamd-Queue-Id: 4FFJMB5NHWz4k9n 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: Tue, 06 Apr 2021 20:01:43 -0000 --UhzzshoCk3D1XLgt Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Le mar. 6 avr. 21 =C3=A0 20:28:59 +0200, Emanuel Haupt =C3=A9crivait=C2=A0: > Setup your work tree like this: >=20 > https://github.com/lwhsu/freebsd-git-docs/blob/main/URLs.md Thanks to Matthias, I was able to fix this error! After that, I faced several other errors (same as netchild@ + some other), but at the end I've been able to push my commit=E1=BC=85 --=20 Th. Thomas. --UhzzshoCk3D1XLgt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJ8BAEBCgBmBQJgbL4kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFNTM2QkU4NTM4NTM5OUQwMEI2RkFBNzZG MUM1MTZCM0M4MzU5NzUzAAoJEPHFFrPINZdTPz4P/ie51Twe6Oi5tGt3mFXw1uZf EbHX98kS54ng4tDhsUKmSCq321nvGVHW6KUTtJrKcN5Th2SO02xgLbm5l6ESvRm5 e8u5qXAVV9FCymY72soeDn59dxkam/oBTUnBgy1Xo+XLguGg7F+rbpEd+Jh9VWM4 jW49Ywo4/WwCH9l1wCbx+BmQv23lG3Y5FsZx8xPW5rzPD9rBrQwzvHTbaCac2FLS bL9Xfr8kPsL6IBLMMoZXtUsvHz8HUbXkM2ZQ4sbkLCFiAtK9Ts3e4a5LFUFB5YVW IyvSMRyeuk0mOONCqibYKtk4xdfF45YksVIttMS6jxYYPZLMj4z7hiqakcBALB7L ieYEEOP0NLJMGFtYVtGWNxl0AH8o+DdfMh48IunnJ57qQWUk/UyppJMg8qgXpukX VVO93pDaMobWhDixpctTUZN+N44/P4erumfm1EL0R0/zAoU7WoS9u+7sE7OLl+L7 aPOWOCUCePiY4Xa8i7M5evsm7CMo+2XgHlNRf3TGkYXqXYj71lbHr86uN35JW+rR QgN9AjLmxYS2b5fQt+n1lUycEV/gFH+IN2I4nkDaTUOrxyeIAOL/MeT0Bq803+MU 3Zo06xRcMIBzqKOlNR197eEj6XWWiz2VkSZYVR6RATppMAS8S0uJUE2biPtox3kr e5CHMeb2Mus0Or30LMqs =eTf9 -----END PGP SIGNATURE----- --UhzzshoCk3D1XLgt-- From owner-freebsd-git@freebsd.org Wed Apr 7 09:45:46 2021 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 5CA365D17B5 for ; Wed, 7 Apr 2021 09:45:46 +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 4FFff2264nz4m1f for ; Wed, 7 Apr 2021 09:45:46 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 483C95D17B4; Wed, 7 Apr 2021 09:45:46 +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 480865D188E for ; Wed, 7 Apr 2021 09:45:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFff21Zj8z4m3M; Wed, 7 Apr 2021 09:45:46 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from weatherwax.trouble.is (weatherwax.trouble.is [46.235.227.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "weatherwax.trouble.is", Issuer "R3" (verified OK)) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 12F8B266C6; Wed, 7 Apr 2021 09:45:46 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from rincewind.trouble.is (rincewind.trouble.is [IPv6:2a01:4f9:2a:1715::1:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits)) (Client CN "rincewind.trouble.is", Issuer "R3" (verified OK)) by weatherwax.trouble.is (Postfix) with ESMTPS id 4FFff12B11z27nS; Wed, 7 Apr 2021 09:45:45 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4FFfdz4G8fz4pgZ; Wed, 7 Apr 2021 09:45:43 +0000 (UTC) From: Philip Paeps To: Thierry Thomas Cc: git@freebsd.org Subject: Re: git@git.freebsd.org: Permission denied (publickey) Date: Wed, 07 Apr 2021 17:45:39 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5790) Message-ID: <5A79804B-BFAA-449E-AA79-30FFAA739D23@freebsd.org> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; format=flowed; markup=markdown 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, 07 Apr 2021 09:45:46 -0000 On 2021-04-06 23:16:11 (+0800), Thierry Thomas wrote: > Trying to push my first commit, I get this error: > > git@git.freebsd.org: Permission denied (publickey). > fatal: Could not read from remote repository. > > Please make sure you have the correct access rights > and the repository exists. > > Any clue? For the archives: this happened to me when I had my .git/config pushurl configured as git.FreeBSD.org but my .ssh/config Host configured as *.freebsd.org. Making the case in .git/config match the case in .ssh/config made the problem go away. Subtle. :) Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From owner-freebsd-git@freebsd.org Fri Apr 9 22:15:36 2021 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 8DC945C02CF for ; Fri, 9 Apr 2021 22:15:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 4FHCBH4sDrz4hn2 for ; Fri, 9 Apr 2021 22:15:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82d.google.com with SMTP id i19so5411710qtv.7 for ; Fri, 09 Apr 2021 15:15:35 -0700 (PDT) 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=RpQbKCVYolg2YM51njqzYl4akm03N6MZjxdg9LiEnVc=; b=Zuc1k9ec94MCz8MMw5+1jMu7AuPLbbCVBh0sA2mVejj9Hf95JLryG2uZAZvWumSE7M 3Dk6O0g5QfaBTvBcSrqs+RQGC/zy3FmgfB/03wSZZpAgTvV/FUbbOYdVC+4lK9lWEv4Q nW2NqG4G3lSBT9K4iwFqjPTexdDPAlolhTX/LIf/uhzhE0I/t81OccgfzflfQiGX3J95 xJhBq3CPOM1tM3MYx5O0F2gfMhxLR1i1hHhn5O+plBtKwNiDChFvlUeRNi8ianwAQyHA litHAf2TxntTsRUtmi3qx3OueCB8dnYMA9KauxOuPDCfpO+4N37HO/YnFiqSRETi4tEl 9zlQ== 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=RpQbKCVYolg2YM51njqzYl4akm03N6MZjxdg9LiEnVc=; b=KJVEiOlqsBM03HAFwVf1JL/NCMF6KwswPJdPgrTWeuyEtExlrCRZinEuPbw8pIaZtS AIpU5HUN7+fYNx1yaomFOBzzeHo/dgIES83EUUuJCe+ewBEMylVaE8AYiphxLFNULqaS 9Sle7wmqEbjCaddLJwwsGqOM8WYfWqGG+hdz8E83tQ6bhdSmjaf6ApNUKAkWG0SiACwT tYT6XiB9yd57oVhTlqr7hIXeQGlw7txfOndALYjThlz4CnlCx2K8+zzykI+mmWDgNN71 Q+0xRovUZaxa+JtKGVydquQ94KtnxIRjDZv/n4PGWD/FCN40kOEdnde2ufKQnYXsDwhw eoIw== X-Gm-Message-State: AOAM532eDzd4qy1pdUiLYg2dPVtat9OTLrSAYFkrX5WJai1JEuXD8Ybi LZppxcEMaT/OQqeI6bKllDBYAbHFPo7hRw880+3K3g== X-Google-Smtp-Source: ABdhPJzTEElgZcJrL+fXSGdvCXXP0RD2j/Wz9lM/moGyrmva+1KgO0qRmNRI0mGtfw8dtYshKO8UnQm3UeaFBSCuotA= X-Received: by 2002:a05:622a:3c8:: with SMTP id k8mr14955222qtx.101.1618006534686; Fri, 09 Apr 2021 15:15:34 -0700 (PDT) MIME-Version: 1.0 References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> <41924e9d-9d61-6646-6c8f-e4458f94296e@FreeBSD.org> <30f529c1-6087-e704-8cc7-0c48a40b7430@FreeBSD.org> In-Reply-To: <30f529c1-6087-e704-8cc7-0c48a40b7430@FreeBSD.org> From: Warner Losh Date: Fri, 9 Apr 2021 16:15:23 -0600 Message-ID: Subject: Re: OpenZFS branch tracking policy To: Martin Matuska Cc: Ed Maste , freebsd-git , Xin Li , Ryan Moeller , Alexander Motin , Mateusz Guzik X-Rspamd-Queue-Id: 4FHCBH4sDrz4hn2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=Zuc1k9ec; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::82d) 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)[]; 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::82d:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-0.998]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::82d:from]; 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::82d: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: Fri, 09 Apr 2021 22:15:36 -0000 On Fri, Apr 2, 2021 at 6:44 PM Martin Matuska wrote: > I have prepared an example merged branch here: > https://github.com/mmatuska/freebsd-src/tree/openzfs_master_merged > > The magical command was: > git merge -s subtree -Xsubtree="sys/contrib/openzfs" 891568c99 > --allow-unrelated-histories > > Luckily, our current diff is manageable. > So I did this for bzip2 using approximately: git add remove bzip2 git fetch bzip2 git merge -s subtree -Xsubtree=contrib/bzip2 bzip2/master --allow-unrelated-histories --squash [1] At this point I resolved conflicts, where were the entire files since I guess I didn't bootstrap right to the last merge. There were 4 files in conflict. Then I did a git add of all the files in conflict and a git commit. This produced a good commit. since it was a squash commit, there were no issues. However, it turns out I botched the commit at point [1] above. So I ran this again and got a conflict for the whole file that I'd removed a blank line from. So, this looks like it could be workable, but does lead me to a few questions: (1) How do we do this so that the conflicts aren't add/add conflicts? Is there some way to bootstrap this? (2) Do we need to keep track of the last merge point and use that in merging the next one in? (3) I assume we keep track of FreeBSD diffs in a branch off and we merge that instead of master. (4) What do we do about adjustments to the build that are needed? (5) Do we need to host a FreeBSD-specific repo with this stuff, maybe with tags we don't want widely pushed to ease the next merge? Eg, make this the first case of a 'vendor repo' that we then pull squash commits from so that the vendor repo can track upstream, but not otherwise be pushed to all our users.... Finally, how did you deal with [1] producing so many full-file add/add conflicts? Oh, and what kind of commit message when things merge do you suggest? I rather like your 'bring in hash XXXX branch blah, here's the important highlights' emails and think that would be a good first cut at advice on what to put in these. This suggests the current answer is 'seems doable, but we need to document it and come up with recommendations for how to do it'. Warner On 3. 4. 2021 1:37, Martin Matuska wrote: > > Hi Warner and Ed, > > > > 2.1-release has already been branched. The stable branch policy in > > OpenZFS is somewhat strange, they make a staging branch for each > > patchlevel release, but the commits are continuous. > > > > To have some idea how big the repo history is: > > > > $ git rev-list master --count > > 6662 > > > > $ git rev-list zfs-2.1-release --count > > 6650 > > > > master and zfs-2.1-release have 6650 common commits at the moment > > > > $ git log master | wc -l > > 129868 > > > > (linecount - 4 * revcount) / revcount = linecount / revcount - 4 = > > 15,4938 comment lines per commit on average > > > > Initial commit was made in Feb 26, 2008. > > > > Yearly commit counts: > > > > $ git log master | grep -c -E '^Date:.* 2020 -[0-9]+$' > > 666 > > > > $ git log master | grep -c -E '^Date:.* 2019 -[0-9]+$' > > 535 > > > > $git log master | grep -c -E '^Date:.* 2018 -[0-9]+$' > > 428 > > > > Martin > > > > On 2. 4. 2021 20:15, Warner Losh wrote: > >> > >> > >> On Fri, Apr 2, 2021 at 11:56 AM Ed Maste >> > wrote: > >> > >> On Fri, 2 Apr 2021 at 11:50, Warner Losh >> > wrote: > >> > > >> > We'd always hoped that we'd be able to do subtree merges from > >> upstreams > >> > that use git into FreeBSD. The big worry, though, was that this > >> would > >> > needless bloat the repo with a lot of history. We don't want, > >> for example, > >> > all of LLVM's history in the tree. We'd always anticipated that > >> there'd be > >> > some things we'd just accept the history for, since it is > >> similar in > >> > character to the vendor branches (though of course a bit more). > >> > >> Note that if we do want to avoid bringing in the full history `git > >> subtree merge` supports a `--squash` option. This brings in the > >> set of > >> upstream changes as a single commit, without bringing along the > >> associated history. We will need to do more experimentation to > >> confirm > >> that the full process, including bootstrapping, will work as we > >> want. > >> Assuming this all works it should allow us to forgo the use of a > >> FreeBSD-specific vendor branch in src. > >> > >> We've discussed mirroring any such 3rd-party source in some > >> FreeBSD-controlled repository. This would allow the project to > >> retain > >> a full copy of the history, but avoid bloating src with it. > >> > >> I agree with Warner that we may want a different policy (full > >> history > >> or snapshots) for different contrib sources. > >> > >> > >> Good points Ed. I'd forgotten about --squash. > >> > >> Martin, what's your timeline for wanting to implement these things? > >> I'm unfamiliar with the OpenZFS schedules. > >> > >> Warner > > _______________________________________________ > > freebsd-git@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/freebsd-git > > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Sat Apr 10 07:09:00 2021 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 9276C5C46A3 for ; Sat, 10 Apr 2021 07:09:00 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) (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 4FHR1l6Lrvz4ZkV for ; Sat, 10 Apr 2021 07:08:59 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: by mail-wm1-x32b.google.com with SMTP id y204so2575512wmg.2 for ; Sat, 10 Apr 2021 00:08:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=Knr/zJOx3/dj1VFYW4KIZSIA6rDIeLzZ8S/v0Hw80E8=; b=OSDmrGvwe4ypmSRrZTBlaCMBxDe3oZG74wkbc8DA1J+Er4pwY/RRS3oDCZwbDmLkhW 8UxG+xMxsArlprqfEkCI5zvrmrFm021ZYFLJWrU7ospNYxX1CuOoX0ZQbXEKlB1aojsn jQQIszQ9WY1Zl2rzDbq8YHanOr1eHU0/YIjkZsru5scyy5fCe+ylCJJhV6mCvSRfT4VW X2X0+JGLYFQZNJXvHXtJvbLnDzSCabDFlHfQjY/mEM2pi1n69OFEnYguuDPXKJqQDgPs 8NrUzMkdgE8r4zNl7XGEVRYYvhazHA7KYgrRjvL8pbyIbjr7QxcJSH90O3+aWQizsQ8Q d6TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=Knr/zJOx3/dj1VFYW4KIZSIA6rDIeLzZ8S/v0Hw80E8=; b=jZ6ZmxdpnW0es9z5CjK0gIbOiteaeQV1MC2IsQRQUQP52eqoGBKW0BZr1k9mrg8lOP uZ6C2bGKCGWu1LGIEZGPZn+LTQL5To0sd1YXCeLV+VdrMAsjfDewEg8wENPowljBYASH PmVUYAeXJejUwDCTewzsL/y9MzD7rGk5zB4ZB/06yOLZWjRLa8fZYp+W2k8s7rxlbtK0 Phfp5rhwyOvAz01cYZi3EM8YtPsAKrS4h64m8mr04Oz1b8pTH6l8/5Dl0/rChR5wwuT6 +ckRYT6SPo9lyJWORpuN9+r4B1f6tXiBo6PL+T7qlsRZDONVH0MOLliqK/Hr2/3raQSI wKdg== X-Gm-Message-State: AOAM530s+LRZWhISGz8Som1putrQWcKSA2THxh1heFphmYjXT7eEjVcO /OEDXQye5yBSPz1s40wuXN/4/IqNk+leoQ== X-Google-Smtp-Source: ABdhPJyGl0PDfOtaLMoqGUhLSzDGF/FjOI0S0IPJ3riRD4IkEoU+5yjWsRXWXQUVnrEOTa00pTIcjg== X-Received: by 2002:a1c:2b03:: with SMTP id r3mr16467260wmr.173.1618038537948; Sat, 10 Apr 2021 00:08:57 -0700 (PDT) Received: from [192.168.1.13] (88-105-96-80.dynamic.dsl.as9105.com. [88.105.96.80]) by smtp.gmail.com with ESMTPSA id y10sm8441028wrp.31.2021.04.10.00.08.56 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 10 Apr 2021 00:08:57 -0700 (PDT) To: freebsd-git@freebsd.org From: Graham Perrin Subject: Web redirect for Message-ID: Date: Sat, 10 Apr 2021 08:08:56 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB X-Rspamd-Queue-Id: 4FHR1l6Lrvz4ZkV X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=OSDmrGvw; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::32b as permitted sender) smtp.mailfrom=grahamperrin@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::32b:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; URL_IN_SUBJECT(1.00)[git.freebsd.org]; 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)[2a00:1450:4864:20::32b:from:127.0.2.255]; RECEIVED_SPAMHAUS_PBL(0.00)[88.105.96.80:received]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::32b:from]; 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: Sat, 10 Apr 2021 07:09:00 -0000 Browsed with e.g. Mozilla Firefox: and redirect to . and redirect to . For , will there be a comparable redirect? (To .) Thanks From owner-freebsd-git@freebsd.org Sat Apr 10 17:15:58 2021 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 44E035D27B7 for ; Sat, 10 Apr 2021 17:15:58 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [IPv6:2a01:4f8:191:9029::4]) by mx1.freebsd.org (Postfix) with ESMTP id 4FHhV51j9Jz3n3l; Sat, 10 Apr 2021 17:15:57 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id 42FCB1FAEF6; Sat, 10 Apr 2021 19:15:50 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by mail.vx.sk (amavisd-new, unix socket) with LMTP id o_eS_pG-HecV; Sat, 10 Apr 2021 19:15:50 +0200 (CEST) Received: from [10.9.8.122] (188-167-101-78.dynamic.chello.sk [188.167.101.78]) by mail.vx.sk (Postfix) with ESMTPSA id C64531FAF8A; Sat, 10 Apr 2021 19:15:49 +0200 (CEST) To: Warner Losh Cc: Ed Maste , freebsd-git , Xin Li , Ryan Moeller , Alexander Motin , Mateusz Guzik References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> <41924e9d-9d61-6646-6c8f-e4458f94296e@FreeBSD.org> <30f529c1-6087-e704-8cc7-0c48a40b7430@FreeBSD.org> From: Martin Matuska Subject: Re: OpenZFS branch tracking policy Message-ID: Date: Sat, 10 Apr 2021 19:15:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Rspamd-Queue-Id: 4FHhV51j9Jz3n3l X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE] Content-Type: text/plain; charset=utf-8; format=flowed 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: Sat, 10 Apr 2021 17:15:58 -0000 Here are some of the facts: - In my merge, there are 15 conflicting files due to changes in FreeBSD=20 (add/add) - Some of the changes have already been upstreamed in later revisions of = openzfs than 891568c99 - A significant majority of the diffs is subject for upstreaming. The=20 ideal state would be to have all changes upstreamed. Sometimes changes=20 get upstreamed with modifications. - In general our developers open pull requests and commit to OpenZFS,=20 then we merge the changes What our developers would like is to use a "git blame" on=20 sys/contrib/openzfs/something to see the history path from OpenZFS. I agree that the merge commits should be more verbose, ideally=20 containing a "git log --oneline" of the commits since last merge. If a do a "squashed" merge like you described with bzip2, then I do not=20 import the history from OpenZFS. That way we don't need that at all and=20 can continue working the way we did until now. What you say about adding "unnecessary" history - since the common=20 development at OpenZFS the majority of commits directly affects FreeBSD. = Only "Linux-Only" and "CI-related" commits are not relevant for FreeBSD. I have updated my example branch how it may look like with more detailed = commit messages, nicely clickable from github: https://github.com/mmatuska/freebsd-src/tree/openzfs_master_merged So the the current question is quite simple, we can do one of the followi= ng: a) do the unsquashed merge I suggest that imports the openzfs history -=20 this will make the commits very transparent, future merges and upstream=20 tracking very easy and --allow-unrelated-history flag is not required=20 anymore. The "common" part of the histories in main and stable/13 will=20 be identical. b) if that is not desired or we are undecided I will continue the way we = go now until a better solution is found. In that case I will fork a=20 second vendor branch (vendor/openzfs-2.1) that starts with the latest=20 common commit of openzfs/master and openzfs/zfs-2.1-release and will=20 merge (or cherry-pick?) from this branch directly to stable/13. As an=20 alternative to merging, git cherry-pick supports -Xsubtree=3D as well. Best regards, mm On 10. 4. 2021 0:15, Warner Losh wrote: > > > On Fri, Apr 2, 2021 at 6:44 PM Martin Matuska > wrote: > > I have prepared an example merged branch here: > https://github.com/mmatuska/freebsd-src/tree/openzfs_master_merged > > > The magical command was: > git merge -s subtree -Xsubtree=3D"sys/contrib/openzfs" 891568c99 > --allow-unrelated-histories > > Luckily, our current diff is manageable. > > > So I did this for bzip2 using approximately: > > git add remove bzip2 > git fetch bzip2 > git merge -s subtree -Xsubtree=3Dcontrib/bzip2 bzip2/master=20 > --allow-unrelated-histories --squash > > [1] At this point I resolved conflicts, where were the entire files=20 > since I guess I didn't bootstrap right to the last merge. There were 4 = > files in conflict. > > Then I did a git add of all the files in conflict and a git commit. > > This produced a good commit. since it was a squash commit, there were=20 > no issues. > > However, it turns out I botched the commit at point [1] above. So I=20 > ran this again and got a conflict for the whole file that I'd removed=20 > a blank line from. > > So, this looks like it could be workable, but does lead me to a few=20 > questions: > > (1) How do we do this so that the conflicts aren't add/add conflicts?=20 > Is there some way to bootstrap this? > (2) Do we need to keep track of the last merge point and use that in=20 > merging the next one in? > (3) I assume we keep track of FreeBSD diffs in a branch off and=20 > we merge that instead of master. > (4) What do we do about adjustments to the build that are needed? > (5) Do we need to host a FreeBSD-specific repo with this stuff, maybe=20 > with tags we don't want widely pushed to ease the next merge? Eg, make = > this the first case of a 'vendor repo' that we then pull squash=20 > commits from so that the vendor repo can track upstream, but not=20 > otherwise be pushed to all our users.... > > Finally, how did you deal with [1] producing so many full-file add/add = > conflicts? Oh, and what kind of commit message when things merge do=20 > you suggest? I rather like your 'bring in hash XXXX branch blah,=20 > here's the important highlights' emails and think that would be a good = > first cut at advice on what to put in these. > > This suggests the current answer is 'seems doable, but we need to=20 > document it and come up with recommendations for how to do it'. > > Warner > > On 3. 4. 2021 1:37, Martin Matuska wrote: > > Hi Warner and Ed, > > > > 2.1-release has already been branched. The stable branch policy i= n > > OpenZFS is somewhat strange, they make a staging branch for each > > patchlevel release, but the commits are continuous. > > > > To have some idea how big the repo history is: > > > > $ git rev-list master --count > > 6662 > > > > $ git rev-list zfs-2.1-release --count > > 6650 > > > > master and zfs-2.1-release have 6650 common commits at the=C2=A0 = moment > > > > $ git log master | wc -l > > 129868 > > > > (linecount - 4 * revcount) / revcount =3D linecount / revcount - = 4 =3D > > 15,4938 comment lines per commit on average > > > > Initial commit was made in Feb 26, 2008. > > > > Yearly commit counts: > > > > $ git log master | grep -c -E '^Date:.* 2020 -[0-9]+$' > > 666 > > > > $ git log master | grep -c -E '^Date:.* 2019 -[0-9]+$' > > 535 > > > > $git log master | grep -c -E '^Date:.* 2018 -[0-9]+$' > > 428 > > > > Martin > > > > On 2. 4. 2021 20:15, Warner Losh wrote: > >> > >> > >> On Fri, Apr 2, 2021 at 11:56 AM Ed Maste > >> >> wrote: > >> > >> =C2=A0=C2=A0=C2=A0 On Fri, 2 Apr 2021 at 11:50, Warner Losh > >> =C2=A0=C2=A0=C2=A0 >> wrote: > >> =C2=A0=C2=A0=C2=A0 > > >> =C2=A0=C2=A0=C2=A0 > We'd always hoped that we'd be able to do s= ubtree merges from > >> =C2=A0=C2=A0=C2=A0 upstreams > >> =C2=A0=C2=A0=C2=A0 > that use git into FreeBSD. The big worry, t= hough, was > that this > >> =C2=A0=C2=A0=C2=A0 would > >> =C2=A0=C2=A0=C2=A0 > needless bloat the repo with a lot of histo= ry. We don't want, > >> =C2=A0=C2=A0=C2=A0 for example, > >> =C2=A0=C2=A0=C2=A0 > all of LLVM's history in the tree. We'd alw= ays > anticipated that > >> =C2=A0=C2=A0=C2=A0 there'd be > >> =C2=A0=C2=A0=C2=A0 > some things we'd just accept the history fo= r, since it is > >> similar in > >> =C2=A0=C2=A0=C2=A0 > character to the vendor branches (though of= course a bit > more). > >> > >> =C2=A0=C2=A0=C2=A0 Note that if we do want to avoid bringing in = the full > history `git > >> =C2=A0=C2=A0=C2=A0 subtree merge` supports a `--squash` option. = This brings in > the > >> set of > >> =C2=A0=C2=A0=C2=A0 upstream changes as a single commit, without = bringing along the > >> =C2=A0=C2=A0=C2=A0 associated history. We will need to do more e= xperimentation to > >> confirm > >> =C2=A0=C2=A0=C2=A0 that the full process, including bootstrappin= g, will work > as we > >> want. > >> =C2=A0=C2=A0=C2=A0 Assuming this all works it should allow us to= forgo the use > of a > >> =C2=A0=C2=A0=C2=A0 FreeBSD-specific vendor branch in src. > >> > >> =C2=A0=C2=A0=C2=A0 We've discussed mirroring any such 3rd-party = source in some > >> =C2=A0=C2=A0=C2=A0 FreeBSD-controlled repository. This would all= ow the project to > >> retain > >> =C2=A0=C2=A0=C2=A0 a full copy of the history, but avoid bloatin= g src with it. > >> > >> =C2=A0=C2=A0=C2=A0 I agree with Warner that we may want a differ= ent policy (full > >> history > >> =C2=A0=C2=A0=C2=A0 or snapshots) for different contrib sources. > >> > >> > >> Good points Ed. I'd forgotten about --squash. > >> > >> Martin, what's your timeline for wanting to implement these > things? > >> I'm unfamiliar with the OpenZFS schedules. > >> > >> Warner > > _______________________________________________ > > freebsd-git@freebsd.org mailing > list > > https://lists.freebsd.org/mailman/listinfo/freebsd-git > > > To unsubscribe, send any mail to > "freebsd-git-unsubscribe@freebsd.org > " > From owner-freebsd-git@freebsd.org Sat Apr 10 19:22:50 2021 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 02F3A5D58CE for ; Sat, 10 Apr 2021 19:22:50 +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 4FHlJT0qxmz3tFs for ; Sat, 10 Apr 2021 19:22:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72a.google.com with SMTP id c4so9350656qkg.3 for ; Sat, 10 Apr 2021 12:22:48 -0700 (PDT) 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=SZsmAsE7kbbvFbm6ddG6CrOcfPbvnu6hXnchpBz+Sr0=; b=UqM0JeX6OvepbFne7953NrVQ5Yu9gagLJrEIVP/0ofhUCUusPEgxictRFTI39e5n1c G81orhDcdjoW349P//yGxMYC8Wvzl20r9R4tTNNYFRTqkNoSfpQX4UVzdHrbsZKTBdGg efHW8OGygEqdg+rdka77wxmiy/q0+giNFSgPFCfNCZ2F/OCZgn2/AHjDxEBTt1jNRJlb ZDB6UJN25dQqhektJlvFkj454J6MqyyZxj4G0GUhIBYFJbCJ0WhKZzV3qfwatCwxP8eW DVEoRPC4MeGCPV3F+MxL765/fNhKcIClzF38V2bJSilt+U4BLknpXBZSzWvJYiC3hWzo fOEA== 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=SZsmAsE7kbbvFbm6ddG6CrOcfPbvnu6hXnchpBz+Sr0=; b=c9MnGUc2OILmi80omK98JWKXi+XyIWaB5ZZILjSIM41Q/g0vjSBgCGaU6lSp4utqs0 B14BxFqFlOgUUYCAq5ofhdm2uHJbEo8vEWcLlz/kPi0XbFZ/wL0AXkEgDyGePAOZiuhL kBt0cM/UtvEaJOAzD7jTiPA9xETGkPMxEND8G6O02/n/Mexu/3VI+FfeR19NqHBTRw/7 jY0bALBQajtOextEkyuvQsXyIYCcyrfKrgawVbvFj+31Mcv/LiopK2RC1upGf6UwAcRL T4z18dikfuwVigH33qdKJV3u2AGE6o6QEJdB5IpblHDQ82brm+tk9lKkSY9SRUzhDyW9 eKZQ== X-Gm-Message-State: AOAM533sRAIjPLhb+5NCfwaAYnHdSV51BDAPFImXZETsn78KesNkFose 9i5wa1OuMo9m5vKxoG1bHc4r8Fr5lYuDbc0WRHhmD/Ur6nKzGg== X-Google-Smtp-Source: ABdhPJzIqImCdkhnHiuIbRKIdjb061r86oTscGYOlpfg/6dyV+UBYVnR/Fc4CTZdV1KZWywF6g7/XkeIbZCuOcYG5IQ= X-Received: by 2002:a37:a48a:: with SMTP id n132mr19203356qke.359.1618082567904; Sat, 10 Apr 2021 12:22:47 -0700 (PDT) MIME-Version: 1.0 References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> <41924e9d-9d61-6646-6c8f-e4458f94296e@FreeBSD.org> <30f529c1-6087-e704-8cc7-0c48a40b7430@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Sat, 10 Apr 2021 13:22:36 -0600 Message-ID: Subject: Re: OpenZFS branch tracking policy To: Martin Matuska Cc: Ed Maste , freebsd-git , Xin Li , Ryan Moeller , Alexander Motin , Mateusz Guzik X-Rspamd-Queue-Id: 4FHlJT0qxmz3tFs X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=UqM0JeX6; 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 [0.94 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(0.94)[0.940]; 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)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_SPAM_LONG(1.00)[1.000]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72a:from]; 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]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] 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: Sat, 10 Apr 2021 19:22:50 -0000 Thanks for the update Martin. The tl;dr is I think this will be fine. However, I'd like to document the reasoning here for future cases that we may need to judge. There's also a couple of logistical issues at the end we need to address, one critical. On Sat, Apr 10, 2021 at 11:15 AM Martin Matuska wrote: > Here are some of the facts: > > - In my merge, there are 15 conflicting files due to changes in FreeBSD > (add/add) > - Some of the changes have already been upstreamed in later revisions of > openzfs than 891568c99 > - A significant majority of the diffs is subject for upstreaming. The > ideal state would be to have all changes upstreamed. Sometimes changes get > upstreamed with modifications. > - In general our developers open pull requests and commit to OpenZFS, then > we merge the changes > > What our developers would like is to use a "git blame" on > sys/contrib/openzfs/something to see the history path from OpenZFS. > > I agree that the merge commits should be more verbose, ideally containing > a "git log --oneline" of the commits since last merge. > > If a do a "squashed" merge like you described with bzip2, then I do not > import the history from OpenZFS. That way we don't need that at all and can > continue working the way we did until now. > > What you say about adding "unnecessary" history - since the common > development at OpenZFS the majority of commits directly affects FreeBSD. > Only "Linux-Only" and "CI-related" commits are not relevant for FreeBSD. > > I have updated my example branch how it may look like with more detailed > commit messages, nicely clickable from github: > https://github.com/mmatuska/freebsd-src/tree/openzfs_master_merged > > So the the current question is quite simple, we can do one of the > following: > a) do the unsquashed merge I suggest that imports the openzfs history - > this will make the commits very transparent, future merges and upstream > tracking very easy and --allow-unrelated-history flag is not required > anymore. The "common" part of the histories in main and stable/13 will be > identical. > b) if that is not desired or we are undecided I will continue the way we > go now until a better solution is found. In that case I will fork a second > vendor branch (vendor/openzfs-2.1) that starts with the latest common > commit of openzfs/master and openzfs/zfs-2.1-release and will merge (or > cherry-pick?) from this branch directly to stable/13. As an alternative to > merging, git cherry-pick supports -Xsubtree= as well. > I'm leading towards 'a', but that's a new way for the project to track vendor changes. Many of my comments were on how to mirror pulling in upstreams that we would want to do infrequently, and where we didn't care about the details so much. llvm is a good example, as would be bzip, though for different reasons. The former more due to the sheer size of the llvm repo and the extremely infrequent need for users and developers of FreeBSD to peer into the details. They simply are relevant for those cases. For these cases, a squashed commit makes sense: people don't care about the details and it keeps our repo size manageable and 'b' is appropriate. I had initially thought OpenZFS would fall into this category, but your additional details suggest that my initial thinking might be a poor fit to our needs. I think that you've made a compelling case to merge in the tree. The potential downsides need to be looked at for doing something new. First is size. From the numbers you provided, OpenZFS is on the larger side of things we'd want to do this with. The expansion of the repo is concerning, so there would need to be some benefit from that. Here, you've clearly articulated the benefit: our OpenZFS developers drift back and forth between OpenZFS and FreeBSD and do development in both places. If these merges are frequent, this allows a more efficient workflow for OpenZFS maintenance. This also allows better bisecting in the case of trouble. One reason we don't generally want to open things up to merge commits is the crazy merges we did with svn that created weird loops. While the git transition work endeavored to eliminate them, a number slipped through. We do not want any more of them created. By that test, these commits pose no risk given then OpenZFS practices (and little risk outside the contrib/openzfs tree). So, the practical aspects of this: how do we do this. We'll need to have the OpenZFS mainline and branches in the tree, so the question of what namespace to put them into comes to mind. The obvious answer would be 'openzfs' or 'vendor/openzfs' comes to mind, but you want two branches, so maybe vendor/openzfs/main (or master, whatever it is called upstream) and vendor/openzfs/ would be better since we could then recommend a 'refs' line for people working on openzfs that would let git do all the heavy lifting here. There's no issue with having both vendor/openzfs and vendor/openzfs/ in the tree at the same time, I don't think. The current rule sets would allow this, and you could carefully push both the branches first. I don't think we need to do anything special except document how to do the first commit (for others who need to do this) and document how to update which I'm more than happy to help out with. One critical thing we need to assess before you proceed, however: mail. We need to make sure we're not about to send 7k emails as all these revisions suddenly appear in the repo... While having an extra 7k revs in the repo will be no problem, but 7k extra emails might raise a comment or two... Comments? Warner > Best regards, > mm > On 10. 4. 2021 0:15, Warner Losh wrote: > > > > On Fri, Apr 2, 2021 at 6:44 PM Martin Matuska wrote: > >> I have prepared an example merged branch here: >> https://github.com/mmatuska/freebsd-src/tree/openzfs_master_merged >> >> The magical command was: >> git merge -s subtree -Xsubtree="sys/contrib/openzfs" 891568c99 >> --allow-unrelated-histories >> >> Luckily, our current diff is manageable. >> > > So I did this for bzip2 using approximately: > > git add remove bzip2 > git fetch bzip2 > git merge -s subtree -Xsubtree=contrib/bzip2 bzip2/master > --allow-unrelated-histories --squash > > [1] At this point I resolved conflicts, where were the entire files since > I guess I didn't bootstrap right to the last merge. There were 4 files in > conflict. > > Then I did a git add of all the files in conflict and a git commit. > > This produced a good commit. since it was a squash commit, there were no > issues. > > However, it turns out I botched the commit at point [1] above. So I ran > this again and got a conflict for the whole file that I'd removed a blank > line from. > > So, this looks like it could be workable, but does lead me to a few > questions: > > (1) How do we do this so that the conflicts aren't add/add conflicts? Is > there some way to bootstrap this? > (2) Do we need to keep track of the last merge point and use that in > merging the next one in? > (3) I assume we keep track of FreeBSD diffs in a branch off and we > merge that instead of master. > (4) What do we do about adjustments to the build that are needed? > (5) Do we need to host a FreeBSD-specific repo with this stuff, maybe with > tags we don't want widely pushed to ease the next merge? Eg, make this the > first case of a 'vendor repo' that we then pull squash commits from so that > the vendor repo can track upstream, but not otherwise be pushed to all our > users.... > > Finally, how did you deal with [1] producing so many full-file add/add > conflicts? Oh, and what kind of commit message when things merge do you > suggest? I rather like your 'bring in hash XXXX branch blah, here's the > important highlights' emails and think that would be a good first cut at > advice on what to put in these. > > This suggests the current answer is 'seems doable, but we need to document > it and come up with recommendations for how to do it'. > > Warner > > On 3. 4. 2021 1:37, Martin Matuska wrote: >> > Hi Warner and Ed, >> > >> > 2.1-release has already been branched. The stable branch policy in >> > OpenZFS is somewhat strange, they make a staging branch for each >> > patchlevel release, but the commits are continuous. >> > >> > To have some idea how big the repo history is: >> > >> > $ git rev-list master --count >> > 6662 >> > >> > $ git rev-list zfs-2.1-release --count >> > 6650 >> > >> > master and zfs-2.1-release have 6650 common commits at the moment >> > >> > $ git log master | wc -l >> > 129868 >> > >> > (linecount - 4 * revcount) / revcount = linecount / revcount - 4 = >> > 15,4938 comment lines per commit on average >> > >> > Initial commit was made in Feb 26, 2008. >> > >> > Yearly commit counts: >> > >> > $ git log master | grep -c -E '^Date:.* 2020 -[0-9]+$' >> > 666 >> > >> > $ git log master | grep -c -E '^Date:.* 2019 -[0-9]+$' >> > 535 >> > >> > $git log master | grep -c -E '^Date:.* 2018 -[0-9]+$' >> > 428 >> > >> > Martin >> > >> > On 2. 4. 2021 20:15, Warner Losh wrote: >> >> >> >> >> >> On Fri, Apr 2, 2021 at 11:56 AM Ed Maste > >> > wrote: >> >> >> >> On Fri, 2 Apr 2021 at 11:50, Warner Losh > >> > wrote: >> >> > >> >> > We'd always hoped that we'd be able to do subtree merges from >> >> upstreams >> >> > that use git into FreeBSD. The big worry, though, was that this >> >> would >> >> > needless bloat the repo with a lot of history. We don't want, >> >> for example, >> >> > all of LLVM's history in the tree. We'd always anticipated that >> >> there'd be >> >> > some things we'd just accept the history for, since it is >> >> similar in >> >> > character to the vendor branches (though of course a bit more). >> >> >> >> Note that if we do want to avoid bringing in the full history `git >> >> subtree merge` supports a `--squash` option. This brings in the >> >> set of >> >> upstream changes as a single commit, without bringing along the >> >> associated history. We will need to do more experimentation to >> >> confirm >> >> that the full process, including bootstrapping, will work as we >> >> want. >> >> Assuming this all works it should allow us to forgo the use of a >> >> FreeBSD-specific vendor branch in src. >> >> >> >> We've discussed mirroring any such 3rd-party source in some >> >> FreeBSD-controlled repository. This would allow the project to >> >> retain >> >> a full copy of the history, but avoid bloating src with it. >> >> >> >> I agree with Warner that we may want a different policy (full >> >> history >> >> or snapshots) for different contrib sources. >> >> >> >> >> >> Good points Ed. I'd forgotten about --squash. >> >> >> >> Martin, what's your timeline for wanting to implement these things? >> >> I'm unfamiliar with the OpenZFS schedules. >> >> >> >> Warner >> > _______________________________________________ >> > freebsd-git@freebsd.org mailing list >> > https://lists.freebsd.org/mailman/listinfo/freebsd-git >> > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >> > From owner-freebsd-git@freebsd.org Sat Apr 10 23:03:34 2021 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 0AC305DA7C8 for ; Sat, 10 Apr 2021 23:03:34 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [IPv6:2a01:4f8:191:9029::4]) by mx1.freebsd.org (Postfix) with ESMTP id 4FHrC92x32z4XWx; Sat, 10 Apr 2021 23:03:33 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id 45261202F5B; Sun, 11 Apr 2021 01:03:31 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by mail.vx.sk (amavisd-new, unix socket) with LMTP id Fo4rmFffWPWc; Sun, 11 Apr 2021 01:03:31 +0200 (CEST) Received: from [10.9.8.122] (188-167-101-78.dynamic.chello.sk [188.167.101.78]) by mail.vx.sk (Postfix) with ESMTPSA id 8F70E2030C7; Sun, 11 Apr 2021 01:03:30 +0200 (CEST) To: Warner Losh Cc: Ed Maste , freebsd-git , Xin Li , Ryan Moeller , Alexander Motin , Mateusz Guzik References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> <41924e9d-9d61-6646-6c8f-e4458f94296e@FreeBSD.org> <30f529c1-6087-e704-8cc7-0c48a40b7430@FreeBSD.org> From: Martin Matuska Subject: Re: OpenZFS branch tracking policy Message-ID: <9679ec9d-4916-92b7-ff70-0050d699875c@FreeBSD.org> Date: Sun, 11 Apr 2021 01:03:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Rspamd-Queue-Id: 4FHrC92x32z4XWx X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE] Content-Type: text/plain; charset=utf-8; format=flowed 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: Sat, 10 Apr 2021 23:03:34 -0000 Thank you for your comments, Warner. What I would like to know is the timing - how much time do we need to=20 resolve the issues. I can pull in the OpenZFS code up to commit=20 3522f57b6 the "old" way. This is the last commit common to master and=20 zfs-2.1-release and can be cherry-picked to stable/13 the "old" way.=20 This will keep our code on par with openzfs-2.1-rc1 (rc2 is out now) and = I can add a 2-week MFC for stable/13 as usual but there are no=20 significant changes at all. After that we need to split main and=20 stable/13 and ideally move to direct tracking of OpenZFS. I have added some comments below. On 10. 4. 2021 21:22, Warner Losh wrote: > Thanks for the update Martin. > > The tl;dr is I think this will be fine. However, I'd like to document=20 > the reasoning here for future cases that we may need to judge. There's = > also a couple of logistical issues at the end we need to address, one=20 > critical. > > On Sat, Apr 10, 2021 at 11:15 AM Martin Matuska > wrote: > > Here are some of the facts: > > - In my merge, there are 15 conflicting files due to changes in > FreeBSD (add/add) > - Some of the changes have already been upstreamed in later > revisions of openzfs than 891568c99 > - A significant majority of the diffs is subject for upstreaming. > The ideal state would be to have all changes upstreamed. Sometimes > changes get upstreamed with modifications. > - In general our developers open pull requests and commit to > OpenZFS, then we merge the changes > > What our developers would like is to use a "git blame" on > sys/contrib/openzfs/something to see the history path from OpenZFS.= > > I agree that the merge commits should be more verbose, ideally > containing a "git log --oneline" of the commits since last merge. > > If a do a "squashed" merge like you described with bzip2, then I > do not import the history from OpenZFS. That way we don't need > that at all and can continue working the way we did until now. > > What you say about adding "unnecessary" history - since the common > development at OpenZFS the majority of commits directly affects > FreeBSD. Only "Linux-Only" and "CI-related" commits are not > relevant for FreeBSD. > > I have updated my example branch how it may look like with more > detailed commit messages, nicely clickable from github: > https://github.com/mmatuska/freebsd-src/tree/openzfs_master_merged > > > So the the current question is quite simple, we can do one of the > following: > a) do the unsquashed merge I suggest that imports the openzfs > history - this will make the commits very transparent, future > merges and upstream tracking very easy and > --allow-unrelated-history flag is not required anymore. The > "common" part of the histories in main and stable/13 will be > identical. > b) if that is not desired or we are undecided I will continue the > way we go now until a better solution is found. In that case I > will fork a second vendor branch (vendor/openzfs-2.1) that starts > with the latest common commit of openzfs/master and > openzfs/zfs-2.1-release and will merge (or cherry-pick?) from this > branch directly to stable/13. As an alternative to merging, git > cherry-pick supports -Xsubtree=3D as well. > > I'm leading towards 'a', but that's a new way for the project to track = > vendor changes. Many of my comments were on how to mirror pulling in=20 > upstreams that we would want to do infrequently, and where we didn't=20 > care about the details so much. llvm is a good example, as would be=20 > bzip, though for different reasons. The former more due to the sheer=20 > size of the llvm repo and the extremely infrequent need for users and=20 > developers of FreeBSD to peer into the details. They simply are=20 > relevant for those cases. For these cases, a squashed commit makes=20 > sense: people don't care about the details and it keeps our repo size=20 > manageable and 'b' is appropriate. I had initially thought OpenZFS=20 > would fall into this category, but your additional details suggest=20 > that my initial thinking might be a poor fit to our needs. I agree to your opinion here. The other project I maintain, libarchive,=20 is another example for the 'b' approach. Imports are infrequent and=20 FreeBSD is primarily a "downstream consumer" of libarchive even if there = is some code dedicated privately to FreeBSD. As of OpenZFS, there is=20 much more dedicated code, we are interested in more frequent pulls and=20 several of our developers are directly involved in the project=20 developing both "common" and "FreeBSD-related" code. What I especially=20 like about the OpenZFS project are the high development standards. > > I think that you've made a compelling case to merge in the tree. The=20 > potential downsides=C2=A0need to be looked at for doing something new. = > First is size. From the numbers you provided, OpenZFS is on the larger = > side of things we'd want to do this with. The expansion of the repo is = > concerning, so there would need to be some benefit from that. Here,=20 > you've clearly articulated the benefit: our OpenZFS developers drift=20 > back and forth between OpenZFS and FreeBSD and do development=C2=A0in b= oth=20 > places. If these merges are frequent, this allows a more efficient=20 > workflow for OpenZFS maintenance. This also allows better bisecting in = > the case of trouble. One reason we don't generally want to open things = > up to merge commits is the crazy merges we did with svn that created=20 > weird loops.=C2=A0 While the git transition work endeavored=C2=A0to eli= minate=20 > them, a number slipped through. We do not want any more of them=20 > created. By that test, these commits pose no risk given then OpenZFS=20 > practices (and little risk outside the contrib/openzfs tree). Are such (messy) situations even possible in git? > > So, the practical aspects of this: how do we do this.=C2=A0We'll need t= o=20 > have the OpenZFS mainline and branches in the tree, so the question of = > what namespace to put them into comes to mind. The obvious answer=20 > would be 'openzfs' or 'vendor/openzfs' comes to mind, but you want two = > branches, so maybe vendor/openzfs/main (or master, whatever it is=20 > called upstream) and vendor/openzfs/ would be better=20 > since we could then recommend a 'refs' line for people working on=20 > openzfs that would let git do all the heavy lifting here. There's no=20 > issue with having both vendor/openzfs and vendor/openzfs/ in the=20 > tree at the same time, I don't think. The current rule sets would=20 > allow this, and you could carefully push both the branches first. I=20 > don't think we need to do anything special except document how to do=20 > the first commit (for others who need to do this) and document how to=20 > update which I'm more than happy to help out with. I would be happy with vendor/openzfs/master and=20 vendor/openzfs/zfs-2.1-release to use the same naming as OpenZFS does. > > One critical thing we need to assess=C2=A0before you proceed, however: = > mail. We need to make sure we're not about to send 7k emails as all=20 > these revisions suddenly appear in the repo... While having an extra=20 > 7k revs in the repo will be no problem, but 7k extra emails might=20 > raise a comment or two... Is there a way to simulate this? > > Comments? > > Warner > > Best regards, > mm > > On 10. 4. 2021 0:15, Warner Losh wrote: >> >> >> On Fri, Apr 2, 2021 at 6:44 PM Martin Matuska > > wrote: >> >> I have prepared an example merged branch here: >> https://github.com/mmatuska/freebsd-src/tree/openzfs_master_me= rged >> >> >> The magical command was: >> git merge -s subtree -Xsubtree=3D"sys/contrib/openzfs" 891568c= 99 >> --allow-unrelated-histories >> >> Luckily, our current diff is manageable. >> >> >> So I did this for bzip2 using approximately: >> >> git add remove bzip2 >> git fetch bzip2 >> git merge -s subtree -Xsubtree=3Dcontrib/bzip2 bzip2/master >> --allow-unrelated-histories --squash >> >> [1] At this point I resolved conflicts, where were the entire >> files since I guess I didn't bootstrap right to the last merge. >> There were 4 files in conflict. >> >> Then I did a git add of all the files in conflict and a git commit= =2E >> >> This produced a good commit. since it was a squash commit, there >> were no issues. >> >> However, it turns out I botched the commit at point [1] above. So >> I ran this again and got a conflict for the whole file that I'd >> removed a blank line from. >> >> So, this looks like it could be workable, but does lead me to a >> few questions: >> >> (1) How do we do this so that the conflicts aren't add/add >> conflicts? Is there some way to bootstrap this? >> (2) Do we need to keep track of the last merge point and use that >> in merging the next one in? >> (3) I assume we keep track of FreeBSD diffs in a branch off >> and we merge that instead of master. >> (4) What do we do about adjustments to the build that are needed? >> (5) Do we need to host a FreeBSD-specific repo with this stuff, >> maybe with tags we don't want widely pushed to ease the next >> merge? Eg, make this the first case of a 'vendor repo' that we >> then pull squash commits from so that the vendor repo can track >> upstream, but not otherwise be pushed to all our users.... >> >> Finally, how did you deal with [1] producing so many full-file >> add/add conflicts? Oh, and what kind of commit message when >> things merge do you suggest? I rather like your 'bring in hash >> XXXX branch blah, here's the important highlights' emails and >> think that would be a good first cut at advice on what to put in >> these. >> >> This suggests the current answer is 'seems doable, but we need to >> document it and come up with recommendations for how to do it'. >> >> Warner >> >> On 3. 4. 2021 1:37, Martin Matuska wrote: >> > Hi Warner and Ed, >> > >> > 2.1-release has already been branched. The stable branch >> policy in >> > OpenZFS is somewhat strange, they make a staging branch for >> each >> > patchlevel release, but the commits are continuous. >> > >> > To have some idea how big the repo history is: >> > >> > $ git rev-list master --count >> > 6662 >> > >> > $ git rev-list zfs-2.1-release --count >> > 6650 >> > >> > master and zfs-2.1-release have 6650 common commits at the=C2= =A0 >> moment >> > >> > $ git log master | wc -l >> > 129868 >> > >> > (linecount - 4 * revcount) / revcount =3D linecount / >> revcount - 4 =3D >> > 15,4938 comment lines per commit on average >> > >> > Initial commit was made in Feb 26, 2008. >> > >> > Yearly commit counts: >> > >> > $ git log master | grep -c -E '^Date:.* 2020 -[0-9]+$' >> > 666 >> > >> > $ git log master | grep -c -E '^Date:.* 2019 -[0-9]+$' >> > 535 >> > >> > $git log master | grep -c -E '^Date:.* 2018 -[0-9]+$' >> > 428 >> > >> > Martin >> > >> > On 2. 4. 2021 20:15, Warner Losh wrote: >> >> >> >> >> >> On Fri, Apr 2, 2021 at 11:56 AM Ed Maste >> >> >> >> >> wrote: >> >> >> >> =C2=A0=C2=A0=C2=A0 On Fri, 2 Apr 2021 at 11:50, Warner Losh= >> >> >> =C2=A0=C2=A0=C2=A0 >> wrote: >> >> =C2=A0=C2=A0=C2=A0 > >> >> =C2=A0=C2=A0=C2=A0 > We'd always hoped that we'd be able to= do subtree >> merges from >> >> =C2=A0=C2=A0=C2=A0 upstreams >> >> =C2=A0=C2=A0=C2=A0 > that use git into FreeBSD. The big wor= ry, though, >> was that this >> >> =C2=A0=C2=A0=C2=A0 would >> >> =C2=A0=C2=A0=C2=A0 > needless bloat the repo with a lot of = history. We >> don't want, >> >> =C2=A0=C2=A0=C2=A0 for example, >> >> =C2=A0=C2=A0=C2=A0 > all of LLVM's history in the tree. We'= d always >> anticipated that >> >> =C2=A0=C2=A0=C2=A0 there'd be >> >> =C2=A0=C2=A0=C2=A0 > some things we'd just accept the histo= ry for, since >> it is >> >> similar in >> >> =C2=A0=C2=A0=C2=A0 > character to the vendor branches (thou= gh of course a >> bit more). >> >> >> >> =C2=A0=C2=A0=C2=A0 Note that if we do want to avoid bringin= g in the full >> history `git >> >> =C2=A0=C2=A0=C2=A0 subtree merge` supports a `--squash` opt= ion. This >> brings in the >> >> set of >> >> =C2=A0=C2=A0=C2=A0 upstream changes as a single commit, wit= hout bringing >> along the >> >> =C2=A0=C2=A0=C2=A0 associated history. We will need to do m= ore >> experimentation to >> >> confirm >> >> =C2=A0=C2=A0=C2=A0 that the full process, including bootstr= apping, will >> work as we >> >> want. >> >> =C2=A0=C2=A0=C2=A0 Assuming this all works it should allow = us to forgo >> the use of a >> >> =C2=A0=C2=A0=C2=A0 FreeBSD-specific vendor branch in src. >> >> >> >> =C2=A0=C2=A0=C2=A0 We've discussed mirroring any such 3rd-p= arty source in >> some >> >> =C2=A0=C2=A0=C2=A0 FreeBSD-controlled repository. This woul= d allow the >> project to >> >> retain >> >> =C2=A0=C2=A0=C2=A0 a full copy of the history, but avoid bl= oating src >> with it. >> >> >> >> =C2=A0=C2=A0=C2=A0 I agree with Warner that we may want a d= ifferent >> policy (full >> >> history >> >> =C2=A0=C2=A0=C2=A0 or snapshots) for different contrib sour= ces. >> >> >> >> >> >> Good points Ed. I'd forgotten about --squash. >> >> >> >> Martin, what's your timeline for wanting to implement >> these things? >> >> I'm unfamiliar with the OpenZFS schedules. >> >> >> >> Warner >> > _______________________________________________ >> > freebsd-git@freebsd.org >> mailing list >> > https://lists.freebsd.org/mailman/listinfo/freebsd-git >> >> > To unsubscribe, send any mail to >> "freebsd-git-unsubscribe@freebsd.org >> " >>