Parcourir la source

fail gracefully if git upstream-diff is called in cog

Bug: 339231299
Change-Id: Iaf3f6f8904fc2d0af0eeb5c22fa08bd6af3418be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5540932
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Auto-Submit: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Yiwei Zhang il y a 1 an
Parent
commit
5773197a10
1 fichiers modifiés avec 7 ajouts et 0 suppressions
  1. 7 0
      git_upstream_diff.py

+ 7 - 0
git_upstream_diff.py

@@ -8,10 +8,17 @@ import sys
 
 import subprocess2
 
+import gclient_utils
 import git_common as git
 
 
 def main(args):
+    if gclient_utils.IsEnvCog():
+        print(
+            'upstream-diff command is not supported. Please navigate to source '
+            'control view in the activity bar to check the diff.',
+            file=sys.stderr)
+        return 1
     default_args = git.get_config_list('depot-tools.upstream-diff.default-args')
     args = default_args + args