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

QueryDirstate.cpp: more caching

Changeset da7d19e195ce…

Parent 0ba1bd374891…

by Adrian Buehlmann

Changes to 2 files · Browse files at da7d19e195ce Showing diff from parent 0ba1bd374891 Diff from another changeset...

Change 1 of 2 Show Entire File tortoise/​shellext/​QueryDirstate.cpp Stacked
 
23
24
25
 
26
27
28
29
30
 
31
32
33
34
35
36
 
 
 
 
 
 
 
 
 
37
38
39
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
40
41
42
43
 
44
45
46
47
48
 
49
50
 
 
 
 
 
 
51
52
 
53
54
55
56
57
58
 
 
 
 
 
59
60
 
 
 
61
62
63
64
 
 
 
 
 
65
 
66
67
68
69
70
 
77
78
79
80
81
82
83
84
 
85
86
87
 
 
 
88
 
89
90
91
92
93
94
 
95
96
97
98
 
 
99
100
101
102
 
 
103
 
104
105
106
 
 
107
 
108
109
110
111
 
112
113
114
115
116
117
118
119
 
 
 
120
121
 
23
24
25
26
27
28
29
30
 
31
32
33
 
 
 
 
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
 
107
108
109
110
111
 
112
113
 
114
115
116
117
118
119
120
 
121
122
123
124
 
 
 
125
126
127
128
129
130
 
131
132
133
134
135
 
 
136
137
138
139
140
141
142
143
 
144
145
146
 
153
154
155
 
 
 
 
 
156
157
 
 
158
159
160
161
162
163
164
165
166
167
 
168
169
170
171
 
172
173
174
175
176
 
177
178
179
180
181
182
 
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
 
 
198
199
200
201
202
@@ -23,48 +23,124 @@
 #include "Dirstatecache.h"  #include "HgRepoRoot.h"  #include "Winstat.h" +#include "TortoiseUtils.h"    #include <shlwapi.h>     -class QueryResult +class QueryState  {  public: - std::string path_; - char status_; - unsigned tickcount_; - QueryResult(): status_(0), tickcount_(0) {} + std::string path; + bool isdir; + std::string basedir; + std::string hgroot; + + char status; + unsigned tickcount; + + QueryState(): isdir(false), status(0), tickcount(0) {}  };     +bool hasHgDir(std::string path) +{ + path += "\\.hg"; + return PathIsDirectory(path.c_str()); +} + + +int findHgRoot(QueryState& cur, QueryState& last, bool outdated) +{ + if (cur.isdir) + { + std::string p = cur.path; + p.push_back('\\'); + if (p.find(".hg\\") != std::string::npos) + { + //TDEBUG_TRACE("findHgRoot: skipping '" << cur.path << "'"); + last = cur; + return 0; + } + } + + if (cur.isdir && hasHgDir(cur.path)) + { + cur.hgroot = cur.path; + TDEBUG_TRACE("findHgRoot(" << cur.path << "): hgroot = cur.path"); + return 1; + } + + cur.basedir = DirName(cur.path); + + if (!outdated && !last.basedir.empty() && cur.basedir == last.basedir) + { + cur.hgroot = last.hgroot; + // TDEBUG_TRACE("findHgRoot(" << cur.path << "): hgroot = '" << cur.hgroot + // << "' (same as last.basedir)"); + return 1; + } + + for (std::string p = cur.basedir;;) + { + if (hasHgDir(p)) { + cur.hgroot = p; + TDEBUG_TRACE("findHgRoot(" << cur.path << "): hgroot = '" << cur.hgroot + << "' (found repo)"); + return 1; + } + std::string p2 = DirName(p); + if (p2.size() == p.size()) + break; + p.swap(p2); + } + + TDEBUG_TRACE("findHgRoot(" << cur.path << "): NO repo found"); + last = cur; + return 0; +} + +  int HgQueryDirstate(   const std::string& path, const char& filterStatus, char& outStatus)  { - static QueryResult last; + static QueryState last;     if (path.empty())   return 0;   - unsigned tc = GetTickCount(); + QueryState cur;   - if (last.path_ == path && (tc - last.tickcount_ < 1000)) + cur.path = path; + cur.tickcount = GetTickCount(); + + const bool outdated = cur.tickcount - last.tickcount > 2000; + + if (!outdated && last.path == path)   { - outStatus = last.status_; + outStatus = last.status;   return 1;   }   - last.path_ = path; - last.status_ = 0; - last.tickcount_ = tc; + if (PathIsRoot(path.c_str())) + { + last = cur; + return 0; + }   - if (PathIsRoot(path.c_str())) + cur.isdir = PathIsDirectory(cur.path.c_str()); + + if (findHgRoot(cur, last, outdated) == 0)   return 0;   - std::string hgroot = HgRepoRoot::get(path); - if (hgroot.empty()) + size_t offset = cur.hgroot.length(); + + if (offset == 0) + { + last = cur;   return 0; + }   - size_t offset = hgroot.length();   if (path[offset] == '\\')   offset++;   const char* relpathptr = path.c_str() + offset; @@ -77,45 +153,50 @@
  relpath[i] = '/';   }   - if (relpath == ".hg" - || (relpath.size() > 4 && relpath.compare(0, 4, ".hg/") == 0)) - return 0; // don't descend into .hg dir - - if (PathIsDirectory(path.c_str())) + if (cur.isdir)   { - DirectoryStatus* pds = DirectoryStatus::get(hgroot); - if (!pds) + DirectoryStatus* pds = DirectoryStatus::get(cur.hgroot); + if (!pds) { + last = cur;   return 0; + }     outStatus = pds->status(relpath);   }   else   { - Dirstate* pds = Dirstatecache::get(hgroot); + Dirstate* pds = Dirstatecache::get(cur.hgroot);   if (!pds)   {   TDEBUG_TRACE("HgQueryDirstate: Dirstatecache::get(" - << hgroot << ") returns no Dirstate"); + << cur.hgroot << ") returns no Dirstate"); + last = cur;   return 0;   }   - if (filterStatus == 'A' && pds->num_added() == 0) + if (filterStatus == 'A' && pds->num_added() == 0) { + last = cur;   return 0; + }     const Direntry* e = pds->root().get(relpath); - if (!e) + if (!e) { + last = cur;   return 0; + }     Winstat stat;   if (0 != stat.lstat(path.c_str())) {   TDEBUG_TRACE("HgQueryDirstate: lstat(" << path << ") failed"); + last = cur;   return 0;   }     outStatus = e->status(stat);   }   - last.status_ = outStatus; - last.tickcount_ = GetTickCount(); + cur.status = outStatus; + cur.tickcount = GetTickCount(); + last = cur;   return 1;  }
Change 1 of 1 Show Entire File tortoise/​shellext/​TortoiseUtils.cpp Stacked
 
154
155
156
 
 
157
158
159
 
154
155
156
157
158
159
160
161
@@ -154,6 +154,8 @@
  return filename;   std::string::size_type pos = filename.find_last_of("\\");   std::string myfilename = filename.substr(0, pos); + if (myfilename.size() > 0 && myfilename[myfilename.size()-1] == ':') + myfilename.push_back('\\');   return myfilename;  }