This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5587

watchman: detect nested mercurial repositories and abort
ClosedPublic

Authored by lothiraldan on Jan 15 2019, 11:57 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5125f0a9728b: watchman: detect nested mercurial repositories and abort
rHG6a7b2d2de124: watchman: detect nested mercurial repositories and abort
Summary

Disable fsmonitor on nested mercurial repositories. Only depth one
repositories are detected at the moment.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Jan 15 2019, 11:57 AM
indygreg accepted this revision.Jan 16 2019, 2:44 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
hgext/fsmonitor/__init__.py
748–750

Nit: we should be using repo.vfs.listdir() here, as all I/O should be abstracted via VFS layer. But I think this is fine (we make this violation in many other places).

This revision is now accepted and ready to land.Jan 16 2019, 2:44 PM
Closed by commit rHG6a7b2d2de124: watchman: detect nested mercurial repositories and abort (authored by lothiraldan). · Explain WhyJan 31 2019, 11:34 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 14075

hgext/fsmonitor/__init__.py

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['mode'] fmode = entry['mode']
fexists = entry['exists'] fexists = entry['exists']
kind = getkind(fmode) kind = getkind(fmode)
if '/.hg/' in fname or fname.endswith('/.hg'):
return bail('nested-repo-detected')
if not fexists: if not fexists:
# if marked as deleted and we don't already have a change # if marked as deleted and we don't already have a change
# record, mark it as deleted. If we already have an entry # record, mark it as deleted. If we already have an entry
# for fname then it was either part of walkexplicit or was # for fname then it was either part of walkexplicit or was
# an earlier result that was a case change # an earlier result that was a case change
if fname not in results and fname in dmap and ( if fname not in results and fname in dmap and (
matchalways or matchfn(fname)): matchalways or matchfn(fname)):
results[fname] = None results[fname] = None
distance = calcdistance(repo.unfiltered(), oldnode, newnode) distance = calcdistance(repo.unfiltered(), oldnode, newnode)
with state_update(repo, name="hg.update", oldnode=oldnode, newnode=newnode, with state_update(repo, name="hg.update", oldnode=oldnode, newnode=newnode,
distance=distance, partial=partial): distance=distance, partial=partial):
return orig( return orig(
repo, node, branchmerge, force, ancestor, mergeancestor, repo, node, branchmerge, force, ancestor, mergeancestor,
labels, matcher, **kwargs) labels, matcher, **kwargs)
def repo_has_depth_one_nested_repo(repo):
for f in repo.wvfs.listdir():
if os.path.isdir(os.path.join(repo.root, f, '.hg')):
msg = 'fsmonitor: sub-repository %r detected, fsmonitor disabled\n'
repo.ui.debug(msg % f)
indygregUnsubmitted
Not Done

Nit: we should be using repo.vfs.listdir() here, as all I/O should be abstracted via VFS layer. But I think this is fine (we make this violation in many other places).

indygreg: Nit: we should be using `repo.vfs.listdir()` here, as all I/O should be abstracted via VFS…
return True
return False
def reposetup(ui, repo): def reposetup(ui, repo):
# We don't work with largefiles or inotify # We don't work with largefiles or inotify
exts = extensions.enabled() exts = extensions.enabled()
for ext in _blacklist: for ext in _blacklist:
if ext in exts: if ext in exts:
ui.warn(_('The fsmonitor extension is incompatible with the %s ' ui.warn(_('The fsmonitor extension is incompatible with the %s '
'extension and has been disabled.\n') % ext) 'extension and has been disabled.\n') % ext)
return return
if repo.local(): if repo.local():
# We don't work with subrepos either. # We don't work with subrepos either.
# #
# if repo[None].substate can cause a dirstate parse, which is too # if repo[None].substate can cause a dirstate parse, which is too
# slow. Instead, look for a file called hgsubstate, # slow. Instead, look for a file called hgsubstate,
if repo.wvfs.exists('.hgsubstate') or repo.wvfs.exists('.hgsub'): if repo.wvfs.exists('.hgsubstate') or repo.wvfs.exists('.hgsub'):
return return
if repo_has_depth_one_nested_repo(repo):
return
fsmonitorstate = state.state(repo) fsmonitorstate = state.state(repo)
if fsmonitorstate.mode == 'off': if fsmonitorstate.mode == 'off':
return return
try: try:
client = watchmanclient.client(repo) client = watchmanclient.client(repo)
except Exception as ex: except Exception as ex:
_handleunavailable(ui, fsmonitorstate, ex) _handleunavailable(ui, fsmonitorstate, ex)