From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Merging use-package before Emacs 29, hopefully Date: Thu, 24 Nov 2022 05:19:25 -0800 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="00000000000018a91c05ee374187" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38432"; mail-complaints-to="usenet@ciao.gmane.io" Cc: John Wiegley , Eli Zaretskii , Payas Relekar To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Nov 24 14:20:49 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 1oyC9p-0009Wd-1k for ged-emacs-devel@m.gmane-mx.org; Thu, 24 Nov 2022 14:20:49 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyC8w-0003Wz-Lp; Thu, 24 Nov 2022 08:19:54 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyC8s-0003TX-0K for emacs-devel@gnu.org; Thu, 24 Nov 2022 08:19:52 -0500 Original-Received: from mail-ot1-x32d.google.com ([2607:f8b0:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyC8p-0001yS-O2; Thu, 24 Nov 2022 08:19:49 -0500 Original-Received: by mail-ot1-x32d.google.com with SMTP id 46-20020a9d0631000000b00666823da25fso938164otn.0; Thu, 24 Nov 2022 05:19:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=KdPX/02WD6R1nGBcQSroTnLPCrwzGC74cxehTw18scA=; b=Lai649GlI9tzZmH4wIe7USHRRpdYrXZF6c0VSntcU982Ma0uQ3NFcYGYyi0zM37tnw t7TeJSUyBS8CzOHLGq5qmqp5TvuGw+CC5/Vcrb0N/XOxdWJx8eFmvc6SO+nQe/3Y6prp b9GD5h7l+yU/UpLZlsaeY6g3LR95TQ/L2F6Qo1fmSckANrluM2ilIjhb1oGpyNqQAzmZ gNSCoC6TGFVesErIBU7x+7mhJdwBg4KA/BgB20N9u0Uxgub+ubAxdGkk/WkjM9JajmHJ AhSZEDF3ZadcGd+UvezAIxbNl3v0re7Y5COIBVS2wNBsc5DrzrOJEcVcbaFRPBfsTcQe 0LAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KdPX/02WD6R1nGBcQSroTnLPCrwzGC74cxehTw18scA=; b=3z7kHB56rHbrCm7mNCMRLZjYY4cKJ3ZWq7LnlgQ9Y4jm0d0qQCPMCEqQWbykaSKbrd E1X/JyjLH8ceRpTdEvK+K0SDGKEkZmwDUyO5tIgUzccvAHa/jP2KtLmESqhtrZ16HXUx QhslcswXgpZiJmh84KVhKNO+dE42EZG8+HepvRBL1VQ+Cn4U4he076ropCQQf9CgjUmb RWSCInaiiVcYm0Q349nlC0SzAuIIiYkItR4GlFfc8xKIPK17u3NS5dWYFWeKnU6N+W46 r8eaMns0mDO6iKIrYyEK4CKh8zEm8uBYjtksXccqQVH+JMallVvoiRIA08weH706KpMm NyoA== X-Gm-Message-State: ANoB5pn8oe0ngsRS/C7BzxFV4SEMyNZwsfKcRfroNCRAoaTiqp5e8vff WaeKEOQguc5VTamDMiZks/TypHdogOjAUoR/T+R8/t01 X-Google-Smtp-Source: AA0mqf7WjbANy9U+f1QeO6bX1DcqgxUe5r8M/uecn3j5TzG110LZymyDP2wP/UO08iuO2VtBPnOnW5d3iIy3ElWJZus= X-Received: by 2002:a9d:5c81:0:b0:661:c48b:12db with SMTP id a1-20020a9d5c81000000b00661c48b12dbmr7937028oti.105.1669295966289; Thu, 24 Nov 2022 05:19:26 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Thu, 24 Nov 2022 05:19:25 -0800 X-Hashcash: 1:20:221124:relekarpayas@gmail.com::mFK5Iv7isqQ5zrLF:00hP Received-SPF: pass client-ip=2607:f8b0:4864:20::32d; envelope-from=stefankangas@gmail.com; helo=mail-ot1-x32d.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-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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:300437 Archived-At: --00000000000018a91c05ee374187 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Emacs, I have pushed the current progress on merging use-package to the new branch scratch/use-package. I based this on Jo=C3=A3o T=C3=A1vora's and Pa= yas Relekar's work on merging eglot, but adapted it for use-package.[1] Here is the script I ended up with: https://gist.github.com/skangas/0f853d5ae90aba90f18ab27236aaaaa7 This is what remains: 1. I'm still working on the new use-package.texi manual. It pretty much amounts to a rewrite, or close to it. If Eli and John are fine with it, I'm happy to finish up that work after the merge. Otherwise, I'm not sure I can make it in time for the Emacs 29 merge window. I'll try my best in any case, of course, but other commitments destroyed most of my time for focused work in the last week. 2. I didn't mark trivial commits with "Copyright-paperwork-exempt: yes". Using the scripts from Jo=C3=A3o and Payas, it will be trivial to add, i= f I can get access to a list of the relevant commits. - Do we care strongly about this? - If yes, do we have a list of commits that need such marking? Or, equivalently, the authors whose work we don't need assignments for? 3. The mailmap.txt file may or may not need looking over. For example, I'm not sure how important it is that the emails line up with the copyright assignments file. Jo=C3=A3o seems to have spent some time ensuring that they do, but I'm not sure if that was out of necessity or in the interest of tidiness. I've attached mailmap.txt below. These points are minor, I think, but added for completion: 4. Just as with eglot, we should add the merge point to admin/git-bisect-start. 5. I added the files README.md as admin/USE-PACKAGE.README and NEWS.md as etc/USE-PACKAGE-NEWS. We might want to just skip these files though, as they don't add much. They are available in the old repository if anyone should need to take a look at them. Footnotes: [1] Their scripts are still available at: https://gist.github.com/joaotavora/2ed97f2ec85958986983d5cb78202770 --00000000000018a91c05ee374187 Content-Type: text/plain; charset="utf-8"; name="mailmap.txt" Content-Disposition: attachment; filename="mailmap.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: dee90be15217e894_0.1 QWFyb24gTWV1cmVyCTxhc21ldXJlckBnbWFpbC5jb20+CkFkYW0gU3BpZXJzCTxlbWFjc0BhZGFt c3BpZXJzLm9yZz4KQWRhbSBTcGllcnMJPGVtYWNzQGFkYW1zcGllcnMub3JnPiA8YWRhbUBwYWNp ZmljLmxpbmtzeXMubW9vc2VoYWxsPgpBZGFtIFNwaWVycwk8ZW1hY3NAYWRhbXNwaWVycy5vcmc+ IDxnaXRodWJAYWRhbXNwaWVycy5vcmc+CkFsZWtzZXkgS2xhZG92CTxhbGVrc2V5LmtsYWRvdkBn bWFpbC5jb20+CkFsZXggQnJhbmhhbQk8YWxleC5icmFuaGFtQGdtYWlsLmNvbT4KQWxleCBCcmFu aGFtCTxhbGV4LmJyYW5oYW1AZ21haWwuY29tPiA8YnJhbmhhbUB1dGV4YXMuZWR1PgpBbGV4IEtv c29ydWtvZmYJPGFsZXhAM2Zvcm0uY29tPgpBbGV4IEtvc3QJPGFsZXpvc3RAZ21haWwuY29tPgpB bmRyZXcgUGVubmViYWtlcgk8YW5kcmV3LnBlbm5lYmFrZXJAZ21haWwuY29tPgpBbmRyZXcgU2No d2FydHptZXllcgk8YW5kcmV3QHNjaHdhcnR6bWV5ZXIuY29tPgpBbmRyZXcgU3RyaWJibGVoaWxs CTxzdHJpYmJAZ21haWwuY29tPgpBbmRyZXcgU3RyaWJibGVoaWxsCTxzdHJpYmJAZ21haWwuY29t PiA8YWRzQHdvbXBvbS5vcmc+CkFuZHJleSBMaXN0b3BhZG92CTxhbmRyZXlvcnN0QGdtYWlsLmNv bT4KQW5kcsOpcyBTYXJhb3MgTHVuYQk8c2FyYW9zbHVuYWFuZHJlc0BnbWFpbC5jb20+CkFydHlv bSBLaHJhbW92CTxmdXR1LmZhdGFAZ21haWwuY29tPgpCYXNpbCBMLiBDb250b3ZvdW5lc2lvcwk8 Y29udG92b2JAdGNkLmllPgpCZXJlbmQgZGUgQm9lcgk8YmVyZW5kQHBvYm94LmNvbT4KQmVyayBE LiBEZW1pcgk8YmRkQG1pbmRjYXN0Lm9yZz4KQmVybmFyZCBIdXJsZXkJPGJlcm5hcmRAbWFyY2Fk ZS5iaXo+CkJqYXJ0ZSBKb2hhbnNlbgk8YmphcnRlLmpvaGFuc2VuQGdtYWlsLmNvbT4KYnJhZHJu CTxicmFkLm5laW1hbm5AaG90bWFpbC5jb20+CkJyaWFuIEJ1cm5zCTxiYnVybnMua21AZ21haWwu Y29tPgpDYXJsIExpZWJlcm1hbgk8ZGV2QGNhcmwuYWM+CmNodWNoYW5hCTxjaHVjaGFuYUBnbXgu ZGU+CkNodW55YW5nIFh1CTx4dWNodW55YW5nNTZAZ21haWwuY29tPgpDb2RydcibIENvbnN0YW50 aW4gR3XImW9pCTxtYWlsK2dpdEBjb2RydXQucHJvPgpjb25hbwk8Y29uYW8zQGdtYWlsLmNvbT4K RGFtaWVuIENhc3NvdQk8ZGFtaWVuLmNhc3NvdUBnbWFpbC5jb20+CkRhbWllbiBDYXNzb3UJPGRh bWllbi5jYXNzb3VAZ21haWwuY29tPiA8ZGFtaWVuQGNhc3NvdS5tZT4KRGFtaWVuIE1lcmVubmUJ PGRhbUBjb3NpbnV4Lm9yZz4KRGFuaWVsIE1hcnTDrW4JPG1hcmRhbmkyOUB5YWhvby5lcz4KRGFu aWVsIE1lbmRsZXIJPG1haWxAZGFuaWVsLW1lbmRsZXIuZGU+CkRhbmllbCBQZXJleiBBbHZhcmV6 CTxkYW5pZWxwemFAcHJvdG9ubWFpbC5jb20+CkRhbmllbCBZYXJlbgk8eWFyZW5kYW5pZWxAZ21h aWwuY29tPgpEYXZlIEFicmFoYW1zCTxkYXZlQGJvb3N0cHJvLmNvbT4KRGF2aWQgTGVhdGhlcm1h bgk8Z2l0QGRhdmlkLmxlYXRoZXJtYW4uZm0+CkRlcGxveW1lbnQgQm90IChmcm9tIFRyYXZpcyBD SSkJPGRlcGxveUB0cmF2aXMtY2kub3JnPgpEb25hbGQgQ3VydGlzCTxkY3VydGlzQG1pbGtib3gu bmV0PgpEcm9yIExldmluCTxzcGF0ekBwc3liZWFyLmNvbT4KZHVpYW50bwk8ZHVpYW50b0B1c2Vy cy5ub3JlcGx5LmdpdGh1Yi5jb20+CkVkd2FyZCBLbnlzaG92CTxlZHZvcmdAZ21haWwuY29tPgpG aWNlIFQJPGZpY2UtdEBwcm90b25tYWlsLmNvbT4KRnJhbsOnb2lzIEbDqXZvdHRlCTxmZXZvdHRl QGdtYWlsLmNvbT4KR2VvcmdlIEhhcnR6ZWxsCTxoYXJ0emVsbEBhbGVyY2UuY29tPgpHcmFudCBS ZXR0a2UJPGdyZXR0a2VAYWNtLm9yZz4KSHVnbyBIZWFncmVuCTxodWdvQGhlYWdyZW4uY29tPgpJ bmRyYWRoYW51c2ggR3VwdGEJPGluZHJhZGhhbnVzaC5ndXB0YUBnbWFpbC5jb20+Ckl2YW4gR29u Y2hhcm92CTxJdmFuLkdvbmNoYXJvdkB3ZXhpbmMuY28ubno+CkphY29iIEZpcnN0CTxqYWNvYi5m aXJzdEBtZW1iZXIuZnNmLm9yZz4KSmFtZXMgUmVlZAk8amNyZEB0dXRhLmlvPgpKaW1teSBZdWVu IEhvIFdvbmcJPHd5dWVuaG9AZ21haWwuY29tPgpKaW1teSBZdWVuIEhvIFdvbmcJPHd5dWVuaG9A Z21haWwuY29tPiA8d3l1ZW5ob0B1c2Vycy5ub3JlcGx5LmdpdGh1Yi5jb20+CkpvZSBXcmVzY2hu aWcJPGpvZS53cmVzY2huaWdAZ21haWwuY29tPgpKb2hhbm4gS2zDpGhuCTxqb2hhbm5AamtsYWVo bi5kZT4KSm9obiBMZWUJPGpqbEBwb2JveC5jb20+CkpvaG4gV2llZ2xleQk8am9obndAbmV3YXJ0 aXNhbnMuY29tPgpKb2huIFdpZWdsZXkJPGpvaG53QG5ld2FydGlzYW5zLmNvbT4gPGp3aWVnbGV5 QGdtYWlsLmNvbT4KSm9uYXMgQmVybm91bGxpCTxqb25hc0BiZXJub3VsLmxpPgpKdXN0aW4gQnVy a2V0dAk8anVzdGluQGJ1cmtldHQuY2M+Ckp1c3RpbiBUYWxib3R0CTxqdXN0aW5Ad2F5bW9uZG8u Y29tPgpLYWxlYiBFbHdlcnQJPGJlbGFrQGNvZGVkLmlvPgprZWl0aG1hbnRlbGwJPGtlaXRobWFu dGVsbEBnbWFpbC5jb20+CmtpbGxkYXNoOQk8a2lsbGRhc2g5PgpLb2VuIHZhbiBHcmVldmVuYnJv ZWsJPGtvZW5AbG9jYWxob3N0LmNvbT4Ka292cmlrCTxrb3ZyaWswQGdtYWlsLmNvbT4KTGF1cmVu Y2UgUm9jaGZvcnQJPGxhdXJlbmNlLnJvY2hmb3J0QGdtYWlsLmNvbT4KTHVrYXMgQmFydGgJPG1h aWxAdGlubG9hZi5kZT4KTWFyYyBXZWJiaWUJPG1hcmN3ZWJiaWVAZ21haWwuY29tPgpNYXJ0aW4g R2Vpc2xlcgk8bWFydGluQGdlaXNsZXIubmV0PgpNYXR0aGV3IEZlaW5iZXJnCTxrZXRicmFAdXNl cnMubm9yZXBseS5naXRodWIuY29tPgpNYXR0aGV3IEp1c3RpbiBCYXVlcgk8bWpiYXVlcjk1QGdt YWlsLmNvbT4KTWF0dGhpYXMgU2NobWl0dAk8bWFsZS5zY2htaXR0QHBvc3Rlby5kZT4KTWF0dXMg R29samVyCTxkb3RhLmtleXNAZ21haWwuY29tPgpNaWtlIEFwcGxlYnkJPG1pa2VAYXBwLmxlYnku b3JnPgpNaWtzIEthbG5pbnMJPE1pa3NLYWxuaW5zQG1haWt1bW9yaS5jb20+Ck5haHVlbCBHcmVj bwk8bmdyZWNvQGdtYWlsLmNvbT4KTmd1eeG7hW4gSMOgIETGsMahbmcJPGNtcGl0Z0BnbWFpbC5j b20+Ck5pY2sgQWxjb2NrCTxuaWNrLmFsY29ja0BvcmFjbGUuY29tPgpOaWNrIE1jQ3VyZHkJPG5p Y2tAbmlja21jY3VyZHkuY29tPgpOaWNvIFdhZ25lcgk8bmljb0BjcnlwdG9wb25lLm9yZz4KTmlj b2xhcyBEdWRlYm91dAk8bmljb2xhcy5kdWRlYm91dEBnbWFpbC5jb20+Ck5pY29sYXMgRHVkZWJv dXQJPG5pY29sYXMuZHVkZWJvdXRAZ21haWwuY29tPiA8bmljb2xhcy5kdWRlYm91dEBnYXRlY2gu ZWR1PgpOaWNvbGFzIFJpY2hhcmQJPHRoZW9uZXdpdGh0aGVldmlsbG9va0B5YWhvby5mcj4KTm9h bSBQb3N0YXZza3kJPG5wb3N0YXZzQHVzZXJzLnNvdXJjZWZvcmdlLm5ldD4KUGF5YXMgUmVsZWth cgk8cmVsZWthcnBheWFzQGdtYWlsLmNvbT4KUGV0ZXIgSG9lZwk8cGV0ZXJAc3BlYXJ0YWlsLmNv bT4KUGV0ZXIgTW9zbWFucwk8c3VwcG9ydEBnby1mb3J3YXJkLm5ldD4KUGhpbCBIdWRzb24JPHBo aWwuaHVkc29uQGluYW1lLmNvbT4KUGhpbGlwcCBTdGVwaGFuaQk8cGhzdEBnb29nbGUuY29tPgpQ aGlsaXBwZSBWYXVjaGVyCTxwaGlsaXBwZS52YXVjaGVyQGdtYWlsLmNvbT4KUGhpbGlwcGUgVmF1 Y2hlcgk8cGhpbGlwcGUudmF1Y2hlckBnbWFpbC5jb20+IDxwaGlsaXBwZUBzdHZzLmNoPgpQaGls bGlwIExvcmQJPHBoaWxsaXAubG9yZEBydXNzZXQub3JnLnVrPgpQaGlsbGlwIExvcmQJPHBoaWxs aXAubG9yZEBydXNzZXQub3JnLnVrPiA8cGhpbGxpcC5sb3JkQG5ld2Nhc3RsZS5hYy51az4KUmFk b24gUm9zYm9yb3VnaAk8cmFkb24ubmVvbkBnbWFpbC5jb20+CnJlYWxjb21wbGV4CTxrb2VudmdA cG9zdGVvLm5ldD4KUmljaCBNdXJwaGV5CTxyaWNoQG11cnBoZXkub3JnPgpyb2JhcmlvCTx3ZWJt YXN0ZXJAcm9iYXJpby5jb20+ClJ1c3NlbGwgQmxhY2sJPGJsYWNrLnJ1c3NlbGxAZ21haWwuY29t Pgpyd3MJPGVsaXNwLnZpbUBnbWFpbC5jb20+ClNhY2hhIENodWEJPHNhY2hhQHNhY2hhY2h1YS5j b20+ClNhc2FuaWRhcwk8Zm1mc0Bwb3N0ZW8ubmV0PgpTZWFuIEFsbHJlZAk8Y29kZUBzZWFuYWxs cmVkLmNvbT4KU2hvaGVpIFlPU0hJREEJPHN5b2hleEBnbWFpbC5jb20+ClN0ZWZhbiBLYW5nYXMJ PHN0ZWZhbmthbmdhc0BnbWFpbC5jb20+ClN0ZXZlIFB1cmNlbGwJPHN0ZXZlQHNhbml0eWluYy5j b20+CnN5bDIwYm5yCTxzeWx2YWluLmJlbm5lckBnbWFpbC5jb20+ClRlZCBabGF0YW5vdgk8dHp6 QGxpZmVsb2dzLmNvbT4KVGVyZW5jaW8gQWdvenppbm8JPHRlcmVuY2lvLmFnb3p6aW5vQGdtYWls LmNvbT4KVGhlIEdpdHRlciBCYWRnZXIJPGJhZGdlckBnaXR0ZXIuaW0+ClRoaWFnbyBCYXJyb3Nv IFBlcnJvdHRhCTx0aGlhZ29wZXJyb3R0YTk1QGdtYWlsLmNvbT4KVGhpZXJyeSBWb2xwaWF0dG8J PHRoaWVycnkudm9scGlhdHRvQGdtYWlsLmNvbT4KVGhvbWFzIEZyw7Zzc21hbgk8dGhvbWFzZkBq b3NzeXN0ZW0uc2U+ClRob21hcyBJbmdyYW0JPHRhaW5ncmFtQG10dS5lZHU+ClRpbmctWXUgTGlu CTxhZXRoYW55Y0BnbWFpbC5jb20+ClRyb3kgSGluY2tsZXkJPHQubWFjbWFuQGdtYWlsLmNvbT4K VmFsZW50aW4gSWduYXRldgk8dmFsZW50amVkaUBnbWFpbC5jb20+ClZpbmNlbnQgWmhhbmcJPHNl YWdsZTAxMjhAZ21haWwuY29tPgpXYW5nIENodW55ZQk8Y2h1bnl3YW5AeGlsaW54LmNvbT4Kd291 dGVyIGJvbHN0ZXJsZWUJPHdvdXRlckBib2xzdGVybC5lZT4KWXVyaWkgS2hvbG9ka292CTx1cmlz dC5tY2tvcm9ib2Noa2FAZ21haWwuY29tPgo= --00000000000018a91c05ee374187--