OSDN Git Service

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