src/TortoiseProc/LogDlg.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control\r
   2 // Copyright (C) 2003-2008 - TortoiseGit\r
   3 // This program is free software; you can redistribute it and/or\r
   4 // modify it under the terms of the GNU General Public License\r
   5 // as published by the Free Software Foundation; either version 2\r
   6 // of the License, or (at your option) any later version.\r
   7 // This program is distributed in the hope that it will be useful,\r
   8 // but WITHOUT ANY WARRANTY; without even the implied warranty of\r
   9 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
  10 // GNU General Public License for more details.\r
  11 \r
  12 // You should have received a copy of the GNU General Public License\r
  13 // along with this program; if not, write to the Free Software Foundation,\r
  14 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
  15 //\r
  16 #include "stdafx.h"\r
  17 #include "TortoiseProc.h"\r
  18 #include "cursor.h"\r
  19 #include "InputDlg.h"\r
  20 #include "PropDlg.h"\r
  21 #include "SVNProgressDlg.h"\r
  22 #include "ProgressDlg.h"\r
  23 //#include "RepositoryBrowser.h"\r
  24 //#include "CopyDlg.h"\r
  25 #include "StatGraphDlg.h"\r
  26 #include "Logdlg.h"\r
  27 #include "MessageBox.h"\r
  28 #include "Registry.h"\r
  29 #include "AppUtils.h"\r
  30 #include "PathUtils.h"\r
  31 #include "StringUtils.h"\r
  32 #include "UnicodeUtils.h"\r
  33 #include "TempFile.h"\r
  34 //#include "GitInfo.h"\r
  35 //#include "GitDiff.h"\r
  36 #include "IconMenu.h"\r
  37 //#include "RevisionRangeDlg.h"\r
  38 //#include "BrowseFolder.h"\r
  39 //#include "BlameDlg.h"\r
  40 //#include "Blame.h"\r
  41 //#include "GitHelpers.h"\r
  42 #include "GitStatus.h"\r
  43 //#include "LogDlgHelper.h"\r
  44 //#include "CachedLogInfo.h"\r
  45 //#include "RepositoryInfo.h"\r
  46 //#include "EditPropertiesDlg.h"\r
  47 #include "FileDiffDlg.h"\r
  48 #include "BrowseRefsDlg.h"\r
  49 \r
  50 const UINT CLogDlg::m_FindDialogMessage = RegisterWindowMessage(FINDMSGSTRING);\r
  51 \r
  52 \r
  53 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)\r
  54 CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)\r
  55         : CResizableStandAloneDialog(CLogDlg::IDD, pParent)\r
  56         , m_logcounter(0)\r
  57         , m_nSearchIndex(0)\r
  58         , m_wParam(0)\r
  59         , m_currentChangedArray(NULL)\r
  60         , m_nSortColumn(0)\r
  61         , m_bShowedAll(false)\r
  62         , m_bSelect(false)\r
  63         \r
  64         , m_bSelectionMustBeContinuous(false)\r
  65         , m_bShowBugtraqColumn(false)\r
  66         , m_lowestRev(_T(""))\r
  67         \r
  68         , m_sLogInfo(_T(""))\r
  69         , m_pFindDialog(NULL)\r
  70         , m_bCancelled(FALSE)\r
  71         , m_pNotifyWindow(NULL)\r
  72         \r
  73         , m_bAscending(FALSE)\r
  74 \r
  75         , m_limit(0)\r
  76         , m_childCounter(0)\r
  77         , m_maxChild(0)\r
  78         , m_bIncludeMerges(FALSE)\r
  79         , m_hAccel(NULL)\r
  80 {\r
  81         m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);\r
  82         m_bAllBranch=FALSE;\r
  83         m_bFirstParent=FALSE;\r
  84         m_bWholeProject=FALSE;\r
  85 }\r
  86 \r
  87 CLogDlg::~CLogDlg()\r
  88 {\r
  89         \r
  90     m_CurrentFilteredChangedArray.RemoveAll();\r
  91         \r
  92 }\r
  93 \r
  94 void CLogDlg::DoDataExchange(CDataExchange* pDX)\r
  95 {\r
  96         CResizableStandAloneDialog::DoDataExchange(pDX);\r
  97         DDX_Control(pDX, IDC_LOGLIST, m_LogList);\r
  98         DDX_Control(pDX, IDC_LOGMSG, m_ChangedFileListCtrl);\r
  99         DDX_Control(pDX, IDC_PROGRESS, m_LogProgress);\r
 100         DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1);\r
 101         DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2);\r
 102         DDX_Text(pDX, IDC_SEARCHEDIT, m_LogList.m_sFilterText);\r
 103         DDX_Control(pDX, IDC_DATEFROM, m_DateFrom);\r
 104         DDX_Control(pDX, IDC_DATETO, m_DateTo);\r
 105         DDX_Control(pDX, IDC_HIDEPATHS, m_cHidePaths);\r
 106         DDX_Text(pDX, IDC_LOGINFO, m_sLogInfo);\r
 107         DDX_Check(pDX, IDC_LOG_FIRSTPARENT, m_bFirstParent);\r
 108         DDX_Check(pDX, IDC_LOG_ALLBRANCH,m_bAllBranch);\r
 109         DDX_Check(pDX, IDC_SHOWWHOLEPROJECT,m_bWholeProject);\r
 110         DDX_Control(pDX, IDC_SEARCHEDIT, m_cFilter);\r
 111         DDX_Control(pDX, IDC_STATIC_REF, m_staticRef);\r
 112 }\r
 113 \r
 114 BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)\r
 115         ON_REGISTERED_MESSAGE(m_FindDialogMessage, OnFindDialogMessage) \r
 116         //ON_BN_CLICKED(IDC_GETALL, OnBnClickedGetall)\r
 117         //ON_NOTIFY(NM_DBLCLK, IDC_LOGMSG, OnNMDblclkChangedFileList)\r
 118         ON_WM_CONTEXTMENU()\r
 119         ON_WM_SETCURSOR()\r
 120         ON_BN_CLICKED(IDHELP, OnBnClickedHelp)\r
 121         ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)\r
 122         ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)\r
 123         ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)\r
 124 \r
 125         \r
 126         ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)\r
 127         ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)\r
 128 \r
 129         ON_MESSAGE(MSG_LOAD_PERCENTAGE,OnLogListLoading)\r
 130         \r
 131         ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)\r
 132         ON_WM_TIMER()\r
 133         ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)\r
 134         ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)\r
 135         ON_BN_CLICKED(IDC_SHOWWHOLEPROJECT, OnBnClickShowWholeProject)\r
 136         //ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGMSG, OnNMCustomdrawChangedFileList)\r
 137         //ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGMSG, OnLvnGetdispinfoChangedFileList)\r
 138         ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST   , OnLvnColumnclick)\r
 139         //ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList)\r
 140         ON_BN_CLICKED(IDC_HIDEPATHS, OnBnClickedHidepaths)\r
 141         ON_BN_CLICKED(IDC_LOG_ALLBRANCH,OnBnClickedAllBranch)\r
 142         \r
 143         ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)\r
 144         ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)\r
 145         ON_WM_SIZE()\r
 146         ON_BN_CLICKED(IDC_LOG_FIRSTPARENT, &CLogDlg::OnBnClickedFirstParent)\r
 147         ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)\r
 148 //      ON_BN_CLICKED(IDC_BUTTON_BROWSE_REF, &CLogDlg::OnBnClickedBrowseRef)\r
 149         ON_STN_CLICKED(IDC_STATIC_REF, &CLogDlg::OnBnClickedBrowseRef)\r
 150         ON_COMMAND(ID_LOGDLG_REFRESH,&CLogDlg::OnRefresh)\r
 151         ON_COMMAND(ID_LOGDLG_FIND,&CLogDlg::OnFind)\r
 152         ON_COMMAND(ID_LOGDLG_FOCUSFILTER,&CLogDlg::OnFocusFilter)\r
 153         ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)\r
 154 END_MESSAGE_MAP()\r
 155 \r
 156 void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit /* = FALSE */)\r
 157 {\r
 158         m_path = path;\r
 159         m_pegrev = pegrev;\r
 160         m_startrev = startrev;\r
 161         m_LogRevision = startrev;\r
 162         m_endrev = endrev;\r
 163         m_hasWC = !path.IsUrl();\r
 164         m_limit = limit;\r
 165         if (::IsWindow(m_hWnd))\r
 166                 UpdateData(FALSE);\r
 167 }\r
 168 \r
 169 BOOL CLogDlg::OnInitDialog()\r
 170 {\r
 171         CString temp;\r
 172         CResizableStandAloneDialog::OnInitDialog();\r
 173 \r
 174         m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));\r
 175 \r
 176 \r
 177         // use the state of the "stop on copy/rename" option from the last time\r
 178         UpdateData(FALSE);\r
 179         \r
 180         // set the font to use in the log message view, configured in the settings dialog\r
 181         CAppUtils::CreateFontForLogs(m_logFont);\r
 182         GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);\r
 183         // automatically detect URLs in the log message and turn them into links\r
 184         GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_AUTOURLDETECT, TRUE, NULL);\r
 185         // make the log message rich edit control send a message when the mouse pointer is over a link\r
 186         GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK);\r
 187         //m_LogList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_SUBITEMIMAGES);\r
 188 \r
 189         // the "hide unrelated paths" checkbox should be indeterminate\r
 190         m_cHidePaths.SetCheck(BST_INDETERMINATE);\r
 191 \r
 192         \r
 193         // if there is a working copy, load the project properties\r
 194         // to get information about the bugtraq: integration\r
 195         if (m_hasWC)\r
 196                 m_ProjectProperties.ReadProps(m_path);\r
 197 \r
 198         // the bugtraq issue id column is only shown if the bugtraq:url or bugtraq:regex is set\r
 199         if ((!m_ProjectProperties.sUrl.IsEmpty())||(!m_ProjectProperties.sCheckRe.IsEmpty()))\r
 200                 m_bShowBugtraqColumn = true;\r
 201 \r
 202         //theme.SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);\r
 203         //theme.SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);\r
 204 \r
 205         // set up the columns\r
 206         m_LogList.DeleteAllItems();\r
 207         m_LogList.InsertGitColumn();\r
 208 \r
 209         m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ (SVNSLC_POPCOMMIT|SVNSLC_POPREVERT)),false);\r
 210 \r
 211         GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
 212 \r
 213         m_logcounter = 0;\r
 214         m_sMessageBuf.Preallocate(100000);\r
 215 \r
 216         // set the dialog title to "Log - path/to/whatever/we/show/the/log/for"\r
 217         SetDlgTitle(false);\r
 218 \r
 219         m_tooltips.Create(this);\r
 220         CheckRegexpTooltip();\r
 221 \r
 222         SetSplitterRange();\r
 223         \r
 224         // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap\r
 225         m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);\r
 226         m_cFilter.SetInfoIcon(IDI_LOGFILTER);\r
 227         m_cFilter.SetValidator(this);\r
 228         \r
 229         AdjustControlSize(IDC_HIDEPATHS);\r
 230         AdjustControlSize(IDC_LOG_FIRSTPARENT);\r
 231         AdjustControlSize(IDC_LOG_ALLBRANCH);\r
 232 \r
 233         GetClientRect(m_DlgOrigRect);\r
 234         m_LogList.GetClientRect(m_LogListOrigRect);\r
 235         GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);\r
 236         m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);\r
 237 \r
 238         m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);\r
 239         m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);\r
 240 \r
 241         m_staticRef.SetURL(CString());\r
 242 \r
 243         // resizable stuff\r
 244         AddAnchor(IDC_STATIC_REF, TOP_LEFT);\r
 245         //AddAnchor(IDC_BUTTON_BROWSE_REF, TOP_LEFT);\r
 246         AddAnchor(IDC_FROMLABEL, TOP_LEFT);\r
 247         AddAnchor(IDC_DATEFROM, TOP_LEFT);\r
 248         AddAnchor(IDC_TOLABEL, TOP_LEFT);\r
 249         AddAnchor(IDC_DATETO, TOP_LEFT);\r
 250 \r
 251         SetFilterCueText();\r
 252         AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);\r
 253         \r
 254         AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);\r
 255         AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);\r
 256         AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);\r
 257         AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);\r
 258         AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);\r
 259 \r
 260         AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);      \r
 261         AddAnchor(IDC_HIDEPATHS, BOTTOM_LEFT);  \r
 262         AddAnchor(IDC_LOG_ALLBRANCH,BOTTOM_LEFT);\r
 263         AddAnchor(IDC_LOG_FIRSTPARENT, BOTTOM_LEFT);\r
 264         //AddAnchor(IDC_GETALL, BOTTOM_LEFT);\r
 265         AddAnchor(IDC_SHOWWHOLEPROJECT, BOTTOM_LEFT);\r
 266         AddAnchor(IDC_REFRESH, BOTTOM_LEFT);\r
 267         AddAnchor(IDC_STATBUTTON, BOTTOM_RIGHT);\r
 268         AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);\r
 269         AddAnchor(IDOK, BOTTOM_RIGHT);\r
 270         AddAnchor(IDCANCEL, BOTTOM_RIGHT);\r
 271         AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 272 \r
 273 //      SetPromptParentWindow(m_hWnd);\r
 274 \r
 275         if (hWndExplorer)\r
 276                 CenterWindow(CWnd::FromHandle(hWndExplorer));\r
 277         EnableSaveRestore(_T("LogDlg"));\r
 278 \r
 279         DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));\r
 280         DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));\r
 281         RECT rcDlg, rcLogList, rcChgMsg;\r
 282         GetClientRect(&rcDlg);\r
 283         m_LogList.GetWindowRect(&rcLogList);\r
 284         ScreenToClient(&rcLogList);\r
 285         m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);\r
 286         ScreenToClient(&rcChgMsg);\r
 287         if (yPos1)\r
 288         {\r
 289                 RECT rectSplitter;\r
 290                 m_wndSplitter1.GetWindowRect(&rectSplitter);\r
 291                 ScreenToClient(&rectSplitter);\r
 292                 int delta = yPos1 - rectSplitter.top;\r
 293 \r
 294                 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))\r
 295                 {\r
 296                         m_wndSplitter1.SetWindowPos(NULL, 0, yPos1, 0, 0, SWP_NOSIZE);\r
 297                         DoSizeV1(delta);\r
 298                 }\r
 299         }\r
 300         if (yPos2)\r
 301         {\r
 302                 RECT rectSplitter;\r
 303                 m_wndSplitter2.GetWindowRect(&rectSplitter);\r
 304                 ScreenToClient(&rectSplitter);\r
 305                 int delta = yPos2 - rectSplitter.top;\r
 306 \r
 307                 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))\r
 308                 {\r
 309                         m_wndSplitter2.SetWindowPos(NULL, 0, yPos2, 0, 0, SWP_NOSIZE);\r
 310                         DoSizeV2(delta);\r
 311                 }\r
 312         }\r
 313 \r
 314         \r
 315         if (m_bSelect)\r
 316         {\r
 317                 // the dialog is used to select revisions\r
 318                 // enable the OK button if appropriate\r
 319                 EnableOKButton();\r
 320         }\r
 321         else\r
 322         {\r
 323                 // the dialog is used to just view log messages\r
 324                 // hide the OK button and set text on Cancel button to OK\r
 325                 GetDlgItemText(IDOK, temp);\r
 326                 SetDlgItemText(IDCANCEL, temp);\r
 327                 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);\r
 328         }\r
 329         \r
 330         m_mergedRevs.clear();\r
 331 \r
 332         // first start a thread to obtain the log messages without\r
 333         // blocking the dialog\r
 334         //m_tTo = 0;\r
 335         //m_tFrom = (DWORD)-1;\r
 336 \r
 337         m_LogList.m_Path=m_path;\r
 338         m_LogList.FetchLogAsync(this);\r
 339 \r
 340         GetDlgItem(IDC_LOGLIST)->SetFocus();\r
 341 \r
 342         ShowStartRef();\r
 343         return FALSE;\r
 344 }\r
 345 \r
 346 LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)\r
 347 {\r
 348         int cur=(int)wParam;\r
 349 \r
 350         if( cur == GITLOG_START )\r
 351         {\r
 352                 CString temp;\r
 353                 temp.LoadString(IDS_PROGRESSWAIT);\r
 354 \r
 355                 this->m_LogList.ShowText(temp, true);\r
 356 \r
 357                 // We use a progress bar while getting the logs \r
 358                 m_LogProgress.SetRange32(0, 100);\r
 359                 m_LogProgress.SetPos(0);\r
 360 \r
 361                 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);\r
 362 \r
 363                 //DialogEnableWindow(IDC_GETALL, FALSE);\r
 364                 //DialogEnableWindow(IDC_SHOWWHOLEPROJECT, FALSE);\r
 365                 //DialogEnableWindow(IDC_LOG_FIRSTPARENT, FALSE);\r
 366                 DialogEnableWindow(IDC_STATBUTTON, FALSE);\r
 367                 DialogEnableWindow(IDC_REFRESH, FALSE);\r
 368                 DialogEnableWindow(IDC_HIDEPATHS,FALSE);\r
 369 \r
 370         }else if( cur == GITLOG_END)\r
 371         {\r
 372                 \r
 373                 //if (!m_bShowedAll)\r
 374                 DialogEnableWindow(IDC_SHOWWHOLEPROJECT, TRUE);\r
 375 \r
 376                 //DialogEnableWindow(IDC_GETALL, TRUE);\r
 377                 DialogEnableWindow(IDC_LOG_FIRSTPARENT, TRUE);\r
 378                 DialogEnableWindow(IDC_STATBUTTON, TRUE);\r
 379                 DialogEnableWindow(IDC_REFRESH, TRUE);\r
 380                 DialogEnableWindow(IDC_HIDEPATHS,TRUE);\r
 381 \r
 382 //              PostMessage(WM_TIMER, LOGFILTER_TIMER);\r
 383                 GetDlgItem(IDC_PROGRESS)->ShowWindow(FALSE);\r
 384                 //CTime time=m_LogList.GetOldestTime();\r
 385                 CTime begin,end;\r
 386                 m_LogList.GetTimeRange(begin,end);\r
 387                 m_DateFrom.SetTime(&begin);\r
 388                 m_DateTo.SetTime(&end);\r
 389                 \r
 390                 \r
 391         \r
 392         }else\r
 393         {\r
 394                 if(this->m_LogList.HasText())\r
 395                 {\r
 396                         this->m_LogList.ClearText();\r
 397                         UpdateLogInfoLabel();\r
 398                 }\r
 399                 m_LogProgress.SetPos(cur);\r
 400         }\r
 401         return 0;\r
 402 }\r
 403 void CLogDlg::SetDlgTitle(bool bOffline)\r
 404 {\r
 405         if (m_sTitle.IsEmpty())\r
 406                 GetWindowText(m_sTitle);\r
 407 \r
 408         if (bOffline)\r
 409         {\r
 410                 CString sTemp;\r
 411                 if (m_path.IsUrl())\r
 412                         sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetUIPathString());\r
 413                 else if (m_path.IsDirectory())\r
 414                         sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetWinPathString());\r
 415                 else\r
 416                         sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetFilename());\r
 417                 SetWindowText(sTemp);\r
 418         }\r
 419         else\r
 420         {\r
 421                 if (m_path.IsUrl())\r
 422                         SetWindowText(m_sTitle + _T(" - ") + m_path.GetUIPathString());\r
 423                 else if (m_path.IsEmpty())\r
 424                         SetWindowText(m_sTitle + _T(" - ") + CString(_T("Whole Project")));\r
 425                 else if (m_path.IsDirectory())\r
 426                         SetWindowText(m_sTitle + _T(" - ") + m_path.GetWinPathString());\r
 427                 else\r
 428                         SetWindowText(m_sTitle + _T(" - ") + m_path.GetFilename());\r
 429         }\r
 430 }\r
 431 \r
 432 void CLogDlg::CheckRegexpTooltip()\r
 433 {\r
 434         CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);\r
 435         // Since tooltip describes regexp features, show it only if regexps are enabled.\r
 436         if (m_bFilterWithRegex)\r
 437         {\r
 438                 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);\r
 439         }\r
 440         else\r
 441                 m_tooltips.DelTool(pWnd);\r
 442 }\r
 443 \r
 444 void CLogDlg::EnableOKButton()\r
 445 {\r
 446         if (m_bSelect)\r
 447         {\r
 448                 // the dialog is used to select revisions\r
 449                 if (m_bSelectionMustBeSingle)\r
 450                 {\r
 451                         // enable OK button if only a single revision is selected\r
 452                         DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()==1));\r
 453                 }\r
 454                 else if (m_bSelectionMustBeContinuous)\r
 455                         DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));\r
 456                 else\r
 457                         DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);\r
 458         }\r
 459         else\r
 460                 DialogEnableWindow(IDOK, TRUE);\r
 461 }\r
 462 \r
 463 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)\r
 464 {\r
 465         // we fill here the log message rich edit control,\r
 466         // and also populate the changed files list control\r
 467         // according to the selected revision(s).\r
 468 \r
 469         CRichEditCtrl * pMsgView = (CRichEditCtrl*)GetDlgItem(IDC_MSGVIEW);\r
 470         // empty the log message view\r
 471         pMsgView->SetWindowText(_T(" "));\r
 472         // empty the changed files list\r
 473         m_ChangedFileListCtrl.SetRedraw(FALSE);\r
 474 //      InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
 475         m_currentChangedArray = NULL;\r
 476         //m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );\r
 477         m_ChangedFileListCtrl.DeleteAllItems();\r
 478         \r
 479         // if we're not here to really show a selected revision, just\r
 480         // get out of here after clearing the views, which is what is intended\r
 481         // if that flag is not set.\r
 482         if (!bShow)\r
 483         {\r
 484                 // force a redraw\r
 485                 m_ChangedFileListCtrl.Invalidate();\r
 486 //              InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
 487                 m_ChangedFileListCtrl.SetRedraw(TRUE);\r
 488                 return;\r
 489         }\r
 490 \r
 491         // depending on how many revisions are selected, we have to do different\r
 492         // tasks.\r
 493         int selCount = m_LogList.GetSelectedCount();\r
 494         if (selCount == 0)\r
 495         {\r
 496                 // if nothing is selected, we have nothing more to do\r
 497 //              InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
 498                 m_ChangedFileListCtrl.SetRedraw(TRUE);\r
 499                 return;\r
 500         }\r
 501         else if (selCount == 1)\r
 502         {\r
 503                 // if one revision is selected, we have to fill the log message view\r
 504                 // with the corresponding log message, and also fill the changed files\r
 505                 // list fully.\r
 506                 POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
 507                 int selIndex = m_LogList.GetNextSelectedItem(pos);\r
 508                 if (selIndex >= m_LogList.m_arShownList.GetCount())\r
 509                 {\r
 510 //                      InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
 511                         m_ChangedFileListCtrl.SetRedraw(TRUE);\r
 512                         return;\r
 513                 }\r
 514                 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));\r
 515 \r
 516                 if(!pLogEntry->m_IsFull)\r
 517                 {\r
 518                         pMsgView->SetWindowText(_T("load ..."));\r
 519                 }else\r
 520                 {\r
 521                         // set the log message text\r
 522                         pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash+_T("\r\n\r\n"));\r
 523                         // turn bug ID's into links if the bugtraq: properties have been set\r
 524                         // and we can find a match of those in the log message\r
 525                         \r
 526                         pMsgView->SetSel(-1,-1);\r
 527                         CHARFORMAT2 format;\r
 528                         SecureZeroMemory(&format, sizeof(CHARFORMAT2));\r
 529                         format.cbSize = sizeof(CHARFORMAT2);\r
 530                         format.dwMask = CFM_BOLD;\r
 531                         format.dwEffects = CFE_BOLD;\r
 532                         pMsgView->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);\r
 533                         \r
 534                         CString msg=_T("* ");\r
 535                         msg+=pLogEntry->m_Subject;\r
 536                         pMsgView->ReplaceSel(msg);\r
 537 \r
 538                         pMsgView->SetSel(-1,-1);\r
 539                         format.dwEffects = 0;\r
 540                         pMsgView->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);\r
 541                         \r
 542                         msg=_T("\n\n");\r
 543                         msg+=pLogEntry->m_Body;\r
 544                         pMsgView->ReplaceSel(msg);\r
 545 \r
 546                         CString text;\r
 547                         pMsgView->GetWindowText(text);\r
 548                         // the rich edit control doesn't count the CR char!\r
 549                         // to be exact: CRLF is treated as one char.\r
 550                         text.Replace(_T("\r"), _T(""));\r
 551 \r
 552                         m_ProjectProperties.FindBugID(text, pMsgView);\r
 553                         CAppUtils::FormatTextInRichEditControl(pMsgView);\r
 554 \r
 555                         int HidePaths=m_cHidePaths.GetState() & 0x0003;\r
 556                         CString matchpath=this->m_path.GetGitPathString();\r
 557 \r
 558                         for(int i=0;i<pLogEntry->m_Files.GetCount() && (!matchpath.IsEmpty());i++)\r
 559                         {\r
 560                                 if( m_bWholeProject )\r
 561                                         break;\r
 562 \r
 563                                 ((CTGitPath&)pLogEntry->m_Files[i]).m_Action &= ~(CTGitPath::LOGACTIONS_HIDE|CTGitPath::LOGACTIONS_GRAY);\r
 564                                 \r
 565                                 if(pLogEntry->m_Files[i].GetGitPathString().Left(matchpath.GetLength()) != matchpath)\r
 566                                 {\r
 567                                         if(HidePaths==BST_CHECKED)\r
 568                                                 ((CTGitPath&)pLogEntry->m_Files[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;\r
 569                                         if(HidePaths==BST_INDETERMINATE)\r
 570                                                 ((CTGitPath&)pLogEntry->m_Files[i]).m_Action |= CTGitPath::LOGACTIONS_GRAY;\r
 571                                 }\r
 572                         }\r
 573                         m_ChangedFileListCtrl.UpdateWithGitPathList(pLogEntry->m_Files);\r
 574                         m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;\r
 575                         m_ChangedFileListCtrl.Show(SVNSLC_SHOWVERSIONED);\r
 576 \r
 577                         m_ChangedFileListCtrl.SetRedraw(TRUE);\r
 578                         return;\r
 579                 }\r
 580 \r
 581         }\r
 582         else\r
 583         {\r
 584                 // more than one revision is selected:\r
 585                 // the log message view must be emptied\r
 586                 // the changed files list contains all the changed paths from all\r
 587                 // selected revisions, with 'doubles' removed\r
 588                 m_currentChangedPathList = GetChangedPathsFromSelectedRevisions(true);\r
 589         }\r
 590         \r
 591         // redraw the views\r
 592 //      InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
 593 #if 0\r
 594         if (m_currentChangedArray)\r
 595         {\r
 596                 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedArray->GetCount());\r
 597                 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedArray->GetCount());\r
 598         }\r
 599         else if (m_currentChangedPathList.GetCount())\r
 600         {\r
 601                 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedPathList.GetCount());\r
 602                 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedPathList.GetCount());\r
 603         }\r
 604         else\r
 605         {\r
 606                 m_ChangedFileListCtrl.SetItemCountEx(0);\r
 607                 m_ChangedFileListCtrl.Invalidate();\r
 608         }\r
 609 #endif\r
 610         // sort according to the settings\r
 611         if (m_nSortColumnPathList > 0)\r
 612                 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);\r
 613         else\r
 614                 SetSortArrow(&m_ChangedFileListCtrl, -1, false);\r
 615         m_ChangedFileListCtrl.SetRedraw(TRUE);\r
 616 \r
 617 }\r
 618 \r
 619 void CLogDlg::OnBnClickedRefresh()\r
 620 {\r
 621         m_limit = 0;\r
 622         Refresh (true);\r
 623 }\r
 624 \r
 625 void CLogDlg::Refresh (bool /*autoGoOnline*/)\r
 626 {\r
 627         m_LogList.Refresh();\r
 628 }\r
 629 \r
 630 \r
 631 \r
 632 BOOL CLogDlg::Cancel()\r
 633 {\r
 634         return m_bCancelled;\r
 635 }\r
 636 \r
 637 void CLogDlg::SaveSplitterPos()\r
 638 {\r
 639         if (!IsIconic())\r
 640         {\r
 641                 CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));\r
 642                 CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));\r
 643                 RECT rectSplitter;\r
 644                 m_wndSplitter1.GetWindowRect(&rectSplitter);\r
 645                 ScreenToClient(&rectSplitter);\r
 646                 regPos1 = rectSplitter.top;\r
 647                 m_wndSplitter2.GetWindowRect(&rectSplitter);\r
 648                 ScreenToClient(&rectSplitter);\r
 649                 regPos2 = rectSplitter.top;\r
 650         }\r
 651 }\r
 652 \r
 653 void CLogDlg::OnCancel()\r
 654 {\r
 655         // canceling means stopping the working thread if it's still running.\r
 656         if (this->IsThreadRunning())\r
 657         {\r
 658                 m_LogList.TerminateThread();\r
 659         }\r
 660         UpdateData();\r
 661         \r
 662         SaveSplitterPos();\r
 663         __super::OnCancel();\r
 664 }\r
 665 \r
 666 CString CLogDlg::MakeShortMessage(const CString& message)\r
 667 {\r
 668         bool bFoundShort = true;\r
 669         CString sShortMessage = m_ProjectProperties.GetLogSummary(message);\r
 670         if (sShortMessage.IsEmpty())\r
 671         {\r
 672                 bFoundShort = false;\r
 673                 sShortMessage = message;\r
 674         }\r
 675         // Remove newlines and tabs 'cause those are not shown nicely in the list control\r
 676         sShortMessage.Replace(_T("\r"), _T(""));\r
 677         sShortMessage.Replace(_T("\t"), _T(" "));\r
 678         \r
 679         // Suppose the first empty line separates 'summary' from the rest of the message.\r
 680         int found = sShortMessage.Find(_T("\n\n"));\r
 681         // To avoid too short 'short' messages \r
 682         // (e.g. if the message looks something like "Bugfix:\n\n*done this\n*done that")\r
 683         // only use the empty newline as a separator if it comes after at least 15 chars.\r
 684         if ((!bFoundShort)&&(found >= 15))\r
 685         {\r
 686                 sShortMessage = sShortMessage.Left(found);\r
 687         }\r
 688         sShortMessage.Replace('\n', ' ');\r
 689         return sShortMessage;\r
 690 }\r
 691 \r
 692 BOOL CLogDlg::Log(git_revnum_t /*rev*/, const CString& /*author*/, const CString& /*date*/, const CString& /*message*/, LogChangedPathArray * /*cpaths*/,  int /*filechanges*/, BOOL /*copies*/, DWORD /*actions*/, BOOL /*haschildren*/)\r
 693 {\r
 694 #if 0\r
 695         if (rev == SVN_INVALID_REVNUM)\r
 696         {\r
 697                 m_childCounter--;\r
 698                 return TRUE;\r
 699         }\r
 700 \r
 701         // this is the callback function which receives the data for every revision we ask the log for\r
 702         // we store this information here one by one.\r
 703         m_logcounter += 1;\r
 704         if (m_startrev == -1)\r
 705                 m_startrev = rev;\r
 706         if (m_limit != 0)\r
 707         {\r
 708                 m_limitcounter--;\r
 709                 m_LogProgress.SetPos(m_limit - m_limitcounter);\r
 710         }\r
 711         else if (m_startrev.IsNumber() && m_startrev.IsNumber())\r
 712                 m_LogProgress.SetPos((git_revnum_t)m_startrev-rev+(git_revnum_t)m_endrev);\r
 713         __time64_t ttime = time/1000000L;\r
 714         if (m_tTo < (DWORD)ttime)\r
 715                 m_tTo = (DWORD)ttime;\r
 716         if (m_tFrom > (DWORD)ttime)\r
 717                 m_tFrom = (DWORD)ttime;\r
 718         if ((m_lowestRev > rev)||(m_lowestRev < 0))\r
 719                 m_lowestRev = rev;\r
 720         // Add as many characters from the log message to the list control\r
 721         PLOGENTRYDATA pLogItem = new LOGENTRYDATA;\r
 722         pLogItem->bCopies = !!copies;\r
 723         \r
 724         // find out if this item was copied in the revision\r
 725         BOOL copiedself = FALSE;\r
 726         if (copies)\r
 727         {\r
 728                 for (INT_PTR cpPathIndex = 0; cpPathIndex < cpaths->GetCount(); ++cpPathIndex)\r
 729                 {\r
 730                         LogChangedPath * cpath = cpaths->GetAt(cpPathIndex);\r
 731                         if (!cpath->sCopyFromPath.IsEmpty() && (cpath->sPath.Compare(m_sSelfRelativeURL) == 0))\r
 732                         {\r
 733                                 // note: this only works if the log is fetched top-to-bottom\r
 734                                 // but since we do that, it shouldn't be a problem\r
 735                                 m_sSelfRelativeURL = cpath->sCopyFromPath;\r
 736                                 copiedself = TRUE;\r
 737                                 break;\r
 738                         }\r
 739                 }\r
 740         }\r
 741         pLogItem->bCopiedSelf = copiedself;\r
 742         pLogItem->tmDate = ttime;\r
 743         pLogItem->sAuthor = author;\r
 744         pLogItem->sDate = date;\r
 745         pLogItem->sShortMessage = MakeShortMessage(message);\r
 746         pLogItem->dwFileChanges = filechanges;\r
 747         pLogItem->actions = actions;\r
 748         pLogItem->haschildren = haschildren;\r
 749         pLogItem->childStackDepth = m_childCounter;\r
 750         m_maxChild = max(m_childCounter, m_maxChild);\r
 751         if (haschildren)\r
 752                 m_childCounter++;\r
 753         pLogItem->sBugIDs = m_ProjectProperties.FindBugID(message).Trim();\r
 754         \r
 755         // split multi line log entries and concatenate them\r
 756         // again but this time with \r\n as line separators\r
 757         // so that the edit control recognizes them\r
 758         try\r
 759         {\r
 760                 if (message.GetLength()>0)\r
 761                 {\r
 762                         m_sMessageBuf = message;\r
 763                         m_sMessageBuf.Replace(_T("\n\r"), _T("\n"));\r
 764                         m_sMessageBuf.Replace(_T("\r\n"), _T("\n"));\r
 765                         if (m_sMessageBuf.Right(1).Compare(_T("\n"))==0)\r
 766                                 m_sMessageBuf = m_sMessageBuf.Left(m_sMessageBuf.GetLength()-1);\r
 767                 }\r
 768                 else\r
 769                         m_sMessageBuf.Empty();\r
 770         pLogItem->sMessage = m_sMessageBuf;\r
 771         pLogItem->Rev = rev;\r
 772 \r
 773         // move-construct path array\r
 774 \r
 775         pLogItem->pArChangedPaths = new LogChangedPathArray (*cpaths);\r
 776         cpaths->RemoveAll();\r
 777         }\r
 778         catch (CException * e)\r
 779         {\r
 780                 ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR);\r
 781                 e->Delete();\r
 782                 m_bCancelled = TRUE;\r
 783         }\r
 784         m_logEntries.push_back(pLogItem);\r
 785         m_arShownList.Add(pLogItem);\r
 786 #endif\r
 787         return TRUE;\r
 788 }\r
 789 \r
 790 GitRev g_rev;\r
 791 //this is the thread function which calls the subversion function\r
 792 \r
 793 \r
 794 \r
 795 \r
 796 void CLogDlg::CopyChangedSelectionToClipBoard()\r
 797 {\r
 798 \r
 799         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
 800         if (pos == NULL)\r
 801                 return; // nothing is selected, get out of here\r
 802 \r
 803         CString sPaths;\r
 804 \r
 805 //      CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
 806 //      if (pos)\r
 807         {\r
 808                 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();\r
 809                 while (pos)\r
 810                 {\r
 811                         int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);\r
 812                         CTGitPath *path = (CTGitPath*)m_ChangedFileListCtrl.GetItemData(nItem);\r
 813                         if(path)\r
 814                                 sPaths += path->GetGitPathString();\r
 815                         sPaths += _T("\r\n");\r
 816                 }\r
 817         }\r
 818 #if 0\r
 819         else\r
 820         {\r
 821                 // only one revision is selected in the log dialog top pane\r
 822                 // but multiple items could be selected  in the changed items list\r
 823                 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();\r
 824                 while (pos)\r
 825                 {\r
 826                         int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);\r
 827                         LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);\r
 828 \r
 829                         if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)\r
 830                         {\r
 831                                 // some items are hidden! So find out which item the user really selected\r
 832                                 INT_PTR selRealIndex = -1;\r
 833                                 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)\r
 834                                 {\r
 835                                         if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)\r
 836                                                 selRealIndex++;\r
 837                                         if (selRealIndex == nItem)\r
 838                                         {\r
 839                                                 changedlogpath = pLogEntry->pArChangedPaths->GetAt(hiddenindex);\r
 840                                                 break;\r
 841                                         }\r
 842                                 }\r
 843                         }\r
 844                         if (changedlogpath)\r
 845                         {\r
 846                                 sPaths += changedlogpath->sPath;\r
 847                                 sPaths += _T("\r\n");\r
 848                         }\r
 849                 }\r
 850         }\r
 851 #endif\r
 852         sPaths.Trim();\r
 853         CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());\r
 854 \r
 855 }\r
 856 \r
 857 BOOL CLogDlg::IsDiffPossible(LogChangedPath * /*changedpath*/, git_revnum_t rev)\r
 858 {\r
 859 #if 0\r
 860         CString added, deleted;\r
 861         if (changedpath == NULL)\r
 862                 return false;\r
 863 \r
 864         if ((rev > 1)&&(changedpath->action != LOGACTIONS_DELETED))\r
 865         {\r
 866                 if (changedpath->action == LOGACTIONS_ADDED) // file is added\r
 867                 {\r
 868                         if (changedpath->lCopyFromRev == 0)\r
 869                                 return FALSE; // but file was not added with history\r
 870                 }\r
 871                 return TRUE;\r
 872         }\r
 873 #endif\r
 874         return FALSE;\r
 875 }\r
 876 \r
 877 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)\r
 878 {\r
 879         // we have two separate context menus:\r
 880         // one shown on the log message list control,\r
 881         // the other shown in the changed-files list control\r
 882         int selCount = m_LogList.GetSelectedCount();\r
 883         if (pWnd == &m_LogList)\r
 884         {\r
 885                 //ShowContextMenuForRevisions(pWnd, point);\r
 886         }\r
 887         else if (pWnd == &m_ChangedFileListCtrl)\r
 888         {\r
 889                 //ShowContextMenuForChangedpaths(pWnd, point);\r
 890         }\r
 891         else if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))\r
 892         {\r
 893                 POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
 894                 int selIndex = -1;\r
 895                 if (pos)\r
 896                         selIndex = m_LogList.GetNextSelectedItem(pos);\r
 897                 if ((point.x == -1) && (point.y == -1))\r
 898                 {\r
 899                         CRect rect;\r
 900                         GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);\r
 901                         ClientToScreen(&rect);\r
 902                         point = rect.CenterPoint();\r
 903                 }\r
 904                 CString sMenuItemText;\r
 905                 CMenu popup;\r
 906                 if (popup.CreatePopupMenu())\r
 907                 {\r
 908                         // add the 'default' entries\r
 909                         sMenuItemText.LoadString(IDS_SCIEDIT_COPY);\r
 910                         popup.AppendMenu(MF_STRING | MF_ENABLED, WM_COPY, sMenuItemText);\r
 911                         sMenuItemText.LoadString(IDS_SCIEDIT_SELECTALL);\r
 912                         popup.AppendMenu(MF_STRING | MF_ENABLED, EM_SETSEL, sMenuItemText);\r
 913 \r
 914                         //if (selIndex >= 0)\r
 915                         //{\r
 916                         //      popup.AppendMenu(MF_SEPARATOR);\r
 917                         //      sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);\r
 918                         //      popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);\r
 919                         //}\r
 920 \r
 921                         int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
 922                         switch (cmd)\r
 923                         {\r
 924                         case 0:\r
 925                                 break;  // no command selected\r
 926                         case EM_SETSEL:\r
 927                         case WM_COPY:\r
 928                                 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);\r
 929                                 break;\r
 930                         case CGitLogList::ID_EDITAUTHOR:\r
 931                                 EditLogMessage(selIndex);\r
 932                                 break;\r
 933                         }\r
 934                 }\r
 935         }\r
 936 }\r
 937 \r
 938 \r
 939 LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)\r
 940 {\r
 941 #if 0\r
 942     ASSERT(m_pFindDialog != NULL);\r
 943 \r
 944     if (m_pFindDialog->IsTerminating())\r
 945     {\r
 946             // invalidate the handle identifying the dialog box.\r
 947         m_pFindDialog = NULL;\r
 948         return 0;\r
 949     }\r
 950 \r
 951     if(m_pFindDialog->FindNext())\r
 952     {\r
 953         //read data from dialog\r
 954         CString FindText = m_pFindDialog->GetFindString();\r
 955         bool bMatchCase = (m_pFindDialog->MatchCase() == TRUE);\r
 956                 bool bFound = false;\r
 957                 tr1::wregex pat;\r
 958                 bool bRegex = ValidateRegexp(FindText, pat, bMatchCase);\r
 959 \r
 960                 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_not_null;\r
 961 \r
 962                 int i;\r
 963                 for (i = this->m_nSearchIndex; i<m_arShownList.GetCount()&&!bFound; i++)\r
 964                 {\r
 965                         if (bRegex)\r
 966                         {\r
 967                                 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));\r
 968 \r
 969                                 if (regex_search(wstring((LPCTSTR)pLogEntry->sMessage), pat, flags))\r
 970                                 {\r
 971                                         bFound = true;\r
 972                                         break;\r
 973                                 }\r
 974                                 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;\r
 975                                 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)\r
 976                                 {\r
 977                                         LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
 978                                         if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags))\r
 979                                         {\r
 980                                                 bFound = true;\r
 981                                                 --i;\r
 982                                                 break;\r
 983                                         }\r
 984                                         if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags))\r
 985                                         {\r
 986                                                 bFound = true;\r
 987                                                 --i;\r
 988                                                 break;\r
 989                                         }\r
 990                                 }\r
 991                         }\r
 992                         else\r
 993                         {\r
 994                                 if (bMatchCase)\r
 995                                 {\r
 996                                         if (m_logEntries[i]->sMessage.Find(FindText) >= 0)\r
 997                                         {\r
 998                                                 bFound = true;\r
 999                                                 break;\r
1000                                         }\r
1001                                         PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));\r
1002                                         LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;\r
1003                                         for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)\r
1004                                         {\r
1005                                                 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
1006                                                 if (cpath->sCopyFromPath.Find(FindText)>=0)\r
1007                                                 {\r
1008                                                         bFound = true;\r
1009                                                         --i;\r
1010                                                         break;\r
1011                                                 }\r
1012                                                 if (cpath->sPath.Find(FindText)>=0)\r
1013                                                 {\r
1014                                                         bFound = true;\r
1015                                                         --i;\r
1016                                                         break;\r
1017                                                 }\r
1018                                         }\r
1019                                 }\r
1020                                 else\r
1021                                 {\r
1022                                     PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));\r
1023                                         CString msg = pLogEntry->sMessage;\r
1024                                         msg = msg.MakeLower();\r
1025                                         CString find = FindText.MakeLower();\r
1026                                         if (msg.Find(find) >= 0)\r
1027                                         {\r
1028                                                 bFound = TRUE;\r
1029                                                 break;\r
1030                                         }\r
1031                                         LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;\r
1032                                         for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)\r
1033                                         {\r
1034                                                 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
1035                                                 CString lowerpath = cpath->sCopyFromPath;\r
1036                                                 lowerpath.MakeLower();\r
1037                                                 if (lowerpath.Find(find)>=0)\r
1038                                                 {\r
1039                                                         bFound = TRUE;\r
1040                                                         --i;\r
1041                                                         break;\r
1042                                                 }\r
1043                                                 lowerpath = cpath->sPath;\r
1044                                                 lowerpath.MakeLower();\r
1045                                                 if (lowerpath.Find(find)>=0)\r
1046                                                 {\r
1047                                                         bFound = TRUE;\r
1048                                                         --i;\r
1049                                                         break;\r
1050                                                 }\r
1051                                         }\r
1052                                 } \r
1053                         }\r
1054                 } // for (i = this->m_nSearchIndex; i<m_arShownList.GetItemCount()&&!bFound; i++)\r
1055                 if (bFound)\r
1056                 {\r
1057                         this->m_nSearchIndex = (i+1);\r
1058                         m_LogList.EnsureVisible(i, FALSE);\r
1059                         m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);\r
1060                         m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);\r
1061                         m_LogList.SetSelectionMark(i);\r
1062                         FillLogMessageCtrl();\r
1063                         UpdateData(FALSE);\r
1064                         m_nSearchIndex++;\r
1065                         if (m_nSearchIndex >= m_arShownList.GetCount())\r
1066                                 m_nSearchIndex = (int)m_arShownList.GetCount()-1;\r
1067                 }\r
1068     } // if(m_pFindDialog->FindNext()) \r
1069         UpdateLogInfoLabel();\r
1070 #endif\r
1071     return 0;\r
1072 }\r
1073 \r
1074 void CLogDlg::OnOK()\r
1075 {\r
1076         // since the log dialog is also used to select revisions for other\r
1077         // dialogs, we have to do some work before closing this dialog\r
1078         if (GetFocus() != GetDlgItem(IDOK))\r
1079                 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter\r
1080 \r
1081         \r
1082         if (this->IsThreadRunning())\r
1083         {\r
1084                 m_LogList.TerminateThread();\r
1085         }\r
1086         UpdateData();\r
1087         // check that one and only one row is selected\r
1088         if (m_LogList.GetSelectedCount() == 1)\r
1089         {\r
1090                 // get the selected row\r
1091                 POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
1092                 int selIndex = m_LogList.GetNextSelectedItem(pos);\r
1093                 if (selIndex < m_LogList.m_arShownList.GetCount())\r
1094                 {\r
1095                         // all ok, pick up the revision\r
1096                         GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));\r
1097                         // extract the hash\r
1098                         m_sSelectedHash = pLogEntry->m_CommitHash;\r
1099                 }\r
1100         }\r
1101         UpdateData(FALSE);\r
1102         SaveSplitterPos();\r
1103         __super::OnOK();\r
1104         \r
1105         #if 0 \r
1106         if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))\r
1107                 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.\r
1108 \r
1109         CString temp;\r
1110         CString buttontext;\r
1111         GetDlgItemText(IDOK, buttontext);\r
1112         temp.LoadString(IDS_MSGBOX_CANCEL);\r
1113         if (temp.Compare(buttontext) != 0)\r
1114                 __super::OnOK();        // only exit if the button text matches, and that will match only if the thread isn't running anymore\r
1115         m_bCancelled = TRUE;\r
1116         m_selectedRevs.Clear();\r
1117         m_selectedRevsOneRange.Clear();\r
1118         if (m_pNotifyWindow)\r
1119         {\r
1120                 int selIndex = m_LogList.GetSelectionMark();\r
1121                 if (selIndex >= 0)\r
1122                 {       \r
1123                     PLOGENTRYDATA pLogEntry = NULL;\r
1124                         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
1125                         pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
1126                         m_selectedRevs.AddRevision(pLogEntry->Rev);\r
1127                         git_revnum_t lowerRev = pLogEntry->Rev;\r
1128                         git_revnum_t higherRev = lowerRev;\r
1129                         while (pos)\r
1130                         {\r
1131                             pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
1132                                 git_revnum_t rev = pLogEntry->Rev;\r
1133                                 m_selectedRevs.AddRevision(pLogEntry->Rev);\r
1134                                 if (lowerRev > rev)\r
1135                                         lowerRev = rev;\r
1136                                 if (higherRev < rev)\r
1137                                         higherRev = rev;\r
1138                         }\r
1139                         if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())\r
1140                         {\r
1141                                 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);\r
1142                         }\r
1143                         BOOL bSentMessage = FALSE;\r
1144                         if (m_LogList.GetSelectedCount() == 1)\r
1145                         {\r
1146                                 // if only one revision is selected, check if the path/url with which the dialog was started\r
1147                                 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.\r
1148                                 // if it was copied, use the copy from revision as lowerRev\r
1149                                 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))\r
1150                                 {\r
1151                                         CString sUrl = m_path.GetGitPathString();\r
1152                                         if (!m_path.IsUrl())\r
1153                                         {\r
1154                                                 sUrl = GetURLFromPath(m_path);\r
1155                                         }\r
1156                                         sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());\r
1157                                         for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)\r
1158                                         {\r
1159                                                 LogChangedPath * pData = pLogEntry->pArChangedPaths->GetAt(cp);\r
1160                                                 if (pData)\r
1161                                                 {\r
1162                                                         if (sUrl.Compare(pData->sPath) == 0)\r
1163                                                         {\r
1164                                                                 if (!pData->sCopyFromPath.IsEmpty())\r
1165                                                                 {\r
1166                                                                         lowerRev = pData->lCopyFromRev;\r
1167                                                                         m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);\r
1168                                                                         m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);\r
1169                                                                         m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);\r
1170                                                                         bSentMessage = TRUE;\r
1171                                                                 }\r
1172                                                         }\r
1173                                                 }\r
1174                                         }\r
1175                                 }\r
1176                         }\r
1177                         if ( !bSentMessage )\r
1178                         {\r
1179                                 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);\r
1180                                 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);\r
1181                                 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);\r
1182                                 if (m_selectedRevsOneRange.GetCount())\r
1183                                         m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);\r
1184                         }\r
1185                 }\r
1186         }\r
1187         UpdateData();\r
1188         CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));\r
1189         reg = m_btnShow.GetCurrentEntry();\r
1190         SaveSplitterPos();\r
1191 #endif \r
1192 }\r
1193 \r
1194 void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
1195 {\r
1196         // a double click on an entry in the changed-files list has happened\r
1197         *pResult = 0;\r
1198 \r
1199         DiffSelectedFile();\r
1200 }\r
1201 \r
1202 void CLogDlg::DiffSelectedFile()\r
1203 {\r
1204 #if 0\r
1205         if (m_bThreadRunning)\r
1206                 return;\r
1207         UpdateLogInfoLabel();\r
1208         INT_PTR selIndex = m_ChangedFileListCtrl.GetSelectionMark();\r
1209         if (selIndex < 0)\r
1210                 return;\r
1211         if (m_ChangedFileListCtrl.GetSelectedCount() == 0)\r
1212                 return;\r
1213         // find out if there's an entry selected in the log list\r
1214         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
1215         PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
1216         git_revnum_t rev1 = pLogEntry->Rev;\r
1217         git_revnum_t rev2 = rev1;\r
1218         if (pos)\r
1219         {\r
1220                 while (pos)\r
1221                 {\r
1222                         // there's at least a second entry selected in the log list: several revisions selected!\r
1223                         pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
1224                         if (pLogEntry)\r
1225                         {\r
1226                                 rev1 = max(rev1,(long)pLogEntry->Rev);\r
1227                                 rev2 = min(rev2,(long)pLogEntry->Rev);\r
1228                         }\r
1229                 }\r
1230                 rev2--;\r
1231                 // now we have both revisions selected in the log list, so we can do a diff of the selected\r
1232                 // entry in the changed files list with these two revisions.\r
1233                 DoDiffFromLog(selIndex, rev1, rev2, false, false);\r
1234         }\r
1235         else\r
1236         {\r
1237                 rev2 = rev1-1;\r
1238                 // nothing or only one revision selected in the log list\r
1239                 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);\r
1240 \r
1241                 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)\r
1242                 {\r
1243                         // some items are hidden! So find out which item the user really clicked on\r
1244                         INT_PTR selRealIndex = -1;\r
1245                         for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)\r
1246                         {\r
1247                                 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)\r
1248                                         selRealIndex++;\r
1249                                 if (selRealIndex == selIndex)\r
1250                                 {\r
1251                                         selIndex = hiddenindex;\r
1252                                         changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);\r
1253                                         break;\r
1254                                 }\r
1255                         }\r
1256                 }\r
1257 \r
1258                 if (IsDiffPossible(changedpath, rev1))\r
1259                 {\r
1260                         // diffs with renamed files are possible\r
1261                         if ((changedpath)&&(!changedpath->sCopyFromPath.IsEmpty()))\r
1262                                 rev2 = changedpath->lCopyFromRev;\r
1263                         else\r
1264                         {\r
1265                                 // if the path was modified but the parent path was 'added with history'\r
1266                                 // then we have to use the copy from revision of the parent path\r
1267                                 CTGitPath cpath = CTGitPath(changedpath->sPath);\r
1268                                 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)\r
1269                                 {\r
1270                                         CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);\r
1271                                         if (p.IsAncestorOf(cpath))\r
1272                                         {\r
1273                                                 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())\r
1274                                                         rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;\r
1275                                         }\r
1276                                 }\r
1277                         }\r
1278                         DoDiffFromLog(selIndex, rev1, rev2, false, false);\r
1279                 }\r
1280                 else \r
1281                 {\r
1282                         CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));\r
1283                         CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));\r
1284                         GitRev r = rev1;\r
1285                         // deleted files must be opened from the revision before the deletion\r
1286                         if (changedpath->action == LOGACTIONS_DELETED)\r
1287                                 r = rev1-1;\r
1288                         m_bCancelled = false;\r
1289 \r
1290                         CProgressDlg progDlg;\r
1291                         progDlg.SetTitle(IDS_APPNAME);\r
1292                         progDlg.SetAnimation(IDR_DOWNLOAD);\r
1293                         CString sInfoLine;\r
1294                         sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)(m_sRepositoryRoot + changedpath->sPath), (LPCTSTR)r.ToString());\r
1295                         progDlg.SetLine(1, sInfoLine, true);\r
1296                         SetAndClearProgressInfo(&progDlg);\r
1297                         progDlg.ShowModeless(m_hWnd);\r
1298 \r
1299                         if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))\r
1300                         {\r
1301                                 m_bCancelled = false;\r
1302                                 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), GitRev::REV_HEAD, r, tempfile))\r
1303                                 {\r
1304                                         progDlg.Stop();\r
1305                                         SetAndClearProgressInfo((HWND)NULL);\r
1306                                         CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
1307                                         return;\r
1308                                 }\r
1309                         }\r
1310                         progDlg.Stop();\r
1311                         SetAndClearProgressInfo((HWND)NULL);\r
1312 \r
1313                         CString sName1, sName2;\r
1314                         sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1);\r
1315                         sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1-1);\r
1316                         CAppUtils::DiffFlags flags;\r
1317                         flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
1318                         if (changedpath->action == LOGACTIONS_DELETED)\r
1319                                 CAppUtils::StartExtDiff(tempfile, tempfile2, sName2, sName1, flags);\r
1320                         else\r
1321                                 CAppUtils::StartExtDiff(tempfile2, tempfile, sName2, sName1, flags);\r
1322                 }\r
1323         }\r
1324 #endif \r
1325 }\r
1326 \r
1327 \r
1328 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool blame, bool unified)\r
1329 {\r
1330         DialogEnableWindow(IDOK, FALSE);\r
1331 //      SetPromptApp(&theApp);\r
1332         theApp.DoWaitCursor(1);\r
1333 \r
1334         CString temppath;\r
1335         GetTempPath(temppath);\r
1336         \r
1337         CString file1;\r
1338         file1.Format(_T("%s%s_%s%s"),\r
1339                                 temppath,                                               \r
1340                                 (*m_currentChangedArray)[selIndex].GetBaseFilename(),\r
1341                                 rev1->m_CommitHash.Left(6),\r
1342                                 (*m_currentChangedArray)[selIndex].GetFileExtension());\r
1343 \r
1344         CString file2;\r
1345         file2.Format(_T("%s\\%s_%s%s"),\r
1346                                 temppath,                                               \r
1347                                 (*m_currentChangedArray)[selIndex].GetBaseFilename(),\r
1348                                 rev2->m_CommitHash.Left(6),\r
1349                                 (*m_currentChangedArray)[selIndex].GetFileExtension());\r
1350 \r
1351         CString cmd;\r
1352 \r
1353         cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());\r
1354         g_Git.RunLogFile(cmd,file1);\r
1355         cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());\r
1356         g_Git.RunLogFile(cmd,file2);\r
1357 \r
1358         CAppUtils::DiffFlags flags;\r
1359         CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),flags);\r
1360 \r
1361 #if 0\r
1362         //get the filename\r
1363         CString filepath;\r
1364         if (Git::PathIsURL(m_path))\r
1365         {\r
1366                 filepath = m_path.GetGitPathString();\r
1367         }\r
1368         else\r
1369         {\r
1370                 filepath = GetURLFromPath(m_path);\r
1371                 if (filepath.IsEmpty())\r
1372                 {\r
1373                         theApp.DoWaitCursor(-1);\r
1374                         CString temp;\r
1375                         temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
1376                         CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
1377                         TRACE(_T("could not retrieve the URL of the file!\n"));\r
1378                         EnableOKButton();\r
1379                         theApp.DoWaitCursor(-11);\r
1380                         return;         //exit\r
1381                 }\r
1382         }\r
1383         m_bCancelled = FALSE;\r
1384         filepath = GetRepositoryRoot(CTGitPath(filepath));\r
1385 \r
1386         CString firstfile, secondfile;\r
1387         if (m_LogList.GetSelectedCount()==1)\r
1388         {\r
1389                 int s = m_LogList.GetSelectionMark();\r
1390                 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(s));\r
1391                 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);\r
1392                 firstfile = changedpath->sPath;\r
1393                 secondfile = firstfile;\r
1394                 if ((rev2 == rev1-1)&&(changedpath->lCopyFromRev > 0)) // is it an added file with history?\r
1395                 {\r
1396                         secondfile = changedpath->sCopyFromPath;\r
1397                         rev2 = changedpath->lCopyFromRev;\r
1398                 }\r
1399         }\r
1400         else\r
1401         {\r
1402                 firstfile = m_currentChangedPathList[selIndex].GetGitPathString();\r
1403                 secondfile = firstfile;\r
1404         }\r
1405 \r
1406         firstfile = filepath + firstfile.Trim();\r
1407         secondfile = filepath + secondfile.Trim();\r
1408 \r
1409         GitDiff diff(this, this->m_hWnd, true);\r
1410         diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
1411         diff.SetHEADPeg(m_LogRevision);\r
1412         if (unified)\r
1413         {\r
1414                 if (PromptShown())\r
1415                         diff.ShowUnifiedDiff(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1);\r
1416                 else\r
1417                         CAppUtils::StartShowUnifiedDiff(m_hWnd, CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), m_LogRevision);\r
1418         }\r
1419         else\r
1420         {\r
1421                 if (diff.ShowCompare(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), false, blame))\r
1422                 {\r
1423                         if (firstfile.Compare(secondfile)==0)\r
1424                         {\r
1425                                 git_revnum_t baseRev = 0;\r
1426                                 diff.DiffProps(CTGitPath(firstfile), rev2, rev1, baseRev);\r
1427                         }\r
1428                 }\r
1429         }\r
1430 \r
1431 #endif\r
1432 \r
1433         theApp.DoWaitCursor(-1);\r
1434         EnableOKButton();\r
1435 }\r
1436 \r
1437 BOOL CLogDlg::Open(bool /*bOpenWith*/,CString changedpath, git_revnum_t rev)\r
1438 {\r
1439 #if 0\r
1440         DialogEnableWindow(IDOK, FALSE);\r
1441         SetPromptApp(&theApp);\r
1442         theApp.DoWaitCursor(1);\r
1443         CString filepath;\r
1444         if (Git::PathIsURL(m_path))\r
1445         {\r
1446                 filepath = m_path.GetGitPathString();\r
1447         }\r
1448         else\r
1449         {\r
1450                 filepath = GetURLFromPath(m_path);\r
1451                 if (filepath.IsEmpty())\r
1452                 {\r
1453                         theApp.DoWaitCursor(-1);\r
1454                         CString temp;\r
1455                         temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
1456                         CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
1457                         TRACE(_T("could not retrieve the URL of the file!\n"));\r
1458                         EnableOKButton();\r
1459                         return FALSE;\r
1460                 }\r
1461         }\r
1462         m_bCancelled = false;\r
1463         filepath = GetRepositoryRoot(CTGitPath(filepath));\r
1464         filepath += changedpath;\r
1465 \r
1466         CProgressDlg progDlg;\r
1467         progDlg.SetTitle(IDS_APPNAME);\r
1468         progDlg.SetAnimation(IDR_DOWNLOAD);\r
1469         CString sInfoLine;\r
1470         sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)GitRev(rev).ToString());\r
1471         progDlg.SetLine(1, sInfoLine, true);\r
1472         SetAndClearProgressInfo(&progDlg);\r
1473         progDlg.ShowModeless(m_hWnd);\r
1474 \r
1475         CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(filepath), rev);\r
1476         m_bCancelled = false;\r
1477         if (!Cat(CTGitPath(filepath), GitRev(rev), rev, tempfile))\r
1478         {\r
1479                 progDlg.Stop();\r
1480                 SetAndClearProgressInfo((HWND)NULL);\r
1481                 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
1482                 EnableOKButton();\r
1483                 theApp.DoWaitCursor(-1);\r
1484                 return FALSE;\r
1485         }\r
1486         progDlg.Stop();\r
1487         SetAndClearProgressInfo((HWND)NULL);\r
1488         SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);\r
1489         if (!bOpenWith)\r
1490         {\r
1491                 int ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);\r
1492                 if (ret <= HINSTANCE_ERROR)\r
1493                         bOpenWith = true;\r
1494         }\r
1495         if (bOpenWith)\r
1496         {\r
1497                 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");\r
1498                 cmd += tempfile.GetWinPathString() + _T(" ");\r
1499                 CAppUtils::LaunchApplication(cmd, NULL, false);\r
1500         }\r
1501         EnableOKButton();\r
1502         theApp.DoWaitCursor(-1);\r
1503 #endif\r
1504         return TRUE;\r
1505 }\r
1506 \r
1507 void CLogDlg::EditAuthor(const CLogDataVector& /*logs*/)\r
1508 {\r
1509 #if 0\r
1510         CString url;\r
1511         CString name;\r
1512         if (logs.size() == 0)\r
1513                 return;\r
1514         DialogEnableWindow(IDOK, FALSE);\r
1515         SetPromptApp(&theApp);\r
1516         theApp.DoWaitCursor(1);\r
1517         if (Git::PathIsURL(m_path))\r
1518                 url = m_path.GetGitPathString();\r
1519         else\r
1520         {\r
1521                 url = GetURLFromPath(m_path);\r
1522         }\r
1523         name = Git_PROP_REVISION_AUTHOR;\r
1524 \r
1525         CString value = RevPropertyGet(name, CTGitPath(url), logs[0]->Rev);\r
1526         CString sOldValue = value;\r
1527         value.Replace(_T("\n"), _T("\r\n"));\r
1528         CInputDlg dlg(this);\r
1529         dlg.m_sHintText.LoadString(IDS_LOG_AUTHOR);\r
1530         dlg.m_sInputText = value;\r
1531         dlg.m_sTitle.LoadString(IDS_LOG_AUTHOREDITTITLE);\r
1532         dlg.m_pProjectProperties = &m_ProjectProperties;\r
1533         dlg.m_bUseLogWidth = false;\r
1534         if (dlg.DoModal() == IDOK)\r
1535         {\r
1536                 dlg.m_sInputText.Replace(_T("\r"), _T(""));\r
1537 \r
1538                 LogCache::CCachedLogInfo* toUpdate \r
1539                         = GetLogCache (CTGitPath (m_sRepositoryRoot));\r
1540 \r
1541                 CProgressDlg progDlg;\r
1542                 progDlg.SetTitle(IDS_APPNAME);\r
1543                 progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));\r
1544                 progDlg.SetTime(true);\r
1545                 progDlg.SetShowProgressBar(true);\r
1546                 progDlg.ShowModeless(m_hWnd);\r
1547                 for (DWORD i=0; i<logs.size(); ++i)\r
1548                 {\r
1549                         if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), logs[i]->Rev))\r
1550                         {\r
1551                                 progDlg.Stop();\r
1552                                 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
1553                                 break;\r
1554                         }\r
1555                         else\r
1556                         {\r
1557 \r
1558                                 logs[i]->sAuthor = dlg.m_sInputText;\r
1559                                 m_LogList.Invalidate();\r
1560 \r
1561                                 // update the log cache \r
1562 \r
1563                                 if (toUpdate != NULL)\r
1564                                 {\r
1565                                         // log caching is active\r
1566 \r
1567                                         LogCache::CCachedLogInfo newInfo;\r
1568                                         newInfo.Insert ( logs[i]->Rev\r
1569                                                 , (const char*) CUnicodeUtils::GetUTF8 (logs[i]->sAuthor)\r
1570                                                 , ""\r
1571                                                 , 0\r
1572                                                 , LogCache::CRevisionInfoContainer::HAS_AUTHOR);\r
1573 \r
1574                                         toUpdate->Update (newInfo);\r
1575                                 }\r
1576                         }\r
1577                         progDlg.SetProgress64(i, logs.size());\r
1578                 }\r
1579                 progDlg.Stop();\r
1580         }\r
1581         theApp.DoWaitCursor(-1);\r
1582         EnableOKButton();\r
1583 #endif\r
1584 }\r
1585 \r
1586 void CLogDlg::EditLogMessage(int /*index*/)\r
1587 {\r
1588 #if 0\r
1589         CString url;\r
1590         CString name;\r
1591         DialogEnableWindow(IDOK, FALSE);\r
1592         SetPromptApp(&theApp);\r
1593         theApp.DoWaitCursor(1);\r
1594         if (Git::PathIsURL(m_path))\r
1595                 url = m_path.GetGitPathString();\r
1596         else\r
1597         {\r
1598                 url = GetURLFromPath(m_path);\r
1599         }\r
1600         name = Git_PROP_REVISION_LOG;\r
1601 \r
1602         PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(index));\r
1603         m_bCancelled = FALSE;\r
1604         CString value = RevPropertyGet(name, CTGitPath(url), pLogEntry->Rev);\r
1605         CString sOldValue = value;\r
1606         value.Replace(_T("\n"), _T("\r\n"));\r
1607         CInputDlg dlg(this);\r
1608         dlg.m_sHintText.LoadString(IDS_LOG_MESSAGE);\r
1609         dlg.m_sInputText = value;\r
1610         dlg.m_sTitle.LoadString(IDS_LOG_MESSAGEEDITTITLE);\r
1611         dlg.m_pProjectProperties = &m_ProjectProperties;\r
1612         dlg.m_bUseLogWidth = true;\r
1613         if (dlg.DoModal() == IDOK)\r
1614         {\r
1615                 dlg.m_sInputText.Replace(_T("\r"), _T(""));\r
1616                 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), pLogEntry->Rev))\r
1617                 {\r
1618                         CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
1619                 }\r
1620                 else\r
1621                 {\r
1622                         pLogEntry->sShortMessage = MakeShortMessage(dlg.m_sInputText);\r
1623                         // split multi line log entries and concatenate them\r
1624                         // again but this time with \r\n as line separators\r
1625                         // so that the edit control recognizes them\r
1626                         if (dlg.m_sInputText.GetLength()>0)\r
1627                         {\r
1628                                 m_sMessageBuf = dlg.m_sInputText;\r
1629                                 dlg.m_sInputText.Replace(_T("\n\r"), _T("\n"));\r
1630                                 dlg.m_sInputText.Replace(_T("\r\n"), _T("\n"));\r
1631                                 if (dlg.m_sInputText.Right(1).Compare(_T("\n"))==0)\r
1632                                         dlg.m_sInputText = dlg.m_sInputText.Left(dlg.m_sInputText.GetLength()-1);\r
1633                         } \r
1634                         else\r
1635                                 dlg.m_sInputText.Empty();\r
1636                         pLogEntry->sMessage = dlg.m_sInputText;\r
1637                         pLogEntry->sBugIDs = m_ProjectProperties.FindBugID(dlg.m_sInputText);\r
1638                         CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);\r
1639                         pMsgView->SetWindowText(_T(" "));\r
1640                         pMsgView->SetWindowText(dlg.m_sInputText);\r
1641                         m_ProjectProperties.FindBugID(dlg.m_sInputText, pMsgView);\r
1642                         m_LogList.Invalidate();\r
1643         \r
1644             // update the log cache \r
1645 \r
1646             LogCache::CCachedLogInfo* toUpdate \r
1647                 = GetLogCache (CTGitPath (m_sRepositoryRoot));\r
1648             if (toUpdate != NULL)\r
1649             {\r
1650                 // log caching is active\r
1651 \r
1652                 LogCache::CCachedLogInfo newInfo;\r
1653                 newInfo.Insert ( pLogEntry->Rev\r
1654                                , ""\r
1655                                , (const char*) CUnicodeUtils::GetUTF8 (pLogEntry->sMessage)\r
1656                                , 0\r
1657                                , LogCache::CRevisionInfoContainer::HAS_COMMENT);\r
1658 \r
1659                 toUpdate->Update (newInfo);\r
1660             }\r
1661         }\r
1662         }\r
1663         theApp.DoWaitCursor(-1);\r
1664         EnableOKButton();\r
1665 #endif\r
1666 }\r
1667 \r
1668 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)\r
1669 {\r
1670         // Skip Ctrl-C when copying text out of the log message or search filter\r
1671         BOOL bSkipAccelerator = ( pMsg->message == WM_KEYDOWN && pMsg->wParam=='C' && (GetFocus()==GetDlgItem(IDC_MSGVIEW) || GetFocus()==GetDlgItem(IDC_SEARCHEDIT) ) && GetKeyState(VK_CONTROL)&0x8000 );\r
1672         if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')\r
1673         {\r
1674                 if (GetFocus()==GetDlgItem(IDC_LOGLIST))\r
1675                 {\r
1676                         if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))\r
1677                         {\r
1678                                 m_LogList.DiffSelectedRevWithPrevious();\r
1679                                 return TRUE;\r
1680                         }\r
1681                 }\r
1682                 if (GetFocus()==GetDlgItem(IDC_LOGMSG))\r
1683                 {\r
1684                         DiffSelectedFile();\r
1685                         return TRUE;\r
1686                 }\r
1687         }\r
1688         if (m_hAccel && !bSkipAccelerator)\r
1689         {\r
1690                 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);\r
1691                 if (ret)\r
1692                         return TRUE;\r
1693         }\r
1694         \r
1695         if(::IsWindow(m_tooltips.m_hWnd))\r
1696                 m_tooltips.RelayEvent(pMsg);\r
1697         return __super::PreTranslateMessage(pMsg);\r
1698 }\r
1699 \r
1700 \r
1701 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)\r
1702 {\r
1703         //if (this->IsThreadRunning())\r
1704         if(m_LogList.m_bNoDispUpdates)\r
1705         {\r
1706                 // only show the wait cursor over the list control\r
1707                 if ((pWnd)&&\r
1708                         ((pWnd == GetDlgItem(IDC_LOGLIST))||\r
1709                         (pWnd == GetDlgItem(IDC_MSGVIEW))||\r
1710                         (pWnd == GetDlgItem(IDC_LOGMSG))))\r
1711                 {\r
1712                         HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));\r
1713                         SetCursor(hCur);\r
1714                         return TRUE;\r
1715                 }\r
1716         }\r
1717         if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))\r
1718                 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);\r
1719 \r
1720         HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));\r
1721         SetCursor(hCur);\r
1722         return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);\r
1723 }\r
1724 \r
1725 void CLogDlg::OnBnClickedHelp()\r
1726 {\r
1727         OnHelp();\r
1728 }\r
1729 \r
1730 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)\r
1731 {\r
1732         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
1733         *pResult = 0;\r
1734         //if (this->IsThreadRunning())\r
1735         if(m_LogList.m_bNoDispUpdates)\r
1736                 return;\r
1737         if (pNMLV->iItem >= 0)\r
1738         {\r
1739                 m_nSearchIndex = pNMLV->iItem;\r
1740                 if (pNMLV->iSubItem != 0)\r
1741                         return;\r
1742                 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount()))\r
1743                 {\r
1744                         // remove the selected state\r
1745                         if (pNMLV->uChanged & LVIF_STATE)\r
1746                         {\r
1747                                 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);\r
1748                                 FillLogMessageCtrl();\r
1749                                 UpdateData(FALSE);\r
1750                                 UpdateLogInfoLabel();\r
1751                         }\r
1752                         return;\r
1753                 }\r
1754                 if (pNMLV->uChanged & LVIF_STATE)\r
1755                 {\r
1756                         FillLogMessageCtrl();\r
1757                         UpdateData(FALSE);\r
1758                 }\r
1759         }\r
1760         else\r
1761         {\r
1762                 FillLogMessageCtrl();\r
1763                 UpdateData(FALSE);\r
1764         }\r
1765         EnableOKButton();\r
1766         UpdateLogInfoLabel();\r
1767 }\r
1768 \r
1769 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)\r
1770 {\r
1771         ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);\r
1772         if (pEnLink->msg == WM_LBUTTONUP)\r
1773         {\r
1774                 CString url, msg;\r
1775                 GetDlgItemText(IDC_MSGVIEW, msg);\r
1776                 msg.Replace(_T("\r\n"), _T("\n"));\r
1777                 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);\r
1778                 if (!::PathIsURL(url))\r
1779                 {\r
1780                         url = m_ProjectProperties.GetBugIDUrl(url);\r
1781                         url = GetAbsoluteUrlFromRelativeUrl(url);\r
1782                 }\r
1783                 if (!url.IsEmpty())\r
1784                         ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);\r
1785         }\r
1786         *pResult = 0;\r
1787 }\r
1788 \r
1789 void CLogDlg::OnBnClickedStatbutton()\r
1790 {\r
1791 \r
1792         if (this->IsThreadRunning())\r
1793                 return;\r
1794         if (m_LogList.m_arShownList.IsEmpty())\r
1795                 return;         // nothing is shown, so no statistics.\r
1796         // the statistics dialog expects the log entries to be sorted by date\r
1797         SortByColumn(3, false);\r
1798         CPtrArray shownlist;\r
1799         m_LogList.RecalculateShownList(&shownlist);\r
1800         // create arrays which are aware of the current filter\r
1801         CStringArray m_arAuthorsFiltered;\r
1802         CDWordArray m_arDatesFiltered;\r
1803         CDWordArray m_arFileChangesFiltered;\r
1804         for (INT_PTR i=0; i<shownlist.GetCount(); ++i)\r
1805         {\r
1806                 GitRev* pLogEntry = reinterpret_cast<GitRev*>(shownlist.GetAt(i));\r
1807                 CString strAuthor = pLogEntry->m_AuthorName;\r
1808                 if ( strAuthor.IsEmpty() )\r
1809                 {\r
1810                         strAuthor.LoadString(IDS_STATGRAPH_EMPTYAUTHOR);\r
1811                 }\r
1812                 m_arAuthorsFiltered.Add(strAuthor);\r
1813                 m_arDatesFiltered.Add(pLogEntry->m_AuthorDate.GetTime());\r
1814                 m_arFileChangesFiltered.Add(pLogEntry->m_Files.GetCount());\r
1815         }\r
1816         CStatGraphDlg dlg;\r
1817         dlg.m_parAuthors = &m_arAuthorsFiltered;\r
1818         dlg.m_parDates = &m_arDatesFiltered;\r
1819         dlg.m_parFileChanges = &m_arFileChangesFiltered;\r
1820         dlg.m_path = m_path;\r
1821         dlg.DoModal();\r
1822         // restore the previous sorting\r
1823         SortByColumn(m_nSortColumn, m_bAscending);\r
1824         OnTimer(LOGFILTER_TIMER);\r
1825 \r
1826 }\r
1827 \r
1828 void CLogDlg::DoSizeV1(int delta)\r
1829 {\r
1830 \r
1831         RemoveAnchor(IDC_LOGLIST);\r
1832         RemoveAnchor(IDC_SPLITTERTOP);\r
1833         RemoveAnchor(IDC_MSGVIEW);\r
1834         RemoveAnchor(IDC_SPLITTERBOTTOM);\r
1835         RemoveAnchor(IDC_LOGMSG);\r
1836         CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);\r
1837         CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);\r
1838         AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);\r
1839         AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);\r
1840         AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);\r
1841         AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);\r
1842         AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);\r
1843         ArrangeLayout();\r
1844         AdjustMinSize();\r
1845         SetSplitterRange();\r
1846         m_LogList.Invalidate();\r
1847         GetDlgItem(IDC_MSGVIEW)->Invalidate();\r
1848 \r
1849 }\r
1850 \r
1851 void CLogDlg::DoSizeV2(int delta)\r
1852 {\r
1853 \r
1854         RemoveAnchor(IDC_LOGLIST);\r
1855         RemoveAnchor(IDC_SPLITTERTOP);\r
1856         RemoveAnchor(IDC_MSGVIEW);\r
1857         RemoveAnchor(IDC_SPLITTERBOTTOM);\r
1858         RemoveAnchor(IDC_LOGMSG);\r
1859         CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);\r
1860         CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);\r
1861         AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);\r
1862         AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);\r
1863         AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);\r
1864         AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);\r
1865         AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);\r
1866         ArrangeLayout();\r
1867         AdjustMinSize();\r
1868         SetSplitterRange();\r
1869         GetDlgItem(IDC_MSGVIEW)->Invalidate();\r
1870         m_ChangedFileListCtrl.Invalidate();\r
1871 \r
1872 }\r
1873 \r
1874 void CLogDlg::AdjustMinSize()\r
1875 {\r
1876         // adjust the minimum size of the dialog to prevent the resizing from\r
1877         // moving the list control too far down.\r
1878         CRect rcChgListView;\r
1879         m_ChangedFileListCtrl.GetClientRect(rcChgListView);\r
1880         CRect rcLogList;\r
1881         m_LogList.GetClientRect(rcLogList);\r
1882 \r
1883         SetMinTrackSize(CSize(m_DlgOrigRect.Width(), \r
1884                 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()\r
1885                 +rcChgListView.Height()+rcLogList.Height()+60));\r
1886 }\r
1887 \r
1888 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam) \r
1889 {\r
1890         switch (message) {\r
1891         case WM_NOTIFY:\r
1892                 if (wParam == IDC_SPLITTERTOP)\r
1893                 { \r
1894                         SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;\r
1895                         DoSizeV1(pHdr->delta);\r
1896                 }\r
1897                 else if (wParam == IDC_SPLITTERBOTTOM)\r
1898                 { \r
1899                         SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;\r
1900                         DoSizeV2(pHdr->delta);\r
1901                 }\r
1902                 break;\r
1903         }\r
1904 \r
1905         return CResizableDialog::DefWindowProc(message, wParam, lParam);\r
1906 }\r
1907 \r
1908 void CLogDlg::SetSplitterRange()\r
1909 {\r
1910         if ((m_LogList)&&(m_ChangedFileListCtrl))\r
1911         {\r
1912                 CRect rcTop;\r
1913                 m_LogList.GetWindowRect(rcTop);\r
1914                 ScreenToClient(rcTop);\r
1915                 CRect rcMiddle;\r
1916                 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);\r
1917                 ScreenToClient(rcMiddle);\r
1918                 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);\r
1919                 CRect rcBottom;\r
1920                 m_ChangedFileListCtrl.GetWindowRect(rcBottom);\r
1921                 ScreenToClient(rcBottom);\r
1922                 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);\r
1923         }\r
1924 }\r
1925 \r
1926 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)\r
1927 {\r
1928         // FIXME: x64 version would get this function called with unexpected parameters.\r
1929         if (!lParam)\r
1930                 return 0;\r
1931 \r
1932         RECT * rect = (LPRECT)lParam;\r
1933         CPoint point;\r
1934         CString temp;\r
1935         point = CPoint(rect->left, rect->bottom);\r
1936 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))\r
1937         CMenu popup;\r
1938         if (popup.CreatePopupMenu())\r
1939         {\r
1940                 temp.LoadString(IDS_LOG_FILTER_ALL);\r
1941                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ALL), LOGFILTER_ALL, temp);\r
1942 \r
1943                 popup.AppendMenu(MF_SEPARATOR, NULL);\r
1944                 \r
1945                 temp.LoadString(IDS_LOG_FILTER_MESSAGES);\r
1946                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);\r
1947                 temp.LoadString(IDS_LOG_FILTER_PATHS);\r
1948                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);\r
1949                 temp.LoadString(IDS_LOG_FILTER_AUTHORS);\r
1950                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);\r
1951                 temp.LoadString(IDS_LOG_FILTER_REVS);\r
1952                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);\r
1953                 temp.LoadString(IDS_LOG_FILTER_BUGIDS);\r
1954                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);\r
1955                 \r
1956                 popup.AppendMenu(MF_SEPARATOR, NULL);\r
1957 \r
1958                 temp.LoadString(IDS_LOG_FILTER_REGEX);\r
1959                 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);\r
1960 \r
1961                 m_tooltips.Pop();\r
1962                 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
1963                 if (selection != 0)\r
1964                 {\r
1965 \r
1966                         if (selection == LOGFILTER_REGEX)\r
1967                         {\r
1968                                 m_bFilterWithRegex = !m_bFilterWithRegex;\r
1969                                 CRegDWORD b = CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);\r
1970                                 b = m_bFilterWithRegex;\r
1971                                 CheckRegexpTooltip();\r
1972                         }\r
1973                         else\r
1974                         {\r
1975                                 m_LogList.m_nSelectedFilter = selection;\r
1976                                 SetFilterCueText();\r
1977                         }\r
1978                         SetTimer(LOGFILTER_TIMER, 1000, NULL);\r
1979                 }\r
1980         }\r
1981         return 0L;\r
1982 }\r
1983 \r
1984 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)\r
1985 {\r
1986 \r
1987         KillTimer(LOGFILTER_TIMER);\r
1988 \r
1989         m_LogList.m_sFilterText.Empty();\r
1990         UpdateData(FALSE);\r
1991         theApp.DoWaitCursor(1);\r
1992         CStoreSelection storeselection(this);\r
1993         FillLogMessageCtrl(false);\r
1994 \r
1995         m_LogList.RemoveFilter();\r
1996 \r
1997         CTime begin,end;\r
1998         m_LogList.GetTimeRange(begin,end);\r
1999         m_DateFrom.SetTime(&begin);\r
2000         m_DateTo.SetTime(&end);\r
2001 \r
2002         theApp.DoWaitCursor(-1);\r
2003         GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);\r
2004         GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);\r
2005         GetDlgItem(IDC_SEARCHEDIT)->SetFocus();\r
2006         UpdateLogInfoLabel();\r
2007 \r
2008         return 0L;      \r
2009 }\r
2010 \r
2011 \r
2012 void CLogDlg::SetFilterCueText()\r
2013 {\r
2014         CString temp;\r
2015         switch (m_LogList.m_nSelectedFilter)\r
2016         {\r
2017         case LOGFILTER_ALL:\r
2018                 temp.LoadString(IDS_LOG_FILTER_ALL);\r
2019                 break;\r
2020         case LOGFILTER_MESSAGES:\r
2021                 temp.LoadString(IDS_LOG_FILTER_MESSAGES);\r
2022                 break;\r
2023         case LOGFILTER_PATHS:\r
2024                 temp.LoadString(IDS_LOG_FILTER_PATHS);\r
2025                 break;\r
2026         case LOGFILTER_AUTHORS:\r
2027                 temp.LoadString(IDS_LOG_FILTER_AUTHORS);\r
2028                 break;\r
2029         case LOGFILTER_REVS:\r
2030                 temp.LoadString(IDS_LOG_FILTER_REVS);\r
2031                 break;\r
2032         }\r
2033         // to make the cue banner text appear more to the right of the edit control\r
2034         temp = _T("   ")+temp;\r
2035         m_cFilter.SetCueBanner(temp);\r
2036 }\r
2037 \r
2038 bool CLogDlg::Validate(LPCTSTR string)\r
2039 {\r
2040         if (!m_bFilterWithRegex)\r
2041                 return true;\r
2042         tr1::wregex pat;\r
2043         return m_LogList.ValidateRegexp(string, pat, false);\r
2044 }\r
2045 \r
2046 \r
2047 void CLogDlg::OnTimer(UINT_PTR nIDEvent)\r
2048 {\r
2049         if (nIDEvent == LOGFILTER_TIMER)\r
2050         {\r
2051                 if (this->IsThreadRunning())\r
2052                 {\r
2053                         // thread still running! So just restart the timer.\r
2054                         SetTimer(LOGFILTER_TIMER, 1000, NULL);\r
2055                         return;\r
2056                 }\r
2057                 CWnd * focusWnd = GetFocus();\r
2058                 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))\r
2059                         && (focusWnd != GetDlgItem(IDC_LOGLIST)));\r
2060                 if (m_LogList.m_sFilterText.IsEmpty())\r
2061                 {\r
2062                         DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));\r
2063                         // do not return here!\r
2064                         // we also need to run the filter if the filter text is empty:\r
2065                         // 1. to clear an existing filter\r
2066                         // 2. to rebuild the m_arShownList after sorting\r
2067                 }\r
2068                 theApp.DoWaitCursor(1);\r
2069                 CStoreSelection storeselection(this);\r
2070                 KillTimer(LOGFILTER_TIMER);\r
2071                 FillLogMessageCtrl(false);\r
2072 \r
2073                 // now start filter the log list\r
2074                 m_LogList.StartFilter();\r
2075 \r
2076                 if ( m_LogList.GetItemCount()==1 )\r
2077                 {\r
2078                         m_LogList.SetSelectionMark(0);\r
2079                         m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);\r
2080                 }\r
2081                 theApp.DoWaitCursor(-1);\r
2082                 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);\r
2083                 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);\r
2084                 if (bSetFocusToFilterControl)\r
2085                         GetDlgItem(IDC_SEARCHEDIT)->SetFocus();\r
2086                 UpdateLogInfoLabel();\r
2087         } // if (nIDEvent == LOGFILTER_TIMER)\r
2088         DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));\r
2089         __super::OnTimer(nIDEvent);\r
2090 }\r
2091 \r
2092 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
2093 {\r
2094         CTime _time;\r
2095         m_DateTo.GetTime(_time);\r
2096         try\r
2097         {\r
2098                 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);\r
2099                 if (time.GetTime() != m_LogList.m_To.GetTime())\r
2100                 {\r
2101                         m_LogList.m_To = (DWORD)time.GetTime();\r
2102                         SetTimer(LOGFILTER_TIMER, 10, NULL);\r
2103                 }\r
2104         }\r
2105         catch (CAtlException)\r
2106         {\r
2107         }\r
2108         \r
2109         *pResult = 0;\r
2110 }\r
2111 \r
2112 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
2113 {\r
2114         CTime _time;\r
2115         m_DateFrom.GetTime(_time);\r
2116         try\r
2117         {\r
2118                 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);\r
2119                 if (time.GetTime() != m_LogList.m_From.GetTime())\r
2120                 {\r
2121                         m_LogList.m_From = (DWORD)time.GetTime();\r
2122                         SetTimer(LOGFILTER_TIMER, 10, NULL);\r
2123                 }\r
2124         }\r
2125         catch (CAtlException)\r
2126         {\r
2127         }\r
2128         \r
2129         *pResult = 0;\r
2130 }\r
2131 \r
2132 \r
2133 \r
2134 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)\r
2135 {\r
2136         CTGitPathList pathList;\r
2137 #if 0\r
2138         \r
2139         if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))\r
2140         {\r
2141                 m_sRepositoryRoot = GetRepositoryRoot(m_path);\r
2142         }\r
2143         if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))\r
2144                 return pathList;\r
2145         \r
2146         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
2147         if (pos != NULL)\r
2148         {\r
2149                 while (pos)\r
2150                 {\r
2151                         int nextpos = m_LogList.GetNextSelectedItem(pos);\r
2152                         if (nextpos >= m_arShownList.GetCount())\r
2153                                 continue;\r
2154                         PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(nextpos));\r
2155                         LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;\r
2156                         for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)\r
2157                         {\r
2158                                 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
2159                                 if (cpath == NULL)\r
2160                                         continue;\r
2161                                 CTGitPath path;\r
2162                                 if (!bRelativePaths)\r
2163                                         path.SetFromGit(m_sRepositoryRoot);\r
2164                                 path.AppendPathString(cpath->sPath);\r
2165                                 if ((!bUseFilter)||\r
2166                                         ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||\r
2167                                         (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))\r
2168                                         pathList.AddPath(path);\r
2169                                 \r
2170                         }\r
2171                 }\r
2172         }\r
2173         pathList.RemoveDuplicates();\r
2174 #endif\r
2175         return pathList;\r
2176 }\r
2177 \r
2178 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)\r
2179 {\r
2180 #if 0\r
2181         switch(nSortColumn)\r
2182         {\r
2183         case 0: // Revision\r
2184                 {\r
2185                         if(bAscending)\r
2186                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());\r
2187                         else\r
2188                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());\r
2189                 }\r
2190                 break;\r
2191         case 1: // action\r
2192                 {\r
2193                         if(bAscending)\r
2194                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());\r
2195                         else\r
2196                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());\r
2197                 }\r
2198                 break;\r
2199         case 2: // Author\r
2200                 {\r
2201                         if(bAscending)\r
2202                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());\r
2203                         else\r
2204                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());\r
2205                 }\r
2206                 break;\r
2207         case 3: // Date\r
2208                 {\r
2209                         if(bAscending)\r
2210                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());\r
2211                         else\r
2212                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());\r
2213                 }\r
2214                 break;\r
2215         case 4: // Message or bug id\r
2216                 if (m_bShowBugtraqColumn)\r
2217                 {\r
2218                         if(bAscending)\r
2219                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());\r
2220                         else\r
2221                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());\r
2222                         break;\r
2223                 }\r
2224                 // fall through here\r
2225         case 5: // Message\r
2226                 {\r
2227                         if(bAscending)\r
2228                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());\r
2229                         else\r
2230                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());\r
2231                 }\r
2232                 break;\r
2233         default:\r
2234                 ATLASSERT(0);\r
2235                 break;\r
2236         }\r
2237 #endif\r
2238 }\r
2239 \r
2240 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)\r
2241 {\r
2242         if (this->IsThreadRunning())\r
2243                 return;         //no sorting while the arrays are filled\r
2244 #if 0\r
2245         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
2246         const int nColumn = pNMLV->iSubItem;\r
2247         m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;\r
2248         m_nSortColumn = nColumn;\r
2249         SortByColumn(m_nSortColumn, m_bAscending);\r
2250         SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);\r
2251         SortShownListArray();\r
2252         m_LogList.Invalidate();\r
2253         UpdateLogInfoLabel();\r
2254 #endif\r
2255         *pResult = 0;\r
2256 }\r
2257 \r
2258 void CLogDlg::SortShownListArray()\r
2259 {\r
2260         // make sure the shown list still matches the filter after sorting.\r
2261     OnTimer(LOGFILTER_TIMER);\r
2262     // clear the selection states\r
2263         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
2264         while (pos)\r
2265         {\r
2266                 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);\r
2267         }    \r
2268         m_LogList.SetSelectionMark(-1);\r
2269 }\r
2270 \r
2271 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)\r
2272 {\r
2273         if (control == NULL)\r
2274                 return;\r
2275         // set the sort arrow\r
2276         CHeaderCtrl * pHeader = control->GetHeaderCtrl();\r
2277         HDITEM HeaderItem = {0};\r
2278         HeaderItem.mask = HDI_FORMAT;\r
2279         for (int i=0; i<pHeader->GetItemCount(); ++i)\r
2280         {\r
2281                 pHeader->GetItem(i, &HeaderItem);\r
2282                 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);\r
2283                 pHeader->SetItem(i, &HeaderItem);\r
2284         }\r
2285         if (nColumn >= 0)\r
2286         {\r
2287                 pHeader->GetItem(nColumn, &HeaderItem);\r
2288                 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);\r
2289                 pHeader->SetItem(nColumn, &HeaderItem);\r
2290         }\r
2291 }\r
2292 void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR* /*pNMHDR*/, LRESULT* /*pResult*/)\r
2293 {\r
2294 #if 0\r
2295         if (this->IsThreadRunning())\r
2296                 return;         //no sorting while the arrays are filled\r
2297         if (m_currentChangedArray == NULL)\r
2298                 return;\r
2299         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
2300         const int nColumn = pNMLV->iSubItem;\r
2301         m_bAscendingPathList = nColumn == m_nSortColumnPathList ? !m_bAscendingPathList : TRUE;\r
2302         m_nSortColumnPathList = nColumn;\r
2303 //      qsort(m_currentChangedArray->GetData(), m_currentChangedArray->GetSize(), sizeof(LogChangedPath*), (GENERICCOMPAREFN)SortCompare);\r
2304 \r
2305         SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);\r
2306         m_ChangedFileListCtrl.Invalidate();\r
2307         *pResult = 0;\r
2308 #endif\r
2309 }\r
2310 \r
2311 int CLogDlg::m_nSortColumnPathList = 0;\r
2312 bool CLogDlg::m_bAscendingPathList = false;\r
2313 \r
2314 int CLogDlg::SortCompare(const void * /*pElem1*/, const void * /*pElem2*/)\r
2315 {\r
2316 #if 0\r
2317         LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);\r
2318         LogChangedPath * cpath2 = *((LogChangedPath**)pElem2);\r
2319 \r
2320         if (m_bAscendingPathList)\r
2321                 std::swap (cpath1, cpath2);\r
2322 \r
2323         int cmp = 0;\r
2324         switch (m_nSortColumnPathList)\r
2325         {\r
2326         case 0: // action\r
2327                         cmp = cpath2->GetAction().Compare(cpath1->GetAction());\r
2328                         if (cmp)\r
2329                                 return cmp;\r
2330                         // fall through\r
2331         case 1: // path\r
2332                         cmp = cpath2->sPath.CompareNoCase(cpath1->sPath);\r
2333                         if (cmp)\r
2334                                 return cmp;\r
2335                         // fall through\r
2336         case 2: // copy from path\r
2337                         cmp = cpath2->sCopyFromPath.Compare(cpath1->sCopyFromPath);\r
2338                         if (cmp)\r
2339                                 return cmp;\r
2340                         // fall through\r
2341         case 3: // copy from revision\r
2342                         return cpath2->lCopyFromRev > cpath1->lCopyFromRev;\r
2343         }\r
2344 #endif\r
2345         return 0;\r
2346 }\r
2347 \r
2348 void CLogDlg::OnBnClickedHidepaths()\r
2349 {\r
2350         FillLogMessageCtrl();\r
2351         m_ChangedFileListCtrl.Invalidate();\r
2352 }\r
2353 \r
2354 \r
2355 \r
2356 void CLogDlg::OnBnClickedCheckStoponcopy()\r
2357 {\r
2358 #if 0\r
2359         if (!GetDlgItem(IDC_GETALL)->IsWindowEnabled())\r
2360                 return;\r
2361 \r
2362         // ignore old fetch limits when switching\r
2363         // between copy-following and stop-on-copy\r
2364         // (otherwise stop-on-copy will limit what\r
2365         // we see immediately after switching to\r
2366         // copy-following)\r
2367 \r
2368         m_endrev = 0;\r
2369 \r
2370         // now, restart the query\r
2371 #endif\r
2372         Refresh();\r
2373 }\r
2374 \r
2375 \r
2376 void CLogDlg::UpdateLogInfoLabel()\r
2377 {\r
2378 \r
2379         git_revnum_t rev1 ;\r
2380         git_revnum_t rev2 ;\r
2381         long selectedrevs = 0;\r
2382         int count =m_LogList.m_arShownList.GetCount();\r
2383         if (count)\r
2384         {\r
2385                 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(0)))->m_CommitHash;\r
2386                 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));\r
2387                 rev2 =  (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(count-1)))->m_CommitHash;\r
2388                 selectedrevs = m_LogList.GetSelectedCount();\r
2389         }\r
2390         CString sTemp;\r
2391         sTemp.Format(_T("Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected"), count, rev2.Left(6), rev1.Left(6), selectedrevs);\r
2392         m_sLogInfo = sTemp;\r
2393 \r
2394         UpdateData(FALSE);\r
2395 }\r
2396 \r
2397 #if 0\r
2398 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)\r
2399 {\r
2400 \r
2401         int selIndex = m_ChangedFileListCtrl.GetSelectionMark();\r
2402         if ((point.x == -1) && (point.y == -1))\r
2403         {\r
2404                 CRect rect;\r
2405                 m_ChangedFileListCtrl.GetItemRect(selIndex, &rect, LVIR_LABEL);\r
2406                 m_ChangedFileListCtrl.ClientToScreen(&rect);\r
2407                 point = rect.CenterPoint();\r
2408         }\r
2409         if (selIndex < 0)\r
2410                 return;\r
2411         int s = m_LogList.GetSelectionMark();\r
2412         if (s < 0)\r
2413                 return;\r
2414         std::vector<CString> changedpaths;\r
2415         std::vector<LogChangedPath*> changedlogpaths;\r
2416         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
2417         if (pos == NULL)\r
2418                 return; // nothing is selected, get out of here\r
2419 \r
2420         bool bOneRev = true;\r
2421         int sel=m_LogList.GetNextSelectedItem(pos);\r
2422         GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel));\r
2423         GitRev * rev1 = pLogEntry;\r
2424         GitRev * rev2 = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel+1));\r
2425 #if 0\r
2426         bool bOneRev = true;\r
2427         if (pos)\r
2428         {\r
2429                 while (pos)\r
2430                 {\r
2431                         pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
2432                         if (pLogEntry)\r
2433                         {\r
2434                                 rev1 = max(rev1,(git_revnum_t)pLogEntry->Rev);\r
2435                                 rev2 = min(rev2,(git_revnum_t)pLogEntry->Rev);\r
2436                                 bOneRev = false;\r
2437                         }                               \r
2438                 }\r
2439                 if (!bOneRev)\r
2440                         rev2--;\r
2441                 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();\r
2442                 while (pos)\r
2443                 {\r
2444                         int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);\r
2445                         changedpaths.push_back(m_currentChangedPathList[nItem].GetGitPathString());\r
2446                 }\r
2447         }\r
2448         else\r
2449         {\r
2450                 // only one revision is selected in the log dialog top pane\r
2451                 // but multiple items could be selected  in the changed items list\r
2452                 rev2 = rev1-1;\r
2453 \r
2454                 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();\r
2455                 while (pos)\r
2456                 {\r
2457                         int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);\r
2458                         LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);\r
2459 \r
2460                         if (m_ChangedFileListCtrl.GetSelectedCount() == 1)\r
2461                         {\r
2462                                 if ((changedlogpath)&&(!changedlogpath->sCopyFromPath.IsEmpty()))\r
2463                                         rev2 = changedlogpath->lCopyFromRev;\r
2464                                 else\r
2465                                 {\r
2466                                         // if the path was modified but the parent path was 'added with history'\r
2467                                         // then we have to use the copy from revision of the parent path\r
2468                                         CTGitPath cpath = CTGitPath(changedlogpath->sPath);\r
2469                                         for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)\r
2470                                         {\r
2471                                                 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);\r
2472                                                 if (p.IsAncestorOf(cpath))\r
2473                                                 {\r
2474                                                         if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())\r
2475                                                                 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;\r
2476                                                 }\r
2477                                         }\r
2478                                 }\r
2479                         }\r
2480                         if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)\r
2481                         {\r
2482                                 // some items are hidden! So find out which item the user really clicked on\r
2483                                 INT_PTR selRealIndex = -1;\r
2484                                 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)\r
2485                                 {\r
2486                                         if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)\r
2487                                                 selRealIndex++;\r
2488                                         if (selRealIndex == nItem)\r
2489                                         {\r
2490                                                 selIndex = hiddenindex;\r
2491                                                 changedlogpath = pLogEntry->pArChangedPaths->GetAt(selIndex);\r
2492                                                 break;\r
2493                                         }\r
2494                                 }\r
2495                         }\r
2496                         if (changedlogpath)\r
2497                         {\r
2498                                 changedpaths.push_back(changedlogpath->sPath);\r
2499                                 changedlogpaths.push_back(changedlogpath);\r
2500                         }\r
2501                 }\r
2502         }\r
2503 #endif\r
2504         //entry is selected, now show the popup menu\r
2505         CIconMenu popup;\r
2506         if (popup.CreatePopupMenu())\r
2507         {\r
2508                 bool bEntryAdded = false;\r
2509                 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)\r
2510                 {\r
2511 //                      if ((!bOneRev)||(IsDiffPossible(changedlogpaths[0], rev1)))\r
2512                         {\r
2513                                 popup.AppendMenuIcon(CGitLogList::ID_DIFF, IDS_LOG_POPUP_DIFF, IDI_DIFF);\r
2514                                 popup.AppendMenuIcon(CGitLogList::ID_BLAMEDIFF, IDS_LOG_POPUP_BLAMEDIFF, IDI_BLAME);\r
2515                                 popup.SetDefaultItem(CGitLogList::ID_DIFF, FALSE);\r
2516                                 popup.AppendMenuIcon(CGitLogList::ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF);\r
2517                                 bEntryAdded = true;\r
2518                         }\r
2519 //                      if (rev2 == rev1-1)\r
2520                         {\r
2521                                 if (bEntryAdded)\r
2522                                         popup.AppendMenu(MF_SEPARATOR, NULL);\r
2523                                 popup.AppendMenuIcon(CGitLogList::ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);\r
2524                                 popup.AppendMenuIcon(CGitLogList::ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);\r
2525                                 popup.AppendMenuIcon(CGitLogList::ID_BLAME, IDS_LOG_POPUP_BLAME, IDI_BLAME);\r
2526                                 popup.AppendMenu(MF_SEPARATOR, NULL);\r
2527                                 if (m_hasWC)\r
2528                                         popup.AppendMenuIcon(CGitLogList::ID_REVERTREV, IDS_LOG_POPUP_REVERTREV, IDI_REVERT);\r
2529                                 popup.AppendMenuIcon(CGitLogList::ID_POPPROPS, IDS_REPOBROWSE_SHOWPROP, IDI_PROPERTIES);                        // "Show Properties"\r
2530                                 popup.AppendMenuIcon(CGitLogList::ID_LOG, IDS_MENULOG, IDI_LOG);                                                // "Show Log"                           \r
2531                                 popup.AppendMenuIcon(CGitLogList::ID_GETMERGELOGS, IDS_LOG_POPUP_GETMERGELOGS, IDI_LOG);                // "Show merge log"\r
2532                                 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);\r
2533                                 bEntryAdded = true;\r
2534                                 if (!m_ProjectProperties.sWebViewerPathRev.IsEmpty())\r
2535                                 {\r
2536                                         popup.AppendMenu(MF_SEPARATOR, NULL);\r
2537                                         popup.AppendMenuIcon(CGitLogList::ID_VIEWPATHREV, IDS_LOG_POPUP_VIEWPATHREV);\r
2538                                 }\r
2539                                 if (popup.GetDefaultItem(0,FALSE)==-1)\r
2540                                         popup.SetDefaultItem(CGitLogList::ID_OPEN, FALSE);\r
2541                         }\r
2542                 }\r
2543                 else if (changedlogpaths.size())\r
2544                 {\r
2545                         // more than one entry is selected\r
2546                         popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE);\r
2547                         bEntryAdded = true;\r
2548                 }\r
2549 \r
2550                 if (!bEntryAdded)\r
2551                         return;\r
2552                 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
2553                 bool bOpenWith = false;\r
2554                 bool bMergeLog = false;\r
2555                 m_bCancelled = false;\r
2556                 \r
2557                 switch (cmd)\r
2558                 {\r
2559                 case CGitLogList::ID_DIFF:\r
2560                         {\r
2561                                 DoDiffFromLog(selIndex, rev1, rev2, false, false);\r
2562                         }\r
2563                         break;\r
2564 #if 0\r
2565                 case ID_BLAMEDIFF:\r
2566                         {\r
2567                                 DoDiffFromLog(selIndex, rev1, rev2, true, false);\r
2568                         }\r
2569                         break;\r
2570                 case ID_GNUDIFF1:\r
2571                         {\r
2572                                 DoDiffFromLog(selIndex, rev1, rev2, false, true);\r
2573                         }\r
2574                         break;\r
2575                 case ID_REVERTREV:\r
2576                         {\r
2577                                 SetPromptApp(&theApp);\r
2578                                 theApp.DoWaitCursor(1);\r
2579                                 CString sUrl;\r
2580                                 if (Git::PathIsURL(m_path))\r
2581                                 {\r
2582                                         sUrl = m_path.GetGitPathString();\r
2583                                 }\r
2584                                 else\r
2585                                 {\r
2586                                         sUrl = GetURLFromPath(m_path);\r
2587                                         if (sUrl.IsEmpty())\r
2588                                         {\r
2589                                                 theApp.DoWaitCursor(-1);\r
2590                                                 CString temp;\r
2591                                                 temp.Format(IDS_ERR_NOURLOFFILE, m_path.GetWinPath());\r
2592                                                 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
2593                                                 EnableOKButton();\r
2594                                                 theApp.DoWaitCursor(-1);\r
2595                                                 break;          //exit\r
2596                                         }\r
2597                                 }\r
2598                                 // find the working copy path of the selected item from the URL\r
2599                                 m_bCancelled = false;\r
2600                                 CString sUrlRoot = GetRepositoryRoot(CTGitPath(sUrl));\r
2601 \r
2602                                 CString fileURL = changedpaths[0];\r
2603                                 fileURL = sUrlRoot + fileURL.Trim();\r
2604                                 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1\r
2605                                 // sUrl = http://mydomain.com/repos/trunk/folder\r
2606                                 CString sUnescapedUrl = CPathUtils::PathUnescape(sUrl);\r
2607                                 // find out until which char the urls are identical\r
2608                                 int i=0;\r
2609                                 while ((i<fileURL.GetLength())&&(i<sUnescapedUrl.GetLength())&&(fileURL[i]==sUnescapedUrl[i]))\r
2610                                         i++;\r
2611                                 int leftcount = m_path.GetWinPathString().GetLength()-(sUnescapedUrl.GetLength()-i);\r
2612                                 CString wcPath = m_path.GetWinPathString().Left(leftcount);\r
2613                                 wcPath += fileURL.Mid(i);\r
2614                                 wcPath.Replace('/', '\\');\r
2615                                 CGitProgressDlg dlg;\r
2616                                 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)\r
2617                                 {\r
2618                                         // a deleted path! Since the path isn't there anymore, merge\r
2619                                         // won't work. So just do a copy url->wc\r
2620                                         dlg.SetCommand(CGitProgressDlg::GitProgress_Copy);\r
2621                                         dlg.SetPathList(CTGitPathList(CTGitPath(fileURL)));\r
2622                                         dlg.SetUrl(wcPath);\r
2623                                         dlg.SetRevision(rev2);\r
2624                                 }\r
2625                                 else\r
2626                                 {\r
2627                                         if (!PathFileExists(wcPath))\r
2628                                         {\r
2629                                                 // seems the path got renamed\r
2630                                                 // tell the user how to work around this.\r
2631                                                 CMessageBox::Show(this->m_hWnd, IDS_LOG_REVERTREV_ERROR, IDS_APPNAME, MB_ICONERROR);\r
2632                                                 EnableOKButton();\r
2633                                                 theApp.DoWaitCursor(-1);\r
2634                                                 break;          //exit\r
2635                                         }\r
2636                                         dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);\r
2637                                         dlg.SetPathList(CTGitPathList(CTGitPath(wcPath)));\r
2638                                         dlg.SetUrl(fileURL);\r
2639                                         dlg.SetSecondUrl(fileURL);\r
2640                                         GitRevRangeArray revarray;\r
2641                                         revarray.AddRevRange(rev1, rev2);\r
2642                                         dlg.SetRevisionRanges(revarray);\r
2643                                 }\r
2644                                 CString msg;\r
2645                                 msg.Format(IDS_LOG_REVERT_CONFIRM, (LPCTSTR)wcPath);\r
2646                                 if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)\r
2647                                 {\r
2648                                         dlg.DoModal();\r
2649                                 }\r
2650                                 theApp.DoWaitCursor(-1);\r
2651                         }\r
2652                         break;\r
2653                 case ID_POPPROPS:\r
2654                         {\r
2655                                 DialogEnableWindow(IDOK, FALSE);\r
2656                                 SetPromptApp(&theApp);\r
2657                                 theApp.DoWaitCursor(1);\r
2658                                 CString filepath;\r
2659                                 if (Git::PathIsURL(m_path))\r
2660                                 {\r
2661                                         filepath = m_path.GetGitPathString();\r
2662                                 }\r
2663                                 else\r
2664                                 {\r
2665                                         filepath = GetURLFromPath(m_path);\r
2666                                         if (filepath.IsEmpty())\r
2667                                         {\r
2668                                                 theApp.DoWaitCursor(-1);\r
2669                                                 CString temp;\r
2670                                                 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
2671                                                 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
2672                                                 TRACE(_T("could not retrieve the URL of the file!\n"));\r
2673                                                 EnableOKButton();\r
2674                                                 break;\r
2675                                         }\r
2676                                 }\r
2677                                 filepath = GetRepositoryRoot(CTGitPath(filepath));\r
2678                                 filepath += changedpaths[0];\r
2679                                 CPropDlg dlg;\r
2680                                 dlg.m_rev = rev1;\r
2681                                 dlg.m_Path = CTGitPath(filepath);\r
2682                                 dlg.DoModal();\r
2683                                 EnableOKButton();\r
2684                                 theApp.DoWaitCursor(-1);\r
2685                         }\r
2686                         break;\r
2687                 case ID_SAVEAS:\r
2688                         {\r
2689                                 DialogEnableWindow(IDOK, FALSE);\r
2690                                 SetPromptApp(&theApp);\r
2691                                 theApp.DoWaitCursor(1);\r
2692                                 CString filepath;\r
2693                                 if (Git::PathIsURL(m_path))\r
2694                                 {\r
2695                                         filepath = m_path.GetGitPathString();\r
2696                                 }\r
2697                                 else\r
2698                                 {\r
2699                                         filepath = GetURLFromPath(m_path);\r
2700                                         if (filepath.IsEmpty())\r
2701                                         {\r
2702                                                 theApp.DoWaitCursor(-1);\r
2703                                                 CString temp;\r
2704                                                 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
2705                                                 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
2706                                                 TRACE(_T("could not retrieve the URL of the file!\n"));\r
2707                                                 EnableOKButton();\r
2708                                                 break;\r
2709                                         }\r
2710                                 }\r
2711                                 m_bCancelled = false;\r
2712                                 CString sRoot = GetRepositoryRoot(CTGitPath(filepath));\r
2713                                 // if more than one entry is selected, we save them\r
2714                                 // one by one into a folder the user has selected\r
2715                                 bool bTargetSelected = false;\r
2716                                 CTGitPath TargetPath;\r
2717                                 if (m_ChangedFileListCtrl.GetSelectedCount() > 1)\r
2718                                 {\r
2719                                         CBrowseFolder browseFolder;\r
2720                                         browseFolder.SetInfo(CString(MAKEINTRESOURCE(IDS_LOG_SAVEFOLDERTOHINT)));\r
2721                                         browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;\r
2722                                         CString strSaveAsDirectory;\r
2723                                         if (browseFolder.Show(GetSafeHwnd(), strSaveAsDirectory) == CBrowseFolder::OK) \r
2724                                         {\r
2725                                                 TargetPath = CTGitPath(strSaveAsDirectory);\r
2726                                                 bTargetSelected = true;\r
2727                                         }\r
2728                                 }\r
2729                                 else\r
2730                                 {\r
2731                                         // Display the Open dialog box. \r
2732                                         CString revFilename;\r
2733                                         CString temp;\r
2734                                         temp = CPathUtils::GetFileNameFromPath(changedpaths[0]);\r
2735                                         int rfind = temp.ReverseFind('.');\r
2736                                         if (rfind > 0)\r
2737                                                 revFilename.Format(_T("%s-%ld%s"), (LPCTSTR)temp.Left(rfind), rev1, (LPCTSTR)temp.Mid(rfind));\r
2738                                         else\r
2739                                                 revFilename.Format(_T("%s-%ld"), (LPCTSTR)temp, rev1);\r
2740                                         bTargetSelected = CAppUtils::FileOpenSave(revFilename, NULL, IDS_LOG_POPUP_SAVE, IDS_COMMONFILEFILTER, false, m_hWnd);\r
2741                                         TargetPath.SetFromWin(revFilename);\r
2742                                 }\r
2743                                 if (bTargetSelected)\r
2744                                 {\r
2745                                         CProgressDlg progDlg;\r
2746                                         progDlg.SetTitle(IDS_APPNAME);\r
2747                                         progDlg.SetAnimation(IDR_DOWNLOAD);\r
2748                                         for (std::vector<LogChangedPath*>::iterator it = changedlogpaths.begin(); it!= changedlogpaths.end(); ++it)\r
2749                                         {\r
2750                                                 GitRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;\r
2751 \r
2752                                                 CString sInfoLine;\r
2753                                                 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)getrev.ToString());\r
2754                                                 progDlg.SetLine(1, sInfoLine, true);\r
2755                                                 SetAndClearProgressInfo(&progDlg);\r
2756                                                 progDlg.ShowModeless(m_hWnd);\r
2757 \r
2758                                                 CTGitPath tempfile = TargetPath;\r
2759                                                 if (changedpaths.size() > 1)\r
2760                                                 {\r
2761                                                         // if multiple items are selected, then the TargetPath\r
2762                                                         // points to a folder and we have to append the filename\r
2763                                                         // to save to to that folder.\r
2764                                                         CString sName = (*it)->sPath;\r
2765                                                         int slashpos = sName.ReverseFind('/');\r
2766                                                         if (slashpos >= 0)\r
2767                                                                 sName = sName.Mid(slashpos);\r
2768                                                         tempfile.AppendPathString(sName);\r
2769                                                         // one problem here:\r
2770                                                         // a user could have selected multiple items which\r
2771                                                         // have the same filename but reside in different\r
2772                                                         // directories, e.g.\r
2773                                                         // /folder1/file1\r
2774                                                         // /folder2/file1\r
2775                                                         // in that case, the second 'file1' will overwrite\r
2776                                                         // the already saved 'file1'.\r
2777                                                         // \r
2778                                                         // we could maybe find the common root of all selected\r
2779                                                         // items and then create sub folders to save those files\r
2780                                                         // there.\r
2781                                                         // But I think we should just leave it that way: to check\r
2782                                                         // out multiple items at once, the better way is still to\r
2783                                                         // use the export command from the top pane of the log dialog.\r
2784                                                 }\r
2785                                                 filepath = sRoot + (*it)->sPath;\r
2786                                                 if (!Cat(CTGitPath(filepath), getrev, getrev, tempfile))\r
2787                                                 {\r
2788                                                         progDlg.Stop();\r
2789                                                         SetAndClearProgressInfo((HWND)NULL);\r
2790                                                         CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
2791                                                         EnableOKButton();\r
2792                                                         theApp.DoWaitCursor(-1);\r
2793                                                         break;\r
2794                                                 }\r
2795                                         }\r
2796                                         progDlg.Stop();\r
2797                                         SetAndClearProgressInfo((HWND)NULL);\r
2798                                 }\r
2799                                 EnableOKButton();\r
2800                                 theApp.DoWaitCursor(-1);\r
2801                         }\r
2802                         break;\r
2803                 case ID_OPENWITH:\r
2804                         bOpenWith = true;\r
2805                 case ID_OPEN:\r
2806                         {\r
2807                                 GitRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;\r
2808                                 Open(bOpenWith,changedpaths[0],getrev);\r
2809                         }\r
2810                         break;\r
2811                 case ID_BLAME:\r
2812                         {\r
2813                                 CString filepath;\r
2814                                 if (Git::PathIsURL(m_path))\r
2815                                 {\r
2816                                         filepath = m_path.GetGitPathString();\r
2817                                 }\r
2818                                 else\r
2819                                 {\r
2820                                         filepath = GetURLFromPath(m_path);\r
2821                                         if (filepath.IsEmpty())\r
2822                                         {\r
2823                                                 theApp.DoWaitCursor(-1);\r
2824                                                 CString temp;\r
2825                                                 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
2826                                                 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
2827                                                 TRACE(_T("could not retrieve the URL of the file!\n"));\r
2828                                                 EnableOKButton();\r
2829                                                 break;\r
2830                                         }\r
2831                                 }\r
2832                                 filepath = GetRepositoryRoot(CTGitPath(filepath));\r
2833                                 filepath += changedpaths[0];\r
2834                                 CBlameDlg dlg;\r
2835                                 dlg.EndRev = rev1;\r
2836                                 if (dlg.DoModal() == IDOK)\r
2837                                 {\r
2838                                         CBlame blame;\r
2839                                         CString tempfile;\r
2840                                         CString logfile;\r
2841                                         tempfile = blame.BlameToTempFile(CTGitPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);\r
2842                                         if (!tempfile.IsEmpty())\r
2843                                         {\r
2844                                                 if (dlg.m_bTextView)\r
2845                                                 {\r
2846                                                         //open the default text editor for the result file\r
2847                                                         CAppUtils::StartTextViewer(tempfile);\r
2848                                                 }\r
2849                                                 else\r
2850                                                 {\r
2851                                                         CString sParams = _T("/path:\"") + filepath + _T("\" ");\r
2852                                                         if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(filepath),sParams))\r
2853                                                         {\r
2854                                                                 break;\r
2855                                                         }\r
2856                                                 }\r
2857                                         }\r
2858                                         else\r
2859                                         {\r
2860                                                 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
2861                                         }\r
2862                                 }\r
2863                         }\r
2864                         break;\r
2865                 case ID_GETMERGELOGS:\r
2866                         bMergeLog = true;\r
2867                         // fall through\r
2868                 case ID_LOG:\r
2869                         {\r
2870                                 DialogEnableWindow(IDOK, FALSE);\r
2871                                 SetPromptApp(&theApp);\r
2872                                 theApp.DoWaitCursor(1);\r
2873                                 CString filepath;\r
2874                                 if (Git::PathIsURL(m_path))\r
2875                                 {\r
2876                                         filepath = m_path.GetGitPathString();\r
2877                                 }\r
2878                                 else\r
2879                                 {\r
2880                                         filepath = GetURLFromPath(m_path);\r
2881                                         if (filepath.IsEmpty())\r
2882                                         {\r
2883                                                 theApp.DoWaitCursor(-1);\r
2884                                                 CString temp;\r
2885                                                 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
2886                                                 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
2887                                                 TRACE(_T("could not retrieve the URL of the file!\n"));\r
2888                                                 EnableOKButton();\r
2889                                                 break;\r
2890                                         }\r
2891                                 }\r
2892                                 m_bCancelled = false;\r
2893                                 filepath = GetRepositoryRoot(CTGitPath(filepath));\r
2894                                 filepath += changedpaths[0];\r
2895                                 git_revnum_t logrev = rev1;\r
2896                                 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)\r
2897                                 {\r
2898                                         // if the item got deleted in this revision,\r
2899                                         // fetch the log from the previous revision where it\r
2900                                         // still existed.\r
2901                                         logrev--;\r
2902                                 }\r
2903                                 CString sCmd;\r
2904                                 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\" /startrev:%ld"), (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)filepath, logrev);\r
2905                                 if (bMergeLog)\r
2906                                         sCmd += _T(" /merge");\r
2907                                 CAppUtils::LaunchApplication(sCmd, NULL, false);\r
2908                                 EnableOKButton();\r
2909                                 theApp.DoWaitCursor(-1);\r
2910                         }\r
2911                         break;\r
2912                 case ID_VIEWPATHREV:\r
2913                         {\r
2914                                 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetSelectionMark()));\r
2915                                 GitRev rev = pLogEntry->Rev;\r
2916                                 CString relurl = changedpaths[0];\r
2917                                 CString url = m_ProjectProperties.sWebViewerPathRev;\r
2918                                 url.Replace(_T("%REVISION%"), rev.ToString());\r
2919                                 url.Replace(_T("%PATH%"), relurl);\r
2920                                 relurl = relurl.Mid(relurl.Find('/'));\r
2921                                 url.Replace(_T("%PATH1%"), relurl);\r
2922                                 if (!url.IsEmpty())\r
2923                                         ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);                                        \r
2924                         }\r
2925                         break;\r
2926 #endif\r
2927                 default:\r
2928                         break;\r
2929                 } // switch (cmd)\r
2930 \r
2931         } // if (popup.CreatePopupMenu())\r
2932 }\r
2933 #endif\r
2934 \r
2935 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
2936 {\r
2937         // the date control should not show the "today" button\r
2938         CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();\r
2939         if (pCtrl)\r
2940                 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));\r
2941         *pResult = 0;\r
2942 }\r
2943 \r
2944 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
2945 {\r
2946         // the date control should not show the "today" button\r
2947         CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();\r
2948         if (pCtrl)\r
2949                 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));\r
2950         *pResult = 0;\r
2951 }\r
2952 \r
2953 void CLogDlg::OnSize(UINT nType, int cx, int cy)\r
2954 {\r
2955         __super::OnSize(nType, cx, cy);\r
2956         //set range\r
2957         SetSplitterRange();\r
2958 }\r
2959 \r
2960 void CLogDlg::OnRefresh()\r
2961 {\r
2962         //if (GetDlgItem(IDC_GETALL)->IsWindowEnabled())\r
2963         ShowStartRef();\r
2964         {\r
2965                 m_limit = 0;\r
2966                 this->m_LogProgress.SetPos(0);\r
2967                 \r
2968                 Refresh (true);\r
2969         }\r
2970 }\r
2971 \r
2972 void CLogDlg::OnFind()\r
2973 {\r
2974         if (!m_pFindDialog)\r
2975         {\r
2976                 m_pFindDialog = new CFindReplaceDialog();\r
2977                 m_pFindDialog->Create(TRUE, NULL, NULL, FR_HIDEUPDOWN | FR_HIDEWHOLEWORD, this);                                                                        \r
2978         }\r
2979 }\r
2980 \r
2981 void CLogDlg::OnFocusFilter()\r
2982 {\r
2983         GetDlgItem(IDC_SEARCHEDIT)->SetFocus(); \r
2984 }\r
2985 \r
2986 void CLogDlg::OnEditCopy()\r
2987 {\r
2988         if (GetFocus() == &m_ChangedFileListCtrl)\r
2989                 CopyChangedSelectionToClipBoard();\r
2990         else\r
2991                 m_LogList.CopySelectionToClipBoard();\r
2992 }\r
2993 \r
2994 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)\r
2995 {\r
2996         // is the URL a relative one?\r
2997         if (url.Left(2).Compare(_T("^/")) == 0)\r
2998         {\r
2999                 // URL is relative to the repository root\r
3000                 CString url1 = m_sRepositoryRoot + url.Mid(1);\r
3001                 TCHAR buf[INTERNET_MAX_URL_LENGTH];\r
3002                 DWORD len = url.GetLength();\r
3003                 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)\r
3004                         return CString(buf, len);\r
3005                 return url1;\r
3006         }\r
3007         else if (url[0] == '/')\r
3008         {\r
3009                 // URL is relative to the server's hostname\r
3010                 CString sHost;\r
3011                 // find the server's hostname\r
3012                 int schemepos = m_sRepositoryRoot.Find(_T("//"));\r
3013                 if (schemepos >= 0)\r
3014                 {\r
3015                         sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));\r
3016                         CString url1 = sHost + url;\r
3017                         TCHAR buf[INTERNET_MAX_URL_LENGTH];\r
3018                         DWORD len = url.GetLength();\r
3019                         if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)\r
3020                                 return CString(buf, len);\r
3021                         return url1;\r
3022                 }\r
3023         }\r
3024         return url;\r
3025 }\r
3026 \r
3027 \r
3028 void CLogDlg::OnEnChangeSearchedit()\r
3029 {\r
3030         UpdateData();\r
3031         if (m_LogList.m_sFilterText.IsEmpty())\r
3032         {\r
3033                 CStoreSelection storeselection(this);\r
3034                 // clear the filter, i.e. make all entries appear\r
3035                 theApp.DoWaitCursor(1);\r
3036                 KillTimer(LOGFILTER_TIMER);\r
3037                 FillLogMessageCtrl(false);\r
3038                 m_LogList.StartFilter();\r
3039 #if 0\r
3040                 InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
3041                 m_arShownList.RemoveAll();\r
3042                 for (DWORD i=0; i<m_logEntries.size(); ++i)\r
3043                 {\r
3044                         if (IsEntryInDateRange(i))\r
3045                                 m_arShownList.Add(m_logEntries[i]);\r
3046                 }\r
3047                 InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
3048                 m_LogList.DeleteAllItems();\r
3049                 m_LogList.SetItemCountEx(ShownCountWithStopped());\r
3050                 m_LogList.RedrawItems(0, ShownCountWithStopped());\r
3051                 m_LogList.SetRedraw(false);\r
3052                 ResizeAllListCtrlCols();\r
3053                 m_LogList.SetRedraw(true);\r
3054 #endif\r
3055                 theApp.DoWaitCursor(-1);\r
3056                 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);\r
3057                 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);\r
3058                 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();\r
3059                 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));\r
3060                 return;\r
3061         }\r
3062         if (Validate(m_LogList.m_sFilterText))\r
3063                 SetTimer(LOGFILTER_TIMER, 1000, NULL);\r
3064         else\r
3065                 KillTimer(LOGFILTER_TIMER);\r
3066 \r
3067 }\r
3068 \r
3069 void CLogDlg::OnBnClickedAllBranch()\r
3070 {\r
3071         this->UpdateData();\r
3072 \r
3073         if(this->m_bAllBranch)\r
3074                 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;\r
3075         else\r
3076                 m_LogList.m_ShowMask&=~CGit::LOG_INFO_ALL_BRANCH;\r
3077 \r
3078         OnRefresh();\r
3079 \r
3080         FillLogMessageCtrl(false);\r
3081 }\r
3082 \r
3083 void CLogDlg::OnBnClickedBrowseRef()\r
3084 {\r
3085         CString newRef = CBrowseRefsDlg::PickRef(false,m_LogList.GetStartRef());        \r
3086         if(newRef.IsEmpty())\r
3087                 return;\r
3088 \r
3089         SetStartRef(newRef);\r
3090         ((CButton*)GetDlgItem(IDC_LOG_ALLBRANCH))->SetCheck(0);\r
3091 \r
3092         OnBnClickedAllBranch();\r
3093 }\r
3094 \r
3095 void CLogDlg::ShowStartRef()\r
3096 {\r
3097         //Show ref name on top\r
3098         if(!::IsWindow(m_hWnd))\r
3099                 return;\r
3100         if(m_bAllBranch)\r
3101         {\r
3102                 m_staticRef.SetWindowText(L"<All Branches>");\r
3103                 m_staticRef.Invalidate(TRUE);\r
3104                 return;\r
3105         }\r
3106 \r
3107         CString showStartRef = m_LogList.GetStartRef();\r
3108         if(showStartRef.IsEmpty())\r
3109         {\r
3110                 //Ref name is HEAD\r
3111                 if( g_Git.Run(L"git symbolic-ref HEAD",&showStartRef,CP_UTF8) )\r
3112                         showStartRef = _T("<No branch>");\r
3113                 showStartRef.Trim(L"\r\n\t ");\r
3114         }\r
3115 \r
3116 \r
3117         if(wcsncmp(showStartRef,L"refs/",5) == 0)\r
3118                 showStartRef = showStartRef.Mid(5);\r
3119         if(wcsncmp(showStartRef,L"heads/",6) == 0)\r
3120                 showStartRef = showStartRef.Mid(6);\r
3121 \r
3122         m_staticRef.SetWindowText(showStartRef);\r
3123         m_staticRef.Invalidate(TRUE);\r
3124 }\r
3125 \r
3126 void CLogDlg::SetStartRef(const CString& StartRef)\r
3127 {\r
3128         m_LogList.SetStartRef(StartRef);\r
3129 \r
3130         ShowStartRef();\r
3131 }\r
3132 \r
3133 \r
3134 \r
3135 void CLogDlg::OnBnClickedFirstParent()\r
3136 {\r
3137         this->UpdateData();\r
3138 \r
3139         if(this->m_bFirstParent)\r
3140                 m_LogList.m_ShowMask|=CGit::LOG_INFO_FIRST_PARENT;\r
3141         else\r
3142                 m_LogList.m_ShowMask&=~CGit::LOG_INFO_FIRST_PARENT;\r
3143 \r
3144         OnRefresh();\r
3145 \r
3146         FillLogMessageCtrl(false);\r
3147 \r
3148 }\r
3149 \r
3150 void CLogDlg::OnBnClickShowWholeProject()\r
3151 {\r
3152         this->UpdateData();\r
3153 \r
3154         if(this->m_bWholeProject)\r
3155         {\r
3156                 m_LogList.m_Path.Reset();\r
3157                 SetWindowText(m_sTitle + _T(" - ") + CString(_T("Whole Project")));\r
3158         }\r
3159         else\r
3160         {\r
3161                 m_LogList.m_Path=m_path;\r
3162                 if(!m_path.IsEmpty())\r
3163                         SetWindowText(m_sTitle + _T(" - ") + m_path.GetGitPathString());\r
3164         }\r
3165         \r
3166         OnRefresh();\r
3167 \r
3168         FillLogMessageCtrl(false);\r
3169 \r
3170 }\r