OSDN Git Service

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