subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1148904 - /subversion/trunk/tools/dist/backport.pl
Date Wed, 20 Jul 2011 19:09:49 GMT
Author: danielsh
Date: Wed Jul 20 19:09:48 2011
New Revision: 1148904

URL: http://svn.apache.org/viewvc?rev=1148904&view=rev
Log:
Support '* foo branch' entries.

* tools/dist/backport.pl
  (sanitize_branch): New helper.
  (parse_entry): Use new helper and recognize '* foo branch' header lines.

Modified:
    subversion/trunk/tools/dist/backport.pl

Modified: subversion/trunk/tools/dist/backport.pl
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1148904&r1=1148903&r2=1148904&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Wed Jul 20 19:09:48 2011
@@ -107,6 +107,14 @@ EOF
   unlink $logmsg_filename unless $? or $!;
 }
 
+sub sanitize_branch {
+  local $_ = shift;
+  s#.*/##;
+  s/^\s*//;
+  s/\s*$//;
+  return $_;
+}
+
 # TODO: may need to parse other headers too?
 sub parse_entry {
   my @lines = @_;
@@ -118,6 +126,7 @@ sub parse_entry {
   s/^   // for @_;
 
   # revisions
+  $branch = sanitize_branch $1 if $_[0] =~ /^(\S*) branch$/;
   while ($_[0] =~ /^r/) {
     while ($_[0] =~ s/^r(\d+)(?:,\s*)?//) {
       push @revisions, $1;
@@ -135,10 +144,7 @@ sub parse_entry {
   # branch
   while (@_) {
     shift and next unless $_[0] =~ s/^Branch:\s*//;
-    $branch = (shift || shift || die "Branch header found without value");
-    $branch =~ s#.*/##;
-    $branch =~ s/^\s*//;
-    $branch =~ s/\s*$//;
+    $branch = sanitize_branch (shift || shift || die "Branch header found without value");
   }
 
   return (



Mime
View raw message