Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

dirstate.cpp: fixed: icon was missing on .hg* dirs

For example, .hgbla is a valid directory, but did not
show an overlay icon.

Changeset 20e880cce2d0…

Parent fb915dc724c9…

by Adrian Buehlmann

Changes to one file · Browse files at 20e880cce2d0 Showing diff from parent fb915dc724c9 Diff from another changeset...

Change 1 of 2 Show Entire File tortoise/​shellext/​dirstate.cpp Stacked
 
354
355
356
357
358
359
 
 
360
361
362
 
377
378
379
380
 
381
382
383
 
354
355
356
 
 
 
357
358
359
360
361
 
376
377
378
 
379
380
381
382
@@ -354,9 +354,8 @@
  if (relpath.empty())   return 0; // don't show icon on repo root dir   - bool isdir = PathIsDirectory(path.c_str()); - - if (isdir && relpath.size() >= 3 && relpath.compare(0, 3, ".hg") == 0) + if (relpath == ".hg" + || (relpath.size() > 4 && relpath.compare(0, 4, ".hg/") == 0))   return 0; // don't descend into .hg dir     const dirstate* pds = dirstatecache::get(hgroot); @@ -377,7 +376,7 @@
    int res = 0;   - if (isdir) + if (PathIsDirectory(path.c_str()))   res = HgQueryDirstateDirectory(hgroot, *pds, relpath, outStatus);   else   res = HgQueryDirstateFile(*pds, relpath, stat, outStatus);