Re: [PATCH 2/1] git svn: remove extraneous newline from log output

From: Jens Seidel <jensseidel@users.sf.net>
Date: Jul 25, 2010, 17:35 UTC
Message-ID: <20100725173549.GA7930@merkur.sol.de>
In-Reply-To: <20100725081344.GB22373@dcvr.yhbt.net>

Hi Eric,

On Sun, Jul 25, 2010 at 08:13:44AM +0000, Eric Wong wrote:

> This is to match the output of "svn log", which does not
> add an extra newline before the next log entry.

thanks for the patch but it doesn't work in the general case.

I attached a sample Subversion repository dump where the output of git svn log and svn log still differs by empty lines.

I also noticed the following error: Can't use an undefined value as an ARRAY reference at /usr/lib/git-core/git-svn line 5717, <$fh> line 53.

I'm not sure whether I introduced this error once I patched
git-svn ...
The affected line is the second one in:
           } elsif (/^${esc_color}    (git-svn-id:.+)$/o) {
                        if (@{$c->{l}} && $c->{l}->[-1] eq "\n") {
                                pop @{$c->{l}};
                        }
(is -1 valid?)

Jens

------------------------------------------------------------------------ r5 | jens | 2010-07-25 19:08:18 +0200 (So, 25. Jul 2010) | 4 lines

2 trailing newlines

------------------------------------------------------------------------ r4 | jens | 2010-07-25 19:07:42 +0200 (So, 25. Jul 2010) | 3 lines

trailing newline

------------------------------------------------------------------------ r3 | jens | 2010-07-25 19:06:58 +0200 (So, 25. Jul 2010) | 3 lines

one linebreak line 2

------------------------------------------------------------------------ r2 | jens | 2010-07-25 19:06:05 +0200 (So, 25. Jul 2010) | 1 line

linebreak ------------------------------------------------------------------------ r1 | jens | 2010-07-25 19:05:21 +0200 (So, 25. Jul 2010) | 1 line

------------------------------------------------------------------------

------------------------------------------------------------------------ r5 | jens | 2010-07-25 19:08:18 +0200 (So, 25. Jul 2010) | 2 lines

2 trailing newlines

------------------------------------------------------------------------ r4 | jens | 2010-07-25 19:07:42 +0200 (So, 25. Jul 2010) | 2 lines

trailing newline

------------------------------------------------------------------------ r3 | jens | 2010-07-25 19:06:58 +0200 (So, 25. Jul 2010) | 3 lines

one linebreak line 2

------------------------------------------------------------------------ r2 | jens | 2010-07-25 19:06:05 +0200 (So, 25. Jul 2010) | 1 line

linebreak Can't use an undefined value as an ARRAY reference at /usr/lib/git-core/git-svn line 5717, <$fh> line 53.

SVN-fs-dump-format-version: 2

UUID: 83f09cc9-4635-489b-9736-9fad07b44175

Revision-number: 0
Prop-content-length: 56
Content-length: 56

K 8 svn:date V 27 2010-07-25T17:03:46.899612Z PROPS-END

Revision-number: 1
Prop-content-length: 98
Content-length: 98

K 7 svn:log V 0

K 10 svn:author V 4 jens K 8 svn:date V 27 2010-07-25T17:05:21.869208Z PROPS-END

Node-path: file
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 0
Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
Content-length: 10

PROPS-END

Revision-number: 2
Prop-content-length: 107
Content-length: 107

K 7 svn:log V 9 linebreak K 10 svn:author V 4 jens K 8 svn:date V 27 2010-07-25T17:06:05.643604Z PROPS-END

Node-path: file
Node-kind: file
Node-action: change
Text-content-length: 13
Text-content-md5: dcf4e97bd1c01e863bf8989b23429f9c
Content-length: 13

no linebreak

Revision-number: 3
Prop-content-length: 120
Content-length: 120

K 7 svn:log V 21 one linebreak line 2

K 10 svn:author V 4 jens K 8 svn:date V 27 2010-07-25T17:06:58.264468Z PROPS-END

Node-path: file
Node-kind: file
Node-action: change
Text-content-length: 21
Text-content-md5: 4e70c8b04910e92f9cc7fbd6424352f0
Content-length: 21

one linebreak line 2

Revision-number: 4
Prop-content-length: 117
Content-length: 117

K 7 svn:log V 18 trailing newline

K 10 svn:author V 4 jens K 8 svn:date V 27 2010-07-25T17:07:42.901800Z PROPS-END

Node-path: file
Node-kind: file
Node-action: change
Text-content-length: 19
Text-content-md5: b20aeff36821448c3bc3c85942bc1fc5
Content-length: 19

trailing newline

Revision-number: 5
Prop-content-length: 121
Content-length: 121

K 7 svn:log V 22 2 trailing newlines

K 10 svn:author V 4 jens K 8 svn:date V 27 2010-07-25T17:08:18.343554Z PROPS-END

Node-path: file
Node-kind: file
Node-action: change
Text-content-length: 23
Text-content-md5: e1314ce7619ef512653071d690dbd789
Content-length: 23

2 trailing newlines