Add support i18n.logOutputEncoding at log list

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

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index cdc7c0c..7d3787c 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -7,6 +7,7 @@
 #include <map>\r
 #include "UnicodeUtils.h"\r
 \r
+int CGit::m_LogEncode=CP_UTF8;\r
 \r
 static LPTSTR nextpath(LPCTSTR src, LPTSTR dst, UINT maxlen)\r
 {\r
@@ -305,13 +306,15 @@ CString CGit::GetUserName(void)
 {\r
        CString UserName;\r
        Run(_T("git.exe config user.name"),&UserName,CP_UTF8);\r
-       return UserName;\r
+       int start = 0;\r
+       return UserName.Tokenize(_T("\n"),start);\r
 }\r
 CString CGit::GetUserEmail(void)\r
 {\r
        CString UserName;\r
        Run(_T("git.exe config user.email"),&UserName,CP_UTF8);\r
-       return UserName;\r
+       int start = 0;\r
+       return UserName.Tokenize(_T("\n"),start);\r
 }\r
 \r
 CString CGit::GetCurrentBranch(void)\r
@@ -401,15 +404,16 @@ int CGit::BuildOutputFormat(CString &format,bool IsFull)
                format += log;\r
                log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);\r
                format += log;\r
-               log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
-               format += log;\r
                log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);\r
                format += log;\r
        }\r
+       \r
        log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);\r
        format += log;\r
        log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);\r
        format += log;\r
+       log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
+       format += log;\r
 \r
        if(IsFull)\r
        {\r
@@ -473,6 +477,9 @@ int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count,
        if(mask& CGit::LOG_INFO_FOLLOW)\r
                param += _T(" --follow ");\r
 \r
+       if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE)\r
+               param += _T(" -c ");\r
+\r
        if(from != NULL && to != NULL)\r
        {\r
                CString range;\r
@@ -798,7 +805,7 @@ BOOL CGit::CheckMsysGitDir()
 \r
        // add git/bin path to PATH\r
 \r
-       CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
+       CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);\r
        CString str=msysdir;\r
        if(str.IsEmpty())\r
        {\r
@@ -888,7 +895,7 @@ public:
        {\r
        }\r
 \r
-       UINT HexChar(char ch)\r
+       BYTE HexChar(char ch)\r
        {\r
                if (ch >= '0' && ch <= '9')\r
                        return (UINT)(ch - '0');\r
@@ -945,7 +952,9 @@ public:
                {\r
                        for (int i=0; i<20; i++)\r
                        {\r
-                               sha1[i] = (BYTE)((HexChar(line[0]) << 8) | HexChar(line[1]));\r
+                               sha1[i]  = (HexChar(line[0])<<4)&0xF0;\r
+                               sha1[i] |= HexChar(line[1])&0xF;\r
+\r
                                line += 2;\r
                        }\r
 \r
@@ -1057,23 +1066,23 @@ int CGit::Revert(CTGitPath &path,bool keep)
        if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)\r
        {       //To init git repository, there are not HEAD, so we can use git reset command\r
                cmd.Format(_T("git.exe rm --cache -- \"%s\""),path.GetGitPathString());\r
-               if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
                        return -1;\r
        }\r
        else if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED )\r
        {\r
                cmd.Format(_T("git.exe mv \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());\r
-               if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
                        return -1;\r
                \r
                cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitOldPathString());\r
-               if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
                        return -1;\r
        }\r
        else\r
        {\r
                cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitPathString());\r
-               if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
                        return -1;\r
        }\r
        return 0;\r