|
Check-in Number:
|
486 | |
| Date: |
2001-May-22 21:26:12 (local)
2001-May-22 19:26:12 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
fix shiela for removed files |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/shiela/ChangeLog 1.5 -> 1.6
--- ChangeLog 2001/05/11 19:53:45 1.5
+++ ChangeLog 2001/05/22 19:26:12 1.6
@@ -10,6 +10,9 @@
ChangeLog
Changes between 0.9.1 and 0.9.2 (10-Feb-2001 to 04-May-2001):
+
+ *) Fixed +d/-d output on removed files.
+ [Ralf S. Engelschall]
*) Fixed meta character handling in regex matchings.
[Ralf S. Engelschall]
|
|
ossp-pkg/shiela/shiela.pl 1.9 -> 1.10
--- shiela.pl 2001/05/12 07:26:54 1.9
+++ shiela.pl 2001/05/22 19:26:12 1.10
@@ -1553,12 +1553,12 @@
$Id = 'BLOB';
}
else {
- if ($Io eq 'A' or $Io eq 'R') {
+ if ($Io eq 'A') {
open(FP, "<$Is");
my $l = 0;
$l++ while (<FP>);
close(FP);
- $Id = sprintf("+%d/-%d", ($Io eq 'A' ? $l : 0), ($Io eq 'A' ? 0 : $l));
+ $Id = sprintf("+%d/-%d", $l, 0);
}
elsif ($Io eq 'M') {
if ($rcslog =~ m|\ndate:.*lines:\s*([\d \t+-]+)|s) {
@@ -1566,6 +1566,18 @@
$Id =~ s|\s+|/|g;
}
}
+ elsif ($Io eq 'R') {
+ my $cvs = new CVS ($RT->{cvs}, $RT->{cvsroot});
+ $cvs->directory($cvsdir);
+ $cvs->entry($Is);
+ $cvs->arguments("-p", "-r$IV", $Is);
+ $cvs->send("update");
+ my $f = scalar $cvs->result;
+ $cvs->close;
+ my $l = 0;
+ $f =~ s|\n|$l++|sge;
+ $Id = sprintf("+%d/-%d", 0, $l);
+ }
}
# determine change diff
|
|
