This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7533

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

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

Details

Reviewers
dlax
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8accf5fa9930: repair: fix an `isinstance(nodelist, str)` check for py3
Summary

All of the callers appear to pass a list, so this doesn't fix anything in core
hg. But maybe out of tree extensions use this shortcut.

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 accepted this revision.Dec 1 2019, 4:49 AM
dlax added a subscriber: dlax.

All these API where one can pass either a list of "things" or just one "thing" is kind of ugly. We should only handle the list case, I think.

pulkit accepted this revision.Dec 2 2019, 10:05 AM
This revision is now accepted and ready to land.Dec 2 2019, 10:05 AM

Revision Contents
Changeset List

Diff 18426

mercurial/repair.py

repo.destroying() repo.destroying()
vfs = repo.vfs vfs = repo.vfs
# load bookmark before changelog to avoid side effect from outdated # load bookmark before changelog to avoid side effect from outdated
# changelog (see repo._refreshchangelog) # changelog (see repo._refreshchangelog)
repo._bookmarks repo._bookmarks
cl = repo.changelog cl = repo.changelog
# TODO handle undo of merge sets # TODO handle undo of merge sets
if isinstance(nodelist, str): if isinstance(nodelist, bytes):
nodelist = [nodelist] nodelist = [nodelist]
striplist = [cl.rev(node) for node in nodelist] striplist = [cl.rev(node) for node in nodelist]
striprev = min(striplist) striprev = min(striplist)
files = _collectfiles(repo, striprev) files = _collectfiles(repo, striprev)
saverevs = _collectbrokencsets(repo, files, striprev) saverevs = _collectbrokencsets(repo, files, striprev)
# Some revisions with rev > striprev may not be descendants of striprev. # Some revisions with rev > striprev may not be descendants of striprev.