Patchwork D3275: py3: use pycompat.{strkwargs|byteskwargs} in infinitepush

login
register
mail settings
Submitter phabricator
Date April 12, 2018, 3:04 p.m.
Message ID <27b83a3a7fd0ef8b737efcacca20c931@localhost.localdomain>
Download mbox | patch
Permalink /patch/30787/
State Not Applicable
Headers show

Comments

phabricator - April 12, 2018, 3:04 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe7eea8582afa: py3: use pycompat.{strkwargs|byteskwargs} in infinitepush (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3275?vs=8042&id=8055

REVISION DETAIL
  https://phab.mercurial-scm.org/D3275

AFFECTED FILES
  hgext/infinitepush/__init__.py

CHANGE DETAILS




To: pulkit, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/hgext/infinitepush/__init__.py b/hgext/infinitepush/__init__.py
--- a/hgext/infinitepush/__init__.py
+++ b/hgext/infinitepush/__init__.py
@@ -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.