OSDN Git Service

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