Fix gcl opened, gcl nothave, and gcl status to:...

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 #
 # Wrapper script around Rietveld's upload.py that groups files into
 # changelists.
 
 import getpass
 import os
@@ skipping 584 matching lines @@
       ErrorExit("Error accessing url %s" % request_path)
     else:
       return None
 
 
 def GetIssueDescription(issue):
   """Returns the issue description from Rietveld."""
   return SendToRietveld("/%d/description" % issue)
 
 
-def Opened():
+def Opened(show_unknown_files):
   """Prints a list of modified files in the current directory down."""
   files = GetModifiedFiles()
   cl_keys = files.keys()
   cl_keys.sort()
   for cl_name in cl_keys:
-    if cl_name:
-      note = ""
-      change_info = ChangeInfo.Load(cl_name, GetRepositoryRoot(),
-                                    fail_on_not_found=True, update_status=False)
-      if len(change_info.GetFiles()) != len(files[cl_name]):
-        note = " (Note: this changelist contains files outside this directory)"
-      print "\n--- Changelist " + cl_name + note + ":"
+    if not cl_name:
+      continue
+    note = ""
+    change_info = ChangeInfo.Load(cl_name, GetRepositoryRoot(),
+                                  fail_on_not_found=True, update_status=False)
+    if len(change_info.GetFiles()) != len(files[cl_name]):
+      note = " (Note: this changelist contains files outside this directory)"
+    print "\n--- Changelist " + cl_name + note + ":"
     for file in files[cl_name]:
       print "".join(file)
+  if show_unknown_files:
+    unknown_files = UnknownFiles([])
+  if (files.get('') or (show_unknown_files and len(unknown_files))):
+    print "\n--- Not in any changelist:"
+    for file in files.get('', []):
+      print "".join(file)
+    if show_unknown_files:
+      for file in unknown_files:
+        print "?      %s" % file
 
 
 def Help(argv=None):
   if argv:
     if argv[0] == 'try':
       TryChange(None, ['--help'], swallow_exception=False)
       return
     if argv[0] == 'upload':
       upload.RealMain(['upload.py', '--help'])
       return
@@ skipping 520 matching lines @@
         if os.path.isfile(file_path) and file != CODEREVIEW_SETTINGS_FILE:
           shutil.move(file_path, GetChangesDir())
     if not os.path.exists(GetCacheDir()):
       os.mkdir(GetCacheDir())
   except gclient_utils.Error:
     # Will throw an exception if not run in a svn checkout.
     pass
 
   # Commands that don't require an argument.
   command = argv[1]
-  if command == "opened":
-    Opened()
-    return 0
-  if command == "status":
-    Opened()
-    print "\n--- Not in any changelist:"
-    UnknownFiles([])
+  if command == "opened" or command == "status":
+    Opened(command == "status")
     return 0
   if command == "nothave":
-    UnknownFiles(argv[2:])
+    unknown_files = UnknownFiles(argv[2:])
+    for file in unknown_files:
+      print "?      " + "".join(file)
     return 0
   if command == "changes":
     Changes()
     return 0
   if command == "help":
     Help(argv[2:])
     return 0
   if command == "diff" and len(argv) == 2:
     files = GetFilesNotInCL()
     print GenerateDiff([x[1] for x in files])
@@ skipping 61 matching lines @@
     # the files. This allows commands such as 'gcl diff xxx' to work.
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.GetFileNames()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())