Patchwork D7533: repair: fix an `isinstance(nodelist, str)` check for py3

login
register
mail settings
Submitter phabricator
Date Dec. 2, 2019, 9:55 p.m.
Message ID <4f77b10594d06fb5b81867e16023886e@localhost.localdomain>
Download mbox | patch
Permalink /patch/43569/
State Not Applicable
Headers show

Comments

phabricator - Dec. 2, 2019, 9:55 p.m.
Closed by commit rHG8accf5fa9930: repair: fix an `isinstance(nodelist, str)` check for py3 (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7533?vs=18409&id=18426

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7533/new/

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

AFFECTED FILES
  mercurial/repair.py

CHANGE DETAILS




To: mharbison72, #hg-reviewers, dlax, pulkit
Cc: dlax, mercurial-devel

Patch

diff --git a/mercurial/repair.py b/mercurial/repair.py
--- a/mercurial/repair.py
+++ b/mercurial/repair.py
@@ -130,7 +130,7 @@ 
     cl = repo.changelog
 
     # TODO handle undo of merge sets
-    if isinstance(nodelist, str):
+    if isinstance(nodelist, bytes):
         nodelist = [nodelist]
     striplist = [cl.rev(node) for node in nodelist]
     striprev = min(striplist)