From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jonas Bernoulli Newsgroups: gmane.emacs.bugs Subject: bug#45345: [elpa-archive] "make build/" should not pull unconditionally Date: Mon, 21 Dec 2020 18:26:18 +0100 Message-ID: <87mty7vznp.fsf@bernoul.li> References: <875z4wi5i6.fsf@bernoul.li> <87ft3zbfmh.fsf@bernoul.li> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20152"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 45345@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 21 18:27:52 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1krOyO-00059D-Ij for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 21 Dec 2020 18:27:52 +0100 Original-Received: from localhost ([::1]:52298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krOyN-0005wp-BX for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 21 Dec 2020 12:27:51 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krOxb-0005wT-1h for bug-gnu-emacs@gnu.org; Mon, 21 Dec 2020 12:27:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1krOxa-0004Dz-8o for bug-gnu-emacs@gnu.org; Mon, 21 Dec 2020 12:27:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1krOxa-0007xv-0h for bug-gnu-emacs@gnu.org; Mon, 21 Dec 2020 12:27:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jonas Bernoulli Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 21 Dec 2020 17:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45345 X-GNU-PR-Package: emacs Original-Received: via spool by 45345-submit@debbugs.gnu.org id=B45345.160857158630576 (code B ref 45345); Mon, 21 Dec 2020 17:27:01 +0000 Original-Received: (at 45345) by debbugs.gnu.org; 21 Dec 2020 17:26:26 +0000 Original-Received: from localhost ([127.0.0.1]:48186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1krOx0-0007x5-IG for submit@debbugs.gnu.org; Mon, 21 Dec 2020 12:26:26 -0500 Original-Received: from mail.hostpark.net ([212.243.197.30]:47796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1krOww-0007wv-VE for 45345@debbugs.gnu.org; Mon, 21 Dec 2020 12:26:24 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by mail.hostpark.net (Postfix) with ESMTP id 4C3D6160DD; Mon, 21 Dec 2020 18:26:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bernoul.li; h= content-type:content-type:mime-version:message-id:date:date :references:in-reply-to:subject:subject:from:from:received :received; s=sel2011a; t=1608571581; bh=hmI46aHKMRdarcSkzGRJhPRz OQ071Bhb7tdgY2ruyyY=; b=mvSDmvBqxtbzdPuvBDLQGoeB8wxR2dJ0d+vlrE4r 3ajMyOOAhYjH3DDZKdZb7VibVRtzhj+59q89OCCMUqDLT1EAIZSap4jjKYcWxqC7 +SDBQ0ekQC1U9v9422iWN6+3ES2+kHdCLGLhpSsEGpeiPkUQtlWW1h18g5y1yTbi 9YA= X-Virus-Scanned: by Hostpark/NetZone Mailprotection at hostpark.net Original-Received: from mail.hostpark.net ([127.0.0.1]) by localhost (mail1.hostpark.net [127.0.0.1]) (amavisd-new, port 10224) with ESMTP id XzNbKj9hWCYB; Mon, 21 Dec 2020 18:26:21 +0100 (CET) Original-Received: from customer (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.hostpark.net (Postfix) with ESMTPSA id 0F9E9160AE; Mon, 21 Dec 2020 18:26:21 +0100 (CET) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:196545 Archived-At: Stefan Monnier writes: > `elpaa--external-package-sync` won't actually fetch anything > from the remote server and will just do `git merge` which will > presumably do nothing at all unless you've `git fetched` something into > `origin/externals/transient` since the last sync or you manually moved > the `externals/transient` branch back to some earlier commit. Now that you mention it, yes I did move back to some earlier commit. I just tried with some new local-only commits and without rewinding first and that indeed worked just fine. I don't expect to rewind history going forward so this likely won't cause me any issues anymore. (I had to rewind because I had not yet discarded the special "for-gnu-elpa" branch that moved the library to the top-level. In this case I did have to "rewrite history", but I don't plan to do that again.) > So, I think your diagnostic pointing at `elpaa--external-package-sync` > was a red herring and the problem is rather that: > >>> `elpaa--make-one-package' >>> is supposed to make packages from *commits* > > whereas you wanted to make a tarball from whatever was currently in > `packages/transient`, including uncommitted changes. Is that right? No, I did in fact create a commit named "[WIP]". > IOW the function that got in the way of your goal wasn't > `elpaa--external-package-sync` but `elpaa--clean`. Had I not created a commit, then yes, that would have been a problem, but apparently I anticipated this complication. ;) > I think the solution will be to make a new kind of make target which > just builds one tarball and skips `elpaa--clean` (and will also skip > `elpaa--external-package-sync` while we're at it). Something like "make archive/" and "make archive-devel/"? That might be useful. Jonas