Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek overlay: only ignore the .kbf directory when kbfiles is enabled

Changeset fc6c6713b0f6…

Parent b606e26a967a…

by David Golub

Changes to one file · Browse files at fc6c6713b0f6 Showing diff from parent b606e26a967a Diff from another changeset...

Change 1 of 1 Show Entire File win32/​shellext/​QueryDirstate.cpp Stacked
 
83
84
85
86
 
 
 
87
88
 
89
90
91
 
83
84
85
 
86
87
88
89
 
90
91
92
93
@@ -83,9 +83,11 @@
  {   std::string p = cur.path;   p.push_back('\\'); - if (p.find("\\.hg\\") != std::string::npos || p.find("\\.kbf\\") != std::string::npos) + bool unset = false; + if (p.find("\\.hg\\") != std::string::npos || (p.find("\\.kbf\\") != std::string::npos && + Dirstatecache::get(cur.hgroot, cur.path, unset, true) != 0))   { - // ignore files and dirs named '.hg' or '.kbf' + // ignore files and dirs named '.hg' or '.kbf' (if kbfiles is enabled)   last = cur;   return 0;   }