--- a/hgext3rd/topic/discovery.py Mon Mar 21 21:25:04 2016 -0700
+++ b/hgext3rd/topic/discovery.py Mon Mar 21 21:26:45 2016 -0700
@@ -77,6 +77,7 @@
tr._prepushheads = _nbheads(op.repo)
reporef = weakref.ref(op.repo)
oldvalidator = tr.validator
+
def validator(tr):
repo = reporef()
if repo is not None:
@@ -89,14 +90,15 @@
raise error.Abort(msg)
for branch, newnb in finalheads.iteritems():
if 1 < newnb:
- msg = _('push create more than 1 head on new branch "%s"' % branch)
+ msg = _('push create more than 1 head on new branch "%s"'
+ % branch)
raise error.Abort(msg)
return oldvalidator(tr)
tr.validator = validator
handlecheckheads.params = frozenset()
def _pushb2phases(orig, pushop, bundler):
- hascheck = any(p.type == 'check:heads' for p in bundler._parts)
+ hascheck = any(p.type == 'check:heads' for p in bundler._parts)
if pushop.outdatedphases and not hascheck:
exchange._pushb2ctxcheckheads(pushop, bundler)
return orig(pushop, bundler)