Reland "Remove obsolete bot_update flag"

This reverts commit c91686c0. Reason for revert: Reland a light version of the original CL that keeps a dummy flag around. Original change's description: > Revert "Remove obsolete bot_update flag" > > This reverts commit 72048266. > > Reason for revert: Skia depends on it. Need to clean that up first. Currently blocks roll: > https://skia-review.googlesource.com/c/14145/ > > Original change's description: > > Remove obsolete bot_update flag > > > > Using the manifest is the default since a long time. The flag was only introduced to smoothly switch it on. Now the flag is not needed anymore. > > > > Bug: 398105 > > Change-Id: I4eb1c98e26e025a69f8b0a7c48877d78c031702e > > Reviewed-on: https://chromium-review.googlesource.com/485659 > > Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org> > > Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org> > > Commit-Queue: Michael Achenbach <machenbach@chromium.org> > > > > TBR=phajdan.jr@chromium.org,machenbach@chromium.org,tandrii@chromium.org,sergiyb@chromium.org,chromium-reviews@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: Iffc4d8076abd3c92feebfd7f3ef88be7ce34b692 > Reviewed-on: https://chromium-review.googlesource.com/486639 > Reviewed-by: Michael Achenbach <machenbach@chromium.org> > Commit-Queue: Michael Achenbach <machenbach@chromium.org> > R=phajdan.jr@chromium.org,machenbach@chromium.org,tandrii@chromium.org,sergiyb@chromium.org,chromium-reviews@chromium.org Bug: 398105 Change-Id: I817d446f8a8eff84c5d7143ac2b9c527a40991f1 Reviewed-on: https://chromium-review.googlesource.com/486640 Commit-Queue: Michael Achenbach <machenbach@chromium.org> Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org>

Reland "Remove obsolete bot_update flag"
This reverts commit c91686c0. Reason for revert: Reland a light version of the original CL that keeps a dummy flag around. Original change's description: > Revert "Remove obsolete bot_update flag" > > This reverts commit 72048266. > > Reason for revert: Skia depends on it. Need to clean that up first. Currently blocks roll: > https://skia-review.googlesource.com/c/14145/ > > Original change's description: > > Remove obsolete bot_update flag > > > > Using the manifest is the default since a long time. The flag was only introduced to smoothly switch it on. Now the flag is not needed anymore. > > > > Bug: 398105 > > Change-Id: I4eb1c98e26e025a69f8b0a7c48877d78c031702e > > Reviewed-on: https://chromium-review.googlesource.com/485659 > > Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org> > > Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org> > > Commit-Queue: Michael Achenbach <machenbach@chromium.org> > > > > TBR=phajdan.jr@chromium.org,machenbach@chromium.org,tandrii@chromium.org,sergiyb@chromium.org,chromium-reviews@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: Iffc4d8076abd3c92feebfd7f3ef88be7ce34b692 > Reviewed-on: https://chromium-review.googlesource.com/486639 > Reviewed-by: Michael Achenbach <machenbach@chromium.org> > Commit-Queue: Michael Achenbach <machenbach@chromium.org> > R=phajdan.jr@chromium.org,machenbach@chromium.org,tandrii@chromium.org,sergiyb@chromium.org,chromium-reviews@chromium.org Bug: 398105 Change-Id: I817d446f8a8eff84c5d7143ac2b9c527a40991f1 Reviewed-on: https://chromium-review.googlesource.com/486640 Commit-Queue: Michael Achenbach <machenbach@chromium.org> Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org>
86989d7b · Michael Achenbach · Commit Bot · e4a7a042 · 86989d7b · 86989d7b
Commit 86989d7b authored Apr 25, 2017 by Michael Achenbach Committed by Commit Bot Apr 25, 2017
27 changed files
--- a/recipes/recipe_modules/bot_update/api.py
+++ b/recipes/recipe_modules/bot_update/api.py
@@ -76,8 +76,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
                      patch_root=None, no_shallow=False,
                      with_branch_heads=False, with_tags=False, refs=None,
                      patch_oauth2=False, oauth2_json=False,
-                      use_site_config_creds=True,
-                      output_manifest=True, clobber=False,
+                      use_site_config_creds=True, clobber=False,
                      root_solution_revision=None, rietveld=None, issue=None,
                      patchset=None, gerrit_no_reset=False,
                      gerrit_no_rebase_patch_ref=False, **kwargs):
@@ -232,8 +231,8 @@ class BotUpdateApi(recipe_api.RecipeApi):
      cmd.append('--clobber')
    if no_shallow:
      cmd.append('--no_shallow')
-    if output_manifest:
-      cmd.append('--output_manifest')
+    # TODO(machenbach): Remove in a separate CL for expectation changes.
+    cmd.append('--output_manifest')
    if with_branch_heads or cfg.with_branch_heads:
      cmd.append('--with_branch_heads')
    if with_tags:
