From: Stefan Monnier <monnier@iro.umontreal.ca>
To: "Basil L. Contovounesios" <contovob@tcd.ie>
Cc: emacs-devel@gnu.org, Oleh Krehel <oleh@oremacs.com>
Subject: Re: [elpa] main 8f4cb59: * elpa-packages (counsel, ivy, swiper): Auto-sync.
Date: Tue, 09 Mar 2021 18:56:23 -0500 [thread overview]
Message-ID: <jwvo8frx68h.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <875z20m0oa.fsf@tcd.ie> (Basil L. Contovounesios's message of "Tue, 09 Mar 2021 22:17:57 +0000")
> 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
next prev parent reply other threads:[~2021-03-09 23:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210225102521.11653.64611@vcs0.savannah.gnu.org>
[not found] ` <20210225102523.7CEF420B28@vcs0.savannah.gnu.org>
2021-02-25 14:33 ` [elpa] main 8f4cb59: * elpa-packages (counsel, ivy, swiper): Auto-sync Basil L. Contovounesios
2021-02-25 15:12 ` Stefan Monnier
2021-02-25 16:24 ` Basil L. Contovounesios
2021-02-25 16:40 ` Stefan Monnier
2021-03-09 22:17 ` Basil L. Contovounesios
2021-03-09 23:56 ` Stefan Monnier [this message]
2021-03-10 12:40 ` Basil L. Contovounesios
2021-03-11 15:48 ` Stefan Monnier
2021-03-11 17:12 ` Basil L. Contovounesios
2021-03-11 17:34 ` Stefan Monnier
2021-03-11 19:25 ` Basil L. Contovounesios
2021-03-11 22:47 ` Stefan Monnier
2021-03-11 22:59 ` Basil L. Contovounesios
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvo8frx68h.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=contovob@tcd.ie \
--cc=emacs-devel@gnu.org \
--cc=oleh@oremacs.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.