Bugzilla Bug 136048

Hi,

I have made a patch for echangelog to support subversion in echangelog. Would
be nice to find it in gentoolkit-dev so we can have decent changelogs in
overlays :)

Created an attachment (id=88661) [edit]
echangelog-svn.diff

tools, give a few days (slaughtered at work at the moment) and I'll have a
patch for git and possibly mercurial along with a new gentoolkit-dev ebuild
with correct deps.

I have added this to the sunrise overlay so we can use a working echangelog
while we are waiting :)

Created an attachment (id=103643) [edit]
hopefully a bit more agnostic patch

please please please test this ;)

I need assistance with this one.  I don't have the resources or time to test
this one. So I need someone to test and let me know which patch is better
suited for inclusion.

http://www.gentoo-sunrise.org/svn-sunrise-commit/trunk/echangelog-tng

this one has been working perfectly for sunrise for several months now

It works fine for me - I've tested Alec's one, it needed the one change:

system("$vcs{$vcs}{add} ChangeLog > /dev/null 2>&1")

line #439

What is up Paul? 4 days and no reaction, seems your interest has ceased again
:/

Close but not quite. I've been busy with work and sick with the flu.  I plan on
updating subversion this weekend.

$ svn commit -m "Update echangelog to support Subversion and git. Bug #136048"
Sending        echangelog/echangelog
Transmitting file data .
Committed revision 348.

(In reply to comment #10)
> $ svn commit -m "Update echangelog to support Subversion and git. Bug #136048"
> Sending        echangelog/echangelog
> Transmitting file data .
> Committed revision 348.

oh snap, genstef can't cut my nuts off now!

(In reply to comment #11)
> oh snap, genstef can't cut my nuts off now!

heh, I still can for repoman now. Is there a bug open about that one?

I dont think anyone besides me and the prefix people cares. Sunrise has its own
replacement. Hopefully we will soon have paludis/pkgcore replacements that
allow committing to svn/git.

The patch is not working correctly with CVS and the gentoo-x86 tree. I received
the following when going to update gentoolkit-dev:

$ cvs update
M Manifest
A gentoolkit-dev-0.2.6.3.ebuild
A files/digest-gentoolkit-dev-0.2.6.3
$ echangelog
**
** NOTE: No non-trivial changed files found.  Normally echangelog
** should be run after all affected files have been added and/or
** modified.  Did you forget to cvs add?
**
Use of uninitialized value in concatenation (.) or string at
/usr/bin/echangelog line 326.
--- ChangeLog   2007-03-21 08:31:11.000000000 -0500
+++ ChangeLog.new       2007-03-21 08:32:39.000000000 -0500
@@ -2,6 +2,9 @@
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.48
2007/01/20 16:29:14 fuzzyray Exp $

+  21 Mar 2007; Paul Varner <fuzzyray@gentoo.org> ChangeLog:
+  Revbump to add subversion support to echangelog (Bug #136048)
+
   20 Jan 2007; Paul Varner <fuzzyray@gentoo.org>
   -gentoolkit-dev-0.2.5.ebuild, -gentoolkit-dev-0.2.6.1.ebuild:
   Removed older ebuilds which install epkgmove

So I need to get this figured out before releasing.  For any developer who
wants to help, the source is available at:

svn+ssh://svn.gentoo.org/var/svnroot/gentoolkit/trunk/

Nevermind on the previous comment. It was apparently a PEBKAC problem since I
re-applied the patch and it seems to be working correctly.

Released in gentoolkit-dev-0.2.6.3

gentoolkit-dev-0.2.6.3 removed from tree due to too much breakage caused by the
patch.  I am reverting back to the original code prior to the patch.

are there any examples of the breakages? (curious :)

Bug# 172017 was the big one.  Additionaly, the patch was prefixing removed
files with a comma instead of a dash.  Due to the fact that Changelogs in the
tree were getting broken, I chose to revert it, rather than keep
troubleshooting and testing.

I'm willing to put this patch back in, but we need to ensure that it is highly
tested and debugged prior to doing so.

can you attach your current version here please and deprecate the other
attachments?

Maybe we can then collectively work towards solving the problem.


And it would be cool if you could mask broken versions instead of bringing out
new versions with exactly the same content as in a lower version number. Saves
us all a lot of download and makes sure that the problem is not forgotten, and
that we can still emerge the version to test it. Also looked kinda as if you
wanted to drop this for good how you handled it and have no intentions to fix
or let others fix this, disappointing :/ I hope I am wrong there.

Removed the now no longer applicable inSVN keyword.

(In reply to comment #19)
> can you attach your current version here please and deprecate the other
> attachments?

The version that was patched can be found at:
http://sources.gentoo.org/viewcvs.py/gentoolkit/trunk/src/echangelog/echangelog?rev=363

> Also looked kinda as if you wanted to drop this for good how you handled it
> and have no intentions to fix or let others fix this, disappointing :/
> I hope I am wrong there.

I'm confused here, my previous comment stated "I'm willing to put this patch
back in" with the caveat that we need to test it fully.

Finally, the reason it was yanked was because I was asked to yank it due the
ChangeLog breakage that it caused.

(In reply to comment #20)
> 
> Finally, the reason it was yanked was because I was asked to yank it due the
> ChangeLog breakage that it caused.
> 

The normal procedure in these cases is package.mask which was already done. Not
a version bump with the same stuff as the previous version.

The version bump was mainly to fix another bug and was unrelated to this. 
However, upon re-reading my Changelog message it didn't come across that way.
So I apologize about that.

$ diff -u echangelog.orig echangelog.fixed
--- echangelog.orig     2007-04-25 13:05:14.000000000 +0200
+++ echangelog.fixed    2007-04-25 13:05:55.000000000 +0200
@@ -121,7 +121,7 @@
            next;
        }
         push @files, $filename;
-        ($actions{$filename} = $status) =~ tr/ARDM/+--/d;
+        ($actions{$filename} = $status) =~ tr/DARM/-+-/d;
     }
 }


That fixes the prefixed with "," bug. I wonder where you got this borken
version of the echangelog svn support ..

Looking at another issue atm, changed ebuilds are omitted :/

Please apply this patch :)

--- echangelog.orig     2007-04-25 13:05:14.000000000 +0200
+++ echangelog.fixed    2007-04-25 13:49:17.000000000 +0200
@@ -261,7 +261,7 @@
        # We assume GNU diff output format here.
        # git format: diff --git a/app-doc/repodoc/metadata.xml
b/app-doc/repodoc/metadata.xml
        elsif (/$vcs{$vcs}{regex}/) {
-            my ($f) = ($1);
+            my ($f) = ($2);
             # file was removed from git
            if (/^deleted file mode/) {
                    $_ = <C>; # just eat the line


Fixes the bug with modified files not being diplayed.

$ svn commit -m "Re-added subversion/git support with fixes from genstef. (Bug
#136048)"
Sending        ChangeLog
Sending        src/echangelog/echangelog
Transmitting file data ..
Committed revision 395.

http://sources.gentoo.org/viewcvs.py/gentoolkit/trunk/src/echangelog/echangelog?rev=395

*** Bug 89827 has been marked as a duplicate of this bug. ***

finally unmasked and fixed, thanks