OSDN Git Service

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