Title: [294250] trunk/Websites/bugs.webkit.org
- Revision
- 294250
- Author
- jbed...@apple.com
- Date
- 2022-05-16 13:32:13 -0700 (Mon, 16 May 2022)
Log Message
[PrettyPatch] Support commit messages (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=240386
<rdar://problem/93248835>
Unreviewed follow-up fix.
* Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb: Handle diffs without a header.
Canonical link: https://commits.webkit.org/250606@main
Modified Paths
Diff
Modified: trunk/Websites/bugs.webkit.org/ChangeLog (294249 => 294250)
--- trunk/Websites/bugs.webkit.org/ChangeLog 2022-05-16 19:00:08 UTC (rev 294249)
+++ trunk/Websites/bugs.webkit.org/ChangeLog 2022-05-16 20:32:13 UTC (rev 294250)
@@ -1,3 +1,13 @@
+2022-05-16 Jonathan Bedard <jbed...@apple.com>
+
+ [PrettyPatch] Support commit messages (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=240386
+ <rdar://problem/93248835>
+
+ Unreviewed follow-up fix.
+
+ * PrettyPatch/PrettyPatch.rb: Handle diffs without a header.
+
2022-05-13 Jonathan Bedard <jbed...@apple.com>
[PrettyPatch] Support commit messages
Modified: trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb (294249 => 294250)
--- trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb 2022-05-16 19:00:08 UTC (rev 294249)
+++ trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb 2022-05-16 20:32:13 UTC (rev 294250)
@@ -797,6 +797,7 @@
def self.parse(string)
commitMessageLength = 0
haveSeenDiffHeader = false
+ haveCommitMessage = false
subject = ''
linesForDiffs = []
line_array = string.lines.to_a
@@ -809,7 +810,7 @@
haveSeenDiffHeader = false
elsif (PrettyPatch.message_header?(line))
haveSeenDiffHeader = false
- parsingSubject = true
+ haveCommitMessage = true
commitMessageLength = 1
linesForDiffs << []
linesForDiffs.last << '+++ COMMIT_MESSAGE'
@@ -836,7 +837,7 @@
if (subject.empty? && commitMessageLength != 0)
commitMessageLength += 1
linesForDiffs.last << '+' + line unless linesForDiffs.last.nil?
- elsif (subject.empty? && haveSeenDiffHeader)
+ elsif (subject.empty? && (!haveCommitMessage || haveSeenDiffHeader))
linesForDiffs.last << line unless linesForDiffs.last.nil?
end
end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
