obshistory: omit keyword arguments with default values in patch.diffui() calls stable
authorAnton Shestakov <av6@dwimlabs.net>
Mon, 11 Feb 2019 21:33:02 +0800
branchstable
changeset 4399 3722557b008c
parent 4397 d2c1e6d61658
child 4400 9a6cebfb596b
child 4401 4baf81dd2193
child 4409 2a593d8f07e7
obshistory: omit keyword arguments with default values in patch.diffui() calls d4c9eebdd72d made that function not take "relroot" and "prefix" anymore, and instead expect "pathfn". These two chunks of code in this patch simply generate patches for obslog -p and they broke because they tried to provide default values for "prefix" and "relroot" for no apparent reason (and also for "changes"). Let's instead rely on defaults of patch.diffui().
hgext3rd/evolve/obshistory.py
--- a/hgext3rd/evolve/obshistory.py	Fri Feb 08 10:21:09 2019 +0100
+++ b/hgext3rd/evolve/obshistory.py	Mon Feb 11 21:33:02 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