src/TortoiseProc/GitDiff.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2003-2008 - TortoiseSVN
   4 // Copyright (C) 2008-2012 - TortoiseGit
   5
   6 // This program is free software; you can redistribute it and/or
   7 // modify it under the terms of the GNU General Public License
   8 // as published by the Free Software Foundation; either version 2
   9 // of the License, or (at your option) any later version.
  10
  11 // This program is distributed in the hope that it will be useful,
  12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  14 // GNU General Public License for more details.
  15
  16 // You should have received a copy of the GNU General Public License
  17 // along with this program; if not, write to the Free Software Foundation,
  18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  19 #include "StdAfx.h"
  20 #include "GitDiff.h"
  21 #include "AppUtils.h"
  22 #include "git.h"
  23 #include "gittype.h"
  24 #include "resource.h"
  25 #include "MessageBox.h"
  26 #include "FileDiffDlg.h"
  27 #include "SubmoduleDiffDlg.h"
  28
  29 CGitDiff::CGitDiff(void)
  30 {
  31 }
  32
  33 CGitDiff::~CGitDiff(void)
  34 {
  35 }
  36 int CGitDiff::SubmoduleDiffNull(CTGitPath *pPath, git_revnum_t &rev1)
  37 {
  38         CString oldhash = GIT_REV_ZERO;
  39         CString oldsub ;
  40         CString newsub;
  41         CString newhash;
  42
  43         CString cmd;
  44         if (rev1 != GIT_REV_ZERO)
  45                 cmd.Format(_T("git.exe ls-tree \"%s\" -- \"%s\""), rev1, pPath->GetGitPathString());
  46         else
  47                 cmd.Format(_T("git.exe ls-files -s -- \"%s\""), pPath->GetGitPathString());
  48
  49         CString output, err;
  50         if (g_Git.Run(cmd, &output, &err, CP_UTF8))
  51         {
  52                 CMessageBox::Show(NULL, output + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
  53                 return -1;
  54         }
  55
  56         int start=0;
  57         start=output.Find(_T(' '),start);
  58         if(start>0)
  59         {
  60                 if (rev1 != GIT_REV_ZERO) // in ls-files the hash is in the second column; in ls-tree it's in the third one
  61                         start = output.Find(_T(' '), start + 1);
  62                 if(start>0)
  63                         newhash=output.Mid(start+1, 40);
  64
  65                 CGit subgit;
  66                 subgit.m_CurrentDir=g_Git.m_CurrentDir+_T("\\")+pPath->GetWinPathString();
  67                 int encode=CAppUtils::GetLogOutputEncode(&subgit);
  68
  69                 cmd.Format(_T("git.exe log -n1  --pretty=format:\"%%s\" %s"),newhash);
  70                 bool toOK = !subgit.Run(cmd,&newsub,encode);
  71
  72                 bool dirty = false;
  73                 CString dirtyList;
  74                 subgit.Run(_T("git.exe status --porcelain"), &dirtyList, encode);
  75                 dirty = !dirtyList.IsEmpty();
  76
  77                 CSubmoduleDiffDlg submoduleDiffDlg;
  78                 submoduleDiffDlg.SetDiff(pPath->GetWinPath(), false, oldhash, oldsub, true, newhash, newsub, toOK, dirty);
  79                 submoduleDiffDlg.DoModal();
  80
  81                 return 0;
  82         }
  83
  84         if (rev1 != GIT_REV_ZERO)
  85                 CMessageBox::Show(NULL, _T("ls-tree output format error"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
  86         else
  87                 CMessageBox::Show(NULL, _T("ls-files output format error"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
  88         return -1;
  89 }
  90
  91 int CGitDiff::DiffNull(CTGitPath *pPath, git_revnum_t rev1,bool bIsAdd)
  92 {
  93         CString temppath;
  94         GetTempPath(temppath);
  95         rev1 = g_Git.GetHash(rev1); // make sure we have a HASH here, otherwise filenames might be invalid
  96         CString file1;
  97         CString nullfile;
  98         CString cmd;
  99
 100         if(pPath->IsDirectory())
 101         {
 102                 git_revnum_t rev2;
 103                 return SubmoduleDiffNull(pPath,rev1);
 104         }
 105
 106         if(rev1 != GIT_REV_ZERO )
 107         {
 108                 TCHAR szTempName[MAX_PATH];
 109                 GetTempFileName(temppath, pPath->GetBaseFilename(), 0, szTempName);
 110                 CString temp(szTempName);
 111                 DeleteFile(szTempName);
 112                 CreateDirectory(szTempName, NULL);
 113                 file1.Format(_T("%s\\%s-%s%s"),
 114                                 temp,
 115                                 pPath->GetBaseFilename(),
 116                                 rev1.Left(g_Git.GetShortHASHLength()),
 117                                 pPath->GetFileExtension());
 118
 119                 g_Git.GetOneFile(rev1,*pPath,file1);
 120         }
 121         else
 122         {
 123                 file1=g_Git.m_CurrentDir+_T("\\")+pPath->GetWinPathString();
 124         }
 125
 126         // preserve FileExtension, needed especially for diffing deleted images (detection on new filename extension)
 127         CString tempfile=::GetTempFile() + pPath->GetFileExtension();
 128         CStdioFile file(tempfile,CFile::modeReadWrite|CFile::modeCreate );
 129         //file.WriteString();
 130         file.Close();
 131         ::SetFileAttributes(tempfile, FILE_ATTRIBUTE_READONLY);
 132
 133         CAppUtils::DiffFlags flags;
 134
 135         if(bIsAdd)
 136                 CAppUtils::StartExtDiff(tempfile,file1,
 137                                                         pPath->GetGitPathString(),
 138                                                         pPath->GetGitPathString() + _T(":") + rev1.Left(g_Git.GetShortHASHLength())
 139                                                         ,flags);
 140         else
 141                 CAppUtils::StartExtDiff(file1,tempfile,
 142                                                         pPath->GetGitPathString() + _T(":") + rev1.Left(g_Git.GetShortHASHLength())
 143                                                         ,pPath->GetGitPathString(),flags);
 144
 145         return 0;
 146 }
 147
 148 int CGitDiff::SubmoduleDiff(CTGitPath * pPath,CTGitPath * /*pPath2*/, git_revnum_t rev1, git_revnum_t rev2, bool /*blame*/, bool /*unified*/)
 149 {
 150         CString oldhash;
 151         CString newhash;
 152         bool dirty = false;
 153         CString cmd;
 154         bool isWorkingCopy = false;
 155         if( rev2 == GIT_REV_ZERO || rev1 == GIT_REV_ZERO )
 156         {
 157                 oldhash = GIT_REV_ZERO;
 158                 newhash = GIT_REV_ZERO;
 159
 160                 CString rev;
 161                 if( rev2 != GIT_REV_ZERO )
 162                         rev = rev2;
 163                 if( rev1 != GIT_REV_ZERO )
 164                         rev = rev1;
 165
 166                 isWorkingCopy = true;
 167
 168                 cmd.Format(_T("git.exe diff %s -- \"%s\""),
 169                 rev,pPath->GetGitPathString());
 170
 171                 CString output, err;
 172                 if (g_Git.Run(cmd, &output, &err, CP_UTF8))
 173                 {
 174                         CMessageBox::Show(NULL, output + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
 175                         return -1;
 176                 }
 177                 int start =0;
 178                 int oldstart = output.Find(_T("-Subproject commit"),start);
 179                 if(oldstart<0)
 180                 {
 181                         CMessageBox::Show(NULL,_T("Subproject Diff Format error") ,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
 182                         return -1;
 183                 }
 184                 oldhash = output.Mid(oldstart+ CString(_T("-Subproject commit")).GetLength()+1,40);
 185                 start = 0;
 186                 int newstart = output.Find(_T("+Subproject commit"),start);
 187                 if(oldstart<0)
 188                 {
 189                         CMessageBox::Show(NULL,_T("Subproject Diff Format error") ,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
 190                         return -1;
 191                 }
 192                 newhash = output.Mid(newstart+ CString(_T("+Subproject commit")).GetLength()+1,40);
 193                 dirty = output.Mid(newstart + CString(_T("+Subproject commit")).GetLength() + 41) == _T("-dirty\n");
 194         }
 195         else
 196         {
 197                 cmd.Format(_T("git.exe diff-tree -r -z %s %s -- \"%s\""),
 198                 rev2,rev1,pPath->GetGitPathString());
 199
 200                 BYTE_VECTOR bytes, errBytes;
 201                 if(g_Git.Run(cmd, &bytes, &errBytes))
 202                 {
 203                         CString err;
 204                         g_Git.StringAppend(&err, &errBytes[0], CP_UTF8);
 205                         CMessageBox::Show(NULL,err,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
 206                         return -1;
 207                 }
 208
 209                 g_Git.StringAppend(&oldhash, &bytes[15], CP_UTF8, 40);
 210                 g_Git.StringAppend(&newhash, &bytes[15+41], CP_UTF8, 40);
 211
 212         }
 213
 214         CString oldsub;
 215         CString newsub;
 216         bool oldOK = false, newOK = false;
 217
 218         CGit subgit;
 219         subgit.m_CurrentDir=g_Git.m_CurrentDir+_T("\\")+pPath->GetWinPathString();
 220
 221         if(pPath->HasAdminDir())
 222         {
 223                 int encode=CAppUtils::GetLogOutputEncode(&subgit);
 224
 225                 if(oldhash != GIT_REV_ZERO)
 226                 {
 227                         cmd.Format(_T("git log -n1  --pretty=format:\"%%s\" %s"),oldhash);
 228                         oldOK = !subgit.Run(cmd,&oldsub,encode);
 229                 }
 230                 if(newsub != GIT_REV_ZERO)
 231                 {
 232                         cmd.Format(_T("git log -n1  --pretty=format:\"%%s\" %s"),newhash);
 233                         newOK = !subgit.Run(cmd,&newsub,encode);
 234                 }
 235         }
 236
 237         CSubmoduleDiffDlg submoduleDiffDlg;
 238         submoduleDiffDlg.SetDiff(pPath->GetWinPath(), isWorkingCopy, oldhash, oldsub, oldOK, newhash, newsub, newOK, dirty);
 239         submoduleDiffDlg.DoModal();
 240
 241         return 0;
 242 }
 243
 244 int CGitDiff::Diff(CTGitPath * pPath,CTGitPath * pPath2, git_revnum_t rev1, git_revnum_t rev2, bool /*blame*/, bool /*unified*/)
 245 {
 246         CString temppath;
 247         GetTempPath(temppath);
 248
 249         // make sure we have HASHes here, otherwise filenames might be invalid
 250         rev1 = g_Git.GetHash(rev1);
 251         rev2 = g_Git.GetHash(rev2);
 252
 253         CString file1;
 254         CString title1;
 255         CString cmd;
 256
 257         if(pPath->IsDirectory() || pPath2->IsDirectory())
 258         {
 259                 return SubmoduleDiff(pPath,pPath2,rev1,rev2);
 260         }
 261
 262         if(rev1 != GIT_REV_ZERO )
 263         {
 264                 TCHAR szTempName[MAX_PATH];
 265                 GetTempFileName(temppath, pPath->GetBaseFilename(), 0, szTempName);
 266                 CString temp(szTempName);
 267                 DeleteFile(szTempName);
 268                 CreateDirectory(szTempName, NULL);
 269                 // use original file extension, an external diff tool might need it
 270                 file1.Format(_T("%s\\%s-%s-right%s"),
 271                                 temp,
 272                                 pPath->GetBaseFilename(),
 273                                 rev1.Left(g_Git.GetShortHASHLength()),
 274                                 pPath->GetFileExtension());
 275                 title1 = pPath->GetFileOrDirectoryName() + _T(":") + rev1.Left(g_Git.GetShortHASHLength());
 276                 g_Git.GetOneFile(rev1,*pPath,file1);
 277                 ::SetFileAttributes(file1, FILE_ATTRIBUTE_READONLY);
 278         }
 279         else
 280         {
 281                 file1=g_Git.m_CurrentDir+_T("\\")+pPath->GetWinPathString();
 282                 title1.Format( IDS_DIFF_WCNAME, pPath->GetFileOrDirectoryName() );
 283                 if (!PathFileExists(file1))
 284                 {
 285                         CString sMsg;
 286                         sMsg.Format(IDS_PROC_DIFFERROR_FILENOTINWORKINGTREE, file1);
 287                         if (MessageBox(NULL, sMsg, _T("TortoiseGit"), MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL)
 288                                 return 1;
 289                         if (!CCommonAppUtils::FileOpenSave(file1, NULL, IDS_DIFF_WCNAME, IDS_COMMONFILEFILTER, true))
 290                                 return 1;
 291                         title1.Format(IDS_DIFF_WCNAME, CTGitPath(file1).GetUIFileOrDirectoryName());
 292                 }
 293         }
 294
 295         CString file2;
 296         CString title2;
 297         if(rev2 != GIT_REV_ZERO)
 298         {
 299                 TCHAR szTempName[MAX_PATH];
 300                 GetTempFileName(temppath, pPath2->GetBaseFilename(), 0, szTempName);
 301                 CString temp(szTempName);
 302                 DeleteFile(szTempName);
 303                 CreateDirectory(szTempName, NULL);
 304                 CTGitPath fileName = *pPath2;
 305                 if (rev1 == GIT_REV_ZERO && pPath2->m_Action & CTGitPath::LOGACTIONS_REPLACED)
 306                         fileName = CTGitPath(pPath2->GetGitOldPathString());
 307
 308                 // use original file extension, an external diff tool might need it
 309                 file2.Format(_T("%s\\%s-%s-left%s"),
 310                                 temp,
 311                                 fileName.GetBaseFilename(),
 312                                 rev2.Left(g_Git.GetShortHASHLength()),
 313                                 fileName.GetFileExtension());
 314                 title2 = fileName.GetFileOrDirectoryName() + _T(":") + rev2.Left(g_Git.GetShortHASHLength());
 315                 g_Git.GetOneFile(rev2, fileName, file2);
 316                 ::SetFileAttributes(file2, FILE_ATTRIBUTE_READONLY);
 317         }
 318         else
 319         {
 320                 file2=g_Git.m_CurrentDir+_T("\\")+pPath2->GetWinPathString();
 321                 title2.Format( IDS_DIFF_WCNAME, pPath2->GetFileOrDirectoryName() );
 322         }
 323
 324         if (pPath->m_Action == pPath->LOGACTIONS_ADDED)
 325         {
 326                 CGitDiff::DiffNull(pPath, rev1, true);
 327         }
 328         else if (pPath->m_Action == pPath->LOGACTIONS_DELETED)
 329         {
 330                 CGitDiff::DiffNull(pPath, rev2, false);
 331         }
 332         else
 333         {
 334                 CAppUtils::DiffFlags flags;
 335                 CAppUtils::StartExtDiff(file2,file1,
 336                                                                 title2,
 337                                                                 title1
 338                                                                 ,flags);
 339         }
 340         return 0;
 341 }
 342
 343 int CGitDiff::DiffCommit(CTGitPath &path, GitRev *r1, GitRev *r2)
 344 {
 345         return DiffCommit(path, path, r1, r2);
 346 }
 347
 348 int CGitDiff::DiffCommit(CTGitPath path1, CTGitPath path2, GitRev *r1, GitRev *r2)
 349 {
 350         if (path1.GetWinPathString().IsEmpty())
 351         {
 352                 CFileDiffDlg dlg;
 353                 dlg.SetDiff(NULL, *r1, *r2);
 354                 dlg.DoModal();
 355         }
 356         else if (path1.IsDirectory())
 357         {
 358                 CFileDiffDlg dlg;
 359                 dlg.SetDiff(&path1, *r1, *r2);
 360                 dlg.DoModal();
 361         }
 362         else
 363         {
 364                 Diff(&path1, &path2, r1->m_CommitHash.ToString(), r2->m_CommitHash.ToString());
 365         }
 366         return 0;
 367 }
 368
 369 int CGitDiff::DiffCommit(CTGitPath &path, CString r1, CString r2)
 370 {
 371         return DiffCommit(path, path, r1, r2);
 372 }
 373
 374
 375 int CGitDiff::DiffCommit(CTGitPath path1, CTGitPath path2, CString r1, CString r2)
 376 {
 377         if (path1.GetWinPathString().IsEmpty())
 378         {
 379                 CFileDiffDlg dlg;
 380                 dlg.SetDiff(NULL, r1, r2);
 381                 dlg.DoModal();
 382         }
 383         else if (path1.IsDirectory())
 384         {
 385                 CFileDiffDlg dlg;
 386                 dlg.SetDiff(&path1, r1, r2);
 387                 dlg.DoModal();
 388         }
 389         else
 390         {
 391                 Diff(&path1, &path2, r1, r2);
 392         }
 393         return 0;
 394 }