diff --git a/error.py b/error.py index 25ff80d1..cbefcb7e 100644 --- a/error.py +++ b/error.py @@ -13,10 +13,6 @@ # limitations under the License. -# URL to file bug reports for repo tool issues. -BUG_REPORT_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue' - - class ManifestParseError(Exception): """Failed to parse the manifest file. """ diff --git a/git_superproject.py b/git_superproject.py index 39a18f0b..f4792f5d 100644 --- a/git_superproject.py +++ b/git_superproject.py @@ -28,13 +28,11 @@ import sys from git_command import GitCommand from git_refs import R_HEADS +from wrapper import Wrapper _SUPERPROJECT_GIT_NAME = 'superproject.git' _SUPERPROJECT_MANIFEST_NAME = 'superproject_override.xml' -# URL to file bug reports for Google specific repo tool issues. -_BUG_REPORT_GOOGLE_URL = 'go/repo-bug' - class Superproject(object): """Get commit ids from superproject. @@ -277,7 +275,7 @@ class Superproject(object): # TODO(rtenneti): Come up with a solution to support non-google URL for # filing bug reports. print('error: please file a bug using %s to report missing commit_ids for: %s' % - (_BUG_REPORT_GOOGLE_URL, projects_missing_commit_ids), file=sys.stderr) + (Wrapper().BUG_URL_GOOGLE, projects_missing_commit_ids), file=sys.stderr) return None manifest_path = self._WriteManfiestFile() diff --git a/repo b/repo index d9c97de1..38c2255c 100755 --- a/repo +++ b/repo @@ -145,6 +145,11 @@ if not REPO_URL: REPO_REV = os.environ.get('REPO_REV') if not REPO_REV: REPO_REV = 'stable' +# URL to file bug reports for repo tool issues. +BUG_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue' + +# URL to file bug reports for Google specific repo tool issues. +BUG_URL_GOOGLE = 'go/repo-bug' # increment this whenever we make important changes to this script VERSION = (2, 14) @@ -1171,6 +1176,7 @@ The most commonly used repo commands are: For access to the full online help, install repo ("repo init"). """) + print('Bug reports:', BUG_URL) sys.exit(0) @@ -1204,6 +1210,7 @@ def _Version(): print('OS %s %s (%s)' % (uname.system, uname.release, uname.version)) print('CPU %s (%s)' % (uname.machine, uname.processor if uname.processor else 'unknown')) + print('Bug reports:', BUG_URL) sys.exit(0) diff --git a/subcmds/help.py b/subcmds/help.py index 6a767e6f..0989b999 100644 --- a/subcmds/help.py +++ b/subcmds/help.py @@ -20,6 +20,7 @@ from subcmds import all_commands from color import Coloring from command import PagedCommand, MirrorSafeCommand, GitcAvailableCommand, GitcClientCommand import gitc_utils +from wrapper import Wrapper class Help(PagedCommand, MirrorSafeCommand): @@ -78,6 +79,7 @@ Displays detailed usage information about a command. print( "See 'repo help ' for more information on a specific command.\n" "See 'repo help --all' for a complete list of recognized commands.") + print('Bug reports:', Wrapper().BUG_URL) def _PrintCommandHelp(self, cmd, header_prefix=''): class _Out(Coloring): diff --git a/subcmds/version.py b/subcmds/version.py index e95a86dc..1d9abb58 100644 --- a/subcmds/version.py +++ b/subcmds/version.py @@ -18,6 +18,7 @@ import sys from command import Command, MirrorSafeCommand from git_command import git, RepoSourceVersion, user_agent from git_refs import HEAD +from wrapper import Wrapper class Version(Command, MirrorSafeCommand): @@ -62,3 +63,4 @@ class Version(Command, MirrorSafeCommand): print('OS %s %s (%s)' % (uname.system, uname.release, uname.version)) print('CPU %s (%s)' % (uname.machine, uname.processor if uname.processor else 'unknown')) + print('Bug reports:', Wrapper().BUG_URL)