<Configurations>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="..\..\obj\ResizableLib\Release"\r
- IntermediateDirectory="..\..\obj\ResizableLib\Release"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
</Configuration>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="..\obj\ResizableLib\Debug"\r
- IntermediateDirectory="..\obj\ResizableLib\Debug"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
<Configurations>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory=".\Release"\r
- IntermediateDirectory=".\Release"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
UseOfMFC="0"\r
</Configuration>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory=".\Debug"\r
- IntermediateDirectory=".\Debug"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
UseOfMFC="0"\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory=".\../bin"\r
- IntermediateDirectory=".\Debug"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\SciLexer\$(ConfigurationName)\"\r
ConfigurationType="2"\r
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
UseOfMFC="0"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory=".\../bin"\r
- IntermediateDirectory=".\Release"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\SciLexer\$(ConfigurationName)\"\r
ConfigurationType="2"\r
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
UseOfMFC="0"\r
return out;\r
}\r
\r
-int CGit::GetTagList(CStringList &list)\r
+int CGit::GetTagList(STRING_VECTOR &list)\r
{\r
int ret;\r
CString cmd,output;\r
{\r
i++;\r
one=output.Tokenize(_T("\n"),pos);\r
- list.AddTail(one);\r
+ list.push_back(one);\r
}\r
}\r
return ret;\r
}\r
\r
-int CGit::GetBranchList(CStringList &list,int *current,BRANCH_TYPE type)\r
+int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)\r
{\r
int ret;\r
CString cmd,output;\r
{\r
i++;\r
one=output.Tokenize(_T("\n"),pos);\r
- list.AddTail(one.Right(one.GetLength()-2));\r
+ list.push_back(one.Right(one.GetLength()-2));\r
if(one[0] == _T('*'))\r
if(current)\r
*current=i;\r
return ret;\r
}\r
\r
-int CGit::GetRemoteList(CStringList &list)\r
+int CGit::GetRemoteList(STRING_VECTOR &list)\r
{\r
int ret;\r
CString cmd,output;\r
url=one.Right(one.GetLength()-start-1);\r
one=url;\r
one=one.Left(one.Find(_T("."),0));\r
- list.AddTail(one);\r
+ list.push_back(one);\r
}\r
}\r
}\r
typedef std::vector<CString> STRING_VECTOR;\r
typedef std::map<CString, STRING_VECTOR> MAP_HASH_NAME;\r
\r
+\r
class CGit\r
{\r
private:\r
BRANCH_ALL=BRANCH_LOCAL|BRANCH_REMOTE,\r
}BRANCH_TYPE;\r
\r
- int GetRemoteList(CStringList &list);\r
- int GetBranchList(CStringList &list, int *Current,BRANCH_TYPE type=BRANCH_LOCAL);\r
- int GetTagList(CStringList &list);\r
+ int GetRemoteList(STRING_VECTOR &list);\r
+ int GetBranchList(STRING_VECTOR &list, int *Current,BRANCH_TYPE type=BRANCH_LOCAL);\r
+ int GetTagList(STRING_VECTOR &list);\r
int GetMapHashToFriendName(MAP_HASH_NAME &map);\r
\r
//hash is empty means all. -1 means all\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="..\..\bin\$(ConfigurationName)"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
- IntermediateDirectory="$(ConfigurationName)"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
CharacterSet="1"\r
\r
int GitRev::SafeFetchFullInfo(CGit *git)\r
{\r
- if(InterlockedExchange(&m_IsUpdateing,TRUE) == FALSE)
- {
- //GitRev rev;
- CString onelog;
- git->GetLog(onelog,m_CommitHash,1);
- CString oldhash=m_CommitHash;
- ParserFromLog(onelog);
-
- ASSERT(oldhash==m_CommitHash);
-
- InterlockedExchange(&m_IsUpdateing,FALSE);
- InterlockedExchange(&m_IsFull,TRUE);
- return 0;
- }
+ if(InterlockedExchange(&m_IsUpdateing,TRUE) == FALSE)\r
+ {\r
+ //GitRev rev;\r
+ CString onelog;\r
+ git->GetLog(onelog,m_CommitHash,1);\r
+ CString oldhash=m_CommitHash;\r
+ ParserFromLog(onelog);\r
+ \r
+ //ASSERT(oldhash==m_CommitHash);\r
+\r
+ InterlockedExchange(&m_IsUpdateing,FALSE);\r
+ InterlockedExchange(&m_IsFull,TRUE);\r
+ return 0;\r
+ }\r
return -1;\r
}
\ No newline at end of file
#pragma once\r
\r
#include "StatusCacheEntry.h"\r
-#include "TSVNPath.h"\r
+#include "TGitPath.h"\r
\r
/**\r
* \ingroup TSVNCache\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="..\..\Bin\Debug\Bin"\r
- IntermediateDirectory="..\..\obj\TSVNCache\Debug"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"\r
ConfigurationType="1"\r
UseOfATL="1"\r
CharacterSet="1"\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
- AdditionalIncludeDirectories=""../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;..\..\ext\gettext\include"\r
+ AdditionalIncludeDirectories=""../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"\r
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;UNICODE;_UNICODE"\r
MinimalRebuild="true"\r
BasicRuntimeChecks="3"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="..\..\bin\Release\bin"\r
- IntermediateDirectory="..\..\obj\TGitCache\Release"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"\r
ConfigurationType="1"\r
UseOfATL="1"\r
CharacterSet="1"\r
<Tool\r
Name="VCCLCompilerTool"\r
InlineFunctionExpansion="2"\r
- AdditionalIncludeDirectories="../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;..\..\ext\gettext\include"\r
+ AdditionalIncludeDirectories=""../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"\r
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"\r
RuntimeLibrary="2"\r
EnableFunctionLevelLinking="true"\r
</FileConfiguration>\r
</File>\r
<File\r
- RelativePath="..\Svn\SVNAdminDir.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNGlobal.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\Svn\SVNHelpers.cpp"\r
- >\r
- </File>\r
- <File\r
RelativePath="..\Svn\SVNStatus.cpp"\r
>\r
</File>\r
\r
void Init()\r
{\r
- CStringList list;\r
+ STRING_VECTOR list;\r
g_Git.GetTagList(list);\r
m_ChooseVersioinTags.AddString(list);\r
\r
- list.RemoveAll();\r
+ list.clear();\r
int current;\r
g_Git.GetBranchList(list,¤t,CGit::BRANCH_ALL);\r
m_ChooseVersioinBranch.AddString(list);\r
m_cDir.LoadHistory(_T("Software\\TortoiseGit\\History\\FormatPatchURLS"), _T("path"));\r
m_cDir.SetCurSel(0);\r
\r
- CStringList list;\r
+ STRING_VECTOR list;\r
g_Git.GetBranchList(list,NULL,CGit::BRANCH_ALL);\r
m_cSince.AddString(list);\r
\r
m_RemoteURL.EnableWindow(FALSE);\r
CheckRadioButton(IDC_RD_REMOTE,IDC_RD_URL,IDC_RD_REMOTE);\r
\r
- CStringList list;\r
+ STRING_VECTOR list;\r
\r
if(!g_Git.GetRemoteList(list))\r
{ \r
- POSITION pos;\r
- pos=list.GetHeadPosition();\r
- while(pos)\r
- {\r
- m_Remote.AddString(list.GetNext(pos));\r
- }\r
+ for(int i=0;i<list.size();i++)\r
+ m_Remote.AddString(list[i]);\r
}\r
\r
int current=0;\r
if(!g_Git.GetBranchList(list,¤t))\r
{\r
- POSITION pos;\r
- pos=list.GetHeadPosition();\r
- while(pos)\r
- {\r
- m_BranchSource.AddString(list.GetNext(pos));\r
- }\r
+ for(int i=0;i<list.size();i++)\r
+ m_BranchSource.AddString(list[i]);\r
}\r
m_BranchSource.SetCurSel(current);\r
\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="..\..\bin\Debug\bin"\r
- IntermediateDirectory="..\..\obj\TortoiseProc\Debug"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
ConfigurationType="1"\r
UseOfMFC="2"\r
UseOfATL="1"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="..\..\bin\Release\bin"\r
- IntermediateDirectory="..\..\obj\TortoiseProc\Release"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
ConfigurationType="1"\r
UseOfMFC="2"\r
CharacterSet="1"\r
Name="VCLinkerTool"\r
AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
LinkIncremental="1"\r
- IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"\r
+ IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
DelayLoadDLLs="gdiplus.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\explorer.ico"\r
+ RelativePath=".\explorer.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\explorer.ico"\r
+ RelativePath="..\Resources\explorer.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\newfolder.ico"\r
+ RelativePath=".\newfolder.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\newfolder.ico"\r
+ RelativePath="..\Resources\newfolder.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\open.ico"\r
+ RelativePath=".\open.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\open.ico"\r
+ RelativePath="..\Resources\open.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\save.ico"\r
+ RelativePath=".\save.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\save.ico"\r
+ RelativePath="..\Resources\save.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\saveas.ico"\r
+ RelativePath=".\saveas.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\saveas.ico"\r
+ RelativePath="..\Resources\saveas.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\up.ico"\r
+ RelativePath=".\up.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\up.ico"\r
+ RelativePath="..\Resources\up.ico"\r
>\r
</File>\r
<File\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="..\..\bin\Debug\bin"\r
- IntermediateDirectory="..\..\obj\TortoiseShell\Debug"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\TortoiseShell\$(ConfigurationName)\"\r
ConfigurationType="2"\r
UseOfMFC="0"\r
UseOfATL="1"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="..\..\bin\Release\bin"\r
- IntermediateDirectory="..\..\obj\TortoiseShell\Release"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\TortoiseShell\$(ConfigurationName)\"\r
ConfigurationType="2"\r
UseOfMFC="0"\r
UseOfATL="1"\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="..\..\bin\Debug\bin"\r
- IntermediateDirectory="..\..\obj\TortoiseUDiff\Debug"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\TortoiseUDiff\$(ConfigurationName)"\r
ConfigurationType="1"\r
CharacterSet="1"\r
>\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="..\..\bin\Release\bin"\r
- IntermediateDirectory="..\..\obj\TortoiseUDiff\Release"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\TortoiseUDiff\$(ConfigurationName)"\r
ConfigurationType="1"\r
CharacterSet="1"\r
WholeProgramOptimization="1"\r
for (int n = m_nMaxHistoryItems; n < nNumItems; n++)\r
DeleteString(m_nMaxHistoryItems);\r
}\r
-void CHistoryCombo::AddString(CStringList &list)\r
+void CHistoryCombo::AddString(STRING_VECTOR &list)\r
{\r
- POSITION pos;\r
- pos=list.GetHeadPosition();\r
- while(pos)\r
+ for(int i=0;i<list.size();i++)\r
{\r
- AddString(list.GetNext(pos));\r
+ AddString(list[i]);\r
}\r
}\r
CString CHistoryCombo::GetString() const\r
* \r
* thats it. \r
*/\r
+#include "git.h"\r
class CHistoryCombo : public CComboBoxEx\r
{\r
// Construction\r
*/\r
CString GetString() const;\r
\r
- void AddString(CStringList &list);\r
+ void AddString(STRING_VECTOR &list);\r
\r
protected:\r
/**\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="..\..\bin\$(ConfigurationName)"\r
- IntermediateDirectory="..\..\obj\$(ConfigurationName)"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
UseOfATL="1"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
- IntermediateDirectory="$(ConfigurationName)"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
CharacterSet="1"\r