checkout: Indicate which change is "primary"
This will allow tooling inside projects to determine which change
triggered the build vs the changes pulled in through patches.json.
Bug: b/390206195
Change-Id: I199d43174d499e588040616eafd10de0726e121f
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/260379
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
diff --git a/recipe_modules/checkout/api.py b/recipe_modules/checkout/api.py
index 2797ec2..9df4856 100644
--- a/recipe_modules/checkout/api.py
+++ b/recipe_modules/checkout/api.py
@@ -144,6 +144,7 @@
commit_message: str = attrs.field(default='')
topic: str | None = None
current_revision: str | None = None
+ primary: bool = False
@property
def gerrit_host(self) -> str:
@@ -478,6 +479,7 @@
change_id: str | int,
project: str = 'pigweed/pigweed',
patchset: int | None = None,
+ primary: bool = False,
) -> Change:
"""Process a LUCI GerritChange and return a Change object."""
@@ -543,6 +545,7 @@
project=details['project'],
topic=details.get('topic', None) or None,
current_revision=details['current_revision'],
+ primary=True,
)
def _process_gerrit_changes(
@@ -559,6 +562,7 @@
project=change.project,
change_id=change.change,
patchset=change.patchset,
+ primary=True,
)
yield result
seen.add(result.name)
@@ -685,6 +689,7 @@
submitted=True,
project=result['project'],
current_revision=commit.id,
+ primary=True,
)
)
diff --git a/recipe_modules/checkout/tests/git.expected/ci.json b/recipe_modules/checkout/tests/git.expected/ci.json
index de3f1ac..c5d200b 100644
--- a/recipe_modules/checkout/tests/git.expected/ci.json
+++ b/recipe_modules/checkout/tests/git.expected/ci.json
@@ -216,7 +216,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
@@ -1321,7 +1321,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": true, \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1341,7 +1341,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": true, \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1444,7 +1444,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1681,7 +1681,7 @@
"cmd": [],
"name": "applied_changes",
"~followup_annotations": [
- "@@@STEP_SUMMARY_TEXT@[Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')]@@@"
+ "@@@STEP_SUMMARY_TEXT@[Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)]@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/git.expected/fail-config.json b/recipe_modules/checkout/tests/git.expected/fail-config.json
index b91efd0..d2234fa 100644
--- a/recipe_modules/checkout/tests/git.expected/fail-config.json
+++ b/recipe_modules/checkout/tests/git.expected/fail-config.json
@@ -177,7 +177,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/git.expected/multiple-equiv-remote.json b/recipe_modules/checkout/tests/git.expected/multiple-equiv-remote.json
index 1f4770f..372f239 100644
--- a/recipe_modules/checkout/tests/git.expected/multiple-equiv-remote.json
+++ b/recipe_modules/checkout/tests/git.expected/multiple-equiv-remote.json
@@ -391,7 +391,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1000",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1000, remote='https://pigweed.googlesource.com/foo', ref='refs/changes/00/1000/1', rebase=True, project='foo', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1000, remote='https://pigweed.googlesource.com/foo', ref='refs/changes/00/1000/1', rebase=True, project='foo', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -399,7 +399,7 @@
"name": "checkout pigweed.change data.changes.pigweed:2000",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2000, remote='https://pigweed.googlesource.com/bar', ref='refs/changes/00/2000/1', rebase=True, project='bar', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2000, remote='https://pigweed.googlesource.com/bar', ref='refs/changes/00/2000/1', rebase=True, project='bar', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/git.expected/multiple-same-remote.json b/recipe_modules/checkout/tests/git.expected/multiple-same-remote.json
index 637a6d6..7ca494d 100644
--- a/recipe_modules/checkout/tests/git.expected/multiple-same-remote.json
+++ b/recipe_modules/checkout/tests/git.expected/multiple-same-remote.json
@@ -391,7 +391,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1000",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1000, remote='https://pigweed.googlesource.com/foo', ref='refs/changes/00/1000/1', rebase=True, project='foo', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1000, remote='https://pigweed.googlesource.com/foo', ref='refs/changes/00/1000/1', rebase=True, project='foo', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -399,7 +399,7 @@
"name": "checkout pigweed.change data.changes.pigweed:2000",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2000, remote='https://pigweed.googlesource.com/foo', ref='refs/changes/00/2000/1', rebase=True, project='foo', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2000, remote='https://pigweed.googlesource.com/foo', ref='refs/changes/00/2000/1', rebase=True, project='foo', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
index 81629cd..b051ed0 100644
--- a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
+++ b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
@@ -171,7 +171,7 @@
"name": "checkout pigweed.change data.changes.pigweed:0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=0, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=0, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
@@ -846,7 +846,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 0, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 0, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -854,7 +854,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 0, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 0, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -921,7 +921,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=0, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=0, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]\nnot applied []@@@"
]
},
{
@@ -1074,7 +1074,7 @@
"cmd": [],
"name": "applied_changes",
"~followup_annotations": [
- "@@@STEP_SUMMARY_TEXT@[Change(number=0, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)]@@@"
+ "@@@STEP_SUMMARY_TEXT@[Change(number=0, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/git.expected/other.json b/recipe_modules/checkout/tests/git.expected/other.json
index d18c802..c2ec617 100644
--- a/recipe_modules/checkout/tests/git.expected/other.json
+++ b/recipe_modules/checkout/tests/git.expected/other.json
@@ -177,7 +177,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
@@ -852,7 +852,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -860,7 +860,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -927,7 +927,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]\nnot applied []@@@"
]
},
{
@@ -1080,7 +1080,7 @@
"cmd": [],
"name": "applied_changes",
"~followup_annotations": [
- "@@@STEP_SUMMARY_TEXT@[Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)]@@@"
+ "@@@STEP_SUMMARY_TEXT@[Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/git.expected/trigger.json b/recipe_modules/checkout/tests/git.expected/trigger.json
index 772417b..328a710 100644
--- a/recipe_modules/checkout/tests/git.expected/trigger.json
+++ b/recipe_modules/checkout/tests/git.expected/trigger.json
@@ -216,7 +216,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='overridden-by-trigger', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='overridden-by-trigger', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
@@ -1373,7 +1373,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"overridden-by-trigger\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"overridden-by-trigger\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": true, \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1393,7 +1393,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"overridden-by-trigger\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"overridden-by-trigger\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": true, \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1496,7 +1496,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='overridden-by-trigger', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='overridden-by-trigger', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1733,7 +1733,7 @@
"cmd": [],
"name": "applied_changes",
"~followup_annotations": [
- "@@@STEP_SUMMARY_TEXT@[Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='overridden-by-trigger', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')]@@@"
+ "@@@STEP_SUMMARY_TEXT@[Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='overridden-by-trigger', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)]@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/git.expected/try.json b/recipe_modules/checkout/tests/git.expected/try.json
index a9c59a7..eaa410e 100644
--- a/recipe_modules/checkout/tests/git.expected/try.json
+++ b/recipe_modules/checkout/tests/git.expected/try.json
@@ -327,7 +327,7 @@
"name": "checkout pigweed.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=False, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=True, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=False, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=True, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1461,7 +1461,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_\", \"base_type\": \"merge-base\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": true, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": false, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_\", \"base_type\": \"merge-base\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": true, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": false, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1481,7 +1481,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_\", \"base_type\": \"merge-base\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": true, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": false, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_\", \"base_type\": \"merge-base\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": true, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": false, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1584,7 +1584,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=False, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_', base_type='merge-base', is_merge=True, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=False, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_', base_type='merge-base', is_merge=True, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1821,7 +1821,7 @@
"cmd": [],
"name": "applied_changes",
"~followup_annotations": [
- "@@@STEP_SUMMARY_TEXT@[Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=False, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_', base_type='merge-base', is_merge=True, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]@@@"
+ "@@@STEP_SUMMARY_TEXT@[Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=False, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_', base_type='merge-base', is_merge=True, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/ci.json b/recipe_modules/checkout/tests/repo.expected/ci.json
index 5b7fbb4..0ff92af 100644
--- a/recipe_modules/checkout/tests/repo.expected/ci.json
+++ b/recipe_modules/checkout/tests/repo.expected/ci.json
@@ -177,7 +177,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
@@ -765,7 +765,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.repo/manifests', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.repo/manifests', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]\nnot applied []@@@"
]
},
{
@@ -862,7 +862,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.repo/manifests', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.repo/manifests', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
index fadf330..be7b389 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
@@ -216,7 +216,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pinned', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pinned', branch='feature1', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pinned', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pinned', branch='feature1', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
@@ -1101,7 +1101,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pinned', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pinned', branch='feature1', gerrit_name='pigweed', submitted=True, patchset=None, path='pinned', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pinned', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pinned', branch='feature1', gerrit_name='pigweed', submitted=True, patchset=None, path='pinned', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1258,7 +1258,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pinned', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pinned', branch='feature1', gerrit_name='pigweed', submitted=True, patchset=None, path='pinned', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pinned', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pinned', branch='feature1', gerrit_name='pigweed', submitted=True, patchset=None, path='pinned', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
index 56a4299..3704be9 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1264,7 +1264,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=7, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=7, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1421,7 +1421,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=7, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=7, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
index 1b25d36..d9052a0 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
@@ -392,7 +392,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -400,7 +400,7 @@
"name": "checkout pigweed.change data.changes.default:2345",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1768,7 +1768,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1925,7 +1925,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1933,7 +1933,7 @@
"name": "changes.1",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
index 85a900d..128c954 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
@@ -391,7 +391,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/34/1234/1', rebase=True, project='pigweed/pigweed', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/34/1234/1', rebase=True, project='pigweed/pigweed', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -399,7 +399,7 @@
"name": "checkout pigweed.change data.changes.default:2345",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/pigweed/pigweed', ref='refs/changes/45/2345/1', rebase=True, project='pigweed/pigweed', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/pigweed/pigweed', ref='refs/changes/45/2345/1', rebase=True, project='pigweed/pigweed', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
index 9cd43c2..711f520 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
@@ -392,7 +392,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -400,7 +400,7 @@
"name": "checkout pigweed.change data.changes.default:2345",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1677,7 +1677,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1834,7 +1834,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1842,7 +1842,7 @@
"name": "changes.1",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='feature2', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/no_trigger.json b/recipe_modules/checkout/tests/repo.expected/no_trigger.json
index 68f6c48..4d03474 100644
--- a/recipe_modules/checkout/tests/repo.expected/no_trigger.json
+++ b/recipe_modules/checkout/tests/repo.expected/no_trigger.json
@@ -177,7 +177,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
@@ -762,7 +762,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.repo/manifests', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.repo/manifests', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]\nnot applied []@@@"
]
},
{
@@ -859,7 +859,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.repo/manifests', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.repo/manifests', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/prefix.json b/recipe_modules/checkout/tests/repo.expected/prefix.json
index f30f6e4..918ffc0 100644
--- a/recipe_modules/checkout/tests/repo.expected/prefix.json
+++ b/recipe_modules/checkout/tests/repo.expected/prefix.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.foo:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://foo.googlesource.com/prefix/suffix', ref='refs/changes/56/123456/7', rebase=True, project='prefix/suffix', branch='main', gerrit_name='foo', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://foo.googlesource.com/prefix/suffix', ref='refs/changes/56/123456/7', rebase=True, project='prefix/suffix', branch='main', gerrit_name='foo', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1211,7 +1211,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://foo.googlesource.com/prefix/suffix', ref='refs/changes/56/123456/7', rebase=True, project='prefix/suffix', branch='main', gerrit_name='foo', submitted=False, patchset=7, path='prefix/suffix', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://foo.googlesource.com/prefix/suffix', ref='refs/changes/56/123456/7', rebase=True, project='prefix/suffix', branch='main', gerrit_name='foo', submitted=False, patchset=7, path='prefix/suffix', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1368,7 +1368,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://foo.googlesource.com/prefix/suffix', ref='refs/changes/56/123456/7', rebase=True, project='prefix/suffix', branch='main', gerrit_name='foo', submitted=False, patchset=7, path='prefix/suffix', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://foo.googlesource.com/prefix/suffix', ref='refs/changes/56/123456/7', rebase=True, project='prefix/suffix', branch='main', gerrit_name='foo', submitted=False, patchset=7, path='prefix/suffix', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
index f0035ee..9a74f01 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
@@ -621,7 +621,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -629,7 +629,7 @@
"name": "checkout pigweed.change data.changes.default:2345",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/3', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/3', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1908,7 +1908,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/3', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=3, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/3', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=3, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
@@ -2065,7 +2065,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -2073,7 +2073,7 @@
"name": "changes.1",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/3', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=3, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/3', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=3, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
index 8e2079d..97f2038 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
@@ -459,7 +459,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -467,7 +467,7 @@
"name": "checkout pigweed.change data.changes.default:2345",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -475,7 +475,7 @@
"name": "checkout pigweed.change data.changes.pigweed:3456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/project-that-is-not-in-the-manifest', ref='refs/changes/56/3456/1', rebase=True, project='project-that-is-not-in-the-manifest', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/project-that-is-not-in-the-manifest', ref='refs/changes/56/3456/1', rebase=True, project='project-that-is-not-in-the-manifest', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1772,7 +1772,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied [Change(number=3456, remote='https://pigweed.googlesource.com/project-that-is-not-in-the-manifest', ref='refs/changes/56/3456/1', rebase=True, project='project-that-is-not-in-the-manifest', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied [Change(number=3456, remote='https://pigweed.googlesource.com/project-that-is-not-in-the-manifest', ref='refs/changes/56/3456/1', rebase=True, project='project-that-is-not-in-the-manifest', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]@@@"
]
},
{
@@ -1929,7 +1929,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1937,7 +1937,7 @@
"name": "changes.1",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1945,7 +1945,7 @@
"name": "changes.2",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/project-that-is-not-in-the-manifest', ref='refs/changes/56/3456/1', rebase=True, project='project-that-is-not-in-the-manifest', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/project-that-is-not-in-the-manifest', ref='refs/changes/56/3456/1', rebase=True, project='project-that-is-not-in-the-manifest', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple.json b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
index b11e030..a72e29b 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
@@ -392,7 +392,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -400,7 +400,7 @@
"name": "checkout pigweed.change data.changes.default:2345",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1679,7 +1679,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1836,7 +1836,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1844,7 +1844,7 @@
"name": "changes.1",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, project='default_name', branch='main', gerrit_name='default', submitted=False, patchset=1, path='default_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/try.json b/recipe_modules/checkout/tests/repo.expected/try.json
index dd43ee6..4270a4b 100644
--- a/recipe_modules/checkout/tests/repo.expected/try.json
+++ b/recipe_modules/checkout/tests/repo.expected/try.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1215,7 +1215,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1372,7 +1372,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, project='pigweed_name', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='pigweed_path', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/try_manifest.json b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
index 6b71f47..45b86ee 100644
--- a/recipe_modules/checkout/tests/repo.expected/try_manifest.json
+++ b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/manifest', branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/manifest', branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1283,7 +1283,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/manifest', branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, patchset=7, path='.repo/manifests', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/manifest', branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, patchset=7, path='.repo/manifests', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
@@ -1440,7 +1440,7 @@
"name": "changes.0",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/manifest', branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, patchset=7, path='.repo/manifests', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/manifest', branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, patchset=7, path='.repo/manifests', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json b/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
index 1ab20ca..1c451ed 100644
--- a/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
+++ b/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.foo:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://foo.googlesource.com/bar', ref='refs/changes/56/123456/7', rebase=True, project='bar', branch='main', gerrit_name='foo', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://foo.googlesource.com/bar', ref='refs/changes/56/123456/7', rebase=True, project='bar', branch='main', gerrit_name='foo', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/insteadof.json b/recipe_modules/checkout/tests/submodule.expected/insteadof.json
index 07a2f38..ed1d400 100644
--- a/recipe_modules/checkout/tests/submodule.expected/insteadof.json
+++ b/recipe_modules/checkout/tests/submodule.expected/insteadof.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1494,7 +1494,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1514,7 +1514,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1644,7 +1644,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
index a4c8d54..5d21b2a 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
@@ -216,7 +216,7 @@
"name": "checkout pigweed.change data.changes.x:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/baz', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='x', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/baz', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='x', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
@@ -1403,7 +1403,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \"baz\", \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \"baz\", \"primary\": true, \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1423,7 +1423,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \"baz\", \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \"baz\", \"primary\": true, \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1634,7 +1634,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/baz', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='x', submitted=True, patchset=None, path='baz', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/baz', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='x', submitted=True, patchset=None, path='baz', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-not-initialized.json b/recipe_modules/checkout/tests/submodule.expected/submodule-not-initialized.json
index 92fb90b..86fe4ec 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-not-initialized.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-not-initialized.json
@@ -216,7 +216,7 @@
"name": "checkout pigweed.change data.changes.x:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/b/c/d', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='x', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/b/c/d', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='x', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
index 7675dcc..a45545e 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.x:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1528,7 +1528,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"foo1\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"foo1\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1548,7 +1548,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"foo1\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"foo1\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1705,7 +1705,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=7, path='foo1', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=7, path='foo1', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
index ae26d05..4715567 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.x:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
index e79d83d..5dc2d7c 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.x:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
index 246720d..8467025 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.z:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://z.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='z', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://z.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='z', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1566,7 +1566,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"z\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"foo\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://z.googlesource.com/foo\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"z\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"foo\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://z.googlesource.com/foo\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1586,7 +1586,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"z\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"foo\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://z.googlesource.com/foo\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"z\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"foo\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://z.googlesource.com/foo\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1797,7 +1797,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://z.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='z', submitted=False, patchset=7, path='foo', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://z.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, project='foo', branch='main', gerrit_name='z', submitted=False, patchset=7, path='foo', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json
index 1f29587..225e1a5 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json
@@ -216,7 +216,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
index 41a3850..cc90c9f 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
@@ -216,7 +216,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
@@ -1334,7 +1334,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": true, \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1354,7 +1354,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": true, \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1457,7 +1457,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json
index 84547d7..56ca432 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json
@@ -216,7 +216,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
index 727db70..7e1b407 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
@@ -216,7 +216,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
@@ -1301,7 +1301,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": true, \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1321,7 +1321,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": true, \"project\": \"pigweed\", \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1424,7 +1424,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
index d41809c..50de03d 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
@@ -758,7 +758,7 @@
"name": "checkout pigweed.change data.changes.x:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -766,7 +766,7 @@
"name": "checkout pigweed.change data.changes.x:2345",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/3', rebase=True, project='bar', branch='main', gerrit_name='x', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/3', rebase=True, project='bar', branch='main', gerrit_name='x', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -774,7 +774,7 @@
"name": "checkout pigweed.change data.changes.pigweed:3456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/3', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/3', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -2904,7 +2904,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 3, \"path\": \"bar\", \"project\": \"bar\", \"rebase\": true, \"ref\": \"refs/changes/45/2345/3\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 3, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/3\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 3, \"path\": \"bar\", \"primary\": true, \"project\": \"bar\", \"rebase\": true, \"ref\": \"refs/changes/45/2345/3\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 3, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/3\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -2924,7 +2924,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 3, \"path\": \"bar\", \"project\": \"bar\", \"rebase\": true, \"ref\": \"refs/changes/45/2345/3\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 3, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/3\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 3, \"path\": \"bar\", \"primary\": true, \"project\": \"bar\", \"rebase\": true, \"ref\": \"refs/changes/45/2345/3\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 3, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/3\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -3135,7 +3135,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path='foo', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/3', rebase=True, project='bar', branch='main', gerrit_name='x', submitted=False, patchset=3, path='bar', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/3', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=3, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path='foo', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/3', rebase=True, project='bar', branch='main', gerrit_name='x', submitted=False, patchset=3, path='bar', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/3', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=3, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
index ec121c3..eda0145 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
@@ -851,7 +851,7 @@
"name": "checkout pigweed.change data.changes.x:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -859,7 +859,7 @@
"name": "checkout pigweed.change data.changes.x:2345",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/3', rebase=True, project='not-a-submodule', branch='main', gerrit_name='x', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/3', rebase=True, project='not-a-submodule', branch='main', gerrit_name='x', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -867,7 +867,7 @@
"name": "checkout pigweed.change data.changes.pigweed:3456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/3', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/3', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -875,7 +875,7 @@
"name": "checkout pigweed.change data.changes.forbidden:9999",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=9999, remote=None, ref=None, rebase=None, project=None, branch=None, gerrit_name='forbidden', submitted=False, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=9999, remote=None, ref=None, rebase=None, project=None, branch=None, gerrit_name='forbidden', submitted=False, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
@@ -2591,7 +2591,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 3, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/3\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 3, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/3\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -2611,7 +2611,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 3, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/3\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 3, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/3\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -2850,7 +2850,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path='foo', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/3', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=3, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied [Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/3', rebase=True, project='not-a-submodule', branch='main', gerrit_name='x', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=9999, remote=None, ref=None, rebase=None, project=None, branch=None, gerrit_name='forbidden', submitted=False, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)]@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path='foo', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/3', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=3, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied [Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/3', rebase=True, project='not-a-submodule', branch='main', gerrit_name='x', submitted=False, patchset=3, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=9999, remote=None, ref=None, rebase=None, project=None, branch=None, gerrit_name='forbidden', submitted=False, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
index f435956..685b34e 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
@@ -459,7 +459,7 @@
"name": "checkout pigweed.change data.changes.x:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -467,7 +467,7 @@
"name": "checkout pigweed.change data.changes.x:2345",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/1', rebase=True, project='not-a-submodule', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/1', rebase=True, project='not-a-submodule', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -475,7 +475,7 @@
"name": "checkout pigweed.change data.changes.pigweed:3456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -2160,7 +2160,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -2180,7 +2180,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -2409,7 +2409,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path='foo', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied [Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/1', rebase=True, project='not-a-submodule', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path='foo', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied [Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/1', rebase=True, project='not-a-submodule', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
index 6b437f6..f07686f 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
@@ -458,7 +458,7 @@
"name": "checkout pigweed.change data.changes.x:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -466,7 +466,7 @@
"name": "checkout pigweed.change data.changes.x:2345",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/1', rebase=True, project='bar', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/1', rebase=True, project='bar', branch='main', gerrit_name='x', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -474,7 +474,7 @@
"name": "checkout pigweed.change data.changes.pigweed:3456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -2604,7 +2604,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 1, \"path\": \"bar\", \"project\": \"bar\", \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 1, \"path\": \"bar\", \"primary\": true, \"project\": \"bar\", \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -2624,7 +2624,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 1, \"path\": \"bar\", \"project\": \"bar\", \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"path\": \"foo\", \"primary\": true, \"project\": \"foo\", \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 1, \"path\": \"bar\", \"primary\": true, \"project\": \"bar\", \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false, \"topic\": null}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -2835,7 +2835,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path='foo', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/1', rebase=True, project='bar', branch='main', gerrit_name='x', submitted=False, patchset=1, path='bar', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff'), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, project='foo', branch='main', gerrit_name='x', submitted=False, patchset=1, path='foo', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/1', rebase=True, project='bar', branch='main', gerrit_name='x', submitted=False, patchset=1, path='bar', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=1, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
index b82a84a..a8c8056 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.x:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/xyz', ref='refs/changes/56/123456/7', rebase=True, project='xyz', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/xyz', ref='refs/changes/56/123456/7', rebase=True, project='xyz', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
index 8207b4e..3832eff 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.x:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/baz', ref='refs/changes/56/123456/7', rebase=True, project='baz', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/baz', ref='refs/changes/56/123456/7', rebase=True, project='baz', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1566,7 +1566,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"baz\", \"project\": \"baz\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"baz\", \"primary\": true, \"project\": \"baz\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1586,7 +1586,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"baz\", \"project\": \"baz\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \"baz\", \"primary\": true, \"project\": \"baz\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1797,7 +1797,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://x.googlesource.com/baz', ref='refs/changes/56/123456/7', rebase=True, project='baz', branch='main', gerrit_name='x', submitted=False, patchset=7, path='baz', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://x.googlesource.com/baz', ref='refs/changes/56/123456/7', rebase=True, project='baz', branch='main', gerrit_name='x', submitted=False, patchset=7, path='baz', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/workspace.expected/found.json b/recipe_modules/checkout/tests/workspace.expected/found.json
index 7bba1aa..ce85465 100644
--- a/recipe_modules/checkout/tests/workspace.expected/found.json
+++ b/recipe_modules/checkout/tests/workspace.expected/found.json
@@ -326,7 +326,7 @@
"name": "checkout foo.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -2184,7 +2184,7 @@
"name": "checkout foo.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='../bazel_repos/pigweed_pigweed_pigweed.git', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='../bazel_repos/pigweed_pigweed_pigweed.git', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
@@ -2335,7 +2335,7 @@
"cmd": [],
"name": "applied_changes",
"~followup_annotations": [
- "@@@STEP_SUMMARY_TEXT@[Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='../bazel_repos/pigweed_pigweed_pigweed.git', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]@@@"
+ "@@@STEP_SUMMARY_TEXT@[Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='../bazel_repos/pigweed_pigweed_pigweed.git', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/workspace.expected/not-found.json b/recipe_modules/checkout/tests/workspace.expected/not-found.json
index 2e421da..5afb0c3 100644
--- a/recipe_modules/checkout/tests/workspace.expected/not-found.json
+++ b/recipe_modules/checkout/tests/workspace.expected/not-found.json
@@ -326,7 +326,7 @@
"name": "checkout foo.change data.changes.x:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/bar', ref='refs/changes/56/123456/7', rebase=True, project='bar', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/bar', ref='refs/changes/56/123456/7', rebase=True, project='bar', branch='main', gerrit_name='x', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index 72bfaab..57fea4b 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -177,7 +177,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
@@ -852,7 +852,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -860,7 +860,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -927,7 +927,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]\nnot applied []@@@"
]
},
{
diff --git a/recipes/target_to_cipd.expected/success.json b/recipes/target_to_cipd.expected/success.json
index 0e053f3..aef4d9d 100644
--- a/recipes/target_to_cipd.expected/success.json
+++ b/recipes/target_to_cipd.expected/success.json
@@ -216,7 +216,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)@@@"
]
},
{
@@ -1065,7 +1065,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.repo/manifests', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, project='pigweed', branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.repo/manifests', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision='2d72510e447ab60a9728aeea2362d8be2cbd7789', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipes/tokendb_check.expected/addition.json b/recipes/tokendb_check.expected/addition.json
index e30f273..c74dbb2 100644
--- a/recipes/tokendb_check.expected/addition.json
+++ b/recipes/tokendb_check.expected/addition.json
@@ -451,7 +451,7 @@
"name": "checkout pigweed.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1609,7 +1609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1629,7 +1629,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1732,7 +1732,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipes/tokendb_check.expected/no-change.json b/recipes/tokendb_check.expected/no-change.json
index 476a7e6..3742812 100644
--- a/recipes/tokendb_check.expected/no-change.json
+++ b/recipes/tokendb_check.expected/no-change.json
@@ -451,7 +451,7 @@
"name": "checkout pigweed.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1609,7 +1609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1629,7 +1629,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1732,7 +1732,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipes/tokendb_check.expected/removal.json b/recipes/tokendb_check.expected/removal.json
index 53473e3..a1526cf 100644
--- a/recipes/tokendb_check.expected/removal.json
+++ b/recipes/tokendb_check.expected/removal.json
@@ -451,7 +451,7 @@
"name": "checkout pigweed.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1609,7 +1609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1629,7 +1629,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1732,7 +1732,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipes/tokendb_check.expected/update.json b/recipes/tokendb_check.expected/update.json
index c3d630b..984b1fd 100644
--- a/recipes/tokendb_check.expected/update.json
+++ b/recipes/tokendb_check.expected/update.json
@@ -451,7 +451,7 @@
"name": "checkout pigweed.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1609,7 +1609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1629,7 +1629,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1732,7 +1732,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
diff --git a/recipes/update_python_versions.expected/simple.json b/recipes/update_python_versions.expected/simple.json
index 648d5ee..f2b300b 100644
--- a/recipes/update_python_versions.expected/simple.json
+++ b/recipes/update_python_versions.expected/simple.json
@@ -177,7 +177,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
@@ -852,7 +852,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -860,7 +860,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -927,7 +927,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]\nnot applied []@@@"
]
},
{
diff --git a/recipes/xrefs.expected/dry_run.json b/recipes/xrefs.expected/dry_run.json
index 571c361..f384e14 100644
--- a/recipes/xrefs.expected/dry_run.json
+++ b/recipes/xrefs.expected/dry_run.json
@@ -177,7 +177,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
@@ -852,7 +852,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -860,7 +860,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -927,7 +927,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]\nnot applied []@@@"
]
},
{
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index 103f9e7..cc47900 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -177,7 +177,7 @@
"name": "checkout pigweed.change data.changes.pigweed:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None)@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)@@@"
]
},
{
@@ -852,7 +852,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -860,7 +860,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": null, \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"path\": \".\", \"primary\": false, \"project\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -927,7 +927,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None)]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, project=None, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, path='.', base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='', topic=None, current_revision=None, primary=False)]\nnot applied []@@@"
]
},
{
diff --git a/recipes/xrefs.expected/tryjob.json b/recipes/xrefs.expected/tryjob.json
index 2a92dd7..6052f72 100644
--- a/recipes/xrefs.expected/tryjob.json
+++ b/recipes/xrefs.expected/tryjob.json
@@ -326,7 +326,7 @@
"name": "checkout pigweed.change data.changes.pigweed:123456",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path=None, base=None, base_type=None, is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)@@@"
]
},
{
@@ -1484,7 +1484,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1504,7 +1504,7 @@
"name": "checkout pigweed.write changes.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"current_revision\": \"ffffffffffffffffffffffffffffffffffffffff\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"path\": \".\", \"primary\": true, \"project\": \"pigweed/pigweed\", \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false, \"topic\": null}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
@@ -1607,7 +1607,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, project='pigweed/pigweed', branch='main', gerrit_name='pigweed', submitted=False, patchset=7, path='.', base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='', topic=None, current_revision='ffffffffffffffffffffffffffffffffffffffff', primary=True)]\nnot applied []@@@"
]
},
{
