roll_util: Escape 'Bug:' instead of filtering
Escape 'Bug:', 'Fixed:', and 'Fixes:' instead of filtering them out
completely.
Bug: b/243177456
Change-Id: I49521589b33e933ac682da7285059bf81be8d86e
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/108673
Commit-Queue: Rob Mohr <mohrr@google.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
diff --git a/recipe_modules/roll_util/api.py b/recipe_modules/roll_util/api.py
index f20e7e1..46fdebd 100644
--- a/recipe_modules/roll_util/api.py
+++ b/recipe_modules/roll_util/api.py
@@ -24,6 +24,9 @@
# If we're embedding the original commit message, prepend 'Original-' to lines
# which begin with these tags.
ESCAPE_TAGS = [
+ 'Bug:',
+ 'Fixed:',
+ 'Fixes:',
'Requires:',
'Reviewed-on:',
]
@@ -33,17 +36,13 @@
FILTER_TAGS = [
'API-Review:',
'Acked-by:',
- 'Auto-Submit',
re.compile(r'^\w+-?Auto-Submit:', re.IGNORECASE),
- 'Bug:',
'CC:',
'CQ-Do-Not-Cancel-Tryjobs:',
'Cq-Include-Trybots:',
'Change-Id:',
'Commit-Queue:',
'Cq-Cl-Tag:',
- 'Fixed:',
- 'Fixes:',
re.compile(r'Git[ -]?watcher:', re.IGNORECASE),
'No-Docs-Update-Reason:',
'No-Presubmit:',
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
index 9fae0a6..28776bc 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
@@ -720,12 +720,13 @@
"@@@STEP_LOG_LINE@kwargs@'original_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nBug: 123\\nChange-Id: I4444444444444444444444444444444444444444\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444'@@@",
"@@@STEP_LOG_LINE@kwargs@'project_name': 'abc'@@@",
"@@@STEP_LOG_LINE@kwargs@'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'@@@",
- "@@@STEP_LOG_LINE@kwargs@'sanitized_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444'@@@",
+ "@@@STEP_LOG_LINE@kwargs@'sanitized_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nOriginal-Bug: 123\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444'@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[roll abc] module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@Longer commit details.@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
@@ -802,6 +803,7 @@
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@Longer commit details.@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
index 937bf36..7d24c14 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
@@ -486,12 +486,13 @@
"@@@STEP_LOG_LINE@kwargs@'original_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nBug: 123\\nChange-Id: I4444444444444444444444444444444444444444\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444'@@@",
"@@@STEP_LOG_LINE@kwargs@'project_name': 'abc'@@@",
"@@@STEP_LOG_LINE@kwargs@'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'@@@",
- "@@@STEP_LOG_LINE@kwargs@'sanitized_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444'@@@",
+ "@@@STEP_LOG_LINE@kwargs@'sanitized_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nOriginal-Bug: 123\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444'@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[roll abc] module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@Longer commit details.@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
@@ -514,12 +515,13 @@
"@@@STEP_LOG_LINE@kwargs@'original_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nBug: 123\\nChange-Id: I8888888888888888888888888888888888888888\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/88888'@@@",
"@@@STEP_LOG_LINE@kwargs@'project_name': 'def'@@@",
"@@@STEP_LOG_LINE@kwargs@'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'@@@",
- "@@@STEP_LOG_LINE@kwargs@'sanitized_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/88888'@@@",
+ "@@@STEP_LOG_LINE@kwargs@'sanitized_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nOriginal-Bug: 123\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/88888'@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[roll def] module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@Longer commit details.@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/88888@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
@@ -542,12 +544,13 @@
"@@@STEP_LOG_LINE@kwargs@'original_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nBug: 123\\nChange-Id: Icccccccccccccccccccccccccccccccccccccccc\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/ccccc'@@@",
"@@@STEP_LOG_LINE@kwargs@'project_name': 'xyz'@@@",
"@@@STEP_LOG_LINE@kwargs@'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'@@@",
- "@@@STEP_LOG_LINE@kwargs@'sanitized_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/ccccc'@@@",
+ "@@@STEP_LOG_LINE@kwargs@'sanitized_message': 'module: Short commit summary\\n\\nLonger commit details.\\n\\nOriginal-Bug: 123\\nReviewed-On: https://pigweed-review.googlesource.com/c/project/+/ccccc'@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[roll xyz] module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@Longer commit details.@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/ccccc@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
@@ -565,6 +568,7 @@
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@Longer commit details.@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
@@ -574,6 +578,7 @@
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@Longer commit details.@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/88888@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
@@ -583,6 +588,7 @@
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@Longer commit details.@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/ccccc@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
index 8d61573..bb7464f 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
@@ -295,7 +295,7 @@
"@@@STEP_LOG_LINE@kwargs@'original_message': 'foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo \\n\\nbar\\n\\nBug: 123\\nCC: foo\\nFoo-Auto-Submit: true\\n'@@@",
"@@@STEP_LOG_LINE@kwargs@'project_name': 'proj'@@@",
"@@@STEP_LOG_LINE@kwargs@'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'@@@",
- "@@@STEP_LOG_LINE@kwargs@'sanitized_message': 'foo foo foo foo foo foo foo foo foo foo \\n\\nfoo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo \\n\\nbar\\n'@@@",
+ "@@@STEP_LOG_LINE@kwargs@'sanitized_message': 'foo foo foo foo foo foo foo foo foo foo \\n\\nfoo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo \\n\\nbar\\n\\nOriginal-Bug: 123'@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[roll proj] foo foo foo foo foo foo foo foo foo foo @@@",
"@@@STEP_LOG_LINE@message@@@@",
@@ -303,6 +303,7 @@
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@bar@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: 000000000000000..111111111111111@@@",
@@ -319,6 +320,7 @@
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@bar@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: 000000000000000..111111111111111@@@",