@@ -247,7 +246,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
    first_sln = cfg.solutions[0].name
    step_test_data = lambda: self.test_api.output_json(
        root, first_sln, reverse_rev_map, self._fail_patch,
-        output_manifest=output_manifest, fixed_revisions=fixed_revisions)
+        fixed_revisions=fixed_revisions)

    # Add suffixes to the step name, if specified.
    name = 'bot_update'

--- a/recipes/recipe_modules/bot_update/example.expected/basic.json
+++ b/recipes/recipe_modules/bot_update/example.expected/basic.json
@@ -15,7 +15,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@abc"
+      "src@abc",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -31,6 +32,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"abc\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json
+++ b/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
-      "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
-      "--patch_root",
-      "src",
-      "--revision_mapping_file",
-      "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}",
-      "--git-cache-dir",
-      "[GIT_CACHE]",
-      "--output_json",
-      "/path/to/tmp/json",
-      "--revision",
-      "src@HEAD",
-      "--output_manifest"
-    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
-    },
-    "infra_step": true,
-    "name": "bot_update",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@Some step text@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#170242}\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
-      "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
-      "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
-      "--patch_root",
-      "src",
-      "--revision_mapping_file",
-      "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}",
-      "--git-cache-dir",
-      "[GIT_CACHE]",
-      "--output_json",
-      "/path/to/tmp/json",
-      "--revision",
-      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
-      "--output_manifest"
-    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
-    },
-    "infra_step": true,
-    "name": "bot_update (without patch)",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@Some step text@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#170242}\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json
+++ b/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json
@@ -16,6 +16,7 @@
      "/path/to/tmp/json",
      "--revision",
      "src@HEAD",
+      "--output_manifest",
      "--with_branch_heads"
    ],
    "env": {
@@ -32,6 +33,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/buildbot.json
+++ b/recipes/recipe_modules/bot_update/example.expected/buildbot.json
@@ -15,7 +15,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@abc"
+      "src@abc",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -31,6 +32,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"abc\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/clobber.json
+++ b/recipes/recipe_modules/bot_update/example.expected/clobber.json
@@ -16,7 +16,8 @@
      "/path/to/tmp/json",
      "--revision",
      "src@HEAD",
-      "--clobber"
+      "--clobber",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -32,6 +33,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json
+++ b/recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json
@@ -21,7 +21,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@HEAD"
+      "src@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -37,6 +38,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json
+++ b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json
@@ -16,6 +16,7 @@
      "/path/to/tmp/json",
      "--revision",
      "src@HEAD",
+      "--output_manifest",
      "--gerrit_no_rebase_patch_ref"
    ],
    "env": {
@@ -32,6 +33,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json
+++ b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json
@@ -16,6 +16,7 @@
      "/path/to/tmp/json",
      "--revision",
      "src@HEAD",
+      "--output_manifest",
      "--gerrit_no_reset"
    ],
    "env": {
@@ -32,6 +33,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/no_shallow.json
+++ b/recipes/recipe_modules/bot_update/example.expected/no_shallow.json
@@ -16,7 +16,8 @@
      "/path/to/tmp/json",
      "--revision",
      "src@HEAD",
-      "--no_shallow"
+      "--no_shallow",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -32,6 +33,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json
+++ b/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json
@@ -15,7 +15,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@revision"
+      "src@revision",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -31,6 +32,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"revision\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/trychange.json
+++ b/recipes/recipe_modules/bot_update/example.expected/trychange.json
@@ -17,7 +17,8 @@
      "--revision",
      "src@HEAD",
      "--refs",
-      "+refs/change/1/2/333"
+      "+refs/change/1/2/333",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -33,6 +34,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json
+++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json
@@ -19,7 +19,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@HEAD"
+      "src@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -35,6 +36,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json
+++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json
@@ -17,7 +17,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@HEAD"
+      "src@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -33,6 +34,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json
+++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json
@@ -17,7 +17,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@HEAD"
+      "src@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -33,6 +34,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/tryjob.json
+++ b/recipes/recipe_modules/bot_update/example.expected/tryjob.json
@@ -21,7 +21,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@HEAD"
+      "src@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -37,6 +38,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json
+++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json
@@ -21,7 +21,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@HEAD"
+      "src@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -38,6 +39,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json
+++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json
@@ -21,7 +21,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@HEAD"
+      "src@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -38,6 +39,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_apply_return_code\": 1, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": true, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",

--- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json
+++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json
@@ -21,7 +21,8 @@
      "--output_json",
      "/path/to/tmp/json",
      "--revision",
-      "src@HEAD"
+      "src@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -38,6 +39,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_apply_return_code\": 3, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": true, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",

--- a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json
+++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json
@@ -21,7 +21,8 @@
      "--revision",
      "src@HEAD",
      "--revision",
-      "src/third_party/angle@HEAD"
+      "src/third_party/angle@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -38,6 +39,12 @@
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\", @@@",
      "@@@STEP_LOG_LINE@json.output@    \"src/third_party/angle\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src/third_party/angle\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json
+++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json
@@ -21,7 +21,8 @@
      "--revision",
      "src@HEAD",
      "--revision",
-      "src/third_party/angle@HEAD"
+      "src/third_party/angle@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -38,6 +39,12 @@
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\", @@@",
      "@@@STEP_LOG_LINE@json.output@    \"src/third_party/angle\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src/third_party/angle\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json
+++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json
@@ -23,7 +23,8 @@
      "--revision",
      "src@HEAD",
      "--revision",
-      "src/v8@abc"
+      "src/v8@abc",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -40,6 +41,12 @@
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\", @@@",
      "@@@STEP_LOG_LINE@json.output@    \"src/v8\": \"abc\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src/v8\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json
+++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json
@@ -23,7 +23,8 @@
      "--revision",
      "src@HEAD",
      "--revision",
-      "src/v8@HEAD"
+      "src/v8@HEAD",
+      "--output_manifest"
    ],
    "env": {
      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
@@ -40,6 +41,12 @@
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\", @@@",
      "@@@STEP_LOG_LINE@json.output@    \"src/v8\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src/v8\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.expected/with_tags.json
+++ b/recipes/recipe_modules/bot_update/example.expected/with_tags.json
@@ -16,6 +16,7 @@
      "/path/to/tmp/json",
      "--revision",
      "src@HEAD",
+      "--output_manifest",
      "--with_tags"
    ],
    "env": {
@@ -32,6 +33,12 @@
      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",

--- a/recipes/recipe_modules/bot_update/example.py
+++ b/recipes/recipe_modules/bot_update/example.py
@@ -31,7 +31,6 @@ def RunSteps(api):
  patch = api.properties.get('patch', True)
  clobber = True if api.properties.get('clobber') else False
  no_shallow = True if api.properties.get('no_shallow') else False
-  output_manifest = api.properties.get('output_manifest', False)
  with_branch_heads = api.properties.get('with_branch_heads', False)
  with_tags = api.properties.get('with_tags', False)
  refs = api.properties.get('refs', [])
@@ -54,7 +53,6 @@ def RunSteps(api):
        patch=patch,
        with_branch_heads=with_branch_heads,
        with_tags=with_tags,
-        output_manifest=output_manifest,
        refs=refs, patch_oauth2=oauth2,
        oauth2_json=oauth2_json,
        clobber=clobber,
@@ -80,9 +78,6 @@ def GenTests(api):
      with_branch_heads=True,
      suffix='with branch heads'
  )
