1 // TortoiseGit - a Windows shell extension for easy version control
\r
2 // Copyright (C) 2003-2008 - TortoiseGit
\r
3 // This program is free software; you can redistribute it and/or
\r
4 // modify it under the terms of the GNU General Public License
\r
5 // as published by the Free Software Foundation; either version 2
\r
6 // of the License, or (at your option) any later version.
\r
7 // This program is distributed in the hope that it will be useful,
\r
8 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
9 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
10 // GNU General Public License for more details.
\r
12 // You should have received a copy of the GNU General Public License
\r
13 // along with this program; if not, write to the Free Software Foundation,
\r
14 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
17 #include "TortoiseProc.h"
\r
19 #include "InputDlg.h"
\r
20 #include "PropDlg.h"
\r
21 #include "SVNProgressDlg.h"
\r
22 #include "ProgressDlg.h"
\r
23 //#include "RepositoryBrowser.h"
\r
24 //#include "CopyDlg.h"
\r
25 #include "StatGraphDlg.h"
\r
27 #include "MessageBox.h"
\r
28 #include "Registry.h"
\r
29 #include "AppUtils.h"
\r
30 #include "PathUtils.h"
\r
31 #include "StringUtils.h"
\r
32 #include "UnicodeUtils.h"
\r
33 #include "TempFile.h"
\r
34 //#include "GitInfo.h"
\r
35 //#include "GitDiff.h"
\r
36 #include "IconMenu.h"
\r
37 //#include "RevisionRangeDlg.h"
\r
38 //#include "BrowseFolder.h"
\r
39 //#include "BlameDlg.h"
\r
40 //#include "Blame.h"
\r
41 //#include "GitHelpers.h"
\r
42 #include "GitStatus.h"
\r
43 //#include "LogDlgHelper.h"
\r
44 //#include "CachedLogInfo.h"
\r
45 //#include "RepositoryInfo.h"
\r
46 //#include "EditPropertiesDlg.h"
\r
47 #include "FileDiffDlg.h"
\r
50 const UINT CLogDlg::m_FindDialogMessage = RegisterWindowMessage(FINDMSGSTRING);
\r
53 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)
\r
54 CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
\r
55 : CResizableStandAloneDialog(CLogDlg::IDD, pParent)
\r
59 , m_currentChangedArray(NULL)
\r
61 , m_bShowedAll(false)
\r
64 , m_bSelectionMustBeContinuous(false)
\r
65 , m_bShowBugtraqColumn(false)
\r
66 , m_lowestRev(_T(""))
\r
68 , m_sLogInfo(_T(""))
\r
69 , m_pFindDialog(NULL)
\r
70 , m_bCancelled(FALSE)
\r
71 , m_pNotifyWindow(NULL)
\r
73 , m_bAscending(FALSE)
\r
78 , m_bIncludeMerges(FALSE)
\r
82 m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
84 m_bFirstParent=FALSE;
\r
85 m_bWholeProject=FALSE;
\r
91 m_CurrentFilteredChangedArray.RemoveAll();
\r
95 void CLogDlg::DoDataExchange(CDataExchange* pDX)
\r
97 CResizableStandAloneDialog::DoDataExchange(pDX);
\r
98 DDX_Control(pDX, IDC_LOGLIST, m_LogList);
\r
99 DDX_Control(pDX, IDC_LOGMSG, m_ChangedFileListCtrl);
\r
100 DDX_Control(pDX, IDC_PROGRESS, m_LogProgress);
\r
101 DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1);
\r
102 DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2);
\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_Text(pDX, IDC_LOGINFO, m_sLogInfo);
\r
108 DDX_Check(pDX, IDC_LOG_FIRSTPARENT, m_bFirstParent);
\r
109 DDX_Check(pDX, IDC_LOG_ALLBRANCH,m_bAllBranch);
\r
110 DDX_Check(pDX, IDC_SHOWWHOLEPROJECT,m_bWholeProject);
\r
111 DDX_Control(pDX, IDC_SEARCHEDIT, m_cFilter);
\r
114 BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
\r
115 ON_REGISTERED_MESSAGE(m_FindDialogMessage, OnFindDialogMessage)
\r
116 //ON_BN_CLICKED(IDC_GETALL, OnBnClickedGetall)
\r
117 //ON_NOTIFY(NM_DBLCLK, IDC_LOGMSG, OnNMDblclkChangedFileList)
\r
118 ON_WM_CONTEXTMENU()
\r
120 ON_BN_CLICKED(IDHELP, OnBnClickedHelp)
\r
121 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)
\r
122 ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)
\r
123 ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)
\r
126 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
\r
127 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
\r
129 ON_MESSAGE(MSG_LOAD_PERCENTAGE,OnLogListLoading)
\r
131 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
\r
133 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
\r
134 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
\r
135 ON_BN_CLICKED(IDC_SHOWWHOLEPROJECT, OnBnClickShowWholeProject)
\r
136 //ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGMSG, OnNMCustomdrawChangedFileList)
\r
137 //ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGMSG, OnLvnGetdispinfoChangedFileList)
\r
138 ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST , OnLvnColumnclick)
\r
139 //ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList)
\r
140 ON_BN_CLICKED(IDC_HIDEPATHS, OnBnClickedHidepaths)
\r
141 ON_BN_CLICKED(IDC_LOG_ALLBRANCH,OnBnClickedAllBranch)
\r
143 ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)
\r
144 ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)
\r
146 ON_BN_CLICKED(IDC_LOG_FIRSTPARENT, &CLogDlg::OnBnClickedFirstParent)
\r
147 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
\r
148 ON_COMMAND(ID_LOGDLG_REFRESH,&CLogDlg::OnRefresh)
\r
149 ON_COMMAND(ID_LOGDLG_FIND,&CLogDlg::OnFind)
\r
150 ON_COMMAND(ID_LOGDLG_FOCUSFILTER,&CLogDlg::OnFocusFilter)
\r
151 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
\r
154 void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit /* = FALSE */)
\r
158 m_startrev = startrev;
\r
159 m_LogRevision = startrev;
\r
161 m_hasWC = !path.IsUrl();
\r
163 if (::IsWindow(m_hWnd))
\r
167 BOOL CLogDlg::OnInitDialog()
\r
170 CResizableStandAloneDialog::OnInitDialog();
\r
172 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
\r
174 OSVERSIONINFOEX inf;
\r
175 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
176 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
177 GetVersionEx((OSVERSIONINFO *)&inf);
\r
178 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
179 m_bVista = (fullver >= 0x0600);
\r
181 // use the state of the "stop on copy/rename" option from the last time
\r
184 // set the font to use in the log message view, configured in the settings dialog
\r
185 CAppUtils::CreateFontForLogs(m_logFont);
\r
186 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
\r
187 // automatically detect URLs in the log message and turn them into links
\r
188 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_AUTOURLDETECT, TRUE, NULL);
\r
189 // make the log message rich edit control send a message when the mouse pointer is over a link
\r
190 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK);
\r
191 //m_LogList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_SUBITEMIMAGES);
\r
193 // the "hide unrelated paths" checkbox should be indeterminate
\r
194 m_cHidePaths.SetCheck(BST_INDETERMINATE);
\r
197 // if there is a working copy, load the project properties
\r
198 // to get information about the bugtraq: integration
\r
200 m_ProjectProperties.ReadProps(m_path);
\r
202 // the bugtraq issue id column is only shown if the bugtraq:url or bugtraq:regex is set
\r
203 if ((!m_ProjectProperties.sUrl.IsEmpty())||(!m_ProjectProperties.sCheckRe.IsEmpty()))
\r
204 m_bShowBugtraqColumn = true;
\r
206 //theme.SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);
\r
207 //theme.SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);
\r
209 // set up the columns
\r
210 m_LogList.DeleteAllItems();
\r
211 m_LogList.InsertGitColumn();
\r
213 m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ (SVNSLC_POPCOMMIT|SVNSLC_POPREVERT)),false);
\r
215 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
218 m_sMessageBuf.Preallocate(100000);
\r
220 // set the dialog title to "Log - path/to/whatever/we/show/the/log/for"
\r
221 SetDlgTitle(false);
\r
223 m_tooltips.Create(this);
\r
224 CheckRegexpTooltip();
\r
226 SetSplitterRange();
\r
228 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
\r
229 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
\r
230 m_cFilter.SetInfoIcon(IDI_LOGFILTER);
\r
231 m_cFilter.SetValidator(this);
\r
233 AdjustControlSize(IDC_HIDEPATHS);
\r
234 AdjustControlSize(IDC_LOG_FIRSTPARENT);
\r
235 AdjustControlSize(IDC_LOG_ALLBRANCH);
\r
237 GetClientRect(m_DlgOrigRect);
\r
238 m_LogList.GetClientRect(m_LogListOrigRect);
\r
239 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
\r
240 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
\r
242 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
243 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
246 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
\r
247 AddAnchor(IDC_DATEFROM, TOP_LEFT);
\r
248 AddAnchor(IDC_TOLABEL, TOP_LEFT);
\r
249 AddAnchor(IDC_DATETO, TOP_LEFT);
\r
251 SetFilterCueText();
\r
252 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
\r
254 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
255 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
256 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
257 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
258 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
260 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
261 AddAnchor(IDC_HIDEPATHS, BOTTOM_LEFT);
\r
262 AddAnchor(IDC_LOG_ALLBRANCH,BOTTOM_LEFT);
\r
263 AddAnchor(IDC_LOG_FIRSTPARENT, BOTTOM_LEFT);
\r
264 //AddAnchor(IDC_GETALL, BOTTOM_LEFT);
\r
265 AddAnchor(IDC_SHOWWHOLEPROJECT, BOTTOM_LEFT);
\r
266 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
\r
267 AddAnchor(IDC_STATBUTTON, BOTTOM_RIGHT);
\r
268 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
269 AddAnchor(IDOK, BOTTOM_RIGHT);
\r
270 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
\r
271 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
273 // SetPromptParentWindow(m_hWnd);
\r
276 CenterWindow(CWnd::FromHandle(hWndExplorer));
\r
277 EnableSaveRestore(_T("LogDlg"));
\r
279 DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
280 DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
281 RECT rcDlg, rcLogList, rcChgMsg;
\r
282 GetClientRect(&rcDlg);
\r
283 m_LogList.GetWindowRect(&rcLogList);
\r
284 ScreenToClient(&rcLogList);
\r
285 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
\r
286 ScreenToClient(&rcChgMsg);
\r
290 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
291 ScreenToClient(&rectSplitter);
\r
292 int delta = yPos1 - rectSplitter.top;
\r
294 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
\r
296 m_wndSplitter1.SetWindowPos(NULL, 0, yPos1, 0, 0, SWP_NOSIZE);
\r
303 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
304 ScreenToClient(&rectSplitter);
\r
305 int delta = yPos2 - rectSplitter.top;
\r
307 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
\r
309 m_wndSplitter2.SetWindowPos(NULL, 0, yPos2, 0, 0, SWP_NOSIZE);
\r
317 // the dialog is used to select revisions
\r
318 // enable the OK button if appropriate
\r
323 // the dialog is used to just view log messages
\r
324 // hide the OK button and set text on Cancel button to OK
\r
325 GetDlgItemText(IDOK, temp);
\r
326 SetDlgItemText(IDCANCEL, temp);
\r
327 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
\r
330 m_mergedRevs.clear();
\r
332 // first start a thread to obtain the log messages without
\r
333 // blocking the dialog
\r
335 //m_tFrom = (DWORD)-1;
\r
337 m_LogList.m_Path=m_path;
\r
338 m_LogList.FetchLogAsync(this);
\r
340 GetDlgItem(IDC_LOGLIST)->SetFocus();
\r
344 LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)
\r
346 int cur=(int)wParam;
\r
348 if( cur == GITLOG_START )
\r
351 temp.LoadString(IDS_PROGRESSWAIT);
\r
353 this->m_LogList.ShowText(temp, true);
\r
355 // We use a progress bar while getting the logs
\r
356 m_LogProgress.SetRange32(0, 100);
\r
357 m_LogProgress.SetPos(0);
\r
359 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
\r
361 //DialogEnableWindow(IDC_GETALL, FALSE);
\r
362 //DialogEnableWindow(IDC_SHOWWHOLEPROJECT, FALSE);
\r
363 //DialogEnableWindow(IDC_LOG_FIRSTPARENT, FALSE);
\r
364 DialogEnableWindow(IDC_STATBUTTON, FALSE);
\r
365 DialogEnableWindow(IDC_REFRESH, FALSE);
\r
366 DialogEnableWindow(IDC_HIDEPATHS,FALSE);
\r
368 }else if( cur == GITLOG_END)
\r
371 //if (!m_bShowedAll)
\r
372 DialogEnableWindow(IDC_SHOWWHOLEPROJECT, TRUE);
\r
374 //DialogEnableWindow(IDC_GETALL, TRUE);
\r
375 DialogEnableWindow(IDC_LOG_FIRSTPARENT, TRUE);
\r
376 DialogEnableWindow(IDC_STATBUTTON, TRUE);
\r
377 DialogEnableWindow(IDC_REFRESH, TRUE);
\r
378 DialogEnableWindow(IDC_HIDEPATHS,TRUE);
\r
380 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
\r
381 GetDlgItem(IDC_PROGRESS)->ShowWindow(FALSE);
\r
382 //CTime time=m_LogList.GetOldestTime();
\r
384 m_LogList.GetTimeRange(begin,end);
\r
385 m_DateFrom.SetTime(&begin);
\r
386 m_DateTo.SetTime(&end);
\r
392 if(this->m_LogList.HasText())
\r
394 this->m_LogList.ClearText();
\r
395 UpdateLogInfoLabel();
\r
397 m_LogProgress.SetPos(cur);
\r
401 void CLogDlg::SetDlgTitle(bool bOffline)
\r
403 if (m_sTitle.IsEmpty())
\r
404 GetWindowText(m_sTitle);
\r
409 if (m_path.IsUrl())
\r
410 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetUIPathString());
\r
411 else if (m_path.IsDirectory())
\r
412 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetWinPathString());
\r
414 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetFilename());
\r
415 SetWindowText(sTemp);
\r
419 if (m_path.IsUrl())
\r
420 SetWindowText(m_sTitle + _T(" - ") + m_path.GetUIPathString());
\r
421 else if (m_path.IsEmpty())
\r
422 SetWindowText(m_sTitle + _T(" - ") + CString(_T("Whole Project")));
\r
423 else if (m_path.IsDirectory())
\r
424 SetWindowText(m_sTitle + _T(" - ") + m_path.GetWinPathString());
\r
426 SetWindowText(m_sTitle + _T(" - ") + m_path.GetFilename());
\r
430 void CLogDlg::CheckRegexpTooltip()
\r
432 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
\r
433 // Since tooltip describes regexp features, show it only if regexps are enabled.
\r
434 if (m_bFilterWithRegex)
\r
436 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
\r
439 m_tooltips.DelTool(pWnd);
\r
442 void CLogDlg::EnableOKButton()
\r
446 // the dialog is used to select revisions
\r
447 if (m_bSelectionMustBeSingle)
\r
449 // enable OK button if only a single revision is selected
\r
450 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()==1));
\r
452 else if (m_bSelectionMustBeContinuous)
\r
453 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
455 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
458 DialogEnableWindow(IDOK, TRUE);
\r
461 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
\r
463 // we fill here the log message rich edit control,
\r
464 // and also populate the changed files list control
\r
465 // according to the selected revision(s).
\r
467 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
468 // empty the log message view
\r
469 pMsgView->SetWindowText(_T(" "));
\r
470 // empty the changed files list
\r
471 m_ChangedFileListCtrl.SetRedraw(FALSE);
\r
472 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
473 m_currentChangedArray = NULL;
\r
474 //m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );
\r
475 m_ChangedFileListCtrl.DeleteAllItems();
\r
477 // if we're not here to really show a selected revision, just
\r
478 // get out of here after clearing the views, which is what is intended
\r
479 // if that flag is not set.
\r
483 m_ChangedFileListCtrl.Invalidate();
\r
484 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
485 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
489 // depending on how many revisions are selected, we have to do different
\r
491 int selCount = m_LogList.GetSelectedCount();
\r
494 // if nothing is selected, we have nothing more to do
\r
495 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
496 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
499 else if (selCount == 1)
\r
501 // if one revision is selected, we have to fill the log message view
\r
502 // with the corresponding log message, and also fill the changed files
\r
504 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
505 int selIndex = m_LogList.GetNextSelectedItem(pos);
\r
506 if (selIndex >= m_LogList.m_arShownList.GetCount())
\r
508 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
509 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
512 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));
\r
514 if(!pLogEntry->m_IsFull)
\r
516 pMsgView->SetWindowText(_T("load ..."));
\r
519 // set the log message text
\r
520 pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash+_T("\r\n\r\n*")+pLogEntry->m_Subject+_T("\n\n")+pLogEntry->m_Body);
\r
521 // turn bug ID's into links if the bugtraq: properties have been set
\r
522 // and we can find a match of those in the log message
\r
523 m_ProjectProperties.FindBugID(pLogEntry->m_Body, pMsgView);
\r
524 CAppUtils::FormatTextInRichEditControl(pMsgView);
\r
526 int HidePaths=m_cHidePaths.GetState() & 0x0003;
\r
527 CString matchpath=this->m_path.GetGitPathString();
\r
529 for(int i=0;i<pLogEntry->m_Files.GetCount() && (!matchpath.IsEmpty());i++)
\r
531 if( m_bWholeProject )
\r
534 ((CTGitPath&)pLogEntry->m_Files[i]).m_Action &= ~(CTGitPath::LOGACTIONS_HIDE|CTGitPath::LOGACTIONS_GRAY);
\r
536 if(pLogEntry->m_Files[i].GetGitPathString().Left(matchpath.GetLength()) != matchpath)
\r
538 if(HidePaths==BST_CHECKED)
\r
539 ((CTGitPath&)pLogEntry->m_Files[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;
\r
540 if(HidePaths==BST_INDETERMINATE)
\r
541 ((CTGitPath&)pLogEntry->m_Files[i]).m_Action |= CTGitPath::LOGACTIONS_GRAY;
\r
544 m_ChangedFileListCtrl.UpdateWithGitPathList(pLogEntry->m_Files);
\r
545 m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;
\r
546 m_ChangedFileListCtrl.Show(SVNSLC_SHOWVERSIONED);
\r
548 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
555 // more than one revision is selected:
\r
556 // the log message view must be emptied
\r
557 // the changed files list contains all the changed paths from all
\r
558 // selected revisions, with 'doubles' removed
\r
559 m_currentChangedPathList = GetChangedPathsFromSelectedRevisions(true);
\r
562 // redraw the views
\r
563 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
565 if (m_currentChangedArray)
\r
567 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedArray->GetCount());
\r
568 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedArray->GetCount());
\r
570 else if (m_currentChangedPathList.GetCount())
\r
572 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedPathList.GetCount());
\r
573 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedPathList.GetCount());
\r
577 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
578 m_ChangedFileListCtrl.Invalidate();
\r
581 // sort according to the settings
\r
582 if (m_nSortColumnPathList > 0)
\r
583 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
585 SetSortArrow(&m_ChangedFileListCtrl, -1, false);
\r
586 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
590 void CLogDlg::OnBnClickedRefresh()
\r
596 void CLogDlg::Refresh (bool /*autoGoOnline*/)
\r
598 m_LogList.Refresh();
\r
603 BOOL CLogDlg::Cancel()
\r
605 return m_bCancelled;
\r
608 void CLogDlg::SaveSplitterPos()
\r
612 CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
613 CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
615 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
616 ScreenToClient(&rectSplitter);
\r
617 regPos1 = rectSplitter.top;
\r
618 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
619 ScreenToClient(&rectSplitter);
\r
620 regPos2 = rectSplitter.top;
\r
624 void CLogDlg::OnCancel()
\r
626 // canceling means stopping the working thread if it's still running.
\r
627 if (this->IsThreadRunning())
\r
629 m_LogList.TerminateThread();
\r
634 __super::OnCancel();
\r
637 CString CLogDlg::MakeShortMessage(const CString& message)
\r
639 bool bFoundShort = true;
\r
640 CString sShortMessage = m_ProjectProperties.GetLogSummary(message);
\r
641 if (sShortMessage.IsEmpty())
\r
643 bFoundShort = false;
\r
644 sShortMessage = message;
\r
646 // Remove newlines and tabs 'cause those are not shown nicely in the list control
\r
647 sShortMessage.Replace(_T("\r"), _T(""));
\r
648 sShortMessage.Replace(_T("\t"), _T(" "));
\r
650 // Suppose the first empty line separates 'summary' from the rest of the message.
\r
651 int found = sShortMessage.Find(_T("\n\n"));
\r
652 // To avoid too short 'short' messages
\r
653 // (e.g. if the message looks something like "Bugfix:\n\n*done this\n*done that")
\r
654 // only use the empty newline as a separator if it comes after at least 15 chars.
\r
655 if ((!bFoundShort)&&(found >= 15))
\r
657 sShortMessage = sShortMessage.Left(found);
\r
659 sShortMessage.Replace('\n', ' ');
\r
660 return sShortMessage;
\r
663 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
666 if (rev == SVN_INVALID_REVNUM)
\r
672 // this is the callback function which receives the data for every revision we ask the log for
\r
673 // we store this information here one by one.
\r
675 if (m_startrev == -1)
\r
680 m_LogProgress.SetPos(m_limit - m_limitcounter);
\r
682 else if (m_startrev.IsNumber() && m_startrev.IsNumber())
\r
683 m_LogProgress.SetPos((git_revnum_t)m_startrev-rev+(git_revnum_t)m_endrev);
\r
684 __time64_t ttime = time/1000000L;
\r
685 if (m_tTo < (DWORD)ttime)
\r
686 m_tTo = (DWORD)ttime;
\r
687 if (m_tFrom > (DWORD)ttime)
\r
688 m_tFrom = (DWORD)ttime;
\r
689 if ((m_lowestRev > rev)||(m_lowestRev < 0))
\r
691 // Add as many characters from the log message to the list control
\r
692 PLOGENTRYDATA pLogItem = new LOGENTRYDATA;
\r
693 pLogItem->bCopies = !!copies;
\r
695 // find out if this item was copied in the revision
\r
696 BOOL copiedself = FALSE;
\r
699 for (INT_PTR cpPathIndex = 0; cpPathIndex < cpaths->GetCount(); ++cpPathIndex)
\r
701 LogChangedPath * cpath = cpaths->GetAt(cpPathIndex);
\r
702 if (!cpath->sCopyFromPath.IsEmpty() && (cpath->sPath.Compare(m_sSelfRelativeURL) == 0))
\r
704 // note: this only works if the log is fetched top-to-bottom
\r
705 // but since we do that, it shouldn't be a problem
\r
706 m_sSelfRelativeURL = cpath->sCopyFromPath;
\r
712 pLogItem->bCopiedSelf = copiedself;
\r
713 pLogItem->tmDate = ttime;
\r
714 pLogItem->sAuthor = author;
\r
715 pLogItem->sDate = date;
\r
716 pLogItem->sShortMessage = MakeShortMessage(message);
\r
717 pLogItem->dwFileChanges = filechanges;
\r
718 pLogItem->actions = actions;
\r
719 pLogItem->haschildren = haschildren;
\r
720 pLogItem->childStackDepth = m_childCounter;
\r
721 m_maxChild = max(m_childCounter, m_maxChild);
\r
724 pLogItem->sBugIDs = m_ProjectProperties.FindBugID(message).Trim();
\r
726 // split multi line log entries and concatenate them
\r
727 // again but this time with \r\n as line separators
\r
728 // so that the edit control recognizes them
\r
731 if (message.GetLength()>0)
\r
733 m_sMessageBuf = message;
\r
734 m_sMessageBuf.Replace(_T("\n\r"), _T("\n"));
\r
735 m_sMessageBuf.Replace(_T("\r\n"), _T("\n"));
\r
736 if (m_sMessageBuf.Right(1).Compare(_T("\n"))==0)
\r
737 m_sMessageBuf = m_sMessageBuf.Left(m_sMessageBuf.GetLength()-1);
\r
740 m_sMessageBuf.Empty();
\r
741 pLogItem->sMessage = m_sMessageBuf;
\r
742 pLogItem->Rev = rev;
\r
744 // move-construct path array
\r
746 pLogItem->pArChangedPaths = new LogChangedPathArray (*cpaths);
\r
747 cpaths->RemoveAll();
\r
749 catch (CException * e)
\r
751 ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR);
\r
753 m_bCancelled = TRUE;
\r
755 m_logEntries.push_back(pLogItem);
\r
756 m_arShownList.Add(pLogItem);
\r
762 //this is the thread function which calls the subversion function
\r
767 void CLogDlg::CopyChangedSelectionToClipBoard()
\r
770 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
772 return; // nothing is selected, get out of here
\r
776 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
779 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
782 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
783 sPaths += m_currentChangedPathList[nItem].GetGitPathString();
\r
784 sPaths += _T("\r\n");
\r
789 // only one revision is selected in the log dialog top pane
\r
790 // but multiple items could be selected in the changed items list
\r
791 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
794 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
795 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
797 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
799 // some items are hidden! So find out which item the user really selected
\r
800 INT_PTR selRealIndex = -1;
\r
801 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
803 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
805 if (selRealIndex == nItem)
\r
807 changedlogpath = pLogEntry->pArChangedPaths->GetAt(hiddenindex);
\r
812 if (changedlogpath)
\r
814 sPaths += changedlogpath->sPath;
\r
815 sPaths += _T("\r\n");
\r
820 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
\r
824 BOOL CLogDlg::IsDiffPossible(LogChangedPath * /*changedpath*/, git_revnum_t rev)
\r
827 CString added, deleted;
\r
828 if (changedpath == NULL)
\r
831 if ((rev > 1)&&(changedpath->action != LOGACTIONS_DELETED))
\r
833 if (changedpath->action == LOGACTIONS_ADDED) // file is added
\r
835 if (changedpath->lCopyFromRev == 0)
\r
836 return FALSE; // but file was not added with history
\r
844 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
\r
846 // we have two separate context menus:
\r
847 // one shown on the log message list control,
\r
848 // the other shown in the changed-files list control
\r
849 int selCount = m_LogList.GetSelectedCount();
\r
850 if (pWnd == &m_LogList)
\r
852 //ShowContextMenuForRevisions(pWnd, point);
\r
854 else if (pWnd == &m_ChangedFileListCtrl)
\r
856 //ShowContextMenuForChangedpaths(pWnd, point);
\r
858 else if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
860 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
863 selIndex = m_LogList.GetNextSelectedItem(pos);
\r
864 if ((point.x == -1) && (point.y == -1))
\r
867 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
\r
868 ClientToScreen(&rect);
\r
869 point = rect.CenterPoint();
\r
871 CString sMenuItemText;
\r
873 if (popup.CreatePopupMenu())
\r
875 // add the 'default' entries
\r
876 sMenuItemText.LoadString(IDS_SCIEDIT_COPY);
\r
877 popup.AppendMenu(MF_STRING | MF_ENABLED, WM_COPY, sMenuItemText);
\r
878 sMenuItemText.LoadString(IDS_SCIEDIT_SELECTALL);
\r
879 popup.AppendMenu(MF_STRING | MF_ENABLED, EM_SETSEL, sMenuItemText);
\r
881 //if (selIndex >= 0)
\r
883 // popup.AppendMenu(MF_SEPARATOR);
\r
884 // sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);
\r
885 // popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);
\r
888 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
892 break; // no command selected
\r
895 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
\r
897 case CGitLogList::ID_EDITAUTHOR:
\r
898 EditLogMessage(selIndex);
\r
906 LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
909 ASSERT(m_pFindDialog != NULL);
\r
911 if (m_pFindDialog->IsTerminating())
\r
913 // invalidate the handle identifying the dialog box.
\r
914 m_pFindDialog = NULL;
\r
918 if(m_pFindDialog->FindNext())
\r
920 //read data from dialog
\r
921 CString FindText = m_pFindDialog->GetFindString();
\r
922 bool bMatchCase = (m_pFindDialog->MatchCase() == TRUE);
\r
923 bool bFound = false;
\r
925 bool bRegex = ValidateRegexp(FindText, pat, bMatchCase);
\r
927 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_not_null;
\r
930 for (i = this->m_nSearchIndex; i<m_arShownList.GetCount()&&!bFound; i++)
\r
934 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
936 if (regex_search(wstring((LPCTSTR)pLogEntry->sMessage), pat, flags))
\r
941 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
942 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
944 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
945 if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags))
\r
951 if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags))
\r
963 if (m_logEntries[i]->sMessage.Find(FindText) >= 0)
\r
968 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
969 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
970 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
972 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
973 if (cpath->sCopyFromPath.Find(FindText)>=0)
\r
979 if (cpath->sPath.Find(FindText)>=0)
\r
989 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
990 CString msg = pLogEntry->sMessage;
\r
991 msg = msg.MakeLower();
\r
992 CString find = FindText.MakeLower();
\r
993 if (msg.Find(find) >= 0)
\r
998 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
999 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1001 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1002 CString lowerpath = cpath->sCopyFromPath;
\r
1003 lowerpath.MakeLower();
\r
1004 if (lowerpath.Find(find)>=0)
\r
1010 lowerpath = cpath->sPath;
\r
1011 lowerpath.MakeLower();
\r
1012 if (lowerpath.Find(find)>=0)
\r
1021 } // for (i = this->m_nSearchIndex; i<m_arShownList.GetItemCount()&&!bFound; i++)
\r
1024 this->m_nSearchIndex = (i+1);
\r
1025 m_LogList.EnsureVisible(i, FALSE);
\r
1026 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);
\r
1027 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
1028 m_LogList.SetSelectionMark(i);
\r
1029 FillLogMessageCtrl();
\r
1030 UpdateData(FALSE);
\r
1032 if (m_nSearchIndex >= m_arShownList.GetCount())
\r
1033 m_nSearchIndex = (int)m_arShownList.GetCount()-1;
\r
1035 } // if(m_pFindDialog->FindNext())
\r
1036 UpdateLogInfoLabel();
\r
1041 void CLogDlg::OnOK()
\r
1043 // since the log dialog is also used to select revisions for other
\r
1044 // dialogs, we have to do some work before closing this dialog
\r
1045 if (GetFocus() != GetDlgItem(IDOK))
\r
1046 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
\r
1049 if (this->IsThreadRunning())
\r
1051 m_LogList.TerminateThread();
\r
1054 // check that one and only one row is selected
\r
1055 if (m_LogList.GetSelectedCount() == 1)
\r
1057 // get the selected row
\r
1058 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1059 int selIndex = m_LogList.GetNextSelectedItem(pos);
\r
1060 if (selIndex < m_LogList.m_arShownList.GetCount())
\r
1062 // all ok, pick up the revision
\r
1063 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));
\r
1064 // extract the hash
\r
1065 m_sSelectedHash = pLogEntry->m_CommitHash;
\r
1068 UpdateData(FALSE);
\r
1069 SaveSplitterPos();
\r
1073 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
\r
1074 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
\r
1077 CString buttontext;
\r
1078 GetDlgItemText(IDOK, buttontext);
\r
1079 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
1080 if (temp.Compare(buttontext) != 0)
\r
1081 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
\r
1082 m_bCancelled = TRUE;
\r
1083 m_selectedRevs.Clear();
\r
1084 m_selectedRevsOneRange.Clear();
\r
1085 if (m_pNotifyWindow)
\r
1087 int selIndex = m_LogList.GetSelectionMark();
\r
1088 if (selIndex >= 0)
\r
1090 PLOGENTRYDATA pLogEntry = NULL;
\r
1091 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1092 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1093 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1094 git_revnum_t lowerRev = pLogEntry->Rev;
\r
1095 git_revnum_t higherRev = lowerRev;
\r
1098 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1099 git_revnum_t rev = pLogEntry->Rev;
\r
1100 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1101 if (lowerRev > rev)
\r
1103 if (higherRev < rev)
\r
1106 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
\r
1108 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
\r
1110 BOOL bSentMessage = FALSE;
\r
1111 if (m_LogList.GetSelectedCount() == 1)
\r
1113 // if only one revision is selected, check if the path/url with which the dialog was started
\r
1114 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
\r
1115 // if it was copied, use the copy from revision as lowerRev
\r
1116 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
\r
1118 CString sUrl = m_path.GetGitPathString();
\r
1119 if (!m_path.IsUrl())
\r
1121 sUrl = GetURLFromPath(m_path);
\r
1123 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
\r
1124 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
\r
1126 LogChangedPath * pData = pLogEntry->pArChangedPaths->GetAt(cp);
\r
1129 if (sUrl.Compare(pData->sPath) == 0)
\r
1131 if (!pData->sCopyFromPath.IsEmpty())
\r
1133 lowerRev = pData->lCopyFromRev;
\r
1134 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
\r
1135 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
\r
1136 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1137 bSentMessage = TRUE;
\r
1144 if ( !bSentMessage )
\r
1146 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
\r
1147 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
\r
1148 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1149 if (m_selectedRevsOneRange.GetCount())
\r
1150 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
\r
1155 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
1156 reg = m_btnShow.GetCurrentEntry();
\r
1157 SaveSplitterPos();
\r
1161 void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
1163 // a double click on an entry in the changed-files list has happened
\r
1166 DiffSelectedFile();
\r
1169 void CLogDlg::DiffSelectedFile()
\r
1172 if (m_bThreadRunning)
\r
1174 UpdateLogInfoLabel();
\r
1175 INT_PTR selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
1178 if (m_ChangedFileListCtrl.GetSelectedCount() == 0)
\r
1180 // find out if there's an entry selected in the log list
\r
1181 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1182 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1183 git_revnum_t rev1 = pLogEntry->Rev;
\r
1184 git_revnum_t rev2 = rev1;
\r
1189 // there's at least a second entry selected in the log list: several revisions selected!
\r
1190 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1193 rev1 = max(rev1,(long)pLogEntry->Rev);
\r
1194 rev2 = min(rev2,(long)pLogEntry->Rev);
\r
1198 // now we have both revisions selected in the log list, so we can do a diff of the selected
\r
1199 // entry in the changed files list with these two revisions.
\r
1200 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1205 // nothing or only one revision selected in the log list
\r
1206 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1208 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
1210 // some items are hidden! So find out which item the user really clicked on
\r
1211 INT_PTR selRealIndex = -1;
\r
1212 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
1214 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
1216 if (selRealIndex == selIndex)
\r
1218 selIndex = hiddenindex;
\r
1219 changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1225 if (IsDiffPossible(changedpath, rev1))
\r
1227 // diffs with renamed files are possible
\r
1228 if ((changedpath)&&(!changedpath->sCopyFromPath.IsEmpty()))
\r
1229 rev2 = changedpath->lCopyFromRev;
\r
1232 // if the path was modified but the parent path was 'added with history'
\r
1233 // then we have to use the copy from revision of the parent path
\r
1234 CTGitPath cpath = CTGitPath(changedpath->sPath);
\r
1235 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
1237 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
1238 if (p.IsAncestorOf(cpath))
\r
1240 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
1241 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
1245 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1249 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1250 CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1252 // deleted files must be opened from the revision before the deletion
\r
1253 if (changedpath->action == LOGACTIONS_DELETED)
\r
1255 m_bCancelled = false;
\r
1257 CProgressDlg progDlg;
\r
1258 progDlg.SetTitle(IDS_APPNAME);
\r
1259 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1260 CString sInfoLine;
\r
1261 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)(m_sRepositoryRoot + changedpath->sPath), (LPCTSTR)r.ToString());
\r
1262 progDlg.SetLine(1, sInfoLine, true);
\r
1263 SetAndClearProgressInfo(&progDlg);
\r
1264 progDlg.ShowModeless(m_hWnd);
\r
1266 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))
\r
1268 m_bCancelled = false;
\r
1269 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), GitRev::REV_HEAD, r, tempfile))
\r
1272 SetAndClearProgressInfo((HWND)NULL);
\r
1273 CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1278 SetAndClearProgressInfo((HWND)NULL);
\r
1280 CString sName1, sName2;
\r
1281 sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1);
\r
1282 sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1-1);
\r
1283 CAppUtils::DiffFlags flags;
\r
1284 flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1285 if (changedpath->action == LOGACTIONS_DELETED)
\r
1286 CAppUtils::StartExtDiff(tempfile, tempfile2, sName2, sName1, flags);
\r
1288 CAppUtils::StartExtDiff(tempfile2, tempfile, sName2, sName1, flags);
\r
1295 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool blame, bool unified)
\r
1297 DialogEnableWindow(IDOK, FALSE);
\r
1298 // SetPromptApp(&theApp);
\r
1299 theApp.DoWaitCursor(1);
\r
1302 GetTempPath(temppath);
\r
1305 file1.Format(_T("%s%s_%s%s"),
\r
1307 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1308 rev1->m_CommitHash.Left(6),
\r
1309 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1312 file2.Format(_T("%s\\%s_%s%s"),
\r
1314 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1315 rev2->m_CommitHash.Left(6),
\r
1316 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1320 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1321 g_Git.RunLogFile(cmd,file1);
\r
1322 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1323 g_Git.RunLogFile(cmd,file2);
\r
1325 CAppUtils::DiffFlags flags;
\r
1326 CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),flags);
\r
1329 //get the filename
\r
1331 if (Git::PathIsURL(m_path))
\r
1333 filepath = m_path.GetGitPathString();
\r
1337 filepath = GetURLFromPath(m_path);
\r
1338 if (filepath.IsEmpty())
\r
1340 theApp.DoWaitCursor(-1);
\r
1342 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1343 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1344 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1346 theApp.DoWaitCursor(-11);
\r
1350 m_bCancelled = FALSE;
\r
1351 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1353 CString firstfile, secondfile;
\r
1354 if (m_LogList.GetSelectedCount()==1)
\r
1356 int s = m_LogList.GetSelectionMark();
\r
1357 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(s));
\r
1358 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1359 firstfile = changedpath->sPath;
\r
1360 secondfile = firstfile;
\r
1361 if ((rev2 == rev1-1)&&(changedpath->lCopyFromRev > 0)) // is it an added file with history?
\r
1363 secondfile = changedpath->sCopyFromPath;
\r
1364 rev2 = changedpath->lCopyFromRev;
\r
1369 firstfile = m_currentChangedPathList[selIndex].GetGitPathString();
\r
1370 secondfile = firstfile;
\r
1373 firstfile = filepath + firstfile.Trim();
\r
1374 secondfile = filepath + secondfile.Trim();
\r
1376 GitDiff diff(this, this->m_hWnd, true);
\r
1377 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1378 diff.SetHEADPeg(m_LogRevision);
\r
1381 if (PromptShown())
\r
1382 diff.ShowUnifiedDiff(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1);
\r
1384 CAppUtils::StartShowUnifiedDiff(m_hWnd, CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), m_LogRevision);
\r
1388 if (diff.ShowCompare(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), false, blame))
\r
1390 if (firstfile.Compare(secondfile)==0)
\r
1392 git_revnum_t baseRev = 0;
\r
1393 diff.DiffProps(CTGitPath(firstfile), rev2, rev1, baseRev);
\r
1400 theApp.DoWaitCursor(-1);
\r
1404 BOOL CLogDlg::Open(bool /*bOpenWith*/,CString changedpath, git_revnum_t rev)
\r
1407 DialogEnableWindow(IDOK, FALSE);
\r
1408 SetPromptApp(&theApp);
\r
1409 theApp.DoWaitCursor(1);
\r
1411 if (Git::PathIsURL(m_path))
\r
1413 filepath = m_path.GetGitPathString();
\r
1417 filepath = GetURLFromPath(m_path);
\r
1418 if (filepath.IsEmpty())
\r
1420 theApp.DoWaitCursor(-1);
\r
1422 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1423 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1424 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1429 m_bCancelled = false;
\r
1430 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1431 filepath += changedpath;
\r
1433 CProgressDlg progDlg;
\r
1434 progDlg.SetTitle(IDS_APPNAME);
\r
1435 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1436 CString sInfoLine;
\r
1437 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)GitRev(rev).ToString());
\r
1438 progDlg.SetLine(1, sInfoLine, true);
\r
1439 SetAndClearProgressInfo(&progDlg);
\r
1440 progDlg.ShowModeless(m_hWnd);
\r
1442 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(filepath), rev);
\r
1443 m_bCancelled = false;
\r
1444 if (!Cat(CTGitPath(filepath), GitRev(rev), rev, tempfile))
\r
1447 SetAndClearProgressInfo((HWND)NULL);
\r
1448 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1450 theApp.DoWaitCursor(-1);
\r
1454 SetAndClearProgressInfo((HWND)NULL);
\r
1455 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
1458 int ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
\r
1459 if (ret <= HINSTANCE_ERROR)
\r
1464 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
1465 cmd += tempfile.GetWinPathString() + _T(" ");
\r
1466 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
1469 theApp.DoWaitCursor(-1);
\r
1474 void CLogDlg::EditAuthor(const CLogDataVector& /*logs*/)
\r
1479 if (logs.size() == 0)
\r
1481 DialogEnableWindow(IDOK, FALSE);
\r
1482 SetPromptApp(&theApp);
\r
1483 theApp.DoWaitCursor(1);
\r
1484 if (Git::PathIsURL(m_path))
\r
1485 url = m_path.GetGitPathString();
\r
1488 url = GetURLFromPath(m_path);
\r
1490 name = Git_PROP_REVISION_AUTHOR;
\r
1492 CString value = RevPropertyGet(name, CTGitPath(url), logs[0]->Rev);
\r
1493 CString sOldValue = value;
\r
1494 value.Replace(_T("\n"), _T("\r\n"));
\r
1495 CInputDlg dlg(this);
\r
1496 dlg.m_sHintText.LoadString(IDS_LOG_AUTHOR);
\r
1497 dlg.m_sInputText = value;
\r
1498 dlg.m_sTitle.LoadString(IDS_LOG_AUTHOREDITTITLE);
\r
1499 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1500 dlg.m_bUseLogWidth = false;
\r
1501 if (dlg.DoModal() == IDOK)
\r
1503 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1505 LogCache::CCachedLogInfo* toUpdate
\r
1506 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1508 CProgressDlg progDlg;
\r
1509 progDlg.SetTitle(IDS_APPNAME);
\r
1510 progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
\r
1511 progDlg.SetTime(true);
\r
1512 progDlg.SetShowProgressBar(true);
\r
1513 progDlg.ShowModeless(m_hWnd);
\r
1514 for (DWORD i=0; i<logs.size(); ++i)
\r
1516 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), logs[i]->Rev))
\r
1519 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1525 logs[i]->sAuthor = dlg.m_sInputText;
\r
1526 m_LogList.Invalidate();
\r
1528 // update the log cache
\r
1530 if (toUpdate != NULL)
\r
1532 // log caching is active
\r
1534 LogCache::CCachedLogInfo newInfo;
\r
1535 newInfo.Insert ( logs[i]->Rev
\r
1536 , (const char*) CUnicodeUtils::GetUTF8 (logs[i]->sAuthor)
\r
1539 , LogCache::CRevisionInfoContainer::HAS_AUTHOR);
\r
1541 toUpdate->Update (newInfo);
\r
1544 progDlg.SetProgress64(i, logs.size());
\r
1548 theApp.DoWaitCursor(-1);
\r
1553 void CLogDlg::EditLogMessage(int /*index*/)
\r
1558 DialogEnableWindow(IDOK, FALSE);
\r
1559 SetPromptApp(&theApp);
\r
1560 theApp.DoWaitCursor(1);
\r
1561 if (Git::PathIsURL(m_path))
\r
1562 url = m_path.GetGitPathString();
\r
1565 url = GetURLFromPath(m_path);
\r
1567 name = Git_PROP_REVISION_LOG;
\r
1569 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(index));
\r
1570 m_bCancelled = FALSE;
\r
1571 CString value = RevPropertyGet(name, CTGitPath(url), pLogEntry->Rev);
\r
1572 CString sOldValue = value;
\r
1573 value.Replace(_T("\n"), _T("\r\n"));
\r
1574 CInputDlg dlg(this);
\r
1575 dlg.m_sHintText.LoadString(IDS_LOG_MESSAGE);
\r
1576 dlg.m_sInputText = value;
\r
1577 dlg.m_sTitle.LoadString(IDS_LOG_MESSAGEEDITTITLE);
\r
1578 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1579 dlg.m_bUseLogWidth = true;
\r
1580 if (dlg.DoModal() == IDOK)
\r
1582 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1583 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), pLogEntry->Rev))
\r
1585 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1589 pLogEntry->sShortMessage = MakeShortMessage(dlg.m_sInputText);
\r
1590 // split multi line log entries and concatenate them
\r
1591 // again but this time with \r\n as line separators
\r
1592 // so that the edit control recognizes them
\r
1593 if (dlg.m_sInputText.GetLength()>0)
\r
1595 m_sMessageBuf = dlg.m_sInputText;
\r
1596 dlg.m_sInputText.Replace(_T("\n\r"), _T("\n"));
\r
1597 dlg.m_sInputText.Replace(_T("\r\n"), _T("\n"));
\r
1598 if (dlg.m_sInputText.Right(1).Compare(_T("\n"))==0)
\r
1599 dlg.m_sInputText = dlg.m_sInputText.Left(dlg.m_sInputText.GetLength()-1);
\r
1602 dlg.m_sInputText.Empty();
\r
1603 pLogEntry->sMessage = dlg.m_sInputText;
\r
1604 pLogEntry->sBugIDs = m_ProjectProperties.FindBugID(dlg.m_sInputText);
\r
1605 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
1606 pMsgView->SetWindowText(_T(" "));
\r
1607 pMsgView->SetWindowText(dlg.m_sInputText);
\r
1608 m_ProjectProperties.FindBugID(dlg.m_sInputText, pMsgView);
\r
1609 m_LogList.Invalidate();
\r
1611 // update the log cache
\r
1613 LogCache::CCachedLogInfo* toUpdate
\r
1614 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1615 if (toUpdate != NULL)
\r
1617 // log caching is active
\r
1619 LogCache::CCachedLogInfo newInfo;
\r
1620 newInfo.Insert ( pLogEntry->Rev
\r
1622 , (const char*) CUnicodeUtils::GetUTF8 (pLogEntry->sMessage)
\r
1624 , LogCache::CRevisionInfoContainer::HAS_COMMENT);
\r
1626 toUpdate->Update (newInfo);
\r
1630 theApp.DoWaitCursor(-1);
\r
1635 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
\r
1637 // Skip Ctrl-C when copying text out of the log message or search filter
\r
1638 BOOL bSkipAccelerator = ( pMsg->message == WM_KEYDOWN && pMsg->wParam=='C' && (GetFocus()==GetDlgItem(IDC_MSGVIEW) || GetFocus()==GetDlgItem(IDC_SEARCHEDIT) ) && GetKeyState(VK_CONTROL)&0x8000 );
\r
1639 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
\r
1641 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
\r
1643 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))
\r
1645 m_LogList.DiffSelectedRevWithPrevious();
\r
1649 if (GetFocus()==GetDlgItem(IDC_LOGMSG))
\r
1651 DiffSelectedFile();
\r
1655 if (m_hAccel && !bSkipAccelerator)
\r
1657 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
\r
1662 if(::IsWindow(m_tooltips.m_hWnd))
\r
1663 m_tooltips.RelayEvent(pMsg);
\r
1664 return __super::PreTranslateMessage(pMsg);
\r
1668 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
1670 //if (this->IsThreadRunning())
\r
1671 if(m_LogList.m_bNoDispUpdates)
\r
1673 // only show the wait cursor over the list control
\r
1675 ((pWnd == GetDlgItem(IDC_LOGLIST))||
\r
1676 (pWnd == GetDlgItem(IDC_MSGVIEW))||
\r
1677 (pWnd == GetDlgItem(IDC_LOGMSG))))
\r
1679 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
1684 if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1685 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1687 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
1689 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1692 void CLogDlg::OnBnClickedHelp()
\r
1697 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1699 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1701 //if (this->IsThreadRunning())
\r
1702 if(m_LogList.m_bNoDispUpdates)
\r
1704 if (pNMLV->iItem >= 0)
\r
1706 m_nSearchIndex = pNMLV->iItem;
\r
1707 if (pNMLV->iSubItem != 0)
\r
1709 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount()))
\r
1711 // remove the selected state
\r
1712 if (pNMLV->uChanged & LVIF_STATE)
\r
1714 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
\r
1715 FillLogMessageCtrl();
\r
1716 UpdateData(FALSE);
\r
1717 UpdateLogInfoLabel();
\r
1721 if (pNMLV->uChanged & LVIF_STATE)
\r
1723 FillLogMessageCtrl();
\r
1724 UpdateData(FALSE);
\r
1729 FillLogMessageCtrl();
\r
1730 UpdateData(FALSE);
\r
1733 UpdateLogInfoLabel();
\r
1736 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
\r
1738 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
\r
1739 if (pEnLink->msg == WM_LBUTTONUP)
\r
1742 GetDlgItemText(IDC_MSGVIEW, msg);
\r
1743 msg.Replace(_T("\r\n"), _T("\n"));
\r
1744 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
\r
1745 if (!::PathIsURL(url))
\r
1747 url = m_ProjectProperties.GetBugIDUrl(url);
\r
1748 url = GetAbsoluteUrlFromRelativeUrl(url);
\r
1750 if (!url.IsEmpty())
\r
1751 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
1756 void CLogDlg::OnBnClickedStatbutton()
\r
1759 if (this->IsThreadRunning())
\r
1761 if (m_LogList.m_arShownList.IsEmpty())
\r
1762 return; // nothing is shown, so no statistics.
\r
1763 // the statistics dialog expects the log entries to be sorted by date
\r
1764 SortByColumn(3, false);
\r
1765 CPtrArray shownlist;
\r
1766 m_LogList.RecalculateShownList(&shownlist);
\r
1767 // create arrays which are aware of the current filter
\r
1768 CStringArray m_arAuthorsFiltered;
\r
1769 CDWordArray m_arDatesFiltered;
\r
1770 CDWordArray m_arFileChangesFiltered;
\r
1771 for (INT_PTR i=0; i<shownlist.GetCount(); ++i)
\r
1773 GitRev* pLogEntry = reinterpret_cast<GitRev*>(shownlist.GetAt(i));
\r
1774 CString strAuthor = pLogEntry->m_AuthorName;
\r
1775 if ( strAuthor.IsEmpty() )
\r
1777 strAuthor.LoadString(IDS_STATGRAPH_EMPTYAUTHOR);
\r
1779 m_arAuthorsFiltered.Add(strAuthor);
\r
1780 m_arDatesFiltered.Add(pLogEntry->m_AuthorDate.GetTime());
\r
1781 m_arFileChangesFiltered.Add(pLogEntry->m_Files.GetCount());
\r
1783 CStatGraphDlg dlg;
\r
1784 dlg.m_parAuthors = &m_arAuthorsFiltered;
\r
1785 dlg.m_parDates = &m_arDatesFiltered;
\r
1786 dlg.m_parFileChanges = &m_arFileChangesFiltered;
\r
1787 dlg.m_path = m_path;
\r
1789 // restore the previous sorting
\r
1790 SortByColumn(m_nSortColumn, m_bAscending);
\r
1791 OnTimer(LOGFILTER_TIMER);
\r
1796 void CLogDlg::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1799 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
1800 // Take the default processing unless we set this to something else below.
\r
1801 *pResult = CDRF_DODEFAULT;
\r
1803 if (m_bNoDispUpdates)
\r
1806 switch (pLVCD->nmcd.dwDrawStage)
\r
1808 case CDDS_PREPAINT:
\r
1810 *pResult = CDRF_NOTIFYITEMDRAW;
\r
1814 case CDDS_ITEMPREPAINT:
\r
1816 // This is the prepaint stage for an item. Here's where we set the
\r
1817 // item's text color.
\r
1819 // Tell Windows to send draw notifications for each subitem.
\r
1820 *pResult = CDRF_NOTIFYSUBITEMDRAW;
\r
1822 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
1824 if (m_arShownList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1826 GitRev* data = (GitRev*)m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec);
\r
1830 if (data->bCopiedSelf)
\r
1832 // only change the background color if the item is not 'hot' (on vista with themes enabled)
\r
1833 if (!theme.IsAppThemed() || !m_bVista || ((pLVCD->nmcd.uItemState & CDIS_HOT)==0))
\r
1834 pLVCD->clrTextBk = GetSysColor(COLOR_MENU);
\r
1837 if (data->bCopies)
\r
1838 crText = m_Colors.GetColor(CColors::Modified);
\r
1840 // if ((data->childStackDepth)||(m_mergedRevs.find(data->Rev) != m_mergedRevs.end()))
\r
1841 // crText = GetSysColor(COLOR_GRAYTEXT);
\r
1842 // if (data->Rev == m_wcRev)
\r
1844 // SelectObject(pLVCD->nmcd.hdc, m_boldFont);
\r
1845 // We changed the font, so we're returning CDRF_NEWFONT. This
\r
1846 // tells the control to recalculate the extent of the text.
\r
1847 // *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;
\r
1851 if (m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1853 if (m_bStrictStopped)
\r
1854 crText = GetSysColor(COLOR_GRAYTEXT);
\r
1856 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
1857 pLVCD->clrText = crText;
\r
1861 case CDDS_ITEMPREPAINT|CDDS_ITEM|CDDS_SUBITEM:
\r
1863 if ((m_bStrictStopped)&&(m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
1865 pLVCD->nmcd.uItemState &= ~(CDIS_SELECTED|CDIS_FOCUS);
\r
1867 if (pLVCD->iSubItem == 1)
\r
1869 *pResult = CDRF_DODEFAULT;
\r
1871 if (m_arShownList.GetCount() <= (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
1875 int iconwidth = ::GetSystemMetrics(SM_CXSMICON);
\r
1876 int iconheight = ::GetSystemMetrics(SM_CYSMICON);
\r
1878 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec));
\r
1880 // Get the selected state of the
\r
1881 // item being drawn.
\r
1883 SecureZeroMemory(&rItem, sizeof(LVITEM));
\r
1884 rItem.mask = LVIF_STATE;
\r
1885 rItem.iItem = pLVCD->nmcd.dwItemSpec;
\r
1886 rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
\r
1887 m_LogList.GetItem(&rItem);
\r
1890 m_LogList.GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);
\r
1892 // Fill the background
\r
1893 if (theme.IsAppThemed() && m_bVista)
\r
1895 theme.Open(m_hWnd, L"Explorer");
\r
1896 int state = LISS_NORMAL;
\r
1897 if (rItem.state & LVIS_SELECTED)
\r
1899 if (::GetFocus() == m_LogList.m_hWnd)
\r
1900 state |= LISS_SELECTED;
\r
1902 state |= LISS_SELECTEDNOTFOCUS;
\r
1907 if (pLogEntry->bCopiedSelf)
\r
1909 // unfortunately, the pLVCD->nmcd.uItemState does not contain valid
\r
1910 // information at this drawing stage. But we can check the whether the
\r
1911 // previous stage changed the background color of the item
\r
1912 if (pLVCD->clrTextBk == GetSysColor(COLOR_MENU))
\r
1915 brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
1918 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
1919 ::DeleteObject(brush);
\r
1926 if (theme.IsBackgroundPartiallyTransparent(LVP_LISTDETAIL, state))
\r
1927 theme.DrawParentBackground(m_hWnd, pLVCD->nmcd.hdc, &rect);
\r
1929 theme.DrawBackground(pLVCD->nmcd.hdc, LVP_LISTDETAIL, state, &rect, NULL);
\r
1934 if (rItem.state & LVIS_SELECTED)
\r
1936 if (::GetFocus() == m_LogList.m_hWnd)
\r
1937 brush = ::CreateSolidBrush(::GetSysColor(COLOR_HIGHLIGHT));
\r
1939 brush = ::CreateSolidBrush(::GetSysColor(COLOR_BTNFACE));
\r
1943 //if (pLogEntry->bCopiedSelf)
\r
1944 // brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
1946 brush = ::CreateSolidBrush(::GetSysColor(COLOR_WINDOW));
\r
1948 if (brush == NULL)
\r
1951 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
1952 ::DeleteObject(brush);
\r
1955 // Draw the icon(s) into the compatible DC
\r
1956 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
1957 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left + ICONITEMBORDER, rect.top, m_hModifiedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
1960 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
1961 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hAddedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
1964 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
1965 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hDeletedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
1968 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
1969 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hReplacedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
1971 *pResult = CDRF_SKIPDEFAULT;
\r
1977 *pResult = CDRF_DODEFAULT;
\r
1982 void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
1985 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
1986 // Take the default processing unless we set this to something else below.
\r
1987 *pResult = CDRF_DODEFAULT;
\r
1989 // if (m_bNoDispUpdates)
\r
1992 // First thing - check the draw stage. If it's the control's prepaint
\r
1993 // stage, then tell Windows we want messages for every item.
\r
1995 if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
\r
1997 *pResult = CDRF_NOTIFYITEMDRAW;
\r
1999 else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2001 // This is the prepaint stage for an item. Here's where we set the
\r
2002 // item's text color. Our return value will tell Windows to draw the
\r
2003 // item itself, but it will use the new color we set here.
\r
2005 // Tell Windows to paint the control itself.
\r
2006 *pResult = CDRF_DODEFAULT;
\r
2008 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
2009 bool bGrayed = false;
\r
2011 if ((m_cHidePaths.GetState() & 0x0003)==BST_INDETERMINATE)
\r
2013 if ((m_currentChangedArray)&&((m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)))
\r
2015 //if ((*m_currentChangedArray)[(pLVCD->nmcd.dwItemSpec)]sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2017 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2021 else if (m_currentChangedPathList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
2023 //if (m_currentChangedPathList[pLVCD->nmcd.dwItemSpec].GetGitPathString().Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2025 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2032 if ((!bGrayed)&&(m_currentChangedArray)&&(m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
2034 DWORD action = ((*m_currentChangedArray)[pLVCD->nmcd.dwItemSpec]).m_Action;
\r
2035 if (action == CTGitPath::LOGACTIONS_MODIFIED)
\r
2036 crText = m_Colors.GetColor(CColors::Modified);
\r
2037 if (action == CTGitPath::LOGACTIONS_REPLACED)
\r
2038 crText = m_Colors.GetColor(CColors::Deleted);
\r
2039 if (action == CTGitPath::LOGACTIONS_ADDED)
\r
2040 crText = m_Colors.GetColor(CColors::Added);
\r
2041 if (action == CTGitPath::LOGACTIONS_DELETED)
\r
2042 crText = m_Colors.GetColor(CColors::Deleted);
\r
2045 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
2046 pLVCD->clrText = crText;
\r
2050 void CLogDlg::DoSizeV1(int delta)
\r
2053 RemoveAnchor(IDC_LOGLIST);
\r
2054 RemoveAnchor(IDC_SPLITTERTOP);
\r
2055 RemoveAnchor(IDC_MSGVIEW);
\r
2056 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2057 RemoveAnchor(IDC_LOGMSG);
\r
2058 CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);
\r
2059 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);
\r
2060 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2061 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2062 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2063 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2064 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2067 SetSplitterRange();
\r
2068 m_LogList.Invalidate();
\r
2069 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2073 void CLogDlg::DoSizeV2(int delta)
\r
2076 RemoveAnchor(IDC_LOGLIST);
\r
2077 RemoveAnchor(IDC_SPLITTERTOP);
\r
2078 RemoveAnchor(IDC_MSGVIEW);
\r
2079 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2080 RemoveAnchor(IDC_LOGMSG);
\r
2081 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);
\r
2082 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);
\r
2083 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2084 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2085 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2086 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2087 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2090 SetSplitterRange();
\r
2091 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2092 m_ChangedFileListCtrl.Invalidate();
\r
2096 void CLogDlg::AdjustMinSize()
\r
2098 // adjust the minimum size of the dialog to prevent the resizing from
\r
2099 // moving the list control too far down.
\r
2100 CRect rcChgListView;
\r
2101 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
\r
2103 m_LogList.GetClientRect(rcLogList);
\r
2105 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
\r
2106 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
\r
2107 +rcChgListView.Height()+rcLogList.Height()+60));
\r
2110 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
2112 switch (message) {
\r
2114 if (wParam == IDC_SPLITTERTOP)
\r
2116 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2117 DoSizeV1(pHdr->delta);
\r
2119 else if (wParam == IDC_SPLITTERBOTTOM)
\r
2121 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2122 DoSizeV2(pHdr->delta);
\r
2127 return CResizableDialog::DefWindowProc(message, wParam, lParam);
\r
2130 void CLogDlg::SetSplitterRange()
\r
2132 if ((m_LogList)&&(m_ChangedFileListCtrl))
\r
2135 m_LogList.GetWindowRect(rcTop);
\r
2136 ScreenToClient(rcTop);
\r
2138 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);
\r
2139 ScreenToClient(rcMiddle);
\r
2140 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);
\r
2142 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
\r
2143 ScreenToClient(rcBottom);
\r
2144 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);
\r
2148 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
\r
2150 RECT * rect = (LPRECT)lParam;
\r
2153 point = CPoint(rect->left, rect->bottom);
\r
2154 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))
\r
2156 if (popup.CreatePopupMenu())
\r
2158 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2159 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ALL), LOGFILTER_ALL, temp);
\r
2161 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2163 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2164 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
\r
2165 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2166 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
\r
2167 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2168 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
\r
2169 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2170 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
\r
2171 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
\r
2172 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
\r
2174 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2176 temp.LoadString(IDS_LOG_FILTER_REGEX);
\r
2177 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
\r
2180 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2181 if (selection != 0)
\r
2184 if (selection == LOGFILTER_REGEX)
\r
2186 m_bFilterWithRegex = !m_bFilterWithRegex;
\r
2187 CRegDWORD b = CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
2188 b = m_bFilterWithRegex;
\r
2189 CheckRegexpTooltip();
\r
2193 m_LogList.m_nSelectedFilter = selection;
\r
2194 SetFilterCueText();
\r
2196 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2202 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
2205 KillTimer(LOGFILTER_TIMER);
\r
2207 m_LogList.m_sFilterText.Empty();
\r
2208 UpdateData(FALSE);
\r
2209 theApp.DoWaitCursor(1);
\r
2210 CStoreSelection storeselection(this);
\r
2211 FillLogMessageCtrl(false);
\r
2213 m_LogList.RemoveFilter();
\r
2216 m_LogList.GetTimeRange(begin,end);
\r
2217 m_DateFrom.SetTime(&begin);
\r
2218 m_DateTo.SetTime(&end);
\r
2220 theApp.DoWaitCursor(-1);
\r
2221 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2222 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2223 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2224 UpdateLogInfoLabel();
\r
2230 void CLogDlg::SetFilterCueText()
\r
2233 switch (m_LogList.m_nSelectedFilter)
\r
2235 case LOGFILTER_ALL:
\r
2236 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2238 case LOGFILTER_MESSAGES:
\r
2239 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2241 case LOGFILTER_PATHS:
\r
2242 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2244 case LOGFILTER_AUTHORS:
\r
2245 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2247 case LOGFILTER_REVS:
\r
2248 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2251 // to make the cue banner text appear more to the right of the edit control
\r
2252 temp = _T(" ")+temp;
\r
2253 m_cFilter.SetCueBanner(temp);
\r
2256 bool CLogDlg::Validate(LPCTSTR string)
\r
2258 if (!m_bFilterWithRegex)
\r
2261 return m_LogList.ValidateRegexp(string, pat, false);
\r
2265 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
\r
2267 if (nIDEvent == LOGFILTER_TIMER)
\r
2269 if (this->IsThreadRunning())
\r
2271 // thread still running! So just restart the timer.
\r
2272 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2275 CWnd * focusWnd = GetFocus();
\r
2276 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
\r
2277 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
\r
2278 if (m_LogList.m_sFilterText.IsEmpty())
\r
2280 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2281 // do not return here!
\r
2282 // we also need to run the filter if the filter text is empty:
\r
2283 // 1. to clear an existing filter
\r
2284 // 2. to rebuild the m_arShownList after sorting
\r
2286 theApp.DoWaitCursor(1);
\r
2287 CStoreSelection storeselection(this);
\r
2288 KillTimer(LOGFILTER_TIMER);
\r
2289 FillLogMessageCtrl(false);
\r
2291 // now start filter the log list
\r
2292 m_LogList.StartFilter();
\r
2294 if ( m_LogList.GetItemCount()==1 )
\r
2296 m_LogList.SetSelectionMark(0);
\r
2297 m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
\r
2299 theApp.DoWaitCursor(-1);
\r
2300 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2301 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2302 if (bSetFocusToFilterControl)
\r
2303 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2304 UpdateLogInfoLabel();
\r
2305 } // if (nIDEvent == LOGFILTER_TIMER)
\r
2306 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2307 __super::OnTimer(nIDEvent);
\r
2310 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2313 m_DateTo.GetTime(_time);
\r
2316 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
\r
2317 if (time.GetTime() != m_LogList.m_To.GetTime())
\r
2319 m_LogList.m_To = (DWORD)time.GetTime();
\r
2320 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2323 catch (CAtlException)
\r
2330 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2333 m_DateFrom.GetTime(_time);
\r
2336 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
\r
2337 if (time.GetTime() != m_LogList.m_From.GetTime())
\r
2339 m_LogList.m_From = (DWORD)time.GetTime();
\r
2340 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2343 catch (CAtlException)
\r
2352 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)
\r
2354 CTGitPathList pathList;
\r
2357 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2359 m_sRepositoryRoot = GetRepositoryRoot(m_path);
\r
2361 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2364 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2369 int nextpos = m_LogList.GetNextSelectedItem(pos);
\r
2370 if (nextpos >= m_arShownList.GetCount())
\r
2372 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(nextpos));
\r
2373 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
2374 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
2376 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2377 if (cpath == NULL)
\r
2380 if (!bRelativePaths)
\r
2381 path.SetFromGit(m_sRepositoryRoot);
\r
2382 path.AppendPathString(cpath->sPath);
\r
2383 if ((!bUseFilter)||
\r
2384 ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||
\r
2385 (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))
\r
2386 pathList.AddPath(path);
\r
2391 pathList.RemoveDuplicates();
\r
2396 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
\r
2399 switch(nSortColumn)
\r
2401 case 0: // Revision
\r
2404 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
\r
2406 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
\r
2412 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
\r
2414 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
\r
2420 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
\r
2422 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
\r
2428 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
\r
2430 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
\r
2433 case 4: // Message or bug id
\r
2434 if (m_bShowBugtraqColumn)
\r
2437 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
\r
2439 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
\r
2442 // fall through here
\r
2443 case 5: // Message
\r
2446 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
\r
2448 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
\r
2458 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
2460 if (this->IsThreadRunning())
\r
2461 return; //no sorting while the arrays are filled
\r
2462 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2463 const int nColumn = pNMLV->iSubItem;
\r
2464 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
\r
2465 m_nSortColumn = nColumn;
\r
2466 SortByColumn(m_nSortColumn, m_bAscending);
\r
2467 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
\r
2468 SortShownListArray();
\r
2469 m_LogList.Invalidate();
\r
2470 UpdateLogInfoLabel();
\r
2475 void CLogDlg::SortShownListArray()
\r
2477 // make sure the shown list still matches the filter after sorting.
\r
2478 OnTimer(LOGFILTER_TIMER);
\r
2479 // clear the selection states
\r
2480 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2483 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
\r
2485 m_LogList.SetSelectionMark(-1);
\r
2488 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
\r
2490 if (control == NULL)
\r
2492 // set the sort arrow
\r
2493 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
\r
2494 HDITEM HeaderItem = {0};
\r
2495 HeaderItem.mask = HDI_FORMAT;
\r
2496 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
2498 pHeader->GetItem(i, &HeaderItem);
\r
2499 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
2500 pHeader->SetItem(i, &HeaderItem);
\r
2504 pHeader->GetItem(nColumn, &HeaderItem);
\r
2505 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
2506 pHeader->SetItem(nColumn, &HeaderItem);
\r
2509 void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR* /*pNMHDR*/, LRESULT* /*pResult*/)
\r
2512 if (this->IsThreadRunning())
\r
2513 return; //no sorting while the arrays are filled
\r
2514 if (m_currentChangedArray == NULL)
\r
2516 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
2517 const int nColumn = pNMLV->iSubItem;
\r
2518 m_bAscendingPathList = nColumn == m_nSortColumnPathList ? !m_bAscendingPathList : TRUE;
\r
2519 m_nSortColumnPathList = nColumn;
\r
2520 // qsort(m_currentChangedArray->GetData(), m_currentChangedArray->GetSize(), sizeof(LogChangedPath*), (GENERICCOMPAREFN)SortCompare);
\r
2522 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
2523 m_ChangedFileListCtrl.Invalidate();
\r
2528 int CLogDlg::m_nSortColumnPathList = 0;
\r
2529 bool CLogDlg::m_bAscendingPathList = false;
\r
2531 int CLogDlg::SortCompare(const void * /*pElem1*/, const void * /*pElem2*/)
\r
2534 LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);
\r
2535 LogChangedPath * cpath2 = *((LogChangedPath**)pElem2);
\r
2537 if (m_bAscendingPathList)
\r
2538 std::swap (cpath1, cpath2);
\r
2541 switch (m_nSortColumnPathList)
\r
2544 cmp = cpath2->GetAction().Compare(cpath1->GetAction());
\r
2549 cmp = cpath2->sPath.CompareNoCase(cpath1->sPath);
\r
2553 case 2: // copy from path
\r
2554 cmp = cpath2->sCopyFromPath.Compare(cpath1->sCopyFromPath);
\r
2558 case 3: // copy from revision
\r
2559 return cpath2->lCopyFromRev > cpath1->lCopyFromRev;
\r
2565 void CLogDlg::OnBnClickedHidepaths()
\r
2567 FillLogMessageCtrl();
\r
2568 m_ChangedFileListCtrl.Invalidate();
\r
2573 void CLogDlg::OnBnClickedCheckStoponcopy()
\r
2576 if (!GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
2579 // ignore old fetch limits when switching
\r
2580 // between copy-following and stop-on-copy
\r
2581 // (otherwise stop-on-copy will limit what
\r
2582 // we see immediately after switching to
\r
2583 // copy-following)
\r
2587 // now, restart the query
\r
2593 void CLogDlg::UpdateLogInfoLabel()
\r
2596 git_revnum_t rev1 ;
\r
2597 git_revnum_t rev2 ;
\r
2598 long selectedrevs = 0;
\r
2599 int count =m_LogList.m_arShownList.GetCount();
\r
2602 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(0)))->m_CommitHash;
\r
2603 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));
\r
2604 rev2 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(count-1)))->m_CommitHash;
\r
2605 selectedrevs = m_LogList.GetSelectedCount();
\r
2608 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
2609 m_sLogInfo = sTemp;
\r
2611 UpdateData(FALSE);
\r
2615 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
\r
2618 int selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
2619 if ((point.x == -1) && (point.y == -1))
\r
2622 m_ChangedFileListCtrl.GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2623 m_ChangedFileListCtrl.ClientToScreen(&rect);
\r
2624 point = rect.CenterPoint();
\r
2628 int s = m_LogList.GetSelectionMark();
\r
2631 std::vector<CString> changedpaths;
\r
2632 std::vector<LogChangedPath*> changedlogpaths;
\r
2633 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2635 return; // nothing is selected, get out of here
\r
2637 bool bOneRev = true;
\r
2638 int sel=m_LogList.GetNextSelectedItem(pos);
\r
2639 GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel));
\r
2640 GitRev * rev1 = pLogEntry;
\r
2641 GitRev * rev2 = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel+1));
\r
2643 bool bOneRev = true;
\r
2648 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
2651 rev1 = max(rev1,(git_revnum_t)pLogEntry->Rev);
\r
2652 rev2 = min(rev2,(git_revnum_t)pLogEntry->Rev);
\r
2658 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
2661 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
2662 changedpaths.push_back(m_currentChangedPathList[nItem].GetGitPathString());
\r
2667 // only one revision is selected in the log dialog top pane
\r
2668 // but multiple items could be selected in the changed items list
\r
2671 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
2674 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
2675 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
2677 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
2679 if ((changedlogpath)&&(!changedlogpath->sCopyFromPath.IsEmpty()))
\r
2680 rev2 = changedlogpath->lCopyFromRev;
\r
2683 // if the path was modified but the parent path was 'added with history'
\r
2684 // then we have to use the copy from revision of the parent path
\r
2685 CTGitPath cpath = CTGitPath(changedlogpath->sPath);
\r
2686 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
2688 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
2689 if (p.IsAncestorOf(cpath))
\r
2691 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
2692 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
2697 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
2699 // some items are hidden! So find out which item the user really clicked on
\r
2700 INT_PTR selRealIndex = -1;
\r
2701 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
2703 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
2705 if (selRealIndex == nItem)
\r
2707 selIndex = hiddenindex;
\r
2708 changedlogpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
2713 if (changedlogpath)
\r
2715 changedpaths.push_back(changedlogpath->sPath);
\r
2716 changedlogpaths.push_back(changedlogpath);
\r
2721 //entry is selected, now show the popup menu
\r
2723 if (popup.CreatePopupMenu())
\r
2725 bool bEntryAdded = false;
\r
2726 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
2728 // if ((!bOneRev)||(IsDiffPossible(changedlogpaths[0], rev1)))
\r
2730 popup.AppendMenuIcon(CGitLogList::ID_DIFF, IDS_LOG_POPUP_DIFF, IDI_DIFF);
\r
2731 popup.AppendMenuIcon(CGitLogList::ID_BLAMEDIFF, IDS_LOG_POPUP_BLAMEDIFF, IDI_BLAME);
\r
2732 popup.SetDefaultItem(CGitLogList::ID_DIFF, FALSE);
\r
2733 popup.AppendMenuIcon(CGitLogList::ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF);
\r
2734 bEntryAdded = true;
\r
2736 // if (rev2 == rev1-1)
\r
2739 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2740 popup.AppendMenuIcon(CGitLogList::ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);
\r
2741 popup.AppendMenuIcon(CGitLogList::ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2742 popup.AppendMenuIcon(CGitLogList::ID_BLAME, IDS_LOG_POPUP_BLAME, IDI_BLAME);
\r
2743 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2745 popup.AppendMenuIcon(CGitLogList::ID_REVERTREV, IDS_LOG_POPUP_REVERTREV, IDI_REVERT);
\r
2746 popup.AppendMenuIcon(CGitLogList::ID_POPPROPS, IDS_REPOBROWSE_SHOWPROP, IDI_PROPERTIES); // "Show Properties"
\r
2747 popup.AppendMenuIcon(CGitLogList::ID_LOG, IDS_MENULOG, IDI_LOG); // "Show Log"
\r
2748 popup.AppendMenuIcon(CGitLogList::ID_GETMERGELOGS, IDS_LOG_POPUP_GETMERGELOGS, IDI_LOG); // "Show merge log"
\r
2749 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
\r
2750 bEntryAdded = true;
\r
2751 if (!m_ProjectProperties.sWebViewerPathRev.IsEmpty())
\r
2753 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2754 popup.AppendMenuIcon(CGitLogList::ID_VIEWPATHREV, IDS_LOG_POPUP_VIEWPATHREV);
\r
2756 if (popup.GetDefaultItem(0,FALSE)==-1)
\r
2757 popup.SetDefaultItem(CGitLogList::ID_OPEN, FALSE);
\r
2760 else if (changedlogpaths.size())
\r
2762 // more than one entry is selected
\r
2763 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE);
\r
2764 bEntryAdded = true;
\r
2769 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2770 bool bOpenWith = false;
\r
2771 bool bMergeLog = false;
\r
2772 m_bCancelled = false;
\r
2776 case CGitLogList::ID_DIFF:
\r
2778 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
2782 case ID_BLAMEDIFF:
\r
2784 DoDiffFromLog(selIndex, rev1, rev2, true, false);
\r
2789 DoDiffFromLog(selIndex, rev1, rev2, false, true);
\r
2792 case ID_REVERTREV:
\r
2794 SetPromptApp(&theApp);
\r
2795 theApp.DoWaitCursor(1);
\r
2797 if (Git::PathIsURL(m_path))
\r
2799 sUrl = m_path.GetGitPathString();
\r
2803 sUrl = GetURLFromPath(m_path);
\r
2804 if (sUrl.IsEmpty())
\r
2806 theApp.DoWaitCursor(-1);
\r
2808 temp.Format(IDS_ERR_NOURLOFFILE, m_path.GetWinPath());
\r
2809 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
2811 theApp.DoWaitCursor(-1);
\r
2815 // find the working copy path of the selected item from the URL
\r
2816 m_bCancelled = false;
\r
2817 CString sUrlRoot = GetRepositoryRoot(CTGitPath(sUrl));
\r
2819 CString fileURL = changedpaths[0];
\r
2820 fileURL = sUrlRoot + fileURL.Trim();
\r
2821 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1
\r
2822 // sUrl = http://mydomain.com/repos/trunk/folder
\r
2823 CString sUnescapedUrl = CPathUtils::PathUnescape(sUrl);
\r
2824 // find out until which char the urls are identical
\r
2826 while ((i<fileURL.GetLength())&&(i<sUnescapedUrl.GetLength())&&(fileURL[i]==sUnescapedUrl[i]))
\r
2828 int leftcount = m_path.GetWinPathString().GetLength()-(sUnescapedUrl.GetLength()-i);
\r
2829 CString wcPath = m_path.GetWinPathString().Left(leftcount);
\r
2830 wcPath += fileURL.Mid(i);
\r
2831 wcPath.Replace('/', '\\');
\r
2832 CGitProgressDlg dlg;
\r
2833 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
2835 // a deleted path! Since the path isn't there anymore, merge
\r
2836 // won't work. So just do a copy url->wc
\r
2837 dlg.SetCommand(CGitProgressDlg::GitProgress_Copy);
\r
2838 dlg.SetPathList(CTGitPathList(CTGitPath(fileURL)));
\r
2839 dlg.SetUrl(wcPath);
\r
2840 dlg.SetRevision(rev2);
\r
2844 if (!PathFileExists(wcPath))
\r
2846 // seems the path got renamed
\r
2847 // tell the user how to work around this.
\r
2848 CMessageBox::Show(this->m_hWnd, IDS_LOG_REVERTREV_ERROR, IDS_APPNAME, MB_ICONERROR);
\r
2850 theApp.DoWaitCursor(-1);
\r
2853 dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);
\r
2854 dlg.SetPathList(CTGitPathList(CTGitPath(wcPath)));
\r
2855 dlg.SetUrl(fileURL);
\r
2856 dlg.SetSecondUrl(fileURL);
\r
2857 GitRevRangeArray revarray;
\r
2858 revarray.AddRevRange(rev1, rev2);
\r
2859 dlg.SetRevisionRanges(revarray);
\r
2862 msg.Format(IDS_LOG_REVERT_CONFIRM, (LPCTSTR)wcPath);
\r
2863 if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)
\r
2867 theApp.DoWaitCursor(-1);
\r
2872 DialogEnableWindow(IDOK, FALSE);
\r
2873 SetPromptApp(&theApp);
\r
2874 theApp.DoWaitCursor(1);
\r
2876 if (Git::PathIsURL(m_path))
\r
2878 filepath = m_path.GetGitPathString();
\r
2882 filepath = GetURLFromPath(m_path);
\r
2883 if (filepath.IsEmpty())
\r
2885 theApp.DoWaitCursor(-1);
\r
2887 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
2888 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
2889 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
2894 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
2895 filepath += changedpaths[0];
\r
2898 dlg.m_Path = CTGitPath(filepath);
\r
2901 theApp.DoWaitCursor(-1);
\r
2906 DialogEnableWindow(IDOK, FALSE);
\r
2907 SetPromptApp(&theApp);
\r
2908 theApp.DoWaitCursor(1);
\r
2910 if (Git::PathIsURL(m_path))
\r
2912 filepath = m_path.GetGitPathString();
\r
2916 filepath = GetURLFromPath(m_path);
\r
2917 if (filepath.IsEmpty())
\r
2919 theApp.DoWaitCursor(-1);
\r
2921 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
2922 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
2923 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
2928 m_bCancelled = false;
\r
2929 CString sRoot = GetRepositoryRoot(CTGitPath(filepath));
\r
2930 // if more than one entry is selected, we save them
\r
2931 // one by one into a folder the user has selected
\r
2932 bool bTargetSelected = false;
\r
2933 CTGitPath TargetPath;
\r
2934 if (m_ChangedFileListCtrl.GetSelectedCount() > 1)
\r
2936 CBrowseFolder browseFolder;
\r
2937 browseFolder.SetInfo(CString(MAKEINTRESOURCE(IDS_LOG_SAVEFOLDERTOHINT)));
\r
2938 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
2939 CString strSaveAsDirectory;
\r
2940 if (browseFolder.Show(GetSafeHwnd(), strSaveAsDirectory) == CBrowseFolder::OK)
\r
2942 TargetPath = CTGitPath(strSaveAsDirectory);
\r
2943 bTargetSelected = true;
\r
2948 // Display the Open dialog box.
\r
2949 CString revFilename;
\r
2951 temp = CPathUtils::GetFileNameFromPath(changedpaths[0]);
\r
2952 int rfind = temp.ReverseFind('.');
\r
2954 revFilename.Format(_T("%s-%ld%s"), (LPCTSTR)temp.Left(rfind), rev1, (LPCTSTR)temp.Mid(rfind));
\r
2956 revFilename.Format(_T("%s-%ld"), (LPCTSTR)temp, rev1);
\r
2957 bTargetSelected = CAppUtils::FileOpenSave(revFilename, NULL, IDS_LOG_POPUP_SAVE, IDS_COMMONFILEFILTER, false, m_hWnd);
\r
2958 TargetPath.SetFromWin(revFilename);
\r
2960 if (bTargetSelected)
\r
2962 CProgressDlg progDlg;
\r
2963 progDlg.SetTitle(IDS_APPNAME);
\r
2964 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
2965 for (std::vector<LogChangedPath*>::iterator it = changedlogpaths.begin(); it!= changedlogpaths.end(); ++it)
\r
2967 GitRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;
\r
2969 CString sInfoLine;
\r
2970 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)getrev.ToString());
\r
2971 progDlg.SetLine(1, sInfoLine, true);
\r
2972 SetAndClearProgressInfo(&progDlg);
\r
2973 progDlg.ShowModeless(m_hWnd);
\r
2975 CTGitPath tempfile = TargetPath;
\r
2976 if (changedpaths.size() > 1)
\r
2978 // if multiple items are selected, then the TargetPath
\r
2979 // points to a folder and we have to append the filename
\r
2980 // to save to to that folder.
\r
2981 CString sName = (*it)->sPath;
\r
2982 int slashpos = sName.ReverseFind('/');
\r
2983 if (slashpos >= 0)
\r
2984 sName = sName.Mid(slashpos);
\r
2985 tempfile.AppendPathString(sName);
\r
2986 // one problem here:
\r
2987 // a user could have selected multiple items which
\r
2988 // have the same filename but reside in different
\r
2989 // directories, e.g.
\r
2992 // in that case, the second 'file1' will overwrite
\r
2993 // the already saved 'file1'.
\r
2995 // we could maybe find the common root of all selected
\r
2996 // items and then create sub folders to save those files
\r
2998 // But I think we should just leave it that way: to check
\r
2999 // out multiple items at once, the better way is still to
\r
3000 // use the export command from the top pane of the log dialog.
\r
3002 filepath = sRoot + (*it)->sPath;
\r
3003 if (!Cat(CTGitPath(filepath), getrev, getrev, tempfile))
\r
3006 SetAndClearProgressInfo((HWND)NULL);
\r
3007 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3009 theApp.DoWaitCursor(-1);
\r
3014 SetAndClearProgressInfo((HWND)NULL);
\r
3017 theApp.DoWaitCursor(-1);
\r
3024 GitRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;
\r
3025 Open(bOpenWith,changedpaths[0],getrev);
\r
3031 if (Git::PathIsURL(m_path))
\r
3033 filepath = m_path.GetGitPathString();
\r
3037 filepath = GetURLFromPath(m_path);
\r
3038 if (filepath.IsEmpty())
\r
3040 theApp.DoWaitCursor(-1);
\r
3042 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3043 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3044 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3049 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3050 filepath += changedpaths[0];
\r
3052 dlg.EndRev = rev1;
\r
3053 if (dlg.DoModal() == IDOK)
\r
3058 tempfile = blame.BlameToTempFile(CTGitPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);
\r
3059 if (!tempfile.IsEmpty())
\r
3061 if (dlg.m_bTextView)
\r
3063 //open the default text editor for the result file
\r
3064 CAppUtils::StartTextViewer(tempfile);
\r
3068 CString sParams = _T("/path:\"") + filepath + _T("\" ");
\r
3069 if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(filepath),sParams))
\r
3077 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3082 case ID_GETMERGELOGS:
\r
3087 DialogEnableWindow(IDOK, FALSE);
\r
3088 SetPromptApp(&theApp);
\r
3089 theApp.DoWaitCursor(1);
\r
3091 if (Git::PathIsURL(m_path))
\r
3093 filepath = m_path.GetGitPathString();
\r
3097 filepath = GetURLFromPath(m_path);
\r
3098 if (filepath.IsEmpty())
\r
3100 theApp.DoWaitCursor(-1);
\r
3102 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3103 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3104 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3109 m_bCancelled = false;
\r
3110 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3111 filepath += changedpaths[0];
\r
3112 git_revnum_t logrev = rev1;
\r
3113 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3115 // if the item got deleted in this revision,
\r
3116 // fetch the log from the previous revision where it
\r
3121 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\" /startrev:%ld"), (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)filepath, logrev);
\r
3123 sCmd += _T(" /merge");
\r
3124 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3126 theApp.DoWaitCursor(-1);
\r
3129 case ID_VIEWPATHREV:
\r
3131 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetSelectionMark()));
\r
3132 GitRev rev = pLogEntry->Rev;
\r
3133 CString relurl = changedpaths[0];
\r
3134 CString url = m_ProjectProperties.sWebViewerPathRev;
\r
3135 url.Replace(_T("%REVISION%"), rev.ToString());
\r
3136 url.Replace(_T("%PATH%"), relurl);
\r
3137 relurl = relurl.Mid(relurl.Find('/'));
\r
3138 url.Replace(_T("%PATH1%"), relurl);
\r
3139 if (!url.IsEmpty())
\r
3140 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
3148 } // if (popup.CreatePopupMenu())
\r
3152 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3154 // the date control should not show the "today" button
\r
3155 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
\r
3157 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3161 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3163 // the date control should not show the "today" button
\r
3164 CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();
\r
3166 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3170 void CLogDlg::OnSize(UINT nType, int cx, int cy)
\r
3172 __super::OnSize(nType, cx, cy);
\r
3174 SetSplitterRange();
\r
3177 void CLogDlg::OnRefresh()
\r
3179 //if (GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
3182 this->m_LogProgress.SetPos(0);
\r
3188 void CLogDlg::OnFind()
\r
3190 if (!m_pFindDialog)
\r
3192 m_pFindDialog = new CFindReplaceDialog();
\r
3193 m_pFindDialog->Create(TRUE, NULL, NULL, FR_HIDEUPDOWN | FR_HIDEWHOLEWORD, this);
\r
3197 void CLogDlg::OnFocusFilter()
\r
3199 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3202 void CLogDlg::OnEditCopy()
\r
3204 if (GetFocus() == &m_ChangedFileListCtrl)
\r
3205 CopyChangedSelectionToClipBoard();
\r
3207 m_LogList.CopySelectionToClipBoard();
\r
3210 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
\r
3212 // is the URL a relative one?
\r
3213 if (url.Left(2).Compare(_T("^/")) == 0)
\r
3215 // URL is relative to the repository root
\r
3216 CString url1 = m_sRepositoryRoot + url.Mid(1);
\r
3217 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3218 DWORD len = url.GetLength();
\r
3219 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
\r
3220 return CString(buf, len);
\r
3223 else if (url[0] == '/')
\r
3225 // URL is relative to the server's hostname
\r
3227 // find the server's hostname
\r
3228 int schemepos = m_sRepositoryRoot.Find(_T("//"));
\r
3229 if (schemepos >= 0)
\r
3231 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));
\r
3232 CString url1 = sHost + url;
\r
3233 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3234 DWORD len = url.GetLength();
\r
3235 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
\r
3236 return CString(buf, len);
\r
3244 void CLogDlg::OnEnChangeSearchedit()
\r
3247 if (m_LogList.m_sFilterText.IsEmpty())
\r
3249 CStoreSelection storeselection(this);
\r
3250 // clear the filter, i.e. make all entries appear
\r
3251 theApp.DoWaitCursor(1);
\r
3252 KillTimer(LOGFILTER_TIMER);
\r
3253 FillLogMessageCtrl(false);
\r
3254 m_LogList.StartFilter();
\r
3256 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
3257 m_arShownList.RemoveAll();
\r
3258 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
3260 if (IsEntryInDateRange(i))
\r
3261 m_arShownList.Add(m_logEntries[i]);
\r
3263 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
3264 m_LogList.DeleteAllItems();
\r
3265 m_LogList.SetItemCountEx(ShownCountWithStopped());
\r
3266 m_LogList.RedrawItems(0, ShownCountWithStopped());
\r
3267 m_LogList.SetRedraw(false);
\r
3268 ResizeAllListCtrlCols();
\r
3269 m_LogList.SetRedraw(true);
\r
3271 theApp.DoWaitCursor(-1);
\r
3272 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
3273 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
3274 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3275 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
3278 if (Validate(m_LogList.m_sFilterText))
\r
3279 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
3281 KillTimer(LOGFILTER_TIMER);
\r
3285 void CLogDlg::OnBnClickedAllBranch()
\r
3287 this->UpdateData();
\r
3289 if(this->m_bAllBranch)
\r
3290 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;
\r
3292 m_LogList.m_ShowMask&=~CGit::LOG_INFO_ALL_BRANCH;
\r
3296 FillLogMessageCtrl(false);
\r
3300 void CLogDlg::OnBnClickedFirstParent()
\r
3302 this->UpdateData();
\r
3304 if(this->m_bFirstParent)
\r
3305 m_LogList.m_ShowMask|=CGit::LOG_INFO_FIRST_PARENT;
\r
3307 m_LogList.m_ShowMask&=~CGit::LOG_INFO_FIRST_PARENT;
\r
3311 FillLogMessageCtrl(false);
\r
3315 void CLogDlg::OnBnClickShowWholeProject()
\r
3317 this->UpdateData();
\r
3319 if(this->m_bWholeProject)
\r
3321 m_LogList.m_Path.Reset();
\r
3322 SetWindowText(m_sTitle + _T(" - ") + CString(_T("Whole Project")));
\r
3326 m_LogList.m_Path=m_path;
\r
3327 if(!m_path.IsEmpty())
\r
3328 SetWindowText(m_sTitle + _T(" - ") + m_path.GetGitPathString());
\r
3333 FillLogMessageCtrl(false);
\r
OSDN Git Service
