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.m_bShowWC = true;\r
 339         m_LogList.FetchLogAsync(this);\r
 340 \r
 341         GetDlgItem(IDC_LOGLIST)->SetFocus();\r
 342 \r
 343         ShowStartRef();\r
 344         return FALSE;\r
 345 }\r
 346 \r
 347 LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)\r
 348 {\r
 349         int cur=(int)wParam;\r
 350 \r
 351         if( cur == GITLOG_START )\r
 352         {\r
 353                 CString temp;\r
 354                 temp.LoadString(IDS_PROGRESSWAIT);\r
 355 \r
 356                 this->m_LogList.ShowText(temp, true);\r
 357 \r
 358                 // We use a progress bar while getting the logs \r
 359                 m_LogProgress.SetRange32(0, 100);\r
 360                 m_LogProgress.SetPos(0);\r
 361 \r
 362                 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);\r
 363 \r
 364                 //DialogEnableWindow(IDC_GETALL, FALSE);\r
 365                 //DialogEnableWindow(IDC_SHOWWHOLEPROJECT, FALSE);\r
 366                 //DialogEnableWindow(IDC_LOG_FIRSTPARENT, FALSE);\r
 367                 DialogEnableWindow(IDC_STATBUTTON, FALSE);\r
 368                 DialogEnableWindow(IDC_REFRESH, FALSE);\r
 369                 DialogEnableWindow(IDC_HIDEPATHS,FALSE);\r
 370                 \r
 371 \r
 372         }else if( cur == GITLOG_END)\r
 373         {\r
 374                 \r
 375                 //if (!m_bShowedAll)\r
 376                 DialogEnableWindow(IDC_SHOWWHOLEPROJECT, TRUE);\r
 377 \r
 378                 //DialogEnableWindow(IDC_GETALL, TRUE);\r
 379                 DialogEnableWindow(IDC_LOG_FIRSTPARENT, TRUE);\r
 380                 DialogEnableWindow(IDC_STATBUTTON, TRUE);\r
 381                 DialogEnableWindow(IDC_REFRESH, TRUE);\r
 382                 DialogEnableWindow(IDC_HIDEPATHS,TRUE);\r
 383 \r
 384 //              PostMessage(WM_TIMER, LOGFILTER_TIMER);\r
 385                 GetDlgItem(IDC_PROGRESS)->ShowWindow(FALSE);\r
 386                 //CTime time=m_LogList.GetOldestTime();\r
 387                 CTime begin,end;\r
 388                 m_LogList.GetTimeRange(begin,end);\r
 389                 m_DateFrom.SetTime(&begin);\r
 390                 m_DateTo.SetTime(&end);\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         \r
 622         Refresh (true);\r
 623 }\r
 624 \r
 625 void CLogDlg::Refresh (bool /*autoGoOnline*/)\r
 626 {\r
 627         m_limit = 0;\r
 628         m_LogList.Refresh();\r
 629         FillLogMessageCtrl(false);\r
 630 }\r
 631 \r
 632 \r
 633 \r
 634 BOOL CLogDlg::Cancel()\r
 635 {\r
 636         return m_bCancelled;\r
 637 }\r
 638 \r
 639 void CLogDlg::SaveSplitterPos()\r
 640 {\r
 641         if (!IsIconic())\r
 642         {\r
 643                 CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));\r
 644                 CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));\r
 645                 RECT rectSplitter;\r
 646                 m_wndSplitter1.GetWindowRect(&rectSplitter);\r
 647                 ScreenToClient(&rectSplitter);\r
 648                 regPos1 = rectSplitter.top;\r
 649                 m_wndSplitter2.GetWindowRect(&rectSplitter);\r
 650                 ScreenToClient(&rectSplitter);\r
 651                 regPos2 = rectSplitter.top;\r
 652         }\r
 653 }\r
 654 \r
 655 void CLogDlg::OnCancel()\r
 656 {\r
 657         // canceling means stopping the working thread if it's still running.\r
 658         if (this->IsThreadRunning())\r
 659         {\r
 660                 m_LogList.TerminateThread();\r
 661         }\r
 662         UpdateData();\r
 663         \r
 664         SaveSplitterPos();\r
 665         __super::OnCancel();\r
 666 }\r
 667 \r
 668 CString CLogDlg::MakeShortMessage(const CString& message)\r
 669 {\r
 670         bool bFoundShort = true;\r
 671         CString sShortMessage = m_ProjectProperties.GetLogSummary(message);\r
 672         if (sShortMessage.IsEmpty())\r
 673         {\r
 674                 bFoundShort = false;\r
 675                 sShortMessage = message;\r
 676         }\r
 677         // Remove newlines and tabs 'cause those are not shown nicely in the list control\r
 678         sShortMessage.Replace(_T("\r"), _T(""));\r
 679         sShortMessage.Replace(_T("\t"), _T(" "));\r
 680         \r
 681         // Suppose the first empty line separates 'summary' from the rest of the message.\r
 682         int found = sShortMessage.Find(_T("\n\n"));\r
 683         // To avoid too short 'short' messages \r
 684         // (e.g. if the message looks something like "Bugfix:\n\n*done this\n*done that")\r
 685         // only use the empty newline as a separator if it comes after at least 15 chars.\r
 686         if ((!bFoundShort)&&(found >= 15))\r
 687         {\r
 688                 sShortMessage = sShortMessage.Left(found);\r
 689         }\r
 690         sShortMessage.Replace('\n', ' ');\r
 691         return sShortMessage;\r
 692 }\r
 693 \r
 694 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
 695 {\r
 696 #if 0\r
 697         if (rev == SVN_INVALID_REVNUM)\r
 698         {\r
 699                 m_childCounter--;\r
 700                 return TRUE;\r
 701         }\r
 702 \r
 703         // this is the callback function which receives the data for every revision we ask the log for\r
 704         // we store this information here one by one.\r
 705         m_logcounter += 1;\r
 706         if (m_startrev == -1)\r
 707                 m_startrev = rev;\r
 708         if (m_limit != 0)\r
 709         {\r
 710                 m_limitcounter--;\r
 711                 m_LogProgress.SetPos(m_limit - m_limitcounter);\r
 712         }\r
 713         else if (m_startrev.IsNumber() && m_startrev.IsNumber())\r
 714                 m_LogProgress.SetPos((git_revnum_t)m_startrev-rev+(git_revnum_t)m_endrev);\r
 715         __time64_t ttime = time/1000000L;\r
 716         if (m_tTo < (DWORD)ttime)\r
 717                 m_tTo = (DWORD)ttime;\r
 718         if (m_tFrom > (DWORD)ttime)\r
 719                 m_tFrom = (DWORD)ttime;\r
 720         if ((m_lowestRev > rev)||(m_lowestRev < 0))\r
 721                 m_lowestRev = rev;\r
 722         // Add as many characters from the log message to the list control\r
 723         PLOGENTRYDATA pLogItem = new LOGENTRYDATA;\r
 724         pLogItem->bCopies = !!copies;\r
 725         \r
 726         // find out if this item was copied in the revision\r
 727         BOOL copiedself = FALSE;\r
 728         if (copies)\r
 729         {\r
 730                 for (INT_PTR cpPathIndex = 0; cpPathIndex < cpaths->GetCount(); ++cpPathIndex)\r
 731                 {\r
 732                         LogChangedPath * cpath = cpaths->GetAt(cpPathIndex);\r
 733                         if (!cpath->sCopyFromPath.IsEmpty() && (cpath->sPath.Compare(m_sSelfRelativeURL) == 0))\r
 734                         {\r
 735                                 // note: this only works if the log is fetched top-to-bottom\r
 736                                 // but since we do that, it shouldn't be a problem\r
 737                                 m_sSelfRelativeURL = cpath->sCopyFromPath;\r
 738                                 copiedself = TRUE;\r
 739                                 break;\r
 740                         }\r
 741                 }\r
 742         }\r
 743         pLogItem->bCopiedSelf = copiedself;\r
 744         pLogItem->tmDate = ttime;\r
 745         pLogItem->sAuthor = author;\r
 746         pLogItem->sDate = date;\r
 747         pLogItem->sShortMessage = MakeShortMessage(message);\r
 748         pLogItem->dwFileChanges = filechanges;\r
 749         pLogItem->actions = actions;\r
 750         pLogItem->haschildren = haschildren;\r
 751         pLogItem->childStackDepth = m_childCounter;\r
 752         m_maxChild = max(m_childCounter, m_maxChild);\r
 753         if (haschildren)\r
 754                 m_childCounter++;\r
 755         pLogItem->sBugIDs = m_ProjectProperties.FindBugID(message).Trim();\r
 756         \r
 757         // split multi line log entries and concatenate them\r
 758         // again but this time with \r\n as line separators\r
 759         // so that the edit control recognizes them\r
 760         try\r
 761         {\r
 762                 if (message.GetLength()>0)\r
 763                 {\r
 764                         m_sMessageBuf = message;\r
 765                         m_sMessageBuf.Replace(_T("\n\r"), _T("\n"));\r
 766                         m_sMessageBuf.Replace(_T("\r\n"), _T("\n"));\r
 767                         if (m_sMessageBuf.Right(1).Compare(_T("\n"))==0)\r
 768                                 m_sMessageBuf = m_sMessageBuf.Left(m_sMessageBuf.GetLength()-1);\r
 769                 }\r
 770                 else\r
 771                         m_sMessageBuf.Empty();\r
 772         pLogItem->sMessage = m_sMessageBuf;\r
 773         pLogItem->Rev = rev;\r
 774 \r
 775         // move-construct path array\r
 776 \r
 777         pLogItem->pArChangedPaths = new LogChangedPathArray (*cpaths);\r
 778         cpaths->RemoveAll();\r
 779         }\r
 780         catch (CException * e)\r
 781         {\r
 782                 ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR);\r
 783                 e->Delete();\r
 784                 m_bCancelled = TRUE;\r
 785         }\r
 786         m_logEntries.push_back(pLogItem);\r
 787         m_arShownList.Add(pLogItem);\r
 788 #endif\r
 789         return TRUE;\r
 790 }\r
 791 \r
 792 GitRev g_rev;\r
 793 //this is the thread function which calls the subversion function\r
 794 \r
 795 \r
 796 \r
 797 \r
 798 void CLogDlg::CopyChangedSelectionToClipBoard()\r
 799 {\r
 800 \r
 801         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
 802         if (pos == NULL)\r
 803                 return; // nothing is selected, get out of here\r
 804 \r
 805         CString sPaths;\r
 806 \r
 807 //      CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
 808 //      if (pos)\r
 809         {\r
 810                 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();\r
 811                 while (pos)\r
 812                 {\r
 813                         int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);\r
 814                         CTGitPath *path = (CTGitPath*)m_ChangedFileListCtrl.GetItemData(nItem);\r
 815                         if(path)\r
 816                                 sPaths += path->GetGitPathString();\r
 817                         sPaths += _T("\r\n");\r
 818                 }\r
 819         }\r
 820 #if 0\r
 821         else\r
 822         {\r
 823                 // only one revision is selected in the log dialog top pane\r
 824                 // but multiple items could be selected  in the changed items list\r
 825                 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();\r
 826                 while (pos)\r
 827                 {\r
 828                         int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);\r
 829                         LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);\r
 830 \r
 831                         if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)\r
 832                         {\r
 833                                 // some items are hidden! So find out which item the user really selected\r
 834                                 INT_PTR selRealIndex = -1;\r
 835                                 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)\r
 836                                 {\r
 837                                         if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)\r
 838                                                 selRealIndex++;\r
 839                                         if (selRealIndex == nItem)\r
 840                                         {\r
 841                                                 changedlogpath = pLogEntry->pArChangedPaths->GetAt(hiddenindex);\r
 842                                                 break;\r
 843                                         }\r
 844                                 }\r
 845                         }\r
 846                         if (changedlogpath)\r
 847                         {\r
 848                                 sPaths += changedlogpath->sPath;\r
 849                                 sPaths += _T("\r\n");\r
 850                         }\r
 851                 }\r
 852         }\r
 853 #endif\r
 854         sPaths.Trim();\r
 855         CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());\r
 856 \r
 857 }\r
 858 \r
 859 BOOL CLogDlg::IsDiffPossible(LogChangedPath * /*changedpath*/, git_revnum_t rev)\r
 860 {\r
 861 #if 0\r
 862         CString added, deleted;\r
 863         if (changedpath == NULL)\r
 864                 return false;\r
 865 \r
 866         if ((rev > 1)&&(changedpath->action != LOGACTIONS_DELETED))\r
 867         {\r
 868                 if (changedpath->action == LOGACTIONS_ADDED) // file is added\r
 869                 {\r
 870                         if (changedpath->lCopyFromRev == 0)\r
 871                                 return FALSE; // but file was not added with history\r
 872                 }\r
 873                 return TRUE;\r
 874         }\r
 875 #endif\r
 876         return FALSE;\r
 877 }\r
 878 \r
 879 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)\r
 880 {\r
 881         // we have two separate context menus:\r
 882         // one shown on the log message list control,\r
 883         // the other shown in the changed-files list control\r
 884         int selCount = m_LogList.GetSelectedCount();\r
 885         if (pWnd == &m_LogList)\r
 886         {\r
 887                 //ShowContextMenuForRevisions(pWnd, point);\r
 888         }\r
 889         else if (pWnd == &m_ChangedFileListCtrl)\r
 890         {\r
 891                 //ShowContextMenuForChangedpaths(pWnd, point);\r
 892         }\r
 893         else if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))\r
 894         {\r
 895                 POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
 896                 int selIndex = -1;\r
 897                 if (pos)\r
 898                         selIndex = m_LogList.GetNextSelectedItem(pos);\r
 899                 if ((point.x == -1) && (point.y == -1))\r
 900                 {\r
 901                         CRect rect;\r
 902                         GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);\r
 903                         ClientToScreen(&rect);\r
 904                         point = rect.CenterPoint();\r
 905                 }\r
 906                 CString sMenuItemText;\r
 907                 CMenu popup;\r
 908                 if (popup.CreatePopupMenu())\r
 909                 {\r
 910                         // add the 'default' entries\r
 911                         sMenuItemText.LoadString(IDS_SCIEDIT_COPY);\r
 912                         popup.AppendMenu(MF_STRING | MF_ENABLED, WM_COPY, sMenuItemText);\r
 913                         sMenuItemText.LoadString(IDS_SCIEDIT_SELECTALL);\r
 914                         popup.AppendMenu(MF_STRING | MF_ENABLED, EM_SETSEL, sMenuItemText);\r
 915 \r
 916                         //if (selIndex >= 0)\r
 917                         //{\r
 918                         //      popup.AppendMenu(MF_SEPARATOR);\r
 919                         //      sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);\r
 920                         //      popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);\r
 921                         //}\r
 922 \r
 923                         int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
 924                         switch (cmd)\r
 925                         {\r
 926                         case 0:\r
 927                                 break;  // no command selected\r
 928                         case EM_SETSEL:\r
 929                         case WM_COPY:\r
 930                                 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);\r
 931                                 break;\r
 932                         case CGitLogList::ID_EDITAUTHOR:\r
 933                                 EditLogMessage(selIndex);\r
 934                                 break;\r
 935                         }\r
 936                 }\r
 937         }\r
 938 }\r
 939 \r
 940 \r
 941 LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)\r
 942 {\r
 943 #if 0\r
 944     ASSERT(m_pFindDialog != NULL);\r
 945 \r
 946     if (m_pFindDialog->IsTerminating())\r
 947     {\r
 948             // invalidate the handle identifying the dialog box.\r
 949         m_pFindDialog = NULL;\r
 950         return 0;\r
 951     }\r
 952 \r
 953     if(m_pFindDialog->FindNext())\r
 954     {\r
 955         //read data from dialog\r
 956         CString FindText = m_pFindDialog->GetFindString();\r
 957         bool bMatchCase = (m_pFindDialog->MatchCase() == TRUE);\r
 958                 bool bFound = false;\r
 959                 tr1::wregex pat;\r
 960                 bool bRegex = ValidateRegexp(FindText, pat, bMatchCase);\r
 961 \r
 962                 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_not_null;\r
 963 \r
 964                 int i;\r
 965                 for (i = this->m_nSearchIndex; i<m_arShownList.GetCount()&&!bFound; i++)\r
 966                 {\r
 967                         if (bRegex)\r
 968                         {\r
 969                                 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));\r
 970 \r
 971                                 if (regex_search(wstring((LPCTSTR)pLogEntry->sMessage), pat, flags))\r
 972                                 {\r
 973                                         bFound = true;\r
 974                                         break;\r
 975                                 }\r
 976                                 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;\r
 977                                 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)\r
 978                                 {\r
 979                                         LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
 980                                         if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags))\r
 981                                         {\r
 982                                                 bFound = true;\r
 983                                                 --i;\r
 984                                                 break;\r
 985                                         }\r
 986                                         if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags))\r
 987                                         {\r
 988                                                 bFound = true;\r
 989                                                 --i;\r
 990                                                 break;\r
 991                                         }\r
 992                                 }\r
 993                         }\r
 994                         else\r
 995                         {\r
 996                                 if (bMatchCase)\r
 997                                 {\r
 998                                         if (m_logEntries[i]->sMessage.Find(FindText) >= 0)\r
 999                                         {\r
1000                                                 bFound = true;\r
1001                                                 break;\r
1002                                         }\r
1003                                         PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));\r
1004                                         LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;\r
1005                                         for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)\r
1006                                         {\r
1007                                                 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
1008                                                 if (cpath->sCopyFromPath.Find(FindText)>=0)\r
1009                                                 {\r
1010                                                         bFound = true;\r
1011                                                         --i;\r
1012                                                         break;\r
1013                                                 }\r
1014                                                 if (cpath->sPath.Find(FindText)>=0)\r
1015                                                 {\r
1016                                                         bFound = true;\r
1017                                                         --i;\r
1018                                                         break;\r
1019                                                 }\r
1020                                         }\r
1021                                 }\r
1022                                 else\r
1023                                 {\r
1024                                     PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));\r
1025                                         CString msg = pLogEntry->sMessage;\r
1026                                         msg = msg.MakeLower();\r
1027                                         CString find = FindText.MakeLower();\r
1028                                         if (msg.Find(find) >= 0)\r
1029                                         {\r
1030                                                 bFound = TRUE;\r
1031                                                 break;\r
1032                                         }\r
1033                                         LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;\r
1034                                         for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)\r
1035                                         {\r
1036                                                 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
1037                                                 CString lowerpath = cpath->sCopyFromPath;\r
1038                                                 lowerpath.MakeLower();\r
1039                                                 if (lowerpath.Find(find)>=0)\r
1040                                                 {\r
1041                                                         bFound = TRUE;\r
1042                                                         --i;\r
1043                                                         break;\r
1044                                                 }\r
1045                                                 lowerpath = cpath->sPath;\r
1046                                                 lowerpath.MakeLower();\r
1047                                                 if (lowerpath.Find(find)>=0)\r
1048                                                 {\r
1049                                                         bFound = TRUE;\r
1050                                                         --i;\r
1051                                                         break;\r
1052                                                 }\r
1053                                         }\r
1054                                 } \r
1055                         }\r
1056                 } // for (i = this->m_nSearchIndex; i<m_arShownList.GetItemCount()&&!bFound; i++)\r
1057                 if (bFound)\r
1058                 {\r
1059                         this->m_nSearchIndex = (i+1);\r
1060                         m_LogList.EnsureVisible(i, FALSE);\r
1061                         m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);\r
1062                         m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);\r
1063                         m_LogList.SetSelectionMark(i);\r
1064                         FillLogMessageCtrl();\r
1065                         UpdateData(FALSE);\r
1066                         m_nSearchIndex++;\r
1067                         if (m_nSearchIndex >= m_arShownList.GetCount())\r
1068                                 m_nSearchIndex = (int)m_arShownList.GetCount()-1;\r
1069                 }\r
1070     } // if(m_pFindDialog->FindNext()) \r
1071         UpdateLogInfoLabel();\r
1072 #endif\r
1073     return 0;\r
1074 }\r
1075 \r
1076 void CLogDlg::OnOK()\r
1077 {\r
1078         // since the log dialog is also used to select revisions for other\r
1079         // dialogs, we have to do some work before closing this dialog\r
1080         if (GetFocus() != GetDlgItem(IDOK))\r
1081                 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter\r
1082 \r
1083         \r
1084         if (this->IsThreadRunning())\r
1085         {\r
1086                 m_LogList.TerminateThread();\r
1087         }\r
1088         UpdateData();\r
1089         // check that one and only one row is selected\r
1090         if (m_LogList.GetSelectedCount() == 1)\r
1091         {\r
1092                 // get the selected row\r
1093                 POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
1094                 int selIndex = m_LogList.GetNextSelectedItem(pos);\r
1095                 if (selIndex < m_LogList.m_arShownList.GetCount())\r
1096                 {\r
1097                         // all ok, pick up the revision\r
1098                         GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));\r
1099                         // extract the hash\r
1100                         m_sSelectedHash = pLogEntry->m_CommitHash;\r
1101                 }\r
1102         }\r
1103         UpdateData(FALSE);\r
1104         SaveSplitterPos();\r
1105         __super::OnOK();\r
1106         \r
1107         #if 0 \r
1108         if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))\r
1109                 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.\r
1110 \r
1111         CString temp;\r
1112         CString buttontext;\r
1113         GetDlgItemText(IDOK, buttontext);\r
1114         temp.LoadString(IDS_MSGBOX_CANCEL);\r
1115         if (temp.Compare(buttontext) != 0)\r
1116                 __super::OnOK();        // only exit if the button text matches, and that will match only if the thread isn't running anymore\r
1117         m_bCancelled = TRUE;\r
1118         m_selectedRevs.Clear();\r
1119         m_selectedRevsOneRange.Clear();\r
1120         if (m_pNotifyWindow)\r
1121         {\r
1122                 int selIndex = m_LogList.GetSelectionMark();\r
1123                 if (selIndex >= 0)\r
1124                 {       \r
1125                     PLOGENTRYDATA pLogEntry = NULL;\r
1126                         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
1127                         pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
1128                         m_selectedRevs.AddRevision(pLogEntry->Rev);\r
1129                         git_revnum_t lowerRev = pLogEntry->Rev;\r
1130                         git_revnum_t higherRev = lowerRev;\r
1131                         while (pos)\r
1132                         {\r
1133                             pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
1134                                 git_revnum_t rev = pLogEntry->Rev;\r
1135                                 m_selectedRevs.AddRevision(pLogEntry->Rev);\r
1136                                 if (lowerRev > rev)\r
1137                                         lowerRev = rev;\r
1138                                 if (higherRev < rev)\r
1139                                         higherRev = rev;\r
1140                         }\r
1141                         if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())\r
1142                         {\r
1143                                 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);\r
1144                         }\r
1145                         BOOL bSentMessage = FALSE;\r
1146                         if (m_LogList.GetSelectedCount() == 1)\r
1147                         {\r
1148                                 // if only one revision is selected, check if the path/url with which the dialog was started\r
1149                                 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.\r
1150                                 // if it was copied, use the copy from revision as lowerRev\r
1151                                 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))\r
1152                                 {\r
1153                                         CString sUrl = m_path.GetGitPathString();\r
1154                                         if (!m_path.IsUrl())\r
1155                                         {\r
1156                                                 sUrl = GetURLFromPath(m_path);\r
1157                                         }\r
1158                                         sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());\r
1159                                         for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)\r
1160                                         {\r
1161                                                 LogChangedPath * pData = pLogEntry->pArChangedPaths->GetAt(cp);\r
1162                                                 if (pData)\r
1163                                                 {\r
1164                                                         if (sUrl.Compare(pData->sPath) == 0)\r
1165                                                         {\r
1166                                                                 if (!pData->sCopyFromPath.IsEmpty())\r
1167                                                                 {\r
1168                                                                         lowerRev = pData->lCopyFromRev;\r
1169                                                                         m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);\r
1170                                                                         m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);\r
1171                                                                         m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);\r
1172                                                                         bSentMessage = TRUE;\r
1173                                                                 }\r
1174                                                         }\r
1175                                                 }\r
1176                                         }\r
1177                                 }\r
1178                         }\r
1179                         if ( !bSentMessage )\r
1180                         {\r
1181                                 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);\r
1182                                 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);\r
1183                                 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);\r
1184                                 if (m_selectedRevsOneRange.GetCount())\r
1185                                         m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);\r
1186                         }\r
1187                 }\r
1188         }\r
1189         UpdateData();\r
1190         CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));\r
1191         reg = m_btnShow.GetCurrentEntry();\r
1192         SaveSplitterPos();\r
1193 #endif \r
1194 }\r
1195 \r
1196 void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
1197 {\r
1198         // a double click on an entry in the changed-files list has happened\r
1199         *pResult = 0;\r
1200 \r
1201         DiffSelectedFile();\r
1202 }\r
1203 \r
1204 void CLogDlg::DiffSelectedFile()\r
1205 {\r
1206 #if 0\r
1207         if (m_bThreadRunning)\r
1208                 return;\r
1209         UpdateLogInfoLabel();\r
1210         INT_PTR selIndex = m_ChangedFileListCtrl.GetSelectionMark();\r
1211         if (selIndex < 0)\r
1212                 return;\r
1213         if (m_ChangedFileListCtrl.GetSelectedCount() == 0)\r
1214                 return;\r
1215         // find out if there's an entry selected in the log list\r
1216         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
1217         PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
1218         git_revnum_t rev1 = pLogEntry->Rev;\r
1219         git_revnum_t rev2 = rev1;\r
1220         if (pos)\r
1221         {\r
1222                 while (pos)\r
1223                 {\r
1224                         // there's at least a second entry selected in the log list: several revisions selected!\r
1225                         pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
1226                         if (pLogEntry)\r
1227                         {\r
1228                                 rev1 = max(rev1,(long)pLogEntry->Rev);\r
1229                                 rev2 = min(rev2,(long)pLogEntry->Rev);\r
1230                         }\r
1231                 }\r
1232                 rev2--;\r
1233                 // now we have both revisions selected in the log list, so we can do a diff of the selected\r
1234                 // entry in the changed files list with these two revisions.\r
1235                 DoDiffFromLog(selIndex, rev1, rev2, false, false);\r
1236         }\r
1237         else\r
1238         {\r
1239                 rev2 = rev1-1;\r
1240                 // nothing or only one revision selected in the log list\r
1241                 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);\r
1242 \r
1243                 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)\r
1244                 {\r
1245                         // some items are hidden! So find out which item the user really clicked on\r
1246                         INT_PTR selRealIndex = -1;\r
1247                         for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)\r
1248                         {\r
1249                                 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)\r
1250                                         selRealIndex++;\r
1251                                 if (selRealIndex == selIndex)\r
1252                                 {\r
1253                                         selIndex = hiddenindex;\r
1254                                         changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);\r
1255                                         break;\r
1256                                 }\r
1257                         }\r
1258                 }\r
1259 \r
1260                 if (IsDiffPossible(changedpath, rev1))\r
1261                 {\r
1262                         // diffs with renamed files are possible\r
1263                         if ((changedpath)&&(!changedpath->sCopyFromPath.IsEmpty()))\r
1264                                 rev2 = changedpath->lCopyFromRev;\r
1265                         else\r
1266                         {\r
1267                                 // if the path was modified but the parent path was 'added with history'\r
1268                                 // then we have to use the copy from revision of the parent path\r
1269                                 CTGitPath cpath = CTGitPath(changedpath->sPath);\r
1270                                 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)\r
1271                                 {\r
1272                                         CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);\r
1273                                         if (p.IsAncestorOf(cpath))\r
1274                                         {\r
1275                                                 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())\r
1276                                                         rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;\r
1277                                         }\r
1278                                 }\r
1279                         }\r
1280                         DoDiffFromLog(selIndex, rev1, rev2, false, false);\r
1281                 }\r
1282                 else \r
1283                 {\r
1284                         CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));\r
1285                         CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));\r
1286                         GitRev r = rev1;\r
1287                         // deleted files must be opened from the revision before the deletion\r
1288                         if (changedpath->action == LOGACTIONS_DELETED)\r
1289                                 r = rev1-1;\r
1290                         m_bCancelled = false;\r
1291 \r
1292                         CProgressDlg progDlg;\r
1293                         progDlg.SetTitle(IDS_APPNAME);\r
1294                         progDlg.SetAnimation(IDR_DOWNLOAD);\r
1295                         CString sInfoLine;\r
1296                         sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)(m_sRepositoryRoot + changedpath->sPath), (LPCTSTR)r.ToString());\r
1297                         progDlg.SetLine(1, sInfoLine, true);\r
1298                         SetAndClearProgressInfo(&progDlg);\r
1299                         progDlg.ShowModeless(m_hWnd);\r
1300 \r
1301                         if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))\r
1302                         {\r
1303                                 m_bCancelled = false;\r
1304                                 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), GitRev::REV_HEAD, r, tempfile))\r
1305                                 {\r
1306                                         progDlg.Stop();\r
1307                                         SetAndClearProgressInfo((HWND)NULL);\r
1308                                         CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
1309                                         return;\r
1310                                 }\r
1311                         }\r
1312                         progDlg.Stop();\r
1313                         SetAndClearProgressInfo((HWND)NULL);\r
1314 \r
1315                         CString sName1, sName2;\r
1316                         sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1);\r
1317                         sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1-1);\r
1318                         CAppUtils::DiffFlags flags;\r
1319                         flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
1320                         if (changedpath->action == LOGACTIONS_DELETED)\r
1321                                 CAppUtils::StartExtDiff(tempfile, tempfile2, sName2, sName1, flags);\r
1322                         else\r
1323                                 CAppUtils::StartExtDiff(tempfile2, tempfile, sName2, sName1, flags);\r
1324                 }\r
1325         }\r
1326 #endif \r
1327 }\r
1328 \r
1329 \r
1330 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool blame, bool unified)\r
1331 {\r
1332         DialogEnableWindow(IDOK, FALSE);\r
1333 //      SetPromptApp(&theApp);\r
1334         theApp.DoWaitCursor(1);\r
1335 \r
1336         CString temppath;\r
1337         GetTempPath(temppath);\r
1338         \r
1339         CString file1;\r
1340         file1.Format(_T("%s%s_%s%s"),\r
1341                                 temppath,                                               \r
1342                                 (*m_currentChangedArray)[selIndex].GetBaseFilename(),\r
1343                                 rev1->m_CommitHash.Left(6),\r
1344                                 (*m_currentChangedArray)[selIndex].GetFileExtension());\r
1345 \r
1346         CString file2;\r
1347         file2.Format(_T("%s\\%s_%s%s"),\r
1348                                 temppath,                                               \r
1349                                 (*m_currentChangedArray)[selIndex].GetBaseFilename(),\r
1350                                 rev2->m_CommitHash.Left(6),\r
1351                                 (*m_currentChangedArray)[selIndex].GetFileExtension());\r
1352 \r
1353         CString cmd;\r
1354 \r
1355         cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());\r
1356         g_Git.RunLogFile(cmd,file1);\r
1357         cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());\r
1358         g_Git.RunLogFile(cmd,file2);\r
1359 \r
1360         CAppUtils::DiffFlags flags;\r
1361         CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),flags);\r
1362 \r
1363 #if 0\r
1364         //get the filename\r
1365         CString filepath;\r
1366         if (Git::PathIsURL(m_path))\r
1367         {\r
1368                 filepath = m_path.GetGitPathString();\r
1369         }\r
1370         else\r
1371         {\r
1372                 filepath = GetURLFromPath(m_path);\r
1373                 if (filepath.IsEmpty())\r
1374                 {\r
1375                         theApp.DoWaitCursor(-1);\r
1376                         CString temp;\r
1377                         temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
1378                         CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
1379                         TRACE(_T("could not retrieve the URL of the file!\n"));\r
1380                         EnableOKButton();\r
1381                         theApp.DoWaitCursor(-11);\r
1382                         return;         //exit\r
1383                 }\r
1384         }\r
1385         m_bCancelled = FALSE;\r
1386         filepath = GetRepositoryRoot(CTGitPath(filepath));\r
1387 \r
1388         CString firstfile, secondfile;\r
1389         if (m_LogList.GetSelectedCount()==1)\r
1390         {\r
1391                 int s = m_LogList.GetSelectionMark();\r
1392                 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(s));\r
1393                 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);\r
1394                 firstfile = changedpath->sPath;\r
1395                 secondfile = firstfile;\r
1396                 if ((rev2 == rev1-1)&&(changedpath->lCopyFromRev > 0)) // is it an added file with history?\r
1397                 {\r
1398                         secondfile = changedpath->sCopyFromPath;\r
1399                         rev2 = changedpath->lCopyFromRev;\r
1400                 }\r
1401         }\r
1402         else\r
1403         {\r
1404                 firstfile = m_currentChangedPathList[selIndex].GetGitPathString();\r
1405                 secondfile = firstfile;\r
1406         }\r
1407 \r
1408         firstfile = filepath + firstfile.Trim();\r
1409         secondfile = filepath + secondfile.Trim();\r
1410 \r
1411         GitDiff diff(this, this->m_hWnd, true);\r
1412         diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
1413         diff.SetHEADPeg(m_LogRevision);\r
1414         if (unified)\r
1415         {\r
1416                 if (PromptShown())\r
1417                         diff.ShowUnifiedDiff(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1);\r
1418                 else\r
1419                         CAppUtils::StartShowUnifiedDiff(m_hWnd, CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), m_LogRevision);\r
1420         }\r
1421         else\r
1422         {\r
1423                 if (diff.ShowCompare(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), false, blame))\r
1424                 {\r
1425                         if (firstfile.Compare(secondfile)==0)\r
1426                         {\r
1427                                 git_revnum_t baseRev = 0;\r
1428                                 diff.DiffProps(CTGitPath(firstfile), rev2, rev1, baseRev);\r
1429                         }\r
1430                 }\r
1431         }\r
1432 \r
1433 #endif\r
1434 \r
1435         theApp.DoWaitCursor(-1);\r
1436         EnableOKButton();\r
1437 }\r
1438 \r
1439 BOOL CLogDlg::Open(bool /*bOpenWith*/,CString changedpath, git_revnum_t rev)\r
1440 {\r
1441 #if 0\r
1442         DialogEnableWindow(IDOK, FALSE);\r
1443         SetPromptApp(&theApp);\r
1444         theApp.DoWaitCursor(1);\r
1445         CString filepath;\r
1446         if (Git::PathIsURL(m_path))\r
1447         {\r
1448                 filepath = m_path.GetGitPathString();\r
1449         }\r
1450         else\r
1451         {\r
1452                 filepath = GetURLFromPath(m_path);\r
1453                 if (filepath.IsEmpty())\r
1454                 {\r
1455                         theApp.DoWaitCursor(-1);\r
1456                         CString temp;\r
1457                         temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
1458                         CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
1459                         TRACE(_T("could not retrieve the URL of the file!\n"));\r
1460                         EnableOKButton();\r
1461                         return FALSE;\r
1462                 }\r
1463         }\r
1464         m_bCancelled = false;\r
1465         filepath = GetRepositoryRoot(CTGitPath(filepath));\r
1466         filepath += changedpath;\r
1467 \r
1468         CProgressDlg progDlg;\r
1469         progDlg.SetTitle(IDS_APPNAME);\r
1470         progDlg.SetAnimation(IDR_DOWNLOAD);\r
1471         CString sInfoLine;\r
1472         sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)GitRev(rev).ToString());\r
1473         progDlg.SetLine(1, sInfoLine, true);\r
1474         SetAndClearProgressInfo(&progDlg);\r
1475         progDlg.ShowModeless(m_hWnd);\r
1476 \r
1477         CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(filepath), rev);\r
1478         m_bCancelled = false;\r
1479         if (!Cat(CTGitPath(filepath), GitRev(rev), rev, tempfile))\r
1480         {\r
1481                 progDlg.Stop();\r
1482                 SetAndClearProgressInfo((HWND)NULL);\r
1483                 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
1484                 EnableOKButton();\r
1485                 theApp.DoWaitCursor(-1);\r
1486                 return FALSE;\r
1487         }\r
1488         progDlg.Stop();\r
1489         SetAndClearProgressInfo((HWND)NULL);\r
1490         SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);\r
1491         if (!bOpenWith)\r
1492         {\r
1493                 int ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);\r
1494                 if (ret <= HINSTANCE_ERROR)\r
1495                         bOpenWith = true;\r
1496         }\r
1497         if (bOpenWith)\r
1498         {\r
1499                 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");\r
1500                 cmd += tempfile.GetWinPathString() + _T(" ");\r
1501                 CAppUtils::LaunchApplication(cmd, NULL, false);\r
1502         }\r
1503         EnableOKButton();\r
1504         theApp.DoWaitCursor(-1);\r
1505 #endif\r
1506         return TRUE;\r
1507 }\r
1508 \r
1509 void CLogDlg::EditAuthor(const CLogDataVector& /*logs*/)\r
1510 {\r
1511 #if 0\r
1512         CString url;\r
1513         CString name;\r
1514         if (logs.size() == 0)\r
1515                 return;\r
1516         DialogEnableWindow(IDOK, FALSE);\r
1517         SetPromptApp(&theApp);\r
1518         theApp.DoWaitCursor(1);\r
1519         if (Git::PathIsURL(m_path))\r
1520                 url = m_path.GetGitPathString();\r
1521         else\r
1522         {\r
1523                 url = GetURLFromPath(m_path);\r
1524         }\r
1525         name = Git_PROP_REVISION_AUTHOR;\r
1526 \r
1527         CString value = RevPropertyGet(name, CTGitPath(url), logs[0]->Rev);\r
1528         CString sOldValue = value;\r
1529         value.Replace(_T("\n"), _T("\r\n"));\r
1530         CInputDlg dlg(this);\r
1531         dlg.m_sHintText.LoadString(IDS_LOG_AUTHOR);\r
1532         dlg.m_sInputText = value;\r
1533         dlg.m_sTitle.LoadString(IDS_LOG_AUTHOREDITTITLE);\r
1534         dlg.m_pProjectProperties = &m_ProjectProperties;\r
1535         dlg.m_bUseLogWidth = false;\r
1536         if (dlg.DoModal() == IDOK)\r
1537         {\r
1538                 dlg.m_sInputText.Replace(_T("\r"), _T(""));\r
1539 \r
1540                 LogCache::CCachedLogInfo* toUpdate \r
1541                         = GetLogCache (CTGitPath (m_sRepositoryRoot));\r
1542 \r
1543                 CProgressDlg progDlg;\r
1544                 progDlg.SetTitle(IDS_APPNAME);\r
1545                 progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));\r
1546                 progDlg.SetTime(true);\r
1547                 progDlg.SetShowProgressBar(true);\r
1548                 progDlg.ShowModeless(m_hWnd);\r
1549                 for (DWORD i=0; i<logs.size(); ++i)\r
1550                 {\r
1551                         if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), logs[i]->Rev))\r
1552                         {\r
1553                                 progDlg.Stop();\r
1554                                 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
1555                                 break;\r
1556                         }\r
1557                         else\r
1558                         {\r
1559 \r
1560                                 logs[i]->sAuthor = dlg.m_sInputText;\r
1561                                 m_LogList.Invalidate();\r
1562 \r
1563                                 // update the log cache \r
1564 \r
1565                                 if (toUpdate != NULL)\r
1566                                 {\r
1567                                         // log caching is active\r
1568 \r
1569                                         LogCache::CCachedLogInfo newInfo;\r
1570                                         newInfo.Insert ( logs[i]->Rev\r
1571                                                 , (const char*) CUnicodeUtils::GetUTF8 (logs[i]->sAuthor)\r
1572                                                 , ""\r
1573                                                 , 0\r
1574                                                 , LogCache::CRevisionInfoContainer::HAS_AUTHOR);\r
1575 \r
1576                                         toUpdate->Update (newInfo);\r
1577                                 }\r
1578                         }\r
1579                         progDlg.SetProgress64(i, logs.size());\r
1580                 }\r
1581                 progDlg.Stop();\r
1582         }\r
1583         theApp.DoWaitCursor(-1);\r
1584         EnableOKButton();\r
1585 #endif\r
1586 }\r
1587 \r
1588 void CLogDlg::EditLogMessage(int /*index*/)\r
1589 {\r
1590 #if 0\r
1591         CString url;\r
1592         CString name;\r
1593         DialogEnableWindow(IDOK, FALSE);\r
1594         SetPromptApp(&theApp);\r
1595         theApp.DoWaitCursor(1);\r
1596         if (Git::PathIsURL(m_path))\r
1597                 url = m_path.GetGitPathString();\r
1598         else\r
1599         {\r
1600                 url = GetURLFromPath(m_path);\r
1601         }\r
1602         name = Git_PROP_REVISION_LOG;\r
1603 \r
1604         PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(index));\r
1605         m_bCancelled = FALSE;\r
1606         CString value = RevPropertyGet(name, CTGitPath(url), pLogEntry->Rev);\r
1607         CString sOldValue = value;\r
1608         value.Replace(_T("\n"), _T("\r\n"));\r
1609         CInputDlg dlg(this);\r
1610         dlg.m_sHintText.LoadString(IDS_LOG_MESSAGE);\r
1611         dlg.m_sInputText = value;\r
1612         dlg.m_sTitle.LoadString(IDS_LOG_MESSAGEEDITTITLE);\r
1613         dlg.m_pProjectProperties = &m_ProjectProperties;\r
1614         dlg.m_bUseLogWidth = true;\r
1615         if (dlg.DoModal() == IDOK)\r
1616         {\r
1617                 dlg.m_sInputText.Replace(_T("\r"), _T(""));\r
1618                 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), pLogEntry->Rev))\r
1619                 {\r
1620                         CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
1621                 }\r
1622                 else\r
1623                 {\r
1624                         pLogEntry->sShortMessage = MakeShortMessage(dlg.m_sInputText);\r
1625                         // split multi line log entries and concatenate them\r
1626                         // again but this time with \r\n as line separators\r
1627                         // so that the edit control recognizes them\r
1628                         if (dlg.m_sInputText.GetLength()>0)\r
1629                         {\r
1630                                 m_sMessageBuf = dlg.m_sInputText;\r
1631                                 dlg.m_sInputText.Replace(_T("\n\r"), _T("\n"));\r
1632                                 dlg.m_sInputText.Replace(_T("\r\n"), _T("\n"));\r
1633                                 if (dlg.m_sInputText.Right(1).Compare(_T("\n"))==0)\r
1634                                         dlg.m_sInputText = dlg.m_sInputText.Left(dlg.m_sInputText.GetLength()-1);\r
1635                         } \r
1636                         else\r
1637                                 dlg.m_sInputText.Empty();\r
1638                         pLogEntry->sMessage = dlg.m_sInputText;\r
1639                         pLogEntry->sBugIDs = m_ProjectProperties.FindBugID(dlg.m_sInputText);\r
1640                         CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);\r
1641                         pMsgView->SetWindowText(_T(" "));\r
1642                         pMsgView->SetWindowText(dlg.m_sInputText);\r
1643                         m_ProjectProperties.FindBugID(dlg.m_sInputText, pMsgView);\r
1644                         m_LogList.Invalidate();\r
1645         \r
1646             // update the log cache \r
1647 \r
1648             LogCache::CCachedLogInfo* toUpdate \r
1649                 = GetLogCache (CTGitPath (m_sRepositoryRoot));\r
1650             if (toUpdate != NULL)\r
1651             {\r
1652                 // log caching is active\r
1653 \r
1654                 LogCache::CCachedLogInfo newInfo;\r
1655                 newInfo.Insert ( pLogEntry->Rev\r
1656                                , ""\r
1657                                , (const char*) CUnicodeUtils::GetUTF8 (pLogEntry->sMessage)\r
1658                                , 0\r
1659                                , LogCache::CRevisionInfoContainer::HAS_COMMENT);\r
1660 \r
1661                 toUpdate->Update (newInfo);\r
1662             }\r
1663         }\r
1664         }\r
1665         theApp.DoWaitCursor(-1);\r
1666         EnableOKButton();\r
1667 #endif\r
1668 }\r
1669 \r
1670 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)\r
1671 {\r
1672         // Skip Ctrl-C when copying text out of the log message or search filter\r
1673         BOOL bSkipAccelerator = ( pMsg->message == WM_KEYDOWN && pMsg->wParam=='C' && (GetFocus()==GetDlgItem(IDC_MSGVIEW) || GetFocus()==GetDlgItem(IDC_SEARCHEDIT) ) && GetKeyState(VK_CONTROL)&0x8000 );\r
1674         if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')\r
1675         {\r
1676                 if (GetFocus()==GetDlgItem(IDC_LOGLIST))\r
1677                 {\r
1678                         if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))\r
1679                         {\r
1680                                 m_LogList.DiffSelectedRevWithPrevious();\r
1681                                 return TRUE;\r
1682                         }\r
1683                 }\r
1684                 if (GetFocus()==GetDlgItem(IDC_LOGMSG))\r
1685                 {\r
1686                         DiffSelectedFile();\r
1687                         return TRUE;\r
1688                 }\r
1689         }\r
1690         if (m_hAccel && !bSkipAccelerator)\r
1691         {\r
1692                 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);\r
1693                 if (ret)\r
1694                         return TRUE;\r
1695         }\r
1696         \r
1697         if(::IsWindow(m_tooltips.m_hWnd))\r
1698                 m_tooltips.RelayEvent(pMsg);\r
1699         return __super::PreTranslateMessage(pMsg);\r
1700 }\r
1701 \r
1702 \r
1703 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)\r
1704 {\r
1705         //if (this->IsThreadRunning())\r
1706         if(m_LogList.m_bNoDispUpdates)\r
1707         {\r
1708                 // only show the wait cursor over the list control\r
1709                 if ((pWnd)&&\r
1710                         ((pWnd == GetDlgItem(IDC_LOGLIST))||\r
1711                         (pWnd == GetDlgItem(IDC_MSGVIEW))||\r
1712                         (pWnd == GetDlgItem(IDC_LOGMSG))))\r
1713                 {\r
1714                         HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));\r
1715                         SetCursor(hCur);\r
1716                         return TRUE;\r
1717                 }\r
1718         }\r
1719         if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))\r
1720                 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);\r
1721 \r
1722         HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));\r
1723         SetCursor(hCur);\r
1724         return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);\r
1725 }\r
1726 \r
1727 void CLogDlg::OnBnClickedHelp()\r
1728 {\r
1729         OnHelp();\r
1730 }\r
1731 \r
1732 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)\r
1733 {\r
1734         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
1735         *pResult = 0;\r
1736         //if (this->IsThreadRunning())\r
1737         if(m_LogList.m_bNoDispUpdates)\r
1738                 return;\r
1739         if (pNMLV->iItem >= 0)\r
1740         {\r
1741                 m_nSearchIndex = pNMLV->iItem;\r
1742                 if (pNMLV->iSubItem != 0)\r
1743                         return;\r
1744                 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount()))\r
1745                 {\r
1746                         // remove the selected state\r
1747                         if (pNMLV->uChanged & LVIF_STATE)\r
1748                         {\r
1749                                 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);\r
1750                                 FillLogMessageCtrl();\r
1751                                 UpdateData(FALSE);\r
1752                                 UpdateLogInfoLabel();\r
1753                         }\r
1754                         return;\r
1755                 }\r
1756                 if (pNMLV->uChanged & LVIF_STATE)\r
1757                 {\r
1758                         FillLogMessageCtrl();\r
1759                         UpdateData(FALSE);\r
1760                 }\r
1761         }\r
1762         else\r
1763         {\r
1764                 FillLogMessageCtrl();\r
1765                 UpdateData(FALSE);\r
1766         }\r
1767         EnableOKButton();\r
1768         UpdateLogInfoLabel();\r
1769 }\r
1770 \r
1771 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)\r
1772 {\r
1773         ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);\r
1774         if (pEnLink->msg == WM_LBUTTONUP)\r
1775         {\r
1776                 CString url, msg;\r
1777                 GetDlgItemText(IDC_MSGVIEW, msg);\r
1778                 msg.Replace(_T("\r\n"), _T("\n"));\r
1779                 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);\r
1780                 if (!::PathIsURL(url))\r
1781                 {\r
1782                         url = m_ProjectProperties.GetBugIDUrl(url);\r
1783                         url = GetAbsoluteUrlFromRelativeUrl(url);\r
1784                 }\r
1785                 if (!url.IsEmpty())\r
1786                         ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);\r
1787         }\r
1788         *pResult = 0;\r
1789 }\r
1790 \r
1791 class CDateSorter\r
1792 {\r
1793 public:\r
1794         class CCommitPointer\r
1795         {\r
1796         public:\r
1797                 CCommitPointer():m_cont(NULL){}\r
1798                 CCommitPointer(const CCommitPointer& P_Right)\r
1799                 : m_cont(NULL)\r
1800                 {\r
1801                         *this = P_Right;\r
1802                 }\r
1803 \r
1804                 CCommitPointer& operator = (const CCommitPointer& P_Right)\r
1805                 {\r
1806                         if(IsPointer())\r
1807                         {\r
1808                                 (*m_cont->m_parDates)[m_place]                  = P_Right.GetDate();\r
1809                                 (*m_cont->m_parFileChanges)[m_place]    = P_Right.GetChanges();\r
1810                                 (*m_cont->m_parAuthors)[m_place]                = P_Right.GetAuthor();\r
1811                         }\r
1812                         else \r
1813                         {\r
1814                                 m_Date                                                          = P_Right.GetDate();\r
1815                                 m_Changes                                                       = P_Right.GetChanges();\r
1816                                 m_csAuthor                                                      = P_Right.GetAuthor();\r
1817                         }\r
1818                         return *this;\r
1819                 }\r
1820 \r
1821                 void Clone(const CCommitPointer& P_Right)\r
1822                 {\r
1823                         m_cont = P_Right.m_cont;\r
1824                         m_place = P_Right.m_place;\r
1825                         m_Date = P_Right.m_Date;\r
1826                         m_Changes = P_Right.m_Changes;\r
1827                         m_csAuthor = P_Right.m_csAuthor;\r
1828                 }\r
1829 \r
1830                 DWORD            GetDate()              const {return IsPointer() ? (*m_cont->m_parDates)[m_place] : m_Date;}\r
1831                 DWORD            GetChanges()   const {return IsPointer() ? (*m_cont->m_parFileChanges)[m_place] : m_Changes;}\r
1832                 CString          GetAuthor()    const {return IsPointer() ? (*m_cont->m_parAuthors)[m_place] : m_csAuthor;}\r
1833 \r
1834                 bool            IsPointer() const {return m_cont != NULL;}\r
1835                 //When pointer\r
1836                 CDateSorter* m_cont;\r
1837                 int                      m_place;\r
1838 \r
1839                 //When element\r
1840                 DWORD            m_Date;\r
1841                 DWORD            m_Changes;\r
1842                 CString          m_csAuthor;\r
1843 \r
1844         };\r
1845         class iterator : public std::iterator<std::random_access_iterator_tag, CCommitPointer>\r
1846         {\r
1847         public:\r
1848                 CCommitPointer m_ptr;\r
1849 \r
1850                 iterator(){}\r
1851                 iterator(const iterator& P_Right){*this = P_Right;}\r
1852                 iterator& operator=(const iterator& P_Right)\r
1853                 {\r
1854                         m_ptr.Clone(P_Right.m_ptr);\r
1855                         return *this;\r
1856                 }\r
1857 \r
1858                 CCommitPointer& operator*(){return m_ptr;}\r
1859                 CCommitPointer* operator->(){return &m_ptr;}\r
1860                 const CCommitPointer& operator*()const{return m_ptr;}\r
1861                 const CCommitPointer* operator->()const{return &m_ptr;}\r
1862 \r
1863                 iterator& operator+=(size_t P_iOffset){m_ptr.m_place += P_iOffset;return *this;}\r
1864                 iterator& operator-=(size_t P_iOffset){m_ptr.m_place -= P_iOffset;return *this;}\r
1865                 iterator operator+(size_t P_iOffset)const{iterator it(*this); it += P_iOffset;return it;}\r
1866                 iterator operator-(size_t P_iOffset)const{iterator it(*this); it -= P_iOffset;return it;}\r
1867 \r
1868                 iterator& operator++(){++m_ptr.m_place;return *this;}\r
1869                 iterator& operator--(){--m_ptr.m_place;return *this;}\r
1870                 iterator operator++(int){iterator it(*this);++*this;return it;}\r
1871                 iterator operator--(int){iterator it(*this);--*this;return it;}\r
1872 \r
1873                 size_t operator-(const iterator& P_itRight)const{return m_ptr.m_place - P_itRight->m_place;}\r
1874 \r
1875                 bool operator<(const iterator& P_itRight)const{return m_ptr.m_place < P_itRight->m_place;}\r
1876                 bool operator!=(const iterator& P_itRight)const{return m_ptr.m_place != P_itRight->m_place;}\r
1877                 bool operator==(const iterator& P_itRight)const{return m_ptr.m_place == P_itRight->m_place;}\r
1878                 bool operator>(const iterator& P_itRight)const{return m_ptr.m_place > P_itRight->m_place;}\r
1879         };\r
1880         iterator begin()\r
1881         {\r
1882                 iterator it;\r
1883                 it->m_place = 0;\r
1884                 it->m_cont = this;\r
1885                 return it;\r
1886         }\r
1887         iterator end()\r
1888         {\r
1889                 iterator it;\r
1890                 it->m_place = m_parDates->GetCount();\r
1891                 it->m_cont = this;\r
1892                 return it;\r
1893         }\r
1894 \r
1895         CDWordArray     *       m_parDates;\r
1896         CDWordArray     *       m_parFileChanges;\r
1897         CStringArray *  m_parAuthors;\r
1898 };\r
1899 \r
1900 class CDateSorterLess\r
1901 {\r
1902 public:\r
1903         bool operator () (const CDateSorter::CCommitPointer& P_Left, const CDateSorter::CCommitPointer& P_Right) const\r
1904         {\r
1905                 return P_Left.GetDate() > P_Right.GetDate(); //Last date first\r
1906         }\r
1907 \r
1908 };\r
1909 \r
1910 \r
1911 \r
1912 void CLogDlg::OnBnClickedStatbutton()\r
1913 {\r
1914 \r
1915         if (this->IsThreadRunning())\r
1916                 return;\r
1917         if (m_LogList.m_arShownList.IsEmpty())\r
1918                 return;         // nothing is shown, so no statistics.\r
1919         // the statistics dialog expects the log entries to be sorted by date\r
1920         SortByColumn(3, false);\r
1921         CPtrArray shownlist;\r
1922         m_LogList.RecalculateShownList(&shownlist);\r
1923         // create arrays which are aware of the current filter\r
1924         CStringArray m_arAuthorsFiltered;\r
1925         CDWordArray m_arDatesFiltered;\r
1926         CDWordArray m_arFileChangesFiltered;\r
1927         for (INT_PTR i=0; i<shownlist.GetCount(); ++i)\r
1928         {\r
1929                 GitRev* pLogEntry = reinterpret_cast<GitRev*>(shownlist.GetAt(i));\r
1930                 CString strAuthor = pLogEntry->m_AuthorName;\r
1931                 if ( strAuthor.IsEmpty() )\r
1932                 {\r
1933                         strAuthor.LoadString(IDS_STATGRAPH_EMPTYAUTHOR);\r
1934                 }\r
1935                 m_arAuthorsFiltered.Add(strAuthor);\r
1936                 m_arDatesFiltered.Add(pLogEntry->m_AuthorDate.GetTime());\r
1937                 m_arFileChangesFiltered.Add(pLogEntry->m_Files.GetCount());\r
1938         }\r
1939 \r
1940         CDateSorter W_Sorter;\r
1941         W_Sorter.m_parAuthors           = &m_arAuthorsFiltered;\r
1942         W_Sorter.m_parDates                     = &m_arDatesFiltered;\r
1943         W_Sorter.m_parFileChanges       = &m_arFileChangesFiltered;\r
1944         std::sort(W_Sorter.begin(), W_Sorter.end(), CDateSorterLess());\r
1945 \r
1946         CStatGraphDlg dlg;\r
1947         dlg.m_parAuthors = &m_arAuthorsFiltered;\r
1948         dlg.m_parDates = &m_arDatesFiltered;\r
1949         dlg.m_parFileChanges = &m_arFileChangesFiltered;\r
1950         dlg.m_path = m_path;\r
1951         dlg.DoModal();\r
1952         // restore the previous sorting\r
1953         SortByColumn(m_nSortColumn, m_bAscending);\r
1954         OnTimer(LOGFILTER_TIMER);\r
1955 \r
1956 }\r
1957 \r
1958 void CLogDlg::DoSizeV1(int delta)\r
1959 {\r
1960 \r
1961         RemoveAnchor(IDC_LOGLIST);\r
1962         RemoveAnchor(IDC_SPLITTERTOP);\r
1963         RemoveAnchor(IDC_MSGVIEW);\r
1964         RemoveAnchor(IDC_SPLITTERBOTTOM);\r
1965         RemoveAnchor(IDC_LOGMSG);\r
1966         CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);\r
1967         CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);\r
1968         AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);\r
1969         AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);\r
1970         AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);\r
1971         AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);\r
1972         AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);\r
1973         ArrangeLayout();\r
1974         AdjustMinSize();\r
1975         SetSplitterRange();\r
1976         m_LogList.Invalidate();\r
1977         GetDlgItem(IDC_MSGVIEW)->Invalidate();\r
1978 \r
1979 }\r
1980 \r
1981 void CLogDlg::DoSizeV2(int delta)\r
1982 {\r
1983 \r
1984         RemoveAnchor(IDC_LOGLIST);\r
1985         RemoveAnchor(IDC_SPLITTERTOP);\r
1986         RemoveAnchor(IDC_MSGVIEW);\r
1987         RemoveAnchor(IDC_SPLITTERBOTTOM);\r
1988         RemoveAnchor(IDC_LOGMSG);\r
1989         CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);\r
1990         CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);\r
1991         AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);\r
1992         AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);\r
1993         AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);\r
1994         AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);\r
1995         AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);\r
1996         ArrangeLayout();\r
1997         AdjustMinSize();\r
1998         SetSplitterRange();\r
1999         GetDlgItem(IDC_MSGVIEW)->Invalidate();\r
2000         m_ChangedFileListCtrl.Invalidate();\r
2001 \r
2002 }\r
2003 \r
2004 void CLogDlg::AdjustMinSize()\r
2005 {\r
2006         // adjust the minimum size of the dialog to prevent the resizing from\r
2007         // moving the list control too far down.\r
2008         CRect rcChgListView;\r
2009         m_ChangedFileListCtrl.GetClientRect(rcChgListView);\r
2010         CRect rcLogList;\r
2011         m_LogList.GetClientRect(rcLogList);\r
2012 \r
2013         SetMinTrackSize(CSize(m_DlgOrigRect.Width(), \r
2014                 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()\r
2015                 +rcChgListView.Height()+rcLogList.Height()+60));\r
2016 }\r
2017 \r
2018 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam) \r
2019 {\r
2020         switch (message) {\r
2021         case WM_NOTIFY:\r
2022                 if (wParam == IDC_SPLITTERTOP)\r
2023                 { \r
2024                         SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;\r
2025                         DoSizeV1(pHdr->delta);\r
2026                 }\r
2027                 else if (wParam == IDC_SPLITTERBOTTOM)\r
2028                 { \r
2029                         SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;\r
2030                         DoSizeV2(pHdr->delta);\r
2031                 }\r
2032                 break;\r
2033         }\r
2034 \r
2035         return CResizableDialog::DefWindowProc(message, wParam, lParam);\r
2036 }\r
2037 \r
2038 void CLogDlg::SetSplitterRange()\r
2039 {\r
2040         if ((m_LogList)&&(m_ChangedFileListCtrl))\r
2041         {\r
2042                 CRect rcTop;\r
2043                 m_LogList.GetWindowRect(rcTop);\r
2044                 ScreenToClient(rcTop);\r
2045                 CRect rcMiddle;\r
2046                 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);\r
2047                 ScreenToClient(rcMiddle);\r
2048                 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);\r
2049                 CRect rcBottom;\r
2050                 m_ChangedFileListCtrl.GetWindowRect(rcBottom);\r
2051                 ScreenToClient(rcBottom);\r
2052                 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);\r
2053         }\r
2054 }\r
2055 \r
2056 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)\r
2057 {\r
2058         // FIXME: x64 version would get this function called with unexpected parameters.\r
2059         if (!lParam)\r
2060                 return 0;\r
2061 \r
2062         RECT * rect = (LPRECT)lParam;\r
2063         CPoint point;\r
2064         CString temp;\r
2065         point = CPoint(rect->left, rect->bottom);\r
2066 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))\r
2067         CMenu popup;\r
2068         if (popup.CreatePopupMenu())\r
2069         {\r
2070                 temp.LoadString(IDS_LOG_FILTER_ALL);\r
2071                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ALL), LOGFILTER_ALL, temp);\r
2072 \r
2073                 popup.AppendMenu(MF_SEPARATOR, NULL);\r
2074                 \r
2075                 temp.LoadString(IDS_LOG_FILTER_MESSAGES);\r
2076                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);\r
2077                 temp.LoadString(IDS_LOG_FILTER_PATHS);\r
2078                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);\r
2079                 temp.LoadString(IDS_LOG_FILTER_AUTHORS);\r
2080                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);\r
2081                 temp.LoadString(IDS_LOG_FILTER_REVS);\r
2082                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);\r
2083                 temp.LoadString(IDS_LOG_FILTER_BUGIDS);\r
2084                 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);\r
2085                 \r
2086                 popup.AppendMenu(MF_SEPARATOR, NULL);\r
2087 \r
2088                 temp.LoadString(IDS_LOG_FILTER_REGEX);\r
2089                 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);\r
2090 \r
2091                 m_tooltips.Pop();\r
2092                 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
2093                 if (selection != 0)\r
2094                 {\r
2095 \r
2096                         if (selection == LOGFILTER_REGEX)\r
2097                         {\r
2098                                 m_bFilterWithRegex = !m_bFilterWithRegex;\r
2099                                 CRegDWORD b = CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);\r
2100                                 b = m_bFilterWithRegex;\r
2101                                 CheckRegexpTooltip();\r
2102                         }\r
2103                         else\r
2104                         {\r
2105                                 m_LogList.m_nSelectedFilter = selection;\r
2106                                 SetFilterCueText();\r
2107                         }\r
2108                         SetTimer(LOGFILTER_TIMER, 1000, NULL);\r
2109                 }\r
2110         }\r
2111         return 0L;\r
2112 }\r
2113 \r
2114 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)\r
2115 {\r
2116 \r
2117         KillTimer(LOGFILTER_TIMER);\r
2118 \r
2119         m_LogList.m_sFilterText.Empty();\r
2120         UpdateData(FALSE);\r
2121         theApp.DoWaitCursor(1);\r
2122         CStoreSelection storeselection(this);\r
2123         FillLogMessageCtrl(false);\r
2124 \r
2125         m_LogList.RemoveFilter();\r
2126 \r
2127         CTime begin,end;\r
2128         m_LogList.GetTimeRange(begin,end);\r
2129         m_DateFrom.SetTime(&begin);\r
2130         m_DateTo.SetTime(&end);\r
2131 \r
2132         theApp.DoWaitCursor(-1);\r
2133         GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);\r
2134         GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);\r
2135         GetDlgItem(IDC_SEARCHEDIT)->SetFocus();\r
2136         UpdateLogInfoLabel();\r
2137 \r
2138         return 0L;      \r
2139 }\r
2140 \r
2141 \r
2142 void CLogDlg::SetFilterCueText()\r
2143 {\r
2144         CString temp;\r
2145         switch (m_LogList.m_nSelectedFilter)\r
2146         {\r
2147         case LOGFILTER_ALL:\r
2148                 temp.LoadString(IDS_LOG_FILTER_ALL);\r
2149                 break;\r
2150         case LOGFILTER_MESSAGES:\r
2151                 temp.LoadString(IDS_LOG_FILTER_MESSAGES);\r
2152                 break;\r
2153         case LOGFILTER_PATHS:\r
2154                 temp.LoadString(IDS_LOG_FILTER_PATHS);\r
2155                 break;\r
2156         case LOGFILTER_AUTHORS:\r
2157                 temp.LoadString(IDS_LOG_FILTER_AUTHORS);\r
2158                 break;\r
2159         case LOGFILTER_REVS:\r
2160                 temp.LoadString(IDS_LOG_FILTER_REVS);\r
2161                 break;\r
2162         }\r
2163         // to make the cue banner text appear more to the right of the edit control\r
2164         temp = _T("   ")+temp;\r
2165         m_cFilter.SetCueBanner(temp);\r
2166 }\r
2167 \r
2168 bool CLogDlg::Validate(LPCTSTR string)\r
2169 {\r
2170         if (!m_bFilterWithRegex)\r
2171                 return true;\r
2172         tr1::wregex pat;\r
2173         return m_LogList.ValidateRegexp(string, pat, false);\r
2174 }\r
2175 \r
2176 \r
2177 void CLogDlg::OnTimer(UINT_PTR nIDEvent)\r
2178 {\r
2179         if (nIDEvent == LOGFILTER_TIMER)\r
2180         {\r
2181                 if (this->IsThreadRunning())\r
2182                 {\r
2183                         // thread still running! So just restart the timer.\r
2184                         SetTimer(LOGFILTER_TIMER, 1000, NULL);\r
2185                         return;\r
2186                 }\r
2187                 CWnd * focusWnd = GetFocus();\r
2188                 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))\r
2189                         && (focusWnd != GetDlgItem(IDC_LOGLIST)));\r
2190                 if (m_LogList.m_sFilterText.IsEmpty())\r
2191                 {\r
2192                         DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));\r
2193                         // do not return here!\r
2194                         // we also need to run the filter if the filter text is empty:\r
2195                         // 1. to clear an existing filter\r
2196                         // 2. to rebuild the m_arShownList after sorting\r
2197                 }\r
2198                 theApp.DoWaitCursor(1);\r
2199                 CStoreSelection storeselection(this);\r
2200                 KillTimer(LOGFILTER_TIMER);\r
2201                 FillLogMessageCtrl(false);\r
2202 \r
2203                 // now start filter the log list\r
2204                 m_LogList.StartFilter();\r
2205 \r
2206                 if ( m_LogList.GetItemCount()==1 )\r
2207                 {\r
2208                         m_LogList.SetSelectionMark(0);\r
2209                         m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);\r
2210                 }\r
2211                 theApp.DoWaitCursor(-1);\r
2212                 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);\r
2213                 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);\r
2214                 if (bSetFocusToFilterControl)\r
2215                         GetDlgItem(IDC_SEARCHEDIT)->SetFocus();\r
2216                 UpdateLogInfoLabel();\r
2217         } // if (nIDEvent == LOGFILTER_TIMER)\r
2218         DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));\r
2219         __super::OnTimer(nIDEvent);\r
2220 }\r
2221 \r
2222 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
2223 {\r
2224         CTime _time;\r
2225         m_DateTo.GetTime(_time);\r
2226         try\r
2227         {\r
2228                 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);\r
2229                 if (time.GetTime() != m_LogList.m_To.GetTime())\r
2230                 {\r
2231                         m_LogList.m_To = (DWORD)time.GetTime();\r
2232                         SetTimer(LOGFILTER_TIMER, 10, NULL);\r
2233                 }\r
2234         }\r
2235         catch (CAtlException)\r
2236         {\r
2237         }\r
2238         \r
2239         *pResult = 0;\r
2240 }\r
2241 \r
2242 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
2243 {\r
2244         CTime _time;\r
2245         m_DateFrom.GetTime(_time);\r
2246         try\r
2247         {\r
2248                 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);\r
2249                 if (time.GetTime() != m_LogList.m_From.GetTime())\r
2250                 {\r
2251                         m_LogList.m_From = (DWORD)time.GetTime();\r
2252                         SetTimer(LOGFILTER_TIMER, 10, NULL);\r
2253                 }\r
2254         }\r
2255         catch (CAtlException)\r
2256         {\r
2257         }\r
2258         \r
2259         *pResult = 0;\r
2260 }\r
2261 \r
2262 \r
2263 \r
2264 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)\r
2265 {\r
2266         CTGitPathList pathList;\r
2267 #if 0\r
2268         \r
2269         if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))\r
2270         {\r
2271                 m_sRepositoryRoot = GetRepositoryRoot(m_path);\r
2272         }\r
2273         if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))\r
2274                 return pathList;\r
2275         \r
2276         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
2277         if (pos != NULL)\r
2278         {\r
2279                 while (pos)\r
2280                 {\r
2281                         int nextpos = m_LogList.GetNextSelectedItem(pos);\r
2282                         if (nextpos >= m_arShownList.GetCount())\r
2283                                 continue;\r
2284                         PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(nextpos));\r
2285                         LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;\r
2286                         for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)\r
2287                         {\r
2288                                 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
2289                                 if (cpath == NULL)\r
2290                                         continue;\r
2291                                 CTGitPath path;\r
2292                                 if (!bRelativePaths)\r
2293                                         path.SetFromGit(m_sRepositoryRoot);\r
2294                                 path.AppendPathString(cpath->sPath);\r
2295                                 if ((!bUseFilter)||\r
2296                                         ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||\r
2297                                         (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))\r
2298                                         pathList.AddPath(path);\r
2299                                 \r
2300                         }\r
2301                 }\r
2302         }\r
2303         pathList.RemoveDuplicates();\r
2304 #endif\r
2305         return pathList;\r
2306 }\r
2307 \r
2308 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)\r
2309 {\r
2310 #if 0\r
2311         switch(nSortColumn)\r
2312         {\r
2313         case 0: // Revision\r
2314                 {\r
2315                         if(bAscending)\r
2316                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());\r
2317                         else\r
2318                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());\r
2319                 }\r
2320                 break;\r
2321         case 1: // action\r
2322                 {\r
2323                         if(bAscending)\r
2324                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());\r
2325                         else\r
2326                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());\r
2327                 }\r
2328                 break;\r
2329         case 2: // Author\r
2330                 {\r
2331                         if(bAscending)\r
2332                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());\r
2333                         else\r
2334                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());\r
2335                 }\r
2336                 break;\r
2337         case 3: // Date\r
2338                 {\r
2339                         if(bAscending)\r
2340                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());\r
2341                         else\r
2342                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());\r
2343                 }\r
2344                 break;\r
2345         case 4: // Message or bug id\r
2346                 if (m_bShowBugtraqColumn)\r
2347                 {\r
2348                         if(bAscending)\r
2349                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());\r
2350                         else\r
2351                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());\r
2352                         break;\r
2353                 }\r
2354                 // fall through here\r
2355         case 5: // Message\r
2356                 {\r
2357                         if(bAscending)\r
2358                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());\r
2359                         else\r
2360                                 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());\r
2361                 }\r
2362                 break;\r
2363         default:\r
2364                 ATLASSERT(0);\r
2365                 break;\r
2366         }\r
2367 #endif\r
2368 }\r
2369 \r
2370 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)\r
2371 {\r
2372         if (this->IsThreadRunning())\r
2373                 return;         //no sorting while the arrays are filled\r
2374 #if 0\r
2375         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
2376         const int nColumn = pNMLV->iSubItem;\r
2377         m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;\r
2378         m_nSortColumn = nColumn;\r
2379         SortByColumn(m_nSortColumn, m_bAscending);\r
2380         SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);\r
2381         SortShownListArray();\r
2382         m_LogList.Invalidate();\r
2383         UpdateLogInfoLabel();\r
2384 #endif\r
2385         *pResult = 0;\r
2386 }\r
2387 \r
2388 void CLogDlg::SortShownListArray()\r
2389 {\r
2390         // make sure the shown list still matches the filter after sorting.\r
2391     OnTimer(LOGFILTER_TIMER);\r
2392     // clear the selection states\r
2393         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
2394         while (pos)\r
2395         {\r
2396                 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);\r
2397         }    \r
2398         m_LogList.SetSelectionMark(-1);\r
2399 }\r
2400 \r
2401 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)\r
2402 {\r
2403         if (control == NULL)\r
2404                 return;\r
2405         // set the sort arrow\r
2406         CHeaderCtrl * pHeader = control->GetHeaderCtrl();\r
2407         HDITEM HeaderItem = {0};\r
2408         HeaderItem.mask = HDI_FORMAT;\r
2409         for (int i=0; i<pHeader->GetItemCount(); ++i)\r
2410         {\r
2411                 pHeader->GetItem(i, &HeaderItem);\r
2412                 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);\r
2413                 pHeader->SetItem(i, &HeaderItem);\r
2414         }\r
2415         if (nColumn >= 0)\r
2416         {\r
2417                 pHeader->GetItem(nColumn, &HeaderItem);\r
2418                 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);\r
2419                 pHeader->SetItem(nColumn, &HeaderItem);\r
2420         }\r
2421 }\r
2422 void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR* /*pNMHDR*/, LRESULT* /*pResult*/)\r
2423 {\r
2424 #if 0\r
2425         if (this->IsThreadRunning())\r
2426                 return;         //no sorting while the arrays are filled\r
2427         if (m_currentChangedArray == NULL)\r
2428                 return;\r
2429         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
2430         const int nColumn = pNMLV->iSubItem;\r
2431         m_bAscendingPathList = nColumn == m_nSortColumnPathList ? !m_bAscendingPathList : TRUE;\r
2432         m_nSortColumnPathList = nColumn;\r
2433 //      qsort(m_currentChangedArray->GetData(), m_currentChangedArray->GetSize(), sizeof(LogChangedPath*), (GENERICCOMPAREFN)SortCompare);\r
2434 \r
2435         SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);\r
2436         m_ChangedFileListCtrl.Invalidate();\r
2437         *pResult = 0;\r
2438 #endif\r
2439 }\r
2440 \r
2441 int CLogDlg::m_nSortColumnPathList = 0;\r
2442 bool CLogDlg::m_bAscendingPathList = false;\r
2443 \r
2444 int CLogDlg::SortCompare(const void * /*pElem1*/, const void * /*pElem2*/)\r
2445 {\r
2446 #if 0\r
2447         LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);\r
2448         LogChangedPath * cpath2 = *((LogChangedPath**)pElem2);\r
2449 \r
2450         if (m_bAscendingPathList)\r
2451                 std::swap (cpath1, cpath2);\r
2452 \r
2453         int cmp = 0;\r
2454         switch (m_nSortColumnPathList)\r
2455         {\r
2456         case 0: // action\r
2457                         cmp = cpath2->GetAction().Compare(cpath1->GetAction());\r
2458                         if (cmp)\r
2459                                 return cmp;\r
2460                         // fall through\r
2461         case 1: // path\r
2462                         cmp = cpath2->sPath.CompareNoCase(cpath1->sPath);\r
2463                         if (cmp)\r
2464                                 return cmp;\r
2465                         // fall through\r
2466         case 2: // copy from path\r
2467                         cmp = cpath2->sCopyFromPath.Compare(cpath1->sCopyFromPath);\r
2468                         if (cmp)\r
2469                                 return cmp;\r
2470                         // fall through\r
2471         case 3: // copy from revision\r
2472                         return cpath2->lCopyFromRev > cpath1->lCopyFromRev;\r
2473         }\r
2474 #endif\r
2475         return 0;\r
2476 }\r
2477 \r
2478 void CLogDlg::OnBnClickedHidepaths()\r
2479 {\r
2480         FillLogMessageCtrl();\r
2481         m_ChangedFileListCtrl.Invalidate();\r
2482 }\r
2483 \r
2484 \r
2485 \r
2486 void CLogDlg::OnBnClickedCheckStoponcopy()\r
2487 {\r
2488 #if 0\r
2489         if (!GetDlgItem(IDC_GETALL)->IsWindowEnabled())\r
2490                 return;\r
2491 \r
2492         // ignore old fetch limits when switching\r
2493         // between copy-following and stop-on-copy\r
2494         // (otherwise stop-on-copy will limit what\r
2495         // we see immediately after switching to\r
2496         // copy-following)\r
2497 \r
2498         m_endrev = 0;\r
2499 \r
2500         // now, restart the query\r
2501 #endif\r
2502         Refresh();\r
2503 }\r
2504 \r
2505 \r
2506 void CLogDlg::UpdateLogInfoLabel()\r
2507 {\r
2508 \r
2509         git_revnum_t rev1 ;\r
2510         git_revnum_t rev2 ;\r
2511         long selectedrevs = 0;\r
2512         int count =m_LogList.m_arShownList.GetCount();\r
2513         if (count)\r
2514         {\r
2515                 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(0)))->m_CommitHash;\r
2516                 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));\r
2517                 rev2 =  (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(count-1)))->m_CommitHash;\r
2518                 selectedrevs = m_LogList.GetSelectedCount();\r
2519         }\r
2520         CString sTemp;\r
2521         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
2522         m_sLogInfo = sTemp;\r
2523 \r
2524         UpdateData(FALSE);\r
2525 }\r
2526 \r
2527 #if 0\r
2528 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)\r
2529 {\r
2530 \r
2531         int selIndex = m_ChangedFileListCtrl.GetSelectionMark();\r
2532         if ((point.x == -1) && (point.y == -1))\r
2533         {\r
2534                 CRect rect;\r
2535                 m_ChangedFileListCtrl.GetItemRect(selIndex, &rect, LVIR_LABEL);\r
2536                 m_ChangedFileListCtrl.ClientToScreen(&rect);\r
2537                 point = rect.CenterPoint();\r
2538         }\r
2539         if (selIndex < 0)\r
2540                 return;\r
2541         int s = m_LogList.GetSelectionMark();\r
2542         if (s < 0)\r
2543                 return;\r
2544         std::vector<CString> changedpaths;\r
2545         std::vector<LogChangedPath*> changedlogpaths;\r
2546         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
2547         if (pos == NULL)\r
2548                 return; // nothing is selected, get out of here\r
2549 \r
2550         bool bOneRev = true;\r
2551         int sel=m_LogList.GetNextSelectedItem(pos);\r
2552         GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel));\r
2553         GitRev * rev1 = pLogEntry;\r
2554         GitRev * rev2 = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel+1));\r
2555 #if 0\r
2556         bool bOneRev = true;\r
2557         if (pos)\r
2558         {\r
2559                 while (pos)\r
2560                 {\r
2561                         pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
2562                         if (pLogEntry)\r
2563                         {\r
2564                                 rev1 = max(rev1,(git_revnum_t)pLogEntry->Rev);\r
2565                                 rev2 = min(rev2,(git_revnum_t)pLogEntry->Rev);\r
2566                                 bOneRev = false;\r
2567                         }                               \r
2568                 }\r
2569                 if (!bOneRev)\r
2570                         rev2--;\r
2571                 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();\r
2572                 while (pos)\r
2573                 {\r
2574                         int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);\r
2575                         changedpaths.push_back(m_currentChangedPathList[nItem].GetGitPathString());\r
2576                 }\r
2577         }\r
2578         else\r
2579         {\r
2580                 // only one revision is selected in the log dialog top pane\r
2581                 // but multiple items could be selected  in the changed items list\r
2582                 rev2 = rev1-1;\r
2583 \r
2584                 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();\r
2585                 while (pos)\r
2586                 {\r
2587                         int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);\r
2588                         LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);\r
2589 \r
2590                         if (m_ChangedFileListCtrl.GetSelectedCount() == 1)\r
2591                         {\r
2592                                 if ((changedlogpath)&&(!changedlogpath->sCopyFromPath.IsEmpty()))\r
2593                                         rev2 = changedlogpath->lCopyFromRev;\r
2594                                 else\r
2595                                 {\r
2596                                         // if the path was modified but the parent path was 'added with history'\r
2597                                         // then we have to use the copy from revision of the parent path\r
2598                                         CTGitPath cpath = CTGitPath(changedlogpath->sPath);\r
2599                                         for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)\r
2600                                         {\r
2601                                                 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);\r
2602                                                 if (p.IsAncestorOf(cpath))\r
2603                                                 {\r
2604                                                         if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())\r
2605                                                                 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;\r
2606                                                 }\r
2607                                         }\r
2608                                 }\r
2609                         }\r
2610                         if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)\r
2611                         {\r
2612                                 // some items are hidden! So find out which item the user really clicked on\r
2613                                 INT_PTR selRealIndex = -1;\r
2614                                 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)\r
2615                                 {\r
2616                                         if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)\r
2617                                                 selRealIndex++;\r
2618                                         if (selRealIndex == nItem)\r
2619                                         {\r
2620                                                 selIndex = hiddenindex;\r
2621                                                 changedlogpath = pLogEntry->pArChangedPaths->GetAt(selIndex);\r
2622                                                 break;\r
2623                                         }\r
2624                                 }\r
2625                         }\r
2626                         if (changedlogpath)\r
2627                         {\r
2628                                 changedpaths.push_back(changedlogpath->sPath);\r
2629                                 changedlogpaths.push_back(changedlogpath);\r
2630                         }\r
2631                 }\r
2632         }\r
2633 #endif\r
2634         //entry is selected, now show the popup menu\r
2635         CIconMenu popup;\r
2636         if (popup.CreatePopupMenu())\r
2637         {\r
2638                 bool bEntryAdded = false;\r
2639                 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)\r
2640                 {\r
2641 //                      if ((!bOneRev)||(IsDiffPossible(changedlogpaths[0], rev1)))\r
2642                         {\r
2643                                 popup.AppendMenuIcon(CGitLogList::ID_DIFF, IDS_LOG_POPUP_DIFF, IDI_DIFF);\r
2644                                 popup.AppendMenuIcon(CGitLogList::ID_BLAMEDIFF, IDS_LOG_POPUP_BLAMEDIFF, IDI_BLAME);\r
2645                                 popup.SetDefaultItem(CGitLogList::ID_DIFF, FALSE);\r
2646                                 popup.AppendMenuIcon(CGitLogList::ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF);\r
2647                                 bEntryAdded = true;\r
2648                         }\r
2649 //                      if (rev2 == rev1-1)\r
2650                         {\r
2651                                 if (bEntryAdded)\r
2652                                         popup.AppendMenu(MF_SEPARATOR, NULL);\r
2653                                 popup.AppendMenuIcon(CGitLogList::ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);\r
2654                                 popup.AppendMenuIcon(CGitLogList::ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);\r
2655                                 popup.AppendMenuIcon(CGitLogList::ID_BLAME, IDS_LOG_POPUP_BLAME, IDI_BLAME);\r
2656                                 popup.AppendMenu(MF_SEPARATOR, NULL);\r
2657                                 if (m_hasWC)\r
2658                                         popup.AppendMenuIcon(CGitLogList::ID_REVERTREV, IDS_LOG_POPUP_REVERTREV, IDI_REVERT);\r
2659                                 popup.AppendMenuIcon(CGitLogList::ID_POPPROPS, IDS_REPOBROWSE_SHOWPROP, IDI_PROPERTIES);                        // "Show Properties"\r
2660                                 popup.AppendMenuIcon(CGitLogList::ID_LOG, IDS_MENULOG, IDI_LOG);                                                // "Show Log"                           \r
2661                                 popup.AppendMenuIcon(CGitLogList::ID_GETMERGELOGS, IDS_LOG_POPUP_GETMERGELOGS, IDI_LOG);                // "Show merge log"\r
2662                                 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);\r
2663                                 bEntryAdded = true;\r
2664                                 if (!m_ProjectProperties.sWebViewerPathRev.IsEmpty())\r
2665                                 {\r
2666                                         popup.AppendMenu(MF_SEPARATOR, NULL);\r
2667                                         popup.AppendMenuIcon(CGitLogList::ID_VIEWPATHREV, IDS_LOG_POPUP_VIEWPATHREV);\r
2668                                 }\r
2669                                 if (popup.GetDefaultItem(0,FALSE)==-1)\r
2670                                         popup.SetDefaultItem(CGitLogList::ID_OPEN, FALSE);\r
2671                         }\r
2672                 }\r
2673                 else if (changedlogpaths.size())\r
2674                 {\r
2675                         // more than one entry is selected\r
2676                         popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE);\r
2677                         bEntryAdded = true;\r
2678                 }\r
2679 \r
2680                 if (!bEntryAdded)\r
2681                         return;\r
2682                 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
2683                 bool bOpenWith = false;\r
2684                 bool bMergeLog = false;\r
2685                 m_bCancelled = false;\r
2686                 \r
2687                 switch (cmd)\r
2688                 {\r
2689                 case CGitLogList::ID_DIFF:\r
2690                         {\r
2691                                 DoDiffFromLog(selIndex, rev1, rev2, false, false);\r
2692                         }\r
2693                         break;\r
2694 #if 0\r
2695                 case ID_BLAMEDIFF:\r
2696                         {\r
2697                                 DoDiffFromLog(selIndex, rev1, rev2, true, false);\r
2698                         }\r
2699                         break;\r
2700                 case ID_GNUDIFF1:\r
2701                         {\r
2702                                 DoDiffFromLog(selIndex, rev1, rev2, false, true);\r
2703                         }\r
2704                         break;\r
2705                 case ID_REVERTREV:\r
2706                         {\r
2707                                 SetPromptApp(&theApp);\r
2708                                 theApp.DoWaitCursor(1);\r
2709                                 CString sUrl;\r
2710                                 if (Git::PathIsURL(m_path))\r
2711                                 {\r
2712                                         sUrl = m_path.GetGitPathString();\r
2713                                 }\r
2714                                 else\r
2715                                 {\r
2716                                         sUrl = GetURLFromPath(m_path);\r
2717                                         if (sUrl.IsEmpty())\r
2718                                         {\r
2719                                                 theApp.DoWaitCursor(-1);\r
2720                                                 CString temp;\r
2721                                                 temp.Format(IDS_ERR_NOURLOFFILE, m_path.GetWinPath());\r
2722                                                 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
2723                                                 EnableOKButton();\r
2724                                                 theApp.DoWaitCursor(-1);\r
2725                                                 break;          //exit\r
2726                                         }\r
2727                                 }\r
2728                                 // find the working copy path of the selected item from the URL\r
2729                                 m_bCancelled = false;\r
2730                                 CString sUrlRoot = GetRepositoryRoot(CTGitPath(sUrl));\r
2731 \r
2732                                 CString fileURL = changedpaths[0];\r
2733                                 fileURL = sUrlRoot + fileURL.Trim();\r
2734                                 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1\r
2735                                 // sUrl = http://mydomain.com/repos/trunk/folder\r
2736                                 CString sUnescapedUrl = CPathUtils::PathUnescape(sUrl);\r
2737                                 // find out until which char the urls are identical\r
2738                                 int i=0;\r
2739                                 while ((i<fileURL.GetLength())&&(i<sUnescapedUrl.GetLength())&&(fileURL[i]==sUnescapedUrl[i]))\r
2740                                         i++;\r
2741                                 int leftcount = m_path.GetWinPathString().GetLength()-(sUnescapedUrl.GetLength()-i);\r
2742                                 CString wcPath = m_path.GetWinPathString().Left(leftcount);\r
2743                                 wcPath += fileURL.Mid(i);\r
2744                                 wcPath.Replace('/', '\\');\r
2745                                 CGitProgressDlg dlg;\r
2746                                 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)\r
2747                                 {\r
2748                                         // a deleted path! Since the path isn't there anymore, merge\r
2749                                         // won't work. So just do a copy url->wc\r
2750                                         dlg.SetCommand(CGitProgressDlg::GitProgress_Copy);\r
2751                                         dlg.SetPathList(CTGitPathList(CTGitPath(fileURL)));\r
2752                                         dlg.SetUrl(wcPath);\r
2753                                         dlg.SetRevision(rev2);\r
2754                                 }\r
2755                                 else\r
2756                                 {\r
2757                                         if (!PathFileExists(wcPath))\r
2758                                         {\r
2759                                                 // seems the path got renamed\r
2760                                                 // tell the user how to work around this.\r
2761                                                 CMessageBox::Show(this->m_hWnd, IDS_LOG_REVERTREV_ERROR, IDS_APPNAME, MB_ICONERROR);\r
2762                                                 EnableOKButton();\r
2763                                                 theApp.DoWaitCursor(-1);\r
2764                                                 break;          //exit\r
2765                                         }\r
2766                                         dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);\r
2767                                         dlg.SetPathList(CTGitPathList(CTGitPath(wcPath)));\r
2768                                         dlg.SetUrl(fileURL);\r
2769                                         dlg.SetSecondUrl(fileURL);\r
2770                                         GitRevRangeArray revarray;\r
2771                                         revarray.AddRevRange(rev1, rev2);\r
2772                                         dlg.SetRevisionRanges(revarray);\r
2773                                 }\r
2774                                 CString msg;\r
2775                                 msg.Format(IDS_LOG_REVERT_CONFIRM, (LPCTSTR)wcPath);\r
2776                                 if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)\r
2777                                 {\r
2778                                         dlg.DoModal();\r
2779                                 }\r
2780                                 theApp.DoWaitCursor(-1);\r
2781                         }\r
2782                         break;\r
2783                 case ID_POPPROPS:\r
2784                         {\r
2785                                 DialogEnableWindow(IDOK, FALSE);\r
2786                                 SetPromptApp(&theApp);\r
2787                                 theApp.DoWaitCursor(1);\r
2788                                 CString filepath;\r
2789                                 if (Git::PathIsURL(m_path))\r
2790                                 {\r
2791                                         filepath = m_path.GetGitPathString();\r
2792                                 }\r
2793                                 else\r
2794                                 {\r
2795                                         filepath = GetURLFromPath(m_path);\r
2796                                         if (filepath.IsEmpty())\r
2797                                         {\r
2798                                                 theApp.DoWaitCursor(-1);\r
2799                                                 CString temp;\r
2800                                                 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
2801                                                 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
2802                                                 TRACE(_T("could not retrieve the URL of the file!\n"));\r
2803                                                 EnableOKButton();\r
2804                                                 break;\r
2805                                         }\r
2806                                 }\r
2807                                 filepath = GetRepositoryRoot(CTGitPath(filepath));\r
2808                                 filepath += changedpaths[0];\r
2809                                 CPropDlg dlg;\r
2810                                 dlg.m_rev = rev1;\r
2811                                 dlg.m_Path = CTGitPath(filepath);\r
2812                                 dlg.DoModal();\r
2813                                 EnableOKButton();\r
2814                                 theApp.DoWaitCursor(-1);\r
2815                         }\r
2816                         break;\r
2817                 case ID_SAVEAS:\r
2818                         {\r
2819                                 DialogEnableWindow(IDOK, FALSE);\r
2820                                 SetPromptApp(&theApp);\r
2821                                 theApp.DoWaitCursor(1);\r
2822                                 CString filepath;\r
2823                                 if (Git::PathIsURL(m_path))\r
2824                                 {\r
2825                                         filepath = m_path.GetGitPathString();\r
2826                                 }\r
2827                                 else\r
2828                                 {\r
2829                                         filepath = GetURLFromPath(m_path);\r
2830                                         if (filepath.IsEmpty())\r
2831                                         {\r
2832                                                 theApp.DoWaitCursor(-1);\r
2833                                                 CString temp;\r
2834                                                 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
2835                                                 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
2836                                                 TRACE(_T("could not retrieve the URL of the file!\n"));\r
2837                                                 EnableOKButton();\r
2838                                                 break;\r
2839                                         }\r
2840                                 }\r
2841                                 m_bCancelled = false;\r
2842                                 CString sRoot = GetRepositoryRoot(CTGitPath(filepath));\r
2843                                 // if more than one entry is selected, we save them\r
2844                                 // one by one into a folder the user has selected\r
2845                                 bool bTargetSelected = false;\r
2846                                 CTGitPath TargetPath;\r
2847                                 if (m_ChangedFileListCtrl.GetSelectedCount() > 1)\r
2848                                 {\r
2849                                         CBrowseFolder browseFolder;\r
2850                                         browseFolder.SetInfo(CString(MAKEINTRESOURCE(IDS_LOG_SAVEFOLDERTOHINT)));\r
2851                                         browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;\r
2852                                         CString strSaveAsDirectory;\r
2853                                         if (browseFolder.Show(GetSafeHwnd(), strSaveAsDirectory) == CBrowseFolder::OK) \r
2854                                         {\r
2855                                                 TargetPath = CTGitPath(strSaveAsDirectory);\r
2856                                                 bTargetSelected = true;\r
2857                                         }\r
2858                                 }\r
2859                                 else\r
2860                                 {\r
2861                                         // Display the Open dialog box. \r
2862                                         CString revFilename;\r
2863                                         CString temp;\r
2864                                         temp = CPathUtils::GetFileNameFromPath(changedpaths[0]);\r
2865                                         int rfind = temp.ReverseFind('.');\r
2866                                         if (rfind > 0)\r
2867                                                 revFilename.Format(_T("%s-%ld%s"), (LPCTSTR)temp.Left(rfind), rev1, (LPCTSTR)temp.Mid(rfind));\r
2868                                         else\r
2869                                                 revFilename.Format(_T("%s-%ld"), (LPCTSTR)temp, rev1);\r
2870                                         bTargetSelected = CAppUtils::FileOpenSave(revFilename, NULL, IDS_LOG_POPUP_SAVE, IDS_COMMONFILEFILTER, false, m_hWnd);\r
2871                                         TargetPath.SetFromWin(revFilename);\r
2872                                 }\r
2873                                 if (bTargetSelected)\r
2874                                 {\r
2875                                         CProgressDlg progDlg;\r
2876                                         progDlg.SetTitle(IDS_APPNAME);\r
2877                                         progDlg.SetAnimation(IDR_DOWNLOAD);\r
2878                                         for (std::vector<LogChangedPath*>::iterator it = changedlogpaths.begin(); it!= changedlogpaths.end(); ++it)\r
2879                                         {\r
2880                                                 GitRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;\r
2881 \r
2882                                                 CString sInfoLine;\r
2883                                                 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)getrev.ToString());\r
2884                                                 progDlg.SetLine(1, sInfoLine, true);\r
2885                                                 SetAndClearProgressInfo(&progDlg);\r
2886                                                 progDlg.ShowModeless(m_hWnd);\r
2887 \r
2888                                                 CTGitPath tempfile = TargetPath;\r
2889                                                 if (changedpaths.size() > 1)\r
2890                                                 {\r
2891                                                         // if multiple items are selected, then the TargetPath\r
2892                                                         // points to a folder and we have to append the filename\r
2893                                                         // to save to to that folder.\r
2894                                                         CString sName = (*it)->sPath;\r
2895                                                         int slashpos = sName.ReverseFind('/');\r
2896                                                         if (slashpos >= 0)\r
2897                                                                 sName = sName.Mid(slashpos);\r
2898                                                         tempfile.AppendPathString(sName);\r
2899                                                         // one problem here:\r
2900                                                         // a user could have selected multiple items which\r
2901                                                         // have the same filename but reside in different\r
2902                                                         // directories, e.g.\r
2903                                                         // /folder1/file1\r
2904                                                         // /folder2/file1\r
2905                                                         // in that case, the second 'file1' will overwrite\r
2906                                                         // the already saved 'file1'.\r
2907                                                         // \r
2908                                                         // we could maybe find the common root of all selected\r
2909                                                         // items and then create sub folders to save those files\r
2910                                                         // there.\r
2911                                                         // But I think we should just leave it that way: to check\r
2912                                                         // out multiple items at once, the better way is still to\r
2913                                                         // use the export command from the top pane of the log dialog.\r
2914                                                 }\r
2915                                                 filepath = sRoot + (*it)->sPath;\r
2916                                                 if (!Cat(CTGitPath(filepath), getrev, getrev, tempfile))\r
2917                                                 {\r
2918                                                         progDlg.Stop();\r
2919                                                         SetAndClearProgressInfo((HWND)NULL);\r
2920                                                         CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
2921                                                         EnableOKButton();\r
2922                                                         theApp.DoWaitCursor(-1);\r
2923                                                         break;\r
2924                                                 }\r
2925                                         }\r
2926                                         progDlg.Stop();\r
2927                                         SetAndClearProgressInfo((HWND)NULL);\r
2928                                 }\r
2929                                 EnableOKButton();\r
2930                                 theApp.DoWaitCursor(-1);\r
2931                         }\r
2932                         break;\r
2933                 case ID_OPENWITH:\r
2934                         bOpenWith = true;\r
2935                 case ID_OPEN:\r
2936                         {\r
2937                                 GitRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;\r
2938                                 Open(bOpenWith,changedpaths[0],getrev);\r
2939                         }\r
2940                         break;\r
2941                 case ID_BLAME:\r
2942                         {\r
2943                                 CString filepath;\r
2944                                 if (Git::PathIsURL(m_path))\r
2945                                 {\r
2946                                         filepath = m_path.GetGitPathString();\r
2947                                 }\r
2948                                 else\r
2949                                 {\r
2950                                         filepath = GetURLFromPath(m_path);\r
2951                                         if (filepath.IsEmpty())\r
2952                                         {\r
2953                                                 theApp.DoWaitCursor(-1);\r
2954                                                 CString temp;\r
2955                                                 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
2956                                                 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
2957                                                 TRACE(_T("could not retrieve the URL of the file!\n"));\r
2958                                                 EnableOKButton();\r
2959                                                 break;\r
2960                                         }\r
2961                                 }\r
2962                                 filepath = GetRepositoryRoot(CTGitPath(filepath));\r
2963                                 filepath += changedpaths[0];\r
2964                                 CBlameDlg dlg;\r
2965                                 dlg.EndRev = rev1;\r
2966                                 if (dlg.DoModal() == IDOK)\r
2967                                 {\r
2968                                         CBlame blame;\r
2969                                         CString tempfile;\r
2970                                         CString logfile;\r
2971                                         tempfile = blame.BlameToTempFile(CTGitPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);\r
2972                                         if (!tempfile.IsEmpty())\r
2973                                         {\r
2974                                                 if (dlg.m_bTextView)\r
2975                                                 {\r
2976                                                         //open the default text editor for the result file\r
2977                                                         CAppUtils::StartTextViewer(tempfile);\r
2978                                                 }\r
2979                                                 else\r
2980                                                 {\r
2981                                                         CString sParams = _T("/path:\"") + filepath + _T("\" ");\r
2982                                                         if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(filepath),sParams))\r
2983                                                         {\r
2984                                                                 break;\r
2985                                                         }\r
2986                                                 }\r
2987                                         }\r
2988                                         else\r
2989                                         {\r
2990                                                 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
2991                                         }\r
2992                                 }\r
2993                         }\r
2994                         break;\r
2995                 case ID_GETMERGELOGS:\r
2996                         bMergeLog = true;\r
2997                         // fall through\r
2998                 case ID_LOG:\r
2999                         {\r
3000                                 DialogEnableWindow(IDOK, FALSE);\r
3001                                 SetPromptApp(&theApp);\r
3002                                 theApp.DoWaitCursor(1);\r
3003                                 CString filepath;\r
3004                                 if (Git::PathIsURL(m_path))\r
3005                                 {\r
3006                                         filepath = m_path.GetGitPathString();\r
3007                                 }\r
3008                                 else\r
3009                                 {\r
3010                                         filepath = GetURLFromPath(m_path);\r
3011                                         if (filepath.IsEmpty())\r
3012                                         {\r
3013                                                 theApp.DoWaitCursor(-1);\r
3014                                                 CString temp;\r
3015                                                 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
3016                                                 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
3017                                                 TRACE(_T("could not retrieve the URL of the file!\n"));\r
3018                                                 EnableOKButton();\r
3019                                                 break;\r
3020                                         }\r
3021                                 }\r
3022                                 m_bCancelled = false;\r
3023                                 filepath = GetRepositoryRoot(CTGitPath(filepath));\r
3024                                 filepath += changedpaths[0];\r
3025                                 git_revnum_t logrev = rev1;\r
3026                                 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)\r
3027                                 {\r
3028                                         // if the item got deleted in this revision,\r
3029                                         // fetch the log from the previous revision where it\r
3030                                         // still existed.\r
3031                                         logrev--;\r
3032                                 }\r
3033                                 CString sCmd;\r
3034                                 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\" /startrev:%ld"), (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)filepath, logrev);\r
3035                                 if (bMergeLog)\r
3036                                         sCmd += _T(" /merge");\r
3037                                 CAppUtils::LaunchApplication(sCmd, NULL, false);\r
3038                                 EnableOKButton();\r
3039                                 theApp.DoWaitCursor(-1);\r
3040                         }\r
3041                         break;\r
3042                 case ID_VIEWPATHREV:\r
3043                         {\r
3044                                 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetSelectionMark()));\r
3045                                 GitRev rev = pLogEntry->Rev;\r
3046                                 CString relurl = changedpaths[0];\r
3047                                 CString url = m_ProjectProperties.sWebViewerPathRev;\r
3048                                 url.Replace(_T("%REVISION%"), rev.ToString());\r
3049                                 url.Replace(_T("%PATH%"), relurl);\r
3050                                 relurl = relurl.Mid(relurl.Find('/'));\r
3051                                 url.Replace(_T("%PATH1%"), relurl);\r
3052                                 if (!url.IsEmpty())\r
3053                                         ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);                                        \r
3054                         }\r
3055                         break;\r
3056 #endif\r
3057                 default:\r
3058                         break;\r
3059                 } // switch (cmd)\r
3060 \r
3061         } // if (popup.CreatePopupMenu())\r
3062 }\r
3063 #endif\r
3064 \r
3065 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
3066 {\r
3067         // the date control should not show the "today" button\r
3068         CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();\r
3069         if (pCtrl)\r
3070                 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));\r
3071         *pResult = 0;\r
3072 }\r
3073 \r
3074 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
3075 {\r
3076         // the date control should not show the "today" button\r
3077         CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();\r
3078         if (pCtrl)\r
3079                 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));\r
3080         *pResult = 0;\r
3081 }\r
3082 \r
3083 void CLogDlg::OnSize(UINT nType, int cx, int cy)\r
3084 {\r
3085         __super::OnSize(nType, cx, cy);\r
3086         //set range\r
3087         SetSplitterRange();\r
3088 }\r
3089 \r
3090 void CLogDlg::OnRefresh()\r
3091 {\r
3092         //if (GetDlgItem(IDC_GETALL)->IsWindowEnabled())\r
3093         ShowStartRef();\r
3094         {\r
3095                 m_limit = 0;\r
3096                 this->m_LogProgress.SetPos(0);\r
3097                 \r
3098                 Refresh (true);\r
3099         }\r
3100 }\r
3101 \r
3102 void CLogDlg::OnFind()\r
3103 {\r
3104         if (!m_pFindDialog)\r
3105         {\r
3106                 m_pFindDialog = new CFindReplaceDialog();\r
3107                 m_pFindDialog->Create(TRUE, NULL, NULL, FR_HIDEUPDOWN | FR_HIDEWHOLEWORD, this);                                                                        \r
3108         }\r
3109 }\r
3110 \r
3111 void CLogDlg::OnFocusFilter()\r
3112 {\r
3113         GetDlgItem(IDC_SEARCHEDIT)->SetFocus(); \r
3114 }\r
3115 \r
3116 void CLogDlg::OnEditCopy()\r
3117 {\r
3118         if (GetFocus() == &m_ChangedFileListCtrl)\r
3119                 CopyChangedSelectionToClipBoard();\r
3120         else\r
3121                 m_LogList.CopySelectionToClipBoard();\r
3122 }\r
3123 \r
3124 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)\r
3125 {\r
3126         // is the URL a relative one?\r
3127         if (url.Left(2).Compare(_T("^/")) == 0)\r
3128         {\r
3129                 // URL is relative to the repository root\r
3130                 CString url1 = m_sRepositoryRoot + url.Mid(1);\r
3131                 TCHAR buf[INTERNET_MAX_URL_LENGTH];\r
3132                 DWORD len = url.GetLength();\r
3133                 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)\r
3134                         return CString(buf, len);\r
3135                 return url1;\r
3136         }\r
3137         else if (url[0] == '/')\r
3138         {\r
3139                 // URL is relative to the server's hostname\r
3140                 CString sHost;\r
3141                 // find the server's hostname\r
3142                 int schemepos = m_sRepositoryRoot.Find(_T("//"));\r
3143                 if (schemepos >= 0)\r
3144                 {\r
3145                         sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));\r
3146                         CString url1 = sHost + url;\r
3147                         TCHAR buf[INTERNET_MAX_URL_LENGTH];\r
3148                         DWORD len = url.GetLength();\r
3149                         if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)\r
3150                                 return CString(buf, len);\r
3151                         return url1;\r
3152                 }\r
3153         }\r
3154         return url;\r
3155 }\r
3156 \r
3157 \r
3158 void CLogDlg::OnEnChangeSearchedit()\r
3159 {\r
3160         UpdateData();\r
3161         if (m_LogList.m_sFilterText.IsEmpty())\r
3162         {\r
3163                 CStoreSelection storeselection(this);\r
3164                 // clear the filter, i.e. make all entries appear\r
3165                 theApp.DoWaitCursor(1);\r
3166                 KillTimer(LOGFILTER_TIMER);\r
3167                 FillLogMessageCtrl(false);\r
3168                 m_LogList.StartFilter();\r
3169 #if 0\r
3170                 InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
3171                 m_arShownList.RemoveAll();\r
3172                 for (DWORD i=0; i<m_logEntries.size(); ++i)\r
3173                 {\r
3174                         if (IsEntryInDateRange(i))\r
3175                                 m_arShownList.Add(m_logEntries[i]);\r
3176                 }\r
3177                 InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
3178                 m_LogList.DeleteAllItems();\r
3179                 m_LogList.SetItemCountEx(ShownCountWithStopped());\r
3180                 m_LogList.RedrawItems(0, ShownCountWithStopped());\r
3181                 m_LogList.SetRedraw(false);\r
3182                 ResizeAllListCtrlCols();\r
3183                 m_LogList.SetRedraw(true);\r
3184 #endif\r
3185                 theApp.DoWaitCursor(-1);\r
3186                 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);\r
3187                 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);\r
3188                 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();\r
3189                 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));\r
3190                 return;\r
3191         }\r
3192         if (Validate(m_LogList.m_sFilterText))\r
3193                 SetTimer(LOGFILTER_TIMER, 1000, NULL);\r
3194         else\r
3195                 KillTimer(LOGFILTER_TIMER);\r
3196 \r
3197 }\r
3198 \r
3199 void CLogDlg::OnBnClickedAllBranch()\r
3200 {\r
3201         this->UpdateData();\r
3202 \r
3203         if(this->m_bAllBranch)\r
3204                 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;\r
3205         else\r
3206                 m_LogList.m_ShowMask&=~CGit::LOG_INFO_ALL_BRANCH;\r
3207 \r
3208         OnRefresh();\r
3209 \r
3210         FillLogMessageCtrl(false);\r
3211 }\r
3212 \r
3213 void CLogDlg::OnBnClickedBrowseRef()\r
3214 {\r
3215         CString newRef = CBrowseRefsDlg::PickRef(false,m_LogList.GetStartRef());        \r
3216         if(newRef.IsEmpty())\r
3217                 return;\r
3218 \r
3219         SetStartRef(newRef);\r
3220         ((CButton*)GetDlgItem(IDC_LOG_ALLBRANCH))->SetCheck(0);\r
3221 \r
3222         OnBnClickedAllBranch();\r
3223 }\r
3224 \r
3225 void CLogDlg::ShowStartRef()\r
3226 {\r
3227         //Show ref name on top\r
3228         if(!::IsWindow(m_hWnd))\r
3229                 return;\r
3230         if(m_bAllBranch)\r
3231         {\r
3232                 m_staticRef.SetWindowText(L"<All Branches>");\r
3233                 m_staticRef.Invalidate(TRUE);\r
3234                 return;\r
3235         }\r
3236 \r
3237         CString showStartRef = m_LogList.GetStartRef();\r
3238         if(showStartRef.IsEmpty())\r
3239         {\r
3240                 //Ref name is HEAD\r
3241                 if( g_Git.Run(L"git symbolic-ref HEAD",&showStartRef,CP_UTF8) )\r
3242                         showStartRef = _T("<No branch>");\r
3243                 showStartRef.Trim(L"\r\n\t ");\r
3244         }\r
3245 \r
3246 \r
3247         if(wcsncmp(showStartRef,L"refs/",5) == 0)\r
3248                 showStartRef = showStartRef.Mid(5);\r
3249         if(wcsncmp(showStartRef,L"heads/",6) == 0)\r
3250                 showStartRef = showStartRef.Mid(6);\r
3251 \r
3252         m_staticRef.SetWindowText(showStartRef);\r
3253         m_staticRef.Invalidate(TRUE);\r
3254 }\r
3255 \r
3256 void CLogDlg::SetStartRef(const CString& StartRef)\r
3257 {\r
3258         m_LogList.SetStartRef(StartRef);\r
3259 \r
3260         ShowStartRef();\r
3261 }\r
3262 \r
3263 \r
3264 \r
3265 void CLogDlg::OnBnClickedFirstParent()\r
3266 {\r
3267         this->UpdateData();\r
3268 \r
3269         if(this->m_bFirstParent)\r
3270                 m_LogList.m_ShowMask|=CGit::LOG_INFO_FIRST_PARENT;\r
3271         else\r
3272                 m_LogList.m_ShowMask&=~CGit::LOG_INFO_FIRST_PARENT;\r
3273 \r
3274         OnRefresh();\r
3275 \r
3276         FillLogMessageCtrl(false);\r
3277 \r
3278 }\r
3279 \r
3280 void CLogDlg::OnBnClickShowWholeProject()\r
3281 {\r
3282         this->UpdateData();\r
3283 \r
3284         if(this->m_bWholeProject)\r
3285         {\r
3286                 m_LogList.m_Path.Reset();\r
3287                 SetWindowText(m_sTitle + _T(" - ") + CString(_T("Whole Project")));\r
3288         }\r
3289         else\r
3290         {\r
3291                 m_LogList.m_Path=m_path;\r
3292                 if(!m_path.IsEmpty())\r
3293                         SetWindowText(m_sTitle + _T(" - ") + m_path.GetGitPathString());\r
3294         }\r
3295         \r
3296         OnRefresh();\r
3297 \r
3298         FillLogMessageCtrl(false);\r
3299 \r
3300 }\r