From owner-dev-commits-src-all@freebsd.org Tue Apr 20 15:19:51 2021 Return-Path: Delivered-To: dev-commits-src-all@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 F226B5DAFB1; Tue, 20 Apr 2021 15:19:51 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPnRW27Ldz4rtm; Tue, 20 Apr 2021 15:19:50 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk1-x731.google.com with SMTP id z2so2680594qkb.9; Tue, 20 Apr 2021 08:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=qUSs71Gmi388ciFd3Hzs+kKYVnzXBAiZFpJYEyLnp8Q=; b=I6GZm8VX9SByhk/Q+2+CreoEExUsrzGI2I0WXwV9Ooj1X2RCR/rHeujHVx/a/6Y22v 9p919QkGvmIB363QAg1U2qw++8xe1AZ/i93NeLKhe9jCa4Hqtf37NTxXtmOlNP3Ye6uU pHLka8jMSpe9XuIBFjbGamh74QrFcoXWZ9osy6lGHv2Pj71XUlW7+6KB9/8ZCujv8t0o sI/K+GRlyISa3fkneHMo509fshydntvjHQAxe2bcXbMEQ2JD7lbO/fJiWn0nDygr+UXH DQ2Ev802ccLxRnZKbK3a3y3ai+Yyh2Jodo1Gv66y9x9fajOmAfFcjXZ1hu4GUBxpMbm2 1usw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=qUSs71Gmi388ciFd3Hzs+kKYVnzXBAiZFpJYEyLnp8Q=; b=AcG8z4RspMI/4lBAcr01MBAxiMsO8olg92PR1DNFBNRPQE5cvM38aYJd6yAIC1Na5J YkPrru3oxluuJz1P6F5NoFsoGFA81oNcYGxl70p5WdKxq5NYnaldDcQsG6w/92FdLW7E SLrMkvZQpkQIqFqoh69Gl3yW/pTqe7/sDgMa1guudicqRc2xWf63v9g+JZCLBOfT2EHK 9neMZiPSkHvBiOwMIBw67g4S5vS5XMyXZOn4kk2gk+qrsBox98MaujgXmkcTXjdElLA6 cjRZXv0pE5SCxXHzDMpaq86rTMOw3lX6xulLVrWoBuK+H2YXQnbHnycGAU7IBdVNOkDf s+Gg== X-Gm-Message-State: AOAM530bw7r2yM0fWlT7TzeFZeIRGFH8rmr7lFqf35bHT3FQYSm2TxuA H5fewxg/59pt0e5FOBOlPvw= X-Google-Smtp-Source: ABdhPJxuI2ZfRsCRrsksV67k+navDX5KrFshsZP2NMo2FSZj9iBK38Ae6KZSiIyWTsOn/5LsT0V9Jg== X-Received: by 2002:a37:7043:: with SMTP id l64mr17730500qkc.358.1618931990202; Tue, 20 Apr 2021 08:19:50 -0700 (PDT) Received: from nuc ([142.126.164.150]) by smtp.gmail.com with ESMTPSA id x85sm8233556qkb.44.2021.04.20.08.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 08:19:49 -0700 (PDT) Sender: Mark Johnston Date: Tue, 20 Apr 2021 11:19:50 -0400 From: Mark Johnston To: Warner Losh Cc: John Baldwin , Alex Richardson , src-committers , "" , dev-commits-src-main@freebsd.org Subject: Re: git: 73c14cc76b5f - main - Remove history.immutable from .arcconfig Message-ID: References: <202104131138.13DBcgrt085662@gitrepo.freebsd.org> <9e0d4574-bcad-b24c-78ad-c172d6d2c221@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FPnRW27Ldz4rtm X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=I6GZm8VX; dmarc=none; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::731 as permitted sender) smtp.mailfrom=markjdb@gmail.com X-Spamd-Result: default: False [-2.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::731:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::731:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::731:from]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 15:19:52 -0000 On Tue, Apr 13, 2021 at 01:53:07PM -0600, Warner Losh wrote: > On Tue, Apr 13, 2021 at 9:23 AM John Baldwin wrote: > > > On 4/13/21 4:38 AM, Alex Richardson wrote: > > > The branch main has been updated by arichardson: > > > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=73c14cc76b5f815c6b1bd93089ebafdd9269d343 > > > > > > commit 73c14cc76b5f815c6b1bd93089ebafdd9269d343 > > > Author: Alex Richardson > > > AuthorDate: 2021-04-13 11:36:24 +0000 > > > Commit: Alex Richardson > > > CommitDate: 2021-04-13 11:36:25 +0000 > > > > > > Remove history.immutable from .arcconfig > > > > > > The `history.immutable` setting prevents arcanist from updating > > > the commit messages with the Differential URL and therefore > > > makes updating patches awkward with a rebase workflow. > > > > > > In case this new behaviour is not wanted the old one can be restored > > > by running `arc set-config --local history.immutable true`. > > > > > > Test Plan: `arc diff --create HEAD^` adds the metadata now. > > > > > > Reviewed By: #phabric-admin, imp, lwhsu > > > Differential Revision: https://reviews.freebsd.org/D27971 > > > > FYI, this might break git arc since arc will now start rewriting commits > > rather than leaving them alone. Empirically, arc does not do this when git-arc is used. One of the options passed to arc diff --create apparently inhibits that behaviour, though I'm having trouble figuring out exactly why from reading the arcanist sources. > > If so, we can look use 'arc diff' > > with --head to turn off some of its magic. It would also avoid having > > 'git arc' have to adjust the working copy. > > > > I'd honestly rather have 'git arc create' stamp this in from the git go. > I really dislike having it not there until just before I go to commit. This is pretty easy to do if the commit is currently checked out. The question is what we should do when uploading a series of patches. Rewriting history would make child branches stale, so one would have to go through them and manually rebase --onto the rewritten branch. I'm not sure if this is a problem for most developers. In general it seems there is a preference for rewriting history to add reviewers and differential revision tags over the current approach, which avoids rewriting history.