ossp-pkg/shiela/shiela.pl 1.33 -> 1.34
--- shiela.pl 2002/12/22 16:30:14 1.33
+++ shiela.pl 2002/12/22 17:10:26 1.34
@@ -36,7 +36,7 @@
use IO::Handle; # shipped with Perl since 5.003
use IPC::Open2; # shipped with Perl since 5.003
use Data::Dumper; # shipped with Perl since 5.005
-use Cwd; # shipped with Perl since 5.003
+use Cwd; # shipped with Perl since 5.005
# DEBUGGING
$Data::Dumper::Purity = 1;
@@ -1036,7 +1036,7 @@
# strip absolute prefix
$cvsdir =~ s|^$RT->{cvsroot}/?||;
- my $cvsdirphysical = Cwd::realpath($RT->{cvsroot});
+ my $cvsdirphysical = Cwd::abs_path($RT->{cvsroot});
$cvsdir =~ s|^$cvsdirphysical/?||;
# provide access control
@@ -1992,11 +1992,19 @@
my $subject = "[CVS]";
$subject .= " ".$CF->{Project}->{Tag}.":";
my $dirlast = '';
+ my $branchlast = '';
foreach my $path (sort(keys(%{$IN->{file}}))) {
my ($dir, $file) = ($path =~ m|^(.+)/([^/]+)$|);
+ my $branch = $IN->{file}->{$path}->{branch} || 'HEAD';
+ if ($branchlast ne $branch) {
+ # prefix with branch
+ $branchlast = $branch;
+ $subject .= " $branch:" if ($branch ne 'HEAD');
+ }
if ($dirlast ne $dir) {
+ # prefix with directory
$dirlast = $dir;
- $subject .= " $dir";
+ $subject .= " $dir/";
}
$subject .= " $file";
}
|
|
