checkout: Add patchset to Change
Bug: b/265795959
Change-Id: I523d151a21bb9ea5d50c9d3b92501b9d68affc77
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/127038
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
diff --git a/recipe_modules/checkout/api.py b/recipe_modules/checkout/api.py
index 8cf9dcd..2ff67d2 100644
--- a/recipe_modules/checkout/api.py
+++ b/recipe_modules/checkout/api.py
@@ -90,6 +90,12 @@
return str(x)
+def _int_or_none(x):
+ if x is None:
+ return x
+ return int(x)
+
+
@attr.s
class Change:
"""Data from buildbucket."""
@@ -102,6 +108,7 @@
branch = attr.ib(converter=_str_or_none)
gerrit_name = attr.ib(converter=_str_or_none)
submitted = attr.ib(type=bool)
+ patchset = attr.ib(converter=_int_or_none, default=None)
applied = attr.ib(type=bool, default=False, repr=False)
base = attr.ib(converter=_str_or_none, default=None)
base_type = attr.ib(converter=_str_or_none, default=None)
@@ -454,6 +461,7 @@
return Change(
number=change.change,
+ patchset=change.patchset,
bb_input=bb_input,
remote=remote,
ref=ref,
diff --git a/recipe_modules/checkout/tests/git.expected/ci.json b/recipe_modules/checkout/tests/git.expected/ci.json
index 6ea84b5..f7eec35 100644
--- a/recipe_modules/checkout/tests/git.expected/ci.json
+++ b/recipe_modules/checkout/tests/git.expected/ci.json
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1268,7 +1268,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1279,7 +1279,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1299,7 +1299,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
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 60e8e99..c6fe40b 100644
--- a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
+++ b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
@@ -151,7 +151,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=0, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -862,7 +862,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=0, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -873,7 +873,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 0, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 0, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -881,7 +881,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 0, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 0, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipe_modules/checkout/tests/git.expected/other.json b/recipe_modules/checkout/tests/git.expected/other.json
index c665bad..d59e7b2 100644
--- a/recipe_modules/checkout/tests/git.expected/other.json
+++ b/recipe_modules/checkout/tests/git.expected/other.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipe_modules/checkout/tests/git.expected/try.json b/recipe_modules/checkout/tests/git.expected/try.json
index 818c9a0..334154b 100644
--- a/recipe_modules/checkout/tests/git.expected/try.json
+++ b/recipe_modules/checkout/tests/git.expected/try.json
@@ -408,7 +408,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=True, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=False, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=True, commit_message='')@@@"
]
},
{
@@ -1510,7 +1510,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, branch='main', gerrit_name='pigweed', submitted=False, base='MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_', base_type='merge-base', is_merge=True, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=False, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_', base_type='merge-base', is_merge=True, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1521,7 +1521,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[{\"applied\": true, \"base\": \"MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_\", \"base_type\": \"merge-base\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": true, \"number\": 123456, \"rebase\": false, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_\", \"base_type\": \"merge-base\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": true, \"number\": 123456, \"patchset\": 7, \"rebase\": false, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1541,7 +1541,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": true, \"number\": 123456, \"rebase\": false, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"MERGEBASE_MERGEBASE_MERGEBASE_MERGEBASE_\", \"base_type\": \"merge-base\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": true, \"number\": 123456, \"patchset\": 7, \"rebase\": false, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipe_modules/checkout/tests/repo.expected/ci.json b/recipe_modules/checkout/tests/repo.expected/ci.json
index 1ad7117..f1a806f 100644
--- a/recipe_modules/checkout/tests/repo.expected/ci.json
+++ b/recipe_modules/checkout/tests/repo.expected/ci.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -691,7 +691,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -808,7 +808,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')@@@"
]
},
{
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 c3b52b6..713a379 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
@@ -195,7 +195,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, branch='feature1', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pinned', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='feature1', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -984,7 +984,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, branch='feature1', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pinned', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='feature1', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1170,7 +1170,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, branch='feature1', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pinned', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='feature1', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')@@@"
]
},
{
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 08ece48..8f5ef6f 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
@@ -407,7 +407,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, branch='feature1', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, branch='feature1', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1249,7 +1249,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, branch='feature1', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, branch='feature1', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1435,7 +1435,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, branch='feature1', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, branch='feature1', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
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 47a2d5b..3a85e30 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
@@ -471,7 +471,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, branch='feature1', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -479,7 +479,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, branch='feature2', gerrit_name='default', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='feature2', gerrit_name='default', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1716,7 +1716,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, branch='feature1', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='feature2', gerrit_name='default', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='feature2', gerrit_name='default', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1902,7 +1902,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, branch='feature1', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
@@ -1910,7 +1910,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, branch='feature2', gerrit_name='default', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='feature2', gerrit_name='default', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
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 433b5e6..e2c1016 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
@@ -470,7 +470,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, branch='feature1', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -478,7 +478,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, branch='feature2', gerrit_name='default', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='feature2', gerrit_name='default', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
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 ea2c1f8..76efb4f 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
@@ -471,7 +471,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, branch='feature1', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -479,7 +479,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, branch='feature2', gerrit_name='default', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='feature2', gerrit_name='default', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1625,7 +1625,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, branch='feature1', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='feature2', gerrit_name='default', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='feature2', gerrit_name='default', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1811,7 +1811,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, branch='feature1', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='feature1', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
@@ -1819,7 +1819,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, branch='feature2', gerrit_name='default', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='feature2', gerrit_name='default', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/no_trigger.json b/recipe_modules/checkout/tests/repo.expected/no_trigger.json
index c577c77..2e26446 100644
--- a/recipe_modules/checkout/tests/repo.expected/no_trigger.json
+++ b/recipe_modules/checkout/tests/repo.expected/no_trigger.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -691,7 +691,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -805,7 +805,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/prefix.json b/recipe_modules/checkout/tests/repo.expected/prefix.json
index f894d0a..33acf25 100644
--- a/recipe_modules/checkout/tests/repo.expected/prefix.json
+++ b/recipe_modules/checkout/tests/repo.expected/prefix.json
@@ -407,7 +407,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, branch='main', gerrit_name='foo', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://foo.googlesource.com/prefix/suffix', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='foo', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1196,7 +1196,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, branch='main', gerrit_name='foo', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://foo.googlesource.com/prefix/suffix', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='foo', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1382,7 +1382,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, branch='main', gerrit_name='foo', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://foo.googlesource.com/prefix/suffix', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='foo', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
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 52e8df1..1240924 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
@@ -644,7 +644,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -652,7 +652,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, branch='main', gerrit_name='default', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1798,7 +1798,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1986,7 +1986,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
@@ -1994,7 +1994,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, branch='main', gerrit_name='default', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
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 b631922..188e106 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
@@ -536,7 +536,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -544,7 +544,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, branch='main', gerrit_name='default', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -552,7 +552,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@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, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1716,7 +1716,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')]@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\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, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')]@@@"
]
},
{
@@ -1904,7 +1904,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
@@ -1912,7 +1912,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, branch='main', gerrit_name='default', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
@@ -1920,7 +1920,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@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, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple.json b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
index cc23ec6..36de678 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
@@ -471,7 +471,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -479,7 +479,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, branch='main', gerrit_name='default', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1625,7 +1625,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1813,7 +1813,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
@@ -1821,7 +1821,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, branch='main', gerrit_name='default', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://default.googlesource.com/default_name', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='default', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/try.json b/recipe_modules/checkout/tests/repo.expected/try.json
index 4c30a5f..4290166 100644
--- a/recipe_modules/checkout/tests/repo.expected/try.json
+++ b/recipe_modules/checkout/tests/repo.expected/try.json
@@ -407,7 +407,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1198,7 +1198,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1386,7 +1386,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed_name', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/repo.expected/try_manifest.json b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
index e9ae1b5..bd34a0c 100644
--- a/recipe_modules/checkout/tests/repo.expected/try_manifest.json
+++ b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
@@ -407,7 +407,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, branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='refs/changes/56/123456/7', rebase=True, branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1266,7 +1266,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, branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='refs/changes/56/123456/7', rebase=True, branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1454,7 +1454,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, branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='refs/changes/56/123456/7', rebase=True, branch='feature-not-in-manifest', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')@@@"
]
},
{
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 21ffb40..7f4cdf7 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
@@ -407,7 +407,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, branch='main', gerrit_name='foo', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://foo.googlesource.com/bar', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='foo', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
index 6a24c2e..a811c89 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
@@ -195,7 +195,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, branch='main', gerrit_name='x', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/b/c/d', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='x', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1274,7 +1274,7 @@
"name": "checkout pigweed.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/b/c/d', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='x', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/b/c/d', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='x', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1285,7 +1285,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://x.googlesource.com/b/c/d\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://x.googlesource.com/b/c/d\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1305,7 +1305,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://x.googlesource.com/b/c/d\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://x.googlesource.com/b/c/d\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
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 fc35179..a289e81 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
@@ -407,7 +407,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1507,7 +1507,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, branch='main', gerrit_name='x', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1518,7 +1518,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1538,7 +1538,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
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 2ac7cd1..92f452f 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
@@ -407,7 +407,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
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 52c15c5..538a58e 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
@@ -407,7 +407,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
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 adab710..a2f5764 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
@@ -407,7 +407,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, branch='main', gerrit_name='z', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://z.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='z', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1539,7 +1539,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, branch='main', gerrit_name='z', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://z.googlesource.com/foo', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='z', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1550,7 +1550,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\": \"\", \"gerrit_name\": \"z\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://z.googlesource.com/foo\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"z\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://z.googlesource.com/foo\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1570,7 +1570,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\": \"\", \"gerrit_name\": \"z\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://z.googlesource.com/foo\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"z\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://z.googlesource.com/foo\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
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 a8671ea..3312a09 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
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
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 fa274b5..bcf6e99 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1278,7 +1278,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1289,7 +1289,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1309,7 +1309,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
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 8825b9f..32a1984 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
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
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 7ed9fee..1f848a7 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1245,7 +1245,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1256,7 +1256,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1276,7 +1276,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
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 050d4b7..7eddd61 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
@@ -881,7 +881,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -889,7 +889,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -897,7 +897,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -2767,7 +2767,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, branch='main', gerrit_name='x', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -2778,7 +2778,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -2798,7 +2798,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
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 fc19d8f..f779b62 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
@@ -972,7 +972,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -980,7 +980,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -988,7 +988,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -996,7 +996,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, branch=None, gerrit_name='forbidden', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=9999, remote=None, ref=None, rebase=None, branch=None, gerrit_name='forbidden', submitted=False, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -2504,7 +2504,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, branch='main', gerrit_name='x', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied [Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message=''), Change(number=9999, remote=None, ref=None, rebase=None, branch=None, gerrit_name='forbidden', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')]@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied [Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message=''), Change(number=9999, remote=None, ref=None, rebase=None, branch=None, gerrit_name='forbidden', submitted=False, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')]@@@"
]
},
{
@@ -2515,7 +2515,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -2535,7 +2535,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
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 9d34d93..b1a999b 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
@@ -536,7 +536,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -544,7 +544,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -552,7 +552,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -2050,7 +2050,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, branch='main', gerrit_name='x', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied [Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')]@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied [Change(number=2345, remote='https://x.googlesource.com/not-a-submodule', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')]@@@"
]
},
{
@@ -2061,7 +2061,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -2081,7 +2081,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
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 8abda9a..1f3416c 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
@@ -535,7 +535,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -543,7 +543,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -551,7 +551,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -2421,7 +2421,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, branch='main', gerrit_name='x', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://x.googlesource.com/foo', ref='refs/changes/34/1234/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=2345, remote='https://x.googlesource.com/bar', ref='refs/changes/45/2345/1', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message=''), Change(number=3456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/3456/1', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=1, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -2432,7 +2432,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -2452,7 +2452,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 1234, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/34/1234/1\", \"remote\": \"https://x.googlesource.com/foo\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 2345, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/45/2345/1\", \"remote\": \"https://x.googlesource.com/bar\", \"submitted\": false}, {\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 3456, \"patchset\": 1, \"rebase\": true, \"ref\": \"refs/changes/56/3456/1\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
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 4a20ead..d27eb0c 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
@@ -407,7 +407,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/xyz', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
index aca540d..f3e5ce8 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
@@ -407,7 +407,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, branch='main', gerrit_name='x', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://x.googlesource.com/baz', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1539,7 +1539,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, branch='main', gerrit_name='x', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://x.googlesource.com/baz', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='x', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1550,7 +1550,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1570,7 +1570,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\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"x\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://x.googlesource.com/baz\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/build.expected/basic.json b/recipes/build.expected/basic.json
index c91dacb..0598362 100644
--- a/recipes/build.expected/basic.json
+++ b/recipes/build.expected/basic.json
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1268,7 +1268,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1279,7 +1279,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1299,7 +1299,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/build.expected/skip_archive.json b/recipes/build.expected/skip_archive.json
index 3569088..af33f13 100644
--- a/recipes/build.expected/skip_archive.json
+++ b/recipes/build.expected/skip_archive.json
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1268,7 +1268,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1279,7 +1279,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1299,7 +1299,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/docs_builder.expected/docs.json b/recipes/docs_builder.expected/docs.json
index ed21531..8f34a96 100644
--- a/recipes/docs_builder.expected/docs.json
+++ b/recipes/docs_builder.expected/docs.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/docs_builder.expected/docs_dry_run.json b/recipes/docs_builder.expected/docs_dry_run.json
index 25e1fe5..cd84261 100644
--- a/recipes/docs_builder.expected/docs_dry_run.json
+++ b/recipes/docs_builder.expected/docs_dry_run.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/envtest.expected/environment_variables.json b/recipes/envtest.expected/environment_variables.json
index d002e7b..375c10c 100644
--- a/recipes/envtest.expected/environment_variables.json
+++ b/recipes/envtest.expected/environment_variables.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/envtest.expected/fail.json b/recipes/envtest.expected/fail.json
index 9768eb7..db422eb 100644
--- a/recipes/envtest.expected/fail.json
+++ b/recipes/envtest.expected/fail.json
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1268,7 +1268,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1279,7 +1279,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1299,7 +1299,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/envtest.expected/pigweed.json b/recipes/envtest.expected/pigweed.json
index 33713ae..b813518 100644
--- a/recipes/envtest.expected/pigweed.json
+++ b/recipes/envtest.expected/pigweed.json
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1268,7 +1268,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1279,7 +1279,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1299,7 +1299,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/envtest.expected/windows.json b/recipes/envtest.expected/windows.json
index d5c6568..927e191 100644
--- a/recipes/envtest.expected/windows.json
+++ b/recipes/envtest.expected/windows.json
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1268,7 +1268,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1279,7 +1279,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]\\tmp_tmp_1"
],
"cwd": "[START_DIR]\\co",
@@ -1299,7 +1299,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/luci_config.expected/starlark.json b/recipes/luci_config.expected/starlark.json
index bd0a8a6..2af70a8 100644
--- a/recipes/luci_config.expected/starlark.json
+++ b/recipes/luci_config.expected/starlark.json
@@ -407,7 +407,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1533,7 +1533,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1544,7 +1544,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1564,7 +1564,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/pw_presubmit.expected/one_step.json b/recipes/pw_presubmit.expected/one_step.json
index 1a53d63..7d6a9ce 100644
--- a/recipes/pw_presubmit.expected/one_step.json
+++ b/recipes/pw_presubmit.expected/one_step.json
@@ -407,7 +407,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1533,7 +1533,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1544,7 +1544,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1564,7 +1564,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/pw_presubmit.expected/sign.json b/recipes/pw_presubmit.expected/sign.json
index c378f89..930fe56 100644
--- a/recipes/pw_presubmit.expected/sign.json
+++ b/recipes/pw_presubmit.expected/sign.json
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1268,7 +1268,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1279,7 +1279,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1299,7 +1299,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/pw_presubmit.expected/two_steps.json b/recipes/pw_presubmit.expected/two_steps.json
index 4b6efa9..baed4d1 100644
--- a/recipes/pw_presubmit.expected/two_steps.json
+++ b/recipes/pw_presubmit.expected/two_steps.json
@@ -407,7 +407,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='Build-Errors: continue')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='Build-Errors: continue')@@@"
]
},
{
@@ -1469,7 +1469,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='Build-Errors: continue')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='Build-Errors: continue')]\nnot applied []@@@"
]
},
{
@@ -1480,7 +1480,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\": \"Build-Errors: continue\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"Build-Errors: continue\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1500,7 +1500,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\": \"Build-Errors: continue\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"Build-Errors: continue\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index 6616827..ccec581 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -407,7 +407,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1533,7 +1533,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1544,7 +1544,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1564,7 +1564,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/run_script.expected/run_script.json b/recipes/run_script.expected/run_script.json
index 7bc3f1d..85d8548 100644
--- a/recipes/run_script.expected/run_script.json
+++ b/recipes/run_script.expected/run_script.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/run_script.expected/variable_substitution.json b/recipes/run_script.expected/variable_substitution.json
index c9ca6af..687ea34 100644
--- a/recipes/run_script.expected/variable_substitution.json
+++ b/recipes/run_script.expected/variable_substitution.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index f21141b..31edc42 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/target_to_cipd.expected/success.json b/recipes/target_to_cipd.expected/success.json
index 1143fc7..427b957 100644
--- a/recipes/target_to_cipd.expected/success.json
+++ b/recipes/target_to_cipd.expected/success.json
@@ -195,7 +195,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -948,7 +948,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/manifest', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
diff --git a/recipes/tokendb_check.expected/addition.json b/recipes/tokendb_check.expected/addition.json
index f759a41..542b1a5 100644
--- a/recipes/tokendb_check.expected/addition.json
+++ b/recipes/tokendb_check.expected/addition.json
@@ -532,7 +532,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1658,7 +1658,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1669,7 +1669,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1689,7 +1689,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/tokendb_check.expected/no-change.json b/recipes/tokendb_check.expected/no-change.json
index 0882275..ed99c0a 100644
--- a/recipes/tokendb_check.expected/no-change.json
+++ b/recipes/tokendb_check.expected/no-change.json
@@ -532,7 +532,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1658,7 +1658,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1669,7 +1669,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1689,7 +1689,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/tokendb_check.expected/removal.json b/recipes/tokendb_check.expected/removal.json
index 3b1fd2d..32e2a67 100644
--- a/recipes/tokendb_check.expected/removal.json
+++ b/recipes/tokendb_check.expected/removal.json
@@ -532,7 +532,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1658,7 +1658,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1669,7 +1669,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1689,7 +1689,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/tokendb_check.expected/update.json b/recipes/tokendb_check.expected/update.json
index 7984ad1..4759ffc 100644
--- a/recipes/tokendb_check.expected/update.json
+++ b/recipes/tokendb_check.expected/update.json
@@ -532,7 +532,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1658,7 +1658,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1669,7 +1669,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1689,7 +1689,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/tokendb_updater.expected/dry-run.json b/recipes/tokendb_updater.expected/dry-run.json
index 667e213..c3193b9 100644
--- a/recipes/tokendb_updater.expected/dry-run.json
+++ b/recipes/tokendb_updater.expected/dry-run.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/tokendb_updater.expected/separate-repo.json b/recipes/tokendb_updater.expected/separate-repo.json
index ceebad2..02b896c 100644
--- a/recipes/tokendb_updater.expected/separate-repo.json
+++ b/recipes/tokendb_updater.expected/separate-repo.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/tokendb_updater.expected/simple.json b/recipes/tokendb_updater.expected/simple.json
index d548c55..24f75bb 100644
--- a/recipes/tokendb_updater.expected/simple.json
+++ b/recipes/tokendb_updater.expected/simple.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/txt_roller.expected/backwards.json b/recipes/txt_roller.expected/backwards.json
index ff13af9..e4ba0c8 100644
--- a/recipes/txt_roller.expected/backwards.json
+++ b/recipes/txt_roller.expected/backwards.json
@@ -743,7 +743,7 @@
"name": "checkout foo.change data.changes.foo:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://foo.googlesource.com/foo', ref='h3ll0', rebase=False, branch='main', gerrit_name='foo', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://foo.googlesource.com/foo', ref='h3ll0', rebase=False, branch='main', gerrit_name='foo', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1367,7 +1367,7 @@
"name": "checkout foo.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://foo.googlesource.com/foo', ref='h3ll0', rebase=False, branch='main', gerrit_name='foo', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://foo.googlesource.com/foo', ref='h3ll0', rebase=False, branch='main', gerrit_name='foo', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1378,7 +1378,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\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/project",
@@ -1386,7 +1386,7 @@
"name": "checkout foo.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\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/txt_roller.expected/no-trigger.json b/recipes/txt_roller.expected/no-trigger.json
index 77978da..0ca59b7 100644
--- a/recipes/txt_roller.expected/no-trigger.json
+++ b/recipes/txt_roller.expected/no-trigger.json
@@ -743,7 +743,7 @@
"name": "checkout foo.change data.changes.foo:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://foo.googlesource.com/foo', ref='h3ll0', rebase=False, branch='main', gerrit_name='foo', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://foo.googlesource.com/foo', ref='h3ll0', rebase=False, branch='main', gerrit_name='foo', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1367,7 +1367,7 @@
"name": "checkout foo.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://foo.googlesource.com/foo', ref='h3ll0', rebase=False, branch='main', gerrit_name='foo', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://foo.googlesource.com/foo', ref='h3ll0', rebase=False, branch='main', gerrit_name='foo', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1378,7 +1378,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\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/project",
@@ -1386,7 +1386,7 @@
"name": "checkout foo.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\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/txt_roller.expected/success.json b/recipes/txt_roller.expected/success.json
index 4156313..3aa565b 100644
--- a/recipes/txt_roller.expected/success.json
+++ b/recipes/txt_roller.expected/success.json
@@ -1094,7 +1094,7 @@
"name": "checkout foo.change data.changes.foo:1234",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://foo.googlesource.com/foo', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='foo', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://foo.googlesource.com/foo', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='foo', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -2036,7 +2036,7 @@
"name": "checkout foo.status",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://foo.googlesource.com/foo', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='foo', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://foo.googlesource.com/foo', ref='2d72510e447ab60a9728aeea2362d8be2cbd7789', rebase=False, branch='main', gerrit_name='foo', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -2047,7 +2047,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\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/project",
@@ -2067,7 +2067,7 @@
"name": "checkout foo.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\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"foo\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"remote\": \"https://foo.googlesource.com/foo\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/update_python_versions.expected/simple.json b/recipes/update_python_versions.expected/simple.json
index 23a3ad8..723bcc1 100644
--- a/recipes/update_python_versions.expected/simple.json
+++ b/recipes/update_python_versions.expected/simple.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/xrefs.expected/dry_run.json b/recipes/xrefs.expected/dry_run.json
index de6e6fe..3eb5655 100644
--- a/recipes/xrefs.expected/dry_run.json
+++ b/recipes/xrefs.expected/dry_run.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index 634e35d..6c73eef 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -156,7 +156,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, branch='main', gerrit_name='pigweed', submitted=True, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -867,7 +867,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, branch='main', gerrit_name='pigweed', submitted=True, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=1234, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='h3ll0', rebase=False, branch='main', gerrit_name='pigweed', submitted=True, patchset=None, base='HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_', base_type='submitted_commit_hash', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -878,7 +878,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
+ "[{\"applied\": true, \"base\": \"HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_HEAD_\", \"base_type\": \"submitted_commit_hash\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -886,7 +886,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
+ "@@@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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 1234, \"patchset\": null, \"rebase\": false, \"ref\": \"h3ll0\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": true}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
diff --git a/recipes/xrefs.expected/tryjob.json b/recipes/xrefs.expected/tryjob.json
index 06036f4..4bb38f5 100644
--- a/recipes/xrefs.expected/tryjob.json
+++ b/recipes/xrefs.expected/tryjob.json
@@ -407,7 +407,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, branch='main', gerrit_name='pigweed', submitted=False, base=None, base_type=None, is_merge=False, commit_message='')@@@"
+ "@@@STEP_SUMMARY_TEXT@Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base=None, base_type=None, is_merge=False, commit_message='')@@@"
]
},
{
@@ -1533,7 +1533,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, branch='main', gerrit_name='pigweed', submitted=False, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
+ "@@@STEP_SUMMARY_TEXT@applied [Change(number=123456, remote='https://pigweed.googlesource.com/pigweed/pigweed', ref='refs/changes/56/123456/7', rebase=True, branch='main', gerrit_name='pigweed', submitted=False, patchset=7, base='REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_', base_type='remote_branch_tip', is_merge=False, commit_message='')]\nnot applied []@@@"
]
},
{
@@ -1544,7 +1544,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
+ "[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/co",
@@ -1564,7 +1564,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\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
+ "@@@STEP_LOG_LINE@tmp_tmp_1@[{\"applied\": true, \"base\": \"REMOTE_BRANCH_REMOTE_BRANCH_REMOTE_BRANCH_\", \"base_type\": \"remote_branch_tip\", \"branch\": \"main\", \"commit_message\": \"\", \"gerrit_name\": \"pigweed\", \"is_merge\": false, \"number\": 123456, \"patchset\": 7, \"rebase\": true, \"ref\": \"refs/changes/56/123456/7\", \"remote\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"submitted\": false}]@@@",
"@@@STEP_LOG_END@tmp_tmp_1@@@"
]
},
