unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* updating async on elpa
@ 2021-04-30 11:56 Thierry Volpiatto
  2021-04-30 14:17 ` Stefan Monnier
  0 siblings, 1 reply; 23+ messages in thread
From: Thierry Volpiatto @ 2021-04-30 11:56 UTC (permalink / raw)
  To: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]


Hello, 

I just pushed last emacs-async changes to Elpa, but I am unsure if I did
it correctly as the way to merge externals repos with Elpa have changed,
can you verify if all went well.

Thanks.
 
-- 
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 11:56 updating async on elpa Thierry Volpiatto
@ 2021-04-30 14:17 ` Stefan Monnier
  2021-04-30 15:20   ` Thierry Volpiatto
  0 siblings, 1 reply; 23+ messages in thread
From: Stefan Monnier @ 2021-04-30 14:17 UTC (permalink / raw)
  To: Thierry Volpiatto; +Cc: emacs-devel

> I just pushed last emacs-async changes to Elpa, but I am unsure if I did
> it correctly as the way to merge externals repos with Elpa have changed,
> can you verify if all went well.

Hmm... you pushed a new branch called `externals/emacs-async` and
another called `elpa` but you didn't change the branch `externals/async`
which is the one that matters ;-)

I just tried to sync the `async` code on elpa.git and it tells me:

    % (cd ../elpa; make sync/async)
    emacs --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-push "async"
    Fetching updates for async...
    Upstream of async has DIVERGED!
    
      Local changes:
    Depuis https://github.com/jwiegley/emacs-async
       d7e7f79ee4..943a75c6a5             -> upstream/async/main
    60118ce687  monnier@iro.um..  Get async-pkg.el out of the way
    d854a60cfa  monnier@iro.um..  * async-bytecomp.el (async-bytecomp--get-package-deps): Fix last change
    a4a50337e4  monnier@iro.um..  Use cl-lib an nadvice (re-apply 783af291680d)
    
      Upstream changes:
    943a75c6a5  thievol@posteo..  Fix paren error in dired-async
    d7e7f79ee4  thievol@posteo..  Update README
    630708b150  thievol@posteo..  Merge branch 'master' of github.com:jwiegley/emacs-async
    4f78c0c91f  thievol@posteo..  Merge pull request #138 from Stebalien/fix/byte-comp-prefix
    0fd5d54073  steven@stebali..  Make the async byte compile variable injection regexp "shy"
    00c6f3f85b  steven@stebali..  fix inclusion of bytecomp variables
    06f0ec7d96  thievol@posteo..  Fix typo in previous commit
    14f48de586  thievol@posteo..  Fix Makefile
    36a10151e7  thievol@posteo..  Change default value of async-bytecomp-allowed-packages to 'all
    86aef2c38e  johnw@newartis..  Untabify and indent-buffer (#119)
    a1bd2ac49c  conao3@gmail.com  untabify and indent-buffer
    036b475a29  thierry.volpia..  Merge pull request #118 from conao3/fix-warnings
    fbbba03e98  conao3@gmail.com  fix package-lint/check-doc/byte-compiler warnings
    11769c1895  thierry.volpia..  Update version in source file as well
    d255820c5a  thierry.volpia..  Merge branch 'master' of github.com:jwiegley/emacs-async
    e81c685741  thierry.volpia..  Update *pkg.el file
    03667dde47  johnw@newartis..  Merge pull request #116 from DamienCassou/typos
    64bb180201  damien@cassou.me  Fix typos
    1209cc2ccd  thierry.volpia..  Merge pull request #115 from M4rkD/master
    c80976d3f5  mark.dawson@sw..  Some rewording of part of README.md
    35ab78afb9  thierry.volpia..  Merge pull request #114 from tarsius/forge
    6577ae5cf9  jonas@bernoul.li  Add forge to async-bytecomp-allowed-packages
    67c369555d  thierry.volpia..  Fix async-bytecomp--get-package-deps according to
    
    %

so I think before pushing to `externals/async` someone will have to
merge the `elpa.git` changes into
https://github.com/jwiegley/emacs-async.


        Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 14:17 ` Stefan Monnier
@ 2021-04-30 15:20   ` Thierry Volpiatto
  2021-04-30 16:21     ` Stefan Monnier
  0 siblings, 1 reply; 23+ messages in thread
From: Thierry Volpiatto @ 2021-04-30 15:20 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 855 bytes --]


Stefan Monnier <monnier@iro.umontreal.ca> writes:

> [[PGP Encrypted Part:OK]]
>> I just pushed last emacs-async changes to Elpa, but I am unsure if I did
>> it correctly as the way to merge externals repos with Elpa have changed,
>> can you verify if all went well.
>
> Hmm... you pushed a new branch called `externals/emacs-async` and
> another called `elpa` but you didn't change the branch `externals/async`
> which is the one that matters ;-)

Not sure how I did this (the second one) :-) sorry.

> so I think before pushing to `externals/async` someone will have to
> merge the `elpa.git` changes into
> https://github.com/jwiegley/emacs-async.

I will try to do it, if I can get async from elpa.git, don't
know how to get this for now.

Thanks.

>
>         Stefan
>
>
> [[End of PGP Encrypted Part]]


-- 
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 15:20   ` Thierry Volpiatto
@ 2021-04-30 16:21     ` Stefan Monnier
  2021-04-30 17:42       ` Thierry Volpiatto
  0 siblings, 1 reply; 23+ messages in thread
From: Stefan Monnier @ 2021-04-30 16:21 UTC (permalink / raw)
  To: Thierry Volpiatto; +Cc: emacs-devel

>> so I think before pushing to `externals/async` someone will have to
>> merge the `elpa.git` changes into
>> https://github.com/jwiegley/emacs-async.
>
> I will try to do it, if I can get async from elpa.git, don't
> know how to get this for now.

Assuming you're in a clone of `jwiegley/emacs-async`, you can do
something like:

    git remote add -f -t externals/async elpa git://git.sv.gnu.org/emacs/elpa.git
    git merge elpa/externals/async


-- Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 16:21     ` Stefan Monnier
@ 2021-04-30 17:42       ` Thierry Volpiatto
  2021-04-30 18:36         ` Stefan Monnier
  2021-04-30 18:37         ` Thierry Volpiatto
  0 siblings, 2 replies; 23+ messages in thread
From: Thierry Volpiatto @ 2021-04-30 17:42 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 849 bytes --]


Stefan Monnier <monnier@iro.umontreal.ca> writes:

> [[PGP Encrypted Part:OK]]
>>> so I think before pushing to `externals/async` someone will have to
>>> merge the `elpa.git` changes into
>>> https://github.com/jwiegley/emacs-async.
>>
>> I will try to do it, if I can get async from elpa.git, don't
>> know how to get this for now.
>
> Assuming you're in a clone of `jwiegley/emacs-async`, you can do
> something like:
>
>     git remote add -f -t externals/async elpa git://git.sv.gnu.org/emacs/elpa.git
>     git merge elpa/externals/async

Thanks, I could merge with many conflicts though, now I have to push,
the address git://git.sv.gnu.org/emacs/elpa.git is the public address
what is the equivalent with write access?

<user>@git.sv.gnu.org:/srv/git/emacs/elpa.git ?

Just to be sure.

Thanks.
 

-- 
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 17:42       ` Thierry Volpiatto
@ 2021-04-30 18:36         ` Stefan Monnier
  2021-04-30 18:42           ` Stefan Monnier
  2021-04-30 18:37         ` Thierry Volpiatto
  1 sibling, 1 reply; 23+ messages in thread
From: Stefan Monnier @ 2021-04-30 18:36 UTC (permalink / raw)
  To: Thierry Volpiatto; +Cc: emacs-devel

> Thanks, I could merge with many conflicts though, now I have to push,
> the address git://git.sv.gnu.org/emacs/elpa.git is the public address
> what is the equivalent with write access?
>
> <user>@git.sv.gnu.org:/srv/git/emacs/elpa.git ?

That sounds right, yes,


        Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 17:42       ` Thierry Volpiatto
  2021-04-30 18:36         ` Stefan Monnier
@ 2021-04-30 18:37         ` Thierry Volpiatto
  2021-04-30 18:48           ` Stefan Monnier
  1 sibling, 1 reply; 23+ messages in thread
From: Thierry Volpiatto @ 2021-04-30 18:37 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]


Thierry Volpiatto <thievol@posteo.net> writes:

> [[PGP Signed Part:Good signature from 0EC56D141D16EF93 thievol@posteo.net (trust ultimate) created at 2021-04-30T19:47:29+0200 using RSA]]
>
> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
>> [[PGP Encrypted Part:OK]]
>>>> so I think before pushing to `externals/async` someone will have to
>>>> merge the `elpa.git` changes into
>>>> https://github.com/jwiegley/emacs-async.
>>>
>>> I will try to do it, if I can get async from elpa.git, don't
>>> know how to get this for now.
>>
>> Assuming you're in a clone of `jwiegley/emacs-async`, you can do
>> something like:
>>
>>     git remote add -f -t externals/async elpa git://git.sv.gnu.org/emacs/elpa.git
>>     git merge elpa/externals/async
>
> Thanks, I could merge with many conflicts though, now I have to push,
> the address git://git.sv.gnu.org/emacs/elpa.git is the public address
> what is the equivalent with write access?
>
> <user>@git.sv.gnu.org:/srv/git/emacs/elpa.git ?

So no, it is not this, it seems it create again an elpa branch, please
remove it, sorry.
I give up to complicated.

-- 
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 18:36         ` Stefan Monnier
@ 2021-04-30 18:42           ` Stefan Monnier
  0 siblings, 0 replies; 23+ messages in thread
From: Stefan Monnier @ 2021-04-30 18:42 UTC (permalink / raw)
  To: Thierry Volpiatto; +Cc: emacs-devel

>> Thanks, I could merge with many conflicts though, now I have to push,
>> the address git://git.sv.gnu.org/emacs/elpa.git is the public address
>> what is the equivalent with write access?
>>
>> <user>@git.sv.gnu.org:/srv/git/emacs/elpa.git ?
>
> That sounds right, yes,

So something like:

    git remote set-url elpa <user>@git.sv.gnu.org:/srv/git/emacs/elpa.git

followed by

    git push elpa master:externals/async

should do the trick.


        Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 18:37         ` Thierry Volpiatto
