1 // TortoiseGit - a Windows shell extension for easy version control
\r
3 // Copyright (C) 2003-2008 - TortoiseGit
\r
5 // This program is free software; you can redistribute it and/or
\r
6 // modify it under the terms of the GNU General Public License
\r
7 // as published by the Free Software Foundation; either version 2
\r
8 // of the License, or (at your option) any later version.
\r
10 // This program is distributed in the hope that it will be useful,
\r
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
13 // GNU General Public License for more details.
\r
15 // You should have received a copy of the GNU General Public License
\r
16 // along with this program; if not, write to the Free Software Foundation,
\r
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
20 #include "TortoiseProc.h"
\r
22 #include "InputDlg.h"
\r
23 #include "PropDlg.h"
\r
24 #include "SVNProgressDlg.h"
\r
25 #include "ProgressDlg.h"
\r
26 //#include "RepositoryBrowser.h"
\r
27 //#include "CopyDlg.h"
\r
28 //#include "StatGraphDlg.h"
\r
30 #include "MessageBox.h"
\r
31 #include "Registry.h"
\r
32 #include "AppUtils.h"
\r
33 #include "PathUtils.h"
\r
34 #include "StringUtils.h"
\r
35 #include "UnicodeUtils.h"
\r
36 #include "TempFile.h"
\r
37 //#include "GitInfo.h"
\r
38 //#include "GitDiff.h"
\r
39 #include "IconMenu.h"
\r
40 //#include "RevisionRangeDlg.h"
\r
41 //#include "BrowseFolder.h"
\r
42 //#include "BlameDlg.h"
\r
43 //#include "Blame.h"
\r
44 //#include "GitHelpers.h"
\r
45 #include "GitStatus.h"
\r
46 //#include "LogDlgHelper.h"
\r
47 //#include "CachedLogInfo.h"
\r
48 //#include "RepositoryInfo.h"
\r
49 //#include "EditPropertiesDlg.h"
\r
50 #include "FileDiffDlg.h"
\r
53 const UINT CLogDlg::m_FindDialogMessage = RegisterWindowMessage(FINDMSGSTRING);
\r
58 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)
\r
59 CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
\r
60 : CResizableStandAloneDialog(CLogDlg::IDD, pParent)
\r
64 , m_nSelectedFilter(LOGFILTER_ALL)
\r
65 , m_currentChangedArray(NULL)
\r
67 , m_bShowedAll(false)
\r
69 , m_regLastStrict(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE)
\r
71 , m_bSelectionMustBeContinuous(false)
\r
72 , m_bShowBugtraqColumn(false)
\r
73 , m_lowestRev(_T(""))
\r
75 , m_sLogInfo(_T(""))
\r
76 , m_pFindDialog(NULL)
\r
77 , m_bCancelled(FALSE)
\r
78 , m_pNotifyWindow(NULL)
\r
80 , m_bAscending(FALSE)
\r
85 , m_bIncludeMerges(FALSE)
\r
89 m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
96 m_CurrentFilteredChangedArray.RemoveAll();
\r
103 void CLogDlg::DoDataExchange(CDataExchange* pDX)
\r
105 CResizableStandAloneDialog::DoDataExchange(pDX);
\r
106 DDX_Control(pDX, IDC_LOGLIST, m_LogList);
\r
107 DDX_Control(pDX, IDC_LOGMSG, m_ChangedFileListCtrl);
\r
108 DDX_Control(pDX, IDC_PROGRESS, m_LogProgress);
\r
109 DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1);
\r
110 DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2);
\r
111 DDX_Check(pDX, IDC_CHECK_STOPONCOPY, m_bStrict);
\r
112 DDX_Text(pDX, IDC_SEARCHEDIT, m_sFilterText);
\r
113 DDX_Control(pDX, IDC_DATEFROM, m_DateFrom);
\r
114 DDX_Control(pDX, IDC_DATETO, m_DateTo);
\r
115 DDX_Control(pDX, IDC_HIDEPATHS, m_cHidePaths);
\r
116 DDX_Control(pDX, IDC_GETALL, m_btnShow);
\r
117 DDX_Text(pDX, IDC_LOGINFO, m_sLogInfo);
\r
118 DDX_Check(pDX, IDC_INCLUDEMERGE, m_bIncludeMerges);
\r
119 DDX_Control(pDX, IDC_SEARCHEDIT, m_cFilter);
\r
122 BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
\r
123 ON_REGISTERED_MESSAGE(m_FindDialogMessage, OnFindDialogMessage)
\r
124 ON_BN_CLICKED(IDC_GETALL, OnBnClickedGetall)
\r
125 ON_NOTIFY(NM_DBLCLK, IDC_LOGMSG, OnNMDblclkChangedFileList)
\r
126 ON_WM_CONTEXTMENU()
\r
128 ON_BN_CLICKED(IDHELP, OnBnClickedHelp)
\r
129 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)
\r
130 ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)
\r
131 ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)
\r
133 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
\r
134 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
\r
136 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
\r
138 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
\r
139 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
\r
140 ON_BN_CLICKED(IDC_NEXTHUNDRED, OnBnClickedNexthundred)
\r
141 ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGMSG, OnNMCustomdrawChangedFileList)
\r
142 ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGMSG, OnLvnGetdispinfoChangedFileList)
\r
143 ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST , OnLvnColumnclick)
\r
144 ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList)
\r
145 ON_BN_CLICKED(IDC_HIDEPATHS, OnBnClickedHidepaths)
\r
147 ON_BN_CLICKED(IDC_CHECK_STOPONCOPY, &CLogDlg::OnBnClickedCheckStoponcopy)
\r
148 ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)
\r
149 ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)
\r
151 ON_BN_CLICKED(IDC_INCLUDEMERGE, &CLogDlg::OnBnClickedIncludemerge)
\r
152 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
\r
153 ON_COMMAND(ID_LOGDLG_REFRESH,&CLogDlg::OnRefresh)
\r
154 ON_COMMAND(ID_LOGDLG_FIND,&CLogDlg::OnFind)
\r
155 ON_COMMAND(ID_LOGDLG_FOCUSFILTER,&CLogDlg::OnFocusFilter)
\r
156 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
\r
159 void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, BOOL bStrict /* = FALSE */, BOOL bSaveStrict /* = TRUE */)
\r
163 m_startrev = startrev;
\r
164 m_LogRevision = startrev;
\r
166 m_hasWC = !path.IsUrl();
\r
167 m_bStrict = bStrict;
\r
168 m_bSaveStrict = bSaveStrict;
\r
170 if (::IsWindow(m_hWnd))
\r
174 BOOL CLogDlg::OnInitDialog()
\r
176 CResizableStandAloneDialog::OnInitDialog();
\r
178 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
\r
180 OSVERSIONINFOEX inf;
\r
181 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
182 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
183 GetVersionEx((OSVERSIONINFO *)&inf);
\r
184 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
185 m_bVista = (fullver >= 0x0600);
\r
187 // use the state of the "stop on copy/rename" option from the last time
\r
189 m_bStrict = m_regLastStrict;
\r
193 temp.Format(IDS_LOG_SHOWNEXT, m_limit);
\r
195 temp.Format(IDS_LOG_SHOWNEXT, (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100));
\r
197 SetDlgItemText(IDC_NEXTHUNDRED, temp);
\r
199 // set the font to use in the log message view, configured in the settings dialog
\r
200 CAppUtils::CreateFontForLogs(m_logFont);
\r
201 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
\r
202 // automatically detect URLs in the log message and turn them into links
\r
203 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_AUTOURLDETECT, TRUE, NULL);
\r
204 // make the log message rich edit control send a message when the mouse pointer is over a link
\r
205 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK);
\r
206 //m_LogList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_SUBITEMIMAGES);
\r
208 // the "hide unrelated paths" checkbox should be indeterminate
\r
209 m_cHidePaths.SetCheck(BST_INDETERMINATE);
\r
212 // if there is a working copy, load the project properties
\r
213 // to get information about the bugtraq: integration
\r
215 m_ProjectProperties.ReadProps(m_path);
\r
217 // the bugtraq issue id column is only shown if the bugtraq:url or bugtraq:regex is set
\r
218 if ((!m_ProjectProperties.sUrl.IsEmpty())||(!m_ProjectProperties.sCheckRe.IsEmpty()))
\r
219 m_bShowBugtraqColumn = true;
\r
221 //theme.SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);
\r
222 theme.SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);
\r
224 // set up the columns
\r
225 m_LogList.DeleteAllItems();
\r
226 m_LogList.InsertGitColumn();
\r
228 m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );
\r
229 m_ChangedFileListCtrl.DeleteAllItems();
\r
230 int c = ((CHeaderCtrl*)(m_ChangedFileListCtrl.GetDlgItem(0)))->GetItemCount()-1;
\r
232 m_ChangedFileListCtrl.DeleteColumn(c--);
\r
233 temp.LoadString(IDS_PROGRS_ACTION);
\r
234 m_ChangedFileListCtrl.InsertColumn(this->FILELIST_ACTION, temp);
\r
235 temp.LoadString(IDS_LOG_FILE_LINE_ADD);
\r
236 m_ChangedFileListCtrl.InsertColumn(this->FILELIST_ADD, temp);
\r
237 temp.LoadString(IDS_LOG_FILE_LINE_DEL);
\r
238 m_ChangedFileListCtrl.InsertColumn(this->FILELIST_DEL, temp);
\r
239 temp.LoadString(IDS_PROGRS_PATH);
\r
240 m_ChangedFileListCtrl.InsertColumn(this->FILELIST_PATH, temp);
\r
242 m_ChangedFileListCtrl.SetRedraw(false);
\r
243 CAppUtils::ResizeAllListCtrlCols(&m_ChangedFileListCtrl);
\r
244 m_ChangedFileListCtrl.SetRedraw(true);
\r
247 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
250 m_sMessageBuf.Preallocate(100000);
\r
252 // set the dialog title to "Log - path/to/whatever/we/show/the/log/for"
\r
253 SetDlgTitle(false);
\r
255 m_tooltips.Create(this);
\r
256 CheckRegexpTooltip();
\r
258 SetSplitterRange();
\r
260 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
\r
261 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
\r
262 m_cFilter.SetInfoIcon(IDI_LOGFILTER);
\r
263 m_cFilter.SetValidator(this);
\r
265 AdjustControlSize(IDC_HIDEPATHS);
\r
266 AdjustControlSize(IDC_CHECK_STOPONCOPY);
\r
267 AdjustControlSize(IDC_INCLUDEMERGE);
\r
269 GetClientRect(m_DlgOrigRect);
\r
270 m_LogList.GetClientRect(m_LogListOrigRect);
\r
271 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
\r
272 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
\r
274 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
275 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
\r
278 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
\r
279 AddAnchor(IDC_DATEFROM, TOP_LEFT);
\r
280 AddAnchor(IDC_TOLABEL, TOP_LEFT);
\r
281 AddAnchor(IDC_DATETO, TOP_LEFT);
\r
283 SetFilterCueText();
\r
284 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
\r
286 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
287 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
288 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
289 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
290 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
292 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
293 AddAnchor(IDC_HIDEPATHS, BOTTOM_LEFT);
\r
294 AddAnchor(IDC_CHECK_STOPONCOPY, BOTTOM_LEFT);
\r
295 AddAnchor(IDC_INCLUDEMERGE, BOTTOM_LEFT);
\r
296 AddAnchor(IDC_GETALL, BOTTOM_LEFT);
\r
297 AddAnchor(IDC_NEXTHUNDRED, BOTTOM_LEFT);
\r
298 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
\r
299 AddAnchor(IDC_STATBUTTON, BOTTOM_RIGHT);
\r
300 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
301 AddAnchor(IDOK, BOTTOM_RIGHT);
\r
302 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
\r
303 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
305 // SetPromptParentWindow(m_hWnd);
\r
308 CenterWindow(CWnd::FromHandle(hWndExplorer));
\r
309 EnableSaveRestore(_T("LogDlg"));
\r
311 DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
312 DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
313 RECT rcDlg, rcLogList, rcChgMsg;
\r
314 GetClientRect(&rcDlg);
\r
315 m_LogList.GetWindowRect(&rcLogList);
\r
316 ScreenToClient(&rcLogList);
\r
317 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
\r
318 ScreenToClient(&rcChgMsg);
\r
322 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
323 ScreenToClient(&rectSplitter);
\r
324 int delta = yPos1 - rectSplitter.top;
\r
326 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
\r
328 m_wndSplitter1.SetWindowPos(NULL, 0, yPos1, 0, 0, SWP_NOSIZE);
\r
335 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
336 ScreenToClient(&rectSplitter);
\r
337 int delta = yPos2 - rectSplitter.top;
\r
339 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
\r
341 m_wndSplitter2.SetWindowPos(NULL, 0, yPos2, 0, 0, SWP_NOSIZE);
\r
349 // the dialog is used to select revisions
\r
350 if (m_bSelectionMustBeContinuous)
\r
351 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
353 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
357 // the dialog is used to just view log messages
\r
358 GetDlgItemText(IDOK, temp);
\r
359 SetDlgItemText(IDCANCEL, temp);
\r
360 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
\r
363 // set the choices for the "Show All" button
\r
364 temp.LoadString(IDS_LOG_SHOWALL);
\r
365 m_btnShow.AddEntry(temp);
\r
366 temp.LoadString(IDS_LOG_SHOWRANGE);
\r
367 m_btnShow.AddEntry(temp);
\r
368 m_btnShow.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")));
\r
370 m_mergedRevs.clear();
\r
372 // first start a thread to obtain the log messages without
\r
373 // blocking the dialog
\r
375 m_tFrom = (DWORD)-1;
\r
377 m_LogList.FetchLogAsync(LogCallBack,this);
\r
379 GetDlgItem(IDC_LOGLIST)->SetFocus();
\r
383 void CLogDlg::LogRunStatus(int cur)
\r
385 if( cur == GITLOG_START )
\r
388 temp.LoadString(IDS_PROGRESSWAIT);
\r
390 // change the text of the close button to "Cancel" since now the thread
\r
391 // is running, and simply closing the dialog doesn't work.
\r
392 if (!GetDlgItem(IDOK)->IsWindowVisible())
\r
394 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
395 SetDlgItemText(IDCANCEL, temp);
\r
398 // We use a progress bar while getting the logs
\r
399 m_LogProgress.SetRange32(0, 100);
\r
400 m_LogProgress.SetPos(0);
\r
402 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
\r
404 DialogEnableWindow(IDC_GETALL, FALSE);
\r
405 DialogEnableWindow(IDC_NEXTHUNDRED, FALSE);
\r
406 DialogEnableWindow(IDC_CHECK_STOPONCOPY, FALSE);
\r
407 DialogEnableWindow(IDC_INCLUDEMERGE, FALSE);
\r
408 DialogEnableWindow(IDC_STATBUTTON, FALSE);
\r
409 DialogEnableWindow(IDC_REFRESH, FALSE);
\r
412 if( cur == GITLOG_END)
\r
416 DialogEnableWindow(IDC_NEXTHUNDRED, TRUE);
\r
418 DialogEnableWindow(IDC_CHECK_STOPONCOPY, TRUE);
\r
419 DialogEnableWindow(IDC_INCLUDEMERGE, TRUE);
\r
420 DialogEnableWindow(IDC_STATBUTTON, TRUE);
\r
421 DialogEnableWindow(IDC_REFRESH, TRUE);
\r
423 PostMessage(WM_TIMER, LOGFILTER_TIMER);
\r
427 m_LogProgress.SetPos(cur);
\r
429 void CLogDlg::SetDlgTitle(bool bOffline)
\r
431 if (m_sTitle.IsEmpty())
\r
432 GetWindowText(m_sTitle);
\r
437 if (m_path.IsUrl())
\r
438 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetUIPathString());
\r
439 else if (m_path.IsDirectory())
\r
440 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetWinPathString());
\r
442 sTemp.Format(IDS_LOG_DLGTITLEOFFLINE, (LPCTSTR)m_sTitle, (LPCTSTR)m_path.GetFilename());
\r
443 SetWindowText(sTemp);
\r
447 if (m_path.IsUrl())
\r
448 SetWindowText(m_sTitle + _T(" - ") + m_path.GetUIPathString());
\r
449 else if (m_path.IsDirectory())
\r
450 SetWindowText(m_sTitle + _T(" - ") + m_path.GetWinPathString());
\r
452 SetWindowText(m_sTitle + _T(" - ") + m_path.GetFilename());
\r
456 void CLogDlg::CheckRegexpTooltip()
\r
458 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
\r
459 // Since tooltip describes regexp features, show it only if regexps are enabled.
\r
460 if (m_bFilterWithRegex)
\r
462 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
\r
465 m_tooltips.DelTool(pWnd);
\r
468 void CLogDlg::EnableOKButton()
\r
472 // the dialog is used to select revisions
\r
473 if (m_bSelectionMustBeContinuous)
\r
474 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
\r
476 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
\r
479 DialogEnableWindow(IDOK, TRUE);
\r
482 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
\r
484 // we fill here the log message rich edit control,
\r
485 // and also populate the changed files list control
\r
486 // according to the selected revision(s).
\r
488 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
489 // empty the log message view
\r
490 pMsgView->SetWindowText(_T(" "));
\r
491 // empty the changed files list
\r
492 m_ChangedFileListCtrl.SetRedraw(FALSE);
\r
493 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
494 m_currentChangedArray = NULL;
\r
495 m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );
\r
496 m_ChangedFileListCtrl.DeleteAllItems();
\r
497 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
499 // if we're not here to really show a selected revision, just
\r
500 // get out of here after clearing the views, which is what is intended
\r
501 // if that flag is not set.
\r
505 m_ChangedFileListCtrl.Invalidate();
\r
506 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
507 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
511 // depending on how many revisions are selected, we have to do different
\r
513 int selCount = m_LogList.GetSelectedCount();
\r
516 // if nothing is selected, we have nothing more to do
\r
517 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
518 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
521 else if (selCount == 1)
\r
523 // if one revision is selected, we have to fill the log message view
\r
524 // with the corresponding log message, and also fill the changed files
\r
526 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
527 int selIndex = m_LogList.GetNextSelectedItem(pos);
\r
528 if (selIndex >= m_LogList.m_arShownList.GetCount())
\r
530 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
531 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
534 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));
\r
536 // set the log message text
\r
537 pMsgView->SetWindowText(_T("*")+pLogEntry->m_Subject+_T("\n\n")+pLogEntry->m_Body);
\r
538 // turn bug ID's into links if the bugtraq: properties have been set
\r
539 // and we can find a match of those in the log message
\r
540 m_ProjectProperties.FindBugID(pLogEntry->m_Body, pMsgView);
\r
541 CAppUtils::FormatTextInRichEditControl(pMsgView);
\r
542 m_currentChangedArray = &(pLogEntry->m_Files);
\r
543 if (m_currentChangedArray == NULL)
\r
545 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
546 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
550 // fill in the changed files list control
\r
551 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
553 m_CurrentFilteredChangedArray.RemoveAll();
\r
554 for (INT_PTR c = 0; c < m_currentChangedArray->GetCount(); ++c)
\r
556 LogChangedPath * cpath = m_currentChangedArray->GetAt(c);
\r
559 if (m_currentChangedArray->GetAt(c)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
561 m_CurrentFilteredChangedArray.Add(cpath);
\r
564 m_currentChangedArray = &m_CurrentFilteredChangedArray;
\r
570 // more than one revision is selected:
\r
571 // the log message view must be emptied
\r
572 // the changed files list contains all the changed paths from all
\r
573 // selected revisions, with 'doubles' removed
\r
574 m_currentChangedPathList = GetChangedPathsFromSelectedRevisions(true);
\r
577 // redraw the views
\r
578 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
579 if (m_currentChangedArray)
\r
581 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedArray->GetCount());
\r
582 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedArray->GetCount());
\r
584 else if (m_currentChangedPathList.GetCount())
\r
586 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedPathList.GetCount());
\r
587 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedPathList.GetCount());
\r
591 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
592 m_ChangedFileListCtrl.Invalidate();
\r
594 CAppUtils::ResizeAllListCtrlCols(&m_ChangedFileListCtrl);
\r
595 // sort according to the settings
\r
596 if (m_nSortColumnPathList > 0)
\r
597 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
599 SetSortArrow(&m_ChangedFileListCtrl, -1, false);
\r
600 m_ChangedFileListCtrl.SetRedraw(TRUE);
\r
604 void CLogDlg::OnBnClickedGetall()
\r
609 void CLogDlg::GetAll(bool bForceAll /* = false */)
\r
612 // fetch all requested log messages, either the specified range or
\r
613 // really *all* available log messages.
\r
615 INT_PTR entry = m_btnShow.GetCurrentEntry();
\r
621 case 0: // show all
\r
624 m_startrev = m_LogRevision;
\r
626 m_bShowedAll = true;
\r
629 case 1: // show range
\r
632 // ask for a revision range
\r
633 CRevisionRangeDlg dlg;
\r
634 dlg.SetStartRevision(m_startrev);
\r
635 dlg.SetEndRevision( (m_endrev>=0) ? m_endrev : 0);
\r
636 if (dlg.DoModal()!=IDOK)
\r
640 m_endrev = dlg.GetEndRevision();
\r
641 m_startrev = dlg.GetStartRevision();
\r
642 if (((m_endrev.IsNumber())&&(m_startrev.IsNumber()))||
\r
643 (m_endrev.IsHead()||m_startrev.IsHead()))
\r
645 if (((LONG)m_startrev < (LONG)m_endrev)||
\r
646 (m_endrev.IsHead()))
\r
648 git_revnum_t temp = m_startrev;
\r
649 m_startrev = m_endrev;
\r
653 m_bShowedAll = false;
\r
658 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
659 m_ChangedFileListCtrl.Invalidate();
\r
660 // We need to create CStoreSelection on the heap or else
\r
661 // the variable will run out of the scope before the
\r
662 // thread ends. Therefore we let the thread delete
\r
664 m_pStoreSelection = new CStoreSelection(this);
\r
665 m_LogList.SetItemCountEx(0);
\r
666 m_LogList.Invalidate();
\r
667 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
668 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
669 pMsgView->SetWindowText(_T(""));
\r
671 SetSortArrow(&m_LogList, -1, true);
\r
673 m_LogList.DeleteAllItems();
\r
674 m_arShownList.RemoveAll();
\r
675 m_logEntries.ClearAll();
\r
678 m_bCancelled = FALSE;
\r
680 m_tFrom = (DWORD)-1;
\r
683 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
684 if (AfxBeginThread(LogThreadEntry, this)==NULL)
\r
686 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
687 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
689 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
690 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
694 void CLogDlg::OnBnClickedRefresh()
\r
700 void CLogDlg::Refresh (bool autoGoOnline)
\r
703 // refreshing means re-downloading the already shown log messages
\r
706 m_childCounter = 0;
\r
708 if ((m_limit == 0)||(m_bStrict)||(int(m_logEntries.size()-1) > m_limit))
\r
710 if (m_logEntries.size() != 0)
\r
712 m_endrev = m_logEntries[m_logEntries.size()-1]->Rev;
\r
716 m_bCancelled = FALSE;
\r
718 // We need to create CStoreSelection on the heap or else
\r
719 // the variable will run out of the scope before the
\r
720 // thread ends. Therefore we let the thread delete
\r
722 m_pStoreSelection = new CStoreSelection(this);
\r
723 m_ChangedFileListCtrl.SetItemCountEx(0);
\r
724 m_ChangedFileListCtrl.Invalidate();
\r
725 m_LogList.SetItemCountEx(0);
\r
726 m_LogList.Invalidate();
\r
727 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
728 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
729 pMsgView->SetWindowText(_T(""));
\r
731 SetSortArrow(&m_LogList, -1, true);
\r
733 m_LogList.DeleteAllItems();
\r
734 m_arShownList.RemoveAll();
\r
735 m_logEntries.ClearAll();
\r
737 // reset the cached HEAD property & go on-line
\r
741 SetDlgTitle (false);
\r
742 logCachePool.GetRepositoryInfo().ResetHeadRevision (m_sUUID, m_sRepositoryRoot);
\r
745 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
746 if (AfxBeginThread(LogThreadEntry, this)==NULL)
\r
748 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
749 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
751 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
752 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
756 void CLogDlg::OnBnClickedNexthundred()
\r
760 // we have to fetch the next X log messages.
\r
761 if (m_logEntries.size() < 1)
\r
763 // since there weren't any log messages fetched before, just
\r
764 // fetch all since we don't have an 'anchor' to fetch the 'next'
\r
766 return GetAll(true);
\r
768 git_revnum_t rev = m_logEntries[m_logEntries.size()-1]->Rev;
\r
771 return; // do nothing! No more revisions to get
\r
775 m_bCancelled = FALSE;
\r
777 // rev is is revision we already have and we will receive it again
\r
778 // -> fetch one extra revision to get NumberOfLogs *new* revisions
\r
780 m_limit = (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100) +1;
\r
781 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
782 SetSortArrow(&m_LogList, -1, true);
\r
783 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
784 // We need to create CStoreSelection on the heap or else
\r
785 // the variable will run out of the scope before the
\r
786 // thread ends. Therefore we let the thread delete
\r
788 m_pStoreSelection = new CStoreSelection(this);
\r
790 // since we fetch the log from the last revision we already have,
\r
791 // we have to remove that revision entry to avoid getting it twice
\r
792 m_logEntries.pop_back();
\r
793 if (AfxBeginThread(LogThreadEntry, this)==NULL)
\r
795 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
796 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
798 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
799 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
\r
803 BOOL CLogDlg::Cancel()
\r
805 return m_bCancelled;
\r
808 void CLogDlg::SaveSplitterPos()
\r
812 CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
\r
813 CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
\r
815 m_wndSplitter1.GetWindowRect(&rectSplitter);
\r
816 ScreenToClient(&rectSplitter);
\r
817 regPos1 = rectSplitter.top;
\r
818 m_wndSplitter2.GetWindowRect(&rectSplitter);
\r
819 ScreenToClient(&rectSplitter);
\r
820 regPos2 = rectSplitter.top;
\r
824 void CLogDlg::OnCancel()
\r
826 // canceling means stopping the working thread if it's still running.
\r
827 // we do this by using the Subversion cancel callback.
\r
828 // But canceling can also mean just to close the dialog, depending on the
\r
829 // text shown on the cancel button (it could simply read "OK").
\r
830 CString temp, temp2;
\r
831 GetDlgItemText(IDOK, temp);
\r
832 temp2.LoadString(IDS_MSGBOX_CANCEL);
\r
833 if ((temp.Compare(temp2)==0)||(this->IsThreadRunning()))
\r
835 m_bCancelled = true;
\r
840 m_regLastStrict = m_bStrict;
\r
841 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
842 reg = m_btnShow.GetCurrentEntry();
\r
844 __super::OnCancel();
\r
847 CString CLogDlg::MakeShortMessage(const CString& message)
\r
849 bool bFoundShort = true;
\r
850 CString sShortMessage = m_ProjectProperties.GetLogSummary(message);
\r
851 if (sShortMessage.IsEmpty())
\r
853 bFoundShort = false;
\r
854 sShortMessage = message;
\r
856 // Remove newlines and tabs 'cause those are not shown nicely in the list control
\r
857 sShortMessage.Replace(_T("\r"), _T(""));
\r
858 sShortMessage.Replace(_T("\t"), _T(" "));
\r
860 // Suppose the first empty line separates 'summary' from the rest of the message.
\r
861 int found = sShortMessage.Find(_T("\n\n"));
\r
862 // To avoid too short 'short' messages
\r
863 // (e.g. if the message looks something like "Bugfix:\n\n*done this\n*done that")
\r
864 // only use the empty newline as a separator if it comes after at least 15 chars.
\r
865 if ((!bFoundShort)&&(found >= 15))
\r
867 sShortMessage = sShortMessage.Left(found);
\r
869 sShortMessage.Replace('\n', ' ');
\r
870 return sShortMessage;
\r
873 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
876 if (rev == SVN_INVALID_REVNUM)
\r
882 // this is the callback function which receives the data for every revision we ask the log for
\r
883 // we store this information here one by one.
\r
885 if (m_startrev == -1)
\r
890 m_LogProgress.SetPos(m_limit - m_limitcounter);
\r
892 else if (m_startrev.IsNumber() && m_startrev.IsNumber())
\r
893 m_LogProgress.SetPos((git_revnum_t)m_startrev-rev+(git_revnum_t)m_endrev);
\r
894 __time64_t ttime = time/1000000L;
\r
895 if (m_tTo < (DWORD)ttime)
\r
896 m_tTo = (DWORD)ttime;
\r
897 if (m_tFrom > (DWORD)ttime)
\r
898 m_tFrom = (DWORD)ttime;
\r
899 if ((m_lowestRev > rev)||(m_lowestRev < 0))
\r
901 // Add as many characters from the log message to the list control
\r
902 PLOGENTRYDATA pLogItem = new LOGENTRYDATA;
\r
903 pLogItem->bCopies = !!copies;
\r
905 // find out if this item was copied in the revision
\r
906 BOOL copiedself = FALSE;
\r
909 for (INT_PTR cpPathIndex = 0; cpPathIndex < cpaths->GetCount(); ++cpPathIndex)
\r
911 LogChangedPath * cpath = cpaths->GetAt(cpPathIndex);
\r
912 if (!cpath->sCopyFromPath.IsEmpty() && (cpath->sPath.Compare(m_sSelfRelativeURL) == 0))
\r
914 // note: this only works if the log is fetched top-to-bottom
\r
915 // but since we do that, it shouldn't be a problem
\r
916 m_sSelfRelativeURL = cpath->sCopyFromPath;
\r
922 pLogItem->bCopiedSelf = copiedself;
\r
923 pLogItem->tmDate = ttime;
\r
924 pLogItem->sAuthor = author;
\r
925 pLogItem->sDate = date;
\r
926 pLogItem->sShortMessage = MakeShortMessage(message);
\r
927 pLogItem->dwFileChanges = filechanges;
\r
928 pLogItem->actions = actions;
\r
929 pLogItem->haschildren = haschildren;
\r
930 pLogItem->childStackDepth = m_childCounter;
\r
931 m_maxChild = max(m_childCounter, m_maxChild);
\r
934 pLogItem->sBugIDs = m_ProjectProperties.FindBugID(message).Trim();
\r
936 // split multi line log entries and concatenate them
\r
937 // again but this time with \r\n as line separators
\r
938 // so that the edit control recognizes them
\r
941 if (message.GetLength()>0)
\r
943 m_sMessageBuf = message;
\r
944 m_sMessageBuf.Replace(_T("\n\r"), _T("\n"));
\r
945 m_sMessageBuf.Replace(_T("\r\n"), _T("\n"));
\r
946 if (m_sMessageBuf.Right(1).Compare(_T("\n"))==0)
\r
947 m_sMessageBuf = m_sMessageBuf.Left(m_sMessageBuf.GetLength()-1);
\r
950 m_sMessageBuf.Empty();
\r
951 pLogItem->sMessage = m_sMessageBuf;
\r
952 pLogItem->Rev = rev;
\r
954 // move-construct path array
\r
956 pLogItem->pArChangedPaths = new LogChangedPathArray (*cpaths);
\r
957 cpaths->RemoveAll();
\r
959 catch (CException * e)
\r
961 ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR);
\r
963 m_bCancelled = TRUE;
\r
965 m_logEntries.push_back(pLogItem);
\r
966 m_arShownList.Add(pLogItem);
\r
972 //this is the thread function which calls the subversion function
\r
977 void CLogDlg::CopyChangedSelectionToClipBoard()
\r
980 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
982 return; // nothing is selected, get out of here
\r
986 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
989 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
992 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
993 sPaths += m_currentChangedPathList[nItem].GetGitPathString();
\r
994 sPaths += _T("\r\n");
\r
999 // only one revision is selected in the log dialog top pane
\r
1000 // but multiple items could be selected in the changed items list
\r
1001 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
1004 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
1005 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
1007 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
1009 // some items are hidden! So find out which item the user really selected
\r
1010 INT_PTR selRealIndex = -1;
\r
1011 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
1013 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
1015 if (selRealIndex == nItem)
\r
1017 changedlogpath = pLogEntry->pArChangedPaths->GetAt(hiddenindex);
\r
1022 if (changedlogpath)
\r
1024 sPaths += changedlogpath->sPath;
\r
1025 sPaths += _T("\r\n");
\r
1030 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
\r
1034 BOOL CLogDlg::IsDiffPossible(LogChangedPath * changedpath, git_revnum_t rev)
\r
1037 CString added, deleted;
\r
1038 if (changedpath == NULL)
\r
1041 if ((rev > 1)&&(changedpath->action != LOGACTIONS_DELETED))
\r
1043 if (changedpath->action == LOGACTIONS_ADDED) // file is added
\r
1045 if (changedpath->lCopyFromRev == 0)
\r
1046 return FALSE; // but file was not added with history
\r
1054 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
\r
1056 // we have two separate context menus:
\r
1057 // one shown on the log message list control,
\r
1058 // the other shown in the changed-files list control
\r
1059 int selCount = m_LogList.GetSelectedCount();
\r
1060 if (pWnd == &m_LogList)
\r
1062 //ShowContextMenuForRevisions(pWnd, point);
\r
1064 else if (pWnd == &m_ChangedFileListCtrl)
\r
1066 ShowContextMenuForChangedpaths(pWnd, point);
\r
1068 else if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1070 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1071 int selIndex = -1;
\r
1073 selIndex = m_LogList.GetNextSelectedItem(pos);
\r
1074 if ((point.x == -1) && (point.y == -1))
\r
1077 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
\r
1078 ClientToScreen(&rect);
\r
1079 point = rect.CenterPoint();
\r
1081 CString sMenuItemText;
\r
1083 if (popup.CreatePopupMenu())
\r
1085 // add the 'default' entries
\r
1086 sMenuItemText.LoadString(IDS_SCIEDIT_COPY);
\r
1087 popup.AppendMenu(MF_STRING | MF_ENABLED, WM_COPY, sMenuItemText);
\r
1088 sMenuItemText.LoadString(IDS_SCIEDIT_SELECTALL);
\r
1089 popup.AppendMenu(MF_STRING | MF_ENABLED, EM_SETSEL, sMenuItemText);
\r
1091 if (selIndex >= 0)
\r
1093 popup.AppendMenu(MF_SEPARATOR);
\r
1094 sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);
\r
1095 popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);
\r
1098 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
1102 break; // no command selected
\r
1105 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
\r
1107 case CGitLogList::ID_EDITAUTHOR:
\r
1108 EditLogMessage(selIndex);
\r
1116 LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
1119 ASSERT(m_pFindDialog != NULL);
\r
1121 if (m_pFindDialog->IsTerminating())
\r
1123 // invalidate the handle identifying the dialog box.
\r
1124 m_pFindDialog = NULL;
\r
1128 if(m_pFindDialog->FindNext())
\r
1130 //read data from dialog
\r
1131 CString FindText = m_pFindDialog->GetFindString();
\r
1132 bool bMatchCase = (m_pFindDialog->MatchCase() == TRUE);
\r
1133 bool bFound = false;
\r
1135 bool bRegex = ValidateRegexp(FindText, pat, bMatchCase);
\r
1137 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_not_null;
\r
1140 for (i = this->m_nSearchIndex; i<m_arShownList.GetCount()&&!bFound; i++)
\r
1144 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1146 if (regex_search(wstring((LPCTSTR)pLogEntry->sMessage), pat, flags))
\r
1151 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1152 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1154 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1155 if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags))
\r
1161 if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags))
\r
1173 if (m_logEntries[i]->sMessage.Find(FindText) >= 0)
\r
1178 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1179 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1180 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1182 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1183 if (cpath->sCopyFromPath.Find(FindText)>=0)
\r
1189 if (cpath->sPath.Find(FindText)>=0)
\r
1199 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));
\r
1200 CString msg = pLogEntry->sMessage;
\r
1201 msg = msg.MakeLower();
\r
1202 CString find = FindText.MakeLower();
\r
1203 if (msg.Find(find) >= 0)
\r
1208 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
1209 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
1211 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
1212 CString lowerpath = cpath->sCopyFromPath;
\r
1213 lowerpath.MakeLower();
\r
1214 if (lowerpath.Find(find)>=0)
\r
1220 lowerpath = cpath->sPath;
\r
1221 lowerpath.MakeLower();
\r
1222 if (lowerpath.Find(find)>=0)
\r
1231 } // for (i = this->m_nSearchIndex; i<m_arShownList.GetItemCount()&&!bFound; i++)
\r
1234 this->m_nSearchIndex = (i+1);
\r
1235 m_LogList.EnsureVisible(i, FALSE);
\r
1236 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);
\r
1237 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
1238 m_LogList.SetSelectionMark(i);
\r
1239 FillLogMessageCtrl();
\r
1240 UpdateData(FALSE);
\r
1242 if (m_nSearchIndex >= m_arShownList.GetCount())
\r
1243 m_nSearchIndex = (int)m_arShownList.GetCount()-1;
\r
1245 } // if(m_pFindDialog->FindNext())
\r
1246 UpdateLogInfoLabel();
\r
1251 void CLogDlg::OnOK()
\r
1254 // since the log dialog is also used to select revisions for other
\r
1255 // dialogs, we have to do some work before closing this dialog
\r
1256 if (GetFocus() != GetDlgItem(IDOK))
\r
1257 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
\r
1258 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
\r
1259 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
\r
1262 CString buttontext;
\r
1263 GetDlgItemText(IDOK, buttontext);
\r
1264 temp.LoadString(IDS_MSGBOX_CANCEL);
\r
1265 if (temp.Compare(buttontext) != 0)
\r
1266 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
\r
1267 m_bCancelled = TRUE;
\r
1268 m_selectedRevs.Clear();
\r
1269 m_selectedRevsOneRange.Clear();
\r
1270 if (m_pNotifyWindow)
\r
1272 int selIndex = m_LogList.GetSelectionMark();
\r
1273 if (selIndex >= 0)
\r
1275 PLOGENTRYDATA pLogEntry = NULL;
\r
1276 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1277 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1278 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1279 git_revnum_t lowerRev = pLogEntry->Rev;
\r
1280 git_revnum_t higherRev = lowerRev;
\r
1283 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1284 git_revnum_t rev = pLogEntry->Rev;
\r
1285 m_selectedRevs.AddRevision(pLogEntry->Rev);
\r
1286 if (lowerRev > rev)
\r
1288 if (higherRev < rev)
\r
1291 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
\r
1293 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
\r
1295 BOOL bSentMessage = FALSE;
\r
1296 if (m_LogList.GetSelectedCount() == 1)
\r
1298 // if only one revision is selected, check if the path/url with which the dialog was started
\r
1299 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
\r
1300 // if it was copied, use the copy from revision as lowerRev
\r
1301 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
\r
1303 CString sUrl = m_path.GetGitPathString();
\r
1304 if (!m_path.IsUrl())
\r
1306 sUrl = GetURLFromPath(m_path);
\r
1308 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
\r
1309 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
\r
1311 LogChangedPath * pData = pLogEntry->pArChangedPaths->GetAt(cp);
\r
1314 if (sUrl.Compare(pData->sPath) == 0)
\r
1316 if (!pData->sCopyFromPath.IsEmpty())
\r
1318 lowerRev = pData->lCopyFromRev;
\r
1319 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
\r
1320 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
\r
1321 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1322 bSentMessage = TRUE;
\r
1329 if ( !bSentMessage )
\r
1331 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
\r
1332 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
\r
1333 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
\r
1334 if (m_selectedRevsOneRange.GetCount())
\r
1335 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
\r
1340 if (m_bSaveStrict)
\r
1341 m_regLastStrict = m_bStrict;
\r
1342 CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
\r
1343 reg = m_btnShow.GetCurrentEntry();
\r
1344 SaveSplitterPos();
\r
1348 void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
1350 // a double click on an entry in the changed-files list has happened
\r
1353 DiffSelectedFile();
\r
1356 void CLogDlg::DiffSelectedFile()
\r
1359 if (m_bThreadRunning)
\r
1361 UpdateLogInfoLabel();
\r
1362 INT_PTR selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
1365 if (m_ChangedFileListCtrl.GetSelectedCount() == 0)
\r
1367 // find out if there's an entry selected in the log list
\r
1368 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
1369 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1370 git_revnum_t rev1 = pLogEntry->Rev;
\r
1371 git_revnum_t rev2 = rev1;
\r
1376 // there's at least a second entry selected in the log list: several revisions selected!
\r
1377 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
1380 rev1 = max(rev1,(long)pLogEntry->Rev);
\r
1381 rev2 = min(rev2,(long)pLogEntry->Rev);
\r
1385 // now we have both revisions selected in the log list, so we can do a diff of the selected
\r
1386 // entry in the changed files list with these two revisions.
\r
1387 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1392 // nothing or only one revision selected in the log list
\r
1393 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1395 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
1397 // some items are hidden! So find out which item the user really clicked on
\r
1398 INT_PTR selRealIndex = -1;
\r
1399 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
1401 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
1403 if (selRealIndex == selIndex)
\r
1405 selIndex = hiddenindex;
\r
1406 changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1412 if (IsDiffPossible(changedpath, rev1))
\r
1414 // diffs with renamed files are possible
\r
1415 if ((changedpath)&&(!changedpath->sCopyFromPath.IsEmpty()))
\r
1416 rev2 = changedpath->lCopyFromRev;
\r
1419 // if the path was modified but the parent path was 'added with history'
\r
1420 // then we have to use the copy from revision of the parent path
\r
1421 CTGitPath cpath = CTGitPath(changedpath->sPath);
\r
1422 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
1424 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
1425 if (p.IsAncestorOf(cpath))
\r
1427 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
1428 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
1432 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
1436 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1437 CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));
\r
1439 // deleted files must be opened from the revision before the deletion
\r
1440 if (changedpath->action == LOGACTIONS_DELETED)
\r
1442 m_bCancelled = false;
\r
1444 CProgressDlg progDlg;
\r
1445 progDlg.SetTitle(IDS_APPNAME);
\r
1446 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1447 CString sInfoLine;
\r
1448 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)(m_sRepositoryRoot + changedpath->sPath), (LPCTSTR)r.ToString());
\r
1449 progDlg.SetLine(1, sInfoLine, true);
\r
1450 SetAndClearProgressInfo(&progDlg);
\r
1451 progDlg.ShowModeless(m_hWnd);
\r
1453 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))
\r
1455 m_bCancelled = false;
\r
1456 if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), GitRev::REV_HEAD, r, tempfile))
\r
1459 SetAndClearProgressInfo((HWND)NULL);
\r
1460 CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1465 SetAndClearProgressInfo((HWND)NULL);
\r
1467 CString sName1, sName2;
\r
1468 sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1);
\r
1469 sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1-1);
\r
1470 CAppUtils::DiffFlags flags;
\r
1471 flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1472 if (changedpath->action == LOGACTIONS_DELETED)
\r
1473 CAppUtils::StartExtDiff(tempfile, tempfile2, sName2, sName1, flags);
\r
1475 CAppUtils::StartExtDiff(tempfile2, tempfile, sName2, sName1, flags);
\r
1482 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool blame, bool unified)
\r
1484 DialogEnableWindow(IDOK, FALSE);
\r
1485 // SetPromptApp(&theApp);
\r
1486 theApp.DoWaitCursor(1);
\r
1489 GetTempPath(temppath);
\r
1492 file1.Format(_T("%s%s_%s%s"),
\r
1494 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1495 rev1->m_CommitHash.Left(6),
\r
1496 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1499 file2.Format(_T("%s\\%s_%s%s"),
\r
1501 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
\r
1502 rev2->m_CommitHash.Left(6),
\r
1503 (*m_currentChangedArray)[selIndex].GetFileExtension());
\r
1507 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1508 g_Git.RunLogFile(cmd,file1);
\r
1509 cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());
\r
1510 g_Git.RunLogFile(cmd,file2);
\r
1512 CAppUtils::DiffFlags flags;
\r
1513 CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),flags);
\r
1516 //get the filename
\r
1518 if (Git::PathIsURL(m_path))
\r
1520 filepath = m_path.GetGitPathString();
\r
1524 filepath = GetURLFromPath(m_path);
\r
1525 if (filepath.IsEmpty())
\r
1527 theApp.DoWaitCursor(-1);
\r
1529 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1530 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1531 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1533 theApp.DoWaitCursor(-11);
\r
1537 m_bCancelled = FALSE;
\r
1538 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1540 CString firstfile, secondfile;
\r
1541 if (m_LogList.GetSelectedCount()==1)
\r
1543 int s = m_LogList.GetSelectionMark();
\r
1544 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(s));
\r
1545 LogChangedPath * changedpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
1546 firstfile = changedpath->sPath;
\r
1547 secondfile = firstfile;
\r
1548 if ((rev2 == rev1-1)&&(changedpath->lCopyFromRev > 0)) // is it an added file with history?
\r
1550 secondfile = changedpath->sCopyFromPath;
\r
1551 rev2 = changedpath->lCopyFromRev;
\r
1556 firstfile = m_currentChangedPathList[selIndex].GetGitPathString();
\r
1557 secondfile = firstfile;
\r
1560 firstfile = filepath + firstfile.Trim();
\r
1561 secondfile = filepath + secondfile.Trim();
\r
1563 GitDiff diff(this, this->m_hWnd, true);
\r
1564 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
1565 diff.SetHEADPeg(m_LogRevision);
\r
1568 if (PromptShown())
\r
1569 diff.ShowUnifiedDiff(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1);
\r
1571 CAppUtils::StartShowUnifiedDiff(m_hWnd, CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), m_LogRevision);
\r
1575 if (diff.ShowCompare(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), false, blame))
\r
1577 if (firstfile.Compare(secondfile)==0)
\r
1579 git_revnum_t baseRev = 0;
\r
1580 diff.DiffProps(CTGitPath(firstfile), rev2, rev1, baseRev);
\r
1587 theApp.DoWaitCursor(-1);
\r
1591 BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, git_revnum_t rev)
\r
1594 DialogEnableWindow(IDOK, FALSE);
\r
1595 SetPromptApp(&theApp);
\r
1596 theApp.DoWaitCursor(1);
\r
1598 if (Git::PathIsURL(m_path))
\r
1600 filepath = m_path.GetGitPathString();
\r
1604 filepath = GetURLFromPath(m_path);
\r
1605 if (filepath.IsEmpty())
\r
1607 theApp.DoWaitCursor(-1);
\r
1609 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
1610 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
1611 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
1616 m_bCancelled = false;
\r
1617 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
1618 filepath += changedpath;
\r
1620 CProgressDlg progDlg;
\r
1621 progDlg.SetTitle(IDS_APPNAME);
\r
1622 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
1623 CString sInfoLine;
\r
1624 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)GitRev(rev).ToString());
\r
1625 progDlg.SetLine(1, sInfoLine, true);
\r
1626 SetAndClearProgressInfo(&progDlg);
\r
1627 progDlg.ShowModeless(m_hWnd);
\r
1629 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(filepath), rev);
\r
1630 m_bCancelled = false;
\r
1631 if (!Cat(CTGitPath(filepath), GitRev(rev), rev, tempfile))
\r
1634 SetAndClearProgressInfo((HWND)NULL);
\r
1635 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1637 theApp.DoWaitCursor(-1);
\r
1641 SetAndClearProgressInfo((HWND)NULL);
\r
1642 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
1645 int ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
\r
1646 if (ret <= HINSTANCE_ERROR)
\r
1651 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
1652 cmd += tempfile.GetWinPathString() + _T(" ");
\r
1653 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
1656 theApp.DoWaitCursor(-1);
\r
1661 void CLogDlg::EditAuthor(const CLogDataVector& logs)
\r
1666 if (logs.size() == 0)
\r
1668 DialogEnableWindow(IDOK, FALSE);
\r
1669 SetPromptApp(&theApp);
\r
1670 theApp.DoWaitCursor(1);
\r
1671 if (Git::PathIsURL(m_path))
\r
1672 url = m_path.GetGitPathString();
\r
1675 url = GetURLFromPath(m_path);
\r
1677 name = Git_PROP_REVISION_AUTHOR;
\r
1679 CString value = RevPropertyGet(name, CTGitPath(url), logs[0]->Rev);
\r
1680 CString sOldValue = value;
\r
1681 value.Replace(_T("\n"), _T("\r\n"));
\r
1682 CInputDlg dlg(this);
\r
1683 dlg.m_sHintText.LoadString(IDS_LOG_AUTHOR);
\r
1684 dlg.m_sInputText = value;
\r
1685 dlg.m_sTitle.LoadString(IDS_LOG_AUTHOREDITTITLE);
\r
1686 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1687 dlg.m_bUseLogWidth = false;
\r
1688 if (dlg.DoModal() == IDOK)
\r
1690 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1692 LogCache::CCachedLogInfo* toUpdate
\r
1693 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1695 CProgressDlg progDlg;
\r
1696 progDlg.SetTitle(IDS_APPNAME);
\r
1697 progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
\r
1698 progDlg.SetTime(true);
\r
1699 progDlg.SetShowProgressBar(true);
\r
1700 progDlg.ShowModeless(m_hWnd);
\r
1701 for (DWORD i=0; i<logs.size(); ++i)
\r
1703 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), logs[i]->Rev))
\r
1706 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1712 logs[i]->sAuthor = dlg.m_sInputText;
\r
1713 m_LogList.Invalidate();
\r
1715 // update the log cache
\r
1717 if (toUpdate != NULL)
\r
1719 // log caching is active
\r
1721 LogCache::CCachedLogInfo newInfo;
\r
1722 newInfo.Insert ( logs[i]->Rev
\r
1723 , (const char*) CUnicodeUtils::GetUTF8 (logs[i]->sAuthor)
\r
1726 , LogCache::CRevisionInfoContainer::HAS_AUTHOR);
\r
1728 toUpdate->Update (newInfo);
\r
1731 progDlg.SetProgress64(i, logs.size());
\r
1735 theApp.DoWaitCursor(-1);
\r
1740 void CLogDlg::EditLogMessage(int index)
\r
1745 DialogEnableWindow(IDOK, FALSE);
\r
1746 SetPromptApp(&theApp);
\r
1747 theApp.DoWaitCursor(1);
\r
1748 if (Git::PathIsURL(m_path))
\r
1749 url = m_path.GetGitPathString();
\r
1752 url = GetURLFromPath(m_path);
\r
1754 name = Git_PROP_REVISION_LOG;
\r
1756 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(index));
\r
1757 m_bCancelled = FALSE;
\r
1758 CString value = RevPropertyGet(name, CTGitPath(url), pLogEntry->Rev);
\r
1759 CString sOldValue = value;
\r
1760 value.Replace(_T("\n"), _T("\r\n"));
\r
1761 CInputDlg dlg(this);
\r
1762 dlg.m_sHintText.LoadString(IDS_LOG_MESSAGE);
\r
1763 dlg.m_sInputText = value;
\r
1764 dlg.m_sTitle.LoadString(IDS_LOG_MESSAGEEDITTITLE);
\r
1765 dlg.m_pProjectProperties = &m_ProjectProperties;
\r
1766 dlg.m_bUseLogWidth = true;
\r
1767 if (dlg.DoModal() == IDOK)
\r
1769 dlg.m_sInputText.Replace(_T("\r"), _T(""));
\r
1770 if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), pLogEntry->Rev))
\r
1772 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
1776 pLogEntry->sShortMessage = MakeShortMessage(dlg.m_sInputText);
\r
1777 // split multi line log entries and concatenate them
\r
1778 // again but this time with \r\n as line separators
\r
1779 // so that the edit control recognizes them
\r
1780 if (dlg.m_sInputText.GetLength()>0)
\r
1782 m_sMessageBuf = dlg.m_sInputText;
\r
1783 dlg.m_sInputText.Replace(_T("\n\r"), _T("\n"));
\r
1784 dlg.m_sInputText.Replace(_T("\r\n"), _T("\n"));
\r
1785 if (dlg.m_sInputText.Right(1).Compare(_T("\n"))==0)
\r
1786 dlg.m_sInputText = dlg.m_sInputText.Left(dlg.m_sInputText.GetLength()-1);
\r
1789 dlg.m_sInputText.Empty();
\r
1790 pLogEntry->sMessage = dlg.m_sInputText;
\r
1791 pLogEntry->sBugIDs = m_ProjectProperties.FindBugID(dlg.m_sInputText);
\r
1792 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
\r
1793 pMsgView->SetWindowText(_T(" "));
\r
1794 pMsgView->SetWindowText(dlg.m_sInputText);
\r
1795 m_ProjectProperties.FindBugID(dlg.m_sInputText, pMsgView);
\r
1796 m_LogList.Invalidate();
\r
1798 // update the log cache
\r
1800 LogCache::CCachedLogInfo* toUpdate
\r
1801 = GetLogCache (CTGitPath (m_sRepositoryRoot));
\r
1802 if (toUpdate != NULL)
\r
1804 // log caching is active
\r
1806 LogCache::CCachedLogInfo newInfo;
\r
1807 newInfo.Insert ( pLogEntry->Rev
\r
1809 , (const char*) CUnicodeUtils::GetUTF8 (pLogEntry->sMessage)
\r
1811 , LogCache::CRevisionInfoContainer::HAS_COMMENT);
\r
1813 toUpdate->Update (newInfo);
\r
1817 theApp.DoWaitCursor(-1);
\r
1822 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
\r
1824 // Skip Ctrl-C when copying text out of the log message or search filter
\r
1825 BOOL bSkipAccelerator = ( pMsg->message == WM_KEYDOWN && pMsg->wParam=='C' && (GetFocus()==GetDlgItem(IDC_MSGVIEW) || GetFocus()==GetDlgItem(IDC_SEARCHEDIT) ) && GetKeyState(VK_CONTROL)&0x8000 );
\r
1826 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
\r
1828 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
\r
1830 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))
\r
1832 DiffSelectedRevWithPrevious();
\r
1836 if (GetFocus()==GetDlgItem(IDC_LOGMSG))
\r
1838 DiffSelectedFile();
\r
1842 if (m_hAccel && !bSkipAccelerator)
\r
1844 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
\r
1849 m_tooltips.RelayEvent(pMsg);
\r
1850 return __super::PreTranslateMessage(pMsg);
\r
1854 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
1856 if (this->IsThreadRunning())
\r
1858 // only show the wait cursor over the list control
\r
1860 ((pWnd == GetDlgItem(IDC_LOGLIST))||
\r
1861 (pWnd == GetDlgItem(IDC_MSGVIEW))||
\r
1862 (pWnd == GetDlgItem(IDC_LOGMSG))))
\r
1864 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
1869 if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))
\r
1870 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1872 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
1874 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
1877 void CLogDlg::OnBnClickedHelp()
\r
1882 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1884 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1886 if (this->IsThreadRunning())
\r
1888 if (pNMLV->iItem >= 0)
\r
1890 m_nSearchIndex = pNMLV->iItem;
\r
1891 if (pNMLV->iSubItem != 0)
\r
1893 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount())&&(m_bStrict)&&(1/*m_bStrictStopped*/))
\r
1895 // remove the selected state
\r
1896 if (pNMLV->uChanged & LVIF_STATE)
\r
1898 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
\r
1899 FillLogMessageCtrl();
\r
1900 UpdateData(FALSE);
\r
1901 UpdateLogInfoLabel();
\r
1905 if (pNMLV->uChanged & LVIF_STATE)
\r
1907 FillLogMessageCtrl();
\r
1908 UpdateData(FALSE);
\r
1913 FillLogMessageCtrl();
\r
1914 UpdateData(FALSE);
\r
1917 UpdateLogInfoLabel();
\r
1920 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
\r
1922 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
\r
1923 if (pEnLink->msg == WM_LBUTTONUP)
\r
1926 GetDlgItemText(IDC_MSGVIEW, msg);
\r
1927 msg.Replace(_T("\r\n"), _T("\n"));
\r
1928 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
\r
1929 if (!::PathIsURL(url))
\r
1931 url = m_ProjectProperties.GetBugIDUrl(url);
\r
1932 url = GetAbsoluteUrlFromRelativeUrl(url);
\r
1934 if (!url.IsEmpty())
\r
1935 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
1940 void CLogDlg::OnBnClickedStatbutton()
\r
1943 if (m_bThreadRunning)
\r
1945 if (m_arShownList.IsEmpty())
\r
1946 return; // nothing is shown, so no statistics.
\r
1947 // the statistics dialog expects the log entries to be sorted by date
\r
1948 SortByColumn(3, false);
\r
1949 CPtrArray shownlist;
\r
1950 RecalculateShownList(&shownlist);
\r
1951 // create arrays which are aware of the current filter
\r
1952 CStringArray m_arAuthorsFiltered;
\r
1953 CDWordArray m_arDatesFiltered;
\r
1954 CDWordArray m_arFileChangesFiltered;
\r
1955 for (INT_PTR i=0; i<shownlist.GetCount(); ++i)
\r
1957 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(shownlist.GetAt(i));
\r
1958 CString strAuthor = pLogEntry->sAuthor;
\r
1959 if ( strAuthor.IsEmpty() )
\r
1961 strAuthor.LoadString(IDS_STATGRAPH_EMPTYAUTHOR);
\r
1963 m_arAuthorsFiltered.Add(strAuthor);
\r
1964 m_arDatesFiltered.Add(static_cast<DWORD>(pLogEntry->tmDate));
\r
1965 m_arFileChangesFiltered.Add(pLogEntry->dwFileChanges);
\r
1967 CStatGraphDlg dlg;
\r
1968 dlg.m_parAuthors = &m_arAuthorsFiltered;
\r
1969 dlg.m_parDates = &m_arDatesFiltered;
\r
1970 dlg.m_parFileChanges = &m_arFileChangesFiltered;
\r
1971 dlg.m_path = m_path;
\r
1973 // restore the previous sorting
\r
1974 SortByColumn(m_nSortColumn, m_bAscending);
\r
1975 OnTimer(LOGFILTER_TIMER);
\r
1980 void CLogDlg::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
1983 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
1984 // Take the default processing unless we set this to something else below.
\r
1985 *pResult = CDRF_DODEFAULT;
\r
1987 if (m_bNoDispUpdates)
\r
1990 switch (pLVCD->nmcd.dwDrawStage)
\r
1992 case CDDS_PREPAINT:
\r
1994 *pResult = CDRF_NOTIFYITEMDRAW;
\r
1998 case CDDS_ITEMPREPAINT:
\r
2000 // This is the prepaint stage for an item. Here's where we set the
\r
2001 // item's text color.
\r
2003 // Tell Windows to send draw notifications for each subitem.
\r
2004 *pResult = CDRF_NOTIFYSUBITEMDRAW;
\r
2006 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
2008 if (m_arShownList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
2010 GitRev* data = (GitRev*)m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec);
\r
2014 if (data->bCopiedSelf)
\r
2016 // only change the background color if the item is not 'hot' (on vista with themes enabled)
\r
2017 if (!theme.IsAppThemed() || !m_bVista || ((pLVCD->nmcd.uItemState & CDIS_HOT)==0))
\r
2018 pLVCD->clrTextBk = GetSysColor(COLOR_MENU);
\r
2021 if (data->bCopies)
\r
2022 crText = m_Colors.GetColor(CColors::Modified);
\r
2024 // if ((data->childStackDepth)||(m_mergedRevs.find(data->Rev) != m_mergedRevs.end()))
\r
2025 // crText = GetSysColor(COLOR_GRAYTEXT);
\r
2026 // if (data->Rev == m_wcRev)
\r
2028 // SelectObject(pLVCD->nmcd.hdc, m_boldFont);
\r
2029 // We changed the font, so we're returning CDRF_NEWFONT. This
\r
2030 // tells the control to recalculate the extent of the text.
\r
2031 // *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;
\r
2035 if (m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
2037 if (m_bStrictStopped)
\r
2038 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2040 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
2041 pLVCD->clrText = crText;
\r
2045 case CDDS_ITEMPREPAINT|CDDS_ITEM|CDDS_SUBITEM:
\r
2047 if ((m_bStrictStopped)&&(m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
2049 pLVCD->nmcd.uItemState &= ~(CDIS_SELECTED|CDIS_FOCUS);
\r
2051 if (pLVCD->iSubItem == 1)
\r
2053 *pResult = CDRF_DODEFAULT;
\r
2055 if (m_arShownList.GetCount() <= (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
2059 int iconwidth = ::GetSystemMetrics(SM_CXSMICON);
\r
2060 int iconheight = ::GetSystemMetrics(SM_CYSMICON);
\r
2062 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec));
\r
2064 // Get the selected state of the
\r
2065 // item being drawn.
\r
2067 SecureZeroMemory(&rItem, sizeof(LVITEM));
\r
2068 rItem.mask = LVIF_STATE;
\r
2069 rItem.iItem = pLVCD->nmcd.dwItemSpec;
\r
2070 rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
\r
2071 m_LogList.GetItem(&rItem);
\r
2074 m_LogList.GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);
\r
2076 // Fill the background
\r
2077 if (theme.IsAppThemed() && m_bVista)
\r
2079 theme.Open(m_hWnd, L"Explorer");
\r
2080 int state = LISS_NORMAL;
\r
2081 if (rItem.state & LVIS_SELECTED)
\r
2083 if (::GetFocus() == m_LogList.m_hWnd)
\r
2084 state |= LISS_SELECTED;
\r
2086 state |= LISS_SELECTEDNOTFOCUS;
\r
2091 if (pLogEntry->bCopiedSelf)
\r
2093 // unfortunately, the pLVCD->nmcd.uItemState does not contain valid
\r
2094 // information at this drawing stage. But we can check the whether the
\r
2095 // previous stage changed the background color of the item
\r
2096 if (pLVCD->clrTextBk == GetSysColor(COLOR_MENU))
\r
2099 brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
2102 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
2103 ::DeleteObject(brush);
\r
2110 if (theme.IsBackgroundPartiallyTransparent(LVP_LISTDETAIL, state))
\r
2111 theme.DrawParentBackground(m_hWnd, pLVCD->nmcd.hdc, &rect);
\r
2113 theme.DrawBackground(pLVCD->nmcd.hdc, LVP_LISTDETAIL, state, &rect, NULL);
\r
2118 if (rItem.state & LVIS_SELECTED)
\r
2120 if (::GetFocus() == m_LogList.m_hWnd)
\r
2121 brush = ::CreateSolidBrush(::GetSysColor(COLOR_HIGHLIGHT));
\r
2123 brush = ::CreateSolidBrush(::GetSysColor(COLOR_BTNFACE));
\r
2127 //if (pLogEntry->bCopiedSelf)
\r
2128 // brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));
\r
2130 brush = ::CreateSolidBrush(::GetSysColor(COLOR_WINDOW));
\r
2132 if (brush == NULL)
\r
2135 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);
\r
2136 ::DeleteObject(brush);
\r
2139 // Draw the icon(s) into the compatible DC
\r
2140 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
2141 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left + ICONITEMBORDER, rect.top, m_hModifiedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2144 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
2145 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hAddedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2148 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
2149 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hDeletedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2152 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
2153 ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hReplacedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);
\r
2155 *pResult = CDRF_SKIPDEFAULT;
\r
2161 *pResult = CDRF_DODEFAULT;
\r
2166 void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2169 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
2170 // Take the default processing unless we set this to something else below.
\r
2171 *pResult = CDRF_DODEFAULT;
\r
2173 // if (m_bNoDispUpdates)
\r
2176 // First thing - check the draw stage. If it's the control's prepaint
\r
2177 // stage, then tell Windows we want messages for every item.
\r
2179 if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2181 *pResult = CDRF_NOTIFYITEMDRAW;
\r
2183 else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
\r
2185 // This is the prepaint stage for an item. Here's where we set the
\r
2186 // item's text color. Our return value will tell Windows to draw the
\r
2187 // item itself, but it will use the new color we set here.
\r
2189 // Tell Windows to paint the control itself.
\r
2190 *pResult = CDRF_DODEFAULT;
\r
2192 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
2193 bool bGrayed = false;
\r
2195 if ((m_cHidePaths.GetState() & 0x0003)==BST_INDETERMINATE)
\r
2197 if ((m_currentChangedArray)&&((m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)))
\r
2199 //if ((*m_currentChangedArray)[(pLVCD->nmcd.dwItemSpec)]sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2201 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2205 else if (m_currentChangedPathList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)
\r
2207 //if (m_currentChangedPathList[pLVCD->nmcd.dwItemSpec].GetGitPathString().Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)
\r
2209 crText = GetSysColor(COLOR_GRAYTEXT);
\r
2216 if ((!bGrayed)&&(m_currentChangedArray)&&(m_currentChangedArray->GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec))
\r
2218 DWORD action = ((*m_currentChangedArray)[pLVCD->nmcd.dwItemSpec]).m_Action;
\r
2219 if (action == CTGitPath::LOGACTIONS_MODIFIED)
\r
2220 crText = m_Colors.GetColor(CColors::Modified);
\r
2221 if (action == CTGitPath::LOGACTIONS_REPLACED)
\r
2222 crText = m_Colors.GetColor(CColors::Deleted);
\r
2223 if (action == CTGitPath::LOGACTIONS_ADDED)
\r
2224 crText = m_Colors.GetColor(CColors::Added);
\r
2225 if (action == CTGitPath::LOGACTIONS_DELETED)
\r
2226 crText = m_Colors.GetColor(CColors::Deleted);
\r
2229 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
2230 pLVCD->clrText = crText;
\r
2234 void CLogDlg::DoSizeV1(int delta)
\r
2237 RemoveAnchor(IDC_LOGLIST);
\r
2238 RemoveAnchor(IDC_SPLITTERTOP);
\r
2239 RemoveAnchor(IDC_MSGVIEW);
\r
2240 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2241 RemoveAnchor(IDC_LOGMSG);
\r
2242 CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);
\r
2243 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);
\r
2244 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2245 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2246 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2247 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2248 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2251 SetSplitterRange();
\r
2252 m_LogList.Invalidate();
\r
2253 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2257 void CLogDlg::DoSizeV2(int delta)
\r
2260 RemoveAnchor(IDC_LOGLIST);
\r
2261 RemoveAnchor(IDC_SPLITTERTOP);
\r
2262 RemoveAnchor(IDC_MSGVIEW);
\r
2263 RemoveAnchor(IDC_SPLITTERBOTTOM);
\r
2264 RemoveAnchor(IDC_LOGMSG);
\r
2265 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);
\r
2266 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);
\r
2267 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
\r
2268 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
\r
2269 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
\r
2270 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2271 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
2274 SetSplitterRange();
\r
2275 GetDlgItem(IDC_MSGVIEW)->Invalidate();
\r
2276 m_ChangedFileListCtrl.Invalidate();
\r
2280 void CLogDlg::AdjustMinSize()
\r
2282 // adjust the minimum size of the dialog to prevent the resizing from
\r
2283 // moving the list control too far down.
\r
2284 CRect rcChgListView;
\r
2285 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
\r
2287 m_LogList.GetClientRect(rcLogList);
\r
2289 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
\r
2290 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
\r
2291 +rcChgListView.Height()+rcLogList.Height()+60));
\r
2294 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
2296 switch (message) {
\r
2298 if (wParam == IDC_SPLITTERTOP)
\r
2300 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2301 DoSizeV1(pHdr->delta);
\r
2303 else if (wParam == IDC_SPLITTERBOTTOM)
\r
2305 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
2306 DoSizeV2(pHdr->delta);
\r
2311 return CResizableDialog::DefWindowProc(message, wParam, lParam);
\r
2314 void CLogDlg::SetSplitterRange()
\r
2316 if ((m_LogList)&&(m_ChangedFileListCtrl))
\r
2319 m_LogList.GetWindowRect(rcTop);
\r
2320 ScreenToClient(rcTop);
\r
2322 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);
\r
2323 ScreenToClient(rcMiddle);
\r
2324 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);
\r
2326 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
\r
2327 ScreenToClient(rcBottom);
\r
2328 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);
\r
2332 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
\r
2334 RECT * rect = (LPRECT)lParam;
\r
2337 point = CPoint(rect->left, rect->bottom);
\r
2338 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))
\r
2340 if (popup.CreatePopupMenu())
\r
2342 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2343 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ALL), LOGFILTER_ALL, temp);
\r
2345 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2347 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2348 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
\r
2349 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2350 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
\r
2351 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2352 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
\r
2353 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2354 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
\r
2355 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
\r
2356 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
\r
2358 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
2360 temp.LoadString(IDS_LOG_FILTER_REGEX);
\r
2361 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
\r
2364 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2365 if (selection != 0)
\r
2368 if (selection == LOGFILTER_REGEX)
\r
2370 m_bFilterWithRegex = !m_bFilterWithRegex;
\r
2371 CRegDWORD b = CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);
\r
2372 b = m_bFilterWithRegex;
\r
2373 CheckRegexpTooltip();
\r
2377 m_nSelectedFilter = selection;
\r
2378 SetFilterCueText();
\r
2380 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2386 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
2389 KillTimer(LOGFILTER_TIMER);
\r
2391 m_sFilterText.Empty();
\r
2392 UpdateData(FALSE);
\r
2393 theApp.DoWaitCursor(1);
\r
2394 CStoreSelection storeselection(this);
\r
2395 FillLogMessageCtrl(false);
\r
2396 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
2397 m_arShownList.RemoveAll();
\r
2399 // reset the time filter too
\r
2400 m_timFrom = (__time64_t(m_tFrom));
\r
2401 m_timTo = (__time64_t(m_tTo));
\r
2402 m_DateFrom.SetTime(&m_timFrom);
\r
2403 m_DateTo.SetTime(&m_timTo);
\r
2404 m_DateFrom.SetRange(&m_timFrom, &m_timTo);
\r
2405 m_DateTo.SetRange(&m_timFrom, &m_timTo);
\r
2407 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
2409 m_arShownList.Add(m_logEntries[i]);
\r
2411 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
2412 m_LogList.DeleteAllItems();
\r
2413 m_LogList.SetItemCountEx(ShownCountWithStopped());
\r
2414 m_LogList.RedrawItems(0, ShownCountWithStopped());
\r
2415 m_LogList.SetRedraw(false);
\r
2416 ResizeAllListCtrlCols();
\r
2417 m_LogList.SetRedraw(true);
\r
2418 theApp.DoWaitCursor(-1);
\r
2419 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2420 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2421 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2422 UpdateLogInfoLabel();
\r
2428 void CLogDlg::SetFilterCueText()
\r
2431 switch (m_nSelectedFilter)
\r
2433 case LOGFILTER_ALL:
\r
2434 temp.LoadString(IDS_LOG_FILTER_ALL);
\r
2436 case LOGFILTER_MESSAGES:
\r
2437 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
\r
2439 case LOGFILTER_PATHS:
\r
2440 temp.LoadString(IDS_LOG_FILTER_PATHS);
\r
2442 case LOGFILTER_AUTHORS:
\r
2443 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
\r
2445 case LOGFILTER_REVS:
\r
2446 temp.LoadString(IDS_LOG_FILTER_REVS);
\r
2449 // to make the cue banner text appear more to the right of the edit control
\r
2450 temp = _T(" ")+temp;
\r
2451 m_cFilter.SetCueBanner(temp);
\r
2454 void CLogDlg::OnLvnGetdispinfoLoglist(NMHDR *pNMHDR, LRESULT *pResult)
\r
2456 NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);
\r
2458 // Create a pointer to the item
\r
2459 LV_ITEM* pItem = &(pDispInfo)->item;
\r
2461 // Do the list need text information?
\r
2462 if (!(pItem->mask & LVIF_TEXT))
\r
2465 // By default, clear text buffer.
\r
2466 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2468 bool bOutOfRange = pItem->iItem >= ShownCountWithStopped();
\r
2471 if (m_bNoDispUpdates || m_bThreadRunning || bOutOfRange)
\r
2474 // Which item number?
\r
2475 int itemid = pItem->iItem;
\r
2476 GitRev * pLogEntry = NULL;
\r
2477 if (itemid < m_arShownList.GetCount())
\r
2478 pLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(pItem->iItem));
\r
2481 switch (pItem->iSubItem)
\r
2483 case this->LOGLIST_GRAPH: //Graphic
\r
2488 case this->LOGLIST_ACTION: //action -- no text in the column
\r
2490 case this->LOGLIST_MESSAGE: //Message
\r
2492 lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_Subject, pItem->cchTextMax);
\r
2494 case this->LOGLIST_AUTHOR: //Author
\r
2496 lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_AuthorName, pItem->cchTextMax);
\r
2498 case this->LOGLIST_DATE: //Date
\r
2500 lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_AuthorDate.Format(_T("%Y-%m-%d %H:%M")), pItem->cchTextMax);
\r
2511 void CLogDlg::OnLvnGetdispinfoChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
2515 NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);
\r
2517 //Create a pointer to the item
\r
2518 LV_ITEM* pItem= &(pDispInfo)->item;
\r
2521 if ((m_bNoDispUpdates)||(m_bThreadRunning))
\r
2523 if (pItem->mask & LVIF_TEXT)
\r
2524 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2527 if ((m_currentChangedArray!=NULL)&&(pItem->iItem >= m_currentChangedArray->GetCount()))
\r
2529 if (pItem->mask & LVIF_TEXT)
\r
2530 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2533 if ((m_currentChangedArray==NULL)&&(pItem->iItem >= m_currentChangedPathList.GetCount()))
\r
2535 if (pItem->mask & LVIF_TEXT)
\r
2536 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2539 CTGitPath lcpath = NULL;
\r
2540 if (m_currentChangedArray)
\r
2541 lcpath = (*m_currentChangedArray)[pItem->iItem];
\r
2542 //Does the list need text information?
\r
2543 if (pItem->mask & LVIF_TEXT)
\r
2546 switch (pItem->iSubItem)
\r
2548 case this->FILELIST_ACTION: //Action
\r
2551 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath->GetAction(), pItem->cchTextMax);
\r
2553 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2555 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.GetActionName(), pItem->cchTextMax);
\r
2559 case this->FILELIST_ADD: //add
\r
2562 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath->sPath, pItem->cchTextMax);
\r
2564 lstrcpyn(pItem->pszText, (LPCTSTR)m_currentChangedPathList[pItem->iItem].GetGitPathString(), pItem->cchTextMax);
\r
2566 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.m_StatAdd, pItem->cchTextMax);
\r
2569 case this->FILELIST_DEL: //del
\r
2572 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath->sCopyFromPath, pItem->cchTextMax);
\r
2574 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2576 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.m_StatDel, pItem->cchTextMax);
\r
2578 case this->FILELIST_PATH: //path
\r
2580 if ((lcpath==NULL)||(lcpath->sCopyFromPath.IsEmpty()))
\r
2581 lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);
\r
2583 _stprintf_s(pItem->pszText, pItem->cchTextMax, _T("%ld"), lcpath->lCopyFromRev);
\r
2585 lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.GetGitPathString(), pItem->cchTextMax);
\r
2593 void CLogDlg::OnEnChangeSearchedit()
\r
2597 if (m_sFilterText.IsEmpty())
\r
2599 CStoreSelection storeselection(this);
\r
2600 // clear the filter, i.e. make all entries appear
\r
2601 theApp.DoWaitCursor(1);
\r
2602 KillTimer(LOGFILTER_TIMER);
\r
2603 FillLogMessageCtrl(false);
\r
2604 InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
2605 m_arShownList.RemoveAll();
\r
2606 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
2608 if (IsEntryInDateRange(i))
\r
2609 m_arShownList.Add(m_logEntries[i]);
\r
2611 InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
2612 m_LogList.DeleteAllItems();
\r
2613 m_LogList.SetItemCountEx(ShownCountWithStopped());
\r
2614 m_LogList.RedrawItems(0, ShownCountWithStopped());
\r
2615 m_LogList.SetRedraw(false);
\r
2616 ResizeAllListCtrlCols();
\r
2617 m_LogList.SetRedraw(true);
\r
2618 theApp.DoWaitCursor(-1);
\r
2619 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2620 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2621 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2622 DialogEnableWindow(IDC_STATBUTTON, !(((m_bThreadRunning)||(m_arShownList.IsEmpty()))));
\r
2625 if (Validate(m_sFilterText))
\r
2626 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2628 KillTimer(LOGFILTER_TIMER);
\r
2632 bool CLogDlg::ValidateRegexp(LPCTSTR regexp_str, tr1::wregex& pat, bool bMatchCase /* = false */)
\r
2636 tr1::regex_constants::syntax_option_type type = tr1::regex_constants::ECMAScript;
\r
2638 type |= tr1::regex_constants::icase;
\r
2639 pat = tr1::wregex(regexp_str, type);
\r
2642 catch (exception) {}
\r
2646 bool CLogDlg::Validate(LPCTSTR string)
\r
2648 if (!m_bFilterWithRegex)
\r
2651 return ValidateRegexp(string, pat, false);
\r
2654 void CLogDlg::RecalculateShownList(CPtrArray * pShownlist)
\r
2657 pShownlist->RemoveAll();
\r
2658 tr1::wregex pat;//(_T("Remove"), tr1::regex_constants::icase);
\r
2659 bool bRegex = false;
\r
2660 if (m_bFilterWithRegex)
\r
2661 bRegex = ValidateRegexp(m_sFilterText, pat, false);
\r
2663 tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_any;
\r
2665 for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
2667 if ((bRegex)&&(m_bFilterWithRegex))
\r
2669 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_BUGID))
\r
2671 ATLTRACE(_T("bugID = \"%s\"\n"), (LPCTSTR)m_logEntries[i]->sBugIDs);
\r
2672 if (regex_search(wstring((LPCTSTR)m_logEntries[i]->sBugIDs), pat, flags)&&IsEntryInDateRange(i))
\r
2674 pShownlist->Add(m_logEntries[i]);
\r
2678 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_MESSAGES))
\r
2680 ATLTRACE(_T("messge = \"%s\"\n"), (LPCTSTR)m_logEntries[i]->sMessage);
\r
2681 if (regex_search(wstring((LPCTSTR)m_logEntries[i]->sMessage), pat, flags)&&IsEntryInDateRange(i))
\r
2683 pShownlist->Add(m_logEntries[i]);
\r
2687 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_PATHS))
\r
2689 LogChangedPathArray * cpatharray = m_logEntries[i]->pArChangedPaths;
\r
2691 bool bGoing = true;
\r
2692 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount() && bGoing; ++cpPathIndex)
\r
2694 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2695 if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags)&&IsEntryInDateRange(i))
\r
2697 pShownlist->Add(m_logEntries[i]);
\r
2701 if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags)&&IsEntryInDateRange(i))
\r
2703 pShownlist->Add(m_logEntries[i]);
\r
2707 if (regex_search(wstring((LPCTSTR)cpath->GetAction()), pat, flags)&&IsEntryInDateRange(i))
\r
2709 pShownlist->Add(m_logEntries[i]);
\r
2717 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_AUTHORS))
\r
2719 if (regex_search(wstring((LPCTSTR)m_logEntries[i]->sAuthor), pat, flags)&&IsEntryInDateRange(i))
\r
2721 pShownlist->Add(m_logEntries[i]);
\r
2725 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_REVS))
\r
2727 sRev.Format(_T("%ld"), m_logEntries[i]->Rev);
\r
2728 if (regex_search(wstring((LPCTSTR)sRev), pat, flags)&&IsEntryInDateRange(i))
\r
2730 pShownlist->Add(m_logEntries[i]);
\r
2737 CString find = m_sFilterText;
\r
2739 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_BUGID))
\r
2741 CString sBugIDs = m_logEntries[i]->sBugIDs;
\r
2743 sBugIDs = sBugIDs.MakeLower();
\r
2744 if ((sBugIDs.Find(find) >= 0)&&(IsEntryInDateRange(i)))
\r
2746 pShownlist->Add(m_logEntries[i]);
\r
2750 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_MESSAGES))
\r
2752 CString msg = m_logEntries[i]->sMessage;
\r
2754 msg = msg.MakeLower();
\r
2755 if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i)))
\r
2757 pShownlist->Add(m_logEntries[i]);
\r
2761 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_PATHS))
\r
2763 LogChangedPathArray * cpatharray = m_logEntries[i]->pArChangedPaths;
\r
2765 bool bGoing = true;
\r
2766 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount() && bGoing; ++cpPathIndex)
\r
2768 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2769 CString path = cpath->sCopyFromPath;
\r
2771 if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))
\r
2773 pShownlist->Add(m_logEntries[i]);
\r
2777 path = cpath->sPath;
\r
2779 if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))
\r
2781 pShownlist->Add(m_logEntries[i]);
\r
2785 path = cpath->GetAction();
\r
2787 if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))
\r
2789 pShownlist->Add(m_logEntries[i]);
\r
2795 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_AUTHORS))
\r
2797 CString msg = m_logEntries[i]->sAuthor;
\r
2798 msg = msg.MakeLower();
\r
2799 if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i)))
\r
2801 pShownlist->Add(m_logEntries[i]);
\r
2805 if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_REVS))
\r
2807 sRev.Format(_T("%ld"), m_logEntries[i]->Rev);
\r
2808 if ((sRev.Find(find) >= 0)&&(IsEntryInDateRange(i)))
\r
2810 pShownlist->Add(m_logEntries[i]);
\r
2814 } // else (from if (bRegex))
\r
2815 } // for (DWORD i=0; i<m_logEntries.size(); ++i)
\r
2819 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
\r
2821 if (nIDEvent == LOGFILTER_TIMER)
\r
2823 if (this->IsThreadRunning())
\r
2825 // thread still running! So just restart the timer.
\r
2826 SetTimer(LOGFILTER_TIMER, 1000, NULL);
\r
2829 CWnd * focusWnd = GetFocus();
\r
2830 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
\r
2831 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
\r
2832 if (m_sFilterText.IsEmpty())
\r
2834 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2835 // do not return here!
\r
2836 // we also need to run the filter if the filter text is empty:
\r
2837 // 1. to clear an existing filter
\r
2838 // 2. to rebuild the m_arShownList after sorting
\r
2840 theApp.DoWaitCursor(1);
\r
2841 CStoreSelection storeselection(this);
\r
2842 KillTimer(LOGFILTER_TIMER);
\r
2843 FillLogMessageCtrl(false);
\r
2845 // now start filter the log list
\r
2846 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
\r
2847 RecalculateShownList(&m_LogList.m_arShownList);
\r
2848 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
\r
2851 m_LogList.DeleteAllItems();
\r
2852 m_LogList.SetItemCountEx(m_LogList.ShownCountWithStopped());
\r
2853 m_LogList.RedrawItems(0, m_LogList.ShownCountWithStopped());
\r
2854 m_LogList.SetRedraw(false);
\r
2855 m_LogList.ResizeAllListCtrlCols();
\r
2856 m_LogList.SetRedraw(true);
\r
2857 m_LogList.Invalidate();
\r
2858 if ( m_LogList.GetItemCount()==1 )
\r
2860 m_LogList.SetSelectionMark(0);
\r
2861 m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
\r
2863 theApp.DoWaitCursor(-1);
\r
2864 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
\r
2865 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
\r
2866 if (bSetFocusToFilterControl)
\r
2867 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
2868 UpdateLogInfoLabel();
\r
2869 } // if (nIDEvent == LOGFILTER_TIMER)
\r
2870 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
\r
2871 __super::OnTimer(nIDEvent);
\r
2874 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2877 m_DateTo.GetTime(_time);
\r
2880 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
\r
2881 if (time.GetTime() != m_tTo)
\r
2883 m_tTo = (DWORD)time.GetTime();
\r
2884 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2887 catch (CAtlException)
\r
2894 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
2897 m_DateFrom.GetTime(_time);
\r
2900 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
\r
2901 if (time.GetTime() != m_tFrom)
\r
2903 m_tFrom = (DWORD)time.GetTime();
\r
2904 SetTimer(LOGFILTER_TIMER, 10, NULL);
\r
2907 catch (CAtlException)
\r
2914 BOOL CLogDlg::IsEntryInDateRange(int i)
\r
2917 __time64_t time = m_logEntries[i]->tmDate;
\r
2918 if ((time >= m_tFrom)&&(time <= m_tTo))
\r
2925 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths /* = false */, bool bUseFilter /* = true */)
\r
2927 CTGitPathList pathList;
\r
2930 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2932 m_sRepositoryRoot = GetRepositoryRoot(m_path);
\r
2934 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
\r
2937 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
2942 int nextpos = m_LogList.GetNextSelectedItem(pos);
\r
2943 if (nextpos >= m_arShownList.GetCount())
\r
2945 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(nextpos));
\r
2946 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
\r
2947 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
\r
2949 LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);
\r
2950 if (cpath == NULL)
\r
2953 if (!bRelativePaths)
\r
2954 path.SetFromGit(m_sRepositoryRoot);
\r
2955 path.AppendPathString(cpath->sPath);
\r
2956 if ((!bUseFilter)||
\r
2957 ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||
\r
2958 (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))
\r
2959 pathList.AddPath(path);
\r
2964 pathList.RemoveDuplicates();
\r
2969 void CLogDlg::SortByColumn(int nSortColumn, bool bAscending)
\r
2972 switch(nSortColumn)
\r
2974 case 0: // Revision
\r
2977 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
\r
2979 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
\r
2985 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
\r
2987 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
\r
2993 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
\r
2995 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
\r
3001 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
\r
3003 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
\r
3006 case 4: // Message or bug id
\r
3007 if (m_bShowBugtraqColumn)
\r
3010 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
\r
3012 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
\r
3015 // fall through here
\r
3016 case 5: // Message
\r
3019 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
\r
3021 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
\r
3031 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
3033 if (this->IsThreadRunning())
\r
3034 return; //no sorting while the arrays are filled
\r
3035 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
3036 const int nColumn = pNMLV->iSubItem;
\r
3037 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
\r
3038 m_nSortColumn = nColumn;
\r
3039 SortByColumn(m_nSortColumn, m_bAscending);
\r
3040 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
\r
3041 SortShownListArray();
\r
3042 m_LogList.Invalidate();
\r
3043 UpdateLogInfoLabel();
\r
3044 // the "next 100" button only makes sense if the log messages
\r
3045 // are sorted by revision in descending order
\r
3046 if ((m_nSortColumn)||(m_bAscending))
\r
3048 DialogEnableWindow(IDC_NEXTHUNDRED, false);
\r
3052 DialogEnableWindow(IDC_NEXTHUNDRED, true);
\r
3057 void CLogDlg::SortShownListArray()
\r
3059 // make sure the shown list still matches the filter after sorting.
\r
3060 OnTimer(LOGFILTER_TIMER);
\r
3061 // clear the selection states
\r
3062 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
3065 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
\r
3067 m_LogList.SetSelectionMark(-1);
\r
3070 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
\r
3072 if (control == NULL)
\r
3074 // set the sort arrow
\r
3075 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
\r
3076 HDITEM HeaderItem = {0};
\r
3077 HeaderItem.mask = HDI_FORMAT;
\r
3078 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
3080 pHeader->GetItem(i, &HeaderItem);
\r
3081 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
3082 pHeader->SetItem(i, &HeaderItem);
\r
3086 pHeader->GetItem(nColumn, &HeaderItem);
\r
3087 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
3088 pHeader->SetItem(nColumn, &HeaderItem);
\r
3091 void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
\r
3093 if (this->IsThreadRunning())
\r
3094 return; //no sorting while the arrays are filled
\r
3095 if (m_currentChangedArray == NULL)
\r
3097 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
3098 const int nColumn = pNMLV->iSubItem;
\r
3099 m_bAscendingPathList = nColumn == m_nSortColumnPathList ? !m_bAscendingPathList : TRUE;
\r
3100 m_nSortColumnPathList = nColumn;
\r
3101 // qsort(m_currentChangedArray->GetData(), m_currentChangedArray->GetSize(), sizeof(LogChangedPath*), (GENERICCOMPAREFN)SortCompare);
\r
3103 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
\r
3104 m_ChangedFileListCtrl.Invalidate();
\r
3108 int CLogDlg::m_nSortColumnPathList = 0;
\r
3109 bool CLogDlg::m_bAscendingPathList = false;
\r
3111 int CLogDlg::SortCompare(const void * pElem1, const void * pElem2)
\r
3114 LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);
\r
3115 LogChangedPath * cpath2 = *((LogChangedPath**)pElem2);
\r
3117 if (m_bAscendingPathList)
\r
3118 std::swap (cpath1, cpath2);
\r
3121 switch (m_nSortColumnPathList)
\r
3124 cmp = cpath2->GetAction().Compare(cpath1->GetAction());
\r
3129 cmp = cpath2->sPath.CompareNoCase(cpath1->sPath);
\r
3133 case 2: // copy from path
\r
3134 cmp = cpath2->sCopyFromPath.Compare(cpath1->sCopyFromPath);
\r
3138 case 3: // copy from revision
\r
3139 return cpath2->lCopyFromRev > cpath1->lCopyFromRev;
\r
3146 void CLogDlg::ResizeAllListCtrlCols()
\r
3149 const int nMinimumWidth = ICONITEMBORDER+16*4;
\r
3150 int maxcol = ((CHeaderCtrl*)(m_LogList.GetDlgItem(0)))->GetItemCount()-1;
\r
3151 int nItemCount = m_LogList.GetItemCount();
\r
3152 TCHAR textbuf[MAX_PATH];
\r
3153 CHeaderCtrl * pHdrCtrl = (CHeaderCtrl*)(m_LogList.GetDlgItem(0));
\r
3156 for (int col = 0; col <= maxcol; col++)
\r
3159 hdi.mask = HDI_TEXT;
\r
3160 hdi.pszText = textbuf;
\r
3161 hdi.cchTextMax = sizeof(textbuf);
\r
3162 pHdrCtrl->GetItem(col, &hdi);
\r
3163 int cx = m_LogList.GetStringWidth(hdi.pszText)+20; // 20 pixels for col separator and margin
\r
3164 for (int index = 0; index<nItemCount; ++index)
\r
3166 // get the width of the string and add 14 pixels for the column separator and margins
\r
3167 int linewidth = m_LogList.GetStringWidth(m_LogList.GetItemText(index, col)) + 14;
\r
3168 if (index < m_arShownList.GetCount())
\r
3170 GitRev * pCurLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(index));
\r
3171 if ((pCurLogEntry)&&(pCurLogEntry->m_CommitHash == m_wcRev.m_CommitHash))
\r
3173 // set the bold font and ask for the string width again
\r
3174 m_LogList.SendMessage(WM_SETFONT, (WPARAM)m_boldFont, NULL);
\r
3175 linewidth = m_LogList.GetStringWidth(m_LogList.GetItemText(index, col)) + 14;
\r
3176 // restore the system font
\r
3177 m_LogList.SendMessage(WM_SETFONT, NULL, NULL);
\r
3182 // add the image size
\r
3183 CImageList * pImgList = m_LogList.GetImageList(LVSIL_SMALL);
\r
3184 if ((pImgList)&&(pImgList->GetImageCount()))
\r
3186 IMAGEINFO imginfo;
\r
3187 pImgList->GetImageInfo(0, &imginfo);
\r
3188 linewidth += (imginfo.rcImage.right - imginfo.rcImage.left);
\r
3189 linewidth += 3; // 3 pixels between icon and text
\r
3192 if (cx < linewidth)
\r
3195 // Adjust columns "Actions" containing icons
\r
3196 if (col == this->LOGLIST_ACTION)
\r
3198 if (cx < nMinimumWidth)
\r
3200 cx = nMinimumWidth;
\r
3204 if (col == this->LOGLIST_MESSAGE)
\r
3206 if (cx > LOGLIST_MESSAGE_MAX)
\r
3208 cx = LOGLIST_MESSAGE_MAX;
\r
3212 // keep the bug id column small
\r
3213 if ((col == 4)&&(m_bShowBugtraqColumn))
\r
3215 if (cx > (int)(DWORD)m_regMaxBugIDColWidth)
\r
3217 cx = (int)(DWORD)m_regMaxBugIDColWidth;
\r
3221 m_LogList.SetColumnWidth(col, cx);
\r
3228 void CLogDlg::OnBnClickedHidepaths()
\r
3230 FillLogMessageCtrl();
\r
3231 m_ChangedFileListCtrl.Invalidate();
\r
3236 void CLogDlg::OnBnClickedCheckStoponcopy()
\r
3239 if (!GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
3242 // ignore old fetch limits when switching
\r
3243 // between copy-following and stop-on-copy
\r
3244 // (otherwise stop-on-copy will limit what
\r
3245 // we see immediately after switching to
\r
3246 // copy-following)
\r
3250 // now, restart the query
\r
3255 void CLogDlg::OnBnClickedIncludemerge()
\r
3265 void CLogDlg::UpdateLogInfoLabel()
\r
3268 git_revnum_t rev1 = 0;
\r
3269 git_revnum_t rev2 = 0;
\r
3270 long selectedrevs = 0;
\r
3271 if (m_arShownList.GetCount())
\r
3273 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(0));
\r
3274 rev1 = pLogEntry->Rev;
\r
3275 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));
\r
3276 rev2 = pLogEntry->Rev;
\r
3277 selectedrevs = m_LogList.GetSelectedCount();
\r
3280 sTemp.Format(IDS_LOG_LOGINFOSTRING, m_arShownList.GetCount(), rev2, rev1, selectedrevs);
\r
3281 m_sLogInfo = sTemp;
\r
3283 UpdateData(FALSE);
\r
3286 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
\r
3289 int selIndex = m_ChangedFileListCtrl.GetSelectionMark();
\r
3290 if ((point.x == -1) && (point.y == -1))
\r
3293 m_ChangedFileListCtrl.GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
3294 m_ChangedFileListCtrl.ClientToScreen(&rect);
\r
3295 point = rect.CenterPoint();
\r
3299 int s = m_LogList.GetSelectionMark();
\r
3302 std::vector<CString> changedpaths;
\r
3303 std::vector<LogChangedPath*> changedlogpaths;
\r
3304 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
\r
3306 return; // nothing is selected, get out of here
\r
3308 bool bOneRev = true;
\r
3309 int sel=m_LogList.GetNextSelectedItem(pos);
\r
3310 GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel));
\r
3311 GitRev * rev1 = pLogEntry;
\r
3312 GitRev * rev2 = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel+1));
\r
3314 bool bOneRev = true;
\r
3319 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
\r
3322 rev1 = max(rev1,(git_revnum_t)pLogEntry->Rev);
\r
3323 rev2 = min(rev2,(git_revnum_t)pLogEntry->Rev);
\r
3329 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
3332 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
3333 changedpaths.push_back(m_currentChangedPathList[nItem].GetGitPathString());
\r
3338 // only one revision is selected in the log dialog top pane
\r
3339 // but multiple items could be selected in the changed items list
\r
3342 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
\r
3345 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
\r
3346 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->GetAt(nItem);
\r
3348 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
3350 if ((changedlogpath)&&(!changedlogpath->sCopyFromPath.IsEmpty()))
\r
3351 rev2 = changedlogpath->lCopyFromRev;
\r
3354 // if the path was modified but the parent path was 'added with history'
\r
3355 // then we have to use the copy from revision of the parent path
\r
3356 CTGitPath cpath = CTGitPath(changedlogpath->sPath);
\r
3357 for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)
\r
3359 CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);
\r
3360 if (p.IsAncestorOf(cpath))
\r
3362 if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())
\r
3363 rev2 = pLogEntry->pArChangedPaths->GetAt(flist)->lCopyFromRev;
\r
3368 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
\r
3370 // some items are hidden! So find out which item the user really clicked on
\r
3371 INT_PTR selRealIndex = -1;
\r
3372 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
\r
3374 if (pLogEntry->pArChangedPaths->GetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
\r
3376 if (selRealIndex == nItem)
\r
3378 selIndex = hiddenindex;
\r
3379 changedlogpath = pLogEntry->pArChangedPaths->GetAt(selIndex);
\r
3384 if (changedlogpath)
\r
3386 changedpaths.push_back(changedlogpath->sPath);
\r
3387 changedlogpaths.push_back(changedlogpath);
\r
3392 //entry is selected, now show the popup menu
\r
3394 if (popup.CreatePopupMenu())
\r
3396 bool bEntryAdded = false;
\r
3397 if (m_ChangedFileListCtrl.GetSelectedCount() == 1)
\r
3399 // if ((!bOneRev)||(IsDiffPossible(changedlogpaths[0], rev1)))
\r
3401 popup.AppendMenuIcon(CGitLogList::ID_DIFF, IDS_LOG_POPUP_DIFF, IDI_DIFF);
\r
3402 popup.AppendMenuIcon(CGitLogList::ID_BLAMEDIFF, IDS_LOG_POPUP_BLAMEDIFF, IDI_BLAME);
\r
3403 popup.SetDefaultItem(CGitLogList::ID_DIFF, FALSE);
\r
3404 popup.AppendMenuIcon(CGitLogList::ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF);
\r
3405 bEntryAdded = true;
\r
3407 // if (rev2 == rev1-1)
\r
3410 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
3411 popup.AppendMenuIcon(CGitLogList::ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);
\r
3412 popup.AppendMenuIcon(CGitLogList::ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
3413 popup.AppendMenuIcon(CGitLogList::ID_BLAME, IDS_LOG_POPUP_BLAME, IDI_BLAME);
\r
3414 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
3416 popup.AppendMenuIcon(CGitLogList::ID_REVERTREV, IDS_LOG_POPUP_REVERTREV, IDI_REVERT);
\r
3417 popup.AppendMenuIcon(CGitLogList::ID_POPPROPS, IDS_REPOBROWSE_SHOWPROP, IDI_PROPERTIES); // "Show Properties"
\r
3418 popup.AppendMenuIcon(CGitLogList::ID_LOG, IDS_MENULOG, IDI_LOG); // "Show Log"
\r
3419 popup.AppendMenuIcon(CGitLogList::ID_GETMERGELOGS, IDS_LOG_POPUP_GETMERGELOGS, IDI_LOG); // "Show merge log"
\r
3420 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
\r
3421 bEntryAdded = true;
\r
3422 if (!m_ProjectProperties.sWebViewerPathRev.IsEmpty())
\r
3424 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
3425 popup.AppendMenuIcon(CGitLogList::ID_VIEWPATHREV, IDS_LOG_POPUP_VIEWPATHREV);
\r
3427 if (popup.GetDefaultItem(0,FALSE)==-1)
\r
3428 popup.SetDefaultItem(CGitLogList::ID_OPEN, FALSE);
\r
3431 else if (changedlogpaths.size())
\r
3433 // more than one entry is selected
\r
3434 popup.AppendMenuIcon(CGitLogList::ID_SAVEAS, IDS_LOG_POPUP_SAVE);
\r
3435 bEntryAdded = true;
\r
3440 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
3441 bool bOpenWith = false;
\r
3442 bool bMergeLog = false;
\r
3443 m_bCancelled = false;
\r
3447 case CGitLogList::ID_DIFF:
\r
3449 DoDiffFromLog(selIndex, rev1, rev2, false, false);
\r
3453 case ID_BLAMEDIFF:
\r
3455 DoDiffFromLog(selIndex, rev1, rev2, true, false);
\r
3460 DoDiffFromLog(selIndex, rev1, rev2, false, true);
\r
3463 case ID_REVERTREV:
\r
3465 SetPromptApp(&theApp);
\r
3466 theApp.DoWaitCursor(1);
\r
3468 if (Git::PathIsURL(m_path))
\r
3470 sUrl = m_path.GetGitPathString();
\r
3474 sUrl = GetURLFromPath(m_path);
\r
3475 if (sUrl.IsEmpty())
\r
3477 theApp.DoWaitCursor(-1);
\r
3479 temp.Format(IDS_ERR_NOURLOFFILE, m_path.GetWinPath());
\r
3480 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3482 theApp.DoWaitCursor(-1);
\r
3486 // find the working copy path of the selected item from the URL
\r
3487 m_bCancelled = false;
\r
3488 CString sUrlRoot = GetRepositoryRoot(CTGitPath(sUrl));
\r
3490 CString fileURL = changedpaths[0];
\r
3491 fileURL = sUrlRoot + fileURL.Trim();
\r
3492 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1
\r
3493 // sUrl = http://mydomain.com/repos/trunk/folder
\r
3494 CString sUnescapedUrl = CPathUtils::PathUnescape(sUrl);
\r
3495 // find out until which char the urls are identical
\r
3497 while ((i<fileURL.GetLength())&&(i<sUnescapedUrl.GetLength())&&(fileURL[i]==sUnescapedUrl[i]))
\r
3499 int leftcount = m_path.GetWinPathString().GetLength()-(sUnescapedUrl.GetLength()-i);
\r
3500 CString wcPath = m_path.GetWinPathString().Left(leftcount);
\r
3501 wcPath += fileURL.Mid(i);
\r
3502 wcPath.Replace('/', '\\');
\r
3503 CGitProgressDlg dlg;
\r
3504 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3506 // a deleted path! Since the path isn't there anymore, merge
\r
3507 // won't work. So just do a copy url->wc
\r
3508 dlg.SetCommand(CGitProgressDlg::GitProgress_Copy);
\r
3509 dlg.SetPathList(CTGitPathList(CTGitPath(fileURL)));
\r
3510 dlg.SetUrl(wcPath);
\r
3511 dlg.SetRevision(rev2);
\r
3515 if (!PathFileExists(wcPath))
\r
3517 // seems the path got renamed
\r
3518 // tell the user how to work around this.
\r
3519 CMessageBox::Show(this->m_hWnd, IDS_LOG_REVERTREV_ERROR, IDS_APPNAME, MB_ICONERROR);
\r
3521 theApp.DoWaitCursor(-1);
\r
3524 dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);
\r
3525 dlg.SetPathList(CTGitPathList(CTGitPath(wcPath)));
\r
3526 dlg.SetUrl(fileURL);
\r
3527 dlg.SetSecondUrl(fileURL);
\r
3528 GitRevRangeArray revarray;
\r
3529 revarray.AddRevRange(rev1, rev2);
\r
3530 dlg.SetRevisionRanges(revarray);
\r
3533 msg.Format(IDS_LOG_REVERT_CONFIRM, (LPCTSTR)wcPath);
\r
3534 if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)
\r
3538 theApp.DoWaitCursor(-1);
\r
3543 DialogEnableWindow(IDOK, FALSE);
\r
3544 SetPromptApp(&theApp);
\r
3545 theApp.DoWaitCursor(1);
\r
3547 if (Git::PathIsURL(m_path))
\r
3549 filepath = m_path.GetGitPathString();
\r
3553 filepath = GetURLFromPath(m_path);
\r
3554 if (filepath.IsEmpty())
\r
3556 theApp.DoWaitCursor(-1);
\r
3558 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3559 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3560 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3565 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3566 filepath += changedpaths[0];
\r
3569 dlg.m_Path = CTGitPath(filepath);
\r
3572 theApp.DoWaitCursor(-1);
\r
3577 DialogEnableWindow(IDOK, FALSE);
\r
3578 SetPromptApp(&theApp);
\r
3579 theApp.DoWaitCursor(1);
\r
3581 if (Git::PathIsURL(m_path))
\r
3583 filepath = m_path.GetGitPathString();
\r
3587 filepath = GetURLFromPath(m_path);
\r
3588 if (filepath.IsEmpty())
\r
3590 theApp.DoWaitCursor(-1);
\r
3592 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3593 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3594 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3599 m_bCancelled = false;
\r
3600 CString sRoot = GetRepositoryRoot(CTGitPath(filepath));
\r
3601 // if more than one entry is selected, we save them
\r
3602 // one by one into a folder the user has selected
\r
3603 bool bTargetSelected = false;
\r
3604 CTGitPath TargetPath;
\r
3605 if (m_ChangedFileListCtrl.GetSelectedCount() > 1)
\r
3607 CBrowseFolder browseFolder;
\r
3608 browseFolder.SetInfo(CString(MAKEINTRESOURCE(IDS_LOG_SAVEFOLDERTOHINT)));
\r
3609 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
3610 CString strSaveAsDirectory;
\r
3611 if (browseFolder.Show(GetSafeHwnd(), strSaveAsDirectory) == CBrowseFolder::OK)
\r
3613 TargetPath = CTGitPath(strSaveAsDirectory);
\r
3614 bTargetSelected = true;
\r
3619 // Display the Open dialog box.
\r
3620 CString revFilename;
\r
3622 temp = CPathUtils::GetFileNameFromPath(changedpaths[0]);
\r
3623 int rfind = temp.ReverseFind('.');
\r
3625 revFilename.Format(_T("%s-%ld%s"), (LPCTSTR)temp.Left(rfind), rev1, (LPCTSTR)temp.Mid(rfind));
\r
3627 revFilename.Format(_T("%s-%ld"), (LPCTSTR)temp, rev1);
\r
3628 bTargetSelected = CAppUtils::FileOpenSave(revFilename, NULL, IDS_LOG_POPUP_SAVE, IDS_COMMONFILEFILTER, false, m_hWnd);
\r
3629 TargetPath.SetFromWin(revFilename);
\r
3631 if (bTargetSelected)
\r
3633 CProgressDlg progDlg;
\r
3634 progDlg.SetTitle(IDS_APPNAME);
\r
3635 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
3636 for (std::vector<LogChangedPath*>::iterator it = changedlogpaths.begin(); it!= changedlogpaths.end(); ++it)
\r
3638 GitRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;
\r
3640 CString sInfoLine;
\r
3641 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)getrev.ToString());
\r
3642 progDlg.SetLine(1, sInfoLine, true);
\r
3643 SetAndClearProgressInfo(&progDlg);
\r
3644 progDlg.ShowModeless(m_hWnd);
\r
3646 CTGitPath tempfile = TargetPath;
\r
3647 if (changedpaths.size() > 1)
\r
3649 // if multiple items are selected, then the TargetPath
\r
3650 // points to a folder and we have to append the filename
\r
3651 // to save to to that folder.
\r
3652 CString sName = (*it)->sPath;
\r
3653 int slashpos = sName.ReverseFind('/');
\r
3654 if (slashpos >= 0)
\r
3655 sName = sName.Mid(slashpos);
\r
3656 tempfile.AppendPathString(sName);
\r
3657 // one problem here:
\r
3658 // a user could have selected multiple items which
\r
3659 // have the same filename but reside in different
\r
3660 // directories, e.g.
\r
3663 // in that case, the second 'file1' will overwrite
\r
3664 // the already saved 'file1'.
\r
3666 // we could maybe find the common root of all selected
\r
3667 // items and then create sub folders to save those files
\r
3669 // But I think we should just leave it that way: to check
\r
3670 // out multiple items at once, the better way is still to
\r
3671 // use the export command from the top pane of the log dialog.
\r
3673 filepath = sRoot + (*it)->sPath;
\r
3674 if (!Cat(CTGitPath(filepath), getrev, getrev, tempfile))
\r
3677 SetAndClearProgressInfo((HWND)NULL);
\r
3678 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3680 theApp.DoWaitCursor(-1);
\r
3685 SetAndClearProgressInfo((HWND)NULL);
\r
3688 theApp.DoWaitCursor(-1);
\r
3695 GitRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;
\r
3696 Open(bOpenWith,changedpaths[0],getrev);
\r
3702 if (Git::PathIsURL(m_path))
\r
3704 filepath = m_path.GetGitPathString();
\r
3708 filepath = GetURLFromPath(m_path);
\r
3709 if (filepath.IsEmpty())
\r
3711 theApp.DoWaitCursor(-1);
\r
3713 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3714 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3715 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3720 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3721 filepath += changedpaths[0];
\r
3723 dlg.EndRev = rev1;
\r
3724 if (dlg.DoModal() == IDOK)
\r
3729 tempfile = blame.BlameToTempFile(CTGitPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);
\r
3730 if (!tempfile.IsEmpty())
\r
3732 if (dlg.m_bTextView)
\r
3734 //open the default text editor for the result file
\r
3735 CAppUtils::StartTextViewer(tempfile);
\r
3739 CString sParams = _T("/path:\"") + filepath + _T("\" ");
\r
3740 if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(filepath),sParams))
\r
3748 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
3753 case ID_GETMERGELOGS:
\r
3758 DialogEnableWindow(IDOK, FALSE);
\r
3759 SetPromptApp(&theApp);
\r
3760 theApp.DoWaitCursor(1);
\r
3762 if (Git::PathIsURL(m_path))
\r
3764 filepath = m_path.GetGitPathString();
\r
3768 filepath = GetURLFromPath(m_path);
\r
3769 if (filepath.IsEmpty())
\r
3771 theApp.DoWaitCursor(-1);
\r
3773 temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);
\r
3774 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
\r
3775 TRACE(_T("could not retrieve the URL of the file!\n"));
\r
3780 m_bCancelled = false;
\r
3781 filepath = GetRepositoryRoot(CTGitPath(filepath));
\r
3782 filepath += changedpaths[0];
\r
3783 git_revnum_t logrev = rev1;
\r
3784 if (changedlogpaths[0]->action == LOGACTIONS_DELETED)
\r
3786 // if the item got deleted in this revision,
\r
3787 // fetch the log from the previous revision where it
\r
3792 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\" /startrev:%ld"), (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)filepath, logrev);
\r
3794 sCmd += _T(" /merge");
\r
3795 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3797 theApp.DoWaitCursor(-1);
\r
3800 case ID_VIEWPATHREV:
\r
3802 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetSelectionMark()));
\r
3803 GitRev rev = pLogEntry->Rev;
\r
3804 CString relurl = changedpaths[0];
\r
3805 CString url = m_ProjectProperties.sWebViewerPathRev;
\r
3806 url.Replace(_T("%REVISION%"), rev.ToString());
\r
3807 url.Replace(_T("%PATH%"), relurl);
\r
3808 relurl = relurl.Mid(relurl.Find('/'));
\r
3809 url.Replace(_T("%PATH1%"), relurl);
\r
3810 if (!url.IsEmpty())
\r
3811 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
\r
3819 } // if (popup.CreatePopupMenu())
\r
3822 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3824 // the date control should not show the "today" button
\r
3825 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
\r
3827 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3831 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
3833 // the date control should not show the "today" button
\r
3834 CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();
\r
3836 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
\r
3840 void CLogDlg::OnSize(UINT nType, int cx, int cy)
\r
3842 __super::OnSize(nType, cx, cy);
\r
3844 SetSplitterRange();
\r
3847 void CLogDlg::OnRefresh()
\r
3849 if (GetDlgItem(IDC_GETALL)->IsWindowEnabled())
\r
3856 void CLogDlg::OnFind()
\r
3858 if (!m_pFindDialog)
\r
3860 m_pFindDialog = new CFindReplaceDialog();
\r
3861 m_pFindDialog->Create(TRUE, NULL, NULL, FR_HIDEUPDOWN | FR_HIDEWHOLEWORD, this);
\r
3865 void CLogDlg::OnFocusFilter()
\r
3867 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
\r
3870 void CLogDlg::OnEditCopy()
\r
3872 if (GetFocus() == &m_ChangedFileListCtrl)
\r
3873 CopyChangedSelectionToClipBoard();
\r
3875 m_LogList.CopySelectionToClipBoard();
\r
3878 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
\r
3880 // is the URL a relative one?
\r
3881 if (url.Left(2).Compare(_T("^/")) == 0)
\r
3883 // URL is relative to the repository root
\r
3884 CString url1 = m_sRepositoryRoot + url.Mid(1);
\r
3885 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3886 DWORD len = url.GetLength();
\r
3887 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
\r
3888 return CString(buf, len);
\r
3891 else if (url[0] == '/')
\r
3893 // URL is relative to the server's hostname
\r
3895 // find the server's hostname
\r
3896 int schemepos = m_sRepositoryRoot.Find(_T("//"));
\r
3897 if (schemepos >= 0)
\r
3899 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));
\r
3900 CString url1 = sHost + url;
\r
3901 TCHAR buf[INTERNET_MAX_URL_LENGTH];
\r
3902 DWORD len = url.GetLength();
\r
3903 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
\r
3904 return CString(buf, len);
\r
OSDN Git Service
