--- a/.hgignore Fri Nov 17 00:51:31 2017 +0100
+++ b/.hgignore Sat Nov 25 17:47:02 2017 -0500
@@ -6,7 +6,7 @@
\.swp$
\.orig$
\.rej$
-\.err$
+^tests/.*\.err$
^tests/easy_run.sh$
^build/
^dist/
--- a/CHANGELOG Fri Nov 17 00:51:31 2017 +0100
+++ b/CHANGELOG Sat Nov 25 17:47:02 2017 -0500
@@ -20,7 +20,7 @@
* fix new-heads check when pushing new topic with --publish.
-7.0.0 -- 2017-10-23
+7.0.0 -- 2017-11-02
-------------------
* drop compatibility with Mercurial 3.8, 3.9 and 4.0,
--- a/hgext3rd/topic/flow.py Fri Nov 17 00:51:31 2017 +0100
+++ b/hgext3rd/topic/flow.py Sat Nov 25 17:47:02 2017 -0500
@@ -41,11 +41,10 @@
newargs['opargs']['publish'] = True
return orig(repo, remote, *args, **newargs)
-def extendpushoperation(orig, *args, **kwargs):
+def extendpushoperation(orig, self, *args, **kwargs):
publish = kwargs.pop('publish', False)
- op = orig(*args, **kwargs)
- op.publish = publish
- return op
+ orig(self, *args, **kwargs)
+ self.publish = publish
def wrapphasediscovery(orig, pushop):
orig(pushop)
@@ -64,6 +63,7 @@
entry = extensions.wrapcommand(commands.table, 'push', wrappush)
entry[1].append(('', 'publish', False,
_('push the changeset as public')))
- extensions.wrapfunction(exchange, 'pushoperation', extendpushoperation)
+ extensions.wrapfunction(exchange.pushoperation, '__init__',
+ extendpushoperation)
extensions.wrapfunction(exchange, '_pushdiscoveryphase', wrapphasediscovery)
exchange.pushdiscoverymapping['phase'] = exchange._pushdiscoveryphase