-  yield api.test('basic_output_manifest') + api.properties(
-      output_manifest=True,
-  )
  yield api.test('with_tags') + api.properties(with_tags=True)
  yield api.test('tryjob') + api.properties(
      issue=12345,

--- a/recipes/recipe_modules/bot_update/resources/bot_update.py
+++ b/recipes/recipe_modules/bot_update/resources/bot_update.py
@@ -919,8 +919,9 @@ def parse_args():
                        'Can prepend root@<rev> to specify which repository, '
                        'where root is either a filesystem path or git https '
                        'url. To specify Tip of Tree, set rev to HEAD. ')
+  # TODO(machenbach): Remove the flag when all uses have been removed.
  parse.add_option('--output_manifest', action='store_true',
-                   help=('Add manifest json to the json output.'))
+                   help=('Deprecated.'))
  parse.add_option('--clobber', action='store_true',
                   help='Delete checkout first, always')
  parse.add_option('--output_json',
@@ -1088,7 +1089,6 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
    #raise Exception('No got_revision(s) found in gclient output')

  if options.output_json:
-    manifest = create_manifest() if options.output_manifest else None
    # Tell recipes information such as root, got_revision, etc.
    emit_json(options.output_json,
              did_run=True,
@@ -1097,7 +1097,7 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
              step_text=step_text,
              fixed_revisions=revisions,
              properties=got_revisions,
-              manifest=manifest)
+              manifest=create_manifest())


 def print_debug_info():

--- a/recipes/recipe_modules/bot_update/test_api.py
+++ b/recipes/recipe_modules/bot_update/test_api.py
@@ -9,7 +9,7 @@ from recipe_engine import recipe_test_api

 class BotUpdateTestApi(recipe_test_api.RecipeTestApi):
  def output_json(self, root, first_sln, revision_mapping, fail_patch=False,
-                  output_manifest=False, fixed_revisions=None):
+                  fixed_revisions=None):
    """Deterministically synthesize json.output test data for gclient's
    --output-json option.
    """
@@ -35,16 +35,15 @@ class BotUpdateTestApi(recipe_test_api.RecipeTestApi):
        'step_text': 'Some step text'
    })

-    if output_manifest:
-      output.update({
-        'manifest': {
-          project_name: {
-            'repository': 'https://fake.org/%s.git' % project_name,
-            'revision': self.gen_revision(project_name),
-          }
-          for project_name in set(revision_mapping.values())
+    output.update({
+      'manifest': {
+        project_name: {
+          'repository': 'https://fake.org/%s.git' % project_name,
+          'revision': self.gen_revision(project_name),
        }
-      })
+        for project_name in set(revision_mapping.values())
+      }
+    })

    if fixed_revisions:
      output['fixed_revisions'] = fixed_revisions