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:
+      if options.target_branch:
+        # Cannonicalize branch references to the equivalent local full symbolic
+        # refs, which are then translated into the remote full symbolic refs
+        # below.
+        if '/' not in options.target_branch:
+          remote_branch = 'refs/remotes/%s/%s' % (remote, options.target_branch)
+        else:
+          prefix_replacements = (('^((refs/)?remotes/)?branch-heads/',

[agable, 2015/01/22 22:59:11]

nit: would prefer these be formatted as

prefix_replacements = (
    ('before',       'after'),
    ('other before', 'other after'),
)

I think it's easier to see cause and effect, and it looks like it'll fit.

[Mike Wittman, 2015/01/23 23:54:47]

Done.

+                                  'refs/remotes/branch-heads/'),
+                                 ('^((refs/)?remotes/)?%s/' % remote,
+                                  'refs/remotes/%s/' % remote),
+                                 ('^(refs/)?heads/',
+                                  'refs/remotes/%s/' % remote))
+
+          match = None
+          for regex, replacement in prefix_replacements:
+            match = re.search(regex, options.target_branch)
+            if match:
+              remote_branch = options.target_branch.replace(match.group(0),
+                                                            replacement)
+              break
+          if not match:
+            # This is a branch path but not one we recognize; use as-is.
+            remote_branch = options.target_branch
+      elif not remote_branch.startswith('refs/remotes/branch-heads'):
+        # Default to master for refs that are not branches.
+        remote_branch = 'refs/remotes/%s/master' % remote
+        
       # 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/')
@@ skipping 73 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/22 22:59:11]

"to use for" is awkward and not super specific. Not sure what a better phrasing
would be though.

[Mike Wittman, 2015/01/23 23:54:47]

Cleaned this up by referring to a metavar.

+                        'Default: remote branch head, or master')

[agable, 2015/01/22 22:59:11]

nit: indentation

[Mike Wittman, 2015/01/23 23:54:47]

Done.

   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:]))