@ 2021-04-30 18:48           ` Stefan Monnier
  2021-04-30 19:31             ` Thierry Volpiatto
  0 siblings, 1 reply; 23+ messages in thread
From: Stefan Monnier @ 2021-04-30 18:48 UTC (permalink / raw)
  To: Thierry Volpiatto; +Cc: emacs-devel

>> <user>@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.

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`.  Actually,
I just enabled the `:auto-sync` on this package, so that elpa.gnu.org
will take care of pulling from that branch every once in a while (but
that will not "merge" for you, so it won't work until the elpa.git
branch is merged into https://github.com/jwiegley/emacs-async).


        Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 18:48           ` Stefan Monnier
@ 2021-04-30 19:31             ` Thierry Volpiatto
  2021-04-30 20:21               ` Stefan Monnier
  0 siblings, 1 reply; 23+ messages in thread
From: Thierry Volpiatto @ 2021-04-30 19:31 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]


Stefan Monnier <monnier@iro.umontreal.ca> writes:

> [[PGP Encrypted Part:OK]]
>>> <user>@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
for me.

> 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.

Thanks.

-- 
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 19:31             ` Thierry Volpiatto
@ 2021-04-30 20:21               ` Stefan Monnier
  2021-05-01  4:45                 ` Thierry Volpiatto
  0 siblings, 1 reply; 23+ messages in thread
From: Stefan Monnier @ 2021-04-30 20:21 UTC (permalink / raw)
  To: Thierry Volpiatto; +Cc: emacs-devel

>>>> <user>@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 for 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 <repository> <localbranch>:<remotebranch>

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'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.

>> 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 sufficient).

- The `async-pkg.el` which is absent on `elpa` and present on `master`.
  Do we actually need it on `master`?


        Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-04-30 20:21               ` Stefan Monnier
@ 2021-05-01  4:45                 ` Thierry Volpiatto
  2021-05-01 13:05                   ` Yoni Rabkin
  2021-05-01 13:06                   ` updating async on elpa Stefan Monnier
  0 siblings, 2 replies; 23+ messages in thread
From: Thierry Volpiatto @ 2021-05-01  4:45 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 2405 bytes --]


Stefan Monnier <monnier@iro.umontreal.ca> writes:

> [[PGP Encrypted Part:OK]]
>>>>> <user>@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 for 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 <repository> <localbranch>:<remotebranch>
>
> 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 sufficient).

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.


-- 
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-05-01  4:45                 ` Thierry Volpiatto
@ 2021-05-01 13:05                   ` Yoni Rabkin
  2021-05-01 14:22                     ` Stefan Monnier
  2021-05-01 13:06                   ` updating async on elpa Stefan Monnier
  1 sibling, 1 reply; 23+ messages in thread
From: Yoni Rabkin @ 2021-05-01 13:05 UTC (permalink / raw)
  To: Thierry Volpiatto; +Cc: Stefan Monnier, emacs-devel

Thierry Volpiatto <thievol@posteo.net> writes:

> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
>> [[PGP Encrypted Part:OK]]
>>>>>> <user>@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 for 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 <repository> <localbranch>:<remotebranch>
>>
>> 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.

Having one repository per package is how it works everywhere else
(Savannah, etc.), and is easier to understand because of that. This is
from the point of view of a contributor of course; I cannot speak to how
it looks from Stefan's side.

I would be much happier if emms and rt-liberation had their own
repositories since it would mean that I couldn't possibly break anything
except emms or rt-liberation when I push to those projects in elpa. As
it stands, I'm always extremely wary that I would get the magical git
incantation wrong and mess up the the u.s. constitution and the magna
carta by mistake.

-- 
   "Cut your own wood and it will warm you twice"



^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-05-01  4:45                 ` Thierry Volpiatto
  2021-05-01 13:05                   ` Yoni Rabkin
@ 2021-05-01 13:06                   ` Stefan Monnier
  2021-05-01 14:38                     ` Thierry Volpiatto
  2021-05-01 15:37                     ` Thierry Volpiatto
  1 sibling, 2 replies; 23+ messages in thread
From: Stefan Monnier @ 2021-05-01 13:06 UTC (permalink / raw)
  To: Thierry Volpiatto; +Cc: emacs-devel

> Yes, the name I use -elpa- is bad,

Really?  It sounds like a genuinely natural and intuitive choice to me ;-)

> but yes a repository per repo would be great, in github organizations
> allow having one repo per package like in helm organization.

I know it's more traditional and has its advantages, but currently it's
not really an option.

> What about ((emacs "24.4")) we don't care of 24.3, we are at 27.2 now so
> very far from 24.3.

((emacs "24.4")) would work, yes.  Whether that's better than
((emacs "24.3") (nadvice "0.3")) or even ((cl-lib "0.5") (nadvice "0.3"))
is for the maintainers of Async to decide ;-)

>> - 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.

Why would it matter, since it's on GNU ELPA anyway?


        Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-05-01 13:05                   ` Yoni Rabkin
@ 2021-05-01 14:22                     ` Stefan Monnier
  2021-05-01 14:50                       ` Thierry Volpiatto
  2021-05-02 20:26                       ` (was Re: updating async on elpa) auto-sync for emms Yoni Rabkin
  0 siblings, 2 replies; 23+ messages in thread
From: Stefan Monnier @ 2021-05-01 14:22 UTC (permalink / raw)
  To: Yoni Rabkin; +Cc: Thierry Volpiatto, emacs-devel

> Having one repository per package is how it works everywhere else
> (Savannah, etc.), and is easier to understand because of that. This is
> from the point of view of a contributor of course; I cannot speak to how
> it looks from Stefan's side.

From my side it's plain and simply not an option at all because creating
a new repository on git.sv.gnu.org requires manual intervention from the
Savannah admins.  Having had to design a solution that lives within this
constraint, I'm actually pretty happy about the current result, so if
the constraint were lifted, I'd probably want to try and preserve
the advantages.

In any case the `:auto-sync` feature should make it much less of an issue.

> I would be much happier if emms and rt-liberation had their own
> repositories since it would mean that I couldn't possibly break anything
> except emms or rt-liberation when I push to those projects in elpa.

