This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7209

fsmonitor: make _hashignore compatible with Python 3
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbdebc7b54dca: fsmonitor: make _hashignore compatible with Python 3
Summary

The Hasher wants a bytes but we were feeding it a str. Let's
use our repr() implementation to return bytes.

In addition, the hexdigest() would return a str, which would be
compared against a bytes and would always fail. Normalize to
bytes so the compare works.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

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

Revision Contents
Changeset List

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

Diff 17507

hgext/fsmonitor/__init__.py

"""Calculate hash for ignore patterns and filenames """Calculate hash for ignore patterns and filenames
If this information changes between Mercurial invocations, we can't If this information changes between Mercurial invocations, we can't
rely on Watchman information anymore and have to re-scan the working rely on Watchman information anymore and have to re-scan the working
copy. copy.
""" """
sha1 = hashlib.sha1() sha1 = hashlib.sha1()
sha1.update(repr(ignore)) sha1.update(pycompat.byterepr(ignore))
return sha1.hexdigest() return pycompat.sysbytes(sha1.hexdigest())
_watchmanencoding = pywatchman.encoding.get_local_encoding() _watchmanencoding = pywatchman.encoding.get_local_encoding()
_fsencoding = sys.getfilesystemencoding() or sys.getdefaultencoding() _fsencoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
_fixencoding = codecs.lookup(_watchmanencoding) != codecs.lookup(_fsencoding) _fixencoding = codecs.lookup(_watchmanencoding) != codecs.lookup(_fsencoding)
def _watchmantofsencoding(path): def _watchmantofsencoding(path):