roll_util: Add link to repository being rolled
Add links to the repositories being rolled in the commit message. This
makes it easier to track down the commits themselves.
Change-Id: I848a411cc911e8c539d75e767061707ed79c0097
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/56321
Reviewed-by: Keir Mierle <keir@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
diff --git a/recipe_modules/roll_util/api.py b/recipe_modules/roll_util/api.py
index 6df915c..d2d3ee6 100644
--- a/recipe_modules/roll_util/api.py
+++ b/recipe_modules/roll_util/api.py
@@ -314,6 +314,7 @@
template = """
[roll {project_name}] {sanitized_message}
+{remote}
{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}
""".strip()
@@ -321,6 +322,7 @@
kwargs = {
'project_name': roll.project_name,
+ 'remote': roll.remote,
'original_message': commit.message,
'sanitized_message': _sanitize_message(commit.message),
'old_revision': roll.old_revision,
@@ -350,6 +352,7 @@
{one_liners}
+{remote}
{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}
""".strip()
@@ -365,6 +368,7 @@
kwargs = {
'project_name': roll.project_name,
+ 'remote': roll.remote,
'num_commits': num_commits,
'one_liners': '\n'.join(one_liners),
'old_revision': roll.old_revision,
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 b2969e6..e0bd666 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
@@ -637,12 +637,14 @@
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@template@[roll {project_name}] {sanitized_message}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '4444444444444444444444444444444444444444',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '1111111111111111111111111111111111111111',@@@",
"@@@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\\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@@@",
@@ -652,6 +654,7 @@
"@@@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@@@",
"@@@STEP_LOG_LINE@message@abc Rolled-Commits: 111111111111111..444444444444444@@@",
"@@@STEP_LOG_END@message@@@"
]
@@ -665,19 +668,22 @@
"@@@STEP_LOG_LINE@template@@@@",
"@@@STEP_LOG_LINE@template@{one_liners}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '8888888888888888888888888888888888888888',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'num_commits': 2,@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '5555555555555555555555555555555555555555',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'one_liners': '666666666666666 module: Short commit summary\\n888888888888888 module: Short commit summary',@@@",
- "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'def'}@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'def',@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'}@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[def] Roll 2 commits@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@666666666666666 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@888888888888888 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@def Rolled-Commits: 555555555555555..888888888888888@@@",
"@@@STEP_LOG_END@message@@@"
]
@@ -691,13 +697,15 @@
"@@@STEP_LOG_LINE@template@@@@",
"@@@STEP_LOG_LINE@template@{one_liners}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': 'cccccccccccccccccccccccccccccccccccccccc',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'num_commits': 3,@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '9999999999999999999999999999999999999999',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'one_liners': 'aaaaaaaaaaaaaaa module: Short commit summary\\nbbbbbbbbbbbbbbb module: Short commit summary\\nccccccccccccccc module: Short commit summary',@@@",
- "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'xyz'}@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'xyz',@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'}@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[xyz] Roll 3 commits@@@",
"@@@STEP_LOG_LINE@message@@@@",
@@ -705,6 +713,7 @@
"@@@STEP_LOG_LINE@message@bbbbbbbbbbbbbbb module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@ccccccccccccccc module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
"@@@STEP_LOG_END@message@@@"
]
@@ -722,6 +731,7 @@
"@@@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@@@",
"@@@STEP_LOG_LINE@message@abc Rolled-Commits: 111111111111111..444444444444444@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@[def] Roll 2 commits@@@",
@@ -729,6 +739,7 @@
"@@@STEP_LOG_LINE@message@666666666666666 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@888888888888888 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@def Rolled-Commits: 555555555555555..888888888888888@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@[xyz] Roll 3 commits@@@",
@@ -737,6 +748,7 @@
"@@@STEP_LOG_LINE@message@bbbbbbbbbbbbbbb module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@ccccccccccccccc module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_END@message@@@"
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
index 3d489b7..48f17aa 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
@@ -855,13 +855,15 @@
"@@@STEP_LOG_LINE@template@@@@",
"@@@STEP_LOG_LINE@template@{one_liners}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '4444444444444444444444444444444444444444',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'num_commits': 3,@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '1111111111111111111111111111111111111111',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'one_liners': '222222222222222 module: Short commit summary\\n333333333333333 module: Short commit summary\\n444444444444444 module: Short commit summary',@@@",
- "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'abc'}@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'abc',@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'}@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[abc] Roll 3 commits@@@",
"@@@STEP_LOG_LINE@message@@@@",
@@ -869,6 +871,7 @@
"@@@STEP_LOG_LINE@message@333333333333333 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@444444444444444 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@abc Rolled-Commits: 111111111111111..444444444444444@@@",
"@@@STEP_LOG_END@message@@@"
]
@@ -882,13 +885,15 @@
"@@@STEP_LOG_LINE@template@@@@",
"@@@STEP_LOG_LINE@template@{one_liners}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '8888888888888888888888888888888888888888',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'num_commits': 3,@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '5555555555555555555555555555555555555555',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'one_liners': '666666666666666 module: Short commit summary\\n777777777777777 module: Short commit summary\\n888888888888888 module: Short commit summary',@@@",
- "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'def'}@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'def',@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'}@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[def] Roll 3 commits@@@",
"@@@STEP_LOG_LINE@message@@@@",
@@ -896,6 +901,7 @@
"@@@STEP_LOG_LINE@message@777777777777777 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@888888888888888 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@def Rolled-Commits: 555555555555555..888888888888888@@@",
"@@@STEP_LOG_END@message@@@"
]
@@ -909,13 +915,15 @@
"@@@STEP_LOG_LINE@template@@@@",
"@@@STEP_LOG_LINE@template@{one_liners}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': 'cccccccccccccccccccccccccccccccccccccccc',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'num_commits': 3,@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '9999999999999999999999999999999999999999',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'one_liners': 'aaaaaaaaaaaaaaa module: Short commit summary\\nbbbbbbbbbbbbbbb module: Short commit summary\\nccccccccccccccc module: Short commit summary',@@@",
- "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'xyz'}@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'xyz',@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'}@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[xyz] Roll 3 commits@@@",
"@@@STEP_LOG_LINE@message@@@@",
@@ -923,6 +931,7 @@
"@@@STEP_LOG_LINE@message@bbbbbbbbbbbbbbb module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@ccccccccccccccc module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
"@@@STEP_LOG_END@message@@@"
]
@@ -939,6 +948,7 @@
"@@@STEP_LOG_LINE@message@333333333333333 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@444444444444444 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@abc Rolled-Commits: 111111111111111..444444444444444@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@[def] Roll 3 commits@@@",
@@ -947,6 +957,7 @@
"@@@STEP_LOG_LINE@message@777777777777777 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@888888888888888 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@def Rolled-Commits: 555555555555555..888888888888888@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@[xyz] Roll 3 commits@@@",
@@ -955,6 +966,7 @@
"@@@STEP_LOG_LINE@message@bbbbbbbbbbbbbbb module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@ccccccccccccccc module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_END@message@@@"
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 e6ded72..ede7239 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
@@ -421,12 +421,14 @@
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@template@[roll {project_name}] {sanitized_message}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '4444444444444444444444444444444444444444',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '1111111111111111111111111111111111111111',@@@",
"@@@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\\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@@@",
@@ -436,6 +438,7 @@
"@@@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@@@",
"@@@STEP_LOG_LINE@message@abc Rolled-Commits: 111111111111111..444444444444444@@@",
"@@@STEP_LOG_END@message@@@"
]
@@ -447,12 +450,14 @@
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@template@[roll {project_name}] {sanitized_message}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '8888888888888888888888888888888888888888',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '5555555555555555555555555555555555555555',@@@",
"@@@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\\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@@@",
@@ -462,6 +467,7 @@
"@@@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@@@",
"@@@STEP_LOG_LINE@message@def Rolled-Commits: 555555555555555..888888888888888@@@",
"@@@STEP_LOG_END@message@@@"
]
@@ -473,12 +479,14 @@
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@template@[roll {project_name}] {sanitized_message}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': 'cccccccccccccccccccccccccccccccccccccccc',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '9999999999999999999999999999999999999999',@@@",
"@@@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\\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@@@",
@@ -488,6 +496,7 @@
"@@@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@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
"@@@STEP_LOG_END@message@@@"
]
@@ -505,6 +514,7 @@
"@@@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@@@",
"@@@STEP_LOG_LINE@message@abc Rolled-Commits: 111111111111111..444444444444444@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@[roll def] module: Short commit summary@@@",
@@ -514,6 +524,7 @@
"@@@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@@@",
"@@@STEP_LOG_LINE@message@def Rolled-Commits: 555555555555555..888888888888888@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@[roll xyz] module: Short commit summary@@@",
@@ -523,6 +534,7 @@
"@@@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@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_END@message@@@"
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json b/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
index 1269ddb..658d386 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
@@ -539,13 +539,15 @@
"@@@STEP_LOG_LINE@template@@@@",
"@@@STEP_LOG_LINE@template@{one_liners}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '5555555555555555555555555555555555555555',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'num_commits': 'multiple',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': 'main',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'one_liners': '555555555555555 five\\n444444444444444 four\\n333333333333333 three\\n222222222222222 two\\n111111111111111 one\\n...',@@@",
- "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'proj'}@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'proj',@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'}@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[proj] Roll multiple commits@@@",
"@@@STEP_LOG_LINE@message@@@@",
@@ -556,6 +558,7 @@
"@@@STEP_LOG_LINE@message@111111111111111 one@@@",
"@@@STEP_LOG_LINE@message@...@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: main..555555555555555@@@",
"@@@STEP_LOG_END@message@@@"
]
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json b/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
index 31d9c57..1aee0f3 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
@@ -465,13 +465,15 @@
"@@@STEP_LOG_LINE@template@@@@",
"@@@STEP_LOG_LINE@template@{one_liners}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '4444444444444444444444444444444444444444',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'num_commits': 4,@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '0000000000000000000000000000000000000000',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'one_liners': '444444444444444 xyz\\n333333333333333 baz\\n222222222222222 00000000001111111111222222222233333333334444444444\\n111111111111111 foo',@@@",
- "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'proj'}@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'proj',@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'}@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[proj] Roll 4 commits@@@",
"@@@STEP_LOG_LINE@message@@@@",
@@ -480,6 +482,7 @@
"@@@STEP_LOG_LINE@message@222222222222222 00000000001111111111222222222233333333334444444444@@@",
"@@@STEP_LOG_LINE@message@111111111111111 foo@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: 000000000000000..444444444444444@@@",
"@@@STEP_LOG_END@message@@@"
]
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/rebase.json b/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
index 677b5e6..9a6abb7 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
@@ -539,13 +539,15 @@
"@@@STEP_LOG_LINE@template@@@@",
"@@@STEP_LOG_LINE@template@{one_liners}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '5555555555555555555555555555555555555555',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'num_commits': 5,@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '0000000000000000000000000000000000000000',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'one_liners': '555555555555555 five\\n444444444444444 four\\n333333333333333 three\\n222222222222222 two\\n111111111111111 one',@@@",
- "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'proj'}@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'project_name': 'proj',@@@",
+ "@@@STEP_LOG_LINE@kwargs@ 'remote': 'https://pigweed.googlesource.com/pigweed/pigweed'}@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[proj] Roll 5 commits@@@",
"@@@STEP_LOG_LINE@message@@@@",
@@ -555,6 +557,7 @@
"@@@STEP_LOG_LINE@message@222222222222222 two@@@",
"@@@STEP_LOG_LINE@message@111111111111111 one@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: 000000000000000..555555555555555@@@",
"@@@STEP_LOG_END@message@@@"
]
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 2279911..f0bc7cf 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
@@ -247,12 +247,14 @@
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@template@[roll {project_name}] {sanitized_message}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '1111111111111111111111111111111111111111',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '0000000000000000000000000000000000000000',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'original_message': '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\\n\\nbar\\n\\nOriginal-Bug: 123'}@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[roll proj] foo@@@",
@@ -261,6 +263,7 @@
"@@@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@@@",
"@@@STEP_LOG_END@message@@@"
]
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
index edcd78a..29f3d99 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
@@ -247,12 +247,14 @@
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@template@[roll {project_name}] {sanitized_message}@@@",
"@@@STEP_LOG_LINE@template@@@@",
+ "@@@STEP_LOG_LINE@template@{remote}@@@",
"@@@STEP_LOG_LINE@template@{project_name} Rolled-Commits: {old_revision:.15}..{new_revision:.15}@@@",
"@@@STEP_LOG_END@template@@@",
"@@@STEP_LOG_LINE@kwargs@{'new_revision': '1111111111111111111111111111111111111111',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'old_revision': '0000000000000000000000000000000000000000',@@@",
"@@@STEP_LOG_LINE@kwargs@ 'original_message': 'foo\\n\\nbar\\n\\nChange-Id: I11111',@@@",
"@@@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\\n\\nbar\\n'}@@@",
"@@@STEP_LOG_END@kwargs@@@",
"@@@STEP_LOG_LINE@message@[roll proj] foo@@@",
@@ -260,6 +262,7 @@
"@@@STEP_LOG_LINE@message@bar@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@@@@",
+ "@@@STEP_LOG_LINE@message@https://pigweed.googlesource.com/pigweed/pigweed@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: 000000000000000..111111111111111@@@",
"@@@STEP_LOG_END@message@@@"
]