The `elpa.git` is configured to reject non-fast-forward pushes, which
should catch most blunders.  Plus it is cloned at various different
places which are not all constantly updated, plus (almost) all changes
to it are reflected in the elpa-diffs mailing-list.  So even if you do
manage to make some really terrible mistake it should be quite easy to
recover from it.

You might want to activate the `:auto-sync` on your packages, tho to
save you from the worry.


        Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-05-01 13:06                   ` updating async on elpa Stefan Monnier
@ 2021-05-01 14:38                     ` Thierry Volpiatto
  2021-05-01 15:37                     ` Thierry Volpiatto
  1 sibling, 0 replies; 23+ messages in thread
From: Thierry Volpiatto @ 2021-05-01 14:38 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 1508 bytes --]


Stefan Monnier <monnier@iro.umontreal.ca> writes:

> [[PGP Encrypted Part:OK]]
>> Yes, the name I use -elpa- is bad,
>
> Really?  It sounds like a genuinely natural and intuitive choice to me ;-)

So I misunderstood what you explained :-) I meant the branch name.

>> but yes a repository per repo would be great, in github organizations
>> allow having one repo per package like in helm organization.
>
> I know it's more traditional and has its advantages, but currently it's
> not really an option.

I understand it is not possible otherwise I am sure you would go this
way as it is much simpler an safer for everybody.

>> What about ((emacs "24.4")) we don't care of 24.3, we are at 27.2 now so
>> very far from 24.3.
>
> ((emacs "24.4")) would work, yes.  Whether that's better than
> ((emacs "24.3") (nadvice "0.3")) or even ((cl-lib "0.5") (nadvice "0.3"))
> is for the maintainers of Async to decide ;-)

So lets go for ((emacs "24.4")).

>>> - 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.
>
> Why would it matter, since it's on GNU ELPA anyway?

As long as I have not a safe configuration for pushing to elpa I want to
keep the melpa configuration i.e. with the pkg.el to be sure users use
the last changes. For now each time I try to push to elpa something bad
happens. Of course not having the need of a special branch for elpa
would simplify.

-- 
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-05-01 14:22                     ` Stefan Monnier
@ 2021-05-01 14:50                       ` Thierry Volpiatto
  2021-05-01 15:49                         ` Stefan Monnier
  2021-05-02 20:26                       ` (was Re: updating async on elpa) auto-sync for emms Yoni Rabkin
  1 sibling, 1 reply; 23+ messages in thread
From: Thierry Volpiatto @ 2021-05-01 14:50 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: Yoni Rabkin, emacs-devel

[-- Attachment #1: Type: text/plain, Size: 1677 bytes --]


Stefan Monnier <monnier@iro.umontreal.ca> writes:

> [[PGP Encrypted Part:OK]]
>> Having one repository per package is how it works everywhere else
>> (Savannah, etc.), and is easier to understand because of that. This is
>> from the point of view of a contributor of course; I cannot speak to how
>> it looks from Stefan's side.
>
> From my side it's plain and simply not an option at all because creating
> a new repository on git.sv.gnu.org requires manual intervention from the
> Savannah admins.  Having had to design a solution that lives within this
> constraint, I'm actually pretty happy about the current result, so if
> the constraint were lifted, I'd probably want to try and preserve
> the advantages.
>
> In any case the `:auto-sync` feature should make it much less of an issue.
>
>> I would be much happier if emms and rt-liberation had their own
>> repositories since it would mean that I couldn't possibly break anything
>> except emms or rt-liberation when I push to those projects in elpa.
>
> The `elpa.git` is configured to reject non-fast-forward pushes, which
> should catch most blunders.  Plus it is cloned at various different
> places which are not all constantly updated, plus (almost) all changes
> to it are reflected in the elpa-diffs mailing-list.  So even if you do
> manage to make some really terrible mistake it should be quite easy to
> recover from it.

Oh that's good and make me more confident, like Yoni I am always afraid
of corrupting the elpa repo.

> You might want to activate the `:auto-sync` on your packages, tho to
> save you from the worry.

Is this documented somewhere?

-- 
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-05-01 13:06                   ` updating async on elpa Stefan Monnier
  2021-05-01 14:38                     ` Thierry Volpiatto
@ 2021-05-01 15:37                     ` Thierry Volpiatto
  2021-05-01 17:11                       ` Stefan Monnier
  1 sibling, 1 reply; 23+ messages in thread
From: Thierry Volpiatto @ 2021-05-01 15:37 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]


Hello Stefan again,

now emacs-async master is compliant with elpa (package-requires, no
pkg.el file), so now I can push from master to elpa, my remote called
elpa is pointing to "me@git.sv$gnu.org:/srv/git/emacs/elpa.git", can I
push safely with git push elpa master:refs/heads/externals/async?

Thanks.

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> [[PGP Encrypted Part:OK]]
>> Yes, the name I use -elpa- is bad,
>
> Really?  It sounds like a genuinely natural and intuitive choice to me ;-)
>
>> but yes a repository per repo would be great, in github organizations
>> allow having one repo per package like in helm organization.
>
> I know it's more traditional and has its advantages, but currently it's
> not really an option.
>
>> What about ((emacs "24.4")) we don't care of 24.3, we are at 27.2 now so
>> very far from 24.3.
>
> ((emacs "24.4")) would work, yes.  Whether that's better than
> ((emacs "24.3") (nadvice "0.3")) or even ((cl-lib "0.5") (nadvice "0.3"))
> is for the maintainers of Async to decide ;-)
>
>>> - 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.
>
> Why would it matter, since it's on GNU ELPA anyway?
>
>
>         Stefan
>
>
>
>
> [[End of PGP Encrypted Part]]


-- 
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-05-01 14:50                       ` Thierry Volpiatto
@ 2021-05-01 15:49                         ` Stefan Monnier
  0 siblings, 0 replies; 23+ messages in thread
From: Stefan Monnier @ 2021-05-01 15:49 UTC (permalink / raw)
  To: Thierry Volpiatto; +Cc: Yoni Rabkin, emacs-devel

>> You might want to activate the `:auto-sync` on your packages, tho to
>> save you from the worry.
> Is this documented somewhere?

In the code and in my head, mostly.


        Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-05-01 15:37                     ` Thierry Volpiatto
