changeset 4401:4baf81dd2193

branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 13 Feb 2019 19:18:17 +0800
parents 5bca2c579b05 (current diff) 3722557b008c (diff)
children cdc095c32e01
files
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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