Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

Merge with stable

Changeset 297f80d564bf…

Parents 63daccd1e59f…

Parents 9e6c172dbfa8…

by Steve Borho

Changes to one file · Browse files at 297f80d564bf Showing diff from parent 63daccd1e59f 9e6c172dbfa8 Diff from another changeset...

Change 1 of 2 Show Entire File win32/​shellext/​TortoiseUtils.cpp Stacked
 
197
198
199
 
 
 
 
 
 
 
 
200
201
 
202
 
 
 
 
 
 
 
 
 
203
204
205
 
208
209
210
 
 
211
212
213
 
197
198
199
200
201
202
203
204
205
206
207
208
 
209
210
211
212
213
214
215
216
217
218
219
220
221
222
 
225
226
227
228
229
230
231
232
@@ -197,9 +197,26 @@
   std::string GetHgRepoRoot(const std::string& path)  { + TDEBUG_TRACE("GetHgRepoRoot('" << path << "')"); + + if (::PathIsUNCServerShare(path.c_str())) + { + TDEBUG_TRACE("GetHgRepoRoot: path is UNC share '" << path << "'"); + return ""; + } +   std::string p = IsDirectory(path)? path : DirName(path); - while (!IsDirectory(p + "\\.hg")) + for (;;)   { + std::string tdir = p + "\\.hg"; + if (::PathIsUNCServerShare(tdir.c_str())) + { + TDEBUG_TRACE("GetHgRepoRoot: tdir is UNC share '" << tdir << "'"); + p.clear(); + break; + } + else if (IsDirectory(tdir)) + break;   std::string oldp = p;   p = DirName(p);   if (p == oldp) @@ -208,6 +225,8 @@
  break;   }   } + + TDEBUG_TRACE("GetHgRepoRoot: returning '" << p << "'");   return p;  }