Mercurial > hg-stable
changeset 37577:e7eea8582afa
py3: use pycompat.{strkwargs|byteskwargs} in infinitepush
Differential Revision: https://phab.mercurial-scm.org/D3275
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 12 Apr 2018 14:26:31 +0530 |
| parents | 6ef94f24aa82 |
| children | 56df2ca5c032 |
| files | hgext/infinitepush/__init__.py |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/infinitepush/__init__.py Wed Apr 11 22:36:16 2018 +0530 +++ b/hgext/infinitepush/__init__.py Thu Apr 12 14:26:31 2018 +0530 @@ -123,6 +123,7 @@ peer, phases, pushkey, + pycompat, registrar, util, wireproto, @@ -579,6 +580,7 @@ return _lookup def _pull(orig, ui, repo, source="default", **opts): + opts = pycompat.byteskwargs(opts) # Copy paste from `pull` command source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) @@ -620,7 +622,7 @@ # Remote scratch bookmarks will be deleted because remotenames doesn't # know about them. Let's save it before pull and restore after remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, source) - result = orig(ui, repo, source, **opts) + result = orig(ui, repo, source, **pycompat.strkwargs(opts)) # TODO(stash): race condition is possible # if scratch bookmarks was updated right after orig. # But that's unlikely and shouldn't be harmful.