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: [elpa] main 8f4cb59: * elpa-packages (counsel, ivy, swiper): Auto-sync. Date: Tue, 09 Mar 2021 18:56:23 -0500 Message-ID: References: <20210225102521.11653.64611@vcs0.savannah.gnu.org> <20210225102523.7CEF420B28@vcs0.savannah.gnu.org> <87h7m0z07r.fsf@tcd.ie> <87mtvsundg.fsf@tcd.ie> <875z20m0oa.fsf@tcd.ie> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35221"; 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: "Basil L. Contovounesios" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Mar 10 00:57:19 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 1lJmE3-00093Z-KS for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Mar 2021 00:57:19 +0100 Original-Received: from localhost ([::1]:59330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJmE2-0005za-MS for ged-emacs-devel@m.gmane-mx.org; Tue, 09 Mar 2021 18:57:18 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJmDK-00055t-Ns for emacs-devel@gnu.org; Tue, 09 Mar 2021 18:56:34 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:25758) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJmDI-0003Lb-Aw for emacs-devel@gnu.org; Tue, 09 Mar 2021 18:56:34 -0500 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id CFFF180229; Tue, 9 Mar 2021 18:56:30 -0500 (EST) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 11237807F4; Tue, 9 Mar 2021 18:56:25 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1615334185; bh=9xUGVWYaSacMOWDkIAywald2BIRHecvZ8Bl2DPl8TNk=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=pVBNDkMzNe5FEwR2KLLFqCtIAiRUrr/DHQDylAZzy30Fkh81DcZ3Z5hq2qF2CzzXA OYUZ5/xPZ/Mb8A6y6sXkHi7mSuDxc2nnCLuXk1Z5dG978bqrSZj5cZlcE9G45DKkSs 63/2iZdwkWtBNDOHBqXfK2hZHB1YJg9MioTCBW1jjszDSWMN46x/XN511fCYSEK2MC 9LtXpUwEh97MZHAN/qWTMQGxUb0xtTiIpNHSHP43orZghhguGRc0dtoE2zuUOPZwD1 cXBRmNe8lMbb1/7AiU3BL6xBZAvXMuNPZ7flcvjYDgTDZiFcrPfB+7kf/R718H81jo 0mSsorMlCUPfw== Original-Received: from alfajor (unknown [216.154.43.249]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id BA62A12024A; Tue, 9 Mar 2021 18:56:24 -0500 (EST) In-Reply-To: <875z20m0oa.fsf@tcd.ie> (Basil L. Contovounesios's message of "Tue, 09 Mar 2021 22:17:57 +0000") 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 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:266256 Archived-At: > I've now bumped all the swiper.git versions to 0.13.3, and merged the > upstream changes into the five corresponding branches in elpa.git. > > The elpa-admin release detection doesn't seem happy with it though: Indeed. It would want first merging and then updating the `Version:` line. > The following seems to fix the revision detection locally: [...] > @@ -170,7 +170,7 @@ elpaa--get-release-revision > (elpaa--call > (current-buffer) > "git" "log" "-n1" "--oneline" "--no-patch" > - "--pretty=format:%H" > + "--pretty=format:%H" "--first-parent" > "-L" (concat "/^;;* *\\(Package-\\)\\?Version:/,+1:" > (elpaa--main-file pkg-spec)))) > (buffer-string) [...] > It seems to work with ivy and ivy-avy, which introduce releases via > merge commits, as well as dash, which doesn't. WDYT? The problem is that which parent is "first" is very much arbitrary in Git (contrary to Bzr where this was made much more visible), so this is just a heuristic that will fail in other cases. > Is there a better/different way? The only alternative I can think of is > to enter revisions manually in the :version-map, but that doesn't seem > desirable in the long run. There are many different ways, some of which are likely better in some respects, but I'm not sure which is the better one overall. Suggestions: - change the versions after merging rather than before (as mentioned above). It's an easy low-tech solution, but it involves N times more work if a single .git upstream version leads to N downstream releases. - if there's really only one version number shared by all the sub-packages, I'd tend to argue that maybe there should only be one package ;-) - as discussed earlier, we could have each subpackage have the complete upstream Git and only create the subpackages via `elpa-package` filtering out the other files. - split the upstream repository. - add some other way than :version-map to specify which commit to use. This could be a new :version-first-parent boolean option, or maybe a "don't look for commit in history" (after all, that's what the old GNU ELPA script used to do: it used whichever commit was HEAD when we discovered that the `Version:` "had changed" (meaning the version in HEAD corresponds to not-yet-built file)). > P.S. Sorry if this breaks anything on elpa.gnu.org :(. I haven't noticed any problem so far. Stefan