sandbox/infrastructure/commit-email/commit-email.patch

   1 --- tools/hook-scripts/commit-email.pl  2004-06-14 22:29:22.000000000 +0200
   2 +++ tools/hook-scripts/commit-email.pl  2005-10-30 22:39:22.942246752 +0100
   3 @@ -222,32 +222,16 @@
   4  shift @svnlooklines;
   5  my @log = map { "$_\n" } @svnlooklines;
   6
   7 -# Figure out what directories have changed using svnlook.
   8 -my @dirschanged = &read_from_process($svnlook, 'dirs-changed', $repos,
   9 -                                     '-r', $rev);
  10 -
  11 -# Lose the trailing slash in the directory names if one exists, except
  12 -# in the case of '/'.
  13 -my $rootchanged = 0;
  14 -for (my $i=0; $i<@dirschanged; ++$i)
  15 -  {
  16 -    if ($dirschanged[$i] eq '/')
  17 -      {
  18 -        $rootchanged = 1;
  19 -      }
  20 -    else
  21 -      {
  22 -        $dirschanged[$i] =~ s#^(.+)[/\\]$#$1#;
  23 -      }
  24 -  }
  25
  26  # Figure out what files have changed using svnlook.
  27  @svnlooklines = &read_from_process($svnlook, 'changed', $repos, '-r', $rev);
  28
  29  # Parse the changed nodes.
  30 +my @fileschanged;
  31  my @adds;
  32  my @dels;
  33  my @mods;
  34 +my $rootchanged = 0;
  35  foreach my $line (@svnlooklines)
  36    {
  37      my $path = '';
  38 @@ -261,6 +245,12 @@
  39          $path = $2;
  40        }
  41
  42 +    push(@fileschanged, $path);
  43 +    if ($path eq '/')
  44 +      {
  45 +        $rootchanged = 1;
  46 +      }
  47 +
  48      if ($code eq 'A')
  49        {
  50          push(@adds, $path);
  51 @@ -288,11 +278,11 @@
  52  # there's no point in collapsing the directories, and only if more
  53  # than one directory was modified.
  54  my $commondir = '';
  55 -if (!$rootchanged and @dirschanged > 1)
  56 +if (!$rootchanged and @fileschanged > 1)
  57    {
  58 -    my $firstline    = shift @dirschanged;
  59 +    my $firstline    = shift @fileschanged;
  60      my @commonpieces = split('/', $firstline);
  61 -    foreach my $line (@dirschanged)
  62 +    foreach my $line (@fileschanged)
  63        {
  64          my @pieces = split('/', $line);
  65          my $i = 0;
  66 @@ -306,28 +296,28 @@
  67              $i++;
  68            }
  69        }
  70 -    unshift(@dirschanged, $firstline);
  71 +    unshift(@fileschanged, $firstline);
  72
  73      if (@commonpieces)
  74        {
  75          $commondir = join('/', @commonpieces);
  76 -        my @new_dirschanged;
  77 -        foreach my $dir (@dirschanged)
  78 +        my @new_fileschanged;
  79 +        foreach my $file (@fileschanged)
  80            {
  81 -            if ($dir eq $commondir)
  82 +            if ($file eq "$commondir/")
  83                {
  84 -                $dir = '.';
  85 +                $file = '.';
  86                }
  87              else
  88                {
  89 -                $dir =~ s#^$commondir/##;
  90 +                $file =~ s#^$commondir/##;
  91                }
  92 -            push(@new_dirschanged, $dir);
  93 +            push(@new_fileschanged, $file);
  94            }
  95 -        @dirschanged = @new_dirschanged;
  96 +        @fileschanged = @new_fileschanged;
  97        }
  98    }
  99 -my $dirlist = join(' ', @dirschanged);
 100 +my $filelist = join(' ', @fileschanged);
 101
 102  ######################################################################
 103  # Assembly of log message.
 104 @@ -367,7 +357,7 @@
 105    {
 106      my $match_re = $project->{match_re};
 107      my $match    = 0;
 108 -    foreach my $path (@dirschanged, @adds, @dels, @mods)
 109 +    foreach my $path (@adds, @dels, @mods)
 110        {
 111          if ($path =~ $match_re)
 112            {
 113 @@ -390,16 +380,20 @@
 114
 115      if ($commondir ne '')
 116        {
 117 -        $subject = "r$rev - in $commondir: $dirlist";
 118 +        $subject = "r$rev - in $commondir: $filelist";
 119        }
 120      else
 121        {
 122 -        $subject = "r$rev - $dirlist";
 123 +        $subject = "r$rev - $filelist";
 124        }
 125      if ($subject_prefix =~ /\w/)
 126        {
 127          $subject = "$subject_prefix $subject";
 128        }
 129 +    if(length($subject) > 900)
 130 +      {
 131 +        $subject = substr($subject, 0, 896) . " ...";
 132 +      }
 133      my $mail_from = $author;
 134
 135      if ($from_address =~ /\w/)