Date: Tue, 15 Dec 2020 14:15:18 -0800 From: John Baldwin <jhb@FreeBSD.org> To: Eitan Adler <eadler@freebsd.org> Cc: doc-committers@freebsd.org, dev-commits-doc-all@freebsd.org Subject: Re: git: 072b13ec97 - configure arcanist for the git world Message-ID: <983694ab-b822-90a7-72a9-1addd0ae7774@FreeBSD.org> In-Reply-To: <CAF6rxgkaGWrO1n0UyY0ddMWWyPLVgCvRUtX0ssGkrOMg4GCdbw@mail.gmail.com> References: <202012131652.0BDGqb5k033036@gitrepo.freebsd.org> <db90a653-4dcb-bd78-b93b-384e7cef6f4f@FreeBSD.org> <CAF6rxgkaGWrO1n0UyY0ddMWWyPLVgCvRUtX0ssGkrOMg4GCdbw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 12/15/20 12:39 AM, Eitan Adler wrote: > On Mon, 14 Dec 2020 at 11:07, John Baldwin <jhb@freebsd.org> wrote: >> >> On 12/13/20 8:52 AM, Eitan Adler wrote: >>> The branch main has been updated by eadler: >>> >>> URL: https://cgit.FreeBSD.org/doc/commit/?id=072b13ec97b32d91379f5c11e577d3509af00e18 >>> >>> commit 072b13ec97b32d91379f5c11e577d3509af00e18 >>> Author: Eitan Adler <eadler@FreeBSD.org> >>> AuthorDate: 2020-12-13 16:52:31 +0000 >>> Commit: Eitan Adler <eadler@FreeBSD.org> >>> CommitDate: 2020-12-13 16:52:31 +0000 >>> >>> configure arcanist for the git world >>> >>> Problem >>> >>> The documentation ("doc") repository has been converted to git but >>> arcanist does not yet understand how to interact with phabricator in >>> this world. >> >> The callsign is still needed for folks who make a private clone and do work >> in branches of that. For example, my workflow in src post-conversion will >> still consist of branches off of github.com/bsdjhb/*.git that are then >> pushed into arc and only pushed up to the actual upstream after review. > > This should not be required as long as you have the true origin as one > of the remotes. I _explicitly_ tested this case. If this isn't > working can you please run `arc which` on the broken case? Yes, but not everyone will have the upstream as a remote. If I'm a non-committer, I might clone the repository on GH or the like and work on a branch in my own clone and have that clone as my only remote when I then upload a diff via 'arc diff --create'. I don't really see the harm in having the repository explicit in the .arcconfig. >>> Solution >>> >>> - remove the callsign "D" which should be inferable from having one of >>> the cgit URLs as a remote >>> - remove "history.immutable" which was a workflow only required for >>> subversion >> >> I don't know that we want all of the arcanist-formatted data in our commit >> logs. Adding the DR URL automatically might be welcome, but I don't know >> that we want arcanist's format for Reviewers, Reviewed By, etc > > Agreed: though there are tradeoffs here. history.immutable=true has > several other implications which go against our workflow. Specifically > it will result in `arc land` using merge commits instead of squash > commits Please see > https://secure.phabricator.com/book/phabricator/article/arcanist_new_project/#history-mutability > for details. I've basically assumed we can't quite use 'arc land' due to the way it's commit log format. I won't belabor the point here but instead wait for the arch@ thread. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?983694ab-b822-90a7-72a9-1addd0ae7774>