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

shellext: show a question mark on dirs if there is no thgstatus

I've used the 'Unversioned' overlay of TortoiseOverlays

Changeset c6953dffe7b7…

Parent 9b5fa39d6f86…

by Adrian Buehlmann

Changes to 4 files · Browse files at c6953dffe7b7 Showing diff from parent 9b5fa39d6f86 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​win32/​registry.iss Stacked
 
7
8
9
 
10
11
12
13
14
 
15
16
17
18
19
 
20
21
22
23
24
 
 
 
 
 
 
25
26
27
28
 
29
30
31
32
33
 
34
35
36
 
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
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
@@ -7,30 +7,41 @@
 Root: HKLM; Subkey: Software\TortoiseHg; ValueType: string; ValueName: ; ValueData: {app}    ; Icon handler COM controls +; Normal  Root: HKCR; Subkey: CLSID\{{B456DBA0-7BF4-478c-937A-05130C2C212E}; Flags: uninsdeletekey  Root: HKCR; Subkey: CLSID\{{B456DBA0-7BF4-478c-937A-05130C2C212E}; ValueType: string; ValueName: ; ValueData: TortoiseHg  Root: HKCR; Subkey: CLSID\{{B456DBA0-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ; ValueData: {app}\THgShell.dll  Root: HKCR; Subkey: CLSID\{{B456DBA0-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ThreadingModel; ValueData: Apartment   +; Added  Root: HKCR; Subkey: CLSID\{{B456DBA1-7BF4-478c-937A-05130C2C212E}; Flags: uninsdeletekey  Root: HKCR; Subkey: CLSID\{{B456DBA1-7BF4-478c-937A-05130C2C212E}; ValueType: string; ValueName: ; ValueData: TortoiseHg  Root: HKCR; Subkey: CLSID\{{B456DBA1-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ; ValueData: {app}\THgShell.dll  Root: HKCR; Subkey: CLSID\{{B456DBA1-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ThreadingModel; ValueData: Apartment   +; Modified  Root: HKCR; Subkey: CLSID\{{B456DBA2-7BF4-478c-937A-05130C2C212E}; Flags: uninsdeletekey  Root: HKCR; Subkey: CLSID\{{B456DBA2-7BF4-478c-937A-05130C2C212E}; ValueType: string; ValueName: ; ValueData: TortoiseHg  Root: HKCR; Subkey: CLSID\{{B456DBA2-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ; ValueData: {app}\THgShell.dll  Root: HKCR; Subkey: CLSID\{{B456DBA2-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ThreadingModel; ValueData: Apartment   +; Unversioned +Root: HKCR; Subkey: CLSID\{{B456DBA6-7BF4-478c-937A-05130C2C212E}; Flags: uninsdeletekey +Root: HKCR; Subkey: CLSID\{{B456DBA6-7BF4-478c-937A-05130C2C212E}; ValueType: string; ValueName: ; ValueData: TortoiseHg +Root: HKCR; Subkey: CLSID\{{B456DBA6-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ; ValueData: {app}\THgShell.dll +Root: HKCR; Subkey: CLSID\{{B456DBA6-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ThreadingModel; ValueData: Apartment +  ; The actual icon overlay handlers for Explorer  Root: HKLM; Subkey: Software\TortoiseOverlays\Normal; ValueType: string; ValueName: TortoiseHg; ValueData: {{B456DBA0-7BF4-478c-937A-05130C2C212E}  Root: HKLM; Subkey: Software\TortoiseOverlays\Added; ValueType: string; ValueName: TortoiseHg; ValueData: {{B456DBA1-7BF4-478c-937A-05130C2C212E}  Root: HKLM; Subkey: Software\TortoiseOverlays\Modified; ValueType: string; ValueName: TortoiseHg; ValueData: {{B456DBA2-7BF4-478c-937A-05130C2C212E} +Root: HKLM; Subkey: Software\TortoiseOverlays\Unversioned; ValueType: string; ValueName: TortoiseHg; ValueData: {{B456DBA6-7BF4-478c-937A-05130C2C212E}    ; Make them approved by administrator  Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved; ValueType: string; ValueName: {{B456DBA0-7BF4-478c-937A-05130C2C212E}; ValueData: TortoiseHg; Flags: uninsdeletevalue  Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved; ValueType: string; ValueName: {{B456DBA1-7BF4-478c-937A-05130C2C212E}; ValueData: TortoiseHg; Flags: uninsdeletevalue  Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved; ValueType: string; ValueName: {{B456DBA2-7BF4-478c-937A-05130C2C212E}; ValueData: TortoiseHg; Flags: uninsdeletevalue +Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved; ValueType: string; ValueName: {{B456DBA6-7BF4-478c-937A-05130C2C212E}; ValueData: TortoiseHg; Flags: uninsdeletevalue    ; Context menu handlers  Root: HKCR; Subkey: Directory\shellex\ContextMenuHandlers\TortoiseHgCMenu; Flags: uninsdeletekey
Change 1 of 1 Show Entire File win32/​shellext/​IconOverlay.cpp Stacked
 
66
67
68
 
 
69
70
71
 
66
67
68
69
70
71
72
73
@@ -66,6 +66,8 @@
  return S_OK;   else if (myTortoiseClass == TORTOISE_OLE_UNCHANGED && status == 'C')   return S_OK; + else if (myTortoiseClass == TORTOISE_OLE_NOTINREPO && status == '?') + return S_OK;     return S_FALSE;  }
Change 1 of 1 Show Changes Only win32/​shellext/​QueryDirstate.cpp Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
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
147
148
149
150
151
152
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
203
204
205
206
207
208
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
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
147
148
149
150
151
152
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
203
204
205
206
207
208
209
   // Copyright (C) 2009 Benjamin Pollack  // Copyright (C) 2009 Adrian Buehlmann  //  // This program is free software: you can redistribute it and/or modify  // it under the terms of the GNU General Public License as published by  // the Free Software Foundation, either version 2 of the License, or  // (at your option) any later version.  //  // This program is distributed in the hope that it will be useful,  // but WITHOUT ANY WARRANTY; without even the implied warranty of  // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  // GNU General Public License for more details.  //  // You should have received a copy of the GNU General Public License  // along with this program. If not, see <http://www.gnu.org/licenses/>.    #include "stdafx.h"    #include "QueryDirstate.h"  #include "dirstate.h"  #include "DirectoryStatus.h"  #include "Dirstatecache.h"  #include "Winstat.h"  #include "TortoiseUtils.h"    #include <shlwapi.h>      class QueryState  {  public:   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 QueryState last;     if (path.empty())   return 0;     QueryState cur;     cur.path = path;   cur.tickcount = GetTickCount();     const bool outdated = cur.tickcount - last.tickcount > 2000;     if (!outdated && last.path == path)   {   outStatus = last.status;   return 1;   }     if (PathIsRoot(path.c_str()))   {   last = cur;   return 0;   }     cur.isdir = PathIsDirectory(cur.path.c_str());     if (findHgRoot(cur, last, outdated) == 0)   return 0;     size_t offset = cur.hgroot.length();     if (offset == 0)   {   last = cur;   return 0;   }     if (path[offset] == '\\')   offset++;   const char* relpathptr = path.c_str() + offset;     std::string relpath = relpathptr;     for (size_t i = 0; i < relpath.size(); ++i)   {   if (relpath[i] == '\\')   relpath[i] = '/';   }     if (cur.isdir)   {   DirectoryStatus* pds = DirectoryStatus::get(cur.hgroot);   if (!pds) { - last = cur; - return 0; + outStatus = '?';   } + else + { + if (!relpath.empty()) + { + Dirstate* pds2 = Dirstatecache::get(cur.hgroot, cur.basedir); + if (pds2 && !pds2->root().getdir(relpath)) + return 0; + }   - 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->status(relpath);   }   else   {   Dirstate* pds = Dirstatecache::get(cur.hgroot, cur.basedir);   if (!pds)   {   TDEBUG_TRACE("HgQueryDirstate: Dirstatecache::get("   << cur.hgroot << ") returns no Dirstate");   last = cur;   return 0;   }     if (filterStatus == 'A' && pds->num_added() == 0) {   last = cur;   return 0;   }     const Direntry* e = pds->root().get(relpath);   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);   }     cur.status = outStatus;   cur.tickcount = GetTickCount();   last = cur;   return 1;  }
Change 1 of 1 Show Entire File win32/​shellext/​ShellExt.cpp Stacked
 
76
77
78
 
 
 
 
 
 
79
80
81
 
76
77
78
79
80
81
82
83
84
85
86
87
@@ -76,6 +76,12 @@
  TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg2");   return pcf->QueryInterface(riid, ppvOut);   } + else if (IsEqualIID(rclsid, CLSID_TortoiseHg6)) + { + CDllRegSxClassFactory *pcf = new CDllRegSxClassFactory(TORTOISE_OLE_NOTINREPO); + TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg6"); + return pcf->QueryInterface(riid, ppvOut); + }     return CLASS_E_CLASSNOTAVAILABLE;  }