Cleanup 'git cl status' in preparation to add new features.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import difflib
@@ skipping 1048 matching lines @@
     return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
                   error_ok=False).strip()
 
 
 def CMDstatus(parser, args):
   """show status of changelists"""
   parser.add_option('--field',
                     help='print only specific field (desc|id|patch|url)')
   (options, args) = parser.parse_args(args)
 
-  # TODO: maybe make show_branches a flag if necessary.
-  show_branches = not options.field
-
-  if show_branches:
-    branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
-    if branches:
-      changes = (Changelist(branchref=b) for b in branches.splitlines())
-      branches = dict((cl.GetBranch(), cl.GetIssueURL()) for cl in changes)
-      alignment = max(5, max(len(b) for b in branches))
-      print 'Branches associated with reviews:'
-      for branch in sorted(branches):
-        print "  %*s: %s" % (alignment, branch, branches[branch])
-
-  cl = Changelist()
   if options.field:
+    cl = Changelist()
     if options.field.startswith('desc'):
       print cl.GetDescription()
     elif options.field == 'id':
       issueid = cl.GetIssue()
       if issueid:
         print issueid
     elif options.field == 'patch':
       patchset = cl.GetPatchset()
       if patchset:
         print patchset
     elif options.field == 'url':
       url = cl.GetIssueURL()
       if url:
         print url
-  else:
-    print
-    print 'Current branch:',
-    if not cl.GetIssue():
-      print 'no issue assigned.'
-      return 0
-    print cl.GetBranch()
-    print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())
-    print 'Issue description:'
-    print cl.GetDescription(pretty=True)
+    return 0
+
+  branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
+  if not branches:
+    print('No local branch found.')
+    return 0
+
+  changes = (Changelist(branchref=b) for b in branches.splitlines())
+  branches = dict((c.GetBranch(), c.GetIssueURL()) for c in changes)
+  alignment = max(5, max(len(b) for b in branches))
+  print 'Branches associated with reviews:'
+  for branch in sorted(branches):
+    print "  %*s: %s" % (alignment, branch, branches[branch])
+  cl = Changelist()
+  print
+  print 'Current branch:',
+  if not cl.GetIssue():
+    print 'no issue assigned.'
+    return 0
+  print cl.GetBranch()
+  print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())
+  print 'Issue description:'
+  print cl.GetDescription(pretty=True)
   return 0
 
 
 @usage('[issue_number]')
 def CMDissue(parser, args):
   """Set or display the current code review issue number.
 
   Pass issue number 0 to clear the current issue.
 """
   _, args = parser.parse_args(args)
@@ skipping 1059 matching lines @@
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))