trychange.py: make --sub_rep work again

trychange.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
@@ skipping 678 matching lines @@
       file_list = [f.LocalPath() for f in change.AffectedFiles()]
 
     if options.upstream_branch:
       path += '@' + options.upstream_branch
       # Clear file list so that the correct list will be retrieved from the
       # upstream branch.
       file_list = []
     checkouts.append(GuessVCS(options, path, file_list))
     checkouts[0].AutomagicalSettings()
     for item in options.sub_rep:
+      # Pass file_list=None because we don't know the sub repo's file list.
       checkout = GuessVCS(options, os.path.join(checkouts[0].checkout_root,

[Marc-Antoine Ruel (Google), 2012/01/06 02:41:38]

Wouha, alignment is not nice; please rewrite as
checkout = GuessVCS(
    options,
    os.path.join(checkouts[0].checkout_root, item),
    None)

-                                                item), file_list)
+                                                item), file_list=None)
       if checkout.checkout_root in [c.checkout_root for c in checkouts]:
         parser.error('Specified the root %s two times.' %
                      checkout.checkout_root)
       checkouts.append(checkout)
 
     can_http = options.port and options.host
     can_svn = options.svn_repo
     # If there was no transport selected yet, now we must have enough data to
     # select one.
     if not options.send_patch and not (can_http or can_svn):
@@ skipping 99 matching lines @@
     return 1
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(TryChange(None, None, False))