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

dirstate: use char& for outStatus param

Changeset e025d55b15d1…

Parent 103c8bb076c3…

by Adrian Buehlmann

Changes to 3 files · Browse files at e025d55b15d1 Showing diff from parent 103c8bb076c3 Diff from another changeset...

Change 1 of 2 Show Entire File tortoise/​shellext/​IconOverlay.cpp Stacked
 
93
94
95
96
 
97
98
99
 
101
102
103
104
 
105
106
107
 
93
94
95
 
96
97
98
99
 
101
102
103
 
104
105
106
107
@@ -93,7 +93,7 @@
  if (strncmp(relpath, ".hg", 3) == 0)   return S_FALSE; // don't descend into .hg dir   - if (!HgQueryDirstateDirectory(hgroot.c_str(), path, relpath, &status)) + if (!HgQueryDirstateDirectory(hgroot.c_str(), path, relpath, status))   {   TDEBUG_TRACE("IsMemberOf: HgQueryDirstateDirectory returns false");   return S_FALSE; @@ -101,7 +101,7 @@
  }   else   { - if (!HgQueryDirstateFile(hgroot.c_str(), path, relpath, &status)) + if (!HgQueryDirstateFile(hgroot.c_str(), path, relpath, status))   {   TDEBUG_TRACE("IsMemberOf: HgQueryDirstateFile returns false");   return S_FALSE;
Change 1 of 3 Show Entire File tortoise/​shellext/​dirstate.cpp Stacked
 
269
270
271
272
 
273
274
275
 
315
316
317
318
 
319
320
 
321
322
 
323
324
 
325
326
327
328
329
330
331
 
332
333
334
 
350
351
352
353
354
355
 
 
 
356
357
358
 
269
270
271
 
272
273
274
275
 
315
316
317
 
318
319
 
320
321
 
322
323
 
324
325
326
327
328
329
330
 
331
332
333
334
 
350
351
352
 
 
 
353
354
355
356
357
358
@@ -269,7 +269,7 @@
     int HgQueryDirstateDirectory( - const char* hgroot, char* abspath, char* relpathloc, char* outStatus) + const char* hgroot, char* abspath, char* relpathloc, char& outStatus)  {   const dirstate* pd = 0;   struct _stat stat; @@ -315,20 +315,20 @@
  }     if (modified) - *outStatus = 'M'; + outStatus = 'M';   else if (added) - *outStatus = 'A'; + outStatus = 'A';   else if (empty) - *outStatus = '?'; + outStatus = '?';   else - *outStatus = 'C'; + outStatus = 'C';     return 1;  }      int HgQueryDirstateFile( - const char* hgroot, const char* abspath, char* relpathloc, char* outStatus) + const char* hgroot, const char* abspath, char* relpathloc, char& outStatus)  {   const dirstate* pd = 0;   struct _stat stat; @@ -350,9 +350,9 @@
  if (0 == strncmp(relpathloc, pd->entries[ix].name.c_str(), MAX_PATH))   {   TDEBUG_TRACE("HgQueryDirstateFile: found relpathloc"); - *outStatus = mapdirstate(&pd->entries[ix], &stat); - TDEBUG_TRACE("HgQueryDirstateFile: *outStatus = " << *outStatus); - return *outStatus != '?'; + outStatus = mapdirstate(&pd->entries[ix], &stat); + TDEBUG_TRACE("HgQueryDirstateFile: outStatus = " << outStatus); + return outStatus != '?';   }   }  
Change 1 of 1 Show Entire File tortoise/​shellext/​dirstate.h Stacked
 
1
2
3
4
 
5
6
 
7
8
 
1
2
3
 
4
5
 
6
7
8
@@ -1,8 +1,8 @@
 #ifndef _DIRSTATE_H  #define _DIRSTATE_H   -int HgQueryDirstateFile(const char* hgroot, const char* abspath, char* relpathloc, char* outStatus); +int HgQueryDirstateFile(const char* hgroot, const char* abspath, char* relpathloc, char& outStatus);   -int HgQueryDirstateDirectory(const char* hgroot, char* abspath, char* relpathloc, char* outStatus); +int HgQueryDirstateDirectory(const char* hgroot, char* abspath, char* relpathloc, char& outStatus);    #endif