1 // TortoiseGit - a Windows shell extension for easy version control
\r
2 // Copyright (C) 2003-2008 - TortoiseGit
\r
3 // This program is free software; you can redistribute it and/or
\r
4 // modify it under the terms of the GNU General Public License
\r
5 // as published by the Free Software Foundation; either version 2
\r
6 // of the License, or (at your option) any later version.
\r
7 // This program is distributed in the hope that it will be useful,
\r
8 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
9 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
10 // GNU General Public License for more details.
\r
12 // You should have received a copy of the GNU General Public License
\r
13 // along with this program; if not, write to the Free Software Foundation,
\r
14 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
17 #include "TortoiseProc.h"
\r
19 #include "InputDlg.h"
\r
20 #include "PropDlg.h"
\r
21 #include "SVNProgressDlg.h"
\r
22 #include "ProgressDlg.h"
\r
23 //#include "RepositoryBrowser.h"
\r
24 //#include "CopyDlg.h"
\r
25 #include "StatGraphDlg.h"
\r
27 #include "MessageBox.h"
\r
28 #include "Registry.h"
\r
29 #include "AppUtils.h"
\r
30 #include "PathUtils.h"
\r
31 #include "StringUtils.h"
\r
32 #include "UnicodeUtils.h"
\r
33 #include "TempFile.h"
\r
34 //#include "GitInfo.h"
\r
35 //#include "GitDiff.h"
\r
36 #include "IconMenu.h"
\r
37 //#include "RevisionRangeDlg.h"
\r
38 //#include "BrowseFolder.h"
\r
39 //#include "BlameDlg.h"
\r
40 //#include "Blame.h"
\r
41 //#include "GitHelpers.h"
\r
42 #include "GitStatus.h"
\r
43 //#include "LogDlgHelper.h"
\r
44 //#include "CachedLogInfo.h"
\r
45 //#include "RepositoryInfo.h"
\r
46 //#include "EditPropertiesDlg.h"
\r
47 #include "FileDiffDlg.h"
\r
50 const UINT CLogDlg::m_FindDialogMessage = RegisterWindowMessage(FINDMSGSTRING);
\r
53 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)
\r
54 CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
\r
55 : CResizableStandAloneDialog(CLogDlg::IDD, pParent)
\r
59 , m_currentChangedArray(NULL)
\r
61 , m_bShowedAll(false)
\r
63 , m_regLastStrict(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE)
\r
65 , m_bSelectionMustBeContinuous(false)
\r
66 , m_bShowBugtraqColumn(false)
\r
67 , m_lowestRev(_T(""))
\r
69 , m_sLogInfo(_T(""))
\r
70 , m_pFindDialog(NULL)
\r
71 , m_bCancelled(FALSE)
\r
72 , m_pNotifyWindow(NULL)
\r
74 , m_bAscending(FALSE)
\r
79 , m_bIncludeMerges(FALSE)
\r
83 m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
90 m_CurrentFilteredChangedArray.RemoveAll();
\r
94 void CLogDlg::DoDataExchange(CDataExchange* pDX)
\r
96 CResizableStandAloneDialog::DoDataExchange(pDX);
\r
97 DDX_Control(pDX, IDC_LOGLIST, m_LogList);
\r
98 DDX_Control(pDX, IDC_LOGMSG, m_ChangedFileListCtrl);
\r
99 DDX_Control(pDX, IDC_PROGRESS, m_LogProgress);
\r
100 DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1);
\r
101 DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2);
\r
102 DDX_Check(pDX, IDC_CHECK_STOPONCOPY, m_bStrict);
\r
103 DDX_Text(pDX, IDC_SEARCHEDIT, m_LogList.m_sFilterText);
\r
104 DDX_Control(pDX, IDC_DATEFROM, m_DateFrom);
\r
105 DDX_Control(pDX, IDC_DATETO, m_DateTo);
\r
106 DDX_Control(pDX, IDC_HIDEPATHS, m_cHidePaths);
\r
107 DDX_Control(pDX, IDC_GETALL, m_btnShow);
\r
108 DDX_Text(pDX, IDC_LOGINFO, m_sLogInfo);
\r
109 DDX_Check(pDX, IDC_INCLUDEMERGE, m_bIncludeMerges);
\r
110 DDX_Control(pDX, IDC_SEARCHEDIT, m_cFilter);
\r
113 BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
\r
114 ON_REGISTERED_MESSAGE(m_FindDialogMessage, OnFindDialogMessage)
\r
115 ON_BN_CLICKED(IDC_GETALL, OnBnClickedGetall)
\r
116 //ON_NOTIFY(NM_DBLCLK, IDC_LOGMSG, OnNMDblclkChangedFileList)
\r
117 ON_WM_CONTEXTMENU()
\r
119 ON_BN_CLICKED(IDHELP, OnBnClickedHelp)
\r
120 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)
\r
121 ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)
\r
122 ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)
\r
124 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
\r
125 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
\r
127 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
\r
129 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
\r
130 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
\r
131 ON_BN_CLICKED(IDC_NEXTHUNDRED, OnBnClickedNexthundred)
\r
132 //ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGMSG, OnNMCustomdrawChangedFileList)
\r
133 //ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGMSG, OnLvnGetdispinfoChangedFileList)
\r
134 ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST , OnLvnColumnclick)
\r
135 //ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList)
\r
136 ON_BN_CLICKED(IDC_HIDEPATHS, OnBnClickedHidepaths)
\r
138 ON_BN_CLICKED(IDC_CHECK_STOPONCOPY, &CLogDlg::OnBnClickedCheckStoponcopy)
\r
139 ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)
\r
140 ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)
\r
142 ON_BN_CLICKED(IDC_INCLUDEMERGE, &CLogDlg::OnBnClickedIncludemerge)
\r
143 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
\r
144 ON_COMMAND(ID_LOGDLG_REFRESH,&CLogDlg::OnRefresh)
\r
145 ON_COMMAND(ID_LOGDLG_FIND,&CLogDlg::OnFind)
\r
146 ON_COMMAND(ID_LOGDLG_FOCUSFILTER,&CLogDlg::OnFocusFilter)
\r
147 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
\r
150 void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, BOOL bStrict /* = FALSE */, BOOL bSaveStrict /* = TRUE */)
\r
154 m_startrev = startrev;
\r
155 m_LogRevision = startrev;
\r
157 m_hasWC = !path.IsUrl();
\r
158 m_bStrict = bStrict;
\r
159 m_bSaveStrict = bSaveStrict;
\r
161 if (::IsWindow(m_hWnd))
\r
165 BOOL CLogDlg::OnInitDialog()
\r
167 CResizableStandAloneDialog::OnInitDialog();
\r
169 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
\r
171 OSVERSIONINFOEX inf;
\r
172 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
173 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
174 GetVersionEx((OSVERSIONINFO *)&inf);
\r
175 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
176 m_bVista = (fullver >= 0x0600);
\r
178 // use the state of the "stop on copy/rename" option from the last time
\r
180 m_bStrict = m_regLastStrict;
\r
184 temp.Format(IDS_LOG_SHOWNEXT, m_limit);
\r
186 temp.Format(IDS_LOG_SHOWNEXT, (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100));
\r
188 SetDlgItemText(IDC_NEXTHUNDRED, temp);
\r
190 // set the font to use in the log message view, configured in the settings dialog
\r
191 CAppUtils::CreateFontForLogs(m_logFont);
\r
192 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
\r
193 // automatically detect URLs in the log message and turn them into links
\r
194 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_AUTOURLDETECT, TRUE, NULL);
\r
195 // make the log message rich edit control send a message when the mouse pointer is over a link
\r
196 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK);
\r
197 //m_LogList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_SUBITEMIMAGES);
\r
199 // the "hide unrelated paths" checkbox should be indeterminate
\r
200 m_cHidePaths.SetCheck(BST_INDETERMINATE);
\r
203 // if there is a working copy, load the project properties
\r
204 // to get information about the bugtraq: integration
\r
206 m_ProjectProperties.ReadProps(m_path);
\r
208 // the bugtraq issue id column is only shown if the bugtraq:url or bugtraq:regex is set
\r
209 if ((!m_ProjectProperties.sUrl.IsEmpty())||(!m_ProjectProperties.sCheckRe.IsEmpty()))
\r
210 m_bShowBugtraqColumn = true;
\r
212 //theme.SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);
\r
213 //theme.SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);
\r
215 // set up the columns
\r
216 m_LogList.DeleteAllItems();
\r
217 m_LogList.InsertGitColumn();
\r
219 m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"));
\r
221 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
224 m_sMessageBuf.Preallocate(100000);
\r
226 // set the dialog title to "Log - path/to/whatever/we/show/the/log/for"
\r
227 SetDlgTitle(false);
\r
229 m_tooltips.Create(this);
\r
230 CheckRegexpTooltip();
\r
232 SetSplitterRange();
\r
234 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
\r
235 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
\r
236 m_cFilter.SetInfoIcon(IDI_LOGFILTER);
\r
237 m_cFilter.SetValidator(this);
\r
239 AdjustControlSize(IDC_HIDEPATHS);
\r
240 AdjustControlSize(IDC_CHECK_STOPONCOPY);
\r
241 AdjustControlSize(IDC_INCLUDEMERGE);
\r
243 GetClientRect(m_DlgOrigRect);
\r
244 m_LogList.GetClientRect(m_LogListOrigRect);
\r
245 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
\r
246 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
\r
248 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
249 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
252 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
\r
253 AddAnchor(IDC_DATEFROM, TOP_LEFT);
\r
254 AddAnchor(IDC_TOLABEL, TOP_LEFT);
\r
255 AddAnchor(IDC_DATETO, TOP_LEFT);
\r
257 SetFilterCueText();
\r
258 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
\r
260 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
261 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
262 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
263 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
264 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
266 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
267 AddAnchor(IDC_HIDEPATHS, BOTTOM_LEFT);
\r
268 AddAnchor(IDC_CHECK_STOPONCOPY, BOTTOM_LEFT);
\r
269 AddAnchor(IDC_INCLUDEMERGE, BOTTOM_LEFT);
\r
270 AddAnchor(IDC_GETALL, BOTTOM_LEFT);
\r
271 AddAnchor(IDC_NEXTHUNDRED, BOTTOM_LEFT);
\r
272 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
\r
273 AddAnchor(IDC_STATBUTTON, BOTTOM_RIGHT);
\r
274 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
275 AddAnchor(IDOK, BOTTOM_RIGHT);
\r
276 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
\r
277 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
279 // SetPromptParentWindow(m_hWnd);
\r
282 CenterWindow(CWnd::FromHandle(hWndExplorer));
\r
283 EnableSaveRestore(_T("LogDlg"));
\r
285 DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
286 DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
287 RECT rcDlg, rcLogList, rcChgMsg;
\r
288 GetClientRect(&rcDlg);
\r
289 m_LogList.GetWindowRect(&rcLogList);
\r
290 ScreenToClient(&rcLogList);
\r
291 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
\r
292 ScreenToClient(&rcChgMsg);
\r
296 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
297 ScreenToClient(&rectSplitter);
\r
298 int delta = yPos1 - rectSplitter.top;
\r
300 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
\r
302 m_wndSplitter1.SetWindowPos(NULL, 0, yPos1, 0, 0, SWP_NOSIZE);
\r
309 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
310 ScreenToClient(&rectSplitter);
\r
311 int delta = yPos2 - rectSplitter.top;
\r
313 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
\r
315 m_wndSplitter2.SetWindowPos(NULL, 0, yPos2, 0, 0, SWP_NOSIZE);
\r
323 // the dialog is used to select revisions
\r
324 if (m_bSelectionMustBeContinuous)
\r
325 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
327 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
331 // the dialog is used to just view log messages
\r
332 GetDlgItemText(IDOK, temp);
\r
333 SetDlgItemText(IDCANCEL, temp);
\r
334 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
\r
337 // set the choices for the "Show All" button
\r
338 temp.LoadString(IDS_LOG_SHOWALL);
\r
339 m_btnShow.AddEntry(temp);
\r
340 temp.LoadString(IDS_LOG_SHOW_WHOLE);
\r
341 m_btnShow.AddEntry(temp);
\r
342 m_btnShow.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")));
\r
344 m_mergedRevs.clear();
\r
346 // first start a thread to obtain the log messages without
\r
347 // blocking the dialog
\r
349 //m_tFrom = (DWORD)-1;
\r
351 m_LogList.m_Path=m_path;
\r
352 m_LogList.FetchLogAsync(LogCallBack,this);
\r
354 GetDlgItem(IDC_LOGLIST)->SetFocus();
\r
358 void CLogDlg::LogRunStatus(int cur)
\r
360 if( cur == GITLOG_START )
\r
363 temp.LoadString(IDS_PROGRESSWAIT);
\r
365 // change the text of the close button to "Cancel" since now the thread
\r
366 // is running, and simply closing the dialog doesn't work.
\r
367 if (!GetDlgItem(IDOK)->IsWindowVisible())
\r
369 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
370 SetDlgItemText(IDCANCEL, temp);
\r
373 // We use a progress bar while getting the logs
\r
374 m_LogProgress.SetRange32(0, 100);
\r
375 m_LogProgress.SetPos(0);
\r
377 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
\r
379 //DialogEnableWindow(IDC_GETALL, FALSE);
\r
380 DialogEnableWindow(IDC_NEXTHUNDRED, FALSE);
\r
381 DialogEnableWindow(IDC_CHECK_STOPONCOPY, FALSE);
\r
382 DialogEnableWindow(IDC_INCLUDEMERGE, FALSE);
\r
383 DialogEnableWindow(IDC_STATBUTTON, FALSE);
\r
384 DialogEnableWindow(IDC_REFRESH, FALSE);
\r
385 DialogEnableWindow(IDC_HIDEPATHS,FALSE);
\r
388 if( cur == GITLOG_END)
\r
392 DialogEnableWindow(IDC_NEXTHUNDRED, TRUE);
\r
394 DialogEnableWindow(IDC_GETALL, TRUE);
\r
395 //DialogEnableWindow(IDC_INCLUDEMERGE, TRUE);
\r
396 DialogEnableWindow(IDC_STATBUTTON, TRUE);
\r
397 DialogEnableWindow(IDC_REFRESH, TRUE);
\r
399 PostMessage(WM_TIMER, LOGFILTER_TIMER);
\r
401 //CTime time=m_LogList.GetOldestTime();
\r
403 m_LogList.GetTimeRange(begin,end);
\r
404 m_DateFrom.SetTime(&begin);
\r
405 m_DateTo.SetTime(&end);
\r
408 m_LogProgress.SetPos(cur);
\r
410 void CLogDlg::SetDlgTitle(bool bOffline)
\r
412 if (m_sTitle.IsEmpty())
\r
413 GetWindowText(m_sTitle);
\r
418 if (m_path.IsUrl())
\r
419 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetUIPathString());
\r
420 else if (m_path.IsDirectory())
\r
421 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetWinPathString());
\r
423 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetFilename());
\r
424 SetWindowText(sTemp);
\r
428 if (m_path.IsUrl())
\r
429 SetWindowText(m_sTitle + _T(" - ") + m_path.GetUIPathString());
\r
430 else if (m_path.IsDirectory())
\r
431 SetWindowText(m_sTitle + _T(" - ") + m_path.GetWinPathString());
\r
433 SetWindowText(m_sTitle + _T(" - ") + m_path.GetFilename());
\r
437 void CLogDlg::CheckRegexpTooltip()
\r
439 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
\r
440 // Since tooltip describes regexp features, show it only if regexps are enabled.
\r
441 if (m_bFilterWithRegex)
\r
443 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
\r
446 m_tooltips.DelTool(pWnd);
\r
449 void CLogDlg::EnableOKButton()
\r
453 // the dialog is used to select revisions
\r
454 if (m_bSelectionMustBeContinuous)
\r
455 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
457 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
460 DialogEnableWindow(IDOK, TRUE);
\r
463 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
\r
465 // we fill here the log message rich edit control,
\r
466 // and also populate the changed files list control
\r
467 // according to the selected revision(s).
\r
469 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
470 // empty the log message view
\r
471 pMsgView->SetWindowText(_T(" "));
\r
472 // empty the changed files list
\r
473 m_ChangedFileListCtrl.SetRedraw(FALSE);
\r
474 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
475 m_currentChangedArray = NULL;
\r
476 //m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );
\r
477 m_ChangedFileListCtrl.DeleteAllItems();
\r
479 // if we're not here to really show a selected revision, just
\r
480 // get out of here after clearing the views, which is what is intended
\r
481 // if that flag is not set.
\r
485 m_ChangedFileListCtrl.Invalidate();
\r
486 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
487 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
491 // depending on how many revisions are selected, we have to do different
\r
493 int selCount = m_LogList.GetSelectedCount();
\r
496 // if nothing is selected, we have nothing more to do
\r
497 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
498 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
501 else if (selCount == 1)
\r
503 // if one revision is selected, we have to fill the log message view
\r
504 // with the corresponding log message, and also fill the changed files
\r
506 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
507 int selIndex = m_LogList.GetNextSelectedItem(pos);
\r
508 if (selIndex >= m_LogList.m_arShownList.GetCount())
\r
510 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
511 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
514 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));
\r
516 if(!pLogEntry->m_IsFull)
\r
518 pMsgView->SetWindowText(_T("load ..."));
\r
521 // set the log message text
\r
522 pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash+_T("\r\n\r\n*")+pLogEntry->m_Subject+_T("\n\n")+pLogEntry->m_Body);
\r
523 // turn bug ID's into links if the bugtraq: properties have been set
\r
524 // and we can find a match of those in the log message
\r
525 m_ProjectProperties.FindBugID(pLogEntry->m_Body, pMsgView);
\r
526 CAppUtils::FormatTextInRichEditControl(pMsgView);
\r
528 m_ChangedFileListCtrl.UpdateWithGitPathList(pLogEntry->m_Files);
\r
529 m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;
\r
530 m_ChangedFileListCtrl.Show(SVNSLC_SHOWVERSIONED);
\r
532 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
536 // fill in the changed files list control
\r
537 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
539 m_CurrentFilteredChangedArray.RemoveAll();
\r
540 for (INT_PTR c = 0; c < m_currentChangedArray->GetCount(); ++c)
\r
542 LogChangedPath * cpath = m_currentChangedArray->GetAt(c);
\r
545 if (m_currentChangedArray->GetAt(c)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
547 m_CurrentFilteredChangedArray.Add(cpath);
\r
550 m_currentChangedArray = &m_CurrentFilteredChangedArray;
\r
556 // more than one revision is selected:
\r
557 // the log message view must be emptied
\r
558 // the changed files list contains all the changed paths from all
\r
559 // selected revisions, with 'doubles' removed
\r
560 m_currentChangedPathList = GetChangedPathsFromSelectedRevisions(true);
\r
563 // redraw the views
\r
564 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
566 if (m_currentChangedArray)
\r
568 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedArray->GetCount());
\r
569 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedArray->GetCount());
\r
571 else if (m_currentChangedPathList.GetCount())
\r
573 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedPathList.GetCount());
\r
574 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedPathList.GetCount());
\r
578 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
579 m_ChangedFileListCtrl.Invalidate();
\r
582 CAppUtils::ResizeAllListCtrlCols(&m_ChangedFileListCtrl);
\r
583 // sort according to the settings
\r
584 if (m_nSortColumnPathList > 0)
\r
585 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
587 SetSortArrow(&m_ChangedFileListCtrl, -1, false);
\r
588 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
592 void CLogDlg::OnBnClickedGetall()
\r
597 void CLogDlg::GetAll(bool bForceAll /* = false */)
\r
600 // fetch all requested log messages, either the specified range or
\r
601 // really *all* available log messages.
\r
603 INT_PTR entry = m_btnShow.GetCurrentEntry();
\r
609 case 0: // show all
\r
612 m_startrev = m_LogRevision;
\r
614 m_bShowedAll = true;
\r
617 case 1: // show range
\r
620 // ask for a revision range
\r
621 CRevisionRangeDlg dlg;
\r
622 dlg.SetStartRevision(m_startrev);
\r
623 dlg.SetEndRevision( (m_endrev>=0) ? m_endrev : 0);
\r
624 if (dlg.DoModal()!=IDOK)
\r
628 m_endrev = dlg.GetEndRevision();
\r
629 m_startrev = dlg.GetStartRevision();
\r
630 if (((m_endrev.IsNumber())&&(m_startrev.IsNumber()))||
\r
631 (m_endrev.IsHead()||m_startrev.IsHead()))
\r
633 if (((LONG)m_startrev < (LONG)m_endrev)||
\r
634 (m_endrev.IsHead()))
\r
636 git_revnum_t temp = m_startrev;
\r
637 m_startrev = m_endrev;
\r
641 m_bShowedAll = false;
\r
646 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
647 m_ChangedFileListCtrl.Invalidate();
\r
648 // We need to create CStoreSelection on the heap or else
\r
649 // the variable will run out of the scope before the
\r
650 // thread ends. Therefore we let the thread delete
\r
652 m_pStoreSelection = new CStoreSelection(this);
\r
653 m_LogList.SetItemCountEx(0);
\r
654 m_LogList.Invalidate();
\r
655 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
656 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
657 pMsgView->SetWindowText(_T(""));
\r
659 SetSortArrow(&m_LogList, -1, true);
\r
661 m_LogList.DeleteAllItems();
\r
662 m_arShownList.RemoveAll();
\r
663 m_logEntries.ClearAll();
\r
666 m_bCancelled = FALSE;
\r
668 m_tFrom = (DWORD)-1;
\r
671 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
672 if (AfxBeginThread(LogThreadEntry, this)==NULL)
\r
674 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
675 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
677 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
678 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
682 void CLogDlg::OnBnClickedRefresh()
\r
688 void CLogDlg::Refresh (bool autoGoOnline)
\r
690 m_LogList.Refresh();
\r
693 void CLogDlg::OnBnClickedNexthundred()
\r
697 // we have to fetch the next X log messages.
\r
698 if (m_logEntries.size() < 1)
\r
700 // since there weren't any log messages fetched before, just
\r
701 // fetch all since we don't have an 'anchor' to fetch the 'next'
\r
703 return GetAll(true);
\r
705 git_revnum_t rev = m_logEntries[m_logEntries.size()-1]->Rev;
\r
708 return; // do nothing! No more revisions to get
\r
712 m_bCancelled = FALSE;
\r
714 // rev is is revision we already have and we will receive it again
\r
715 // -> fetch one extra revision to get NumberOfLogs *new* revisions
\r
717 m_limit = (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100) +1;
\r
718 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
719 SetSortArrow(&m_LogList, -1, true);
\r
720 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
721 // We need to create CStoreSelection on the heap or else
\r
722 // the variable will run out of the scope before the
\r
723 // thread ends. Therefore we let the thread delete
\r
725 m_pStoreSelection = new CStoreSelection(this);
\r
727 // since we fetch the log from the last revision we already have,
\r
728 // we have to remove that revision entry to avoid getting it twice
\r
729 m_logEntries.pop_back();
\r
730 if (AfxBeginThread(LogThreadEntry, this)==NULL)
\r
732 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
733 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
735 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
736 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
740 BOOL CLogDlg::Cancel()
\r
742 return m_bCancelled;
\r
745 void CLogDlg::SaveSplitterPos()
\r
749 CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
750 CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
752 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
753 ScreenToClient(&rectSplitter);
\r
754 regPos1 = rectSplitter.top;
\r
755 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
756 ScreenToClient(&rectSplitter);
\r
757 regPos2 = rectSplitter.top;
\r
761 void CLogDlg::OnCancel()
\r
763 // canceling means stopping the working thread if it's still running.
\r
764 // we do this by using the Subversion cancel callback.
\r
765 // But canceling can also mean just to close the dialog, depending on the
\r
766 // text shown on the cancel button (it could simply read "OK").
\r
767 CString temp, temp2;
\r
768 GetDlgItemText(IDOK, temp);
\r
769 temp2.LoadString(IDS_MSGBOX_CANCEL);
\r
770 if ((temp.Compare(temp2)==0)||(this->IsThreadRunning()))
\r
772 m_bCancelled = true;
\r
777 m_regLastStrict = m_bStrict;
\r
778 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
779 reg = m_btnShow.GetCurrentEntry();
\r
781 __super::OnCancel();
\r
784 CString CLogDlg::MakeShortMessage(const CString& message)
\r
786 bool bFoundShort = true;
\r
787 CString sShortMessage = m_ProjectProperties.GetLogSummary(message);
\r
788 if (sShortMessage.IsEmpty())
\r
790 bFoundShort = false;
\r
791 sShortMessage = message;
\r
793 // Remove newlines and tabs 'cause those are not shown nicely in the list control
\r
794 sShortMessage.Replace(_T("\r"), _T(""));
\r
795 sShortMessage.Replace(_T("\t"), _T(" "));
\r
797 // Suppose the first empty line separates 'summary' from the rest of the message.
\r
798 int found = sShortMessage.Find(_T("\n\n"));
\r
799 // To avoid too short 'short' messages
\r
800 // (e.g. if the message looks something like "Bugfix:\n\n*done this\n*done that")
\r
801 // only use the empty newline as a separator if it comes after at least 15 chars.
\r
802 if ((!bFoundShort)&&(found >= 15))
\r
804 sShortMessage = sShortMessage.Left(found);
\r
806 sShortMessage.Replace('\n', ' ');
\r
807 return sShortMessage;
\r
810 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
813 if (rev == SVN_INVALID_REVNUM)
\r
819 // this is the callback function which receives the data for every revision we ask the log for
\r
820 // we store this information here one by one.
\r
822 if (m_startrev == -1)
\r
827 m_LogProgress.SetPos(m_limit - m_limitcounter);
\r
829 else if (m_startrev.IsNumber() && m_startrev.IsNumber())
\r
830 m_LogProgress.SetPos((git_revnum_t)m_startrev-rev+(git_revnum_t)m_endrev);
\r
831 __time64_t ttime = time/1000000L;
\r
832 if (m_tTo < (DWORD)ttime)
\r
833 m_tTo = (DWORD)ttime;
\r
834 if (m_tFrom > (DWORD)ttime)
\r
835 m_tFrom = (DWORD)ttime;
\r
836 if ((m_lowestRev > rev)||(m_lowestRev < 0))
\r
838 // Add as many characters from the log message to the list control
\r
839 PLOGENTRYDATA pLogItem = new LOGENTRYDATA;
\r
840 pLogItem->bCopies = !!copies;
\r
842 // find out if this item was copied in the revision
\r
843 BOOL copiedself = FALSE;
\r
846 for (INT_PTR cpPathIndex = 0; cpPathIndex < cpaths->GetCount(); ++cpPathIndex)
\r
848 LogChangedPath * cpath = cpaths->GetAt(cpPathIndex);
\r
849 if (!cpath->sCopyFromPath.IsEmpty() && (cpath->sPath.Compare(m_sSelfRelativeURL) == 0))
\r
851 // note: this only works if the log is fetched top-to-bottom
\r
852 // but since we do that, it shouldn't be a problem
\r
853 m_sSelfRelativeURL = cpath->sCopyFromPath;
\r
859 pLogItem->bCopiedSelf = copiedself;
\r
860 pLogItem->tmDate = ttime;
\r
861 pLogItem->sAuthor = author;
\r
862 pLogItem->sDate = date;
\r
863 pLogItem->sShortMessage = MakeShortMessage(message);
\r
864 pLogItem->dwFileChanges = filechanges;
\r
865 pLogItem->actions = actions;
\r
866 pLogItem->haschildren = haschildren;
\r
867 pLogItem->childStackDepth = m_childCounter;
\r
868 m_maxChild = max(m_childCounter, m_maxChild);
\r
871 pLogItem->sBugIDs = m_ProjectProperties.FindBugID(message).Trim();
\r
873 // split multi line log entries and concatenate them
\r
874 // again but this time with \r\n as line separators
\r
875 // so that the edit control recognizes them
\r
878 if (message.GetLength()>0)
\r
880 m_sMessageBuf = message;
\r
881 m_sMessageBuf.Replace(_T("\n\r"), _T("\n"));
\r
882 m_sMessageBuf.Replace(_T("\r\n"), _T("\n"));
\r
883 if (m_sMessageBuf.Right(1).Compare(_T("\n"))==0)
\r
884 m_sMessageBuf = m_sMessageBuf.Left(m_sMessageBuf.GetLength()-1);
\r
887 m_sMessageBuf.Empty();
\r
888 pLogItem->sMessage = m_sMessageBuf;
\r
889 pLogItem->Rev = rev;
\r
891 // move-construct path array
\r
893 pLogItem->pArChangedPaths = new LogChangedPathArray (*cpaths);
\r
894 cpaths->RemoveAll();
\r
896 catch (CException * e)
\r
898 ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR);
\r
900 m_bCancelled = TRUE;
\r
902 m_logEntries.push_back(pLogItem);
\r
903 m_arShownList.Add(pLogItem);
\r
909 //this is the thread function which calls the subversion function
\r
914 void CLogDlg::CopyChangedSelectionToClipBoard()
\r
917 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
919 return; // nothing is selected, get out of here
\r
923 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
926 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
929 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
930 sPaths += m_currentChangedPathList[nItem].GetGitPathString();
\r
931 sPaths += _T("\r\n");
\r
936 // only one revision is selected in the log dialog top pane
\r
937 // but multiple items could be selected in the changed items list
\r
938 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
941 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
942 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
944 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
946 // some items are hidden! So find out which item the user really selected
\r
947 INT_PTR selRealIndex = -1;
\r
948 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
950 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
952 if (selRealIndex == nItem)
\r
954 changedlogpath = pLogEntry->pArChangedPaths->GetAt(hiddenindex);
\r
959 if (changedlogpath)
\r
961 sPaths += changedlogpath->sPath;
\r
962 sPaths += _T("\r\n");
\r
967 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
\r
971 BOOL CLogDlg::IsDiffPossible(LogChangedPath * changedpath, git_revnum_t rev)
\r
974 CString added, deleted;
\r
975 if (changedpath == NULL)
\r
978 if ((rev > 1)&&(changedpath->action != LOGACTIONS_DELETED))
\r
980 if (changedpath->action == LOGACTIONS_ADDED) // file is added
\r
982 if (changedpath->lCopyFromRev == 0)
\r
983 return FALSE; // but file was not added with history
\r
991 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
\r
993 // we have two separate context menus:
\r
994 // one shown on the log message list control,
\r
995 // the other shown in the changed-files list control
\r
996 int selCount = m_LogList.GetSelectedCount();
\r
997 if (pWnd == &m_LogList)
\r
999 //ShowContextMenuForRevisions(pWnd, point);
\r
1001 else if (pWnd == &m_ChangedFileListCtrl)
\r
1003 //ShowContextMenuForChangedpaths(pWnd, point);
\r
1005 else if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1007 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1008 int selIndex = -1;
\r
1010 selIndex = m_LogList.GetNextSelectedItem(pos);
\r
1011 if ((point.x == -1) && (point.y == -1))
\r
1014 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
\r
1015 ClientToScreen(&rect);
\r
1016 point = rect.CenterPoint();
\r
1018 CString sMenuItemText;
\r
1020 if (popup.CreatePopupMenu())
\r
1022 // add the 'default' entries
\r
1023 sMenuItemText.LoadString(IDS_SCIEDIT_COPY);
\r
1024 popup.AppendMenu(MF_STRING | MF_ENABLED, WM_COPY, sMenuItemText);
\r
1025 sMenuItemText.LoadString(IDS_SCIEDIT_SELECTALL);
\r
1026 popup.AppendMenu(MF_STRING | MF_ENABLED, EM_SETSEL, sMenuItemText);
\r
1028 //if (selIndex >= 0)
\r
1030 // popup.AppendMenu(MF_SEPARATOR);
\r
1031 // sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);
\r
1032 // popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);
\r
1035 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
1039 break; // no command selected
\r
1042 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
\r
1044 case CGitLogList::ID_EDITAUTHOR:
\r
1045 EditLogMessage(selIndex);
\r
1053 LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
1056 ASSERT(m_pFindDialog != NULL);
\r
1058 if (m_pFindDialog->IsTerminating())
\r
1060 // invalidate the handle identifying the dialog box.
\r
1061 m_pFindDialog = NULL;
\r
1065 if(m_pFindDialog->FindNext())
\r
1067 //read data from dialog
\r
1068 CString FindText = m_pFindDialog->GetFindString();
\r
1069 bool bMatchCase = (m_pFindDialog->MatchCase() == TRUE);
\r
1070 bool bFound = false;
\r
1072 bool bRegex = ValidateRegexp(FindText, pat, bMatchCase);
\r
1074 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_not_null;
\r
1077 for (i = this->m_nSearchIndex; i<m_arShownList.GetCount()&&!bFound; i++)
\r
1081 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1083 if (regex_search(wstring((LPCTSTR)pLogEntry->sMessage), pat, flags))
\r
1088 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1089 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1091 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1092 if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags))
\r
1098 if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags))
\r
1110 if (m_logEntries[i]->sMessage.Find(FindText) >= 0)
\r
1115 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1116 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1117 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1119 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1120 if (cpath->sCopyFromPath.Find(FindText)>=0)
\r
1126 if (cpath->sPath.Find(FindText)>=0)
\r
1136 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1137 CString msg = pLogEntry->sMessage;
\r
1138 msg = msg.MakeLower();
\r
1139 CString find = FindText.MakeLower();
\r
1140 if (msg.Find(find) >= 0)
\r
1145 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1146 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1148 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1149 CString lowerpath = cpath->sCopyFromPath;
\r
1150 lowerpath.MakeLower();
\r
1151 if (lowerpath.Find(find)>=0)
\r
1157 lowerpath = cpath->sPath;
\r
1158 lowerpath.MakeLower();
\r
1159 if (lowerpath.Find(find)>=0)
\r
1168 } // for (i = this->m_nSearchIndex; i<m_arShownList.GetItemCount()&&!bFound; i++)
\r
1171 this->m_nSearchIndex = (i+1);
\r
1172 m_LogList.EnsureVisible(i, FALSE);
\r
1173 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);
\r
1174 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
1175 m_LogList.SetSelectionMark(i);
\r
1176 FillLogMessageCtrl();
\r
1177 UpdateData(FALSE);
\r
1179 if (m_nSearchIndex >= m_arShownList.GetCount())
\r
1180 m_nSearchIndex = (int)m_arShownList.GetCount()-1;
\r
1182 } // if(m_pFindDialog->FindNext())
\r
1183 UpdateLogInfoLabel();
\r
1188 void CLogDlg::OnOK()
\r
1191 // since the log dialog is also used to select revisions for other
\r
1192 // dialogs, we have to do some work before closing this dialog
\r
1193 if (GetFocus() != GetDlgItem(IDOK))
\r
1194 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
\r
1195 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
\r
1196 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
\r
1199 CString buttontext;
\r
1200 GetDlgItemText(IDOK, buttontext);
\r
1201 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
1202 if (temp.Compare(buttontext) != 0)
\r
1203 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
\r
1204 m_bCancelled = TRUE;
\r
1205 m_selectedRevs.Clear();
\r
1206 m_selectedRevsOneRange.Clear();
\r
1207 if (m_pNotifyWindow)
\r
1209 int selIndex = m_LogList.GetSelectionMark();
\r
1210 if (selIndex >= 0)
\r
1212 PLOGENTRYDATA pLogEntry = NULL;
\r
1213 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1214 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1215 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1216 git_revnum_t lowerRev = pLogEntry->Rev;
\r
1217 git_revnum_t higherRev = lowerRev;
\r
1220 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1221 git_revnum_t rev = pLogEntry->Rev;
\r
1222 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1223 if (lowerRev > rev)
\r
1225 if (higherRev < rev)
\r
1228 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
\r
1230 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
\r
1232 BOOL bSentMessage = FALSE;
\r
1233 if (m_LogList.GetSelectedCount() == 1)
\r
1235 // if only one revision is selected, check if the path/url with which the dialog was started
\r
1236 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
\r
1237 // if it was copied, use the copy from revision as lowerRev
\r
1238 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
\r
1240 CString sUrl = m_path.GetGitPathString();
\r
1241 if (!m_path.IsUrl())
\r
1243 sUrl = GetURLFromPath(m_path);
\r
1245 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
\r
1246 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
\r
1248 LogChangedPath * pData = pLogEntry->pArChangedPaths->GetAt(cp);
\r
1251 if (sUrl.Compare(pData->sPath) == 0)
\r
1253 if (!pData->sCopyFromPath.IsEmpty())
\r
1255 lowerRev = pData->lCopyFromRev;
\r
1256 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
\r
1257 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
\r
1258 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1259 bSentMessage = TRUE;
\r
1266 if ( !bSentMessage )
\r
1268 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
\r
1269 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
\r
1270 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1271 if (m_selectedRevsOneRange.GetCount())
\r
1272 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
\r
1277 if (m_bSaveStrict)
\r
1278 m_regLastStrict = m_bStrict;
\r
1279 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
1280 reg = m_btnShow.GetCurrentEntry();
\r
1281 SaveSplitterPos();
\r
1285 void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
1287 // a double click on an entry in the changed-files list has happened
\r
1290 DiffSelectedFile();
\r
1293 void CLogDlg::DiffSelectedFile()
\r
1296 if (m_bThreadRunning)
\r
1298 UpdateLogInfoLabel();
\r
1299 INT_PTR selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
1302 if (m_ChangedFileListCtrl.GetSelectedCount() == 0)
\r
1304 // find out if there's an entry selected in the log list
\r
1305 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1306 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1307 git_revnum_t rev1 = pLogEntry->Rev;
\r
1308 git_revnum_t rev2 = rev1;
\r
1313 // there's at least a second entry selected in the log list: several revisions selected!
\r
1314 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1317 rev1 = max(rev1,(long)pLogEntry->Rev);
\r
1318 rev2 = min(rev2,(long)pLogEntry->Rev);
\r
1322 // now we have both revisions selected in the log list, so we can do a diff of the selected
\r
1323 // entry in the changed files list with these two revisions.
\r
1324 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1329 // nothing or only one revision selected in the log list
\r
1330 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1332 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
1334 // some items are hidden! So find out which item the user really clicked on
\r
1335 INT_PTR selRealIndex = -1;
\r
1336 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
1338 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
1340 if (selRealIndex == selIndex)
\r
1342 selIndex = hiddenindex;
\r
1343 changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1349 if (IsDiffPossible(changedpath, rev1))
\r
1351 // diffs with renamed files are possible
\r
1352 if ((changedpath)&&(!changedpath->sCopyFromPath.IsEmpty()))
\r
1353 rev2 = changedpath->lCopyFromRev;
\r
1356 // if the path was modified but the parent path was 'added with history'
\r
1357 // then we have to use the copy from revision of the parent path
\r
1358 CTGitPath cpath = CTGitPath(changedpath->sPath);
\r
1359 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
1361 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
1362 if (p.IsAncestorOf(cpath))
\r
1364 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
1365 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
1369 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1373 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1374 CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1376 // deleted files must be opened from the revision before the deletion
\r
1377 if (changedpath->action == LOGACTIONS_DELETED)
\r
1379 m_bCancelled = false;
\r
1381 CProgressDlg progDlg;
\r
1382 progDlg.SetTitle(IDS_APPNAME);
\r
1383 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1384 CString sInfoLine;
\r
1385 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)(m_sRepositoryRoot + changedpath->sPath), (LPCTSTR)r.ToString());
\r
1386 progDlg.SetLine(1, sInfoLine, true);
\r
1387 SetAndClearProgressInfo(&progDlg);
\r
1388 progDlg.ShowModeless(m_hWnd);
\r
1390 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))
\r
1392 m_bCancelled = false;
\r
1393 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), GitRev::REV_HEAD, r, tempfile))
\r
1396 SetAndClearProgressInfo((HWND)NULL);
\r
1397 CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1402 SetAndClearProgressInfo((HWND)NULL);
\r
1404 CString sName1, sName2;
\r
1405 sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1);
\r
1406 sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1-1);
\r
1407 CAppUtils::DiffFlags flags;
\r
1408 flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1409 if (changedpath->action == LOGACTIONS_DELETED)
\r
1410 CAppUtils::StartExtDiff(tempfile, tempfile2, sName2, sName1, flags);
\r
1412 CAppUtils::StartExtDiff(tempfile2, tempfile, sName2, sName1, flags);
\r
1419 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool blame, bool unified)
\r
1421 DialogEnableWindow(IDOK, FALSE);
\r
1422 // SetPromptApp(&theApp);
\r
1423 theApp.DoWaitCursor(1);
\r
1426 GetTempPath(temppath);
\r
1429 file1.Format(_T("%s%s_%s%s"),
\r
1431 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1432 rev1->m_CommitHash.Left(6),
\r
1433 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1436 file2.Format(_T("%s\\%s_%s%s"),
\r
1438 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1439 rev2->m_CommitHash.Left(6),
\r
1440 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1444 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1445 g_Git.RunLogFile(cmd,file1);
\r
1446 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1447 g_Git.RunLogFile(cmd,file2);
\r
1449 CAppUtils::DiffFlags flags;
\r
1450 CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),flags);
\r
1453 //get the filename
\r
1455 if (Git::PathIsURL(m_path))
\r
1457 filepath = m_path.GetGitPathString();
\r
1461 filepath = GetURLFromPath(m_path);
\r
1462 if (filepath.IsEmpty())
\r
1464 theApp.DoWaitCursor(-1);
\r
1466 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1467 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1468 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1470 theApp.DoWaitCursor(-11);
\r
1474 m_bCancelled = FALSE;
\r
1475 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1477 CString firstfile, secondfile;
\r
1478 if (m_LogList.GetSelectedCount()==1)
\r
1480 int s = m_LogList.GetSelectionMark();
\r
1481 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(s));
\r
1482 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1483 firstfile = changedpath->sPath;
\r
1484 secondfile = firstfile;
\r
1485 if ((rev2 == rev1-1)&&(changedpath->lCopyFromRev > 0)) // is it an added file with history?
\r
1487 secondfile = changedpath->sCopyFromPath;
\r
1488 rev2 = changedpath->lCopyFromRev;
\r
1493 firstfile = m_currentChangedPathList[selIndex].GetGitPathString();
\r
1494 secondfile = firstfile;
\r
1497 firstfile = filepath + firstfile.Trim();
\r
1498 secondfile = filepath + secondfile.Trim();
\r
1500 GitDiff diff(this, this->m_hWnd, true);
\r
1501 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1502 diff.SetHEADPeg(m_LogRevision);
\r
1505 if (PromptShown())
\r
1506 diff.ShowUnifiedDiff(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1);
\r
1508 CAppUtils::StartShowUnifiedDiff(m_hWnd, CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), m_LogRevision);
\r
1512 if (diff.ShowCompare(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), false, blame))
\r
1514 if (firstfile.Compare(secondfile)==0)
\r
1516 git_revnum_t baseRev = 0;
\r
1517 diff.DiffProps(CTGitPath(firstfile), rev2, rev1, baseRev);
\r
1524 theApp.DoWaitCursor(-1);
\r
1528 BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, git_revnum_t rev)
\r
1531 DialogEnableWindow(IDOK, FALSE);
\r
1532 SetPromptApp(&theApp);
\r
1533 theApp.DoWaitCursor(1);
\r
1535 if (Git::PathIsURL(m_path))
\r
1537 filepath = m_path.GetGitPathString();
\r
1541 filepath = GetURLFromPath(m_path);
\r
1542 if (filepath.IsEmpty())
\r
1544 theApp.DoWaitCursor(-1);
\r
1546 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1547 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1548 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1553 m_bCancelled = false;
\r
1554 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1555 filepath += changedpath;
\r
1557 CProgressDlg progDlg;
\r
1558 progDlg.SetTitle(IDS_APPNAME);
\r
1559 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1560 CString sInfoLine;
\r
1561 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)GitRev(rev).ToString());
\r
1562 progDlg.SetLine(1, sInfoLine, true);
\r
1563 SetAndClearProgressInfo(&progDlg);
\r
1564 progDlg.ShowModeless(m_hWnd);
\r
1566 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(filepath), rev);
\r
1567 m_bCancelled = false;
\r
1568 if (!Cat(CTGitPath(filepath), GitRev(rev), rev, tempfile))
\r
1571 SetAndClearProgressInfo((HWND)NULL);
\r
1572 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1574 theApp.DoWaitCursor(-1);
\r
1578 SetAndClearProgressInfo((HWND)NULL);
\r
1579 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
1582 int ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
\r
1583 if (ret <= HINSTANCE_ERROR)
\r
1588 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
1589 cmd += tempfile.GetWinPathString() + _T(" ");
\r
1590 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
1593 theApp.DoWaitCursor(-1);
\r
1598 void CLogDlg::EditAuthor(const CLogDataVector& logs)
\r
1603 if (logs.size() == 0)
\r
1605 DialogEnableWindow(IDOK, FALSE);
\r
1606 SetPromptApp(&theApp);
\r
1607 theApp.DoWaitCursor(1);
\r
1608 if (Git::PathIsURL(m_path))
\r
1609 url = m_path.GetGitPathString();
\r
1612 url = GetURLFromPath(m_path);
\r
1614 name = Git_PROP_REVISION_AUTHOR;
\r
1616 CString value = RevPropertyGet(name, CTGitPath(url), logs[0]->Rev);
\r
1617 CString sOldValue = value;
\r
1618 value.Replace(_T("\n"), _T("\r\n"));
\r
1619 CInputDlg dlg(this);
\r
1620 dlg.m_sHintText.LoadString(IDS_LOG_AUTHOR);
\r
1621 dlg.m_sInputText = value;
\r
1622 dlg.m_sTitle.LoadString(IDS_LOG_AUTHOREDITTITLE);
\r
1623 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1624 dlg.m_bUseLogWidth = false;
\r
1625 if (dlg.DoModal() == IDOK)
\r
1627 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1629 LogCache::CCachedLogInfo* toUpdate
\r
1630 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1632 CProgressDlg progDlg;
\r
1633 progDlg.SetTitle(IDS_APPNAME);
\r
1634 progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
\r
1635 progDlg.SetTime(true);
\r
1636 progDlg.SetShowProgressBar(true);
\r
1637 progDlg.ShowModeless(m_hWnd);
\r
1638 for (DWORD i=0; i<logs.size(); ++i)
\r
1640 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), logs[i]->Rev))
\r
1643 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1649 logs[i]->sAuthor = dlg.m_sInputText;
\r
1650 m_LogList.Invalidate();
\r
1652 // update the log cache
\r
1654 if (toUpdate != NULL)
\r
1656 // log caching is active
\r
1658 LogCache::CCachedLogInfo newInfo;
\r
1659 newInfo.Insert ( logs[i]->Rev
\r
1660 , (const char*) CUnicodeUtils::GetUTF8 (logs[i]->sAuthor)
\r
1663 , LogCache::CRevisionInfoContainer::HAS_AUTHOR);
\r
1665 toUpdate->Update (newInfo);
\r
1668 progDlg.SetProgress64(i, logs.size());
\r
1672 theApp.DoWaitCursor(-1);
\r
1677 void CLogDlg::EditLogMessage(int index)
\r
1682 DialogEnableWindow(IDOK, FALSE);
\r
1683 SetPromptApp(&theApp);
\r
1684 theApp.DoWaitCursor(1);
\r
1685 if (Git::PathIsURL(m_path))
\r
1686 url = m_path.GetGitPathString();
\r
1689 url = GetURLFromPath(m_path);
\r
1691 name = Git_PROP_REVISION_LOG;
\r
1693 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(index));
\r
1694 m_bCancelled = FALSE;
\r
1695 CString value = RevPropertyGet(name, CTGitPath(url), pLogEntry->Rev);
\r
1696 CString sOldValue = value;
\r
1697 value.Replace(_T("\n"), _T("\r\n"));
\r
1698 CInputDlg dlg(this);
\r
1699 dlg.m_sHintText.LoadString(IDS_LOG_MESSAGE);
\r
1700 dlg.m_sInputText = value;
\r
1701 dlg.m_sTitle.LoadString(IDS_LOG_MESSAGEEDITTITLE);
\r
1702 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1703 dlg.m_bUseLogWidth = true;
\r
1704 if (dlg.DoModal() == IDOK)
\r
1706 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1707 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), pLogEntry->Rev))
\r
1709 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1713 pLogEntry->sShortMessage = MakeShortMessage(dlg.m_sInputText);
\r
1714 // split multi line log entries and concatenate them
\r
1715 // again but this time with \r\n as line separators
\r
1716 // so that the edit control recognizes them
\r
1717 if (dlg.m_sInputText.GetLength()>0)
\r
1719 m_sMessageBuf = dlg.m_sInputText;
\r
1720 dlg.m_sInputText.Replace(_T("\n\r"), _T("\n"));
\r
1721 dlg.m_sInputText.Replace(_T("\r\n"), _T("\n"));
\r
1722 if (dlg.m_sInputText.Right(1).Compare(_T("\n"))==0)
\r
1723 dlg.m_sInputText = dlg.m_sInputText.Left(dlg.m_sInputText.GetLength()-1);
\r
1726 dlg.m_sInputText.Empty();
\r
1727 pLogEntry->sMessage = dlg.m_sInputText;
\r
1728 pLogEntry->sBugIDs = m_ProjectProperties.FindBugID(dlg.m_sInputText);
\r
1729 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
1730 pMsgView->SetWindowText(_T(" "));
\r
1731 pMsgView->SetWindowText(dlg.m_sInputText);
\r
1732 m_ProjectProperties.FindBugID(dlg.m_sInputText, pMsgView);
\r
1733 m_LogList.Invalidate();
\r
1735 // update the log cache
\r
1737 LogCache::CCachedLogInfo* toUpdate
\r
1738 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1739 if (toUpdate != NULL)
\r
1741 // log caching is active
\r
1743 LogCache::CCachedLogInfo newInfo;
\r
1744 newInfo.Insert ( pLogEntry->Rev
\r
1746 , (const char*) CUnicodeUtils::GetUTF8 (pLogEntry->sMessage)
\r
1748 , LogCache::CRevisionInfoContainer::HAS_COMMENT);
\r
1750 toUpdate->Update (newInfo);
\r
1754 theApp.DoWaitCursor(-1);
\r
1759 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
\r
1761 // Skip Ctrl-C when copying text out of the log message or search filter
\r
1762 BOOL bSkipAccelerator = ( pMsg->message == WM_KEYDOWN && pMsg->wParam=='C' && (GetFocus()==GetDlgItem(IDC_MSGVIEW) || GetFocus()==GetDlgItem(IDC_SEARCHEDIT) ) && GetKeyState(VK_CONTROL)&0x8000 );
\r
1763 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
\r
1765 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
\r
1767 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))
\r
1769 DiffSelectedRevWithPrevious();
\r
1773 if (GetFocus()==GetDlgItem(IDC_LOGMSG))
\r
1775 DiffSelectedFile();
\r
1779 if (m_hAccel && !bSkipAccelerator)
\r
1781 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
\r
1786 m_tooltips.RelayEvent(pMsg);
\r
1787 return __super::PreTranslateMessage(pMsg);
\r
1791 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
1793 //if (this->IsThreadRunning())
\r
1794 if(m_LogList.m_bNoDispUpdates)
\r
1796 // only show the wait cursor over the list control
\r
1798 ((pWnd == GetDlgItem(IDC_LOGLIST))||
\r
1799 (pWnd == GetDlgItem(IDC_MSGVIEW))||
\r
1800 (pWnd == GetDlgItem(IDC_LOGMSG))))
\r
1802 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
1807 if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1808 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1810 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
1812 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1815 void CLogDlg::OnBnClickedHelp()
\r
1820 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1822 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1824 //if (this->IsThreadRunning())
\r
1825 if(m_LogList.m_bNoDispUpdates)
\r
1827 if (pNMLV->iItem >= 0)
\r
1829 m_nSearchIndex = pNMLV->iItem;
\r
1830 if (pNMLV->iSubItem != 0)
\r
1832 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount())&&(m_bStrict)&&(1/*m_bStrictStopped*/))
\r
1834 // remove the selected state
\r
1835 if (pNMLV->uChanged & LVIF_STATE)
\r
1837 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
\r
1838 FillLogMessageCtrl();
\r
1839 UpdateData(FALSE);
\r
1840 UpdateLogInfoLabel();
\r
1844 if (pNMLV->uChanged & LVIF_STATE)
\r
1846 FillLogMessageCtrl();
\r
1847 UpdateData(FALSE);
\r
1852 FillLogMessageCtrl();
\r
1853 UpdateData(FALSE);
\r
1856 UpdateLogInfoLabel();
\r
1859 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
\r
1861 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
\r
1862 if (pEnLink->msg == WM_LBUTTONUP)
\r
1865 GetDlgItemText(IDC_MSGVIEW, msg);
\r
1866 msg.Replace(_T("\r\n"), _T("\n"));
\r
1867 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
\r
1868 if (!::PathIsURL(url))
\r
1870 url = m_ProjectProperties.GetBugIDUrl(url);
\r
1871 url = GetAbsoluteUrlFromRelativeUrl(url);
\r
1873 if (!url.IsEmpty())
\r
1874 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
1879 void CLogDlg::OnBnClickedStatbutton()
\r
1882 if (this->IsThreadRunning())
\r
1884 if (m_LogList.m_arShownList.IsEmpty())
\r
1885 return; // nothing is shown, so no statistics.
\r
1886 // the statistics dialog expects the log entries to be sorted by date
\r
1887 SortByColumn(3, false);
\r
1888 CPtrArray shownlist;
\r
1889 m_LogList.RecalculateShownList(&shownlist);
\r
1890 // create arrays which are aware of the current filter
\r
1891 CStringArray m_arAuthorsFiltered;
\r
1892 CDWordArray m_arDatesFiltered;
\r
1893 CDWordArray m_arFileChangesFiltered;
\r
1894 for (INT_PTR i=0; i<shownlist.GetCount(); ++i)
\r
1896 GitRev* pLogEntry = reinterpret_cast<GitRev*>(shownlist.GetAt(i));
\r
1897 CString strAuthor = pLogEntry->m_AuthorName;
\r
1898 if ( strAuthor.IsEmpty() )
\r
1900 strAuthor.LoadString(IDS_STATGRAPH_EMPTYAUTHOR);
\r
1902 m_arAuthorsFiltered.Add(strAuthor);
\r
1903 m_arDatesFiltered.Add(pLogEntry->m_AuthorDate.GetTime());
\r
1904 m_arFileChangesFiltered.Add(pLogEntry->m_Files.GetCount());
\r
1906 CStatGraphDlg dlg;
\r
1907 dlg.m_parAuthors = &m_arAuthorsFiltered;
\r
1908 dlg.m_parDates = &m_arDatesFiltered;
\r
1909 dlg.m_parFileChanges = &m_arFileChangesFiltered;
\r
1910 dlg.m_path = m_path;
\r
1912 // restore the previous sorting
\r
1913 SortByColumn(m_nSortColumn, m_bAscending);
\r
1914 OnTimer(LOGFILTER_TIMER);
\r
1919 void CLogDlg::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1922 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
1923 // Take the default processing unless we set this to something else below.
\r
1924 *pResult = CDRF_DODEFAULT;
\r
1926 if (m_bNoDispUpdates)
\r
1929 switch (pLVCD->nmcd.dwDrawStage)
\r
1931 case CDDS_PREPAINT:
\r
1933 *pResult = CDRF_NOTIFYITEMDRAW;
\r
1937 case CDDS_ITEMPREPAINT:
\r
1939 // This is the prepaint stage for an item. Here's where we set the
\r
1940 // item's text color.
\r
1942 // Tell Windows to send draw notifications for each subitem.
\r
1943 *pResult = CDRF_NOTIFYSUBITEMDRAW;
\r
1945 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
1947 if (m_arShownList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1949 GitRev* data = (GitRev*)m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec);
\r
1953 if (data->bCopiedSelf)
\r
1955 // only change the background color if the item is not 'hot' (on vista with themes enabled)
\r
1956 if (!theme.IsAppThemed() || !m_bVista || ((pLVCD->nmcd.uItemState & CDIS_HOT)==0))
\r
1957 pLVCD->clrTextBk = GetSysColor(COLOR_MENU);
\r
1960 if (data->bCopies)
\r
1961 crText = m_Colors.GetColor(CColors::Modified);
\r
1963 // if ((data->childStackDepth)||(m_mergedRevs.find(data->Rev) != m_mergedRevs.end()))
\r
1964 // crText = GetSysColor(COLOR_GRAYTEXT);
\r
1965 // if (data->Rev == m_wcRev)
\r
1967 // SelectObject(pLVCD->nmcd.hdc, m_boldFont);
\r
1968 // We changed the font, so we're returning CDRF_NEWFONT. This
\r
1969 // tells the control to recalculate the extent of the text.
\r
1970 // *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;
\r
1974 if (m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1976 if (m_bStrictStopped)
\r
1977 crText = GetSysColor(COLOR_GRAYTEXT);
\r
1979 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
1980 pLVCD->clrText = crText;
\r
1984 case CDDS_ITEMPREPAINT|CDDS_ITEM|CDDS_SUBITEM:
\r
1986 if ((m_bStrictStopped)&&(m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
1988 pLVCD->nmcd.uItemState &= ~(CDIS_SELECTED|CDIS_FOCUS);
\r
1990 if (pLVCD->iSubItem == 1)
\r
1992 *pResult = CDRF_DODEFAULT;
\r
1994 if (m_arShownList.GetCount() <= (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1998 int iconwidth = ::GetSystemMetrics(SM_CXSMICON);
\r
1999 int iconheight = ::GetSystemMetrics(SM_CYSMICON);
\r
2001 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec));
\r
2003 // Get the selected state of the
\r
2004 // item being drawn.
\r
2006 SecureZeroMemory(&rItem, sizeof(LVITEM));
\r
2007 rItem.mask = LVIF_STATE;
\r
2008 rItem.iItem = pLVCD->nmcd.dwItemSpec;
\r
2009 rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
\r
2010 m_LogList.GetItem(&rItem);
\r
2013 m_LogList.GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);
\r
2015 // Fill the background
\r
2016 if (theme.IsAppThemed() && m_bVista)
\r
2018 theme.Open(m_hWnd, L"Explorer");
\r
2019 int state = LISS_NORMAL;
\r
2020 if (rItem.state & LVIS_SELECTED)
\r
2022 if (::GetFocus() == m_LogList.m_hWnd)
\r
2023 state |= LISS_SELECTED;
\r
2025 state |= LISS_SELECTEDNOTFOCUS;
\r
2030 if (pLogEntry->bCopiedSelf)
\r
2032 // unfortunately, the pLVCD->nmcd.uItemState does not contain valid
\r
2033 // information at this drawing stage. But we can check the whether the
\r
2034 // previous stage changed the background color of the item
\r
2035 if (pLVCD->clrTextBk == GetSysColor(COLOR_MENU))
\r
2038 brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
2041 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
2042 ::DeleteObject(brush);
\r
2049 if (theme.IsBackgroundPartiallyTransparent(LVP_LISTDETAIL, state))
\r
2050 theme.DrawParentBackground(m_hWnd, pLVCD->nmcd.hdc, &rect);
\r
2052 theme.DrawBackground(pLVCD->nmcd.hdc, LVP_LISTDETAIL, state, &rect, NULL);
\r
2057 if (rItem.state & LVIS_SELECTED)
\r
2059 if (::GetFocus() == m_LogList.m_hWnd)
\r
2060 brush = ::CreateSolidBrush(::GetSysColor(COLOR_HIGHLIGHT));
\r
2062 brush = ::CreateSolidBrush(::GetSysColor(COLOR_BTNFACE));
\r
2066 //if (pLogEntry->bCopiedSelf)
\r
2067 // brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
2069 brush = ::CreateSolidBrush(::GetSysColor(COLOR_WINDOW));
\r
2071 if (brush == NULL)
\r
2074 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
2075 ::DeleteObject(brush);
\r
2078 // Draw the icon(s) into the compatible DC
\r
2079 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
2080 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left + ICONITEMBORDER, rect.top, m_hModifiedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2083 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
2084 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hAddedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2087 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
2088 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hDeletedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2091 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
2092 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hReplacedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2094 *pResult = CDRF_SKIPDEFAULT;
\r
2100 *pResult = CDRF_DODEFAULT;
\r
2105 void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2108 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
2109 // Take the default processing unless we set this to something else below.
\r
2110 *pResult = CDRF_DODEFAULT;
\r
2112 // if (m_bNoDispUpdates)
\r
2115 // First thing - check the draw stage. If it's the control's prepaint
\r
2116 // stage, then tell Windows we want messages for every item.
\r
2118 if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2120 *pResult = CDRF_NOTIFYITEMDRAW;
\r
2122 else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2124 // This is the prepaint stage for an item. Here's where we set the
\r
2125 // item's text color. Our return value will tell Windows to draw the
\r
2126 // item itself, but it will use the new color we set here.
\r
2128 // Tell Windows to paint the control itself.
\r
2129 *pResult = CDRF_DODEFAULT;
\r
2131 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
2132 bool bGrayed = false;
\r
2134 if ((m_cHidePaths.GetState() & 0x0003)==BST_INDETERMINATE)
\r
2136 if ((m_currentChangedArray)&&((m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)))
\r
2138 //if ((*m_currentChangedArray)[(pLVCD->nmcd.dwItemSpec)]sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2140 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2144 else if (m_currentChangedPathList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
2146 //if (m_currentChangedPathList[pLVCD->nmcd.dwItemSpec].GetGitPathString().Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2148 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2155 if ((!bGrayed)&&(m_currentChangedArray)&&(m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
2157 DWORD action = ((*m_currentChangedArray)[pLVCD->nmcd.dwItemSpec]).m_Action;
\r
2158 if (action == CTGitPath::LOGACTIONS_MODIFIED)
\r
2159 crText = m_Colors.GetColor(CColors::Modified);
\r
2160 if (action == CTGitPath::LOGACTIONS_REPLACED)
\r
2161 crText = m_Colors.GetColor(CColors::Deleted);
\r
2162 if (action == CTGitPath::LOGACTIONS_ADDED)
\r
2163 crText = m_Colors.GetColor(CColors::Added);
\r
2164 if (action == CTGitPath::LOGACTIONS_DELETED)
\r
2165 crText = m_Colors.GetColor(CColors::Deleted);
\r
2168 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
2169 pLVCD->clrText = crText;
\r
2173 void CLogDlg::DoSizeV1(int delta)
\r
2176 RemoveAnchor(IDC_LOGLIST);
\r
2177 RemoveAnchor(IDC_SPLITTERTOP);
\r
2178 RemoveAnchor(IDC_MSGVIEW);
\r
2179 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2180 RemoveAnchor(IDC_LOGMSG);
\r
2181 CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);
\r
2182 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);
\r
2183 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2184 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2185 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2186 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2187 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2190 SetSplitterRange();
\r
2191 m_LogList.Invalidate();
\r
2192 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2196 void CLogDlg::DoSizeV2(int delta)
\r
2199 RemoveAnchor(IDC_LOGLIST);
\r
2200 RemoveAnchor(IDC_SPLITTERTOP);
\r
2201 RemoveAnchor(IDC_MSGVIEW);
\r
2202 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2203 RemoveAnchor(IDC_LOGMSG);
\r
2204 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);
\r
2205 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);
\r
2206 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2207 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2208 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2209 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2210 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2213 SetSplitterRange();
\r
2214 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2215 m_ChangedFileListCtrl.Invalidate();
\r
2219 void CLogDlg::AdjustMinSize()
\r
2221 // adjust the minimum size of the dialog to prevent the resizing from
\r
2222 // moving the list control too far down.
\r
2223 CRect rcChgListView;
\r
2224 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
\r
2226 m_LogList.GetClientRect(rcLogList);
\r
2228 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
\r
2229 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
\r
2230 +rcChgListView.Height()+rcLogList.Height()+60));
\r
2233 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
2235 switch (message) {
\r
2237 if (wParam == IDC_SPLITTERTOP)
\r
2239 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2240 DoSizeV1(pHdr->delta);
\r
2242 else if (wParam == IDC_SPLITTERBOTTOM)
\r
2244 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2245 DoSizeV2(pHdr->delta);
\r
2250 return CResizableDialog::DefWindowProc(message, wParam, lParam);
\r
2253 void CLogDlg::SetSplitterRange()
\r
2255 if ((m_LogList)&&(m_ChangedFileListCtrl))
\r
2258 m_LogList.GetWindowRect(rcTop);
\r
2259 ScreenToClient(rcTop);
\r
2261 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);
\r
2262 ScreenToClient(rcMiddle);
\r
2263 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);
\r
2265 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
\r
2266 ScreenToClient(rcBottom);
\r
2267 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);
\r
2271 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
\r
2273 RECT * rect = (LPRECT)lParam;
\r
2276 point = CPoint(rect->left, rect->bottom);
\r
2277 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))
\r
2279 if (popup.CreatePopupMenu())
\r
2281 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2282 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ALL), LOGFILTER_ALL, temp);
\r
2284 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2286 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2287 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
\r
2288 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2289 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
\r
2290 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2291 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
\r
2292 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2293 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
\r
2294 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
\r
2295 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
\r
2297 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2299 temp.LoadString(IDS_LOG_FILTER_REGEX);
\r
2300 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
\r
2303 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2304 if (selection != 0)
\r
2307 if (selection == LOGFILTER_REGEX)
\r
2309 m_bFilterWithRegex = !m_bFilterWithRegex;
\r
2310 CRegDWORD b = CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
2311 b = m_bFilterWithRegex;
\r
2312 CheckRegexpTooltip();
\r
2316 m_LogList.m_nSelectedFilter = selection;
\r
2317 SetFilterCueText();
\r
2319 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2325 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
2328 KillTimer(LOGFILTER_TIMER);
\r
2330 m_LogList.m_sFilterText.Empty();
\r
2331 UpdateData(FALSE);
\r
2332 theApp.DoWaitCursor(1);
\r
2333 CStoreSelection storeselection(this);
\r
2334 FillLogMessageCtrl(false);
\r
2336 m_LogList.RemoveFilter();
\r
2339 m_LogList.GetTimeRange(begin,end);
\r
2340 m_DateFrom.SetTime(&begin);
\r
2341 m_DateTo.SetTime(&end);
\r
2343 theApp.DoWaitCursor(-1);
\r
2344 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2345 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2346 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2347 UpdateLogInfoLabel();
\r
2353 void CLogDlg::SetFilterCueText()
\r
2356 switch (m_LogList.m_nSelectedFilter)
\r
2358 case LOGFILTER_ALL:
\r
2359 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2361 case LOGFILTER_MESSAGES:
\r
2362 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2364 case LOGFILTER_PATHS:
\r
2365 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2367 case LOGFILTER_AUTHORS:
\r
2368 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2370 case LOGFILTER_REVS:
\r
2371 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2374 // to make the cue banner text appear more to the right of the edit control
\r
2375 temp = _T(" ")+temp;
\r
2376 m_cFilter.SetCueBanner(temp);
\r
2379 bool CLogDlg::Validate(LPCTSTR string)
\r
2381 if (!m_bFilterWithRegex)
\r
2384 return m_LogList.ValidateRegexp(string, pat, false);
\r
2388 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
\r
2390 if (nIDEvent == LOGFILTER_TIMER)
\r
2392 if (this->IsThreadRunning())
\r
2394 // thread still running! So just restart the timer.
\r
2395 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2398 CWnd * focusWnd = GetFocus();
\r
2399 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
\r
2400 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
\r
2401 if (m_LogList.m_sFilterText.IsEmpty())
\r
2403 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2404 // do not return here!
\r
2405 // we also need to run the filter if the filter text is empty:
\r
2406 // 1. to clear an existing filter
\r
2407 // 2. to rebuild the m_arShownList after sorting
\r
2409 theApp.DoWaitCursor(1);
\r
2410 CStoreSelection storeselection(this);
\r
2411 KillTimer(LOGFILTER_TIMER);
\r
2412 FillLogMessageCtrl(false);
\r
2414 // now start filter the log list
\r
2415 m_LogList.StartFilter();
\r
2417 if ( m_LogList.GetItemCount()==1 )
\r
2419 m_LogList.SetSelectionMark(0);
\r
2420 m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
\r
2422 theApp.DoWaitCursor(-1);
\r
2423 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2424 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2425 if (bSetFocusToFilterControl)
\r
2426 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2427 UpdateLogInfoLabel();
\r
2428 } // if (nIDEvent == LOGFILTER_TIMER)
\r
2429 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2430 __super::OnTimer(nIDEvent);
\r
2433 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2436 m_DateTo.GetTime(_time);
\r
2439 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
\r
2440 if (time.GetTime() != m_LogList.m_To.GetTime())
\r
2442 m_LogList.m_To = (DWORD)time.GetTime();
\r
2443 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2446 catch (CAtlException)
\r
2453 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2456 m_DateFrom.GetTime(_time);
\r
2459 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
\r
2460 if (time.GetTime() != m_LogList.m_From.GetTime())
\r
2462 m_LogList.m_From = (DWORD)time.GetTime();
\r
2463 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2466 catch (CAtlException)
\r
2475 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths /* = false */, bool bUseFilter /* = true */)
\r
2477 CTGitPathList pathList;
\r
2480 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2482 m_sRepositoryRoot = GetRepositoryRoot(m_path);
\r
2484 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2487 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2492 int nextpos = m_LogList.GetNextSelectedItem(pos);
\r
2493 if (nextpos >= m_arShownList.GetCount())
\r
2495 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(nextpos));
\r
2496 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
2497 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
2499 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2500 if (cpath == NULL)
\r
2503 if (!bRelativePaths)
\r
2504 path.SetFromGit(m_sRepositoryRoot);
\r
2505 path.AppendPathString(cpath->sPath);
\r
2506 if ((!bUseFilter)||
\r
2507 ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||
\r
2508 (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))
\r
2509 pathList.AddPath(path);
\r
2514 pathList.RemoveDuplicates();
\r
2519 void CLogDlg::SortByColumn(int nSortColumn, bool bAscending)
\r
2522 switch(nSortColumn)
\r
2524 case 0: // Revision
\r
2527 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
\r
2529 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
\r
2535 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
\r
2537 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
\r
2543 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
\r
2545 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
\r
2551 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
\r
2553 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
\r
2556 case 4: // Message or bug id
\r
2557 if (m_bShowBugtraqColumn)
\r
2560 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
\r
2562 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
\r
2565 // fall through here
\r
2566 case 5: // Message
\r
2569 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
\r
2571 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
\r
2581 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
2583 if (this->IsThreadRunning())
\r
2584 return; //no sorting while the arrays are filled
\r
2585 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2586 const int nColumn = pNMLV->iSubItem;
\r
2587 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
\r
2588 m_nSortColumn = nColumn;
\r
2589 SortByColumn(m_nSortColumn, m_bAscending);
\r
2590 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
\r
2591 SortShownListArray();
\r
2592 m_LogList.Invalidate();
\r
2593 UpdateLogInfoLabel();
\r
2594 // the "next 100" button only makes sense if the log messages
\r
2595 // are sorted by revision in descending order
\r
2596 if ((m_nSortColumn)||(m_bAscending))
\r
2598 DialogEnableWindow(IDC_NEXTHUNDRED, false);
\r
2602 DialogEnableWindow(IDC_NEXTHUNDRED, true);
\r
2607 void CLogDlg::SortShownListArray()
\r
2609 // make sure the shown list still matches the filter after sorting.
\r
2610 OnTimer(LOGFILTER_TIMER);
\r
2611 // clear the selection states
\r
2612 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2615 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
\r
2617 m_LogList.SetSelectionMark(-1);
\r
2620 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
\r
2622 if (control == NULL)
\r
2624 // set the sort arrow
\r
2625 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
\r
2626 HDITEM HeaderItem = {0};
\r
2627 HeaderItem.mask = HDI_FORMAT;
\r
2628 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
2630 pHeader->GetItem(i, &HeaderItem);
\r
2631 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
2632 pHeader->SetItem(i, &HeaderItem);
\r
2636 pHeader->GetItem(nColumn, &HeaderItem);
\r
2637 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
2638 pHeader->SetItem(nColumn, &HeaderItem);
\r
2641 void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2644 if (this->IsThreadRunning())
\r
2645 return; //no sorting while the arrays are filled
\r
2646 if (m_currentChangedArray == NULL)
\r
2648 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2649 const int nColumn = pNMLV->iSubItem;
\r
2650 m_bAscendingPathList = nColumn == m_nSortColumnPathList ? !m_bAscendingPathList : TRUE;
\r
2651 m_nSortColumnPathList = nColumn;
\r
2652 // qsort(m_currentChangedArray->GetData(), m_currentChangedArray->GetSize(), sizeof(LogChangedPath*), (GENERICCOMPAREFN)SortCompare);
\r
2654 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
2655 m_ChangedFileListCtrl.Invalidate();
\r
2660 int CLogDlg::m_nSortColumnPathList = 0;
\r
2661 bool CLogDlg::m_bAscendingPathList = false;
\r
2663 int CLogDlg::SortCompare(const void * pElem1, const void * pElem2)
\r
2666 LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);
\r
2667 LogChangedPath * cpath2 = *((LogChangedPath**)pElem2);
\r
2669 if (m_bAscendingPathList)
\r
2670 std::swap (cpath1, cpath2);
\r
2673 switch (m_nSortColumnPathList)
\r
2676 cmp = cpath2->GetAction().Compare(cpath1->GetAction());
\r
2681 cmp = cpath2->sPath.CompareNoCase(cpath1->sPath);
\r
2685 case 2: // copy from path
\r
2686 cmp = cpath2->sCopyFromPath.Compare(cpath1->sCopyFromPath);
\r
2690 case 3: // copy from revision
\r
2691 return cpath2->lCopyFromRev > cpath1->lCopyFromRev;
\r
2698 void CLogDlg::ResizeAllListCtrlCols()
\r
2701 const int nMinimumWidth = ICONITEMBORDER+16*4;
\r
2702 int maxcol = ((CHeaderCtrl*)(m_LogList.GetDlgItem(0)))->GetItemCount()-1;
\r
2703 int nItemCount = m_LogList.GetItemCount();
\r
2704 TCHAR textbuf[MAX_PATH];
\r
2705 CHeaderCtrl * pHdrCtrl = (CHeaderCtrl*)(m_LogList.GetDlgItem(0));
\r
2708 for (int col = 0; col <= maxcol; col++)
\r
2711 hdi.mask = HDI_TEXT;
\r
2712 hdi.pszText = textbuf;
\r
2713 hdi.cchTextMax = sizeof(textbuf);
\r
2714 pHdrCtrl->GetItem(col, &hdi);
\r
2715 int cx = m_LogList.GetStringWidth(hdi.pszText)+20; // 20 pixels for col separator and margin
\r
2716 for (int index = 0; index<nItemCount; ++index)
\r
2718 // get the width of the string and add 14 pixels for the column separator and margins
\r
2719 int linewidth = m_LogList.GetStringWidth(m_LogList.GetItemText(index, col)) + 14;
\r
2720 if (index < m_arShownList.GetCount())
\r
2722 GitRev * pCurLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(index));
\r
2723 if ((pCurLogEntry)&&(pCurLogEntry->m_CommitHash == m_wcRev.m_CommitHash))
\r
2725 // set the bold font and ask for the string width again
\r
2726 m_LogList.SendMessage(WM_SETFONT, (WPARAM)m_boldFont, NULL);
\r
2727 linewidth = m_LogList.GetStringWidth(m_LogList.GetItemText(index, col)) + 14;
\r
2728 // restore the system font
\r
2729 m_LogList.SendMessage(WM_SETFONT, NULL, NULL);
\r
2734 // add the image size
\r
2735 CImageList * pImgList = m_LogList.GetImageList(LVSIL_SMALL);
\r
2736 if ((pImgList)&&(pImgList->GetImageCount()))
\r
2738 IMAGEINFO imginfo;
\r
2739 pImgList->GetImageInfo(0, &imginfo);
\r
2740 linewidth += (imginfo.rcImage.right - imginfo.rcImage.left);
\r
2741 linewidth += 3; // 3 pixels between icon and text
\r
2744 if (cx < linewidth)
\r
2747 // Adjust columns "Actions" containing icons
\r
2748 if (col == this->LOGLIST_ACTION)
\r
2750 if (cx < nMinimumWidth)
\r
2752 cx = nMinimumWidth;
\r
2756 if (col == this->LOGLIST_MESSAGE)
\r
2758 if (cx > LOGLIST_MESSAGE_MAX)
\r
2760 cx = LOGLIST_MESSAGE_MAX;
\r
2764 // keep the bug id column small
\r
2765 if ((col == 4)&&(m_bShowBugtraqColumn))
\r
2767 if (cx > (int)(DWORD)m_regMaxBugIDColWidth)
\r
2769 cx = (int)(DWORD)m_regMaxBugIDColWidth;
\r
2773 m_LogList.SetColumnWidth(col, cx);
\r
2780 void CLogDlg::OnBnClickedHidepaths()
\r
2782 FillLogMessageCtrl();
\r
2783 m_ChangedFileListCtrl.Invalidate();
\r
2788 void CLogDlg::OnBnClickedCheckStoponcopy()
\r
2791 if (!GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
2794 // ignore old fetch limits when switching
\r
2795 // between copy-following and stop-on-copy
\r
2796 // (otherwise stop-on-copy will limit what
\r
2797 // we see immediately after switching to
\r
2798 // copy-following)
\r
2802 // now, restart the query
\r
2807 void CLogDlg::OnBnClickedIncludemerge()
\r
2817 void CLogDlg::UpdateLogInfoLabel()
\r
2820 git_revnum_t rev1 ;
\r
2821 git_revnum_t rev2 ;
\r
2822 long selectedrevs ;
\r
2823 int count =m_LogList.m_arShownList.GetCount();
\r
2826 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(0)))->m_CommitHash;
\r
2827 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));
\r
2828 rev2 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(count-1)))->m_CommitHash;
\r
2829 selectedrevs = m_LogList.GetSelectedCount();
\r
2832 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
2833 m_sLogInfo = sTemp;
\r
2835 UpdateData(FALSE);
\r
2839 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
\r
2842 int selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
2843 if ((point.x == -1) && (point.y == -1))
\r
2846 m_ChangedFileListCtrl.GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2847 m_ChangedFileListCtrl.ClientToScreen(&rect);
\r
2848 point = rect.CenterPoint();
\r
2852 int s = m_LogList.GetSelectionMark();
\r
2855 std::vector<CString> changedpaths;
\r
2856 std::vector<LogChangedPath*> changedlogpaths;
\r
2857 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2859 return; // nothing is selected, get out of here
\r
2861 bool bOneRev = true;
\r
2862 int sel=m_LogList.GetNextSelectedItem(pos);
\r
2863 GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel));
\r
2864 GitRev * rev1 = pLogEntry;
\r
2865 GitRev * rev2 = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel+1));
\r
2867 bool bOneRev = true;
\r
2872 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
2875 rev1 = max(rev1,(git_revnum_t)pLogEntry->Rev);
\r
2876 rev2 = min(rev2,(git_revnum_t)pLogEntry->Rev);
\r
2882 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
2885 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
2886 changedpaths.push_back(m_currentChangedPathList[nItem].GetGitPathString());
\r
2891 // only one revision is selected in the log dialog top pane
\r
2892 // but multiple items could be selected in the changed items list
\r
2895 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
2898 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
2899 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
2901 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
2903 if ((changedlogpath)&&(!changedlogpath->sCopyFromPath.IsEmpty()))
\r
2904 rev2 = changedlogpath->lCopyFromRev;
\r
2907 // if the path was modified but the parent path was 'added with history'
\r
2908 // then we have to use the copy from revision of the parent path
\r
2909 CTGitPath cpath = CTGitPath(changedlogpath->sPath);
\r
2910 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
2912 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
2913 if (p.IsAncestorOf(cpath))
\r
2915 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
2916 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
2921 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
2923 // some items are hidden! So find out which item the user really clicked on
\r
2924 INT_PTR selRealIndex = -1;
\r
2925 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
2927 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
2929 if (selRealIndex == nItem)
\r
2931 selIndex = hiddenindex;
\r
2932 changedlogpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
2937 if (changedlogpath)
\r
2939 changedpaths.push_back(changedlogpath->sPath);
\r
2940 changedlogpaths.push_back(changedlogpath);
\r
2945 //entry is selected, now show the popup menu
\r
2947 if (popup.CreatePopupMenu())
\r
2949 bool bEntryAdded = false;
\r
2950 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
2952 // if ((!bOneRev)||(IsDiffPossible(changedlogpaths[0], rev1)))
\r
2954 popup.AppendMenuIcon(CGitLogList::ID_DIFF, IDS_LOG_POPUP_DIFF, IDI_DIFF);
\r
2955 popup.AppendMenuIcon(CGitLogList::ID_BLAMEDIFF, IDS_LOG_POPUP_BLAMEDIFF, IDI_BLAME);
\r
2956 popup.SetDefaultItem(CGitLogList::ID_DIFF, FALSE);
\r
2957 popup.AppendMenuIcon(CGitLogList::ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF);
\r
2958 bEntryAdded = true;
\r
2960 // if (rev2 == rev1-1)
\r
2963 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2964 popup.AppendMenuIcon(CGitLogList::ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);
\r
2965 popup.AppendMenuIcon(CGitLogList::ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2966 popup.AppendMenuIcon(CGitLogList::ID_BLAME, IDS_LOG_POPUP_BLAME, IDI_BLAME);
\r
2967 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2969 popup.AppendMenuIcon(CGitLogList::ID_REVERTREV, IDS_LOG_POPUP_REVERTREV, IDI_REVERT);
\r
2970 popup.AppendMenuIcon(CGitLogList::ID_POPPROPS, IDS_REPOBROWSE_SHOWPROP, IDI_PROPERTIES); // "Show Properties"
\r
2971 popup.AppendMenuIcon(CGitLogList::ID_LOG, IDS_MENULOG, IDI_LOG); // "Show Log"
\r
2972 popup.AppendMenuIcon(CGitLogList::ID_GETMERGELOGS, IDS_LOG_POPUP_GETMERGELOGS, IDI_LOG); // "Show merge log"
\r
2973 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
\r
2974 bEntryAdded = true;
\r
2975 if (!m_ProjectProperties.sWebViewerPathRev.IsEmpty())
\r
2977 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2978 popup.AppendMenuIcon(CGitLogList::ID_VIEWPATHREV, IDS_LOG_POPUP_VIEWPATHREV);
\r
2980 if (popup.GetDefaultItem(0,FALSE)==-1)
\r
2981 popup.SetDefaultItem(CGitLogList::ID_OPEN, FALSE);
\r
2984 else if (changedlogpaths.size())
\r
2986 // more than one entry is selected
\r
2987 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE);
\r
2988 bEntryAdded = true;
\r
2993 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2994 bool bOpenWith = false;
\r
2995 bool bMergeLog = false;
\r
2996 m_bCancelled = false;
\r
3000 case CGitLogList::ID_DIFF:
\r
3002 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
3006 case ID_BLAMEDIFF:
\r
3008 DoDiffFromLog(selIndex, rev1, rev2, true, false);
\r
3013 DoDiffFromLog(selIndex, rev1, rev2, false, true);
\r
3016 case ID_REVERTREV:
\r
3018 SetPromptApp(&theApp);
\r
3019 theApp.DoWaitCursor(1);
\r
3021 if (Git::PathIsURL(m_path))
\r
3023 sUrl = m_path.GetGitPathString();
\r
3027 sUrl = GetURLFromPath(m_path);
\r
3028 if (sUrl.IsEmpty())
\r
3030 theApp.DoWaitCursor(-1);
\r
3032 temp.Format(IDS_ERR_NOURLOFFILE, m_path.GetWinPath());
\r
3033 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3035 theApp.DoWaitCursor(-1);
\r
3039 // find the working copy path of the selected item from the URL
\r
3040 m_bCancelled = false;
\r
3041 CString sUrlRoot = GetRepositoryRoot(CTGitPath(sUrl));
\r
3043 CString fileURL = changedpaths[0];
\r
3044 fileURL = sUrlRoot + fileURL.Trim();
\r
3045 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1
\r
3046 // sUrl = http://mydomain.com/repos/trunk/folder
\r
3047 CString sUnescapedUrl = CPathUtils::PathUnescape(sUrl);
\r
3048 // find out until which char the urls are identical
\r
3050 while ((i<fileURL.GetLength())&&(i<sUnescapedUrl.GetLength())&&(fileURL[i]==sUnescapedUrl[i]))
\r
3052 int leftcount = m_path.GetWinPathString().GetLength()-(sUnescapedUrl.GetLength()-i);
\r
3053 CString wcPath = m_path.GetWinPathString().Left(leftcount);
\r
3054 wcPath += fileURL.Mid(i);
\r
3055 wcPath.Replace('/', '\\');
\r
3056 CGitProgressDlg dlg;
\r
3057 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3059 // a deleted path! Since the path isn't there anymore, merge
\r
3060 // won't work. So just do a copy url->wc
\r
3061 dlg.SetCommand(CGitProgressDlg::GitProgress_Copy);
\r
3062 dlg.SetPathList(CTGitPathList(CTGitPath(fileURL)));
\r
3063 dlg.SetUrl(wcPath);
\r
3064 dlg.SetRevision(rev2);
\r
3068 if (!PathFileExists(wcPath))
\r
3070 // seems the path got renamed
\r
3071 // tell the user how to work around this.
\r
3072 CMessageBox::Show(this->m_hWnd, IDS_LOG_REVERTREV_ERROR, IDS_APPNAME, MB_ICONERROR);
\r
3074 theApp.DoWaitCursor(-1);
\r
3077 dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);
\r
3078 dlg.SetPathList(CTGitPathList(CTGitPath(wcPath)));
\r
3079 dlg.SetUrl(fileURL);
\r
3080 dlg.SetSecondUrl(fileURL);
\r
3081 GitRevRangeArray revarray;
\r
3082 revarray.AddRevRange(rev1, rev2);
\r
3083 dlg.SetRevisionRanges(revarray);
\r
3086 msg.Format(IDS_LOG_REVERT_CONFIRM, (LPCTSTR)wcPath);
\r
3087 if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)
\r
3091 theApp.DoWaitCursor(-1);
\r
3096 DialogEnableWindow(IDOK, FALSE);
\r
3097 SetPromptApp(&theApp);
\r
3098 theApp.DoWaitCursor(1);
\r
3100 if (Git::PathIsURL(m_path))
\r
3102 filepath = m_path.GetGitPathString();
\r
3106 filepath = GetURLFromPath(m_path);
\r
3107 if (filepath.IsEmpty())
\r
3109 theApp.DoWaitCursor(-1);
\r
3111 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3112 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3113 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3118 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3119 filepath += changedpaths[0];
\r
3122 dlg.m_Path = CTGitPath(filepath);
\r
3125 theApp.DoWaitCursor(-1);
\r
3130 DialogEnableWindow(IDOK, FALSE);
\r
3131 SetPromptApp(&theApp);
\r
3132 theApp.DoWaitCursor(1);
\r
3134 if (Git::PathIsURL(m_path))
\r
3136 filepath = m_path.GetGitPathString();
\r
3140 filepath = GetURLFromPath(m_path);
\r
3141 if (filepath.IsEmpty())
\r
3143 theApp.DoWaitCursor(-1);
\r
3145 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3146 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3147 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3152 m_bCancelled = false;
\r
3153 CString sRoot = GetRepositoryRoot(CTGitPath(filepath));
\r
3154 // if more than one entry is selected, we save them
\r
3155 // one by one into a folder the user has selected
\r
3156 bool bTargetSelected = false;
\r
3157 CTGitPath TargetPath;
\r
3158 if (m_ChangedFileListCtrl.GetSelectedCount() > 1)
\r
3160 CBrowseFolder browseFolder;
\r
3161 browseFolder.SetInfo(CString(MAKEINTRESOURCE(IDS_LOG_SAVEFOLDERTOHINT)));
\r
3162 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
3163 CString strSaveAsDirectory;
\r
3164 if (browseFolder.Show(GetSafeHwnd(), strSaveAsDirectory) == CBrowseFolder::OK)
\r
3166 TargetPath = CTGitPath(strSaveAsDirectory);
\r
3167 bTargetSelected = true;
\r
3172 // Display the Open dialog box.
\r
3173 CString revFilename;
\r
3175 temp = CPathUtils::GetFileNameFromPath(changedpaths[0]);
\r
3176 int rfind = temp.ReverseFind('.');
\r
3178 revFilename.Format(_T("%s-%ld%s"), (LPCTSTR)temp.Left(rfind), rev1, (LPCTSTR)temp.Mid(rfind));
\r
3180 revFilename.Format(_T("%s-%ld"), (LPCTSTR)temp, rev1);
\r
3181 bTargetSelected = CAppUtils::FileOpenSave(revFilename, NULL, IDS_LOG_POPUP_SAVE, IDS_COMMONFILEFILTER, false, m_hWnd);
\r
3182 TargetPath.SetFromWin(revFilename);
\r
3184 if (bTargetSelected)
\r
3186 CProgressDlg progDlg;
\r
3187 progDlg.SetTitle(IDS_APPNAME);
\r
3188 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
3189 for (std::vector<LogChangedPath*>::iterator it = changedlogpaths.begin(); it!= changedlogpaths.end(); ++it)
\r
3191 GitRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;
\r
3193 CString sInfoLine;
\r
3194 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)getrev.ToString());
\r
3195 progDlg.SetLine(1, sInfoLine, true);
\r
3196 SetAndClearProgressInfo(&progDlg);
\r
3197 progDlg.ShowModeless(m_hWnd);
\r
3199 CTGitPath tempfile = TargetPath;
\r
3200 if (changedpaths.size() > 1)
\r
3202 // if multiple items are selected, then the TargetPath
\r
3203 // points to a folder and we have to append the filename
\r
3204 // to save to to that folder.
\r
3205 CString sName = (*it)->sPath;
\r
3206 int slashpos = sName.ReverseFind('/');
\r
3207 if (slashpos >= 0)
\r
3208 sName = sName.Mid(slashpos);
\r
3209 tempfile.AppendPathString(sName);
\r
3210 // one problem here:
\r
3211 // a user could have selected multiple items which
\r
3212 // have the same filename but reside in different
\r
3213 // directories, e.g.
\r
3216 // in that case, the second 'file1' will overwrite
\r
3217 // the already saved 'file1'.
\r
3219 // we could maybe find the common root of all selected
\r
3220 // items and then create sub folders to save those files
\r
3222 // But I think we should just leave it that way: to check
\r
3223 // out multiple items at once, the better way is still to
\r
3224 // use the export command from the top pane of the log dialog.
\r
3226 filepath = sRoot + (*it)->sPath;
\r
3227 if (!Cat(CTGitPath(filepath), getrev, getrev, tempfile))
\r
3230 SetAndClearProgressInfo((HWND)NULL);
\r
3231 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3233 theApp.DoWaitCursor(-1);
\r
3238 SetAndClearProgressInfo((HWND)NULL);
\r
3241 theApp.DoWaitCursor(-1);
\r
3248 GitRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;
\r
3249 Open(bOpenWith,changedpaths[0],getrev);
\r
3255 if (Git::PathIsURL(m_path))
\r
3257 filepath = m_path.GetGitPathString();
\r
3261 filepath = GetURLFromPath(m_path);
\r
3262 if (filepath.IsEmpty())
\r
3264 theApp.DoWaitCursor(-1);
\r
3266 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3267 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3268 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3273 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3274 filepath += changedpaths[0];
\r
3276 dlg.EndRev = rev1;
\r
3277 if (dlg.DoModal() == IDOK)
\r
3282 tempfile = blame.BlameToTempFile(CTGitPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);
\r
3283 if (!tempfile.IsEmpty())
\r
3285 if (dlg.m_bTextView)
\r
3287 //open the default text editor for the result file
\r
3288 CAppUtils::StartTextViewer(tempfile);
\r
3292 CString sParams = _T("/path:\"") + filepath + _T("\" ");
\r
3293 if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(filepath),sParams))
\r
3301 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3306 case ID_GETMERGELOGS:
\r
3311 DialogEnableWindow(IDOK, FALSE);
\r
3312 SetPromptApp(&theApp);
\r
3313 theApp.DoWaitCursor(1);
\r
3315 if (Git::PathIsURL(m_path))
\r
3317 filepath = m_path.GetGitPathString();
\r
3321 filepath = GetURLFromPath(m_path);
\r
3322 if (filepath.IsEmpty())
\r
3324 theApp.DoWaitCursor(-1);
\r
3326 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3327 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3328 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3333 m_bCancelled = false;
\r
3334 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3335 filepath += changedpaths[0];
\r
3336 git_revnum_t logrev = rev1;
\r
3337 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3339 // if the item got deleted in this revision,
\r
3340 // fetch the log from the previous revision where it
\r
3345 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\" /startrev:%ld"), (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)filepath, logrev);
\r
3347 sCmd += _T(" /merge");
\r
3348 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3350 theApp.DoWaitCursor(-1);
\r
3353 case ID_VIEWPATHREV:
\r
3355 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetSelectionMark()));
\r
3356 GitRev rev = pLogEntry->Rev;
\r
3357 CString relurl = changedpaths[0];
\r
3358 CString url = m_ProjectProperties.sWebViewerPathRev;
\r
3359 url.Replace(_T("%REVISION%"), rev.ToString());
\r
3360 url.Replace(_T("%PATH%"), relurl);
\r
3361 relurl = relurl.Mid(relurl.Find('/'));
\r
3362 url.Replace(_T("%PATH1%"), relurl);
\r
3363 if (!url.IsEmpty())
\r
3364 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
3372 } // if (popup.CreatePopupMenu())
\r
3376 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3378 // the date control should not show the "today" button
\r
3379 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
\r
3381 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3385 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3387 // the date control should not show the "today" button
\r
3388 CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();
\r
3390 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3394 void CLogDlg::OnSize(UINT nType, int cx, int cy)
\r
3396 __super::OnSize(nType, cx, cy);
\r
3398 SetSplitterRange();
\r
3401 void CLogDlg::OnRefresh()
\r
3403 if (GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
3410 void CLogDlg::OnFind()
\r
3412 if (!m_pFindDialog)
\r
3414 m_pFindDialog = new CFindReplaceDialog();
\r
3415 m_pFindDialog->Create(TRUE, NULL, NULL, FR_HIDEUPDOWN | FR_HIDEWHOLEWORD, this);
\r
3419 void CLogDlg::OnFocusFilter()
\r
3421 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3424 void CLogDlg::OnEditCopy()
\r
3426 if (GetFocus() == &m_ChangedFileListCtrl)
\r
3427 CopyChangedSelectionToClipBoard();
\r
3429 m_LogList.CopySelectionToClipBoard();
\r
3432 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
\r
3434 // is the URL a relative one?
\r
3435 if (url.Left(2).Compare(_T("^/")) == 0)
\r
3437 // URL is relative to the repository root
\r
3438 CString url1 = m_sRepositoryRoot + url.Mid(1);
\r
3439 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3440 DWORD len = url.GetLength();
\r
3441 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
\r
3442 return CString(buf, len);
\r
3445 else if (url[0] == '/')
\r
3447 // URL is relative to the server's hostname
\r
3449 // find the server's hostname
\r
3450 int schemepos = m_sRepositoryRoot.Find(_T("//"));
\r
3451 if (schemepos >= 0)
\r
3453 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));
\r
3454 CString url1 = sHost + url;
\r
3455 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3456 DWORD len = url.GetLength();
\r
3457 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
\r
3458 return CString(buf, len);
\r
3466 void CLogDlg::OnEnChangeSearchedit()
\r
3469 if (m_LogList.m_sFilterText.IsEmpty())
\r
3471 CStoreSelection storeselection(this);
\r
3472 // clear the filter, i.e. make all entries appear
\r
3473 theApp.DoWaitCursor(1);
\r
3474 KillTimer(LOGFILTER_TIMER);
\r
3475 FillLogMessageCtrl(false);
\r
3476 m_LogList.StartFilter();
\r
3478 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
3479 m_arShownList.RemoveAll();
\r
3480 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
3482 if (IsEntryInDateRange(i))
\r
3483 m_arShownList.Add(m_logEntries[i]);
\r
3485 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
3486 m_LogList.DeleteAllItems();
\r
3487 m_LogList.SetItemCountEx(ShownCountWithStopped());
\r
3488 m_LogList.RedrawItems(0, ShownCountWithStopped());
\r
3489 m_LogList.SetRedraw(false);
\r
3490 ResizeAllListCtrlCols();
\r
3491 m_LogList.SetRedraw(true);
\r
3493 theApp.DoWaitCursor(-1);
\r
3494 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
3495 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
3496 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3497 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
3500 if (Validate(m_LogList.m_sFilterText))
\r
3501 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
3503 KillTimer(LOGFILTER_TIMER);
\r
OSDN Git Service
