branching: merge with stable
authorAnton Shestakov <av6@dwimlabs.net>
Wed, 13 Feb 2019 19:18:17 +0800
changeset 4401 4baf81dd2193
parent 4398 5bca2c579b05 (current diff)
parent 4399 3722557b008c (diff)
child 4402 cdc095c32e01
branching: merge with stable
--- a/hgext3rd/evolve/obshistory.py	Fri Feb 08 17:52:49 2019 +0100
+++ b/hgext3rd/evolve/obshistory.py	Wed Feb 13 19:18:17 2019 +0800
@@ -601,8 +601,7 @@
             matchfn = scmutil.matchall(repo)
             firstline = True
             for chunk, label in patch.diffui(repo, node, succ, matchfn,
-                                             changes=None, opts=diffopts,
-                                             prefix='', relroot=''):
+                                             opts=diffopts):
                 if firstline:
                     fm.plain('\n')
                     firstline = False
@@ -738,8 +737,7 @@
             matchfn = scmutil.matchall(repo)
             firstline = True
             for chunk, label in patch.diffui(repo, node, succ, matchfn,
-                                             changes=None, opts=diffopts,
-                                             prefix='', relroot=''):
+                                             opts=diffopts):
                 if firstline:
                     fm.plain('\n')
                     firstline = False