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

shellext: no '?'-icon on dirs not in dirstate

Changeset 243a4415d03e…

Parent c6953dffe7b7…

by Adrian Buehlmann

Changes to one file · Browse files at 243a4415d03e Showing diff from parent c6953dffe7b7 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​shellext/​QueryDirstate.cpp Stacked
 
154
155
156
 
 
 
 
 
 
 
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
 
172
173
174
 
154
155
156
157
158
159
160
161
162
163
164
 
 
 
 
 
 
 
 
 
 
 
 
 
 
165
166
167
168
@@ -154,21 +154,15 @@
    if (cur.isdir)   { + if (!relpath.empty()) + { + Dirstate* pds2 = Dirstatecache::get(cur.hgroot, cur.basedir); + if (pds2 && !pds2->root().getdir(relpath)) + return 0; // unknown dir -> no icon + } +   DirectoryStatus* pds = DirectoryStatus::get(cur.hgroot); - if (!pds) { - outStatus = '?'; - } - else - { - if (!relpath.empty()) - { - Dirstate* pds2 = Dirstatecache::get(cur.hgroot, cur.basedir); - if (pds2 && !pds2->root().getdir(relpath)) - return 0; - } - - outStatus = pds->status(relpath); - } + outStatus = (pds ? pds->status(relpath) : '?');   }   else   {