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
64 , m_bSelectionMustBeContinuous(false)
\r
65 , m_bShowBugtraqColumn(false)
\r
66 , m_lowestRev(_T(""))
\r
68 , m_sLogInfo(_T(""))
\r
69 , m_pFindDialog(NULL)
\r
70 , m_bCancelled(FALSE)
\r
71 , m_pNotifyWindow(NULL)
\r
73 , m_bAscending(FALSE)
\r
78 , m_bIncludeMerges(FALSE)
\r
82 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_Text(pDX, IDC_SEARCHEDIT, m_LogList.m_sFilterText);
\r
103 DDX_Control(pDX, IDC_DATEFROM, m_DateFrom);
\r
104 DDX_Control(pDX, IDC_DATETO, m_DateTo);
\r
105 DDX_Control(pDX, IDC_HIDEPATHS, m_cHidePaths);
\r
106 DDX_Control(pDX, IDC_GETALL, m_btnShow);
\r
107 DDX_Control(pDX, IDC_SHOWWHOLEPROJECT,m_btnShowWholeProject);
\r
108 DDX_Text(pDX, IDC_LOGINFO, m_sLogInfo);
\r
109 DDX_Check(pDX, IDC_INCLUDEMERGE, m_bIncludeMerges);
\r
110 DDX_Check(pDX, IDC_LOG_ALLBRANCH,m_bAllBranch);
\r
111 DDX_Control(pDX, IDC_SEARCHEDIT, m_cFilter);
\r
114 BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
\r
115 ON_REGISTERED_MESSAGE(m_FindDialogMessage, OnFindDialogMessage)
\r
116 ON_BN_CLICKED(IDC_GETALL, OnBnClickedGetall)
\r
117 //ON_NOTIFY(NM_DBLCLK, IDC_LOGMSG, OnNMDblclkChangedFileList)
\r
118 ON_WM_CONTEXTMENU()
\r
120 ON_BN_CLICKED(IDHELP, OnBnClickedHelp)
\r
121 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)
\r
122 ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)
\r
123 ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)
\r
126 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
\r
127 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
\r
129 ON_MESSAGE(MSG_LOAD_PERCENTAGE,OnLogListLoading)
\r
131 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
\r
133 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
\r
134 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
\r
135 ON_BN_CLICKED(IDC_SHOWWHOLEPROJECT, OnBnClickShowWholeProject)
\r
136 //ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGMSG, OnNMCustomdrawChangedFileList)
\r
137 //ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGMSG, OnLvnGetdispinfoChangedFileList)
\r
138 ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST , OnLvnColumnclick)
\r
139 //ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList)
\r
140 ON_BN_CLICKED(IDC_HIDEPATHS, OnBnClickedHidepaths)
\r
141 ON_BN_CLICKED(IDC_LOG_ALLBRANCH,OnBnClickedAllBranch)
\r
143 ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)
\r
144 ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)
\r
146 ON_BN_CLICKED(IDC_INCLUDEMERGE, &CLogDlg::OnBnClickedIncludemerge)
\r
147 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
\r
148 ON_COMMAND(ID_LOGDLG_REFRESH,&CLogDlg::OnRefresh)
\r
149 ON_COMMAND(ID_LOGDLG_FIND,&CLogDlg::OnFind)
\r
150 ON_COMMAND(ID_LOGDLG_FOCUSFILTER,&CLogDlg::OnFocusFilter)
\r
151 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
\r
154 void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit /* = FALSE */)
\r
158 m_startrev = startrev;
\r
159 m_LogRevision = startrev;
\r
161 m_hasWC = !path.IsUrl();
\r
163 if (::IsWindow(m_hWnd))
\r
167 BOOL CLogDlg::OnInitDialog()
\r
170 CResizableStandAloneDialog::OnInitDialog();
\r
172 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
\r
174 OSVERSIONINFOEX inf;
\r
175 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
176 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
177 GetVersionEx((OSVERSIONINFO *)&inf);
\r
178 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
179 m_bVista = (fullver >= 0x0600);
\r
181 // use the state of the "stop on copy/rename" option from the last time
\r
184 // set the font to use in the log message view, configured in the settings dialog
\r
185 CAppUtils::CreateFontForLogs(m_logFont);
\r
186 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
\r
187 // automatically detect URLs in the log message and turn them into links
\r
188 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_AUTOURLDETECT, TRUE, NULL);
\r
189 // make the log message rich edit control send a message when the mouse pointer is over a link
\r
190 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK);
\r
191 //m_LogList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_SUBITEMIMAGES);
\r
193 // the "hide unrelated paths" checkbox should be indeterminate
\r
194 m_cHidePaths.SetCheck(BST_INDETERMINATE);
\r
197 // if there is a working copy, load the project properties
\r
198 // to get information about the bugtraq: integration
\r
200 m_ProjectProperties.ReadProps(m_path);
\r
202 // the bugtraq issue id column is only shown if the bugtraq:url or bugtraq:regex is set
\r
203 if ((!m_ProjectProperties.sUrl.IsEmpty())||(!m_ProjectProperties.sCheckRe.IsEmpty()))
\r
204 m_bShowBugtraqColumn = true;
\r
206 //theme.SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);
\r
207 //theme.SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);
\r
209 // set up the columns
\r
210 m_LogList.DeleteAllItems();
\r
211 m_LogList.InsertGitColumn();
\r
213 m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);
\r
215 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
218 m_sMessageBuf.Preallocate(100000);
\r
220 // set the dialog title to "Log - path/to/whatever/we/show/the/log/for"
\r
221 SetDlgTitle(false);
\r
223 m_tooltips.Create(this);
\r
224 CheckRegexpTooltip();
\r
226 SetSplitterRange();
\r
228 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
\r
229 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
\r
230 m_cFilter.SetInfoIcon(IDI_LOGFILTER);
\r
231 m_cFilter.SetValidator(this);
\r
233 AdjustControlSize(IDC_HIDEPATHS);
\r
234 AdjustControlSize(IDC_INCLUDEMERGE);
\r
235 AdjustControlSize(IDC_LOG_ALLBRANCH);
\r
237 GetClientRect(m_DlgOrigRect);
\r
238 m_LogList.GetClientRect(m_LogListOrigRect);
\r
239 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
\r
240 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
\r
242 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
243 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
246 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
\r
247 AddAnchor(IDC_DATEFROM, TOP_LEFT);
\r
248 AddAnchor(IDC_TOLABEL, TOP_LEFT);
\r
249 AddAnchor(IDC_DATETO, TOP_LEFT);
\r
251 SetFilterCueText();
\r
252 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
\r
254 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
255 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
256 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
257 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
258 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
260 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
261 AddAnchor(IDC_HIDEPATHS, BOTTOM_LEFT);
\r
262 AddAnchor(IDC_LOG_ALLBRANCH,BOTTOM_LEFT);
\r
263 AddAnchor(IDC_INCLUDEMERGE, BOTTOM_LEFT);
\r
264 AddAnchor(IDC_GETALL, BOTTOM_LEFT);
\r
265 AddAnchor(IDC_SHOWWHOLEPROJECT, BOTTOM_LEFT);
\r
266 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
\r
267 AddAnchor(IDC_STATBUTTON, BOTTOM_RIGHT);
\r
268 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
269 AddAnchor(IDOK, BOTTOM_RIGHT);
\r
270 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
\r
271 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
273 // SetPromptParentWindow(m_hWnd);
\r
276 CenterWindow(CWnd::FromHandle(hWndExplorer));
\r
277 EnableSaveRestore(_T("LogDlg"));
\r
279 DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
280 DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
281 RECT rcDlg, rcLogList, rcChgMsg;
\r
282 GetClientRect(&rcDlg);
\r
283 m_LogList.GetWindowRect(&rcLogList);
\r
284 ScreenToClient(&rcLogList);
\r
285 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
\r
286 ScreenToClient(&rcChgMsg);
\r
290 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
291 ScreenToClient(&rectSplitter);
\r
292 int delta = yPos1 - rectSplitter.top;
\r
294 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
\r
296 m_wndSplitter1.SetWindowPos(NULL, 0, yPos1, 0, 0, SWP_NOSIZE);
\r
303 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
304 ScreenToClient(&rectSplitter);
\r
305 int delta = yPos2 - rectSplitter.top;
\r
307 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
\r
309 m_wndSplitter2.SetWindowPos(NULL, 0, yPos2, 0, 0, SWP_NOSIZE);
\r
317 // the dialog is used to select revisions
\r
318 if (m_bSelectionMustBeContinuous)
\r
319 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
321 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
325 // the dialog is used to just view log messages
\r
326 GetDlgItemText(IDOK, temp);
\r
327 SetDlgItemText(IDCANCEL, temp);
\r
328 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
\r
331 // set the choices for the "Show All" button
\r
332 temp.LoadString(IDS_LOG_SHOWALL);
\r
333 m_btnShow.AddEntry(temp);
\r
335 format.LoadString(IDS_LOG_SHOW_CURRENT_BRANCH);
\r
336 temp.Format(format,g_Git.GetCurrentBranch());
\r
337 m_btnShow.AddEntry(temp);
\r
338 temp.LoadString(IDS_LOG_SHOW_FIRST_PARENT);
\r
339 m_btnShow.AddEntry(temp);
\r
340 temp.LoadString(IDS_LOG_SHOW_NO_MERGE);
\r
341 m_btnShow.AddEntry(temp);
\r
342 m_btnShow.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")));
\r
344 temp.LoadString(IDS_LOG_SHOW_WHOLE);
\r
345 this->m_btnShowWholeProject.AddEntry(temp);
\r
346 format.LoadString(IDS_LOG_SHOW_CURRENT_PATH);
\r
347 temp.Format(format,m_path.GetGitPathString());
\r
348 if(!m_path.IsEmpty())
\r
350 this->m_btnShowWholeProject.AddEntry(temp);
\r
351 this->m_btnShowWholeProject.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowWholeProject")));
\r
355 m_mergedRevs.clear();
\r
357 // first start a thread to obtain the log messages without
\r
358 // blocking the dialog
\r
360 //m_tFrom = (DWORD)-1;
\r
362 m_LogList.m_Path=m_path;
\r
363 m_LogList.FetchLogAsync(this);
\r
365 GetDlgItem(IDC_LOGLIST)->SetFocus();
\r
369 LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM lParam)
\r
371 int cur=(int)wParam;
\r
373 if( cur == GITLOG_START )
\r
376 temp.LoadString(IDS_PROGRESSWAIT);
\r
378 this->m_LogList.ShowText(temp, true);
\r
380 // change the text of the close button to "Cancel" since now the thread
\r
381 // is running, and simply closing the dialog doesn't work.
\r
382 if (!GetDlgItem(IDOK)->IsWindowVisible())
\r
384 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
385 SetDlgItemText(IDCANCEL, temp);
\r
388 // We use a progress bar while getting the logs
\r
389 m_LogProgress.SetRange32(0, 100);
\r
390 m_LogProgress.SetPos(0);
\r
392 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
\r
394 //DialogEnableWindow(IDC_GETALL, FALSE);
\r
395 //DialogEnableWindow(IDC_SHOWWHOLEPROJECT, FALSE);
\r
396 //DialogEnableWindow(IDC_INCLUDEMERGE, FALSE);
\r
397 DialogEnableWindow(IDC_STATBUTTON, FALSE);
\r
398 DialogEnableWindow(IDC_REFRESH, FALSE);
\r
399 DialogEnableWindow(IDC_HIDEPATHS,FALSE);
\r
401 }else if( cur == GITLOG_END)
\r
404 //if (!m_bShowedAll)
\r
405 DialogEnableWindow(IDC_SHOWWHOLEPROJECT, TRUE);
\r
407 DialogEnableWindow(IDC_GETALL, TRUE);
\r
408 DialogEnableWindow(IDC_INCLUDEMERGE, TRUE);
\r
409 DialogEnableWindow(IDC_STATBUTTON, TRUE);
\r
410 DialogEnableWindow(IDC_REFRESH, TRUE);
\r
411 DialogEnableWindow(IDC_HIDEPATHS,TRUE);
\r
413 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
\r
414 GetDlgItem(IDC_PROGRESS)->ShowWindow(FALSE);
\r
415 //CTime time=m_LogList.GetOldestTime();
\r
417 m_LogList.GetTimeRange(begin,end);
\r
418 m_DateFrom.SetTime(&begin);
\r
419 m_DateTo.SetTime(&end);
\r
424 if(this->m_LogList.HasText())
\r
425 this->m_LogList.ClearText();
\r
426 m_LogProgress.SetPos(cur);
\r
430 void CLogDlg::SetDlgTitle(bool bOffline)
\r
432 if (m_sTitle.IsEmpty())
\r
433 GetWindowText(m_sTitle);
\r
438 if (m_path.IsUrl())
\r
439 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetUIPathString());
\r
440 else if (m_path.IsDirectory())
\r
441 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetWinPathString());
\r
443 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetFilename());
\r
444 SetWindowText(sTemp);
\r
448 if (m_path.IsUrl())
\r
449 SetWindowText(m_sTitle + _T(" - ") + m_path.GetUIPathString());
\r
450 else if (m_path.IsEmpty())
\r
451 SetWindowText(m_sTitle + _T(" - ") + CString(_T("Whole Project")));
\r
452 else if (m_path.IsDirectory())
\r
453 SetWindowText(m_sTitle + _T(" - ") + m_path.GetWinPathString());
\r
455 SetWindowText(m_sTitle + _T(" - ") + m_path.GetFilename());
\r
459 void CLogDlg::CheckRegexpTooltip()
\r
461 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
\r
462 // Since tooltip describes regexp features, show it only if regexps are enabled.
\r
463 if (m_bFilterWithRegex)
\r
465 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
\r
468 m_tooltips.DelTool(pWnd);
\r
471 void CLogDlg::EnableOKButton()
\r
475 // the dialog is used to select revisions
\r
476 if (m_bSelectionMustBeContinuous)
\r
477 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
479 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
482 DialogEnableWindow(IDOK, TRUE);
\r
485 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
\r
487 // we fill here the log message rich edit control,
\r
488 // and also populate the changed files list control
\r
489 // according to the selected revision(s).
\r
491 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
492 // empty the log message view
\r
493 pMsgView->SetWindowText(_T(" "));
\r
494 // empty the changed files list
\r
495 m_ChangedFileListCtrl.SetRedraw(FALSE);
\r
496 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
497 m_currentChangedArray = NULL;
\r
498 //m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );
\r
499 m_ChangedFileListCtrl.DeleteAllItems();
\r
501 // if we're not here to really show a selected revision, just
\r
502 // get out of here after clearing the views, which is what is intended
\r
503 // if that flag is not set.
\r
507 m_ChangedFileListCtrl.Invalidate();
\r
508 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
509 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
513 // depending on how many revisions are selected, we have to do different
\r
515 int selCount = m_LogList.GetSelectedCount();
\r
518 // if nothing is selected, we have nothing more to do
\r
519 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
520 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
523 else if (selCount == 1)
\r
525 // if one revision is selected, we have to fill the log message view
\r
526 // with the corresponding log message, and also fill the changed files
\r
528 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
529 int selIndex = m_LogList.GetNextSelectedItem(pos);
\r
530 if (selIndex >= m_LogList.m_arShownList.GetCount())
\r
532 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
533 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
536 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));
\r
538 if(!pLogEntry->m_IsFull)
\r
540 pMsgView->SetWindowText(_T("load ..."));
\r
543 // set the log message text
\r
544 pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash+_T("\r\n\r\n*")+pLogEntry->m_Subject+_T("\n\n")+pLogEntry->m_Body);
\r
545 // turn bug ID's into links if the bugtraq: properties have been set
\r
546 // and we can find a match of those in the log message
\r
547 m_ProjectProperties.FindBugID(pLogEntry->m_Body, pMsgView);
\r
548 CAppUtils::FormatTextInRichEditControl(pMsgView);
\r
550 int HidePaths=m_cHidePaths.GetState() & 0x0003;
\r
551 CString matchpath=this->m_path.GetGitPathString();
\r
553 for(int i=0;i<pLogEntry->m_Files.GetCount() && (!matchpath.IsEmpty());i++)
\r
555 ((CTGitPath&)pLogEntry->m_Files[i]).m_Action &= ~(CTGitPath::LOGACTIONS_HIDE|CTGitPath::LOGACTIONS_GRAY);
\r
557 if(pLogEntry->m_Files[i].GetGitPathString().Left(matchpath.GetLength()) != matchpath)
\r
559 if(HidePaths==BST_CHECKED)
\r
560 ((CTGitPath&)pLogEntry->m_Files[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;
\r
561 if(HidePaths==BST_INDETERMINATE)
\r
562 ((CTGitPath&)pLogEntry->m_Files[i]).m_Action |= CTGitPath::LOGACTIONS_GRAY;
\r
565 m_ChangedFileListCtrl.UpdateWithGitPathList(pLogEntry->m_Files);
\r
566 m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;
\r
567 m_ChangedFileListCtrl.Show(SVNSLC_SHOWVERSIONED);
\r
569 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
576 // more than one revision is selected:
\r
577 // the log message view must be emptied
\r
578 // the changed files list contains all the changed paths from all
\r
579 // selected revisions, with 'doubles' removed
\r
580 m_currentChangedPathList = GetChangedPathsFromSelectedRevisions(true);
\r
583 // redraw the views
\r
584 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
586 if (m_currentChangedArray)
\r
588 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedArray->GetCount());
\r
589 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedArray->GetCount());
\r
591 else if (m_currentChangedPathList.GetCount())
\r
593 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedPathList.GetCount());
\r
594 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedPathList.GetCount());
\r
598 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
599 m_ChangedFileListCtrl.Invalidate();
\r
602 // sort according to the settings
\r
603 if (m_nSortColumnPathList > 0)
\r
604 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
606 SetSortArrow(&m_ChangedFileListCtrl, -1, false);
\r
607 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
611 void CLogDlg::OnBnClickedGetall()
\r
616 void CLogDlg::GetAll(bool bIsShowProjectOrBranch)
\r
619 // fetch all requested log messages, either the specified range or
\r
620 // really *all* available log messages.
\r
622 if(bIsShowProjectOrBranch)
\r
624 INT_PTR entry = this->m_btnShowWholeProject.GetCurrentEntry();
\r
627 case 0: // show whole Project
\r
628 m_LogList.m_Path.Reset();
\r
629 SetWindowText(m_sTitle + _T(" - ")+_T("whole project"));
\r
631 case 1: // show whole project
\r
632 m_LogList.m_Path=this->m_path;
\r
633 SetWindowText(m_sTitle + _T(" - ")+this->m_path.GetGitPathString());
\r
639 INT_PTR entry = m_btnShow.GetCurrentEntry();
\r
642 case 0: // show all branch
\r
643 m_LogList.m_ShowMask=CGit::LOG_INFO_ALL_BRANCH;
\r
645 case 1: // show current branch
\r
646 m_LogList.m_ShowMask=0;
\r
648 case 2: // first parent
\r
649 m_LogList.m_ShowMask=CGit::LOG_INFO_FIRST_PARENT;
\r
651 case 3: // no merge
\r
652 m_LogList.m_ShowMask=CGit::LOG_INFO_NO_MERGE;
\r
657 m_LogList.m_bExitThread=TRUE;
\r
658 DWORD ret =::WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,20000);
\r
659 if(ret == WAIT_TIMEOUT)
\r
660 m_LogList.TerminateThread();
\r
663 m_LogList.FetchLogAsync(this);
\r
667 void CLogDlg::OnBnClickedRefresh()
\r
673 void CLogDlg::Refresh (bool autoGoOnline)
\r
675 m_LogList.Refresh();
\r
678 void CLogDlg::OnBnClickShowWholeProject()
\r
683 BOOL CLogDlg::Cancel()
\r
685 return m_bCancelled;
\r
688 void CLogDlg::SaveSplitterPos()
\r
692 CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
693 CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
695 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
696 ScreenToClient(&rectSplitter);
\r
697 regPos1 = rectSplitter.top;
\r
698 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
699 ScreenToClient(&rectSplitter);
\r
700 regPos2 = rectSplitter.top;
\r
704 void CLogDlg::OnCancel()
\r
706 // canceling means stopping the working thread if it's still running.
\r
707 // we do this by using the Subversion cancel callback.
\r
708 // But canceling can also mean just to close the dialog, depending on the
\r
709 // text shown on the cancel button (it could simply read "OK").
\r
710 CString temp, temp2;
\r
711 GetDlgItemText(IDOK, temp);
\r
712 temp2.LoadString(IDS_MSGBOX_CANCEL);
\r
713 if ((temp.Compare(temp2)==0)||(this->IsThreadRunning()))
\r
715 //m_bCancelled = true;
\r
717 if(m_LogList.m_bThreadRunning)
\r
719 //m_LogList.m_bExitThread=true;
\r
720 //WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,INFINITE);
\r
721 m_LogList.TerminateThread();
\r
724 //m_LogList.TerminateThread();
\r
728 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
729 reg = m_btnShow.GetCurrentEntry();
\r
731 reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowWholeProject"));
\r
732 reg = m_btnShowWholeProject.GetCurrentEntry();
\r
735 __super::OnCancel();
\r
738 CString CLogDlg::MakeShortMessage(const CString& message)
\r
740 bool bFoundShort = true;
\r
741 CString sShortMessage = m_ProjectProperties.GetLogSummary(message);
\r
742 if (sShortMessage.IsEmpty())
\r
744 bFoundShort = false;
\r
745 sShortMessage = message;
\r
747 // Remove newlines and tabs 'cause those are not shown nicely in the list control
\r
748 sShortMessage.Replace(_T("\r"), _T(""));
\r
749 sShortMessage.Replace(_T("\t"), _T(" "));
\r
751 // Suppose the first empty line separates 'summary' from the rest of the message.
\r
752 int found = sShortMessage.Find(_T("\n\n"));
\r
753 // To avoid too short 'short' messages
\r
754 // (e.g. if the message looks something like "Bugfix:\n\n*done this\n*done that")
\r
755 // only use the empty newline as a separator if it comes after at least 15 chars.
\r
756 if ((!bFoundShort)&&(found >= 15))
\r
758 sShortMessage = sShortMessage.Left(found);
\r
760 sShortMessage.Replace('\n', ' ');
\r
761 return sShortMessage;
\r
764 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
767 if (rev == SVN_INVALID_REVNUM)
\r
773 // this is the callback function which receives the data for every revision we ask the log for
\r
774 // we store this information here one by one.
\r
776 if (m_startrev == -1)
\r
781 m_LogProgress.SetPos(m_limit - m_limitcounter);
\r
783 else if (m_startrev.IsNumber() && m_startrev.IsNumber())
\r
784 m_LogProgress.SetPos((git_revnum_t)m_startrev-rev+(git_revnum_t)m_endrev);
\r
785 __time64_t ttime = time/1000000L;
\r
786 if (m_tTo < (DWORD)ttime)
\r
787 m_tTo = (DWORD)ttime;
\r
788 if (m_tFrom > (DWORD)ttime)
\r
789 m_tFrom = (DWORD)ttime;
\r
790 if ((m_lowestRev > rev)||(m_lowestRev < 0))
\r
792 // Add as many characters from the log message to the list control
\r
793 PLOGENTRYDATA pLogItem = new LOGENTRYDATA;
\r
794 pLogItem->bCopies = !!copies;
\r
796 // find out if this item was copied in the revision
\r
797 BOOL copiedself = FALSE;
\r
800 for (INT_PTR cpPathIndex = 0; cpPathIndex < cpaths->GetCount(); ++cpPathIndex)
\r
802 LogChangedPath * cpath = cpaths->GetAt(cpPathIndex);
\r
803 if (!cpath->sCopyFromPath.IsEmpty() && (cpath->sPath.Compare(m_sSelfRelativeURL) == 0))
\r
805 // note: this only works if the log is fetched top-to-bottom
\r
806 // but since we do that, it shouldn't be a problem
\r
807 m_sSelfRelativeURL = cpath->sCopyFromPath;
\r
813 pLogItem->bCopiedSelf = copiedself;
\r
814 pLogItem->tmDate = ttime;
\r
815 pLogItem->sAuthor = author;
\r
816 pLogItem->sDate = date;
\r
817 pLogItem->sShortMessage = MakeShortMessage(message);
\r
818 pLogItem->dwFileChanges = filechanges;
\r
819 pLogItem->actions = actions;
\r
820 pLogItem->haschildren = haschildren;
\r
821 pLogItem->childStackDepth = m_childCounter;
\r
822 m_maxChild = max(m_childCounter, m_maxChild);
\r
825 pLogItem->sBugIDs = m_ProjectProperties.FindBugID(message).Trim();
\r
827 // split multi line log entries and concatenate them
\r
828 // again but this time with \r\n as line separators
\r
829 // so that the edit control recognizes them
\r
832 if (message.GetLength()>0)
\r
834 m_sMessageBuf = message;
\r
835 m_sMessageBuf.Replace(_T("\n\r"), _T("\n"));
\r
836 m_sMessageBuf.Replace(_T("\r\n"), _T("\n"));
\r
837 if (m_sMessageBuf.Right(1).Compare(_T("\n"))==0)
\r
838 m_sMessageBuf = m_sMessageBuf.Left(m_sMessageBuf.GetLength()-1);
\r
841 m_sMessageBuf.Empty();
\r
842 pLogItem->sMessage = m_sMessageBuf;
\r
843 pLogItem->Rev = rev;
\r
845 // move-construct path array
\r
847 pLogItem->pArChangedPaths = new LogChangedPathArray (*cpaths);
\r
848 cpaths->RemoveAll();
\r
850 catch (CException * e)
\r
852 ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR);
\r
854 m_bCancelled = TRUE;
\r
856 m_logEntries.push_back(pLogItem);
\r
857 m_arShownList.Add(pLogItem);
\r
863 //this is the thread function which calls the subversion function
\r
868 void CLogDlg::CopyChangedSelectionToClipBoard()
\r
871 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
873 return; // nothing is selected, get out of here
\r
877 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
880 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
883 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
884 sPaths += m_currentChangedPathList[nItem].GetGitPathString();
\r
885 sPaths += _T("\r\n");
\r
890 // only one revision is selected in the log dialog top pane
\r
891 // but multiple items could be selected in the changed items list
\r
892 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
895 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
896 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
898 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
900 // some items are hidden! So find out which item the user really selected
\r
901 INT_PTR selRealIndex = -1;
\r
902 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
904 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
906 if (selRealIndex == nItem)
\r
908 changedlogpath = pLogEntry->pArChangedPaths->GetAt(hiddenindex);
\r
913 if (changedlogpath)
\r
915 sPaths += changedlogpath->sPath;
\r
916 sPaths += _T("\r\n");
\r
921 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
\r
925 BOOL CLogDlg::IsDiffPossible(LogChangedPath * changedpath, git_revnum_t rev)
\r
928 CString added, deleted;
\r
929 if (changedpath == NULL)
\r
932 if ((rev > 1)&&(changedpath->action != LOGACTIONS_DELETED))
\r
934 if (changedpath->action == LOGACTIONS_ADDED) // file is added
\r
936 if (changedpath->lCopyFromRev == 0)
\r
937 return FALSE; // but file was not added with history
\r
945 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
\r
947 // we have two separate context menus:
\r
948 // one shown on the log message list control,
\r
949 // the other shown in the changed-files list control
\r
950 int selCount = m_LogList.GetSelectedCount();
\r
951 if (pWnd == &m_LogList)
\r
953 //ShowContextMenuForRevisions(pWnd, point);
\r
955 else if (pWnd == &m_ChangedFileListCtrl)
\r
957 //ShowContextMenuForChangedpaths(pWnd, point);
\r
959 else if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
961 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
964 selIndex = m_LogList.GetNextSelectedItem(pos);
\r
965 if ((point.x == -1) && (point.y == -1))
\r
968 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
\r
969 ClientToScreen(&rect);
\r
970 point = rect.CenterPoint();
\r
972 CString sMenuItemText;
\r
974 if (popup.CreatePopupMenu())
\r
976 // add the 'default' entries
\r
977 sMenuItemText.LoadString(IDS_SCIEDIT_COPY);
\r
978 popup.AppendMenu(MF_STRING | MF_ENABLED, WM_COPY, sMenuItemText);
\r
979 sMenuItemText.LoadString(IDS_SCIEDIT_SELECTALL);
\r
980 popup.AppendMenu(MF_STRING | MF_ENABLED, EM_SETSEL, sMenuItemText);
\r
982 //if (selIndex >= 0)
\r
984 // popup.AppendMenu(MF_SEPARATOR);
\r
985 // sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);
\r
986 // popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);
\r
989 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
993 break; // no command selected
\r
996 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
\r
998 case CGitLogList::ID_EDITAUTHOR:
\r
999 EditLogMessage(selIndex);
\r
1007 LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
1010 ASSERT(m_pFindDialog != NULL);
\r
1012 if (m_pFindDialog->IsTerminating())
\r
1014 // invalidate the handle identifying the dialog box.
\r
1015 m_pFindDialog = NULL;
\r
1019 if(m_pFindDialog->FindNext())
\r
1021 //read data from dialog
\r
1022 CString FindText = m_pFindDialog->GetFindString();
\r
1023 bool bMatchCase = (m_pFindDialog->MatchCase() == TRUE);
\r
1024 bool bFound = false;
\r
1026 bool bRegex = ValidateRegexp(FindText, pat, bMatchCase);
\r
1028 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_not_null;
\r
1031 for (i = this->m_nSearchIndex; i<m_arShownList.GetCount()&&!bFound; i++)
\r
1035 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1037 if (regex_search(wstring((LPCTSTR)pLogEntry->sMessage), pat, flags))
\r
1042 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1043 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1045 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1046 if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags))
\r
1052 if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags))
\r
1064 if (m_logEntries[i]->sMessage.Find(FindText) >= 0)
\r
1069 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1070 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1071 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1073 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1074 if (cpath->sCopyFromPath.Find(FindText)>=0)
\r
1080 if (cpath->sPath.Find(FindText)>=0)
\r
1090 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1091 CString msg = pLogEntry->sMessage;
\r
1092 msg = msg.MakeLower();
\r
1093 CString find = FindText.MakeLower();
\r
1094 if (msg.Find(find) >= 0)
\r
1099 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1100 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1102 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1103 CString lowerpath = cpath->sCopyFromPath;
\r
1104 lowerpath.MakeLower();
\r
1105 if (lowerpath.Find(find)>=0)
\r
1111 lowerpath = cpath->sPath;
\r
1112 lowerpath.MakeLower();
\r
1113 if (lowerpath.Find(find)>=0)
\r
1122 } // for (i = this->m_nSearchIndex; i<m_arShownList.GetItemCount()&&!bFound; i++)
\r
1125 this->m_nSearchIndex = (i+1);
\r
1126 m_LogList.EnsureVisible(i, FALSE);
\r
1127 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);
\r
1128 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
1129 m_LogList.SetSelectionMark(i);
\r
1130 FillLogMessageCtrl();
\r
1131 UpdateData(FALSE);
\r
1133 if (m_nSearchIndex >= m_arShownList.GetCount())
\r
1134 m_nSearchIndex = (int)m_arShownList.GetCount()-1;
\r
1136 } // if(m_pFindDialog->FindNext())
\r
1137 UpdateLogInfoLabel();
\r
1142 void CLogDlg::OnOK()
\r
1145 // since the log dialog is also used to select revisions for other
\r
1146 // dialogs, we have to do some work before closing this dialog
\r
1147 if (GetFocus() != GetDlgItem(IDOK))
\r
1148 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
\r
1149 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
\r
1150 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
\r
1153 CString buttontext;
\r
1154 GetDlgItemText(IDOK, buttontext);
\r
1155 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
1156 if (temp.Compare(buttontext) != 0)
\r
1157 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
\r
1158 m_bCancelled = TRUE;
\r
1159 m_selectedRevs.Clear();
\r
1160 m_selectedRevsOneRange.Clear();
\r
1161 if (m_pNotifyWindow)
\r
1163 int selIndex = m_LogList.GetSelectionMark();
\r
1164 if (selIndex >= 0)
\r
1166 PLOGENTRYDATA pLogEntry = NULL;
\r
1167 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1168 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1169 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1170 git_revnum_t lowerRev = pLogEntry->Rev;
\r
1171 git_revnum_t higherRev = lowerRev;
\r
1174 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1175 git_revnum_t rev = pLogEntry->Rev;
\r
1176 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1177 if (lowerRev > rev)
\r
1179 if (higherRev < rev)
\r
1182 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
\r
1184 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
\r
1186 BOOL bSentMessage = FALSE;
\r
1187 if (m_LogList.GetSelectedCount() == 1)
\r
1189 // if only one revision is selected, check if the path/url with which the dialog was started
\r
1190 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
\r
1191 // if it was copied, use the copy from revision as lowerRev
\r
1192 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
\r
1194 CString sUrl = m_path.GetGitPathString();
\r
1195 if (!m_path.IsUrl())
\r
1197 sUrl = GetURLFromPath(m_path);
\r
1199 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
\r
1200 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
\r
1202 LogChangedPath * pData = pLogEntry->pArChangedPaths->GetAt(cp);
\r
1205 if (sUrl.Compare(pData->sPath) == 0)
\r
1207 if (!pData->sCopyFromPath.IsEmpty())
\r
1209 lowerRev = pData->lCopyFromRev;
\r
1210 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
\r
1211 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
\r
1212 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1213 bSentMessage = TRUE;
\r
1220 if ( !bSentMessage )
\r
1222 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
\r
1223 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
\r
1224 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1225 if (m_selectedRevsOneRange.GetCount())
\r
1226 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
\r
1231 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
1232 reg = m_btnShow.GetCurrentEntry();
\r
1233 SaveSplitterPos();
\r
1237 void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
1239 // a double click on an entry in the changed-files list has happened
\r
1242 DiffSelectedFile();
\r
1245 void CLogDlg::DiffSelectedFile()
\r
1248 if (m_bThreadRunning)
\r
1250 UpdateLogInfoLabel();
\r
1251 INT_PTR selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
1254 if (m_ChangedFileListCtrl.GetSelectedCount() == 0)
\r
1256 // find out if there's an entry selected in the log list
\r
1257 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1258 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1259 git_revnum_t rev1 = pLogEntry->Rev;
\r
1260 git_revnum_t rev2 = rev1;
\r
1265 // there's at least a second entry selected in the log list: several revisions selected!
\r
1266 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1269 rev1 = max(rev1,(long)pLogEntry->Rev);
\r
1270 rev2 = min(rev2,(long)pLogEntry->Rev);
\r
1274 // now we have both revisions selected in the log list, so we can do a diff of the selected
\r
1275 // entry in the changed files list with these two revisions.
\r
1276 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1281 // nothing or only one revision selected in the log list
\r
1282 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1284 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
1286 // some items are hidden! So find out which item the user really clicked on
\r
1287 INT_PTR selRealIndex = -1;
\r
1288 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
1290 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
1292 if (selRealIndex == selIndex)
\r
1294 selIndex = hiddenindex;
\r
1295 changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1301 if (IsDiffPossible(changedpath, rev1))
\r
1303 // diffs with renamed files are possible
\r
1304 if ((changedpath)&&(!changedpath->sCopyFromPath.IsEmpty()))
\r
1305 rev2 = changedpath->lCopyFromRev;
\r
1308 // if the path was modified but the parent path was 'added with history'
\r
1309 // then we have to use the copy from revision of the parent path
\r
1310 CTGitPath cpath = CTGitPath(changedpath->sPath);
\r
1311 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
1313 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
1314 if (p.IsAncestorOf(cpath))
\r
1316 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
1317 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
1321 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1325 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1326 CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1328 // deleted files must be opened from the revision before the deletion
\r
1329 if (changedpath->action == LOGACTIONS_DELETED)
\r
1331 m_bCancelled = false;
\r
1333 CProgressDlg progDlg;
\r
1334 progDlg.SetTitle(IDS_APPNAME);
\r
1335 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1336 CString sInfoLine;
\r
1337 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)(m_sRepositoryRoot + changedpath->sPath), (LPCTSTR)r.ToString());
\r
1338 progDlg.SetLine(1, sInfoLine, true);
\r
1339 SetAndClearProgressInfo(&progDlg);
\r
1340 progDlg.ShowModeless(m_hWnd);
\r
1342 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))
\r
1344 m_bCancelled = false;
\r
1345 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), GitRev::REV_HEAD, r, tempfile))
\r
1348 SetAndClearProgressInfo((HWND)NULL);
\r
1349 CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1354 SetAndClearProgressInfo((HWND)NULL);
\r
1356 CString sName1, sName2;
\r
1357 sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1);
\r
1358 sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1-1);
\r
1359 CAppUtils::DiffFlags flags;
\r
1360 flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1361 if (changedpath->action == LOGACTIONS_DELETED)
\r
1362 CAppUtils::StartExtDiff(tempfile, tempfile2, sName2, sName1, flags);
\r
1364 CAppUtils::StartExtDiff(tempfile2, tempfile, sName2, sName1, flags);
\r
1371 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool blame, bool unified)
\r
1373 DialogEnableWindow(IDOK, FALSE);
\r
1374 // SetPromptApp(&theApp);
\r
1375 theApp.DoWaitCursor(1);
\r
1378 GetTempPath(temppath);
\r
1381 file1.Format(_T("%s%s_%s%s"),
\r
1383 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1384 rev1->m_CommitHash.Left(6),
\r
1385 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1388 file2.Format(_T("%s\\%s_%s%s"),
\r
1390 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1391 rev2->m_CommitHash.Left(6),
\r
1392 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1396 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1397 g_Git.RunLogFile(cmd,file1);
\r
1398 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1399 g_Git.RunLogFile(cmd,file2);
\r
1401 CAppUtils::DiffFlags flags;
\r
1402 CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),flags);
\r
1405 //get the filename
\r
1407 if (Git::PathIsURL(m_path))
\r
1409 filepath = m_path.GetGitPathString();
\r
1413 filepath = GetURLFromPath(m_path);
\r
1414 if (filepath.IsEmpty())
\r
1416 theApp.DoWaitCursor(-1);
\r
1418 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1419 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1420 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1422 theApp.DoWaitCursor(-11);
\r
1426 m_bCancelled = FALSE;
\r
1427 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1429 CString firstfile, secondfile;
\r
1430 if (m_LogList.GetSelectedCount()==1)
\r
1432 int s = m_LogList.GetSelectionMark();
\r
1433 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(s));
\r
1434 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1435 firstfile = changedpath->sPath;
\r
1436 secondfile = firstfile;
\r
1437 if ((rev2 == rev1-1)&&(changedpath->lCopyFromRev > 0)) // is it an added file with history?
\r
1439 secondfile = changedpath->sCopyFromPath;
\r
1440 rev2 = changedpath->lCopyFromRev;
\r
1445 firstfile = m_currentChangedPathList[selIndex].GetGitPathString();
\r
1446 secondfile = firstfile;
\r
1449 firstfile = filepath + firstfile.Trim();
\r
1450 secondfile = filepath + secondfile.Trim();
\r
1452 GitDiff diff(this, this->m_hWnd, true);
\r
1453 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1454 diff.SetHEADPeg(m_LogRevision);
\r
1457 if (PromptShown())
\r
1458 diff.ShowUnifiedDiff(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1);
\r
1460 CAppUtils::StartShowUnifiedDiff(m_hWnd, CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), m_LogRevision);
\r
1464 if (diff.ShowCompare(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), false, blame))
\r
1466 if (firstfile.Compare(secondfile)==0)
\r
1468 git_revnum_t baseRev = 0;
\r
1469 diff.DiffProps(CTGitPath(firstfile), rev2, rev1, baseRev);
\r
1476 theApp.DoWaitCursor(-1);
\r
1480 BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, git_revnum_t rev)
\r
1483 DialogEnableWindow(IDOK, FALSE);
\r
1484 SetPromptApp(&theApp);
\r
1485 theApp.DoWaitCursor(1);
\r
1487 if (Git::PathIsURL(m_path))
\r
1489 filepath = m_path.GetGitPathString();
\r
1493 filepath = GetURLFromPath(m_path);
\r
1494 if (filepath.IsEmpty())
\r
1496 theApp.DoWaitCursor(-1);
\r
1498 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1499 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1500 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1505 m_bCancelled = false;
\r
1506 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1507 filepath += changedpath;
\r
1509 CProgressDlg progDlg;
\r
1510 progDlg.SetTitle(IDS_APPNAME);
\r
1511 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1512 CString sInfoLine;
\r
1513 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)GitRev(rev).ToString());
\r
1514 progDlg.SetLine(1, sInfoLine, true);
\r
1515 SetAndClearProgressInfo(&progDlg);
\r
1516 progDlg.ShowModeless(m_hWnd);
\r
1518 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(filepath), rev);
\r
1519 m_bCancelled = false;
\r
1520 if (!Cat(CTGitPath(filepath), GitRev(rev), rev, tempfile))
\r
1523 SetAndClearProgressInfo((HWND)NULL);
\r
1524 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1526 theApp.DoWaitCursor(-1);
\r
1530 SetAndClearProgressInfo((HWND)NULL);
\r
1531 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
1534 int ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
\r
1535 if (ret <= HINSTANCE_ERROR)
\r
1540 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
1541 cmd += tempfile.GetWinPathString() + _T(" ");
\r
1542 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
1545 theApp.DoWaitCursor(-1);
\r
1550 void CLogDlg::EditAuthor(const CLogDataVector& logs)
\r
1555 if (logs.size() == 0)
\r
1557 DialogEnableWindow(IDOK, FALSE);
\r
1558 SetPromptApp(&theApp);
\r
1559 theApp.DoWaitCursor(1);
\r
1560 if (Git::PathIsURL(m_path))
\r
1561 url = m_path.GetGitPathString();
\r
1564 url = GetURLFromPath(m_path);
\r
1566 name = Git_PROP_REVISION_AUTHOR;
\r
1568 CString value = RevPropertyGet(name, CTGitPath(url), logs[0]->Rev);
\r
1569 CString sOldValue = value;
\r
1570 value.Replace(_T("\n"), _T("\r\n"));
\r
1571 CInputDlg dlg(this);
\r
1572 dlg.m_sHintText.LoadString(IDS_LOG_AUTHOR);
\r
1573 dlg.m_sInputText = value;
\r
1574 dlg.m_sTitle.LoadString(IDS_LOG_AUTHOREDITTITLE);
\r
1575 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1576 dlg.m_bUseLogWidth = false;
\r
1577 if (dlg.DoModal() == IDOK)
\r
1579 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1581 LogCache::CCachedLogInfo* toUpdate
\r
1582 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1584 CProgressDlg progDlg;
\r
1585 progDlg.SetTitle(IDS_APPNAME);
\r
1586 progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
\r
1587 progDlg.SetTime(true);
\r
1588 progDlg.SetShowProgressBar(true);
\r
1589 progDlg.ShowModeless(m_hWnd);
\r
1590 for (DWORD i=0; i<logs.size(); ++i)
\r
1592 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), logs[i]->Rev))
\r
1595 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1601 logs[i]->sAuthor = dlg.m_sInputText;
\r
1602 m_LogList.Invalidate();
\r
1604 // update the log cache
\r
1606 if (toUpdate != NULL)
\r
1608 // log caching is active
\r
1610 LogCache::CCachedLogInfo newInfo;
\r
1611 newInfo.Insert ( logs[i]->Rev
\r
1612 , (const char*) CUnicodeUtils::GetUTF8 (logs[i]->sAuthor)
\r
1615 , LogCache::CRevisionInfoContainer::HAS_AUTHOR);
\r
1617 toUpdate->Update (newInfo);
\r
1620 progDlg.SetProgress64(i, logs.size());
\r
1624 theApp.DoWaitCursor(-1);
\r
1629 void CLogDlg::EditLogMessage(int index)
\r
1634 DialogEnableWindow(IDOK, FALSE);
\r
1635 SetPromptApp(&theApp);
\r
1636 theApp.DoWaitCursor(1);
\r
1637 if (Git::PathIsURL(m_path))
\r
1638 url = m_path.GetGitPathString();
\r
1641 url = GetURLFromPath(m_path);
\r
1643 name = Git_PROP_REVISION_LOG;
\r
1645 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(index));
\r
1646 m_bCancelled = FALSE;
\r
1647 CString value = RevPropertyGet(name, CTGitPath(url), pLogEntry->Rev);
\r
1648 CString sOldValue = value;
\r
1649 value.Replace(_T("\n"), _T("\r\n"));
\r
1650 CInputDlg dlg(this);
\r
1651 dlg.m_sHintText.LoadString(IDS_LOG_MESSAGE);
\r
1652 dlg.m_sInputText = value;
\r
1653 dlg.m_sTitle.LoadString(IDS_LOG_MESSAGEEDITTITLE);
\r
1654 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1655 dlg.m_bUseLogWidth = true;
\r
1656 if (dlg.DoModal() == IDOK)
\r
1658 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1659 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), pLogEntry->Rev))
\r
1661 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1665 pLogEntry->sShortMessage = MakeShortMessage(dlg.m_sInputText);
\r
1666 // split multi line log entries and concatenate them
\r
1667 // again but this time with \r\n as line separators
\r
1668 // so that the edit control recognizes them
\r
1669 if (dlg.m_sInputText.GetLength()>0)
\r
1671 m_sMessageBuf = dlg.m_sInputText;
\r
1672 dlg.m_sInputText.Replace(_T("\n\r"), _T("\n"));
\r
1673 dlg.m_sInputText.Replace(_T("\r\n"), _T("\n"));
\r
1674 if (dlg.m_sInputText.Right(1).Compare(_T("\n"))==0)
\r
1675 dlg.m_sInputText = dlg.m_sInputText.Left(dlg.m_sInputText.GetLength()-1);
\r
1678 dlg.m_sInputText.Empty();
\r
1679 pLogEntry->sMessage = dlg.m_sInputText;
\r
1680 pLogEntry->sBugIDs = m_ProjectProperties.FindBugID(dlg.m_sInputText);
\r
1681 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
1682 pMsgView->SetWindowText(_T(" "));
\r
1683 pMsgView->SetWindowText(dlg.m_sInputText);
\r
1684 m_ProjectProperties.FindBugID(dlg.m_sInputText, pMsgView);
\r
1685 m_LogList.Invalidate();
\r
1687 // update the log cache
\r
1689 LogCache::CCachedLogInfo* toUpdate
\r
1690 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1691 if (toUpdate != NULL)
\r
1693 // log caching is active
\r
1695 LogCache::CCachedLogInfo newInfo;
\r
1696 newInfo.Insert ( pLogEntry->Rev
\r
1698 , (const char*) CUnicodeUtils::GetUTF8 (pLogEntry->sMessage)
\r
1700 , LogCache::CRevisionInfoContainer::HAS_COMMENT);
\r
1702 toUpdate->Update (newInfo);
\r
1706 theApp.DoWaitCursor(-1);
\r
1711 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
\r
1713 // Skip Ctrl-C when copying text out of the log message or search filter
\r
1714 BOOL bSkipAccelerator = ( pMsg->message == WM_KEYDOWN && pMsg->wParam=='C' && (GetFocus()==GetDlgItem(IDC_MSGVIEW) || GetFocus()==GetDlgItem(IDC_SEARCHEDIT) ) && GetKeyState(VK_CONTROL)&0x8000 );
\r
1715 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
\r
1717 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
\r
1719 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))
\r
1721 DiffSelectedRevWithPrevious();
\r
1725 if (GetFocus()==GetDlgItem(IDC_LOGMSG))
\r
1727 DiffSelectedFile();
\r
1731 if (m_hAccel && !bSkipAccelerator)
\r
1733 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
\r
1738 m_tooltips.RelayEvent(pMsg);
\r
1739 return __super::PreTranslateMessage(pMsg);
\r
1743 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
1745 //if (this->IsThreadRunning())
\r
1746 if(m_LogList.m_bNoDispUpdates)
\r
1748 // only show the wait cursor over the list control
\r
1750 ((pWnd == GetDlgItem(IDC_LOGLIST))||
\r
1751 (pWnd == GetDlgItem(IDC_MSGVIEW))||
\r
1752 (pWnd == GetDlgItem(IDC_LOGMSG))))
\r
1754 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
1759 if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1760 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1762 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
1764 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1767 void CLogDlg::OnBnClickedHelp()
\r
1772 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1774 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1776 //if (this->IsThreadRunning())
\r
1777 if(m_LogList.m_bNoDispUpdates)
\r
1779 if (pNMLV->iItem >= 0)
\r
1781 m_nSearchIndex = pNMLV->iItem;
\r
1782 if (pNMLV->iSubItem != 0)
\r
1784 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount()))
\r
1786 // remove the selected state
\r
1787 if (pNMLV->uChanged & LVIF_STATE)
\r
1789 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
\r
1790 FillLogMessageCtrl();
\r
1791 UpdateData(FALSE);
\r
1792 UpdateLogInfoLabel();
\r
1796 if (pNMLV->uChanged & LVIF_STATE)
\r
1798 FillLogMessageCtrl();
\r
1799 UpdateData(FALSE);
\r
1804 FillLogMessageCtrl();
\r
1805 UpdateData(FALSE);
\r
1808 UpdateLogInfoLabel();
\r
1811 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
\r
1813 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
\r
1814 if (pEnLink->msg == WM_LBUTTONUP)
\r
1817 GetDlgItemText(IDC_MSGVIEW, msg);
\r
1818 msg.Replace(_T("\r\n"), _T("\n"));
\r
1819 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
\r
1820 if (!::PathIsURL(url))
\r
1822 url = m_ProjectProperties.GetBugIDUrl(url);
\r
1823 url = GetAbsoluteUrlFromRelativeUrl(url);
\r
1825 if (!url.IsEmpty())
\r
1826 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
1831 void CLogDlg::OnBnClickedStatbutton()
\r
1834 if (this->IsThreadRunning())
\r
1836 if (m_LogList.m_arShownList.IsEmpty())
\r
1837 return; // nothing is shown, so no statistics.
\r
1838 // the statistics dialog expects the log entries to be sorted by date
\r
1839 SortByColumn(3, false);
\r
1840 CPtrArray shownlist;
\r
1841 m_LogList.RecalculateShownList(&shownlist);
\r
1842 // create arrays which are aware of the current filter
\r
1843 CStringArray m_arAuthorsFiltered;
\r
1844 CDWordArray m_arDatesFiltered;
\r
1845 CDWordArray m_arFileChangesFiltered;
\r
1846 for (INT_PTR i=0; i<shownlist.GetCount(); ++i)
\r
1848 GitRev* pLogEntry = reinterpret_cast<GitRev*>(shownlist.GetAt(i));
\r
1849 CString strAuthor = pLogEntry->m_AuthorName;
\r
1850 if ( strAuthor.IsEmpty() )
\r
1852 strAuthor.LoadString(IDS_STATGRAPH_EMPTYAUTHOR);
\r
1854 m_arAuthorsFiltered.Add(strAuthor);
\r
1855 m_arDatesFiltered.Add(pLogEntry->m_AuthorDate.GetTime());
\r
1856 m_arFileChangesFiltered.Add(pLogEntry->m_Files.GetCount());
\r
1858 CStatGraphDlg dlg;
\r
1859 dlg.m_parAuthors = &m_arAuthorsFiltered;
\r
1860 dlg.m_parDates = &m_arDatesFiltered;
\r
1861 dlg.m_parFileChanges = &m_arFileChangesFiltered;
\r
1862 dlg.m_path = m_path;
\r
1864 // restore the previous sorting
\r
1865 SortByColumn(m_nSortColumn, m_bAscending);
\r
1866 OnTimer(LOGFILTER_TIMER);
\r
1871 void CLogDlg::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1874 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
1875 // Take the default processing unless we set this to something else below.
\r
1876 *pResult = CDRF_DODEFAULT;
\r
1878 if (m_bNoDispUpdates)
\r
1881 switch (pLVCD->nmcd.dwDrawStage)
\r
1883 case CDDS_PREPAINT:
\r
1885 *pResult = CDRF_NOTIFYITEMDRAW;
\r
1889 case CDDS_ITEMPREPAINT:
\r
1891 // This is the prepaint stage for an item. Here's where we set the
\r
1892 // item's text color.
\r
1894 // Tell Windows to send draw notifications for each subitem.
\r
1895 *pResult = CDRF_NOTIFYSUBITEMDRAW;
\r
1897 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
1899 if (m_arShownList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1901 GitRev* data = (GitRev*)m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec);
\r
1905 if (data->bCopiedSelf)
\r
1907 // only change the background color if the item is not 'hot' (on vista with themes enabled)
\r
1908 if (!theme.IsAppThemed() || !m_bVista || ((pLVCD->nmcd.uItemState & CDIS_HOT)==0))
\r
1909 pLVCD->clrTextBk = GetSysColor(COLOR_MENU);
\r
1912 if (data->bCopies)
\r
1913 crText = m_Colors.GetColor(CColors::Modified);
\r
1915 // if ((data->childStackDepth)||(m_mergedRevs.find(data->Rev) != m_mergedRevs.end()))
\r
1916 // crText = GetSysColor(COLOR_GRAYTEXT);
\r
1917 // if (data->Rev == m_wcRev)
\r
1919 // SelectObject(pLVCD->nmcd.hdc, m_boldFont);
\r
1920 // We changed the font, so we're returning CDRF_NEWFONT. This
\r
1921 // tells the control to recalculate the extent of the text.
\r
1922 // *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;
\r
1926 if (m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1928 if (m_bStrictStopped)
\r
1929 crText = GetSysColor(COLOR_GRAYTEXT);
\r
1931 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
1932 pLVCD->clrText = crText;
\r
1936 case CDDS_ITEMPREPAINT|CDDS_ITEM|CDDS_SUBITEM:
\r
1938 if ((m_bStrictStopped)&&(m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
1940 pLVCD->nmcd.uItemState &= ~(CDIS_SELECTED|CDIS_FOCUS);
\r
1942 if (pLVCD->iSubItem == 1)
\r
1944 *pResult = CDRF_DODEFAULT;
\r
1946 if (m_arShownList.GetCount() <= (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1950 int iconwidth = ::GetSystemMetrics(SM_CXSMICON);
\r
1951 int iconheight = ::GetSystemMetrics(SM_CYSMICON);
\r
1953 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec));
\r
1955 // Get the selected state of the
\r
1956 // item being drawn.
\r
1958 SecureZeroMemory(&rItem, sizeof(LVITEM));
\r
1959 rItem.mask = LVIF_STATE;
\r
1960 rItem.iItem = pLVCD->nmcd.dwItemSpec;
\r
1961 rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
\r
1962 m_LogList.GetItem(&rItem);
\r
1965 m_LogList.GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);
\r
1967 // Fill the background
\r
1968 if (theme.IsAppThemed() && m_bVista)
\r
1970 theme.Open(m_hWnd, L"Explorer");
\r
1971 int state = LISS_NORMAL;
\r
1972 if (rItem.state & LVIS_SELECTED)
\r
1974 if (::GetFocus() == m_LogList.m_hWnd)
\r
1975 state |= LISS_SELECTED;
\r
1977 state |= LISS_SELECTEDNOTFOCUS;
\r
1982 if (pLogEntry->bCopiedSelf)
\r
1984 // unfortunately, the pLVCD->nmcd.uItemState does not contain valid
\r
1985 // information at this drawing stage. But we can check the whether the
\r
1986 // previous stage changed the background color of the item
\r
1987 if (pLVCD->clrTextBk == GetSysColor(COLOR_MENU))
\r
1990 brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
1993 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
1994 ::DeleteObject(brush);
\r
2001 if (theme.IsBackgroundPartiallyTransparent(LVP_LISTDETAIL, state))
\r
2002 theme.DrawParentBackground(m_hWnd, pLVCD->nmcd.hdc, &rect);
\r
2004 theme.DrawBackground(pLVCD->nmcd.hdc, LVP_LISTDETAIL, state, &rect, NULL);
\r
2009 if (rItem.state & LVIS_SELECTED)
\r
2011 if (::GetFocus() == m_LogList.m_hWnd)
\r
2012 brush = ::CreateSolidBrush(::GetSysColor(COLOR_HIGHLIGHT));
\r
2014 brush = ::CreateSolidBrush(::GetSysColor(COLOR_BTNFACE));
\r
2018 //if (pLogEntry->bCopiedSelf)
\r
2019 // brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
2021 brush = ::CreateSolidBrush(::GetSysColor(COLOR_WINDOW));
\r
2023 if (brush == NULL)
\r
2026 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
2027 ::DeleteObject(brush);
\r
2030 // Draw the icon(s) into the compatible DC
\r
2031 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
2032 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left + ICONITEMBORDER, rect.top, m_hModifiedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2035 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
2036 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hAddedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2039 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
2040 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hDeletedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2043 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
2044 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hReplacedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2046 *pResult = CDRF_SKIPDEFAULT;
\r
2052 *pResult = CDRF_DODEFAULT;
\r
2057 void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2060 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
2061 // Take the default processing unless we set this to something else below.
\r
2062 *pResult = CDRF_DODEFAULT;
\r
2064 // if (m_bNoDispUpdates)
\r
2067 // First thing - check the draw stage. If it's the control's prepaint
\r
2068 // stage, then tell Windows we want messages for every item.
\r
2070 if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2072 *pResult = CDRF_NOTIFYITEMDRAW;
\r
2074 else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2076 // This is the prepaint stage for an item. Here's where we set the
\r
2077 // item's text color. Our return value will tell Windows to draw the
\r
2078 // item itself, but it will use the new color we set here.
\r
2080 // Tell Windows to paint the control itself.
\r
2081 *pResult = CDRF_DODEFAULT;
\r
2083 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
2084 bool bGrayed = false;
\r
2086 if ((m_cHidePaths.GetState() & 0x0003)==BST_INDETERMINATE)
\r
2088 if ((m_currentChangedArray)&&((m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)))
\r
2090 //if ((*m_currentChangedArray)[(pLVCD->nmcd.dwItemSpec)]sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2092 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2096 else if (m_currentChangedPathList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
2098 //if (m_currentChangedPathList[pLVCD->nmcd.dwItemSpec].GetGitPathString().Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2100 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2107 if ((!bGrayed)&&(m_currentChangedArray)&&(m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
2109 DWORD action = ((*m_currentChangedArray)[pLVCD->nmcd.dwItemSpec]).m_Action;
\r
2110 if (action == CTGitPath::LOGACTIONS_MODIFIED)
\r
2111 crText = m_Colors.GetColor(CColors::Modified);
\r
2112 if (action == CTGitPath::LOGACTIONS_REPLACED)
\r
2113 crText = m_Colors.GetColor(CColors::Deleted);
\r
2114 if (action == CTGitPath::LOGACTIONS_ADDED)
\r
2115 crText = m_Colors.GetColor(CColors::Added);
\r
2116 if (action == CTGitPath::LOGACTIONS_DELETED)
\r
2117 crText = m_Colors.GetColor(CColors::Deleted);
\r
2120 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
2121 pLVCD->clrText = crText;
\r
2125 void CLogDlg::DoSizeV1(int delta)
\r
2128 RemoveAnchor(IDC_LOGLIST);
\r
2129 RemoveAnchor(IDC_SPLITTERTOP);
\r
2130 RemoveAnchor(IDC_MSGVIEW);
\r
2131 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2132 RemoveAnchor(IDC_LOGMSG);
\r
2133 CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);
\r
2134 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);
\r
2135 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2136 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2137 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2138 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2139 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2142 SetSplitterRange();
\r
2143 m_LogList.Invalidate();
\r
2144 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2148 void CLogDlg::DoSizeV2(int delta)
\r
2151 RemoveAnchor(IDC_LOGLIST);
\r
2152 RemoveAnchor(IDC_SPLITTERTOP);
\r
2153 RemoveAnchor(IDC_MSGVIEW);
\r
2154 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2155 RemoveAnchor(IDC_LOGMSG);
\r
2156 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);
\r
2157 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);
\r
2158 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2159 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2160 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2161 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2162 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2165 SetSplitterRange();
\r
2166 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2167 m_ChangedFileListCtrl.Invalidate();
\r
2171 void CLogDlg::AdjustMinSize()
\r
2173 // adjust the minimum size of the dialog to prevent the resizing from
\r
2174 // moving the list control too far down.
\r
2175 CRect rcChgListView;
\r
2176 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
\r
2178 m_LogList.GetClientRect(rcLogList);
\r
2180 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
\r
2181 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
\r
2182 +rcChgListView.Height()+rcLogList.Height()+60));
\r
2185 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
2187 switch (message) {
\r
2189 if (wParam == IDC_SPLITTERTOP)
\r
2191 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2192 DoSizeV1(pHdr->delta);
\r
2194 else if (wParam == IDC_SPLITTERBOTTOM)
\r
2196 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2197 DoSizeV2(pHdr->delta);
\r
2202 return CResizableDialog::DefWindowProc(message, wParam, lParam);
\r
2205 void CLogDlg::SetSplitterRange()
\r
2207 if ((m_LogList)&&(m_ChangedFileListCtrl))
\r
2210 m_LogList.GetWindowRect(rcTop);
\r
2211 ScreenToClient(rcTop);
\r
2213 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);
\r
2214 ScreenToClient(rcMiddle);
\r
2215 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);
\r
2217 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
\r
2218 ScreenToClient(rcBottom);
\r
2219 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);
\r
2223 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
\r
2225 RECT * rect = (LPRECT)lParam;
\r
2228 point = CPoint(rect->left, rect->bottom);
\r
2229 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))
\r
2231 if (popup.CreatePopupMenu())
\r
2233 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2234 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ALL), LOGFILTER_ALL, temp);
\r
2236 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2238 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2239 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
\r
2240 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2241 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
\r
2242 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2243 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
\r
2244 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2245 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
\r
2246 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
\r
2247 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
\r
2249 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2251 temp.LoadString(IDS_LOG_FILTER_REGEX);
\r
2252 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
\r
2255 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2256 if (selection != 0)
\r
2259 if (selection == LOGFILTER_REGEX)
\r
2261 m_bFilterWithRegex = !m_bFilterWithRegex;
\r
2262 CRegDWORD b = CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
2263 b = m_bFilterWithRegex;
\r
2264 CheckRegexpTooltip();
\r
2268 m_LogList.m_nSelectedFilter = selection;
\r
2269 SetFilterCueText();
\r
2271 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2277 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
2280 KillTimer(LOGFILTER_TIMER);
\r
2282 m_LogList.m_sFilterText.Empty();
\r
2283 UpdateData(FALSE);
\r
2284 theApp.DoWaitCursor(1);
\r
2285 CStoreSelection storeselection(this);
\r
2286 FillLogMessageCtrl(false);
\r
2288 m_LogList.RemoveFilter();
\r
2291 m_LogList.GetTimeRange(begin,end);
\r
2292 m_DateFrom.SetTime(&begin);
\r
2293 m_DateTo.SetTime(&end);
\r
2295 theApp.DoWaitCursor(-1);
\r
2296 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2297 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2298 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2299 UpdateLogInfoLabel();
\r
2305 void CLogDlg::SetFilterCueText()
\r
2308 switch (m_LogList.m_nSelectedFilter)
\r
2310 case LOGFILTER_ALL:
\r
2311 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2313 case LOGFILTER_MESSAGES:
\r
2314 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2316 case LOGFILTER_PATHS:
\r
2317 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2319 case LOGFILTER_AUTHORS:
\r
2320 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2322 case LOGFILTER_REVS:
\r
2323 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2326 // to make the cue banner text appear more to the right of the edit control
\r
2327 temp = _T(" ")+temp;
\r
2328 m_cFilter.SetCueBanner(temp);
\r
2331 bool CLogDlg::Validate(LPCTSTR string)
\r
2333 if (!m_bFilterWithRegex)
\r
2336 return m_LogList.ValidateRegexp(string, pat, false);
\r
2340 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
\r
2342 if (nIDEvent == LOGFILTER_TIMER)
\r
2344 if (this->IsThreadRunning())
\r
2346 // thread still running! So just restart the timer.
\r
2347 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2350 CWnd * focusWnd = GetFocus();
\r
2351 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
\r
2352 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
\r
2353 if (m_LogList.m_sFilterText.IsEmpty())
\r
2355 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2356 // do not return here!
\r
2357 // we also need to run the filter if the filter text is empty:
\r
2358 // 1. to clear an existing filter
\r
2359 // 2. to rebuild the m_arShownList after sorting
\r
2361 theApp.DoWaitCursor(1);
\r
2362 CStoreSelection storeselection(this);
\r
2363 KillTimer(LOGFILTER_TIMER);
\r
2364 FillLogMessageCtrl(false);
\r
2366 // now start filter the log list
\r
2367 m_LogList.StartFilter();
\r
2369 if ( m_LogList.GetItemCount()==1 )
\r
2371 m_LogList.SetSelectionMark(0);
\r
2372 m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
\r
2374 theApp.DoWaitCursor(-1);
\r
2375 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2376 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2377 if (bSetFocusToFilterControl)
\r
2378 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2379 UpdateLogInfoLabel();
\r
2380 } // if (nIDEvent == LOGFILTER_TIMER)
\r
2381 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2382 __super::OnTimer(nIDEvent);
\r
2385 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2388 m_DateTo.GetTime(_time);
\r
2391 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
\r
2392 if (time.GetTime() != m_LogList.m_To.GetTime())
\r
2394 m_LogList.m_To = (DWORD)time.GetTime();
\r
2395 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2398 catch (CAtlException)
\r
2405 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2408 m_DateFrom.GetTime(_time);
\r
2411 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
\r
2412 if (time.GetTime() != m_LogList.m_From.GetTime())
\r
2414 m_LogList.m_From = (DWORD)time.GetTime();
\r
2415 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2418 catch (CAtlException)
\r
2427 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths /* = false */, bool bUseFilter /* = true */)
\r
2429 CTGitPathList pathList;
\r
2432 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2434 m_sRepositoryRoot = GetRepositoryRoot(m_path);
\r
2436 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2439 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2444 int nextpos = m_LogList.GetNextSelectedItem(pos);
\r
2445 if (nextpos >= m_arShownList.GetCount())
\r
2447 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(nextpos));
\r
2448 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
2449 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
2451 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2452 if (cpath == NULL)
\r
2455 if (!bRelativePaths)
\r
2456 path.SetFromGit(m_sRepositoryRoot);
\r
2457 path.AppendPathString(cpath->sPath);
\r
2458 if ((!bUseFilter)||
\r
2459 ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||
\r
2460 (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))
\r
2461 pathList.AddPath(path);
\r
2466 pathList.RemoveDuplicates();
\r
2471 void CLogDlg::SortByColumn(int nSortColumn, bool bAscending)
\r
2474 switch(nSortColumn)
\r
2476 case 0: // Revision
\r
2479 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
\r
2481 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
\r
2487 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
\r
2489 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
\r
2495 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
\r
2497 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
\r
2503 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
\r
2505 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
\r
2508 case 4: // Message or bug id
\r
2509 if (m_bShowBugtraqColumn)
\r
2512 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
\r
2514 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
\r
2517 // fall through here
\r
2518 case 5: // Message
\r
2521 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
\r
2523 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
\r
2533 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
2535 if (this->IsThreadRunning())
\r
2536 return; //no sorting while the arrays are filled
\r
2537 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2538 const int nColumn = pNMLV->iSubItem;
\r
2539 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
\r
2540 m_nSortColumn = nColumn;
\r
2541 SortByColumn(m_nSortColumn, m_bAscending);
\r
2542 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
\r
2543 SortShownListArray();
\r
2544 m_LogList.Invalidate();
\r
2545 UpdateLogInfoLabel();
\r
2550 void CLogDlg::SortShownListArray()
\r
2552 // make sure the shown list still matches the filter after sorting.
\r
2553 OnTimer(LOGFILTER_TIMER);
\r
2554 // clear the selection states
\r
2555 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2558 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
\r
2560 m_LogList.SetSelectionMark(-1);
\r
2563 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
\r
2565 if (control == NULL)
\r
2567 // set the sort arrow
\r
2568 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
\r
2569 HDITEM HeaderItem = {0};
\r
2570 HeaderItem.mask = HDI_FORMAT;
\r
2571 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
2573 pHeader->GetItem(i, &HeaderItem);
\r
2574 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
2575 pHeader->SetItem(i, &HeaderItem);
\r
2579 pHeader->GetItem(nColumn, &HeaderItem);
\r
2580 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
2581 pHeader->SetItem(nColumn, &HeaderItem);
\r
2584 void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2587 if (this->IsThreadRunning())
\r
2588 return; //no sorting while the arrays are filled
\r
2589 if (m_currentChangedArray == NULL)
\r
2591 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2592 const int nColumn = pNMLV->iSubItem;
\r
2593 m_bAscendingPathList = nColumn == m_nSortColumnPathList ? !m_bAscendingPathList : TRUE;
\r
2594 m_nSortColumnPathList = nColumn;
\r
2595 // qsort(m_currentChangedArray->GetData(), m_currentChangedArray->GetSize(), sizeof(LogChangedPath*), (GENERICCOMPAREFN)SortCompare);
\r
2597 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
2598 m_ChangedFileListCtrl.Invalidate();
\r
2603 int CLogDlg::m_nSortColumnPathList = 0;
\r
2604 bool CLogDlg::m_bAscendingPathList = false;
\r
2606 int CLogDlg::SortCompare(const void * pElem1, const void * pElem2)
\r
2609 LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);
\r
2610 LogChangedPath * cpath2 = *((LogChangedPath**)pElem2);
\r
2612 if (m_bAscendingPathList)
\r
2613 std::swap (cpath1, cpath2);
\r
2616 switch (m_nSortColumnPathList)
\r
2619 cmp = cpath2->GetAction().Compare(cpath1->GetAction());
\r
2624 cmp = cpath2->sPath.CompareNoCase(cpath1->sPath);
\r
2628 case 2: // copy from path
\r
2629 cmp = cpath2->sCopyFromPath.Compare(cpath1->sCopyFromPath);
\r
2633 case 3: // copy from revision
\r
2634 return cpath2->lCopyFromRev > cpath1->lCopyFromRev;
\r
2640 void CLogDlg::OnBnClickedHidepaths()
\r
2642 FillLogMessageCtrl();
\r
2643 m_ChangedFileListCtrl.Invalidate();
\r
2648 void CLogDlg::OnBnClickedCheckStoponcopy()
\r
2651 if (!GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
2654 // ignore old fetch limits when switching
\r
2655 // between copy-following and stop-on-copy
\r
2656 // (otherwise stop-on-copy will limit what
\r
2657 // we see immediately after switching to
\r
2658 // copy-following)
\r
2662 // now, restart the query
\r
2667 void CLogDlg::OnBnClickedIncludemerge()
\r
2677 void CLogDlg::UpdateLogInfoLabel()
\r
2680 git_revnum_t rev1 ;
\r
2681 git_revnum_t rev2 ;
\r
2682 long selectedrevs = 0;
\r
2683 int count =m_LogList.m_arShownList.GetCount();
\r
2686 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(0)))->m_CommitHash;
\r
2687 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));
\r
2688 rev2 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(count-1)))->m_CommitHash;
\r
2689 selectedrevs = m_LogList.GetSelectedCount();
\r
2692 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
2693 m_sLogInfo = sTemp;
\r
2695 UpdateData(FALSE);
\r
2699 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
\r
2702 int selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
2703 if ((point.x == -1) && (point.y == -1))
\r
2706 m_ChangedFileListCtrl.GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2707 m_ChangedFileListCtrl.ClientToScreen(&rect);
\r
2708 point = rect.CenterPoint();
\r
2712 int s = m_LogList.GetSelectionMark();
\r
2715 std::vector<CString> changedpaths;
\r
2716 std::vector<LogChangedPath*> changedlogpaths;
\r
2717 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2719 return; // nothing is selected, get out of here
\r
2721 bool bOneRev = true;
\r
2722 int sel=m_LogList.GetNextSelectedItem(pos);
\r
2723 GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel));
\r
2724 GitRev * rev1 = pLogEntry;
\r
2725 GitRev * rev2 = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel+1));
\r
2727 bool bOneRev = true;
\r
2732 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
2735 rev1 = max(rev1,(git_revnum_t)pLogEntry->Rev);
\r
2736 rev2 = min(rev2,(git_revnum_t)pLogEntry->Rev);
\r
2742 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
2745 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
2746 changedpaths.push_back(m_currentChangedPathList[nItem].GetGitPathString());
\r
2751 // only one revision is selected in the log dialog top pane
\r
2752 // but multiple items could be selected in the changed items list
\r
2755 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
2758 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
2759 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
2761 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
2763 if ((changedlogpath)&&(!changedlogpath->sCopyFromPath.IsEmpty()))
\r
2764 rev2 = changedlogpath->lCopyFromRev;
\r
2767 // if the path was modified but the parent path was 'added with history'
\r
2768 // then we have to use the copy from revision of the parent path
\r
2769 CTGitPath cpath = CTGitPath(changedlogpath->sPath);
\r
2770 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
2772 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
2773 if (p.IsAncestorOf(cpath))
\r
2775 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
2776 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
2781 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
2783 // some items are hidden! So find out which item the user really clicked on
\r
2784 INT_PTR selRealIndex = -1;
\r
2785 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
2787 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
2789 if (selRealIndex == nItem)
\r
2791 selIndex = hiddenindex;
\r
2792 changedlogpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
2797 if (changedlogpath)
\r
2799 changedpaths.push_back(changedlogpath->sPath);
\r
2800 changedlogpaths.push_back(changedlogpath);
\r
2805 //entry is selected, now show the popup menu
\r
2807 if (popup.CreatePopupMenu())
\r
2809 bool bEntryAdded = false;
\r
2810 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
2812 // if ((!bOneRev)||(IsDiffPossible(changedlogpaths[0], rev1)))
\r
2814 popup.AppendMenuIcon(CGitLogList::ID_DIFF, IDS_LOG_POPUP_DIFF, IDI_DIFF);
\r
2815 popup.AppendMenuIcon(CGitLogList::ID_BLAMEDIFF, IDS_LOG_POPUP_BLAMEDIFF, IDI_BLAME);
\r
2816 popup.SetDefaultItem(CGitLogList::ID_DIFF, FALSE);
\r
2817 popup.AppendMenuIcon(CGitLogList::ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF);
\r
2818 bEntryAdded = true;
\r
2820 // if (rev2 == rev1-1)
\r
2823 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2824 popup.AppendMenuIcon(CGitLogList::ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);
\r
2825 popup.AppendMenuIcon(CGitLogList::ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2826 popup.AppendMenuIcon(CGitLogList::ID_BLAME, IDS_LOG_POPUP_BLAME, IDI_BLAME);
\r
2827 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2829 popup.AppendMenuIcon(CGitLogList::ID_REVERTREV, IDS_LOG_POPUP_REVERTREV, IDI_REVERT);
\r
2830 popup.AppendMenuIcon(CGitLogList::ID_POPPROPS, IDS_REPOBROWSE_SHOWPROP, IDI_PROPERTIES); // "Show Properties"
\r
2831 popup.AppendMenuIcon(CGitLogList::ID_LOG, IDS_MENULOG, IDI_LOG); // "Show Log"
\r
2832 popup.AppendMenuIcon(CGitLogList::ID_GETMERGELOGS, IDS_LOG_POPUP_GETMERGELOGS, IDI_LOG); // "Show merge log"
\r
2833 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
\r
2834 bEntryAdded = true;
\r
2835 if (!m_ProjectProperties.sWebViewerPathRev.IsEmpty())
\r
2837 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2838 popup.AppendMenuIcon(CGitLogList::ID_VIEWPATHREV, IDS_LOG_POPUP_VIEWPATHREV);
\r
2840 if (popup.GetDefaultItem(0,FALSE)==-1)
\r
2841 popup.SetDefaultItem(CGitLogList::ID_OPEN, FALSE);
\r
2844 else if (changedlogpaths.size())
\r
2846 // more than one entry is selected
\r
2847 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE);
\r
2848 bEntryAdded = true;
\r
2853 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2854 bool bOpenWith = false;
\r
2855 bool bMergeLog = false;
\r
2856 m_bCancelled = false;
\r
2860 case CGitLogList::ID_DIFF:
\r
2862 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
2866 case ID_BLAMEDIFF:
\r
2868 DoDiffFromLog(selIndex, rev1, rev2, true, false);
\r
2873 DoDiffFromLog(selIndex, rev1, rev2, false, true);
\r
2876 case ID_REVERTREV:
\r
2878 SetPromptApp(&theApp);
\r
2879 theApp.DoWaitCursor(1);
\r
2881 if (Git::PathIsURL(m_path))
\r
2883 sUrl = m_path.GetGitPathString();
\r
2887 sUrl = GetURLFromPath(m_path);
\r
2888 if (sUrl.IsEmpty())
\r
2890 theApp.DoWaitCursor(-1);
\r
2892 temp.Format(IDS_ERR_NOURLOFFILE, m_path.GetWinPath());
\r
2893 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
2895 theApp.DoWaitCursor(-1);
\r
2899 // find the working copy path of the selected item from the URL
\r
2900 m_bCancelled = false;
\r
2901 CString sUrlRoot = GetRepositoryRoot(CTGitPath(sUrl));
\r
2903 CString fileURL = changedpaths[0];
\r
2904 fileURL = sUrlRoot + fileURL.Trim();
\r
2905 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1
\r
2906 // sUrl = http://mydomain.com/repos/trunk/folder
\r
2907 CString sUnescapedUrl = CPathUtils::PathUnescape(sUrl);
\r
2908 // find out until which char the urls are identical
\r
2910 while ((i<fileURL.GetLength())&&(i<sUnescapedUrl.GetLength())&&(fileURL[i]==sUnescapedUrl[i]))
\r
2912 int leftcount = m_path.GetWinPathString().GetLength()-(sUnescapedUrl.GetLength()-i);
\r
2913 CString wcPath = m_path.GetWinPathString().Left(leftcount);
\r
2914 wcPath += fileURL.Mid(i);
\r
2915 wcPath.Replace('/', '\\');
\r
2916 CGitProgressDlg dlg;
\r
2917 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
2919 // a deleted path! Since the path isn't there anymore, merge
\r
2920 // won't work. So just do a copy url->wc
\r
2921 dlg.SetCommand(CGitProgressDlg::GitProgress_Copy);
\r
2922 dlg.SetPathList(CTGitPathList(CTGitPath(fileURL)));
\r
2923 dlg.SetUrl(wcPath);
\r
2924 dlg.SetRevision(rev2);
\r
2928 if (!PathFileExists(wcPath))
\r
2930 // seems the path got renamed
\r
2931 // tell the user how to work around this.
\r
2932 CMessageBox::Show(this->m_hWnd, IDS_LOG_REVERTREV_ERROR, IDS_APPNAME, MB_ICONERROR);
\r
2934 theApp.DoWaitCursor(-1);
\r
2937 dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);
\r
2938 dlg.SetPathList(CTGitPathList(CTGitPath(wcPath)));
\r
2939 dlg.SetUrl(fileURL);
\r
2940 dlg.SetSecondUrl(fileURL);
\r
2941 GitRevRangeArray revarray;
\r
2942 revarray.AddRevRange(rev1, rev2);
\r
2943 dlg.SetRevisionRanges(revarray);
\r
2946 msg.Format(IDS_LOG_REVERT_CONFIRM, (LPCTSTR)wcPath);
\r
2947 if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)
\r
2951 theApp.DoWaitCursor(-1);
\r
2956 DialogEnableWindow(IDOK, FALSE);
\r
2957 SetPromptApp(&theApp);
\r
2958 theApp.DoWaitCursor(1);
\r
2960 if (Git::PathIsURL(m_path))
\r
2962 filepath = m_path.GetGitPathString();
\r
2966 filepath = GetURLFromPath(m_path);
\r
2967 if (filepath.IsEmpty())
\r
2969 theApp.DoWaitCursor(-1);
\r
2971 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
2972 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
2973 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
2978 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
2979 filepath += changedpaths[0];
\r
2982 dlg.m_Path = CTGitPath(filepath);
\r
2985 theApp.DoWaitCursor(-1);
\r
2990 DialogEnableWindow(IDOK, FALSE);
\r
2991 SetPromptApp(&theApp);
\r
2992 theApp.DoWaitCursor(1);
\r
2994 if (Git::PathIsURL(m_path))
\r
2996 filepath = m_path.GetGitPathString();
\r
3000 filepath = GetURLFromPath(m_path);
\r
3001 if (filepath.IsEmpty())
\r
3003 theApp.DoWaitCursor(-1);
\r
3005 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3006 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3007 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3012 m_bCancelled = false;
\r
3013 CString sRoot = GetRepositoryRoot(CTGitPath(filepath));
\r
3014 // if more than one entry is selected, we save them
\r
3015 // one by one into a folder the user has selected
\r
3016 bool bTargetSelected = false;
\r
3017 CTGitPath TargetPath;
\r
3018 if (m_ChangedFileListCtrl.GetSelectedCount() > 1)
\r
3020 CBrowseFolder browseFolder;
\r
3021 browseFolder.SetInfo(CString(MAKEINTRESOURCE(IDS_LOG_SAVEFOLDERTOHINT)));
\r
3022 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
3023 CString strSaveAsDirectory;
\r
3024 if (browseFolder.Show(GetSafeHwnd(), strSaveAsDirectory) == CBrowseFolder::OK)
\r
3026 TargetPath = CTGitPath(strSaveAsDirectory);
\r
3027 bTargetSelected = true;
\r
3032 // Display the Open dialog box.
\r
3033 CString revFilename;
\r
3035 temp = CPathUtils::GetFileNameFromPath(changedpaths[0]);
\r
3036 int rfind = temp.ReverseFind('.');
\r
3038 revFilename.Format(_T("%s-%ld%s"), (LPCTSTR)temp.Left(rfind), rev1, (LPCTSTR)temp.Mid(rfind));
\r
3040 revFilename.Format(_T("%s-%ld"), (LPCTSTR)temp, rev1);
\r
3041 bTargetSelected = CAppUtils::FileOpenSave(revFilename, NULL, IDS_LOG_POPUP_SAVE, IDS_COMMONFILEFILTER, false, m_hWnd);
\r
3042 TargetPath.SetFromWin(revFilename);
\r
3044 if (bTargetSelected)
\r
3046 CProgressDlg progDlg;
\r
3047 progDlg.SetTitle(IDS_APPNAME);
\r
3048 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
3049 for (std::vector<LogChangedPath*>::iterator it = changedlogpaths.begin(); it!= changedlogpaths.end(); ++it)
\r
3051 GitRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;
\r
3053 CString sInfoLine;
\r
3054 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)getrev.ToString());
\r
3055 progDlg.SetLine(1, sInfoLine, true);
\r
3056 SetAndClearProgressInfo(&progDlg);
\r
3057 progDlg.ShowModeless(m_hWnd);
\r
3059 CTGitPath tempfile = TargetPath;
\r
3060 if (changedpaths.size() > 1)
\r
3062 // if multiple items are selected, then the TargetPath
\r
3063 // points to a folder and we have to append the filename
\r
3064 // to save to to that folder.
\r
3065 CString sName = (*it)->sPath;
\r
3066 int slashpos = sName.ReverseFind('/');
\r
3067 if (slashpos >= 0)
\r
3068 sName = sName.Mid(slashpos);
\r
3069 tempfile.AppendPathString(sName);
\r
3070 // one problem here:
\r
3071 // a user could have selected multiple items which
\r
3072 // have the same filename but reside in different
\r
3073 // directories, e.g.
\r
3076 // in that case, the second 'file1' will overwrite
\r
3077 // the already saved 'file1'.
\r
3079 // we could maybe find the common root of all selected
\r
3080 // items and then create sub folders to save those files
\r
3082 // But I think we should just leave it that way: to check
\r
3083 // out multiple items at once, the better way is still to
\r
3084 // use the export command from the top pane of the log dialog.
\r
3086 filepath = sRoot + (*it)->sPath;
\r
3087 if (!Cat(CTGitPath(filepath), getrev, getrev, tempfile))
\r
3090 SetAndClearProgressInfo((HWND)NULL);
\r
3091 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3093 theApp.DoWaitCursor(-1);
\r
3098 SetAndClearProgressInfo((HWND)NULL);
\r
3101 theApp.DoWaitCursor(-1);
\r
3108 GitRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;
\r
3109 Open(bOpenWith,changedpaths[0],getrev);
\r
3115 if (Git::PathIsURL(m_path))
\r
3117 filepath = m_path.GetGitPathString();
\r
3121 filepath = GetURLFromPath(m_path);
\r
3122 if (filepath.IsEmpty())
\r
3124 theApp.DoWaitCursor(-1);
\r
3126 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3127 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3128 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3133 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3134 filepath += changedpaths[0];
\r
3136 dlg.EndRev = rev1;
\r
3137 if (dlg.DoModal() == IDOK)
\r
3142 tempfile = blame.BlameToTempFile(CTGitPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);
\r
3143 if (!tempfile.IsEmpty())
\r
3145 if (dlg.m_bTextView)
\r
3147 //open the default text editor for the result file
\r
3148 CAppUtils::StartTextViewer(tempfile);
\r
3152 CString sParams = _T("/path:\"") + filepath + _T("\" ");
\r
3153 if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(filepath),sParams))
\r
3161 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3166 case ID_GETMERGELOGS:
\r
3171 DialogEnableWindow(IDOK, FALSE);
\r
3172 SetPromptApp(&theApp);
\r
3173 theApp.DoWaitCursor(1);
\r
3175 if (Git::PathIsURL(m_path))
\r
3177 filepath = m_path.GetGitPathString();
\r
3181 filepath = GetURLFromPath(m_path);
\r
3182 if (filepath.IsEmpty())
\r
3184 theApp.DoWaitCursor(-1);
\r
3186 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3187 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3188 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3193 m_bCancelled = false;
\r
3194 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3195 filepath += changedpaths[0];
\r
3196 git_revnum_t logrev = rev1;
\r
3197 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3199 // if the item got deleted in this revision,
\r
3200 // fetch the log from the previous revision where it
\r
3205 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\" /startrev:%ld"), (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)filepath, logrev);
\r
3207 sCmd += _T(" /merge");
\r
3208 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3210 theApp.DoWaitCursor(-1);
\r
3213 case ID_VIEWPATHREV:
\r
3215 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetSelectionMark()));
\r
3216 GitRev rev = pLogEntry->Rev;
\r
3217 CString relurl = changedpaths[0];
\r
3218 CString url = m_ProjectProperties.sWebViewerPathRev;
\r
3219 url.Replace(_T("%REVISION%"), rev.ToString());
\r
3220 url.Replace(_T("%PATH%"), relurl);
\r
3221 relurl = relurl.Mid(relurl.Find('/'));
\r
3222 url.Replace(_T("%PATH1%"), relurl);
\r
3223 if (!url.IsEmpty())
\r
3224 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
3232 } // if (popup.CreatePopupMenu())
\r
3236 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3238 // the date control should not show the "today" button
\r
3239 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
\r
3241 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3245 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3247 // the date control should not show the "today" button
\r
3248 CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();
\r
3250 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3254 void CLogDlg::OnSize(UINT nType, int cx, int cy)
\r
3256 __super::OnSize(nType, cx, cy);
\r
3258 SetSplitterRange();
\r
3261 void CLogDlg::OnRefresh()
\r
3263 if (GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
3270 void CLogDlg::OnFind()
\r
3272 if (!m_pFindDialog)
\r
3274 m_pFindDialog = new CFindReplaceDialog();
\r
3275 m_pFindDialog->Create(TRUE, NULL, NULL, FR_HIDEUPDOWN | FR_HIDEWHOLEWORD, this);
\r
3279 void CLogDlg::OnFocusFilter()
\r
3281 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3284 void CLogDlg::OnEditCopy()
\r
3286 if (GetFocus() == &m_ChangedFileListCtrl)
\r
3287 CopyChangedSelectionToClipBoard();
\r
3289 m_LogList.CopySelectionToClipBoard();
\r
3292 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
\r
3294 // is the URL a relative one?
\r
3295 if (url.Left(2).Compare(_T("^/")) == 0)
\r
3297 // URL is relative to the repository root
\r
3298 CString url1 = m_sRepositoryRoot + url.Mid(1);
\r
3299 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3300 DWORD len = url.GetLength();
\r
3301 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
\r
3302 return CString(buf, len);
\r
3305 else if (url[0] == '/')
\r
3307 // URL is relative to the server's hostname
\r
3309 // find the server's hostname
\r
3310 int schemepos = m_sRepositoryRoot.Find(_T("//"));
\r
3311 if (schemepos >= 0)
\r
3313 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));
\r
3314 CString url1 = sHost + url;
\r
3315 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3316 DWORD len = url.GetLength();
\r
3317 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
\r
3318 return CString(buf, len);
\r
3326 void CLogDlg::OnEnChangeSearchedit()
\r
3329 if (m_LogList.m_sFilterText.IsEmpty())
\r
3331 CStoreSelection storeselection(this);
\r
3332 // clear the filter, i.e. make all entries appear
\r
3333 theApp.DoWaitCursor(1);
\r
3334 KillTimer(LOGFILTER_TIMER);
\r
3335 FillLogMessageCtrl(false);
\r
3336 m_LogList.StartFilter();
\r
3338 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
3339 m_arShownList.RemoveAll();
\r
3340 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
3342 if (IsEntryInDateRange(i))
\r
3343 m_arShownList.Add(m_logEntries[i]);
\r
3345 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
3346 m_LogList.DeleteAllItems();
\r
3347 m_LogList.SetItemCountEx(ShownCountWithStopped());
\r
3348 m_LogList.RedrawItems(0, ShownCountWithStopped());
\r
3349 m_LogList.SetRedraw(false);
\r
3350 ResizeAllListCtrlCols();
\r
3351 m_LogList.SetRedraw(true);
\r
3353 theApp.DoWaitCursor(-1);
\r
3354 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
3355 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
3356 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3357 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
3360 if (Validate(m_LogList.m_sFilterText))
\r
3361 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
3363 KillTimer(LOGFILTER_TIMER);
\r
3367 void CLogDlg::OnBnClickedAllBranch()
\r
3369 this->UpdateData();
\r
3371 if(this->m_bAllBranch)
\r
3372 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;
\r
3374 m_LogList.m_ShowMask&=~CGit::LOG_INFO_ALL_BRANCH;
\r
3376 m_LogList.Refresh();
\r
3378 FillLogMessageCtrl(false);
\r
OSDN Git Service
