aboutsummaryrefslogtreecommitdiffstats
path: root/CVSROOT
diff options
context:
space:
mode:
Diffstat (limited to 'CVSROOT')
-rwxr-xr-xCVSROOT/log_accum.pl12
1 files changed, 7 insertions, 5 deletions
diff --git a/CVSROOT/log_accum.pl b/CVSROOT/log_accum.pl
index 85e2b8fef483..1b4aaf13c3f1 100755
--- a/CVSROOT/log_accum.pl
+++ b/CVSROOT/log_accum.pl
@@ -21,6 +21,7 @@
require 5.003; # might work with older perl5
use strict;
+use POSIX qw(strftime);
use Text::Tabs;
use lib $ENV{CVSROOT};
@@ -364,9 +365,7 @@ sub change_summary_removed {
sub build_header {
- delete $ENV{'TZ'};
-
- my $datestr = `/bin/date +"%Y/%m/%d %H:%M:%S %Z"`;
+ my $datestr = strftime("%F %T %Z", localtime());
chomp $datestr;
my $header = sprintf("%-8s %s", $cfg::COMMITTER, $datestr);
@@ -594,11 +593,14 @@ sub do_diff {
$diff .= "Index: $file\n"
. "=" x 68 . "\n";
@args = ('-Qn', 'update', '-p',
- '-r1.1', $file);
+ '-r1.1');
} else {
@args = ('-Qn', 'diff', '-u',
- "-r$prev_rev", "-r$rev", $file);
+ "-r$prev_rev", "-r$rev",
+ "--ignore-matching-lines=" .
+ "\$$cfg::IDHEADER.*\$");
}
+ push(@args, $file);
print "Generating diff: $cfg::PROG_CVS @args\n"
if $cfg::DEBUG;