1 // TortoiseGit - a Windows shell extension for easy version control
\r
3 // Copyright (C) 2003-2008 - TortoiseGit
\r
5 // This program is free software; you can redistribute it and/or
\r
6 // modify it under the terms of the GNU General Public License
\r
7 // as published by the Free Software Foundation; either version 2
\r
8 // of the License, or (at your option) any later version.
\r
10 // This program is distributed in the hope that it will be useful,
\r
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
13 // GNU General Public License for more details.
\r
15 // You should have received a copy of the GNU General Public License
\r
16 // along with this program; if not, write to the Free Software Foundation,
\r
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
20 #include "TortoiseProc.h"
\r
22 #include "InputDlg.h"
\r
23 #include "PropDlg.h"
\r
24 #include "SVNProgressDlg.h"
\r
25 #include "ProgressDlg.h"
\r
26 //#include "RepositoryBrowser.h"
\r
27 //#include "CopyDlg.h"
\r
28 //#include "StatGraphDlg.h"
\r
30 #include "MessageBox.h"
\r
31 #include "Registry.h"
\r
32 #include "AppUtils.h"
\r
33 #include "PathUtils.h"
\r
34 #include "StringUtils.h"
\r
35 #include "UnicodeUtils.h"
\r
36 #include "TempFile.h"
\r
37 //#include "GitInfo.h"
\r
38 //#include "GitDiff.h"
\r
39 #include "IconMenu.h"
\r
40 //#include "RevisionRangeDlg.h"
\r
41 //#include "BrowseFolder.h"
\r
42 //#include "BlameDlg.h"
\r
43 //#include "Blame.h"
\r
44 //#include "GitHelpers.h"
\r
45 #include "GitStatus.h"
\r
46 //#include "LogDlgHelper.h"
\r
47 //#include "CachedLogInfo.h"
\r
48 //#include "RepositoryInfo.h"
\r
49 //#include "EditPropertiesDlg.h"
\r
50 #include "FileDiffDlg.h"
\r
53 const UINT CLogDlg::m_FindDialogMessage = RegisterWindowMessage(FINDMSGSTRING);
\r
58 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)
\r
59 CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
\r
60 : CResizableStandAloneDialog(CLogDlg::IDD, pParent)
\r
64 , m_nSelectedFilter(LOGFILTER_ALL)
\r
65 , m_currentChangedArray(NULL)
\r
67 , m_bShowedAll(false)
\r
69 , m_regLastStrict(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE)
\r
71 , m_bSelectionMustBeContinuous(false)
\r
72 , m_bShowBugtraqColumn(false)
\r
73 , m_lowestRev(_T(""))
\r
75 , m_sLogInfo(_T(""))
\r
76 , m_pFindDialog(NULL)
\r
77 , m_bCancelled(FALSE)
\r
78 , m_pNotifyWindow(NULL)
\r
80 , m_bAscending(FALSE)
\r
85 , m_bIncludeMerges(FALSE)
\r
89 m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
96 m_CurrentFilteredChangedArray.RemoveAll();
\r
103 void CLogDlg::DoDataExchange(CDataExchange* pDX)
\r
105 CResizableStandAloneDialog::DoDataExchange(pDX);
\r
106 DDX_Control(pDX, IDC_LOGLIST, m_LogList);
\r
107 DDX_Control(pDX, IDC_LOGMSG, m_ChangedFileListCtrl);
\r
108 DDX_Control(pDX, IDC_PROGRESS, m_LogProgress);
\r
109 DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1);
\r
110 DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2);
\r
111 DDX_Check(pDX, IDC_CHECK_STOPONCOPY, m_bStrict);
\r
112 DDX_Text(pDX, IDC_SEARCHEDIT, m_sFilterText);
\r
113 DDX_Control(pDX, IDC_DATEFROM, m_DateFrom);
\r
114 DDX_Control(pDX, IDC_DATETO, m_DateTo);
\r
115 DDX_Control(pDX, IDC_HIDEPATHS, m_cHidePaths);
\r
116 DDX_Control(pDX, IDC_GETALL, m_btnShow);
\r
117 DDX_Text(pDX, IDC_LOGINFO, m_sLogInfo);
\r
118 DDX_Check(pDX, IDC_INCLUDEMERGE, m_bIncludeMerges);
\r
119 DDX_Control(pDX, IDC_SEARCHEDIT, m_cFilter);
\r
122 BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
\r
123 ON_REGISTERED_MESSAGE(m_FindDialogMessage, OnFindDialogMessage)
\r
124 ON_BN_CLICKED(IDC_GETALL, OnBnClickedGetall)
\r
125 //ON_NOTIFY(NM_DBLCLK, IDC_LOGMSG, OnNMDblclkChangedFileList)
\r
126 ON_WM_CONTEXTMENU()
\r
128 ON_BN_CLICKED(IDHELP, OnBnClickedHelp)
\r
129 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)
\r
130 ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)
\r
131 ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)
\r
133 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
\r
134 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
\r
136 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
\r
138 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
\r
139 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
\r
140 ON_BN_CLICKED(IDC_NEXTHUNDRED, OnBnClickedNexthundred)
\r
141 //ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGMSG, OnNMCustomdrawChangedFileList)
\r
142 //ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGMSG, OnLvnGetdispinfoChangedFileList)
\r
143 ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST , OnLvnColumnclick)
\r
144 //ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList)
\r
145 ON_BN_CLICKED(IDC_HIDEPATHS, OnBnClickedHidepaths)
\r
147 ON_BN_CLICKED(IDC_CHECK_STOPONCOPY, &CLogDlg::OnBnClickedCheckStoponcopy)
\r
148 ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)
\r
149 ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)
\r
151 ON_BN_CLICKED(IDC_INCLUDEMERGE, &CLogDlg::OnBnClickedIncludemerge)
\r
152 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
\r
153 ON_COMMAND(ID_LOGDLG_REFRESH,&CLogDlg::OnRefresh)
\r
154 ON_COMMAND(ID_LOGDLG_FIND,&CLogDlg::OnFind)
\r
155 ON_COMMAND(ID_LOGDLG_FOCUSFILTER,&CLogDlg::OnFocusFilter)
\r
156 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
\r
159 void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, BOOL bStrict /* = FALSE */, BOOL bSaveStrict /* = TRUE */)
\r
163 m_startrev = startrev;
\r
164 m_LogRevision = startrev;
\r
166 m_hasWC = !path.IsUrl();
\r
167 m_bStrict = bStrict;
\r
168 m_bSaveStrict = bSaveStrict;
\r
170 if (::IsWindow(m_hWnd))
\r
174 BOOL CLogDlg::OnInitDialog()
\r
176 CResizableStandAloneDialog::OnInitDialog();
\r
178 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
\r
180 OSVERSIONINFOEX inf;
\r
181 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
182 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
183 GetVersionEx((OSVERSIONINFO *)&inf);
\r
184 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
185 m_bVista = (fullver >= 0x0600);
\r
187 // use the state of the "stop on copy/rename" option from the last time
\r
189 m_bStrict = m_regLastStrict;
\r
193 temp.Format(IDS_LOG_SHOWNEXT, m_limit);
\r
195 temp.Format(IDS_LOG_SHOWNEXT, (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100));
\r
197 SetDlgItemText(IDC_NEXTHUNDRED, temp);
\r
199 // set the font to use in the log message view, configured in the settings dialog
\r
200 CAppUtils::CreateFontForLogs(m_logFont);
\r
201 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
\r
202 // automatically detect URLs in the log message and turn them into links
\r
203 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_AUTOURLDETECT, TRUE, NULL);
\r
204 // make the log message rich edit control send a message when the mouse pointer is over a link
\r
205 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK);
\r
206 //m_LogList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_SUBITEMIMAGES);
\r
208 // the "hide unrelated paths" checkbox should be indeterminate
\r
209 m_cHidePaths.SetCheck(BST_INDETERMINATE);
\r
212 // if there is a working copy, load the project properties
\r
213 // to get information about the bugtraq: integration
\r
215 m_ProjectProperties.ReadProps(m_path);
\r
217 // the bugtraq issue id column is only shown if the bugtraq:url or bugtraq:regex is set
\r
218 if ((!m_ProjectProperties.sUrl.IsEmpty())||(!m_ProjectProperties.sCheckRe.IsEmpty()))
\r
219 m_bShowBugtraqColumn = true;
\r
221 //theme.SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);
\r
222 //theme.SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);
\r
224 // set up the columns
\r
225 m_LogList.DeleteAllItems();
\r
226 m_LogList.InsertGitColumn();
\r
228 m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"));
\r
230 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
233 m_sMessageBuf.Preallocate(100000);
\r
235 // set the dialog title to "Log - path/to/whatever/we/show/the/log/for"
\r
236 SetDlgTitle(false);
\r
238 m_tooltips.Create(this);
\r
239 CheckRegexpTooltip();
\r
241 SetSplitterRange();
\r
243 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
\r
244 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
\r
245 m_cFilter.SetInfoIcon(IDI_LOGFILTER);
\r
246 m_cFilter.SetValidator(this);
\r
248 AdjustControlSize(IDC_HIDEPATHS);
\r
249 AdjustControlSize(IDC_CHECK_STOPONCOPY);
\r
250 AdjustControlSize(IDC_INCLUDEMERGE);
\r
252 GetClientRect(m_DlgOrigRect);
\r
253 m_LogList.GetClientRect(m_LogListOrigRect);
\r
254 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
\r
255 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
\r
257 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
258 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
261 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
\r
262 AddAnchor(IDC_DATEFROM, TOP_LEFT);
\r
263 AddAnchor(IDC_TOLABEL, TOP_LEFT);
\r
264 AddAnchor(IDC_DATETO, TOP_LEFT);
\r
266 SetFilterCueText();
\r
267 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
\r
269 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
270 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
271 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
272 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
273 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
275 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
276 AddAnchor(IDC_HIDEPATHS, BOTTOM_LEFT);
\r
277 AddAnchor(IDC_CHECK_STOPONCOPY, BOTTOM_LEFT);
\r
278 AddAnchor(IDC_INCLUDEMERGE, BOTTOM_LEFT);
\r
279 AddAnchor(IDC_GETALL, BOTTOM_LEFT);
\r
280 AddAnchor(IDC_NEXTHUNDRED, BOTTOM_LEFT);
\r
281 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
\r
282 AddAnchor(IDC_STATBUTTON, BOTTOM_RIGHT);
\r
283 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
284 AddAnchor(IDOK, BOTTOM_RIGHT);
\r
285 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
\r
286 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
288 // SetPromptParentWindow(m_hWnd);
\r
291 CenterWindow(CWnd::FromHandle(hWndExplorer));
\r
292 EnableSaveRestore(_T("LogDlg"));
\r
294 DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
295 DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
296 RECT rcDlg, rcLogList, rcChgMsg;
\r
297 GetClientRect(&rcDlg);
\r
298 m_LogList.GetWindowRect(&rcLogList);
\r
299 ScreenToClient(&rcLogList);
\r
300 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
\r
301 ScreenToClient(&rcChgMsg);
\r
305 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
306 ScreenToClient(&rectSplitter);
\r
307 int delta = yPos1 - rectSplitter.top;
\r
309 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
\r
311 m_wndSplitter1.SetWindowPos(NULL, 0, yPos1, 0, 0, SWP_NOSIZE);
\r
318 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
319 ScreenToClient(&rectSplitter);
\r
320 int delta = yPos2 - rectSplitter.top;
\r
322 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
\r
324 m_wndSplitter2.SetWindowPos(NULL, 0, yPos2, 0, 0, SWP_NOSIZE);
\r
332 // the dialog is used to select revisions
\r
333 if (m_bSelectionMustBeContinuous)
\r
334 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
336 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
340 // the dialog is used to just view log messages
\r
341 GetDlgItemText(IDOK, temp);
\r
342 SetDlgItemText(IDCANCEL, temp);
\r
343 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
\r
346 // set the choices for the "Show All" button
\r
347 temp.LoadString(IDS_LOG_SHOWALL);
\r
348 m_btnShow.AddEntry(temp);
\r
349 temp.LoadString(IDS_LOG_SHOWRANGE);
\r
350 m_btnShow.AddEntry(temp);
\r
351 m_btnShow.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")));
\r
353 m_mergedRevs.clear();
\r
355 // first start a thread to obtain the log messages without
\r
356 // blocking the dialog
\r
358 m_tFrom = (DWORD)-1;
\r
360 m_LogList.FetchLogAsync(LogCallBack,this);
\r
362 GetDlgItem(IDC_LOGLIST)->SetFocus();
\r
366 void CLogDlg::LogRunStatus(int cur)
\r
368 if( cur == GITLOG_START )
\r
371 temp.LoadString(IDS_PROGRESSWAIT);
\r
373 // change the text of the close button to "Cancel" since now the thread
\r
374 // is running, and simply closing the dialog doesn't work.
\r
375 if (!GetDlgItem(IDOK)->IsWindowVisible())
\r
377 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
378 SetDlgItemText(IDCANCEL, temp);
\r
381 // We use a progress bar while getting the logs
\r
382 m_LogProgress.SetRange32(0, 100);
\r
383 m_LogProgress.SetPos(0);
\r
385 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
\r
387 DialogEnableWindow(IDC_GETALL, FALSE);
\r
388 DialogEnableWindow(IDC_NEXTHUNDRED, FALSE);
\r
389 DialogEnableWindow(IDC_CHECK_STOPONCOPY, FALSE);
\r
390 DialogEnableWindow(IDC_INCLUDEMERGE, FALSE);
\r
391 DialogEnableWindow(IDC_STATBUTTON, FALSE);
\r
392 DialogEnableWindow(IDC_REFRESH, FALSE);
\r
395 if( cur == GITLOG_END)
\r
399 DialogEnableWindow(IDC_NEXTHUNDRED, TRUE);
\r
401 DialogEnableWindow(IDC_CHECK_STOPONCOPY, TRUE);
\r
402 DialogEnableWindow(IDC_INCLUDEMERGE, TRUE);
\r
403 DialogEnableWindow(IDC_STATBUTTON, TRUE);
\r
404 DialogEnableWindow(IDC_REFRESH, TRUE);
\r
406 PostMessage(WM_TIMER, LOGFILTER_TIMER);
\r
410 m_LogProgress.SetPos(cur);
\r
412 void CLogDlg::SetDlgTitle(bool bOffline)
\r
414 if (m_sTitle.IsEmpty())
\r
415 GetWindowText(m_sTitle);
\r
420 if (m_path.IsUrl())
\r
421 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetUIPathString());
\r
422 else if (m_path.IsDirectory())
\r
423 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetWinPathString());
\r
425 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetFilename());
\r
426 SetWindowText(sTemp);
\r
430 if (m_path.IsUrl())
\r
431 SetWindowText(m_sTitle + _T(" - ") + m_path.GetUIPathString());
\r
432 else if (m_path.IsDirectory())
\r
433 SetWindowText(m_sTitle + _T(" - ") + m_path.GetWinPathString());
\r
435 SetWindowText(m_sTitle + _T(" - ") + m_path.GetFilename());
\r
439 void CLogDlg::CheckRegexpTooltip()
\r
441 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
\r
442 // Since tooltip describes regexp features, show it only if regexps are enabled.
\r
443 if (m_bFilterWithRegex)
\r
445 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
\r
448 m_tooltips.DelTool(pWnd);
\r
451 void CLogDlg::EnableOKButton()
\r
455 // the dialog is used to select revisions
\r
456 if (m_bSelectionMustBeContinuous)
\r
457 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
459 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
462 DialogEnableWindow(IDOK, TRUE);
\r
465 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
\r
467 // we fill here the log message rich edit control,
\r
468 // and also populate the changed files list control
\r
469 // according to the selected revision(s).
\r
471 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
472 // empty the log message view
\r
473 pMsgView->SetWindowText(_T(" "));
\r
474 // empty the changed files list
\r
475 m_ChangedFileListCtrl.SetRedraw(FALSE);
\r
476 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
477 m_currentChangedArray = NULL;
\r
478 //m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );
\r
479 m_ChangedFileListCtrl.DeleteAllItems();
\r
481 // if we're not here to really show a selected revision, just
\r
482 // get out of here after clearing the views, which is what is intended
\r
483 // if that flag is not set.
\r
487 m_ChangedFileListCtrl.Invalidate();
\r
488 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
489 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
493 // depending on how many revisions are selected, we have to do different
\r
495 int selCount = m_LogList.GetSelectedCount();
\r
498 // if nothing is selected, we have nothing more to do
\r
499 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
500 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
503 else if (selCount == 1)
\r
505 // if one revision is selected, we have to fill the log message view
\r
506 // with the corresponding log message, and also fill the changed files
\r
508 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
509 int selIndex = m_LogList.GetNextSelectedItem(pos);
\r
510 if (selIndex >= m_LogList.m_arShownList.GetCount())
\r
512 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
513 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
516 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));
\r
518 // set the log message text
\r
519 pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash+_T("\r\n\r\n*")+pLogEntry->m_Subject+_T("\n\n")+pLogEntry->m_Body);
\r
520 // turn bug ID's into links if the bugtraq: properties have been set
\r
521 // and we can find a match of those in the log message
\r
522 m_ProjectProperties.FindBugID(pLogEntry->m_Body, pMsgView);
\r
523 CAppUtils::FormatTextInRichEditControl(pMsgView);
\r
525 m_ChangedFileListCtrl.UpdateWithGitPathList(pLogEntry->m_Files);
\r
526 m_ChangedFileListCtrl.Show(0);
\r
528 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
531 // fill in the changed files list control
\r
532 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
534 m_CurrentFilteredChangedArray.RemoveAll();
\r
535 for (INT_PTR c = 0; c < m_currentChangedArray->GetCount(); ++c)
\r
537 LogChangedPath * cpath = m_currentChangedArray->GetAt(c);
\r
540 if (m_currentChangedArray->GetAt(c)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
542 m_CurrentFilteredChangedArray.Add(cpath);
\r
545 m_currentChangedArray = &m_CurrentFilteredChangedArray;
\r
551 // more than one revision is selected:
\r
552 // the log message view must be emptied
\r
553 // the changed files list contains all the changed paths from all
\r
554 // selected revisions, with 'doubles' removed
\r
555 m_currentChangedPathList = GetChangedPathsFromSelectedRevisions(true);
\r
558 // redraw the views
\r
559 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
560 if (m_currentChangedArray)
\r
562 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedArray->GetCount());
\r
563 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedArray->GetCount());
\r
565 else if (m_currentChangedPathList.GetCount())
\r
567 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedPathList.GetCount());
\r
568 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedPathList.GetCount());
\r
572 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
573 m_ChangedFileListCtrl.Invalidate();
\r
575 CAppUtils::ResizeAllListCtrlCols(&m_ChangedFileListCtrl);
\r
576 // sort according to the settings
\r
577 if (m_nSortColumnPathList > 0)
\r
578 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
580 SetSortArrow(&m_ChangedFileListCtrl, -1, false);
\r
581 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
585 void CLogDlg::OnBnClickedGetall()
\r
590 void CLogDlg::GetAll(bool bForceAll /* = false */)
\r
593 // fetch all requested log messages, either the specified range or
\r
594 // really *all* available log messages.
\r
596 INT_PTR entry = m_btnShow.GetCurrentEntry();
\r
602 case 0: // show all
\r
605 m_startrev = m_LogRevision;
\r
607 m_bShowedAll = true;
\r
610 case 1: // show range
\r
613 // ask for a revision range
\r
614 CRevisionRangeDlg dlg;
\r
615 dlg.SetStartRevision(m_startrev);
\r
616 dlg.SetEndRevision( (m_endrev>=0) ? m_endrev : 0);
\r
617 if (dlg.DoModal()!=IDOK)
\r
621 m_endrev = dlg.GetEndRevision();
\r
622 m_startrev = dlg.GetStartRevision();
\r
623 if (((m_endrev.IsNumber())&&(m_startrev.IsNumber()))||
\r
624 (m_endrev.IsHead()||m_startrev.IsHead()))
\r
626 if (((LONG)m_startrev < (LONG)m_endrev)||
\r
627 (m_endrev.IsHead()))
\r
629 git_revnum_t temp = m_startrev;
\r
630 m_startrev = m_endrev;
\r
634 m_bShowedAll = false;
\r
639 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
640 m_ChangedFileListCtrl.Invalidate();
\r
641 // We need to create CStoreSelection on the heap or else
\r
642 // the variable will run out of the scope before the
\r
643 // thread ends. Therefore we let the thread delete
\r
645 m_pStoreSelection = new CStoreSelection(this);
\r
646 m_LogList.SetItemCountEx(0);
\r
647 m_LogList.Invalidate();
\r
648 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
649 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
650 pMsgView->SetWindowText(_T(""));
\r
652 SetSortArrow(&m_LogList, -1, true);
\r
654 m_LogList.DeleteAllItems();
\r
655 m_arShownList.RemoveAll();
\r
656 m_logEntries.ClearAll();
\r
659 m_bCancelled = FALSE;
\r
661 m_tFrom = (DWORD)-1;
\r
664 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
665 if (AfxBeginThread(LogThreadEntry, this)==NULL)
\r
667 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
668 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
670 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
671 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
675 void CLogDlg::OnBnClickedRefresh()
\r
681 void CLogDlg::Refresh (bool autoGoOnline)
\r
683 m_LogList.Refresh();
\r
686 void CLogDlg::OnBnClickedNexthundred()
\r
690 // we have to fetch the next X log messages.
\r
691 if (m_logEntries.size() < 1)
\r
693 // since there weren't any log messages fetched before, just
\r
694 // fetch all since we don't have an 'anchor' to fetch the 'next'
\r
696 return GetAll(true);
\r
698 git_revnum_t rev = m_logEntries[m_logEntries.size()-1]->Rev;
\r
701 return; // do nothing! No more revisions to get
\r
705 m_bCancelled = FALSE;
\r
707 // rev is is revision we already have and we will receive it again
\r
708 // -> fetch one extra revision to get NumberOfLogs *new* revisions
\r
710 m_limit = (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100) +1;
\r
711 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
712 SetSortArrow(&m_LogList, -1, true);
\r
713 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
714 // We need to create CStoreSelection on the heap or else
\r
715 // the variable will run out of the scope before the
\r
716 // thread ends. Therefore we let the thread delete
\r
718 m_pStoreSelection = new CStoreSelection(this);
\r
720 // since we fetch the log from the last revision we already have,
\r
721 // we have to remove that revision entry to avoid getting it twice
\r
722 m_logEntries.pop_back();
\r
723 if (AfxBeginThread(LogThreadEntry, this)==NULL)
\r
725 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
726 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
728 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
729 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
733 BOOL CLogDlg::Cancel()
\r
735 return m_bCancelled;
\r
738 void CLogDlg::SaveSplitterPos()
\r
742 CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
743 CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
745 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
746 ScreenToClient(&rectSplitter);
\r
747 regPos1 = rectSplitter.top;
\r
748 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
749 ScreenToClient(&rectSplitter);
\r
750 regPos2 = rectSplitter.top;
\r
754 void CLogDlg::OnCancel()
\r
756 // canceling means stopping the working thread if it's still running.
\r
757 // we do this by using the Subversion cancel callback.
\r
758 // But canceling can also mean just to close the dialog, depending on the
\r
759 // text shown on the cancel button (it could simply read "OK").
\r
760 CString temp, temp2;
\r
761 GetDlgItemText(IDOK, temp);
\r
762 temp2.LoadString(IDS_MSGBOX_CANCEL);
\r
763 if ((temp.Compare(temp2)==0)||(this->IsThreadRunning()))
\r
765 m_bCancelled = true;
\r
770 m_regLastStrict = m_bStrict;
\r
771 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
772 reg = m_btnShow.GetCurrentEntry();
\r
774 __super::OnCancel();
\r
777 CString CLogDlg::MakeShortMessage(const CString& message)
\r
779 bool bFoundShort = true;
\r
780 CString sShortMessage = m_ProjectProperties.GetLogSummary(message);
\r
781 if (sShortMessage.IsEmpty())
\r
783 bFoundShort = false;
\r
784 sShortMessage = message;
\r
786 // Remove newlines and tabs 'cause those are not shown nicely in the list control
\r
787 sShortMessage.Replace(_T("\r"), _T(""));
\r
788 sShortMessage.Replace(_T("\t"), _T(" "));
\r
790 // Suppose the first empty line separates 'summary' from the rest of the message.
\r
791 int found = sShortMessage.Find(_T("\n\n"));
\r
792 // To avoid too short 'short' messages
\r
793 // (e.g. if the message looks something like "Bugfix:\n\n*done this\n*done that")
\r
794 // only use the empty newline as a separator if it comes after at least 15 chars.
\r
795 if ((!bFoundShort)&&(found >= 15))
\r
797 sShortMessage = sShortMessage.Left(found);
\r
799 sShortMessage.Replace('\n', ' ');
\r
800 return sShortMessage;
\r
803 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
806 if (rev == SVN_INVALID_REVNUM)
\r
812 // this is the callback function which receives the data for every revision we ask the log for
\r
813 // we store this information here one by one.
\r
815 if (m_startrev == -1)
\r
820 m_LogProgress.SetPos(m_limit - m_limitcounter);
\r
822 else if (m_startrev.IsNumber() && m_startrev.IsNumber())
\r
823 m_LogProgress.SetPos((git_revnum_t)m_startrev-rev+(git_revnum_t)m_endrev);
\r
824 __time64_t ttime = time/1000000L;
\r
825 if (m_tTo < (DWORD)ttime)
\r
826 m_tTo = (DWORD)ttime;
\r
827 if (m_tFrom > (DWORD)ttime)
\r
828 m_tFrom = (DWORD)ttime;
\r
829 if ((m_lowestRev > rev)||(m_lowestRev < 0))
\r
831 // Add as many characters from the log message to the list control
\r
832 PLOGENTRYDATA pLogItem = new LOGENTRYDATA;
\r
833 pLogItem->bCopies = !!copies;
\r
835 // find out if this item was copied in the revision
\r
836 BOOL copiedself = FALSE;
\r
839 for (INT_PTR cpPathIndex = 0; cpPathIndex < cpaths->GetCount(); ++cpPathIndex)
\r
841 LogChangedPath * cpath = cpaths->GetAt(cpPathIndex);
\r
842 if (!cpath->sCopyFromPath.IsEmpty() && (cpath->sPath.Compare(m_sSelfRelativeURL) == 0))
\r
844 // note: this only works if the log is fetched top-to-bottom
\r
845 // but since we do that, it shouldn't be a problem
\r
846 m_sSelfRelativeURL = cpath->sCopyFromPath;
\r
852 pLogItem->bCopiedSelf = copiedself;
\r
853 pLogItem->tmDate = ttime;
\r
854 pLogItem->sAuthor = author;
\r
855 pLogItem->sDate = date;
\r
856 pLogItem->sShortMessage = MakeShortMessage(message);
\r
857 pLogItem->dwFileChanges = filechanges;
\r
858 pLogItem->actions = actions;
\r
859 pLogItem->haschildren = haschildren;
\r
860 pLogItem->childStackDepth = m_childCounter;
\r
861 m_maxChild = max(m_childCounter, m_maxChild);
\r
864 pLogItem->sBugIDs = m_ProjectProperties.FindBugID(message).Trim();
\r
866 // split multi line log entries and concatenate them
\r
867 // again but this time with \r\n as line separators
\r
868 // so that the edit control recognizes them
\r
871 if (message.GetLength()>0)
\r
873 m_sMessageBuf = message;
\r
874 m_sMessageBuf.Replace(_T("\n\r"), _T("\n"));
\r
875 m_sMessageBuf.Replace(_T("\r\n"), _T("\n"));
\r
876 if (m_sMessageBuf.Right(1).Compare(_T("\n"))==0)
\r
877 m_sMessageBuf = m_sMessageBuf.Left(m_sMessageBuf.GetLength()-1);
\r
880 m_sMessageBuf.Empty();
\r
881 pLogItem->sMessage = m_sMessageBuf;
\r
882 pLogItem->Rev = rev;
\r
884 // move-construct path array
\r
886 pLogItem->pArChangedPaths = new LogChangedPathArray (*cpaths);
\r
887 cpaths->RemoveAll();
\r
889 catch (CException * e)
\r
891 ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR);
\r
893 m_bCancelled = TRUE;
\r
895 m_logEntries.push_back(pLogItem);
\r
896 m_arShownList.Add(pLogItem);
\r
902 //this is the thread function which calls the subversion function
\r
907 void CLogDlg::CopyChangedSelectionToClipBoard()
\r
910 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
912 return; // nothing is selected, get out of here
\r
916 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
919 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
922 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
923 sPaths += m_currentChangedPathList[nItem].GetGitPathString();
\r
924 sPaths += _T("\r\n");
\r
929 // only one revision is selected in the log dialog top pane
\r
930 // but multiple items could be selected in the changed items list
\r
931 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
934 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
935 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
937 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
939 // some items are hidden! So find out which item the user really selected
\r
940 INT_PTR selRealIndex = -1;
\r
941 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
943 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
945 if (selRealIndex == nItem)
\r
947 changedlogpath = pLogEntry->pArChangedPaths->GetAt(hiddenindex);
\r
952 if (changedlogpath)
\r
954 sPaths += changedlogpath->sPath;
\r
955 sPaths += _T("\r\n");
\r
960 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
\r
964 BOOL CLogDlg::IsDiffPossible(LogChangedPath * changedpath, git_revnum_t rev)
\r
967 CString added, deleted;
\r
968 if (changedpath == NULL)
\r
971 if ((rev > 1)&&(changedpath->action != LOGACTIONS_DELETED))
\r
973 if (changedpath->action == LOGACTIONS_ADDED) // file is added
\r
975 if (changedpath->lCopyFromRev == 0)
\r
976 return FALSE; // but file was not added with history
\r
984 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
\r
986 // we have two separate context menus:
\r
987 // one shown on the log message list control,
\r
988 // the other shown in the changed-files list control
\r
989 int selCount = m_LogList.GetSelectedCount();
\r
990 if (pWnd == &m_LogList)
\r
992 //ShowContextMenuForRevisions(pWnd, point);
\r
994 else if (pWnd == &m_ChangedFileListCtrl)
\r
996 //ShowContextMenuForChangedpaths(pWnd, point);
\r
998 else if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1000 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1001 int selIndex = -1;
\r
1003 selIndex = m_LogList.GetNextSelectedItem(pos);
\r
1004 if ((point.x == -1) && (point.y == -1))
\r
1007 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
\r
1008 ClientToScreen(&rect);
\r
1009 point = rect.CenterPoint();
\r
1011 CString sMenuItemText;
\r
1013 if (popup.CreatePopupMenu())
\r
1015 // add the 'default' entries
\r
1016 sMenuItemText.LoadString(IDS_SCIEDIT_COPY);
\r
1017 popup.AppendMenu(MF_STRING | MF_ENABLED, WM_COPY, sMenuItemText);
\r
1018 sMenuItemText.LoadString(IDS_SCIEDIT_SELECTALL);
\r
1019 popup.AppendMenu(MF_STRING | MF_ENABLED, EM_SETSEL, sMenuItemText);
\r
1021 //if (selIndex >= 0)
\r
1023 // popup.AppendMenu(MF_SEPARATOR);
\r
1024 // sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);
\r
1025 // popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);
\r
1028 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
1032 break; // no command selected
\r
1035 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
\r
1037 case CGitLogList::ID_EDITAUTHOR:
\r
1038 EditLogMessage(selIndex);
\r
1046 LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
1049 ASSERT(m_pFindDialog != NULL);
\r
1051 if (m_pFindDialog->IsTerminating())
\r
1053 // invalidate the handle identifying the dialog box.
\r
1054 m_pFindDialog = NULL;
\r
1058 if(m_pFindDialog->FindNext())
\r
1060 //read data from dialog
\r
1061 CString FindText = m_pFindDialog->GetFindString();
\r
1062 bool bMatchCase = (m_pFindDialog->MatchCase() == TRUE);
\r
1063 bool bFound = false;
\r
1065 bool bRegex = ValidateRegexp(FindText, pat, bMatchCase);
\r
1067 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_not_null;
\r
1070 for (i = this->m_nSearchIndex; i<m_arShownList.GetCount()&&!bFound; i++)
\r
1074 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1076 if (regex_search(wstring((LPCTSTR)pLogEntry->sMessage), pat, flags))
\r
1081 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1082 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1084 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1085 if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags))
\r
1091 if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags))
\r
1103 if (m_logEntries[i]->sMessage.Find(FindText) >= 0)
\r
1108 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1109 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1110 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1112 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1113 if (cpath->sCopyFromPath.Find(FindText)>=0)
\r
1119 if (cpath->sPath.Find(FindText)>=0)
\r
1129 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1130 CString msg = pLogEntry->sMessage;
\r
1131 msg = msg.MakeLower();
\r
1132 CString find = FindText.MakeLower();
\r
1133 if (msg.Find(find) >= 0)
\r
1138 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1139 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1141 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1142 CString lowerpath = cpath->sCopyFromPath;
\r
1143 lowerpath.MakeLower();
\r
1144 if (lowerpath.Find(find)>=0)
\r
1150 lowerpath = cpath->sPath;
\r
1151 lowerpath.MakeLower();
\r
1152 if (lowerpath.Find(find)>=0)
\r
1161 } // for (i = this->m_nSearchIndex; i<m_arShownList.GetItemCount()&&!bFound; i++)
\r
1164 this->m_nSearchIndex = (i+1);
\r
1165 m_LogList.EnsureVisible(i, FALSE);
\r
1166 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);
\r
1167 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
1168 m_LogList.SetSelectionMark(i);
\r
1169 FillLogMessageCtrl();
\r
1170 UpdateData(FALSE);
\r
1172 if (m_nSearchIndex >= m_arShownList.GetCount())
\r
1173 m_nSearchIndex = (int)m_arShownList.GetCount()-1;
\r
1175 } // if(m_pFindDialog->FindNext())
\r
1176 UpdateLogInfoLabel();
\r
1181 void CLogDlg::OnOK()
\r
1184 // since the log dialog is also used to select revisions for other
\r
1185 // dialogs, we have to do some work before closing this dialog
\r
1186 if (GetFocus() != GetDlgItem(IDOK))
\r
1187 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
\r
1188 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
\r
1189 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
\r
1192 CString buttontext;
\r
1193 GetDlgItemText(IDOK, buttontext);
\r
1194 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
1195 if (temp.Compare(buttontext) != 0)
\r
1196 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
\r
1197 m_bCancelled = TRUE;
\r
1198 m_selectedRevs.Clear();
\r
1199 m_selectedRevsOneRange.Clear();
\r
1200 if (m_pNotifyWindow)
\r
1202 int selIndex = m_LogList.GetSelectionMark();
\r
1203 if (selIndex >= 0)
\r
1205 PLOGENTRYDATA pLogEntry = NULL;
\r
1206 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1207 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1208 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1209 git_revnum_t lowerRev = pLogEntry->Rev;
\r
1210 git_revnum_t higherRev = lowerRev;
\r
1213 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1214 git_revnum_t rev = pLogEntry->Rev;
\r
1215 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1216 if (lowerRev > rev)
\r
1218 if (higherRev < rev)
\r
1221 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
\r
1223 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
\r
1225 BOOL bSentMessage = FALSE;
\r
1226 if (m_LogList.GetSelectedCount() == 1)
\r
1228 // if only one revision is selected, check if the path/url with which the dialog was started
\r
1229 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
\r
1230 // if it was copied, use the copy from revision as lowerRev
\r
1231 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
\r
1233 CString sUrl = m_path.GetGitPathString();
\r
1234 if (!m_path.IsUrl())
\r
1236 sUrl = GetURLFromPath(m_path);
\r
1238 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
\r
1239 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
\r
1241 LogChangedPath * pData = pLogEntry->pArChangedPaths->GetAt(cp);
\r
1244 if (sUrl.Compare(pData->sPath) == 0)
\r
1246 if (!pData->sCopyFromPath.IsEmpty())
\r
1248 lowerRev = pData->lCopyFromRev;
\r
1249 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
\r
1250 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
\r
1251 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1252 bSentMessage = TRUE;
\r
1259 if ( !bSentMessage )
\r
1261 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
\r
1262 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
\r
1263 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1264 if (m_selectedRevsOneRange.GetCount())
\r
1265 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
\r
1270 if (m_bSaveStrict)
\r
1271 m_regLastStrict = m_bStrict;
\r
1272 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
1273 reg = m_btnShow.GetCurrentEntry();
\r
1274 SaveSplitterPos();
\r
1278 void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
1280 // a double click on an entry in the changed-files list has happened
\r
1283 DiffSelectedFile();
\r
1286 void CLogDlg::DiffSelectedFile()
\r
1289 if (m_bThreadRunning)
\r
1291 UpdateLogInfoLabel();
\r
1292 INT_PTR selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
1295 if (m_ChangedFileListCtrl.GetSelectedCount() == 0)
\r
1297 // find out if there's an entry selected in the log list
\r
1298 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1299 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1300 git_revnum_t rev1 = pLogEntry->Rev;
\r
1301 git_revnum_t rev2 = rev1;
\r
1306 // there's at least a second entry selected in the log list: several revisions selected!
\r
1307 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1310 rev1 = max(rev1,(long)pLogEntry->Rev);
\r
1311 rev2 = min(rev2,(long)pLogEntry->Rev);
\r
1315 // now we have both revisions selected in the log list, so we can do a diff of the selected
\r
1316 // entry in the changed files list with these two revisions.
\r
1317 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1322 // nothing or only one revision selected in the log list
\r
1323 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1325 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
1327 // some items are hidden! So find out which item the user really clicked on
\r
1328 INT_PTR selRealIndex = -1;
\r
1329 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
1331 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
1333 if (selRealIndex == selIndex)
\r
1335 selIndex = hiddenindex;
\r
1336 changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1342 if (IsDiffPossible(changedpath, rev1))
\r
1344 // diffs with renamed files are possible
\r
1345 if ((changedpath)&&(!changedpath->sCopyFromPath.IsEmpty()))
\r
1346 rev2 = changedpath->lCopyFromRev;
\r
1349 // if the path was modified but the parent path was 'added with history'
\r
1350 // then we have to use the copy from revision of the parent path
\r
1351 CTGitPath cpath = CTGitPath(changedpath->sPath);
\r
1352 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
1354 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
1355 if (p.IsAncestorOf(cpath))
\r
1357 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
1358 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
1362 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1366 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1367 CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1369 // deleted files must be opened from the revision before the deletion
\r
1370 if (changedpath->action == LOGACTIONS_DELETED)
\r
1372 m_bCancelled = false;
\r
1374 CProgressDlg progDlg;
\r
1375 progDlg.SetTitle(IDS_APPNAME);
\r
1376 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1377 CString sInfoLine;
\r
1378 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)(m_sRepositoryRoot + changedpath->sPath), (LPCTSTR)r.ToString());
\r
1379 progDlg.SetLine(1, sInfoLine, true);
\r
1380 SetAndClearProgressInfo(&progDlg);
\r
1381 progDlg.ShowModeless(m_hWnd);
\r
1383 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))
\r
1385 m_bCancelled = false;
\r
1386 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), GitRev::REV_HEAD, r, tempfile))
\r
1389 SetAndClearProgressInfo((HWND)NULL);
\r
1390 CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1395 SetAndClearProgressInfo((HWND)NULL);
\r
1397 CString sName1, sName2;
\r
1398 sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1);
\r
1399 sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1-1);
\r
1400 CAppUtils::DiffFlags flags;
\r
1401 flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1402 if (changedpath->action == LOGACTIONS_DELETED)
\r
1403 CAppUtils::StartExtDiff(tempfile, tempfile2, sName2, sName1, flags);
\r
1405 CAppUtils::StartExtDiff(tempfile2, tempfile, sName2, sName1, flags);
\r
1412 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool blame, bool unified)
\r
1414 DialogEnableWindow(IDOK, FALSE);
\r
1415 // SetPromptApp(&theApp);
\r
1416 theApp.DoWaitCursor(1);
\r
1419 GetTempPath(temppath);
\r
1422 file1.Format(_T("%s%s_%s%s"),
\r
1424 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1425 rev1->m_CommitHash.Left(6),
\r
1426 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1429 file2.Format(_T("%s\\%s_%s%s"),
\r
1431 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1432 rev2->m_CommitHash.Left(6),
\r
1433 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1437 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1438 g_Git.RunLogFile(cmd,file1);
\r
1439 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1440 g_Git.RunLogFile(cmd,file2);
\r
1442 CAppUtils::DiffFlags flags;
\r
1443 CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),flags);
\r
1446 //get the filename
\r
1448 if (Git::PathIsURL(m_path))
\r
1450 filepath = m_path.GetGitPathString();
\r
1454 filepath = GetURLFromPath(m_path);
\r
1455 if (filepath.IsEmpty())
\r
1457 theApp.DoWaitCursor(-1);
\r
1459 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1460 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1461 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1463 theApp.DoWaitCursor(-11);
\r
1467 m_bCancelled = FALSE;
\r
1468 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1470 CString firstfile, secondfile;
\r
1471 if (m_LogList.GetSelectedCount()==1)
\r
1473 int s = m_LogList.GetSelectionMark();
\r
1474 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(s));
\r
1475 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1476 firstfile = changedpath->sPath;
\r
1477 secondfile = firstfile;
\r
1478 if ((rev2 == rev1-1)&&(changedpath->lCopyFromRev > 0)) // is it an added file with history?
\r
1480 secondfile = changedpath->sCopyFromPath;
\r
1481 rev2 = changedpath->lCopyFromRev;
\r
1486 firstfile = m_currentChangedPathList[selIndex].GetGitPathString();
\r
1487 secondfile = firstfile;
\r
1490 firstfile = filepath + firstfile.Trim();
\r
1491 secondfile = filepath + secondfile.Trim();
\r
1493 GitDiff diff(this, this->m_hWnd, true);
\r
1494 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1495 diff.SetHEADPeg(m_LogRevision);
\r
1498 if (PromptShown())
\r
1499 diff.ShowUnifiedDiff(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1);
\r
1501 CAppUtils::StartShowUnifiedDiff(m_hWnd, CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), m_LogRevision);
\r
1505 if (diff.ShowCompare(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), false, blame))
\r
1507 if (firstfile.Compare(secondfile)==0)
\r
1509 git_revnum_t baseRev = 0;
\r
1510 diff.DiffProps(CTGitPath(firstfile), rev2, rev1, baseRev);
\r
1517 theApp.DoWaitCursor(-1);
\r
1521 BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, git_revnum_t rev)
\r
1524 DialogEnableWindow(IDOK, FALSE);
\r
1525 SetPromptApp(&theApp);
\r
1526 theApp.DoWaitCursor(1);
\r
1528 if (Git::PathIsURL(m_path))
\r
1530 filepath = m_path.GetGitPathString();
\r
1534 filepath = GetURLFromPath(m_path);
\r
1535 if (filepath.IsEmpty())
\r
1537 theApp.DoWaitCursor(-1);
\r
1539 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1540 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1541 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1546 m_bCancelled = false;
\r
1547 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1548 filepath += changedpath;
\r
1550 CProgressDlg progDlg;
\r
1551 progDlg.SetTitle(IDS_APPNAME);
\r
1552 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1553 CString sInfoLine;
\r
1554 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)GitRev(rev).ToString());
\r
1555 progDlg.SetLine(1, sInfoLine, true);
\r
1556 SetAndClearProgressInfo(&progDlg);
\r
1557 progDlg.ShowModeless(m_hWnd);
\r
1559 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(filepath), rev);
\r
1560 m_bCancelled = false;
\r
1561 if (!Cat(CTGitPath(filepath), GitRev(rev), rev, tempfile))
\r
1564 SetAndClearProgressInfo((HWND)NULL);
\r
1565 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1567 theApp.DoWaitCursor(-1);
\r
1571 SetAndClearProgressInfo((HWND)NULL);
\r
1572 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
1575 int ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
\r
1576 if (ret <= HINSTANCE_ERROR)
\r
1581 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
1582 cmd += tempfile.GetWinPathString() + _T(" ");
\r
1583 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
1586 theApp.DoWaitCursor(-1);
\r
1591 void CLogDlg::EditAuthor(const CLogDataVector& logs)
\r
1596 if (logs.size() == 0)
\r
1598 DialogEnableWindow(IDOK, FALSE);
\r
1599 SetPromptApp(&theApp);
\r
1600 theApp.DoWaitCursor(1);
\r
1601 if (Git::PathIsURL(m_path))
\r
1602 url = m_path.GetGitPathString();
\r
1605 url = GetURLFromPath(m_path);
\r
1607 name = Git_PROP_REVISION_AUTHOR;
\r
1609 CString value = RevPropertyGet(name, CTGitPath(url), logs[0]->Rev);
\r
1610 CString sOldValue = value;
\r
1611 value.Replace(_T("\n"), _T("\r\n"));
\r
1612 CInputDlg dlg(this);
\r
1613 dlg.m_sHintText.LoadString(IDS_LOG_AUTHOR);
\r
1614 dlg.m_sInputText = value;
\r
1615 dlg.m_sTitle.LoadString(IDS_LOG_AUTHOREDITTITLE);
\r
1616 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1617 dlg.m_bUseLogWidth = false;
\r
1618 if (dlg.DoModal() == IDOK)
\r
1620 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1622 LogCache::CCachedLogInfo* toUpdate
\r
1623 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1625 CProgressDlg progDlg;
\r
1626 progDlg.SetTitle(IDS_APPNAME);
\r
1627 progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
\r
1628 progDlg.SetTime(true);
\r
1629 progDlg.SetShowProgressBar(true);
\r
1630 progDlg.ShowModeless(m_hWnd);
\r
1631 for (DWORD i=0; i<logs.size(); ++i)
\r
1633 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), logs[i]->Rev))
\r
1636 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1642 logs[i]->sAuthor = dlg.m_sInputText;
\r
1643 m_LogList.Invalidate();
\r
1645 // update the log cache
\r
1647 if (toUpdate != NULL)
\r
1649 // log caching is active
\r
1651 LogCache::CCachedLogInfo newInfo;
\r
1652 newInfo.Insert ( logs[i]->Rev
\r
1653 , (const char*) CUnicodeUtils::GetUTF8 (logs[i]->sAuthor)
\r
1656 , LogCache::CRevisionInfoContainer::HAS_AUTHOR);
\r
1658 toUpdate->Update (newInfo);
\r
1661 progDlg.SetProgress64(i, logs.size());
\r
1665 theApp.DoWaitCursor(-1);
\r
1670 void CLogDlg::EditLogMessage(int index)
\r
1675 DialogEnableWindow(IDOK, FALSE);
\r
1676 SetPromptApp(&theApp);
\r
1677 theApp.DoWaitCursor(1);
\r
1678 if (Git::PathIsURL(m_path))
\r
1679 url = m_path.GetGitPathString();
\r
1682 url = GetURLFromPath(m_path);
\r
1684 name = Git_PROP_REVISION_LOG;
\r
1686 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(index));
\r
1687 m_bCancelled = FALSE;
\r
1688 CString value = RevPropertyGet(name, CTGitPath(url), pLogEntry->Rev);
\r
1689 CString sOldValue = value;
\r
1690 value.Replace(_T("\n"), _T("\r\n"));
\r
1691 CInputDlg dlg(this);
\r
1692 dlg.m_sHintText.LoadString(IDS_LOG_MESSAGE);
\r
1693 dlg.m_sInputText = value;
\r
1694 dlg.m_sTitle.LoadString(IDS_LOG_MESSAGEEDITTITLE);
\r
1695 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1696 dlg.m_bUseLogWidth = true;
\r
1697 if (dlg.DoModal() == IDOK)
\r
1699 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1700 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), pLogEntry->Rev))
\r
1702 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1706 pLogEntry->sShortMessage = MakeShortMessage(dlg.m_sInputText);
\r
1707 // split multi line log entries and concatenate them
\r
1708 // again but this time with \r\n as line separators
\r
1709 // so that the edit control recognizes them
\r
1710 if (dlg.m_sInputText.GetLength()>0)
\r
1712 m_sMessageBuf = dlg.m_sInputText;
\r
1713 dlg.m_sInputText.Replace(_T("\n\r"), _T("\n"));
\r
1714 dlg.m_sInputText.Replace(_T("\r\n"), _T("\n"));
\r
1715 if (dlg.m_sInputText.Right(1).Compare(_T("\n"))==0)
\r
1716 dlg.m_sInputText = dlg.m_sInputText.Left(dlg.m_sInputText.GetLength()-1);
\r
1719 dlg.m_sInputText.Empty();
\r
1720 pLogEntry->sMessage = dlg.m_sInputText;
\r
1721 pLogEntry->sBugIDs = m_ProjectProperties.FindBugID(dlg.m_sInputText);
\r
1722 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
1723 pMsgView->SetWindowText(_T(" "));
\r
1724 pMsgView->SetWindowText(dlg.m_sInputText);
\r
1725 m_ProjectProperties.FindBugID(dlg.m_sInputText, pMsgView);
\r
1726 m_LogList.Invalidate();
\r
1728 // update the log cache
\r
1730 LogCache::CCachedLogInfo* toUpdate
\r
1731 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1732 if (toUpdate != NULL)
\r
1734 // log caching is active
\r
1736 LogCache::CCachedLogInfo newInfo;
\r
1737 newInfo.Insert ( pLogEntry->Rev
\r
1739 , (const char*) CUnicodeUtils::GetUTF8 (pLogEntry->sMessage)
\r
1741 , LogCache::CRevisionInfoContainer::HAS_COMMENT);
\r
1743 toUpdate->Update (newInfo);
\r
1747 theApp.DoWaitCursor(-1);
\r
1752 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
\r
1754 // Skip Ctrl-C when copying text out of the log message or search filter
\r
1755 BOOL bSkipAccelerator = ( pMsg->message == WM_KEYDOWN && pMsg->wParam=='C' && (GetFocus()==GetDlgItem(IDC_MSGVIEW) || GetFocus()==GetDlgItem(IDC_SEARCHEDIT) ) && GetKeyState(VK_CONTROL)&0x8000 );
\r
1756 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
\r
1758 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
\r
1760 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))
\r
1762 DiffSelectedRevWithPrevious();
\r
1766 if (GetFocus()==GetDlgItem(IDC_LOGMSG))
\r
1768 DiffSelectedFile();
\r
1772 if (m_hAccel && !bSkipAccelerator)
\r
1774 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
\r
1779 m_tooltips.RelayEvent(pMsg);
\r
1780 return __super::PreTranslateMessage(pMsg);
\r
1784 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
1786 //if (this->IsThreadRunning())
\r
1787 if(m_LogList.m_bNoDispUpdates)
\r
1789 // only show the wait cursor over the list control
\r
1791 ((pWnd == GetDlgItem(IDC_LOGLIST))||
\r
1792 (pWnd == GetDlgItem(IDC_MSGVIEW))||
\r
1793 (pWnd == GetDlgItem(IDC_LOGMSG))))
\r
1795 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
1800 if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1801 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1803 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
1805 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1808 void CLogDlg::OnBnClickedHelp()
\r
1813 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1815 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1817 //if (this->IsThreadRunning())
\r
1818 if(m_LogList.m_bNoDispUpdates)
\r
1820 if (pNMLV->iItem >= 0)
\r
1822 m_nSearchIndex = pNMLV->iItem;
\r
1823 if (pNMLV->iSubItem != 0)
\r
1825 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount())&&(m_bStrict)&&(1/*m_bStrictStopped*/))
\r
1827 // remove the selected state
\r
1828 if (pNMLV->uChanged & LVIF_STATE)
\r
1830 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
\r
1831 FillLogMessageCtrl();
\r
1832 UpdateData(FALSE);
\r
1833 UpdateLogInfoLabel();
\r
1837 if (pNMLV->uChanged & LVIF_STATE)
\r
1839 FillLogMessageCtrl();
\r
1840 UpdateData(FALSE);
\r
1845 FillLogMessageCtrl();
\r
1846 UpdateData(FALSE);
\r
1849 UpdateLogInfoLabel();
\r
1852 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
\r
1854 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
\r
1855 if (pEnLink->msg == WM_LBUTTONUP)
\r
1858 GetDlgItemText(IDC_MSGVIEW, msg);
\r
1859 msg.Replace(_T("\r\n"), _T("\n"));
\r
1860 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
\r
1861 if (!::PathIsURL(url))
\r
1863 url = m_ProjectProperties.GetBugIDUrl(url);
\r
1864 url = GetAbsoluteUrlFromRelativeUrl(url);
\r
1866 if (!url.IsEmpty())
\r
1867 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
1872 void CLogDlg::OnBnClickedStatbutton()
\r
1875 if (m_bThreadRunning)
\r
1877 if (m_arShownList.IsEmpty())
\r
1878 return; // nothing is shown, so no statistics.
\r
1879 // the statistics dialog expects the log entries to be sorted by date
\r
1880 SortByColumn(3, false);
\r
1881 CPtrArray shownlist;
\r
1882 RecalculateShownList(&shownlist);
\r
1883 // create arrays which are aware of the current filter
\r
1884 CStringArray m_arAuthorsFiltered;
\r
1885 CDWordArray m_arDatesFiltered;
\r
1886 CDWordArray m_arFileChangesFiltered;
\r
1887 for (INT_PTR i=0; i<shownlist.GetCount(); ++i)
\r
1889 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(shownlist.GetAt(i));
\r
1890 CString strAuthor = pLogEntry->sAuthor;
\r
1891 if ( strAuthor.IsEmpty() )
\r
1893 strAuthor.LoadString(IDS_STATGRAPH_EMPTYAUTHOR);
\r
1895 m_arAuthorsFiltered.Add(strAuthor);
\r
1896 m_arDatesFiltered.Add(static_cast<DWORD>(pLogEntry->tmDate));
\r
1897 m_arFileChangesFiltered.Add(pLogEntry->dwFileChanges);
\r
1899 CStatGraphDlg dlg;
\r
1900 dlg.m_parAuthors = &m_arAuthorsFiltered;
\r
1901 dlg.m_parDates = &m_arDatesFiltered;
\r
1902 dlg.m_parFileChanges = &m_arFileChangesFiltered;
\r
1903 dlg.m_path = m_path;
\r
1905 // restore the previous sorting
\r
1906 SortByColumn(m_nSortColumn, m_bAscending);
\r
1907 OnTimer(LOGFILTER_TIMER);
\r
1912 void CLogDlg::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1915 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
1916 // Take the default processing unless we set this to something else below.
\r
1917 *pResult = CDRF_DODEFAULT;
\r
1919 if (m_bNoDispUpdates)
\r
1922 switch (pLVCD->nmcd.dwDrawStage)
\r
1924 case CDDS_PREPAINT:
\r
1926 *pResult = CDRF_NOTIFYITEMDRAW;
\r
1930 case CDDS_ITEMPREPAINT:
\r
1932 // This is the prepaint stage for an item. Here's where we set the
\r
1933 // item's text color.
\r
1935 // Tell Windows to send draw notifications for each subitem.
\r
1936 *pResult = CDRF_NOTIFYSUBITEMDRAW;
\r
1938 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
1940 if (m_arShownList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1942 GitRev* data = (GitRev*)m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec);
\r
1946 if (data->bCopiedSelf)
\r
1948 // only change the background color if the item is not 'hot' (on vista with themes enabled)
\r
1949 if (!theme.IsAppThemed() || !m_bVista || ((pLVCD->nmcd.uItemState & CDIS_HOT)==0))
\r
1950 pLVCD->clrTextBk = GetSysColor(COLOR_MENU);
\r
1953 if (data->bCopies)
\r
1954 crText = m_Colors.GetColor(CColors::Modified);
\r
1956 // if ((data->childStackDepth)||(m_mergedRevs.find(data->Rev) != m_mergedRevs.end()))
\r
1957 // crText = GetSysColor(COLOR_GRAYTEXT);
\r
1958 // if (data->Rev == m_wcRev)
\r
1960 // SelectObject(pLVCD->nmcd.hdc, m_boldFont);
\r
1961 // We changed the font, so we're returning CDRF_NEWFONT. This
\r
1962 // tells the control to recalculate the extent of the text.
\r
1963 // *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;
\r
1967 if (m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1969 if (m_bStrictStopped)
\r
1970 crText = GetSysColor(COLOR_GRAYTEXT);
\r
1972 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
1973 pLVCD->clrText = crText;
\r
1977 case CDDS_ITEMPREPAINT|CDDS_ITEM|CDDS_SUBITEM:
\r
1979 if ((m_bStrictStopped)&&(m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
1981 pLVCD->nmcd.uItemState &= ~(CDIS_SELECTED|CDIS_FOCUS);
\r
1983 if (pLVCD->iSubItem == 1)
\r
1985 *pResult = CDRF_DODEFAULT;
\r
1987 if (m_arShownList.GetCount() <= (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1991 int iconwidth = ::GetSystemMetrics(SM_CXSMICON);
\r
1992 int iconheight = ::GetSystemMetrics(SM_CYSMICON);
\r
1994 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec));
\r
1996 // Get the selected state of the
\r
1997 // item being drawn.
\r
1999 SecureZeroMemory(&rItem, sizeof(LVITEM));
\r
2000 rItem.mask = LVIF_STATE;
\r
2001 rItem.iItem = pLVCD->nmcd.dwItemSpec;
\r
2002 rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
\r
2003 m_LogList.GetItem(&rItem);
\r
2006 m_LogList.GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);
\r
2008 // Fill the background
\r
2009 if (theme.IsAppThemed() && m_bVista)
\r
2011 theme.Open(m_hWnd, L"Explorer");
\r
2012 int state = LISS_NORMAL;
\r
2013 if (rItem.state & LVIS_SELECTED)
\r
2015 if (::GetFocus() == m_LogList.m_hWnd)
\r
2016 state |= LISS_SELECTED;
\r
2018 state |= LISS_SELECTEDNOTFOCUS;
\r
2023 if (pLogEntry->bCopiedSelf)
\r
2025 // unfortunately, the pLVCD->nmcd.uItemState does not contain valid
\r
2026 // information at this drawing stage. But we can check the whether the
\r
2027 // previous stage changed the background color of the item
\r
2028 if (pLVCD->clrTextBk == GetSysColor(COLOR_MENU))
\r
2031 brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
2034 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
2035 ::DeleteObject(brush);
\r
2042 if (theme.IsBackgroundPartiallyTransparent(LVP_LISTDETAIL, state))
\r
2043 theme.DrawParentBackground(m_hWnd, pLVCD->nmcd.hdc, &rect);
\r
2045 theme.DrawBackground(pLVCD->nmcd.hdc, LVP_LISTDETAIL, state, &rect, NULL);
\r
2050 if (rItem.state & LVIS_SELECTED)
\r
2052 if (::GetFocus() == m_LogList.m_hWnd)
\r
2053 brush = ::CreateSolidBrush(::GetSysColor(COLOR_HIGHLIGHT));
\r
2055 brush = ::CreateSolidBrush(::GetSysColor(COLOR_BTNFACE));
\r
2059 //if (pLogEntry->bCopiedSelf)
\r
2060 // brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
2062 brush = ::CreateSolidBrush(::GetSysColor(COLOR_WINDOW));
\r
2064 if (brush == NULL)
\r
2067 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
2068 ::DeleteObject(brush);
\r
2071 // Draw the icon(s) into the compatible DC
\r
2072 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
2073 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left + ICONITEMBORDER, rect.top, m_hModifiedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2076 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
2077 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hAddedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2080 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
2081 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hDeletedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2084 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
2085 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hReplacedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2087 *pResult = CDRF_SKIPDEFAULT;
\r
2093 *pResult = CDRF_DODEFAULT;
\r
2098 void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2101 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
2102 // Take the default processing unless we set this to something else below.
\r
2103 *pResult = CDRF_DODEFAULT;
\r
2105 // if (m_bNoDispUpdates)
\r
2108 // First thing - check the draw stage. If it's the control's prepaint
\r
2109 // stage, then tell Windows we want messages for every item.
\r
2111 if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2113 *pResult = CDRF_NOTIFYITEMDRAW;
\r
2115 else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2117 // This is the prepaint stage for an item. Here's where we set the
\r
2118 // item's text color. Our return value will tell Windows to draw the
\r
2119 // item itself, but it will use the new color we set here.
\r
2121 // Tell Windows to paint the control itself.
\r
2122 *pResult = CDRF_DODEFAULT;
\r
2124 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
2125 bool bGrayed = false;
\r
2127 if ((m_cHidePaths.GetState() & 0x0003)==BST_INDETERMINATE)
\r
2129 if ((m_currentChangedArray)&&((m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)))
\r
2131 //if ((*m_currentChangedArray)[(pLVCD->nmcd.dwItemSpec)]sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2133 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2137 else if (m_currentChangedPathList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
2139 //if (m_currentChangedPathList[pLVCD->nmcd.dwItemSpec].GetGitPathString().Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2141 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2148 if ((!bGrayed)&&(m_currentChangedArray)&&(m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
2150 DWORD action = ((*m_currentChangedArray)[pLVCD->nmcd.dwItemSpec]).m_Action;
\r
2151 if (action == CTGitPath::LOGACTIONS_MODIFIED)
\r
2152 crText = m_Colors.GetColor(CColors::Modified);
\r
2153 if (action == CTGitPath::LOGACTIONS_REPLACED)
\r
2154 crText = m_Colors.GetColor(CColors::Deleted);
\r
2155 if (action == CTGitPath::LOGACTIONS_ADDED)
\r
2156 crText = m_Colors.GetColor(CColors::Added);
\r
2157 if (action == CTGitPath::LOGACTIONS_DELETED)
\r
2158 crText = m_Colors.GetColor(CColors::Deleted);
\r
2161 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
2162 pLVCD->clrText = crText;
\r
2166 void CLogDlg::DoSizeV1(int delta)
\r
2169 RemoveAnchor(IDC_LOGLIST);
\r
2170 RemoveAnchor(IDC_SPLITTERTOP);
\r
2171 RemoveAnchor(IDC_MSGVIEW);
\r
2172 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2173 RemoveAnchor(IDC_LOGMSG);
\r
2174 CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);
\r
2175 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);
\r
2176 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2177 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2178 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2179 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2180 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2183 SetSplitterRange();
\r
2184 m_LogList.Invalidate();
\r
2185 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2189 void CLogDlg::DoSizeV2(int delta)
\r
2192 RemoveAnchor(IDC_LOGLIST);
\r
2193 RemoveAnchor(IDC_SPLITTERTOP);
\r
2194 RemoveAnchor(IDC_MSGVIEW);
\r
2195 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2196 RemoveAnchor(IDC_LOGMSG);
\r
2197 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);
\r
2198 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);
\r
2199 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2200 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2201 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2202 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2203 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2206 SetSplitterRange();
\r
2207 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2208 m_ChangedFileListCtrl.Invalidate();
\r
2212 void CLogDlg::AdjustMinSize()
\r
2214 // adjust the minimum size of the dialog to prevent the resizing from
\r
2215 // moving the list control too far down.
\r
2216 CRect rcChgListView;
\r
2217 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
\r
2219 m_LogList.GetClientRect(rcLogList);
\r
2221 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
\r
2222 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
\r
2223 +rcChgListView.Height()+rcLogList.Height()+60));
\r
2226 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
2228 switch (message) {
\r
2230 if (wParam == IDC_SPLITTERTOP)
\r
2232 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2233 DoSizeV1(pHdr->delta);
\r
2235 else if (wParam == IDC_SPLITTERBOTTOM)
\r
2237 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2238 DoSizeV2(pHdr->delta);
\r
2243 return CResizableDialog::DefWindowProc(message, wParam, lParam);
\r
2246 void CLogDlg::SetSplitterRange()
\r
2248 if ((m_LogList)&&(m_ChangedFileListCtrl))
\r
2251 m_LogList.GetWindowRect(rcTop);
\r
2252 ScreenToClient(rcTop);
\r
2254 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);
\r
2255 ScreenToClient(rcMiddle);
\r
2256 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);
\r
2258 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
\r
2259 ScreenToClient(rcBottom);
\r
2260 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);
\r
2264 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
\r
2266 RECT * rect = (LPRECT)lParam;
\r
2269 point = CPoint(rect->left, rect->bottom);
\r
2270 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))
\r
2272 if (popup.CreatePopupMenu())
\r
2274 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2275 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ALL), LOGFILTER_ALL, temp);
\r
2277 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2279 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2280 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
\r
2281 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2282 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
\r
2283 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2284 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
\r
2285 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2286 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
\r
2287 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
\r
2288 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
\r
2290 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2292 temp.LoadString(IDS_LOG_FILTER_REGEX);
\r
2293 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
\r
2296 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2297 if (selection != 0)
\r
2300 if (selection == LOGFILTER_REGEX)
\r
2302 m_bFilterWithRegex = !m_bFilterWithRegex;
\r
2303 CRegDWORD b = CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
2304 b = m_bFilterWithRegex;
\r
2305 CheckRegexpTooltip();
\r
2309 m_nSelectedFilter = selection;
\r
2310 SetFilterCueText();
\r
2312 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2318 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
2321 KillTimer(LOGFILTER_TIMER);
\r
2323 m_sFilterText.Empty();
\r
2324 UpdateData(FALSE);
\r
2325 theApp.DoWaitCursor(1);
\r
2326 CStoreSelection storeselection(this);
\r
2327 FillLogMessageCtrl(false);
\r
2328 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
2329 m_arShownList.RemoveAll();
\r
2331 // reset the time filter too
\r
2332 m_timFrom = (__time64_t(m_tFrom));
\r
2333 m_timTo = (__time64_t(m_tTo));
\r
2334 m_DateFrom.SetTime(&m_timFrom);
\r
2335 m_DateTo.SetTime(&m_timTo);
\r
2336 m_DateFrom.SetRange(&m_timFrom, &m_timTo);
\r
2337 m_DateTo.SetRange(&m_timFrom, &m_timTo);
\r
2339 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
2341 m_arShownList.Add(m_logEntries[i]);
\r
2343 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
2344 m_LogList.DeleteAllItems();
\r
2345 m_LogList.SetItemCountEx(ShownCountWithStopped());
\r
2346 m_LogList.RedrawItems(0, ShownCountWithStopped());
\r
2347 m_LogList.SetRedraw(false);
\r
2348 ResizeAllListCtrlCols();
\r
2349 m_LogList.SetRedraw(true);
\r
2350 theApp.DoWaitCursor(-1);
\r
2351 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2352 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2353 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2354 UpdateLogInfoLabel();
\r
2360 void CLogDlg::SetFilterCueText()
\r
2363 switch (m_nSelectedFilter)
\r
2365 case LOGFILTER_ALL:
\r
2366 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2368 case LOGFILTER_MESSAGES:
\r
2369 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2371 case LOGFILTER_PATHS:
\r
2372 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2374 case LOGFILTER_AUTHORS:
\r
2375 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2377 case LOGFILTER_REVS:
\r
2378 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2381 // to make the cue banner text appear more to the right of the edit control
\r
2382 temp = _T(" ")+temp;
\r
2383 m_cFilter.SetCueBanner(temp);
\r
2386 void CLogDlg::OnLvnGetdispinfoLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
2388 NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);
\r
2390 // Create a pointer to the item
\r
2391 LV_ITEM* pItem = &(pDispInfo)->item;
\r
2393 // Do the list need text information?
\r
2394 if (!(pItem->mask & LVIF_TEXT))
\r
2397 // By default, clear text buffer.
\r
2398 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2400 bool bOutOfRange = pItem->iItem >= ShownCountWithStopped();
\r
2403 if (m_bNoDispUpdates || m_bThreadRunning || bOutOfRange)
\r
2406 // Which item number?
\r
2407 int itemid = pItem->iItem;
\r
2408 GitRev * pLogEntry = NULL;
\r
2409 if (itemid < m_arShownList.GetCount())
\r
2410 pLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(pItem->iItem));
\r
2413 switch (pItem->iSubItem)
\r
2415 case this->LOGLIST_GRAPH: //Graphic
\r
2420 case this->LOGLIST_ACTION: //action -- no text in the column
\r
2422 case this->LOGLIST_MESSAGE: //Message
\r
2424 lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_Subject, pItem->cchTextMax);
\r
2426 case this->LOGLIST_AUTHOR: //Author
\r
2428 lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_AuthorName, pItem->cchTextMax);
\r
2430 case this->LOGLIST_DATE: //Date
\r
2432 lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_AuthorDate.Format(_T("%Y-%m-%d %H:%M")), pItem->cchTextMax);
\r
2443 void CLogDlg::OnLvnGetdispinfoChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2447 NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);
\r
2449 //Create a pointer to the item
\r
2450 LV_ITEM* pItem= &(pDispInfo)->item;
\r
2453 if ((m_bNoDispUpdates)||(m_bThreadRunning))
\r
2455 if (pItem->mask & LVIF_TEXT)
\r
2456 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2459 if ((m_currentChangedArray!=NULL)&&(pItem->iItem >= m_currentChangedArray->GetCount()))
\r
2461 if (pItem->mask & LVIF_TEXT)
\r
2462 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2465 if ((m_currentChangedArray==NULL)&&(pItem->iItem >= m_currentChangedPathList.GetCount()))
\r
2467 if (pItem->mask & LVIF_TEXT)
\r
2468 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2471 CTGitPath lcpath = NULL;
\r
2472 if (m_currentChangedArray)
\r
2473 lcpath = (*m_currentChangedArray)[pItem->iItem];
\r
2474 //Does the list need text information?
\r
2475 if (pItem->mask & LVIF_TEXT)
\r
2478 switch (pItem->iSubItem)
\r
2480 case this->FILELIST_ACTION: //Action
\r
2483 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath->GetAction(), pItem->cchTextMax);
\r
2485 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2487 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.GetActionName(), pItem->cchTextMax);
\r
2491 case this->FILELIST_ADD: //add
\r
2494 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath->sPath, pItem->cchTextMax);
\r
2496 lstrcpyn(pItem->pszText, (LPCTSTR)m_currentChangedPathList[pItem->iItem].GetGitPathString(), pItem->cchTextMax);
\r
2498 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.m_StatAdd, pItem->cchTextMax);
\r
2501 case this->FILELIST_DEL: //del
\r
2504 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath->sCopyFromPath, pItem->cchTextMax);
\r
2506 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2508 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.m_StatDel, pItem->cchTextMax);
\r
2510 case this->FILELIST_PATH: //path
\r
2512 if ((lcpath==NULL)||(lcpath->sCopyFromPath.IsEmpty()))
\r
2513 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2515 _stprintf_s(pItem->pszText, pItem->cchTextMax, _T("%ld"), lcpath->lCopyFromRev);
\r
2517 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.GetGitPathString(), pItem->cchTextMax);
\r
2525 void CLogDlg::OnEnChangeSearchedit()
\r
2529 if (m_sFilterText.IsEmpty())
\r
2531 CStoreSelection storeselection(this);
\r
2532 // clear the filter, i.e. make all entries appear
\r
2533 theApp.DoWaitCursor(1);
\r
2534 KillTimer(LOGFILTER_TIMER);
\r
2535 FillLogMessageCtrl(false);
\r
2536 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
2537 m_arShownList.RemoveAll();
\r
2538 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
2540 if (IsEntryInDateRange(i))
\r
2541 m_arShownList.Add(m_logEntries[i]);
\r
2543 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
2544 m_LogList.DeleteAllItems();
\r
2545 m_LogList.SetItemCountEx(ShownCountWithStopped());
\r
2546 m_LogList.RedrawItems(0, ShownCountWithStopped());
\r
2547 m_LogList.SetRedraw(false);
\r
2548 ResizeAllListCtrlCols();
\r
2549 m_LogList.SetRedraw(true);
\r
2550 theApp.DoWaitCursor(-1);
\r
2551 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2552 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2553 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2554 DialogEnableWindow(IDC_STATBUTTON, !(((m_bThreadRunning)||(m_arShownList.IsEmpty()))));
\r
2557 if (Validate(m_sFilterText))
\r
2558 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2560 KillTimer(LOGFILTER_TIMER);
\r
2564 bool CLogDlg::ValidateRegexp(LPCTSTR regexp_str, tr1::wregex& pat, bool bMatchCase /* = false */)
\r
2568 tr1::regex_constants::syntax_option_type type = tr1::regex_constants::ECMAScript;
\r
2570 type |= tr1::regex_constants::icase;
\r
2571 pat = tr1::wregex(regexp_str, type);
\r
2574 catch (exception) {}
\r
2578 bool CLogDlg::Validate(LPCTSTR string)
\r
2580 if (!m_bFilterWithRegex)
\r
2583 return ValidateRegexp(string, pat, false);
\r
2586 void CLogDlg::RecalculateShownList(CPtrArray * pShownlist)
\r
2589 pShownlist->RemoveAll();
\r
2590 tr1::wregex pat;//(_T("Remove"), tr1::regex_constants::icase);
\r
2591 bool bRegex = false;
\r
2592 if (m_bFilterWithRegex)
\r
2593 bRegex = ValidateRegexp(m_sFilterText, pat, false);
\r
2595 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_any;
\r
2597 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
2599 if ((bRegex)&&(m_bFilterWithRegex))
\r
2601 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_BUGID))
\r
2603 ATLTRACE(_T("bugID = \"%s\"\n"), (LPCTSTR)m_logEntries[i]->sBugIDs);
\r
2604 if (regex_search(wstring((LPCTSTR)m_logEntries[i]->sBugIDs), pat, flags)&&IsEntryInDateRange(i))
\r
2606 pShownlist->Add(m_logEntries[i]);
\r
2610 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_MESSAGES))
\r
2612 ATLTRACE(_T("messge = \"%s\"\n"), (LPCTSTR)m_logEntries[i]->sMessage);
\r
2613 if (regex_search(wstring((LPCTSTR)m_logEntries[i]->sMessage), pat, flags)&&IsEntryInDateRange(i))
\r
2615 pShownlist->Add(m_logEntries[i]);
\r
2619 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_PATHS))
\r
2621 LogChangedPathArray * cpatharray = m_logEntries[i]->pArChangedPaths;
\r
2623 bool bGoing = true;
\r
2624 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount() && bGoing; ++cpPathIndex)
\r
2626 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2627 if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags)&&IsEntryInDateRange(i))
\r
2629 pShownlist->Add(m_logEntries[i]);
\r
2633 if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags)&&IsEntryInDateRange(i))
\r
2635 pShownlist->Add(m_logEntries[i]);
\r
2639 if (regex_search(wstring((LPCTSTR)cpath->GetAction()), pat, flags)&&IsEntryInDateRange(i))
\r
2641 pShownlist->Add(m_logEntries[i]);
\r
2649 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_AUTHORS))
\r
2651 if (regex_search(wstring((LPCTSTR)m_logEntries[i]->sAuthor), pat, flags)&&IsEntryInDateRange(i))
\r
2653 pShownlist->Add(m_logEntries[i]);
\r
2657 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_REVS))
\r
2659 sRev.Format(_T("%ld"), m_logEntries[i]->Rev);
\r
2660 if (regex_search(wstring((LPCTSTR)sRev), pat, flags)&&IsEntryInDateRange(i))
\r
2662 pShownlist->Add(m_logEntries[i]);
\r
2669 CString find = m_sFilterText;
\r
2671 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_BUGID))
\r
2673 CString sBugIDs = m_logEntries[i]->sBugIDs;
\r
2675 sBugIDs = sBugIDs.MakeLower();
\r
2676 if ((sBugIDs.Find(find) >= 0)&&(IsEntryInDateRange(i)))
\r
2678 pShownlist->Add(m_logEntries[i]);
\r
2682 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_MESSAGES))
\r
2684 CString msg = m_logEntries[i]->sMessage;
\r
2686 msg = msg.MakeLower();
\r
2687 if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i)))
\r
2689 pShownlist->Add(m_logEntries[i]);
\r
2693 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_PATHS))
\r
2695 LogChangedPathArray * cpatharray = m_logEntries[i]->pArChangedPaths;
\r
2697 bool bGoing = true;
\r
2698 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount() && bGoing; ++cpPathIndex)
\r
2700 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2701 CString path = cpath->sCopyFromPath;
\r
2703 if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))
\r
2705 pShownlist->Add(m_logEntries[i]);
\r
2709 path = cpath->sPath;
\r
2711 if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))
\r
2713 pShownlist->Add(m_logEntries[i]);
\r
2717 path = cpath->GetAction();
\r
2719 if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))
\r
2721 pShownlist->Add(m_logEntries[i]);
\r
2727 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_AUTHORS))
\r
2729 CString msg = m_logEntries[i]->sAuthor;
\r
2730 msg = msg.MakeLower();
\r
2731 if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i)))
\r
2733 pShownlist->Add(m_logEntries[i]);
\r
2737 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_REVS))
\r
2739 sRev.Format(_T("%ld"), m_logEntries[i]->Rev);
\r
2740 if ((sRev.Find(find) >= 0)&&(IsEntryInDateRange(i)))
\r
2742 pShownlist->Add(m_logEntries[i]);
\r
2746 } // else (from if (bRegex))
\r
2747 } // for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
2751 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
\r
2753 if (nIDEvent == LOGFILTER_TIMER)
\r
2755 if (this->IsThreadRunning())
\r
2757 // thread still running! So just restart the timer.
\r
2758 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2761 CWnd * focusWnd = GetFocus();
\r
2762 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
\r
2763 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
\r
2764 if (m_sFilterText.IsEmpty())
\r
2766 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2767 // do not return here!
\r
2768 // we also need to run the filter if the filter text is empty:
\r
2769 // 1. to clear an existing filter
\r
2770 // 2. to rebuild the m_arShownList after sorting
\r
2772 theApp.DoWaitCursor(1);
\r
2773 CStoreSelection storeselection(this);
\r
2774 KillTimer(LOGFILTER_TIMER);
\r
2775 FillLogMessageCtrl(false);
\r
2777 // now start filter the log list
\r
2778 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
2779 // RecalculateShownList(&m_LogList.m_arShownList);
\r
2780 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
2783 // m_LogList.DeleteAllItems();
\r
2784 // m_LogList.SetItemCountEx(m_LogList.ShownCountWithStopped());
\r
2785 // m_LogList.RedrawItems(0, m_LogList.ShownCountWithStopped());
\r
2786 // m_LogList.SetRedraw(false);
\r
2787 // m_LogList.ResizeAllListCtrlCols();
\r
2788 // m_LogList.SetRedraw(true);
\r
2789 // m_LogList.Invalidate();
\r
2790 // if ( m_LogList.GetItemCount()==1 )
\r
2792 // m_LogList.SetSelectionMark(0);
\r
2793 // m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
\r
2795 theApp.DoWaitCursor(-1);
\r
2796 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2797 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2798 if (bSetFocusToFilterControl)
\r
2799 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2800 UpdateLogInfoLabel();
\r
2801 } // if (nIDEvent == LOGFILTER_TIMER)
\r
2802 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2803 __super::OnTimer(nIDEvent);
\r
2806 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2809 m_DateTo.GetTime(_time);
\r
2812 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
\r
2813 if (time.GetTime() != m_tTo)
\r
2815 m_tTo = (DWORD)time.GetTime();
\r
2816 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2819 catch (CAtlException)
\r
2826 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2829 m_DateFrom.GetTime(_time);
\r
2832 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
\r
2833 if (time.GetTime() != m_tFrom)
\r
2835 m_tFrom = (DWORD)time.GetTime();
\r
2836 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2839 catch (CAtlException)
\r
2846 BOOL CLogDlg::IsEntryInDateRange(int i)
\r
2849 __time64_t time = m_logEntries[i]->tmDate;
\r
2850 if ((time >= m_tFrom)&&(time <= m_tTo))
\r
2857 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths /* = false */, bool bUseFilter /* = true */)
\r
2859 CTGitPathList pathList;
\r
2862 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2864 m_sRepositoryRoot = GetRepositoryRoot(m_path);
\r
2866 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2869 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2874 int nextpos = m_LogList.GetNextSelectedItem(pos);
\r
2875 if (nextpos >= m_arShownList.GetCount())
\r
2877 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(nextpos));
\r
2878 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
2879 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
2881 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2882 if (cpath == NULL)
\r
2885 if (!bRelativePaths)
\r
2886 path.SetFromGit(m_sRepositoryRoot);
\r
2887 path.AppendPathString(cpath->sPath);
\r
2888 if ((!bUseFilter)||
\r
2889 ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||
\r
2890 (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))
\r
2891 pathList.AddPath(path);
\r
2896 pathList.RemoveDuplicates();
\r
2901 void CLogDlg::SortByColumn(int nSortColumn, bool bAscending)
\r
2904 switch(nSortColumn)
\r
2906 case 0: // Revision
\r
2909 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
\r
2911 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
\r
2917 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
\r
2919 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
\r
2925 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
\r
2927 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
\r
2933 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
\r
2935 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
\r
2938 case 4: // Message or bug id
\r
2939 if (m_bShowBugtraqColumn)
\r
2942 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
\r
2944 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
\r
2947 // fall through here
\r
2948 case 5: // Message
\r
2951 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
\r
2953 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
\r
2963 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
2965 if (this->IsThreadRunning())
\r
2966 return; //no sorting while the arrays are filled
\r
2967 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2968 const int nColumn = pNMLV->iSubItem;
\r
2969 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
\r
2970 m_nSortColumn = nColumn;
\r
2971 SortByColumn(m_nSortColumn, m_bAscending);
\r
2972 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
\r
2973 SortShownListArray();
\r
2974 m_LogList.Invalidate();
\r
2975 UpdateLogInfoLabel();
\r
2976 // the "next 100" button only makes sense if the log messages
\r
2977 // are sorted by revision in descending order
\r
2978 if ((m_nSortColumn)||(m_bAscending))
\r
2980 DialogEnableWindow(IDC_NEXTHUNDRED, false);
\r
2984 DialogEnableWindow(IDC_NEXTHUNDRED, true);
\r
2989 void CLogDlg::SortShownListArray()
\r
2991 // make sure the shown list still matches the filter after sorting.
\r
2992 OnTimer(LOGFILTER_TIMER);
\r
2993 // clear the selection states
\r
2994 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2997 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
\r
2999 m_LogList.SetSelectionMark(-1);
\r
3002 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
\r
3004 if (control == NULL)
\r
3006 // set the sort arrow
\r
3007 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
\r
3008 HDITEM HeaderItem = {0};
\r
3009 HeaderItem.mask = HDI_FORMAT;
\r
3010 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
3012 pHeader->GetItem(i, &HeaderItem);
\r
3013 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
3014 pHeader->SetItem(i, &HeaderItem);
\r
3018 pHeader->GetItem(nColumn, &HeaderItem);
\r
3019 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
3020 pHeader->SetItem(nColumn, &HeaderItem);
\r
3023 void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
3026 if (this->IsThreadRunning())
\r
3027 return; //no sorting while the arrays are filled
\r
3028 if (m_currentChangedArray == NULL)
\r
3030 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
3031 const int nColumn = pNMLV->iSubItem;
\r
3032 m_bAscendingPathList = nColumn == m_nSortColumnPathList ? !m_bAscendingPathList : TRUE;
\r
3033 m_nSortColumnPathList = nColumn;
\r
3034 // qsort(m_currentChangedArray->GetData(), m_currentChangedArray->GetSize(), sizeof(LogChangedPath*), (GENERICCOMPAREFN)SortCompare);
\r
3036 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
3037 m_ChangedFileListCtrl.Invalidate();
\r
3042 int CLogDlg::m_nSortColumnPathList = 0;
\r
3043 bool CLogDlg::m_bAscendingPathList = false;
\r
3045 int CLogDlg::SortCompare(const void * pElem1, const void * pElem2)
\r
3048 LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);
\r
3049 LogChangedPath * cpath2 = *((LogChangedPath**)pElem2);
\r
3051 if (m_bAscendingPathList)
\r
3052 std::swap (cpath1, cpath2);
\r
3055 switch (m_nSortColumnPathList)
\r
3058 cmp = cpath2->GetAction().Compare(cpath1->GetAction());
\r
3063 cmp = cpath2->sPath.CompareNoCase(cpath1->sPath);
\r
3067 case 2: // copy from path
\r
3068 cmp = cpath2->sCopyFromPath.Compare(cpath1->sCopyFromPath);
\r
3072 case 3: // copy from revision
\r
3073 return cpath2->lCopyFromRev > cpath1->lCopyFromRev;
\r
3080 void CLogDlg::ResizeAllListCtrlCols()
\r
3083 const int nMinimumWidth = ICONITEMBORDER+16*4;
\r
3084 int maxcol = ((CHeaderCtrl*)(m_LogList.GetDlgItem(0)))->GetItemCount()-1;
\r
3085 int nItemCount = m_LogList.GetItemCount();
\r
3086 TCHAR textbuf[MAX_PATH];
\r
3087 CHeaderCtrl * pHdrCtrl = (CHeaderCtrl*)(m_LogList.GetDlgItem(0));
\r
3090 for (int col = 0; col <= maxcol; col++)
\r
3093 hdi.mask = HDI_TEXT;
\r
3094 hdi.pszText = textbuf;
\r
3095 hdi.cchTextMax = sizeof(textbuf);
\r
3096 pHdrCtrl->GetItem(col, &hdi);
\r
3097 int cx = m_LogList.GetStringWidth(hdi.pszText)+20; // 20 pixels for col separator and margin
\r
3098 for (int index = 0; index<nItemCount; ++index)
\r
3100 // get the width of the string and add 14 pixels for the column separator and margins
\r
3101 int linewidth = m_LogList.GetStringWidth(m_LogList.GetItemText(index, col)) + 14;
\r
3102 if (index < m_arShownList.GetCount())
\r
3104 GitRev * pCurLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(index));
\r
3105 if ((pCurLogEntry)&&(pCurLogEntry->m_CommitHash == m_wcRev.m_CommitHash))
\r
3107 // set the bold font and ask for the string width again
\r
3108 m_LogList.SendMessage(WM_SETFONT, (WPARAM)m_boldFont, NULL);
\r
3109 linewidth = m_LogList.GetStringWidth(m_LogList.GetItemText(index, col)) + 14;
\r
3110 // restore the system font
\r
3111 m_LogList.SendMessage(WM_SETFONT, NULL, NULL);
\r
3116 // add the image size
\r
3117 CImageList * pImgList = m_LogList.GetImageList(LVSIL_SMALL);
\r
3118 if ((pImgList)&&(pImgList->GetImageCount()))
\r
3120 IMAGEINFO imginfo;
\r
3121 pImgList->GetImageInfo(0, &imginfo);
\r
3122 linewidth += (imginfo.rcImage.right - imginfo.rcImage.left);
\r
3123 linewidth += 3; // 3 pixels between icon and text
\r
3126 if (cx < linewidth)
\r
3129 // Adjust columns "Actions" containing icons
\r
3130 if (col == this->LOGLIST_ACTION)
\r
3132 if (cx < nMinimumWidth)
\r
3134 cx = nMinimumWidth;
\r
3138 if (col == this->LOGLIST_MESSAGE)
\r
3140 if (cx > LOGLIST_MESSAGE_MAX)
\r
3142 cx = LOGLIST_MESSAGE_MAX;
\r
3146 // keep the bug id column small
\r
3147 if ((col == 4)&&(m_bShowBugtraqColumn))
\r
3149 if (cx > (int)(DWORD)m_regMaxBugIDColWidth)
\r
3151 cx = (int)(DWORD)m_regMaxBugIDColWidth;
\r
3155 m_LogList.SetColumnWidth(col, cx);
\r
3162 void CLogDlg::OnBnClickedHidepaths()
\r
3164 FillLogMessageCtrl();
\r
3165 m_ChangedFileListCtrl.Invalidate();
\r
3170 void CLogDlg::OnBnClickedCheckStoponcopy()
\r
3173 if (!GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
3176 // ignore old fetch limits when switching
\r
3177 // between copy-following and stop-on-copy
\r
3178 // (otherwise stop-on-copy will limit what
\r
3179 // we see immediately after switching to
\r
3180 // copy-following)
\r
3184 // now, restart the query
\r
3189 void CLogDlg::OnBnClickedIncludemerge()
\r
3199 void CLogDlg::UpdateLogInfoLabel()
\r
3202 git_revnum_t rev1 ;
\r
3203 git_revnum_t rev2 ;
\r
3204 long selectedrevs ;
\r
3205 int count =m_LogList.m_arShownList.GetCount();
\r
3208 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(0)))->m_CommitHash;
\r
3209 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));
\r
3210 rev2 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(count-1)))->m_CommitHash;
\r
3211 selectedrevs = m_LogList.GetSelectedCount();
\r
3214 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
3215 m_sLogInfo = sTemp;
\r
3217 UpdateData(FALSE);
\r
3221 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
\r
3224 int selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
3225 if ((point.x == -1) && (point.y == -1))
\r
3228 m_ChangedFileListCtrl.GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
3229 m_ChangedFileListCtrl.ClientToScreen(&rect);
\r
3230 point = rect.CenterPoint();
\r
3234 int s = m_LogList.GetSelectionMark();
\r
3237 std::vector<CString> changedpaths;
\r
3238 std::vector<LogChangedPath*> changedlogpaths;
\r
3239 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
3241 return; // nothing is selected, get out of here
\r
3243 bool bOneRev = true;
\r
3244 int sel=m_LogList.GetNextSelectedItem(pos);
\r
3245 GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel));
\r
3246 GitRev * rev1 = pLogEntry;
\r
3247 GitRev * rev2 = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel+1));
\r
3249 bool bOneRev = true;
\r
3254 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
3257 rev1 = max(rev1,(git_revnum_t)pLogEntry->Rev);
\r
3258 rev2 = min(rev2,(git_revnum_t)pLogEntry->Rev);
\r
3264 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
3267 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
3268 changedpaths.push_back(m_currentChangedPathList[nItem].GetGitPathString());
\r
3273 // only one revision is selected in the log dialog top pane
\r
3274 // but multiple items could be selected in the changed items list
\r
3277 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
3280 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
3281 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
3283 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
3285 if ((changedlogpath)&&(!changedlogpath->sCopyFromPath.IsEmpty()))
\r
3286 rev2 = changedlogpath->lCopyFromRev;
\r
3289 // if the path was modified but the parent path was 'added with history'
\r
3290 // then we have to use the copy from revision of the parent path
\r
3291 CTGitPath cpath = CTGitPath(changedlogpath->sPath);
\r
3292 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
3294 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
3295 if (p.IsAncestorOf(cpath))
\r
3297 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
3298 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
3303 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
3305 // some items are hidden! So find out which item the user really clicked on
\r
3306 INT_PTR selRealIndex = -1;
\r
3307 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
3309 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
3311 if (selRealIndex == nItem)
\r
3313 selIndex = hiddenindex;
\r
3314 changedlogpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
3319 if (changedlogpath)
\r
3321 changedpaths.push_back(changedlogpath->sPath);
\r
3322 changedlogpaths.push_back(changedlogpath);
\r
3327 //entry is selected, now show the popup menu
\r
3329 if (popup.CreatePopupMenu())
\r
3331 bool bEntryAdded = false;
\r
3332 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
3334 // if ((!bOneRev)||(IsDiffPossible(changedlogpaths[0], rev1)))
\r
3336 popup.AppendMenuIcon(CGitLogList::ID_DIFF, IDS_LOG_POPUP_DIFF, IDI_DIFF);
\r
3337 popup.AppendMenuIcon(CGitLogList::ID_BLAMEDIFF, IDS_LOG_POPUP_BLAMEDIFF, IDI_BLAME);
\r
3338 popup.SetDefaultItem(CGitLogList::ID_DIFF, FALSE);
\r
3339 popup.AppendMenuIcon(CGitLogList::ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF);
\r
3340 bEntryAdded = true;
\r
3342 // if (rev2 == rev1-1)
\r
3345 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
3346 popup.AppendMenuIcon(CGitLogList::ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);
\r
3347 popup.AppendMenuIcon(CGitLogList::ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
3348 popup.AppendMenuIcon(CGitLogList::ID_BLAME, IDS_LOG_POPUP_BLAME, IDI_BLAME);
\r
3349 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
3351 popup.AppendMenuIcon(CGitLogList::ID_REVERTREV, IDS_LOG_POPUP_REVERTREV, IDI_REVERT);
\r
3352 popup.AppendMenuIcon(CGitLogList::ID_POPPROPS, IDS_REPOBROWSE_SHOWPROP, IDI_PROPERTIES); // "Show Properties"
\r
3353 popup.AppendMenuIcon(CGitLogList::ID_LOG, IDS_MENULOG, IDI_LOG); // "Show Log"
\r
3354 popup.AppendMenuIcon(CGitLogList::ID_GETMERGELOGS, IDS_LOG_POPUP_GETMERGELOGS, IDI_LOG); // "Show merge log"
\r
3355 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
\r
3356 bEntryAdded = true;
\r
3357 if (!m_ProjectProperties.sWebViewerPathRev.IsEmpty())
\r
3359 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
3360 popup.AppendMenuIcon(CGitLogList::ID_VIEWPATHREV, IDS_LOG_POPUP_VIEWPATHREV);
\r
3362 if (popup.GetDefaultItem(0,FALSE)==-1)
\r
3363 popup.SetDefaultItem(CGitLogList::ID_OPEN, FALSE);
\r
3366 else if (changedlogpaths.size())
\r
3368 // more than one entry is selected
\r
3369 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE);
\r
3370 bEntryAdded = true;
\r
3375 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
3376 bool bOpenWith = false;
\r
3377 bool bMergeLog = false;
\r
3378 m_bCancelled = false;
\r
3382 case CGitLogList::ID_DIFF:
\r
3384 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
3388 case ID_BLAMEDIFF:
\r
3390 DoDiffFromLog(selIndex, rev1, rev2, true, false);
\r
3395 DoDiffFromLog(selIndex, rev1, rev2, false, true);
\r
3398 case ID_REVERTREV:
\r
3400 SetPromptApp(&theApp);
\r
3401 theApp.DoWaitCursor(1);
\r
3403 if (Git::PathIsURL(m_path))
\r
3405 sUrl = m_path.GetGitPathString();
\r
3409 sUrl = GetURLFromPath(m_path);
\r
3410 if (sUrl.IsEmpty())
\r
3412 theApp.DoWaitCursor(-1);
\r
3414 temp.Format(IDS_ERR_NOURLOFFILE, m_path.GetWinPath());
\r
3415 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3417 theApp.DoWaitCursor(-1);
\r
3421 // find the working copy path of the selected item from the URL
\r
3422 m_bCancelled = false;
\r
3423 CString sUrlRoot = GetRepositoryRoot(CTGitPath(sUrl));
\r
3425 CString fileURL = changedpaths[0];
\r
3426 fileURL = sUrlRoot + fileURL.Trim();
\r
3427 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1
\r
3428 // sUrl = http://mydomain.com/repos/trunk/folder
\r
3429 CString sUnescapedUrl = CPathUtils::PathUnescape(sUrl);
\r
3430 // find out until which char the urls are identical
\r
3432 while ((i<fileURL.GetLength())&&(i<sUnescapedUrl.GetLength())&&(fileURL[i]==sUnescapedUrl[i]))
\r
3434 int leftcount = m_path.GetWinPathString().GetLength()-(sUnescapedUrl.GetLength()-i);
\r
3435 CString wcPath = m_path.GetWinPathString().Left(leftcount);
\r
3436 wcPath += fileURL.Mid(i);
\r
3437 wcPath.Replace('/', '\\');
\r
3438 CGitProgressDlg dlg;
\r
3439 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3441 // a deleted path! Since the path isn't there anymore, merge
\r
3442 // won't work. So just do a copy url->wc
\r
3443 dlg.SetCommand(CGitProgressDlg::GitProgress_Copy);
\r
3444 dlg.SetPathList(CTGitPathList(CTGitPath(fileURL)));
\r
3445 dlg.SetUrl(wcPath);
\r
3446 dlg.SetRevision(rev2);
\r
3450 if (!PathFileExists(wcPath))
\r
3452 // seems the path got renamed
\r
3453 // tell the user how to work around this.
\r
3454 CMessageBox::Show(this->m_hWnd, IDS_LOG_REVERTREV_ERROR, IDS_APPNAME, MB_ICONERROR);
\r
3456 theApp.DoWaitCursor(-1);
\r
3459 dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);
\r
3460 dlg.SetPathList(CTGitPathList(CTGitPath(wcPath)));
\r
3461 dlg.SetUrl(fileURL);
\r
3462 dlg.SetSecondUrl(fileURL);
\r
3463 GitRevRangeArray revarray;
\r
3464 revarray.AddRevRange(rev1, rev2);
\r
3465 dlg.SetRevisionRanges(revarray);
\r
3468 msg.Format(IDS_LOG_REVERT_CONFIRM, (LPCTSTR)wcPath);
\r
3469 if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)
\r
3473 theApp.DoWaitCursor(-1);
\r
3478 DialogEnableWindow(IDOK, FALSE);
\r
3479 SetPromptApp(&theApp);
\r
3480 theApp.DoWaitCursor(1);
\r
3482 if (Git::PathIsURL(m_path))
\r
3484 filepath = m_path.GetGitPathString();
\r
3488 filepath = GetURLFromPath(m_path);
\r
3489 if (filepath.IsEmpty())
\r
3491 theApp.DoWaitCursor(-1);
\r
3493 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3494 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3495 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3500 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3501 filepath += changedpaths[0];
\r
3504 dlg.m_Path = CTGitPath(filepath);
\r
3507 theApp.DoWaitCursor(-1);
\r
3512 DialogEnableWindow(IDOK, FALSE);
\r
3513 SetPromptApp(&theApp);
\r
3514 theApp.DoWaitCursor(1);
\r
3516 if (Git::PathIsURL(m_path))
\r
3518 filepath = m_path.GetGitPathString();
\r
3522 filepath = GetURLFromPath(m_path);
\r
3523 if (filepath.IsEmpty())
\r
3525 theApp.DoWaitCursor(-1);
\r
3527 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3528 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3529 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3534 m_bCancelled = false;
\r
3535 CString sRoot = GetRepositoryRoot(CTGitPath(filepath));
\r
3536 // if more than one entry is selected, we save them
\r
3537 // one by one into a folder the user has selected
\r
3538 bool bTargetSelected = false;
\r
3539 CTGitPath TargetPath;
\r
3540 if (m_ChangedFileListCtrl.GetSelectedCount() > 1)
\r
3542 CBrowseFolder browseFolder;
\r
3543 browseFolder.SetInfo(CString(MAKEINTRESOURCE(IDS_LOG_SAVEFOLDERTOHINT)));
\r
3544 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
3545 CString strSaveAsDirectory;
\r
3546 if (browseFolder.Show(GetSafeHwnd(), strSaveAsDirectory) == CBrowseFolder::OK)
\r
3548 TargetPath = CTGitPath(strSaveAsDirectory);
\r
3549 bTargetSelected = true;
\r
3554 // Display the Open dialog box.
\r
3555 CString revFilename;
\r
3557 temp = CPathUtils::GetFileNameFromPath(changedpaths[0]);
\r
3558 int rfind = temp.ReverseFind('.');
\r
3560 revFilename.Format(_T("%s-%ld%s"), (LPCTSTR)temp.Left(rfind), rev1, (LPCTSTR)temp.Mid(rfind));
\r
3562 revFilename.Format(_T("%s-%ld"), (LPCTSTR)temp, rev1);
\r
3563 bTargetSelected = CAppUtils::FileOpenSave(revFilename, NULL, IDS_LOG_POPUP_SAVE, IDS_COMMONFILEFILTER, false, m_hWnd);
\r
3564 TargetPath.SetFromWin(revFilename);
\r
3566 if (bTargetSelected)
\r
3568 CProgressDlg progDlg;
\r
3569 progDlg.SetTitle(IDS_APPNAME);
\r
3570 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
3571 for (std::vector<LogChangedPath*>::iterator it = changedlogpaths.begin(); it!= changedlogpaths.end(); ++it)
\r
3573 GitRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;
\r
3575 CString sInfoLine;
\r
3576 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)getrev.ToString());
\r
3577 progDlg.SetLine(1, sInfoLine, true);
\r
3578 SetAndClearProgressInfo(&progDlg);
\r
3579 progDlg.ShowModeless(m_hWnd);
\r
3581 CTGitPath tempfile = TargetPath;
\r
3582 if (changedpaths.size() > 1)
\r
3584 // if multiple items are selected, then the TargetPath
\r
3585 // points to a folder and we have to append the filename
\r
3586 // to save to to that folder.
\r
3587 CString sName = (*it)->sPath;
\r
3588 int slashpos = sName.ReverseFind('/');
\r
3589 if (slashpos >= 0)
\r
3590 sName = sName.Mid(slashpos);
\r
3591 tempfile.AppendPathString(sName);
\r
3592 // one problem here:
\r
3593 // a user could have selected multiple items which
\r
3594 // have the same filename but reside in different
\r
3595 // directories, e.g.
\r
3598 // in that case, the second 'file1' will overwrite
\r
3599 // the already saved 'file1'.
\r
3601 // we could maybe find the common root of all selected
\r
3602 // items and then create sub folders to save those files
\r
3604 // But I think we should just leave it that way: to check
\r
3605 // out multiple items at once, the better way is still to
\r
3606 // use the export command from the top pane of the log dialog.
\r
3608 filepath = sRoot + (*it)->sPath;
\r
3609 if (!Cat(CTGitPath(filepath), getrev, getrev, tempfile))
\r
3612 SetAndClearProgressInfo((HWND)NULL);
\r
3613 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3615 theApp.DoWaitCursor(-1);
\r
3620 SetAndClearProgressInfo((HWND)NULL);
\r
3623 theApp.DoWaitCursor(-1);
\r
3630 GitRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;
\r
3631 Open(bOpenWith,changedpaths[0],getrev);
\r
3637 if (Git::PathIsURL(m_path))
\r
3639 filepath = m_path.GetGitPathString();
\r
3643 filepath = GetURLFromPath(m_path);
\r
3644 if (filepath.IsEmpty())
\r
3646 theApp.DoWaitCursor(-1);
\r
3648 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3649 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3650 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3655 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3656 filepath += changedpaths[0];
\r
3658 dlg.EndRev = rev1;
\r
3659 if (dlg.DoModal() == IDOK)
\r
3664 tempfile = blame.BlameToTempFile(CTGitPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);
\r
3665 if (!tempfile.IsEmpty())
\r
3667 if (dlg.m_bTextView)
\r
3669 //open the default text editor for the result file
\r
3670 CAppUtils::StartTextViewer(tempfile);
\r
3674 CString sParams = _T("/path:\"") + filepath + _T("\" ");
\r
3675 if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(filepath),sParams))
\r
3683 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3688 case ID_GETMERGELOGS:
\r
3693 DialogEnableWindow(IDOK, FALSE);
\r
3694 SetPromptApp(&theApp);
\r
3695 theApp.DoWaitCursor(1);
\r
3697 if (Git::PathIsURL(m_path))
\r
3699 filepath = m_path.GetGitPathString();
\r
3703 filepath = GetURLFromPath(m_path);
\r
3704 if (filepath.IsEmpty())
\r
3706 theApp.DoWaitCursor(-1);
\r
3708 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3709 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3710 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3715 m_bCancelled = false;
\r
3716 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3717 filepath += changedpaths[0];
\r
3718 git_revnum_t logrev = rev1;
\r
3719 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3721 // if the item got deleted in this revision,
\r
3722 // fetch the log from the previous revision where it
\r
3727 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\" /startrev:%ld"), (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)filepath, logrev);
\r
3729 sCmd += _T(" /merge");
\r
3730 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3732 theApp.DoWaitCursor(-1);
\r
3735 case ID_VIEWPATHREV:
\r
3737 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetSelectionMark()));
\r
3738 GitRev rev = pLogEntry->Rev;
\r
3739 CString relurl = changedpaths[0];
\r
3740 CString url = m_ProjectProperties.sWebViewerPathRev;
\r
3741 url.Replace(_T("%REVISION%"), rev.ToString());
\r
3742 url.Replace(_T("%PATH%"), relurl);
\r
3743 relurl = relurl.Mid(relurl.Find('/'));
\r
3744 url.Replace(_T("%PATH1%"), relurl);
\r
3745 if (!url.IsEmpty())
\r
3746 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
3754 } // if (popup.CreatePopupMenu())
\r
3758 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3760 // the date control should not show the "today" button
\r
3761 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
\r
3763 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3767 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3769 // the date control should not show the "today" button
\r
3770 CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();
\r
3772 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3776 void CLogDlg::OnSize(UINT nType, int cx, int cy)
\r
3778 __super::OnSize(nType, cx, cy);
\r
3780 SetSplitterRange();
\r
3783 void CLogDlg::OnRefresh()
\r
3785 if (GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
3792 void CLogDlg::OnFind()
\r
3794 if (!m_pFindDialog)
\r
3796 m_pFindDialog = new CFindReplaceDialog();
\r
3797 m_pFindDialog->Create(TRUE, NULL, NULL, FR_HIDEUPDOWN | FR_HIDEWHOLEWORD, this);
\r
3801 void CLogDlg::OnFocusFilter()
\r
3803 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3806 void CLogDlg::OnEditCopy()
\r
3808 if (GetFocus() == &m_ChangedFileListCtrl)
\r
3809 CopyChangedSelectionToClipBoard();
\r
3811 m_LogList.CopySelectionToClipBoard();
\r
3814 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
\r
3816 // is the URL a relative one?
\r
3817 if (url.Left(2).Compare(_T("^/")) == 0)
\r
3819 // URL is relative to the repository root
\r
3820 CString url1 = m_sRepositoryRoot + url.Mid(1);
\r
3821 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3822 DWORD len = url.GetLength();
\r
3823 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
\r
3824 return CString(buf, len);
\r
3827 else if (url[0] == '/')
\r
3829 // URL is relative to the server's hostname
\r
3831 // find the server's hostname
\r
3832 int schemepos = m_sRepositoryRoot.Find(_T("//"));
\r
3833 if (schemepos >= 0)
\r
3835 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));
\r
3836 CString url1 = sHost + url;
\r
3837 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3838 DWORD len = url.GetLength();
\r
3839 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
\r
3840 return CString(buf, len);
\r