git-cl: Reword the message when surfacing traces to the user.
In crbug.com/955206 they pointed out that:
- It's not clear when to upload the issue
- It's not clear where to report it, or where to look for existing issues.
- It's not made clear that the traces can contain information the user might not want to share.
I've reworded the message to address those concerns
Bug: 955206
Change-Id: Ia1426007d389328eac52babeee1ec3782c2b104e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1606608
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
diff --git a/git_cl.py b/git_cl.py
index 5e5993a..f5b27d8 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -86,11 +86,16 @@
# traces we just collected.
TRACES_MESSAGE = (
'\n'
-'When filing a bug for this push, be sure to include the traces found at:\n'
+'A trace of this git-cl execution has been recorded at:\n'
' %(trace_name)s-traces.zip\n'
-'Consider including the git config and gitcookies, which we have packed for \n'
-'you at:\n'
-' %(trace_name)s-git-info.zip\n')
+'A redacted copy of your gitcookies file and git config has been recorded at:\n'
+' %(trace_name)s-git-info.zip\n'
+'If git-cl is not working correctly, please file a bug under the Infra>SDK\n'
+'component, include the files above, and set the Restrict-View-Google label\n'
+'so that they\'re not publicly accessible.\n'
+'Review the files before upload. They might contain sensitive information\n'
+'like reviewer emails, patchset titles, and the local path to your checkout.\n'
+)
# Format of the message to be stored as part of the traces to give developers a
# better context when they go through traces.
TRACES_README_FORMAT = (