Re: Replacing the `elpa' branch

[Jorgen Schaefer <forcer@forcix.cx>]

On Sun, 10 Mar 2013 00:18:52 -0500
Stefan Monnier <monnier@iro.umontreal.ca> wrote:

> >> Let me know here or over e-mail what needs to be done.  I plan to
> >> do some work with the ELPA anyhow after the 24.3 release (to
> >> address the things that came up during the ELPA security
> >> discussion).
> > What's the status of the ELPA branch replacement?
> 
> Haven't had time to devote to it.  AFAIK, there's a Git version of the
> branch (prepared by Joergen)

Just so I'm not the only one with this "arcane" knowledge. It's not
really difficult to prepare a git version of bzr, just requires some
non-obvious incantations:


mkdir elpa-migration
cd elpa-migration
bzr branch https://code.launchpad.net/~schwab-linux-m68k/bzr-fastimport/master fastimport
export BZR_PLUGIN_PATH=$HOME/elpa-migration
export PYTHONPATH=$HOME/elpa-migration/
mkdir bzr ; cd bzr
bzr branch http://bzr.savannah.gnu.org/r/emacs/elpa
cd elpa
bzr revert
cd ../..
mkdir -p  git/elpa ; cd git/elpa ; git init
bzr fast-export --plain ~/elpa-migration/bzr/elpa/ | git fast-import --force
git checkout


This results in a git copy of the ELPA bzr repository, but it's lacking
information about all the upstream repositories the bzr repo is tracking.

I used read-tree to import them, but it might be better to use submodule.
I know too little about git and the uses here to make a decision.

Repositories to be tracked:

f90-interface-browser  https://github.com/wence-/f90-iface/
coffee-mode            https://github.com/defunkt/coffee-mode
ioccur                 https://github.com/thierryvolpiatto/ioccur
yasnippet              https://github.com/capitaomorte/yasnippet
ggtags                 https://github.com/leoliu/ggtags
ack-el                 https://github.com/leoliu/ack-el

For each of those, I did the following:

git remote add $PACKAGE $URL
git fetch -n $PACKAGE
git checkout -b $PACKAGE $PACKAGE/master
git checkout master

I then merged each of them with a separate commit using the following:

git rm -r packages/$PACKAGE
git read-tree --prefix=packages/$PACKAGE -u $PACKAGE
git add packages/$PACKAGE
git commit -m "Merged packages/$PACKAGE from $URL"

This then is only missing js2-mode, which is hosted on subversion. I
do not use git-svn much at all and have no idea how to do a read-tree
or submodule with that. The svn repo is hosted here:

svn checkout http://js2-mode.googlecode.com/svn/trunk/ js2-mode-read-only


It might be best if someone who has more clue about both git and how
elpa is used picks up from here.


Regards,
	-- Jorgen