# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1500909413 14400
# Node ID 38fc45721334b566d2a3f56b3274c7fbc18ae1f5
# Parent  e5f8c7baa7290fd99d698fab4a419a09d8b41ca6
changegroup: wrap some ** expansions in strkwargs

diff -r e5f8c7baa729 -r 38fc45721334 mercurial/changegroup.py
--- a/mercurial/changegroup.py	Mon Jul 24 10:21:23 2017 -0400
+++ b/mercurial/changegroup.py	Mon Jul 24 11:16:53 2017 -0400
@@ -266,7 +266,8 @@
             # in this function.
             srctype = tr.hookargs.setdefault('source', srctype)
             url = tr.hookargs.setdefault('url', url)
-            repo.hook('prechangegroup', throw=True, **tr.hookargs)
+            repo.hook('prechangegroup',
+                      throw=True, **pycompat.strkwargs(tr.hookargs))
 
             # write changelog data to temp files so concurrent readers
             # will not see an inconsistent view
@@ -353,7 +354,8 @@
                     hookargs = dict(tr.hookargs)
                     hookargs['node'] = hex(cl.node(clstart))
                     hookargs['node_last'] = hex(cl.node(clend - 1))
-                repo.hook('pretxnchangegroup', throw=True, **hookargs)
+                repo.hook('pretxnchangegroup',
+                          throw=True, **pycompat.strkwargs(hookargs))
 
             added = [cl.node(r) for r in xrange(clstart, clend)]
             phaseall = None