OSDN Git Service

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