This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7213

fsmonitor: normalize clock value to bytes
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG09ab61c0ab4b: fsmonitor: normalize clock value to bytes
Summary

We normalize the value returned by watchman because
we perform a number of compares with this value in code.
So the easiest path forward is to normalize to bytes so we
don't have to update many call sites.

With this commit, the fsmonitor extension appears to be working
with Python 3! Although there are still some failures in edge
cases...

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: rHG09ab61c0ab4b: fsmonitor: normalize clock value 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 rHG09ab61c0ab4b: fsmonitor: normalize clock value 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 (2 lines)

Diff 17529

hgext/fsmonitor/__init__.py

) )
except Exception as ex: except Exception as ex:
_handleunavailable(self._ui, state, ex) _handleunavailable(self._ui, state, ex)
self._watchmanclient.clearconnection() self._watchmanclient.clearconnection()
return bail(b'exception during run') return bail(b'exception during run')
else: else:
# We need to propagate the last observed clock up so that we # We need to propagate the last observed clock up so that we
# can use it for our next query # can use it for our next query
state.setlastclock(result[b'clock']) state.setlastclock(pycompat.sysbytes(result[b'clock']))
if result[b'is_fresh_instance']: if result[b'is_fresh_instance']:
if state.walk_on_invalidate: if state.walk_on_invalidate:
state.invalidate() state.invalidate()
return bail(b'fresh instance') return bail(b'fresh instance')
fresh_instance = True fresh_instance = True
# Ignore any prior noteable files from the state info # Ignore any prior noteable files from the state info
notefiles = [] notefiles = []