From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Eglot to core [Was: rmsbolt.el [Was: Colorful line numbers]] Date: Sat, 23 Jul 2022 13:52:12 -0400 Message-ID: References: <87leslpow2.fsf@gmail.com> <83ilnpl8e0.fsf@gnu.org> <874jz9peq0.fsf@gmail.com> <837d45l6ge.fsf@gnu.org> <87zgh1nyo6.fsf@gmail.com> <831qudl1k3.fsf@gnu.org> <87v8rpntiv.fsf@gmail.com> <83sfmtjjy8.fsf@gnu.org> <87fsitnpxd.fsf@gmail.com> <83k085jgxr.fsf@gnu.org> <87tu77vq1a.fsf@eve> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39959"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Stefan Kangas , Eli Zaretskii , emacs-devel To: =?windows-1252?B?Sm/jbyBU4XZvcmE=?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Jul 23 19:53:10 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 1oFJJN-000ACf-Er for ged-emacs-devel@m.gmane-mx.org; Sat, 23 Jul 2022 19:53:09 +0200 Original-Received: from localhost ([::1]:49256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFJJL-0008KJ-Sr for ged-emacs-devel@m.gmane-mx.org; Sat, 23 Jul 2022 13:53:07 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFJIc-0007e5-Jc for emacs-devel@gnu.org; Sat, 23 Jul 2022 13:52:22 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:17247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFJIZ-0004AQ-9W; Sat, 23 Jul 2022 13:52:20 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 6F3658005E; Sat, 23 Jul 2022 13:52:16 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id D69958054F; Sat, 23 Jul 2022 13:52:14 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1658598734; bh=S/nN/GbuoftEh0vC51q/iPua8a2q6uhA1LpphfSQI+E=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=CD1RBfbVTx1hcNkaD6yuUMLFC6ke1XQ1oD/1O0JpPFZdrwDbPZfTVJvCEWRYAFonz QT5+W7ckZaybISF39VX/QSWfkeq9cbmKjfvyTJSHumAYu+6VUz92VvV2C2Wl9D+b/4 QLI1rUAVmLssRxtkewmq7Rkxs/9K5CaTnbK4iQlILY7n8NmXNohtHN+oUWgEp5ZBAN eiTGV8xyNA40ai9+BrEboUkTknpKiE/Drs3/5q4tbKdn1P3SqQIeXKzmLgTv7COINc fMWsq+err4/dl9e5RjeWG9/qOsTFmlcL/HOU1RgzvBw2eYFiuDYQgLBNXOKozhAXkc DtF8T3n3N2+hQ== Original-Received: from pastel (unknown [45.72.195.111]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 7B6421203D4; Sat, 23 Jul 2022 13:52:14 -0400 (EDT) In-Reply-To: (=?windows-1252?Q?=22Jo=E3o_T=E1vora=22's?= message of "Sat, 23 Jul 2022 18:34:40 +0100") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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:292549 Archived-At: >> (which also means the upstream should *not* force push >> even if the last push was "just a few minutes ago so surely noone will >> notice") and a new release is made whenever the `Version:` header > > Dang, I shamefully confess I did exactly that some weeks ago to Eglot > (with seconds instead of minutes). But last I checked Eglot was still in > the push-to-ELPA model, right? Nope. > Sorry if I caused any trouble, % make fetch/eglot emacs --no-site-lisp --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "eglot" Fetching updates for eglot... Upstream of eglot has DIVERGED! Local changes: c558fd6a24 43703153+ssnno.. Fix #965: Update link for Fortran language server fortls e0c08e7f68 47760695+jgart.. Close #961: Add support for jedi-language-server Upstream changes: 29690e88e3 joaotavora@gma.. Always default eglot-strict-mode to nil c962f6e5f6 joaotavora@gma.. Rework table of contents in README.md again a62a388021 joaotavora@gma.. Fix README.md typos and rework section about Workspace configuration eed9a65515 joaotavora@gma.. Fix embarrassing paren-matching blunder in eglot.el a2d9e18945 joaotavora@gma.. Reply more reasonably to server's workspace/applyEdit 87e6de3cdf joaotavora@gma.. Appease byte-compiler warnings about wrong use of quotes 1db95974a7 joaotavora@gma.. Per #967: eglot-workspace-configuration can be a function 33c464f658 joaotavora@gma.. Per #131, #314: Be more conservative with the LSP identifier guess f62b641b5c joaotavora@gma.. Per #131, #314: Guess the "LSP identifier at point" 25f6338741 joaotavora@gma.. Per #131: Tweak some details, fix some bugs c64fe76e86 joaotavora@gma.. Per #131: Cosmetic decisions guaranteed to tick off someone somewhere (tm) ae7261c1fe joaotavora@gma.. Per #131: Experiment with grouping in xref-backend-identifier-completion-table 2f71de72e3 joaotavora@gma.. Fix #131: Make C-u M-. work half decently % So, yes, `eglot` in GNU ELPA is now stuck and you'll have to merge `c558fd6a24` back into your upstream repo before it will start tracking it again :-( > Speaking of that, I'd like to get started with this sometime soon (maybe > August, around the corner). I wonder if you know any Git technique that > allows me to keep the history, at least of eglot.el so that is merged with > Emacs's own history. There was some `git subtree` command to do this > right? As a one-time thing it's pretty easy. You don't really need `git subtree` for that. Just do something like: git merge --no-commit --allow-unrelated-histories .../eglot git mv eglot.el lisp/ ... git commit Keeping it up if you keep hacking on the upstream is IMO an unsolved problem (there are various hacks you can use, but they all suck one way or another). Stefan