Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 31689 - diffstat gives incorrect stats (skips files)
Summary: diffstat gives incorrect stats (skips files)
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Brandy Westcott (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-10-21 10:40 UTC by jochen
Modified: 2004-02-15 08:02 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Adds a new sscanf line to match yyyy-mm-dd diff output. (diffstat-1.29-newmatch.diff,477 bytes, patch)
2003-10-21 22:51 UTC, Doug Weimer
Details | Diff
above patch for diffstat 1.34 (diffstat-1.34-hard-locale.patch,522 bytes, patch)
2004-02-15 03:06 UTC, jochen
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description jochen 2003-10-21 10:40:05 UTC
when applying diffstat to 20_dc395-integ24 from patches-2.4.20-xfs-r3.tar.bz2
from current gentoo mirrors, it reports over 8000 lines of changes in Makefile.
However those changes don't belong to the Makefile but to a file listed in the
patch after the Makefile

Reproducible: Always
Steps to Reproduce:
1. ebuild /usr/portage/sys-kernel/xfs-sources/xfs-sources-2.4.20-xfs-r3.ebuild fetch
2. cd /tmp && tar xjf /usr/portage/distfiles/patches-2.4.20-xfs-r3.tar.bz2; cd
2.4.20-xfs-r3
3. diffstat 20_dc395-integ24
Actual Results:  
 Documentation/Configure.help |   13 
 MAINTAINERS                  |    6 
 drivers/scsi/Config.in       |    3 
 drivers/scsi/Makefile        | 8047 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 8067 insertions(+), 2 deletions(-)

Expected Results:  
 Documentation/Configure.help |   13 
 MAINTAINERS                  |    6 
 drivers/scsi/Config.in       |    3 
 drivers/scsi/Makefile        |    1
 drivers/scsi/dc395x_trm.c    | 7903 +++++++++++++++++++++++++++++++++++++++++++
 drivers/scsi/dc395x_trm.h    |  143 ++
 6 files changed, 8067 insertions(+), 2 deletions(-)

diffstat 1.29 installed
Comment 1 Doug Weimer 2003-10-21 22:51:27 UTC
Created attachment 19611 [details, diff]
Adds a new sscanf line to match yyyy-mm-dd diff output.

The problem here is that the diff output for dc395x_trm.* contained headers
with:
2002-12-22 18:34:27
2002-06-21 11:57:38

This year/time format was not supported by diffstat. This patch adds a sscanf
line to handle such headers.
Comment 2 Brandy Westcott (RETIRED) gentoo-dev 2003-10-30 04:44:21 UTC
Nice catch Jochen and thanks for the patch Doug. diffstat now handles files
with hard-locale headers. :)
Comment 3 Joshua Kinard gentoo-dev 2004-02-15 01:19:12 UTC
I've just made a 1.34 ebuild of diffstat, however the 1.29 patch for this issue does not apply.  The codebases are too drastically altered (AFAICT).  Someone mind double checking this to see if such a patch is needed for this version as well and let me know via a new bug?
Comment 4 jochen 2004-02-15 03:06:53 UTC
Created attachment 25648 [details, diff]
above patch for diffstat 1.34
Comment 5 Joshua Kinard gentoo-dev 2004-02-15 08:02:25 UTC
Thanks, applied, remerge the 1.34 ebuild for the patch.