[Rt-commit] rt branch, 4.2/concise-lifecycle-actions, repushed

[Alex Vandiver]

The branch 4.2/concise-lifecycle-actions was deleted and repushed:
       was 506b41c966cc4e9cbc43a5566df1d4092c910300
       now f211b5a936e2737f5f109db8082c4a15bb09dcee

1:  d7b9355 ! 1:  a3c87bd Add a new loc form, loc{key}, which localizes the value of that key
    @@ -6,13 +6,13 @@
     --- a/devel/tools/extract-message-catalog
     +++ b/devel/tools/extract-message-catalog
     @@
    -         push @{ $FILECAT{$val} }, [ $filename, $line, '' ];
    +         push @{ $FILECAT{$val} }, [ $filename, $line, '', $interp_val ];
          }
      
     +    # Specific key  foo => "...", #loc{foo}
     +    $line = 1;
     +    pos($_) = 0;
    -+    while (m/\G(.*?(\w+|$re_delim)\s*=>\s*($re_delim).*?\#$re_space_wo_nl*loc\{\2\}$re_space_wo_nl*)$/smgo) {
    ++    while (m/\G(.*?(\w+|$re_delim)\s*=>\s*($re_delim)(?-s:.*?)\#$re_space_wo_nl*loc\{\2\}$re_space_wo_nl*)$/smgo) {
     +        my ( $all, $key, $val ) = ( $1, $2, $10 );
     +        $line += ( $all =~ tr/\n/\n/ );
     +        $seen{$line}++;
    @@ -20,11 +20,8 @@
     +            warn "Couldn't process loc_pair at $filename:$line:\n  key«$key»\n  val«$val»\n";
     +            next;
     +        }
    -+        $key =~ s/^(['"])(.*)\1$/$2/g; # dequote potentially quoted string
     +        $val = substr($val, 1, -1);    # dequote always quoted string
    -+        $key  =~ s/\\(['"])/$1/g;
     +        $val  =~ s/\\(['"])/$1/g;
    -+        push @{ $FILECAT{$key} }, [ $filename, $line, '' ];
     +        push @{ $FILECAT{$val} }, [ $filename, $line, '' ];
     +    }
     +
2:  506b41c < -:  ------- Use the new loc{key} form to compress the default lifecycles
-:  ------- > 2:  f211b5a Use the new loc{key} form to compress the default lifecycles