Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 36430:7b86aa31b004
py3: fix handling of keyword arguments at more places
The keys of keyword arguments of Python 3 should be str, which is why we need to
prevent getting the b'' prefix added by the transformer or convert keys to str
using pycompat.strkwargs()
Differential Revision: https://phab.mercurial-scm.org/D2420
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sat, 24 Feb 2018 16:18:40 +0530 |
| parents | 4bc983568016 |
| children | 0b57596253b8 |
line wrap: on
line diff
--- a/hgext/rebase.py Sat Feb 24 16:16:14 2018 +0530 +++ b/hgext/rebase.py Sat Feb 24 16:18:40 2018 +0530 @@ -593,7 +593,8 @@ self.state[oldrev] = newrev if 'qtip' in repo.tags(): - updatemq(repo, self.state, self.skipped, **opts) + updatemq(repo, self.state, self.skipped, + **pycompat.strkwargs(opts)) # restore original working directory # (we do this before stripping)