diff options
author | Russ Cox <rsc@golang.org> | 2014-09-25 13:11:57 -0400 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2014-09-25 13:11:57 -0400 |
commit | f98c5ff28d3d8ec5683111c1af45e3e9d845a268 (patch) | |
tree | 8f2cdb1be6c6ca30253ea17fd5e9eb45340f1623 | |
parent | d3cde2de0d595c6e48f9fabd43fe72251d19b44a (diff) | |
download | go-f98c5ff28d3d8ec5683111c1af45e3e9d845a268.tar.gz |
[dev.garbage] lib/codereview: allow hg submit to commit new branch if CL description says so
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://codereview.appspot.com/148950045
-rw-r--r-- | lib/codereview/codereview.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index fdf11d1f4..876264584 100644 --- a/lib/codereview/codereview.py +++ b/lib/codereview/codereview.py @@ -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: |