mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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://golang.org/cl/148950045
This commit is contained in:
Russ Cox 2014-09-25 13:11:57 -04:00
parent d6ea375920
commit af282f0011
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/codereview/codereview.py
View File

@ -2024,13 +2024,13 @@ def submit(ui, repo, *pats, **opts):
# push to remote; if it fails for any reason, roll back # push to remote; if it fails for any reason, roll back
try: try:
new_heads = len(hg_heads(ui, repo).split()) 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. # Created new head, so we weren't up to date.
need_sync() need_sync()
# Push changes to remote. If it works, we're committed. If not, roll back. # Push changes to remote. If it works, we're committed. If not, roll back.
try: 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") raise hg_util.Abort("push error")
except hg_error.Abort, e: except hg_error.Abort, e:
if e.message.find("push creates new heads") >= 0: if e.message.find("push creates new heads") >= 0: