From ecff4f17b08f791466b73d935c772de57f2257e6 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Tue, 29 Nov 2011 15:01:33 -0800 Subject: [PATCH] Describe the repo launch version in `repo version` repo version v1.7.8 (from https://android.googlesource.com/tools/repo.git) repo launcher version 1.14 (from /home/sop/bin/repo) git version 1.7.8.rc2.256.gcc761 Python 2.6.5 (r265:79063, Apr 16 2010, 13:57:41) [GCC 4.4.3] Change-Id: Ifcbe5b0e226a1a6ca85455eb62e4da5e9a0f0ca0 --- main.py | 4 ++++ subcmds/version.py | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/main.py b/main.py index ebce9b73..a4cf4304 100755 --- a/main.py +++ b/main.py @@ -36,6 +36,7 @@ from git_config import init_ssh, close_ssh from command import InteractiveCommand from command import MirrorSafeCommand from command import PagedCommand +from subcmds.version import Version from editor import Editor from error import DownloadError from error import ManifestInvalidRevisionError @@ -334,6 +335,9 @@ def _Main(argv): _CheckWrapperVersion(opt.wrapper_version, opt.wrapper_path) _CheckRepoDir(opt.repodir) + Version.wrapper_version = opt.wrapper_version + Version.wrapper_path = opt.wrapper_path + repo = _Repo(opt.repodir) try: try: diff --git a/subcmds/version.py b/subcmds/version.py index 83e77d0b..03195f88 100644 --- a/subcmds/version.py +++ b/subcmds/version.py @@ -19,6 +19,9 @@ from git_command import git from project import HEAD class Version(Command, MirrorSafeCommand): + wrapper_version = None + wrapper_path = None + common = False helpSummary = "Display the version of repo" helpUsage = """ @@ -31,5 +34,10 @@ class Version(Command, MirrorSafeCommand): print 'repo version %s' % rp.work_git.describe(HEAD) print ' (from %s)' % rem.url + + if Version.wrapper_path is not None: + print 'repo launcher version %s' % Version.wrapper_version + print ' (from %s)' % Version.wrapper_path + print git.version().strip() print 'Python %s' % sys.version