From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Thierry Volpiatto Newsgroups: gmane.emacs.devel Subject: Re: updating async on elpa Date: Sat, 01 May 2021 04:45:45 +0000 Message-ID: <87lf8zrqym.fsf@posteo.net> References: <874kfom16w.fsf@posteo.net> <871rarn69c.fsf@posteo.net> <87y2czll5a.fsf@posteo.net> <87o8dvty56.fsf@posteo.net> <87zgxf5zyz.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28015"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat May 01 06:58:39 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 1lchiB-0007B4-KX for ged-emacs-devel@m.gmane-mx.org; Sat, 01 May 2021 06:58:39 +0200 Original-Received: from localhost ([::1]:34806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lchiA-0006FR-Pc for ged-emacs-devel@m.gmane-mx.org; Sat, 01 May 2021 00:58:38 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lchhQ-0005ny-N0 for emacs-devel@gnu.org; Sat, 01 May 2021 00:57:52 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:35547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lchhL-0000tW-HE for emacs-devel@gnu.org; Sat, 01 May 2021 00:57:52 -0400 Original-Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E398B2400E5 for ; Sat, 1 May 2021 06:57:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1619845063; bh=SYvYN/HnPT+wEP1gS8POU2tJ1XBNUTIqOr/f14xDYyQ=; h=From:To:Cc:Subject:Date:From; b=HriUA2m/z2Ze4fIvdwdFGA52Gt2DeHePCMllEO1pFqeAMYSXmGOebgHZZwwYC+wWE 5AgMHXA42xnscOjcCwQYPNAiK8lqIeJE94c83p9WTnizyi/OlIoX35pBw+oUN4A22I /8zGappUdZ3688JPAICoK7022/uBdS5/FwwTlQz7v2X229yhbh6E5ZNOwMeMhRUz6Z 0eZ15nS/FVk8iYHd94QaXMoPh7pqJbXsVMxSI9L+wnLnBY9xxL2xk6mmAwUvSDbjmP djYsCV2cjSwVZVzHx09nEgTsOkyayf4rkCHGyWa6mMtjICP1c8QzV9jkL7gIY7YF5f qCR7J83LsdtaA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FXH6Z2HwTz9rxM; Sat, 1 May 2021 06:57:42 +0200 (CEST) In-reply-to: Received-SPF: pass client-ip=185.67.36.66; envelope-from=thievol@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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:268701 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Stefan Monnier writes: > [[PGP Encrypted Part:OK]] >>>>> @git.sv.gnu.org:/srv/git/emacs/elpa.git ? >>>> So no, it is not this, >>> Yes it it, but this only specifies the repository, not the branch. >> Hmm, I understand nothing how the elpa is structured, too complicated fo= r me. > > When you push a branch you need to tell to which branch in the remote > repository you're pushing. The syntax is: > > git push : > > so if you're pushing from your local `elpa` branch to elpa.git's > `externals/async` branch, then you need to do: > > git push elpa elpa:externals/async > > I suspect the problem is that you used a shorthand which works well when > the remote branch has the same name as a the local branch but can't be > used here. I will rename it to something else. > I'm not sure how much simpler we could make it. E.g. if we used > a separate repository per package, then presumably your `elpa` remote > would point to something like git.sv.gnu.org:emacs/elpa/async.git > and you'd need to push to the `main` branch in that repository, which > would still bring the same problem since the name `main` is still > different from the name `elpa` you used for your local branch. Yes, the name I use -elpa- is bad, but yes a repository per repo would be great, in github organizations allow having one repo per package like in helm organization. >>> In any case, if you push to John's `emacs-async` on Github, I can then >>> bring it into elpa.git with a simple `make sync/async`. >> Done, the branch to merge on elpa is the elpa branch, not master. > > Any chance the two branches can be "unified"? > AFAICT the difference are: > > - The `Package-Requires:` where `master` says ((emacs "24.3")), whereas > `elpa` says ((cl-lib "0.5") (nadvice "0.3")). Not sure why they need > to be different: we can "merge" them to ((emacs "24.3") (nadvice "0.3")= ), > since cl-lib in included in Emacs-24.3 (OTOH nadvice appeared with > Emacs-24.4, so I think requiring only Emacs-24.3 is not quite sufficien= t). What about ((emacs "24.4")) we don't care of 24.3, we are at 27.2 now so very far from 24.3. > - The `async-pkg.el` which is absent on `elpa` and present on `master`. > Do we actually need it on `master`? IIRC yes, Melpa needs it. =2D-=20 Thierry --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHHBAEBCgAxFiEEI9twfRN7r3nig/xwDsVtFB0W75MFAmCM38ITHHRoaWV2b2xA cG9zdGVvLm5ldAAKCRAOxW0UHRbvkwGQC/9ZZOlJfo1vm8ATPtRrFG3paAjxaDfA nueyL0waxZyprU6SM3UT5E6xJsEa63WQALWd6oTnx4HETTJBHalXhhGw4wDQSS61 DKMXG48R16crRWCiSJgzezKDG4VOMK8GYd5zQAckq4CPHymvocGsRRcK8dOKAv3h aE+Ruv4gBFQgur7zJzmcSiVKvA8L1IGbEFqPb3T5j8uLcWHmUKqLzRNW46BWYLhy 9/iEjYv2vN4rHmlNQ3VZ6bEO18PfXzxJ1y0Fb1Je+oq0f7CIb5Ofvok7oAZY4LNn nlkO0QobgotipGQhuuABn7zicFEXZPV+PY6rVDLwbbANUdEZxgXbgmAlSK+KFjr8 l/QOA0BzVJwNOtaxE9o0Q3OIupq8oh2jEyN8iKu8g2n4NH2CwgNQJHqq7SfTaRGl 2qfGiE7AHXxpP+DBkFIxSvyPZ2WNPC7uea7TR2y6gcH/qebjt62AuJplEci+P6Y5 RdcwoTRNxKsJGfzt6zr/PSKzeABOvwNgptQ= =r9L4 -----END PGP SIGNATURE----- --=-=-=--