code review 183140043: all: merge dev.garbage (d1238958d4ae) into default branch

lib/codereview/codereview.py

 # coding=utf-8
 # (The line above is necessary so that I can use 世界 in the
 # *comment* below without Python getting all bent out of shape.)
 
 # Copyright 2007-2009 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ skipping 2006 matching lines @@
         commit_okay = True
         ret = hg_commit(ui, repo, *files, message=message, user=userline)
         commit_okay = False
         if ret:
                 raise hg_util.Abort("nothing changed")
 
         node = repo["-1"].node()
         # push to remote; if it fails for any reason, roll back
         try:
                 new_heads = len(hg_heads(ui, repo).split())
-                if old_heads != new_heads and not (old_heads == 0 and new_heads == 1):
+                if cl.desc.find("create new branch") < 0 and old_heads != new_heads and not (old_heads == 0 and new_heads == 1):
                         # Created new head, so we weren't up to date.
                         need_sync()
 
                 # Push changes to remote.  If it works, we're committed.  If not, roll back.
                 try:
-                        if hg_push(ui, repo):
+                        if hg_push(ui, repo, new_branch=cl.desc.find("create new branch")>=0):
                                 raise hg_util.Abort("push error")
                 except hg_error.Abort, e:
                         if e.message.find("push creates new heads") >= 0:
                                 # Remote repository had changes we missed.
                                 need_sync()
                         raise
                 except urllib2.HTTPError, e:
                         print >>sys.stderr, "pushing to remote server failed; do you have commit permissions?"
                         raise
         except:
@@ skipping 1641 matching lines @@
                 ctype, body = EncodeMultipartFormData(form_fields, files)
                 url = "/%d/upload_patch/%d" % (int(issue), int(patchset))
                 print "Uploading patch for " + patch[0]
                 response_body = rpc_server.Send(url, body, content_type=ctype)
                 lines = response_body.splitlines()
                 if not lines or lines[0] != "OK":
                         StatusUpdate("  --> %s" % response_body)
                         sys.exit(1)
                 rv.append([lines[1], patch[0]])
         return rv