1 // TortoiseGit - a Windows shell extension for easy version control
\r
2 // Copyright (C) 2003-2008 - TortoiseGit
\r
3 // This program is free software; you can redistribute it and/or
\r
4 // modify it under the terms of the GNU General Public License
\r
5 // as published by the Free Software Foundation; either version 2
\r
6 // of the License, or (at your option) any later version.
\r
7 // This program is distributed in the hope that it will be useful,
\r
8 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
9 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
10 // GNU General Public License for more details.
\r
12 // You should have received a copy of the GNU General Public License
\r
13 // along with this program; if not, write to the Free Software Foundation,
\r
14 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
17 #include "TortoiseProc.h"
\r
19 #include "InputDlg.h"
\r
20 #include "PropDlg.h"
\r
21 #include "SVNProgressDlg.h"
\r
22 #include "ProgressDlg.h"
\r
23 //#include "RepositoryBrowser.h"
\r
24 //#include "CopyDlg.h"
\r
25 #include "StatGraphDlg.h"
\r
27 #include "MessageBox.h"
\r
28 #include "Registry.h"
\r
29 #include "AppUtils.h"
\r
30 #include "PathUtils.h"
\r
31 #include "StringUtils.h"
\r
32 #include "UnicodeUtils.h"
\r
33 #include "TempFile.h"
\r
34 //#include "GitInfo.h"
\r
35 //#include "GitDiff.h"
\r
36 #include "IconMenu.h"
\r
37 //#include "RevisionRangeDlg.h"
\r
38 //#include "BrowseFolder.h"
\r
39 //#include "BlameDlg.h"
\r
40 //#include "Blame.h"
\r
41 //#include "GitHelpers.h"
\r
42 #include "GitStatus.h"
\r
43 //#include "LogDlgHelper.h"
\r
44 //#include "CachedLogInfo.h"
\r
45 //#include "RepositoryInfo.h"
\r
46 //#include "EditPropertiesDlg.h"
\r
47 #include "FileDiffDlg.h"
\r
50 const UINT CLogDlg::m_FindDialogMessage = RegisterWindowMessage(FINDMSGSTRING);
\r
53 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)
\r
54 CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
\r
55 : CResizableStandAloneDialog(CLogDlg::IDD, pParent)
\r
59 , m_currentChangedArray(NULL)
\r
61 , m_bShowedAll(false)
\r
63 , m_regLastStrict(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE)
\r
65 , m_bSelectionMustBeContinuous(false)
\r
66 , m_bShowBugtraqColumn(false)
\r
67 , m_lowestRev(_T(""))
\r
69 , m_sLogInfo(_T(""))
\r
70 , m_pFindDialog(NULL)
\r
71 , m_bCancelled(FALSE)
\r
72 , m_pNotifyWindow(NULL)
\r
74 , m_bAscending(FALSE)
\r
79 , m_bIncludeMerges(FALSE)
\r
83 m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
90 m_CurrentFilteredChangedArray.RemoveAll();
\r
94 void CLogDlg::DoDataExchange(CDataExchange* pDX)
\r
96 CResizableStandAloneDialog::DoDataExchange(pDX);
\r
97 DDX_Control(pDX, IDC_LOGLIST, m_LogList);
\r
98 DDX_Control(pDX, IDC_LOGMSG, m_ChangedFileListCtrl);
\r
99 DDX_Control(pDX, IDC_PROGRESS, m_LogProgress);
\r
100 DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1);
\r
101 DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2);
\r
102 DDX_Check(pDX, IDC_CHECK_STOPONCOPY, m_bStrict);
\r
103 DDX_Text(pDX, IDC_SEARCHEDIT, m_LogList.m_sFilterText);
\r
104 DDX_Control(pDX, IDC_DATEFROM, m_DateFrom);
\r
105 DDX_Control(pDX, IDC_DATETO, m_DateTo);
\r
106 DDX_Control(pDX, IDC_HIDEPATHS, m_cHidePaths);
\r
107 DDX_Control(pDX, IDC_GETALL, m_btnShow);
\r
108 DDX_Control(pDX, IDC_SHOWWHOLEPROJECT,m_btnShowWholeProject);
\r
109 DDX_Text(pDX, IDC_LOGINFO, m_sLogInfo);
\r
110 DDX_Check(pDX, IDC_INCLUDEMERGE, m_bIncludeMerges);
\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
125 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
\r
126 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
\r
128 ON_MESSAGE(MSG_LOAD_PERCENTAGE,OnLogListLoading)
\r
130 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
\r
132 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
\r
133 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
\r
134 ON_BN_CLICKED(IDC_SHOWWHOLEPROJECT, OnBnClickShowWholeProject)
\r
135 //ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGMSG, OnNMCustomdrawChangedFileList)
\r
136 //ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGMSG, OnLvnGetdispinfoChangedFileList)
\r
137 ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST , OnLvnColumnclick)
\r
138 //ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList)
\r
139 ON_BN_CLICKED(IDC_HIDEPATHS, OnBnClickedHidepaths)
\r
141 ON_BN_CLICKED(IDC_CHECK_STOPONCOPY, &CLogDlg::OnBnClickedCheckStoponcopy)
\r
142 ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)
\r
143 ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)
\r
145 ON_BN_CLICKED(IDC_INCLUDEMERGE, &CLogDlg::OnBnClickedIncludemerge)
\r
146 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
\r
147 ON_COMMAND(ID_LOGDLG_REFRESH,&CLogDlg::OnRefresh)
\r
148 ON_COMMAND(ID_LOGDLG_FIND,&CLogDlg::OnFind)
\r
149 ON_COMMAND(ID_LOGDLG_FOCUSFILTER,&CLogDlg::OnFocusFilter)
\r
150 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
\r
153 void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, BOOL bStrict /* = FALSE */, BOOL bSaveStrict /* = TRUE */)
\r
157 m_startrev = startrev;
\r
158 m_LogRevision = startrev;
\r
160 m_hasWC = !path.IsUrl();
\r
161 m_bStrict = bStrict;
\r
162 m_bSaveStrict = bSaveStrict;
\r
164 if (::IsWindow(m_hWnd))
\r
168 BOOL CLogDlg::OnInitDialog()
\r
171 CResizableStandAloneDialog::OnInitDialog();
\r
173 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
\r
175 OSVERSIONINFOEX inf;
\r
176 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
177 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
178 GetVersionEx((OSVERSIONINFO *)&inf);
\r
179 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
180 m_bVista = (fullver >= 0x0600);
\r
182 // use the state of the "stop on copy/rename" option from the last time
\r
184 m_bStrict = m_regLastStrict;
\r
187 // set the font to use in the log message view, configured in the settings dialog
\r
188 CAppUtils::CreateFontForLogs(m_logFont);
\r
189 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
\r
190 // automatically detect URLs in the log message and turn them into links
\r
191 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_AUTOURLDETECT, TRUE, NULL);
\r
192 // make the log message rich edit control send a message when the mouse pointer is over a link
\r
193 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK);
\r
194 //m_LogList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_SUBITEMIMAGES);
\r
196 // the "hide unrelated paths" checkbox should be indeterminate
\r
197 m_cHidePaths.SetCheck(BST_INDETERMINATE);
\r
200 // if there is a working copy, load the project properties
\r
201 // to get information about the bugtraq: integration
\r
203 m_ProjectProperties.ReadProps(m_path);
\r
205 // the bugtraq issue id column is only shown if the bugtraq:url or bugtraq:regex is set
\r
206 if ((!m_ProjectProperties.sUrl.IsEmpty())||(!m_ProjectProperties.sCheckRe.IsEmpty()))
\r
207 m_bShowBugtraqColumn = true;
\r
209 //theme.SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);
\r
210 //theme.SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);
\r
212 // set up the columns
\r
213 m_LogList.DeleteAllItems();
\r
214 m_LogList.InsertGitColumn();
\r
216 m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);
\r
218 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
221 m_sMessageBuf.Preallocate(100000);
\r
223 // set the dialog title to "Log - path/to/whatever/we/show/the/log/for"
\r
224 SetDlgTitle(false);
\r
226 m_tooltips.Create(this);
\r
227 CheckRegexpTooltip();
\r
229 SetSplitterRange();
\r
231 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
\r
232 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
\r
233 m_cFilter.SetInfoIcon(IDI_LOGFILTER);
\r
234 m_cFilter.SetValidator(this);
\r
236 AdjustControlSize(IDC_HIDEPATHS);
\r
237 AdjustControlSize(IDC_CHECK_STOPONCOPY);
\r
238 AdjustControlSize(IDC_INCLUDEMERGE);
\r
240 GetClientRect(m_DlgOrigRect);
\r
241 m_LogList.GetClientRect(m_LogListOrigRect);
\r
242 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
\r
243 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
\r
245 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
246 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
249 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
\r
250 AddAnchor(IDC_DATEFROM, TOP_LEFT);
\r
251 AddAnchor(IDC_TOLABEL, TOP_LEFT);
\r
252 AddAnchor(IDC_DATETO, TOP_LEFT);
\r
254 SetFilterCueText();
\r
255 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
\r
257 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
258 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
259 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
260 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
261 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
263 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
264 AddAnchor(IDC_HIDEPATHS, BOTTOM_LEFT);
\r
265 AddAnchor(IDC_CHECK_STOPONCOPY, BOTTOM_LEFT);
\r
266 AddAnchor(IDC_INCLUDEMERGE, BOTTOM_LEFT);
\r
267 AddAnchor(IDC_GETALL, BOTTOM_LEFT);
\r
268 AddAnchor(IDC_SHOWWHOLEPROJECT, BOTTOM_LEFT);
\r
269 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
\r
270 AddAnchor(IDC_STATBUTTON, BOTTOM_RIGHT);
\r
271 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
272 AddAnchor(IDOK, BOTTOM_RIGHT);
\r
273 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
\r
274 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
276 // SetPromptParentWindow(m_hWnd);
\r
279 CenterWindow(CWnd::FromHandle(hWndExplorer));
\r
280 EnableSaveRestore(_T("LogDlg"));
\r
282 DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
283 DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
284 RECT rcDlg, rcLogList, rcChgMsg;
\r
285 GetClientRect(&rcDlg);
\r
286 m_LogList.GetWindowRect(&rcLogList);
\r
287 ScreenToClient(&rcLogList);
\r
288 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
\r
289 ScreenToClient(&rcChgMsg);
\r
293 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
294 ScreenToClient(&rectSplitter);
\r
295 int delta = yPos1 - rectSplitter.top;
\r
297 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
\r
299 m_wndSplitter1.SetWindowPos(NULL, 0, yPos1, 0, 0, SWP_NOSIZE);
\r
306 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
307 ScreenToClient(&rectSplitter);
\r
308 int delta = yPos2 - rectSplitter.top;
\r
310 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
\r
312 m_wndSplitter2.SetWindowPos(NULL, 0, yPos2, 0, 0, SWP_NOSIZE);
\r
320 // the dialog is used to select revisions
\r
321 if (m_bSelectionMustBeContinuous)
\r
322 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
324 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
328 // the dialog is used to just view log messages
\r
329 GetDlgItemText(IDOK, temp);
\r
330 SetDlgItemText(IDCANCEL, temp);
\r
331 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
\r
334 // set the choices for the "Show All" button
\r
335 temp.LoadString(IDS_LOG_SHOWALL);
\r
336 m_btnShow.AddEntry(temp);
\r
338 format.LoadString(IDS_LOG_SHOW_CURRENT_BRANCH);
\r
339 temp.Format(format,g_Git.GetCurrentBranch());
\r
340 m_btnShow.AddEntry(temp);
\r
341 m_btnShow.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")));
\r
343 temp.LoadString(IDS_LOG_SHOW_WHOLE);
\r
344 this->m_btnShowWholeProject.AddEntry(temp);
\r
345 format.LoadString(IDS_LOG_SHOW_CURRENT_PATH);
\r
346 temp.Format(format,m_path.GetGitPathString());
\r
347 if(!m_path.IsEmpty())
\r
349 this->m_btnShowWholeProject.AddEntry(temp);
\r
350 this->m_btnShowWholeProject.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowWholeProject")));
\r
354 m_mergedRevs.clear();
\r
356 // first start a thread to obtain the log messages without
\r
357 // blocking the dialog
\r
359 //m_tFrom = (DWORD)-1;
\r
361 m_LogList.m_Path=m_path;
\r
362 m_LogList.FetchLogAsync(this);
\r
364 GetDlgItem(IDC_LOGLIST)->SetFocus();
\r
368 LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM lParam)
\r
370 int cur=(int)wParam;
\r
372 if( cur == GITLOG_START )
\r
375 temp.LoadString(IDS_PROGRESSWAIT);
\r
377 this->m_LogList.ShowText(temp, true);
\r
379 // change the text of the close button to "Cancel" since now the thread
\r
380 // is running, and simply closing the dialog doesn't work.
\r
381 if (!GetDlgItem(IDOK)->IsWindowVisible())
\r
383 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
384 SetDlgItemText(IDCANCEL, temp);
\r
387 // We use a progress bar while getting the logs
\r
388 m_LogProgress.SetRange32(0, 100);
\r
389 m_LogProgress.SetPos(0);
\r
391 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
\r
393 //DialogEnableWindow(IDC_GETALL, FALSE);
\r
394 //DialogEnableWindow(IDC_SHOWWHOLEPROJECT, FALSE);
\r
395 DialogEnableWindow(IDC_CHECK_STOPONCOPY, 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
412 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
\r
414 //CTime time=m_LogList.GetOldestTime();
\r
416 m_LogList.GetTimeRange(begin,end);
\r
417 m_DateFrom.SetTime(&begin);
\r
418 m_DateTo.SetTime(&end);
\r
422 if(this->m_LogList.HasText())
\r
423 this->m_LogList.ClearText();
\r
424 m_LogProgress.SetPos(cur);
\r
428 void CLogDlg::SetDlgTitle(bool bOffline)
\r
430 if (m_sTitle.IsEmpty())
\r
431 GetWindowText(m_sTitle);
\r
436 if (m_path.IsUrl())
\r
437 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetUIPathString());
\r
438 else if (m_path.IsDirectory())
\r
439 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetWinPathString());
\r
441 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetFilename());
\r
442 SetWindowText(sTemp);
\r
446 if (m_path.IsUrl())
\r
447 SetWindowText(m_sTitle + _T(" - ") + m_path.GetUIPathString());
\r
448 else if (m_path.IsEmpty())
\r
449 SetWindowText(m_sTitle + _T(" - ") + CString(_T("Whole Project")));
\r
450 else if (m_path.IsDirectory())
\r
451 SetWindowText(m_sTitle + _T(" - ") + m_path.GetWinPathString());
\r
453 SetWindowText(m_sTitle + _T(" - ") + m_path.GetFilename());
\r
457 void CLogDlg::CheckRegexpTooltip()
\r
459 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
\r
460 // Since tooltip describes regexp features, show it only if regexps are enabled.
\r
461 if (m_bFilterWithRegex)
\r
463 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
\r
466 m_tooltips.DelTool(pWnd);
\r
469 void CLogDlg::EnableOKButton()
\r
473 // the dialog is used to select revisions
\r
474 if (m_bSelectionMustBeContinuous)
\r
475 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
477 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
480 DialogEnableWindow(IDOK, TRUE);
\r
483 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
\r
485 // we fill here the log message rich edit control,
\r
486 // and also populate the changed files list control
\r
487 // according to the selected revision(s).
\r
489 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
490 // empty the log message view
\r
491 pMsgView->SetWindowText(_T(" "));
\r
492 // empty the changed files list
\r
493 m_ChangedFileListCtrl.SetRedraw(FALSE);
\r
494 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
495 m_currentChangedArray = NULL;
\r
496 //m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );
\r
497 m_ChangedFileListCtrl.DeleteAllItems();
\r
499 // if we're not here to really show a selected revision, just
\r
500 // get out of here after clearing the views, which is what is intended
\r
501 // if that flag is not set.
\r
505 m_ChangedFileListCtrl.Invalidate();
\r
506 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
507 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
511 // depending on how many revisions are selected, we have to do different
\r
513 int selCount = m_LogList.GetSelectedCount();
\r
516 // if nothing is selected, we have nothing more to do
\r
517 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
518 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
521 else if (selCount == 1)
\r
523 // if one revision is selected, we have to fill the log message view
\r
524 // with the corresponding log message, and also fill the changed files
\r
526 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
527 int selIndex = m_LogList.GetNextSelectedItem(pos);
\r
528 if (selIndex >= m_LogList.m_arShownList.GetCount())
\r
530 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
531 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
534 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));
\r
536 if(!pLogEntry->m_IsFull)
\r
538 pMsgView->SetWindowText(_T("load ..."));
\r
541 // set the log message text
\r
542 pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash+_T("\r\n\r\n*")+pLogEntry->m_Subject+_T("\n\n")+pLogEntry->m_Body);
\r
543 // turn bug ID's into links if the bugtraq: properties have been set
\r
544 // and we can find a match of those in the log message
\r
545 m_ProjectProperties.FindBugID(pLogEntry->m_Body, pMsgView);
\r
546 CAppUtils::FormatTextInRichEditControl(pMsgView);
\r
548 m_ChangedFileListCtrl.UpdateWithGitPathList(pLogEntry->m_Files);
\r
549 m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;
\r
550 m_ChangedFileListCtrl.Show(SVNSLC_SHOWVERSIONED);
\r
552 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
556 // fill in the changed files list control
\r
557 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
559 m_CurrentFilteredChangedArray.RemoveAll();
\r
560 for (INT_PTR c = 0; c < m_currentChangedArray->GetCount(); ++c)
\r
562 LogChangedPath * cpath = m_currentChangedArray->GetAt(c);
\r
565 if (m_currentChangedArray->GetAt(c)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
567 m_CurrentFilteredChangedArray.Add(cpath);
\r
570 m_currentChangedArray = &m_CurrentFilteredChangedArray;
\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_bAllBranch=true;
\r
645 case 1: // show current branch
\r
646 m_LogList.m_bAllBranch=false;
\r
652 m_LogList.m_bExitThread=TRUE;
\r
653 DWORD ret =::WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,20000);
\r
654 if(ret == WAIT_TIMEOUT)
\r
655 m_LogList.TerminateThread();
\r
658 m_LogList.FetchLogAsync(this);
\r
662 void CLogDlg::OnBnClickedRefresh()
\r
668 void CLogDlg::Refresh (bool autoGoOnline)
\r
670 m_LogList.Refresh();
\r
673 void CLogDlg::OnBnClickShowWholeProject()
\r
678 BOOL CLogDlg::Cancel()
\r
680 return m_bCancelled;
\r
683 void CLogDlg::SaveSplitterPos()
\r
687 CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
688 CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
690 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
691 ScreenToClient(&rectSplitter);
\r
692 regPos1 = rectSplitter.top;
\r
693 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
694 ScreenToClient(&rectSplitter);
\r
695 regPos2 = rectSplitter.top;
\r
699 void CLogDlg::OnCancel()
\r
701 // canceling means stopping the working thread if it's still running.
\r
702 // we do this by using the Subversion cancel callback.
\r
703 // But canceling can also mean just to close the dialog, depending on the
\r
704 // text shown on the cancel button (it could simply read "OK").
\r
705 CString temp, temp2;
\r
706 GetDlgItemText(IDOK, temp);
\r
707 temp2.LoadString(IDS_MSGBOX_CANCEL);
\r
708 if ((temp.Compare(temp2)==0)||(this->IsThreadRunning()))
\r
710 //m_bCancelled = true;
\r
712 if(m_LogList.m_bThreadRunning)
\r
714 //m_LogList.m_bExitThread=true;
\r
715 //WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,INFINITE);
\r
716 m_LogList.TerminateThread();
\r
719 //m_LogList.TerminateThread();
\r
723 m_regLastStrict = m_bStrict;
\r
725 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
726 reg = m_btnShow.GetCurrentEntry();
\r
728 reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowWholeProject"));
\r
729 reg = m_btnShowWholeProject.GetCurrentEntry();
\r
732 __super::OnCancel();
\r
735 CString CLogDlg::MakeShortMessage(const CString& message)
\r
737 bool bFoundShort = true;
\r
738 CString sShortMessage = m_ProjectProperties.GetLogSummary(message);
\r
739 if (sShortMessage.IsEmpty())
\r
741 bFoundShort = false;
\r
742 sShortMessage = message;
\r
744 // Remove newlines and tabs 'cause those are not shown nicely in the list control
\r
745 sShortMessage.Replace(_T("\r"), _T(""));
\r
746 sShortMessage.Replace(_T("\t"), _T(" "));
\r
748 // Suppose the first empty line separates 'summary' from the rest of the message.
\r
749 int found = sShortMessage.Find(_T("\n\n"));
\r
750 // To avoid too short 'short' messages
\r
751 // (e.g. if the message looks something like "Bugfix:\n\n*done this\n*done that")
\r
752 // only use the empty newline as a separator if it comes after at least 15 chars.
\r
753 if ((!bFoundShort)&&(found >= 15))
\r
755 sShortMessage = sShortMessage.Left(found);
\r
757 sShortMessage.Replace('\n', ' ');
\r
758 return sShortMessage;
\r
761 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
764 if (rev == SVN_INVALID_REVNUM)
\r
770 // this is the callback function which receives the data for every revision we ask the log for
\r
771 // we store this information here one by one.
\r
773 if (m_startrev == -1)
\r
778 m_LogProgress.SetPos(m_limit - m_limitcounter);
\r
780 else if (m_startrev.IsNumber() && m_startrev.IsNumber())
\r
781 m_LogProgress.SetPos((git_revnum_t)m_startrev-rev+(git_revnum_t)m_endrev);
\r
782 __time64_t ttime = time/1000000L;
\r
783 if (m_tTo < (DWORD)ttime)
\r
784 m_tTo = (DWORD)ttime;
\r
785 if (m_tFrom > (DWORD)ttime)
\r
786 m_tFrom = (DWORD)ttime;
\r
787 if ((m_lowestRev > rev)||(m_lowestRev < 0))
\r
789 // Add as many characters from the log message to the list control
\r
790 PLOGENTRYDATA pLogItem = new LOGENTRYDATA;
\r
791 pLogItem->bCopies = !!copies;
\r
793 // find out if this item was copied in the revision
\r
794 BOOL copiedself = FALSE;
\r
797 for (INT_PTR cpPathIndex = 0; cpPathIndex < cpaths->GetCount(); ++cpPathIndex)
\r
799 LogChangedPath * cpath = cpaths->GetAt(cpPathIndex);
\r
800 if (!cpath->sCopyFromPath.IsEmpty() && (cpath->sPath.Compare(m_sSelfRelativeURL) == 0))
\r
802 // note: this only works if the log is fetched top-to-bottom
\r
803 // but since we do that, it shouldn't be a problem
\r
804 m_sSelfRelativeURL = cpath->sCopyFromPath;
\r
810 pLogItem->bCopiedSelf = copiedself;
\r
811 pLogItem->tmDate = ttime;
\r
812 pLogItem->sAuthor = author;
\r
813 pLogItem->sDate = date;
\r
814 pLogItem->sShortMessage = MakeShortMessage(message);
\r
815 pLogItem->dwFileChanges = filechanges;
\r
816 pLogItem->actions = actions;
\r
817 pLogItem->haschildren = haschildren;
\r
818 pLogItem->childStackDepth = m_childCounter;
\r
819 m_maxChild = max(m_childCounter, m_maxChild);
\r
822 pLogItem->sBugIDs = m_ProjectProperties.FindBugID(message).Trim();
\r
824 // split multi line log entries and concatenate them
\r
825 // again but this time with \r\n as line separators
\r
826 // so that the edit control recognizes them
\r
829 if (message.GetLength()>0)
\r
831 m_sMessageBuf = message;
\r
832 m_sMessageBuf.Replace(_T("\n\r"), _T("\n"));
\r
833 m_sMessageBuf.Replace(_T("\r\n"), _T("\n"));
\r
834 if (m_sMessageBuf.Right(1).Compare(_T("\n"))==0)
\r
835 m_sMessageBuf = m_sMessageBuf.Left(m_sMessageBuf.GetLength()-1);
\r
838 m_sMessageBuf.Empty();
\r
839 pLogItem->sMessage = m_sMessageBuf;
\r
840 pLogItem->Rev = rev;
\r
842 // move-construct path array
\r
844 pLogItem->pArChangedPaths = new LogChangedPathArray (*cpaths);
\r
845 cpaths->RemoveAll();
\r
847 catch (CException * e)
\r
849 ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR);
\r
851 m_bCancelled = TRUE;
\r
853 m_logEntries.push_back(pLogItem);
\r
854 m_arShownList.Add(pLogItem);
\r
860 //this is the thread function which calls the subversion function
\r
865 void CLogDlg::CopyChangedSelectionToClipBoard()
\r
868 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
870 return; // nothing is selected, get out of here
\r
874 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
877 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
880 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
881 sPaths += m_currentChangedPathList[nItem].GetGitPathString();
\r
882 sPaths += _T("\r\n");
\r
887 // only one revision is selected in the log dialog top pane
\r
888 // but multiple items could be selected in the changed items list
\r
889 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
892 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
893 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
895 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
897 // some items are hidden! So find out which item the user really selected
\r
898 INT_PTR selRealIndex = -1;
\r
899 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
901 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
903 if (selRealIndex == nItem)
\r
905 changedlogpath = pLogEntry->pArChangedPaths->GetAt(hiddenindex);
\r
910 if (changedlogpath)
\r
912 sPaths += changedlogpath->sPath;
\r
913 sPaths += _T("\r\n");
\r
918 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
\r
922 BOOL CLogDlg::IsDiffPossible(LogChangedPath * changedpath, git_revnum_t rev)
\r
925 CString added, deleted;
\r
926 if (changedpath == NULL)
\r
929 if ((rev > 1)&&(changedpath->action != LOGACTIONS_DELETED))
\r
931 if (changedpath->action == LOGACTIONS_ADDED) // file is added
\r
933 if (changedpath->lCopyFromRev == 0)
\r
934 return FALSE; // but file was not added with history
\r
942 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
\r
944 // we have two separate context menus:
\r
945 // one shown on the log message list control,
\r
946 // the other shown in the changed-files list control
\r
947 int selCount = m_LogList.GetSelectedCount();
\r
948 if (pWnd == &m_LogList)
\r
950 //ShowContextMenuForRevisions(pWnd, point);
\r
952 else if (pWnd == &m_ChangedFileListCtrl)
\r
954 //ShowContextMenuForChangedpaths(pWnd, point);
\r
956 else if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
958 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
961 selIndex = m_LogList.GetNextSelectedItem(pos);
\r
962 if ((point.x == -1) && (point.y == -1))
\r
965 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
\r
966 ClientToScreen(&rect);
\r
967 point = rect.CenterPoint();
\r
969 CString sMenuItemText;
\r
971 if (popup.CreatePopupMenu())
\r
973 // add the 'default' entries
\r
974 sMenuItemText.LoadString(IDS_SCIEDIT_COPY);
\r
975 popup.AppendMenu(MF_STRING | MF_ENABLED, WM_COPY, sMenuItemText);
\r
976 sMenuItemText.LoadString(IDS_SCIEDIT_SELECTALL);
\r
977 popup.AppendMenu(MF_STRING | MF_ENABLED, EM_SETSEL, sMenuItemText);
\r
979 //if (selIndex >= 0)
\r
981 // popup.AppendMenu(MF_SEPARATOR);
\r
982 // sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);
\r
983 // popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);
\r
986 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
990 break; // no command selected
\r
993 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
\r
995 case CGitLogList::ID_EDITAUTHOR:
\r
996 EditLogMessage(selIndex);
\r
1004 LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
1007 ASSERT(m_pFindDialog != NULL);
\r
1009 if (m_pFindDialog->IsTerminating())
\r
1011 // invalidate the handle identifying the dialog box.
\r
1012 m_pFindDialog = NULL;
\r
1016 if(m_pFindDialog->FindNext())
\r
1018 //read data from dialog
\r
1019 CString FindText = m_pFindDialog->GetFindString();
\r
1020 bool bMatchCase = (m_pFindDialog->MatchCase() == TRUE);
\r
1021 bool bFound = false;
\r
1023 bool bRegex = ValidateRegexp(FindText, pat, bMatchCase);
\r
1025 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_not_null;
\r
1028 for (i = this->m_nSearchIndex; i<m_arShownList.GetCount()&&!bFound; i++)
\r
1032 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1034 if (regex_search(wstring((LPCTSTR)pLogEntry->sMessage), pat, flags))
\r
1039 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1040 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1042 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1043 if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags))
\r
1049 if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags))
\r
1061 if (m_logEntries[i]->sMessage.Find(FindText) >= 0)
\r
1066 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1067 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1068 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1070 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1071 if (cpath->sCopyFromPath.Find(FindText)>=0)
\r
1077 if (cpath->sPath.Find(FindText)>=0)
\r
1087 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1088 CString msg = pLogEntry->sMessage;
\r
1089 msg = msg.MakeLower();
\r
1090 CString find = FindText.MakeLower();
\r
1091 if (msg.Find(find) >= 0)
\r
1096 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1097 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1099 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1100 CString lowerpath = cpath->sCopyFromPath;
\r
1101 lowerpath.MakeLower();
\r
1102 if (lowerpath.Find(find)>=0)
\r
1108 lowerpath = cpath->sPath;
\r
1109 lowerpath.MakeLower();
\r
1110 if (lowerpath.Find(find)>=0)
\r
1119 } // for (i = this->m_nSearchIndex; i<m_arShownList.GetItemCount()&&!bFound; i++)
\r
1122 this->m_nSearchIndex = (i+1);
\r
1123 m_LogList.EnsureVisible(i, FALSE);
\r
1124 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);
\r
1125 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
1126 m_LogList.SetSelectionMark(i);
\r
1127 FillLogMessageCtrl();
\r
1128 UpdateData(FALSE);
\r
1130 if (m_nSearchIndex >= m_arShownList.GetCount())
\r
1131 m_nSearchIndex = (int)m_arShownList.GetCount()-1;
\r
1133 } // if(m_pFindDialog->FindNext())
\r
1134 UpdateLogInfoLabel();
\r
1139 void CLogDlg::OnOK()
\r
1142 // since the log dialog is also used to select revisions for other
\r
1143 // dialogs, we have to do some work before closing this dialog
\r
1144 if (GetFocus() != GetDlgItem(IDOK))
\r
1145 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
\r
1146 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
\r
1147 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
\r
1150 CString buttontext;
\r
1151 GetDlgItemText(IDOK, buttontext);
\r
1152 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
1153 if (temp.Compare(buttontext) != 0)
\r
1154 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
\r
1155 m_bCancelled = TRUE;
\r
1156 m_selectedRevs.Clear();
\r
1157 m_selectedRevsOneRange.Clear();
\r
1158 if (m_pNotifyWindow)
\r
1160 int selIndex = m_LogList.GetSelectionMark();
\r
1161 if (selIndex >= 0)
\r
1163 PLOGENTRYDATA pLogEntry = NULL;
\r
1164 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1165 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1166 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1167 git_revnum_t lowerRev = pLogEntry->Rev;
\r
1168 git_revnum_t higherRev = lowerRev;
\r
1171 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1172 git_revnum_t rev = pLogEntry->Rev;
\r
1173 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1174 if (lowerRev > rev)
\r
1176 if (higherRev < rev)
\r
1179 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
\r
1181 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
\r
1183 BOOL bSentMessage = FALSE;
\r
1184 if (m_LogList.GetSelectedCount() == 1)
\r
1186 // if only one revision is selected, check if the path/url with which the dialog was started
\r
1187 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
\r
1188 // if it was copied, use the copy from revision as lowerRev
\r
1189 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
\r
1191 CString sUrl = m_path.GetGitPathString();
\r
1192 if (!m_path.IsUrl())
\r
1194 sUrl = GetURLFromPath(m_path);
\r
1196 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
\r
1197 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
\r
1199 LogChangedPath * pData = pLogEntry->pArChangedPaths->GetAt(cp);
\r
1202 if (sUrl.Compare(pData->sPath) == 0)
\r
1204 if (!pData->sCopyFromPath.IsEmpty())
\r
1206 lowerRev = pData->lCopyFromRev;
\r
1207 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
\r
1208 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
\r
1209 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1210 bSentMessage = TRUE;
\r
1217 if ( !bSentMessage )
\r
1219 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
\r
1220 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
\r
1221 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1222 if (m_selectedRevsOneRange.GetCount())
\r
1223 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
\r
1228 if (m_bSaveStrict)
\r
1229 m_regLastStrict = m_bStrict;
\r
1230 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
1231 reg = m_btnShow.GetCurrentEntry();
\r
1232 SaveSplitterPos();
\r
1236 void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
1238 // a double click on an entry in the changed-files list has happened
\r
1241 DiffSelectedFile();
\r
1244 void CLogDlg::DiffSelectedFile()
\r
1247 if (m_bThreadRunning)
\r
1249 UpdateLogInfoLabel();
\r
1250 INT_PTR selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
1253 if (m_ChangedFileListCtrl.GetSelectedCount() == 0)
\r
1255 // find out if there's an entry selected in the log list
\r
1256 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1257 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1258 git_revnum_t rev1 = pLogEntry->Rev;
\r
1259 git_revnum_t rev2 = rev1;
\r
1264 // there's at least a second entry selected in the log list: several revisions selected!
\r
1265 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1268 rev1 = max(rev1,(long)pLogEntry->Rev);
\r
1269 rev2 = min(rev2,(long)pLogEntry->Rev);
\r
1273 // now we have both revisions selected in the log list, so we can do a diff of the selected
\r
1274 // entry in the changed files list with these two revisions.
\r
1275 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1280 // nothing or only one revision selected in the log list
\r
1281 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1283 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
1285 // some items are hidden! So find out which item the user really clicked on
\r
1286 INT_PTR selRealIndex = -1;
\r
1287 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
1289 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
1291 if (selRealIndex == selIndex)
\r
1293 selIndex = hiddenindex;
\r
1294 changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1300 if (IsDiffPossible(changedpath, rev1))
\r
1302 // diffs with renamed files are possible
\r
1303 if ((changedpath)&&(!changedpath->sCopyFromPath.IsEmpty()))
\r
1304 rev2 = changedpath->lCopyFromRev;
\r
1307 // if the path was modified but the parent path was 'added with history'
\r
1308 // then we have to use the copy from revision of the parent path
\r
1309 CTGitPath cpath = CTGitPath(changedpath->sPath);
\r
1310 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
1312 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
1313 if (p.IsAncestorOf(cpath))
\r
1315 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
1316 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
1320 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1324 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1325 CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1327 // deleted files must be opened from the revision before the deletion
\r
1328 if (changedpath->action == LOGACTIONS_DELETED)
\r
1330 m_bCancelled = false;
\r
1332 CProgressDlg progDlg;
\r
1333 progDlg.SetTitle(IDS_APPNAME);
\r
1334 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1335 CString sInfoLine;
\r
1336 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)(m_sRepositoryRoot + changedpath->sPath), (LPCTSTR)r.ToString());
\r
1337 progDlg.SetLine(1, sInfoLine, true);
\r
1338 SetAndClearProgressInfo(&progDlg);
\r
1339 progDlg.ShowModeless(m_hWnd);
\r
1341 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))
\r
1343 m_bCancelled = false;
\r
1344 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), GitRev::REV_HEAD, r, tempfile))
\r
1347 SetAndClearProgressInfo((HWND)NULL);
\r
1348 CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1353 SetAndClearProgressInfo((HWND)NULL);
\r
1355 CString sName1, sName2;
\r
1356 sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1);
\r
1357 sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1-1);
\r
1358 CAppUtils::DiffFlags flags;
\r
1359 flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1360 if (changedpath->action == LOGACTIONS_DELETED)
\r
1361 CAppUtils::StartExtDiff(tempfile, tempfile2, sName2, sName1, flags);
\r
1363 CAppUtils::StartExtDiff(tempfile2, tempfile, sName2, sName1, flags);
\r
1370 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool blame, bool unified)
\r
1372 DialogEnableWindow(IDOK, FALSE);
\r
1373 // SetPromptApp(&theApp);
\r
1374 theApp.DoWaitCursor(1);
\r
1377 GetTempPath(temppath);
\r
1380 file1.Format(_T("%s%s_%s%s"),
\r
1382 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1383 rev1->m_CommitHash.Left(6),
\r
1384 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1387 file2.Format(_T("%s\\%s_%s%s"),
\r
1389 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1390 rev2->m_CommitHash.Left(6),
\r
1391 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1395 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1396 g_Git.RunLogFile(cmd,file1);
\r
1397 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1398 g_Git.RunLogFile(cmd,file2);
\r
1400 CAppUtils::DiffFlags flags;
\r
1401 CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),flags);
\r
1404 //get the filename
\r
1406 if (Git::PathIsURL(m_path))
\r
1408 filepath = m_path.GetGitPathString();
\r
1412 filepath = GetURLFromPath(m_path);
\r
1413 if (filepath.IsEmpty())
\r
1415 theApp.DoWaitCursor(-1);
\r
1417 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1418 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1419 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1421 theApp.DoWaitCursor(-11);
\r
1425 m_bCancelled = FALSE;
\r
1426 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1428 CString firstfile, secondfile;
\r
1429 if (m_LogList.GetSelectedCount()==1)
\r
1431 int s = m_LogList.GetSelectionMark();
\r
1432 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(s));
\r
1433 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1434 firstfile = changedpath->sPath;
\r
1435 secondfile = firstfile;
\r
1436 if ((rev2 == rev1-1)&&(changedpath->lCopyFromRev > 0)) // is it an added file with history?
\r
1438 secondfile = changedpath->sCopyFromPath;
\r
1439 rev2 = changedpath->lCopyFromRev;
\r
1444 firstfile = m_currentChangedPathList[selIndex].GetGitPathString();
\r
1445 secondfile = firstfile;
\r
1448 firstfile = filepath + firstfile.Trim();
\r
1449 secondfile = filepath + secondfile.Trim();
\r
1451 GitDiff diff(this, this->m_hWnd, true);
\r
1452 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1453 diff.SetHEADPeg(m_LogRevision);
\r
1456 if (PromptShown())
\r
1457 diff.ShowUnifiedDiff(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1);
\r
1459 CAppUtils::StartShowUnifiedDiff(m_hWnd, CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), m_LogRevision);
\r
1463 if (diff.ShowCompare(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), false, blame))
\r
1465 if (firstfile.Compare(secondfile)==0)
\r
1467 git_revnum_t baseRev = 0;
\r
1468 diff.DiffProps(CTGitPath(firstfile), rev2, rev1, baseRev);
\r
1475 theApp.DoWaitCursor(-1);
\r
1479 BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, git_revnum_t rev)
\r
1482 DialogEnableWindow(IDOK, FALSE);
\r
1483 SetPromptApp(&theApp);
\r
1484 theApp.DoWaitCursor(1);
\r
1486 if (Git::PathIsURL(m_path))
\r
1488 filepath = m_path.GetGitPathString();
\r
1492 filepath = GetURLFromPath(m_path);
\r
1493 if (filepath.IsEmpty())
\r
1495 theApp.DoWaitCursor(-1);
\r
1497 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1498 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1499 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1504 m_bCancelled = false;
\r
1505 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1506 filepath += changedpath;
\r
1508 CProgressDlg progDlg;
\r
1509 progDlg.SetTitle(IDS_APPNAME);
\r
1510 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1511 CString sInfoLine;
\r
1512 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)GitRev(rev).ToString());
\r
1513 progDlg.SetLine(1, sInfoLine, true);
\r
1514 SetAndClearProgressInfo(&progDlg);
\r
1515 progDlg.ShowModeless(m_hWnd);
\r
1517 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(filepath), rev);
\r
1518 m_bCancelled = false;
\r
1519 if (!Cat(CTGitPath(filepath), GitRev(rev), rev, tempfile))
\r
1522 SetAndClearProgressInfo((HWND)NULL);
\r
1523 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1525 theApp.DoWaitCursor(-1);
\r
1529 SetAndClearProgressInfo((HWND)NULL);
\r
1530 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
1533 int ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
\r
1534 if (ret <= HINSTANCE_ERROR)
\r
1539 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
1540 cmd += tempfile.GetWinPathString() + _T(" ");
\r
1541 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
1544 theApp.DoWaitCursor(-1);
\r
1549 void CLogDlg::EditAuthor(const CLogDataVector& logs)
\r
1554 if (logs.size() == 0)
\r
1556 DialogEnableWindow(IDOK, FALSE);
\r
1557 SetPromptApp(&theApp);
\r
1558 theApp.DoWaitCursor(1);
\r
1559 if (Git::PathIsURL(m_path))
\r
1560 url = m_path.GetGitPathString();
\r
1563 url = GetURLFromPath(m_path);
\r
1565 name = Git_PROP_REVISION_AUTHOR;
\r
1567 CString value = RevPropertyGet(name, CTGitPath(url), logs[0]->Rev);
\r
1568 CString sOldValue = value;
\r
1569 value.Replace(_T("\n"), _T("\r\n"));
\r
1570 CInputDlg dlg(this);
\r
1571 dlg.m_sHintText.LoadString(IDS_LOG_AUTHOR);
\r
1572 dlg.m_sInputText = value;
\r
1573 dlg.m_sTitle.LoadString(IDS_LOG_AUTHOREDITTITLE);
\r
1574 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1575 dlg.m_bUseLogWidth = false;
\r
1576 if (dlg.DoModal() == IDOK)
\r
1578 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1580 LogCache::CCachedLogInfo* toUpdate
\r
1581 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1583 CProgressDlg progDlg;
\r
1584 progDlg.SetTitle(IDS_APPNAME);
\r
1585 progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
\r
1586 progDlg.SetTime(true);
\r
1587 progDlg.SetShowProgressBar(true);
\r
1588 progDlg.ShowModeless(m_hWnd);
\r
1589 for (DWORD i=0; i<logs.size(); ++i)
\r
1591 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), logs[i]->Rev))
\r
1594 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1600 logs[i]->sAuthor = dlg.m_sInputText;
\r
1601 m_LogList.Invalidate();
\r
1603 // update the log cache
\r
1605 if (toUpdate != NULL)
\r
1607 // log caching is active
\r
1609 LogCache::CCachedLogInfo newInfo;
\r
1610 newInfo.Insert ( logs[i]->Rev
\r
1611 , (const char*) CUnicodeUtils::GetUTF8 (logs[i]->sAuthor)
\r
1614 , LogCache::CRevisionInfoContainer::HAS_AUTHOR);
\r
1616 toUpdate->Update (newInfo);
\r
1619 progDlg.SetProgress64(i, logs.size());
\r
1623 theApp.DoWaitCursor(-1);
\r
1628 void CLogDlg::EditLogMessage(int index)
\r
1633 DialogEnableWindow(IDOK, FALSE);
\r
1634 SetPromptApp(&theApp);
\r
1635 theApp.DoWaitCursor(1);
\r
1636 if (Git::PathIsURL(m_path))
\r
1637 url = m_path.GetGitPathString();
\r
1640 url = GetURLFromPath(m_path);
\r
1642 name = Git_PROP_REVISION_LOG;
\r
1644 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(index));
\r
1645 m_bCancelled = FALSE;
\r
1646 CString value = RevPropertyGet(name, CTGitPath(url), pLogEntry->Rev);
\r
1647 CString sOldValue = value;
\r
1648 value.Replace(_T("\n"), _T("\r\n"));
\r
1649 CInputDlg dlg(this);
\r
1650 dlg.m_sHintText.LoadString(IDS_LOG_MESSAGE);
\r
1651 dlg.m_sInputText = value;
\r
1652 dlg.m_sTitle.LoadString(IDS_LOG_MESSAGEEDITTITLE);
\r
1653 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1654 dlg.m_bUseLogWidth = true;
\r
1655 if (dlg.DoModal() == IDOK)
\r
1657 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1658 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), pLogEntry->Rev))
\r
1660 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1664 pLogEntry->sShortMessage = MakeShortMessage(dlg.m_sInputText);
\r
1665 // split multi line log entries and concatenate them
\r
1666 // again but this time with \r\n as line separators
\r
1667 // so that the edit control recognizes them
\r
1668 if (dlg.m_sInputText.GetLength()>0)
\r
1670 m_sMessageBuf = dlg.m_sInputText;
\r
1671 dlg.m_sInputText.Replace(_T("\n\r"), _T("\n"));
\r
1672 dlg.m_sInputText.Replace(_T("\r\n"), _T("\n"));
\r
1673 if (dlg.m_sInputText.Right(1).Compare(_T("\n"))==0)
\r
1674 dlg.m_sInputText = dlg.m_sInputText.Left(dlg.m_sInputText.GetLength()-1);
\r
1677 dlg.m_sInputText.Empty();
\r
1678 pLogEntry->sMessage = dlg.m_sInputText;
\r
1679 pLogEntry->sBugIDs = m_ProjectProperties.FindBugID(dlg.m_sInputText);
\r
1680 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
1681 pMsgView->SetWindowText(_T(" "));
\r
1682 pMsgView->SetWindowText(dlg.m_sInputText);
\r
1683 m_ProjectProperties.FindBugID(dlg.m_sInputText, pMsgView);
\r
1684 m_LogList.Invalidate();
\r
1686 // update the log cache
\r
1688 LogCache::CCachedLogInfo* toUpdate
\r
1689 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1690 if (toUpdate != NULL)
\r
1692 // log caching is active
\r
1694 LogCache::CCachedLogInfo newInfo;
\r
1695 newInfo.Insert ( pLogEntry->Rev
\r
1697 , (const char*) CUnicodeUtils::GetUTF8 (pLogEntry->sMessage)
\r
1699 , LogCache::CRevisionInfoContainer::HAS_COMMENT);
\r
1701 toUpdate->Update (newInfo);
\r
1705 theApp.DoWaitCursor(-1);
\r
1710 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
\r
1712 // Skip Ctrl-C when copying text out of the log message or search filter
\r
1713 BOOL bSkipAccelerator = ( pMsg->message == WM_KEYDOWN && pMsg->wParam=='C' && (GetFocus()==GetDlgItem(IDC_MSGVIEW) || GetFocus()==GetDlgItem(IDC_SEARCHEDIT) ) && GetKeyState(VK_CONTROL)&0x8000 );
\r
1714 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
\r
1716 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
\r
1718 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))
\r
1720 DiffSelectedRevWithPrevious();
\r
1724 if (GetFocus()==GetDlgItem(IDC_LOGMSG))
\r
1726 DiffSelectedFile();
\r
1730 if (m_hAccel && !bSkipAccelerator)
\r
1732 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
\r
1737 m_tooltips.RelayEvent(pMsg);
\r
1738 return __super::PreTranslateMessage(pMsg);
\r
1742 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
1744 //if (this->IsThreadRunning())
\r
1745 if(m_LogList.m_bNoDispUpdates)
\r
1747 // only show the wait cursor over the list control
\r
1749 ((pWnd == GetDlgItem(IDC_LOGLIST))||
\r
1750 (pWnd == GetDlgItem(IDC_MSGVIEW))||
\r
1751 (pWnd == GetDlgItem(IDC_LOGMSG))))
\r
1753 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
1758 if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1759 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1761 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
1763 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1766 void CLogDlg::OnBnClickedHelp()
\r
1771 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1773 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1775 //if (this->IsThreadRunning())
\r
1776 if(m_LogList.m_bNoDispUpdates)
\r
1778 if (pNMLV->iItem >= 0)
\r
1780 m_nSearchIndex = pNMLV->iItem;
\r
1781 if (pNMLV->iSubItem != 0)
\r
1783 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount())&&(m_bStrict)&&(1/*m_bStrictStopped*/))
\r
1785 // remove the selected state
\r
1786 if (pNMLV->uChanged & LVIF_STATE)
\r
1788 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
\r
1789 FillLogMessageCtrl();
\r
1790 UpdateData(FALSE);
\r
1791 UpdateLogInfoLabel();
\r
1795 if (pNMLV->uChanged & LVIF_STATE)
\r
1797 FillLogMessageCtrl();
\r
1798 UpdateData(FALSE);
\r
1803 FillLogMessageCtrl();
\r
1804 UpdateData(FALSE);
\r
1807 UpdateLogInfoLabel();
\r
1810 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
\r
1812 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
\r
1813 if (pEnLink->msg == WM_LBUTTONUP)
\r
1816 GetDlgItemText(IDC_MSGVIEW, msg);
\r
1817 msg.Replace(_T("\r\n"), _T("\n"));
\r
1818 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
\r
1819 if (!::PathIsURL(url))
\r
1821 url = m_ProjectProperties.GetBugIDUrl(url);
\r
1822 url = GetAbsoluteUrlFromRelativeUrl(url);
\r
1824 if (!url.IsEmpty())
\r
1825 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
1830 void CLogDlg::OnBnClickedStatbutton()
\r
1833 if (this->IsThreadRunning())
\r
1835 if (m_LogList.m_arShownList.IsEmpty())
\r
1836 return; // nothing is shown, so no statistics.
\r
1837 // the statistics dialog expects the log entries to be sorted by date
\r
1838 SortByColumn(3, false);
\r
1839 CPtrArray shownlist;
\r
1840 m_LogList.RecalculateShownList(&shownlist);
\r
1841 // create arrays which are aware of the current filter
\r
1842 CStringArray m_arAuthorsFiltered;
\r
1843 CDWordArray m_arDatesFiltered;
\r
1844 CDWordArray m_arFileChangesFiltered;
\r
1845 for (INT_PTR i=0; i<shownlist.GetCount(); ++i)
\r
1847 GitRev* pLogEntry = reinterpret_cast<GitRev*>(shownlist.GetAt(i));
\r
1848 CString strAuthor = pLogEntry->m_AuthorName;
\r
1849 if ( strAuthor.IsEmpty() )
\r
1851 strAuthor.LoadString(IDS_STATGRAPH_EMPTYAUTHOR);
\r
1853 m_arAuthorsFiltered.Add(strAuthor);
\r
1854 m_arDatesFiltered.Add(pLogEntry->m_AuthorDate.GetTime());
\r
1855 m_arFileChangesFiltered.Add(pLogEntry->m_Files.GetCount());
\r
1857 CStatGraphDlg dlg;
\r
1858 dlg.m_parAuthors = &m_arAuthorsFiltered;
\r
1859 dlg.m_parDates = &m_arDatesFiltered;
\r
1860 dlg.m_parFileChanges = &m_arFileChangesFiltered;
\r
1861 dlg.m_path = m_path;
\r
1863 // restore the previous sorting
\r
1864 SortByColumn(m_nSortColumn, m_bAscending);
\r
1865 OnTimer(LOGFILTER_TIMER);
\r
1870 void CLogDlg::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1873 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
1874 // Take the default processing unless we set this to something else below.
\r
1875 *pResult = CDRF_DODEFAULT;
\r
1877 if (m_bNoDispUpdates)
\r
1880 switch (pLVCD->nmcd.dwDrawStage)
\r
1882 case CDDS_PREPAINT:
\r
1884 *pResult = CDRF_NOTIFYITEMDRAW;
\r
1888 case CDDS_ITEMPREPAINT:
\r
1890 // This is the prepaint stage for an item. Here's where we set the
\r
1891 // item's text color.
\r
1893 // Tell Windows to send draw notifications for each subitem.
\r
1894 *pResult = CDRF_NOTIFYSUBITEMDRAW;
\r
1896 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
1898 if (m_arShownList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1900 GitRev* data = (GitRev*)m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec);
\r
1904 if (data->bCopiedSelf)
\r
1906 // only change the background color if the item is not 'hot' (on vista with themes enabled)
\r
1907 if (!theme.IsAppThemed() || !m_bVista || ((pLVCD->nmcd.uItemState & CDIS_HOT)==0))
\r
1908 pLVCD->clrTextBk = GetSysColor(COLOR_MENU);
\r
1911 if (data->bCopies)
\r
1912 crText = m_Colors.GetColor(CColors::Modified);
\r
1914 // if ((data->childStackDepth)||(m_mergedRevs.find(data->Rev) != m_mergedRevs.end()))
\r
1915 // crText = GetSysColor(COLOR_GRAYTEXT);
\r
1916 // if (data->Rev == m_wcRev)
\r
1918 // SelectObject(pLVCD->nmcd.hdc, m_boldFont);
\r
1919 // We changed the font, so we're returning CDRF_NEWFONT. This
\r
1920 // tells the control to recalculate the extent of the text.
\r
1921 // *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;
\r
1925 if (m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1927 if (m_bStrictStopped)
\r
1928 crText = GetSysColor(COLOR_GRAYTEXT);
\r
1930 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
1931 pLVCD->clrText = crText;
\r
1935 case CDDS_ITEMPREPAINT|CDDS_ITEM|CDDS_SUBITEM:
\r
1937 if ((m_bStrictStopped)&&(m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
1939 pLVCD->nmcd.uItemState &= ~(CDIS_SELECTED|CDIS_FOCUS);
\r
1941 if (pLVCD->iSubItem == 1)
\r
1943 *pResult = CDRF_DODEFAULT;
\r
1945 if (m_arShownList.GetCount() <= (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1949 int iconwidth = ::GetSystemMetrics(SM_CXSMICON);
\r
1950 int iconheight = ::GetSystemMetrics(SM_CYSMICON);
\r
1952 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec));
\r
1954 // Get the selected state of the
\r
1955 // item being drawn.
\r
1957 SecureZeroMemory(&rItem, sizeof(LVITEM));
\r
1958 rItem.mask = LVIF_STATE;
\r
1959 rItem.iItem = pLVCD->nmcd.dwItemSpec;
\r
1960 rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
\r
1961 m_LogList.GetItem(&rItem);
\r
1964 m_LogList.GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);
\r
1966 // Fill the background
\r
1967 if (theme.IsAppThemed() && m_bVista)
\r
1969 theme.Open(m_hWnd, L"Explorer");
\r
1970 int state = LISS_NORMAL;
\r
1971 if (rItem.state & LVIS_SELECTED)
\r
1973 if (::GetFocus() == m_LogList.m_hWnd)
\r
1974 state |= LISS_SELECTED;
\r
1976 state |= LISS_SELECTEDNOTFOCUS;
\r
1981 if (pLogEntry->bCopiedSelf)
\r
1983 // unfortunately, the pLVCD->nmcd.uItemState does not contain valid
\r
1984 // information at this drawing stage. But we can check the whether the
\r
1985 // previous stage changed the background color of the item
\r
1986 if (pLVCD->clrTextBk == GetSysColor(COLOR_MENU))
\r
1989 brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
1992 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
1993 ::DeleteObject(brush);
\r
2000 if (theme.IsBackgroundPartiallyTransparent(LVP_LISTDETAIL, state))
\r
2001 theme.DrawParentBackground(m_hWnd, pLVCD->nmcd.hdc, &rect);
\r
2003 theme.DrawBackground(pLVCD->nmcd.hdc, LVP_LISTDETAIL, state, &rect, NULL);
\r
2008 if (rItem.state & LVIS_SELECTED)
\r
2010 if (::GetFocus() == m_LogList.m_hWnd)
\r
2011 brush = ::CreateSolidBrush(::GetSysColor(COLOR_HIGHLIGHT));
\r
2013 brush = ::CreateSolidBrush(::GetSysColor(COLOR_BTNFACE));
\r
2017 //if (pLogEntry->bCopiedSelf)
\r
2018 // brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
2020 brush = ::CreateSolidBrush(::GetSysColor(COLOR_WINDOW));
\r
2022 if (brush == NULL)
\r
2025 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
2026 ::DeleteObject(brush);
\r
2029 // Draw the icon(s) into the compatible DC
\r
2030 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
2031 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left + ICONITEMBORDER, rect.top, m_hModifiedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2034 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
2035 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hAddedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2038 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
2039 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hDeletedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2042 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
2043 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hReplacedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2045 *pResult = CDRF_SKIPDEFAULT;
\r
2051 *pResult = CDRF_DODEFAULT;
\r
2056 void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2059 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
2060 // Take the default processing unless we set this to something else below.
\r
2061 *pResult = CDRF_DODEFAULT;
\r
2063 // if (m_bNoDispUpdates)
\r
2066 // First thing - check the draw stage. If it's the control's prepaint
\r
2067 // stage, then tell Windows we want messages for every item.
\r
2069 if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2071 *pResult = CDRF_NOTIFYITEMDRAW;
\r
2073 else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2075 // This is the prepaint stage for an item. Here's where we set the
\r
2076 // item's text color. Our return value will tell Windows to draw the
\r
2077 // item itself, but it will use the new color we set here.
\r
2079 // Tell Windows to paint the control itself.
\r
2080 *pResult = CDRF_DODEFAULT;
\r
2082 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
2083 bool bGrayed = false;
\r
2085 if ((m_cHidePaths.GetState() & 0x0003)==BST_INDETERMINATE)
\r
2087 if ((m_currentChangedArray)&&((m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)))
\r
2089 //if ((*m_currentChangedArray)[(pLVCD->nmcd.dwItemSpec)]sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2091 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2095 else if (m_currentChangedPathList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
2097 //if (m_currentChangedPathList[pLVCD->nmcd.dwItemSpec].GetGitPathString().Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2099 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2106 if ((!bGrayed)&&(m_currentChangedArray)&&(m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
2108 DWORD action = ((*m_currentChangedArray)[pLVCD->nmcd.dwItemSpec]).m_Action;
\r
2109 if (action == CTGitPath::LOGACTIONS_MODIFIED)
\r
2110 crText = m_Colors.GetColor(CColors::Modified);
\r
2111 if (action == CTGitPath::LOGACTIONS_REPLACED)
\r
2112 crText = m_Colors.GetColor(CColors::Deleted);
\r
2113 if (action == CTGitPath::LOGACTIONS_ADDED)
\r
2114 crText = m_Colors.GetColor(CColors::Added);
\r
2115 if (action == CTGitPath::LOGACTIONS_DELETED)
\r
2116 crText = m_Colors.GetColor(CColors::Deleted);
\r
2119 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
2120 pLVCD->clrText = crText;
\r
2124 void CLogDlg::DoSizeV1(int delta)
\r
2127 RemoveAnchor(IDC_LOGLIST);
\r
2128 RemoveAnchor(IDC_SPLITTERTOP);
\r
2129 RemoveAnchor(IDC_MSGVIEW);
\r
2130 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2131 RemoveAnchor(IDC_LOGMSG);
\r
2132 CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);
\r
2133 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);
\r
2134 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2135 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2136 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2137 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2138 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2141 SetSplitterRange();
\r
2142 m_LogList.Invalidate();
\r
2143 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2147 void CLogDlg::DoSizeV2(int delta)
\r
2150 RemoveAnchor(IDC_LOGLIST);
\r
2151 RemoveAnchor(IDC_SPLITTERTOP);
\r
2152 RemoveAnchor(IDC_MSGVIEW);
\r
2153 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2154 RemoveAnchor(IDC_LOGMSG);
\r
2155 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);
\r
2156 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);
\r
2157 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2158 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2159 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2160 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2161 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2164 SetSplitterRange();
\r
2165 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2166 m_ChangedFileListCtrl.Invalidate();
\r
2170 void CLogDlg::AdjustMinSize()
\r
2172 // adjust the minimum size of the dialog to prevent the resizing from
\r
2173 // moving the list control too far down.
\r
2174 CRect rcChgListView;
\r
2175 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
\r
2177 m_LogList.GetClientRect(rcLogList);
\r
2179 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
\r
2180 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
\r
2181 +rcChgListView.Height()+rcLogList.Height()+60));
\r
2184 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
2186 switch (message) {
\r
2188 if (wParam == IDC_SPLITTERTOP)
\r
2190 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2191 DoSizeV1(pHdr->delta);
\r
2193 else if (wParam == IDC_SPLITTERBOTTOM)
\r
2195 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2196 DoSizeV2(pHdr->delta);
\r
2201 return CResizableDialog::DefWindowProc(message, wParam, lParam);
\r
2204 void CLogDlg::SetSplitterRange()
\r
2206 if ((m_LogList)&&(m_ChangedFileListCtrl))
\r
2209 m_LogList.GetWindowRect(rcTop);
\r
2210 ScreenToClient(rcTop);
\r
2212 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);
\r
2213 ScreenToClient(rcMiddle);
\r
2214 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);
\r
2216 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
\r
2217 ScreenToClient(rcBottom);
\r
2218 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);
\r
2222 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
\r
2224 RECT * rect = (LPRECT)lParam;
\r
2227 point = CPoint(rect->left, rect->bottom);
\r
2228 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))
\r
2230 if (popup.CreatePopupMenu())
\r
2232 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2233 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ALL), LOGFILTER_ALL, temp);
\r
2235 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2237 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2238 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
\r
2239 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2240 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
\r
2241 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2242 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
\r
2243 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2244 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
\r
2245 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
\r
2246 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
\r
2248 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2250 temp.LoadString(IDS_LOG_FILTER_REGEX);
\r
2251 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
\r
2254 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2255 if (selection != 0)
\r
2258 if (selection == LOGFILTER_REGEX)
\r
2260 m_bFilterWithRegex = !m_bFilterWithRegex;
\r
2261 CRegDWORD b = CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
2262 b = m_bFilterWithRegex;
\r
2263 CheckRegexpTooltip();
\r
2267 m_LogList.m_nSelectedFilter = selection;
\r
2268 SetFilterCueText();
\r
2270 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2276 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
2279 KillTimer(LOGFILTER_TIMER);
\r
2281 m_LogList.m_sFilterText.Empty();
\r
2282 UpdateData(FALSE);
\r
2283 theApp.DoWaitCursor(1);
\r
2284 CStoreSelection storeselection(this);
\r
2285 FillLogMessageCtrl(false);
\r
2287 m_LogList.RemoveFilter();
\r
2290 m_LogList.GetTimeRange(begin,end);
\r
2291 m_DateFrom.SetTime(&begin);
\r
2292 m_DateTo.SetTime(&end);
\r
2294 theApp.DoWaitCursor(-1);
\r
2295 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2296 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2297 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2298 UpdateLogInfoLabel();
\r
2304 void CLogDlg::SetFilterCueText()
\r
2307 switch (m_LogList.m_nSelectedFilter)
\r
2309 case LOGFILTER_ALL:
\r
2310 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2312 case LOGFILTER_MESSAGES:
\r
2313 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2315 case LOGFILTER_PATHS:
\r
2316 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2318 case LOGFILTER_AUTHORS:
\r
2319 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2321 case LOGFILTER_REVS:
\r
2322 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2325 // to make the cue banner text appear more to the right of the edit control
\r
2326 temp = _T(" ")+temp;
\r
2327 m_cFilter.SetCueBanner(temp);
\r
2330 bool CLogDlg::Validate(LPCTSTR string)
\r
2332 if (!m_bFilterWithRegex)
\r
2335 return m_LogList.ValidateRegexp(string, pat, false);
\r
2339 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
\r
2341 if (nIDEvent == LOGFILTER_TIMER)
\r
2343 if (this->IsThreadRunning())
\r
2345 // thread still running! So just restart the timer.
\r
2346 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2349 CWnd * focusWnd = GetFocus();
\r
2350 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
\r
2351 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
\r
2352 if (m_LogList.m_sFilterText.IsEmpty())
\r
2354 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2355 // do not return here!
\r
2356 // we also need to run the filter if the filter text is empty:
\r
2357 // 1. to clear an existing filter
\r
2358 // 2. to rebuild the m_arShownList after sorting
\r
2360 theApp.DoWaitCursor(1);
\r
2361 CStoreSelection storeselection(this);
\r
2362 KillTimer(LOGFILTER_TIMER);
\r
2363 FillLogMessageCtrl(false);
\r
2365 // now start filter the log list
\r
2366 m_LogList.StartFilter();
\r
2368 if ( m_LogList.GetItemCount()==1 )
\r
2370 m_LogList.SetSelectionMark(0);
\r
2371 m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
\r
2373 theApp.DoWaitCursor(-1);
\r
2374 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2375 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2376 if (bSetFocusToFilterControl)
\r
2377 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2378 UpdateLogInfoLabel();
\r
2379 } // if (nIDEvent == LOGFILTER_TIMER)
\r
2380 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2381 __super::OnTimer(nIDEvent);
\r
2384 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2387 m_DateTo.GetTime(_time);
\r
2390 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
\r
2391 if (time.GetTime() != m_LogList.m_To.GetTime())
\r
2393 m_LogList.m_To = (DWORD)time.GetTime();
\r
2394 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2397 catch (CAtlException)
\r
2404 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2407 m_DateFrom.GetTime(_time);
\r
2410 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
\r
2411 if (time.GetTime() != m_LogList.m_From.GetTime())
\r
2413 m_LogList.m_From = (DWORD)time.GetTime();
\r
2414 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2417 catch (CAtlException)
\r
2426 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths /* = false */, bool bUseFilter /* = true */)
\r
2428 CTGitPathList pathList;
\r
2431 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2433 m_sRepositoryRoot = GetRepositoryRoot(m_path);
\r
2435 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2438 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2443 int nextpos = m_LogList.GetNextSelectedItem(pos);
\r
2444 if (nextpos >= m_arShownList.GetCount())
\r
2446 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(nextpos));
\r
2447 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
2448 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
2450 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2451 if (cpath == NULL)
\r
2454 if (!bRelativePaths)
\r
2455 path.SetFromGit(m_sRepositoryRoot);
\r
2456 path.AppendPathString(cpath->sPath);
\r
2457 if ((!bUseFilter)||
\r
2458 ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||
\r
2459 (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))
\r
2460 pathList.AddPath(path);
\r
2465 pathList.RemoveDuplicates();
\r
2470 void CLogDlg::SortByColumn(int nSortColumn, bool bAscending)
\r
2473 switch(nSortColumn)
\r
2475 case 0: // Revision
\r
2478 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
\r
2480 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
\r
2486 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
\r
2488 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
\r
2494 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
\r
2496 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
\r
2502 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
\r
2504 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
\r
2507 case 4: // Message or bug id
\r
2508 if (m_bShowBugtraqColumn)
\r
2511 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
\r
2513 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
\r
2516 // fall through here
\r
2517 case 5: // Message
\r
2520 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
\r
2522 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
\r
2532 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
2534 if (this->IsThreadRunning())
\r
2535 return; //no sorting while the arrays are filled
\r
2536 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2537 const int nColumn = pNMLV->iSubItem;
\r
2538 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
\r
2539 m_nSortColumn = nColumn;
\r
2540 SortByColumn(m_nSortColumn, m_bAscending);
\r
2541 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
\r
2542 SortShownListArray();
\r
2543 m_LogList.Invalidate();
\r
2544 UpdateLogInfoLabel();
\r
2549 void CLogDlg::SortShownListArray()
\r
2551 // make sure the shown list still matches the filter after sorting.
\r
2552 OnTimer(LOGFILTER_TIMER);
\r
2553 // clear the selection states
\r
2554 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2557 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
\r
2559 m_LogList.SetSelectionMark(-1);
\r
2562 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
\r
2564 if (control == NULL)
\r
2566 // set the sort arrow
\r
2567 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
\r
2568 HDITEM HeaderItem = {0};
\r
2569 HeaderItem.mask = HDI_FORMAT;
\r
2570 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
2572 pHeader->GetItem(i, &HeaderItem);
\r
2573 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
2574 pHeader->SetItem(i, &HeaderItem);
\r
2578 pHeader->GetItem(nColumn, &HeaderItem);
\r
2579 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
2580 pHeader->SetItem(nColumn, &HeaderItem);
\r
2583 void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2586 if (this->IsThreadRunning())
\r
2587 return; //no sorting while the arrays are filled
\r
2588 if (m_currentChangedArray == NULL)
\r
2590 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2591 const int nColumn = pNMLV->iSubItem;
\r
2592 m_bAscendingPathList = nColumn == m_nSortColumnPathList ? !m_bAscendingPathList : TRUE;
\r
2593 m_nSortColumnPathList = nColumn;
\r
2594 // qsort(m_currentChangedArray->GetData(), m_currentChangedArray->GetSize(), sizeof(LogChangedPath*), (GENERICCOMPAREFN)SortCompare);
\r
2596 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
2597 m_ChangedFileListCtrl.Invalidate();
\r
2602 int CLogDlg::m_nSortColumnPathList = 0;
\r
2603 bool CLogDlg::m_bAscendingPathList = false;
\r
2605 int CLogDlg::SortCompare(const void * pElem1, const void * pElem2)
\r
2608 LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);
\r
2609 LogChangedPath * cpath2 = *((LogChangedPath**)pElem2);
\r
2611 if (m_bAscendingPathList)
\r
2612 std::swap (cpath1, cpath2);
\r
2615 switch (m_nSortColumnPathList)
\r
2618 cmp = cpath2->GetAction().Compare(cpath1->GetAction());
\r
2623 cmp = cpath2->sPath.CompareNoCase(cpath1->sPath);
\r
2627 case 2: // copy from path
\r
2628 cmp = cpath2->sCopyFromPath.Compare(cpath1->sCopyFromPath);
\r
2632 case 3: // copy from revision
\r
2633 return cpath2->lCopyFromRev > cpath1->lCopyFromRev;
\r
2639 void CLogDlg::OnBnClickedHidepaths()
\r
2641 FillLogMessageCtrl();
\r
2642 m_ChangedFileListCtrl.Invalidate();
\r
2647 void CLogDlg::OnBnClickedCheckStoponcopy()
\r
2650 if (!GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
2653 // ignore old fetch limits when switching
\r
2654 // between copy-following and stop-on-copy
\r
2655 // (otherwise stop-on-copy will limit what
\r
2656 // we see immediately after switching to
\r
2657 // copy-following)
\r
2661 // now, restart the query
\r
2666 void CLogDlg::OnBnClickedIncludemerge()
\r
2676 void CLogDlg::UpdateLogInfoLabel()
\r
2679 git_revnum_t rev1 ;
\r
2680 git_revnum_t rev2 ;
\r
2681 long selectedrevs = 0;
\r
2682 int count =m_LogList.m_arShownList.GetCount();
\r
2685 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(0)))->m_CommitHash;
\r
2686 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));
\r
2687 rev2 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(count-1)))->m_CommitHash;
\r
2688 selectedrevs = m_LogList.GetSelectedCount();
\r
2691 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
2692 m_sLogInfo = sTemp;
\r
2694 UpdateData(FALSE);
\r
2698 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
\r
2701 int selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
2702 if ((point.x == -1) && (point.y == -1))
\r
2705 m_ChangedFileListCtrl.GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2706 m_ChangedFileListCtrl.ClientToScreen(&rect);
\r
2707 point = rect.CenterPoint();
\r
2711 int s = m_LogList.GetSelectionMark();
\r
2714 std::vector<CString> changedpaths;
\r
2715 std::vector<LogChangedPath*> changedlogpaths;
\r
2716 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2718 return; // nothing is selected, get out of here
\r
2720 bool bOneRev = true;
\r
2721 int sel=m_LogList.GetNextSelectedItem(pos);
\r
2722 GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel));
\r
2723 GitRev * rev1 = pLogEntry;
\r
2724 GitRev * rev2 = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel+1));
\r
2726 bool bOneRev = true;
\r
2731 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
2734 rev1 = max(rev1,(git_revnum_t)pLogEntry->Rev);
\r
2735 rev2 = min(rev2,(git_revnum_t)pLogEntry->Rev);
\r
2741 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
2744 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
2745 changedpaths.push_back(m_currentChangedPathList[nItem].GetGitPathString());
\r
2750 // only one revision is selected in the log dialog top pane
\r
2751 // but multiple items could be selected in the changed items list
\r
2754 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
2757 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
2758 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
2760 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
2762 if ((changedlogpath)&&(!changedlogpath->sCopyFromPath.IsEmpty()))
\r
2763 rev2 = changedlogpath->lCopyFromRev;
\r
2766 // if the path was modified but the parent path was 'added with history'
\r
2767 // then we have to use the copy from revision of the parent path
\r
2768 CTGitPath cpath = CTGitPath(changedlogpath->sPath);
\r
2769 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
2771 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
2772 if (p.IsAncestorOf(cpath))
\r
2774 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
2775 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
2780 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
2782 // some items are hidden! So find out which item the user really clicked on
\r
2783 INT_PTR selRealIndex = -1;
\r
2784 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
2786 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
2788 if (selRealIndex == nItem)
\r
2790 selIndex = hiddenindex;
\r
2791 changedlogpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
2796 if (changedlogpath)
\r
2798 changedpaths.push_back(changedlogpath->sPath);
\r
2799 changedlogpaths.push_back(changedlogpath);
\r
2804 //entry is selected, now show the popup menu
\r
2806 if (popup.CreatePopupMenu())
\r
2808 bool bEntryAdded = false;
\r
2809 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
2811 // if ((!bOneRev)||(IsDiffPossible(changedlogpaths[0], rev1)))
\r
2813 popup.AppendMenuIcon(CGitLogList::ID_DIFF, IDS_LOG_POPUP_DIFF, IDI_DIFF);
\r
2814 popup.AppendMenuIcon(CGitLogList::ID_BLAMEDIFF, IDS_LOG_POPUP_BLAMEDIFF, IDI_BLAME);
\r
2815 popup.SetDefaultItem(CGitLogList::ID_DIFF, FALSE);
\r
2816 popup.AppendMenuIcon(CGitLogList::ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF);
\r
2817 bEntryAdded = true;
\r
2819 // if (rev2 == rev1-1)
\r
2822 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2823 popup.AppendMenuIcon(CGitLogList::ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);
\r
2824 popup.AppendMenuIcon(CGitLogList::ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2825 popup.AppendMenuIcon(CGitLogList::ID_BLAME, IDS_LOG_POPUP_BLAME, IDI_BLAME);
\r
2826 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2828 popup.AppendMenuIcon(CGitLogList::ID_REVERTREV, IDS_LOG_POPUP_REVERTREV, IDI_REVERT);
\r
2829 popup.AppendMenuIcon(CGitLogList::ID_POPPROPS, IDS_REPOBROWSE_SHOWPROP, IDI_PROPERTIES); // "Show Properties"
\r
2830 popup.AppendMenuIcon(CGitLogList::ID_LOG, IDS_MENULOG, IDI_LOG); // "Show Log"
\r
2831 popup.AppendMenuIcon(CGitLogList::ID_GETMERGELOGS, IDS_LOG_POPUP_GETMERGELOGS, IDI_LOG); // "Show merge log"
\r
2832 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
\r
2833 bEntryAdded = true;
\r
2834 if (!m_ProjectProperties.sWebViewerPathRev.IsEmpty())
\r
2836 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2837 popup.AppendMenuIcon(CGitLogList::ID_VIEWPATHREV, IDS_LOG_POPUP_VIEWPATHREV);
\r
2839 if (popup.GetDefaultItem(0,FALSE)==-1)
\r
2840 popup.SetDefaultItem(CGitLogList::ID_OPEN, FALSE);
\r
2843 else if (changedlogpaths.size())
\r
2845 // more than one entry is selected
\r
2846 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE);
\r
2847 bEntryAdded = true;
\r
2852 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2853 bool bOpenWith = false;
\r
2854 bool bMergeLog = false;
\r
2855 m_bCancelled = false;
\r
2859 case CGitLogList::ID_DIFF:
\r
2861 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
2865 case ID_BLAMEDIFF:
\r
2867 DoDiffFromLog(selIndex, rev1, rev2, true, false);
\r
2872 DoDiffFromLog(selIndex, rev1, rev2, false, true);
\r
2875 case ID_REVERTREV:
\r
2877 SetPromptApp(&theApp);
\r
2878 theApp.DoWaitCursor(1);
\r
2880 if (Git::PathIsURL(m_path))
\r
2882 sUrl = m_path.GetGitPathString();
\r
2886 sUrl = GetURLFromPath(m_path);
\r
2887 if (sUrl.IsEmpty())
\r
2889 theApp.DoWaitCursor(-1);
\r
2891 temp.Format(IDS_ERR_NOURLOFFILE, m_path.GetWinPath());
\r
2892 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
2894 theApp.DoWaitCursor(-1);
\r
2898 // find the working copy path of the selected item from the URL
\r
2899 m_bCancelled = false;
\r
2900 CString sUrlRoot = GetRepositoryRoot(CTGitPath(sUrl));
\r
2902 CString fileURL = changedpaths[0];
\r
2903 fileURL = sUrlRoot + fileURL.Trim();
\r
2904 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1
\r
2905 // sUrl = http://mydomain.com/repos/trunk/folder
\r
2906 CString sUnescapedUrl = CPathUtils::PathUnescape(sUrl);
\r
2907 // find out until which char the urls are identical
\r
2909 while ((i<fileURL.GetLength())&&(i<sUnescapedUrl.GetLength())&&(fileURL[i]==sUnescapedUrl[i]))
\r
2911 int leftcount = m_path.GetWinPathString().GetLength()-(sUnescapedUrl.GetLength()-i);
\r
2912 CString wcPath = m_path.GetWinPathString().Left(leftcount);
\r
2913 wcPath += fileURL.Mid(i);
\r
2914 wcPath.Replace('/', '\\');
\r
2915 CGitProgressDlg dlg;
\r
2916 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
2918 // a deleted path! Since the path isn't there anymore, merge
\r
2919 // won't work. So just do a copy url->wc
\r
2920 dlg.SetCommand(CGitProgressDlg::GitProgress_Copy);
\r
2921 dlg.SetPathList(CTGitPathList(CTGitPath(fileURL)));
\r
2922 dlg.SetUrl(wcPath);
\r
2923 dlg.SetRevision(rev2);
\r
2927 if (!PathFileExists(wcPath))
\r
2929 // seems the path got renamed
\r
2930 // tell the user how to work around this.
\r
2931 CMessageBox::Show(this->m_hWnd, IDS_LOG_REVERTREV_ERROR, IDS_APPNAME, MB_ICONERROR);
\r
2933 theApp.DoWaitCursor(-1);
\r
2936 dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);
\r
2937 dlg.SetPathList(CTGitPathList(CTGitPath(wcPath)));
\r
2938 dlg.SetUrl(fileURL);
\r
2939 dlg.SetSecondUrl(fileURL);
\r
2940 GitRevRangeArray revarray;
\r
2941 revarray.AddRevRange(rev1, rev2);
\r
2942 dlg.SetRevisionRanges(revarray);
\r
2945 msg.Format(IDS_LOG_REVERT_CONFIRM, (LPCTSTR)wcPath);
\r
2946 if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)
\r
2950 theApp.DoWaitCursor(-1);
\r
2955 DialogEnableWindow(IDOK, FALSE);
\r
2956 SetPromptApp(&theApp);
\r
2957 theApp.DoWaitCursor(1);
\r
2959 if (Git::PathIsURL(m_path))
\r
2961 filepath = m_path.GetGitPathString();
\r
2965 filepath = GetURLFromPath(m_path);
\r
2966 if (filepath.IsEmpty())
\r
2968 theApp.DoWaitCursor(-1);
\r
2970 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
2971 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
2972 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
2977 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
2978 filepath += changedpaths[0];
\r
2981 dlg.m_Path = CTGitPath(filepath);
\r
2984 theApp.DoWaitCursor(-1);
\r
2989 DialogEnableWindow(IDOK, FALSE);
\r
2990 SetPromptApp(&theApp);
\r
2991 theApp.DoWaitCursor(1);
\r
2993 if (Git::PathIsURL(m_path))
\r
2995 filepath = m_path.GetGitPathString();
\r
2999 filepath = GetURLFromPath(m_path);
\r
3000 if (filepath.IsEmpty())
\r
3002 theApp.DoWaitCursor(-1);
\r
3004 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3005 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3006 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3011 m_bCancelled = false;
\r
3012 CString sRoot = GetRepositoryRoot(CTGitPath(filepath));
\r
3013 // if more than one entry is selected, we save them
\r
3014 // one by one into a folder the user has selected
\r
3015 bool bTargetSelected = false;
\r
3016 CTGitPath TargetPath;
\r
3017 if (m_ChangedFileListCtrl.GetSelectedCount() > 1)
\r
3019 CBrowseFolder browseFolder;
\r
3020 browseFolder.SetInfo(CString(MAKEINTRESOURCE(IDS_LOG_SAVEFOLDERTOHINT)));
\r
3021 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
3022 CString strSaveAsDirectory;
\r
3023 if (browseFolder.Show(GetSafeHwnd(), strSaveAsDirectory) == CBrowseFolder::OK)
\r
3025 TargetPath = CTGitPath(strSaveAsDirectory);
\r
3026 bTargetSelected = true;
\r
3031 // Display the Open dialog box.
\r
3032 CString revFilename;
\r
3034 temp = CPathUtils::GetFileNameFromPath(changedpaths[0]);
\r
3035 int rfind = temp.ReverseFind('.');
\r
3037 revFilename.Format(_T("%s-%ld%s"), (LPCTSTR)temp.Left(rfind), rev1, (LPCTSTR)temp.Mid(rfind));
\r
3039 revFilename.Format(_T("%s-%ld"), (LPCTSTR)temp, rev1);
\r
3040 bTargetSelected = CAppUtils::FileOpenSave(revFilename, NULL, IDS_LOG_POPUP_SAVE, IDS_COMMONFILEFILTER, false, m_hWnd);
\r
3041 TargetPath.SetFromWin(revFilename);
\r
3043 if (bTargetSelected)
\r
3045 CProgressDlg progDlg;
\r
3046 progDlg.SetTitle(IDS_APPNAME);
\r
3047 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
3048 for (std::vector<LogChangedPath*>::iterator it = changedlogpaths.begin(); it!= changedlogpaths.end(); ++it)
\r
3050 GitRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;
\r
3052 CString sInfoLine;
\r
3053 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)getrev.ToString());
\r
3054 progDlg.SetLine(1, sInfoLine, true);
\r
3055 SetAndClearProgressInfo(&progDlg);
\r
3056 progDlg.ShowModeless(m_hWnd);
\r
3058 CTGitPath tempfile = TargetPath;
\r
3059 if (changedpaths.size() > 1)
\r
3061 // if multiple items are selected, then the TargetPath
\r
3062 // points to a folder and we have to append the filename
\r
3063 // to save to to that folder.
\r
3064 CString sName = (*it)->sPath;
\r
3065 int slashpos = sName.ReverseFind('/');
\r
3066 if (slashpos >= 0)
\r
3067 sName = sName.Mid(slashpos);
\r
3068 tempfile.AppendPathString(sName);
\r
3069 // one problem here:
\r
3070 // a user could have selected multiple items which
\r
3071 // have the same filename but reside in different
\r
3072 // directories, e.g.
\r
3075 // in that case, the second 'file1' will overwrite
\r
3076 // the already saved 'file1'.
\r
3078 // we could maybe find the common root of all selected
\r
3079 // items and then create sub folders to save those files
\r
3081 // But I think we should just leave it that way: to check
\r
3082 // out multiple items at once, the better way is still to
\r
3083 // use the export command from the top pane of the log dialog.
\r
3085 filepath = sRoot + (*it)->sPath;
\r
3086 if (!Cat(CTGitPath(filepath), getrev, getrev, tempfile))
\r
3089 SetAndClearProgressInfo((HWND)NULL);
\r
3090 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3092 theApp.DoWaitCursor(-1);
\r
3097 SetAndClearProgressInfo((HWND)NULL);
\r
3100 theApp.DoWaitCursor(-1);
\r
3107 GitRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;
\r
3108 Open(bOpenWith,changedpaths[0],getrev);
\r
3114 if (Git::PathIsURL(m_path))
\r
3116 filepath = m_path.GetGitPathString();
\r
3120 filepath = GetURLFromPath(m_path);
\r
3121 if (filepath.IsEmpty())
\r
3123 theApp.DoWaitCursor(-1);
\r
3125 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3126 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3127 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3132 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3133 filepath += changedpaths[0];
\r
3135 dlg.EndRev = rev1;
\r
3136 if (dlg.DoModal() == IDOK)
\r
3141 tempfile = blame.BlameToTempFile(CTGitPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);
\r
3142 if (!tempfile.IsEmpty())
\r
3144 if (dlg.m_bTextView)
\r
3146 //open the default text editor for the result file
\r
3147 CAppUtils::StartTextViewer(tempfile);
\r
3151 CString sParams = _T("/path:\"") + filepath + _T("\" ");
\r
3152 if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(filepath),sParams))
\r
3160 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3165 case ID_GETMERGELOGS:
\r
3170 DialogEnableWindow(IDOK, FALSE);
\r
3171 SetPromptApp(&theApp);
\r
3172 theApp.DoWaitCursor(1);
\r
3174 if (Git::PathIsURL(m_path))
\r
3176 filepath = m_path.GetGitPathString();
\r
3180 filepath = GetURLFromPath(m_path);
\r
3181 if (filepath.IsEmpty())
\r
3183 theApp.DoWaitCursor(-1);
\r
3185 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3186 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3187 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3192 m_bCancelled = false;
\r
3193 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3194 filepath += changedpaths[0];
\r
3195 git_revnum_t logrev = rev1;
\r
3196 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3198 // if the item got deleted in this revision,
\r
3199 // fetch the log from the previous revision where it
\r
3204 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\" /startrev:%ld"), (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)filepath, logrev);
\r
3206 sCmd += _T(" /merge");
\r
3207 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3209 theApp.DoWaitCursor(-1);
\r
3212 case ID_VIEWPATHREV:
\r
3214 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetSelectionMark()));
\r
3215 GitRev rev = pLogEntry->Rev;
\r
3216 CString relurl = changedpaths[0];
\r
3217 CString url = m_ProjectProperties.sWebViewerPathRev;
\r
3218 url.Replace(_T("%REVISION%"), rev.ToString());
\r
3219 url.Replace(_T("%PATH%"), relurl);
\r
3220 relurl = relurl.Mid(relurl.Find('/'));
\r
3221 url.Replace(_T("%PATH1%"), relurl);
\r
3222 if (!url.IsEmpty())
\r
3223 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
3231 } // if (popup.CreatePopupMenu())
\r
3235 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3237 // the date control should not show the "today" button
\r
3238 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
\r
3240 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3244 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3246 // the date control should not show the "today" button
\r
3247 CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();
\r
3249 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3253 void CLogDlg::OnSize(UINT nType, int cx, int cy)
\r
3255 __super::OnSize(nType, cx, cy);
\r
3257 SetSplitterRange();
\r
3260 void CLogDlg::OnRefresh()
\r
3262 if (GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
3269 void CLogDlg::OnFind()
\r
3271 if (!m_pFindDialog)
\r
3273 m_pFindDialog = new CFindReplaceDialog();
\r
3274 m_pFindDialog->Create(TRUE, NULL, NULL, FR_HIDEUPDOWN | FR_HIDEWHOLEWORD, this);
\r
3278 void CLogDlg::OnFocusFilter()
\r
3280 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3283 void CLogDlg::OnEditCopy()
\r
3285 if (GetFocus() == &m_ChangedFileListCtrl)
\r
3286 CopyChangedSelectionToClipBoard();
\r
3288 m_LogList.CopySelectionToClipBoard();
\r
3291 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
\r
3293 // is the URL a relative one?
\r
3294 if (url.Left(2).Compare(_T("^/")) == 0)
\r
3296 // URL is relative to the repository root
\r
3297 CString url1 = m_sRepositoryRoot + url.Mid(1);
\r
3298 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3299 DWORD len = url.GetLength();
\r
3300 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
\r
3301 return CString(buf, len);
\r
3304 else if (url[0] == '/')
\r
3306 // URL is relative to the server's hostname
\r
3308 // find the server's hostname
\r
3309 int schemepos = m_sRepositoryRoot.Find(_T("//"));
\r
3310 if (schemepos >= 0)
\r
3312 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));
\r
3313 CString url1 = sHost + url;
\r
3314 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3315 DWORD len = url.GetLength();
\r
3316 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
\r
3317 return CString(buf, len);
\r
3325 void CLogDlg::OnEnChangeSearchedit()
\r
3328 if (m_LogList.m_sFilterText.IsEmpty())
\r
3330 CStoreSelection storeselection(this);
\r
3331 // clear the filter, i.e. make all entries appear
\r
3332 theApp.DoWaitCursor(1);
\r
3333 KillTimer(LOGFILTER_TIMER);
\r
3334 FillLogMessageCtrl(false);
\r
3335 m_LogList.StartFilter();
\r
3337 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
3338 m_arShownList.RemoveAll();
\r
3339 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
3341 if (IsEntryInDateRange(i))
\r
3342 m_arShownList.Add(m_logEntries[i]);
\r
3344 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
3345 m_LogList.DeleteAllItems();
\r
3346 m_LogList.SetItemCountEx(ShownCountWithStopped());
\r
3347 m_LogList.RedrawItems(0, ShownCountWithStopped());
\r
3348 m_LogList.SetRedraw(false);
\r
3349 ResizeAllListCtrlCols();
\r
3350 m_LogList.SetRedraw(true);
\r
3352 theApp.DoWaitCursor(-1);
\r
3353 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
3354 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
3355 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3356 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
3359 if (Validate(m_LogList.m_sFilterText))
\r
3360 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
3362 KillTimer(LOGFILTER_TIMER);
\r
OSDN Git Service
