Confusion about new format of ELPA repo

Confusion about new format of ELPA repo

[Eric Abrahamsen]

I'm trying to release some updates to my org-translate package, which is
developed in ELPA itself. It is not an external (has an :external nil
key in the externals-list file). The entire "packages" subdirectory is
now ignored by .gitignore, meaning I would need to force-add changes to
this file. Maybe each package is now meant to be worked on in a separate
branch? But the .gitignore problem is still there.

Before I go screw something up -- how are we meant to work around
gitignore?

Thanks,
Eric

Re: Confusion about new format of ELPA repo

[Lars Ingebrigtsen]

Eric Abrahamsen <eric@ericabrahamsen.net> writes:

> Maybe each package is now meant to be worked on in a separate branch?

Yes, every package in ELPA is now on its own branch, and only the files
from that package is present in that branch.  To take an example at
random:

larsi@xo:~/src/emacs/elpa$ git checkout externals/ack
Branch 'externals/ack' set up to track remote branch 'externals/ack' from 'origin'.
Switched to a new branch 'externals/ack'
larsi@xo:~/src/emacs/elpa$ ls
ack.el  csv-mode.elc  packages  pcmpl-ack.el  README.rst

If you have an ELPA checkout from before the structure was changed, it's
perhaps best to do a fresh checkout now to get rid of a bunch of
artefacts from the old layout.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: Confusion about new format of ELPA repo

[Lars Ingebrigtsen]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> larsi@xo:~/src/emacs/elpa$ git checkout externals/ack
> Branch 'externals/ack' set up to track remote branch 'externals/ack'
> from 'origin'.
> Switched to a new branch 'externals/ack'
> larsi@xo:~/src/emacs/elpa$ ls
> ack.el  csv-mode.elc  packages  pcmpl-ack.el  README.rst
>
> If you have an ELPA checkout from before the structure was changed, it's
> perhaps best to do a fresh checkout now to get rid of a bunch of
> artefacts from the old layout.

Heh, I should have followed my own advice.  This is what's it's supposed
to look like:

larsi@xo:~/src/emacs/elpa$ git checkout externals/ack
Branch 'externals/ack' set up to track remote branch 'externals/ack' from 'origin'.
Switched to a new branch 'externals/ack'
larsi@xo:~/src/emacs/elpa$ ls
ack.el  pcmpl-ack.el  README.rst


-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: Confusion about new format of ELPA repo

[Eric Abrahamsen]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Lars Ingebrigtsen <larsi@gnus.org> writes:
>
>> larsi@xo:~/src/emacs/elpa$ git checkout externals/ack
>> Branch 'externals/ack' set up to track remote branch 'externals/ack'
>> from 'origin'.
>> Switched to a new branch 'externals/ack'
>> larsi@xo:~/src/emacs/elpa$ ls
>> ack.el  csv-mode.elc  packages  pcmpl-ack.el  README.rst
>>
>> If you have an ELPA checkout from before the structure was changed, it's
>> perhaps best to do a fresh checkout now to get rid of a bunch of
>> artefacts from the old layout.
>
> Heh, I should have followed my own advice.  This is what's it's supposed
> to look like:
>
> larsi@xo:~/src/emacs/elpa$ git checkout externals/ack
> Branch 'externals/ack' set up to track remote branch 'externals/ack' from 'origin'.
> Switched to a new branch 'externals/ack'
> larsi@xo:~/src/emacs/elpa$ ls
> ack.el  pcmpl-ack.el  README.rst

Aha, got it. I'm running a "git fetch" that looks like it's going to
take a while, so I'll see what the new landscape looks like after lunch.
Thanks for the explanation.

Re: Confusion about new format of ELPA repo

[Stefan Monnier]

> Aha, got it. I'm running a "git fetch" that looks like it's going to
> take a while, so I'll see what the new landscape looks like after lunch.
> Thanks for the explanation.

You can also do:

   git clone --single-branch -b externals/ack .../elpa.git

which should only download the data for that branch.


        Stefan

Re: Confusion about new format of ELPA repo

[Eric Abrahamsen]

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

>> Aha, got it. I'm running a "git fetch" that looks like it's going to
>> take a while, so I'll see what the new landscape looks like after lunch.
>> Thanks for the explanation.
>
> You can also do:
>
>    git clone --single-branch -b externals/ack .../elpa.git
>
> which should only download the data for that branch.

Well I have several packages to work on, and had a long lunch to get
through, so I brought the whole thing down. This works nicely! I've
never done worktree-inside-a-repo before, but all the tooling handles it
well, and I didn't even have to change my load-path additions.

Thanks,
Eric

Re: Confusion about new format of ELPA repo

[Stefan Monnier]

>> You can also do:
>>    git clone --single-branch -b externals/ack .../elpa.git
>> which should only download the data for that branch.
> Well I have several packages to work on,

[ I pointed it out for completeness's sake, and for the benefit of
  others, really.  ]

> and had a long lunch to get through, so I brought the whole thing
> down.  This works nicely!  I've never done worktree-inside-a-repo
> before, but all the tooling handles it well, and I didn't even have to
> change my load-path additions.

Very nice to hear, thank you,


        Stefan

Re: Confusion about new format of ELPA repo

[Stefan Monnier]

> larsi@xo:~/src/emacs/elpa$ git checkout externals/ack

I recommend using worktrees as in:

    git worktree add packages/ack externals/ack
or
    make externals

which will create all the worktrees for all the packages.

Real soon now you should also be able to just say

    make packages/ack

in order to setup that worktree.


        Stefan

Re: Confusion about new format of ELPA repo

[Lars Ingebrigtsen]

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

> I recommend using worktrees as in:
>
>     git worktree add packages/ack externals/ack
> or
>     make externals
>
> which will create all the worktrees for all the packages.

Oh, that's very nice; thanks.  Having all the ELPA packages available at
the same time is a lot more convenient than switching branches all the
time.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: Confusion about new format of ELPA repo

[Stefan Monnier]

> Oh, that's very nice; thanks.  Having all the ELPA packages available
> at the same time is a lot more convenient than switching branches all
> the time.

It took me a while to start using Bazaar's lightweight branches, but
it's one thing Bazaar got right.

I never use Git's model of one worktree in which you frequently switch
from branch to branch, I instead almost always have a few worktrees in
sibling directories.


        Stefan

Re: Confusion about new format of ELPA repo

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

Is it possible that the documentation for this format, and how to use it,
could use improvement?

-- 
Dr Richard Stallman
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: Confusion about new format of ELPA repo

[Stefan Monnier]

> Is it possible that the documentation for this format, and how to use it,
> could use improvement?

And here I was, thinking you didn't like euphemisms?


        Stefan

Re: Confusion about new format of ELPA repo

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > > Is it possible that the documentation for this format, and how to use it,
  > > could use improvement?

  > And here I was, thinking you didn't like euphemisms?

It's not a euphemism, but I did mean it to be very general
and not assume anything about the situation.
I don't know what documentation we have for that format
so I don't know how much, or what kind, of change is called for.

What I did know is that people were talking about dealing with
some kind of inadequacy in it, so I figured that the discussion should
include the possibility of improving that documentation.


-- 
Dr Richard Stallman
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: Confusion about new format of ELPA repo

[Stefan Monnier]

>   > > Is it possible that the documentation for this format, and how to use it,
>   > > could use improvement?
>
>   > And here I was, thinking you didn't like euphemisms?
>
> It's not a euphemism, but I did mean it to be very general

Oh, well.  I thought you were being facetious, because, yes, it is in
dire need of improvement, because the way it works has changed
significantly and the doc is a fair bit behind.


        Stefan