This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7211

fsmonitor: normalize Watchman paths to bytes
ClosedPublic

Authored by indygreg on Nov 2 2019, 6:03 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2b8be670dcb6: fsmonitor: normalize Watchman paths to bytes
Summary

Otherwise it will be a str on Python 3 and operations below
which operate in the bytes domain will fail.

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

indygreg created this revision.Nov 2 2019, 6:03 PM
indygreg added a commit: rHG2b8be670dcb6: fsmonitor: normalize Watchman paths to bytes.Nov 4 2019, 11:27 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2b8be670dcb6: fsmonitor: normalize Watchman paths to bytes (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fsmonitor/__init__.py (7 lines)

Diff 17527

hgext/fsmonitor/__init__.py

# For case changes on a case insensitive filesystem we may receive # For case changes on a case insensitive filesystem we may receive
# two entries, one with exists=True and another with exists=False. # two entries, one with exists=True and another with exists=False.
# The exists=True entries in the same response should be interpreted # The exists=True entries in the same response should be interpreted
# as being happens-after the exists=False entries due to the way that # as being happens-after the exists=False entries due to the way that
# Watchman tracks files. We use this property to reconcile deletes # Watchman tracks files. We use this property to reconcile deletes
# for name case changes. # for name case changes.
for entry in result[b'files']: for entry in result[b'files']:
fname = entry[b'name'] fname = entry[b'name']
# Watchman always give us a str. Normalize to bytes on Python 3
# using Watchman's encoding, if needed.
if not isinstance(fname, bytes):
fname = fname.encode(_watchmanencoding)
if _fixencoding: if _fixencoding:
fname = _watchmantofsencoding(fname) fname = _watchmantofsencoding(fname)
if switch_slashes: if switch_slashes:
fname = fname.replace(b'\\', b'/') fname = fname.replace(b'\\', b'/')
if normalize: if normalize:
normed = normcase(fname) normed = normcase(fname)
fname = normalize(fname, True, True) fname = normalize(fname, True, True)
foldmap[normed] = fname foldmap[normed] = fname
fmode = entry[b'mode'] fmode = entry[b'mode']
fexists = entry[b'exists'] fexists = entry[b'exists']