android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

info: fix "current" output

Browse Source 
The "Current revision" field shows the revision as listed in the
manifest.  I think most users expect this to show the revision
that the git tree is checked out to instead.  Switch the output
to show that revision instead, and add a "Current branch" if it
matches a local branch.

Change-Id: Ib546f5ebbc8a23875fbd14bf166fbe95b7dd244e
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/239240
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Mike Frysinger 2019-10-01 01:17:55 -04:00
parent 2058c63641
commit f1c5dd8a0f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subcmds/info.py
View File

@ -94,13 +94,19 @@ class Info(PagedCommand):
self.out.nl() self.out.nl()
self.heading("Current revision: ") self.heading("Current revision: ")
self.headtext(p.revisionExpr) self.headtext(p.GetRevisionId())
self.out.nl()
currentBranch = p.CurrentBranch
if currentBranch:
self.heading('Current branch: ')
self.headtext(currentBranch)
self.out.nl() self.out.nl()
localBranches = list(p.GetBranches().keys()) localBranches = list(p.GetBranches().keys())
self.heading("Local Branches: ") self.heading("Local Branches: ")
self.redtext(str(len(localBranches))) self.redtext(str(len(localBranches)))
if len(localBranches) > 0: if localBranches:
self.text(" [") self.text(" [")
self.text(", ".join(localBranches)) self.text(", ".join(localBranches))
self.text("]") self.text("]")