src/TortoiseProc/FileDiffDlg.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2008-2014 - TortoiseGit
   4 // Copyright (C) 2003-2008 - TortoiseSVN
   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 //
  20 #include "stdafx.h"
  21 #include "TortoiseProc.h"
  22 #include "UnicodeUtils.h"
  23 #include "MessageBox.h"
  24 #include "AppUtils.h"
  25 #include "TempFile.h"
  26 #include "SysImageList.h"
  27 #include "IconMenu.h"
  28 #include "StringUtils.h"
  29 #include "PathUtils.h"
  30 #include "BrowseFolder.h"
  31 #include "FileDiffDlg.h"
  32 #include "GitDiff.h"
  33 #include "LoglistCommonResource.h"
  34 #include "LoglistUtils.h"
  35 #include "BrowseRefsDlg.h"
  36 #include "LogDlg.h"
  37 #include "RefLogDlg.h"
  38 #include "GitStatusListCtrl.h"
  39 #include "FormatMessageWrapper.h"
  40
  41 #define ID_COMPARE 1
  42 #define ID_BLAME 2
  43 #define ID_SAVEAS 3
  44 #define ID_EXPORT 4
  45 #define ID_CLIPBOARD_PATH 5
  46 #define ID_CLIPBOARD_ALL 6
  47 #define ID_LOG 7
  48 #define ID_GNUDIFFCOMPARE 8
  49 #define ID_REVERT1 9
  50 #define ID_REVERT2 10
  51
  52 BOOL    CFileDiffDlg::m_bAscending = TRUE;
  53 int             CFileDiffDlg::m_nSortedColumn = -1;
  54
  55 UINT CFileDiffDlg::WM_DISABLEBUTTONS = RegisterWindowMessage(_T("TORTOISEGIT_FILEDIFF_DISABLEBUTTONS"));
  56 UINT CFileDiffDlg::WM_DIFFFINISHED = RegisterWindowMessage(_T("TORTOISEGIT_FILEDIFF_DIFFFINISHED"));
  57
  58 IMPLEMENT_DYNAMIC(CFileDiffDlg, CResizableStandAloneDialog)
  59 CFileDiffDlg::CFileDiffDlg(CWnd* pParent /*=NULL*/)
  60         : CResizableStandAloneDialog(CFileDiffDlg::IDD, pParent)
  61         , m_bBlame(false)
  62         , m_pProgDlg(NULL)
  63         , m_bCancelled(false)
  64         , m_nIconFolder(0)
  65         , m_bThreadRunning(FALSE)
  66         , m_bIgnoreSpaceAtEol(false)
  67         , m_bIgnoreSpaceChange(false)
  68         , m_bIgnoreAllSpace(false)
  69         , m_bIgnoreBlankLines(false)
  70 {
  71         m_bLoadingRef=FALSE;
  72 }
  73
  74 CFileDiffDlg::~CFileDiffDlg()
  75 {
  76 }
  77
  78 void CFileDiffDlg::DoDataExchange(CDataExchange* pDX)
  79 {
  80         CResizableStandAloneDialog::DoDataExchange(pDX);
  81         DDX_Control(pDX, IDC_FILELIST, m_cFileList);
  82         DDX_Control(pDX, IDC_SWITCHLEFTRIGHT, m_SwitchButton);
  83         DDX_Control(pDX, IDC_REV1BTN, m_cRev1Btn);
  84         DDX_Control(pDX, IDC_REV2BTN, m_cRev2Btn);
  85         DDX_Control(pDX, IDC_FILTER, m_cFilter);
  86         DDX_Control(pDX, IDC_REV1EDIT, m_ctrRev1Edit);
  87         DDX_Control(pDX, IDC_REV2EDIT, m_ctrRev2Edit);
  88 }
  89
  90
  91 BEGIN_MESSAGE_MAP(CFileDiffDlg, CResizableStandAloneDialog)
  92         ON_NOTIFY(NM_DBLCLK, IDC_FILELIST, OnNMDblclkFilelist)
  93         ON_NOTIFY(LVN_GETINFOTIP, IDC_FILELIST, OnLvnGetInfoTipFilelist)
  94         ON_NOTIFY(NM_CUSTOMDRAW, IDC_FILELIST, OnNMCustomdrawFilelist)
  95         ON_WM_CONTEXTMENU()
  96         ON_WM_SETCURSOR()
  97         ON_EN_SETFOCUS(IDC_SECONDURL, &CFileDiffDlg::OnEnSetfocusSecondurl)
  98         ON_EN_SETFOCUS(IDC_FIRSTURL, &CFileDiffDlg::OnEnSetfocusFirsturl)
  99         ON_BN_CLICKED(IDC_SWITCHLEFTRIGHT, &CFileDiffDlg::OnBnClickedSwitchleftright)
 100         ON_NOTIFY(HDN_ITEMCLICK, 0, &CFileDiffDlg::OnHdnItemclickFilelist)
 101         ON_BN_CLICKED(IDC_REV1BTN, &CFileDiffDlg::OnBnClickedRev1btn)
 102         ON_BN_CLICKED(IDC_REV2BTN, &CFileDiffDlg::OnBnClickedRev2btn)
 103         ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
 104         ON_EN_CHANGE(IDC_FILTER, &CFileDiffDlg::OnEnChangeFilter)
 105         ON_WM_TIMER()
 106         ON_MESSAGE(ENAC_UPDATE, &CFileDiffDlg::OnEnUpdate)
 107         ON_MESSAGE(MSG_REF_LOADED, OnRefLoad)
 108         ON_REGISTERED_MESSAGE(WM_DISABLEBUTTONS, OnDisableButtons)
 109         ON_REGISTERED_MESSAGE(WM_DIFFFINISHED, OnDiffFinished)
 110         ON_BN_CLICKED(IDC_DIFFOPTION, OnBnClickedDiffoption)
 111         ON_BN_CLICKED(IDC_LOG, &CFileDiffDlg::OnBnClickedLog)
 112 END_MESSAGE_MAP()
 113
 114
 115 void CFileDiffDlg::SetDiff(const CTGitPath * path, const GitRev &rev1, const GitRev &rev2)
 116 {
 117         if(path!=NULL)
 118         {
 119                 m_path1 = *path;
 120                 m_path2 = *path;
 121                 m_sFilter = path->GetGitPathString();
 122         }
 123         m_rev1 = rev1;
 124         m_rev2 = rev2;
 125 }
 126
 127 void CFileDiffDlg::SetDiff(const CTGitPath * path, const CString &hash1, const CString &hash2)
 128 {
 129         if(path!=NULL)
 130         {
 131                 m_path1 = *path;
 132                 m_path2 = *path;
 133                 m_sFilter = path->GetGitPathString();
 134         }
 135
 136         BYTE_VECTOR logout;
 137
 138         if(hash1 == GIT_REV_ZERO)
 139         {
 140                 m_rev1.m_CommitHash.Empty();
 141                 m_rev1.GetSubject() = CString(MAKEINTRESOURCE(IDS_git_DEPTH_WORKING));
 142         }
 143         else
 144         {
 145                 try
 146                 {
 147                         m_rev1.GetCommit(hash1);
 148                 }
 149                 catch (const char *msg)
 150                 {
 151                         MessageBox(_T("Could not get commit ") + hash1 + _T("\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
 152                 }
 153         }
 154
 155         logout.clear();
 156
 157         if(hash2 == GIT_REV_ZERO)
 158         {
 159                 m_rev2.m_CommitHash.Empty();
 160                 m_rev2.GetSubject() = CString(MAKEINTRESOURCE(IDS_git_DEPTH_WORKING));
 161         }
 162         else
 163         {
 164                 try
 165                 {
 166                         m_rev2.GetCommit(hash2);
 167                 }
 168                 catch (const char *msg)
 169                 {
 170                         MessageBox(_T("Could not get commit ") + hash2 + _T("\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
 171                 }
 172         }
 173 }
 174
 175 void CFileDiffDlg::SetDiff(const CTGitPath * path, const GitRev &rev1)
 176 {
 177         if(path!=NULL)
 178         {
 179                 m_path1 = *path;
 180                 m_path2 = *path;
 181                 m_sFilter = path->GetGitPathString();
 182         }
 183         m_rev1 = rev1;
 184         m_rev2.m_CommitHash.Empty();
 185         m_rev2.GetSubject() = CString(MAKEINTRESOURCE(IDS_PROC_PREVIOUSVERSION));
 186
 187         //this->GetDlgItem()->EnableWindow(FALSE);
 188 }
 189
 190 BOOL CFileDiffDlg::OnInitDialog()
 191 {
 192         CResizableStandAloneDialog::OnInitDialog();
 193         CString temp;
 194
 195         CString sWindowTitle;
 196         GetWindowText(sWindowTitle);
 197         CString pathText = g_Git.m_CurrentDir;
 198         if (!m_path1.IsEmpty())
 199                 pathText = g_Git.m_CurrentDir + _T("\\") + m_path1.GetWinPathString();
 200         CAppUtils::SetWindowTitle(m_hWnd, pathText, sWindowTitle);
 201
 202         this->m_ctrRev1Edit.Init();
 203         this->m_ctrRev2Edit.Init();
 204
 205         m_tooltips.Create(this);
 206         m_tooltips.AddTool(IDC_SWITCHLEFTRIGHT, IDS_FILEDIFF_SWITCHLEFTRIGHT_TT);
 207
 208         m_cFileList.SetRedraw(false);
 209         m_cFileList.DeleteAllItems();
 210         DWORD exStyle = LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP;
 211         m_cFileList.SetExtendedStyle(exStyle);
 212
 213         m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
 214         m_cFileList.SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
 215
 216         m_SwitchButton.SetImage((HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_SWITCHLEFTRIGHT), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR));
 217         m_SwitchButton.Invalidate();
 218
 219         m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
 220         m_cFilter.SetInfoIcon(IDI_FILTEREDIT);
 221         temp.LoadString(IDS_FILEDIFF_FILTERCUE);
 222         temp = _T("   ")+temp;
 223         m_cFilter.SetCueBanner(temp);
 224         if (!m_sFilter.IsEmpty())
 225                 m_cFilter.SetWindowText(m_sFilter);
 226
 227         int c = ((CHeaderCtrl*)(m_cFileList.GetDlgItem(0)))->GetItemCount()-1;
 228         while (c>=0)
 229                 m_cFileList.DeleteColumn(c--);
 230
 231         temp.LoadString(IDS_FILEDIFF_FILE);
 232         m_cFileList.InsertColumn(0, temp);
 233         temp.LoadString(IDS_FILEDIFF_EXT);
 234         m_cFileList.InsertColumn(1, temp);
 235         temp.LoadString(IDS_FILEDIFF_ACTION);
 236         m_cFileList.InsertColumn(2, temp);
 237
 238         temp.LoadString(IDS_FILEDIFF_STATADD);
 239         m_cFileList.InsertColumn(3, temp);
 240         temp.LoadString(IDS_FILEDIFF_STATDEL);
 241         m_cFileList.InsertColumn(4, temp);
 242
 243         int mincol = 0;
 244         int maxcol = ((CHeaderCtrl*)(m_cFileList.GetDlgItem(0)))->GetItemCount()-1;
 245         int col;
 246         for (col = mincol; col <= maxcol; col++)
 247         {
 248                 m_cFileList.SetColumnWidth(col,LVSCW_AUTOSIZE_USEHEADER);
 249         }
 250
 251         m_cFileList.SetRedraw(true);
 252
 253         AddAnchor(IDC_DIFFSTATIC1, TOP_LEFT, TOP_RIGHT);
 254         AddAnchor(IDC_SWITCHLEFTRIGHT, TOP_RIGHT);
 255         AddAnchor(IDC_FIRSTURL, TOP_LEFT, TOP_RIGHT);
 256         AddAnchor(IDC_REV1BTN, TOP_RIGHT);
 257         //AddAnchor(IDC_DIFFSTATIC2, TOP_LEFT, TOP_RIGHT);
 258         AddAnchor(IDC_SECONDURL, TOP_LEFT, TOP_RIGHT);
 259         AddAnchor(IDC_REV2BTN, TOP_RIGHT);
 260         AddAnchor(IDC_FILTER, TOP_LEFT, TOP_RIGHT);
 261         AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
 262         AddAnchor(IDC_REV1GROUP,TOP_LEFT,TOP_RIGHT);
 263         AddAnchor(IDC_REV2GROUP,TOP_LEFT,TOP_RIGHT);
 264         AddAnchor(IDC_REV1EDIT,TOP_LEFT);
 265         AddAnchor(IDC_REV2EDIT,TOP_LEFT);
 266         AddAnchor(IDC_DIFFOPTION, TOP_RIGHT);
 267         AddAnchor(IDC_LOG, TOP_RIGHT);
 268
 269         EnableSaveRestore(_T("FileDiffDlg"));
 270
 271         if(this->m_strRev1.IsEmpty())
 272                 this->m_ctrRev1Edit.SetWindowText(this->m_rev1.m_CommitHash.ToString());
 273         else
 274         {
 275                 bool rev1fail = false;
 276                 try
 277                 {
 278                         rev1fail = !!m_rev1.GetCommit(m_strRev1);
 279                 }
 280                 catch (const char *msg)
 281                 {
 282                         rev1fail = true;
 283                         MessageBox(_T("Could not get commit ") + m_strRev1 + _T("\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
 284                 }
 285                 if (rev1fail)
 286                 {
 287                         CString msg;
 288                         msg.Format(IDS_PROC_REFINVALID, m_strRev1);
 289                         this->m_FileListText += msg;
 290                 }
 291
 292                 this->m_ctrRev1Edit.SetWindowText(m_strRev1);
 293         }
 294
 295         if(this->m_strRev2.IsEmpty())
 296                 this->m_ctrRev2Edit.SetWindowText(this->m_rev2.m_CommitHash.ToString());
 297         else
 298         {
 299                 bool rev2fail = false;
 300                 try
 301                 {
 302                         rev2fail = !!m_rev2.GetCommit(m_strRev2);
 303                 }
 304                 catch (const char *msg)
 305                 {
 306                         rev2fail = true;
 307                         MessageBox(_T("Could not get commit ") + m_strRev2 + _T("\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
 308                 }
 309                 if (rev2fail)
 310                 {
 311                         CString msg;
 312                         msg.Format(IDS_PROC_REFINVALID, m_strRev2);
 313                         this->m_FileListText += msg;
 314                 }
 315
 316                 this->m_ctrRev2Edit.SetWindowText(m_strRev2);
 317         }
 318
 319         SetURLLabels();
 320
 321         InterlockedExchange(&m_bThreadRunning, TRUE);
 322         if (AfxBeginThread(DiffThreadEntry, this)==NULL)
 323         {
 324                 InterlockedExchange(&m_bThreadRunning, FALSE);
 325                 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
 326         }
 327
 328         InterlockedExchange(&m_bLoadingRef, TRUE);
 329         if (AfxBeginThread(LoadRefThreadEntry, this)==NULL)
 330         {
 331                 InterlockedExchange(&m_bLoadingRef, FALSE);
 332                 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
 333         }
 334
 335         this->m_cRev1Btn.AddEntry(CString(MAKEINTRESOURCE(IDS_REFBROWSE)));
 336         this->m_cRev1Btn.AddEntry(CString(MAKEINTRESOURCE(IDS_LOG)));
 337         this->m_cRev1Btn.AddEntry(CString(MAKEINTRESOURCE(IDS_REFLOG)));
 338
 339         this->m_cRev2Btn.AddEntry(CString(MAKEINTRESOURCE(IDS_REFBROWSE)));
 340         this->m_cRev2Btn.AddEntry(CString(MAKEINTRESOURCE(IDS_LOG)));
 341         this->m_cRev2Btn.AddEntry(CString(MAKEINTRESOURCE(IDS_REFLOG)));
 342
 343         // Start with focus on file list
 344         GetDlgItem(IDC_FILELIST)->SetFocus();
 345
 346         if(m_rev2.m_CommitHash.IsEmpty())
 347                 m_SwitchButton.EnableWindow(FALSE);
 348
 349         KillTimer(IDT_INPUT);
 350         return FALSE;
 351 }
 352
 353 UINT CFileDiffDlg::DiffThreadEntry(LPVOID pVoid)
 354 {
 355         return ((CFileDiffDlg*)pVoid)->DiffThread();
 356 }
 357
 358 UINT CFileDiffDlg::DiffThread()
 359 {
 360         SendMessage(WM_DISABLEBUTTONS);
 361
 362         if( m_rev1.m_CommitHash.IsEmpty() || m_rev2.m_CommitHash.IsEmpty())
 363                 g_Git.RefreshGitIndex();
 364
 365         g_Git.GetCommitDiffList(m_rev1.m_CommitHash.ToString(), m_rev2.m_CommitHash.ToString(), m_arFileList, m_bIgnoreSpaceAtEol, m_bIgnoreSpaceChange, m_bIgnoreAllSpace, m_bIgnoreBlankLines);
 366         Sort();
 367
 368         SendMessage(WM_DIFFFINISHED);
 369
 370         InterlockedExchange(&m_bThreadRunning, FALSE);
 371         return 0;
 372 }
 373
 374 LRESULT CFileDiffDlg::OnDisableButtons(WPARAM, LPARAM)
 375 {
 376         RefreshCursor();
 377         m_cFileList.ShowText(CString(MAKEINTRESOURCE(IDS_FILEDIFF_WAIT)));
 378         m_cFileList.DeleteAllItems();
 379         m_arFileList.Clear();
 380         EnableInputControl(false);
 381         return 0;
 382 }
 383
 384 LRESULT CFileDiffDlg::OnDiffFinished(WPARAM, LPARAM)
 385 {
 386         CString sFilterText;
 387         m_cFilter.GetWindowText(sFilterText);
 388         m_cFileList.SetRedraw(false);
 389         Filter(sFilterText);
 390         if (!m_arFileList.IsEmpty())
 391         {
 392                 // Highlight first entry in file list
 393                 m_cFileList.SetSelectionMark(0);
 394                 m_cFileList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
 395         }
 396
 397         int mincol = 0;
 398         int maxcol = ((CHeaderCtrl*)(m_cFileList.GetDlgItem(0)))->GetItemCount()-1;
 399         int col;
 400         for (col = mincol; col <= maxcol; ++col)
 401         {
 402                 m_cFileList.SetColumnWidth(col, LVSCW_AUTOSIZE_USEHEADER);
 403         }
 404
 405         m_cFileList.ClearText();
 406         if (m_arFileList.IsEmpty())
 407                 m_cFileList.ShowText(CString(MAKEINTRESOURCE(IDS_COMPAREREV_NODIFF)));
 408         m_cFileList.SetRedraw(true);
 409
 410         InvalidateRect(NULL);
 411         RefreshCursor();
 412         EnableInputControl(true);
 413         return 0;
 414 }
 415
 416 int CFileDiffDlg::AddEntry(const CTGitPath * fd)
 417 {
 418         int ret = -1;
 419         if (fd)
 420         {
 421                 int index = m_cFileList.GetItemCount();
 422
 423                 int icon_idx = 0;
 424                 if (fd->IsDirectory())
 425                         icon_idx = m_nIconFolder;
 426                 else
 427                         icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(fd->GetGitPathString());
 428
 429                 ret = m_cFileList.InsertItem(index, fd->GetGitPathString(), icon_idx);
 430                 m_cFileList.SetItemText(index, 1, ((CTGitPath*)fd)->GetFileExtension());
 431                 m_cFileList.SetItemText(index, 2, ((CTGitPath*)fd)->GetActionName());
 432                 m_cFileList.SetItemText(index, 3, ((CTGitPath*)fd)->m_StatAdd);
 433                 m_cFileList.SetItemText(index, 4, ((CTGitPath*)fd)->m_StatDel);
 434         }
 435         return ret;
 436 }
 437
 438 void CFileDiffDlg::EnableInputControl(bool b)
 439 {
 440         this->m_ctrRev1Edit.EnableWindow(b);
 441         this->m_ctrRev2Edit.EnableWindow(b);
 442         this->m_cRev1Btn.EnableWindow(b);
 443         this->m_cRev2Btn.EnableWindow(b);
 444         m_cFilter.EnableWindow(b);
 445         m_SwitchButton.EnableWindow(b);
 446         GetDlgItem(IDC_LOG)->EnableWindow(b && !(m_rev1.m_CommitHash.IsEmpty() || m_rev2.m_CommitHash.IsEmpty()));
 447 }
 448
 449 void CFileDiffDlg::DoDiff(int selIndex, bool blame)
 450 {
 451         CGitDiff diff;
 452         CTGitPath* fd2 = m_arFilteredList[selIndex];
 453         CTGitPath* fd1 = fd2;
 454         if (fd2->m_Action & CTGitPath::LOGACTIONS_REPLACED)
 455                 fd1 = new CTGitPath(fd2->GetGitOldPathString());
 456         diff.Diff(fd2, fd1, this->m_rev1.m_CommitHash.ToString(), this->m_rev2.m_CommitHash.ToString(), blame, FALSE);
 457         if (fd1 != fd2)
 458                 delete fd1;
 459 }
 460
 461
 462 void CFileDiffDlg::OnNMDblclkFilelist(NMHDR *pNMHDR, LRESULT *pResult)
 463 {
 464         *pResult = 0;
 465         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
 466         int selIndex = pNMLV->iItem;
 467         if (selIndex < 0)
 468                 return;
 469         if (selIndex >= (int)m_arFilteredList.size())
 470                 return;
 471
 472         DoDiff(selIndex, m_bBlame);
 473 }
 474
 475 void CFileDiffDlg::OnLvnGetInfoTipFilelist(NMHDR *pNMHDR, LRESULT *pResult)
 476 {
 477
 478         LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
 479         if (pGetInfoTip->iItem >= (int)m_arFilteredList.size())
 480                 return;
 481
 482         CString path = m_path1.GetGitPathString() + _T("/") + m_arFilteredList[pGetInfoTip->iItem]->GetGitPathString();
 483         if (pGetInfoTip->cchTextMax > path.GetLength())
 484                         _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, path, pGetInfoTip->cchTextMax);
 485
 486         *pResult = 0;
 487 }
 488
 489 void CFileDiffDlg::OnNMCustomdrawFilelist(NMHDR *pNMHDR, LRESULT *pResult)
 490 {
 491         NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
 492         // Take the default processing unless we set this to something else below.
 493         *pResult = CDRF_DODEFAULT;
 494
 495         // First thing - check the draw stage. If it's the control's prepaint
 496         // stage, then tell Windows we want messages for every item.
 497
 498         if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
 499         {
 500                 *pResult = CDRF_NOTIFYITEMDRAW;
 501         }
 502         else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
 503         {
 504                 // This is the prepaint stage for an item. Here's where we set the
 505                 // item's text color. Our return value will tell Windows to draw the
 506                 // item itself, but it will use the new color we set here.
 507
 508                 // Tell Windows to paint the control itself.
 509                 *pResult = CDRF_DODEFAULT;
 510
 511                 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
 512
 513                 if (m_arFilteredList.size() > pLVCD->nmcd.dwItemSpec)
 514                 {
 515                         CTGitPath * fd = m_arFilteredList[pLVCD->nmcd.dwItemSpec];
 516                         switch (fd->m_Action)
 517                         {
 518                         case CTGitPath::LOGACTIONS_ADDED:
 519                                 crText = m_colors.GetColor(CColors::Added);
 520                                 break;
 521                         case CTGitPath::LOGACTIONS_DELETED:
 522                                 crText = m_colors.GetColor(CColors::Deleted);
 523                                 break;
 524                         case CTGitPath::LOGACTIONS_MODIFIED:
 525                                 crText = m_colors.GetColor(CColors::Modified);
 526                                 break;
 527                         default:
 528                                 crText = m_colors.GetColor(CColors::PropertyChanged);
 529                                 break;
 530                         }
 531                 }
 532                 // Store the color back in the NMLVCUSTOMDRAW struct.
 533                 pLVCD->clrText = crText;
 534         }
 535 }
 536
 537 UINT CFileDiffDlg::LoadRefThread()
 538 {
 539         g_Git.GetBranchList(m_Reflist,NULL,CGit::BRANCH_ALL_F);
 540         g_Git.GetTagList(m_Reflist);
 541
 542         this->PostMessage(MSG_REF_LOADED);
 543         InterlockedExchange(&m_bLoadingRef, FALSE);
 544         return 0;
 545 }
 546
 547 void CFileDiffDlg::OnContextMenu(CWnd* pWnd, CPoint point)
 548 {
 549         if ((pWnd==0)||(pWnd != &m_cFileList))
 550                 return;
 551         if (m_cFileList.GetSelectedCount() == 0)
 552                 return;
 553         // if the context menu is invoked through the keyboard, we have to use
 554         // a calculated position on where to anchor the menu on
 555         if ((point.x == -1) && (point.y == -1))
 556         {
 557                 CRect rect;
 558                 m_cFileList.GetItemRect(m_cFileList.GetSelectionMark(), &rect, LVIR_LABEL);
 559                 m_cFileList.ClientToScreen(&rect);
 560                 point = rect.CenterPoint();
 561         }
 562         CIconMenu popup;
 563         if (popup.CreatePopupMenu())
 564         {
 565                 CString menuText;
 566                 popup.AppendMenuIcon(ID_COMPARE, IDS_LOG_POPUP_COMPARETWO, IDI_DIFF);
 567                 popup.AppendMenuIcon(ID_GNUDIFFCOMPARE, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
 568                 popup.AppendMenu(MF_SEPARATOR, NULL);
 569                 menuText.Format(IDS_FILEDIFF_POPREVERTTOREV, m_rev1.m_CommitHash.ToString().Left(g_Git.GetShortHASHLength()));
 570                 popup.AppendMenuIcon(ID_REVERT1, menuText, IDI_REVERT);
 571                 menuText.Format(IDS_FILEDIFF_POPREVERTTOREV, m_rev2.m_CommitHash.ToString().Left(g_Git.GetShortHASHLength()));
 572                 popup.AppendMenuIcon(ID_REVERT2, menuText, IDI_REVERT);
 573                 popup.AppendMenu(MF_SEPARATOR, NULL);
 574                 popup.AppendMenuIcon(ID_LOG, IDS_FILEDIFF_LOG, IDI_LOG);
 575                 popup.AppendMenuIcon(ID_BLAME, IDS_FILEDIFF_POPBLAME, IDI_BLAME);
 576                 popup.AppendMenu(MF_SEPARATOR, NULL);
 577                 popup.AppendMenuIcon(ID_EXPORT, IDS_FILEDIFF_POPEXPORT, IDI_EXPORT);
 578                 popup.AppendMenu(MF_SEPARATOR, NULL);
 579                 popup.AppendMenuIcon(ID_SAVEAS, IDS_FILEDIFF_POPSAVELIST, IDI_SAVEAS);
 580                 popup.AppendMenuIcon(ID_CLIPBOARD_PATH, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
 581                 popup.AppendMenuIcon(ID_CLIPBOARD_ALL, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
 582
 583                 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
 584                 m_bCancelled = false;
 585                 switch (cmd)
 586                 {
 587                 case ID_COMPARE:
 588                         {
 589                                 POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
 590                                 while (pos)
 591                                 {
 592                                         int index = m_cFileList.GetNextSelectedItem(pos);
 593                                         DoDiff(index, false);
 594                                 }
 595                         }
 596                         break;
 597                 case ID_GNUDIFFCOMPARE:
 598                         {
 599                                 POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
 600                                 while (pos)
 601                                 {
 602                                         CTGitPath *fd2 = m_arFilteredList[m_cFileList.GetNextSelectedItem(pos)];
 603                                         CTGitPath *fd1 = fd2;
 604                                         if (fd2->m_Action & CTGitPath::LOGACTIONS_REPLACED)
 605                                                 fd1 = new CTGitPath(fd2->GetGitOldPathString());
 606                                         CAppUtils::StartShowUnifiedDiff(m_hWnd, *fd2, m_rev2.m_CommitHash.ToString(), *fd1, m_rev1.m_CommitHash.ToString());
 607                                         if (fd1 != fd2)
 608                                                 delete fd1;
 609                                 }
 610                         }
 611                         break;
 612                 case ID_REVERT1:
 613                         RevertSelectedItemToVersion(m_rev1.m_CommitHash.ToString());
 614                         break;
 615                 case ID_REVERT2:
 616                         RevertSelectedItemToVersion(m_rev2.m_CommitHash.ToString());
 617                         break;
 618                 case ID_BLAME:
 619                         {
 620                                 POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
 621                                 while (pos)
 622                                 {
 623                                         int index = m_cFileList.GetNextSelectedItem(pos);
 624                                         CAppUtils::LaunchTortoiseBlame(m_arFilteredList[index]->GetWinPathString(), m_rev1.m_CommitHash.ToString());
 625                                 }
 626                         }
 627                         break;
 628                 case ID_LOG:
 629                         {
 630                                 POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
 631                                 while (pos)
 632                                 {
 633                                         int index = m_cFileList.GetNextSelectedItem(pos);
 634                                         CString cmd = _T("/command:log");
 635                                         cmd += _T(" /path:\"")+m_arFilteredList[index]->GetWinPathString()+_T("\" ");
 636                                         cmd += _T(" /endrev:")+m_rev1.m_CommitHash.ToString();
 637                                         CAppUtils::RunTortoiseGitProc(cmd);
 638                                 }
 639                         }
 640                         break;
 641                 case ID_SAVEAS:
 642                         {
 643                                 if (m_cFileList.GetSelectedCount() > 0)
 644                                 {
 645                                         CString temp;
 646                                         CTGitPath savePath;
 647                                         CString pathSave;
 648                                         if (!CAppUtils::FileOpenSave(pathSave, NULL, IDS_REPOBROWSE_SAVEAS, IDS_COMMONFILEFILTER, false, m_hWnd))
 649                                         {
 650                                                 break;
 651                                         }
 652                                         savePath = CTGitPath(pathSave);
 653
 654                                         // now open the selected file for writing
 655                                         try
 656                                         {
 657                                                 CStdioFile file(savePath.GetWinPathString(), CFile::typeBinary | CFile::modeReadWrite | CFile::modeCreate);
 658 //                                              temp.Format(IDS_FILEDIFF_CHANGEDLISTINTRO, (LPCTSTR)m_path1.GetGitPathString(), (LPCTSTR)m_rev1.ToString(), (LPCTSTR)m_path2.GetGitPathString(), (LPCTSTR)m_rev2.ToString());
 659                                                 file.WriteString(temp + _T("\n"));
 660                                                 POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
 661                                                 while (pos)
 662                                                 {
 663                                                         int index = m_cFileList.GetNextSelectedItem(pos);
 664                                                         CTGitPath* fd = m_arFilteredList[index];
 665                                                         file.WriteString(fd->GetGitPathString());
 666                                                         file.WriteString(_T("\n"));
 667                                                 }
 668                                                 file.Close();
 669                                         }
 670                                         catch (CFileException* pE)
 671                                         {
 672                                                 pE->ReportError();
 673                                         }
 674                                 }
 675                         }
 676                         break;
 677                 case ID_CLIPBOARD_PATH:
 678                         {
 679                                 CopySelectionToClipboard();
 680                         }
 681                         break;
 682
 683                 case ID_CLIPBOARD_ALL:
 684                         {
 685                                 CopySelectionToClipboard(TRUE);
 686                         }
 687                         break;
 688                 case ID_EXPORT:
 689                         {
 690                                 // export all changed files to a folder
 691                                 CBrowseFolder browseFolder;
 692                                 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
 693                                 if (browseFolder.Show(GetSafeHwnd(), m_strExportDir) == CBrowseFolder::OK)
 694                                 {
 695                                         POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
 696                                         while (pos)
 697                                         {
 698                                                 int index = m_cFileList.GetNextSelectedItem(pos);
 699                                                 CTGitPath* fd = m_arFilteredList[index];
 700                                                 // we cannot export directories or folders
 701                                                 if (fd->m_Action == CTGitPath::LOGACTIONS_DELETED || fd->IsDirectory())
 702                                                         continue;
 703                                                 CAppUtils::CreateMultipleDirectory(m_strExportDir + _T("\\") + fd->GetContainingDirectory().GetWinPathString());
 704                                                 CString filename = m_strExportDir + _T("\\") + fd->GetWinPathString();
 705                                                 if(m_rev1.m_CommitHash.ToString() == GIT_REV_ZERO)
 706                                                 {
 707                                                         if(!CopyFile(g_Git.m_CurrentDir + _T("\\") + fd->GetWinPath(), filename, false))
 708                                                         {
 709                                                                 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 710                                                                 return;
 711                                                         }
 712                                                 }
 713                                                 else
 714                                                 {
 715                                                         if(g_Git.GetOneFile(m_rev1.m_CommitHash, *fd, filename))
 716                                                         {
 717                                                                 CString out;
 718                                                                 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, fd->GetGitPathString(), m_rev1.m_CommitHash.ToString(), filename);
 719                                                                 if (CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), 2, IDI_WARNING, CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 2)
 720                                                                         return;
 721                                                         }
 722                                                 }
 723                                         }
 724                                 }
 725                         }
 726
 727                         break;
 728
 729                 }
 730         }
 731 }
 732
 733 BOOL CFileDiffDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
 734 {
 735         if (pWnd != &m_cFileList)
 736                 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
 737         if (m_bThreadRunning == 0)
 738         {
 739                 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
 740                 SetCursor(hCur);
 741                 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
 742         }
 743         HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
 744         SetCursor(hCur);
 745         return TRUE;
 746 }
 747
 748 void CFileDiffDlg::OnEnSetfocusFirsturl()
 749 {
 750         GetDlgItem(IDC_FIRSTURL)->HideCaret();
 751 }
 752
 753 void CFileDiffDlg::OnEnSetfocusSecondurl()
 754 {
 755         GetDlgItem(IDC_SECONDURL)->HideCaret();
 756 }
 757
 758
 759 void CFileDiffDlg::OnBnClickedSwitchleftright()
 760 {
 761
 762         if (m_bThreadRunning)
 763                 return;
 764
 765 #if 0
 766         CString sFilterString;
 767         m_cFilter.GetWindowText(sFilterString);
 768
 769         m_cFileList.SetRedraw(false);
 770         m_cFileList.DeleteAllItems();
 771         for (int i=0; i<(int)m_arFileList.GetCount(); ++i)
 772         {
 773                 CTGitPath fd = m_arFileList[i];
 774                 if (fd.m_Action == CTGitPath::LOGACTIONS_ADDED)
 775                         fd.m_Action = CTGitPath::LOGACTIONS_DELETED;
 776                 else if (fd.m_Action == CTGitPath::LOGACTIONS_DELETED)
 777                         fd.m_Action = CTGitPath::LOGACTIONS_ADDED;
 778                 std::swap(fd.m_StatAdd, fd.m_StatDel);
 779                 (CTGitPath&)m_arFileList[i] = fd;
 780         }
 781         Filter(sFilterString);
 782 #endif
 783
 784         m_cFileList.SetRedraw(true);
 785         CTGitPath path = m_path1;
 786         m_path1 = m_path2;
 787         m_path2 = path;
 788         GitRev rev = m_rev1;
 789         m_rev1 = m_rev2;
 790         m_rev2 = rev;
 791
 792         CString str1,str2;
 793         this->m_ctrRev1Edit.GetWindowText(str1);
 794         this->m_ctrRev2Edit.GetWindowText(str2);
 795
 796         this->m_ctrRev1Edit.SetWindowText(str2);
 797         this->m_ctrRev2Edit.SetWindowText(str1);
 798
 799         SetURLLabels();
 800         //KillTimer(IDT_INPUT);
 801 }
 802
 803 void CFileDiffDlg::SetURLLabels(int mask)
 804 {
 805
 806 //      m_cRev1Btn.SetWindowText(m_rev1.m_CommitHash.ToString().Left(6));
 807 //      m_cRev2Btn.SetWindowText(m_rev2.m_CommitHash.ToString().Left(6));
 808
 809         if(mask &0x1)
 810         {
 811                 SetDlgItemText(IDC_FIRSTURL, m_rev1.m_CommitHash.ToString().Left(8)+_T(": ")+m_rev1.GetSubject());
 812                 m_tooltips.AddTool(IDC_FIRSTURL,
 813                         CLoglistUtils::FormatDateAndTime(m_rev1.GetAuthorDate(), DATE_SHORTDATE, false) + _T("  ") + m_rev1.GetAuthorName());
 814
 815         }
 816
 817         if(mask &0x2)
 818         {
 819                 SetDlgItemText(IDC_SECONDURL,m_rev2.m_CommitHash.ToString().Left(8)+_T(": ")+m_rev2.GetSubject());
 820
 821                 m_tooltips.AddTool(IDC_SECONDURL,
 822                         CLoglistUtils::FormatDateAndTime(m_rev2.GetAuthorDate(), DATE_SHORTDATE, false) + _T("  ") + m_rev2.GetAuthorName());
 823         }
 824
 825         this->GetDlgItem(IDC_REV2GROUP)->SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_FILEDIFF_VERSION2BASE)));
 826         this->GetDlgItem(IDC_REV1GROUP)->SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_FILEDIFF_VERSION1)));
 827
 828         if( (mask&0x3) == 0x3 && !m_rev1.m_CommitHash.IsEmpty() && !m_rev2.m_CommitHash.IsEmpty())
 829                 if(m_rev2.GetCommitterDate() > m_rev1.GetCommitterDate())
 830                 {
 831                         this->GetDlgItem(IDC_REV2GROUP)->SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_FILEDIFF_VERSION2BASENEWER)));
 832                 }
 833                 else
 834                 {
 835                         this->GetDlgItem(IDC_REV1GROUP)->SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_FILEDIFF_VERSION1NEWER)));
 836                 }
 837 }
 838
 839 void CFileDiffDlg::ClearURLabels(int mask)
 840 {
 841         if(mask&0x1)
 842         {
 843                 SetDlgItemText(IDC_FIRSTURL, _T(""));
 844                 m_tooltips.AddTool(IDC_FIRSTURL,  _T(""));
 845         }
 846
 847         if(mask&0x2)
 848         {
 849                 SetDlgItemText(IDC_SECONDURL, _T(""));
 850                 m_tooltips.AddTool(IDC_SECONDURL,  _T(""));
 851         }
 852 }
 853 BOOL CFileDiffDlg::PreTranslateMessage(MSG* pMsg)
 854 {
 855         m_tooltips.RelayEvent(pMsg);
 856         if (pMsg->message == WM_KEYDOWN)
 857         {
 858                 switch (pMsg->wParam)
 859                 {
 860                 case 'A':
 861                         {
 862                                 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
 863                                 {
 864                                         // select all entries
 865                                         for (int i=0; i<m_cFileList.GetItemCount(); ++i)
 866                                         {
 867                                                 m_cFileList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
 868                                         }
 869                                         return TRUE;
 870                                 }
 871                         }
 872                         break;
 873                 case 'C':
 874                 case VK_INSERT:
 875                         {
 876                                 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
 877                                 {
 878                                         CopySelectionToClipboard();
 879                                         return TRUE;
 880                                 }
 881                         }
 882                         break;
 883                 case '\r':
 884                         {
 885                                 if (GetFocus() == GetDlgItem(IDC_FILELIST))
 886                                 {
 887                                         // Return pressed in file list. Show diff, as for double click
 888                                         int selIndex = m_cFileList.GetSelectionMark();
 889                                         if ((selIndex >= 0) && (selIndex < (int)m_arFileList.GetCount()))
 890                                                 DoDiff(selIndex, m_bBlame);
 891                                         return TRUE;
 892                                 }
 893                         }
 894                         break;
 895                 case VK_F5:
 896                         {
 897                                 OnTimer(IDT_INPUT);
 898                         }
 899                         break;
 900                 }
 901         }
 902         return __super::PreTranslateMessage(pMsg);
 903 }
 904
 905 void CFileDiffDlg::OnCancel()
 906 {
 907         if (m_bThreadRunning)
 908         {
 909                 m_bCancelled = true;
 910                 return;
 911         }
 912         __super::OnCancel();
 913 }
 914
 915 void CFileDiffDlg::OnHdnItemclickFilelist(NMHDR *pNMHDR, LRESULT *pResult)
 916 {
 917         LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
 918         if (m_bThreadRunning)
 919                 return;
 920
 921         if (m_nSortedColumn == phdr->iItem)
 922                 m_bAscending = !m_bAscending;
 923         else
 924                 m_bAscending = TRUE;
 925         m_nSortedColumn = phdr->iItem;
 926         Sort();
 927
 928         CString temp;
 929         m_cFileList.SetRedraw(FALSE);
 930         m_cFileList.DeleteAllItems();
 931         m_cFilter.GetWindowText(temp);
 932         Filter(temp);
 933
 934         CHeaderCtrl * pHeader = m_cFileList.GetHeaderCtrl();
 935         HDITEM HeaderItem = {0};
 936         HeaderItem.mask = HDI_FORMAT;
 937         for (int i=0; i<pHeader->GetItemCount(); ++i)
 938         {
 939                 pHeader->GetItem(i, &HeaderItem);
 940                 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
 941                 pHeader->SetItem(i, &HeaderItem);
 942         }
 943         pHeader->GetItem(m_nSortedColumn, &HeaderItem);
 944         HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
 945         pHeader->SetItem(m_nSortedColumn, &HeaderItem);
 946
 947         m_cFileList.SetRedraw(TRUE);
 948
 949         *pResult = 0;
 950 }
 951
 952 void CFileDiffDlg::Sort()
 953 {
 954         if(m_arFileList.GetCount() < 2)
 955         {
 956                 return;
 957         }
 958
 959         std::sort(m_arFileList.m_paths.begin(), m_arFileList.m_paths.end(), &CFileDiffDlg::SortCompare);
 960 }
 961
 962 bool CFileDiffDlg::SortCompare(const CTGitPath& Data1, const CTGitPath& Data2)
 963 {
 964         int result = 0;
 965         int d1, d2;
 966         switch (m_nSortedColumn)
 967         {
 968         case 0:         //path column
 969                 result = Data1.GetWinPathString().Compare(Data2.GetWinPathString());
 970                 break;
 971         case 1:         //extension column
 972                 result = Data1.GetFileExtension().Compare(Data2.GetFileExtension());
 973                 break;
 974         case 2:         //action column
 975                 result = Data1.m_Action - Data2.m_Action;
 976                 break;
 977         case 3:
 978                 d1 = CSorter::A2L(Data1.m_StatAdd);
 979                 d2 = CSorter::A2L(Data2.m_StatAdd);
 980                 result = d1 - d2;
 981                 break;
 982         case 4:
 983                 d1 = CSorter::A2L(Data1.m_StatDel);;
 984                 d2 = CSorter::A2L(Data2.m_StatDel);
 985                 result = d1 - d2;
 986                 break;
 987         default:
 988                 break;
 989         }
 990         // sort by path name as second priority
 991         if (m_nSortedColumn != 0 && result == 0)
 992                 result = Data1.GetWinPathString().Compare(Data2.GetWinPathString());
 993
 994         if (!m_bAscending)
 995                 result = -result;
 996         return result < 0;
 997 }
 998
 999
