Changeset 60015 in webkit

Timestamp:

May 22, 2010 2:40:31 PM (14 years ago)

Author:

dbates@webkit.org

Message:

2010-05-22 Daniel Bates <​dbates@rim.com>

Reviewed by Chris Jerdonek.

Add infrastructure to parse SVN property changes
​https://bugs.webkit.org/show_bug.cgi?id=38885

Adds function VCSUtils::parseSvnDiffFooter to parse an SVN footer
that consists of one or more properties.

Note, the first line of an SVN footer begins with "Property changes on".

• Scripts/VCSUtils.pm:
  • Added function parseSvnDiffFooter. Will use this function towards resolving Bug #39409 <​https://bugs.webkit.org/show_bug.cgi?id=39409>.
  • Removed FIXME comment above function parseSvnProperty, since it is being used by parseSvnDiffFooter.
• Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffFooter.pl: Added.
  • Added unit tests.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (2 diffs)
• Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffFooter.pl (added)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-05-22  Daniel Bates  <dbates@rim.com>
+
+        Reviewed by Chris Jerdonek.
+
+        Add infrastructure to parse SVN property changes
+        https://bugs.webkit.org/show_bug.cgi?id=38885
+
+        Adds function VCSUtils::parseSvnDiffFooter to parse an SVN footer
+        that consists of one or more properties.
+
+        Note, the first line of an SVN footer begins with "Property changes on".
+
+        * Scripts/VCSUtils.pm:
+          - Added function parseSvnDiffFooter. Will use this function
+            towards resolving Bug #39409 <https://bugs.webkit.org/show_bug.cgi?id=39409>.
+          - Removed FIXME comment above function parseSvnProperty, since
+            it is being used by parseSvnDiffFooter.
+        * Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffFooter.pl: Added.
+          - Added unit tests.
+
 2010-05-22  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/VCSUtils.pm

@@ -839 +839 @@
 }
 
+# Parse an SVN property change diff from the given file handle, and advance
+# the handle so the last line read is the first line after this diff.
+#
+# For the case of an SVN binary diff, the binary contents will follow the
+# the property changes.
+#
+# This subroutine dies if the first line does not begin with "Property changes on"
+# or if the separator line that follows this line is missing.
+#
+# Args:
+#   $fileHandle: advanced so the last line read from the handle is the first
+#                line of the footer to parse.  This line begins with
+#                "Property changes on".
+#   $line: the line last read from $fileHandle.
+#
+# Returns ($propertyHashRef, $lastReadLine):
+#   $propertyHashRef: a hash reference representing an SVN diff footer.
+#     propertyPath: the path of the target file.
+#     executableBitDelta: the value 1 or -1 if the executable bit was added or
+#                         removed from the target file, respectively.
+#   $lastReadLine: the line last read from $fileHandle.
+#
+# FIXME: This method is unused as of (05/22/2010).  We will call this function
+#        as part of parsing a diff.  See <https://bugs.webkit.org/show_bug.cgi?id=39409>.
+sub parseSvnDiffProperties($$)
+{
+    my ($fileHandle, $line) = @_;
+
+    $_ = $line;
+
+    my $svnFooterDiffStartRegEx = qr#Property changes on: ([^\r\n]+)#; # $1 is normally the same as the index path.
+
+    my %footer;
+    if (/$svnFooterDiffStartRegEx/) {
+        $footer{propertyPath} = $1;
+    } else {
+        die("Failed to find start of SVN property change, \"Property changes on \": \"$_\"");
+    }
+
+    # We advance $fileHandle two lines so that the next line that
+    # we process is $svnPropertyStartRegEx in a well-formed footer.
+    # A well-formed footer has the form:
+    # Property changes on: FileA
+    # ___________________________________________________________________
+    # Added: svn:executable
+    #    + *
+    $_ = <$fileHandle>; # Not defined if end-of-file reached.
+    my $separator = "_" x 67;
+    if (defined($_) && /^$separator[\r\n]+$/) {
+        $_ = <$fileHandle>;
+    } else {
+        die("Failed to find separator line: \"$_\".");
+    }
+
+    # FIXME: We should expand this to support other SVN properties
+    #        (e.g. return a hash of property key-values that represents
+    #        all properties).
+    #
+    # Notice, we keep processing until we hit end-of-file or some
+    # line that does not resemble $svnPropertyStartRegEx, such as
+    # the empty line that precedes the start of the binary contents
+    # of a patch, or the start of the next diff (e.g. "Index:").
+    my $propertyHashRef;
+    while (defined($_) && /$svnPropertyStartRegEx/) {
+        ($propertyHashRef, $_) = parseSvnProperty($fileHandle, $_);
+        if ($propertyHashRef->{name} eq "svn:executable") {
+            # Notice, for SVN properties, propertyChangeDelta is always non-zero
+            # because a property can only be added or removed.
+            $footer{executableBitDelta} = $propertyHashRef->{propertyChangeDelta};   
+        }
+    }
+
+    return(\%footer, $_);
+}
+
 # Parse the next SVN property from the given file handle, and advance the handle so the last
 # line read is the first line after the property.
@@ -862 +937 @@
 #                          removed, respectively.
 #   $lastReadLine: the line last read from $fileHandle.
-#
-# FIXME: This method is unused as of (05/16/2010).  We will call this function
-#        as part of parsing a SVN footer.  See <https://bugs.webkit.org/show_bug.cgi?id=38885>.
 sub parseSvnProperty($$)
 {