Request inclusion of ioccur.el in ELPA

Request inclusion of ioccur.el in ELPA

[Thierry Volpiatto]

Hi,
would it be possible to include ioccur.el in ELPA?

http://mercurial.intuxication.org/hg/ioccur

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Re: Request inclusion of ioccur.el in ELPA

[Stefan Monnier]

> would it be possible to include ioccur.el in ELPA?
> http://mercurial.intuxication.org/hg/ioccur

Of course, bzr-hg doesn't want to cooperate right now, so we can either
wait until I get it to work, or I can add the file as is, losing
the history.


        Stefan

Re: Request inclusion of ioccur.el in ELPA

[Thierry Volpiatto]

Hi Stefan,

Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

>> would it be possible to include ioccur.el in ELPA?
>> http://mercurial.intuxication.org/hg/ioccur
>
> Of course, bzr-hg doesn't want to cooperate right now, so we can either
> wait until I get it to work,
Ok, better waiting you fix this, take your time, no urgency!
Thanks.


> or I can add the file as is, losing the history.
>
>
>         Stefan

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Re: Request inclusion of ioccur.el in ELPA

[Stefan Monnier]

> Ok, better waiting you fix this, take your time, no urgency!

OK, it looks like the repository is not really corrupted: you can still
check it out, just not directly.  I.e. you have to
"bzr checkout -r 170 ...elpa" and then "bzr update".
So, it can probably be fixed by fixin bzr without changing
the repository.  So I installed your ioccur, with the patch below.

It has full history, AFAIK, but I have no experience with bzr-hg, so
I don't know how future merges may or may not work.  IOW, if you can
use the emacs/elpa as the upstream from now on, that's better.


        Stefan


=== modified file 'packages/ioccur/ioccur.el'
--- packages/ioccur/ioccur.el	2012-03-14 12:35:01 +0000
+++ packages/ioccur/ioccur.el	2012-03-14 12:40:15 +0000
@@ -1,14 +1,11 @@
 ;;; ioccur.el --- Incremental occur.
 
-;; Author: Thierry Volpiatto <thierry dot volpiatto at gmail dot com>
-
-;; Copyright (C) 2010~2011 Thierry Volpiatto, all rights reserved.
-
-;; Compatibility: GNU Emacs >=22.3
+;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
+;; Author: Thierry Volpiatto <thierry dot volpiatto at gmail dot com>
 ;; X-URL: http://mercurial.intuxication.org/hg/ioccur
-
-;; This file is not part of GNU Emacs.
+;; Version: 2.4
+;; Compatibility: GNU Emacs >=22.3
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -21,9 +18,7 @@
 ;; General Public License for more details.
 ;; 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
+;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ;;; Install:
 ;;
@@ -51,7 +46,7 @@
 ;; (add-to-list 'desktop-globals-to-save 'ioccur-history)
 ;;
 ;; For more info See:
