Put patches to refs/patches/<username>/<patchname>

trychange.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.
 
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn/git repository or by directly
 connecting to the server by HTTP.
 """
 
@@ skipping 493 matching lines @@
     path = os.path.join(temp_dir, name)
     if contents is not None:
       with open(path, 'wb') as f:
         f.write(contents)
     yield path
   finally:
     shutil.rmtree(temp_dir, True)
 
 
 @contextlib.contextmanager
-def _PrepareDescriptionAndPatchFiles(description, options):
+def _PrepareDescriptionAndPatchFiles(description, options, use_username=True):

[agable, 2014/04/11 20:53:11]

Why add this complexity? The ref is not actually a path to the file -- just
because the ref contains the username doesn't mean the filename shouldn't.

[nodir, 2014/04/11 23:49:59]

Good point

   """Creates temporary files with description and patch.
 
   __enter__ called on the return value returns a tuple of patch_filename and
   description_filename.
 
   Args:
     description: contents of description file.
     options: patchset options object. Must have attributes: user,
         name (of patch) and diff (contents of patch).
+    use_username: specifies if username must be included in the patch_filename.
   """
   current_time = str(datetime.datetime.now()).replace(':', '.')
-  patch_basename = '%s.%s.%s.diff' % (Escape(options.user),
-                                      Escape(options.name), current_time)
+  patch_basename = '%s.%s.diff' % (Escape(options.name), current_time)
+  if use_username:
+    patch_basename = '%s.%s' % (Escape(options.user), patch_basename)
   with _TempFilename('description', description) as description_filename:
     with _TempFilename(patch_basename, options.diff) as patch_filename:
       yield patch_filename, description_filename
 
 
 def _SendChangeSVN(bot_spec, options):
   """Send a change to the try server by committing a diff file on a subversion
   server."""
   if not options.svn_repo:
     raise NoTryServerAccess('Please use the --svn_repo option to specify the'
@@ skipping 92 matching lines @@
   patch_dir = _GetPatchGitRepo(options.git_repo)
   def patch_git(*args):
     return scm.GIT.Capture(list(args), cwd=patch_dir)
   def add_and_commit(filename, comment_filename):
     patch_git('add', filename)
     patch_git('commit', '-F', comment_filename)
 
   assert scm.GIT.IsInsideWorkTree(patch_dir)
   assert not scm.GIT.IsWorkTreeDirty(patch_dir)
 
-  with _PrepareDescriptionAndPatchFiles(description, options) as (
+  with _PrepareDescriptionAndPatchFiles(description, options,
+                                        use_username=False) as (
        patch_filename, description_filename):
     logging.info('Committing patch')
-    target_branch = ('refs/patches/' +
-                     os.path.basename(patch_filename).replace(' ','-'))
+    target_branch = 'refs/patches/%s/%s' % (
+        Escape(options.user),
+        os.path.basename(patch_filename).replace(' ','-'))

[agable, 2014/04/11 20:53:11]

use underscores instead of hyphens

[nodir, 2014/04/11 23:49:59]

Done.

     target_filename = os.path.join(patch_dir, 'patch.diff')
     branch_file = os.path.join(patch_dir, GIT_BRANCH_FILE)
     try:
-      # Crete a new branch and put the patch there
+      # Create a new branch and put the patch there.
       patch_git('checkout', '--orphan', target_branch)
       patch_git('reset')
       patch_git('clean', '-f')
       shutil.copyfile(patch_filename, target_filename)
       add_and_commit(target_filename, description_filename)
       assert not scm.GIT.IsWorkTreeDirty(patch_dir)
 
       # Update the branch file in the master
       patch_git('checkout', 'master')
 
@@ skipping 461 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))