commit f1c5dd8a0fdfa6ef916ea1befea9c44a10eae73f
author Mike Frysinger <vapier@google.com> Tue Oct 01 01:17:55 2019 -0400
committer Mike Frysinger <vapier@google.com> Sat Oct 05 05:24:34 2019 +0000
tree 21906ee8c28f9e641f7a5a6e9f40ef31d2f945ac
parent 2058c6364180a899bc17b8cefba193f931ef4493

info: fix "current" output

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>

subcmds/info.py

diff --git a/subcmds/info.py b/subcmds/info.py
index 0d5696d..b1e92e3 100644
--- a/subcmds/info.py
+++ b/subcmds/info.py
@@ -94,13 +94,19 @@
       self.out.nl()
 
       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()
+
       localBranches = list(p.GetBranches().keys())
       self.heading("Local Branches: ")
       self.redtext(str(len(localBranches)))
-      if len(localBranches) > 0:
+      if localBranches:
         self.text(" [")
         self.text(", ".join(localBranches))
         self.text("]")