@ 2021-05-01 17:11                       ` Stefan Monnier
  2021-05-01 18:01                         ` Thierry Volpiatto
  0 siblings, 1 reply; 23+ messages in thread
From: Stefan Monnier @ 2021-05-01 17:11 UTC (permalink / raw)
  To: Thierry Volpiatto; +Cc: emacs-devel

> now emacs-async master is compliant with elpa (package-requires, no
> pkg.el file), so now I can push from master to elpa, my remote called
> elpa is pointing to "me@git.sv$gnu.org:/srv/git/emacs/elpa.git", can I
> push safely with git push elpa master:refs/heads/externals/async?

Yes.  Tho there's not much to push because the `:auto-sync` is enabled
so elpa.gnu.org just pulled your new changes into elpa.git already.


        Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: updating async on elpa
  2021-05-01 17:11                       ` Stefan Monnier
@ 2021-05-01 18:01                         ` Thierry Volpiatto
  0 siblings, 0 replies; 23+ messages in thread
From: Thierry Volpiatto @ 2021-05-01 18:01 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]


Stefan Monnier <monnier@iro.umontreal.ca> writes:

> [[PGP Encrypted Part:OK]]
>> now emacs-async master is compliant with elpa (package-requires, no
>> pkg.el file), so now I can push from master to elpa, my remote called
>> elpa is pointing to "me@git.sv$gnu.org:/srv/git/emacs/elpa.git", can I
>> push safely with git push elpa master:refs/heads/externals/async?
>
> Yes.  Tho there's not much to push because the `:auto-sync` is enabled
> so elpa.gnu.org just pulled your new changes into elpa.git already.

Yes, I just realised this now, thanks.

-- 
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* (was Re: updating async on elpa) auto-sync for emms
  2021-05-01 14:22                     ` Stefan Monnier
  2021-05-01 14:50                       ` Thierry Volpiatto
@ 2021-05-02 20:26                       ` Yoni Rabkin
  2021-05-03 13:39                         ` Stefan Monnier
  1 sibling, 1 reply; 23+ messages in thread
