From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Payas Relekar Newsgroups: gmane.emacs.devel Subject: Re: Progress on merging Eglot? Date: Mon, 19 Sep 2022 10:12:34 +0530 Message-ID: References: <8735d1ajxb.fsf@gmail.com> <874jxhaizf.fsf@gmail.com> <87zgf993py.fsf@gmail.com> <87fsgod4ee.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="18290"; mail-complaints-to="usenet@ciao.gmane.io" Cc: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Sep 19 13:33:42 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 1oaF1x-0004bo-Pr for ged-emacs-devel@m.gmane-mx.org; Mon, 19 Sep 2022 13:33:41 +0200 Original-Received: from localhost ([::1]:35400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaF1w-000157-Of for ged-emacs-devel@m.gmane-mx.org; Mon, 19 Sep 2022 07:33:40 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oa8cB-00086s-23 for emacs-devel@gnu.org; Mon, 19 Sep 2022 00:42:39 -0400 Original-Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:41552) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oa8c9-0000ap-8H for emacs-devel@gnu.org; Mon, 19 Sep 2022 00:42:38 -0400 Original-Received: by mail-wr1-x42f.google.com with SMTP id t14so45617053wrx.8 for ; Sun, 18 Sep 2022 21:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:from:to:cc:subject:date; bh=lAHTm3+7kp3w0cfOL14G4dMdUTNvW6/Hg9zQE4AD740=; b=NngamRTMN28EeFiNlqZHtqJBXqJwOD/msg5n7OsmUl0hekkbgyl8YivTPgGQ73XRhf 4iH7Aggvac+cDyrVzws5Pe9CNgFYTjQShEhQ94fOVN1M35Qhm2+hZwT/xp9mcZZ9Gyql xHNKuMdp3/dGgyc1xERTcmRqtkzNahYgPFxOzDp1oDXcTrMHrUVv3bowRruisJZr30Wg zNdhAka3s6S0q8jyIXhiAIaMlraikQfAAsyu8PergD3sBeaTv0i/3kO//9uSJzqBvudV g/4KY80OL2/u0VCGajnyHnNFbD1vgeJJJwrADLuvd41u7YkDqhexnFlbHBZH04NJNmjS Nl3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:x-gm-message-state:from:to:cc :subject:date; bh=lAHTm3+7kp3w0cfOL14G4dMdUTNvW6/Hg9zQE4AD740=; b=hh/0KJp81YIB3pZz9j9T6tcF2yj+Qdy7FXAdk7U1Gj1vhDENV/8j9yPRua739qSOFL DND8C8663Yu89nz8fMummZOBpRFo4qS97FjZYFVgUvl3h/iGHWynb9CGoSuNJEl4XrJ1 wiPmK+bDJPaDyHGe2PGE4InBuGaLyHy1DV7nuGOUqfSBjOK5/J7I9F0JMDxOW4vBsULD cSJqAIlrAj7P0foZcvx+ew3lAKgPl1JnmOjdsX6Eu/QTrdiB+b+O6/qWxAbrxQE6/HYi wRUmiqkbBjqgTUqPn84mCE7DaoSdWZSbjH7+o+hAIUZFgjwVJkaF8Dqpij4t3LpGzJTI dM6g== X-Gm-Message-State: ACrzQf3GspA3wTuHPQVcbXTe91+RvYTmTUZmaBBeYBvd4qD10lPVccuX r8kEKrqhCIxFbL+OvlZRdAWwR79Z/hvFN3DVUMs= X-Google-Smtp-Source: AMsMyM4Tahp4B88Z4JnXObdbsXPjFNklZGmYoTp/O3Vy9/E5pAERPNWk+bEOg7owY+PKhd6BtM9yeYMK7UE0+5rriXw= X-Received: by 2002:a5d:4b84:0:b0:228:7e07:115e with SMTP id b4-20020a5d4b84000000b002287e07115emr9439592wrt.168.1663562555025; Sun, 18 Sep 2022 21:42:35 -0700 (PDT) Original-Received: by 2002:a05:6000:2cb:0:0:0:0 with HTTP; Sun, 18 Sep 2022 21:42:34 -0700 (PDT) In-Reply-To: Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=relekarpayas@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 19 Sep 2022 07:30:43 -0400 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:295665 Archived-At: Another way I can think of is to keep #nums where they are right now, but add their respective links in the message body below. e.g. Fixes #234,#456 this fixes two issues Becomes =3D> Fixes #234,#456 this fixes two issues #234: https://github.com/joaotavora/eglot/234 #456: https://github.com/joaotavora/eglot/456 Inputs welcome, since this is not 100% convenient, but much simpler to implement, with minimal to none manual readjustment needed. Thanks, Payas On 9/19/22, Payas Relekar wrote: > Thank you! Indeed moving to subdirectory makes history apply to > correct file and shows up as expected. Was also quite straightforward > with git-filter-repo, so here's the updates: > > Updates gist: > https://gist.github.com/bhankas/422c34db2e987d4dc3f243e26ba156a3 > > Updated repo: > https://github.com/bhankas/emacs > > Updated history: > https://github.com/bhankas/emacs/commits/master/lisp/progmodes/eglot.el > > Now the only remaining issue is commit length. Can someone please > advice on how we can go about it? My brute force thinking is to simply > add newline where length exceeds, delimited at word boundary, but > obviously that's not good enough nor covers sufficient edge cases. > Perhaps a Python/Perl wizard has a one/two liner to take that pain > away? > > Thanks, > Payas > > On Mon, 19 Sep, 2022, 08:08 Stefan Monnier, > wrote: >> >> > # filter eglot with only eglot.el and find+replace # in commit message= s >> > git filter-repo --path eglot.el --message-callback ' >> >=C2=A0 =C2=A0 =C2=A0 =C2=A0return re.sub(b" #", b" >> > https://github.com/joaotavora/eglot/issues/", message) >> >=C2=A0 =C2=A0 =C2=A0 =C2=A0return re.sub(b",#", >> > b",https://github.com/joaotavora/eglot/issues/", message) >> >=C2=A0 =C2=A0 =C2=A0 =C2=A0return re.sub(b"(#", >> > b"(https://github.com/joaotavora/eglot/issues/", message) >> >=C2=A0 =C2=A0 =C2=A0 =C2=A0return re.sub(b"Fix#", b"Fix: >> > https://github.com/joaotavora/eglot/issues/", message) >> >=C2=A0 =C2=A0 =C2=A0 =C2=A0return re.sub(b"github#", b"Github: >> > https://github.com/joaotavora/eglot/issues/", message) >> >> I suspect you can get a slightly better result if you tweak this filter >> script so as to rename `eglot.el` to `lisp/progmodes/eglot.el` in each >> commit. >> >> Then you can also skip the `git read-tree`. >> >> >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 Stefan >> >