Patchwork D7440: dirstate: stop caring about match.explicitdir

login
register
mail settings
Submitter phabricator
Date Nov. 19, 2019, 1:13 p.m.
Message ID <4abc4f7a2b5ea97aa89b96c08d04f0a4@localhost.localdomain>
Download mbox | patch
Permalink /patch/43355/
State Not Applicable
Headers show

Comments

phabricator - Nov. 19, 2019, 1:13 p.m.
Closed by commit rHGdeacffd227e2: dirstate: stop caring about match.explicitdir (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7440?vs=18175&id=18237

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7440/new/

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

AFFECTED FILES
  mercurial/dirstate.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, Alphare, pulkit
Cc: mercurial-devel

Patch

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -769,7 +769,6 @@ 
                 kind = _(b'directory')
             return _(b'unsupported file type (type is %s)') % kind
 
-        matchedir = match.explicitdir
         badfn = match.bad
         dmap = self._map
         lstat = os.lstat
@@ -823,8 +822,6 @@ 
                     if nf in dmap:
                         # file replaced by dir on disk but still in dirstate
                         results[nf] = None
-                    if matchedir:
-                        matchedir(nf)
                     foundadd((nf, ff))
                 elif kind == regkind or kind == lnkkind:
                     results[nf] = st
@@ -837,8 +834,6 @@ 
                     results[nf] = None
                 else:  # does it match a missing directory?
                     if self._map.hasdir(nf):
-                        if matchedir:
-                            matchedir(nf)
                         notfoundadd(nf)
                     else:
                         badfn(ff, encoding.strtolocal(inst.strerror))