-;; [EVAL] (info "(emacs) saving emacs sessions")
+;; [EVAL] (info "(emacs) Saving Emacs Sessions")
 
 ;;; Code:
 (require 'derived)

Re: Request inclusion of ioccur.el in ELPA

[Thierry Volpiatto]

Hi Stefan,

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

>> Ok, better waiting you fix this, take your time, no urgency!
>
> OK, it looks like the repository is not really corrupted: you can still
> check it out, just not directly.
Good news.


> I.e. you have to "bzr checkout -r 170 ...elpa" and then "bzr update".
> So, it can probably be fixed by fixin bzr without changing the
> repository.  So I installed your ioccur, with the patch below.
Thank you very much.

> It has full history, AFAIK, but I have no experience with bzr-hg, so
> I don't know how future merges may or may not work.
Ok, I will check if you use the very last changes 
(i.e "hg update -C development")


> IOW, if you can use the emacs/elpa as the upstream from now on, that's
> better.
Yes I will do that.
Thanks also for the patch.

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Re: Request inclusion of ioccur.el in ELPA

[Chong Yidong]

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

> OK, it looks like the repository is not really corrupted: you can still
> check it out, just not directly.  I.e. you have to
> "bzr checkout -r 170 ...elpa" and then "bzr update".
> So, it can probably be fixed by fixin bzr without changing
> the repository.  So I installed your ioccur, with the patch below.

What about doing `bzr push --overwrite' from revision 170 into the elpa
branch stored on Savannah?  IIUC, that should overwrite the elpa branch
entirely, discarding the problematic revno 171 commit.

Re: Request inclusion of ioccur.el in ELPA

[Andreas Schwab]

Chong Yidong <cyd@gnu.org> writes:

> What about doing `bzr push --overwrite' from revision 170 into the elpa
> branch stored on Savannah?

Never ever modify published history.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Request inclusion of ioccur.el in ELPA

[Stefan Monnier]

>> OK, it looks like the repository is not really corrupted: you can still
>> check it out, just not directly.  I.e. you have to
>> "bzr checkout -r 170 ...elpa" and then "bzr update".
>> So, it can probably be fixed by fixin bzr without changing
>> the repository.  So I installed your ioccur, with the patch below.
> What about doing `bzr push --overwrite' from revision 170 into the elpa
> branch stored on Savannah?

You mean reverting to version 170?  And then do what with the rest?
Replay it?  I'd guess that replaying it will re-add the same problem
when I add 171.  IOW We may end up having to do that, but first I'd like
to know what it is that made 171 into a problem (I know that 171 is an
unusual commit because it is the result of a "bzr join").  I'm not sure
the problem is really a bug in Bzr that resulted in a corrupted 171.
It doesn't seem like the repository is really corrupted, so maybe the
repository is fine and the bug is only in the checkout code (and indeed,
IIUC some (older?) versions of Bzr will happily checkout the current
`elpa' branch, since some people failed to reproduce the problem).


        Stefan

Re: Request inclusion of ioccur.el in ELPA

[Thierry Volpiatto]

Hi,
I don't see 'ioccur' in M-x list-packages.
Do I have some thing to do to make it appear?
Thanks.

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Re: Request inclusion of ioccur.el in ELPA

[Stefan Monnier]

> I don't see 'ioccur' in M-x list-packages.

That's because it's not there.

> Do I have some thing to do to make it appear?

Yes: you have to wait.
The archive is rebuilt from the `elpa' branch every once in a while, but
it's not fully automatic yet.


        Stefan

Re: Request inclusion of ioccur.el in ELPA

[Thierry Volpiatto]

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

>> I don't see 'ioccur' in M-x list-packages.
>
> That's because it's not there.
>
>> Do I have some thing to do to make it appear?
>
> Yes: you have to wait.
> The archive is rebuilt from the `elpa' branch every once in a while, but
> it's not fully automatic yet.
Ok thanks.

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Re: Request inclusion of ioccur.el in ELPA

[Chong Yidong]

Thierry Volpiatto <thierry.volpiatto@gmail.com> writes:

> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
>>> I don't see 'ioccur' in M-x list-packages.
>>
>> That's because it's not there.
>>
>>> Do I have some thing to do to make it appear?
>>
>> Yes: you have to wait.
>> The archive is rebuilt from the `elpa' branch every once in a while, but
>> it's not fully automatic yet.
> Ok thanks.

It's updated now.

Re: Request inclusion of ioccur.el in ELPA

[Thierry Volpiatto]

Chong Yidong <cyd@gnu.org> writes:

> Thierry Volpiatto <thierry.volpiatto@gmail.com> writes:
>
>> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>>
>>>> I don't see 'ioccur' in M-x list-packages.
>>>
>>> That's because it's not there.
>>>
>>>> Do I have some thing to do to make it appear?
>>>
>>> Yes: you have to wait.
>>> The archive is rebuilt from the `elpa' branch every once in a while, but
>>> it's not fully automatic yet.
>> Ok thanks.
>
> It's updated now.
Thanks.

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Re: Request inclusion of ioccur.el in ELPA

[Thierry Volpiatto]

Hi Stefan,

Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

>> would it be possible to include ioccur.el in ELPA?
>> http://mercurial.intuxication.org/hg/ioccur
>
> Of course, bzr-hg doesn't want to cooperate right now, so we can either
> wait until I get it to work, or I can add the file as is, losing
> the history.
I have created a new repo there, maybe it will be easier for bzr to
convert...

git://repo.or.cz/Emacs-ioccur.git

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Re: Request inclusion of ioccur.el in ELPA

[Stefan Monnier]

>>> would it be possible to include ioccur.el in ELPA?
>>> http://mercurial.intuxication.org/hg/ioccur
>> Of course, bzr-hg doesn't want to cooperate right now, so we can either
>> wait until I get it to work, or I can add the file as is, losing
>> the history.
> I have created a new repo there, maybe it will be easier for bzr to
> convert...
> git://repo.or.cz/Emacs-ioccur.git

I actually managed to convert the Hg one recently, but when trying to
"bzr join" it, I bumped into another problem (a problem in Bzr itself).

And now the ELPA repository is in a weird state (see
https://bugs.launchpad.net/bzr/+bug/937101).


        Stefan

Re: Request inclusion of ioccur.el in ELPA

[Thierry Volpiatto]

Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

>>>> would it be possible to include ioccur.el in ELPA?
>>>> http://mercurial.intuxication.org/hg/ioccur
>>> Of course, bzr-hg doesn't want to cooperate right now, so we can either
>>> wait until I get it to work, or I can add the file as is, losing
>>> the history.
>> I have created a new repo there, maybe it will be easier for bzr to
>> convert...
>> git://repo.or.cz/Emacs-ioccur.git
>
> I actually managed to convert the Hg one recently, but when trying to
> "bzr join" it, I bumped into another problem (a problem in Bzr itself).
>
> And now the ELPA repository is in a weird state (see
> https://bugs.launchpad.net/bzr/+bug/937101).
I see, that's bad, hope the bzr guys will fix that soon.
Thanks.

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997