D945: fsmonitor: update to match new dirstate refactor

durham (Durham Goode) phabricator at mercurial-scm.org
Thu Oct 5 00:57:28 UTC 2017


durham created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The dirstate was refactored so dirstate._map is now at dirstate._map._map. Same
  for _copymap, is not _map.copymap. It seems none of the mercurial tests cover
  this stuff, but it was caught by our Facebook extension tests.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D945

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
@@ -228,10 +228,10 @@
 
     matchfn = match.matchfn
     matchalways = match.always()
-    dmap = self._map
+    dmap = self._map._map
     nonnormalset = getattr(self, '_nonnormalset', None)
 
-    copymap = self._copymap
+    copymap = self._map.copymap
     getkind = stat.S_IFMT
     dirkind = stat.S_IFDIR
     regkind = stat.S_IFREG



To: durham, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list