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"
35 #define WM_TGIT_REFRESH_SELECTION (WM_APP + 1)
37 IMPLEMENT_DYNAMIC(CLogDlg
, CResizableStandAloneDialog
)
38 CLogDlg::CLogDlg(CWnd
* pParent
/*=nullptr*/)
39 : CResizableStandAloneDialog(CLogDlg::IDD
, pParent
)
42 , m_bFollowRenames(false)
44 , m_bSelectionMustBeSingle(true)
46 , m_bShowLocalBranches(true)
47 , m_bShowRemoteBranches(true)
48 , m_bShowOtherRefs(true)
51 , m_bFirstParent(false)
52 , m_bWholeProject(FALSE
)
53 , m_iCompressedGraph(0)
56 , m_bSelectionMustBeContinuous(false)
58 , m_pNotifyWindow(nullptr)
62 , m_bNavigatingWithSelect(false)
64 m_bFilterWithRegex
= !!CRegDWORD(L
"Software\\TortoiseGit\\UseRegexFilter", FALSE
);
65 m_bFilterCaseSensitively
= !!CRegDWORD(L
"Software\\TortoiseGit\\FilterCaseSensitively", FALSE
);
66 m_bAsteriskLogPrefix
= !!CRegDWORD(L
"Software\\TortoiseGit\\AsteriskLogPrefix", TRUE
);
67 m_LogList
.m_SelectedFilters
= CRegDWORD(L
"Software\\TortoiseGit\\SelectedLogFilters", LOGFILTER_ALL
);
69 CString str
= g_Git
.m_CurrentDir
;
70 str
.Replace(L
':', L
'_');
72 m_regbAllBranch
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\AllBranch\\" + str
, FALSE
);
73 m_AllBranchType
= (AllBranchType
)(DWORD
)m_regbAllBranch
;
74 switch (m_AllBranchType
)
76 case AllBranchType::None
:
79 case AllBranchType::AllBranches
:
83 m_bAllBranch
= BST_INDETERMINATE
;
86 m_regShowWholeProject
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\" + str
, FALSE
);
87 m_bWholeProject
= m_regShowWholeProject
;
88 m_regbShowTags
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\ShowTags\\" + str
, TRUE
);
89 m_bShowTags
= !!m_regbShowTags
;
90 m_regbShowLocalBranches
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\ShowLocalBranches\\" + str
, TRUE
);
91 m_bShowLocalBranches
= !!m_regbShowLocalBranches
;
92 m_regbShowRemoteBranches
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\ShowRemoteBranches\\" + str
, TRUE
);
93 m_bShowRemoteBranches
= !!m_regbShowRemoteBranches
;
94 m_regbShowOtherRefs
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\ShowOtherRefs\\" + str
, TRUE
);
95 m_bShowOtherRefs
= !!m_regbShowOtherRefs
;
98 m_regAddBeforeCommit
= CRegDWORD(L
"Software\\TortoiseGit\\AddBeforeCommit", TRUE
);
99 m_bShowUnversioned
= !!m_regAddBeforeCommit
;
101 m_bShowGravatar
= !!CRegDWORD(L
"Software\\TortoiseGit\\EnableGravatar", FALSE
);
102 m_regbShowGravatar
= CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\ShowGravatar\\" + str
, m_bShowGravatar
);
103 m_bShowGravatar
= !!m_regbShowGravatar
;
104 m_bShowDescribe
= !!CRegDWORD(L
"Software\\TortoiseGit\\ShowDescribe");
105 m_bShowBranchRevNo
= !!CRegDWORD(L
"Software\\TortoiseGit\\ShowBranchRevisionNumber", FALSE
);
110 m_regbAllBranch
= (DWORD
)m_AllBranchType
;
111 m_regbShowTags
= m_bShowTags
;
112 m_regbShowLocalBranches
= m_bShowLocalBranches
;
113 m_regbShowRemoteBranches
= m_bShowRemoteBranches
;
114 m_regbShowOtherRefs
= m_bShowOtherRefs
;
115 m_regbShowGravatar
= m_bShowGravatar
;
116 m_regAddBeforeCommit
= m_bShowUnversioned
;
119 void CLogDlg::DoDataExchange(CDataExchange
* pDX
)
121 CResizableStandAloneDialog::DoDataExchange(pDX
);
122 DDX_Control(pDX
, IDC_LOGLIST
, m_LogList
);
123 DDX_Control(pDX
, IDC_LOGMSG
, m_ChangedFileListCtrl
);
124 DDX_Control(pDX
, IDC_PROGRESS
, m_LogProgress
);
125 DDX_Control(pDX
, IDC_SPLITTERTOP
, m_wndSplitter1
);
126 DDX_Control(pDX
, IDC_SPLITTERBOTTOM
, m_wndSplitter2
);
127 DDX_Text(pDX
, IDC_SEARCHEDIT
, m_LogList
.m_sFilterText
);
128 DDX_Control(pDX
, IDC_DATEFROM
, m_DateFrom
);
129 DDX_Control(pDX
, IDC_DATETO
, m_DateTo
);
130 DDX_Control(pDX
, IDC_LOG_JUMPTYPE
, m_JumpType
);
131 DDX_Control(pDX
, IDC_LOG_JUMPUP
, m_JumpUp
);
132 DDX_Control(pDX
, IDC_LOG_JUMPDOWN
, m_JumpDown
);
133 DDX_Text(pDX
, IDC_LOGINFO
, m_sLogInfo
);
134 DDX_Check(pDX
, IDC_LOG_ALLBRANCH
,m_bAllBranch
);
135 DDX_Check(pDX
, IDC_WHOLE_PROJECT
, m_bWholeProject
);
136 DDX_Control(pDX
, IDC_WALKBEHAVIOUR
, m_ctrlWalkBehavior
);
137 DDX_Control(pDX
, IDC_VIEW
, m_ctrlView
);
138 DDX_Control(pDX
, IDC_SEARCHEDIT
, m_cFilter
);
139 DDX_Control(pDX
, IDC_STATIC_REF
, m_staticRef
);
140 DDX_Control(pDX
, IDC_PIC_AUTHOR
, m_gravatar
);
141 DDX_Control(pDX
, IDC_FILTER
, m_cFileFilter
);
144 BEGIN_MESSAGE_MAP(CLogDlg
, CResizableStandAloneDialog
)
147 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGLIST
, OnLvnItemchangedLoglist
)
148 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGMSG
, OnLvnItemchangedLogmsg
)
149 ON_NOTIFY(EN_LINK
, IDC_MSGVIEW
, OnEnLinkMsgview
)
150 ON_EN_VSCROLL(IDC_MSGVIEW
, OnEnscrollMsgview
)
151 ON_EN_HSCROLL(IDC_MSGVIEW
, OnEnscrollMsgview
)
152 ON_BN_CLICKED(IDC_STATBUTTON
, OnBnClickedStatbutton
)
154 ON_MESSAGE(WM_TGIT_REFRESH_SELECTION
, OnRefreshSelection
)
155 ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_INFOCLICKED
, OnClickedInfoIcon
)
156 ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_CANCELCLICKED
, OnClickedCancelFilter
)
158 ON_MESSAGE(MSG_LOAD_PERCENTAGE
,OnLogListLoading
)
160 ON_EN_CHANGE(IDC_SEARCHEDIT
, OnEnChangeSearchedit
)
162 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATETO
, OnDtnDatetimechangeDateto
)
163 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATEFROM
, OnDtnDatetimechangeDatefrom
)
164 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE
, &CLogDlg::OnCbnSelchangeJumpType
)
165 ON_COMMAND(IDC_LOG_JUMPUP
, &CLogDlg::OnBnClickedJumpUp
)
166 ON_COMMAND(IDC_LOG_JUMPDOWN
, &CLogDlg::OnBnClickedJumpDown
)
167 ON_COMMAND(ID_GO_UP
, &CLogDlg::OnBnClickedJumpUp
)
168 ON_COMMAND(ID_GO_DOWN
, &CLogDlg::OnBnClickedJumpDown
)
169 ON_COMMAND(ID_EXITCLEARFILTER
, OnExitClearFilter
)
170 ON_BN_CLICKED(IDC_WALKBEHAVIOUR
, OnBnClickedWalkBehaviour
)
171 ON_BN_CLICKED(IDC_VIEW
, OnBnClickedView
)
172 ON_BN_CLICKED(IDC_WHOLE_PROJECT
, OnBnClickShowWholeProject
)
173 ON_NOTIFY(LVN_COLUMNCLICK
,IDC_LOGLIST
, OnLvnColumnclick
)
174 ON_COMMAND(MSG_FETCHED_DIFF
, OnBnClickedHidepaths
)
175 ON_BN_CLICKED(IDC_LOG_ALLBRANCH
, OnBnClickedAllBranch
)
176 ON_EN_CHANGE(IDC_FILTER
, OnEnChangeFileFilter
)
178 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATEFROM
, &CLogDlg::OnDtnDropdownDatefrom
)
180 ON_BN_CLICKED(IDC_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
181 ON_STN_CLICKED(IDC_STATIC_REF
, &CLogDlg::OnBnClickedBrowseRef
)
182 ON_COMMAND(ID_LOGDLG_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
183 ON_COMMAND(ID_GO_BACKWARD_SELECT
, &CLogDlg::GoBackAndSelect
)
184 ON_COMMAND(ID_GO_FORWARD_SELECT
, &CLogDlg::GoForwardAndSelect
)
185 ON_COMMAND(ID_GO_BACKWARD
, &CLogDlg::GoBack
)
186 ON_COMMAND(ID_GO_FORWARD
, &CLogDlg::GoForward
)
187 ON_COMMAND(ID_SELECT_SEARCHFIELD
, &CLogDlg::OnSelectSearchField
)
188 ON_COMMAND(ID_LOGDLG_FIND
, &CLogDlg::OnFind
)
189 ON_COMMAND(ID_LOGDLG_FOCUSFILTER
, &CLogDlg::OnFocusFilter
)
190 ON_COMMAND(ID_EDIT_COPY
, &CLogDlg::OnEditCopy
)
191 ON_MESSAGE(MSG_REFLOG_CHANGED
, OnRefLogChanged
)
192 ON_REGISTERED_MESSAGE(TaskBarButtonCreated
, OnTaskbarBtnCreated
)
194 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED
, &CLogDlg::OnFileListCtrlItemChanged
)
195 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
, OnGitStatusListCtrlNeedsRefresh
)
196 ON_REGISTERED_MESSAGE(CGitLogListBase::LOGLIST_RESET_WCREV
, OnResetWcRev
)
206 JumpType_AuthorEmail
,
207 JumpType_CommitterEmail
,
218 LRESULT
CLogDlg::OnResetWcRev(WPARAM
, LPARAM
)
220 if (m_LogList
.m_hasWC
&& (m_ChangedFileListCtrl
.m_CurrentVersion
.IsEmpty() || m_ChangedFileListCtrl
.m_CurrentVersion
== GIT_REV_ZERO
))
221 m_ChangedFileListCtrl
.Clear();
226 LRESULT
CLogDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
228 if (m_LogList
.m_hasWC
&& m_LogList
.GetSelectedCount() == 1)
230 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
231 size_t selIndex
= m_LogList
.GetNextSelectedItem(pos
);
232 GitRevLoglist
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(selIndex
);
233 if (pLogEntry
&& pLogEntry
->m_CommitHash
.IsEmpty())
234 m_ChangedFileListCtrl
.StoreScrollPos();
236 m_LogList
.ResetWcRev(true);
237 m_LogList
.Invalidate();
241 void CLogDlg::SetParams(const CTGitPath
& orgPath
, const CTGitPath
& path
, CString hightlightRevision
, CString range
, DWORD limit
, int limitScale
/*=-1*/)
245 m_hightlightRevision
= hightlightRevision
;
247 if (range
== GIT_REV_ZERO
)
250 if (!(range
.IsEmpty() || range
== L
"HEAD"))
252 m_bAllBranch
= BST_UNCHECKED
;
253 m_AllBranchType
= AllBranchType::None
;
258 if (limitScale
== CFilterData::SHOW_NO_LIMIT
|| (!range
.IsEmpty() && m_LogList
.m_Filter
.m_NumberOfLogsScale
!= CFilterData::SHOW_LAST_N_COMMITS
))
259 m_LogList
.m_Filter
.m_NumberOfLogsScale
= CFilterData::SHOW_NO_LIMIT
;
260 if (limitScale
>= CFilterData::SHOW_LAST_N_COMMITS
&& limit
> 0)
262 // limitation from command line argument, so override the filter.
263 m_LogList
.m_Filter
.m_NumberOfLogs
= limit
;
264 m_LogList
.m_Filter
.m_NumberOfLogsScale
= limitScale
;
267 if (::IsWindow(m_hWnd
))
271 void CLogDlg::SetFilter(const CString
& findstr
, LONG findtype
, bool findregex
)
273 m_LogList
.m_sFilterText
= findstr
;
275 m_LogList
.m_SelectedFilters
= findtype
;
276 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
= findregex
;
279 BOOL
CLogDlg::OnInitDialog()
282 CResizableStandAloneDialog::OnInitDialog();
283 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
285 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
286 // do this, Explorer would be unable to send that message to our window if we
287 // were running elevated. It's OK to make the call all the time, since if we're
288 // not elevated, this is a no-op.
289 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
290 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
291 CAutoLibrary hUser
= AtlLoadSystemLibraryUsingFullPath(L
"user32.dll");
294 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
295 if (pfnChangeWindowMessageFilterEx
)
297 pfnChangeWindowMessageFilterEx(m_hWnd
, TaskBarButtonCreated
, MSGFLT_ALLOW
, &cfs
);
300 m_pTaskbarList
.Release();
301 if (FAILED(m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
)))
302 m_pTaskbarList
= nullptr;
304 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG
));
306 // use the state of the "stop on copy/rename" option from the last time
309 // set the font to use in the log message view, configured in the settings dialog
310 CAppUtils::CreateFontForLogs(m_logFont
);
311 GetDlgItem(IDC_MSGVIEW
)->SetFont(&m_logFont
);
312 // make the log message rich edit control send a message when the mouse pointer is over a link
313 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_SETEVENTMASK
, NULL
, ENM_LINK
| ENM_SCROLL
);
315 // "unrelated paths" should be in gray color
318 // set up the columns
319 m_LogList
.DeleteAllItems();
321 m_LogList
.m_Path
=m_path
;
322 m_LogList
.m_hasWC
= !GitAdminDir::IsBareRepo(g_Git
.m_CurrentDir
);
323 m_LogList
.m_bShowWC
= m_LogList
.m_hasWC
&& m_bShowWC
;
324 m_LogList
.InsertGitColumn();
327 m_LogList
.m_Path
.Reset();
329 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
);
331 GetDlgItem(IDC_LOGLIST
)->UpdateData(FALSE
);
335 CheckRegexpTooltip();
339 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
340 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
, 14, 14);
341 m_cFilter
.SetInfoIcon(IDI_LOGFILTER
, 19, 19);
342 m_cFilter
.SetValidator(this);
344 AdjustControlSize(IDC_LOG_ALLBRANCH
);
345 AdjustControlSize(IDC_WHOLE_PROJECT
);
347 GetClientRect(m_DlgOrigRect
);
348 m_LogList
.GetClientRect(m_LogListOrigRect
);
349 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(m_MsgViewOrigRect
);
350 m_ChangedFileListCtrl
.GetClientRect(m_ChgOrigRect
);
352 m_Brush
.CreateSolidBrush(RGB(174, 200, 255));
354 m_DateFrom
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
355 m_DateTo
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
| MCS_NOTRAILINGDATES
| MCS_NOSELCHANGEONNAV
);
357 m_staticRef
.SetURL(CString());
362 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_LOCAL_BRANCHES
;
363 if (m_AllBranchType
== AllBranchType::AllBranches
)
364 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
365 else if (m_AllBranchType
== AllBranchType::AllLocalBranches
)
366 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
367 else if (m_AllBranchType
== AllBranchType::AllBasicRefs
)
368 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_BASIC_REFS
;
370 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_ALL_BRANCH
;
372 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
373 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
374 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
375 HandleShowLabels(m_bShowOtherRefs
, LOGLIST_SHOWOTHERREFS
);
377 // SetPromptParentWindow(m_hWnd);
378 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL
)));
379 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL
)));
380 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT
)));
381 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1
)));
382 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2
)));
383 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG
)));
384 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF
)));
385 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH
)));
386 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH_FF
)));
387 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_SELECTION_HISTORY
)));
388 m_JumpType
.SetCurSel(0);
389 int iconWidth
= GetSystemMetrics(SM_CXSMICON
);
390 int iconHeight
= GetSystemMetrics(SM_CYSMICON
);
391 m_JumpUp
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP
), IMAGE_ICON
, iconWidth
, iconHeight
, LR_DEFAULTCOLOR
));
392 m_JumpDown
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN
), IMAGE_ICON
, iconWidth
, iconHeight
, LR_DEFAULTCOLOR
));
395 CenterWindow(CWnd::FromHandle(hWndExplorer
));
396 EnableSaveRestore(L
"LogDlg");
398 DWORD yPos1
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1");
399 DWORD yPos2
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2");
400 RECT rcDlg
, rcLogList
, rcChgMsg
;
401 GetClientRect(&rcDlg
);
402 m_LogList
.GetWindowRect(&rcLogList
);
403 ScreenToClient(&rcLogList
);
404 m_ChangedFileListCtrl
.GetWindowRect(&rcChgMsg
);
405 ScreenToClient(&rcChgMsg
);
406 if (yPos1
&& ((LONG
)yPos1
< rcDlg
.bottom
- 185))
409 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
410 ScreenToClient(&rectSplitter
);
411 int delta
= yPos1
- rectSplitter
.top
;
413 if ((rcLogList
.bottom
+ delta
> rcLogList
.top
)&&(rcLogList
.bottom
+ delta
< rcChgMsg
.bottom
- 30))
415 m_wndSplitter1
.SetWindowPos(nullptr, rectSplitter
.left
, yPos1
, 0, 0, SWP_NOSIZE
);
419 if (yPos2
&& ((LONG
)yPos2
< rcDlg
.bottom
- 153))
422 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
423 ScreenToClient(&rectSplitter
);
424 int delta
= yPos2
- rectSplitter
.top
;
426 if ((rcChgMsg
.top
+ delta
< rcChgMsg
.bottom
)&&(rcChgMsg
.top
+ delta
> rcLogList
.top
+ 30))
428 m_wndSplitter2
.SetWindowPos(nullptr, rectSplitter
.left
, yPos2
, 0, 0, SWP_NOSIZE
);
438 // the dialog is used to select revisions
439 // enable the OK button if appropriate
444 // the dialog is used to just view log messages
445 // hide the OK button and set text on Cancel button to OK
446 GetDlgItemText(IDOK
, temp
);
447 SetDlgItemText(IDCANCEL
, temp
);
448 GetDlgItem(IDOK
)->ShowWindow(SW_HIDE
);
451 // first start a thread to obtain the log messages without
452 // blocking the dialog
454 //m_tFrom = (DWORD)-1;
456 // scroll to user selected or current revision
457 if (m_hightlightRevision
.IsEmpty() || g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, m_hightlightRevision
))
459 if (g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, L
"HEAD"))
460 MessageBox(g_Git
.GetGitLastErr(L
"Could not get HEAD hash."), L
"TortoiseGit", MB_ICONERROR
);
463 if (g_Git
.GetConfigValueBool(L
"tgit.logshowpatch"))
466 m_LogList
.FetchLogAsync(this);
470 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
, 14, 14);
471 m_cFilter
.SetInfoIcon(IDI_LOGFILTER
, 19, 19);
472 temp
.LoadString(IDS_FILEDIFF_FILTERCUE
);
474 m_cFileFilter
.SetCueBanner(temp
);
476 GetDlgItem(IDC_LOGLIST
)->SetFocus();
478 m_History
.SetMaxHistoryItems((LONG
)CRegDWORD(L
"Software\\TortoiseGit\\MaxRefHistoryItems", 5));
480 reg
.Format(L
"Software\\TortoiseGit\\History\\log-refs\\%s", (LPCTSTR
)g_Git
.m_CurrentDir
);
481 reg
.Replace(L
':', L
'_');
482 m_History
.Load(reg
, L
"ref");
484 reg
.Format(L
"Software\\TortoiseGit\\History\\LogDlg_Limits\\%s\\FromDate", (LPCTSTR
)g_Git
.m_CurrentDir
);
485 reg
.Replace(L
':', L
'_');
486 m_regLastSelectedFromDate
= CRegString(reg
);
488 m_ctrlWalkBehavior
.m_bAlwaysShowArrow
= true;
489 m_ctrlView
.m_bAlwaysShowArrow
= true;
495 HBRUSH
CLogDlg::OnCtlColor(CDC
* pDC
, CWnd
* pWnd
, UINT nCtlColor
)
497 HBRUSH hbr
= __super::OnCtlColor(pDC
, pWnd
, nCtlColor
);
499 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
)
501 pDC
->SetBkMode(TRANSPARENT
);
508 void CLogDlg::OnPaint()
512 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))
515 CWnd
* pWnd
= GetDlgItem(IDC_FROMLABEL
);
520 pWnd
->GetWindowRect(&rect
);
521 ScreenToClient(rect
);
526 dc
.FillRect(rect
, &m_Brush
);
529 LRESULT
CLogDlg::OnLogListLoading(WPARAM wParam
, LPARAM
/*lParam*/)
533 if( cur
== GITLOG_START
)
536 temp
.LoadString(IDS_PROGRESSWAIT
);
538 this->m_LogList
.ShowText(temp
, true);
540 // We use a progress bar while getting the logs
541 m_LogProgress
.SetRange32(0, 100);
542 m_LogProgress
.SetPos(0);
545 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
546 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
549 GetDlgItem(IDC_WALKBEHAVIOUR
)->ShowWindow(SW_HIDE
);
550 GetDlgItem(IDC_VIEW
)->ShowWindow(SW_HIDE
);
551 GetDlgItem(IDC_STATBUTTON
)->ShowWindow(SW_HIDE
);
552 GetDlgItem(IDC_PROGRESS
)->ShowWindow(TRUE
);
554 DialogEnableWindow(IDC_WALKBEHAVIOUR
, FALSE
);
555 DialogEnableWindow(IDC_STATBUTTON
, FALSE
);
556 //DialogEnableWindow(IDC_REFRESH, FALSE);
557 DialogEnableWindow(IDC_VIEW
, FALSE
);
560 else if( cur
== GITLOG_END
)
562 if(this->m_LogList
.HasText())
564 this->m_LogList
.ClearText();
566 UpdateLogInfoLabel();
569 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
571 DialogEnableWindow(IDC_WHOLE_PROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
573 DialogEnableWindow(IDC_STATBUTTON
, !(m_LogList
.m_arShownList
.empty() || m_LogList
.m_arShownList
.size() == 1 && m_LogList
.m_bShowWC
));
574 DialogEnableWindow(IDC_REFRESH
, TRUE
);
575 DialogEnableWindow(IDC_VIEW
, TRUE
);
576 DialogEnableWindow(IDC_WALKBEHAVIOUR
, TRUE
);
577 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
578 GetDlgItem(IDC_WALKBEHAVIOUR
)->ShowWindow(SW_SHOW
);
579 GetDlgItem(IDC_VIEW
)->ShowWindow(SW_SHOW
);
580 GetDlgItem(IDC_STATBUTTON
)->ShowWindow(SW_SHOW
);
581 GetDlgItem(IDC_PROGRESS
)->ShowWindow(FALSE
);
582 //CTime time=m_LogList.GetOldestTime();
584 m_LogList
.GetTimeRange(begin
,end
);
586 if (m_LogList
.m_Filter
.m_From
> 0 && m_LogList
.m_Filter
.m_NumberOfLogsScale
>= CFilterData::SHOW_LAST_SEL_DATE
)
587 begin
= m_LogList
.m_Filter
.m_From
;
588 m_DateFrom
.SetTime(&begin
);
589 if (m_LogList
.m_Filter
.m_To
!= -1)
590 end
= m_LogList
.m_Filter
.m_To
;
591 m_DateTo
.SetTime(&end
);
596 if(this->m_LogList
.HasText())
598 this->m_LogList
.ClearText();
599 this->m_LogList
.Invalidate();
601 UpdateLogInfoLabel();
602 m_LogProgress
.SetPos(cur
);
605 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
606 m_pTaskbarList
->SetProgressValue(m_hWnd
, cur
, 100);
611 void CLogDlg::SetDlgTitle()
613 if (m_sTitle
.IsEmpty())
614 GetWindowText(m_sTitle
);
616 if (m_LogList
.m_Path
.IsEmpty() || m_orgPath
.GetWinPathString().IsEmpty())
617 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
619 CAppUtils::SetWindowTitle(m_hWnd
, m_orgPath
.GetWinPathString(), m_sTitle
);
622 void CLogDlg::CheckRegexpTooltip()
624 CWnd
*pWnd
= GetDlgItem(IDC_SEARCHEDIT
);
625 // Since tooltip describes regexp features, show it only if regexps are enabled.
626 if (m_bFilterWithRegex
)
627 m_tooltips
.AddTool(pWnd
, IDS_LOG_FILTER_REGEX_TT
);
629 m_tooltips
.DelTool(pWnd
);
632 void CLogDlg::EnableOKButton()
636 // the dialog is used to select revisions
637 if (m_bSelectionMustBeSingle
)
639 // enable OK button if only a single revision is selected
640 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()==1));
642 else if (m_bSelectionMustBeContinuous
)
643 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()!=0)&&(m_LogList
.IsSelectionContinuous()));
645 DialogEnableWindow(IDOK
, m_LogList
.GetSelectedCount()!=0);
648 DialogEnableWindow(IDOK
, TRUE
);
651 bool LookLikeGitHash(const CString
& msg
, int &pos
)
654 for (; pos
< msg
.GetLength(); ++pos
)
656 if (msg
[pos
] >= '0' && msg
[pos
] <= '9' || msg
[pos
] >= 'a' && msg
[pos
] <= 'f')
659 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2 && msg
[pos
] != '@';
661 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2;
664 std::vector
<CHARRANGE
> FindGitHashPositions(const CString
& msg
, int offset
)
666 std::vector
<CHARRANGE
> result
;
667 offset
= offset
< 0 ? 0 : offset
;
669 while (offset
< msg
.GetLength())
672 TCHAR e
= msg
[offset
];
676 if (msg
.Mid(offset
, 11) == L
"git-svn-id:"
677 || msg
.Mid(offset
, 14) == L
"Signed-off-by:"
678 || msg
.Mid(offset
, 10) == L
"Change-Id:"
682 while (offset
< msg
.GetLength())
684 if (msg
[++offset
] == '\n')
690 else if (e
>= 'A' && e
<= 'Z' || e
>= 'h' && e
<= 'z')
695 } while (offset
< msg
.GetLength() && (e
>= 'A' && e
<= 'Z' || e
>= 'a' && e
<= 'z' || e
>= '0' && e
<= '9'));
697 else if (e
>= 'a' && e
<= 'g' || e
>= '0' && e
<= '9')
704 if (LookLikeGitHash(msg
, offset
))
706 TCHAR d
= offset
< msg
.GetLength() ? msg
[offset
] : '\0';
707 if (!((d
>= 'A' && d
<= 'Z') || (d
>= 'a' && d
<= 'z') || (d
>= '0' && d
<= '9')))
709 CHARRANGE range
= { old
, offset
};
710 result
.push_back(range
);
722 BOOL
FindGitHash(const CString
& msg
, int offset
, CWnd
*pWnd
)
724 std::vector
<CHARRANGE
> positions
= FindGitHashPositions(msg
, offset
);
725 CAppUtils::SetCharFormat(pWnd
, CFM_LINK
, CFE_LINK
, positions
);
727 return positions
.empty() ? FALSE
: TRUE
;
730 static int DescribeCommit(CGitHash
& hash
, CString
& result
)
732 CAutoRepository
repo(g_Git
.GetGitRepository());
736 if (git_object_lookup(commit
.GetPointer(), repo
, (const git_oid
*)hash
.m_hash
, GIT_OBJ_COMMIT
))
739 CAutoDescribeResult describe
;
740 git_describe_options describe_options
= GIT_DESCRIBE_OPTIONS_INIT
;
741 describe_options
.describe_strategy
= CRegDWORD(L
"Software\\TortoiseGit\\DescribeStrategy", GIT_DESCRIBE_DEFAULT
);
742 if (git_describe_commit(describe
.GetPointer(), (git_object
*)commit
, &describe_options
))
745 CAutoBuf describe_buf
;
746 git_describe_format_options format_options
= GIT_DESCRIBE_FORMAT_OPTIONS_INIT
;
747 format_options
.abbreviated_size
= CRegDWORD(L
"Software\\TortoiseGit\\DescribeAbbreviatedSize", GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE
);
748 format_options
.always_use_long_format
= CRegDWORD(L
"Software\\TortoiseGit\\DescribeAlwaysLong");
749 if (git_describe_format(describe_buf
, describe
, &format_options
))
752 result
= CUnicodeUtils::GetUnicode(describe_buf
->ptr
);
756 void CLogDlg::FillLogMessageCtrl(bool bShow
/* = true*/)
758 // we fill here the log message rich edit control,
759 // and also populate the changed files list control
760 // according to the selected revision(s).
762 CRichEditCtrl
* pMsgView
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
763 // empty the log message view
764 pMsgView
->SetWindowText(L
" ");
766 // empty the changed files list
767 m_ChangedFileListCtrl
.SetRedraw(FALSE
);
768 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
769 m_ChangedFileListCtrl
.Clear();
771 // if we're not here to really show a selected revision, just
772 // get out of here after clearing the views, which is what is intended
773 // if that flag is not set.
777 m_ChangedFileListCtrl
.Invalidate();
778 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
779 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
780 m_gravatar
.LoadGravatar();
784 // depending on how many revisions are selected, we have to do different
786 int selCount
= m_LogList
.GetSelectedCount();
789 // if nothing is selected, we have nothing more to do
790 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
791 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
792 m_gravatar
.LoadGravatar();
795 else if (selCount
== 1)
797 // if one revision is selected, we have to fill the log message view
798 // with the corresponding log message, and also fill the changed files
800 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
801 size_t selIndex
= m_LogList
.GetNextSelectedItem(pos
);
802 if (selIndex
>= m_LogList
.m_arShownList
.size())
804 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
805 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
808 GitRevLoglist
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(selIndex
);
811 m_gravatar
.LoadGravatar(pLogEntry
->GetAuthorEmail());
813 CString out_describe
;
817 if (!DescribeCommit(pLogEntry
->m_CommitHash
, result
))
818 out_describe
= L
"Describe: " + result
+ L
"\r\n";
822 if (m_bShowBranchRevNo
&& !pLogEntry
->m_CommitHash
.IsEmpty())
824 bool isFirstParentCommit
= !pLogEntry
->m_Lanes
.empty() && Lanes::isActive(pLogEntry
->m_Lanes
[0]);
826 if (isFirstParentCommit
)
828 CString rev_counter
, rev_err
;
829 if (g_Git
.Run(L
"git.exe rev-list --count --first-parent " + pLogEntry
->m_CommitHash
.ToString(), &rev_counter
, &rev_err
, CP_UTF8
))
830 CMessageBox::Show(GetSafeHwnd(), L
"Could not get rev count\n" + rev_counter
+ L
'\n' + rev_err
, L
"TortoiseGit", MB_ICONERROR
);
832 out_counter
= L
", " + CString(MAKEINTRESOURCE(IDS_REV_COUNTER
)) + L
": " + rev_counter
.Trim();
836 // set the log message text
837 pMsgView
->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH
)) + L
": " + pLogEntry
->m_CommitHash
.ToString() + out_counter
+ L
"\r\n" + out_describe
+ L
"\r\n");
838 // turn bug ID's into links if the bugtraq: properties have been set
839 // and we can find a match of those in the log message
841 pMsgView
->SetSel(-1,-1);
842 CAppUtils::SetCharFormat(pMsgView
, CFM_BOLD
, CFE_BOLD
);
844 CString msg
= m_bAsteriskLogPrefix
? L
"* " : L
"";
845 msg
+=pLogEntry
->GetSubject();
846 pMsgView
->ReplaceSel(msg
);
848 pMsgView
->SetSel(-1,-1);
849 CAppUtils::SetCharFormat(pMsgView
, CFM_BOLD
, 0);
851 HCURSOR old
= GetCursor(); // hack to fix issue #2792
854 msg
+=pLogEntry
->GetBody();
855 pMsgView
->ReplaceSel(msg
);
857 if(!pLogEntry
->m_Notes
.IsEmpty())
859 pMsgView
->SetSel(-1, -1);
860 CAppUtils::SetCharFormat(pMsgView
, CFM_BOLD
, CFE_BOLD
);
862 if (m_bAsteriskLogPrefix
)
864 msg
+= CString(MAKEINTRESOURCE(IDS_NOTES
)) + L
":\n";
865 pMsgView
->ReplaceSel(msg
);
866 pMsgView
->SetSel(-1, -1);
867 CAppUtils::SetCharFormat(pMsgView
, CFM_BOLD
, 0);
868 pMsgView
->ReplaceSel(pLogEntry
->m_Notes
);
871 CString tagInfo
= m_LogList
.GetTagInfo(pLogEntry
);
872 if (!tagInfo
.IsEmpty())
874 pMsgView
->SetSel(-1, -1);
875 CAppUtils::SetCharFormat(pMsgView
, CFM_BOLD
, CFE_BOLD
);
877 if (m_bAsteriskLogPrefix
)
879 msg
+= CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO
)) + L
":\n";
880 pMsgView
->ReplaceSel(msg
);
881 pMsgView
->SetSel(-1, -1);
882 CAppUtils::SetCharFormat(pMsgView
, CFM_BOLD
, 0);
883 pMsgView
->ReplaceSel(tagInfo
);
889 pMsgView
->GetWindowText(text
);
890 // the rich edit control doesn't count the CR char!
891 // to be exact: CRLF is treated as one char.
894 int findHashStart
= text
.Find('\n');
895 if (!out_describe
.IsEmpty())
896 findHashStart
= text
.Find('\n', findHashStart
+ 1);
897 FindGitHash(text
, findHashStart
, pMsgView
);
898 m_LogList
.m_ProjectProperties
.FindBugID(text
, pMsgView
);
899 CAppUtils::StyleURLs(text
, pMsgView
);
900 if (((DWORD
)CRegStdDWORD(L
"Software\\TortoiseGit\\StyleCommitMessages", TRUE
)) == TRUE
)
901 CAppUtils::FormatTextInRichEditControl(pMsgView
);
906 pMsgView
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
908 if (!pLogEntry
->m_IsDiffFiles
)
910 m_ChangedFileListCtrl
.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES
)));
911 m_ChangedFileListCtrl
.SetBusy(TRUE
);
912 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
913 // entry might not already been enqueued for updating, issue #3090
914 pLogEntry
->GetAction(&m_LogList
);
918 CString matchpath
=this->m_path
.GetGitPathString();
920 CTGitPathList
& files
= pLogEntry
->GetFiles(&m_LogList
);
921 int count
= files
.GetCount();
922 if (!m_bWholeProject
&& !matchpath
.IsEmpty() && m_iHidePaths
)
924 if (m_path
.IsDirectory() && !CStringUtils::EndsWith(matchpath
, L
'/'))
925 matchpath
.AppendChar(L
'/');
926 int matchPathLen
= matchpath
.GetLength();
927 bool somethingHidden
= false;
928 for (int i
= 0; i
< count
; ++i
)
930 ((CTGitPath
&)files
[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
| CTGitPath::LOGACTIONS_GRAY
);
932 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
933 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
))))
935 somethingHidden
= true;
936 if (m_iHidePaths
== 1)
937 ((CTGitPath
&)files
[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
938 else if (m_iHidePaths
== 2)
939 ((CTGitPath
&)files
[i
]).m_Action
|= CTGitPath::LOGACTIONS_GRAY
;
943 pLogEntry
->GetAction(&m_LogList
) |= CTGitPath::LOGACTIONS_HIDE
;
945 pLogEntry
->GetAction(&m_LogList
) &= ~CTGitPath::LOGACTIONS_HIDE
;
947 else if (pLogEntry
->GetAction(&m_LogList
) & CTGitPath::LOGACTIONS_HIDE
)
949 pLogEntry
->GetAction(&m_LogList
) &= ~CTGitPath::LOGACTIONS_HIDE
;
950 for (int i
= 0 ; i
< count
; ++i
)
951 ((CTGitPath
&)files
[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
| CTGitPath::LOGACTIONS_GRAY
);
955 m_cFileFilter
.GetWindowText(fileFilter
);
956 if (!fileFilter
.IsEmpty())
958 fileFilter
.MakeLower();
959 bool somethingHidden
= false;
960 for (int i
= 0; i
< count
; ++i
)
962 CString
sPath(files
[i
].GetGitPathString());
964 if (sPath
.Find(fileFilter
) < 0)
966 ((CTGitPath
&)files
[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
967 somethingHidden
= true;
971 pLogEntry
->GetAction(&m_LogList
) |= CTGitPath::LOGACTIONS_HIDE
;
974 m_ChangedFileListCtrl
.UpdateWithGitPathList(files
);
975 m_ChangedFileListCtrl
.m_CurrentVersion
=pLogEntry
->m_CommitHash
;
976 if (pLogEntry
->m_CommitHash
.IsEmpty() && m_bShowUnversioned
)
978 m_ChangedFileListCtrl
.UpdateUnRevFileList(pLogEntry
->GetUnRevFiles());
979 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
| GITSLC_SHOWUNVERSIONED
);
982 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
984 m_ChangedFileListCtrl
.SetBusy(FALSE
);
986 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
993 // more than one revision is selected:
994 // the log message view must be emptied
995 // the changed files list contains all the changed paths from all
996 // selected revisions, with 'doubles' removed
997 m_gravatar
.LoadGravatar();
1001 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
1003 // sort according to the settings
1004 if (m_nSortColumnPathList
> 0)
1005 SetSortArrow(&m_ChangedFileListCtrl
, m_nSortColumnPathList
, m_bAscendingPathList
);
1007 SetSortArrow(&m_ChangedFileListCtrl
, -1, false);
1008 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
1011 void CLogDlg::FillPatchView(bool onlySetTimer
)
1013 if (!::IsWindow(this->m_patchViewdlg
.m_hWnd
))
1016 KillTimer(LOG_FILLPATCHVTIMER
);
1019 SetTimer(LOG_FILLPATCHVTIMER
, 100, nullptr);
1023 POSITION posLogList
= m_LogList
.GetFirstSelectedItemPosition();
1024 if (posLogList
== nullptr)
1026 m_patchViewdlg
.ClearView();
1027 return; // nothing is selected, get out of here
1030 GitRev
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(posLogList
));
1031 if (pLogEntry
== nullptr || m_LogList
.GetNextSelectedItem(posLogList
) != -1)
1033 m_patchViewdlg
.ClearView();
1037 auto locker(m_ChangedFileListCtrl
.AcquireReadWeakLock(50));
1038 if (!locker
.IsAcquired())
1040 SetTimer(LOG_FILLPATCHVTIMER
, 100, nullptr);
1043 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1048 int diffContext
= g_Git
.GetConfigValueInt32(L
"diff.context", -1);
1050 CString rev1
= pLogEntry
->m_CommitHash
.IsEmpty() ? L
"HEAD" : (pLogEntry
->m_CommitHash
.ToString() + L
"~1");
1051 CString rev2
= pLogEntry
->m_CommitHash
.IsEmpty() ? GIT_REV_ZERO
: pLogEntry
->m_CommitHash
.ToString();
1052 g_Git
.GetUnifiedDiff(CTGitPath(), rev1
, rev2
, &outA
, false, false, diffContext
);
1053 out
= CUnicodeUtils::GetUnicode(outA
);
1059 int nSelect
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1060 auto p
= m_ChangedFileListCtrl
.GetListEntry(nSelect
);
1061 if (p
&& !(p
->m_Action
&CTGitPath::LOGACTIONS_UNVER
))
1064 if (pLogEntry
->m_CommitHash
.IsEmpty())
1065 cmd
.Format(L
"git.exe diff HEAD -- \"%s\"", (LPCTSTR
)p
->GetGitPathString());
1067 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());
1068 g_Git
.Run(cmd
, &out
, CP_UTF8
);
1073 m_patchViewdlg
.SetText(out
);
1076 void CLogDlg::TogglePatchView()
1078 m_patchViewdlg
.m_ParentDlg
= this;
1079 if (!IsWindow(m_patchViewdlg
.m_hWnd
))
1081 if (g_Git
.GetConfigValueBool(L
"tgit.logshowpatch") == FALSE
)
1082 g_Git
.SetConfigValue(L
"tgit.logshowpatch", L
"true");
1083 m_patchViewdlg
.Create(IDD_PATCH_VIEW
, this);
1084 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTHTRACKING
, TRUE
);
1086 this->GetWindowRect(&rect
);
1088 m_patchViewdlg
.ShowWindow(SW_SHOW
);
1089 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
);
1095 g_Git
.SetConfigValue(L
"tgit.logshowpatch", L
"false");
1096 m_patchViewdlg
.ShowWindow(SW_HIDE
);
1097 m_patchViewdlg
.DestroyWindow();
1101 LRESULT
CLogDlg::OnFileListCtrlItemChanged(WPARAM
/*wparam*/, LPARAM
/*lparam*/)
1103 FillPatchView(true);
1107 void CLogDlg::OnMoving(UINT fwSide
, LPRECT pRect
)
1109 __super::OnMoving(fwSide
, pRect
);
1111 if (!::IsWindow(m_patchViewdlg
.m_hWnd
))
1115 m_patchViewdlg
.GetWindowRect(&patchrect
);
1116 if (!::IsWindow(m_hWnd
))
1120 GetWindowRect(&thisrect
);
1121 if (patchrect
.left
== thisrect
.right
)
1123 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
);
1127 void CLogDlg::OnSizing(UINT fwSide
, LPRECT pRect
)
1129 __super::OnSizing(fwSide
, pRect
);
1131 if (!::IsWindow(this->m_patchViewdlg
.m_hWnd
))
1134 CRect thisrect
, patchrect
;
1135 this->GetWindowRect(thisrect
);
1136 this->m_patchViewdlg
.GetWindowRect(patchrect
);
1137 if (thisrect
.right
!= patchrect
.left
)
1140 patchrect
.left
-= (thisrect
.right
- pRect
->right
);
1141 patchrect
.right
-= (thisrect
.right
- pRect
->right
);
1143 if (patchrect
.bottom
== thisrect
.bottom
)
1144 patchrect
.bottom
-= (thisrect
.bottom
- pRect
->bottom
);
1145 if (patchrect
.top
== thisrect
.top
)
1146 patchrect
.top
-= thisrect
.top
- pRect
->top
;
1147 m_patchViewdlg
.MoveWindow(patchrect
);
1150 void CLogDlg::OnSelectSearchField()
1152 m_cFilter
.SetSel(0, -1, FALSE
);
1153 m_cFilter
.SetFocus();
1156 void CLogDlg::GoBack()
1158 GoBackForward(false, false);
1161 void CLogDlg::GoForward()
1163 GoBackForward(false, true);
1166 void CLogDlg::GoBackAndSelect()
1168 GoBackForward(true, false);
1171 void CLogDlg::GoForwardAndSelect()
1173 GoBackForward(true, true);
1176 void CLogDlg::GoBackForward(bool select
, bool bForward
)
1178 m_LogList
.m_highlight
.Empty();
1180 if (bForward
? m_LogList
.m_selectionHistory
.GoForward(gotoHash
) : m_LogList
.m_selectionHistory
.GoBack(gotoHash
))
1183 for (i
= 0; i
< (int)m_LogList
.m_arShownList
.size(); ++i
)
1185 GitRev
* rev
= m_LogList
.m_arShownList
.SafeGetAt(i
);
1187 if (rev
->m_CommitHash
== gotoHash
)
1189 m_LogList
.EnsureVisible(i
, FALSE
);
1192 m_LogList
.m_highlight
.Empty();
1193 m_LogList
.SetItemState(m_LogList
.GetSelectionMark(), 0, LVIS_SELECTED
| LVIS_FOCUSED
);
1194 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1197 int index
= m_LogList
.GetNextSelectedItem(pos
);
1199 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1201 m_bNavigatingWithSelect
= true;
1202 m_LogList
.SetItemState(i
, LVIS_SELECTED
| LVIS_FOCUSED
, LVIS_SELECTED
| LVIS_FOCUSED
);
1203 m_LogList
.SetSelectionMark(i
);
1204 m_bNavigatingWithSelect
= false;
1207 m_LogList
.m_highlight
= gotoHash
;
1208 m_LogList
.Invalidate();
1212 if (i
== (int)m_LogList
.m_arShownList
.size())
1215 msg
.Format(IDS_LOG_NOT_VISIBLE
, (LPCTSTR
)gotoHash
.ToString());
1216 MessageBox(msg
, L
"TortoiseGit", MB_OK
| MB_ICONINFORMATION
);
1220 PlaySound((LPCTSTR
)SND_ALIAS_SYSTEMASTERISK
, nullptr, SND_ASYNC
| SND_ALIAS_ID
);
1223 void CLogDlg::OnBnClickedRefresh()
1228 void CLogDlg::Refresh (bool clearfilter
/*autoGoOnline*/)
1231 DialogEnableWindow(IDOK
, FALSE
);
1232 m_LogList
.Refresh(clearfilter
);
1235 FillLogMessageCtrl(false);
1238 void CLogDlg::SaveSplitterPos()
1242 CRegDWORD
regPos1(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1");
1243 CRegDWORD
regPos2(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2");
1245 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
1246 ScreenToClient(&rectSplitter
);
1247 regPos1
= rectSplitter
.top
;
1248 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
1249 ScreenToClient(&rectSplitter
);
1250 regPos2
= rectSplitter
.top
;
1254 void CLogDlg::OnCancel()
1256 this->ShowWindow(SW_HIDE
);
1258 // canceling means stopping the working thread if it's still running.
1259 m_LogList
.SafeTerminateAsyncDiffThread();
1260 if (this->IsThreadRunning())
1262 m_LogList
.SafeTerminateThread();
1267 __super::OnCancel();
1270 void CLogDlg::CopyChangedSelectionToClipBoard()
1272 POSITION posLogList
= m_LogList
.GetFirstSelectedItemPosition();
1273 if (posLogList
== nullptr)
1274 return; // nothing is selected, get out of here
1278 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1281 auto locker(m_ChangedFileListCtrl
.AcquireReadLock());
1282 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1285 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1286 auto path
= m_ChangedFileListCtrl
.GetListEntry(nItem
);
1289 sPaths
+= path
->GetGitPathString();
1296 // only one revision is selected in the log dialog top pane
1297 // but multiple items could be selected in the changed items list
1298 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1301 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1302 LogChangedPath
* changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(nItem
);
1304 if ((m_cHidePaths
.GetState() & 0x0003)==BST_CHECKED
)
1306 // some items are hidden! So find out which item the user really selected
1307 INT_PTR selRealIndex
= -1;
1308 for (INT_PTR hiddenindex
=0; hiddenindex
<pLogEntry
->pArChangedPaths
->GetCount(); ++hiddenindex
)
1310 if (pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
)->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0)
1312 if (selRealIndex
== nItem
)
1314 changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
);
1321 sPaths
+= changedlogpath
->sPath
;
1328 CStringUtils::WriteAsciiStringToClipboard(sPaths
, GetSafeHwnd());
1331 void CLogDlg::OnContextMenu(CWnd
* pWnd
, CPoint point
)
1333 // we have 4 separate context menus:
1334 // one for the branch label in the upper left
1335 // one for FROM date control
1336 // one shown on the log message list control,
1337 // one shown in the changed-files list control
1338 if (pWnd
== GetDlgItem(IDC_STATIC_REF
))
1341 if (!popup
.CreatePopupMenu())
1345 popup
.AppendMenuIcon(++cnt
, IDS_MENUREFBROWSE
);
1346 popup
.SetDefaultItem(cnt
);
1347 CString head
= L
"HEAD";
1348 CString curBranch
= g_Git
.GetCurrentBranch();
1349 if (!curBranch
.IsEmpty())
1350 head
.AppendFormat(L
" -> \"%s\"", (LPCTSTR
)curBranch
);
1351 popup
.AppendMenuIcon(++cnt
, head
);
1353 g_Git
.GetHash(fetchHead
, g_Git
.FixBranchName(L
"FETCH_HEAD"));
1354 popup
.AppendMenuIcon(++cnt
, L
"FETCH_HEAD");
1355 popup
.EnableMenuItem(cnt
, fetchHead
.IsEmpty());
1356 popup
.AppendMenuIcon(++cnt
, IDS_ALL
);
1357 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1358 popup
.AppendMenuIcon(++cnt
, IDS_PROC_LOG_SELECT_BASIC_REFS
);
1359 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1360 popup
.AppendMenuIcon(++cnt
, IDS_PROC_LOG_SELECT_LOCAL_BRANCHES
);
1361 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1363 if (m_History
.GetCount() > 0)
1365 popup
.AppendMenu(MF_SEPARATOR
, 0);
1366 for (size_t i
= 0; i
< m_History
.GetCount(); ++i
)
1368 CString entry
= m_History
.GetEntry(i
);
1369 if (entry
.GetLength() > 150)
1370 entry
= entry
.Left(150) + L
"...";
1371 popup
.AppendMenuIcon(cnt
++, entry
);
1375 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this);
1380 OnBnClickedBrowseRef();
1384 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_BASIC_REFS
| CGit::LOG_INFO_LOCAL_BRANCHES
);
1385 m_bAllBranch
= BST_UNCHECKED
;
1386 m_AllBranchType
= AllBranchType::None
;
1389 SetRange(g_Git
.GetCurrentBranch(true));
1393 SetRange(fetchHead
.ToString());
1397 m_bAllBranch
= BST_CHECKED
;
1398 m_AllBranchType
= AllBranchType::AllBranches
;
1399 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_ALL_BRANCH
;
1403 m_bAllBranch
= BST_INDETERMINATE
;
1404 m_AllBranchType
= AllBranchType::AllBasicRefs
;
1405 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_BASIC_REFS
;
1409 m_bAllBranch
= BST_INDETERMINATE
;
1410 m_AllBranchType
= AllBranchType::AllLocalBranches
;
1411 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
1413 else if (cmd
>= offset
)
1415 SetRange(m_History
.GetEntry(cmd
- offset
));
1416 m_History
.AddEntry(m_LogList
.m_sRange
);
1423 FillLogMessageCtrl(false);
1428 if (pWnd
== GetDlgItem(IDC_DATEFROM
))
1431 if (!popup
.CreatePopupMenu())
1436 popup
.AppendMenuIcon(++cnt
, IDS_NO_LIMIT
);
1438 DWORD scale
= (DWORD
)CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\NumberOfLogsScale", CFilterData::SHOW_NO_LIMIT
);
1442 case CFilterData::SHOW_LAST_N_COMMITS
:
1443 strScale
.LoadString(IDS_LAST_N_COMMITS
);
1445 case CFilterData::SHOW_LAST_N_YEARS
:
1446 strScale
.LoadString(IDS_LAST_N_YEARS
);
1448 case CFilterData::SHOW_LAST_N_MONTHS
:
1449 strScale
.LoadString(IDS_LAST_N_MONTHS
);
1451 case CFilterData::SHOW_LAST_N_WEEKS
:
1452 strScale
.LoadString(IDS_LAST_N_WEEKS
);
1455 if (!strScale
.IsEmpty() && m_LogList
.m_Filter
.m_NumberOfLogs
> 0)
1457 popup
.AppendMenu(MF_SEPARATOR
, 0);
1459 number
.Format(L
"%ld", m_LogList
.m_Filter
.m_NumberOfLogs
);
1461 item
.Format(strScale
, (LPCTSTR
)number
);
1462 popup
.AppendMenuIcon(++cnt
, item
);
1465 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this);
1470 m_LogList
.m_Filter
.m_NumberOfLogsScale
= CFilterData::SHOW_NO_LIMIT
;
1471 // reset last selected date
1472 m_regLastSelectedFromDate
.removeValue();
1475 m_LogList
.m_Filter
.m_NumberOfLogsScale
= scale
;
1479 FillLogMessageCtrl(false);
1484 int selCount
= m_LogList
.GetSelectedCount();
1485 if ((selCount
== 1)&&(pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1487 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1490 selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1492 GitRevLoglist
* pRev
= nullptr;
1494 pRev
= m_LogList
.m_arShownList
.SafeGetAt(selIndex
);
1496 if ((point
.x
== -1) && (point
.y
== -1))
1499 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(&rect
);
1500 ClientToScreen(&rect
);
1501 point
= rect
.CenterPoint();
1503 CString sMenuItemText
;
1505 if (popup
.CreatePopupMenu())
1507 long start
= -1, end
= -1;
1508 auto pEdit
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
1509 pEdit
->GetSel(start
, end
);
1510 // add the 'default' entries
1511 popup
.AppendMenuIcon(WM_COPY
, IDS_SCIEDIT_COPY
, IDI_COPYCLIP
);
1513 popup
.EnableMenuItem(WM_COPY
, MF_BYCOMMAND
| MF_DISABLED
| MF_GRAYED
);
1514 popup
.AppendMenu(MF_SEPARATOR
);
1515 sMenuItemText
.LoadString(IDS_STATUSLIST_CONTEXT_COPYEXT
);
1516 popup
.AppendMenuIcon(EM_SETSEL
, sMenuItemText
, IDI_COPYCLIP
);
1517 if (pRev
&& !pRev
->m_CommitHash
.IsEmpty())
1519 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1520 sMenuItemText
.LoadString(IDS_EDIT_NOTES
);
1521 popup
.AppendMenuIcon(CGitLogList::ID_EDITNOTE
, sMenuItemText
, IDI_EDIT
);
1524 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this);
1528 break; // no command selected
1531 pEdit
->SetRedraw(FALSE
);
1532 int oldLine
= pEdit
->GetFirstVisibleLine();
1533 pEdit
->SetSel(0, -1);
1535 pEdit
->SetSel(start
, end
);
1536 int newLine
= pEdit
->GetFirstVisibleLine();
1537 pEdit
->LineScroll(oldLine
- newLine
);
1538 pEdit
->SetRedraw(TRUE
);
1539 pEdit
->RedrawWindow();
1543 ::SendMessage(GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), cmd
, 0, -1);
1545 case CGitLogList::ID_EDITNOTE
:
1546 CAppUtils::EditNote(GetSafeHwnd(), pRev
, &m_LogList
.m_ProjectProperties
);
1547 this->FillLogMessageCtrl(true);
1554 void CLogDlg::OnOK()
1556 // since the log dialog is also used to select revisions for other
1557 // dialogs, we have to do some work before closing this dialog
1558 if (GetFocus() != GetDlgItem(IDOK
))
1559 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
1561 m_LogList
.SafeTerminateAsyncDiffThread();
1562 if (this->IsThreadRunning())
1564 m_LogList
.SafeTerminateThread();
1567 // get the selected row(s)
1568 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1571 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1572 GitRev
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(selIndex
);
1575 m_sSelectedHash
.push_back(pLogEntry
->m_CommitHash
);
1582 if (!GetDlgItem(IDOK
)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL
))
1583 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
1587 GetDlgItemText(IDOK
, buttontext
);
1588 temp
.LoadString(IDS_MSGBOX_CANCEL
);
1589 if (temp
.Compare(buttontext
) != 0)
1590 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
1591 m_selectedRevs
.Clear();
1592 m_selectedRevsOneRange
.Clear();
1593 if (m_pNotifyWindow
)
1595 int selIndex
= m_LogList
.GetSelectionMark();
1598 PLOGENTRYDATA pLogEntry
= nullptr;
1599 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1600 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1601 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1602 git_revnum_t lowerRev
= pLogEntry
->Rev
;
1603 git_revnum_t higherRev
= lowerRev
;
1606 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1607 git_revnum_t rev
= pLogEntry
->Rev
;
1608 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1611 if (higherRev
< rev
)
1614 if (m_sFilterText
.IsEmpty() && m_nSortColumn
== 0 && IsSelectionContinuous())
1616 m_selectedRevsOneRange
.AddRevRange(lowerRev
, higherRev
);
1618 BOOL bSentMessage
= FALSE
;
1619 if (m_LogList
.GetSelectedCount() == 1)
1621 // if only one revision is selected, check if the path/url with which the dialog was started
1622 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1623 // if it was copied, use the copy from revision as lowerRev
1624 if ((pLogEntry
)&&(pLogEntry
->pArChangedPaths
)&&(lowerRev
== higherRev
))
1626 CString sUrl
= m_path
.GetGitPathString();
1627 if (!m_path
.IsUrl())
1629 sUrl
= GetURLFromPath(m_path
);
1631 sUrl
= sUrl
.Mid(m_sRepositoryRoot
.GetLength());
1632 for (int cp
= 0; cp
< pLogEntry
->pArChangedPaths
->GetCount(); ++cp
)
1634 LogChangedPath
* pData
= pLogEntry
->pArChangedPaths
->SafeGetAt(cp
);
1637 if (sUrl
.Compare(pData
->sPath
) == 0)
1639 if (!pData
->sCopyFromPath
.IsEmpty())
1641 lowerRev
= pData
->lCopyFromRev
;
1642 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
), lowerRev
);
1643 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
), higherRev
);
1644 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1645 bSentMessage
= TRUE
;
1652 if ( !bSentMessage
)
1654 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
| MERGE_REVSELECTMINUSONE
), lowerRev
);
1655 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
| MERGE_REVSELECTMINUSONE
), higherRev
);
1656 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1657 if (m_selectedRevsOneRange
.GetCount())
1658 m_pNotifyWindow
->SendMessage(WM_REVLISTONERANGE
, 0, (LPARAM
)&m_selectedRevsOneRange
);
1663 CRegDWORD
reg(L
"Software\\TortoiseGit\\ShowAllEntry");
1668 void CLogDlg::OnPasteGitHash()
1670 if (!IsClipboardFormatAvailable(CF_TEXT
))
1673 CClipboardHelper clipboardHelper
;
1674 if (!clipboardHelper
.Open(GetSafeHwnd()))
1677 HGLOBAL hClipboardData
= GetClipboardData(CF_TEXT
);
1678 if (!hClipboardData
)
1681 char* pStr
= (char*)GlobalLock(hClipboardData
);
1683 GlobalUnlock(hClipboardData
);
1688 if (LookLikeGitHash(str
, pos
))
1692 void CLogDlg::JumpToGitHash(CString hash
)
1694 int prefixLen
= hash
.GetLength();
1695 while (hash
.GetLength() < 2 * GIT_HASH_SIZE
)
1697 CGitHash
prefixHash(hash
);
1698 // start searching downwards, because it's unlikely that a hash is a forward reference
1699 int currentPos
= m_LogList
.GetSelectionMark();
1700 int cnt
= (int)m_LogList
.m_arShownList
.size();
1701 if (!cnt
|| currentPos
< 0)
1703 for (int i
= currentPos
+ 1; i
!= currentPos
; ++i
)
1708 GitRev
* rev
= m_LogList
.m_arShownList
.SafeGetAt(i
);
1710 if (!rev
->m_CommitHash
.MatchesPrefix(prefixHash
, hash
, prefixLen
))
1713 m_LogList
.SetItemState(m_LogList
.GetSelectionMark(), 0, LVIS_SELECTED
| LVIS_FOCUSED
);
1714 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1717 int index
= m_LogList
.GetNextSelectedItem(pos
);
1719 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1721 m_LogList
.EnsureVisible(i
, FALSE
);
1722 m_LogList
.SetSelectionMark(i
);
1723 m_LogList
.SetItemState(i
, LVIS_SELECTED
| LVIS_FOCUSED
, LVIS_SELECTED
| LVIS_FOCUSED
);
1724 // refresh of selection needs to be queued instead of done immediately, to ensure hyperlinks in target selection are created
1725 PostMessage(WM_TGIT_REFRESH_SELECTION
, 0, 0);
1729 FlashWindowEx(FLASHW_ALL
, 3, 100);
1730 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, L
"NoJumpNotFoundWarning", IDS_MSGBOX_DONOTSHOWAGAIN
);
1733 BOOL
CLogDlg::PreTranslateMessage(MSG
* pMsg
)
1735 // Skip Ctrl-C when copying text out of the log message or search filter
1736 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);
1737 if (pMsg
->message
== WM_KEYDOWN
&& pMsg
->wParam
=='\r')
1739 if (GetFocus()==GetDlgItem(IDC_LOGLIST
))
1741 if (CRegDWORD(L
"Software\\TortoiseGit\\DiffByDoubleClickInLog", FALSE
))
1743 m_LogList
.DiffSelectedRevWithPrevious();
1747 if (GetFocus() == GetDlgItem(IDC_SEARCHEDIT
))
1749 KillTimer(LOGFILTER_TIMER
);
1752 if (GetFocus() == GetDlgItem(IDC_FILTER
))
1754 KillTimer(FILEFILTER_TIMER
);
1755 FillLogMessageCtrl();
1759 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)
1761 if (GetFocus() != GetDlgItem(IDC_SEARCHEDIT
) && GetFocus() != GetDlgItem(IDC_FILTER
))
1767 else if (pMsg
->message
== WM_KEYDOWN
&& pMsg
->wParam
== VK_ESCAPE
&& GetFocus() == GetDlgItem(IDC_FILTER
) && m_cFileFilter
.GetWindowTextLength())
1769 m_cFileFilter
.SetWindowText(L
"");
1770 KillTimer(FILEFILTER_TIMER
);
1771 FillLogMessageCtrl();
1774 else if (pMsg
->message
== WM_XBUTTONUP
)
1776 bool select
= (pMsg
->wParam
& MK_SHIFT
) == 0;
1777 if (HIWORD(pMsg
->wParam
) & XBUTTON1
)
1778 GoBackForward(select
, false);
1779 if (HIWORD(pMsg
->wParam
) & XBUTTON2
)
1780 GoBackForward(select
, true);
1781 if (HIWORD(pMsg
->wParam
) & (XBUTTON1
| XBUTTON2
))
1784 if (m_hAccel
&& !bSkipAccelerator
)
1786 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1791 return __super::PreTranslateMessage(pMsg
);
1795 BOOL
CLogDlg::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
1797 //if (this->IsThreadRunning())
1798 if(m_LogList
.m_bNoDispUpdates
)
1800 // only show the wait cursor over the list control
1802 ((pWnd
== GetDlgItem(IDC_LOGLIST
))||
1803 (pWnd
== GetDlgItem(IDC_MSGVIEW
))||
1804 (pWnd
== GetDlgItem(IDC_LOGMSG
))))
1806 HCURSOR hCur
= LoadCursor(nullptr, IDC_WAIT
);
1811 if (pWnd
&& (pWnd
== GetDlgItem(IDC_MSGVIEW
) || pWnd
== GetDlgItem(IDC_SEARCHEDIT
) || pWnd
== GetDlgItem(IDC_FILTER
)))
1812 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1814 HCURSOR hCur
= LoadCursor(nullptr, IDC_ARROW
);
1816 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1819 void CLogDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1821 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1823 //if (this->IsThreadRunning())
1824 if(m_LogList
.m_bNoDispUpdates
)
1826 if (pNMLV
->iItem
>= 0)
1828 if (!m_LogList
.m_highlight
.IsEmpty())
1830 m_LogList
.m_highlight
.Empty();
1831 m_LogList
.Invalidate();
1833 this->m_LogList
.m_nSearchIndex
= pNMLV
->iItem
;
1834 GitRev
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(pNMLV
->iItem
);
1835 if (pLogEntry
== nullptr)
1837 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1838 if (pNMLV
->iSubItem
!= 0)
1840 if (pNMLV
->iItem
== (int)m_LogList
.m_arShownList
.size())
1842 // remove the selected state
1843 if (pNMLV
->uChanged
& LVIF_STATE
)
1845 m_LogList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1846 FillLogMessageCtrl();
1848 UpdateLogInfoLabel();
1852 if (pNMLV
->uChanged
& LVIF_STATE
)
1854 if ((pNMLV
->uNewState
& LVIS_SELECTED
) && !m_bNavigatingWithSelect
)
1856 m_LogList
.m_selectionHistory
.Add(m_LogList
.m_lastSelectedHash
);
1857 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1859 FillLogMessageCtrl();
1865 m_LogList
.m_lastSelectedHash
.Empty();
1866 FillLogMessageCtrl();
1870 if (pNMLV
->iItem
< 0)
1872 UpdateLogInfoLabel();
1875 void CLogDlg::OnLvnItemchangedLogmsg(NMHDR
* /*pNMHDR*/, LRESULT
* /*pResult*/)
1877 if (m_ChangedFileListCtrl
.IsBusy())
1879 UpdateLogInfoLabel();
1882 void CLogDlg::OnEnLinkMsgview(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1884 // similar code in ProgressDlg.cpp and SyncDlg.cpp
1885 ENLINK
*pEnLink
= reinterpret_cast<ENLINK
*>(pNMHDR
);
1886 if ((pEnLink
->msg
== WM_LBUTTONUP
) || (pEnLink
->msg
== WM_SETCURSOR
))
1889 GetDlgItemText(IDC_MSGVIEW
, msg
);
1890 msg
.Replace(L
"\r\n", L
"\n");
1891 url
= msg
.Mid(pEnLink
->chrg
.cpMin
, pEnLink
->chrg
.cpMax
-pEnLink
->chrg
.cpMin
);
1892 auto findResult
= m_LogList
.m_ProjectProperties
.FindBugIDPositions(msg
);
1893 if (std::find_if(findResult
.cbegin(), findResult
.cend(),
1894 [=] (const CHARRANGE
&cr
) -> bool { return cr
.cpMin
== pEnLink
->chrg
.cpMin
&& cr
.cpMax
== pEnLink
->chrg
.cpMax
; }
1895 ) != findResult
.cend())
1897 url
= m_LogList
.m_ProjectProperties
.GetBugIDUrl(url
);
1898 url
= GetAbsoluteUrlFromRelativeUrl(url
);
1900 // check if it's an email address
1901 auto atpos
= url
.Find(L
'@');
1902 if ((atpos
> 0) && (url
.ReverseFind(L
'.') > atpos
) && !::PathIsURL(url
))
1903 url
= L
"mailto:" + url
;
1904 if (::PathIsURL(url
))
1906 if (pEnLink
->msg
== WM_LBUTTONUP
)
1907 ShellExecute(GetSafeHwnd(), L
"open", url
, nullptr, nullptr, SW_SHOWDEFAULT
);
1910 static RECT prevRect
= { 0 };
1911 CWnd
* pMsgView
= GetDlgItem(IDC_MSGVIEW
);
1916 pMsgView
->SendMessage(EM_POSFROMCHAR
, (WPARAM
)&pt
, pEnLink
->chrg
.cpMin
);
1919 pMsgView
->SendMessage(EM_POSFROMCHAR
, (WPARAM
)&pt
, pEnLink
->chrg
.cpMax
);
1921 rc
.bottom
= pt
.y
+ 12;
1922 if ((prevRect
.left
!= rc
.left
) || (prevRect
.top
!= rc
.top
))
1924 m_tooltips
.DelTool(pMsgView
, 1);
1925 m_tooltips
.AddTool(pMsgView
, url
, &rc
, 1);
1931 else if(pEnLink
->msg
== WM_LBUTTONUP
)
1934 if (LookLikeGitHash(url
, pos
))
1941 void CLogDlg::OnBnClickedStatbutton()
1943 if (this->IsThreadRunning())
1946 if (m_LogList
.m_arShownList
.empty() || m_LogList
.m_arShownList
.size() == 1 && m_LogList
.m_bShowWC
)
1947 return; // nothing or just the working copy changes are shown, so no statistics.
1950 dlg
.m_ShowList
.reserve(m_LogList
.m_arShownList
.size());
1951 for (size_t i
= m_LogList
.m_bShowWC
? 1 : 0; i
< m_LogList
.m_arShownList
.size(); ++i
)
1952 dlg
.m_ShowList
.emplace_back(m_LogList
.m_arShownList
.SafeGetAt(i
));
1954 dlg
.m_path
= m_orgPath
;
1958 void CLogDlg::MoveToSameTop(CWnd
*pWndRef
, CWnd
*pWndTarget
)
1960 CRect rcWndPicAuthor
, rcWndMsgView
;
1961 pWndRef
->GetWindowRect(rcWndMsgView
);
1962 ScreenToClient(rcWndMsgView
);
1963 pWndTarget
->GetWindowRect(rcWndPicAuthor
);
1964 ScreenToClient(rcWndPicAuthor
);
1965 int diff
= rcWndMsgView
.top
- rcWndPicAuthor
.top
;
1966 rcWndPicAuthor
.top
+= diff
;
1967 rcWndPicAuthor
.bottom
+= diff
;
1968 pWndTarget
->MoveWindow(rcWndPicAuthor
);
1971 void CLogDlg::DoSizeV1(int delta
)
1973 RemoveMainAnchors();
1975 // first, reduce the middle section to a minimum.
1976 // if that is not sufficient, minimize the lower section
1978 CRect changeListViewRect
;
1979 m_ChangedFileListCtrl
.GetClientRect(changeListViewRect
);
1980 CRect messageViewRect
;
1981 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(messageViewRect
);
1983 int messageViewDelta
= max(-delta
, 20 - messageViewRect
.Height());
1984 int changeFileListDelta
= -delta
- messageViewDelta
;
1986 // set new sizes & positions
1987 auto hdwp
= BeginDeferWindowPos(5);
1988 hdwp
= CSplitterControl::ChangeRect(hdwp
, &m_LogList
, 0, 0, 0, delta
);
1989 hdwp
= CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_MSGVIEW
), 0, delta
, 0, delta
+ messageViewDelta
);
1990 MoveToSameTop(GetDlgItem(IDC_MSGVIEW
), GetDlgItem(IDC_PIC_AUTHOR
));
1991 hdwp
= CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_SPLITTERBOTTOM
), 0, -changeFileListDelta
, 0, -changeFileListDelta
);
1992 hdwp
= CSplitterControl::ChangeRect(hdwp
, &m_ChangedFileListCtrl
, 0, -changeFileListDelta
, 0, 0);
1993 EndDeferWindowPos(hdwp
);
1999 m_LogList
.Invalidate();
2000 m_ChangedFileListCtrl
.Invalidate();
2001 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
2002 m_gravatar
.Invalidate();
2005 void CLogDlg::DoSizeV2(int delta
)
2007 RemoveMainAnchors();
2009 // first, reduce the middle section to a minimum.
2010 // if that is not sufficient, minimize the top section
2013 m_LogList
.GetClientRect(logViewRect
);
2014 CRect messageViewRect
;
2015 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(messageViewRect
);
2017 int messageViewDelta
= max(delta
, 20 - messageViewRect
.Height());
2018 int logListDelta
= delta
- messageViewDelta
;
2020 // set new sizes & positions
2021 auto hdwp
= BeginDeferWindowPos(5);
2022 hdwp
= CSplitterControl::ChangeRect(hdwp
, &m_LogList
, 0, 0, 0, logListDelta
);
2023 hdwp
= CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_SPLITTERTOP
), 0, logListDelta
, 0, logListDelta
);
2024 hdwp
= CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_MSGVIEW
), 0, logListDelta
, 0, logListDelta
+ messageViewDelta
);
2025 MoveToSameTop(GetDlgItem(IDC_MSGVIEW
), GetDlgItem(IDC_PIC_AUTHOR
));
2026 hdwp
= CSplitterControl::ChangeRect(hdwp
, &m_ChangedFileListCtrl
, 0, delta
, 0, 0);
2027 EndDeferWindowPos(hdwp
);
2033 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
2034 m_ChangedFileListCtrl
.Invalidate();
2035 m_gravatar
.Invalidate();
2038 void CLogDlg::AddMainAnchors()
2040 AddAnchor(IDC_STATIC_REF
, TOP_LEFT
);
2041 AddAnchor(IDC_FROMLABEL
, TOP_LEFT
);
2042 AddAnchor(IDC_DATEFROM
, TOP_LEFT
);
2043 AddAnchor(IDC_TOLABEL
, TOP_LEFT
);
2044 AddAnchor(IDC_DATETO
, TOP_LEFT
);
2046 AddAnchor(IDC_SEARCHEDIT
, TOP_LEFT
, TOP_RIGHT
);
2047 AddAnchor(IDC_LOG_JUMPTYPE
, TOP_RIGHT
);
2048 AddAnchor(IDC_LOG_JUMPUP
, TOP_RIGHT
);
2049 AddAnchor(IDC_LOG_JUMPDOWN
, TOP_RIGHT
);
2051 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, MIDDLE_RIGHT
);
2052 AddAnchor(IDC_SPLITTERTOP
, MIDDLE_LEFT
, MIDDLE_RIGHT
);
2053 AddAnchor(IDC_MSGVIEW
, MIDDLE_LEFT
, MIDDLE_RIGHT
); // keep in sync with ShowGravatar()
2054 AddAnchor(IDC_PIC_AUTHOR
, MIDDLE_RIGHT
);
2055 AddAnchor(IDC_SPLITTERBOTTOM
, MIDDLE_LEFT
, MIDDLE_RIGHT
);
2056 AddAnchor(IDC_LOGMSG
, MIDDLE_LEFT
, BOTTOM_RIGHT
);
2058 AddAnchor(IDC_LOGINFO
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
2059 AddAnchor(IDC_WALKBEHAVIOUR
, BOTTOM_LEFT
);
2060 AddAnchor(IDC_VIEW
, BOTTOM_LEFT
);
2061 AddAnchor(IDC_LOG_ALLBRANCH
, BOTTOM_LEFT
);
2062 AddAnchor(IDC_FILTER
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
2063 AddAnchor(IDC_WHOLE_PROJECT
, BOTTOM_LEFT
);
2064 AddAnchor(IDC_REFRESH
, BOTTOM_LEFT
);
2065 AddAnchor(IDC_STATBUTTON
, BOTTOM_LEFT
);
2066 AddAnchor(IDC_PROGRESS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
2067 AddAnchor(IDOK
, BOTTOM_RIGHT
);
2068 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
2069 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
2072 void CLogDlg::RemoveMainAnchors()
2074 RemoveAnchor(IDC_STATIC_REF
);
2075 RemoveAnchor(IDC_FROMLABEL
);
2076 RemoveAnchor(IDC_DATEFROM
);
2077 RemoveAnchor(IDC_TOLABEL
);
2078 RemoveAnchor(IDC_DATETO
);
2080 RemoveAnchor(IDC_SEARCHEDIT
);
2081 RemoveAnchor(IDC_LOG_JUMPTYPE
);
2082 RemoveAnchor(IDC_LOG_JUMPUP
);
2083 RemoveAnchor(IDC_LOG_JUMPDOWN
);
2085 RemoveAnchor(IDC_LOGLIST
);
2086 RemoveAnchor(IDC_SPLITTERTOP
);
2087 RemoveAnchor(IDC_MSGVIEW
);
2088 RemoveAnchor(IDC_PIC_AUTHOR
);
2089 RemoveAnchor(IDC_SPLITTERBOTTOM
);
2090 RemoveAnchor(IDC_LOGMSG
);
2092 RemoveAnchor(IDC_LOGINFO
);
2093 RemoveAnchor(IDC_WALKBEHAVIOUR
);
2094 RemoveAnchor(IDC_VIEW
);
2095 RemoveAnchor(IDC_LOG_ALLBRANCH
);
2096 RemoveAnchor(IDC_FILTER
);
2097 RemoveAnchor(IDC_WHOLE_PROJECT
);
2098 RemoveAnchor(IDC_REFRESH
);
2099 RemoveAnchor(IDC_STATBUTTON
);
2100 RemoveAnchor(IDC_PROGRESS
);
2102 RemoveAnchor(IDCANCEL
);
2103 RemoveAnchor(IDHELP
);
2106 void CLogDlg::AdjustMinSize()
2108 // adjust the minimum size of the dialog to prevent the resizing from
2109 // moving the list control too far down.
2110 CRect rcChgListView
;
2111 m_ChangedFileListCtrl
.GetClientRect(rcChgListView
);
2113 m_LogList
.GetClientRect(rcLogList
);
2115 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(rcLogMsg
);
2117 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(),
2118 m_DlgOrigRect
.Height()-m_ChgOrigRect
.Height()-m_LogListOrigRect
.Height()-m_MsgViewOrigRect
.Height()
2119 + rcLogMsg
.Height() + abs(rcChgListView
.Height() - rcLogList
.Height()) + 60));
2122 LRESULT
CLogDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
2126 if (wParam
== IDC_SPLITTERTOP
)
2128 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
2129 DoSizeV1(pHdr
->delta
);
2131 else if (wParam
== IDC_SPLITTERBOTTOM
)
2133 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
2134 DoSizeV2(pHdr
->delta
);
2139 return CResizableDialog::DefWindowProc(message
, wParam
, lParam
);
2142 void CLogDlg::SetSplitterRange()
2144 if ((m_LogList
)&&(m_ChangedFileListCtrl
))
2147 m_LogList
.GetWindowRect(rcTop
);
2148 ScreenToClient(rcTop
);
2150 m_ChangedFileListCtrl
.GetWindowRect(rcBottom
);
2151 ScreenToClient(rcBottom
);
2152 m_wndSplitter1
.SetRange(rcTop
.top
+ 20, rcBottom
.bottom
- 50);
2153 m_wndSplitter2
.SetRange(rcTop
.top
+ 50, rcBottom
.bottom
- 20);
2157 void CLogDlg::OnEnscrollMsgview()
2159 m_tooltips
.DelTool(GetDlgItem(IDC_MSGVIEW
), 1);
2162 LRESULT
CLogDlg::OnClickedInfoIcon(WPARAM wParam
, LPARAM lParam
)
2164 if ((HWND
)wParam
== m_cFileFilter
.GetSafeHwnd())
2167 // FIXME: x64 version would get this function called with unexpected parameters.
2171 RECT
* rect
= (LPRECT
)lParam
;
2174 point
= CPoint(rect
->left
, rect
->bottom
);
2175 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | ((m_LogList.m_SelectedFilters & x) ? MF_CHECKED : MF_UNCHECKED))
2177 if (popup
.CreatePopupMenu())
2179 temp
.LoadString(IDS_LOG_FILTER_SUBJECT
);
2180 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT
), LOGFILTER_SUBJECT
, temp
);
2182 temp
.LoadString(IDS_LOG_FILTER_MESSAGES
);
2183 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES
), LOGFILTER_MESSAGES
, temp
);
2185 temp
.LoadString(IDS_LOG_FILTER_PATHS
);
2186 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS
), LOGFILTER_PATHS
, temp
);
2188 temp
.LoadString(IDS_LOG_FILTER_AUTHORS
);
2189 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS
), LOGFILTER_AUTHORS
, temp
);
2191 temp
.LoadString(IDS_LOG_FILTER_EMAILS
);
2192 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_EMAILS
), LOGFILTER_EMAILS
, temp
);
2194 temp
.LoadString(IDS_LOG_FILTER_REVS
);
2195 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS
), LOGFILTER_REVS
, temp
);
2197 temp
.LoadString(IDS_LOG_FILTER_REFNAME
);
2198 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME
), LOGFILTER_REFNAME
, temp
);
2200 temp
.LoadString(IDS_PROC_LOG_TAGINFO
);
2201 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_ANNOTATEDTAG
), LOGFILTER_ANNOTATEDTAG
, temp
);
2203 temp
.LoadString(IDS_NOTES
);
2204 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_NOTES
), LOGFILTER_NOTES
, temp
);
2206 if (m_LogList
.m_bShowBugtraqColumn
== TRUE
) {
2207 temp
.LoadString(IDS_LOG_FILTER_BUGIDS
);
2208 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID
), LOGFILTER_BUGID
, temp
);
2211 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2213 temp
.LoadString(IDS_LOG_FILTER_TOGGLE
);
2214 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, LOGFILTER_TOGGLE
, temp
);
2216 temp
.LoadString(IDS_ALL
);
2217 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, LOGFILTER_ALL
, temp
);
2219 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2221 temp
.LoadString(IDS_LOG_FILTER_REGEX
);
2222 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterWithRegex
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_REGEX
, temp
);
2224 temp
.LoadString(IDS_LOG_FILTER_CASESENSITIVE
);
2225 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterCaseSensitively
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_CASE
, temp
);
2228 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this);
2231 if (selection
== LOGFILTER_REGEX
)
2233 m_bFilterWithRegex
= !m_bFilterWithRegex
;
2234 CRegDWORD
b(L
"Software\\TortoiseGit\\UseRegexFilter", FALSE
);
2235 b
= m_bFilterWithRegex
;
2236 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
;
2238 CheckRegexpTooltip();
2239 m_cFilter
.ValidateAndRedraw();
2241 else if (selection
== LOGFILTER_CASE
)
2243 m_bFilterCaseSensitively
= !m_bFilterCaseSensitively
;
2244 CRegDWORD
b(L
"Software\\TortoiseGit\\FilterCaseSensitively", FALSE
);
2245 b
= m_bFilterCaseSensitively
;
2246 m_LogList
.m_bFilterCaseSensitively
= m_bFilterCaseSensitively
;
2248 else if (selection
== LOGFILTER_TOGGLE
)
2250 m_LogList
.m_SelectedFilters
= (~m_LogList
.m_SelectedFilters
) & LOGFILTER_ALL
;
2253 else if (selection
== LOGFILTER_ALL
)
2255 m_LogList
.m_SelectedFilters
= selection
;
2260 m_LogList
.m_SelectedFilters
^= selection
;
2263 CRegDWORD(L
"Software\\TortoiseGit\\SelectedLogFilters") = m_LogList
.m_SelectedFilters
;
2264 // Reload only if a search text is entered
2265 if (m_LogList
.HasFilterText())
2266 SetTimer(LOGFILTER_TIMER
, 1000, nullptr);
2272 LRESULT
CLogDlg::OnClickedCancelFilter(WPARAM wParam
, LPARAM
/*lParam*/)
2274 if ((HWND
)wParam
== m_cFileFilter
.GetSafeHwnd())
2276 KillTimer(FILEFILTER_TIMER
);
2278 FillLogMessageCtrl();
2282 KillTimer(LOGFILTER_TIMER
);
2284 m_LogList
.m_sFilterText
.Empty();
2286 theApp
.DoWaitCursor(1);
2287 FillLogMessageCtrl(false);
2289 m_LogList
.RemoveFilter();
2293 theApp
.DoWaitCursor(-1);
2294 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2295 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2296 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2297 UpdateLogInfoLabel();
2303 void CLogDlg::SetFilterCueText()
2305 CString
temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY
));
2308 if (m_LogList
.m_SelectedFilters
& LOGFILTER_SUBJECT
)
2310 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT
));
2313 if (m_LogList
.m_SelectedFilters
& LOGFILTER_MESSAGES
)
2315 if (!CStringUtils::EndsWith(temp
, L
' '))
2317 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES
));
2320 if (m_LogList
.m_SelectedFilters
& LOGFILTER_PATHS
)
2322 if (!CStringUtils::EndsWith(temp
, L
' '))
2324 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS
));
2327 if (m_LogList
.m_SelectedFilters
& LOGFILTER_AUTHORS
)
2329 if (!CStringUtils::EndsWith(temp
, L
' '))
2331 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS
));
2334 if (m_LogList
.m_SelectedFilters
& LOGFILTER_EMAILS
)
2336 if (!CStringUtils::EndsWith(temp
, L
' '))
2338 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_EMAILS
));
2341 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REVS
)
2343 if (!CStringUtils::EndsWith(temp
, L
' '))
2345 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS
));
2348 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REFNAME
)
2350 if (!CStringUtils::EndsWith(temp
, L
' '))
2352 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REFNAME
));
2355 if (m_LogList
.m_SelectedFilters
& LOGFILTER_NOTES
)
2357 if (!CStringUtils::EndsWith(temp
, L
' '))
2359 temp
+= CString(MAKEINTRESOURCE(IDS_NOTES
));
2362 if (m_LogList
.m_bShowBugtraqColumn
&& m_LogList
.m_SelectedFilters
& LOGFILTER_BUGID
)
2364 if (!CStringUtils::EndsWith(temp
, L
' '))
2366 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS
));
2369 // to make the cue banner text appear more to the right of the edit control
2371 m_cFilter
.SetCueBanner(temp
.TrimRight());
2374 bool CLogDlg::Validate(LPCTSTR string
)
2376 if (!m_bFilterWithRegex
)
2379 return m_LogList
.ValidateRegexp(string
, pat
, false);
2382 void CLogDlg::OnEnChangeFileFilter()
2384 SetTimer(FILEFILTER_TIMER
, 1000, nullptr);
2387 void CLogDlg::OnTimer(UINT_PTR nIDEvent
)
2389 if (nIDEvent
== LOGFTIME_TIMER
)
2391 KillTimer(LOGFTIME_TIMER
);
2394 else if (nIDEvent
== LOG_FILLPATCHVTIMER
)
2396 else if (nIDEvent
== LOGFILTER_TIMER
)
2398 KillTimer(LOGFILTER_TIMER
);
2402 /* we will use git built-in grep to filter log */
2403 if (this->IsThreadRunning())
2405 // thread still running! So just restart the timer.
2406 SetTimer(LOGFILTER_TIMER
, 1000, nullptr);
2409 CWnd
* focusWnd
= GetFocus();
2410 bool bSetFocusToFilterControl
= ((focusWnd
!= GetDlgItem(IDC_DATEFROM
))&&(focusWnd
!= GetDlgItem(IDC_DATETO
))
2411 && (focusWnd
!= GetDlgItem(IDC_LOGLIST
)));
2412 if (m_LogList
.m_sFilterText
.IsEmpty())
2414 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
2415 // do not return here!
2416 // we also need to run the filter if the filter text is empty:
2417 // 1. to clear an existing filter
2418 // 2. to rebuild the m_arShownList after sorting
2420 theApp
.DoWaitCursor(1);
2421 CStoreSelection
storeselection(this);
2422 KillTimer(LOGFILTER_TIMER
);
2423 FillLogMessageCtrl(false);
2425 // now start filter the log list
2426 m_LogList
.StartFilter();
2428 if ( m_LogList
.GetItemCount()==1 )
2430 m_LogList
.SetSelectionMark(0);
2431 m_LogList
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
2433 theApp
.DoWaitCursor(-1);
2434 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2435 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2436 if (bSetFocusToFilterControl
)
2437 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2438 UpdateLogInfoLabel();
2440 } // if (nIDEvent == LOGFILTER_TIMER)
2441 else if (nIDEvent
== LOG_HEADER_ORDER_TIMER
)
2443 KillTimer(LOG_HEADER_ORDER_TIMER
);
2444 CLogOrdering orderDlg
;
2445 if (orderDlg
.DoModal() == IDOK
)
2448 else if (nIDEvent
== FILEFILTER_TIMER
)
2450 KillTimer(FILEFILTER_TIMER
);
2451 FillLogMessageCtrl();
2453 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.empty() || m_LogList
.m_arShownList
.size() == 1 && m_LogList
.m_bShowWC
))));
2454 __super::OnTimer(nIDEvent
);
2457 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2462 m_DateTo
.GetTime(_time
);
2465 m_DateFrom
.GetTime(fromTime
);
2466 if (_time
< fromTime
)
2469 m_DateTo
.SetTime(&_time
);
2472 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 23, 59, 59);
2473 if (time
.GetTime() != m_LogList
.m_Filter
.m_To
)
2475 m_LogList
.m_Filter
.m_To
= (DWORD
)time
.GetTime();
2476 SetTimer(LOGFTIME_TIMER
, 10, nullptr);
2481 CMessageBox::Show(GetSafeHwnd(), L
"Invalidate Parameter", L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
2487 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2492 m_DateFrom
.GetTime(_time
);
2495 m_DateTo
.GetTime(toTime
);
2499 m_DateFrom
.SetTime(&_time
);
2502 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 0, 0, 0);
2503 if (time
.GetTime() != m_LogList
.m_Filter
.m_From
)
2505 m_LogList
.m_Filter
.m_From
= (DWORD
)time
.GetTime();
2506 m_LogList
.m_Filter
.m_NumberOfLogsScale
= CFilterData::SHOW_LAST_SEL_DATE
;
2508 if (CFilterData::SHOW_LAST_SEL_DATE
== (DWORD
)CRegDWORD(L
"Software\\TortoiseGit\\LogDialog\\NumberOfLogsScale", CFilterData::SHOW_NO_LIMIT
))
2509 m_regLastSelectedFromDate
= time
.Format(L
"%Y-%m-%d");
2511 SetTimer(LOGFTIME_TIMER
, 10, nullptr);
2516 CMessageBox::Show(GetSafeHwnd(), L
"Invalidate Parameter", L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
2522 void CLogDlg::OnCbnSelchangeJumpType()
2524 // reserved for future use
2527 void CLogDlg::OnBnClickedJumpUp()
2529 int sel
= m_JumpType
.GetCurSel();
2530 if (sel
< 0) return;
2531 JumpType jumpType
= (JumpType
)sel
;
2533 if (jumpType
== JumpType_History
)
2542 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2545 index
= m_LogList
.GetNextSelectedItem(pos
);
2546 if (index
== 0) return;
2548 GitRev
* data
= m_LogList
.m_arShownList
.SafeGetAt(index
);
2549 if (jumpType
== JumpType_AuthorEmail
)
2550 strValue
= data
->GetAuthorEmail();
2551 else if (jumpType
== JumpType_CommitterEmail
)
2552 strValue
= data
->GetCommitterEmail();
2553 else if (jumpType
== JumpType_Parent1
)
2554 hashValue
= data
->m_CommitHash
;
2555 else if (jumpType
== JumpType_Parent2
)
2556 hashValue
= data
->m_CommitHash
;
2557 else if (jumpType
== JumpType_TagFF
)
2558 hashValue
= data
->m_CommitHash
;
2559 else if (jumpType
== JumpType_BranchFF
)
2560 hashValue
= data
->m_CommitHash
;
2562 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2569 index
= m_LogList
.GetNextSelectedItem(pos
);
2570 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2572 m_LogList
.SetSelectionMark(-1);
2574 for (int i
= index
- 1; i
>= 0; i
--)
2577 GitRev
* data
= m_LogList
.m_arShownList
.SafeGetAt(i
);
2578 if (jumpType
== JumpType_AuthorEmail
)
2579 found
= strValue
== data
->GetAuthorEmail();
2580 else if (jumpType
== JumpType_CommitterEmail
)
2581 found
= strValue
== data
->GetCommitterEmail();
2582 else if (jumpType
== JumpType_MergePoint
)
2583 found
= data
->ParentsCount() > 1;
2584 else if (jumpType
== JumpType_Parent1
)
2586 if (!data
->m_ParentHash
.empty())
2587 found
= data
->m_ParentHash
[0] == hashValue
;
2589 else if (jumpType
== JumpType_Parent2
)
2591 if (data
->m_ParentHash
.size() > 1)
2592 found
= data
->m_ParentHash
[1] == hashValue
;
2594 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
2596 auto refList
= m_LogList
.m_HashMap
.find(data
->m_CommitHash
);
2597 if (refList
!= m_LogList
.m_HashMap
.cend())
2598 found
= find_if((*refList
).second
, [](const auto& ref
) { return CStringUtils::StartsWith(ref
, L
"refs/tags/"); }) != (*refList
).second
.cend();
2600 if (found
&& jumpType
== JumpType_TagFF
)
2601 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
2603 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2605 auto refList
= m_LogList
.m_HashMap
.find(data
->m_CommitHash
);
2606 if (refList
!= m_LogList
.m_HashMap
.cend())
2607 found
= find_if((*refList
).second
, [](const auto& ref
) { return CStringUtils::StartsWith(ref
, L
"refs/heads/") || CStringUtils::StartsWith(ref
, L
"refs/remotes/"); }) != (*refList
).second
.cend();
2609 if (found
&& jumpType
== JumpType_BranchFF
)
2610 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
2615 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2616 m_LogList
.EnsureVisible(i
, FALSE
);
2617 m_LogList
.SetSelectionMark(i
);
2622 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, L
"NoJumpNotFoundWarning", IDS_MSGBOX_DONOTSHOWAGAIN
);
2625 void CLogDlg::OnBnClickedJumpDown()
2627 int jumpType
= m_JumpType
.GetCurSel();
2628 if (jumpType
< 0) return;
2630 if (jumpType
== JumpType_History
)
2639 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2642 index
= m_LogList
.GetNextSelectedItem(pos
);
2643 if (index
== 0) return;
2645 GitRev
* data
= m_LogList
.m_arShownList
.SafeGetAt(index
);
2646 if (jumpType
== JumpType_AuthorEmail
)
2647 strValue
= data
->GetAuthorEmail();
2648 else if (jumpType
== JumpType_CommitterEmail
)
2649 strValue
= data
->GetCommitterEmail();
2650 else if (jumpType
== JumpType_Parent1
)
2652 if (!data
->m_ParentHash
.empty())
2653 hashValue
= data
->m_ParentHash
.at(0);
2657 else if (jumpType
== JumpType_Parent2
)
2659 if (data
->m_ParentHash
.size() > 1)
2660 hashValue
= data
->m_ParentHash
.at(1);
2664 else if (jumpType
== JumpType_TagFF
)
2665 hashValue
= data
->m_CommitHash
;
2666 else if (jumpType
== JumpType_BranchFF
)
2667 hashValue
= data
->m_CommitHash
;
2669 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2676 index
= m_LogList
.GetNextSelectedItem(pos
);
2677 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2679 m_LogList
.SetSelectionMark(-1);
2681 for (int i
= index
+ 1; i
< m_LogList
.GetItemCount(); ++i
)
2684 GitRev
* data
= m_LogList
.m_arShownList
.SafeGetAt(i
);
2685 if (jumpType
== JumpType_AuthorEmail
)
2686 found
= strValue
== data
->GetAuthorEmail();
2687 else if (jumpType
== JumpType_CommitterEmail
)
2688 found
= strValue
== data
->GetCommitterEmail();
2689 else if (jumpType
== JumpType_MergePoint
)
2690 found
= data
->ParentsCount() > 1;
2691 else if (jumpType
== JumpType_Parent1
)
2692 found
= data
->m_CommitHash
== hashValue
;
2693 else if (jumpType
== JumpType_Parent2
)
2694 found
= data
->m_CommitHash
== hashValue
;
2695 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
2697 auto refList
= m_LogList
.m_HashMap
.find(data
->m_CommitHash
);
2698 if (refList
!= m_LogList
.m_HashMap
.cend())
2699 found
= find_if((*refList
).second
, [](const auto& ref
) { return CStringUtils::StartsWith(ref
, L
"refs/tags/"); }) != (*refList
).second
.cend();
2701 if (found
&& jumpType
== JumpType_TagFF
)
2702 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
2704 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2706 auto refList
= m_LogList
.m_HashMap
.find(data
->m_CommitHash
);
2707 if (refList
!= m_LogList
.m_HashMap
.cend())
2708 found
= find_if((*refList
).second
, [](const auto& ref
) { return CStringUtils::StartsWith(ref
, L
"refs/heads/") || CStringUtils::StartsWith(ref
, L
"refs/remotes/"); }) != (*refList
).second
.cend();
2710 if (found
&& jumpType
== JumpType_BranchFF
)
2711 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
2716 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2717 m_LogList
.EnsureVisible(i
, FALSE
);
2718 m_LogList
.SetSelectionMark(i
);
2723 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, L
"NoJumpNotFoundWarning", IDS_MSGBOX_DONOTSHOWAGAIN
);
2726 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
2734 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscRevSort());
2736 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescRevSort());
2742 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscActionSort());
2744 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescActionSort());
2750 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscAuthorSort());
2752 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescAuthorSort());
2758 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscDateSort());
2760 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescDateSort());
2763 case 4: // Message or bug id
2764 if (m_bShowBugtraqColumn
)
2767 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscBugIDSort());
2769 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescBugIDSort());
2772 // fall through here
2776 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscMessageSort());
2778 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescMessageSort());
2788 void CLogDlg::OnLvnColumnclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2790 if (this->IsThreadRunning())
2791 return; //no sorting while the arrays are filled
2793 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
2794 const int nColumn
= pNMLV
->iSubItem
;
2795 m_bAscending
= nColumn
== m_nSortColumn
? !m_bAscending
: TRUE
;
2796 m_nSortColumn
= nColumn
;
2797 SortByColumn(m_nSortColumn
, m_bAscending
);
2798 SetSortArrow(&m_LogList
, m_nSortColumn
, !!m_bAscending
);
2799 SortShownListArray();
2800 m_LogList
.Invalidate();
2801 UpdateLogInfoLabel();
2803 UNREFERENCED_PARAMETER(pNMHDR
);
2807 SetTimer(LOG_HEADER_ORDER_TIMER
, 10, nullptr);
2810 void CLogDlg::SortShownListArray()
2812 // make sure the shown list still matches the filter after sorting.
2813 OnTimer(LOGFILTER_TIMER
);
2814 // clear the selection states
2815 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2818 m_LogList
.SetItemState(m_LogList
.GetNextSelectedItem(pos
), 0, LVIS_SELECTED
);
2820 m_LogList
.SetSelectionMark(-1);
2823 void CLogDlg::SetSortArrow(CListCtrl
* control
, int nColumn
, bool bAscending
)
2827 // set the sort arrow
2828 CHeaderCtrl
* pHeader
= control
->GetHeaderCtrl();
2829 HDITEM HeaderItem
= {0};
2830 HeaderItem
.mask
= HDI_FORMAT
;
2831 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
2833 pHeader
->GetItem(i
, &HeaderItem
);
2834 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
2835 pHeader
->SetItem(i
, &HeaderItem
);
2839 pHeader
->GetItem(nColumn
, &HeaderItem
);
2840 HeaderItem
.fmt
|= (bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
2841 pHeader
->SetItem(nColumn
, &HeaderItem
);
2845 int CLogDlg::m_nSortColumnPathList
= 0;
2846 bool CLogDlg::m_bAscendingPathList
= false;
2848 void CLogDlg::OnBnClickedHidepaths()
2850 FillLogMessageCtrl();
2851 m_ChangedFileListCtrl
.Invalidate();
2854 void CLogDlg::UpdateLogInfoLabel()
2858 long selectedrevs
= 0;
2859 long selectedfiles
= 0;
2860 int count
= (int)m_LogList
.m_arShownList
.size();
2864 auto pRev
= m_LogList
.m_arShownList
.SafeGetAt(0);
2867 rev1
= m_LogList
.m_arShownList
.SafeGetAt(0)->m_CommitHash
;
2868 if (m_LogList
.m_bShowWC
&& rev1
.IsEmpty() && count
> 1)
2871 pRev
= m_LogList
.m_arShownList
.SafeGetAt(start
);
2873 rev1
= pRev
->m_CommitHash
;
2876 pRev
= m_LogList
.m_arShownList
.SafeGetAt(count
- 1);
2878 rev2
= pRev
->m_CommitHash
;
2879 selectedrevs
= m_LogList
.GetSelectedCount();
2881 selectedfiles
= m_ChangedFileListCtrl
.GetSelectedCount();
2884 sTemp
.Format(IDS_PROC_LOG_STATS
,
2886 (LPCTSTR
)rev2
.ToString().Left(g_Git
.GetShortHASHLength()), (LPCTSTR
)rev1
.ToString().Left(g_Git
.GetShortHASHLength()), selectedrevs
, selectedfiles
);
2888 if(selectedrevs
== 1)
2890 CString str
=m_ChangedFileListCtrl
.GetStatisticsString(true);
2891 str
.Replace(L
'\n', L
' ');
2892 sTemp
+= L
"; " + str
;
2899 void CLogDlg::OnDtnDropdownDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2901 // the date control should not show the "today" button
2902 CMonthCalCtrl
* pCtrl
= m_DateFrom
.GetMonthCalCtrl();
2904 pCtrl
->ModifyStyle(0, MCS_NOTODAY
);
2908 void CLogDlg::OnSize(UINT nType
, int cx
, int cy
)
2910 __super::OnSize(nType
, cx
, cy
);
2915 void CLogDlg::OnRefresh()
2918 this->m_LogProgress
.SetPos(0);
2924 void CLogDlg::OnFocusFilter()
2926 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2929 void CLogDlg::OnEditCopy()
2931 if (GetFocus() == &m_ChangedFileListCtrl
)
2932 CopyChangedSelectionToClipBoard();
2934 m_LogList
.CopySelectionToClipBoard();
2937 CString
CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString
& url
)
2939 // is the URL a relative one?
2940 if (CStringUtils::StartsWith(url
, L
"^/"))
2942 // URL is relative to the repository root
2943 CString url1
= m_sRepositoryRoot
+ url
.Mid(1);
2944 TCHAR buf
[INTERNET_MAX_URL_LENGTH
] = { 0 };
2945 DWORD len
= url
.GetLength();
2946 if (UrlCanonicalize((LPCTSTR
)url1
, buf
, &len
, 0) == S_OK
)
2947 return CString(buf
, len
);
2950 else if (url
[0] == '/')
2952 // URL is relative to the server's hostname
2954 // find the server's hostname
2955 int schemepos
= m_sRepositoryRoot
.Find(L
"//");
2958 sHost
= m_sRepositoryRoot
.Left(m_sRepositoryRoot
.Find(L
'/', schemepos
+ 3));
2959 CString url1
= sHost
+ url
;
2960 TCHAR buf
[INTERNET_MAX_URL_LENGTH
] = { 0 };
2961 DWORD len
= url
.GetLength();
2962 if (UrlCanonicalize((LPCTSTR
)url
, buf
, &len
, 0) == S_OK
)
2963 return CString(buf
, len
);
2970 void CLogDlg::ShowGravatar()
2972 m_gravatar
.EnableGravatar(m_bShowGravatar
);
2973 RemoveAnchor(IDC_MSGVIEW
);
2974 if (m_gravatar
.IsGravatarEnabled())
2977 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
2978 ScreenToClient(&rect
);
2979 m_gravatar
.GetWindowRect(&rect2
);
2980 ScreenToClient(&rect2
);
2981 rect
.right
= rect2
.left
;
2982 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
2983 m_gravatar
.ShowWindow(SW_SHOW
);
2988 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
2989 ScreenToClient(&rect
);
2990 m_gravatar
.GetWindowRect(&rect2
);
2991 ScreenToClient(&rect2
);
2992 rect
.right
= rect2
.right
;
2993 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
2994 m_gravatar
.ShowWindow(SW_HIDE
);
2996 AddAnchor(IDC_MSGVIEW
, MIDDLE_LEFT
, MIDDLE_RIGHT
); // keep in sync with AddMainAnchors
3000 void CLogDlg::OnEnChangeSearchedit()
3003 if (!m_LogList
.HasFilterText())
3005 // clear the filter, i.e. make all entries appear
3006 theApp
.DoWaitCursor(1);
3007 KillTimer(LOGFILTER_TIMER
);
3008 FillLogMessageCtrl(false);
3011 //m_LogList.StartFilter();
3013 InterlockedExchange(&m_bNoDispUpdates
, TRUE
);
3014 m_arShownList
.RemoveAll();
3015 for (DWORD i
=0; i
<m_logEntries
.size(); ++i
)
3017 if (IsEntryInDateRange(i
))
3018 m_arShownList
.Add(m_logEntries
[i
]);
3020 InterlockedExchange(&m_bNoDispUpdates
, FALSE
);
3021 m_LogList
.DeleteAllItems();
3022 m_LogList
.SetItemCountEx(ShownCountWithStopped());
3023 m_LogList
.RedrawItems(0, ShownCountWithStopped());
3024 m_LogList
.SetRedraw(false);
3025 m_LogList
.SetRedraw(true);
3027 theApp
.DoWaitCursor(-1);
3028 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
3029 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
3030 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
3031 DialogEnableWindow(IDC_STATBUTTON
, !(this->IsThreadRunning() || m_LogList
.m_arShownList
.empty()));
3034 if (Validate(m_LogList
.m_sFilterText
))
3035 SetTimer(LOGFILTER_TIMER
, 1000, nullptr);
3037 KillTimer(LOGFILTER_TIMER
);
3040 void CLogDlg::OnBnClickedAllBranch()
3042 // m_bAllBranch is not auto-toggled by MFC, we have to handle it manually (in order to prevent the indeterminate state)
3044 m_LogList
.m_ShowMask
&=~ (CGit::LOG_INFO_LOCAL_BRANCHES
| CGit::LOG_INFO_BASIC_REFS
| CGit::LOG_INFO_ALL_BRANCH
);
3048 m_bAllBranch
= BST_UNCHECKED
;
3049 m_AllBranchType
= AllBranchType::None
;
3050 m_ChangedFileListCtrl
.m_sDisplayedBranch
= m_LogList
.GetRange();
3054 m_bAllBranch
= BST_CHECKED
;
3055 m_AllBranchType
= AllBranchType::AllBranches
;
3056 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
3057 m_ChangedFileListCtrl
.m_sDisplayedBranch
.Empty();
3060 // need to save value here, so that log dialogs started from now on also have AllBranch activated
3061 m_regbAllBranch
= (DWORD
)m_AllBranchType
;
3067 FillLogMessageCtrl(false);
3070 void CLogDlg::OnBnClickedFollowRenames()
3072 if(m_bFollowRenames
)
3074 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_FOLLOW
;
3075 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_LOCAL_BRANCHES
;
3076 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_BASIC_REFS
;
3079 m_bAllBranch
= FALSE
;
3080 m_AllBranchType
= AllBranchType::None
;
3081 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_ALL_BRANCH
;
3085 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_FOLLOW
;
3087 DialogEnableWindow(IDC_LOG_ALLBRANCH
, !m_bFollowRenames
);
3088 DialogEnableWindow(IDC_WHOLE_PROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
3092 FillLogMessageCtrl(false);
3095 void CLogDlg::HandleShowLabels(bool var
, int flag
)
3098 m_LogList
.m_ShowRefMask
|= flag
;
3100 m_LogList
.m_ShowRefMask
&= ~flag
;
3102 if ((m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_REFS
) && !(m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_ANYCOMMIT
))
3104 // Remove commits where labels are not shown.
3106 FillLogMessageCtrl(false);
3111 m_LogList
.Invalidate();
3115 void CLogDlg::OnBnClickedCompressedGraph()
3119 if (m_iCompressedGraph
== 2)
3120 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_REFS
;
3121 else if (m_iCompressedGraph
== 1)
3122 m_LogList
.m_ShowFilter
= static_cast<CGitLogListBase::FilterShow
>(CGitLogListBase::FILTERSHOW_REFS
| CGitLogListBase::FILTERSHOW_MERGEPOINTS
);
3124 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_ALL
;
3127 FillLogMessageCtrl(false);
3130 void CLogDlg::OnBnClickedBrowseRef()
3132 CString newRef
= CBrowseRefsDlg::PickRef(false, m_LogList
.GetRange(), gPickRef_All
, true);
3133 if(newRef
.IsEmpty())
3136 m_History
.AddEntry(newRef
);
3141 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_BASIC_REFS
| CGit::LOG_INFO_LOCAL_BRANCHES
);
3142 m_bAllBranch
= BST_UNCHECKED
;
3143 m_AllBranchType
= AllBranchType::None
;
3147 FillLogMessageCtrl(false);
3150 void CLogDlg::ShowStartRef()
3152 //Show ref name on top
3153 if(!::IsWindow(m_hWnd
))
3155 if (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_BASIC_REFS
| CGit::LOG_INFO_LOCAL_BRANCHES
))
3157 switch (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_BASIC_REFS
| CGit::LOG_INFO_LOCAL_BRANCHES
))
3159 case CGit::LOG_INFO_ALL_BRANCH
:
3160 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES
)));
3163 case CGit::LOG_INFO_BASIC_REFS
:
3164 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_BASIC_REFS
)));
3167 case CGit::LOG_INFO_LOCAL_BRANCHES
:
3168 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_LOCAL_BRANCHES
)));
3172 m_staticRef
.Invalidate(TRUE
);
3173 m_tooltips
.DelTool(GetDlgItem(IDC_STATIC_REF
));
3177 CString showStartRef
= m_LogList
.GetRange();
3178 if (showStartRef
.IsEmpty() || showStartRef
== L
"HEAD")
3180 showStartRef
.Empty();
3182 if (g_Git
.Run(L
"git.exe symbolic-ref HEAD", &showStartRef
, nullptr, CP_UTF8
))
3183 showStartRef
.LoadString(IDS_PROC_LOG_NOBRANCH
);
3184 showStartRef
.Trim(L
"\r\n\t ");
3188 showStartRef
= g_Git
.StripRefName(showStartRef
);
3190 m_staticRef
.SetWindowText(showStartRef
);
3191 CWnd
*pWnd
= GetDlgItem(IDC_STATIC_REF
);
3192 m_tooltips
.AddTool(pWnd
, showStartRef
);
3193 m_staticRef
.Invalidate(TRUE
);
3196 void CLogDlg::SetRange(const CString
& range
)
3198 m_LogList
.SetRange(range
);
3199 m_ChangedFileListCtrl
.m_sDisplayedBranch
= range
;
3204 static void AppendMenuChecked(CMenu
&menu
, UINT nTextID
, UINT_PTR nItemID
, BOOL checked
= FALSE
, BOOL enabled
= TRUE
)
3207 text
.LoadString(nTextID
);
3208 menu
.AppendMenu(MF_STRING
| (enabled
? MF_ENABLED
: MF_DISABLED
) | (checked
? MF_CHECKED
: MF_UNCHECKED
), nItemID
, text
);
3211 #define WALKBEHAVIOUR_FIRSTPARENT 1
3212 #define WALKBEHAVIOUR_FOLLOWRENAMES 2
3213 #define WALKBEHAVIOUR_COMPRESSEDGRAPH 3
3214 #define WALKBEHAVIOUR_LABELEDCOMMITS 4
3215 #define WALKBEHAVIOUR_NOMERGES 5
3217 void CLogDlg::OnBnClickedWalkBehaviour()
3220 if (popup
.CreatePopupMenu())
3222 m_ctrlWalkBehavior
.SetCheck(BST_CHECKED
);
3223 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FIRSTPARENT
, WALKBEHAVIOUR_FIRSTPARENT
, m_bFirstParent
);
3224 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_NOMERGES
, WALKBEHAVIOUR_NOMERGES
, m_bNoMerges
);
3225 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FOLLOWRENAMES
, WALKBEHAVIOUR_FOLLOWRENAMES
, m_bFollowRenames
, !(m_path
.IsEmpty() || m_path
.IsDirectory()));
3226 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3227 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_COMPRESSED
, WALKBEHAVIOUR_COMPRESSEDGRAPH
, m_iCompressedGraph
== 1);
3228 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_LABELEDCOMMITS
, WALKBEHAVIOUR_LABELEDCOMMITS
, m_iCompressedGraph
== 2);
3232 GetDlgItem(IDC_WALKBEHAVIOUR
)->GetWindowRect(&rect
);
3234 params
.cbSize
= sizeof(TPMPARAMS
);
3235 params
.rcExclude
= rect
;
3236 int selection
= popup
.TrackPopupMenuEx(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
| TPM_VERTICAL
, rect
.left
, rect
.top
, this, ¶ms
);
3239 case WALKBEHAVIOUR_FIRSTPARENT
:
3240 m_bFirstParent
= !m_bFirstParent
;
3241 OnBnClickedFirstParent();
3243 case WALKBEHAVIOUR_NOMERGES
:
3244 m_bNoMerges
= !m_bNoMerges
;
3245 OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges
3247 case WALKBEHAVIOUR_FOLLOWRENAMES
:
3248 m_bFollowRenames
= !m_bFollowRenames
;
3249 OnBnClickedFollowRenames();
3251 case WALKBEHAVIOUR_COMPRESSEDGRAPH
:
3252 m_iCompressedGraph
= (m_iCompressedGraph
== 1 ? 0 : 1);
3253 OnBnClickedCompressedGraph();
3255 case WALKBEHAVIOUR_LABELEDCOMMITS
:
3256 m_iCompressedGraph
= (m_iCompressedGraph
== 2 ? 0 : 2);
3257 OnBnClickedCompressedGraph();
3262 m_ctrlWalkBehavior
.SetCheck((m_bFirstParent
|| m_bNoMerges
|| m_bFollowRenames
|| m_iCompressedGraph
) ? BST_CHECKED
: BST_UNCHECKED
);
3266 #define VIEW_HIDEPATHS 1
3267 #define VIEW_GRAYPATHS 2
3268 #define VIEW_SHOWTAGS 3
3269 #define VIEW_SHOWLOCALBRANCHES 4
3270 #define VIEW_SHOWREMOTEBRANCHES 5
3271 #define VIEW_SHOWGRAVATAR 6
3272 #define VIEW_SHOWPATCH 7
3273 #define VIEW_SHOWWCUNVERSIONED 8
3274 #define VIEW_SHOWOTHERREFS 9
3276 void CLogDlg::OnBnClickedView()
3279 if (popup
.CreatePopupMenu())
3281 m_ctrlView
.SetCheck(BST_CHECKED
);
3282 AppendMenuChecked(popup
, IDS_SHOWFILES_HIDEPATHS
, VIEW_HIDEPATHS
, m_iHidePaths
== 1);
3283 AppendMenuChecked(popup
, IDS_SHOWFILES_GRAYPATHS
, VIEW_GRAYPATHS
, m_iHidePaths
== 2);
3284 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3285 AppendMenuChecked(popup
, IDS_PROC_LOG_SHOWUNVERSIONED
, VIEW_SHOWWCUNVERSIONED
, m_bShowUnversioned
== BST_CHECKED
);
3286 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3287 CMenu showLabelsMenu
;
3288 if (showLabelsMenu
.CreatePopupMenu())
3290 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWTAGLABELS
, VIEW_SHOWTAGS
, m_bShowTags
);
3291 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWLOCALBRANCHLABELS
, VIEW_SHOWLOCALBRANCHES
, m_bShowLocalBranches
);
3292 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWREMOTEBRANCHLABELS
, VIEW_SHOWREMOTEBRANCHES
, m_bShowRemoteBranches
);
3293 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWROTHERLABELS
, VIEW_SHOWOTHERREFS
, m_bShowOtherRefs
);
3294 popup
.AppendMenu(MF_STRING
| MF_POPUP
, (UINT_PTR
)showLabelsMenu
.m_hMenu
, (CString
)MAKEINTRESOURCE(IDS_VIEW_LABELS
));
3296 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3297 AppendMenuChecked(popup
, IDS_VIEW_SHOWGRAVATAR
, VIEW_SHOWGRAVATAR
, m_bShowGravatar
);
3298 AppendMenuChecked(popup
, IDS_MENU_VIEWPATCH
, VIEW_SHOWPATCH
, IsWindow(this->m_patchViewdlg
.m_hWnd
));
3302 GetDlgItem(IDC_VIEW
)->GetWindowRect(&rect
);
3304 params
.cbSize
= sizeof(TPMPARAMS
);
3305 params
.rcExclude
= rect
;
3306 int selection
= popup
.TrackPopupMenuEx(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
| TPM_VERTICAL
, rect
.left
, rect
.top
, this, ¶ms
);
3309 case VIEW_HIDEPATHS
:
3310 if (m_iHidePaths
== 1)
3314 OnBnClickedHidepaths();
3316 case VIEW_GRAYPATHS
:
3317 if (m_iHidePaths
== 2)
3321 OnBnClickedHidepaths();
3324 m_bShowTags
= !m_bShowTags
;
3325 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
3327 case VIEW_SHOWLOCALBRANCHES
:
3328 m_bShowLocalBranches
= !m_bShowLocalBranches
;
3329 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
3331 case VIEW_SHOWREMOTEBRANCHES
:
3332 m_bShowRemoteBranches
= !m_bShowRemoteBranches
;
3333 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
3335 case VIEW_SHOWOTHERREFS
:
3336 m_bShowOtherRefs
= !m_bShowOtherRefs
;
3337 HandleShowLabels(m_bShowOtherRefs
, LOGLIST_SHOWOTHERREFS
);
3339 case VIEW_SHOWGRAVATAR
:
3341 m_bShowGravatar
= !m_bShowGravatar
;
3345 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
3348 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
3349 int moreSel
= m_LogList
.GetNextSelectedItem(pos
);
3352 GitRev
* pLogEntry
= m_LogList
.m_arShownList
.SafeGetAt(selIndex
);
3354 email
= pLogEntry
->GetAuthorEmail();
3357 m_gravatar
.LoadGravatar(email
);
3360 case VIEW_SHOWPATCH
:
3363 case VIEW_SHOWWCUNVERSIONED
:
3364 m_bShowUnversioned
= !m_bShowUnversioned
;
3365 FillLogMessageCtrl();
3366 m_ChangedFileListCtrl
.Invalidate();
3371 m_ctrlView
.SetCheck(BST_UNCHECKED
);
3375 void CLogDlg::OnBnClickedFirstParent()
3377 if(this->m_bFirstParent
)
3378 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_FIRST_PARENT
;
3380 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_FIRST_PARENT
;
3383 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_NO_MERGE
;
3385 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_NO_MERGE
;
3389 FillLogMessageCtrl(false);
3392 void CLogDlg::OnBnClickShowWholeProject()
3396 if(this->m_bWholeProject
)
3398 m_LogList
.m_Path
.Reset();
3402 m_LogList
.m_Path
=m_path
;
3404 m_regShowWholeProject
= m_bWholeProject
;
3410 FillLogMessageCtrl(false);
3413 LRESULT
CLogDlg::OnRefLogChanged(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
3419 LRESULT
CLogDlg::OnTaskbarBtnCreated(WPARAM wParam
, LPARAM lParam
)
3421 m_pTaskbarList
.Release();
3422 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
3423 return __super::OnTaskbarButtonCreated(wParam
, lParam
);
3426 LRESULT
CLogDlg::OnRefreshSelection(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
3428 // it's enough to deselect, then select again one item of the whole selection
3429 int selMark
= m_LogList
.GetSelectionMark();
3432 m_LogList
.SetSelectionMark(selMark
);
3433 m_LogList
.SetItemState(selMark
, 0, LVIS_SELECTED
);
3434 m_LogList
.SetItemState(selMark
, LVIS_SELECTED
, LVIS_SELECTED
);
3439 void CLogDlg::OnExitClearFilter()
3441 if (!m_LogList
.m_sFilterText
.IsEmpty())
3443 OnClickedCancelFilter(NULL
, NULL
);
3446 SendMessage(WM_CLOSE
);