This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7536

histedit: fix an `isinstance(nodelist, str)` check for py3
ClosedPublic

Authored by mharbison72 on Nov 30 2019, 12:09 PM.

Details

Reviewers
durin42
dlax
pulkit
Group Reviewers
hg-reviewers
Commits
rHG40db695040eb: histedit: fix an `isinstance(nodelist, str)` check for py3

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Nov 30 2019, 12:09 PM
dlax retitled this revision from hitedit: fix an `isinstance(nodelist, str)` check for py3 to histedit: fix an `isinstance(nodelist, str)` check for py3.Dec 1 2019, 4:53 AM
dlax accepted this revision.
pulkit accepted this revision.Dec 2 2019, 10:06 AM
This revision is now accepted and ready to land.Dec 2 2019, 10:06 AM

Revision Contents
Changeset List

Diff 18429

hgext/histedit.py

nodes = sorted(n for n in nodes if n in nm) nodes = sorted(n for n in nodes if n in nm)
roots = [c.node() for c in repo.set(b"roots(%ln)", nodes)] roots = [c.node() for c in repo.set(b"roots(%ln)", nodes)]
if roots: if roots:
backup = not nobackup backup = not nobackup
repair.strip(ui, repo, roots, backup=backup) repair.strip(ui, repo, roots, backup=backup)
def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs): def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs):
if isinstance(nodelist, str): if isinstance(nodelist, bytes):
nodelist = [nodelist] nodelist = [nodelist]
state = histeditstate(repo) state = histeditstate(repo)
if state.inprogress(): if state.inprogress():
state.read() state.read()
histedit_nodes = { histedit_nodes = {
action.node for action in state.actions if action.node action.node for action in state.actions if action.node
} }
common_nodes = histedit_nodes & set(nodelist) common_nodes = histedit_nodes & set(nodelist)