This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6669

py: error out if a "skip" character was given with non-dict to util.dirs()
ClosedPublic

Authored by martinvonz on Jul 22 2019, 1:06 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb5092c23ca35: py: error out if a "skip" character was given with non-dict to util.dirs()
Summary

util.dirs() keeps track of the directories in its input collection. If
a "skip" character is given to it, it will assume the input is a
dirstate map and it will skip entries that are in the given "skip"
state. I think this is used only for skipping removed entries ("r") in
the dirtate. The C implementation of util.dirs() errors out if it was
given a skip character and a non-dict was passed. The pure
implementation simply ignored the request skip state. Let's make it
easier to discover bugs here by erroring out in the pure
implementation too. Let's also switch to checking for the dict-ness,
to make the C implementation (since that's clearly been sufficient for
many years). This last change makes test-issue660.t pass on py3 in
pure mode, since the old check was for existence of iteritems(), which
doesn't exist on 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

martinvonz created this revision.Jul 22 2019, 1:06 PM
martinvonz added a commit: rHGb5092c23ca35: py: error out if a "skip" character was given with non-dict to util.dirs().Jul 22 2019, 3:03 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb5092c23ca35: py: error out if a "skip" character was given with non-dict to util.dirs() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (5 lines)

Diff 15999

mercurial/util.py

f.flush() f.flush()
class dirs(object): class dirs(object):
'''a multiset of directory names from a dirstate or manifest''' '''a multiset of directory names from a dirstate or manifest'''
def __init__(self, map, skip=None): def __init__(self, map, skip=None):
self._dirs = {} self._dirs = {}
addpath = self.addpath addpath = self.addpath
if safehasattr(map, 'iteritems') and skip is not None: if isinstance(map, dict) and skip is not None:
for f, s in map.iteritems(): for f, s in map.iteritems():
if s[0] != skip: if s[0] != skip:
addpath(f) addpath(f)
elif skip is not None:
raise error.ProgrammingError("skip character is only supported "
"with a dict source")
else: else:
for f in map: for f in map:
addpath(f) addpath(f)
def addpath(self, path): def addpath(self, path):
dirs = self._dirs dirs = self._dirs
for base in finddirs(path): for base in finddirs(path):
if base in dirs: if base in dirs: