Clean up the HTML output. Add a -filedetails option to report the number of
lines contributed by each user to each file. llvm-svn: 29624
This commit is contained in:
parent
c647e96ea0
commit
1f0b9a1158
|
@ -16,6 +16,8 @@
|
||||||
# specified directory is examined
|
# specified directory is examined
|
||||||
# -tag=tag
|
# -tag=tag
|
||||||
# Use "tag" to select the revision (as per cvs -r option)
|
# Use "tag" to select the revision (as per cvs -r option)
|
||||||
|
# -filedetails
|
||||||
|
# Report details about lines of code in each file for each user
|
||||||
# -html
|
# -html
|
||||||
# Generate HTML output instead of text output
|
# Generate HTML output instead of text output
|
||||||
|
|
||||||
|
@ -26,6 +28,7 @@ my $tag = "";
|
||||||
my $recurse = 0;
|
my $recurse = 0;
|
||||||
my $html = 0;
|
my $html = 0;
|
||||||
my $debug = 0;
|
my $debug = 0;
|
||||||
|
my $filedetails = "";
|
||||||
while ( substr($ARGV[0],0,1) eq '-' )
|
while ( substr($ARGV[0],0,1) eq '-' )
|
||||||
{
|
{
|
||||||
if ($ARGV[0] eq "-recurse") {
|
if ($ARGV[0] eq "-recurse") {
|
||||||
|
@ -33,6 +36,8 @@ while ( substr($ARGV[0],0,1) eq '-' )
|
||||||
} elsif ($ARGV[0] =~ /-tag=.*/) {
|
} elsif ($ARGV[0] =~ /-tag=.*/) {
|
||||||
$tag = $ARGV[0];
|
$tag = $ARGV[0];
|
||||||
$tag =~ s#-tag=(.*)#$1#;
|
$tag =~ s#-tag=(.*)#$1#;
|
||||||
|
} elsif ($ARGV[0] =~ /-filedetails/) {
|
||||||
|
$filedetails = 1;
|
||||||
} elsif ($ARGV[0] eq "-html") {
|
} elsif ($ARGV[0] eq "-html") {
|
||||||
$html = 1;
|
$html = 1;
|
||||||
} elsif ($ARGV[0] eq "-debug") {
|
} elsif ($ARGV[0] eq "-debug") {
|
||||||
|
@ -47,7 +52,7 @@ die "Usage userloc.pl [-recurse|-tag=tag|-html] <directories>..."
|
||||||
if ($#ARGV < 0);
|
if ($#ARGV < 0);
|
||||||
|
|
||||||
my %Stats;
|
my %Stats;
|
||||||
my %StatsDetails;
|
my %FileStats;
|
||||||
|
|
||||||
sub ValidateFile
|
sub ValidateFile
|
||||||
{
|
{
|
||||||
|
@ -96,19 +101,26 @@ sub ScanDir
|
||||||
my $Dir = $_[0];
|
my $Dir = $_[0];
|
||||||
my $files = GetCVSFiles($Dir);
|
my $files = GetCVSFiles($Dir);
|
||||||
|
|
||||||
open (DATA,"$annotate $files 2>/dev/null |")
|
open (DATA,"$annotate $files 2>&1 |")
|
||||||
|| die "Can't read cvs annotation data";
|
|| die "Can't read cvs annotation data";
|
||||||
|
|
||||||
|
my $curfile = "";
|
||||||
while ( defined($line = <DATA>) )
|
while ( defined($line = <DATA>) )
|
||||||
{
|
{
|
||||||
if ($line =~ /^[0-9.]*[ \t]*\([^)]*\):/)
|
chomp($line);
|
||||||
{
|
if ($line =~ '^Annotations for.*') {
|
||||||
chomp($line);
|
$curfile = $line;
|
||||||
$line =~ s#^[0-9.]*[ \t]*\(([a-zA-Z0-9_.-]*) [^)]*\):.*#$1#;
|
$curfile =~ s#^Annotations for ([[:print:]]*)#$1#;
|
||||||
$Stats{$line}++;
|
} elsif ($line =~ /^[0-9.]*[ \t]*\([^)]*\):/) {
|
||||||
|
$uname = $line;
|
||||||
|
$uname =~ s#^[0-9.]*[ \t]*\(([a-zA-Z0-9_.-]*) [^)]*\):.*#$1#;
|
||||||
|
$Stats{$uname}++;
|
||||||
|
if ($filedetails) {
|
||||||
|
$FileStats{$uname} = {} unless exists $FileStats{$uname};
|
||||||
|
${$FileStats{$uname}}{$curfile}++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
close DATA;
|
close DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -135,56 +147,61 @@ sub ValidateDirectory
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
my $RowCount = 0;
|
|
||||||
sub printStats
|
sub printStats
|
||||||
{
|
{
|
||||||
my $dir = $_[0];
|
my $dir = $_[0];
|
||||||
my $hash = $_[1];
|
my $hash = $_[1];
|
||||||
my $user;
|
my $usr;
|
||||||
my $total = 0;
|
my $total = 0;
|
||||||
|
|
||||||
if ($RowCount % 10 == 0)
|
foreach $usr (keys %Stats) { $total += $Stats{$usr}; }
|
||||||
{
|
|
||||||
if ($html) {
|
if ($html) {
|
||||||
print " <tr><th style=\"text-align:left\">Directory</th>\n";
|
print "<table>";
|
||||||
foreach $user (sort keys %Stats)
|
print " <tr><th style=\"text-align:right\">LOC</th>\n";
|
||||||
{
|
print " <th style=\"text-align:right\">\%LOC</th>\n";
|
||||||
print "<th style=\"text-align:right\">",$user,"</th>\n";
|
print " <th style=\"text-align:left\">User</th>\n";
|
||||||
}
|
print "</tr>\n";
|
||||||
print "</tr>\n";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$RowCount++;
|
foreach $usr ( sort keys %Stats )
|
||||||
|
|
||||||
if ($html)
|
|
||||||
{ print "<tr><td style=\"text-align:left\">",$dir,"</td>"; }
|
|
||||||
else
|
|
||||||
{ print $dir,"\n"; }
|
|
||||||
|
|
||||||
foreach $user (keys %{$hash}) { $total += $hash->{$user}; }
|
|
||||||
|
|
||||||
foreach $user ( sort keys %Stats )
|
|
||||||
{
|
{
|
||||||
my $v = $hash->{$user};
|
my $v = $Stats{$usr};
|
||||||
if (defined($v))
|
if (defined($v))
|
||||||
{
|
{
|
||||||
if ($html)
|
if ($html) {
|
||||||
{
|
printf "<tr><td style=\"text-align:right\">%d</td><td style=\"text-align:right\">(%4.1f%%)</td><td style=\"text-align:left\">%s</td></tr>", $v, (100.0/$total)*$v,$usr;
|
||||||
printf "<td style=\"text-align:right\">%d<br/>(%2.1f%%)</td>", $v,
|
} else {
|
||||||
(100.0/$total)*$v;
|
printf "%8d (%4.1f%%) %s\n", $v, (100.0/$total)*$v, $usr;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
printf "%8d (%4.1f%%): %s\n", $v, (100.0/$total)*$v, $user;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
elsif ($html)
|
|
||||||
{
|
|
||||||
print "<td style=\"text-align:right\">- </td>";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print "</tr>\n" if ($html);
|
print "</table>\n" if ($html);
|
||||||
|
|
||||||
|
if ($filedetails) {
|
||||||
|
foreach $user (sort keys %FileStats) {
|
||||||
|
my $total = 0;
|
||||||
|
foreach $file (sort keys %{$FileStats{$user}}) {
|
||||||
|
$total += ${$FileStats{$user}}{$file}
|
||||||
|
}
|
||||||
|
if ($html) {
|
||||||
|
print "<table><tr><th style=\"text-align:left\" colspan=\"3\">$user</th></tr>\n";
|
||||||
|
} else {
|
||||||
|
print $user,":\n";
|
||||||
|
}
|
||||||
|
foreach $file (sort keys %{$FileStats{$user}}) {
|
||||||
|
my $v = ${$FileStats{$user}}{$file};
|
||||||
|
if ($html) {
|
||||||
|
printf "<tr><td style=\"text-align:right\"> %d</td><td
|
||||||
|
style=\"text-align:right\"> %4.1f%%</td><td
|
||||||
|
style=\"text-align:left\">%s</td></tr>",$v, (100.0/$total)*$v,$file;
|
||||||
|
} else {
|
||||||
|
printf "%8d (%4.1f%%) %s\n", $v, (100.0/$total)*$v, $file;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($html) { print "</table>\n"; }
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
my @ALLDIRS = @ARGV;
|
my @ALLDIRS = @ARGV;
|
||||||
|
@ -223,16 +240,10 @@ for $Dir (@ALLDIRS)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($html)
|
printStats;
|
||||||
{
|
|
||||||
print "<table>\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
printStats("Total",\%Stats);
|
|
||||||
|
|
||||||
if ($html)
|
if ($html)
|
||||||
{
|
{
|
||||||
print "</table>";
|
|
||||||
if (scalar @ignored_dirs > 0) {
|
if (scalar @ignored_dirs > 0) {
|
||||||
print "<p>The following directories were skipped:</p>\n";
|
print "<p>The following directories were skipped:</p>\n";
|
||||||
print "<ol>\n";
|
print "<ol>\n";
|
||||||
|
|
Loading…
Reference in New Issue