This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7207

fsmonitor: access repo.root
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGffdf0bf28212: fsmonitor: access repo.root
Summary

There is no repo._root. It looks like fsmonitor has
been busted since this access was introduced in
ab1900323b1 in July 2019!

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 subscriber: durin42.Nov 2 2019, 6:07 PM

@durin42 if you don't want to take this entire series for stable, this patch should be taken because it unborks fsmonitor.

In related news, apparently we don't have meaningful test coverage that watchman integration is actually working, ugh.

indygreg added a commit: rHGffdf0bf28212: fsmonitor: access repo.root.Nov 4 2019, 11:27 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGffdf0bf28212: fsmonitor: access repo.root (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 17523

hgext/fsmonitor/__init__.py

if repo_has_depth_one_nested_repo(repo): if repo_has_depth_one_nested_repo(repo):
return return
fsmonitorstate = state.state(repo) fsmonitorstate = state.state(repo)
if fsmonitorstate.mode == b'off': if fsmonitorstate.mode == b'off':
return return
try: try:
client = watchmanclient.client(repo.ui, repo._root) client = watchmanclient.client(repo.ui, repo.root)
except Exception as ex: except Exception as ex:
_handleunavailable(ui, fsmonitorstate, ex) _handleunavailable(ui, fsmonitorstate, ex)
return return
repo._fsmonitorstate = fsmonitorstate repo._fsmonitorstate = fsmonitorstate
repo._watchmanclient = client repo._watchmanclient = client
dirstate, cached = localrepo.isfilecached(repo, b'dirstate') dirstate, cached = localrepo.isfilecached(repo, b'dirstate')