From: Yoni Rabkin @ 2021-05-02 20:26 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: emacs-devel

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> You might want to activate the `:auto-sync` on your packages, tho to
> save you from the worry.

Up until now I would merge into the "elpa" branch in the Emms Savannah
repo, and then push to "externals/emms" from there. If I understand
:auto-sync correctly (I recall us discussing such a feature), then I
won't need the "elpa" branch in our repo anymore. Instead, we'll:

    * develop on "main" until we are ready for a release

    * increment ";; Version"

    * ...and emacs/elpa.git will do the rest (how often does it
      sync?). This assuming that nobody put any changes conflicting with
      the Emms Savannah repo directly into "externals/emms", which
      nobody should be doing anyway.

So, can you please enable auto-sync for Emms as well so that it syncs
from the main branch of our savannah repository?

-- 
   "Cut your own wood and it will warm you twice"



^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: (was Re: updating async on elpa) auto-sync for emms
  2021-05-02 20:26                       ` (was Re: updating async on elpa) auto-sync for emms Yoni Rabkin
@ 2021-05-03 13:39                         ` Stefan Monnier
  0 siblings, 0 replies; 23+ messages in thread
From: Stefan Monnier @ 2021-05-03 13:39 UTC (permalink / raw)
  To: Yoni Rabkin; +Cc: emacs-devel

>> You might want to activate the `:auto-sync` on your packages, tho to
>> save you from the worry.
>
> Up until now I would merge into the "elpa" branch in the Emms Savannah
> repo, and then push to "externals/emms" from there. If I understand
> :auto-sync correctly (I recall us discussing such a feature), then I
> won't need the "elpa" branch in our repo anymore. Instead, we'll:
>
>     * develop on "main" until we are ready for a release
>
>     * increment ";; Version"
>
>     * ...and emacs/elpa.git will do the rest

Sounds right.

>       (how often does it sync?).

Currently the sync is done every hour, IIRC.

>       This assuming that nobody put any changes conflicting with
>       the Emms Savannah repo directly into "externals/emms", which
>       nobody should be doing anyway.

Indeed, the auto-sync will only pull "fast-forwards" from the upstream,
so if someone commits directly to `elpa.git` the auto-sync will fail
until someone merges that changes into the upstream.

> So, can you please enable auto-sync for Emms as well so that it syncs
> from the main branch of our savannah repository?

Done,


        Stefan




^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2021-05-03 13:39 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-30 11:56 updating async on elpa Thierry Volpiatto
2021-04-30 14:17 ` Stefan Monnier
2021-04-30 15:20   ` Thierry Volpiatto
2021-04-30 16:21     ` Stefan Monnier
2021-04-30 17:42       ` Thierry Volpiatto
2021-04-30 18:36         ` Stefan Monnier
2021-04-30 18:42           ` Stefan Monnier
2021-04-30 18:37         ` Thierry Volpiatto
2021-04-30 18:48           ` Stefan Monnier
2021-04-30 19:31             ` Thierry Volpiatto
2021-04-30 20:21               ` Stefan Monnier
2021-05-01  4:45                 ` Thierry Volpiatto
2021-05-01 13:05                   ` Yoni Rabkin
2021-05-01 14:22                     ` Stefan Monnier
2021-05-01 14:50                       ` Thierry Volpiatto
2021-05-01 15:49                         ` Stefan Monnier
2021-05-02 20:26                       ` (was Re: updating async on elpa) auto-sync for emms Yoni Rabkin
2021-05-03 13:39                         ` Stefan Monnier
2021-05-01 13:06                   ` updating async on elpa Stefan Monnier
2021-05-01 14:38                     ` Thierry Volpiatto
2021-05-01 15:37                     ` Thierry Volpiatto
2021-05-01 17:11                       ` Stefan Monnier
2021-05-01 18:01                         ` Thierry Volpiatto

unofficial mirror of emacs-devel@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/emacs-devel/0 emacs-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 emacs-devel emacs-devel/ https://yhetil.org/emacs-devel \
		emacs-devel@gnu.org
	public-inbox-index emacs-devel

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.yhetil.org/yhetil.emacs.devel
	nntp://news.gmane.io/gmane.emacs.devel


code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs.git

AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git