1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2008 - TortoiseSVN
4 // Copyright (C) 2008-2012 - TortoiseGit
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21 #include "TortoiseProc.h"
24 #include "GITProgressDlg.h"
25 #include "ProgressDlg.h"
26 //#include "CopyDlg.h"
27 #include "StatGraphDlg.h"
29 #include "MessageBox.h"
32 #include "PathUtils.h"
33 #include "StringUtils.h"
34 #include "UnicodeUtils.h"
36 //#include "GitInfo.h"
37 //#include "GitDiff.h"
39 //#include "BrowseFolder.h"
40 //#include "GitHelpers.h"
41 #include "GitStatus.h"
42 //#include "LogDlgHelper.h"
43 //#include "CachedLogInfo.h"
44 #include "FileDiffDlg.h"
45 #include "BrowseRefsDlg.h"
46 #include "SmartHandle.h"
48 IMPLEMENT_DYNAMIC(CLogDlg
, CResizableStandAloneDialog
)
49 CLogDlg::CLogDlg(CWnd
* pParent
/*=NULL*/)
50 : CResizableStandAloneDialog(CLogDlg::IDD
, pParent
)
52 , m_currentChangedArray(NULL
)
54 , m_bFollowRenames(FALSE
)
57 , m_bSelectionMustBeContinuous(false)
62 , m_pNotifyWindow(NULL
)
69 m_bFilterWithRegex
= !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE
);
72 str
=g_Git
.m_CurrentDir
;
73 str
.Replace(_T(":"),_T("_"));
74 str
=CString(_T("Software\\TortoiseGit\\LogDialog\\AllBranch\\"))+str
;
76 m_regbAllBranch
=CRegDWORD(str
,FALSE
);
78 m_bAllBranch
=m_regbAllBranch
;
81 m_bWholeProject
=FALSE
;
83 m_bShowUnversioned
= CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE
);
89 m_regbAllBranch
=m_bAllBranch
;
91 m_CurrentFilteredChangedArray
.RemoveAll();
95 void CLogDlg::DoDataExchange(CDataExchange
* pDX
)
97 CResizableStandAloneDialog::DoDataExchange(pDX
);
98 DDX_Control(pDX
, IDC_LOGLIST
, m_LogList
);
99 DDX_Control(pDX
, IDC_LOGMSG
, m_ChangedFileListCtrl
);
100 DDX_Control(pDX
, IDC_PROGRESS
, m_LogProgress
);
101 DDX_Control(pDX
, IDC_SPLITTERTOP
, m_wndSplitter1
);
102 DDX_Control(pDX
, IDC_SPLITTERBOTTOM
, m_wndSplitter2
);
103 DDX_Text(pDX
, IDC_SEARCHEDIT
, m_LogList
.m_sFilterText
);
104 DDX_Control(pDX
, IDC_DATEFROM
, m_DateFrom
);
105 DDX_Control(pDX
, IDC_DATETO
, m_DateTo
);
106 DDX_Control(pDX
, IDC_LOG_JUMPTYPE
, m_JumpType
);
107 DDX_Control(pDX
, IDC_LOG_JUMPUP
, m_JumpUp
);
108 DDX_Control(pDX
, IDC_LOG_JUMPDOWN
, m_JumpDown
);
109 DDX_Control(pDX
, IDC_HIDEPATHS
, m_cHidePaths
);
110 DDX_Text(pDX
, IDC_LOGINFO
, m_sLogInfo
);
111 DDX_Check(pDX
, IDC_LOG_FIRSTPARENT
, m_bFirstParent
);
112 DDX_Check(pDX
, IDC_LOG_ALLBRANCH
,m_bAllBranch
);
113 DDX_Check(pDX
, IDC_LOG_FOLLOWRENAMES
, m_bFollowRenames
);
114 DDX_Check(pDX
, IDC_SHOWWHOLEPROJECT
,m_bWholeProject
);
115 DDX_Control(pDX
, IDC_SEARCHEDIT
, m_cFilter
);
116 DDX_Control(pDX
, IDC_STATIC_REF
, m_staticRef
);
119 BEGIN_MESSAGE_MAP(CLogDlg
, CResizableStandAloneDialog
)
122 ON_BN_CLICKED(IDHELP
, OnBnClickedHelp
)
123 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGLIST
, OnLvnItemchangedLoglist
)
124 ON_NOTIFY(EN_LINK
, IDC_MSGVIEW
, OnEnLinkMsgview
)
125 ON_BN_CLICKED(IDC_STATBUTTON
, OnBnClickedStatbutton
)
127 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED
, OnClickedInfoIcon
)
128 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED
, OnClickedCancelFilter
)
130 ON_MESSAGE(MSG_LOAD_PERCENTAGE
,OnLogListLoading
)
132 ON_EN_CHANGE(IDC_SEARCHEDIT
, OnEnChangeSearchedit
)
134 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATETO
, OnDtnDatetimechangeDateto
)
135 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATEFROM
, OnDtnDatetimechangeDatefrom
)
136 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE
, &CLogDlg::OnCbnSelchangeJumpType
)
137 ON_COMMAND(IDC_LOG_JUMPUP
, &CLogDlg::OnBnClickedJumpUp
)
138 ON_COMMAND(IDC_LOG_JUMPDOWN
, &CLogDlg::OnBnClickedJumpDown
)
139 ON_BN_CLICKED(IDC_SHOWWHOLEPROJECT
, OnBnClickShowWholeProject
)
140 ON_NOTIFY(LVN_COLUMNCLICK
,IDC_LOGLIST
, OnLvnColumnclick
)
141 ON_BN_CLICKED(IDC_HIDEPATHS
, OnBnClickedHidepaths
)
142 ON_COMMAND(MSG_FETCHED_DIFF
, OnBnClickedHidepaths
)
143 ON_BN_CLICKED(IDC_LOG_ALLBRANCH
, OnBnClickedAllBranch
)
144 ON_BN_CLICKED(IDC_LOG_FOLLOWRENAMES
, OnBnClickedFollowRenames
)
146 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATEFROM
, &CLogDlg::OnDtnDropdownDatefrom
)
147 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATETO
, &CLogDlg::OnDtnDropdownDateto
)
149 ON_BN_CLICKED(IDC_LOG_FIRSTPARENT
, &CLogDlg::OnBnClickedFirstParent
)
150 ON_BN_CLICKED(IDC_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
151 ON_STN_CLICKED(IDC_STATIC_REF
, &CLogDlg::OnBnClickedBrowseRef
)
152 ON_COMMAND(ID_LOGDLG_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
153 ON_COMMAND(ID_LOGDLG_FIND
, &CLogDlg::OnFind
)
154 ON_COMMAND(ID_LOGDLG_FOCUSFILTER
, &CLogDlg::OnFocusFilter
)
155 ON_COMMAND(ID_EDIT_COPY
, &CLogDlg::OnEditCopy
)
156 ON_MESSAGE(MSG_REFLOG_CHANGED
, OnRefLogChanged
)
157 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
169 void CLogDlg::SetParams(const CTGitPath
& orgPath
, const CTGitPath
& path
, CString hightlightRevision
, CString startrev
, CString endrev
, int limit
/* = FALSE */)
173 m_hightlightRevision
= hightlightRevision
;
175 if (startrev
== GIT_REV_ZERO
)
177 if (endrev
== GIT_REV_ZERO
)
180 this->m_LogList
.m_startrev
= startrev
;
181 m_LogRevision
= startrev
;
182 this->m_LogList
.m_endrev
= endrev
;
184 if(!endrev
.IsEmpty())
185 this->SetStartRef(endrev
);
188 if (::IsWindow(m_hWnd
))
192 void CLogDlg::SetFilter(const CString
& findstr
, LONG findtype
, bool findregex
)
194 m_LogList
.m_sFilterText
= findstr
;
196 m_LogList
.m_SelectedFilters
= findtype
;
197 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
= findregex
;
200 BOOL
CLogDlg::OnInitDialog()
203 CResizableStandAloneDialog::OnInitDialog();
204 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
206 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
207 // do this, Explorer would be unable to send that message to our window if we
208 // were running elevated. It's OK to make the call all the time, since if we're
209 // not elevated, this is a no-op.
210 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
211 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
212 CAutoLibrary hUser
= ::LoadLibrary(_T("user32.dll"));
215 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
216 if (pfnChangeWindowMessageFilterEx
)
218 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
221 m_pTaskbarList
.Release();
222 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
224 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG
));
226 // use the state of the "stop on copy/rename" option from the last time
229 // set the font to use in the log message view, configured in the settings dialog
230 CAppUtils::CreateFontForLogs(m_logFont
);
231 GetDlgItem(IDC_MSGVIEW
)->SetFont(&m_logFont
);
232 // automatically detect URLs in the log message and turn them into links
233 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_AUTOURLDETECT
, TRUE
, NULL
);
234 // make the log message rich edit control send a message when the mouse pointer is over a link
235 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_SETEVENTMASK
, NULL
, ENM_LINK
);
236 //m_LogList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_SUBITEMIMAGES);
238 // the "hide unrelated paths" checkbox should be indeterminate
239 m_cHidePaths
.SetCheck(BST_INDETERMINATE
);
242 //SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);
243 //SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);
245 // set up the columns
246 m_LogList
.DeleteAllItems();
248 m_LogList
.m_Path
=m_path
;
249 m_LogList
.m_hasWC
= m_LogList
.m_bShowWC
= !g_GitAdminDir
.IsBareRepo(g_Git
.m_CurrentDir
);
250 m_LogList
.InsertGitColumn();
252 m_ChangedFileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("LogDlg"), (GITSLC_POPALL
^ (GITSLC_POPCOMMIT
|GITSLC_POPIGNORE
|GITSLC_POPRESTORE
)), false, m_LogList
.m_hasWC
, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
254 GetDlgItem(IDC_LOGLIST
)->UpdateData(FALSE
);
258 m_tooltips
.Create(this);
259 CheckRegexpTooltip();
263 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
264 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
);
265 m_cFilter
.SetInfoIcon(IDI_LOGFILTER
);
266 m_cFilter
.SetValidator(this);
268 AdjustControlSize(IDC_HIDEPATHS
);
269 AdjustControlSize(IDC_LOG_FIRSTPARENT
);
270 AdjustControlSize(IDC_LOG_ALLBRANCH
);
271 AdjustControlSize(IDC_SHOWWHOLEPROJECT
);
272 AdjustControlSize(IDC_LOG_FOLLOWRENAMES
);
274 GetClientRect(m_DlgOrigRect
);
275 m_LogList
.GetClientRect(m_LogListOrigRect
);
276 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(m_MsgViewOrigRect
);
277 m_ChangedFileListCtrl
.GetClientRect(m_ChgOrigRect
);
279 m_DateFrom
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
280 m_DateTo
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
282 m_staticRef
.SetURL(CString());
285 AddAnchor(IDC_STATIC_REF
, TOP_LEFT
);
286 //AddAnchor(IDC_BUTTON_BROWSE_REF, TOP_LEFT);
287 AddAnchor(IDC_FROMLABEL
, TOP_LEFT
);
288 AddAnchor(IDC_DATEFROM
, TOP_LEFT
);
289 AddAnchor(IDC_TOLABEL
, TOP_LEFT
);
290 AddAnchor(IDC_DATETO
, TOP_LEFT
);
293 AddAnchor(IDC_SEARCHEDIT
, TOP_LEFT
, TOP_RIGHT
);
294 AddAnchor(IDC_LOG_JUMPTYPE
, TOP_RIGHT
);
295 AddAnchor(IDC_LOG_JUMPUP
, TOP_RIGHT
);
296 AddAnchor(IDC_LOG_JUMPDOWN
, TOP_RIGHT
);
298 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
299 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
300 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
301 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
302 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
304 AddAnchor(IDC_LOGINFO
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
305 AddAnchor(IDC_HIDEPATHS
, BOTTOM_LEFT
);
306 AddAnchor(IDC_LOG_ALLBRANCH
,BOTTOM_LEFT
);
307 AddAnchor(IDC_LOG_FOLLOWRENAMES
, BOTTOM_LEFT
);
308 AddAnchor(IDC_LOG_FIRSTPARENT
, BOTTOM_LEFT
);
309 AddAnchor(IDC_SHOWWHOLEPROJECT
, BOTTOM_LEFT
);
310 AddAnchor(IDC_REFRESH
, BOTTOM_LEFT
);
311 AddAnchor(IDC_STATBUTTON
, BOTTOM_RIGHT
);
312 AddAnchor(IDC_PROGRESS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
313 AddAnchor(IDOK
, BOTTOM_RIGHT
);
314 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
315 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
317 if(this->m_bAllBranch
)
318 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
320 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_ALL_BRANCH
;
322 // SetPromptParentWindow(m_hWnd);
323 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL
)));
324 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL
)));
325 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT
)));
326 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1
)));
327 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2
)));
328 m_JumpType
.SetCurSel(0);
329 m_JumpUp
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
330 m_JumpDown
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
333 CenterWindow(CWnd::FromHandle(hWndExplorer
));
334 EnableSaveRestore(_T("LogDlg"));
336 DWORD yPos1
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
337 DWORD yPos2
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
338 RECT rcDlg
, rcLogList
, rcChgMsg
;
339 GetClientRect(&rcDlg
);
340 m_LogList
.GetWindowRect(&rcLogList
);
341 ScreenToClient(&rcLogList
);
342 m_ChangedFileListCtrl
.GetWindowRect(&rcChgMsg
);
343 ScreenToClient(&rcChgMsg
);
347 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
348 ScreenToClient(&rectSplitter
);
349 int delta
= yPos1
- rectSplitter
.top
;
351 if ((rcLogList
.bottom
+ delta
> rcLogList
.top
)&&(rcLogList
.bottom
+ delta
< rcChgMsg
.bottom
- 30))
353 m_wndSplitter1
.SetWindowPos(NULL
, rectSplitter
.left
, yPos1
, 0, 0, SWP_NOSIZE
);
360 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
361 ScreenToClient(&rectSplitter
);
362 int delta
= yPos2
- rectSplitter
.top
;
364 if ((rcChgMsg
.top
+ delta
< rcChgMsg
.bottom
)&&(rcChgMsg
.top
+ delta
> rcLogList
.top
+ 30))
366 m_wndSplitter2
.SetWindowPos(NULL
, rectSplitter
.left
, yPos2
, 0, 0, SWP_NOSIZE
);
375 // the dialog is used to select revisions
376 // enable the OK button if appropriate
381 // the dialog is used to just view log messages
382 // hide the OK button and set text on Cancel button to OK
383 GetDlgItemText(IDOK
, temp
);
384 SetDlgItemText(IDCANCEL
, temp
);
385 GetDlgItem(IDOK
)->ShowWindow(SW_HIDE
);
388 // first start a thread to obtain the log messages without
389 // blocking the dialog
391 //m_tFrom = (DWORD)-1;
393 // scroll to user selected or current revision
394 if (!m_hightlightRevision
.IsEmpty() && m_hightlightRevision
.GetLength() >= GIT_HASH_SIZE
)
395 m_LogList
.m_lastSelectedHash
= m_hightlightRevision
;
396 else if (!m_LogList
.m_endrev
.IsEmpty() && m_LogList
.m_endrev
.GetLength() >= GIT_HASH_SIZE
)
397 m_LogList
.m_lastSelectedHash
= m_hightlightRevision
;
402 m_LogList
.m_lastSelectedHash
= g_Git
.GetHash(_T("HEAD"));
407 MessageBox(_T("Could not get HEAD hash.\nlibgit reports:\n") + err
, _T("TortoiseGit"), MB_ICONERROR
);
411 if (m_path
.IsEmpty() || m_path
.IsDirectory())
412 DialogEnableWindow(IDC_LOG_FOLLOWRENAMES
, FALSE
);
414 m_LogList
.FetchLogAsync(this);
416 GetDlgItem(IDC_LOGLIST
)->SetFocus();
422 LRESULT
CLogDlg::OnLogListLoading(WPARAM wParam
, LPARAM
/*lParam*/)
426 if( cur
== GITLOG_START
)
429 temp
.LoadString(IDS_PROGRESSWAIT
);
431 this->m_LogList
.ShowText(temp
, true);
433 // We use a progress bar while getting the logs
434 m_LogProgress
.SetRange32(0, 100);
435 m_LogProgress
.SetPos(0);
438 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
439 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
442 GetDlgItem(IDC_PROGRESS
)->ShowWindow(TRUE
);
444 //DialogEnableWindow(IDC_SHOWWHOLEPROJECT, FALSE);
445 //DialogEnableWindow(IDC_LOG_FIRSTPARENT, FALSE);
446 DialogEnableWindow(IDC_STATBUTTON
, FALSE
);
447 //DialogEnableWindow(IDC_REFRESH, FALSE);
448 DialogEnableWindow(IDC_HIDEPATHS
,FALSE
);
451 else if( cur
== GITLOG_END
)
453 if(this->m_LogList
.HasText())
455 this->m_LogList
.ClearText();
457 UpdateLogInfoLabel();
460 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
462 DialogEnableWindow(IDC_SHOWWHOLEPROJECT
, !m_bFollowRenames
);
464 DialogEnableWindow(IDC_STATBUTTON
, !(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
));
465 DialogEnableWindow(IDC_REFRESH
, TRUE
);
466 DialogEnableWindow(IDC_HIDEPATHS
,TRUE
);
468 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
469 GetDlgItem(IDC_PROGRESS
)->ShowWindow(FALSE
);
470 //CTime time=m_LogList.GetOldestTime();
472 m_LogList
.GetTimeRange(begin
,end
);
474 if(m_LogList
.m_From
== -1)
475 m_DateFrom
.SetTime(&begin
);
477 if(m_LogList
.m_To
== -1)
478 m_DateTo
.SetTime(&end
);
484 if(this->m_LogList
.HasText())
486 this->m_LogList
.ClearText();
487 this->m_LogList
.Invalidate();
489 UpdateLogInfoLabel();
490 m_LogProgress
.SetPos(cur
);
493 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
494 m_pTaskbarList
->SetProgressValue(m_hWnd
, cur
, 100);
499 void CLogDlg::SetDlgTitle()
501 if (m_sTitle
.IsEmpty())
502 GetWindowText(m_sTitle
);
504 if (m_LogList
.m_Path
.IsEmpty() || m_orgPath
.GetWinPathString().IsEmpty())
506 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
509 CAppUtils::SetWindowTitle(m_hWnd
, m_orgPath
.GetWinPathString(), m_sTitle
);
512 void CLogDlg::CheckRegexpTooltip()
514 CWnd
*pWnd
= GetDlgItem(IDC_SEARCHEDIT
);
515 // Since tooltip describes regexp features, show it only if regexps are enabled.
516 if (m_bFilterWithRegex
)
518 m_tooltips
.AddTool(pWnd
, IDS_LOG_FILTER_REGEX_TT
);
521 m_tooltips
.DelTool(pWnd
);
524 void CLogDlg::EnableOKButton()
528 // the dialog is used to select revisions
529 if (m_bSelectionMustBeSingle
)
531 // enable OK button if only a single revision is selected
532 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()==1));
534 else if (m_bSelectionMustBeContinuous
)
535 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()!=0)&&(m_LogList
.IsSelectionContinuous()));
537 DialogEnableWindow(IDOK
, m_LogList
.GetSelectedCount()!=0);
540 DialogEnableWindow(IDOK
, TRUE
);
543 CString
CLogDlg::GetTagInfo(GitRev
* pLogEntry
)
548 if(m_LogList
.m_HashMap
.find(pLogEntry
->m_CommitHash
) != m_LogList
.m_HashMap
.end())
550 STRING_VECTOR
&vector
= m_LogList
.m_HashMap
[pLogEntry
->m_CommitHash
];
551 for(int i
=0;i
<vector
.size();i
++)
553 if(vector
[i
].Find(_T("refs/tags/")) == 0 )
555 CString tag
= vector
[i
];
556 int start
= vector
[i
].Find(_T("^{}"));
562 cmd
.Format(_T("git.exe cat-file tag %s"), tag
);
564 if(g_Git
.Run(cmd
, &output
, NULL
, CP_UTF8
) == 0 )
570 if(!output
.IsEmpty())
572 output
= _T("\n*") + CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO
)) + _T("*\n\n") + output
;
578 void CLogDlg::FillLogMessageCtrl(bool bShow
/* = true*/)
580 // we fill here the log message rich edit control,
581 // and also populate the changed files list control
582 // according to the selected revision(s).
584 CRichEditCtrl
* pMsgView
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
585 // empty the log message view
586 pMsgView
->SetWindowText(_T(" "));
587 // empty the changed files list
588 m_ChangedFileListCtrl
.SetRedraw(FALSE
);
589 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
590 m_currentChangedArray
= NULL
;
591 //m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );
592 m_ChangedFileListCtrl
.DeleteAllItems();
594 // if we're not here to really show a selected revision, just
595 // get out of here after clearing the views, which is what is intended
596 // if that flag is not set.
600 m_ChangedFileListCtrl
.Invalidate();
601 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
602 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
606 // depending on how many revisions are selected, we have to do different
608 int selCount
= m_LogList
.GetSelectedCount();
611 // if nothing is selected, we have nothing more to do
612 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
613 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
616 else if (selCount
== 1)
618 // if one revision is selected, we have to fill the log message view
619 // with the corresponding log message, and also fill the changed files
621 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
622 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
623 if (selIndex
>= m_LogList
.m_arShownList
.GetCount())
625 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
626 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
629 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
632 // set the log message text
633 pMsgView
->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH
)) + _T(": ") + pLogEntry
->m_CommitHash
.ToString() + _T("\r\n\r\n"));
634 // turn bug ID's into links if the bugtraq: properties have been set
635 // and we can find a match of those in the log message
637 pMsgView
->SetSel(-1,-1);
639 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
640 format
.cbSize
= sizeof(CHARFORMAT2
);
641 format
.dwMask
= CFM_BOLD
;
642 format
.dwEffects
= CFE_BOLD
;
643 pMsgView
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
645 CString msg
=_T("* ");
646 msg
+=pLogEntry
->GetSubject();
647 pMsgView
->ReplaceSel(msg
);
649 pMsgView
->SetSel(-1,-1);
650 format
.dwEffects
= 0;
651 pMsgView
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
654 msg
+=pLogEntry
->GetBody();
656 if(!pLogEntry
->m_Notes
.IsEmpty())
658 msg
+= _T("\n*") + CString(MAKEINTRESOURCE(IDS_NOTES
)) + _T("* ");
659 msg
+= pLogEntry
->m_Notes
;
663 msg
+=GetTagInfo(pLogEntry
);
665 pMsgView
->ReplaceSel(msg
);
668 pMsgView
->GetWindowText(text
);
669 // the rich edit control doesn't count the CR char!
670 // to be exact: CRLF is treated as one char.
673 m_LogList
.m_ProjectProperties
.FindBugID(text
, pMsgView
);
674 if (((DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\StyleCommitMessages"), TRUE
)) == TRUE
)
675 CAppUtils::FormatTextInRichEditControl(pMsgView
);
677 int HidePaths
=m_cHidePaths
.GetState() & 0x0003;
678 CString matchpath
=this->m_path
.GetGitPathString();
680 int count
= pLogEntry
->GetFiles(&m_LogList
).GetCount();
681 for(int i
=0;i
<count
&& (!matchpath
.IsEmpty());i
++)
683 if( m_bWholeProject
)
686 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
|CTGitPath::LOGACTIONS_GRAY
);
688 if(pLogEntry
->GetFiles(&m_LogList
)[i
].GetGitPathString().Left(matchpath
.GetLength()) != matchpath
&& pLogEntry
->GetFiles(&m_LogList
)[i
].GetGitOldPathString().Left(matchpath
.GetLength()) != matchpath
)
690 if(HidePaths
==BST_CHECKED
)
691 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
692 if(HidePaths
==BST_INDETERMINATE
)
693 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
|= CTGitPath::LOGACTIONS_GRAY
;
697 m_ChangedFileListCtrl
.UpdateWithGitPathList(pLogEntry
->GetFiles(&m_LogList
));
698 m_ChangedFileListCtrl
.m_CurrentVersion
=pLogEntry
->m_CommitHash
;
699 if (pLogEntry
->m_CommitHash
.IsEmpty() && m_bShowUnversioned
)
701 m_ChangedFileListCtrl
.UpdateUnRevFileList(pLogEntry
->GetUnRevFiles());
702 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
| GITSLC_SHOWUNVERSIONED
);
705 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
707 m_ChangedFileListCtrl
.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES
)));
709 if(!pLogEntry
->m_IsDiffFiles
)
710 m_ChangedFileListCtrl
.SetBusy(TRUE
);
712 m_ChangedFileListCtrl
.SetBusy(FALSE
);
714 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
721 // more than one revision is selected:
722 // the log message view must be emptied
723 // the changed files list contains all the changed paths from all
724 // selected revisions, with 'doubles' removed
725 m_currentChangedPathList
= GetChangedPathsFromSelectedRevisions(true);
729 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
731 if (m_currentChangedArray
)
733 m_ChangedFileListCtrl
.SetItemCountEx(m_currentChangedArray
->GetCount());
734 m_ChangedFileListCtrl
.RedrawItems(0, m_currentChangedArray
->GetCount());
736 else if (m_currentChangedPathList
.GetCount())
738 m_ChangedFileListCtrl
.SetItemCountEx(m_currentChangedPathList
.GetCount());
739 m_ChangedFileListCtrl
.RedrawItems(0, m_currentChangedPathList
.GetCount());
743 m_ChangedFileListCtrl
.SetItemCountEx(0);
744 m_ChangedFileListCtrl
.Invalidate();
747 // sort according to the settings
748 if (m_nSortColumnPathList
> 0)
749 SetSortArrow(&m_ChangedFileListCtrl
, m_nSortColumnPathList
, m_bAscendingPathList
);
751 SetSortArrow(&m_ChangedFileListCtrl
, -1, false);
752 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
756 void CLogDlg::OnBnClickedRefresh()
761 void CLogDlg::Refresh (bool clearfilter
/*autoGoOnline*/)
764 m_LogList
.Refresh(clearfilter
);
766 FillLogMessageCtrl(false);
771 BOOL
CLogDlg::Cancel()
776 void CLogDlg::SaveSplitterPos()
780 CRegDWORD regPos1
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
781 CRegDWORD regPos2
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
783 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
784 ScreenToClient(&rectSplitter
);
785 regPos1
= rectSplitter
.top
;
786 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
787 ScreenToClient(&rectSplitter
);
788 regPos2
= rectSplitter
.top
;
792 void CLogDlg::OnCancel()
794 this->ShowWindow(SW_HIDE
);
796 // canceling means stopping the working thread if it's still running.
797 m_LogList
.SafeTerminateAsyncDiffThread();
798 if (this->IsThreadRunning())
800 m_LogList
.SafeTerminateThread();
808 void CLogDlg::CopyChangedSelectionToClipBoard()
811 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
813 return; // nothing is selected, get out of here
817 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
820 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
823 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
824 CTGitPath
*path
= (CTGitPath
*)m_ChangedFileListCtrl
.GetItemData(nItem
);
826 sPaths
+= path
->GetGitPathString();
827 sPaths
+= _T("\r\n");
833 // only one revision is selected in the log dialog top pane
834 // but multiple items could be selected in the changed items list
835 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
838 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
839 LogChangedPath
* changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(nItem
);
841 if ((m_cHidePaths
.GetState() & 0x0003)==BST_CHECKED
)
843 // some items are hidden! So find out which item the user really selected
844 INT_PTR selRealIndex
= -1;
845 for (INT_PTR hiddenindex
=0; hiddenindex
<pLogEntry
->pArChangedPaths
->GetCount(); ++hiddenindex
)
847 if (pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
)->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0)
849 if (selRealIndex
== nItem
)
851 changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
);
858 sPaths
+= changedlogpath
->sPath
;
859 sPaths
+= _T("\r\n");
865 CStringUtils::WriteAsciiStringToClipboard(sPaths
, GetSafeHwnd());
869 void CLogDlg::OnContextMenu(CWnd
* pWnd
, CPoint point
)
871 // we have two separate context menus:
872 // one shown on the log message list control,
873 // the other shown in the changed-files list control
874 int selCount
= m_LogList
.GetSelectedCount();
875 if ((selCount
== 1)&&(pWnd
== GetDlgItem(IDC_MSGVIEW
)))
877 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
880 selIndex
= m_LogList
.GetNextSelectedItem(pos
);
882 GitRev
*pRev
= ((GitRev
*)m_LogList
.m_arShownList
[selIndex
]);
884 if ((point
.x
== -1) && (point
.y
== -1))
887 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(&rect
);
888 ClientToScreen(&rect
);
889 point
= rect
.CenterPoint();
891 CString sMenuItemText
;
893 if (popup
.CreatePopupMenu())
895 // add the 'default' entries
896 sMenuItemText
.LoadString(IDS_SCIEDIT_COPY
);
897 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, WM_COPY
, sMenuItemText
);
898 sMenuItemText
.LoadString(IDS_SCIEDIT_SELECTALL
);
899 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, EM_SETSEL
, sMenuItemText
);
900 sMenuItemText
.LoadString(IDS_EDIT_NOTES
);
901 popup
.AppendMenuIcon( CGitLogList::ID_EDITNOTE
, sMenuItemText
, IDI_EDIT
);
903 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
907 break; // no command selected
910 ::SendMessage(GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), cmd
, 0, -1);
912 case CGitLogList::ID_EDITNOTE
:
913 CAppUtils::EditNote(pRev
);
914 this->FillLogMessageCtrl(true);
923 // since the log dialog is also used to select revisions for other
924 // dialogs, we have to do some work before closing this dialog
925 if (GetFocus() != GetDlgItem(IDOK
))
926 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
928 m_LogList
.SafeTerminateAsyncDiffThread();
929 if (this->IsThreadRunning())
931 m_LogList
.SafeTerminateThread();
934 // check that one and only one row is selected
935 if (m_LogList
.GetSelectedCount() == 1)
937 // get the selected row
938 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
939 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
940 if (selIndex
< m_LogList
.m_arShownList
.GetCount())
942 // all ok, pick up the revision
943 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
945 m_sSelectedHash
= pLogEntry
->m_CommitHash
;
953 if (!GetDlgItem(IDOK
)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL
))
954 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
958 GetDlgItemText(IDOK
, buttontext
);
959 temp
.LoadString(IDS_MSGBOX_CANCEL
);
960 if (temp
.Compare(buttontext
) != 0)
961 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
963 m_selectedRevs
.Clear();
964 m_selectedRevsOneRange
.Clear();
967 int selIndex
= m_LogList
.GetSelectionMark();
970 PLOGENTRYDATA pLogEntry
= NULL
;
971 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
972 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
973 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
974 git_revnum_t lowerRev
= pLogEntry
->Rev
;
975 git_revnum_t higherRev
= lowerRev
;
978 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
979 git_revnum_t rev
= pLogEntry
->Rev
;
980 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
986 if (m_sFilterText
.IsEmpty() && m_nSortColumn
== 0 && IsSelectionContinuous())
988 m_selectedRevsOneRange
.AddRevRange(lowerRev
, higherRev
);
990 BOOL bSentMessage
= FALSE
;
991 if (m_LogList
.GetSelectedCount() == 1)
993 // if only one revision is selected, check if the path/url with which the dialog was started
994 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
995 // if it was copied, use the copy from revision as lowerRev
996 if ((pLogEntry
)&&(pLogEntry
->pArChangedPaths
)&&(lowerRev
== higherRev
))
998 CString sUrl
= m_path
.GetGitPathString();
1001 sUrl
= GetURLFromPath(m_path
);
1003 sUrl
= sUrl
.Mid(m_sRepositoryRoot
.GetLength());
1004 for (int cp
= 0; cp
< pLogEntry
->pArChangedPaths
->GetCount(); ++cp
)
1006 LogChangedPath
* pData
= pLogEntry
->pArChangedPaths
->SafeGetAt(cp
);
1009 if (sUrl
.Compare(pData
->sPath
) == 0)
1011 if (!pData
->sCopyFromPath
.IsEmpty())
1013 lowerRev
= pData
->lCopyFromRev
;
1014 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
), lowerRev
);
1015 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
), higherRev
);
1016 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1017 bSentMessage
= TRUE
;
1024 if ( !bSentMessage
)
1026 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
| MERGE_REVSELECTMINUSONE
), lowerRev
);
1027 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
| MERGE_REVSELECTMINUSONE
), higherRev
);
1028 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1029 if (m_selectedRevsOneRange
.GetCount())
1030 m_pNotifyWindow
->SendMessage(WM_REVLISTONERANGE
, 0, (LPARAM
)&m_selectedRevsOneRange
);
1035 CRegDWORD reg
= CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
1040 void CLogDlg::DoDiffFromLog(INT_PTR selIndex
, GitRev
* rev1
, GitRev
* rev2
, bool /*blame*/, bool /*unified*/)
1042 DialogEnableWindow(IDOK
, FALSE
);
1043 // SetPromptApp(&theApp);
1044 theApp
.DoWaitCursor(1);
1047 GetTempPath(temppath
);
1050 file1
.Format(_T("%s%s_%s%s"),
1052 (*m_currentChangedArray
)[selIndex
].GetBaseFilename(),
1053 rev1
->m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()),
1054 (*m_currentChangedArray
)[selIndex
].GetFileExtension());
1057 file2
.Format(_T("%s\\%s_%s%s"),
1059 (*m_currentChangedArray
)[selIndex
].GetBaseFilename(),
1060 rev2
->m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()),
1061 (*m_currentChangedArray
)[selIndex
].GetFileExtension());
1064 CTGitPath
&path
= (CTGitPath
&)(*m_currentChangedArray
)[selIndex
];
1066 g_Git
.GetOneFile(rev1
->m_CommitHash
.ToString(), path
, file1
);
1067 g_Git
.GetOneFile(rev2
->m_CommitHash
.ToString(), path
, file2
);
1069 CAppUtils::DiffFlags flags
;
1070 CAppUtils::StartExtDiff(file1
,file2
,_T("A"),_T("B"),
1071 g_Git
.m_CurrentDir
+ _T("\\") + path
.GetWinPathString(), g_Git
.m_CurrentDir
+ _T("\\") + path
.GetWinPathString(),
1072 rev1
->m_CommitHash
.ToString(), rev2
->m_CommitHash
.ToString(),
1075 theApp
.DoWaitCursor(-1);
1079 BOOL
CLogDlg::PreTranslateMessage(MSG
* pMsg
)
1081 // Skip Ctrl-C when copying text out of the log message or search filter
1082 bool bSkipAccelerator
= (pMsg
->message
== WM_KEYDOWN
&& (pMsg
->wParam
== 'C' || pMsg
->wParam
== VK_INSERT
) && (GetFocus() == GetDlgItem(IDC_MSGVIEW
) || GetFocus() == GetDlgItem(IDC_SEARCHEDIT
)) && GetKeyState(VK_CONTROL
) & 0x8000);
1083 if (pMsg
->message
== WM_KEYDOWN
&& pMsg
->wParam
=='\r')
1085 if (GetFocus()==GetDlgItem(IDC_LOGLIST
))
1087 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE
))
1089 m_LogList
.DiffSelectedRevWithPrevious();
1094 if (m_hAccel
&& !bSkipAccelerator
)
1096 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1101 if(::IsWindow(m_tooltips
.m_hWnd
))
1102 m_tooltips
.RelayEvent(pMsg
);
1103 return __super::PreTranslateMessage(pMsg
);
1107 BOOL
CLogDlg::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
1109 //if (this->IsThreadRunning())
1110 if(m_LogList
.m_bNoDispUpdates
)
1112 // only show the wait cursor over the list control
1114 ((pWnd
== GetDlgItem(IDC_LOGLIST
))||
1115 (pWnd
== GetDlgItem(IDC_MSGVIEW
))||
1116 (pWnd
== GetDlgItem(IDC_LOGMSG
))))
1118 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_WAIT
));
1123 if ((pWnd
) && (pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1124 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1126 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_ARROW
));
1128 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1131 void CLogDlg::OnBnClickedHelp()
1136 void CLogDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1138 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1140 //if (this->IsThreadRunning())
1141 if(m_LogList
.m_bNoDispUpdates
)
1143 if (pNMLV
->iItem
>= 0)
1145 this->m_LogList
.m_nSearchIndex
= pNMLV
->iItem
;
1146 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(pNMLV
->iItem
));
1147 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1148 if (pNMLV
->iSubItem
!= 0)
1150 if ((pNMLV
->iItem
== m_LogList
.m_arShownList
.GetCount()))
1152 // remove the selected state
1153 if (pNMLV
->uChanged
& LVIF_STATE
)
1155 m_LogList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1156 FillLogMessageCtrl();
1158 UpdateLogInfoLabel();
1162 if (pNMLV
->uChanged
& LVIF_STATE
)
1164 FillLogMessageCtrl();
1170 m_LogList
.m_lastSelectedHash
.Empty();
1171 FillLogMessageCtrl();
1175 UpdateLogInfoLabel();
1178 void CLogDlg::OnEnLinkMsgview(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1180 ENLINK
*pEnLink
= reinterpret_cast<ENLINK
*>(pNMHDR
);
1181 if (pEnLink
->msg
== WM_LBUTTONUP
)
1184 GetDlgItemText(IDC_MSGVIEW
, msg
);
1185 msg
.Replace(_T("\r\n"), _T("\n"));
1186 url
= msg
.Mid(pEnLink
->chrg
.cpMin
, pEnLink
->chrg
.cpMax
-pEnLink
->chrg
.cpMin
);
1187 if (!::PathIsURL(url
))
1189 url
= m_LogList
.m_ProjectProperties
.GetBugIDUrl(url
);
1190 url
= GetAbsoluteUrlFromRelativeUrl(url
);
1193 ShellExecute(this->m_hWnd
, _T("open"), url
, NULL
, NULL
, SW_SHOWDEFAULT
);
1201 class CCommitPointer
1204 CCommitPointer():m_cont(NULL
){}
1205 CCommitPointer(const CCommitPointer
& P_Right
)
1211 CCommitPointer
& operator = (const CCommitPointer
& P_Right
)
1215 (*m_cont
->m_parDates
)[m_place
] = P_Right
.GetDate();
1216 (*m_cont
->m_parFileChanges
)[m_place
] = P_Right
.GetChanges();
1217 (*m_cont
->m_parAuthors
)[m_place
] = P_Right
.GetAuthor();
1221 m_Date
= P_Right
.GetDate();
1222 m_Changes
= P_Right
.GetChanges();
1223 m_csAuthor
= P_Right
.GetAuthor();
1228 void Clone(const CCommitPointer
& P_Right
)
1230 m_cont
= P_Right
.m_cont
;
1231 m_place
= P_Right
.m_place
;
1232 m_Date
= P_Right
.m_Date
;
1233 m_Changes
= P_Right
.m_Changes
;
1234 m_csAuthor
= P_Right
.m_csAuthor
;
1237 DWORD
GetDate() const {return IsPointer() ? (*m_cont
->m_parDates
)[m_place
] : m_Date
;}
1238 DWORD
GetChanges() const {return IsPointer() ? (*m_cont
->m_parFileChanges
)[m_place
] : m_Changes
;}
1239 CString
GetAuthor() const {return IsPointer() ? (*m_cont
->m_parAuthors
)[m_place
] : m_csAuthor
;}
1241 bool IsPointer() const {return m_cont
!= NULL
;}
1243 CDateSorter
* m_cont
;
1252 class iterator
: public std::iterator
<std::random_access_iterator_tag
, CCommitPointer
>
1255 CCommitPointer m_ptr
;
1258 iterator(const iterator
& P_Right
){*this = P_Right
;}
1259 iterator
& operator=(const iterator
& P_Right
)
1261 m_ptr
.Clone(P_Right
.m_ptr
);
1265 CCommitPointer
& operator*(){return m_ptr
;}
1266 CCommitPointer
* operator->(){return &m_ptr
;}
1267 const CCommitPointer
& operator*()const{return m_ptr
;}
1268 const CCommitPointer
* operator->()const{return &m_ptr
;}
1270 iterator
& operator+=(size_t P_iOffset
){m_ptr
.m_place
+= (int)P_iOffset
;return *this;}
1271 iterator
& operator-=(size_t P_iOffset
){m_ptr
.m_place
-= (int)P_iOffset
;return *this;}
1272 iterator
operator+(size_t P_iOffset
)const{iterator
it(*this); it
+= P_iOffset
;return it
;}
1273 iterator
operator-(size_t P_iOffset
)const{iterator
it(*this); it
-= P_iOffset
;return it
;}
1275 iterator
& operator++(){++m_ptr
.m_place
;return *this;}
1276 iterator
& operator--(){--m_ptr
.m_place
;return *this;}
1277 iterator
operator++(int){iterator
it(*this);++*this;return it
;}
1278 iterator
operator--(int){iterator
it(*this);--*this;return it
;}
1280 size_t operator-(const iterator
& P_itRight
)const{return m_ptr
.m_place
- P_itRight
->m_place
;}
1282 bool operator<(const iterator
& P_itRight
)const{return m_ptr
.m_place
< P_itRight
->m_place
;}
1283 bool operator!=(const iterator
& P_itRight
)const{return m_ptr
.m_place
!= P_itRight
->m_place
;}
1284 bool operator==(const iterator
& P_itRight
)const{return m_ptr
.m_place
== P_itRight
->m_place
;}
1285 bool operator>(const iterator
& P_itRight
)const{return m_ptr
.m_place
> P_itRight
->m_place
;}
1297 it
->m_place
= (int)m_parDates
->GetCount();
1302 CDWordArray
* m_parDates
;
1303 CDWordArray
* m_parFileChanges
;
1304 CStringArray
* m_parAuthors
;
1307 class CDateSorterLess
1310 bool operator () (const CDateSorter::CCommitPointer
& P_Left
, const CDateSorter::CCommitPointer
& P_Right
) const
1312 return P_Left
.GetDate() > P_Right
.GetDate(); //Last date first
1317 void CLogDlg::OnBnClickedStatbutton()
1319 if (this->IsThreadRunning())
1321 if (m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
)
1322 return; // nothing or just the working copy changes are shown, so no statistics.
1323 // the statistics dialog expects the log entries to be sorted by date
1324 SortByColumn(3, false);
1325 CThreadSafePtrArray
shownlist(NULL
);
1326 m_LogList
.RecalculateShownList(&shownlist
);
1327 // create arrays which are aware of the current filter
1328 CStringArray m_arAuthorsFiltered
;
1329 CDWordArray m_arDatesFiltered
;
1330 CDWordArray m_arFileChangesFiltered
;
1331 for (INT_PTR i
=0; i
<shownlist
.GetCount(); ++i
)
1333 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(shownlist
.SafeGetAt(i
));
1335 // do not take working dir changes into statistics
1336 if (pLogEntry
->m_CommitHash
.IsEmpty()) {
1340 CString strAuthor
= pLogEntry
->GetAuthorName();
1341 if ( strAuthor
.IsEmpty() )
1343 strAuthor
.LoadString(IDS_STATGRAPH_EMPTYAUTHOR
);
1345 m_arAuthorsFiltered
.Add(strAuthor
);
1346 m_arDatesFiltered
.Add(pLogEntry
->GetCommitterDate().GetTime());
1347 m_arFileChangesFiltered
.Add(pLogEntry
->GetFiles(&m_LogList
).GetCount());
1350 CDateSorter W_Sorter
;
1351 W_Sorter
.m_parAuthors
= &m_arAuthorsFiltered
;
1352 W_Sorter
.m_parDates
= &m_arDatesFiltered
;
1353 W_Sorter
.m_parFileChanges
= &m_arFileChangesFiltered
;
1354 std::sort(W_Sorter
.begin(), W_Sorter
.end(), CDateSorterLess());
1357 dlg
.m_parAuthors
= &m_arAuthorsFiltered
;
1358 dlg
.m_parDates
= &m_arDatesFiltered
;
1359 dlg
.m_parFileChanges
= &m_arFileChangesFiltered
;
1360 dlg
.m_path
= m_orgPath
;
1362 // restore the previous sorting
1363 SortByColumn(m_nSortColumn
, m_bAscending
);
1364 OnTimer(LOGFILTER_TIMER
);
1367 void CLogDlg::DoSizeV1(int delta
)
1370 RemoveAnchor(IDC_LOGLIST
);
1371 RemoveAnchor(IDC_SPLITTERTOP
);
1372 RemoveAnchor(IDC_MSGVIEW
);
1373 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1374 RemoveAnchor(IDC_LOGMSG
);
1375 CSplitterControl::ChangeHeight(&m_LogList
, delta
, CW_TOPALIGN
);
1376 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), -delta
, CW_BOTTOMALIGN
);
1377 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
1378 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
1379 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
1380 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1381 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1385 m_LogList
.Invalidate();
1386 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1390 void CLogDlg::DoSizeV2(int delta
)
1393 RemoveAnchor(IDC_LOGLIST
);
1394 RemoveAnchor(IDC_SPLITTERTOP
);
1395 RemoveAnchor(IDC_MSGVIEW
);
1396 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1397 RemoveAnchor(IDC_LOGMSG
);
1398 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), delta
, CW_TOPALIGN
);
1399 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl
, -delta
, CW_BOTTOMALIGN
);
1400 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
1401 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
1402 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
1403 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1404 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1408 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1409 m_ChangedFileListCtrl
.Invalidate();
1413 void CLogDlg::AdjustMinSize()
1415 // adjust the minimum size of the dialog to prevent the resizing from
1416 // moving the list control too far down.
1417 CRect rcChgListView
;
1418 m_ChangedFileListCtrl
.GetClientRect(rcChgListView
);
1420 m_LogList
.GetClientRect(rcLogList
);
1422 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(),
1423 m_DlgOrigRect
.Height()-m_ChgOrigRect
.Height()-m_LogListOrigRect
.Height()-m_MsgViewOrigRect
.Height()
1424 +rcChgListView
.Height()+rcLogList
.Height()+60));
1427 LRESULT
CLogDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
1431 if (wParam
== IDC_SPLITTERTOP
)
1433 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1434 DoSizeV1(pHdr
->delta
);
1436 else if (wParam
== IDC_SPLITTERBOTTOM
)
1438 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1439 DoSizeV2(pHdr
->delta
);
1444 return CResizableDialog::DefWindowProc(message
, wParam
, lParam
);
1447 void CLogDlg::SetSplitterRange()
1449 if ((m_LogList
)&&(m_ChangedFileListCtrl
))
1452 m_LogList
.GetWindowRect(rcTop
);
1453 ScreenToClient(rcTop
);
1455 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(rcMiddle
);
1456 ScreenToClient(rcMiddle
);
1457 m_wndSplitter1
.SetRange(rcTop
.top
+30, rcMiddle
.bottom
-20);
1459 m_ChangedFileListCtrl
.GetWindowRect(rcBottom
);
1460 ScreenToClient(rcBottom
);
1461 m_wndSplitter2
.SetRange(rcMiddle
.top
+30, rcBottom
.bottom
-20);
1465 LRESULT
CLogDlg::OnClickedInfoIcon(WPARAM
/*wParam*/, LPARAM lParam
)
1467 // FIXME: x64 version would get this function called with unexpected parameters.
1471 RECT
* rect
= (LPRECT
)lParam
;
1474 point
= CPoint(rect
->left
, rect
->bottom
);
1475 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_SelectedFilters & x ? MF_CHECKED : MF_UNCHECKED))
1477 if (popup
.CreatePopupMenu())
1479 temp
.LoadString(IDS_LOG_FILTER_SUBJECT
);
1480 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT
), LOGFILTER_SUBJECT
, temp
);
1482 temp
.LoadString(IDS_LOG_FILTER_MESSAGES
);
1483 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES
), LOGFILTER_MESSAGES
, temp
);
1485 temp
.LoadString(IDS_LOG_FILTER_PATHS
);
1486 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS
), LOGFILTER_PATHS
, temp
);
1488 temp
.LoadString(IDS_LOG_FILTER_AUTHORS
);
1489 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS
), LOGFILTER_AUTHORS
, temp
);
1491 temp
.LoadString(IDS_LOG_FILTER_REVS
);
1492 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS
), LOGFILTER_REVS
, temp
);
1494 if (m_LogList
.m_bShowBugtraqColumn
== TRUE
) {
1495 temp
.LoadString(IDS_LOG_FILTER_BUGIDS
);
1496 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID
), LOGFILTER_BUGID
, temp
);
1499 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1501 temp
.LoadString(IDS_LOG_FILTER_REGEX
);
1502 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterWithRegex
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_REGEX
, temp
);
1505 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1509 if (selection
== LOGFILTER_REGEX
)
1511 m_bFilterWithRegex
= !m_bFilterWithRegex
;
1512 CRegDWORD b
= CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE
);
1513 b
= m_bFilterWithRegex
;
1514 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
;
1516 CheckRegexpTooltip();
1520 m_LogList
.m_SelectedFilters
^= selection
;
1523 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
1529 LRESULT
CLogDlg::OnClickedCancelFilter(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1532 KillTimer(LOGFILTER_TIMER
);
1534 m_LogList
.m_sFilterText
.Empty();
1536 theApp
.DoWaitCursor(1);
1537 CStoreSelection
storeselection(this);
1538 FillLogMessageCtrl(false);
1540 m_LogList
.RemoveFilter();
1545 m_LogList
.GetTimeRange(begin
,end
);
1546 m_DateFrom
.SetTime(&begin
);
1547 m_DateTo
.SetTime(&end
);
1549 theApp
.DoWaitCursor(-1);
1550 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
1551 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
1552 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
1553 UpdateLogInfoLabel();
1559 void CLogDlg::SetFilterCueText()
1561 CString
temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY
));
1564 if (m_LogList
.m_SelectedFilters
& LOGFILTER_SUBJECT
)
1566 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT
));
1569 if (m_LogList
.m_SelectedFilters
& LOGFILTER_MESSAGES
)
1571 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1573 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES
));
1576 if (m_LogList
.m_SelectedFilters
& LOGFILTER_PATHS
)
1578 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1580 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS
));
1583 if (m_LogList
.m_SelectedFilters
& LOGFILTER_AUTHORS
)
1585 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1587 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS
));
1590 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REVS
)
1592 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1594 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS
));
1597 if (m_LogList
.m_SelectedFilters
& LOGFILTER_BUGID
)
1599 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1601 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS
));
1604 // to make the cue banner text appear more to the right of the edit control
1605 temp
= _T(" ")+temp
;
1606 m_cFilter
.SetCueBanner(temp
.TrimRight());
1609 bool CLogDlg::Validate(LPCTSTR string
)
1611 if (!m_bFilterWithRegex
)
1614 return m_LogList
.ValidateRegexp(string
, pat
, false);
1618 void CLogDlg::OnTimer(UINT_PTR nIDEvent
)
1620 if (nIDEvent
== LOGFTIME_TIMER
)
1622 KillTimer(LOGFTIME_TIMER
);
1624 m_LogList
.Refresh(FALSE
);
1625 FillLogMessageCtrl(false);
1628 if (nIDEvent
== LOGFILTER_TIMER
)
1630 KillTimer(LOGFILTER_TIMER
);
1632 m_LogList
.Refresh(FALSE
);
1633 FillLogMessageCtrl(false);
1636 /* we will use git built-in grep to filter log */
1637 if (this->IsThreadRunning())
1639 // thread still running! So just restart the timer.
1640 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
1643 CWnd
* focusWnd
= GetFocus();
1644 bool bSetFocusToFilterControl
= ((focusWnd
!= GetDlgItem(IDC_DATEFROM
))&&(focusWnd
!= GetDlgItem(IDC_DATETO
))
1645 && (focusWnd
!= GetDlgItem(IDC_LOGLIST
)));
1646 if (m_LogList
.m_sFilterText
.IsEmpty())
1648 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
1649 // do not return here!
1650 // we also need to run the filter if the filter text is empty:
1651 // 1. to clear an existing filter
1652 // 2. to rebuild the m_arShownList after sorting
1654 theApp
.DoWaitCursor(1);
1655 CStoreSelection
storeselection(this);
1656 KillTimer(LOGFILTER_TIMER
);
1657 FillLogMessageCtrl(false);
1659 // now start filter the log list
1660 m_LogList
.StartFilter();
1662 if ( m_LogList
.GetItemCount()==1 )
1664 m_LogList
.SetSelectionMark(0);
1665 m_LogList
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
1667 theApp
.DoWaitCursor(-1);
1668 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
1669 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
1670 if (bSetFocusToFilterControl
)
1671 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
1672 UpdateLogInfoLabel();
1674 } // if (nIDEvent == LOGFILTER_TIMER)
1675 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
))));
1676 __super::OnTimer(nIDEvent
);
1679 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
1684 m_DateTo
.GetTime(_time
);
1686 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 23, 59, 59);
1687 if (time
.GetTime() != m_LogList
.m_To
)
1689 m_LogList
.m_To
= (DWORD
)time
.GetTime();
1690 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
1695 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1701 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
1707 m_DateFrom
.GetTime(_time
);
1709 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 0, 0, 0);
1710 if (time
.GetTime() != m_LogList
.m_From
)
1712 m_LogList
.m_From
= (DWORD
)time
.GetTime();
1713 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
1718 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1724 void CLogDlg::OnCbnSelchangeJumpType()
1726 // reserved for future use
1729 void CLogDlg::OnBnClickedJumpUp()
1731 int sel
= m_JumpType
.GetCurSel();
1732 if (sel
< 0) return;
1733 JumpType jumpType
= (JumpType
)sel
;
1738 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1741 index
= m_LogList
.GetNextSelectedItem(pos
);
1742 if (index
== 0) return;
1744 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
1745 if (jumpType
== AuthorEmail
)
1746 strValue
= data
->GetAuthorEmail();
1747 else if (jumpType
== CommitterEmail
)
1748 strValue
= data
->GetCommitterEmail();
1749 else if (jumpType
== Parent1
)
1750 hashValue
= data
->m_CommitHash
;
1751 else if (jumpType
== Parent2
)
1752 hashValue
= data
->m_CommitHash
;
1754 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1759 index
= m_LogList
.GetNextSelectedItem(pos
);
1760 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1762 m_LogList
.SetSelectionMark(-1);
1764 for (int i
= index
- 1; i
>= 0; i
--)
1767 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1768 if (jumpType
== AuthorEmail
)
1769 found
= strValue
== data
->GetAuthorEmail();
1770 else if (jumpType
== CommitterEmail
)
1771 found
= strValue
== data
->GetCommitterEmail();
1772 else if (jumpType
== MergePoint
)
1773 found
= data
->ParentsCount() > 1;
1774 else if (jumpType
== Parent1
)
1776 if (data
->m_ParentHash
.size() > 0)
1777 found
= data
->m_ParentHash
[0] == hashValue
;
1779 else if (jumpType
== Parent2
)
1781 if (data
->m_ParentHash
.size() > 1)
1782 found
= data
->m_ParentHash
[1] == hashValue
;
1787 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
1788 m_LogList
.EnsureVisible(i
, FALSE
);
1789 m_LogList
.SetSelectionMark(i
);
1794 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
1797 void CLogDlg::OnBnClickedJumpDown()
1799 int jumpType
= m_JumpType
.GetCurSel();
1800 if (jumpType
< 0) return;
1805 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1808 index
= m_LogList
.GetNextSelectedItem(pos
);
1809 if (index
== 0) return;
1811 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
1812 if (jumpType
== AuthorEmail
)
1813 strValue
= data
->GetAuthorEmail();
1814 else if (jumpType
== CommitterEmail
)
1815 strValue
= data
->GetCommitterEmail();
1816 else if (jumpType
== Parent1
)
1818 if (data
->m_ParentHash
.size() > 0)
1819 hashValue
= data
->m_ParentHash
.at(0);
1823 else if (jumpType
== Parent2
)
1825 if (data
->m_ParentHash
.size() > 1)
1826 hashValue
= data
->m_ParentHash
.at(1);
1831 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1836 index
= m_LogList
.GetNextSelectedItem(pos
);
1837 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1839 m_LogList
.SetSelectionMark(-1);
1841 for (int i
= index
+ 1; i
< m_LogList
.GetItemCount(); i
++)
1844 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1845 if (jumpType
== AuthorEmail
)
1846 found
= strValue
== data
->GetAuthorEmail();
1847 else if (jumpType
== CommitterEmail
)
1848 found
= strValue
== data
->GetCommitterEmail();
1849 else if (jumpType
== MergePoint
)
1850 found
= data
->ParentsCount() > 1;
1851 else if (jumpType
== Parent1
)
1852 found
= data
->m_CommitHash
== hashValue
;
1853 else if (jumpType
== Parent2
)
1854 found
= data
->m_CommitHash
== hashValue
;
1858 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
1859 m_LogList
.EnsureVisible(i
, FALSE
);
1860 m_LogList
.SetSelectionMark(i
);
1865 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
1868 CTGitPathList
CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)
1870 CTGitPathList pathList
;
1873 if (m_sRepositoryRoot
.IsEmpty() && (bRelativePaths
== false))
1875 m_sRepositoryRoot
= GetRepositoryRoot(m_path
);
1877 if (m_sRepositoryRoot
.IsEmpty() && (bRelativePaths
== false))
1880 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1885 int nextpos
= m_LogList
.GetNextSelectedItem(pos
);
1886 if (nextpos
>= m_arShownList
.GetCount())
1888 PLOGENTRYDATA pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(nextpos
));
1889 LogChangedPathArray
* cpatharray
= pLogEntry
->pArChangedPaths
;
1890 for (INT_PTR cpPathIndex
= 0; cpPathIndex
<cpatharray
->GetCount(); ++cpPathIndex
)
1892 LogChangedPath
* cpath
= cpatharray
->SafeGetAt(cpPathIndex
);
1896 if (!bRelativePaths
)
1897 path
.SetFromGit(m_sRepositoryRoot
);
1898 path
.AppendPathString(cpath
->sPath
);
1900 ((m_cHidePaths
.GetState() & 0x0003)!=BST_CHECKED
)||
1901 (cpath
->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0))
1902 pathList
.AddPath(path
);
1907 pathList
.RemoveDuplicates();
1912 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
1920 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscRevSort());
1922 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescRevSort());
1928 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscActionSort());
1930 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescActionSort());
1936 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscAuthorSort());
1938 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescAuthorSort());
1944 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscDateSort());
1946 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescDateSort());
1949 case 4: // Message or bug id
1950 if (m_bShowBugtraqColumn
)
1953 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscBugIDSort());
1955 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescBugIDSort());
1958 // fall through here
1962 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscMessageSort());
1964 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescMessageSort());
1974 void CLogDlg::OnLvnColumnclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1976 if (this->IsThreadRunning())
1977 return; //no sorting while the arrays are filled
1979 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1980 const int nColumn
= pNMLV
->iSubItem
;
1981 m_bAscending
= nColumn
== m_nSortColumn
? !m_bAscending
: TRUE
;
1982 m_nSortColumn
= nColumn
;
1983 SortByColumn(m_nSortColumn
, m_bAscending
);
1984 SetSortArrow(&m_LogList
, m_nSortColumn
, !!m_bAscending
);
1985 SortShownListArray();
1986 m_LogList
.Invalidate();
1987 UpdateLogInfoLabel();
1989 UNREFERENCED_PARAMETER(pNMHDR
);
1994 void CLogDlg::SortShownListArray()
1996 // make sure the shown list still matches the filter after sorting.
1997 OnTimer(LOGFILTER_TIMER
);
1998 // clear the selection states
1999 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2002 m_LogList
.SetItemState(m_LogList
.GetNextSelectedItem(pos
), 0, LVIS_SELECTED
);
2004 m_LogList
.SetSelectionMark(-1);
2007 void CLogDlg::SetSortArrow(CListCtrl
* control
, int nColumn
, bool bAscending
)
2009 if (control
== NULL
)
2011 // set the sort arrow
2012 CHeaderCtrl
* pHeader
= control
->GetHeaderCtrl();
2013 HDITEM HeaderItem
= {0};
2014 HeaderItem
.mask
= HDI_FORMAT
;
2015 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
2017 pHeader
->GetItem(i
, &HeaderItem
);
2018 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
2019 pHeader
->SetItem(i
, &HeaderItem
);
2023 pHeader
->GetItem(nColumn
, &HeaderItem
);
2024 HeaderItem
.fmt
|= (bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
2025 pHeader
->SetItem(nColumn
, &HeaderItem
);
2029 int CLogDlg::m_nSortColumnPathList
= 0;
2030 bool CLogDlg::m_bAscendingPathList
= false;
2032 void CLogDlg::OnBnClickedHidepaths()
2034 FillLogMessageCtrl();
2035 m_ChangedFileListCtrl
.Invalidate();
2038 void CLogDlg::UpdateLogInfoLabel()
2043 long selectedrevs
= 0;
2044 int count
= (int)m_LogList
.m_arShownList
.GetCount();
2048 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(0)))->m_CommitHash
;
2049 if(this->m_LogList
.m_bShowWC
&& rev1
.IsEmpty()&&(count
>1))
2051 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(start
)))->m_CommitHash
;
2052 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_arShownList.GetCount()-1));
2053 rev2
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(count
-1)))->m_CommitHash
;
2054 selectedrevs
= m_LogList
.GetSelectedCount();
2057 sTemp
.Format(IDS_PROC_LOG_STATS
,
2059 rev2
.ToString().Left(g_Git
.GetShortHASHLength()), rev1
.ToString().Left(g_Git
.GetShortHASHLength()), selectedrevs
);
2061 if(selectedrevs
== 1)
2063 CString str
=m_ChangedFileListCtrl
.GetStatisticsString(true);
2064 str
.Replace(_T('\n'), _T(' '));
2065 sTemp
+= _T("\r\n") + str
;
2072 void CLogDlg::OnDtnDropdownDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2074 // the date control should not show the "today" button
2075 CMonthCalCtrl
* pCtrl
= m_DateFrom
.GetMonthCalCtrl();
2077 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
2081 void CLogDlg::OnDtnDropdownDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2083 // the date control should not show the "today" button
2084 CMonthCalCtrl
* pCtrl
= m_DateTo
.GetMonthCalCtrl();
2086 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
2090 void CLogDlg::OnSize(UINT nType
, int cx
, int cy
)
2092 __super::OnSize(nType
, cx
, cy
);
2097 void CLogDlg::OnRefresh()
2101 this->m_LogProgress
.SetPos(0);
2107 void CLogDlg::OnFocusFilter()
2109 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2112 void CLogDlg::OnEditCopy()
2114 if (GetFocus() == &m_ChangedFileListCtrl
)
2115 CopyChangedSelectionToClipBoard();
2117 m_LogList
.CopySelectionToClipBoard();
2120 CString
CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString
& url
)
2122 // is the URL a relative one?
2123 if (url
.Left(2).Compare(_T("^/")) == 0)
2125 // URL is relative to the repository root
2126 CString url1
= m_sRepositoryRoot
+ url
.Mid(1);
2127 TCHAR buf
[INTERNET_MAX_URL_LENGTH
];
2128 DWORD len
= url
.GetLength();
2129 if (UrlCanonicalize((LPCTSTR
)url1
, buf
, &len
, 0) == S_OK
)
2130 return CString(buf
, len
);
2133 else if (url
[0] == '/')
2135 // URL is relative to the server's hostname
2137 // find the server's hostname
2138 int schemepos
= m_sRepositoryRoot
.Find(_T("//"));
2141 sHost
= m_sRepositoryRoot
.Left(m_sRepositoryRoot
.Find('/', schemepos
+3));
2142 CString url1
= sHost
+ url
;
2143 TCHAR buf
[INTERNET_MAX_URL_LENGTH
];
2144 DWORD len
= url
.GetLength();
2145 if (UrlCanonicalize((LPCTSTR
)url
, buf
, &len
, 0) == S_OK
)
2146 return CString(buf
, len
);
2154 void CLogDlg::OnEnChangeSearchedit()
2157 if (m_LogList
.m_sFilterText
.IsEmpty())
2159 CStoreSelection
storeselection(this);
2160 // clear the filter, i.e. make all entries appear
2161 theApp
.DoWaitCursor(1);
2162 KillTimer(LOGFILTER_TIMER
);
2163 FillLogMessageCtrl(false);
2166 //m_LogList.StartFilter();
2168 InterlockedExchange(&m_bNoDispUpdates
, TRUE
);
2169 m_arShownList
.RemoveAll();
2170 for (DWORD i
=0; i
<m_logEntries
.size(); ++i
)
2172 if (IsEntryInDateRange(i
))
2173 m_arShownList
.Add(m_logEntries
[i
]);
2175 InterlockedExchange(&m_bNoDispUpdates
, FALSE
);
2176 m_LogList
.DeleteAllItems();
2177 m_LogList
.SetItemCountEx(ShownCountWithStopped());
2178 m_LogList
.RedrawItems(0, ShownCountWithStopped());
2179 m_LogList
.SetRedraw(false);
2180 ResizeAllListCtrlCols();
2181 m_LogList
.SetRedraw(true);
2183 theApp
.DoWaitCursor(-1);
2184 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2185 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2186 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2187 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
2190 if (Validate(m_LogList
.m_sFilterText
))
2191 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
2193 KillTimer(LOGFILTER_TIMER
);
2197 void CLogDlg::OnBnClickedAllBranch()
2201 if(this->m_bAllBranch
)
2202 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
2204 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_ALL_BRANCH
;
2208 FillLogMessageCtrl(false);
2211 void CLogDlg::OnBnClickedFollowRenames()
2215 if(m_bFollowRenames
)
2217 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_FOLLOW
;
2221 m_bAllBranch
= FALSE
;
2222 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_ALL_BRANCH
;
2227 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_FOLLOW
;
2229 DialogEnableWindow(IDC_LOG_ALLBRANCH
, !m_bFollowRenames
);
2230 DialogEnableWindow(IDC_SHOWWHOLEPROJECT
, !m_bFollowRenames
);
2234 FillLogMessageCtrl(false);
2237 void CLogDlg::OnBnClickedBrowseRef()
2239 CString newRef
= CBrowseRefsDlg::PickRef(false,m_LogList
.GetStartRef());
2240 if(newRef
.IsEmpty())
2243 SetStartRef(newRef
);
2244 ((CButton
*)GetDlgItem(IDC_LOG_ALLBRANCH
))->SetCheck(0);
2246 OnBnClickedAllBranch();
2249 void CLogDlg::ShowStartRef()
2251 //Show ref name on top
2252 if(!::IsWindow(m_hWnd
))
2256 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES
)));
2257 m_staticRef
.Invalidate(TRUE
);
2261 CString showStartRef
= m_LogList
.GetStartRef();
2262 if(showStartRef
.IsEmpty())
2265 if (g_Git
.Run(L
"git symbolic-ref HEAD", &showStartRef
, NULL
, CP_UTF8
))
2266 showStartRef
= CString(MAKEINTRESOURCE(IDS_PROC_LOG_NOBRANCH
));
2267 showStartRef
.Trim(L
"\r\n\t ");
2271 if(wcsncmp(showStartRef
,L
"refs/",5) == 0)
2272 showStartRef
= showStartRef
.Mid(5);
2273 if(wcsncmp(showStartRef
,L
"heads/",6) == 0)
2274 showStartRef
= showStartRef
.Mid(6);
2276 m_staticRef
.SetWindowText(showStartRef
);
2277 m_staticRef
.Invalidate(TRUE
);
2280 void CLogDlg::SetStartRef(const CString
& StartRef
)
2282 m_LogList
.SetStartRef(StartRef
);
2284 if (m_hightlightRevision
.IsEmpty())
2286 m_hightlightRevision
= g_Git
.GetHash(StartRef
);
2287 m_LogList
.m_lastSelectedHash
= m_hightlightRevision
;
2294 void CLogDlg::OnBnClickedFirstParent()
2298 if(this->m_bFirstParent
)
2299 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_FIRST_PARENT
;
2301 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_FIRST_PARENT
;
2305 FillLogMessageCtrl(false);
2309 void CLogDlg::OnBnClickShowWholeProject()
2313 if(this->m_bWholeProject
)
2315 m_LogList
.m_Path
.Reset();
2317 DialogEnableWindow(IDC_LOG_FOLLOWRENAMES
, FALSE
);
2321 m_LogList
.m_Path
=m_path
;
2322 DialogEnableWindow(IDC_LOG_FOLLOWRENAMES
, !(m_path
.IsEmpty() || m_path
.IsDirectory()));
2329 FillLogMessageCtrl(false);
2333 LRESULT
CLogDlg::OnRefLogChanged(WPARAM wParam
, LPARAM lParam
)
2335 UNREFERENCED_PARAMETER(wParam
);
2336 UNREFERENCED_PARAMETER(lParam
);
2341 LRESULT
CLogDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
2343 m_pTaskbarList
.Release();
2344 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);