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: Sun, 18 Sep 2022 22:25:40 +0530 Message-ID: <87bkrcd3k1.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="30037"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.8.9; emacs 29.0.50 To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Sep 18 18:59:54 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 1oZxe6-0007fn-QH for ged-emacs-devel@m.gmane-mx.org; Sun, 18 Sep 2022 18:59:54 +0200 Original-Received: from localhost ([::1]:38982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZxe5-0002Tz-Dz for ged-emacs-devel@m.gmane-mx.org; Sun, 18 Sep 2022 12:59:53 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZxay-0001LX-Sb for emacs-devel@gnu.org; Sun, 18 Sep 2022 12:56:40 -0400 Original-Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]:46898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZxav-00083G-Tj for emacs-devel@gnu.org; Sun, 18 Sep 2022 12:56:39 -0400 Original-Received: by mail-pj1-x1034.google.com with SMTP id j6-20020a17090a694600b00200bba67dadso3998667pjm.5 for ; Sun, 18 Sep 2022 09:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:user-agent:from:to:cc:subject:date; bh=RGdkAXY2xJ78DBm89UL0pXt4l6G5qY4P7h2asgXKuJY=; b=LWxckoUDSm5+XOBmsHkdi35u7GQdNWeM1Jp/u/OOyNOG8PoAoSnfvJdogTXA+T1Fqm 90F8R0iocVtreRvaJA5DjvxXzROKhC9NHPRgCPs0UzDjhBWFul6bhryOCDHGMrkzbM96 KrErmDjgl5YrXVHtzqRrNYDfKA1ke2mVVuiVVjGD2JruuDg3FQnWdga20SCx86qPRM0U kyAlc3Td4RCaN1Nk2N0y/4aIH2pt7sPp2WwnOnd4RhHInMOObrW9EguyX4c+zCZBIwk1 Qs8nAOmyvxc50Y/X/kO3bUUhfBXxFW6MmSey3CQIAnp93RxIOnxGI8nDgtx/vufM+Hc+ Peyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:user-agent:x-gm-message-state:from:to:cc:subject:date; bh=RGdkAXY2xJ78DBm89UL0pXt4l6G5qY4P7h2asgXKuJY=; b=RxrGt5CnihlzDFpZj7O78+zEggW/H2/nKZ33LqMUz+GpSewLjJ+xLbg9ETcUpm4DfF W83NZsACsdZtqGdibBfTgousx0MwMG+MwYCSixf9qBNO+XJ0jlRdBPrCSjRRpwc6e+gb EaCfsVfWHrtL0oeoHYPb41Gh3qFXXI4NJ0JoMzdH7nnwzUcaPmdtL4LTGfmo9grJ2iaK cjifZZO7nHUvtPYCDSH3z0H297xpwMIkMX/J3o5pEoLZjkSfRuTltlarZ7Lpz82MCxEe +xaWLg1GaTQo3VxKwRzf5WNi1SI92DY9gsLZcmv1UFf6xUeUND3wVDsH6eh4/LjNhzIs Z9Fg== X-Gm-Message-State: ACrzQf1wPZeJLBT5+KzB+apO0Y4XJrdElxOlyhWbsTIdE0QtFZiTowQ3 /WPu+ZlzPzLXwrc4JeLAw/12l8gTHyU= X-Google-Smtp-Source: AMsMyM4FXr8Ery/ti0UpU+1cVs9iVrsetHVCEuit/XK43OIeAgCvdiKdsCHbsyjOCl67Au9iNZPIBQ== X-Received: by 2002:a17:902:f644:b0:172:b074:d1f5 with SMTP id m4-20020a170902f64400b00172b074d1f5mr9255003plg.29.1663520195006; Sun, 18 Sep 2022 09:56:35 -0700 (PDT) Original-Received: from localhost ([150.107.26.19]) by smtp.gmail.com with ESMTPSA id l2-20020a170902f68200b00176ca089a7csm18902722plg.165.2022.09.18.09.56.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Sep 2022 09:56:34 -0700 (PDT) Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=relekarpayas@gmail.com; helo=mail-pj1-x1034.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: Sun, 18 Sep 2022 12:58:47 -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:295588 Archived-At: Payas Relekar writes: A convenient gist for the steps, for those who'd like it that way: https://gist.github.com/bhankas/422c34db2e987d4dc3f243e26ba156a3 Thanks, Payas > Hello, > > A bit later than I expected, but $LIFE and all.. > > I made a naive attempt to get eglot.el into emacs with history (took too > long to call it QnD, but its definitely dirty). > > Here's the steps I followed: > > *** > # move to a directory where both repos can be cloned > cd ~/git > > # clone repos > git clone https://github.com/joaotavora/eglot.git > > git clone git clone -b master git://git.sv.gnu.org/emacs.git > > # filter eglot with only eglot.el and find+replace # in commit messages > git filter-repo --path eglot.el --message-callback ' > return re.sub(b" #", b" https://github.com/joaotavora/eglot/issues/= ", message) > return re.sub(b",#", b",https://github.com/joaotavora/eglot/issues/= ", message) > return re.sub(b"(#", b"(https://github.com/joaotavora/eglot/issues/= ", message) > return re.sub(b"Fix#", b"Fix: https://github.com/joaotavora/eglot/i= ssues/", message) > return re.sub(b"github#", b"Github: https://github.com/joaotavora/e= glot/issues/", message) > ' > > # back to emacs repo > cd ../emacs > > # add filtered eglot as upstream > git remote add eglot ../eglot/ > > git fetch eglot master > > # prepare emacs repo for merge > git merge remotes/eglot/master --allow-unrelated-histories --no-commit > > # reset eglot to initial commit > cd ../eglot && git reset --hard 4970e7e1b605510c665c52bc1ddd83bcd1e255d4 > > # merge by pushing eglot.el into lisp/progmodes/ > cd ../emacs && git read-tree --prefix=3Dlisp/progmodes/ -u eglot/master > > # make a commit > git commit -m "; Merge from joaotavora/eglot" > > # push eglot to latest > cd ../eglot && git reset --hard 2f9cf0dcfb2d37f45ec8b9ea65ac9063da033b70 > > # pull all eglot history to emacs > cd ../emacs && git pull -s subtree eglot master > --allow-unrelated-histories > *** > > This is the repo I pushed for you to see: > https://github.com/bhankas/emacs/commits/master > > There are couple of glaring issues with this: > > 1. commit message length is not validated, but can be part of 'git filter= -repo' script > 2. history does not show for eglot.el or lisp/progmodes, but only as part > of entire emacs repo > > I'm kinda unsure where to go from here, for #1 I can definitely use some > help, my bash skills are primitive at best. > > As for #2, I've tried quite a few solutions after scouring Google and > this seems to be the least bad. Another approach was to export patches > from our filtered eglot repo and apply them to particular file in emacs > repo, but that way leads to many many merge conflicts, that I am unsure > how to resolve automatically. I'll be happy to provide the patches to > anybody if it can help. > > Further help appreciated. > > Thanks, > Payas > > Payas Relekar writes: > >> Jo=C3=A3o T=C3=A1vora writes: >> I'd say focus just on keeping the history of eglot.el. The history of >>> eglot-tests.el would >>> be nice too, but nowhere as important as eglot.el. >>> >>> Don't worry about the other files. >>> >>> Jo=C3=A3o >> >> Very well. Thank you! >> >> Will get back once there is some progress. > > -- > > --