OSDN Git Service

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