OSDN Git Service

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