From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "Basil L. Contovounesios" Newsgroups: gmane.emacs.devel Subject: Re: [elpa] main 8f4cb59: * elpa-packages (counsel, ivy, swiper): Auto-sync. Date: Thu, 25 Feb 2021 14:33:12 +0000 Message-ID: <87h7m0z07r.fsf@tcd.ie> References: <20210225102521.11653.64611@vcs0.savannah.gnu.org> <20210225102523.7CEF420B28@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3612"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: emacs-devel@gnu.org, Oleh Krehel To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Feb 25 15:35:52 2021 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 1lFHk8-0000pP-4r for ged-emacs-devel@m.gmane-mx.org; Thu, 25 Feb 2021 15:35:52 +0100 Original-Received: from localhost ([::1]:45160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFHk7-0007dd-6k for ged-emacs-devel@m.gmane-mx.org; Thu, 25 Feb 2021 09:35:51 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFHhg-0005UN-F1 for emacs-devel@gnu.org; Thu, 25 Feb 2021 09:33:20 -0500 Original-Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:40099) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFHhd-0005KT-FU for emacs-devel@gnu.org; Thu, 25 Feb 2021 09:33:20 -0500 Original-Received: by mail-wm1-x32c.google.com with SMTP id a11so1514085wmd.5 for ; Thu, 25 Feb 2021 06:33:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd.ie; s=google21; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=D3sjYihTSF9f99bkS174QsufVRY9IjyqnbXt74YqDRE=; b=dqKkZQIT5V+DJTTbfZxudhph46S7OsIpVkPYFvN6QpoCJtdjHe0xgKm9ElYwK8/tHt sBv1MmT169x9X3Q0weA01uZYFMi/hyF4bqpVHkYionLBWBESy0/r3IZTeM8aFDpOAvW3 84ohk01ti9aww+v61alXYylTKOlxTkySreVjPoMkj1mW1mSXrb0pOj7X0t6gPrf1EVpj fA3MBafldu2x/TK4ywFyWFGPt3zkCkuLEDqJEIldIGzvJ0cwOBmBT49MMiQ4pCp+YKDS 5WCIVxLsIzGM6Y7BEquioJ79nLVk9z1YrOs2oZGpgsyCwiCgjV7nTQEKaJMni6OL2xsS Amrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=D3sjYihTSF9f99bkS174QsufVRY9IjyqnbXt74YqDRE=; b=tMoDiBAZZB0QouiUVKlJBJ1/48Xv/r2PLNnSGhpc+cXryMM1PnK0uGlm7hswZ2novW zcFP3Q3DfiCucpqrTzjgbGuYOX0N3xgEofg9nSgGBVpt+kSlWWRO6fzH4GSJOTAyqlZ0 0aQCDrCYIRSwZ6PiaCsc4lHw4uMcuIGiDVesBrsPu33YY/bqY41K9HXaxAO5EADCDczR XI5iSSK8y72gEJqLJPF24JCs3rmzciERPC0qP+ZJV+5Xh1sqaoZd3fSwLreTCR4HvxP1 Twqn20UyZ6Dd2L/yMGGJ4LnHgloop9j5jj5yrNpZAF8vvLU62t4bo0snZaIszXQfb146 pw0A== X-Gm-Message-State: AOAM530vDgZHYon0EU3CqYyOWdskC8I+K+dqLMR0Rum1w5vP6fwx4m7B TL2uTfjuohR7V54P5zj34We9Cg== X-Google-Smtp-Source: ABdhPJzHwV2clE3IfdiJtCsWZgmISEfNo2gbkPcRG3BuVcKnU8SAQaqU6fZMgBI+FTQiZAs+wScxvg== X-Received: by 2002:a1c:4386:: with SMTP id q128mr3542753wma.184.1614263595277; Thu, 25 Feb 2021 06:33:15 -0800 (PST) Original-Received: from localhost ([2a02:8084:20e2:c380:f410:82e8:3a21:eedf]) by smtp.gmail.com with ESMTPSA id l4sm8764951wrt.42.2021.02.25.06.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Feb 2021 06:33:14 -0800 (PST) In-Reply-To: <20210225102523.7CEF420B28@vcs0.savannah.gnu.org> (Basil L. Contovounesios's message of "Thu, 25 Feb 2021 05:25:22 -0500 (EST)") Received-SPF: none client-ip=2a00:1450:4864:20::32c; envelope-from=contovob@tcd.ie; helo=mail-wm1-x32c.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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:265616 Archived-At: blc@savannah.gnu.org (Basil L. Contovounesios) writes: > branch: main > commit 8f4cb595fb1f34059b22a3f3e0ef71cb310e08d5 > Author: Basil L. Contovounesios > Commit: Basil L. Contovounesios > > * elpa-packages (counsel, ivy, swiper): Auto-sync. Sorry, I realised only after the fact that the corresponding externals in elpa.git had significant local changes in the form of deleted files, diverging Version headers, etc., so I'm guessing :auto-sync won't work for these packages. Should I revert this commit in the meantime? It gets even more complicated: the existing ivy-hydra.el and the new ivy-avy.el in swiper.git were apparently designed as optional separate packages, so I've now created the corresponding external branches in elpa.git (but not yet added them to elpa-packages). What is the best way to handle this complexity (that of having multiple packages provided by a single upstream repository) in elpa.git? For example, should swiper.git have separate branches for each package's subtree, so that elpa.git can (hopefully) just fetch and fast-forward to them automatically? Should things continue as they are now, with elpa.git deleting files locally and swiper.git blissfully unaware of the fact? Either way, it currently looks to me like there will always be manual merging required in either swiper.git or elpa.git, with no auto-sync, fast-foward, DTRT option. Is there a better way, e.g. reverting the local deletions in elpa.git, keeping 5 full copies of swiper.git as externals (one for each package), and tightening each package's :ignored-files entry? Or maybe adding something like MELPA's ability to specify which exact files to consider from the upstream repository? I'd be grateful for any guidance in how to proceed with the update of ivy, ivy-avy, ivy-hydra, swiper, and counsel in elpa.git. Thanks, -- Basil