Add Check Software Updater support

[tortoisegit/TortoiseGitJp.git] / src / Utils / TempFile.cpp

diff --git a/src/Utils/TempFile.cpp b/src/Utils/TempFile.cpp
index bbfdfe6..d223bb4 100644 (file)
--- a/src/Utils/TempFile.cpp
+++ b/src/Utils/TempFile.cpp
@@ -19,6 +19,7 @@
 #include "StdAfx.h"\r
 #include "Registry.h"\r
 #include "TempFile.h"\r
+#include "TGitPath.h"\r
 \r
 CTempFiles::CTempFiles(void)\r
 {\r
@@ -35,31 +36,31 @@ CTempFiles& CTempFiles::Instance()
        return instance;\r
 }\r
 \r
-CTSVNPath CTempFiles::GetTempFilePath(bool bRemoveAtEnd, const CTSVNPath& path /* = CTSVNPath() */, const SVNRev revision /* = SVNRev() */)\r
+CTGitPath CTempFiles::GetTempFilePath(bool bRemoveAtEnd, const CTGitPath& path /* = CTGitPath() */, const GitRev revision /* = GitRev() */)\r
 {\r
        DWORD len = ::GetTempPath(0, NULL);\r
        TCHAR * temppath = new TCHAR[len+1];\r
        TCHAR * tempF = new TCHAR[len+50];\r
        ::GetTempPath (len+1, temppath);\r
-       CTSVNPath tempfile;\r
+       CTGitPath tempfile;\r
        CString possibletempfile;\r
        if (path.IsEmpty())\r
        {\r
-               ::GetTempFileName (temppath, TEXT("svn"), 0, tempF);\r
-               tempfile = CTSVNPath(tempF);\r
+               ::GetTempFileName (temppath, TEXT("git"), 0, tempF);\r
+               tempfile = CTGitPath(tempF);\r
        }\r
        else\r
        {\r
                int i=0;\r
                do\r
                {\r
-                       if (revision.IsValid())\r
+                       if (!revision.m_CommitHash.IsEmpty())\r
                        {\r
-                               possibletempfile.Format(_T("%s%s-rev%s.svn%3.3x.tmp%s"), temppath, (LPCTSTR)path.GetFileOrDirectoryName(), (LPCTSTR)revision.ToString(), i, (LPCTSTR)path.GetFileExtension());\r
+                               possibletempfile.Format(_T("%s%s-rev%s.git%3.3x.tmp%s"), temppath, (LPCTSTR)path.GetFileOrDirectoryName(), (LPCTSTR)revision.m_CommitHash.Left(7), i, (LPCTSTR)path.GetFileExtension());\r
                        }\r
                        else\r
                        {\r
-                               possibletempfile.Format(_T("%s%s.svn%3.3x.tmp%s"), temppath, (LPCTSTR)path.GetFileOrDirectoryName(), i, (LPCTSTR)path.GetFileExtension());\r
+                               possibletempfile.Format(_T("%s%s.git%3.3x.tmp%s"), temppath, (LPCTSTR)path.GetFileOrDirectoryName(), i, (LPCTSTR)path.GetFileExtension());\r
                        }\r
                        tempfile.SetFromWin(possibletempfile);\r
                        i++;\r