From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jorgen Schaefer Newsgroups: gmane.emacs.devel Subject: Re: Replacing the `elpa' branch Date: Sun, 10 Mar 2013 17:51:20 +0100 Message-ID: <20130310175120.55791dae@forcix.kollektiv-hamburg.de> References: <87txp0tkuc.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1362934289 7513 80.91.229.3 (10 Mar 2013 16:51:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 10 Mar 2013 16:51:29 +0000 (UTC) Cc: johnw@gnu.org, Stefan Monnier , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 10 17:51:53 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UEjTU-00010X-JV for ged-emacs-devel@m.gmane.org; Sun, 10 Mar 2013 17:51:52 +0100 Original-Received: from localhost ([::1]:57032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEjT8-00062w-Jo for ged-emacs-devel@m.gmane.org; Sun, 10 Mar 2013 12:51:30 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEjT5-00062r-BL for emacs-devel@gnu.org; Sun, 10 Mar 2013 12:51:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UEjT2-000202-QE for emacs-devel@gnu.org; Sun, 10 Mar 2013 12:51:27 -0400 Original-Received: from istinn.electusmatari.com ([83.169.37.145]:38963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEjT2-0001zo-Gw; Sun, 10 Mar 2013 12:51:24 -0400 Original-Received: from forcix.kollektiv-hamburg.de (hmbg-5f7642ff.pool.mediaWays.net [95.118.66.255]) by istinn.electusmatari.com (Postfix) with ESMTPSA id 820CF15DC0004; Sun, 10 Mar 2013 17:51:22 +0100 (CET) In-Reply-To: X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; i486-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 83.169.37.145 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:157700 Archived-At: On Sun, 10 Mar 2013 00:18:52 -0500 Stefan Monnier 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