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

QueryDirstate: ignore paths containing .hglf when largefiles is enabled

Changeset efb311d3e8a8…

Parent 34451c8d6bd9…

by David Golub

Changes to one file · Browse files at efb311d3e8a8 Showing diff from parent 34451c8d6bd9 Diff from another changeset...

Change 1 of 1 Show Entire File src/​QueryDirstate.cpp Stacked
 
86
87
88
89
90
 
 
 
91
92
 
93
94
95
96
97
98
 
 
 
 
 
 
 
 
 
 
 
 
 
99
100
101
 
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
@@ -86,16 +86,30 @@
  int nPos;   if ((nPos = strPath.Find(_T("\\.kbf\\"))) != -1)   { - strPath.Truncate(nPos); - strPath += _T("\\.hg\\kilnbfiles\\dirstate"); + CString strPath2 = strPath; + strPath2.Truncate(nPos); + strPath2 += _T("\\.hg\\kilnbfiles\\dirstate");   CWinstat stat; - if (stat.lstat(strPath, true) == 0) + if (stat.lstat(strPath2, true) == 0)   {   // ignore files and dirs named '.kbf' when kbfiles is enabled   qsLast = qsCur;   return false;   }   } + if ((nPos = strPath.Find(_T("\\.hglf\\"))) != -1) + { + CString strPath2 = strPath; + strPath2.Truncate(nPos); + strPath2 += _T("\\.hg\\largefiles\\dirstate"); + CWinstat stat; + if (stat.lstat(strPath2, true) == 0) + { + // ignore files and dirs named '.hglf' when largefiles is enabled + qsLast = qsCur; + return false; + } + }   }     if (!bOutdated && !qsLast.strHgRoot.IsEmpty()