1000 void CFileDiffDlg::OnBnClickedRev1btn()
1001 {
1002         ClickRevButton(&this->m_cRev1Btn,&this->m_rev1, &this->m_ctrRev1Edit);
1003 }
1004
1005 void CFileDiffDlg::ClickRevButton(CMenuButton *button, GitRev *rev, CACEdit *edit)
1006 {
1007         INT_PTR entry=button->GetCurrentEntry();
1008         if(entry == 0) /* Browse Refence*/
1009         {
1010                 {
1011                         CString str = CBrowseRefsDlg::PickRef();
1012                         if(str.IsEmpty())
1013                                 return;
1014
1015                         if(FillRevFromString(rev,str))
1016                                 return;
1017
1018                         edit->SetWindowText(str);
1019                 }
1020         }
1021
1022         if(entry == 1) /*Log*/
1023         {
1024                 CLogDlg dlg;
1025                 dlg.SetSelect(true);
1026                 if(dlg.DoModal() == IDOK)
1027                 {
1028                         if( dlg.GetSelectedHash().IsEmpty() )
1029                                 return;
1030
1031                         if(FillRevFromString(rev,dlg.GetSelectedHash()))
1032                                 return;
1033
1034                         edit->SetWindowText(dlg.GetSelectedHash());
1035
1036                 }
1037                 else
1038                         return;
1039         }
1040
1041         if(entry == 2) /*RefLog*/
1042         {
1043                 CRefLogDlg dlg;
1044                 if(dlg.DoModal() == IDOK)
1045                 {
1046                         if(FillRevFromString(rev,dlg.m_SelectedHash))
1047                                 return;
1048
1049                         edit->SetWindowText(dlg.m_SelectedHash);
1050
1051                 }
1052                 else
1053                         return;
1054         }
1055
1056         SetURLLabels();
1057
1058         InterlockedExchange(&m_bThreadRunning, TRUE);
1059         if (AfxBeginThread(DiffThreadEntry, this)==NULL)
1060         {
1061                 InterlockedExchange(&m_bThreadRunning, FALSE);
1062                 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
1063         }
1064         KillTimer(IDT_INPUT);
1065 }
1066
1067 void CFileDiffDlg::OnBnClickedRev2btn()
1068 {
1069         ClickRevButton(&this->m_cRev2Btn,&this->m_rev2, &this->m_ctrRev2Edit);
1070 }
1071
1072 LRESULT CFileDiffDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)
1073 {
1074         if (m_bThreadRunning)
1075         {
1076                 SetTimer(IDT_FILTER, 1000, NULL);
1077                 return 0L;
1078         }
1079
1080         KillTimer(IDT_FILTER);
1081
1082         m_cFileList.SetRedraw(FALSE);
1083         m_arFilteredList.clear();
1084         m_cFileList.DeleteAllItems();
1085
1086         Filter(_T(""));
1087
1088         m_cFileList.SetRedraw(TRUE);
1089         return 0L;
1090 }
1091
1092 void CFileDiffDlg::OnEnChangeFilter()
1093 {
1094         SetTimer(IDT_FILTER, 1000, NULL);
1095 }
1096
1097 void CFileDiffDlg::OnTimer(UINT_PTR nIDEvent)
1098 {
1099         if (m_bThreadRunning)
1100                 return;
1101
1102         if( nIDEvent == IDT_FILTER)
1103         {
1104                 CString sFilterText;
1105                 KillTimer(IDT_FILTER);
1106                 m_cFilter.GetWindowText(sFilterText);
1107
1108                 m_cFileList.SetRedraw(FALSE);
1109                 m_cFileList.DeleteAllItems();
1110
1111                 Filter(sFilterText);
1112
1113                 m_cFileList.SetRedraw(TRUE);
1114
1115                 __super::OnTimer(nIDEvent);
1116         }
1117
1118         if( nIDEvent == IDT_INPUT)
1119         {
1120                 KillTimer(IDT_INPUT);
1121                 TRACE(_T("Input Timer\r\n"));
1122
1123                 GitRev gitrev;
1124                 CString str;
1125                 int mask = 0;
1126                 this->m_ctrRev1Edit.GetWindowText(str);
1127                 try
1128                 {
1129                         if (!gitrev.GetCommit(str))
1130                         {
1131                                 m_rev1 = gitrev;
1132                                 mask |= 0x1;
1133                         }
1134                 }
1135                 catch (const char *msg)
1136                 {
1137                         CMessageBox::Show(m_hWnd, _T("Could not get commit ") + str + _T("\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
1138                 }
1139
1140                 this->m_ctrRev2Edit.GetWindowText(str);
1141
1142                 try
1143                 {
1144                         if (!gitrev.GetCommit(str))
1145                         {
1146                                 m_rev2 = gitrev;
1147                                 mask |= 0x2;
1148                         }
1149                 }
1150                 catch (const char *msg)
1151                 {
1152                         CMessageBox::Show(m_hWnd, _T("Could not get commit ") + str + _T("\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
1153                 }
1154
1155                 this->SetURLLabels(mask);
1156
1157                 if(mask == 0x3)
1158                 {
1159
1160                         InterlockedExchange(&m_bThreadRunning, TRUE);
1161                         if (AfxBeginThread(DiffThreadEntry, this)==NULL)
1162                         {
1163                                 InterlockedExchange(&m_bThreadRunning, FALSE);
1164                                 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
1165                         }
1166                 }
1167         }
1168 }
1169
1170 void CFileDiffDlg::Filter(CString sFilterText)
1171 {
1172         sFilterText.MakeLower();
1173
1174         m_arFilteredList.clear();
1175
1176         for (int i=0;i<m_arFileList.GetCount();i++)
1177         {
1178                 CString sPath = m_arFileList[i].GetGitPathString();
1179                 sPath.MakeLower();
1180                 if (sPath.Find(sFilterText) >= 0)
1181                 {
1182                         m_arFilteredList.push_back((CTGitPath*)&(m_arFileList[i]));
1183                 }
1184         }
1185         for (std::vector<CTGitPath*>::const_iterator it = m_arFilteredList.begin(); it != m_arFilteredList.end(); ++it)
1186         {
1187                 AddEntry(*it);
1188         }
1189 }
1190
1191 void CFileDiffDlg::CopySelectionToClipboard(BOOL isFull)
1192 {
1193         // copy all selected paths to the clipboard
1194         POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
1195         int index;
1196         CString sTextForClipboard;
1197         while ((index = m_cFileList.GetNextSelectedItem(pos)) >= 0)
1198         {
1199                 sTextForClipboard += m_cFileList.GetItemText(index, 0);
1200                 sTextForClipboard += _T("\t");
1201
1202                 if(!isFull)
1203                 {
1204                         sTextForClipboard += _T("\r\n");
1205
1206                 }
1207                 else
1208                 {
1209                         sTextForClipboard += m_cFileList.GetItemText(index, 1);
1210                         sTextForClipboard += _T("\t");
1211                         sTextForClipboard += m_cFileList.GetItemText(index, 2);
1212                         sTextForClipboard += _T("\t");
1213                         sTextForClipboard += m_cFileList.GetItemText(index, 3);
1214                         sTextForClipboard += _T("\t");
1215                         sTextForClipboard += m_cFileList.GetItemText(index, 4);
1216                         sTextForClipboard += _T("\r\n");
1217                 }
1218         }
1219         CStringUtils::WriteAsciiStringToClipboard(sTextForClipboard);
1220 }
1221
1222
1223 LRESULT CFileDiffDlg::OnRefLoad(WPARAM /*wParam*/, LPARAM /*lParam*/)
1224 {
1225         for (size_t i = 0; i < m_Reflist.size(); ++i)
1226         {
1227                 CString str=m_Reflist[i];
1228
1229                 if(str.Find(_T("remotes/")) == 0)
1230                         str=str.Mid(8);
1231
1232                 m_ctrRev1Edit.AddSearchString(str);
1233                 m_ctrRev2Edit.AddSearchString(str);
1234         }
1235         return 0;
1236 }
1237
1238 BOOL CFileDiffDlg::DestroyWindow()
1239 {
1240         return CResizableStandAloneDialog::DestroyWindow();
1241 }
1242
1243 LRESULT CFileDiffDlg::OnEnUpdate(WPARAM /*wParam*/, LPARAM lParam)
1244 {
1245         if(lParam == IDC_REV1EDIT)
1246         {
1247                 OnTextUpdate(&this->m_ctrRev1Edit);
1248                 ClearURLabels(1);
1249         }
1250         if(lParam == IDC_REV2EDIT)
1251         {
1252                 OnTextUpdate(&this->m_ctrRev2Edit);
1253                 ClearURLabels(1<<1);
1254         }
1255         return 0;
1256 }
1257
1258 void CFileDiffDlg::OnTextUpdate(CACEdit * /*pEdit*/)
1259 {
1260         SetTimer(IDT_INPUT, 1000, NULL);
1261         this->m_cFileList.ShowText(_T("Wait For input validate version"));
1262 }
1263
1264 int CFileDiffDlg::RevertSelectedItemToVersion(CString rev)
1265 {
1266         if (rev.IsEmpty() || rev == GIT_REV_ZERO)
1267                 return 0;
1268
1269         POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
1270         int index;
1271         int count = 0;
1272         while ((index = m_cFileList.GetNextSelectedItem(pos)) >= 0)
1273         {
1274                 CString cmd, out;
1275                 CTGitPath *fentry = (CTGitPath *)m_arFilteredList[index];
1276                 cmd.Format(_T("git.exe checkout %s -- \"%s\""), rev, fentry->GetGitPathString());
1277                 if (g_Git.Run(cmd, &out, CP_UTF8))
1278                 {
1279                         if (CMessageBox::Show(NULL, out, _T("TortoiseGit"), 2, IDI_WARNING, CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 2)
1280                                 break;
1281                 }
1282                 else
1283                         count++;
1284         }
1285
1286         CString out;
1287         out.Format(IDS_STATUSLIST_FILESREVERTED, count, rev);
1288         CMessageBox::Show(NULL, out, _T("TortoiseGit"), MB_OK);
1289         return 0;
1290 }
1291
1292 static void AppendMenuChecked(CMenu &menu, UINT nTextID, UINT_PTR nItemID, BOOL checked = FALSE, BOOL enabled = TRUE)
1293 {
1294         CString text;
1295         text.LoadString(nTextID);
1296         menu.AppendMenu(MF_STRING | (enabled ? MF_ENABLED : MF_DISABLED) | (checked ? MF_CHECKED : MF_UNCHECKED), nItemID, text);
1297 }
1298
1299 #define DIFFOPTION_IGNORESPACEATEOL             1
1300 #define DIFFOPTION_IGNORESPACECHANGE    2
1301 #define DIFFOPTION_IGNOREALLSPACE               3
1302 #define DIFFOPTION_IGNORBLANKLINES              4
1303
1304 void CFileDiffDlg::OnBnClickedDiffoption()
1305 {
1306         CMenu popup;
1307         if (popup.CreatePopupMenu())
1308         {
1309                 AppendMenuChecked(popup, IDS_DIFFOPTION_IGNORESPACEATEOL, DIFFOPTION_IGNORESPACEATEOL, m_bIgnoreSpaceAtEol);
1310                 AppendMenuChecked(popup, IDS_DIFFOPTION_IGNORESPACECHANGE, DIFFOPTION_IGNORESPACECHANGE, m_bIgnoreSpaceChange);
1311                 AppendMenuChecked(popup, IDS_DIFFOPTION_IGNOREALLSPACE, DIFFOPTION_IGNOREALLSPACE, m_bIgnoreAllSpace);
1312                 AppendMenuChecked(popup, IDS_DIFFOPTION_IGNORBLANKLINES, DIFFOPTION_IGNORBLANKLINES, m_bIgnoreBlankLines);
1313
1314                 m_tooltips.Pop();
1315                 RECT rect;
1316                 GetDlgItem(IDC_DIFFOPTION)->GetWindowRect(&rect);
1317                 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, rect.left, rect.bottom, this, 0);
1318                 switch (selection)
1319                 {
1320                 case DIFFOPTION_IGNORESPACEATEOL:
1321                         m_bIgnoreSpaceAtEol = !m_bIgnoreSpaceAtEol;
1322                         OnTimer(IDT_INPUT);
1323                         break;
1324                 case DIFFOPTION_IGNORESPACECHANGE:
1325                         m_bIgnoreSpaceChange = !m_bIgnoreSpaceChange;
1326                         OnTimer(IDT_INPUT);
1327                         break;
1328                 case DIFFOPTION_IGNOREALLSPACE:
1329                         m_bIgnoreAllSpace = !m_bIgnoreAllSpace;
1330                         OnTimer(IDT_INPUT);
1331                         break;
1332                 case DIFFOPTION_IGNORBLANKLINES:
1333                         m_bIgnoreBlankLines = !m_bIgnoreBlankLines;
1334                         OnTimer(IDT_INPUT);
1335                         break;
1336                 default:
1337                         break;
1338                 }
1339                 UpdateData(FALSE);
1340         }
1341 }
1342
1343 void CFileDiffDlg::OnBnClickedLog()
1344 {
1345         CLogDlg dlg;
1346         dlg.SetRange(m_rev2.m_CommitHash.ToString() + _T("..") + m_rev1.m_CommitHash.ToString());
1347         dlg.DoModal();
1348 }