Fix gcl to look for newly-added codereview.settings files as well as modified...

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 139 matching lines @@
       dir_info = gclient_scm.CaptureSVNInfo(".")
       repo_root = dir_info["Repository Root"]
       if use_root:
         url_path = repo_root
       else:
         url_path = dir_info["URL"]
       content = ""
       while True:
         # First, look for a locally modified version of the file.
         local_path = os.path.join(local_dir, local_base)
-        content, rc = RunShellWithReturnCode(["svn", "status", local_path])
-        if not rc and content.startswith('M'):
+        r = gclient_scm.CaptureSVNStatus((local_path,))
+        rc = -1
+        if r:
+          (status, file) = r[0]
+          rc = 0
+        if not rc and (status.startswith('A') or status.startswith('M')):

[M-A Ruel, 2009/11/04 00:38:19]

you can do status[0] in ('A', 'M') since it's guaranteed to be a valid non-empty
string.

[Dirk Pranke, 2009/11/04 01:05:18]

Done.

           content = ReadFile(local_path)
           rc = 0
         else:
           # Then look in the repository.
           svn_path = url_path + "/" + filename
           content, rc = RunShellWithReturnCode(["svn", "cat", svn_path])
 
         if not rc:
           # Exit the loop if the file was found. Override content.
           break
@@ skipping 1098 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())