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

git_cl.py

Index: git_cl.py
===================================================================
--- git_cl.py	(revision 293289)
+++ git_cl.py	(working copy)
@@ -1747,6 +1747,21 @@
                       + 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: