From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: Progress on merging Eglot? Date: Thu, 08 Sep 2022 13:55:11 +0000 Message-ID: <87tu5i55ts.fsf@posteo.net> References: <87tu5ihwp0.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4714"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Payas Relekar , emacs-devel@gnu.org To: =?utf-8?B?Sm/Do28gVMOhdm9yYQ==?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Sep 08 16:05:58 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oWIAI-000145-Lq for ged-emacs-devel@m.gmane-mx.org; Thu, 08 Sep 2022 16:05:58 +0200 Original-Received: from localhost ([::1]:59118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWIAH-0004Ez-K3 for ged-emacs-devel@m.gmane-mx.org; Thu, 08 Sep 2022 10:05:57 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWI0Y-0000Cx-TE for emacs-devel@gnu.org; Thu, 08 Sep 2022 09:55:56 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:40399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWI0S-0007br-L3 for emacs-devel@gnu.org; Thu, 08 Sep 2022 09:55:54 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id BA35E240107 for ; Thu, 8 Sep 2022 15:55:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1662645314; bh=7H07Hqc079NTBOvX6mxOdyoYlJ5tRClnmAXwgH0Mzlg=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=iLNy499DIjpsj2NEfGKendCF53m1iNZGabv5+eU6AcjtWtNNHiI3rCoxhrlIJmxEv xl7D8ovqZ3uO10E6H3iLZbWzt2ef3YUs6ltVnNcgEi03L6iwDIUovJogc0001GJKlN tU+IzPeIjAj3ZX5mjjnU7C8mi1pEOFpumRGFepV+FFNOSRSYpsYNdx7ixzVW5QvFhf dPQ4kaOtWwgaACVBZbgDzwszRldJNOcEm+RwNvFKRwhW+1GNuTuiTZ4kyDfY83cSzt 2MaC4aLuVAbv9DjYpdW6+lFPEEO00/m3h1o77zYw85Jn0ZVm6DLnsSJFkjjc+I6JxM hp8s8okX+f7IA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MNgcH4yFkz6tmX; Thu, 8 Sep 2022 15:55:11 +0200 (CEST) In-Reply-To: (=?utf-8?Q?=22Jo=C3=A3o_T=C3=A1vora=22's?= message of "Thu, 8 Sep 2022 14:09:32 +0100") Autocrypt: addr=philipk@posteo.net; prefer-encrypt=nopreference; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB Received-SPF: pass client-ip=185.67.36.66; envelope-from=philipk@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:294961 Archived-At: Jo=C3=A3o T=C3=A1vora writes: > On Thu, Sep 8, 2022 at 1:34 PM Payas Relekar wro= te: > >> I remember reading a discussion on possibly merging Eglot (language >> server client) to Emacs core. I also distinctly remember author wished >> to hack on it in the core after merging. >> >> Since it is already on ELPA, are there any more blockers to merge it? > > > Hi, > > The only blocker -- as far as I am aware -- is the amount of time I have > to dedicate to this. > > A sequence of concrete actions needs to be laid down to reach these > objectives: [...] > 2. Preserve the full Git history of the eglot.el file after it has been > merged. [...] > 5. Arrange for the eglot.el file in Eglot's current upstream -- > https://github.com/joaotavora/eglot -- to mirror > src/progmodes/eglot.el, ideally (but not necessarily) automatically > > This is so that: > > 5.1 Users of bare Git clones can continue mostly unimpeded. > > 5.2 GitHub users can still suggest changes as "Pull Requests" > via GitHub's interface > > 5.3 The current GitHub actions CI -- where installation of third-party > language servers is relatively easy -- can run at least the current > eglot-tests.el. [...] > Items 2 and 5 are the ones I'm not 100% sure on how to make > happen. But I'm pretty sure they are possible given sufficient Git > skills. It might be possible to add Eglot's history as a branch, then move elgot.el to the right position and merge the branches. Another approach could be to "rebase" Eglot's repository with artificial commits that match those in the actual repository. In either case, the main problem is that the (908) commits in the repository don't appear to be in the conventional changelog format, and I don't think there is an easy way to automatically fix that.