Add Revert to Version feature.

[tortoisegit/TortoiseGitJp.git] / src / Git / GitRev.cpp

diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp
index 9f06c61..88a24ed 100644 (file)
--- a/src/Git/GitRev.cpp
+++ b/src/Git/GitRev.cpp
@@ -2,11 +2,23 @@
 #include "GitRev.h"\r
 #include "Git.h"\r
 \r
+// provide an ASSERT macro for when compiled without MFC\r
+#if !defined ASSERT\r
+       // Don't use _asm here, it isn't supported by x64 version of compiler. In fact, MFC's ASSERT() is the same with _ASSERTE().\r
+       #define ASSERT(x) _ASSERTE(x)\r
+#endif\r
+\r
+\r
 GitRev::GitRev(void)\r
 {\r
        m_Action=0;\r
        m_IsFull = 0;\r
        m_IsUpdateing = 0;\r
+       // fetch local machine timezone info\r
+       if ( GetTimeZoneInformation( &m_TimeZone ) == TIME_ZONE_ID_INVALID )\r
+       {\r
+               ASSERT(false);\r
+       }\r
 }\r
 \r
 GitRev::~GitRev(void)\r
@@ -69,7 +81,6 @@ int GitRev::ParserFromLog(BYTE_VECTOR &log,int start)
        this->m_Files.Clear();\r
     m_Action=0;\r
        int begintime=0;\r
-       BYTE *p=&log[0];\r
        int filebegin=-1;\r
 \r
        while( pos < log.size() && pos>=0)\r
@@ -196,22 +207,14 @@ CTime GitRev::ConverFromString(CString input)
        // get local timezone\r
        SYSTEMTIME sysTime;\r
        tm.GetAsSystemTime( sysTime );\r
-       TIME_ZONE_INFORMATION timeZone;\r
-       if ( GetTimeZoneInformation( &timeZone ) == TIME_ZONE_ID_UNKNOWN )\r
+       SYSTEMTIME local;\r
+       if ( SystemTimeToTzSpecificLocalTime( &m_TimeZone, &sysTime, &local ) )\r
        {\r
-               ASSERT(false);\r
+               sysTime = local;\r
        }\r
        else\r
        {\r
-               SYSTEMTIME local;\r
-               if ( SystemTimeToTzSpecificLocalTime( &timeZone, &sysTime, &local ) )\r
-               {\r
-                       sysTime = local;\r
-               }\r
-               else\r
-               {\r
-                       ASSERT(false);\r
-               }\r
+               ASSERT(false);\r
        }\r
        tm = CTime( sysTime, 0 );\r
        return tm;\r