]> Cypherpunks repositories - gostls13.git/commitdiff
[dev.garbage] lib/codereview: allow hg submit to commit new branch if CL description...
authorRuss Cox <rsc@golang.org>
Thu, 25 Sep 2014 17:11:57 +0000 (13:11 -0400)
committerRuss Cox <rsc@golang.org>
Thu, 25 Sep 2014 17:11:57 +0000 (13:11 -0400)
This means I won't have to edit the plugin when I create
the next dev branch.

LGTM=r, adg
R=r, adg
CC=golang-codereviews
https://golang.org/cl/148950045

lib/codereview/codereview.py

index fdf11d1f48f924ed261319c61af3a0a4329f42db..876264584bee5bf7a25abf415126a518e8c759fd 100644 (file)
@@ -2024,13 +2024,13 @@ def submit(ui, repo, *pats, **opts):
        # 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: