src/TortoiseProc/GitDiff.cpp

   1 #include "StdAfx.h"\r
   2 #include "GitDiff.h"\r
   3 #include "AppUtils.h"\r
   4 #include "git.h"\r
   5 #include "gittype.h"\r
   6 #include "resource.h"\r
   7 #include "MessageBox.h"\r
   8 \r
   9 CGitDiff::CGitDiff(void)\r
  10 {\r
  11 }\r
  12 \r
  13 CGitDiff::~CGitDiff(void)\r
  14 {\r
  15 }\r
  16 int CGitDiff::Parser(git_revnum_t &rev)\r
  17 {\r
  18         if(rev == GIT_REV_ZERO)\r
  19                 return 0;\r
  20         if(rev.GetLength() > 40)\r
  21         {\r
  22                 CString cmd;\r
  23                 cmd.Format(_T("git.exe rev-parse %s"),rev);\r
  24                 CString output;\r
  25                 if(!g_Git.Run(cmd,&output,CP_UTF8))\r
  26                 {\r
  27                         //int start=output.Find(_T('\n'));\r
  28                         rev=output.Left(40);\r
  29                 }\r
  30         }\r
  31         return 0;\r
  32 }\r
  33 int CGitDiff::DiffNull(CTGitPath *pPath, git_revnum_t &rev1,bool bIsAdd)\r
  34 {\r
  35         CString temppath;\r
  36         GetTempPath(temppath);\r
  37         Parser(rev1);\r
  38         CString file1;\r
  39         CString nullfile;\r
  40         CString cmd;\r
  41         if(rev1 != GIT_REV_ZERO )\r
  42         {\r
  43                 file1.Format(_T("%s%s_%s%s"),\r
  44                                 temppath,                                               \r
  45                                 pPath->GetBaseFilename(),\r
  46                                 rev1.Left(6),\r
  47                                 pPath->GetFileExtension());\r
  48                 cmd.Format(_T("git.exe cat-file -p %s:\"%s\""),rev1,pPath->GetGitPathString());\r
  49                                 g_Git.RunLogFile(cmd,file1);\r
  50         }else\r
  51         {\r
  52                 file1=g_Git.m_CurrentDir+_T("\\")+pPath->GetWinPathString();\r
  53         }\r
  54 \r
  55         CString tempfile=::GetTempFile();\r
  56         CStdioFile file(tempfile,CFile::modeReadWrite|CFile::modeCreate );\r
  57         //file.WriteString();\r
  58         file.Close();\r
  59         \r
  60         CAppUtils::DiffFlags flags;\r
  61 \r
  62         if(bIsAdd)\r
  63                 CAppUtils::StartExtDiff(tempfile,file1,\r
  64                                                         _T("NULL"),\r
  65                                                         pPath->GetGitPathString()+_T(":")+rev1.Left(6)\r
  66                                                         ,flags);\r
  67         else\r
  68                 CAppUtils::StartExtDiff(file1,tempfile,\r
  69                                                         pPath->GetGitPathString()+_T(":")+rev1.Left(6)\r
  70                                                         ,_T("NULL"),flags);\r
  71 \r
  72         return 0;\r
  73 }\r
  74 \r
  75 int CGitDiff::Diff(CTGitPath * pPath,CTGitPath * pPath2, git_revnum_t & rev1, git_revnum_t & rev2, bool /*blame*/, bool /*unified*/)\r
  76 {\r
  77         CString temppath;\r
  78         GetTempPath(temppath);\r
  79         Parser(rev1);\r
  80         Parser(rev2);\r
  81         CString file1;\r
  82         CString title1;\r
  83         CString cmd;\r
  84 \r
  85         if(pPath->IsDirectory() || pPath2->IsDirectory())\r
  86         {\r
  87                 cmd.Format(_T("git.exe diff-tree -r -z %s %s -- \"%s\""),\r
  88                         rev2,rev1,pPath->GetGitPathString());\r
  89                 \r
  90                 BYTE_VECTOR bytes;\r
  91                 if(g_Git.Run(cmd,&bytes))\r
  92                 {\r
  93                         CString err;\r
  94                         g_Git.StringAppend(&err,&bytes[0],CP_ACP);\r
  95                         CMessageBox::Show(NULL,err,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
  96                 }\r
  97                 \r
  98                 CString oldhash;\r
  99                 g_Git.StringAppend(&oldhash,&bytes[15],CP_ACP,40);\r
 100                 CString newhash;\r
 101                 g_Git.StringAppend(&newhash,&bytes[15+41],CP_ACP,40);\r
 102 \r
 103                 CString oldsub;\r
 104                 CString newsub;\r
 105 \r
 106                 CGit subgit; \r
 107                 subgit.m_CurrentDir=g_Git.m_CurrentDir+_T("\\")+pPath->GetWinPathString();\r
 108 \r
 109                 CString cmd;\r
 110                 if(pPath->HasAdminDir())\r
 111                 {\r
 112                         int encode=CAppUtils::GetLogOutputEncode(&subgit);\r
 113 \r
 114                         if(oldhash != GIT_REV_ZERO)\r
 115                         {\r
 116                                 cmd.Format(_T("git log -n1 HEAD --pretty=format:\"%%s\" %s"),oldhash);\r
 117                                 subgit.Run(cmd,&oldsub,encode);\r
 118                         }\r
 119 \r
 120                         if(newsub != GIT_REV_ZERO)\r
 121                         {\r
 122                                 cmd.Format(_T("git log -n1 HEAD --pretty=format:\"%%s\" %s"),newhash);\r
 123                                 subgit.Run(cmd,&newsub,encode);\r
 124                         }\r
 125                 }\r
 126                 CString msg;\r
 127                 msg.Format(_T("Submodule <b>%s</b> Change\r\n\r\n<b>From:</b> %s\r\n\t%s\r\n\r\n<b>To:</b>     %s\r\n\t\t%s"),\r
 128                                    pPath->GetWinPath(),\r
 129                                    oldhash,\r
 130                                    oldsub ,\r
 131                                    newhash,\r
 132                                    newsub);\r
 133                 CMessageBox::Show(NULL,msg,_T("TortoiseGit"),MB_OK);\r
 134 \r
 135                 return 0;\r
 136         }\r
 137 \r
 138         if(rev1 != GIT_REV_ZERO )\r
 139         {\r
 140                 file1.Format(_T("%s%s_%s%s"),\r
 141                                 temppath,                                               \r
 142                                 pPath->GetBaseFilename(),\r
 143                                 rev1.Left(6),\r
 144                                 pPath->GetFileExtension());\r
 145                 title1 = pPath->GetFileOrDirectoryName()+_T(":")+rev1.Left(6);\r
 146                 cmd.Format(_T("git.exe cat-file -p %s:\"%s\""),rev1,pPath->GetGitPathString());\r
 147                                 g_Git.RunLogFile(cmd,file1);\r
 148         }else\r
 149         {\r
 150                 file1=g_Git.m_CurrentDir+_T("\\")+pPath->GetWinPathString();\r
 151                 title1.Format( IDS_DIFF_WCNAME, pPath->GetFileOrDirectoryName() );\r
 152         }\r
 153 \r
 154         CString file2;\r
 155         CString title2;\r
 156         if(rev2 != GIT_REV_ZERO)\r
 157         {\r
 158                 \r
 159                 file2.Format(_T("%s%s_%s%s"),\r
 160                                 temppath,                                               \r
 161                                 pPath2->GetBaseFilename(),\r
 162                                 rev2.Left(6),\r
 163                                 pPath2->GetFileExtension());\r
 164                 title2 = pPath2->GetFileOrDirectoryName()+_T(":")+rev2.Left(6);\r
 165                 cmd.Format(_T("git.exe cat-file -p %s:\"%s\""),rev2,pPath2->GetGitPathString());\r
 166                 g_Git.RunLogFile(cmd,file2);\r
 167         }else\r
 168         {\r
 169                 file2=g_Git.m_CurrentDir+_T("\\")+pPath2->GetWinPathString();\r
 170                 title2.Format( IDS_DIFF_WCNAME, pPath2->GetFileOrDirectoryName() );\r
 171         }\r
 172         \r
 173         CAppUtils::DiffFlags flags;\r
 174         CAppUtils::StartExtDiff(file2,file1,\r
 175                                                         title2,\r
 176                                                         title1\r
 177                                                         ,flags);\r
 178 \r
 179         return 0;\r
 180 }\r
 181 \r