From: Jorgen Schaefer <forcer@forcix.cx>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: johnw@gnu.org, Stefan Monnier <monnier@iro.umontreal.ca>,
emacs-devel@gnu.org
Subject: Re: Replacing the `elpa' branch
Date: Sun, 10 Mar 2013 17:51:20 +0100 [thread overview]
Message-ID: <20130310175120.55791dae@forcix.kollektiv-hamburg.de> (raw)
In-Reply-To: <jwv4ngj6exc.fsf-monnier+emacs@gnu.org>
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
next prev parent reply other threads:[~2013-03-10 16:51 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-15 20:33 Replacing the `elpa' branch Stefan Monnier
2013-02-16 14:06 ` Richard Stallman
2013-02-16 14:31 ` Stefan Monnier
2013-02-18 6:33 ` Leo Liu
2013-02-25 16:32 ` Ted Zlatanov
2013-03-09 5:02 ` Fabian Ezequiel Gallina
2013-03-10 5:18 ` Stefan Monnier
2013-03-10 8:06 ` Andreas Schwab
2013-03-10 10:19 ` Jorgen Schaefer
2013-03-10 11:57 ` Andreas Schwab
2013-03-10 12:06 ` Jorgen Schaefer
2013-03-10 16:35 ` Andreas Schwab
2013-03-10 12:44 ` Achim Gratz
2013-03-10 16:51 ` Jorgen Schaefer [this message]
2013-03-10 17:37 ` Dmitry Gutov
2013-03-10 17:41 ` Jorgen Schaefer
2013-03-10 18:52 ` Andreas Schwab
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130310175120.55791dae@forcix.kollektiv-hamburg.de \
--to=forcer@forcix.cx \
--cc=emacs-devel@gnu.org \
--cc=johnw@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).