depot_tools: Send the remote tracked ref to Rietveld via upload.py

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."""
 
 from distutils.version import LooseVersion
@@ skipping 1729 matching lines @@
   remote_url = cl.GetGitBaseUrlFromConfig()
   if not remote_url:
     if settings.GetIsGitSvn():
       remote_url = cl.GetGitSvnRemoteUrl()
     else:
       if cl.GetRemoteUrl() and '/' in cl.GetUpstreamBranch():
         remote_url = (cl.GetRemoteUrl() + '@'
                       + cl.GetUpstreamBranch().split('/')[-1])
   if remote_url:
     upload_args.extend(['--base_url', remote_url])
+    remote, remote_branch = cl.GetRemoteBranch()
+    if remote and remote_branch:
+      # Create the true path to the remote branch.
+      # Does the following translation:
+      # * refs/remotes/origin/refs/diff/test -> refs/diff/test
+      # * refs/remotes/origin/master -> refs/heads/master
+      # * refs/remotes/branch-heads/test -> refs/branch-heads/test
+      if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
+        remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
+      elif remote_branch.startswith('refs/remotes/%s/' % remote):
+        remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
+                                              'refs/heads/')
+      elif remote_branch.startswith('refs/remotes/branch-heads'):
+        remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
+      upload_args.extend(['--target_ref', remote_branch])

[agable, 2014/12/09 20:42:56]

So what happens if either remote or remote_branch comes back None/False? Under
what circumstances does that happen? How can we prevent it?

[rmistry, 2014/12/09 20:54:43]

Those are good questions and I am not sure. Looking at GetRemoteBranch it does
not appear that either should come back as None but it is probably good to be
defensive here.

 
   project = settings.GetProject()
   if project:
     upload_args.extend(['--project', project])
 
   try:
     upload_args = ['upload'] + upload_args + args
     logging.info('upload.RealMain(%s)', upload_args)
     issue, patchset = upload.RealMain(upload_args)
     issue = int(issue)
@@ skipping 1156 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 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:]))