1
// TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2009, 2015 - TortoiseSVN
4 // Copyright (C) 2008-2018 - 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"
22 #include "StatGraphDlg.h"
24 #include "MessageBox.h"
26 #include "StringUtils.h"
27 #include "UnicodeUtils.h"
30 #include "BrowseRefsDlg.h"
31 #include "SmartHandle.h"
32 #include "LogOrdering.h"
33 #include "ClipboardHelper.h"
36 #define MIN_CTRL_HEIGHT (CDPIAware::Instance().ScaleY(20))
37 #define MIN_SPLITTER_HEIGHT (CDPIAware::Instance().ScaleY(10))
39 #define WM_TGIT_REFRESH_SELECTION (WM_APP + 1)
41 IMPLEMENT_DYNAMIC(CLogDlg
, CResizableStandAloneDialog
)
42 CLogDlg::CLogDlg(CWnd
* pParent
/*=nullptr*/)
43 : CResizableStandAloneDialog(CLogDlg::IDD
, pParent
)
46 , m_bFollowRenames(false)
48 , m_bSelectionMustBeSingle(true)
50 , m_bShowLocalBranches(true)
51 , m_bShowRemoteBranches(true)
52 , m_bShowOtherRefs(true)
55 , m_bFirstParent(false)
56 , m_bWholeProject(FALSE
)
57 , m_iCompressedGraph(0)
60 , m_bSelectionMustBeContinuous(false)
62 , m_pNotifyWindow(nullptr)
66 , m_bNavigatingWithSelect(false)
68 m_bFilterWithRegex
= !!CRegDWORD(L
"Software\\TortoiseGit\\UseRegexFilter", FALSE
);
69 m_bFilterCaseSensitively
= !!CRegDWORD(L
"Software\\TortoiseGit\\FilterCaseSensitively", FALSE
);
70 m_bAsteriskLogPrefix
= !!CRegDWORD(L
"Software\\TortoiseGit\\AsteriskLogPrefix", TRUE
);
71 m_SelectedFilters
= CRegDWORD(L
"Software\\TortoiseGit\\SelectedLogFilters", LOGFILTER_ALL
);
73 CString str
= g_Git
.m_CurrentDir
;
74 str
.Replace(L
':', L
'_');
76 m_regbAllBranch
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\AllBranch\\" + str
, FALSE
);
77 m_AllBranchType
= (AllBranchType
)(DWORD
)m_regbAllBranch
;
78 switch (m_AllBranchType
)
80 case AllBranchType::None
:
83 case AllBranchType::AllBranches
:
87 m_bAllBranch
= BST_INDETERMINATE
;
90 m_regShowWholeProject
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\" + str
, FALSE
);
91 m_bWholeProject
= m_regShowWholeProject
;
92 m_regbShowTags
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\ShowTags\\" + str
, TRUE
);
93 m_bShowTags
= !!m_regbShowTags
;
94 m_regbShowLocalBranches
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\ShowLocalBranches\\" + str
, TRUE
);
95 m_bShowLocalBranches
= !!m_regbShowLocalBranches
;
96 m_regbShowRemoteBranches
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\ShowRemoteBranches\\" + str
, TRUE
);
97 m_bShowRemoteBranches
= !!m_regbShowRemoteBranches
;
98 m_regbShowOtherRefs
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\ShowOtherRefs\\" + str
, TRUE
);
99 m_bShowOtherRefs
= !!m_regbShowOtherRefs
;
102 m_regAddBeforeCommit
= CRegDWORD(L
"Software\\TortoiseGit\\AddBeforeCommit", TRUE
);
103 m_bShowUnversioned
= !!m_regAddBeforeCommit
;
105 m_bShowGravatar
= !!CRegDWORD(L
"Software\\TortoiseGit\\EnableGravatar", FALSE
);
106 m_regbShowGravatar
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\ShowGravatar\\" + str
, m_bShowGravatar
);
107 m_bShowGravatar
= !!m_regbShowGravatar
;
108 m_bShowDescribe
= !!CRegDWORD(L
"Software\\TortoiseGit\\ShowDescribe");
109 m_bShowBranchRevNo
= !!CRegDWORD(L
"Software\\TortoiseGit\\ShowBranchRevisionNumber", FALSE
);
114 m_regbAllBranch
= (DWORD
)m_AllBranchType
;
115 m_regbShowTags
= m_bShowTags
;
116 m_regbShowLocalBranches
= m_bShowLocalBranches
;
117 m_regbShowRemoteBranches
= m_bShowRemoteBranches
;
118 m_regbShowOtherRefs
= m_bShowOtherRefs
;
119 m_regbShowGravatar
= m_bShowGravatar
;
120 m_regAddBeforeCommit
= m_bShowUnversioned
;
123 void CLogDlg::DoDataExchange(CDataExchange
* pDX
)
125 CResizableStandAloneDialog::DoDataExchange(pDX
);
126 DDX_Control(pDX
, IDC_LOGLIST
, m_LogList
);
127 DDX_Control(pDX
, IDC_LOGMSG
, m_ChangedFileListCtrl
);
128 DDX_Control(pDX
, IDC_PROGRESS
, m_LogProgress
);
129 DDX_Control(pDX
, IDC_SPLITTERTOP
, m_wndSplitter1
);
130 DDX_Control(pDX
, IDC_SPLITTERBOTTOM
, m_wndSplitter2
);
131 DDX_Text(pDX
, IDC_SEARCHEDIT
, m_sFilterText
);
132 DDX_Control(pDX
, IDC_DATEFROM
, m_DateFrom
);
133 DDX_Control(pDX
, IDC_DATETO
, m_DateTo
);
134 DDX_Control(pDX
, IDC_LOG_JUMPTYPE
, m_JumpType
);
135 DDX_Control(pDX
, IDC_LOG_JUMPUP
, m_JumpUp
);
136 DDX_Control(pDX
, IDC_LOG_JUMPDOWN
, m_JumpDown
);
137 DDX_Text(pDX
, IDC_LOGINFO
, m_sLogInfo
);
138 DDX_Check(pDX
, IDC_LOG_ALLBRANCH
,m_bAllBranch
);
139 DDX_Check(pDX
, IDC_WHOLE_PROJECT
, m_bWholeProject
);
140 DDX_Control(pDX
, IDC_WALKBEHAVIOUR
, m_ctrlWalkBehavior
);
141 DDX_Control(pDX
, IDC_VIEW
, m_ctrlView
);
142 DDX_Control(pDX
, IDC_SEARCHEDIT
, m_cFilter
);
143 DDX_Control(pDX
, IDC_STATIC_REF
, m_staticRef
);
144 DDX_Control(pDX
, IDC_PIC_AUTHOR
, m_gravatar
);
145 DDX_Control(pDX
, IDC_FILTER
, m_cFileFilter
);
148 BEGIN_MESSAGE_MAP(CLogDlg
, CResizableStandAloneDialog
)
151 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGLIST
, OnLvnItemchangedLoglist
)
152 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGMSG
, OnLvnItemchangedLogmsg
)
153 ON_NOTIFY(NM_CUSTOMDRAW
, IDC_LOGMSG
, OnNMCustomdrawChangedFileList
)
154 ON_NOTIFY(EN_LINK
, IDC_MSGVIEW
, OnEnLinkMsgview
)
155 ON_EN_VSCROLL(IDC_MSGVIEW
, OnEnscrollMsgview
)
156 ON_EN_HSCROLL(IDC_MSGVIEW
, OnEnscrollMsgview
)
157 ON_BN_CLICKED(IDC_STATBUTTON
, OnBnClickedStatbutton
)
159 ON_MESSAGE(WM_TGIT_REFRESH_SELECTION
, OnRefreshSelection
)
160 ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_INFOCLICKED
, OnClickedInfoIcon
)
161 ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_CANCELCLICKED
, OnClickedCancelFilter
)
163 ON_MESSAGE(MSG_LOAD_PERCENTAGE
,OnLogListLoading
)
165 ON_EN_CHANGE(IDC_SEARCHEDIT
, OnEnChangeSearchedit
)
167 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATETO
, OnDtnDatetimechangeDateto
)
168 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATEFROM
, OnDtnDatetimechangeDatefrom
)
169 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE
, &CLogDlg::OnCbnSelchangeJumpType
)
170 ON_COMMAND(IDC_LOG_JUMPUP
, &CLogDlg::OnBnClickedJumpUp
)
171 ON_COMMAND(IDC_LOG_JUMPDOWN
, &CLogDlg::OnBnClickedJumpDown
)
172 ON_COMMAND(ID_GO_UP
, &CLogDlg::OnBnClickedJumpUp
)
173 ON_COMMAND(ID_GO_DOWN
, &CLogDlg::OnBnClickedJumpDown
)
174 ON_COMMAND(ID_EXITCLEARFILTER
, OnExitClearFilter
)
175 ON_BN_CLICKED(IDC_WALKBEHAVIOUR
, OnBnClickedWalkBehaviour
)
176 ON_BN_CLICKED(IDC_VIEW
, OnBnClickedView
)
177 ON_BN_CLICKED(IDC_WHOLE_PROJECT
, OnBnClickShowWholeProject
)
178 ON_NOTIFY(LVN_COLUMNCLICK
,IDC_LOGLIST
, OnLvnColumnclick
)
179 ON_COMMAND(MSG_FETCHED_DIFF
, OnBnClickedHidepaths
)
180 ON_BN_CLICKED(IDC_LOG_ALLBRANCH
, OnBnClickedAllBranch
)
181 ON_EN_CHANGE(IDC_FILTER
, OnEnChangeFileFilter
)
183 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATEFROM
, &CLogDlg::OnDtnDropdownDatefrom
)
185 ON_BN_CLICKED(IDC_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
186 ON_STN_CLICKED(IDC_STATIC_REF
, &CLogDlg::OnBnClickedBrowseRef
)
187 ON_COMMAND(ID_LOGDLG_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
188 ON_COMMAND(ID_GO_BACKWARD_SELECT
, &CLogDlg::GoBackAndSelect
)
189 ON_COMMAND(ID_GO_FORWARD_SELECT
, &CLogDlg::GoForwardAndSelect
)
190 ON_COMMAND(ID_GO_BACKWARD
, &CLogDlg::GoBack
)
191 ON_COMMAND(ID_GO_FORWARD
, &CLogDlg::GoForward
)
192 ON_COMMAND(ID_SELECT_SEARCHFIELD
, &CLogDlg::OnSelectSearchField
)
193 ON_COMMAND(ID_LOGDLG_FIND
, &CLogDlg::OnFind
)
194 ON_COMMAND(ID_LOGDLG_FOCUSFILTER
, &CLogDlg::OnFocusFilter
)
195 ON_COMMAND(ID_EDIT_COPY
, &CLogDlg::OnEditCopy
)
196 ON_MESSAGE(MSG_REFLOG_CHANGED
, OnRefLogChanged
)
197 ON_REGISTERED_MESSAGE(TaskBarButtonCreated
, OnTaskbarBtnCreated
)
199 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED
, &CLogDlg::OnFileListCtrlItemChanged
)
200 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
, OnGitStatusListCtrlNeedsRefresh
)
201 ON_REGISTERED_MESSAGE(CGitLogListBase::LOGLIST_RESET_WCREV
, OnResetWcRev
)
211 JumpType_AuthorEmail
,
212 JumpType_CommitterEmail
,
223 LRESULT
CLogDlg::OnResetWcRev(WPARAM
, LPARAM
)
225 if (m_LogList
.m_hasWC
&& m_ChangedFileListCtrl
.m_CurrentVersion
.IsEmpty())
226 m_ChangedFileListCtrl
.Clear();
231 LRESULT
CLogDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
233 if (m_LogList
.m_hasWC
&& m_LogList
.GetSelectedCount() == 1)
235 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
236 size_t selIndex
= m_LogList
.GetNextSelectedItem(pos
);
237 GitRevLoglist
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(selIndex
);
238 if (pLogEntry
&& pLogEntry
->m_CommitHash
.IsEmpty())
239 m_ChangedFileListCtrl
.StoreScrollPos();
241 m_LogList
.ResetWcRev(true);
242 m_LogList
.Invalidate();
246 void CLogDlg::SetParams(const CTGitPath
& orgPath
, const CTGitPath
& path
, CString hightlightRevision
, CString range
, DWORD limit
, int limitScale
/*=-1*/)
250 m_hightlightRevision
= hightlightRevision
;
252 if (range
== GIT_REV_ZERO
)
255 if (!(range
.IsEmpty() || range
== L
"HEAD"))
257 m_bAllBranch
= BST_UNCHECKED
;
258 m_AllBranchType
= AllBranchType::None
;
263 if (limitScale
== CFilterData::SHOW_NO_LIMIT
|| (!range
.IsEmpty() && m_LogList
.m_Filter
.m_NumberOfLogsScale
!= CFilterData::SHOW_LAST_N_COMMITS
))
264 m_LogList
.m_Filter
.m_NumberOfLogsScale
= CFilterData::SHOW_NO_LIMIT
;
265 if (limitScale
>= CFilterData::SHOW_LAST_N_COMMITS
&& limit
> 0)
267 // limitation from command line argument, so override the filter.
268 m_LogList
.m_Filter
.m_NumberOfLogs
= limit
;
269 m_LogList
.m_Filter
.m_NumberOfLogsScale
= limitScale
;
272 if (::IsWindow(m_hWnd
))
276 void CLogDlg::SetFilter(const CString
& findstr
, LONG findtype
, bool findregex
)
278 m_LogList
.m_LogFilter
= std::make_shared
<CLogDlgFilter
>(findstr
, m_bFilterWithRegex
, (DWORD
)findtype
, m_bFilterCaseSensitively
);
279 m_sFilterText
= findstr
;
280 m_bFilterWithRegex
= findregex
;
283 BOOL
CLogDlg::OnInitDialog()
286 CResizableStandAloneDialog::OnInitDialog();
287 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
289 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
290 // do this, Explorer would be unable to send that message to our window if we
291 // were running elevated. It's OK to make the call all the time, since if we're
292 // not elevated, this is a no-op.
293 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
294 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
295 CAutoLibrary hUser
= AtlLoadSystemLibraryUsingFullPath(L
"user32.dll");
298 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
299 if (pfnChangeWindowMessageFilterEx
)
301 pfnChangeWindowMessageFilterEx(m_hWnd
, TaskBarButtonCreated
, MSGFLT_ALLOW
, &cfs
);
304 m_pTaskbarList
.Release();
305 if (FAILED(m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
)))
306 m_pTaskbarList
= nullptr;
308 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG
));
310 // use the state of the "stop on copy/rename" option from the last time
313 // set the font to use in the log message view, configured in the settings dialog
314 CAppUtils::CreateFontForLogs(m_logFont
);
315 GetDlgItem(IDC_MSGVIEW
)->SetFont(&m_logFont
);
316 // make the log message rich edit control send a message when the mouse pointer is over a link
317 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_SETEVENTMASK
, NULL
, ENM_LINK
| ENM_SCROLL
);
319 // "unrelated paths" should be in gray color
322 // set up the columns
323 m_LogList
.DeleteAllItems();
325 m_LogList
.m_Path
=m_path
;
326 m_LogList
.m_hasWC
= !GitAdminDir::IsBareRepo(g_Git
.m_CurrentDir
);
327 m_LogList
.m_bShowWC
= m_LogList
.m_hasWC
&& m_bShowWC
;
328 m_LogList
.InsertGitColumn();
331 m_LogList
.m_Path
.Reset();
333 m_ChangedFileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
, L
"LogDlg", (GITSLC_POPALL
^ (GITSLC_POPIGNORE
| GITSLC_POPRESTORE
)), false, m_LogList
.m_hasWC
, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
335 GetDlgItem(IDC_LOGLIST
)->UpdateData(FALSE
);
339 CheckRegexpTooltip();
343 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
344 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
, 14, 14);
345 m_cFilter
.SetInfoIcon(IDI_LOGFILTER
, 19, 19);
346 m_cFilter
.SetValidator(this);
348 AdjustControlSize(IDC_LOG_ALLBRANCH
);
349 AdjustControlSize(IDC_WHOLE_PROJECT
);
351 GetClientRect(m_DlgOrigRect
);
352 m_LogList
.GetClientRect(m_LogListOrigRect
);
353 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(m_MsgViewOrigRect
);
354 m_ChangedFileListCtrl
.GetClientRect(m_ChgOrigRect
);
356 m_Brush
.CreateSolidBrush(RGB(174, 200, 255));
358 m_DateFrom
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
359 m_DateTo
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
| MCS_NOTRAILINGDATES
| MCS_NOSELCHANGEONNAV
);
361 m_staticRef
.SetURL(CString());
366 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_LOCAL_BRANCHES
;
367 if (m_AllBranchType
== AllBranchType::AllBranches
)
368 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
369 else if (m_AllBranchType
== AllBranchType::AllLocalBranches
)
370 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
371 else if (m_AllBranchType
== AllBranchType::AllBasicRefs
)
372 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_BASIC_REFS
;
374 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_ALL_BRANCH
;
376 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
377 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
378 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
379 HandleShowLabels(m_bShowOtherRefs
, LOGLIST_SHOWOTHERREFS
);
381 // SetPromptParentWindow(m_hWnd);
382 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL
)));
383 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL
)));
384 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT
)));
385 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1
)));
386 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2
)));
387 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG
)));
388 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF
)));
389 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH
)));
390 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH_FF
)));
391 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_SELECTION_HISTORY
)));
392 m_JumpType
.SetCurSel(0);
393 int iconWidth
= GetSystemMetrics(SM_CXSMICON
);
394 int iconHeight
= GetSystemMetrics(SM_CYSMICON
);
395 m_JumpUp
.SetIcon(CCommonAppUtils::LoadIconEx(IDI_JUMPUP
, iconWidth
, iconHeight
));
396 m_JumpDown
.SetIcon(CCommonAppUtils::LoadIconEx(IDI_JUMPDOWN
, iconWidth
, iconHeight
));
398 if (GetExplorerHWND())
399 CenterWindow(CWnd::FromHandle(GetExplorerHWND()));
400 EnableSaveRestore(L
"LogDlg");
402 DWORD yPos1
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1");
403 DWORD yPos2
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2");
404 RECT rcDlg
, rcLogList
, rcChgMsg
;
405 GetClientRect(&rcDlg
);
406 m_LogList
.GetWindowRect(&rcLogList
);
407 ScreenToClient(&rcLogList
);
408 m_ChangedFileListCtrl
.GetWindowRect(&rcChgMsg
);
409 ScreenToClient(&rcChgMsg
);
410 if (yPos1
&& ((LONG
)yPos1
< rcDlg
.bottom
- CDPIAware::Instance().ScaleY(185)))
413 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
414 ScreenToClient(&rectSplitter
);
415 int delta
= yPos1
- rectSplitter
.top
;
417 if ((rcLogList
.bottom
+ delta
> rcLogList
.top
) && (rcLogList
.bottom
+ delta
< rcChgMsg
.bottom
- CDPIAware::Instance().ScaleY(30)))
419 m_wndSplitter1
.SetWindowPos(nullptr, rectSplitter
.left
, yPos1
, 0, 0, SWP_NOSIZE
);
423 if (yPos2
&& ((LONG
)yPos2
< rcDlg
.bottom
- CDPIAware::Instance().ScaleY(153)))
426 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
427 ScreenToClient(&rectSplitter
);
428 int delta
= yPos2
- rectSplitter
.top
;
430 if ((rcChgMsg
.top
+ delta
< rcChgMsg
.bottom
) && (rcChgMsg
.top
+ delta
> rcLogList
.top
+ CDPIAware::Instance().ScaleY(30)))
432 m_wndSplitter2
.SetWindowPos(nullptr, rectSplitter
.left
, yPos2
, 0, 0, SWP_NOSIZE
);
442 // the dialog is used to select revisions
443 // enable the OK button if appropriate
448 // the dialog is used to just view log messages
449 // hide the OK button and set text on Cancel button to OK
450 GetDlgItemText(IDOK
, temp
);
451 SetDlgItemText(IDCANCEL
, temp
);
452 GetDlgItem(IDOK
)->ShowWindow(SW_HIDE
);
455 // first start a thread to obtain the log messages without
456 // blocking the dialog
458 //m_tFrom = (DWORD)-1;
460 // scroll to user selected or current revision
461 if (m_hightlightRevision
.IsEmpty() || g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, m_hightlightRevision
))
463 if (g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, L
"HEAD"))
464 MessageBox(g_Git
.GetGitLastErr(L
"Could not get HEAD hash."), L
"TortoiseGit", MB_ICONERROR
);
467 if (g_Git
.GetConfigValueBool(L
"tgit.logshowpatch"))
470 m_LogList
.FetchLogAsync(this);
474 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
, 14, 14);
475 m_cFilter
.SetInfoIcon(IDI_LOGFILTER
, 19, 19);
476 temp
.LoadString(IDS_FILEDIFF_FILTERCUE
);
478 m_cFileFilter
.SetCueBanner(temp
);
480 GetDlgItem(IDC_LOGLIST
)->SetFocus();
482 m_History
.SetMaxHistoryItems((LONG
)CRegDWORD(L
"Software\\TortoiseGit\\MaxRefHistoryItems", 5));
484 reg
.Format(L
"Software\\TortoiseGit\\History\\log-refs\\%s", (LPCTSTR
)g_Git
.m_CurrentDir
);
485 reg
.Replace(L
':', L
'_');
486 m_History
.Load(reg
, L
"ref");
488 reg
.Format(L
"Software\\TortoiseGit\\History\\LogDlg_Limits\\%s\\FromDate", (LPCTSTR
)g_Git
.m_CurrentDir
);
489 reg
.Replace(L
':', L
'_');
490 m_regLastSelectedFromDate
= CRegString(reg
);
492 m_ctrlWalkBehavior
.m_bAlwaysShowArrow
= true;
493 m_ctrlView
.m_bAlwaysShowArrow
= true;
499 HBRUSH
CLogDlg::OnCtlColor(CDC
* pDC
, CWnd
* pWnd
, UINT nCtlColor
)
501 HBRUSH hbr
= __super::OnCtlColor(pDC
, pWnd
, nCtlColor
);
503 if ((m_LogList
.m_Filter
.m_NumberOfLogsScale
>= CFilterData::SHOW_LAST_N_COMMITS
|| m_LogList
.m_Filter
.m_NumberOfLogsScale
== CFilterData::SHOW_LAST_SEL_DATE
&& m_LogList
.m_Filter
.m_From
!= -1) && pWnd
->GetDlgCtrlID() == IDC_FROMLABEL
)
505 pDC
->SetBkMode(TRANSPARENT
);
512 void CLogDlg::OnPaint()
516 if (!(m_LogList
.m_Filter
.m_NumberOfLogsScale
>= CFilterData::SHOW_LAST_N_COMMITS
|| m_LogList
.m_Filter
.m_NumberOfLogsScale
== CFilterData::SHOW_LAST_SEL_DATE
&& m_LogList
.m_Filter
.m_From
!= -1))
519 CWnd
* pWnd
= GetDlgItem(IDC_FROMLABEL
);
524 pWnd
->GetWindowRect(&rect
);
525 ScreenToClient(rect
);
530 dc
.FillRect(rect
, &m_Brush
);
533 LRESULT
CLogDlg::OnLogListLoading(WPARAM wParam
, LPARAM
/*lParam*/)
537 if( cur
== GITLOG_START
)
540 temp
.LoadString(IDS_PROGRESSWAIT
);
542 this->m_LogList
.ShowText(temp
, true);
544 // We use a progress bar while getting the logs
545 m_LogProgress
.SetRange32(0, 100);
546 m_LogProgress
.SetPos(0);
549 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
550 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
553 GetDlgItem(IDC_WALKBEHAVIOUR
)->ShowWindow(SW_HIDE
);
554 GetDlgItem(IDC_VIEW
)->ShowWindow(SW_HIDE
);
555 GetDlgItem(IDC_STATBUTTON
)->ShowWindow(SW_HIDE
);
556 GetDlgItem(IDC_PROGRESS
)->ShowWindow(TRUE
);
558 DialogEnableWindow(IDC_WALKBEHAVIOUR
, FALSE
);
559 DialogEnableWindow(IDC_STATBUTTON
, FALSE
);
560 //DialogEnableWindow(IDC_REFRESH, FALSE);
561 DialogEnableWindow(IDC_VIEW
, FALSE
);
564 else if( cur
== GITLOG_END
)
566 if(this->m_LogList
.HasText())
568 this->m_LogList
.ClearText();
570 UpdateLogInfoLabel();
573 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
575 DialogEnableWindow(IDC_WHOLE_PROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
577 DialogEnableWindow(IDC_STATBUTTON
, !(m_LogList
.m_arShownList
.empty() || m_LogList
.m_arShownList
.size() == 1 && m_LogList
.m_bShowWC
));
578 DialogEnableWindow(IDC_REFRESH
, TRUE
);
579 DialogEnableWindow(IDC_VIEW
, TRUE
);
580 DialogEnableWindow(IDC_WALKBEHAVIOUR
, TRUE
);
581 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
582 GetDlgItem(IDC_WALKBEHAVIOUR
)->ShowWindow(SW_SHOW
);
583 GetDlgItem(IDC_VIEW
)->ShowWindow(SW_SHOW
);
584 GetDlgItem(IDC_STATBUTTON
)->ShowWindow(SW_SHOW
);
585 GetDlgItem(IDC_PROGRESS
)->ShowWindow(FALSE
);
586 //CTime time=m_LogList.GetOldestTime();
588 m_LogList
.GetTimeRange(begin
,end
);
590 if (m_LogList
.m_Filter
.m_From
> 0 && m_LogList
.m_Filter
.m_NumberOfLogsScale
>= CFilterData::SHOW_LAST_SEL_DATE
)
591 begin
= m_LogList
.m_Filter
.m_From
;
592 m_DateFrom
.SetTime(&begin
);
593 if (m_LogList
.m_Filter
.m_To
!= -1)
594 end
= m_LogList
.m_Filter
.m_To
;
595 m_DateTo
.SetTime(&end
);
600 if(this->m_LogList
.HasText())
602 this->m_LogList
.ClearText();
603 this->m_LogList
.Invalidate();
605 UpdateLogInfoLabel();
606 m_LogProgress
.SetPos(cur
);
609 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
610 m_pTaskbarList
->SetProgressValue(m_hWnd
, cur
, 100);
615 void CLogDlg::SetDlgTitle()
617 if (m_sTitle
.IsEmpty())
618 GetWindowText(m_sTitle
);
620 if (m_LogList
.m_Path
.IsEmpty() || m_orgPath
.GetWinPathString().IsEmpty())
621 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
623 CAppUtils::SetWindowTitle(m_hWnd
, m_orgPath
.GetWinPathString(), m_sTitle
);
626 void CLogDlg::CheckRegexpTooltip()
628 CWnd
*pWnd
= GetDlgItem(IDC_SEARCHEDIT
);
629 // Since tooltip describes regexp features, show it only if regexps are enabled.
630 if (m_bFilterWithRegex
)
631 m_tooltips
.AddTool(pWnd
, IDS_LOG_FILTER_REGEX_TT
);
633 m_tooltips
.DelTool(pWnd
);
636 void CLogDlg::EnableOKButton()
640 // the dialog is used to select revisions
641 if (m_bSelectionMustBeSingle
)
643 // enable OK button if only a single revision is selected
644 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()==1));
646 else if (m_bSelectionMustBeContinuous
)
647 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()!=0)&&(m_LogList
.IsSelectionContinuous()));
649 DialogEnableWindow(IDOK
, m_LogList
.GetSelectedCount()!=0);
652 DialogEnableWindow(IDOK
, TRUE
);
655 bool LookLikeGitHash(const CString
& msg
, int &pos
)
658 for (; pos
< msg
.GetLength(); ++pos
)
660 if (msg
[pos
] >= '0' && msg
[pos
] <= '9' || msg
[pos
] >= 'a' && msg
[pos
] <= 'f')
663 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2 && msg
[pos
] != '@';
665 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2;
668 std::vector
<CHARRANGE
> FindGitHashPositions(const CString
& msg
, int offset
)
670 std::vector
<CHARRANGE
> result
;
671 offset
= offset
< 0 ? 0 : offset
;
673 while (offset
< msg
.GetLength())
676 TCHAR e
= msg
[offset
];
680 if (msg
.Mid(offset
, 11) == L
"git-svn-id:"
681 || msg
.Mid(offset
, 14) == L
"Signed-off-by:"
682 || msg
.Mid(offset
, 10) == L
"Change-Id:"
686 while (offset
< msg
.GetLength())
688 if (msg
[++offset
] == '\n')
694 else if (e
>= 'A' && e
<= 'Z' || e
>= 'h' && e
<= 'z')
699 } while (offset
< msg
.GetLength() && (e
>= 'A' && e
<= 'Z' || e
>= 'a' && e
<= 'z' || e
>= '0' && e
<= '9'));
701 else if (e
>= 'a' && e
<= 'g' || e
>= '0' && e
<= '9')
708 if (LookLikeGitHash(msg
, offset
))
710 TCHAR d
= offset
< msg
.GetLength() ? msg
[offset
] : '\0';
711 if (!((d
>= 'A' && d
<= 'Z') || (d
>= 'a' && d
<= 'z') || (d
>= '0' && d
<= '9')))
713 CHARRANGE range
= { old
, offset
};
714 result
.push_back(range
);
726 BOOL
FindGitHash(const CString
& msg
, int offset
, CWnd
*pWnd
)
728 std::vector
<CHARRANGE
> positions
= FindGitHashPositions(msg
, offset
);
729 CAppUtils::SetCharFormat(pWnd
, CFM_LINK
, CFE_LINK
, positions
);
731 return positions
.empty() ? FALSE
: TRUE
;
734 static int DescribeCommit(CGitHash
& hash
, CString
& result
)
736 CAutoRepository
repo(g_Git
.GetGitRepository());
740 if (git_object_lookup(commit
.GetPointer(), repo
, hash
, GIT_OBJ_COMMIT
))
743 CAutoDescribeResult describe
;
744 git_describe_options describe_options
= GIT_DESCRIBE_OPTIONS_INIT
;
745 describe_options
.describe_strategy
= CRegDWORD(L
"Software\\TortoiseGit\\DescribeStrategy", GIT_DESCRIBE_DEFAULT
);
746 describe_options
.only_follow_first_parent
= CRegDWORD(L
"Software\\TortoiseGit\\DescribeOnlyFollowFirstParent", 0);
747 if (git_describe_commit(describe
.GetPointer(), (git_object
*)commit
, &describe_options
))
750 CAutoBuf describe_buf
;
751 git_describe_format_options format_options
= GIT_DESCRIBE_FORMAT_OPTIONS_INIT
;
752 format_options
.abbreviated_size
= CRegDWORD(L
"Software\\TortoiseGit\\DescribeAbbreviatedSize", GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE
);
753 format_options
.always_use_long_format
= CRegDWORD(L
"Software\\TortoiseGit\\DescribeAlwaysLong");
754 if (git_describe_format(describe_buf
, describe
, &format_options
))
757 result
= CUnicodeUtils::GetUnicode(describe_buf
->ptr
);
763 bool IsAllWhitespace(const CString
& text
, long first
, long last
)
765 for (; first
< last
; ++first
)
767 wchar_t c
= text
[first
];
771 if (c
!= L
' ' && c
!= L
'\t' && c
!= L
'\r' && c
!= L
'\n')
778 void ReduceRanges(std::vector
<CHARRANGE
>& ranges
, const CString
& text
)
780 if (ranges
.size() < 2)
783 auto begin
= ranges
.begin();
784 auto end
= ranges
.end();
787 for (auto source
= begin
+ 1; source
!= end
; ++source
)
788 if (IsAllWhitespace(text
, target
->cpMax
, source
->cpMin
))
789 target
->cpMax
= source
->cpMax
;
791 *(++target
) = *source
;
793 ranges
.erase(++target
, end
);
797 void CLogDlg::FillLogMessageCtrl(bool bShow
/* = true*/)
799 // we fill here the log message rich edit control,
800 // and also populate the changed files list control
801 // according to the selected revision(s).
803 CRichEditCtrl
* pMsgView
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
804 // empty the log message view
805 pMsgView
->SetWindowText(L
" ");
807 // empty the changed files list
808 m_ChangedFileListCtrl
.SetRedraw(FALSE
);
809 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
810 m_ChangedFileListCtrl
.Clear();
812 // if we're not here to really show a selected revision, just
813 // get out of here after clearing the views, which is what is intended
814 // if that flag is not set.
818 m_ChangedFileListCtrl
.Invalidate();
819 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
820 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
821 m_gravatar
.LoadGravatar();
825 // depending on how many revisions are selected, we have to do different
827 int selCount
= m_LogList
.GetSelectedCount();
830 // if nothing is selected, we have nothing more to do
831 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
832 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
833 m_gravatar
.LoadGravatar();
836 else if (selCount
== 1)
838 // if one revision is selected, we have to fill the log message view
839 // with the corresponding log message, and also fill the changed files
841 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
842 size_t selIndex
= m_LogList
.GetNextSelectedItem(pos
);
843 if (selIndex
>= m_LogList
.m_arShownList
.size())
845 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
846 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
849 GitRevLoglist
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(selIndex
);
852 m_gravatar
.LoadGravatar(pLogEntry
->GetAuthorEmail());
854 CString out_describe
;
858 if (!DescribeCommit(pLogEntry
->m_CommitHash
, result
))
859 out_describe
= L
"Describe: " + result
+ L
"\n";
863 if (m_bShowBranchRevNo
&& !pLogEntry
->m_CommitHash
.IsEmpty())
865 bool isFirstParentCommit
= !pLogEntry
->m_Lanes
.empty() && Lanes::isActive(pLogEntry
->m_Lanes
[0]);
867 if (isFirstParentCommit
)
869 CString rev_counter
, rev_err
;
870 if (g_Git
.Run(L
"git.exe rev-list --count --first-parent " + pLogEntry
->m_CommitHash
.ToString(), &rev_counter
, &rev_err
, CP_UTF8
))
871 CMessageBox::Show(GetSafeHwnd(), L
"Could not get rev count\n" + rev_counter
+ L
'\n' + rev_err
, L
"TortoiseGit", MB_ICONERROR
);
873 out_counter
= L
", " + CString(MAKEINTRESOURCE(IDS_REV_COUNTER
)) + L
": " + rev_counter
.Trim();
877 std::vector
<CHARRANGE
> hightlightRanges
;
878 std::vector
<CHARRANGE
> boldRanges
;
879 auto filter
= m_LogList
.m_LogFilter
;
881 // set the log message text
882 CString msg
= CString(MAKEINTRESOURCE(IDS_HASH
)) + L
": ";
883 int offset
= msg
.GetLength();
884 msg
+= pLogEntry
->m_CommitHash
.ToString();
885 if ((m_SelectedFilters
& LOGFILTER_REVS
) && filter
->IsFilterActive())
886 filter
->GetMatchRanges(hightlightRanges
, msg
.Mid(offset
), offset
);
887 msg
+= out_counter
+ L
"\n" + out_describe
+ L
"\n";
889 if (m_bAsteriskLogPrefix
)
891 offset
= msg
.GetLength();
892 msg
+= pLogEntry
->GetSubject();
894 boldRanges
.push_back({ offset
, msg
.GetLength() });
895 if ((m_SelectedFilters
& (LOGFILTER_SUBJECT
| LOGFILTER_MESSAGES
)) && filter
->IsFilterActive())
896 filter
->GetMatchRanges(hightlightRanges
, msg
.Mid(offset
), offset
);
899 offset
= msg
.GetLength();
900 msg
+= pLogEntry
->GetBody();
902 if ((m_SelectedFilters
& LOGFILTER_MESSAGES
) && filter
->IsFilterActive())
903 filter
->GetMatchRanges(hightlightRanges
, msg
.Mid(offset
), offset
);
905 if (!pLogEntry
->m_Notes
.IsEmpty())
908 if (m_bAsteriskLogPrefix
)
910 offset
= msg
.GetLength();
911 msg
+= CString(MAKEINTRESOURCE(IDS_NOTES
)) + L
":\n";
912 boldRanges
.push_back({ offset
, msg
.GetLength() });
913 msg
+= pLogEntry
->m_Notes
;
915 if ((m_SelectedFilters
& LOGFILTER_NOTES
) && filter
->IsFilterActive())
916 filter
->GetMatchRanges(hightlightRanges
, msg
.Mid(offset
), offset
);
919 CString tagInfo
= m_LogList
.GetTagInfo(pLogEntry
);
920 if (!tagInfo
.IsEmpty())
923 if (m_bAsteriskLogPrefix
)
925 offset
= msg
.GetLength();
926 msg
+= CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO
)) + L
":\n";
927 boldRanges
.push_back({ offset
, msg
.GetLength() });
930 if ((m_SelectedFilters
& LOGFILTER_ANNOTATEDTAG
) && filter
->IsFilterActive())
931 filter
->GetMatchRanges(hightlightRanges
, msg
.Mid(offset
), offset
);
934 pMsgView
->SetWindowText(msg
);
936 CAppUtils::SetCharFormat(pMsgView
, CFM_BOLD
, CFE_BOLD
, boldRanges
);
937 if (!hightlightRanges
.empty())
939 ReduceRanges(hightlightRanges
, msg
);
940 CAppUtils::SetCharFormat(pMsgView
, CFM_COLOR
, m_Colors
.GetColor(CColors::FilterMatch
), hightlightRanges
);
943 // turn bug ID's into links if the bugtraq: properties have been set
944 // and we can find a match of those in the log message
945 int findHashStart
= msg
.Find(L
'\n');
946 if (!out_describe
.IsEmpty())
947 findHashStart
= msg
.Find(L
'\n', findHashStart
+ 1);
948 FindGitHash(msg
, findHashStart
, pMsgView
);
949 m_LogList
.m_ProjectProperties
.FindBugID(msg
, pMsgView
);
950 CAppUtils::StyleURLs(msg
, pMsgView
);
951 if (((DWORD
)CRegStdDWORD(L
"Software\\TortoiseGit\\StyleCommitMessages", TRUE
)) == TRUE
)
952 CAppUtils::FormatTextInRichEditControl(pMsgView
);
954 if (!pLogEntry
->m_IsDiffFiles
)
956 m_ChangedFileListCtrl
.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES
)));
957 m_ChangedFileListCtrl
.SetBusy(TRUE
);
958 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
959 // entry might not already been enqueued for updating, issue #3090
960 pLogEntry
->GetAction(&m_LogList
);
964 CString matchpath
=this->m_path
.GetGitPathString();
966 CTGitPathList
& files
= pLogEntry
->GetFiles(&m_LogList
);
967 int count
= files
.GetCount();
968 if (!m_bWholeProject
&& !matchpath
.IsEmpty() && m_iHidePaths
)
970 if (m_path
.IsDirectory() && !CStringUtils::EndsWith(matchpath
, L
'/'))
971 matchpath
.AppendChar(L
'/');
972 int matchPathLen
= matchpath
.GetLength();
973 bool somethingHidden
= false;
974 for (int i
= 0; i
< count
; ++i
)
976 ((CTGitPath
&)files
[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
| CTGitPath::LOGACTIONS_GRAY
);
978 bool bothAreDirectory
= m_path
.IsDirectory() && files
[i
].IsDirectory() && files
[i
].GetGitPathString().GetLength() == matchPathLen
- 1; // submodules don't end with slash, but we must also not match a submodule in a fodler with an equal prefix
979 if ((bothAreDirectory
&& wcsncmp(files
[i
].GetGitPathString(), matchpath
, matchPathLen
- 1) || !bothAreDirectory
&& wcsncmp(files
[i
].GetGitPathString(), matchpath
, matchPathLen
)) && ((files
[i
].m_Action
& (CTGitPath::LOGACTIONS_REPLACED
| CTGitPath::LOGACTIONS_COPY
)) == 0 || (bothAreDirectory
&& wcsncmp(files
[i
].GetGitOldPathString(), matchpath
, matchPathLen
- 1) || !bothAreDirectory
&& wcsncmp(files
[i
].GetGitOldPathString(), matchpath
, matchPathLen
))))
981 somethingHidden
= true;
982 if (m_iHidePaths
== 1)
983 ((CTGitPath
&)files
[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
984 else if (m_iHidePaths
== 2)
985 ((CTGitPath
&)files
[i
]).m_Action
|= CTGitPath::LOGACTIONS_GRAY
;
989 pLogEntry
->GetAction(&m_LogList
) |= CTGitPath::LOGACTIONS_HIDE
;
991 pLogEntry
->GetAction(&m_LogList
) &= ~CTGitPath::LOGACTIONS_HIDE
;
993 else if (pLogEntry
->GetAction(&m_LogList
) & CTGitPath::LOGACTIONS_HIDE
)
995 pLogEntry
->GetAction(&m_LogList
) &= ~CTGitPath::LOGACTIONS_HIDE
;
996 for (int i
= 0 ; i
< count
; ++i
)
997 ((CTGitPath
&)files
[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
| CTGitPath::LOGACTIONS_GRAY
);
1001 m_cFileFilter
.GetWindowText(fileFilter
);
1002 if (!fileFilter
.IsEmpty())
1004 fileFilter
.MakeLower();
1005 bool somethingHidden
= false;
1006 for (int i
= 0; i
< count
; ++i
)
1008 CString
sPath(files
[i
].GetGitPathString());
1010 if (sPath
.Find(fileFilter
) < 0)
1012 ((CTGitPath
&)files
[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
1013 somethingHidden
= true;
1016 if (somethingHidden
)
1017 pLogEntry
->GetAction(&m_LogList
) |= CTGitPath::LOGACTIONS_HIDE
;
1020 m_ChangedFileListCtrl
.UpdateWithGitPathList(files
);
1021 m_ChangedFileListCtrl
.m_CurrentVersion
= pLogEntry
->m_CommitHash
.ToString();
1022 if (pLogEntry
->m_CommitHash
.IsEmpty() && m_bShowUnversioned
)
1024 m_ChangedFileListCtrl
.UpdateUnRevFileList(pLogEntry
->GetUnRevFiles());
1025 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
| GITSLC_SHOWUNVERSIONED
);
1028 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
1030 m_ChangedFileListCtrl
.SetBusy(FALSE
);
1032 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
1039 // more than one revision is selected:
1040 // the log message view must be emptied
1041 // the changed files list contains all the changed paths from all
1042 // selected revisions, with 'doubles' removed
1043 m_gravatar
.LoadGravatar();
1047 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
1049 // sort according to the settings
1050 if (m_nSortColumnPathList
> 0)
1051 SetSortArrow(&m_ChangedFileListCtrl
, m_nSortColumnPathList
, m_bAscendingPathList
);
1053 SetSortArrow(&m_ChangedFileListCtrl
, -1, false);
1054 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
1057 void CLogDlg::FillPatchView(bool onlySetTimer
)
1059 if (!::IsWindow(this->m_patchViewdlg
.m_hWnd
))
1062 KillTimer(LOG_FILLPATCHVTIMER
);
1065 SetTimer(LOG_FILLPATCHVTIMER
, 100, nullptr);
1069 POSITION posLogList
= m_LogList
.GetFirstSelectedItemPosition();
1070 if (posLogList
== nullptr)
1072 m_patchViewdlg
.ClearView();
1073 return; // nothing is selected, get out of here
1076 GitRev
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(posLogList
));
1077 if (pLogEntry
== nullptr || m_LogList
.GetNextSelectedItem(posLogList
) != -1)
1079 m_patchViewdlg
.ClearView();
1083 auto locker(m_ChangedFileListCtrl
.AcquireReadWeakLock(50));
1084 if (!locker
.IsAcquired())
1086 SetTimer(LOG_FILLPATCHVTIMER
, 100, nullptr);
1089 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1094 int diffContext
= g_Git
.GetConfigValueInt32(L
"diff.context", -1);
1096 CString rev1
= pLogEntry
->m_CommitHash
.IsEmpty() ? L
"HEAD" : (pLogEntry
->m_CommitHash
.ToString() + L
"~1");
1097 CString rev2
= pLogEntry
->m_CommitHash
.IsEmpty() ? GIT_REV_ZERO
: pLogEntry
->m_CommitHash
.ToString();
1098 g_Git
.GetUnifiedDiff(CTGitPath(), rev1
, rev2
, &outA
, false, false, diffContext
);
1099 out
= CUnicodeUtils::GetUnicode(outA
);
1105 int nSelect
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1106 auto p
= m_ChangedFileListCtrl
.GetListEntry(nSelect
);
1107 if (p
&& !(p
->m_Action
&CTGitPath::LOGACTIONS_UNVER
))
1110 if (pLogEntry
->m_CommitHash
.IsEmpty())
1111 cmd
.Format(L
"git.exe diff HEAD -- \"%s\"", (LPCTSTR
)p
->GetGitPathString());
1113 cmd
.Format(L
"git.exe diff %s^%d..%s -- \"%s\"", (LPCTSTR
)pLogEntry
->m_CommitHash
.ToString(), p
->m_ParentNo
+ 1, (LPCTSTR
)pLogEntry
->m_CommitHash
.ToString(), (LPCTSTR
)p
->GetGitPathString());
1114 g_Git
.Run(cmd
, &out
, CP_UTF8
);
1119 m_patchViewdlg
.SetText(out
);
1122 void CLogDlg::TogglePatchView()
1124 m_patchViewdlg
.m_ParentDlg
= this;
1125 if (!IsWindow(m_patchViewdlg
.m_hWnd
))
1127 if (g_Git
.GetConfigValueBool(L
"tgit.logshowpatch") == FALSE
)
1128 g_Git
.SetConfigValue(L
"tgit.logshowpatch", L
"true");
1129 m_patchViewdlg
.Create(IDD_PATCH_VIEW
, this);
1130 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTHTRACKING
, TRUE
);
1132 this->GetWindowRect(&rect
);
1134 m_patchViewdlg
.ShowWindow(SW_SHOW
);
1135 m_patchViewdlg
.SetWindowPos(nullptr, rect
.right
, rect
.top
, (DWORD
)CRegStdDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\PatchDlgWidth", rect
.Width()), rect
.Height(), SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOZORDER
);
1141 g_Git
.SetConfigValue(L
"tgit.logshowpatch", L
"false");
1142 m_patchViewdlg
.ShowWindow(SW_HIDE
);
1143 m_patchViewdlg
.DestroyWindow();
1147 LRESULT
CLogDlg::OnFileListCtrlItemChanged(WPARAM
/*wparam*/, LPARAM
/*lparam*/)
1149 FillPatchView(true);
1153 void CLogDlg::OnMoving(UINT fwSide
, LPRECT pRect
)
1155 __super::OnMoving(fwSide
, pRect
);
1157 if (!::IsWindow(m_patchViewdlg
.m_hWnd
))
1161 m_patchViewdlg
.GetWindowRect(&patchrect
);
1162 if (!::IsWindow(m_hWnd
))
1166 GetWindowRect(&thisrect
);
1167 if (patchrect
.left
== thisrect
.right
)
1169 m_patchViewdlg
.SetWindowPos(nullptr, patchrect
.left
- (thisrect
.left
- pRect
->left
), patchrect
.top
- (thisrect
.top
- pRect
->top
), 0, 0, SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOSIZE
| SWP_NOZORDER
);
1173 void CLogDlg::OnSizing(UINT fwSide
, LPRECT pRect
)
1175 __super::OnSizing(fwSide
, pRect
);
1177 if (!::IsWindow(this->m_patchViewdlg
.m_hWnd
))
1180 CRect thisrect
, patchrect
;
1181 this->GetWindowRect(thisrect
);
1182 this->m_patchViewdlg
.GetWindowRect(patchrect
);
1183 if (thisrect
.right
!= patchrect
.left
)
1186 patchrect
.left
-= (thisrect
.right
- pRect
->right
);
1187 patchrect
.right
-= (thisrect
.right
- pRect
->right
);
1189 if (patchrect
.bottom
== thisrect
.bottom
)
1190 patchrect
.bottom
-= (thisrect
.bottom
- pRect
->bottom
);
1191 if (patchrect
.top
== thisrect
.top
)
1192 patchrect
.top
-= thisrect
.top
- pRect
->top
;
1193 m_patchViewdlg
.MoveWindow(patchrect
);
1196 void CLogDlg::OnSelectSearchField()
1198 m_cFilter
.SetSel(0, -1, FALSE
);
1199 m_cFilter
.SetFocus();
1202 void CLogDlg::GoBack()
1204 GoBackForward(false, false);
1207 void CLogDlg::GoForward()
1209 GoBackForward(false, true);
1212 void CLogDlg::GoBackAndSelect()
1214 GoBackForward(true, false);
1217 void CLogDlg::GoForwardAndSelect()
1219 GoBackForward(true, true);
1222 void CLogDlg::GoBackForward(bool select
, bool bForward
)
1224 m_LogList
.m_highlight
.Empty();
1226 if (bForward
? m_LogList
.m_selectionHistory
.GoForward(gotoHash
) : m_LogList
.m_selectionHistory
.GoBack(gotoHash
))
1229 for (i
= 0; i
< (int)m_LogList
.m_arShownList
.size(); ++i
)
1231 GitRev
* rev
= m_LogList
.m_arShownList
.SafeGetAt(i
);
1233 if (rev
->m_CommitHash
== gotoHash
)
1235 m_LogList
.EnsureVisible(i
, FALSE
);
1238 m_LogList
.m_highlight
.Empty();
1239 m_LogList
.SetItemState(m_LogList
.GetSelectionMark(), 0, LVIS_SELECTED
| LVIS_FOCUSED
);
1240 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1243 int index
= m_LogList
.GetNextSelectedItem(pos
);
1245 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1247 m_bNavigatingWithSelect
= true;
1248 m_LogList
.SetItemState(i
, LVIS_SELECTED
| LVIS_FOCUSED
, LVIS_SELECTED
| LVIS_FOCUSED
);
1249 m_LogList
.SetSelectionMark(i
);
1250 m_bNavigatingWithSelect
= false;
1253 m_LogList
.m_highlight
= gotoHash
;
1254 m_LogList
.Invalidate();
1258 if (i
== (int)m_LogList
.m_arShownList
.size())
1261 msg
.Format(IDS_LOG_NOT_VISIBLE
, (LPCTSTR
)gotoHash
.ToString());
1262 MessageBox(msg
, L
"TortoiseGit", MB_OK
| MB_ICONINFORMATION
);
1266 PlaySound((LPCTSTR
)SND_ALIAS_SYSTEMASTERISK
, nullptr, SND_ASYNC
| SND_ALIAS_ID
);
1269 void CLogDlg::OnBnClickedRefresh()
1274 void CLogDlg::Refresh (bool clearfilter
/*autoGoOnline*/)
1277 DialogEnableWindow(IDOK
, FALSE
);
1278 m_LogList
.m_LogFilter
= std::make_shared
<CLogDlgFilter
>(m_sFilterText
, m_bFilterWithRegex
, (DWORD
)m_SelectedFilters
, m_bFilterCaseSensitively
);
1279 m_LogList
.Refresh(clearfilter
);
1281 m_sFilterText
.Empty();
1284 FillLogMessageCtrl(false);
1287 void CLogDlg::SaveSplitterPos()
1291 CRegDWORD
regPos1(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1");
1292 CRegDWORD
regPos2(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2");
1294 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
1295 ScreenToClient(&rectSplitter
);
1296 regPos1
= rectSplitter
.top
;
1297 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
1298 ScreenToClient(&rectSplitter
);
1299 regPos2
= rectSplitter
.top
;
1303 void CLogDlg::OnCancel()
1305 this->ShowWindow(SW_HIDE
);
1307 // canceling means stopping the working thread if it's still running.
1308 m_LogList
.SafeTerminateAsyncDiffThread();
1309 if (this->IsThreadRunning())
1311 m_LogList
.SafeTerminateThread();
1316 __super::OnCancel();
1319 void CLogDlg::CopyChangedSelectionToClipBoard()
1321 POSITION posLogList
= m_LogList
.GetFirstSelectedItemPosition();
1322 if (posLogList
== nullptr)
1323 return; // nothing is selected, get out of here
1327 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1330 auto locker(m_ChangedFileListCtrl
.AcquireReadLock());
1331 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1334 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1335 auto path
= m_ChangedFileListCtrl
.GetListEntry(nItem
);
1338 sPaths
+= path
->GetGitPathString();
1345 // only one revision is selected in the log dialog top pane
1346 // but multiple items could be selected in the changed items list
1347 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1350 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1351 LogChangedPath
* changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(nItem
);
1353 if ((m_cHidePaths
.GetState() & 0x0003)==BST_CHECKED
)
1355 // some items are hidden! So find out which item the user really selected
1356 INT_PTR selRealIndex
= -1;
1357 for (INT_PTR hiddenindex
=0; hiddenindex
<pLogEntry
->pArChangedPaths
->GetCount(); ++hiddenindex
)
1359 if (pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
)->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0)
1361 if (selRealIndex
== nItem
)
1363 changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
);
1370 sPaths
+= changedlogpath
->sPath
;
1377 CStringUtils::WriteAsciiStringToClipboard(sPaths
, GetSafeHwnd());
1380 void CLogDlg::OnContextMenu(CWnd
* pWnd
, CPoint point
)
1382 // we have 4 separate context menus:
1383 // one for the branch label in the upper left
1384 // one for FROM date control
1385 // one shown on the log message list control,
1386 // one shown in the changed-files list control
1387 if (pWnd
== GetDlgItem(IDC_STATIC_REF
))
1390 if (!popup
.CreatePopupMenu())
1394 popup
.AppendMenuIcon(++cnt
, IDS_MENUREFBROWSE
);
1395 popup
.SetDefaultItem(cnt
);
1396 CString head
= L
"HEAD";
1397 CString curBranch
= g_Git
.GetCurrentBranch();
1398 if (!curBranch
.IsEmpty())
1399 head
.AppendFormat(L
" -> \"%s\"", (LPCTSTR
)curBranch
);
1400 popup
.AppendMenuIcon(++cnt
, head
);
1402 g_Git
.GetHash(fetchHead
, g_Git
.FixBranchName(L
"FETCH_HEAD"));
1403 popup
.AppendMenuIcon(++cnt
, L
"FETCH_HEAD");
1404 popup
.EnableMenuItem(cnt
, fetchHead
.IsEmpty());
1405 popup
.AppendMenuIcon(++cnt
, IDS_ALL
);
1406 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1407 popup
.AppendMenuIcon(++cnt
, IDS_PROC_LOG_SELECT_BASIC_REFS
);
1408 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1409 popup
.AppendMenuIcon(++cnt
, IDS_PROC_LOG_SELECT_LOCAL_BRANCHES
);
1410 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1412 if (m_History
.GetCount() > 0)
1414 popup
.AppendMenu(MF_SEPARATOR
, 0);
1415 for (size_t i
= 0; i
< m_History
.GetCount(); ++i
)
1417 CString entry
= m_History
.GetEntry(i
);
1418 if (entry
.GetLength() > 150)
1419 entry
= entry
.Left(150) + L
"...";
1420 popup
.AppendMenuIcon(cnt
++, entry
);
1424 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this);
1429 OnBnClickedBrowseRef();
1433 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_BASIC_REFS
| CGit::LOG_INFO_LOCAL_BRANCHES
);
1434 m_bAllBranch
= BST_UNCHECKED
;
1435 m_AllBranchType
= AllBranchType::None
;
1438 SetRange(g_Git
.GetCurrentBranch(true));
1442 SetRange(fetchHead
.ToString());
1446 m_bAllBranch
= BST_CHECKED
;
1447 m_AllBranchType
= AllBranchType::AllBranches
;
1448 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_ALL_BRANCH
;
1452 m_bAllBranch
= BST_INDETERMINATE
;
1453 m_AllBranchType
= AllBranchType::AllBasicRefs
;
1454 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_BASIC_REFS
;
1458 m_bAllBranch
= BST_INDETERMINATE
;
1459 m_AllBranchType
= AllBranchType::AllLocalBranches
;
1460 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
1462 else if (cmd
>= offset
)
1464 SetRange(m_History
.GetEntry(cmd
- offset
));
1465 m_History
.AddEntry(m_LogList
.m_sRange
);
1472 FillLogMessageCtrl(false);
1477 if (pWnd
== GetDlgItem(IDC_DATEFROM
))
1480 if (!popup
.CreatePopupMenu())
1485 popup
.AppendMenuIcon(++cnt
, IDS_NO_LIMIT
);
1487 DWORD scale
= (DWORD
)CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\NumberOfLogsScale", CFilterData::SHOW_NO_LIMIT
);
1491 case CFilterData::SHOW_LAST_N_COMMITS
:
1492 strScale
.LoadString(IDS_LAST_N_COMMITS
);
1494 case CFilterData::SHOW_LAST_N_YEARS
:
1495 strScale
.LoadString(IDS_LAST_N_YEARS
);
1497 case CFilterData::SHOW_LAST_N_MONTHS
:
1498 strScale
.LoadString(IDS_LAST_N_MONTHS
);
1500 case CFilterData::SHOW_LAST_N_WEEKS
:
1501 strScale
.LoadString(IDS_LAST_N_WEEKS
);
1504 if (!strScale
.IsEmpty() && m_LogList
.m_Filter
.m_NumberOfLogs
> 0)
1506 popup
.AppendMenu(MF_SEPARATOR
, 0);
1508 number
.Format(L
"%ld", m_LogList
.m_Filter
.m_NumberOfLogs
);
1510 item
.Format(strScale
, (LPCTSTR
)number
);
1511 popup
.AppendMenuIcon(++cnt
, item
);
1514 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this);
1519 m_LogList
.m_Filter
.m_NumberOfLogsScale
= CFilterData::SHOW_NO_LIMIT
;
1520 // reset last selected date
1521 m_regLastSelectedFromDate
.removeValue();
1524 m_LogList
.m_Filter
.m_NumberOfLogsScale
= scale
;
1528 FillLogMessageCtrl(false);
1533 int selCount
= m_LogList
.GetSelectedCount();
1534 if ((selCount
== 1)&&(pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1536 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1539 selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1541 GitRevLoglist
* pRev
= nullptr;
1543 pRev
= m_LogList
.m_arShownList
.SafeGetAt(selIndex
);
1545 if ((point
.x
== -1) && (point
.y
== -1))
1548 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(&rect
);
1549 ClientToScreen(&rect
);
1550 point
= rect
.CenterPoint();
1552 CString sMenuItemText
;
1554 if (popup
.CreatePopupMenu())
1556 long start
= -1, end
= -1;
1557 auto pEdit
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
1558 pEdit
->GetSel(start
, end
);
1559 // add the 'default' entries
1560 popup
.AppendMenuIcon(WM_COPY
, IDS_SCIEDIT_COPY
, IDI_COPYCLIP
);
1562 popup
.EnableMenuItem(WM_COPY
, MF_BYCOMMAND
| MF_DISABLED
| MF_GRAYED
);
1563 popup
.AppendMenu(MF_SEPARATOR
);
1564 sMenuItemText
.LoadString(IDS_STATUSLIST_CONTEXT_COPYEXT
);
1565 popup
.AppendMenuIcon(EM_SETSEL
, sMenuItemText
, IDI_COPYCLIP
);
1566 if (pRev
&& !pRev
->m_CommitHash
.IsEmpty())
1568 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1569 sMenuItemText
.LoadString(IDS_EDIT_NOTES
);
1570 popup
.AppendMenuIcon(CGitLogList::ID_EDITNOTE
, sMenuItemText
, IDI_EDIT
);
1573 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this);
1577 break; // no command selected
1580 pEdit
->SetRedraw(FALSE
);
1581 int oldLine
= pEdit
->GetFirstVisibleLine();
1582 pEdit
->SetSel(0, -1);
1584 pEdit
->SetSel(start
, end
);
1585 int newLine
= pEdit
->GetFirstVisibleLine();
1586 pEdit
->LineScroll(oldLine
- newLine
);
1587 pEdit
->SetRedraw(TRUE
);
1588 pEdit
->RedrawWindow();
1592 ::SendMessage(GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), cmd
, 0, -1);
1594 case CGitLogList::ID_EDITNOTE
:
1595 CAppUtils::EditNote(GetSafeHwnd(), pRev
, &m_LogList
.m_ProjectProperties
);
1596 this->FillLogMessageCtrl(true);
1603 void CLogDlg::OnOK()
1605 // since the log dialog is also used to select revisions for other
1606 // dialogs, we have to do some work before closing this dialog
1607 if (GetFocus() != GetDlgItem(IDOK
))
1608 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
1610 m_LogList
.SafeTerminateAsyncDiffThread();
1611 if (this->IsThreadRunning())
1613 m_LogList
.SafeTerminateThread();
1616 // get the selected row(s)
1617 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1620 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1621 GitRev
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(selIndex
);
1624 m_sSelectedHash
.push_back(pLogEntry
->m_CommitHash
);
1631 if (!GetDlgItem(IDOK
)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL
))
1632 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
1636 GetDlgItemText(IDOK
, buttontext
);
1637 temp
.LoadString(IDS_MSGBOX_CANCEL
);
1638 if (temp
.Compare(buttontext
) != 0)
1639 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
1640 m_selectedRevs
.Clear();
1641 m_selectedRevsOneRange
.Clear();
1642 if (m_pNotifyWindow
)
1644 int selIndex
= m_LogList
.GetSelectionMark();
1647 PLOGENTRYDATA pLogEntry
= nullptr;
1648 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1649 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1650 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1651 git_revnum_t lowerRev
= pLogEntry
->Rev
;
1652 git_revnum_t higherRev
= lowerRev
;
1655 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1656 git_revnum_t rev
= pLogEntry
->Rev
;
1657 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1660 if (higherRev
< rev
)
1663 if (m_sFilterText
.IsEmpty() && m_nSortColumn
== 0 && IsSelectionContinuous())
1665 m_selectedRevsOneRange
.AddRevRange(lowerRev
, higherRev
);
1667 BOOL bSentMessage
= FALSE
;
1668 if (m_LogList
.GetSelectedCount() == 1)
1670 // if only one revision is selected, check if the path/url with which the dialog was started
1671 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1672 // if it was copied, use the copy from revision as lowerRev
1673 if ((pLogEntry
)&&(pLogEntry
->pArChangedPaths
)&&(lowerRev
== higherRev
))
1675 CString sUrl
= m_path
.GetGitPathString();
1676 if (!m_path
.IsUrl())
1678 sUrl
= GetURLFromPath(m_path
);
1680 sUrl
= sUrl
.Mid(m_sRepositoryRoot
.GetLength());
1681 for (int cp
= 0; cp
< pLogEntry
->pArChangedPaths
->GetCount(); ++cp
)
1683 LogChangedPath
* pData
= pLogEntry
->pArChangedPaths
->SafeGetAt(cp
);
1686 if (sUrl
.Compare(pData
->sPath
) == 0)
1688 if (!pData
->sCopyFromPath
.IsEmpty())
1690 lowerRev
= pData
->lCopyFromRev
;
1691 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
), lowerRev
);
1692 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
), higherRev
);
1693 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1694 bSentMessage
= TRUE
;
1701 if ( !bSentMessage
)
1703 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
| MERGE_REVSELECTMINUSONE
), lowerRev
);
1704 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
| MERGE_REVSELECTMINUSONE
), higherRev
);
1705 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1706 if (m_selectedRevsOneRange
.GetCount())
1707 m_pNotifyWindow
->SendMessage(WM_REVLISTONERANGE
, 0, (LPARAM
)&m_selectedRevsOneRange
);
1712 CRegDWORD
reg(L
"Software\\TortoiseGit\\ShowAllEntry");
1717 void CLogDlg::OnPasteGitHash()
1719 if (!IsClipboardFormatAvailable(CF_TEXT
))
1722 CClipboardHelper clipboardHelper
;
1723 if (!clipboardHelper
.Open(GetSafeHwnd()))
1726 HGLOBAL hClipboardData
= GetClipboardData(CF_TEXT
);
1727 if (!hClipboardData
)
1730 char* pStr
= (char*)GlobalLock(hClipboardData
);
1732 GlobalUnlock(hClipboardData
);
1737 if (LookLikeGitHash(str
, pos
))
1741 void CLogDlg::JumpToGitHash(CString hash
)
1743 int prefixLen
= hash
.GetLength();
1744 while (hash
.GetLength() < 2 * GIT_HASH_SIZE
)
1746 CGitHash
prefixHash(hash
);
1747 // start searching downwards, because it's unlikely that a hash is a forward reference
1748 int currentPos
= m_LogList
.GetSelectionMark();
1749 int cnt
= (int)m_LogList
.m_arShownList
.size();
1750 if (!cnt
|| currentPos
< 0)
1752 for (int i
= currentPos
+ 1; i
!= currentPos
; ++i
)
1757 GitRev
* rev
= m_LogList
.m_arShownList
.SafeGetAt(i
);
1759 if (!rev
->m_CommitHash
.MatchesPrefix(prefixHash
, hash
, prefixLen
))
1762 m_LogList
.SetItemState(m_LogList
.GetSelectionMark(), 0, LVIS_SELECTED
| LVIS_FOCUSED
);
1763 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1766 int index
= m_LogList
.GetNextSelectedItem(pos
);
1768 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1770 m_LogList
.EnsureVisible(i
, FALSE
);
1771 m_LogList
.SetSelectionMark(i
);
1772 m_LogList
.SetItemState(i
, LVIS_SELECTED
| LVIS_FOCUSED
, LVIS_SELECTED
| LVIS_FOCUSED
);
1773 // refresh of selection needs to be queued instead of done immediately, to ensure hyperlinks in target selection are created
1774 PostMessage(WM_TGIT_REFRESH_SELECTION
, 0, 0);
1778 FlashWindowEx(FLASHW_ALL
, 3, 100);
1779 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, L
"NoJumpNotFoundWarning", IDS_MSGBOX_DONOTSHOWAGAIN
);
1782 BOOL
CLogDlg::PreTranslateMessage(MSG
* pMsg
)
1784 // Skip Ctrl-C when copying text out of the log message or search filter
1785 bool bSkipAccelerator
= (pMsg
->message
== WM_KEYDOWN
&& (pMsg
->wParam
== 'C' || pMsg
->wParam
== VK_INSERT
) && (GetFocus() == GetDlgItem(IDC_MSGVIEW
) || GetFocus() == GetDlgItem(IDC_SEARCHEDIT
) || GetFocus() == GetDlgItem(IDC_FILTER
)) && GetKeyState(VK_CONTROL
) & 0x8000);
1786 if (pMsg
->message
== WM_KEYDOWN
&& pMsg
->wParam
=='\r')
1788 if (GetFocus()==GetDlgItem(IDC_LOGLIST
))
1790 if (CRegDWORD(L
"Software\\TortoiseGit\\DiffByDoubleClickInLog", FALSE
))
1792 m_LogList
.DiffSelectedRevWithPrevious();
1796 if (GetFocus() == GetDlgItem(IDC_SEARCHEDIT
))
1798 KillTimer(LOGFILTER_TIMER
);
1801 if (GetFocus() == GetDlgItem(IDC_FILTER
))
1803 KillTimer(FILEFILTER_TIMER
);
1804 FillLogMessageCtrl();
1808 else if (pMsg
->message
== WM_KEYDOWN
&& ((pMsg
->wParam
== 'V' && GetKeyState(VK_CONTROL
) < 0) || (pMsg
->wParam
== VK_INSERT
&& GetKeyState(VK_SHIFT
) < 0 && GetKeyState(VK_CONTROL
) >= 0)) && GetKeyState(VK_MENU
) >= 0)
1810 if (GetFocus() != GetDlgItem(IDC_SEARCHEDIT
) && GetFocus() != GetDlgItem(IDC_FILTER
))
1816 else if (pMsg
->message
== WM_KEYDOWN
&& pMsg
->wParam
== VK_ESCAPE
&& GetFocus() == GetDlgItem(IDC_FILTER
) && m_cFileFilter
.GetWindowTextLength())
1818 m_cFileFilter
.SetWindowText(L
"");
1819 KillTimer(FILEFILTER_TIMER
);
1820 FillLogMessageCtrl();
1823 else if (pMsg
->message
== WM_XBUTTONUP
)
1825 bool select
= (pMsg
->wParam
& MK_SHIFT
) == 0;
1826 if (HIWORD(pMsg
->wParam
) & XBUTTON1
)
1827 GoBackForward(select
, false);
1828 if (HIWORD(pMsg
->wParam
) & XBUTTON2
)
1829 GoBackForward(select
, true);
1830 if (HIWORD(pMsg
->wParam
) & (XBUTTON1
| XBUTTON2
))
1833 if (m_hAccel
&& !bSkipAccelerator
)
1835 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1840 return __super::PreTranslateMessage(pMsg
);
1844 BOOL
CLogDlg::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
1846 //if (this->IsThreadRunning())
1847 if(m_LogList
.m_bNoDispUpdates
)
1849 // only show the wait cursor over the list control
1851 ((pWnd
== GetDlgItem(IDC_LOGLIST
))||
1852 (pWnd
== GetDlgItem(IDC_MSGVIEW
))||
1853 (pWnd
== GetDlgItem(IDC_LOGMSG
))))
1855 HCURSOR hCur
= LoadCursor(nullptr, IDC_WAIT
);
1860 if (pWnd
&& (pWnd
== GetDlgItem(IDC_MSGVIEW
) || pWnd
== GetDlgItem(IDC_SEARCHEDIT
) || pWnd
== GetDlgItem(IDC_FILTER
)))
1861 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1863 HCURSOR hCur
= LoadCursor(nullptr, IDC_ARROW
);
1865 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1868 void CLogDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1870 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1872 //if (this->IsThreadRunning())
1873 if(m_LogList
.m_bNoDispUpdates
)
1875 if (pNMLV
->iItem
>= 0)
1877 if (!m_LogList
.m_highlight
.IsEmpty())
1879 m_LogList
.m_highlight
.Empty();
1880 m_LogList
.Invalidate();
1882 this->m_LogList
.m_nSearchIndex
= pNMLV
->iItem
;
1883 GitRev
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(pNMLV
->iItem
);
1884 if (pLogEntry
== nullptr)
1886 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1887 if (pNMLV
->iSubItem
!= 0)
1889 if (pNMLV
->iItem
== (int)m_LogList
.m_arShownList
.size())
1891 // remove the selected state
1892 if (pNMLV
->uChanged
& LVIF_STATE
)
1894 m_LogList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1895 FillLogMessageCtrl();
1897 UpdateLogInfoLabel();
1901 if (pNMLV
->uChanged
& LVIF_STATE
)
1903 if ((pNMLV
->uNewState
& LVIS_SELECTED
) && !m_bNavigatingWithSelect
)
1905 m_LogList
.m_selectionHistory
.Add(m_LogList
.m_lastSelectedHash
);
1906 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1908 FillLogMessageCtrl();
1914 m_LogList
.m_lastSelectedHash
.Empty();
1915 FillLogMessageCtrl();
1919 if (pNMLV
->iItem
< 0)
1921 UpdateLogInfoLabel();
1924 void CLogDlg::OnLvnItemchangedLogmsg(NMHDR
* /*pNMHDR*/, LRESULT
* /*pResult*/)
1926 if (m_ChangedFileListCtrl
.IsBusy())
1928 UpdateLogInfoLabel();
1931 void CLogDlg::OnEnLinkMsgview(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1933 // similar code in ProgressDlg.cpp and SyncDlg.cpp
1934 ENLINK
*pEnLink
= reinterpret_cast<ENLINK
*>(pNMHDR
);
1935 if ((pEnLink
->msg
== WM_LBUTTONUP
) || (pEnLink
->msg
== WM_SETCURSOR
))
1937 auto pEdit
= reinterpret_cast<CRichEditCtrl
*>(GetDlgItem(IDC_MSGVIEW
));
1939 pEdit
->GetSel(selRange
);
1940 bool hasSelection
= (selRange
.cpMax
!= selRange
.cpMin
);
1943 GetDlgItemText(IDC_MSGVIEW
, msg
);
1944 msg
.Replace(L
"\r\n", L
"\n");
1945 url
= msg
.Mid(pEnLink
->chrg
.cpMin
, pEnLink
->chrg
.cpMax
-pEnLink
->chrg
.cpMin
);
1946 auto findResult
= m_LogList
.m_ProjectProperties
.FindBugIDPositions(msg
);
1947 if (std::find_if(findResult
.cbegin(), findResult
.cend(),
1948 [=] (const CHARRANGE
&cr
) -> bool { return cr
.cpMin
== pEnLink
->chrg
.cpMin
&& cr
.cpMax
== pEnLink
->chrg
.cpMax
; }
1949 ) != findResult
.cend())
1951 url
= m_LogList
.m_ProjectProperties
.GetBugIDUrl(url
);
1952 url
= GetAbsoluteUrlFromRelativeUrl(url
);
1954 // check if it's an email address
1955 auto atpos
= url
.Find(L
'@');
1956 if ((atpos
> 0) && (url
.ReverseFind(L
'.') > atpos
) && !::PathIsURL(url
))
1957 url
= L
"mailto:" + url
;
1958 if (::PathIsURL(url
))
1960 if (pEnLink
->msg
== WM_LBUTTONUP
)
1963 ShellExecute(GetSafeHwnd(), L
"open", url
, nullptr, nullptr, SW_SHOWDEFAULT
);
1967 static RECT prevRect
= { 0 };
1968 CWnd
* pMsgView
= GetDlgItem(IDC_MSGVIEW
);
1973 pMsgView
->SendMessage(EM_POSFROMCHAR
, (WPARAM
)&pt
, pEnLink
->chrg
.cpMin
);
1976 pMsgView
->SendMessage(EM_POSFROMCHAR
, (WPARAM
)&pt
, pEnLink
->chrg
.cpMax
);
1978 rc
.bottom
= pt
.y
+ 12;
1979 if ((prevRect
.left
!= rc
.left
) || (prevRect
.top
!= rc
.top
))
1981 m_tooltips
.DelTool(pMsgView
, 1);
1982 m_tooltips
.AddTool(pMsgView
, url
, &rc
, 1);
1988 else if(pEnLink
->msg
== WM_LBUTTONUP
&& !hasSelection
)
1991 if (LookLikeGitHash(url
, pos
))
1998 void CLogDlg::OnBnClickedStatbutton()
2000 if (this->IsThreadRunning())
2003 if (m_LogList
.m_arShownList
.empty() || m_LogList
.m_arShownList
.size() == 1 && m_LogList
.m_bShowWC
)
2004 return; // nothing or just the working copy changes are shown, so no statistics.
2007 dlg
.m_ShowList
.reserve(m_LogList
.m_arShownList
.size());
2008 for (size_t i
= m_LogList
.m_bShowWC
? 1 : 0; i
< m_LogList
.m_arShownList
.size(); ++i
)
2009 dlg
.m_ShowList
.emplace_back(m_LogList
.m_arShownList
.SafeGetAt(i
));
2011 dlg
.m_path
= m_orgPath
;
2015 void CLogDlg::MoveToSameTop(CWnd
*pWndRef
, CWnd
*pWndTarget
)
2017 CRect rcWndPicAuthor
, rcWndMsgView
;
2018 pWndRef
->GetWindowRect(rcWndMsgView
);
2019 ScreenToClient(rcWndMsgView
);
2020 pWndTarget
->GetWindowRect(rcWndPicAuthor
);
2021 ScreenToClient(rcWndPicAuthor
);
2022 int diff
= rcWndMsgView
.top
- rcWndPicAuthor
.top
;
2023 rcWndPicAuthor
.top
+= diff
;
2024 rcWndPicAuthor
.bottom
+= diff
;
2025 pWndTarget
->MoveWindow(rcWndPicAuthor
);
2028 void CLogDlg::DoSizeV1(int delta
)
2030 RemoveMainAnchors();
2032 // first, reduce the middle section to a minimum.
2033 // if that is not sufficient, minimize the lower section
2035 CRect changeListViewRect
;
2036 m_ChangedFileListCtrl
.GetClientRect(changeListViewRect
);
2037 CRect messageViewRect
;
2038 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(messageViewRect
);
2040 int messageViewDelta
= max(-delta
, CDPIAware::Instance().ScaleY(20) - messageViewRect
.Height());
2041 int changeFileListDelta
= -delta
- messageViewDelta
;
2043 // set new sizes & positions
2044 auto hdwp
= BeginDeferWindowPos(5);
2045 hdwp
= CSplitterControl::ChangeRect(hdwp
, &m_LogList
, 0, 0, 0, delta
);
2046 hdwp
= CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_MSGVIEW
), 0, delta
, 0, delta
+ messageViewDelta
);
2047 MoveToSameTop(GetDlgItem(IDC_MSGVIEW
), GetDlgItem(IDC_PIC_AUTHOR
));
2048 hdwp
= CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_SPLITTERBOTTOM
), 0, -changeFileListDelta
, 0, -changeFileListDelta
);
2049 hdwp
= CSplitterControl::ChangeRect(hdwp
, &m_ChangedFileListCtrl
, 0, -changeFileListDelta
, 0, 0);
2050 EndDeferWindowPos(hdwp
);
2055 m_LogList
.Invalidate();
2056 m_ChangedFileListCtrl
.Invalidate();
2057 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
2058 m_gravatar
.Invalidate();
2061 void CLogDlg::DoSizeV2(int delta
)
2063 RemoveMainAnchors();
2065 // first, reduce the middle section to a minimum.
2066 // if that is not sufficient, minimize the top section
2069 m_LogList
.GetClientRect(logViewRect
);
2070 CRect messageViewRect
;
2071 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(messageViewRect
);
2073 int messageViewDelta
= max(delta
, CDPIAware::Instance().ScaleY(20) - messageViewRect
.Height());
2074 int logListDelta
= delta
- messageViewDelta
;
2076 // set new sizes & positions
2077 auto hdwp
= BeginDeferWindowPos(5);
2078 hdwp
= CSplitterControl::ChangeRect(hdwp
, &m_LogList
, 0, 0, 0, logListDelta
);
2079 hdwp
= CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_SPLITTERTOP
), 0, logListDelta
, 0, logListDelta
);
2080 hdwp
= CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_MSGVIEW
), 0, logListDelta
, 0, logListDelta
+ messageViewDelta
);
2081 MoveToSameTop(GetDlgItem(IDC_MSGVIEW
), GetDlgItem(IDC_PIC_AUTHOR
));
2082 hdwp
= CSplitterControl::ChangeRect(hdwp
, &m_ChangedFileListCtrl
, 0, delta
, 0, 0);
2083 EndDeferWindowPos(hdwp
);
2088 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
2089 m_ChangedFileListCtrl
.Invalidate();
2090 m_gravatar
.Invalidate();
2093 void CLogDlg::AddMainAnchors()
2095 AddAnchor(IDC_STATIC_REF
, TOP_LEFT
);
2096 AddAnchor(IDC_FROMLABEL
, TOP_LEFT
);
2097 AddAnchor(IDC_DATEFROM
, TOP_LEFT
);
2098 AddAnchor(IDC_TOLABEL
, TOP_LEFT
);
2099 AddAnchor(IDC_DATETO
, TOP_LEFT
);
2101 AddAnchor(IDC_SEARCHEDIT
, TOP_LEFT
, TOP_RIGHT
);
2102 AddAnchor(IDC_LOG_JUMPTYPE
, TOP_RIGHT
);
2103 AddAnchor(IDC_LOG_JUMPUP
, TOP_RIGHT
);
2104 AddAnchor(IDC_LOG_JUMPDOWN
, TOP_RIGHT
);
2106 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, MIDDLE_RIGHT
);
2107 AddAnchor(IDC_SPLITTERTOP
, MIDDLE_LEFT
, MIDDLE_RIGHT
);
2108 AddAnchor(IDC_MSGVIEW
, MIDDLE_LEFT
, MIDDLE_RIGHT
); // keep in sync with ShowGravatar()
2109 AddAnchor(IDC_PIC_AUTHOR
, MIDDLE_RIGHT
);
2110 AddAnchor(IDC_SPLITTERBOTTOM
, MIDDLE_LEFT
, MIDDLE_RIGHT
);
2111 AddAnchor(IDC_LOGMSG
, MIDDLE_LEFT
, BOTTOM_RIGHT
);
2113 AddAnchor(IDC_LOGINFO
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
2114 AddAnchor(IDC_WALKBEHAVIOUR
, BOTTOM_LEFT
);
2115 AddAnchor(IDC_VIEW
, BOTTOM_LEFT
);
2116 AddAnchor(IDC_LOG_ALLBRANCH
, BOTTOM_LEFT
);
2117 AddAnchor(IDC_FILTER
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
2118 AddAnchor(IDC_WHOLE_PROJECT
, BOTTOM_LEFT
);
2119 AddAnchor(IDC_REFRESH
, BOTTOM_LEFT
);
2120 AddAnchor(IDC_STATBUTTON
, BOTTOM_LEFT
);
2121 AddAnchor(IDC_PROGRESS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
2122 AddAnchor(IDOK
, BOTTOM_RIGHT
);
2123 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
2124 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
2127 void CLogDlg::RemoveMainAnchors()
2129 RemoveAnchor(IDC_STATIC_REF
);
2130 RemoveAnchor(IDC_FROMLABEL
);
2131 RemoveAnchor(IDC_DATEFROM
);
2132 RemoveAnchor(IDC_TOLABEL
);
2133 RemoveAnchor(IDC_DATETO
);
2135 RemoveAnchor(IDC_SEARCHEDIT
);
2136 RemoveAnchor(IDC_LOG_JUMPTYPE
);
2137 RemoveAnchor(IDC_LOG_JUMPUP
);
2138 RemoveAnchor(IDC_LOG_JUMPDOWN
);
2140 RemoveAnchor(IDC_LOGLIST
);
2141 RemoveAnchor(IDC_SPLITTERTOP
);
2142 RemoveAnchor(IDC_MSGVIEW
);
2143 RemoveAnchor(IDC_PIC_AUTHOR
);
2144 RemoveAnchor(IDC_SPLITTERBOTTOM
);
2145 RemoveAnchor(IDC_LOGMSG
);
2147 RemoveAnchor(IDC_LOGINFO
);
2148 RemoveAnchor(IDC_WALKBEHAVIOUR
);
2149 RemoveAnchor(IDC_VIEW
);
2150 RemoveAnchor(IDC_LOG_ALLBRANCH
);
2151 RemoveAnchor(IDC_FILTER
);
2152 RemoveAnchor(IDC_WHOLE_PROJECT
);
2153 RemoveAnchor(IDC_REFRESH
);
2154 RemoveAnchor(IDC_STATBUTTON
);
2155 RemoveAnchor(IDC_PROGRESS
);
2157 RemoveAnchor(IDCANCEL
);
2158 RemoveAnchor(IDHELP
);
2161 LRESULT
CLogDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
2165 if (wParam
== IDC_SPLITTERTOP
)
2167 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
2168 DoSizeV1(pHdr
->delta
);
2170 else if (wParam
== IDC_SPLITTERBOTTOM
)
2172 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
2173 DoSizeV2(pHdr
->delta
);
2178 return CResizableDialog::DefWindowProc(message
, wParam
, lParam
);
2181 void CLogDlg::SetSplitterRange()
2183 if ((m_LogList
)&&(m_ChangedFileListCtrl
))
2186 m_LogList
.GetWindowRect(rcTop
);
2187 ScreenToClient(rcTop
);
2190 m_ChangedFileListCtrl
.GetWindowRect(rcBottom
);
2191 ScreenToClient(rcBottom
);
2193 m_wndSplitter1
.SetRange(rcTop
.top
+ MIN_CTRL_HEIGHT
, rcBottom
.bottom
- (2 * MIN_CTRL_HEIGHT
+ MIN_SPLITTER_HEIGHT
));
2194 m_wndSplitter2
.SetRange(rcTop
.top
+ (2 * MIN_CTRL_HEIGHT
+ MIN_SPLITTER_HEIGHT
), rcBottom
.bottom
- MIN_CTRL_HEIGHT
);
2198 void CLogDlg::OnEnscrollMsgview()
2200 m_tooltips
.DelTool(GetDlgItem(IDC_MSGVIEW
), 1);
2203 LRESULT
CLogDlg::OnClickedInfoIcon(WPARAM wParam
, LPARAM lParam
)
2205 if ((HWND
)wParam
== m_cFileFilter
.GetSafeHwnd())
2208 // FIXME: x64 version would get this function called with unexpected parameters.
2212 RECT
* rect
= (LPRECT
)lParam
;
2215 point
= CPoint(rect
->left
, rect
->bottom
);
2216 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | ((m_SelectedFilters & x) ? MF_CHECKED : MF_UNCHECKED))
2218 if (popup
.CreatePopupMenu())
2220 temp
.LoadString(IDS_LOG_FILTER_SUBJECT
);
2221 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT
), LOGFILTER_SUBJECT
, temp
);
2223 temp
.LoadString(IDS_LOG_FILTER_MESSAGES
);
2224 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES
), LOGFILTER_MESSAGES
, temp
);
2226 temp
.LoadString(IDS_LOG_FILTER_PATHS
);
2227 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS
), LOGFILTER_PATHS
, temp
);
2229 temp
.LoadString(IDS_LOG_FILTER_AUTHORS
);
2230 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS
), LOGFILTER_AUTHORS
, temp
);
2232 temp
.LoadString(IDS_LOG_FILTER_EMAILS
);
2233 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_EMAILS
), LOGFILTER_EMAILS
, temp
);
2235 temp
.LoadString(IDS_LOG_FILTER_REVS
);
2236 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS
), LOGFILTER_REVS
, temp
);
2238 temp
.LoadString(IDS_LOG_FILTER_REFNAME
);
2239 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME
), LOGFILTER_REFNAME
, temp
);
2241 temp
.LoadString(IDS_PROC_LOG_TAGINFO
);
2242 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_ANNOTATEDTAG
), LOGFILTER_ANNOTATEDTAG
, temp
);
2244 temp
.LoadString(IDS_NOTES
);
2245 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_NOTES
), LOGFILTER_NOTES
, temp
);
2247 if (m_LogList
.m_bShowBugtraqColumn
== TRUE
) {
2248 temp
.LoadString(IDS_LOG_FILTER_BUGIDS
);
2249 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID
), LOGFILTER_BUGID
, temp
);
2252 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2254 temp
.LoadString(IDS_LOG_FILTER_TOGGLE
);
2255 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, LOGFILTER_TOGGLE
, temp
);
2257 temp
.LoadString(IDS_ALL
);
2258 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, LOGFILTER_ALL
, temp
);
2260 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2262 temp
.LoadString(IDS_LOG_FILTER_REGEX
);
2263 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterWithRegex
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_REGEX
, temp
);
2265 temp
.LoadString(IDS_LOG_FILTER_CASESENSITIVE
);
2266 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterCaseSensitively
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_CASE
, temp
);
2269 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this);
2272 if (selection
== LOGFILTER_REGEX
)
2274 m_bFilterWithRegex
= !m_bFilterWithRegex
;
2275 CRegDWORD
b(L
"Software\\TortoiseGit\\UseRegexFilter", FALSE
);
2276 b
= m_bFilterWithRegex
;
2278 CheckRegexpTooltip();
2279 m_cFilter
.ValidateAndRedraw();
2281 else if (selection
== LOGFILTER_CASE
)
2283 m_bFilterCaseSensitively
= !m_bFilterCaseSensitively
;
2284 CRegDWORD
b(L
"Software\\TortoiseGit\\FilterCaseSensitively", FALSE
);
2285 b
= m_bFilterCaseSensitively
;
2287 else if (selection
== LOGFILTER_TOGGLE
)
2289 m_SelectedFilters
= (~m_SelectedFilters
) & LOGFILTER_ALL
;
2292 else if (selection
== LOGFILTER_ALL
)
2294 m_SelectedFilters
= selection
;
2299 m_SelectedFilters
^= selection
;
2302 CRegDWORD(L
"Software\\TortoiseGit\\SelectedLogFilters") = m_SelectedFilters
;
2303 // Reload only if a search text is entered
2304 if (m_LogList
.m_LogFilter
->IsFilterActive())
2305 SetTimer(LOGFILTER_TIMER
, 1000, nullptr);
2311 LRESULT
CLogDlg::OnClickedCancelFilter(WPARAM wParam
, LPARAM
/*lParam*/)
2313 if ((HWND
)wParam
== m_cFileFilter
.GetSafeHwnd())
2315 KillTimer(FILEFILTER_TIMER
);
2317 FillLogMessageCtrl();
2321 KillTimer(LOGFILTER_TIMER
);
2323 m_sFilterText
.Empty();
2325 theApp
.DoWaitCursor(1);
2326 FillLogMessageCtrl(false);
2330 theApp
.DoWaitCursor(-1);
2331 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2332 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2333 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2334 UpdateLogInfoLabel();
2340 void CLogDlg::SetFilterCueText()
2342 CString
temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY
));
2345 if (m_SelectedFilters
& LOGFILTER_SUBJECT
)
2347 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT
));
2350 if (m_SelectedFilters
& LOGFILTER_MESSAGES
)
2352 if (!CStringUtils::EndsWith(temp
, L
' '))
2354 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES
));
2357 if (m_SelectedFilters
& LOGFILTER_PATHS
)
2359 if (!CStringUtils::EndsWith(temp
, L
' '))
2361 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS
));
2364 if (m_SelectedFilters
& LOGFILTER_AUTHORS
)
2366 if (!CStringUtils::EndsWith(temp
, L
' '))
2368 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS
));
2371 if (m_SelectedFilters
& LOGFILTER_EMAILS
)
2373 if (!CStringUtils::EndsWith(temp
, L
' '))
2375 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_EMAILS
));
2378 if (m_SelectedFilters
& LOGFILTER_REVS
)
2380 if (!CStringUtils::EndsWith(temp
, L
' '))
2382 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS
));
2385 if (m_SelectedFilters
& LOGFILTER_REFNAME
)
2387 if (!CStringUtils::EndsWith(temp
, L
' '))
2389 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REFNAME
));
2392 if (m_SelectedFilters
& LOGFILTER_NOTES
)
2394 if (!CStringUtils::EndsWith(temp
, L
' '))
2396 temp
+= CString(MAKEINTRESOURCE(IDS_NOTES
));
2399 if (m_LogList
.m_bShowBugtraqColumn
&& m_SelectedFilters
& LOGFILTER_BUGID
)
2401 if (!CStringUtils::EndsWith(temp
, L
' '))
2403 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS
));
2406 // to make the cue banner text appear more to the right of the edit control
2408 m_cFilter
.SetCueBanner(temp
.TrimRight());
2411 bool CLogDlg::Validate(LPCTSTR string
)
2413 if (!m_bFilterWithRegex
)
2415 std::vector
<std::wregex
> pats
;
2416 return m_LogList
.m_LogFilter
->ValidateRegexp(string
, pats
);
2419 void CLogDlg::OnEnChangeFileFilter()
2421 SetTimer(FILEFILTER_TIMER
, 1000, nullptr);
2424 void CLogDlg::OnTimer(UINT_PTR nIDEvent
)
2426 if (nIDEvent
== LOGFTIME_TIMER
)
2428 KillTimer(LOGFTIME_TIMER
);
2431 else if (nIDEvent
== LOG_FILLPATCHVTIMER
)
2433 else if (nIDEvent
== LOGFILTER_TIMER
)
2435 KillTimer(LOGFILTER_TIMER
);
2439 /* we will use git built-in grep to filter log */
2440 if (this->IsThreadRunning())
2442 // thread still running! So just restart the timer.
2443 SetTimer(LOGFILTER_TIMER
, 1000, nullptr);
2446 CWnd
* focusWnd
= GetFocus();
2447 bool bSetFocusToFilterControl
= ((focusWnd
!= GetDlgItem(IDC_DATEFROM
))&&(focusWnd
!= GetDlgItem(IDC_DATETO
))
2448 && (focusWnd
!= GetDlgItem(IDC_LOGLIST
)));
2449 if (m_LogList
.m_sFilterText
.IsEmpty())
2451 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
2452 // do not return here!
2453 // we also need to run the filter if the filter text is empty:
2454 // 1. to clear an existing filter
2455 // 2. to rebuild the m_arShownList after sorting
2457 theApp
.DoWaitCursor(1);
2458 CStoreSelection
storeselection(this);
2459 KillTimer(LOGFILTER_TIMER
);
2460 FillLogMessageCtrl(false);
2462 // now start filter the log list
2463 m_LogList
.StartFilter();
2465 if ( m_LogList
.GetItemCount()==1 )
2467 m_LogList
.SetSelectionMark(0);
2468 m_LogList
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
2470 theApp
.DoWaitCursor(-1);
2471 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2472 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2473 if (bSetFocusToFilterControl
)
2474 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2475 UpdateLogInfoLabel();
2477 } // if (nIDEvent == LOGFILTER_TIMER)
2478 else if (nIDEvent
== LOG_HEADER_ORDER_TIMER
)
2480 KillTimer(LOG_HEADER_ORDER_TIMER
);
2481 CLogOrdering orderDlg
;
2482 if (orderDlg
.DoModal() == IDOK
)
2485 else if (nIDEvent
== FILEFILTER_TIMER
)
2487 KillTimer(FILEFILTER_TIMER
);
2488 FillLogMessageCtrl();
2490 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.empty() || m_LogList
.m_arShownList
.size() == 1 && m_LogList
.m_bShowWC
))));
2491 __super::OnTimer(nIDEvent
);
2494 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2499 m_DateTo
.GetTime(_time
);
2502 m_DateFrom
.GetTime(fromTime
);
2503 if (_time
< fromTime
)
2506 m_DateTo
.SetTime(&_time
);
2509 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 23, 59, 59);
2510 if (time
.GetTime() != m_LogList
.m_Filter
.m_To
)
2512 m_LogList
.m_Filter
.m_To
= (DWORD
)time
.GetTime();
2513 SetTimer(LOGFTIME_TIMER
, 10, nullptr);
2518 CMessageBox::Show(GetSafeHwnd(), L
"Invalidate Parameter", L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
2524 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2529 m_DateFrom
.GetTime(_time
);
2532 m_DateTo
.GetTime(toTime
);
2536 m_DateFrom
.SetTime(&_time
);
2539 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 0, 0, 0);
2540 if (time
.GetTime() != m_LogList
.m_Filter
.m_From
)
2542 m_LogList
.m_Filter
.m_From
= (DWORD
)time
.GetTime();
2543 m_LogList
.m_Filter
.m_NumberOfLogsScale
= CFilterData::SHOW_LAST_SEL_DATE
;
2545 if (CFilterData::SHOW_LAST_SEL_DATE
== (DWORD
)CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\NumberOfLogsScale", CFilterData::SHOW_NO_LIMIT
))
2546 m_regLastSelectedFromDate
= time
.Format(L
"%Y-%m-%d");
2548 SetTimer(LOGFTIME_TIMER
, 10, nullptr);
2553 CMessageBox::Show(GetSafeHwnd(), L
"Invalidate Parameter", L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
2559 void CLogDlg::OnCbnSelchangeJumpType()
2561 // reserved for future use
2564 void CLogDlg::OnBnClickedJumpUp()
2566 int sel
= m_JumpType
.GetCurSel();
2567 if (sel
< 0) return;
2568 JumpType jumpType
= (JumpType
)sel
;
2570 if (jumpType
== JumpType_History
)
2579 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2582 index
= m_LogList
.GetNextSelectedItem(pos
);
2583 if (index
== 0) return;
2585 GitRev
* data
= m_LogList
.m_arShownList
.SafeGetAt(index
);
2586 if (jumpType
== JumpType_AuthorEmail
)
2587 strValue
= data
->GetAuthorEmail();
2588 else if (jumpType
== JumpType_CommitterEmail
)
2589 strValue
= data
->GetCommitterEmail();
2590 else if (jumpType
== JumpType_Parent1
)
2591 hashValue
= data
->m_CommitHash
;
2592 else if (jumpType
== JumpType_Parent2
)
2593 hashValue
= data
->m_CommitHash
;
2594 else if (jumpType
== JumpType_TagFF
)
2595 hashValue
= data
->m_CommitHash
;
2596 else if (jumpType
== JumpType_BranchFF
)
2597 hashValue
= data
->m_CommitHash
;
2599 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2606 index
= m_LogList
.GetNextSelectedItem(pos
);
2607 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2609 m_LogList
.SetSelectionMark(-1);
2611 for (int i
= index
- 1; i
>= 0; i
--)
2614 GitRev
* data
= m_LogList
.m_arShownList
.SafeGetAt(i
);
2615 if (jumpType
== JumpType_AuthorEmail
)
2616 found
= strValue
== data
->GetAuthorEmail();
2617 else if (jumpType
== JumpType_CommitterEmail
)
2618 found
= strValue
== data
->GetCommitterEmail();
2619 else if (jumpType
== JumpType_MergePoint
)
2620 found
= data
->ParentsCount() > 1;
2621 else if (jumpType
== JumpType_Parent1
)
2623 if (!data
->m_ParentHash
.empty())
2624 found
= data
->m_ParentHash
[0] == hashValue
;
2626 else if (jumpType
== JumpType_Parent2
)
2628 if (data
->m_ParentHash
.size() > 1)
2629 found
= data
->m_ParentHash
[1] == hashValue
;
2631 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
2633 auto refList
= m_LogList
.m_HashMap
.find(data
->m_CommitHash
);
2634 if (refList
!= m_LogList
.m_HashMap
.cend())
2635 found
= find_if((*refList
).second
, [](const auto& ref
) { return CStringUtils::StartsWith(ref
, L
"refs/tags/"); }) != (*refList
).second
.cend();
2637 if (found
&& jumpType
== JumpType_TagFF
)
2638 found
= g_Git
.IsFastForward(hashValue
.ToString(), data
->m_CommitHash
.ToString());
2640 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2642 auto refList
= m_LogList
.m_HashMap
.find(data
->m_CommitHash
);
2643 if (refList
!= m_LogList
.m_HashMap
.cend())
2644 found
= find_if((*refList
).second
, [](const auto& ref
) { return CStringUtils::StartsWith(ref
, L
"refs/heads/") || CStringUtils::StartsWith(ref
, L
"refs/remotes/"); }) != (*refList
).second
.cend();
2646 if (found
&& jumpType
== JumpType_BranchFF
)
2647 found
= g_Git
.IsFastForward(hashValue
.ToString(), data
->m_CommitHash
.ToString());
2652 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2653 m_LogList
.EnsureVisible(i
, FALSE
);
2654 m_LogList
.SetSelectionMark(i
);
2659 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, L
"NoJumpNotFoundWarning", IDS_MSGBOX_DONOTSHOWAGAIN
);
2662 void CLogDlg::OnBnClickedJumpDown()
2664 int jumpType
= m_JumpType
.GetCurSel();
2665 if (jumpType
< 0) return;
2667 if (jumpType
== JumpType_History
)
2676 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2679 index
= m_LogList
.GetNextSelectedItem(pos
);
2680 if (index
== 0) return;
2682 GitRev
* data
= m_LogList
.m_arShownList
.SafeGetAt(index
);
2683 if (jumpType
== JumpType_AuthorEmail
)
2684 strValue
= data
->GetAuthorEmail();
2685 else if (jumpType
== JumpType_CommitterEmail
)
2686 strValue
= data
->GetCommitterEmail();
2687 else if (jumpType
== JumpType_Parent1
)
2689 if (!data
->m_ParentHash
.empty())
2690 hashValue
= data
->m_ParentHash
.at(0);
2694 else if (jumpType
== JumpType_Parent2
)
2696 if (data
->m_ParentHash
.size() > 1)
2697 hashValue
= data
->m_ParentHash
.at(1);
2701 else if (jumpType
== JumpType_TagFF
)
2702 hashValue
= data
->m_CommitHash
;
2703 else if (jumpType
== JumpType_BranchFF
)
2704 hashValue
= data
->m_CommitHash
;
2706 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2713 index
= m_LogList
.GetNextSelectedItem(pos
);
2714 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2716 m_LogList
.SetSelectionMark(-1);
2718 for (int i
= index
+ 1; i
< m_LogList
.GetItemCount(); ++i
)
2721 GitRev
* data
= m_LogList
.m_arShownList
.SafeGetAt(i
);
2722 if (jumpType
== JumpType_AuthorEmail
)
2723 found
= strValue
== data
->GetAuthorEmail();
2724 else if (jumpType
== JumpType_CommitterEmail
)
2725 found
= strValue
== data
->GetCommitterEmail();
2726 else if (jumpType
== JumpType_MergePoint
)
2727 found
= data
->ParentsCount() > 1;
2728 else if (jumpType
== JumpType_Parent1
)
2729 found
= data
->m_CommitHash
== hashValue
;
2730 else if (jumpType
== JumpType_Parent2
)
2731 found
= data
->m_CommitHash
== hashValue
;
2732 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
2734 auto refList
= m_LogList
.m_HashMap
.find(data
->m_CommitHash
);
2735 if (refList
!= m_LogList
.m_HashMap
.cend())
2736 found
= find_if((*refList
).second
, [](const auto& ref
) { return CStringUtils::StartsWith(ref
, L
"refs/tags/"); }) != (*refList
).second
.cend();
2738 if (found
&& jumpType
== JumpType_TagFF
)
2739 found
= g_Git
.IsFastForward(data
->m_CommitHash
.ToString(), hashValue
.ToString());
2741 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2743 auto refList
= m_LogList
.m_HashMap
.find(data
->m_CommitHash
);
2744 if (refList
!= m_LogList
.m_HashMap
.cend())
2745 found
= find_if((*refList
).second
, [](const auto& ref
) { return CStringUtils::StartsWith(ref
, L
"refs/heads/") || CStringUtils::StartsWith(ref
, L
"refs/remotes/"); }) != (*refList
).second
.cend();
2747 if (found
&& jumpType
== JumpType_BranchFF
)
2748 found
= g_Git
.IsFastForward(data
->m_CommitHash
.ToString(), hashValue
.ToString());
2753 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2754 m_LogList
.EnsureVisible(i
, FALSE
);
2755 m_LogList
.SetSelectionMark(i
);
2760 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, L
"NoJumpNotFoundWarning", IDS_MSGBOX_DONOTSHOWAGAIN
);
2763 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
2771 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscRevSort());
2773 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescRevSort());
2779 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscActionSort());
2781 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescActionSort());
2787 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscAuthorSort());
2789 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescAuthorSort());
2795 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscDateSort());
2797 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescDateSort());
2800 case 4: // Message or bug id
2801 if (m_bShowBugtraqColumn
)
2804 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscBugIDSort());
2806 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescBugIDSort());
2809 // fall through here
2813 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscMessageSort());
2815 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescMessageSort());
2825 void CLogDlg::OnLvnColumnclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2827 if (this->IsThreadRunning())
2828 return; //no sorting while the arrays are filled
2830 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
2831 const int nColumn
= pNMLV
->iSubItem
;
2832 m_bAscending
= nColumn
== m_nSortColumn
? !m_bAscending
: TRUE
;
2833 m_nSortColumn
= nColumn
;
2834 SortByColumn(m_nSortColumn
, m_bAscending
);
2835 SetSortArrow(&m_LogList
, m_nSortColumn
, !!m_bAscending
);
2836 SortShownListArray();
2837 m_LogList
.Invalidate();
2838 UpdateLogInfoLabel();
2840 UNREFERENCED_PARAMETER(pNMHDR
);
2844 SetTimer(LOG_HEADER_ORDER_TIMER
, 10, nullptr);
2847 void CLogDlg::SortShownListArray()
2849 // make sure the shown list still matches the filter after sorting.
2850 OnTimer(LOGFILTER_TIMER
);
2851 // clear the selection states
2852 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2855 m_LogList
.SetItemState(m_LogList
.GetNextSelectedItem(pos
), 0, LVIS_SELECTED
);
2857 m_LogList
.SetSelectionMark(-1);
2860 void CLogDlg::SetSortArrow(CListCtrl
* control
, int nColumn
, bool bAscending
)
2864 // set the sort arrow
2865 CHeaderCtrl
* pHeader
= control
->GetHeaderCtrl();
2866 HDITEM HeaderItem
= {0};
2867 HeaderItem
.mask
= HDI_FORMAT
;
2868 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
2870 pHeader
->GetItem(i
, &HeaderItem
);
2871 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
2872 pHeader
->SetItem(i
, &HeaderItem
);
2876 pHeader
->GetItem(nColumn
, &HeaderItem
);
2877 HeaderItem
.fmt
|= (bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
2878 pHeader
->SetItem(nColumn
, &HeaderItem
);
2882 int CLogDlg::m_nSortColumnPathList
= 0;
2883 bool CLogDlg::m_bAscendingPathList
= false;
2885 void CLogDlg::OnBnClickedHidepaths()
2887 FillLogMessageCtrl();
2888 m_ChangedFileListCtrl
.Invalidate();
2891 void CLogDlg::UpdateLogInfoLabel()
2895 long selectedrevs
= 0;
2896 long selectedfiles
= 0;
2897 int count
= (int)m_LogList
.m_arShownList
.size();
2901 auto pRev
= m_LogList
.m_arShownList
.SafeGetAt(0);
2904 rev1
= m_LogList
.m_arShownList
.SafeGetAt(0)->m_CommitHash
;
2905 if (m_LogList
.m_bShowWC
&& rev1
.IsEmpty() && count
> 1)
2908 pRev
= m_LogList
.m_arShownList
.SafeGetAt(start
);
2910 rev1
= pRev
->m_CommitHash
;
2913 pRev
= m_LogList
.m_arShownList
.SafeGetAt(count
- 1);
2915 rev2
= pRev
->m_CommitHash
;
2916 selectedrevs
= m_LogList
.GetSelectedCount();
2918 selectedfiles
= m_ChangedFileListCtrl
.GetSelectedCount();
2921 sTemp
.FormatMessage(IDS_PROC_LOG_STATS
,
2923 (LPCTSTR
)rev2
.ToString().Left(g_Git
.GetShortHASHLength()), (LPCTSTR
)rev1
.ToString().Left(g_Git
.GetShortHASHLength()), selectedrevs
, selectedfiles
);
2925 if(selectedrevs
== 1)
2927 CString str
=m_ChangedFileListCtrl
.GetStatisticsString(true);
2928 str
.Replace(L
'\n', L
' ');
2929 sTemp
+= L
"; " + str
;
2936 void CLogDlg::OnDtnDropdownDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2938 // the date control should not show the "today" button
2939 CMonthCalCtrl
* pCtrl
= m_DateFrom
.GetMonthCalCtrl();
2941 pCtrl
->ModifyStyle(0, MCS_NOTODAY
);
2945 void CLogDlg::OnSize(UINT nType
, int cx
, int cy
)
2947 __super::OnSize(nType
, cx
, cy
);
2948 if ((m_LogList
) && (m_ChangedFileListCtrl
) && (nType
== 0) && (cx
>0) && (cy
> 0))
2950 // correct the splitter positions if they're out of bounds
2952 m_LogList
.GetWindowRect(rcTop
);
2953 ScreenToClient(rcTop
);
2956 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(rcMiddle
);
2957 ScreenToClient(rcMiddle
);
2960 m_ChangedFileListCtrl
.GetWindowRect(rcBottom
);
2961 ScreenToClient(rcBottom
);
2963 CRect rcBottomLimit
;
2964 GetDlgItem(IDC_LOGINFO
)->GetWindowRect(rcBottomLimit
);
2965 ScreenToClient(rcBottomLimit
);
2967 auto minCtrlHeight
= MIN_CTRL_HEIGHT
;
2969 // the IDC_LOGINFO and the changed file list control
2970 // have a space of 3 dlg units between them (check in the dlg resource editor)
2971 CRect
dlgUnitRect(0, 0, 3, 3);
2972 MapDialogRect(&dlgUnitRect
);
2974 if ((rcTop
.Height() < minCtrlHeight
) ||
2975 (rcMiddle
.Height() < minCtrlHeight
) ||
2976 (rcBottom
.Height() < minCtrlHeight
) ||
2977 (rcBottom
.bottom
> rcBottomLimit
.top
- dlgUnitRect
.bottom
))
2979 // controls sizes and splitters need adjusting
2980 RemoveMainAnchors();
2982 auto hdwp
= BeginDeferWindowPos(5);
2983 auto hdwpflags
= SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOREDRAW
| SWP_NOZORDER
;
2984 auto splitterHeight
= MIN_SPLITTER_HEIGHT
;
2986 if ((rcBottom
.bottom
> rcBottomLimit
.top
- dlgUnitRect
.bottom
) || (rcBottom
.Height() < minCtrlHeight
))
2988 // the bottom of the changed files list control is
2989 // below the point it should get, so move it upwards.
2990 // or the control is too small and needs extending.
2991 rcBottom
.bottom
= rcBottomLimit
.top
+ dlgUnitRect
.bottom
;
2992 rcBottom
.top
= min(rcBottom
.top
, rcBottom
.bottom
- minCtrlHeight
);
2993 DeferWindowPos(hdwp
, m_ChangedFileListCtrl
.GetSafeHwnd(), nullptr, rcBottom
.left
, rcBottom
.top
, rcBottom
.Width(), rcBottom
.Height(), hdwpflags
);
2994 if (rcBottom
.top
< rcMiddle
.bottom
+ splitterHeight
)
2996 // we also need to move splitter2 and rcMiddle.bottom upwards
2998 m_wndSplitter2
.GetWindowRect(rcSplitter2
);
2999 ScreenToClient(rcSplitter2
);
3000 rcSplitter2
.top
= rcBottom
.top
- splitterHeight
;
3001 rcSplitter2
.bottom
= rcBottom
.top
;
3002 DeferWindowPos(hdwp
, m_wndSplitter2
.GetSafeHwnd(), nullptr, rcSplitter2
.left
, rcSplitter2
.top
, rcSplitter2
.Width(), rcSplitter2
.Height(), hdwpflags
);
3003 rcMiddle
.bottom
= rcSplitter2
.top
;
3004 if (rcMiddle
.Height() < minCtrlHeight
)
3006 // now the message view is too small, we have to
3007 // move splitter1 upwards and resize the top view
3009 m_wndSplitter1
.GetWindowRect(rcSplitter1
);
3010 ScreenToClient(rcSplitter1
);
3011 rcMiddle
.top
= min(rcMiddle
.top
, rcMiddle
.bottom
- minCtrlHeight
);
3012 rcSplitter1
.top
= rcMiddle
.top
- splitterHeight
;
3013 rcSplitter1
.bottom
= rcMiddle
.top
;
3014 DeferWindowPos(hdwp
, m_wndSplitter1
.GetSafeHwnd(), nullptr, rcSplitter1
.left
, rcSplitter1
.top
, rcSplitter1
.Width(), rcSplitter1
.Height(), hdwpflags
);
3015 rcTop
.bottom
= rcSplitter1
.top
;
3016 DeferWindowPos(hdwp
, m_LogList
.GetSafeHwnd(), nullptr, rcTop
.left
, rcTop
.top
, rcTop
.Width(), rcTop
.Height(), hdwpflags
);
3018 rcMiddle
.top
= min(rcMiddle
.top
, rcMiddle
.bottom
- minCtrlHeight
);
3019 DeferWindowPos(hdwp
, GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), nullptr, rcMiddle
.left
, rcMiddle
.top
, rcMiddle
.Width(), rcMiddle
.Height(), hdwpflags
);
3022 if (rcTop
.Height() < minCtrlHeight
)
3024 // the log list view is too small. Extend its height down and move splitter1 down.
3025 rcTop
.bottom
= rcTop
.top
+ minCtrlHeight
;
3026 DeferWindowPos(hdwp
, m_LogList
.GetSafeHwnd(), nullptr, rcTop
.left
, rcTop
.top
, rcTop
.Width(), rcTop
.Height(), hdwpflags
);
3028 m_wndSplitter1
.GetWindowRect(rcSplitter1
);
3029 ScreenToClient(rcSplitter1
);
3030 rcSplitter1
.top
= rcTop
.bottom
;
3031 rcSplitter1
.bottom
= rcSplitter1
.top
+ splitterHeight
;
3032 DeferWindowPos(hdwp
, m_wndSplitter1
.GetSafeHwnd(), nullptr, rcSplitter1
.left
, rcSplitter1
.top
, rcSplitter1
.Width(), rcSplitter1
.Height(), hdwpflags
);
3033 // since splitter1 moves down, also adjust the message view
3034 rcMiddle
.top
= rcSplitter1
.bottom
;
3035 DeferWindowPos(hdwp
, GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), nullptr, rcMiddle
.left
, rcMiddle
.top
, rcMiddle
.Width(), rcMiddle
.Height(), hdwpflags
);
3037 if (rcMiddle
.Height() < minCtrlHeight
)
3039 // the message view is too small. Extend its height down and move splitter2 down;
3040 rcMiddle
.bottom
= rcMiddle
.top
+ minCtrlHeight
;
3041 DeferWindowPos(hdwp
, GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), nullptr, rcMiddle
.left
, rcMiddle
.top
, rcMiddle
.Width(), rcMiddle
.Height(), hdwpflags
);
3043 m_wndSplitter2
.GetWindowRect(rcSplitter2
);
3044 ScreenToClient(rcSplitter2
);
3045 rcSplitter2
.top
= rcMiddle
.bottom
;
3046 rcSplitter2
.bottom
= rcSplitter2
.top
+ splitterHeight
;
3047 DeferWindowPos(hdwp
, m_wndSplitter2
.GetSafeHwnd(), nullptr, rcSplitter2
.left
, rcSplitter2
.top
, rcSplitter2
.Width(), rcSplitter2
.Height(), hdwpflags
);
3048 // since splitter2 moves down, also adjust the changed files list control
3049 rcBottom
.top
= rcSplitter2
.bottom
;
3050 DeferWindowPos(hdwp
, m_ChangedFileListCtrl
.GetSafeHwnd(), nullptr, rcBottom
.left
, rcBottom
.top
, rcBottom
.Width(), rcBottom
.Height(), hdwpflags
);
3052 EndDeferWindowPos(hdwp
);
3058 m_wndSplitter1
.SetRange(rcTop
.top
+ MIN_CTRL_HEIGHT
, rcBottom
.bottom
- (2 * MIN_CTRL_HEIGHT
+ MIN_SPLITTER_HEIGHT
));
3059 m_wndSplitter2
.SetRange(rcTop
.top
+ (2 * MIN_CTRL_HEIGHT
+ MIN_SPLITTER_HEIGHT
), rcBottom
.bottom
- MIN_CTRL_HEIGHT
);
3061 m_LogList
.Invalidate();
3062 m_ChangedFileListCtrl
.Invalidate();
3063 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
3067 void CLogDlg::OnRefresh()
3070 this->m_LogProgress
.SetPos(0);
3076 void CLogDlg::OnFocusFilter()
3078 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
3081 void CLogDlg::OnEditCopy()
3083 if (GetFocus() == &m_ChangedFileListCtrl
)
3084 CopyChangedSelectionToClipBoard();
3086 m_LogList
.CopySelectionToClipBoard();
3089 CString
CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString
& url
)
3091 // is the URL a relative one?
3092 if (CStringUtils::StartsWith(url
, L
"^/"))
3094 // URL is relative to the repository root
3095 CString url1
= m_sRepositoryRoot
+ url
.Mid(1);
3096 TCHAR buf
[INTERNET_MAX_URL_LENGTH
] = { 0 };
3097 DWORD len
= url
.GetLength();
3098 if (UrlCanonicalize((LPCTSTR
)url1
, buf
, &len
, 0) == S_OK
)
3099 return CString(buf
, len
);
3102 else if (url
[0] == '/')
3104 // URL is relative to the server's hostname
3106 // find the server's hostname
3107 int schemepos
= m_sRepositoryRoot
.Find(L
"//");
3110 sHost
= m_sRepositoryRoot
.Left(m_sRepositoryRoot
.Find(L
'/', schemepos
+ 3));
3111 CString url1
= sHost
+ url
;
3112 TCHAR buf
[INTERNET_MAX_URL_LENGTH
] = { 0 };
3113 DWORD len
= url
.GetLength();
3114 if (UrlCanonicalize((LPCTSTR
)url
, buf
, &len
, 0) == S_OK
)
3115 return CString(buf
, len
);
3122 void CLogDlg::ShowGravatar()
3124 m_gravatar
.EnableGravatar(m_bShowGravatar
);
3125 RemoveAnchor(IDC_MSGVIEW
);
3126 if (m_gravatar
.IsGravatarEnabled())
3129 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
3130 ScreenToClient(&rect
);
3131 m_gravatar
.GetWindowRect(&rect2
);
3132 ScreenToClient(&rect2
);
3133 rect
.right
= rect2
.left
;
3134 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
3135 m_gravatar
.ShowWindow(SW_SHOW
);
3140 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
3141 ScreenToClient(&rect
);
3142 m_gravatar
.GetWindowRect(&rect2
);
3143 ScreenToClient(&rect2
);
3144 rect
.right
= rect2
.right
;
3145 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
3146 m_gravatar
.ShowWindow(SW_HIDE
);
3148 AddAnchor(IDC_MSGVIEW
, MIDDLE_LEFT
, MIDDLE_RIGHT
); // keep in sync with AddMainAnchors
3152 void CLogDlg::OnEnChangeSearchedit()
3155 if (m_sFilterText
.IsEmpty())
3157 // clear the filter, i.e. make all entries appear
3158 theApp
.DoWaitCursor(1);
3159 KillTimer(LOGFILTER_TIMER
);
3160 FillLogMessageCtrl(false);
3164 theApp
.DoWaitCursor(-1);
3165 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
3166 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
3167 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
3168 DialogEnableWindow(IDC_STATBUTTON
, !(this->IsThreadRunning() || m_LogList
.m_arShownList
.empty()));
3171 if (Validate(m_sFilterText
))
3172 SetTimer(LOGFILTER_TIMER
, 1000, nullptr);
3174 KillTimer(LOGFILTER_TIMER
);
3177 void CLogDlg::OnBnClickedAllBranch()
3179 // m_bAllBranch is not auto-toggled by MFC, we have to handle it manually (in order to prevent the indeterminate state)
3181 m_LogList
.m_ShowMask
&=~ (CGit::LOG_INFO_LOCAL_BRANCHES
| CGit::LOG_INFO_BASIC_REFS
| CGit::LOG_INFO_ALL_BRANCH
);
3185 m_bAllBranch
= BST_UNCHECKED
;
3186 m_AllBranchType
= AllBranchType::None
;
3187 m_ChangedFileListCtrl
.m_sDisplayedBranch
= m_LogList
.GetRange();
3191 m_bAllBranch
= BST_CHECKED
;
3192 m_AllBranchType
= AllBranchType::AllBranches
;
3193 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
3194 m_ChangedFileListCtrl
.m_sDisplayedBranch
.Empty();
3197 // need to save value here, so that log dialogs started from now on also have AllBranch activated
3198 m_regbAllBranch
= (DWORD
)m_AllBranchType
;
3204 FillLogMessageCtrl(false);
3207 void CLogDlg::OnBnClickedFollowRenames()
3209 if(m_bFollowRenames
)
3211 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_FOLLOW
;
3212 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_LOCAL_BRANCHES
;
3213 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_BASIC_REFS
;
3216 m_bAllBranch
= FALSE
;
3217 m_AllBranchType
= AllBranchType::None
;
3218 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_ALL_BRANCH
;
3222 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_FOLLOW
;
3224 DialogEnableWindow(IDC_LOG_ALLBRANCH
, !m_bFollowRenames
);
3225 DialogEnableWindow(IDC_WHOLE_PROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
3229 FillLogMessageCtrl(false);
3232 void CLogDlg::HandleShowLabels(bool var
, int flag
)
3235 m_LogList
.m_ShowRefMask
|= flag
;
3237 m_LogList
.m_ShowRefMask
&= ~flag
;
3239 if ((m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_REFS
) && !(m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_ANYCOMMIT
))
3241 // Remove commits where labels are not shown.
3243 FillLogMessageCtrl(false);
3248 m_LogList
.Invalidate();
3252 void CLogDlg::OnBnClickedCompressedGraph()
3256 if (m_iCompressedGraph
== 2)
3257 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_REFS
;
3258 else if (m_iCompressedGraph
== 1)
3259 m_LogList
.m_ShowFilter
= static_cast<CGitLogListBase::FilterShow
>(CGitLogListBase::FILTERSHOW_REFS
| CGitLogListBase::FILTERSHOW_MERGEPOINTS
);
3261 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_ALL
;
3264 FillLogMessageCtrl(false);
3267 void CLogDlg::OnBnClickedBrowseRef()
3269 CString newRef
= CBrowseRefsDlg::PickRef(false, m_LogList
.GetRange(), gPickRef_All
, true);
3270 if(newRef
.IsEmpty())
3273 m_History
.AddEntry(newRef
);
3278 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_BASIC_REFS
| CGit::LOG_INFO_LOCAL_BRANCHES
);
3279 m_bAllBranch
= BST_UNCHECKED
;
3280 m_AllBranchType
= AllBranchType::None
;
3284 FillLogMessageCtrl(false);
3287 void CLogDlg::ShowStartRef()
3289 //Show ref name on top
3290 if(!::IsWindow(m_hWnd
))
3292 if (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_BASIC_REFS
| CGit::LOG_INFO_LOCAL_BRANCHES
))
3294 switch (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_BASIC_REFS
| CGit::LOG_INFO_LOCAL_BRANCHES
))
3296 case CGit::LOG_INFO_ALL_BRANCH
:
3297 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES
)));
3300 case CGit::LOG_INFO_BASIC_REFS
:
3301 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_BASIC_REFS
)));
3304 case CGit::LOG_INFO_LOCAL_BRANCHES
:
3305 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_LOCAL_BRANCHES
)));
3309 m_staticRef
.Invalidate(TRUE
);
3310 m_tooltips
.DelTool(GetDlgItem(IDC_STATIC_REF
));
3314 CString showStartRef
= m_LogList
.GetRange();
3315 if (showStartRef
.IsEmpty() || showStartRef
== L
"HEAD")
3317 showStartRef
.Empty();
3319 if (g_Git
.Run(L
"git.exe symbolic-ref HEAD", &showStartRef
, nullptr, CP_UTF8
))
3320 showStartRef
.LoadString(IDS_PROC_LOG_NOBRANCH
);
3321 showStartRef
.Trim(L
"\r\n\t ");
3325 showStartRef
= g_Git
.StripRefName(showStartRef
);
3327 m_staticRef
.SetWindowText(showStartRef
);
3328 CWnd
*pWnd
= GetDlgItem(IDC_STATIC_REF
);
3329 m_tooltips
.AddTool(pWnd
, showStartRef
);
3330 m_staticRef
.Invalidate(TRUE
);
3333 void CLogDlg::SetRange(const CString
& range
)
3335 m_LogList
.SetRange(range
);
3336 m_ChangedFileListCtrl
.m_sDisplayedBranch
= range
;
3341 static void AppendMenuChecked(CMenu
&menu
, UINT nTextID
, UINT_PTR nItemID
, BOOL checked
= FALSE
, BOOL enabled
= TRUE
)
3344 text
.LoadString(nTextID
);
3345 menu
.AppendMenu(MF_STRING
| (enabled
? MF_ENABLED
: MF_DISABLED
) | (checked
? MF_CHECKED
: MF_UNCHECKED
), nItemID
, text
);
3348 #define WALKBEHAVIOUR_FIRSTPARENT 1
3349 #define WALKBEHAVIOUR_FOLLOWRENAMES 2
3350 #define WALKBEHAVIOUR_COMPRESSEDGRAPH 3
3351 #define WALKBEHAVIOUR_LABELEDCOMMITS 4
3352 #define WALKBEHAVIOUR_NOMERGES 5
3354 void CLogDlg::OnBnClickedWalkBehaviour()
3357 if (popup
.CreatePopupMenu())
3359 m_ctrlWalkBehavior
.SetCheck(BST_CHECKED
);
3360 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FIRSTPARENT
, WALKBEHAVIOUR_FIRSTPARENT
, m_bFirstParent
);
3361 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_NOMERGES
, WALKBEHAVIOUR_NOMERGES
, m_bNoMerges
);
3362 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FOLLOWRENAMES
, WALKBEHAVIOUR_FOLLOWRENAMES
, m_bFollowRenames
, !(m_path
.IsEmpty() || m_path
.IsDirectory()));
3363 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3364 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_COMPRESSED
, WALKBEHAVIOUR_COMPRESSEDGRAPH
, m_iCompressedGraph
== 1);
3365 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_LABELEDCOMMITS
, WALKBEHAVIOUR_LABELEDCOMMITS
, m_iCompressedGraph
== 2);
3369 GetDlgItem(IDC_WALKBEHAVIOUR
)->GetWindowRect(&rect
);
3371 params
.cbSize
= sizeof(TPMPARAMS
);
3372 params
.rcExclude
= rect
;
3373 int selection
= popup
.TrackPopupMenuEx(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
| TPM_VERTICAL
, rect
.left
, rect
.top
, this, ¶ms
);
3376 case WALKBEHAVIOUR_FIRSTPARENT
:
3377 m_bFirstParent
= !m_bFirstParent
;
3378 OnBnClickedFirstParent();
3380 case WALKBEHAVIOUR_NOMERGES
:
3381 m_bNoMerges
= !m_bNoMerges
;
3382 OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges
3384 case WALKBEHAVIOUR_FOLLOWRENAMES
:
3385 m_bFollowRenames
= !m_bFollowRenames
;
3386 OnBnClickedFollowRenames();
3388 case WALKBEHAVIOUR_COMPRESSEDGRAPH
:
3389 m_iCompressedGraph
= (m_iCompressedGraph
== 1 ? 0 : 1);
3390 OnBnClickedCompressedGraph();
3392 case WALKBEHAVIOUR_LABELEDCOMMITS
:
3393 m_iCompressedGraph
= (m_iCompressedGraph
== 2 ? 0 : 2);
3394 OnBnClickedCompressedGraph();
3399 m_ctrlWalkBehavior
.SetCheck((m_bFirstParent
|| m_bNoMerges
|| m_bFollowRenames
|| m_iCompressedGraph
) ? BST_CHECKED
: BST_UNCHECKED
);
3403 #define VIEW_HIDEPATHS 1
3404 #define VIEW_GRAYPATHS 2
3405 #define VIEW_SHOWTAGS 3
3406 #define VIEW_SHOWLOCALBRANCHES 4
3407 #define VIEW_SHOWREMOTEBRANCHES 5
3408 #define VIEW_SHOWGRAVATAR 6
3409 #define VIEW_SHOWPATCH 7
3410 #define VIEW_SHOWWCUNVERSIONED 8
3411 #define VIEW_SHOWOTHERREFS 9
3413 void CLogDlg::OnBnClickedView()
3416 if (popup
.CreatePopupMenu())
3418 m_ctrlView
.SetCheck(BST_CHECKED
);
3419 AppendMenuChecked(popup
, IDS_SHOWFILES_HIDEPATHS
, VIEW_HIDEPATHS
, m_iHidePaths
== 1);
3420 AppendMenuChecked(popup
, IDS_SHOWFILES_GRAYPATHS
, VIEW_GRAYPATHS
, m_iHidePaths
== 2);
3421 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3422 AppendMenuChecked(popup
, IDS_PROC_LOG_SHOWUNVERSIONED
, VIEW_SHOWWCUNVERSIONED
, m_bShowUnversioned
== BST_CHECKED
);
3423 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3424 CMenu showLabelsMenu
;
3425 if (showLabelsMenu
.CreatePopupMenu())
3427 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWTAGLABELS
, VIEW_SHOWTAGS
, m_bShowTags
);
3428 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWLOCALBRANCHLABELS
, VIEW_SHOWLOCALBRANCHES
, m_bShowLocalBranches
);
3429 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWREMOTEBRANCHLABELS
, VIEW_SHOWREMOTEBRANCHES
, m_bShowRemoteBranches
);
3430 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWROTHERLABELS
, VIEW_SHOWOTHERREFS
, m_bShowOtherRefs
);
3431 popup
.AppendMenu(MF_STRING
| MF_POPUP
, (UINT_PTR
)showLabelsMenu
.m_hMenu
, (CString
)MAKEINTRESOURCE(IDS_VIEW_LABELS
));
3433 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3434 AppendMenuChecked(popup
, IDS_VIEW_SHOWGRAVATAR
, VIEW_SHOWGRAVATAR
, m_bShowGravatar
);
3435 AppendMenuChecked(popup
, IDS_MENU_VIEWPATCH
, VIEW_SHOWPATCH
, IsWindow(this->m_patchViewdlg
.m_hWnd
));
3439 GetDlgItem(IDC_VIEW
)->GetWindowRect(&rect
);
3441 params
.cbSize
= sizeof(TPMPARAMS
);
3442 params
.rcExclude
= rect
;
3443 int selection
= popup
.TrackPopupMenuEx(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
| TPM_VERTICAL
, rect
.left
, rect
.top
, this, ¶ms
);
3446 case VIEW_HIDEPATHS
:
3447 if (m_iHidePaths
== 1)
3451 OnBnClickedHidepaths();
3453 case VIEW_GRAYPATHS
:
3454 if (m_iHidePaths
== 2)
3458 OnBnClickedHidepaths();
3461 m_bShowTags
= !m_bShowTags
;
3462 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
3464 case VIEW_SHOWLOCALBRANCHES
:
3465 m_bShowLocalBranches
= !m_bShowLocalBranches
;
3466 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
3468 case VIEW_SHOWREMOTEBRANCHES
:
3469 m_bShowRemoteBranches
= !m_bShowRemoteBranches
;
3470 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
3472 case VIEW_SHOWOTHERREFS
:
3473 m_bShowOtherRefs
= !m_bShowOtherRefs
;
3474 HandleShowLabels(m_bShowOtherRefs
, LOGLIST_SHOWOTHERREFS
);
3476 case VIEW_SHOWGRAVATAR
:
3478 m_bShowGravatar
= !m_bShowGravatar
;
3482 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
3485 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
3486 int moreSel
= m_LogList
.GetNextSelectedItem(pos
);
3489 GitRev
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(selIndex
);
3491 email
= pLogEntry
->GetAuthorEmail();
3494 m_gravatar
.LoadGravatar(email
);
3497 case VIEW_SHOWPATCH
:
3500 case VIEW_SHOWWCUNVERSIONED
:
3501 m_bShowUnversioned
= !m_bShowUnversioned
;
3502 FillLogMessageCtrl();
3503 m_ChangedFileListCtrl
.Invalidate();
3508 m_ctrlView
.SetCheck(BST_UNCHECKED
);
3512 void CLogDlg::OnBnClickedFirstParent()
3514 if(this->m_bFirstParent
)
3515 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_FIRST_PARENT
;
3517 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_FIRST_PARENT
;
3520 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_NO_MERGE
;
3522 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_NO_MERGE
;
3526 FillLogMessageCtrl(false);
3529 void CLogDlg::OnBnClickShowWholeProject()
3533 if(this->m_bWholeProject
)
3535 m_LogList
.m_Path
.Reset();
3539 m_LogList
.m_Path
=m_path
;
3541 m_regShowWholeProject
= m_bWholeProject
;
3547 FillLogMessageCtrl(false);
3550 LRESULT
CLogDlg::OnRefLogChanged(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
3556 LRESULT
CLogDlg::OnTaskbarBtnCreated(WPARAM wParam
, LPARAM lParam
)
3558 m_pTaskbarList
.Release();
3559 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
3560 return __super::OnTaskbarButtonCreated(wParam
, lParam
);
3563 LRESULT
CLogDlg::OnRefreshSelection(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
3565 // it's enough to deselect, then select again one item of the whole selection
3566 int selMark
= m_LogList
.GetSelectionMark();
3569 m_LogList
.SetSelectionMark(selMark
);
3570 m_LogList
.SetItemState(selMark
, 0, LVIS_SELECTED
);
3571 m_LogList
.SetItemState(selMark
, LVIS_SELECTED
, LVIS_SELECTED
);
3576 void CLogDlg::OnExitClearFilter()
3578 if (m_LogList
.m_LogFilter
->IsFilterActive())
3580 OnClickedCancelFilter(NULL
, NULL
);
3583 SendMessage(WM_CLOSE
);
3586 void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR
* pNMHDR
, LRESULT
* pResult
)
3588 NMLVCUSTOMDRAW
* pLVCD
= reinterpret_cast<NMLVCUSTOMDRAW
*>(pNMHDR
);
3589 if (pLVCD
->nmcd
.dwDrawStage
!= (CDDS_ITEMPREPAINT
| CDDS_ITEM
| CDDS_SUBITEM
))
3592 if (pLVCD
->iSubItem
> 2)
3595 auto filter(m_LogList
.m_LogFilter
);
3596 if ((m_SelectedFilters
& LOGFILTER_PATHS
) && (filter
->IsFilterActive()))
3597 *pResult
= m_LogList
.DrawListItemWithMatches(filter
.get(), m_ChangedFileListCtrl
, pLVCD
);