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 aa5c8712e0e6…

Parents 0b7674159f27…

Parents 319fa452b1f4…

by Adrian Buehlmann

Changes to one file · Browse files at aa5c8712e0e6 Showing diff from parent 0b7674159f27 319fa452b1f4 Diff from another changeset...

Change 1 of 2 Show Entire File win32/​shellext/​QueryDirstate.cpp Stacked
 
105
106
107
108
109
110
111
 
112
113
114
 
133
134
135
136
 
137
138
139
 
105
106
107
 
 
 
 
108
109
110
111
 
130
131
132
 
133
134
135
136
@@ -105,10 +105,7 @@
    const bool has_hg = hasHgDir(cls, cur.path, ticks);   - // we require a higher speed for showing overlays on repo roots, - // since we will do considerably more file accesses compared - // to showing icons just *inside* repos - if (ticks > 150 /* ms */) + if (ticks > 5000 /* ms */)   {   file_access_is_unacceptably_slow = true;   goto exit; @@ -133,7 +130,7 @@
  for (std::string p = cur.basedir;;)   {   bool has_hg = hasHgDir(cls, p, ticks); - if (ticks > 300 /* ms */) + if (ticks > 5000 /* ms */)   {   const std::string reason = "ignoring slow \"" + p + "\"";   Thgstatus::error(reason);