Support --target-branch option to git-cl upload for Rietveld

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 1731 matching lines @@
     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/')
+      if options.target_branch:

[agable, 2015/01/07 21:45:09]

And what if the user passes --target_branch=refs/heads/master?

[Mike Wittman, 2015/01/07 23:55:33]

Good point. I've updated the branch recognition to (I believe) recognize all
valid local and remote branch ref paths.

+        if options.target_branch.startswith('branch-heads/'):
+          remote_branch = 'refs/%s' % options.target_branch
+        else:
+          remote_branch = 'refs/heads/%s' % options.target_branch
+      else:
+        # 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/')
+
+        # Default to master for refs that are not branches.
+        if not remote_branch.startswith('refs/branch-heads'):
+          remote_branch = 'refs/heads/master'
+
       pending_prefix = settings.GetPendingRefPrefix()
       # If a pending prefix exists then replace refs/ with it.
       if pending_prefix:
         remote_branch = remote_branch.replace('refs/', pending_prefix)
       upload_args.extend(['--target_ref', remote_branch])
 
   project = settings.GetProject()
   if project:
     upload_args.extend(['--project', project])
 
@@ skipping 61 matching lines @@
                     '--emulate-svn-auto-props',
                     action="store_true",
                     dest="emulate_svn_auto_props",
                     help="Emulate Subversion's auto properties feature.")
   parser.add_option('-c', '--use-commit-queue', action='store_true',
                     help='tell the commit queue to commit this patchset')
   parser.add_option('--private', action='store_true',
                     help='set the review private (rietveld only)')
   parser.add_option('--target_branch',
                     '--target-branch',
-                    help='When uploading to gerrit, remote branch to '
-                         'use for CL.  Default: master')
+                    help='Remote branch to use for CL.  ' +

[agable, 2015/01/07 21:45:09]

As noted above, this text is not explicit enough to know what kind of format to
use. origin/master? master? refs/remotes/origin/master? refs/heads/master? And
of those could be construed as a valid of way of specifying a "remote branch",
but the code above only handles one of them (master).

[Mike Wittman, 2015/01/07 23:55:33]

We should now handle all of these cases.

+                        'Default: remote branch head, or master')
   parser.add_option('--email', default=None,
                     help='email address to use to connect to Rietveld')
   parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
                     help='add a set of OWNERS to TBR')
 
   add_git_similarity(parser)
   (options, args) = parser.parse_args(args)
 
-  if options.target_branch and not settings.GetIsGerrit():
-    parser.error('Use --target_branch for non gerrit repository.')
-
   if is_dirty_git_tree('upload'):
     return 1
 
   options.reviewers = cleanup_list(options.reviewers)
   options.cc = cleanup_list(options.cc)
 
   cl = Changelist()
   if args:
     # TODO(ukai): is it ok for gerrit case?
     base_branch = args[0]
@@ skipping 1070 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:]))