Kiln » TortoiseHg » Shell Extension
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

cleaned up debugging messages

Changeset 59df9bfba378…

Parent 4128176c48d3…

by David Golub

Changes to 6 files · Browse files at 59df9bfba378 Showing diff from parent 4128176c48d3 Diff from another changeset...

Change 1 of 4 Show Entire File src/​Directory.cpp Stacked
 
81
82
83
84
 
85
86
87
 
129
130
131
132
 
133
134
135
 
197
198
199
200
 
201
202
203
 
230
231
232
233
 
234
235
236
 
81
82
83
 
84
85
86
87
 
129
130
131
 
132
133
134
135
 
197
198
199
 
200
201
202
203
 
230
231
232
 
233
234
235
236
@@ -81,7 +81,7 @@
    if (!SplitBase(strName, strBase, strRest))   { - ATLTRACE(_T("CDirectory('%s')::Add(%d): splitbase returned 0\n"), + ATLTRACE(_T("CDirectory('%s')::Add(%d): SplitBase returned 0\n"),   (LPCTSTR)Path(), (LPCTSTR)strName);   return 0;   } @@ -129,7 +129,7 @@
    if (!SplitBase(strRelPath, strBase, strRest))   { - ATLTRACE(_T("CDirectory('%s')::Get(%d): splitbase returned 0\n"), + ATLTRACE(_T("CDirectory('%s')::Get(%d): SplitBase returned 0\n"),   (LPCTSTR)Path(), (LPCTSTR)strRelPath);   return 0;   } @@ -197,7 +197,7 @@
    if (!SplitBase(strRelPath, strBase, strRest))   { - ATLTRACE(_T("Directory('%s')::getdir('%s'): splitbase returned 0\n"), + ATLTRACE(_T("Directory('%s')::GetDir('%s'): SplitBase returned 0\n"),   (LPCTSTR)Path(), (LPCTSTR)strRelPath);   return 0;   } @@ -230,7 +230,7 @@
  const CDirectory* pDir = m_listSubdirs.GetNext(position);   if (!pDir)   { - ATLTRACE(_T("Directory('%s')::print: error: d is 0\n"), (LPCTSTR)Path()); + ATLTRACE(_T("Directory('%s')::Print: error: pDir is NULL\n"), (LPCTSTR)Path());   return;   }   pDir->Print();
Change 1 of 7 Show Entire File src/​DirstateCache.cpp Stacked
 
64
65
66
67
 
68
69
70
 
71
72
73
74
75
76
 
77
78
79
 
90
91
92
93
94
 
 
95
96
97
98
99
100
 
101
102
103
 
112
113
114
115
 
116
117
118
119
 
120
121
122
 
130
131
132
133
 
134
135
136
137
138
 
139
140
141
 
145
146
147
148
 
149
150
151
 
153
154
155
156
 
157
158
159
160
161
 
162
163
164
 
176
177
178
179
 
180
181
182
 
64
65
66
 
67
68
69
 
70
71
72
73
74
75
 
76
77
78
79
 
90
91
92
 
 
93
94
95
96
97
98
99
 
100
101
102
103
 
112
113
114
 
115
116
117
118
 
119
120
121
122
 
130
131
132
 
133
134
135
136
137
 
138
139
140
141
 
145
146
147
 
148
149
150
151
 
153
154
155
 
156
157
158
159
160
 
161
162
163
164
 
176
177
178
 
179
180
181
182
@@ -64,16 +64,16 @@
  {   if (stat.lstat(strPath, true) != 0)   { - ATLTRACE(_T("CDirstateCache::get: lstat('%s') failed\n"), (LPCTSTR)strPath); + ATLTRACE(_T("CDirstateCache::Get: lstat('%s') failed\n"), (LPCTSTR)strPath);   return 0;   } - ATLTRACE(_T("CDirstateCache::get: lstat('%s') ok\n"), (LPCTSTR)strPath); + ATLTRACE(_T("CDirstateCache::Get: lstat('%s') ok\n"), (LPCTSTR)strPath);   bNewStat = true;     if (Cache().GetCount() >= 10)   {   CEntry e = Cache().RemoveTail(); - ATLTRACE(_T("CDirstateCache::get: dropping '%s'\n"), (LPCTSTR)e.strHgRoot); + ATLTRACE(_T("CDirstateCache::Get: dropping '%s'\n"), (LPCTSTR)e.strHgRoot);   delete e.pDirstate;   }   @@ -90,14 +90,14 @@
  {   if (0 != stat.lstat(strPath, true))   { - ATLTRACE(_T("CDirstateCache::get: lstat('%s') failed\n"), (LPCTSTR)strPath); - ATLTRACE(_T("CDirstateCache::get: dropping '%s'\n"), (LPCTSTR)rItem.strHgRoot); + ATLTRACE(_T("CDirstateCache::Get: lstat('%s') failed\n"), (LPCTSTR)strPath); + ATLTRACE(_T("CDirstateCache::Get: dropping '%s'\n"), (LPCTSTR)rItem.strHgRoot);   delete rItem.pDirstate;   Cache().RemoveAt(position);   return 0;   }   rItem.uTickCount = tc; - ATLTRACE(_T("CDirstateCache::get: lstat('%s') ok\n"), (LPCTSTR)strPath); + ATLTRACE(_T("CDirstateCache::Get: lstat('%s') ok\n"), (LPCTSTR)strPath);   bNewStat = true;   }   @@ -112,11 +112,11 @@
  return rItem.pDirstate;   }   - ATLTRACE(_T("CDirstateCache::get: refreshing '%s'\n"), (LPCTSTR)strHgRoot); + ATLTRACE(_T("CDirstateCache::Get: refreshing '%s'\n"), (LPCTSTR)strHgRoot);   }   else   { - ATLTRACE(_T("CDirstateCache::get: reading '%s'\n"), (LPCTSTR)strHgRoot); + ATLTRACE(_T("CDirstateCache::Get: reading '%s'\n"), (LPCTSTR)strHgRoot);   }     bUnset = false; @@ -130,12 +130,12 @@
  {   if (rItem.bUnset)   { - ATLTRACE(_T("CDirstateCache::get: **** old and new have unset entries\n")); + ATLTRACE(_T("CDirstateCache::Get: **** old and new have unset entries\n"));   bRequestTHgStatusUpdate = false;   }   else   { - ATLTRACE(_T("CDirstateCache::get: new has unset entries\n")); + ATLTRACE(_T("CDirstateCache::Get: new has unset entries\n"));   }   }   @@ -145,7 +145,7 @@
  rItem.pDirstate = ds.Detach();     unsigned delta = tc1 - tc0; - ATLTRACE(_T("CDirstateCache::get: read done in %d ticks, %d repos in cache\n"), + ATLTRACE(_T("CDirstateCache::Get: read done in %d ticks, %d repos in cache\n"),   delta, Cache().GetCount());     rItem.llMTime = stat.ullMTime; @@ -153,12 +153,12 @@
    if (bRequestTHgStatusUpdate)   { - ATLTRACE(_T("CDirstateCache::get: calling Thgstatus::update\n")); + ATLTRACE(_T("CDirstateCache::Get: calling CTHgStatus::Update\n"));   CTHgStatus::Update(strCwd);   }   else   { - ATLTRACE(_T("CDirstateCache::get: omitting Thgstatus::update\n")); + ATLTRACE(_T("CDirstateCache::Get: omitting CTHgStatus::Update\n"));   }     return rItem.pDirstate; @@ -176,7 +176,7 @@
  {   delete rItem.pDirstate;   Cache().RemoveAt(position); - ATLTRACE(_T("Dirstatecache::invalidate('%s')\n"), (LPCTSTR)strHgRoot); + ATLTRACE(_T("CDirstateCache::Invalidate('%s')\n"), (LPCTSTR)strHgRoot);   break;   }   }
Change 1 of 3 Show Entire File src/​QueryDirstate.cpp Stacked
 
138
139
140
141
 
 
142
143
144
 
167
168
169
170
 
171
172
173
 
324
325
326
327
 
328
329
330
 
138
139
140
 
141
142
143
144
145
 
168
169
170
 
171
172
173
174
 
325
326
327
 
328
329
330
331
@@ -138,7 +138,8 @@
  if (bHasHg)   {   qsCur.strHgRoot = qsCur.strPath; - ATLTRACE(_T("%s('%s'): hgroot = cur.path\n"), (LPCTSTR)dp, (LPCTSTR)qsCur.strPath); + ATLTRACE(_T("%s('%s'): qsCur.strHgRoot = qsCur.strPath\n"), (LPCTSTR)dp, + (LPCTSTR)qsCur.strPath);   return true;   }   } @@ -167,7 +168,7 @@
  if (bHasHg)   {   qsCur.strHgRoot = strPath; - ATLTRACE(_T("%s('%s'): hgroot = '%s' (found repo)"), (LPCTSTR)dp, + ATLTRACE(_T("%s('%s'): qsCur.strHgRoot = '%s' (found repo)"), (LPCTSTR)dp,   (LPCTSTR)qsCur.strPath, (LPCTSTR)qsCur.strHgRoot);   return true;   } @@ -324,7 +325,7 @@
  CDirstate* pDirstate = CDirstateCache::Get(qsCur.strHgRoot, qsCur.strBaseDir, bUnset);   if (!pDirstate)   { - ATLTRACE(_T("%s Dirstatecache::Get('%s') returns no Dirstate\n"), (LPCTSTR)dp, + ATLTRACE(_T("%s CDirstateCache::Get('%s') returns no Dirstate\n"), (LPCTSTR)dp,   (LPCTSTR)qsCur.strHgRoot);   qsLast = qsCur;   return false;
Change 1 of 1 Show Entire File src/​RegistryConfig.cpp Stacked
 
52
53
54
55
 
56
57
58
 
52
53
54
 
55
56
57
58
@@ -52,7 +52,7 @@
  }   else   { - ATLTRACE(_T("GetCMenuTranslation: RegOpenKeyExW('%s') failed\n"), + ATLTRACE(_T("GetCMenuTranslation: CRegKey::Open('%s') failed\n"),   (LPCTSTR)strSubKey);   }  }
Change 1 of 1 Show Entire File src/​TortoiseHgCmenu.cpp Stacked
 
524
525
526
527
 
528
529
530
531
532
533
 
534
535
536
 
524
525
526
 
527
528
529
530
531
532
 
533
534
535
536
@@ -524,13 +524,13 @@
    nSize = strlen(psz);   - ATLTRACE("CShellExtCMenu::GetCommandString: res = %d, pszName = '%s'\n", + ATLTRACE("CTortoiseHgCmenuBase::GetCommandString: res = %d, pszName = '%s'\n",   (int)hr, psz);   }     if (nSize > cchMax-1)   { - ATLTRACE(_T("***** CShellExtCMenu::GetCommandString: string was truncated: ") + ATLTRACE(_T("***** CTortoiseHgCmenuBase::GetCommandString: string was truncated: ")   _T("size = %d, cchMax = %d\n"), nSize, cchMax);   }  
Change 1 of 1 Show Entire File src/​TortoiseHgOverlay.cpp Stacked
 
27
28
29
30
 
31
32
33
 
27
28
29
 
30
31
32
33
@@ -27,7 +27,7 @@
 STDMETHODIMP CTortoiseHgOverlay::GetOverlayInfo(LPWSTR pwszIconFile, int cchMax,   int *pIndex, DWORD *pdwFlags)  { - ATLTRACE(_T("CShellExtOverlay::GetOverlayInfo: myTortoiseClass = '%c'\n"), + ATLTRACE(_T("CTortoiseHgOverlay::GetOverlayInfo: m_chTortoiseClass = '%c'\n"),   m_chTortoiseClass);   // icons are determined by TortoiseOverlays shim   *pIndex = 0;