Your message dated Sat, 02 Jun 2012 17:32:10 +0000
with message-id <[email protected]>
and subject line Bug#675465: fixed in diffstat 1.55-3
has caused the Debian Bug report #675465,
regarding diffstat doesn't handle svn diff with spaces in path
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
675465: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675465
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: diffstat
Version: 1.53-1
Severity: normal
Tags: upstream patch
Hi!
diffstat in both squeeze and sid doesn't handle svn diff output nicely if
there are spaces in the file path. I guess that's probably considered just
punishment for creating files or directories with spaces in them... but it
does make the output of diffstat somewhat less useful.
The attached example illustrates the problem:
$ diffstat svn_diff_example
ergh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
and the attached patch (against 1.55-2 and suitable for debian/patches/)
fixes this:
$ diffstat svn_diff_example
quux bar baz | 2 +-
quux bar baz2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
cheers
Stuart
-- System Information:
Debian Release: 6.0.5
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-0.bpo.2-686-pae (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages diffstat depends on:
ii libc6 2.11.3-3 Embedded GNU C Library: Shared lib
diffstat recommends no packages.
diffstat suggests no packages.
-- no debconf information
Index: ergh eek arf/quux bar baz
===================================================================
--- ergh eek arf/quux bar baz (.../branch1) (revision 4)
+++ ergh eek arf/quux bar baz (.../branch2) (revision 4)
@@ -1 +1 @@
-foo goo
+foo bar
Index: ergh eek arf/quux bar baz2
===================================================================
--- ergh eek arf/quux bar baz2 (.../branch1) (revision 4)
+++ ergh eek arf/quux bar baz2 (.../branch2) (revision 4)
@@ -1 +1 @@
-foo goo
+foo bar
Description: Handle pathnames with spaces in svn diff format
Author: Stuart Prescott <[email protected]>
--- a/diffstat.c
+++ b/diffstat.c
@@ -1444,6 +1444,10 @@
&hour, &minute, &second) == 9
&& date_delims(yrmon, monday)
&& !version_num(b_fname))
+ || (sscanf(buffer,
+ "*** %[^\t]\t(%[^)])\t(%[^)])",
+ b_fname, b_temp1, b_temp2) == 3
+ && !version_num(b_fname))
|| sscanf(buffer,
"*** %[^\t ]%[\t ]%[^ ] %[^ ] %d %d:%d:%d %d",
b_fname,
--- End Message ---
--- Begin Message ---
Source: diffstat
Source-Version: 1.55-3
We believe that the bug you reported is fixed in the latest version of
diffstat, which is due to be installed in the Debian FTP archive:
diffstat_1.55-3.debian.tar.gz
to main/d/diffstat/diffstat_1.55-3.debian.tar.gz
diffstat_1.55-3.dsc
to main/d/diffstat/diffstat_1.55-3.dsc
diffstat_1.55-3_amd64.deb
to main/d/diffstat/diffstat_1.55-3_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Sandro Tosi <[email protected]> (supplier of updated diffstat package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sat, 02 Jun 2012 19:08:11 +0200
Source: diffstat
Binary: diffstat
Architecture: source amd64
Version: 1.55-3
Distribution: unstable
Urgency: low
Maintainer: Sandro Tosi <[email protected]>
Changed-By: Sandro Tosi <[email protected]>
Description:
diffstat - produces graph of changes introduced by a diff file
Closes: 675465
Changes:
diffstat (1.55-3) unstable; urgency=low
.
* debian/patches/02-svn-spaces.patch
- handle pathnames with spaces in svn diff format; thanks to Stuart
Prescott
for the report and patch; Closes: #675465
* debian/control
- bump Standards-Version to 3.9.3 (no changes needed)
Checksums-Sha1:
60f3f72aaf269ae01a9f8aedf7c69177fc133207 1192 diffstat_1.55-3.dsc
36139e8f98465634e0fbcd940a5a5f0c22c4a906 5378 diffstat_1.55-3.debian.tar.gz
88fe18ecb64c2d3ce29b13a3fafd2826fff90dcd 30020 diffstat_1.55-3_amd64.deb
Checksums-Sha256:
83302a25193b8730701fa880e35532791240f4f48821bb03fabbc6cd9716a72c 1192
diffstat_1.55-3.dsc
05f7a4a67bb5380a600f0bffe0094363dfb4cda211a114984251e66beeff4e29 5378
diffstat_1.55-3.debian.tar.gz
4b2788ad553bffbf7f42b2cccbe608d8310e7af2cb2a2b6d2cb482b3011480f1 30020
diffstat_1.55-3_amd64.deb
Files:
455d8850b46fb21d4a90cfac4251d815 1192 devel optional diffstat_1.55-3.dsc
8a919f2814fd037704591271d4c905fb 5378 devel optional
diffstat_1.55-3.debian.tar.gz
92b1949ccc828c5ecce8b7f4afb075a4 30020 devel optional diffstat_1.55-3_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEARECAAYFAk/KSzEACgkQAukwV0RN2VCPiQCfchoxjvb1AmyUQtdGv6KdQgMe
FJAAnjfCM2WXQgKk1DWn3XWlUwk6tn5d
=gbrZ
-----END PGP SIGNATURE-----
--- End Message ---
