D5587: watchman: detect nested mercurial repositories and abort
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Tue Jan 15 16:57:11 UTC 2019
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Disable fsmonitor on nested mercurial repositories. Only depth one
repositories are detected at the moment.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5587
AFFECTED FILES
hgext/fsmonitor/__init__.py
CHANGE DETAILS
diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -385,6 +385,9 @@
fexists = entry['exists']
kind = getkind(fmode)
+ if '/.hg/' in fname or fname.endswith('/.hg'):
+ return bail('nested-repo-detected')
+
if not fexists:
# if marked as deleted and we don't already have a change
# record, mark it as deleted. If we already have an entry
@@ -758,6 +761,13 @@
repo, node, branchmerge, force, ancestor, mergeancestor,
labels, matcher, **kwargs)
+def repo_has_depth_one_nested_repo(repo):
+ import os
+ for f in os.listdir(repo.root):
+ if os.path.isdir(os.path.join(repo.root, f, '.hg')):
+ return True
+ return False
+
def reposetup(ui, repo):
# We don't work with largefiles or inotify
exts = extensions.enabled()
@@ -775,6 +785,9 @@
if repo.wvfs.exists('.hgsubstate') or repo.wvfs.exists('.hgsub'):
return
+ if repo_has_depth_one_nested_repo(repo):
+ return
+
fsmonitorstate = state.state(repo)
if fsmonitorstate.mode == 'off':
return
To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list