Add explicit "python" to script for Windows compatibility

Remove cwd augmentation for good measure. This should be done by the
caller.

Bug: 923016
Change-Id: I7f6618d7a9e56f70168fc71046412c6d462f40fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2311320
Auto-Submit: Gregory Guterman <guterman@google.com>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

recipes/README.recipes.md

@@ -267,7 +267,7 @@ Returns (Path): The "depot_tools" root directory.
 
 #### **class [GclientApi](/recipes/recipe_modules/gclient/api.py#68)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
 
-&emsp; **@property**<br>&mdash; **def [DepsDiffException](/recipes/recipe_modules/gclient/api.py#426)(self):**
+&emsp; **@property**<br>&mdash; **def [DepsDiffException](/recipes/recipe_modules/gclient/api.py#422)(self):**
 
 &mdash; **def [\_\_call\_\_](/recipes/recipe_modules/gclient/api.py#78)(self, name, cmd, infra_step=True, \*\*kwargs):**
 

recipes/recipe_modules/gclient/api.py

@@ -363,7 +363,6 @@ class GclientApi(recipe_api.RecipeApi):
       cfg.revisions[path] = revision
 
   def diff_deps(self, cwd):
-    cwd = cwd.join(self.get_gerrit_patch_root())
     with self.m.context(cwd=cwd):
       step_result = self.m.git(
           '-c',
@@ -381,10 +380,7 @@ class GclientApi(recipe_api.RecipeApi):
 
         step_result = self(
             'recursively git diff all DEPS',
-            [
-                'recurse',
-                self.resource('diff_deps.py'),
-            ],
+            ['recurse', 'python', self.resource('diff_deps.py')],
             stdout=self.m.raw_io.output_text(add_output_log=True),
         )
 

recipes/recipe_modules/gclient/tests/diff_deps.expected/basic.json

@@ -9,7 +9,7 @@
       "--",
       "DEPS"
     ],
-    "cwd": "[CACHE]/src",
+    "cwd": "[CACHE]",
     "infra_step": true,
     "name": "checkout the previous DEPS"
   },
@@ -19,9 +19,10 @@
       "-u",
       "RECIPE_REPO[depot_tools]/gclient.py",
       "recurse",
+      "python",
       "RECIPE_MODULE[depot_tools::gclient]/resources/diff_deps.py"
     ],
-    "cwd": "[CACHE]/src",
+    "cwd": "[CACHE]",
     "env_suffixes": {
       "PATH": [
         "RECIPE_REPO[depot_tools]"
@@ -45,7 +46,7 @@
       "--",
       "DEPS"
     ],
-    "cwd": "[CACHE]/src",
+    "cwd": "[CACHE]",
     "infra_step": true,
     "name": "checkout the original DEPS"
   },

recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json

@@ -9,7 +9,7 @@
       "--",
       "DEPS"
     ],
-    "cwd": "[CACHE]/src",
+    "cwd": "[CACHE]",
     "infra_step": true,
     "name": "checkout the previous DEPS"
   },
@@ -19,9 +19,10 @@
       "-u",
       "RECIPE_REPO[depot_tools]/gclient.py",
       "recurse",
+      "python",
       "RECIPE_MODULE[depot_tools::gclient]/resources/diff_deps.py"
     ],
-    "cwd": "[CACHE]/src",
+    "cwd": "[CACHE]",
     "env_suffixes": {
       "PATH": [
         "RECIPE_REPO[depot_tools]"
@@ -46,7 +47,7 @@
       "--",
       "DEPS"
     ],
-    "cwd": "[CACHE]/src",
+    "cwd": "[CACHE]",
     "infra_step": true,
     "name": "checkout the original DEPS"
   },
@@ -70,7 +71,7 @@
       "    affected_files = api.gclient.diff_deps(api.path['cache'])",
       "  File \"RECIPE_REPO[recipe_engine]/recipe_engine/recipe_api.py\", in _inner",
       "    return func(*a, **kw)",
-      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/gclient/api.py\", line 398, in diff_deps",
+      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/gclient/api.py\", line 394, in diff_deps",
       "    raise self.DepsDiffException(msg)",
       "DepsDiffException: Couldn't checkout previous ref: fatal: bad object abcdef1234567890"
     ]

recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json

@@ -9,7 +9,7 @@
       "--",
       "DEPS"
     ],
-    "cwd": "[CACHE]/src",
+    "cwd": "[CACHE]",
     "infra_step": true,
     "name": "checkout the previous DEPS"
   },
@@ -19,9 +19,10 @@
       "-u",
       "RECIPE_REPO[depot_tools]/gclient.py",
       "recurse",
+      "python",
       "RECIPE_MODULE[depot_tools::gclient]/resources/diff_deps.py"
     ],
-    "cwd": "[CACHE]/src",
+    "cwd": "[CACHE]",
     "env_suffixes": {
       "PATH": [
         "RECIPE_REPO[depot_tools]"
@@ -45,7 +46,7 @@
       "--",
       "DEPS"
     ],
-    "cwd": "[CACHE]/src",
+    "cwd": "[CACHE]",
     "infra_step": true,
     "name": "checkout the original DEPS"
   },
@@ -69,7 +70,7 @@
       "    affected_files = api.gclient.diff_deps(api.path['cache'])",
       "  File \"RECIPE_REPO[recipe_engine]/recipe_engine/recipe_api.py\", in _inner",
       "    return func(*a, **kw)",
-      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/gclient/api.py\", line 414, in diff_deps",
+      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/gclient/api.py\", line 410, in diff_deps",
       "    raise self.DepsDiffException(msg)",
       "DepsDiffException: Unexpected result: autoroll diff found 0 files changed"
     ]

recipes/recipe_modules/gclient/tests/diff_deps.expected/windows.json

@@ -9,7 +9,7 @@
       "--",
       "DEPS"
     ],
-    "cwd": "[CACHE]\\src",
+    "cwd": "[CACHE]",
     "infra_step": true,
     "name": "checkout the previous DEPS"
   },
@@ -19,9 +19,10 @@
       "-u",
       "RECIPE_REPO[depot_tools]\\gclient.py",
       "recurse",
+      "python",
       "RECIPE_MODULE[depot_tools::gclient]\\resources\\diff_deps.py"
     ],
-    "cwd": "[CACHE]\\src",
+    "cwd": "[CACHE]",
     "env_suffixes": {
       "PATH": [
         "RECIPE_REPO[depot_tools]"
@@ -45,7 +46,7 @@
       "--",
       "DEPS"
     ],
-    "cwd": "[CACHE]\\src",
+    "cwd": "[CACHE]",
     "infra_step": true,
     "name": "checkout the original DEPS"
   },