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
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
17 #include "TortoiseProc.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
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
50 const UINT CLogDlg::m_FindDialogMessage = RegisterWindowMessage(FINDMSGSTRING);
\r
53 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)
\r
54 CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
\r
55 : CResizableStandAloneDialog(CLogDlg::IDD, pParent)
\r
59 , m_currentChangedArray(NULL)
\r
61 , m_bShowedAll(false)
\r
63 , m_regLastStrict(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE)
\r
65 , m_bSelectionMustBeContinuous(false)
\r
66 , m_bShowBugtraqColumn(false)
\r
67 , m_lowestRev(_T(""))
\r
69 , m_sLogInfo(_T(""))
\r
70 , m_pFindDialog(NULL)
\r
71 , m_bCancelled(FALSE)
\r
72 , m_pNotifyWindow(NULL)
\r
74 , m_bAscending(FALSE)
\r
79 , m_bIncludeMerges(FALSE)
\r
83 m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
90 m_CurrentFilteredChangedArray.RemoveAll();
\r
94 void CLogDlg::DoDataExchange(CDataExchange* pDX)
\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
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
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
124 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
\r
125 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
\r
127 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
\r
129 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
\r
130 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
\r
131 ON_BN_CLICKED(IDC_NEXTHUNDRED, OnBnClickedNexthundred)
\r
132 //ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGMSG, OnNMCustomdrawChangedFileList)
\r
133 //ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGMSG, OnLvnGetdispinfoChangedFileList)
\r
134 ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST , OnLvnColumnclick)
\r
135 //ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList)
\r
136 ON_BN_CLICKED(IDC_HIDEPATHS, OnBnClickedHidepaths)
\r
138 ON_BN_CLICKED(IDC_CHECK_STOPONCOPY, &CLogDlg::OnBnClickedCheckStoponcopy)
\r
139 ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)
\r
140 ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)
\r
142 ON_BN_CLICKED(IDC_INCLUDEMERGE, &CLogDlg::OnBnClickedIncludemerge)
\r
143 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
\r
144 ON_COMMAND(ID_LOGDLG_REFRESH,&CLogDlg::OnRefresh)
\r
145 ON_COMMAND(ID_LOGDLG_FIND,&CLogDlg::OnFind)
\r
146 ON_COMMAND(ID_LOGDLG_FOCUSFILTER,&CLogDlg::OnFocusFilter)
\r
147 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
\r
150 void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, BOOL bStrict /* = FALSE */, BOOL bSaveStrict /* = TRUE */)
\r
154 m_startrev = startrev;
\r
155 m_LogRevision = startrev;
\r
157 m_hasWC = !path.IsUrl();
\r
158 m_bStrict = bStrict;
\r
159 m_bSaveStrict = bSaveStrict;
\r
161 if (::IsWindow(m_hWnd))
\r
165 BOOL CLogDlg::OnInitDialog()
\r
167 CResizableStandAloneDialog::OnInitDialog();
\r
169 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
\r
171 OSVERSIONINFOEX inf;
\r
172 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
173 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
174 GetVersionEx((OSVERSIONINFO *)&inf);
\r
175 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
176 m_bVista = (fullver >= 0x0600);
\r
178 // use the state of the "stop on copy/rename" option from the last time
\r
180 m_bStrict = m_regLastStrict;
\r
184 temp.Format(IDS_LOG_SHOWNEXT, m_limit);
\r
186 temp.Format(IDS_LOG_SHOWNEXT, (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100));
\r
188 SetDlgItemText(IDC_NEXTHUNDRED, temp);
\r
190 // set the font to use in the log message view, configured in the settings dialog
\r
191 CAppUtils::CreateFontForLogs(m_logFont);
\r
192 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
\r
193 // automatically detect URLs in the log message and turn them into links
\r
194 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_AUTOURLDETECT, TRUE, NULL);
\r
195 // make the log message rich edit control send a message when the mouse pointer is over a link
\r
196 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK);
\r
197 //m_LogList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_SUBITEMIMAGES);
\r
199 // the "hide unrelated paths" checkbox should be indeterminate
\r
200 m_cHidePaths.SetCheck(BST_INDETERMINATE);
\r
203 // if there is a working copy, load the project properties
\r
204 // to get information about the bugtraq: integration
\r
206 m_ProjectProperties.ReadProps(m_path);
\r
208 // the bugtraq issue id column is only shown if the bugtraq:url or bugtraq:regex is set
\r
209 if ((!m_ProjectProperties.sUrl.IsEmpty())||(!m_ProjectProperties.sCheckRe.IsEmpty()))
\r
210 m_bShowBugtraqColumn = true;
\r
212 //theme.SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);
\r
213 //theme.SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);
\r
215 // set up the columns
\r
216 m_LogList.DeleteAllItems();
\r
217 m_LogList.InsertGitColumn();
\r
219 m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"));
\r
221 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
224 m_sMessageBuf.Preallocate(100000);
\r
226 // set the dialog title to "Log - path/to/whatever/we/show/the/log/for"
\r
227 SetDlgTitle(false);
\r
229 m_tooltips.Create(this);
\r
230 CheckRegexpTooltip();
\r
232 SetSplitterRange();
\r
234 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
\r
235 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
\r
236 m_cFilter.SetInfoIcon(IDI_LOGFILTER);
\r
237 m_cFilter.SetValidator(this);
\r
239 AdjustControlSize(IDC_HIDEPATHS);
\r
240 AdjustControlSize(IDC_CHECK_STOPONCOPY);
\r
241 AdjustControlSize(IDC_INCLUDEMERGE);
\r
243 GetClientRect(m_DlgOrigRect);
\r
244 m_LogList.GetClientRect(m_LogListOrigRect);
\r
245 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
\r
246 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
\r
248 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
249 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
252 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
\r
253 AddAnchor(IDC_DATEFROM, TOP_LEFT);
\r
254 AddAnchor(IDC_TOLABEL, TOP_LEFT);
\r
255 AddAnchor(IDC_DATETO, TOP_LEFT);
\r
257 SetFilterCueText();
\r
258 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
\r
260 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
261 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
262 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
263 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
264 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
266 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
267 AddAnchor(IDC_HIDEPATHS, BOTTOM_LEFT);
\r
268 AddAnchor(IDC_CHECK_STOPONCOPY, BOTTOM_LEFT);
\r
269 AddAnchor(IDC_INCLUDEMERGE, BOTTOM_LEFT);
\r
270 AddAnchor(IDC_GETALL, BOTTOM_LEFT);
\r
271 AddAnchor(IDC_NEXTHUNDRED, BOTTOM_LEFT);
\r
272 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
\r
273 AddAnchor(IDC_STATBUTTON, BOTTOM_RIGHT);
\r
274 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
275 AddAnchor(IDOK, BOTTOM_RIGHT);
\r
276 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
\r
277 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
279 // SetPromptParentWindow(m_hWnd);
\r
282 CenterWindow(CWnd::FromHandle(hWndExplorer));
\r
283 EnableSaveRestore(_T("LogDlg"));
\r
285 DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
286 DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
287 RECT rcDlg, rcLogList, rcChgMsg;
\r
288 GetClientRect(&rcDlg);
\r
289 m_LogList.GetWindowRect(&rcLogList);
\r
290 ScreenToClient(&rcLogList);
\r
291 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
\r
292 ScreenToClient(&rcChgMsg);
\r
296 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
297 ScreenToClient(&rectSplitter);
\r
298 int delta = yPos1 - rectSplitter.top;
\r
300 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
\r
302 m_wndSplitter1.SetWindowPos(NULL, 0, yPos1, 0, 0, SWP_NOSIZE);
\r
309 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
310 ScreenToClient(&rectSplitter);
\r
311 int delta = yPos2 - rectSplitter.top;
\r
313 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
\r
315 m_wndSplitter2.SetWindowPos(NULL, 0, yPos2, 0, 0, SWP_NOSIZE);
\r
323 // the dialog is used to select revisions
\r
324 if (m_bSelectionMustBeContinuous)
\r
325 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
327 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
331 // the dialog is used to just view log messages
\r
332 GetDlgItemText(IDOK, temp);
\r
333 SetDlgItemText(IDCANCEL, temp);
\r
334 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
\r
337 // set the choices for the "Show All" button
\r
338 temp.LoadString(IDS_LOG_SHOWALL);
\r
339 m_btnShow.AddEntry(temp);
\r
340 temp.LoadString(IDS_LOG_SHOWRANGE);
\r
341 m_btnShow.AddEntry(temp);
\r
342 m_btnShow.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")));
\r
344 m_mergedRevs.clear();
\r
346 // first start a thread to obtain the log messages without
\r
347 // blocking the dialog
\r
349 //m_tFrom = (DWORD)-1;
\r
351 m_LogList.FetchLogAsync(LogCallBack,this);
\r
353 GetDlgItem(IDC_LOGLIST)->SetFocus();
\r
357 void CLogDlg::LogRunStatus(int cur)
\r
359 if( cur == GITLOG_START )
\r
362 temp.LoadString(IDS_PROGRESSWAIT);
\r
364 // change the text of the close button to "Cancel" since now the thread
\r
365 // is running, and simply closing the dialog doesn't work.
\r
366 if (!GetDlgItem(IDOK)->IsWindowVisible())
\r
368 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
369 SetDlgItemText(IDCANCEL, temp);
\r
372 // We use a progress bar while getting the logs
\r
373 m_LogProgress.SetRange32(0, 100);
\r
374 m_LogProgress.SetPos(0);
\r
376 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
\r
378 DialogEnableWindow(IDC_GETALL, FALSE);
\r
379 DialogEnableWindow(IDC_NEXTHUNDRED, FALSE);
\r
380 DialogEnableWindow(IDC_CHECK_STOPONCOPY, FALSE);
\r
381 DialogEnableWindow(IDC_INCLUDEMERGE, FALSE);
\r
382 DialogEnableWindow(IDC_STATBUTTON, FALSE);
\r
383 DialogEnableWindow(IDC_REFRESH, FALSE);
\r
384 DialogEnableWindow(IDC_HIDEPATHS,FALSE);
\r
387 if( cur == GITLOG_END)
\r
391 DialogEnableWindow(IDC_NEXTHUNDRED, TRUE);
\r
393 //DialogEnableWindow(IDC_CHECK_STOPONCOPY, TRUE);
\r
394 //DialogEnableWindow(IDC_INCLUDEMERGE, TRUE);
\r
395 DialogEnableWindow(IDC_STATBUTTON, TRUE);
\r
396 DialogEnableWindow(IDC_REFRESH, TRUE);
\r
398 PostMessage(WM_TIMER, LOGFILTER_TIMER);
\r
400 //CTime time=m_LogList.GetOldestTime();
\r
402 m_LogList.GetTimeRange(begin,end);
\r
403 m_DateFrom.SetTime(&begin);
\r
404 m_DateTo.SetTime(&end);
\r
407 m_LogProgress.SetPos(cur);
\r
409 void CLogDlg::SetDlgTitle(bool bOffline)
\r
411 if (m_sTitle.IsEmpty())
\r
412 GetWindowText(m_sTitle);
\r
417 if (m_path.IsUrl())
\r
418 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetUIPathString());
\r
419 else if (m_path.IsDirectory())
\r
420 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetWinPathString());
\r
422 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetFilename());
\r
423 SetWindowText(sTemp);
\r
427 if (m_path.IsUrl())
\r
428 SetWindowText(m_sTitle + _T(" - ") + m_path.GetUIPathString());
\r
429 else if (m_path.IsDirectory())
\r
430 SetWindowText(m_sTitle + _T(" - ") + m_path.GetWinPathString());
\r
432 SetWindowText(m_sTitle + _T(" - ") + m_path.GetFilename());
\r
436 void CLogDlg::CheckRegexpTooltip()
\r
438 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
\r
439 // Since tooltip describes regexp features, show it only if regexps are enabled.
\r
440 if (m_bFilterWithRegex)
\r
442 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
\r
445 m_tooltips.DelTool(pWnd);
\r
448 void CLogDlg::EnableOKButton()
\r
452 // the dialog is used to select revisions
\r
453 if (m_bSelectionMustBeContinuous)
\r
454 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
456 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
459 DialogEnableWindow(IDOK, TRUE);
\r
462 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
\r
464 // we fill here the log message rich edit control,
\r
465 // and also populate the changed files list control
\r
466 // according to the selected revision(s).
\r
468 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
469 // empty the log message view
\r
470 pMsgView->SetWindowText(_T(" "));
\r
471 // empty the changed files list
\r
472 m_ChangedFileListCtrl.SetRedraw(FALSE);
\r
473 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
474 m_currentChangedArray = NULL;
\r
475 //m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );
\r
476 m_ChangedFileListCtrl.DeleteAllItems();
\r
478 // if we're not here to really show a selected revision, just
\r
479 // get out of here after clearing the views, which is what is intended
\r
480 // if that flag is not set.
\r
484 m_ChangedFileListCtrl.Invalidate();
\r
485 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
486 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
490 // depending on how many revisions are selected, we have to do different
\r
492 int selCount = m_LogList.GetSelectedCount();
\r
495 // if nothing is selected, we have nothing more to do
\r
496 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
497 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
500 else if (selCount == 1)
\r
502 // if one revision is selected, we have to fill the log message view
\r
503 // with the corresponding log message, and also fill the changed files
\r
505 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
506 int selIndex = m_LogList.GetNextSelectedItem(pos);
\r
507 if (selIndex >= m_LogList.m_arShownList.GetCount())
\r
509 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
510 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
513 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));
\r
515 if(!pLogEntry->m_IsFull)
\r
517 pMsgView->SetWindowText(_T("load ..."));
\r
520 // set the log message text
\r
521 pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash+_T("\r\n\r\n*")+pLogEntry->m_Subject+_T("\n\n")+pLogEntry->m_Body);
\r
522 // turn bug ID's into links if the bugtraq: properties have been set
\r
523 // and we can find a match of those in the log message
\r
524 m_ProjectProperties.FindBugID(pLogEntry->m_Body, pMsgView);
\r
525 CAppUtils::FormatTextInRichEditControl(pMsgView);
\r
527 m_ChangedFileListCtrl.UpdateWithGitPathList(pLogEntry->m_Files);
\r
528 m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;
\r
529 m_ChangedFileListCtrl.Show(0);
\r
531 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
535 // fill in the changed files list control
\r
536 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
538 m_CurrentFilteredChangedArray.RemoveAll();
\r
539 for (INT_PTR c = 0; c < m_currentChangedArray->GetCount(); ++c)
\r
541 LogChangedPath * cpath = m_currentChangedArray->GetAt(c);
\r
544 if (m_currentChangedArray->GetAt(c)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
546 m_CurrentFilteredChangedArray.Add(cpath);
\r
549 m_currentChangedArray = &m_CurrentFilteredChangedArray;
\r
555 // more than one revision is selected:
\r
556 // the log message view must be emptied
\r
557 // the changed files list contains all the changed paths from all
\r
558 // selected revisions, with 'doubles' removed
\r
559 m_currentChangedPathList = GetChangedPathsFromSelectedRevisions(true);
\r
562 // redraw the views
\r
563 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
564 if (m_currentChangedArray)
\r
566 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedArray->GetCount());
\r
567 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedArray->GetCount());
\r
569 else if (m_currentChangedPathList.GetCount())
\r
571 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedPathList.GetCount());
\r
572 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedPathList.GetCount());
\r
576 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
577 m_ChangedFileListCtrl.Invalidate();
\r
579 CAppUtils::ResizeAllListCtrlCols(&m_ChangedFileListCtrl);
\r
580 // sort according to the settings
\r
581 if (m_nSortColumnPathList > 0)
\r
582 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
584 SetSortArrow(&m_ChangedFileListCtrl, -1, false);
\r
585 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
589 void CLogDlg::OnBnClickedGetall()
\r
594 void CLogDlg::GetAll(bool bForceAll /* = false */)
\r
597 // fetch all requested log messages, either the specified range or
\r
598 // really *all* available log messages.
\r
600 INT_PTR entry = m_btnShow.GetCurrentEntry();
\r
606 case 0: // show all
\r
609 m_startrev = m_LogRevision;
\r
611 m_bShowedAll = true;
\r
614 case 1: // show range
\r
617 // ask for a revision range
\r
618 CRevisionRangeDlg dlg;
\r
619 dlg.SetStartRevision(m_startrev);
\r
620 dlg.SetEndRevision( (m_endrev>=0) ? m_endrev : 0);
\r
621 if (dlg.DoModal()!=IDOK)
\r
625 m_endrev = dlg.GetEndRevision();
\r
626 m_startrev = dlg.GetStartRevision();
\r
627 if (((m_endrev.IsNumber())&&(m_startrev.IsNumber()))||
\r
628 (m_endrev.IsHead()||m_startrev.IsHead()))
\r
630 if (((LONG)m_startrev < (LONG)m_endrev)||
\r
631 (m_endrev.IsHead()))
\r
633 git_revnum_t temp = m_startrev;
\r
634 m_startrev = m_endrev;
\r
638 m_bShowedAll = false;
\r
643 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
644 m_ChangedFileListCtrl.Invalidate();
\r
645 // We need to create CStoreSelection on the heap or else
\r
646 // the variable will run out of the scope before the
\r
647 // thread ends. Therefore we let the thread delete
\r
649 m_pStoreSelection = new CStoreSelection(this);
\r
650 m_LogList.SetItemCountEx(0);
\r
651 m_LogList.Invalidate();
\r
652 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
653 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
654 pMsgView->SetWindowText(_T(""));
\r
656 SetSortArrow(&m_LogList, -1, true);
\r
658 m_LogList.DeleteAllItems();
\r
659 m_arShownList.RemoveAll();
\r
660 m_logEntries.ClearAll();
\r
663 m_bCancelled = FALSE;
\r
665 m_tFrom = (DWORD)-1;
\r
668 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
669 if (AfxBeginThread(LogThreadEntry, this)==NULL)
\r
671 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
672 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
674 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
675 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
679 void CLogDlg::OnBnClickedRefresh()
\r
685 void CLogDlg::Refresh (bool autoGoOnline)
\r
687 m_LogList.Refresh();
\r
690 void CLogDlg::OnBnClickedNexthundred()
\r
694 // we have to fetch the next X log messages.
\r
695 if (m_logEntries.size() < 1)
\r
697 // since there weren't any log messages fetched before, just
\r
698 // fetch all since we don't have an 'anchor' to fetch the 'next'
\r
700 return GetAll(true);
\r
702 git_revnum_t rev = m_logEntries[m_logEntries.size()-1]->Rev;
\r
705 return; // do nothing! No more revisions to get
\r
709 m_bCancelled = FALSE;
\r
711 // rev is is revision we already have and we will receive it again
\r
712 // -> fetch one extra revision to get NumberOfLogs *new* revisions
\r
714 m_limit = (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100) +1;
\r
715 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
716 SetSortArrow(&m_LogList, -1, true);
\r
717 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
718 // We need to create CStoreSelection on the heap or else
\r
719 // the variable will run out of the scope before the
\r
720 // thread ends. Therefore we let the thread delete
\r
722 m_pStoreSelection = new CStoreSelection(this);
\r
724 // since we fetch the log from the last revision we already have,
\r
725 // we have to remove that revision entry to avoid getting it twice
\r
726 m_logEntries.pop_back();
\r
727 if (AfxBeginThread(LogThreadEntry, this)==NULL)
\r
729 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
730 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
732 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
733 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
737 BOOL CLogDlg::Cancel()
\r
739 return m_bCancelled;
\r
742 void CLogDlg::SaveSplitterPos()
\r
746 CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
747 CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
749 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
750 ScreenToClient(&rectSplitter);
\r
751 regPos1 = rectSplitter.top;
\r
752 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
753 ScreenToClient(&rectSplitter);
\r
754 regPos2 = rectSplitter.top;
\r
758 void CLogDlg::OnCancel()
\r
760 // canceling means stopping the working thread if it's still running.
\r
761 // we do this by using the Subversion cancel callback.
\r
762 // But canceling can also mean just to close the dialog, depending on the
\r
763 // text shown on the cancel button (it could simply read "OK").
\r
764 CString temp, temp2;
\r
765 GetDlgItemText(IDOK, temp);
\r
766 temp2.LoadString(IDS_MSGBOX_CANCEL);
\r
767 if ((temp.Compare(temp2)==0)||(this->IsThreadRunning()))
\r
769 m_bCancelled = true;
\r
774 m_regLastStrict = m_bStrict;
\r
775 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
776 reg = m_btnShow.GetCurrentEntry();
\r
778 __super::OnCancel();
\r
781 CString CLogDlg::MakeShortMessage(const CString& message)
\r
783 bool bFoundShort = true;
\r
784 CString sShortMessage = m_ProjectProperties.GetLogSummary(message);
\r
785 if (sShortMessage.IsEmpty())
\r
787 bFoundShort = false;
\r
788 sShortMessage = message;
\r
790 // Remove newlines and tabs 'cause those are not shown nicely in the list control
\r
791 sShortMessage.Replace(_T("\r"), _T(""));
\r
792 sShortMessage.Replace(_T("\t"), _T(" "));
\r
794 // Suppose the first empty line separates 'summary' from the rest of the message.
\r
795 int found = sShortMessage.Find(_T("\n\n"));
\r
796 // To avoid too short 'short' messages
\r
797 // (e.g. if the message looks something like "Bugfix:\n\n*done this\n*done that")
\r
798 // only use the empty newline as a separator if it comes after at least 15 chars.
\r
799 if ((!bFoundShort)&&(found >= 15))
\r
801 sShortMessage = sShortMessage.Left(found);
\r
803 sShortMessage.Replace('\n', ' ');
\r
804 return sShortMessage;
\r
807 BOOL CLogDlg::Log(git_revnum_t rev, const CString& author, const CString& date, const CString& message, LogChangedPathArray * cpaths, int filechanges, BOOL copies, DWORD actions, BOOL haschildren)
\r
810 if (rev == SVN_INVALID_REVNUM)
\r
816 // this is the callback function which receives the data for every revision we ask the log for
\r
817 // we store this information here one by one.
\r
819 if (m_startrev == -1)
\r
824 m_LogProgress.SetPos(m_limit - m_limitcounter);
\r
826 else if (m_startrev.IsNumber() && m_startrev.IsNumber())
\r
827 m_LogProgress.SetPos((git_revnum_t)m_startrev-rev+(git_revnum_t)m_endrev);
\r
828 __time64_t ttime = time/1000000L;
\r
829 if (m_tTo < (DWORD)ttime)
\r
830 m_tTo = (DWORD)ttime;
\r
831 if (m_tFrom > (DWORD)ttime)
\r
832 m_tFrom = (DWORD)ttime;
\r
833 if ((m_lowestRev > rev)||(m_lowestRev < 0))
\r
835 // Add as many characters from the log message to the list control
\r
836 PLOGENTRYDATA pLogItem = new LOGENTRYDATA;
\r
837 pLogItem->bCopies = !!copies;
\r
839 // find out if this item was copied in the revision
\r
840 BOOL copiedself = FALSE;
\r
843 for (INT_PTR cpPathIndex = 0; cpPathIndex < cpaths->GetCount(); ++cpPathIndex)
\r
845 LogChangedPath * cpath = cpaths->GetAt(cpPathIndex);
\r
846 if (!cpath->sCopyFromPath.IsEmpty() && (cpath->sPath.Compare(m_sSelfRelativeURL) == 0))
\r
848 // note: this only works if the log is fetched top-to-bottom
\r
849 // but since we do that, it shouldn't be a problem
\r
850 m_sSelfRelativeURL = cpath->sCopyFromPath;
\r
856 pLogItem->bCopiedSelf = copiedself;
\r
857 pLogItem->tmDate = ttime;
\r
858 pLogItem->sAuthor = author;
\r
859 pLogItem->sDate = date;
\r
860 pLogItem->sShortMessage = MakeShortMessage(message);
\r
861 pLogItem->dwFileChanges = filechanges;
\r
862 pLogItem->actions = actions;
\r
863 pLogItem->haschildren = haschildren;
\r
864 pLogItem->childStackDepth = m_childCounter;
\r
865 m_maxChild = max(m_childCounter, m_maxChild);
\r
868 pLogItem->sBugIDs = m_ProjectProperties.FindBugID(message).Trim();
\r
870 // split multi line log entries and concatenate them
\r
871 // again but this time with \r\n as line separators
\r
872 // so that the edit control recognizes them
\r
875 if (message.GetLength()>0)
\r
877 m_sMessageBuf = message;
\r
878 m_sMessageBuf.Replace(_T("\n\r"), _T("\n"));
\r
879 m_sMessageBuf.Replace(_T("\r\n"), _T("\n"));
\r
880 if (m_sMessageBuf.Right(1).Compare(_T("\n"))==0)
\r
881 m_sMessageBuf = m_sMessageBuf.Left(m_sMessageBuf.GetLength()-1);
\r
884 m_sMessageBuf.Empty();
\r
885 pLogItem->sMessage = m_sMessageBuf;
\r
886 pLogItem->Rev = rev;
\r
888 // move-construct path array
\r
890 pLogItem->pArChangedPaths = new LogChangedPathArray (*cpaths);
\r
891 cpaths->RemoveAll();
\r
893 catch (CException * e)
\r
895 ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR);
\r
897 m_bCancelled = TRUE;
\r
899 m_logEntries.push_back(pLogItem);
\r
900 m_arShownList.Add(pLogItem);
\r
906 //this is the thread function which calls the subversion function
\r
911 void CLogDlg::CopyChangedSelectionToClipBoard()
\r
914 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
916 return; // nothing is selected, get out of here
\r
920 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
923 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
926 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
927 sPaths += m_currentChangedPathList[nItem].GetGitPathString();
\r
928 sPaths += _T("\r\n");
\r
933 // only one revision is selected in the log dialog top pane
\r
934 // but multiple items could be selected in the changed items list
\r
935 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
938 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
939 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
941 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
943 // some items are hidden! So find out which item the user really selected
\r
944 INT_PTR selRealIndex = -1;
\r
945 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
947 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
949 if (selRealIndex == nItem)
\r
951 changedlogpath = pLogEntry->pArChangedPaths->GetAt(hiddenindex);
\r
956 if (changedlogpath)
\r
958 sPaths += changedlogpath->sPath;
\r
959 sPaths += _T("\r\n");
\r
964 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
\r
968 BOOL CLogDlg::IsDiffPossible(LogChangedPath * changedpath, git_revnum_t rev)
\r
971 CString added, deleted;
\r
972 if (changedpath == NULL)
\r
975 if ((rev > 1)&&(changedpath->action != LOGACTIONS_DELETED))
\r
977 if (changedpath->action == LOGACTIONS_ADDED) // file is added
\r
979 if (changedpath->lCopyFromRev == 0)
\r
980 return FALSE; // but file was not added with history
\r
988 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
\r
990 // we have two separate context menus:
\r
991 // one shown on the log message list control,
\r
992 // the other shown in the changed-files list control
\r
993 int selCount = m_LogList.GetSelectedCount();
\r
994 if (pWnd == &m_LogList)
\r
996 //ShowContextMenuForRevisions(pWnd, point);
\r
998 else if (pWnd == &m_ChangedFileListCtrl)
\r
1000 //ShowContextMenuForChangedpaths(pWnd, point);
\r
1002 else if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1004 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1005 int selIndex = -1;
\r
1007 selIndex = m_LogList.GetNextSelectedItem(pos);
\r
1008 if ((point.x == -1) && (point.y == -1))
\r
1011 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
\r
1012 ClientToScreen(&rect);
\r
1013 point = rect.CenterPoint();
\r
1015 CString sMenuItemText;
\r
1017 if (popup.CreatePopupMenu())
\r
1019 // add the 'default' entries
\r
1020 sMenuItemText.LoadString(IDS_SCIEDIT_COPY);
\r
1021 popup.AppendMenu(MF_STRING | MF_ENABLED, WM_COPY, sMenuItemText);
\r
1022 sMenuItemText.LoadString(IDS_SCIEDIT_SELECTALL);
\r
1023 popup.AppendMenu(MF_STRING | MF_ENABLED, EM_SETSEL, sMenuItemText);
\r
1025 //if (selIndex >= 0)
\r
1027 // popup.AppendMenu(MF_SEPARATOR);
\r
1028 // sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);
\r
1029 // popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);
\r
1032 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
1036 break; // no command selected
\r
1039 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
\r
1041 case CGitLogList::ID_EDITAUTHOR:
\r
1042 EditLogMessage(selIndex);
\r
1050 LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
1053 ASSERT(m_pFindDialog != NULL);
\r
1055 if (m_pFindDialog->IsTerminating())
\r
1057 // invalidate the handle identifying the dialog box.
\r
1058 m_pFindDialog = NULL;
\r
1062 if(m_pFindDialog->FindNext())
\r
1064 //read data from dialog
\r
1065 CString FindText = m_pFindDialog->GetFindString();
\r
1066 bool bMatchCase = (m_pFindDialog->MatchCase() == TRUE);
\r
1067 bool bFound = false;
\r
1069 bool bRegex = ValidateRegexp(FindText, pat, bMatchCase);
\r
1071 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_not_null;
\r
1074 for (i = this->m_nSearchIndex; i<m_arShownList.GetCount()&&!bFound; i++)
\r
1078 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1080 if (regex_search(wstring((LPCTSTR)pLogEntry->sMessage), pat, flags))
\r
1085 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1086 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1088 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1089 if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags))
\r
1095 if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags))
\r
1107 if (m_logEntries[i]->sMessage.Find(FindText) >= 0)
\r
1112 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1113 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1114 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1116 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1117 if (cpath->sCopyFromPath.Find(FindText)>=0)
\r
1123 if (cpath->sPath.Find(FindText)>=0)
\r
1133 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1134 CString msg = pLogEntry->sMessage;
\r
1135 msg = msg.MakeLower();
\r
1136 CString find = FindText.MakeLower();
\r
1137 if (msg.Find(find) >= 0)
\r
1142 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1143 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1145 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1146 CString lowerpath = cpath->sCopyFromPath;
\r
1147 lowerpath.MakeLower();
\r
1148 if (lowerpath.Find(find)>=0)
\r
1154 lowerpath = cpath->sPath;
\r
1155 lowerpath.MakeLower();
\r
1156 if (lowerpath.Find(find)>=0)
\r
1165 } // for (i = this->m_nSearchIndex; i<m_arShownList.GetItemCount()&&!bFound; i++)
\r
1168 this->m_nSearchIndex = (i+1);
\r
1169 m_LogList.EnsureVisible(i, FALSE);
\r
1170 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);
\r
1171 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
1172 m_LogList.SetSelectionMark(i);
\r
1173 FillLogMessageCtrl();
\r
1174 UpdateData(FALSE);
\r
1176 if (m_nSearchIndex >= m_arShownList.GetCount())
\r
1177 m_nSearchIndex = (int)m_arShownList.GetCount()-1;
\r
1179 } // if(m_pFindDialog->FindNext())
\r
1180 UpdateLogInfoLabel();
\r
1185 void CLogDlg::OnOK()
\r
1188 // since the log dialog is also used to select revisions for other
\r
1189 // dialogs, we have to do some work before closing this dialog
\r
1190 if (GetFocus() != GetDlgItem(IDOK))
\r
1191 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
\r
1192 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
\r
1193 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
\r
1196 CString buttontext;
\r
1197 GetDlgItemText(IDOK, buttontext);
\r
1198 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
1199 if (temp.Compare(buttontext) != 0)
\r
1200 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
\r
1201 m_bCancelled = TRUE;
\r
1202 m_selectedRevs.Clear();
\r
1203 m_selectedRevsOneRange.Clear();
\r
1204 if (m_pNotifyWindow)
\r
1206 int selIndex = m_LogList.GetSelectionMark();
\r
1207 if (selIndex >= 0)
\r
1209 PLOGENTRYDATA pLogEntry = NULL;
\r
1210 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1211 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1212 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1213 git_revnum_t lowerRev = pLogEntry->Rev;
\r
1214 git_revnum_t higherRev = lowerRev;
\r
1217 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1218 git_revnum_t rev = pLogEntry->Rev;
\r
1219 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1220 if (lowerRev > rev)
\r
1222 if (higherRev < rev)
\r
1225 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
\r
1227 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
\r
1229 BOOL bSentMessage = FALSE;
\r
1230 if (m_LogList.GetSelectedCount() == 1)
\r
1232 // if only one revision is selected, check if the path/url with which the dialog was started
\r
1233 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
\r
1234 // if it was copied, use the copy from revision as lowerRev
\r
1235 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
\r
1237 CString sUrl = m_path.GetGitPathString();
\r
1238 if (!m_path.IsUrl())
\r
1240 sUrl = GetURLFromPath(m_path);
\r
1242 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
\r
1243 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
\r
1245 LogChangedPath * pData = pLogEntry->pArChangedPaths->GetAt(cp);
\r
1248 if (sUrl.Compare(pData->sPath) == 0)
\r
1250 if (!pData->sCopyFromPath.IsEmpty())
\r
1252 lowerRev = pData->lCopyFromRev;
\r
1253 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
\r
1254 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
\r
1255 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1256 bSentMessage = TRUE;
\r
1263 if ( !bSentMessage )
\r
1265 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
\r
1266 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
\r
1267 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1268 if (m_selectedRevsOneRange.GetCount())
\r
1269 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
\r
1274 if (m_bSaveStrict)
\r
1275 m_regLastStrict = m_bStrict;
\r
1276 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
1277 reg = m_btnShow.GetCurrentEntry();
\r
1278 SaveSplitterPos();
\r
1282 void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
1284 // a double click on an entry in the changed-files list has happened
\r
1287 DiffSelectedFile();
\r
1290 void CLogDlg::DiffSelectedFile()
\r
1293 if (m_bThreadRunning)
\r
1295 UpdateLogInfoLabel();
\r
1296 INT_PTR selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
1299 if (m_ChangedFileListCtrl.GetSelectedCount() == 0)
\r
1301 // find out if there's an entry selected in the log list
\r
1302 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1303 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1304 git_revnum_t rev1 = pLogEntry->Rev;
\r
1305 git_revnum_t rev2 = rev1;
\r
1310 // there's at least a second entry selected in the log list: several revisions selected!
\r
1311 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1314 rev1 = max(rev1,(long)pLogEntry->Rev);
\r
1315 rev2 = min(rev2,(long)pLogEntry->Rev);
\r
1319 // now we have both revisions selected in the log list, so we can do a diff of the selected
\r
1320 // entry in the changed files list with these two revisions.
\r
1321 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1326 // nothing or only one revision selected in the log list
\r
1327 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1329 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
1331 // some items are hidden! So find out which item the user really clicked on
\r
1332 INT_PTR selRealIndex = -1;
\r
1333 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
1335 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
1337 if (selRealIndex == selIndex)
\r
1339 selIndex = hiddenindex;
\r
1340 changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1346 if (IsDiffPossible(changedpath, rev1))
\r
1348 // diffs with renamed files are possible
\r
1349 if ((changedpath)&&(!changedpath->sCopyFromPath.IsEmpty()))
\r
1350 rev2 = changedpath->lCopyFromRev;
\r
1353 // if the path was modified but the parent path was 'added with history'
\r
1354 // then we have to use the copy from revision of the parent path
\r
1355 CTGitPath cpath = CTGitPath(changedpath->sPath);
\r
1356 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
1358 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
1359 if (p.IsAncestorOf(cpath))
\r
1361 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
1362 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
1366 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1370 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1371 CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1373 // deleted files must be opened from the revision before the deletion
\r
1374 if (changedpath->action == LOGACTIONS_DELETED)
\r
1376 m_bCancelled = false;
\r
1378 CProgressDlg progDlg;
\r
1379 progDlg.SetTitle(IDS_APPNAME);
\r
1380 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1381 CString sInfoLine;
\r
1382 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)(m_sRepositoryRoot + changedpath->sPath), (LPCTSTR)r.ToString());
\r
1383 progDlg.SetLine(1, sInfoLine, true);
\r
1384 SetAndClearProgressInfo(&progDlg);
\r
1385 progDlg.ShowModeless(m_hWnd);
\r
1387 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))
\r
1389 m_bCancelled = false;
\r
1390 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), GitRev::REV_HEAD, r, tempfile))
\r
1393 SetAndClearProgressInfo((HWND)NULL);
\r
1394 CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1399 SetAndClearProgressInfo((HWND)NULL);
\r
1401 CString sName1, sName2;
\r
1402 sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1);
\r
1403 sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1-1);
\r
1404 CAppUtils::DiffFlags flags;
\r
1405 flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1406 if (changedpath->action == LOGACTIONS_DELETED)
\r
1407 CAppUtils::StartExtDiff(tempfile, tempfile2, sName2, sName1, flags);
\r
1409 CAppUtils::StartExtDiff(tempfile2, tempfile, sName2, sName1, flags);
\r
1416 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool blame, bool unified)
\r
1418 DialogEnableWindow(IDOK, FALSE);
\r
1419 // SetPromptApp(&theApp);
\r
1420 theApp.DoWaitCursor(1);
\r
1423 GetTempPath(temppath);
\r
1426 file1.Format(_T("%s%s_%s%s"),
\r
1428 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1429 rev1->m_CommitHash.Left(6),
\r
1430 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1433 file2.Format(_T("%s\\%s_%s%s"),
\r
1435 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1436 rev2->m_CommitHash.Left(6),
\r
1437 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1441 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1442 g_Git.RunLogFile(cmd,file1);
\r
1443 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1444 g_Git.RunLogFile(cmd,file2);
\r
1446 CAppUtils::DiffFlags flags;
\r
1447 CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),flags);
\r
1450 //get the filename
\r
1452 if (Git::PathIsURL(m_path))
\r
1454 filepath = m_path.GetGitPathString();
\r
1458 filepath = GetURLFromPath(m_path);
\r
1459 if (filepath.IsEmpty())
\r
1461 theApp.DoWaitCursor(-1);
\r
1463 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1464 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1465 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1467 theApp.DoWaitCursor(-11);
\r
1471 m_bCancelled = FALSE;
\r
1472 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1474 CString firstfile, secondfile;
\r
1475 if (m_LogList.GetSelectedCount()==1)
\r
1477 int s = m_LogList.GetSelectionMark();
\r
1478 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(s));
\r
1479 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1480 firstfile = changedpath->sPath;
\r
1481 secondfile = firstfile;
\r
1482 if ((rev2 == rev1-1)&&(changedpath->lCopyFromRev > 0)) // is it an added file with history?
\r
1484 secondfile = changedpath->sCopyFromPath;
\r
1485 rev2 = changedpath->lCopyFromRev;
\r
1490 firstfile = m_currentChangedPathList[selIndex].GetGitPathString();
\r
1491 secondfile = firstfile;
\r
1494 firstfile = filepath + firstfile.Trim();
\r
1495 secondfile = filepath + secondfile.Trim();
\r
1497 GitDiff diff(this, this->m_hWnd, true);
\r
1498 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1499 diff.SetHEADPeg(m_LogRevision);
\r
1502 if (PromptShown())
\r
1503 diff.ShowUnifiedDiff(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1);
\r
1505 CAppUtils::StartShowUnifiedDiff(m_hWnd, CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), m_LogRevision);
\r
1509 if (diff.ShowCompare(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), false, blame))
\r
1511 if (firstfile.Compare(secondfile)==0)
\r
1513 git_revnum_t baseRev = 0;
\r
1514 diff.DiffProps(CTGitPath(firstfile), rev2, rev1, baseRev);
\r
1521 theApp.DoWaitCursor(-1);
\r
1525 BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, git_revnum_t rev)
\r
1528 DialogEnableWindow(IDOK, FALSE);
\r
1529 SetPromptApp(&theApp);
\r
1530 theApp.DoWaitCursor(1);
\r
1532 if (Git::PathIsURL(m_path))
\r
1534 filepath = m_path.GetGitPathString();
\r
1538 filepath = GetURLFromPath(m_path);
\r
1539 if (filepath.IsEmpty())
\r
1541 theApp.DoWaitCursor(-1);
\r
1543 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1544 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1545 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1550 m_bCancelled = false;
\r
1551 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1552 filepath += changedpath;
\r
1554 CProgressDlg progDlg;
\r
1555 progDlg.SetTitle(IDS_APPNAME);
\r
1556 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1557 CString sInfoLine;
\r
1558 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)GitRev(rev).ToString());
\r
1559 progDlg.SetLine(1, sInfoLine, true);
\r
1560 SetAndClearProgressInfo(&progDlg);
\r
1561 progDlg.ShowModeless(m_hWnd);
\r
1563 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(filepath), rev);
\r
1564 m_bCancelled = false;
\r
1565 if (!Cat(CTGitPath(filepath), GitRev(rev), rev, tempfile))
\r
1568 SetAndClearProgressInfo((HWND)NULL);
\r
1569 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1571 theApp.DoWaitCursor(-1);
\r
1575 SetAndClearProgressInfo((HWND)NULL);
\r
1576 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
1579 int ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
\r
1580 if (ret <= HINSTANCE_ERROR)
\r
1585 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
1586 cmd += tempfile.GetWinPathString() + _T(" ");
\r
1587 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
1590 theApp.DoWaitCursor(-1);
\r
1595 void CLogDlg::EditAuthor(const CLogDataVector& logs)
\r
1600 if (logs.size() == 0)
\r
1602 DialogEnableWindow(IDOK, FALSE);
\r
1603 SetPromptApp(&theApp);
\r
1604 theApp.DoWaitCursor(1);
\r
1605 if (Git::PathIsURL(m_path))
\r
1606 url = m_path.GetGitPathString();
\r
1609 url = GetURLFromPath(m_path);
\r
1611 name = Git_PROP_REVISION_AUTHOR;
\r
1613 CString value = RevPropertyGet(name, CTGitPath(url), logs[0]->Rev);
\r
1614 CString sOldValue = value;
\r
1615 value.Replace(_T("\n"), _T("\r\n"));
\r
1616 CInputDlg dlg(this);
\r
1617 dlg.m_sHintText.LoadString(IDS_LOG_AUTHOR);
\r
1618 dlg.m_sInputText = value;
\r
1619 dlg.m_sTitle.LoadString(IDS_LOG_AUTHOREDITTITLE);
\r
1620 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1621 dlg.m_bUseLogWidth = false;
\r
1622 if (dlg.DoModal() == IDOK)
\r
1624 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1626 LogCache::CCachedLogInfo* toUpdate
\r
1627 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1629 CProgressDlg progDlg;
\r
1630 progDlg.SetTitle(IDS_APPNAME);
\r
1631 progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
\r
1632 progDlg.SetTime(true);
\r
1633 progDlg.SetShowProgressBar(true);
\r
1634 progDlg.ShowModeless(m_hWnd);
\r
1635 for (DWORD i=0; i<logs.size(); ++i)
\r
1637 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), logs[i]->Rev))
\r
1640 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1646 logs[i]->sAuthor = dlg.m_sInputText;
\r
1647 m_LogList.Invalidate();
\r
1649 // update the log cache
\r
1651 if (toUpdate != NULL)
\r
1653 // log caching is active
\r
1655 LogCache::CCachedLogInfo newInfo;
\r
1656 newInfo.Insert ( logs[i]->Rev
\r
1657 , (const char*) CUnicodeUtils::GetUTF8 (logs[i]->sAuthor)
\r
1660 , LogCache::CRevisionInfoContainer::HAS_AUTHOR);
\r
1662 toUpdate->Update (newInfo);
\r
1665 progDlg.SetProgress64(i, logs.size());
\r
1669 theApp.DoWaitCursor(-1);
\r
1674 void CLogDlg::EditLogMessage(int index)
\r
1679 DialogEnableWindow(IDOK, FALSE);
\r
1680 SetPromptApp(&theApp);
\r
1681 theApp.DoWaitCursor(1);
\r
1682 if (Git::PathIsURL(m_path))
\r
1683 url = m_path.GetGitPathString();
\r
1686 url = GetURLFromPath(m_path);
\r
1688 name = Git_PROP_REVISION_LOG;
\r
1690 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(index));
\r
1691 m_bCancelled = FALSE;
\r
1692 CString value = RevPropertyGet(name, CTGitPath(url), pLogEntry->Rev);
\r
1693 CString sOldValue = value;
\r
1694 value.Replace(_T("\n"), _T("\r\n"));
\r
1695 CInputDlg dlg(this);
\r
1696 dlg.m_sHintText.LoadString(IDS_LOG_MESSAGE);
\r
1697 dlg.m_sInputText = value;
\r
1698 dlg.m_sTitle.LoadString(IDS_LOG_MESSAGEEDITTITLE);
\r
1699 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1700 dlg.m_bUseLogWidth = true;
\r
1701 if (dlg.DoModal() == IDOK)
\r
1703 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1704 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), pLogEntry->Rev))
\r
1706 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1710 pLogEntry->sShortMessage = MakeShortMessage(dlg.m_sInputText);
\r
1711 // split multi line log entries and concatenate them
\r
1712 // again but this time with \r\n as line separators
\r
1713 // so that the edit control recognizes them
\r
1714 if (dlg.m_sInputText.GetLength()>0)
\r
1716 m_sMessageBuf = dlg.m_sInputText;
\r
1717 dlg.m_sInputText.Replace(_T("\n\r"), _T("\n"));
\r
1718 dlg.m_sInputText.Replace(_T("\r\n"), _T("\n"));
\r
1719 if (dlg.m_sInputText.Right(1).Compare(_T("\n"))==0)
\r
1720 dlg.m_sInputText = dlg.m_sInputText.Left(dlg.m_sInputText.GetLength()-1);
\r
1723 dlg.m_sInputText.Empty();
\r
1724 pLogEntry->sMessage = dlg.m_sInputText;
\r
1725 pLogEntry->sBugIDs = m_ProjectProperties.FindBugID(dlg.m_sInputText);
\r
1726 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
1727 pMsgView->SetWindowText(_T(" "));
\r
1728 pMsgView->SetWindowText(dlg.m_sInputText);
\r
1729 m_ProjectProperties.FindBugID(dlg.m_sInputText, pMsgView);
\r
1730 m_LogList.Invalidate();
\r
1732 // update the log cache
\r
1734 LogCache::CCachedLogInfo* toUpdate
\r
1735 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1736 if (toUpdate != NULL)
\r
1738 // log caching is active
\r
1740 LogCache::CCachedLogInfo newInfo;
\r
1741 newInfo.Insert ( pLogEntry->Rev
\r
1743 , (const char*) CUnicodeUtils::GetUTF8 (pLogEntry->sMessage)
\r
1745 , LogCache::CRevisionInfoContainer::HAS_COMMENT);
\r
1747 toUpdate->Update (newInfo);
\r
1751 theApp.DoWaitCursor(-1);
\r
1756 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
\r
1758 // Skip Ctrl-C when copying text out of the log message or search filter
\r
1759 BOOL bSkipAccelerator = ( pMsg->message == WM_KEYDOWN && pMsg->wParam=='C' && (GetFocus()==GetDlgItem(IDC_MSGVIEW) || GetFocus()==GetDlgItem(IDC_SEARCHEDIT) ) && GetKeyState(VK_CONTROL)&0x8000 );
\r
1760 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
\r
1762 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
\r
1764 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))
\r
1766 DiffSelectedRevWithPrevious();
\r
1770 if (GetFocus()==GetDlgItem(IDC_LOGMSG))
\r
1772 DiffSelectedFile();
\r
1776 if (m_hAccel && !bSkipAccelerator)
\r
1778 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
\r
1783 m_tooltips.RelayEvent(pMsg);
\r
1784 return __super::PreTranslateMessage(pMsg);
\r
1788 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
1790 //if (this->IsThreadRunning())
\r
1791 if(m_LogList.m_bNoDispUpdates)
\r
1793 // only show the wait cursor over the list control
\r
1795 ((pWnd == GetDlgItem(IDC_LOGLIST))||
\r
1796 (pWnd == GetDlgItem(IDC_MSGVIEW))||
\r
1797 (pWnd == GetDlgItem(IDC_LOGMSG))))
\r
1799 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
1804 if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1805 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1807 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
1809 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1812 void CLogDlg::OnBnClickedHelp()
\r
1817 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1819 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1821 //if (this->IsThreadRunning())
\r
1822 if(m_LogList.m_bNoDispUpdates)
\r
1824 if (pNMLV->iItem >= 0)
\r
1826 m_nSearchIndex = pNMLV->iItem;
\r
1827 if (pNMLV->iSubItem != 0)
\r
1829 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount())&&(m_bStrict)&&(1/*m_bStrictStopped*/))
\r
1831 // remove the selected state
\r
1832 if (pNMLV->uChanged & LVIF_STATE)
\r
1834 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
\r
1835 FillLogMessageCtrl();
\r
1836 UpdateData(FALSE);
\r
1837 UpdateLogInfoLabel();
\r
1841 if (pNMLV->uChanged & LVIF_STATE)
\r
1843 FillLogMessageCtrl();
\r
1844 UpdateData(FALSE);
\r
1849 FillLogMessageCtrl();
\r
1850 UpdateData(FALSE);
\r
1853 UpdateLogInfoLabel();
\r
1856 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
\r
1858 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
\r
1859 if (pEnLink->msg == WM_LBUTTONUP)
\r
1862 GetDlgItemText(IDC_MSGVIEW, msg);
\r
1863 msg.Replace(_T("\r\n"), _T("\n"));
\r
1864 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
\r
1865 if (!::PathIsURL(url))
\r
1867 url = m_ProjectProperties.GetBugIDUrl(url);
\r
1868 url = GetAbsoluteUrlFromRelativeUrl(url);
\r
1870 if (!url.IsEmpty())
\r
1871 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
1876 void CLogDlg::OnBnClickedStatbutton()
\r
1879 if (this->IsThreadRunning())
\r
1881 if (m_LogList.m_arShownList.IsEmpty())
\r
1882 return; // nothing is shown, so no statistics.
\r
1883 // the statistics dialog expects the log entries to be sorted by date
\r
1884 SortByColumn(3, false);
\r
1885 CPtrArray shownlist;
\r
1886 m_LogList.RecalculateShownList(&shownlist);
\r
1887 // create arrays which are aware of the current filter
\r
1888 CStringArray m_arAuthorsFiltered;
\r
1889 CDWordArray m_arDatesFiltered;
\r
1890 CDWordArray m_arFileChangesFiltered;
\r
1891 for (INT_PTR i=0; i<shownlist.GetCount(); ++i)
\r
1893 GitRev* pLogEntry = reinterpret_cast<GitRev*>(shownlist.GetAt(i));
\r
1894 CString strAuthor = pLogEntry->m_AuthorName;
\r
1895 if ( strAuthor.IsEmpty() )
\r
1897 strAuthor.LoadString(IDS_STATGRAPH_EMPTYAUTHOR);
\r
1899 m_arAuthorsFiltered.Add(strAuthor);
\r
1900 m_arDatesFiltered.Add(pLogEntry->m_AuthorDate.GetTime());
\r
1901 m_arFileChangesFiltered.Add(pLogEntry->m_Files.GetCount());
\r
1903 CStatGraphDlg dlg;
\r
1904 dlg.m_parAuthors = &m_arAuthorsFiltered;
\r
1905 dlg.m_parDates = &m_arDatesFiltered;
\r
1906 dlg.m_parFileChanges = &m_arFileChangesFiltered;
\r
1907 dlg.m_path = m_path;
\r
1909 // restore the previous sorting
\r
1910 SortByColumn(m_nSortColumn, m_bAscending);
\r
1911 OnTimer(LOGFILTER_TIMER);
\r
1916 void CLogDlg::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1919 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
1920 // Take the default processing unless we set this to something else below.
\r
1921 *pResult = CDRF_DODEFAULT;
\r
1923 if (m_bNoDispUpdates)
\r
1926 switch (pLVCD->nmcd.dwDrawStage)
\r
1928 case CDDS_PREPAINT:
\r
1930 *pResult = CDRF_NOTIFYITEMDRAW;
\r
1934 case CDDS_ITEMPREPAINT:
\r
1936 // This is the prepaint stage for an item. Here's where we set the
\r
1937 // item's text color.
\r
1939 // Tell Windows to send draw notifications for each subitem.
\r
1940 *pResult = CDRF_NOTIFYSUBITEMDRAW;
\r
1942 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
1944 if (m_arShownList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1946 GitRev* data = (GitRev*)m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec);
\r
1950 if (data->bCopiedSelf)
\r
1952 // only change the background color if the item is not 'hot' (on vista with themes enabled)
\r
1953 if (!theme.IsAppThemed() || !m_bVista || ((pLVCD->nmcd.uItemState & CDIS_HOT)==0))
\r
1954 pLVCD->clrTextBk = GetSysColor(COLOR_MENU);
\r
1957 if (data->bCopies)
\r
1958 crText = m_Colors.GetColor(CColors::Modified);
\r
1960 // if ((data->childStackDepth)||(m_mergedRevs.find(data->Rev) != m_mergedRevs.end()))
\r
1961 // crText = GetSysColor(COLOR_GRAYTEXT);
\r
1962 // if (data->Rev == m_wcRev)
\r
1964 // SelectObject(pLVCD->nmcd.hdc, m_boldFont);
\r
1965 // We changed the font, so we're returning CDRF_NEWFONT. This
\r
1966 // tells the control to recalculate the extent of the text.
\r
1967 // *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;
\r
1971 if (m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1973 if (m_bStrictStopped)
\r
1974 crText = GetSysColor(COLOR_GRAYTEXT);
\r
1976 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
1977 pLVCD->clrText = crText;
\r
1981 case CDDS_ITEMPREPAINT|CDDS_ITEM|CDDS_SUBITEM:
\r
1983 if ((m_bStrictStopped)&&(m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
1985 pLVCD->nmcd.uItemState &= ~(CDIS_SELECTED|CDIS_FOCUS);
\r
1987 if (pLVCD->iSubItem == 1)
\r
1989 *pResult = CDRF_DODEFAULT;
\r
1991 if (m_arShownList.GetCount() <= (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1995 int iconwidth = ::GetSystemMetrics(SM_CXSMICON);
\r
1996 int iconheight = ::GetSystemMetrics(SM_CYSMICON);
\r
1998 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec));
\r
2000 // Get the selected state of the
\r
2001 // item being drawn.
\r
2003 SecureZeroMemory(&rItem, sizeof(LVITEM));
\r
2004 rItem.mask = LVIF_STATE;
\r
2005 rItem.iItem = pLVCD->nmcd.dwItemSpec;
\r
2006 rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
\r
2007 m_LogList.GetItem(&rItem);
\r
2010 m_LogList.GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);
\r
2012 // Fill the background
\r
2013 if (theme.IsAppThemed() && m_bVista)
\r
2015 theme.Open(m_hWnd, L"Explorer");
\r
2016 int state = LISS_NORMAL;
\r
2017 if (rItem.state & LVIS_SELECTED)
\r
2019 if (::GetFocus() == m_LogList.m_hWnd)
\r
2020 state |= LISS_SELECTED;
\r
2022 state |= LISS_SELECTEDNOTFOCUS;
\r
2027 if (pLogEntry->bCopiedSelf)
\r
2029 // unfortunately, the pLVCD->nmcd.uItemState does not contain valid
\r
2030 // information at this drawing stage. But we can check the whether the
\r
2031 // previous stage changed the background color of the item
\r
2032 if (pLVCD->clrTextBk == GetSysColor(COLOR_MENU))
\r
2035 brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
2038 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
2039 ::DeleteObject(brush);
\r
2046 if (theme.IsBackgroundPartiallyTransparent(LVP_LISTDETAIL, state))
\r
2047 theme.DrawParentBackground(m_hWnd, pLVCD->nmcd.hdc, &rect);
\r
2049 theme.DrawBackground(pLVCD->nmcd.hdc, LVP_LISTDETAIL, state, &rect, NULL);
\r
2054 if (rItem.state & LVIS_SELECTED)
\r
2056 if (::GetFocus() == m_LogList.m_hWnd)
\r
2057 brush = ::CreateSolidBrush(::GetSysColor(COLOR_HIGHLIGHT));
\r
2059 brush = ::CreateSolidBrush(::GetSysColor(COLOR_BTNFACE));
\r
2063 //if (pLogEntry->bCopiedSelf)
\r
2064 // brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
2066 brush = ::CreateSolidBrush(::GetSysColor(COLOR_WINDOW));
\r
2068 if (brush == NULL)
\r
2071 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
2072 ::DeleteObject(brush);
\r
2075 // Draw the icon(s) into the compatible DC
\r
2076 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
2077 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left + ICONITEMBORDER, rect.top, m_hModifiedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2080 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
2081 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hAddedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2084 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
2085 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hDeletedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2088 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
2089 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hReplacedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2091 *pResult = CDRF_SKIPDEFAULT;
\r
2097 *pResult = CDRF_DODEFAULT;
\r
2102 void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2105 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
2106 // Take the default processing unless we set this to something else below.
\r
2107 *pResult = CDRF_DODEFAULT;
\r
2109 // if (m_bNoDispUpdates)
\r
2112 // First thing - check the draw stage. If it's the control's prepaint
\r
2113 // stage, then tell Windows we want messages for every item.
\r
2115 if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2117 *pResult = CDRF_NOTIFYITEMDRAW;
\r
2119 else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2121 // This is the prepaint stage for an item. Here's where we set the
\r
2122 // item's text color. Our return value will tell Windows to draw the
\r
2123 // item itself, but it will use the new color we set here.
\r
2125 // Tell Windows to paint the control itself.
\r
2126 *pResult = CDRF_DODEFAULT;
\r
2128 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
2129 bool bGrayed = false;
\r
2131 if ((m_cHidePaths.GetState() & 0x0003)==BST_INDETERMINATE)
\r
2133 if ((m_currentChangedArray)&&((m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)))
\r
2135 //if ((*m_currentChangedArray)[(pLVCD->nmcd.dwItemSpec)]sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2137 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2141 else if (m_currentChangedPathList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
2143 //if (m_currentChangedPathList[pLVCD->nmcd.dwItemSpec].GetGitPathString().Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2145 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2152 if ((!bGrayed)&&(m_currentChangedArray)&&(m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
2154 DWORD action = ((*m_currentChangedArray)[pLVCD->nmcd.dwItemSpec]).m_Action;
\r
2155 if (action == CTGitPath::LOGACTIONS_MODIFIED)
\r
2156 crText = m_Colors.GetColor(CColors::Modified);
\r
2157 if (action == CTGitPath::LOGACTIONS_REPLACED)
\r
2158 crText = m_Colors.GetColor(CColors::Deleted);
\r
2159 if (action == CTGitPath::LOGACTIONS_ADDED)
\r
2160 crText = m_Colors.GetColor(CColors::Added);
\r
2161 if (action == CTGitPath::LOGACTIONS_DELETED)
\r
2162 crText = m_Colors.GetColor(CColors::Deleted);
\r
2165 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
2166 pLVCD->clrText = crText;
\r
2170 void CLogDlg::DoSizeV1(int delta)
\r
2173 RemoveAnchor(IDC_LOGLIST);
\r
2174 RemoveAnchor(IDC_SPLITTERTOP);
\r
2175 RemoveAnchor(IDC_MSGVIEW);
\r
2176 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2177 RemoveAnchor(IDC_LOGMSG);
\r
2178 CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);
\r
2179 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);
\r
2180 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2181 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2182 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2183 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2184 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2187 SetSplitterRange();
\r
2188 m_LogList.Invalidate();
\r
2189 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2193 void CLogDlg::DoSizeV2(int delta)
\r
2196 RemoveAnchor(IDC_LOGLIST);
\r
2197 RemoveAnchor(IDC_SPLITTERTOP);
\r
2198 RemoveAnchor(IDC_MSGVIEW);
\r
2199 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2200 RemoveAnchor(IDC_LOGMSG);
\r
2201 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);
\r
2202 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);
\r
2203 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2204 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2205 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2206 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2207 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2210 SetSplitterRange();
\r
2211 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2212 m_ChangedFileListCtrl.Invalidate();
\r
2216 void CLogDlg::AdjustMinSize()
\r
2218 // adjust the minimum size of the dialog to prevent the resizing from
\r
2219 // moving the list control too far down.
\r
2220 CRect rcChgListView;
\r
2221 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
\r
2223 m_LogList.GetClientRect(rcLogList);
\r
2225 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
\r
2226 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
\r
2227 +rcChgListView.Height()+rcLogList.Height()+60));
\r
2230 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
2232 switch (message) {
\r
2234 if (wParam == IDC_SPLITTERTOP)
\r
2236 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2237 DoSizeV1(pHdr->delta);
\r
2239 else if (wParam == IDC_SPLITTERBOTTOM)
\r
2241 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2242 DoSizeV2(pHdr->delta);
\r
2247 return CResizableDialog::DefWindowProc(message, wParam, lParam);
\r
2250 void CLogDlg::SetSplitterRange()
\r
2252 if ((m_LogList)&&(m_ChangedFileListCtrl))
\r
2255 m_LogList.GetWindowRect(rcTop);
\r
2256 ScreenToClient(rcTop);
\r
2258 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);
\r
2259 ScreenToClient(rcMiddle);
\r
2260 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);
\r
2262 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
\r
2263 ScreenToClient(rcBottom);
\r
2264 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);
\r
2268 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
\r
2270 RECT * rect = (LPRECT)lParam;
\r
2273 point = CPoint(rect->left, rect->bottom);
\r
2274 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))
\r
2276 if (popup.CreatePopupMenu())
\r
2278 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2279 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ALL), LOGFILTER_ALL, temp);
\r
2281 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2283 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2284 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
\r
2285 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2286 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
\r
2287 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2288 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
\r
2289 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2290 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
\r
2291 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
\r
2292 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
\r
2294 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2296 temp.LoadString(IDS_LOG_FILTER_REGEX);
\r
2297 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
\r
2300 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2301 if (selection != 0)
\r
2304 if (selection == LOGFILTER_REGEX)
\r
2306 m_bFilterWithRegex = !m_bFilterWithRegex;
\r
2307 CRegDWORD b = CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
2308 b = m_bFilterWithRegex;
\r
2309 CheckRegexpTooltip();
\r
2313 m_LogList.m_nSelectedFilter = selection;
\r
2314 SetFilterCueText();
\r
2316 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2322 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
2325 KillTimer(LOGFILTER_TIMER);
\r
2327 m_LogList.m_sFilterText.Empty();
\r
2328 UpdateData(FALSE);
\r
2329 theApp.DoWaitCursor(1);
\r
2330 CStoreSelection storeselection(this);
\r
2331 FillLogMessageCtrl(false);
\r
2333 m_LogList.RemoveFilter();
\r
2336 m_LogList.GetTimeRange(begin,end);
\r
2337 m_DateFrom.SetTime(&begin);
\r
2338 m_DateTo.SetTime(&end);
\r
2340 theApp.DoWaitCursor(-1);
\r
2341 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2342 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2343 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2344 UpdateLogInfoLabel();
\r
2350 void CLogDlg::SetFilterCueText()
\r
2353 switch (m_LogList.m_nSelectedFilter)
\r
2355 case LOGFILTER_ALL:
\r
2356 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2358 case LOGFILTER_MESSAGES:
\r
2359 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2361 case LOGFILTER_PATHS:
\r
2362 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2364 case LOGFILTER_AUTHORS:
\r
2365 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2367 case LOGFILTER_REVS:
\r
2368 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2371 // to make the cue banner text appear more to the right of the edit control
\r
2372 temp = _T(" ")+temp;
\r
2373 m_cFilter.SetCueBanner(temp);
\r
2376 bool CLogDlg::Validate(LPCTSTR string)
\r
2378 if (!m_bFilterWithRegex)
\r
2381 return m_LogList.ValidateRegexp(string, pat, false);
\r
2385 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
\r
2387 if (nIDEvent == LOGFILTER_TIMER)
\r
2389 if (this->IsThreadRunning())
\r
2391 // thread still running! So just restart the timer.
\r
2392 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2395 CWnd * focusWnd = GetFocus();
\r
2396 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
\r
2397 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
\r
2398 if (m_LogList.m_sFilterText.IsEmpty())
\r
2400 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2401 // do not return here!
\r
2402 // we also need to run the filter if the filter text is empty:
\r
2403 // 1. to clear an existing filter
\r
2404 // 2. to rebuild the m_arShownList after sorting
\r
2406 theApp.DoWaitCursor(1);
\r
2407 CStoreSelection storeselection(this);
\r
2408 KillTimer(LOGFILTER_TIMER);
\r
2409 FillLogMessageCtrl(false);
\r
2411 // now start filter the log list
\r
2412 m_LogList.StartFilter();
\r
2414 if ( m_LogList.GetItemCount()==1 )
\r
2416 m_LogList.SetSelectionMark(0);
\r
2417 m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
\r
2419 theApp.DoWaitCursor(-1);
\r
2420 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2421 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2422 if (bSetFocusToFilterControl)
\r
2423 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2424 UpdateLogInfoLabel();
\r
2425 } // if (nIDEvent == LOGFILTER_TIMER)
\r
2426 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2427 __super::OnTimer(nIDEvent);
\r
2430 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2433 m_DateTo.GetTime(_time);
\r
2436 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
\r
2437 if (time.GetTime() != m_LogList.m_To.GetTime())
\r
2439 m_LogList.m_To = (DWORD)time.GetTime();
\r
2440 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2443 catch (CAtlException)
\r
2450 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2453 m_DateFrom.GetTime(_time);
\r
2456 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
\r
2457 if (time.GetTime() != m_LogList.m_From.GetTime())
\r
2459 m_LogList.m_From = (DWORD)time.GetTime();
\r
2460 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2463 catch (CAtlException)
\r
2472 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths /* = false */, bool bUseFilter /* = true */)
\r
2474 CTGitPathList pathList;
\r
2477 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2479 m_sRepositoryRoot = GetRepositoryRoot(m_path);
\r
2481 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2484 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2489 int nextpos = m_LogList.GetNextSelectedItem(pos);
\r
2490 if (nextpos >= m_arShownList.GetCount())
\r
2492 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(nextpos));
\r
2493 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
2494 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
2496 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2497 if (cpath == NULL)
\r
2500 if (!bRelativePaths)
\r
2501 path.SetFromGit(m_sRepositoryRoot);
\r
2502 path.AppendPathString(cpath->sPath);
\r
2503 if ((!bUseFilter)||
\r
2504 ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||
\r
2505 (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))
\r
2506 pathList.AddPath(path);
\r
2511 pathList.RemoveDuplicates();
\r
2516 void CLogDlg::SortByColumn(int nSortColumn, bool bAscending)
\r
2519 switch(nSortColumn)
\r
2521 case 0: // Revision
\r
2524 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
\r
2526 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
\r
2532 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
\r
2534 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
\r
2540 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
\r
2542 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
\r
2548 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
\r
2550 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
\r
2553 case 4: // Message or bug id
\r
2554 if (m_bShowBugtraqColumn)
\r
2557 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
\r
2559 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
\r
2562 // fall through here
\r
2563 case 5: // Message
\r
2566 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
\r
2568 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
\r
2578 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
2580 if (this->IsThreadRunning())
\r
2581 return; //no sorting while the arrays are filled
\r
2582 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2583 const int nColumn = pNMLV->iSubItem;
\r
2584 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
\r
2585 m_nSortColumn = nColumn;
\r
2586 SortByColumn(m_nSortColumn, m_bAscending);
\r
2587 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
\r
2588 SortShownListArray();
\r
2589 m_LogList.Invalidate();
\r
2590 UpdateLogInfoLabel();
\r
2591 // the "next 100" button only makes sense if the log messages
\r
2592 // are sorted by revision in descending order
\r
2593 if ((m_nSortColumn)||(m_bAscending))
\r
2595 DialogEnableWindow(IDC_NEXTHUNDRED, false);
\r
2599 DialogEnableWindow(IDC_NEXTHUNDRED, true);
\r
2604 void CLogDlg::SortShownListArray()
\r
2606 // make sure the shown list still matches the filter after sorting.
\r
2607 OnTimer(LOGFILTER_TIMER);
\r
2608 // clear the selection states
\r
2609 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2612 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
\r
2614 m_LogList.SetSelectionMark(-1);
\r
2617 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
\r
2619 if (control == NULL)
\r
2621 // set the sort arrow
\r
2622 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
\r
2623 HDITEM HeaderItem = {0};
\r
2624 HeaderItem.mask = HDI_FORMAT;
\r
2625 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
2627 pHeader->GetItem(i, &HeaderItem);
\r
2628 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
2629 pHeader->SetItem(i, &HeaderItem);
\r
2633 pHeader->GetItem(nColumn, &HeaderItem);
\r
2634 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
2635 pHeader->SetItem(nColumn, &HeaderItem);
\r
2638 void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2641 if (this->IsThreadRunning())
\r
2642 return; //no sorting while the arrays are filled
\r
2643 if (m_currentChangedArray == NULL)
\r
2645 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2646 const int nColumn = pNMLV->iSubItem;
\r
2647 m_bAscendingPathList = nColumn == m_nSortColumnPathList ? !m_bAscendingPathList : TRUE;
\r
2648 m_nSortColumnPathList = nColumn;
\r
2649 // qsort(m_currentChangedArray->GetData(), m_currentChangedArray->GetSize(), sizeof(LogChangedPath*), (GENERICCOMPAREFN)SortCompare);
\r
2651 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
2652 m_ChangedFileListCtrl.Invalidate();
\r
2657 int CLogDlg::m_nSortColumnPathList = 0;
\r
2658 bool CLogDlg::m_bAscendingPathList = false;
\r
2660 int CLogDlg::SortCompare(const void * pElem1, const void * pElem2)
\r
2663 LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);
\r
2664 LogChangedPath * cpath2 = *((LogChangedPath**)pElem2);
\r
2666 if (m_bAscendingPathList)
\r
2667 std::swap (cpath1, cpath2);
\r
2670 switch (m_nSortColumnPathList)
\r
2673 cmp = cpath2->GetAction().Compare(cpath1->GetAction());
\r
2678 cmp = cpath2->sPath.CompareNoCase(cpath1->sPath);
\r
2682 case 2: // copy from path
\r
2683 cmp = cpath2->sCopyFromPath.Compare(cpath1->sCopyFromPath);
\r
2687 case 3: // copy from revision
\r
2688 return cpath2->lCopyFromRev > cpath1->lCopyFromRev;
\r
2695 void CLogDlg::ResizeAllListCtrlCols()
\r
2698 const int nMinimumWidth = ICONITEMBORDER+16*4;
\r
2699 int maxcol = ((CHeaderCtrl*)(m_LogList.GetDlgItem(0)))->GetItemCount()-1;
\r
2700 int nItemCount = m_LogList.GetItemCount();
\r
2701 TCHAR textbuf[MAX_PATH];
\r
2702 CHeaderCtrl * pHdrCtrl = (CHeaderCtrl*)(m_LogList.GetDlgItem(0));
\r
2705 for (int col = 0; col <= maxcol; col++)
\r
2708 hdi.mask = HDI_TEXT;
\r
2709 hdi.pszText = textbuf;
\r
2710 hdi.cchTextMax = sizeof(textbuf);
\r
2711 pHdrCtrl->GetItem(col, &hdi);
\r
2712 int cx = m_LogList.GetStringWidth(hdi.pszText)+20; // 20 pixels for col separator and margin
\r
2713 for (int index = 0; index<nItemCount; ++index)
\r
2715 // get the width of the string and add 14 pixels for the column separator and margins
\r
2716 int linewidth = m_LogList.GetStringWidth(m_LogList.GetItemText(index, col)) + 14;
\r
2717 if (index < m_arShownList.GetCount())
\r
2719 GitRev * pCurLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(index));
\r
2720 if ((pCurLogEntry)&&(pCurLogEntry->m_CommitHash == m_wcRev.m_CommitHash))
\r
2722 // set the bold font and ask for the string width again
\r
2723 m_LogList.SendMessage(WM_SETFONT, (WPARAM)m_boldFont, NULL);
\r
2724 linewidth = m_LogList.GetStringWidth(m_LogList.GetItemText(index, col)) + 14;
\r
2725 // restore the system font
\r
2726 m_LogList.SendMessage(WM_SETFONT, NULL, NULL);
\r
2731 // add the image size
\r
2732 CImageList * pImgList = m_LogList.GetImageList(LVSIL_SMALL);
\r
2733 if ((pImgList)&&(pImgList->GetImageCount()))
\r
2735 IMAGEINFO imginfo;
\r
2736 pImgList->GetImageInfo(0, &imginfo);
\r
2737 linewidth += (imginfo.rcImage.right - imginfo.rcImage.left);
\r
2738 linewidth += 3; // 3 pixels between icon and text
\r
2741 if (cx < linewidth)
\r
2744 // Adjust columns "Actions" containing icons
\r
2745 if (col == this->LOGLIST_ACTION)
\r
2747 if (cx < nMinimumWidth)
\r
2749 cx = nMinimumWidth;
\r
2753 if (col == this->LOGLIST_MESSAGE)
\r
2755 if (cx > LOGLIST_MESSAGE_MAX)
\r
2757 cx = LOGLIST_MESSAGE_MAX;
\r
2761 // keep the bug id column small
\r
2762 if ((col == 4)&&(m_bShowBugtraqColumn))
\r
2764 if (cx > (int)(DWORD)m_regMaxBugIDColWidth)
\r
2766 cx = (int)(DWORD)m_regMaxBugIDColWidth;
\r
2770 m_LogList.SetColumnWidth(col, cx);
\r
2777 void CLogDlg::OnBnClickedHidepaths()
\r
2779 FillLogMessageCtrl();
\r
2780 m_ChangedFileListCtrl.Invalidate();
\r
2785 void CLogDlg::OnBnClickedCheckStoponcopy()
\r
2788 if (!GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
2791 // ignore old fetch limits when switching
\r
2792 // between copy-following and stop-on-copy
\r
2793 // (otherwise stop-on-copy will limit what
\r
2794 // we see immediately after switching to
\r
2795 // copy-following)
\r
2799 // now, restart the query
\r
2804 void CLogDlg::OnBnClickedIncludemerge()
\r
2814 void CLogDlg::UpdateLogInfoLabel()
\r
2817 git_revnum_t rev1 ;
\r
2818 git_revnum_t rev2 ;
\r
2819 long selectedrevs ;
\r
2820 int count =m_LogList.m_arShownList.GetCount();
\r
2823 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(0)))->m_CommitHash;
\r
2824 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));
\r
2825 rev2 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(count-1)))->m_CommitHash;
\r
2826 selectedrevs = m_LogList.GetSelectedCount();
\r
2829 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
2830 m_sLogInfo = sTemp;
\r
2832 UpdateData(FALSE);
\r
2836 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
\r
2839 int selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
2840 if ((point.x == -1) && (point.y == -1))
\r
2843 m_ChangedFileListCtrl.GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2844 m_ChangedFileListCtrl.ClientToScreen(&rect);
\r
2845 point = rect.CenterPoint();
\r
2849 int s = m_LogList.GetSelectionMark();
\r
2852 std::vector<CString> changedpaths;
\r
2853 std::vector<LogChangedPath*> changedlogpaths;
\r
2854 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2856 return; // nothing is selected, get out of here
\r
2858 bool bOneRev = true;
\r
2859 int sel=m_LogList.GetNextSelectedItem(pos);
\r
2860 GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel));
\r
2861 GitRev * rev1 = pLogEntry;
\r
2862 GitRev * rev2 = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel+1));
\r
2864 bool bOneRev = true;
\r
2869 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
2872 rev1 = max(rev1,(git_revnum_t)pLogEntry->Rev);
\r
2873 rev2 = min(rev2,(git_revnum_t)pLogEntry->Rev);
\r
2879 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
2882 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
2883 changedpaths.push_back(m_currentChangedPathList[nItem].GetGitPathString());
\r
2888 // only one revision is selected in the log dialog top pane
\r
2889 // but multiple items could be selected in the changed items list
\r
2892 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
2895 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
2896 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
2898 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
2900 if ((changedlogpath)&&(!changedlogpath->sCopyFromPath.IsEmpty()))
\r
2901 rev2 = changedlogpath->lCopyFromRev;
\r
2904 // if the path was modified but the parent path was 'added with history'
\r
2905 // then we have to use the copy from revision of the parent path
\r
2906 CTGitPath cpath = CTGitPath(changedlogpath->sPath);
\r
2907 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
2909 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
2910 if (p.IsAncestorOf(cpath))
\r
2912 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
2913 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
2918 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
2920 // some items are hidden! So find out which item the user really clicked on
\r
2921 INT_PTR selRealIndex = -1;
\r
2922 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
2924 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
2926 if (selRealIndex == nItem)
\r
2928 selIndex = hiddenindex;
\r
2929 changedlogpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
2934 if (changedlogpath)
\r
2936 changedpaths.push_back(changedlogpath->sPath);
\r
2937 changedlogpaths.push_back(changedlogpath);
\r
2942 //entry is selected, now show the popup menu
\r
2944 if (popup.CreatePopupMenu())
\r
2946 bool bEntryAdded = false;
\r
2947 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
2949 // if ((!bOneRev)||(IsDiffPossible(changedlogpaths[0], rev1)))
\r
2951 popup.AppendMenuIcon(CGitLogList::ID_DIFF, IDS_LOG_POPUP_DIFF, IDI_DIFF);
\r
2952 popup.AppendMenuIcon(CGitLogList::ID_BLAMEDIFF, IDS_LOG_POPUP_BLAMEDIFF, IDI_BLAME);
\r
2953 popup.SetDefaultItem(CGitLogList::ID_DIFF, FALSE);
\r
2954 popup.AppendMenuIcon(CGitLogList::ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF);
\r
2955 bEntryAdded = true;
\r
2957 // if (rev2 == rev1-1)
\r
2960 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2961 popup.AppendMenuIcon(CGitLogList::ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);
\r
2962 popup.AppendMenuIcon(CGitLogList::ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2963 popup.AppendMenuIcon(CGitLogList::ID_BLAME, IDS_LOG_POPUP_BLAME, IDI_BLAME);
\r
2964 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2966 popup.AppendMenuIcon(CGitLogList::ID_REVERTREV, IDS_LOG_POPUP_REVERTREV, IDI_REVERT);
\r
2967 popup.AppendMenuIcon(CGitLogList::ID_POPPROPS, IDS_REPOBROWSE_SHOWPROP, IDI_PROPERTIES); // "Show Properties"
\r
2968 popup.AppendMenuIcon(CGitLogList::ID_LOG, IDS_MENULOG, IDI_LOG); // "Show Log"
\r
2969 popup.AppendMenuIcon(CGitLogList::ID_GETMERGELOGS, IDS_LOG_POPUP_GETMERGELOGS, IDI_LOG); // "Show merge log"
\r
2970 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
\r
2971 bEntryAdded = true;
\r
2972 if (!m_ProjectProperties.sWebViewerPathRev.IsEmpty())
\r
2974 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2975 popup.AppendMenuIcon(CGitLogList::ID_VIEWPATHREV, IDS_LOG_POPUP_VIEWPATHREV);
\r
2977 if (popup.GetDefaultItem(0,FALSE)==-1)
\r
2978 popup.SetDefaultItem(CGitLogList::ID_OPEN, FALSE);
\r
2981 else if (changedlogpaths.size())
\r
2983 // more than one entry is selected
\r
2984 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE);
\r
2985 bEntryAdded = true;
\r
2990 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2991 bool bOpenWith = false;
\r
2992 bool bMergeLog = false;
\r
2993 m_bCancelled = false;
\r
2997 case CGitLogList::ID_DIFF:
\r
2999 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
3003 case ID_BLAMEDIFF:
\r
3005 DoDiffFromLog(selIndex, rev1, rev2, true, false);
\r
3010 DoDiffFromLog(selIndex, rev1, rev2, false, true);
\r
3013 case ID_REVERTREV:
\r
3015 SetPromptApp(&theApp);
\r
3016 theApp.DoWaitCursor(1);
\r
3018 if (Git::PathIsURL(m_path))
\r
3020 sUrl = m_path.GetGitPathString();
\r
3024 sUrl = GetURLFromPath(m_path);
\r
3025 if (sUrl.IsEmpty())
\r
3027 theApp.DoWaitCursor(-1);
\r
3029 temp.Format(IDS_ERR_NOURLOFFILE, m_path.GetWinPath());
\r
3030 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3032 theApp.DoWaitCursor(-1);
\r
3036 // find the working copy path of the selected item from the URL
\r
3037 m_bCancelled = false;
\r
3038 CString sUrlRoot = GetRepositoryRoot(CTGitPath(sUrl));
\r
3040 CString fileURL = changedpaths[0];
\r
3041 fileURL = sUrlRoot + fileURL.Trim();
\r
3042 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1
\r
3043 // sUrl = http://mydomain.com/repos/trunk/folder
\r
3044 CString sUnescapedUrl = CPathUtils::PathUnescape(sUrl);
\r
3045 // find out until which char the urls are identical
\r
3047 while ((i<fileURL.GetLength())&&(i<sUnescapedUrl.GetLength())&&(fileURL[i]==sUnescapedUrl[i]))
\r
3049 int leftcount = m_path.GetWinPathString().GetLength()-(sUnescapedUrl.GetLength()-i);
\r
3050 CString wcPath = m_path.GetWinPathString().Left(leftcount);
\r
3051 wcPath += fileURL.Mid(i);
\r
3052 wcPath.Replace('/', '\\');
\r
3053 CGitProgressDlg dlg;
\r
3054 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3056 // a deleted path! Since the path isn't there anymore, merge
\r
3057 // won't work. So just do a copy url->wc
\r
3058 dlg.SetCommand(CGitProgressDlg::GitProgress_Copy);
\r
3059 dlg.SetPathList(CTGitPathList(CTGitPath(fileURL)));
\r
3060 dlg.SetUrl(wcPath);
\r
3061 dlg.SetRevision(rev2);
\r
3065 if (!PathFileExists(wcPath))
\r
3067 // seems the path got renamed
\r
3068 // tell the user how to work around this.
\r
3069 CMessageBox::Show(this->m_hWnd, IDS_LOG_REVERTREV_ERROR, IDS_APPNAME, MB_ICONERROR);
\r
3071 theApp.DoWaitCursor(-1);
\r
3074 dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);
\r
3075 dlg.SetPathList(CTGitPathList(CTGitPath(wcPath)));
\r
3076 dlg.SetUrl(fileURL);
\r
3077 dlg.SetSecondUrl(fileURL);
\r
3078 GitRevRangeArray revarray;
\r
3079 revarray.AddRevRange(rev1, rev2);
\r
3080 dlg.SetRevisionRanges(revarray);
\r
3083 msg.Format(IDS_LOG_REVERT_CONFIRM, (LPCTSTR)wcPath);
\r
3084 if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)
\r
3088 theApp.DoWaitCursor(-1);
\r
3093 DialogEnableWindow(IDOK, FALSE);
\r
3094 SetPromptApp(&theApp);
\r
3095 theApp.DoWaitCursor(1);
\r
3097 if (Git::PathIsURL(m_path))
\r
3099 filepath = m_path.GetGitPathString();
\r
3103 filepath = GetURLFromPath(m_path);
\r
3104 if (filepath.IsEmpty())
\r
3106 theApp.DoWaitCursor(-1);
\r
3108 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3109 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3110 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3115 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3116 filepath += changedpaths[0];
\r
3119 dlg.m_Path = CTGitPath(filepath);
\r
3122 theApp.DoWaitCursor(-1);
\r
3127 DialogEnableWindow(IDOK, FALSE);
\r
3128 SetPromptApp(&theApp);
\r
3129 theApp.DoWaitCursor(1);
\r
3131 if (Git::PathIsURL(m_path))
\r
3133 filepath = m_path.GetGitPathString();
\r
3137 filepath = GetURLFromPath(m_path);
\r
3138 if (filepath.IsEmpty())
\r
3140 theApp.DoWaitCursor(-1);
\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
3149 m_bCancelled = false;
\r
3150 CString sRoot = GetRepositoryRoot(CTGitPath(filepath));
\r
3151 // if more than one entry is selected, we save them
\r
3152 // one by one into a folder the user has selected
\r
3153 bool bTargetSelected = false;
\r
3154 CTGitPath TargetPath;
\r
3155 if (m_ChangedFileListCtrl.GetSelectedCount() > 1)
\r
3157 CBrowseFolder browseFolder;
\r
3158 browseFolder.SetInfo(CString(MAKEINTRESOURCE(IDS_LOG_SAVEFOLDERTOHINT)));
\r
3159 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
3160 CString strSaveAsDirectory;
\r
3161 if (browseFolder.Show(GetSafeHwnd(), strSaveAsDirectory) == CBrowseFolder::OK)
\r
3163 TargetPath = CTGitPath(strSaveAsDirectory);
\r
3164 bTargetSelected = true;
\r
3169 // Display the Open dialog box.
\r
3170 CString revFilename;
\r
3172 temp = CPathUtils::GetFileNameFromPath(changedpaths[0]);
\r
3173 int rfind = temp.ReverseFind('.');
\r
3175 revFilename.Format(_T("%s-%ld%s"), (LPCTSTR)temp.Left(rfind), rev1, (LPCTSTR)temp.Mid(rfind));
\r
3177 revFilename.Format(_T("%s-%ld"), (LPCTSTR)temp, rev1);
\r
3178 bTargetSelected = CAppUtils::FileOpenSave(revFilename, NULL, IDS_LOG_POPUP_SAVE, IDS_COMMONFILEFILTER, false, m_hWnd);
\r
3179 TargetPath.SetFromWin(revFilename);
\r
3181 if (bTargetSelected)
\r
3183 CProgressDlg progDlg;
\r
3184 progDlg.SetTitle(IDS_APPNAME);
\r
3185 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
3186 for (std::vector<LogChangedPath*>::iterator it = changedlogpaths.begin(); it!= changedlogpaths.end(); ++it)
\r
3188 GitRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;
\r
3190 CString sInfoLine;
\r
3191 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)getrev.ToString());
\r
3192 progDlg.SetLine(1, sInfoLine, true);
\r
3193 SetAndClearProgressInfo(&progDlg);
\r
3194 progDlg.ShowModeless(m_hWnd);
\r
3196 CTGitPath tempfile = TargetPath;
\r
3197 if (changedpaths.size() > 1)
\r
3199 // if multiple items are selected, then the TargetPath
\r
3200 // points to a folder and we have to append the filename
\r
3201 // to save to to that folder.
\r
3202 CString sName = (*it)->sPath;
\r
3203 int slashpos = sName.ReverseFind('/');
\r
3204 if (slashpos >= 0)
\r
3205 sName = sName.Mid(slashpos);
\r
3206 tempfile.AppendPathString(sName);
\r
3207 // one problem here:
\r
3208 // a user could have selected multiple items which
\r
3209 // have the same filename but reside in different
\r
3210 // directories, e.g.
\r
3213 // in that case, the second 'file1' will overwrite
\r
3214 // the already saved 'file1'.
\r
3216 // we could maybe find the common root of all selected
\r
3217 // items and then create sub folders to save those files
\r
3219 // But I think we should just leave it that way: to check
\r
3220 // out multiple items at once, the better way is still to
\r
3221 // use the export command from the top pane of the log dialog.
\r
3223 filepath = sRoot + (*it)->sPath;
\r
3224 if (!Cat(CTGitPath(filepath), getrev, getrev, tempfile))
\r
3227 SetAndClearProgressInfo((HWND)NULL);
\r
3228 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3230 theApp.DoWaitCursor(-1);
\r
3235 SetAndClearProgressInfo((HWND)NULL);
\r
3238 theApp.DoWaitCursor(-1);
\r
3245 GitRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;
\r
3246 Open(bOpenWith,changedpaths[0],getrev);
\r
3252 if (Git::PathIsURL(m_path))
\r
3254 filepath = m_path.GetGitPathString();
\r
3258 filepath = GetURLFromPath(m_path);
\r
3259 if (filepath.IsEmpty())
\r
3261 theApp.DoWaitCursor(-1);
\r
3263 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3264 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3265 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3270 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3271 filepath += changedpaths[0];
\r
3273 dlg.EndRev = rev1;
\r
3274 if (dlg.DoModal() == IDOK)
\r
3279 tempfile = blame.BlameToTempFile(CTGitPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);
\r
3280 if (!tempfile.IsEmpty())
\r
3282 if (dlg.m_bTextView)
\r
3284 //open the default text editor for the result file
\r
3285 CAppUtils::StartTextViewer(tempfile);
\r
3289 CString sParams = _T("/path:\"") + filepath + _T("\" ");
\r
3290 if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(filepath),sParams))
\r
3298 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3303 case ID_GETMERGELOGS:
\r
3308 DialogEnableWindow(IDOK, FALSE);
\r
3309 SetPromptApp(&theApp);
\r
3310 theApp.DoWaitCursor(1);
\r
3312 if (Git::PathIsURL(m_path))
\r
3314 filepath = m_path.GetGitPathString();
\r
3318 filepath = GetURLFromPath(m_path);
\r
3319 if (filepath.IsEmpty())
\r
3321 theApp.DoWaitCursor(-1);
\r
3323 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3324 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3325 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3330 m_bCancelled = false;
\r
3331 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3332 filepath += changedpaths[0];
\r
3333 git_revnum_t logrev = rev1;
\r
3334 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3336 // if the item got deleted in this revision,
\r
3337 // fetch the log from the previous revision where it
\r
3342 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\" /startrev:%ld"), (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)filepath, logrev);
\r
3344 sCmd += _T(" /merge");
\r
3345 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3347 theApp.DoWaitCursor(-1);
\r
3350 case ID_VIEWPATHREV:
\r
3352 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetSelectionMark()));
\r
3353 GitRev rev = pLogEntry->Rev;
\r
3354 CString relurl = changedpaths[0];
\r
3355 CString url = m_ProjectProperties.sWebViewerPathRev;
\r
3356 url.Replace(_T("%REVISION%"), rev.ToString());
\r
3357 url.Replace(_T("%PATH%"), relurl);
\r
3358 relurl = relurl.Mid(relurl.Find('/'));
\r
3359 url.Replace(_T("%PATH1%"), relurl);
\r
3360 if (!url.IsEmpty())
\r
3361 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
3369 } // if (popup.CreatePopupMenu())
\r
3373 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3375 // the date control should not show the "today" button
\r
3376 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
\r
3378 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3382 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3384 // the date control should not show the "today" button
\r
3385 CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();
\r
3387 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3391 void CLogDlg::OnSize(UINT nType, int cx, int cy)
\r
3393 __super::OnSize(nType, cx, cy);
\r
3395 SetSplitterRange();
\r
3398 void CLogDlg::OnRefresh()
\r
3400 if (GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
3407 void CLogDlg::OnFind()
\r
3409 if (!m_pFindDialog)
\r
3411 m_pFindDialog = new CFindReplaceDialog();
\r
3412 m_pFindDialog->Create(TRUE, NULL, NULL, FR_HIDEUPDOWN | FR_HIDEWHOLEWORD, this);
\r
3416 void CLogDlg::OnFocusFilter()
\r
3418 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3421 void CLogDlg::OnEditCopy()
\r
3423 if (GetFocus() == &m_ChangedFileListCtrl)
\r
3424 CopyChangedSelectionToClipBoard();
\r
3426 m_LogList.CopySelectionToClipBoard();
\r
3429 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
\r
3431 // is the URL a relative one?
\r
3432 if (url.Left(2).Compare(_T("^/")) == 0)
\r
3434 // URL is relative to the repository root
\r
3435 CString url1 = m_sRepositoryRoot + url.Mid(1);
\r
3436 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3437 DWORD len = url.GetLength();
\r
3438 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
\r
3439 return CString(buf, len);
\r
3442 else if (url[0] == '/')
\r
3444 // URL is relative to the server's hostname
\r
3446 // find the server's hostname
\r
3447 int schemepos = m_sRepositoryRoot.Find(_T("//"));
\r
3448 if (schemepos >= 0)
\r
3450 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));
\r
3451 CString url1 = sHost + url;
\r
3452 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3453 DWORD len = url.GetLength();
\r
3454 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
\r
3455 return CString(buf, len);
\r
3463 void CLogDlg::OnEnChangeSearchedit()
\r
3466 if (m_LogList.m_sFilterText.IsEmpty())
\r
3468 CStoreSelection storeselection(this);
\r
3469 // clear the filter, i.e. make all entries appear
\r
3470 theApp.DoWaitCursor(1);
\r
3471 KillTimer(LOGFILTER_TIMER);
\r
3472 FillLogMessageCtrl(false);
\r
3473 m_LogList.StartFilter();
\r
3475 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
3476 m_arShownList.RemoveAll();
\r
3477 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
3479 if (IsEntryInDateRange(i))
\r
3480 m_arShownList.Add(m_logEntries[i]);
\r
3482 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
3483 m_LogList.DeleteAllItems();
\r
3484 m_LogList.SetItemCountEx(ShownCountWithStopped());
\r
3485 m_LogList.RedrawItems(0, ShownCountWithStopped());
\r
3486 m_LogList.SetRedraw(false);
\r
3487 ResizeAllListCtrlCols();
\r
3488 m_LogList.SetRedraw(true);
\r
3490 theApp.DoWaitCursor(-1);
\r
3491 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
3492 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
3493 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3494 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
3497 if (Validate(m_LogList.m_sFilterText))
\r
3498 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
3500 KillTimer(LOGFILTER_TIMER);
\r
OSDN Git Service
