1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2009 - TortoiseSVN
4 // Copyright (C) 2008-2014 - 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"
23 #include "StatGraphDlg.h"
25 #include "MessageBox.h"
28 #include "PathUtils.h"
29 #include "StringUtils.h"
30 #include "UnicodeUtils.h"
33 #include "BrowseRefsDlg.h"
34 #include "SmartHandle.h"
35 #include "LogOrdering.h"
37 #define WM_TGIT_REFRESH_SELECTION (WM_APP + 1)
39 IMPLEMENT_DYNAMIC(CLogDlg
, CResizableStandAloneDialog
)
40 CLogDlg::CLogDlg(CWnd
* pParent
/*=NULL*/)
41 : CResizableStandAloneDialog(CLogDlg::IDD
, pParent
)
43 , m_currentChangedArray(NULL
)
45 , m_bFollowRenames(false)
47 , m_bSelectionMustBeSingle(true)
49 , m_bShowLocalBranches(true)
50 , m_bShowRemoteBranches(true)
53 , m_bWalkBehavior(FALSE
)
54 , m_bFirstParent(false)
55 , m_bWholeProject(FALSE
)
56 , m_iCompressedGraph(0)
58 , m_bSelectionMustBeContinuous(false)
63 , m_pNotifyWindow(NULL
)
69 , m_bNavigatingWithSelect(false)
71 m_bFilterWithRegex
= !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), FALSE
);
72 m_bFilterCaseSensitively
= !!CRegDWORD(L
"Software\\TortoiseGit\\FilterCaseSensitively", FALSE
);
75 str
=g_Git
.m_CurrentDir
;
76 str
.Replace(_T(":"),_T("_"));
77 str
=CString(_T("Software\\TortoiseGit\\LogDialog\\AllBranch\\"))+str
;
79 m_regbAllBranch
=CRegDWORD(str
,FALSE
);
81 m_bAllBranch
=m_regbAllBranch
;
83 str
= g_Git
.m_CurrentDir
;
84 str
.Replace(_T(":"),_T("_"));
85 m_regShowWholeProject
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\") + str
, FALSE
);
86 m_bWholeProject
= m_regShowWholeProject
;
87 m_regbShowTags
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowTags\\") + str
, TRUE
);
88 m_bShowTags
= !!m_regbShowTags
;
89 m_regbShowLocalBranches
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowLocalBranches\\") + str
, TRUE
);
90 m_bShowLocalBranches
= !!m_regbShowLocalBranches
;
91 m_regbShowRemoteBranches
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowRemoteBranches\\") + str
, TRUE
);
92 m_bShowRemoteBranches
= !!m_regbShowRemoteBranches
;
94 m_bShowUnversioned
= CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE
);
96 m_bShowGravatar
= !!CRegDWORD(_T("Software\\TortoiseGit\\EnableGravatar"), FALSE
);
97 m_regbShowGravatar
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowGravatar\\") + str
, m_bShowGravatar
);
98 m_bShowGravatar
= !!m_regbShowGravatar
;
104 m_regbAllBranch
= m_bAllBranch
;
105 m_regbShowTags
= m_bShowTags
;
106 m_regbShowLocalBranches
= m_bShowLocalBranches
;
107 m_regbShowRemoteBranches
= m_bShowRemoteBranches
;
108 m_regbShowGravatar
= m_bShowGravatar
;
110 m_CurrentFilteredChangedArray
.RemoveAll();
114 void CLogDlg::DoDataExchange(CDataExchange
* pDX
)
116 CResizableStandAloneDialog::DoDataExchange(pDX
);
117 DDX_Control(pDX
, IDC_LOGLIST
, m_LogList
);
118 DDX_Control(pDX
, IDC_LOGMSG
, m_ChangedFileListCtrl
);
119 DDX_Control(pDX
, IDC_PROGRESS
, m_LogProgress
);
120 DDX_Control(pDX
, IDC_SPLITTERTOP
, m_wndSplitter1
);
121 DDX_Control(pDX
, IDC_SPLITTERBOTTOM
, m_wndSplitter2
);
122 DDX_Text(pDX
, IDC_SEARCHEDIT
, m_LogList
.m_sFilterText
);
123 DDX_Control(pDX
, IDC_DATEFROM
, m_DateFrom
);
124 DDX_Control(pDX
, IDC_DATETO
, m_DateTo
);
125 DDX_Control(pDX
, IDC_LOG_JUMPTYPE
, m_JumpType
);
126 DDX_Control(pDX
, IDC_LOG_JUMPUP
, m_JumpUp
);
127 DDX_Control(pDX
, IDC_LOG_JUMPDOWN
, m_JumpDown
);
128 DDX_Text(pDX
, IDC_LOGINFO
, m_sLogInfo
);
129 DDX_Check(pDX
, IDC_LOG_ALLBRANCH
,m_bAllBranch
);
130 DDX_Check(pDX
, IDC_SHOWWHOLEPROJECT
,m_bWholeProject
);
131 DDX_Check(pDX
, IDC_WALKBEHAVIOUR
, m_bWalkBehavior
);
132 DDX_Control(pDX
, IDC_SEARCHEDIT
, m_cFilter
);
133 DDX_Control(pDX
, IDC_STATIC_REF
, m_staticRef
);
134 DDX_Control(pDX
, IDC_PIC_AUTHOR
, m_gravatar
);
137 BEGIN_MESSAGE_MAP(CLogDlg
, CResizableStandAloneDialog
)
140 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGLIST
, OnLvnItemchangedLoglist
)
141 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGMSG
, OnLvnItemchangedLogmsg
)
142 ON_NOTIFY(EN_LINK
, IDC_MSGVIEW
, OnEnLinkMsgview
)
143 ON_BN_CLICKED(IDC_STATBUTTON
, OnBnClickedStatbutton
)
145 ON_MESSAGE(WM_TGIT_REFRESH_SELECTION
, OnRefreshSelection
)
146 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED
, OnClickedInfoIcon
)
147 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED
, OnClickedCancelFilter
)
149 ON_MESSAGE(MSG_LOAD_PERCENTAGE
,OnLogListLoading
)
151 ON_EN_CHANGE(IDC_SEARCHEDIT
, OnEnChangeSearchedit
)
153 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATETO
, OnDtnDatetimechangeDateto
)
154 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATEFROM
, OnDtnDatetimechangeDatefrom
)
155 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE
, &CLogDlg::OnCbnSelchangeJumpType
)
156 ON_COMMAND(IDC_LOG_JUMPUP
, &CLogDlg::OnBnClickedJumpUp
)
157 ON_COMMAND(IDC_LOG_JUMPDOWN
, &CLogDlg::OnBnClickedJumpDown
)
158 ON_COMMAND(ID_GO_UP
, &CLogDlg::OnBnClickedJumpUp
)
159 ON_COMMAND(ID_GO_DOWN
, &CLogDlg::OnBnClickedJumpDown
)
160 ON_BN_CLICKED(IDC_WALKBEHAVIOUR
, OnBnClickedWalkBehaviour
)
161 ON_BN_CLICKED(IDC_VIEW
, OnBnClickedView
)
162 ON_BN_CLICKED(IDC_SHOWWHOLEPROJECT
, OnBnClickShowWholeProject
)
163 ON_NOTIFY(LVN_COLUMNCLICK
,IDC_LOGLIST
, OnLvnColumnclick
)
164 ON_COMMAND(MSG_FETCHED_DIFF
, OnBnClickedHidepaths
)
165 ON_BN_CLICKED(IDC_LOG_ALLBRANCH
, OnBnClickedAllBranch
)
167 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATEFROM
, &CLogDlg::OnDtnDropdownDatefrom
)
168 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATETO
, &CLogDlg::OnDtnDropdownDateto
)
170 ON_BN_CLICKED(IDC_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
171 ON_STN_CLICKED(IDC_STATIC_REF
, &CLogDlg::OnBnClickedBrowseRef
)
172 ON_COMMAND(ID_LOGDLG_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
173 ON_COMMAND(ID_GO_BACKWARD_SELECT
, &CLogDlg::GoBackAndSelect
)
174 ON_COMMAND(ID_GO_FORWARD_SELECT
, &CLogDlg::GoForwardAndSelect
)
175 ON_COMMAND(ID_GO_BACKWARD
, &CLogDlg::GoBack
)
176 ON_COMMAND(ID_GO_FORWARD
, &CLogDlg::GoForward
)
177 ON_COMMAND(ID_LOGDLG_FIND
, &CLogDlg::OnFind
)
178 ON_COMMAND(ID_LOGDLG_FOCUSFILTER
, &CLogDlg::OnFocusFilter
)
179 ON_COMMAND(ID_EDIT_COPY
, &CLogDlg::OnEditCopy
)
180 ON_MESSAGE(MSG_REFLOG_CHANGED
, OnRefLogChanged
)
181 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
183 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED
, &CLogDlg::OnFileListCtrlItemChanged
)
191 JumpType_AuthorEmail
,
192 JumpType_CommitterEmail
,
203 void CLogDlg::SetParams(const CTGitPath
& orgPath
, const CTGitPath
& path
, CString hightlightRevision
, CString range
, int limit
)
207 m_hightlightRevision
= hightlightRevision
;
209 if (!(range
.IsEmpty() || range
== _T("HEAD")))
210 m_bAllBranch
= BST_UNCHECKED
;
215 if (::IsWindow(m_hWnd
))
219 void CLogDlg::SetFilter(const CString
& findstr
, LONG findtype
, bool findregex
)
221 m_LogList
.m_sFilterText
= findstr
;
223 m_LogList
.m_SelectedFilters
= findtype
;
224 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
= findregex
;
227 BOOL
CLogDlg::OnInitDialog()
230 CResizableStandAloneDialog::OnInitDialog();
231 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
233 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
234 // do this, Explorer would be unable to send that message to our window if we
235 // were running elevated. It's OK to make the call all the time, since if we're
236 // not elevated, this is a no-op.
237 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
238 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
239 CAutoLibrary hUser
= AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
242 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
243 if (pfnChangeWindowMessageFilterEx
)
245 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
248 m_pTaskbarList
.Release();
249 if (FAILED(m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
)))
250 m_pTaskbarList
= nullptr;
252 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG
));
254 // use the state of the "stop on copy/rename" option from the last time
257 // set the font to use in the log message view, configured in the settings dialog
258 CAppUtils::CreateFontForLogs(m_logFont
);
259 GetDlgItem(IDC_MSGVIEW
)->SetFont(&m_logFont
);
260 // automatically detect URLs in the log message and turn them into links
261 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_AUTOURLDETECT
, TRUE
, NULL
);
262 // make the log message rich edit control send a message when the mouse pointer is over a link
263 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_SETEVENTMASK
, NULL
, ENM_LINK
);
265 // "unrelated paths" should be in gray color
268 // set up the columns
269 m_LogList
.DeleteAllItems();
271 m_LogList
.m_Path
=m_path
;
272 m_LogList
.m_hasWC
= m_LogList
.m_bShowWC
= !g_GitAdminDir
.IsBareRepo(g_Git
.m_CurrentDir
);
273 m_LogList
.InsertGitColumn();
276 m_LogList
.m_Path
.Reset();
278 m_ChangedFileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("LogDlg"), (GITSLC_POPALL
^ (GITSLC_POPIGNORE
|GITSLC_POPRESTORE
)), false, m_LogList
.m_hasWC
, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
280 GetDlgItem(IDC_LOGLIST
)->UpdateData(FALSE
);
284 m_tooltips
.Create(this);
285 CheckRegexpTooltip();
289 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
290 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
);
291 m_cFilter
.SetInfoIcon(IDI_LOGFILTER
);
292 m_cFilter
.SetValidator(this);
294 AdjustControlSize(IDC_LOG_ALLBRANCH
);
295 AdjustControlSize(IDC_SHOWWHOLEPROJECT
);
297 GetClientRect(m_DlgOrigRect
);
298 m_LogList
.GetClientRect(m_LogListOrigRect
);
299 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(m_MsgViewOrigRect
);
300 m_ChangedFileListCtrl
.GetClientRect(m_ChgOrigRect
);
302 m_DateFrom
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
303 m_DateTo
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
305 m_staticRef
.SetURL(CString());
308 AddAnchor(IDC_STATIC_REF
, TOP_LEFT
);
309 //AddAnchor(IDC_BUTTON_BROWSE_REF, TOP_LEFT);
310 AddAnchor(IDC_FROMLABEL
, TOP_LEFT
);
311 AddAnchor(IDC_DATEFROM
, TOP_LEFT
);
312 AddAnchor(IDC_TOLABEL
, TOP_LEFT
);
313 AddAnchor(IDC_DATETO
, TOP_LEFT
);
316 AddAnchor(IDC_SEARCHEDIT
, TOP_LEFT
, TOP_RIGHT
);
317 AddAnchor(IDC_LOG_JUMPTYPE
, TOP_RIGHT
);
318 AddAnchor(IDC_LOG_JUMPUP
, TOP_RIGHT
);
319 AddAnchor(IDC_LOG_JUMPDOWN
, TOP_RIGHT
);
321 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
322 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
323 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
324 AddAnchor(IDC_PIC_AUTHOR
, TOP_RIGHT
);
325 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
326 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
328 AddAnchor(IDC_LOGINFO
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
329 AddAnchor(IDC_WALKBEHAVIOUR
, BOTTOM_LEFT
);
330 AddAnchor(IDC_VIEW
, BOTTOM_LEFT
);
331 AddAnchor(IDC_LOG_ALLBRANCH
,BOTTOM_LEFT
);
332 AddAnchor(IDC_SHOWWHOLEPROJECT
, BOTTOM_LEFT
);
333 AddAnchor(IDC_REFRESH
, BOTTOM_LEFT
);
334 AddAnchor(IDC_STATBUTTON
, BOTTOM_RIGHT
);
335 AddAnchor(IDC_PROGRESS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
336 AddAnchor(IDOK
, BOTTOM_RIGHT
);
337 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
338 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
340 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_LOCAL_BRANCHES
;
341 if (m_bAllBranch
== BST_CHECKED
)
342 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
343 else if (m_bAllBranch
== BST_INDETERMINATE
)
344 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
346 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_ALL_BRANCH
;
348 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
349 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
350 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
352 // SetPromptParentWindow(m_hWnd);
353 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL
)));
354 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL
)));
355 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT
)));
356 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1
)));
357 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2
)));
358 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG
)));
359 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF
)));
360 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH
)));
361 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH_FF
)));
362 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_SELECTION_HISTORY
)));
363 m_JumpType
.SetCurSel(0);
364 m_JumpUp
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
365 m_JumpDown
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
368 CenterWindow(CWnd::FromHandle(hWndExplorer
));
369 EnableSaveRestore(_T("LogDlg"));
371 DWORD yPos1
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
372 DWORD yPos2
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
373 RECT rcDlg
, rcLogList
, rcChgMsg
;
374 GetClientRect(&rcDlg
);
375 m_LogList
.GetWindowRect(&rcLogList
);
376 ScreenToClient(&rcLogList
);
377 m_ChangedFileListCtrl
.GetWindowRect(&rcChgMsg
);
378 ScreenToClient(&rcChgMsg
);
382 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
383 ScreenToClient(&rectSplitter
);
384 int delta
= yPos1
- rectSplitter
.top
;
386 if ((rcLogList
.bottom
+ delta
> rcLogList
.top
)&&(rcLogList
.bottom
+ delta
< rcChgMsg
.bottom
- 30))
388 m_wndSplitter1
.SetWindowPos(NULL
, rectSplitter
.left
, yPos1
, 0, 0, SWP_NOSIZE
);
395 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
396 ScreenToClient(&rectSplitter
);
397 int delta
= yPos2
- rectSplitter
.top
;
399 if ((rcChgMsg
.top
+ delta
< rcChgMsg
.bottom
)&&(rcChgMsg
.top
+ delta
> rcLogList
.top
+ 30))
401 m_wndSplitter2
.SetWindowPos(NULL
, rectSplitter
.left
, yPos2
, 0, 0, SWP_NOSIZE
);
410 // the dialog is used to select revisions
411 // enable the OK button if appropriate
416 // the dialog is used to just view log messages
417 // hide the OK button and set text on Cancel button to OK
418 GetDlgItemText(IDOK
, temp
);
419 SetDlgItemText(IDCANCEL
, temp
);
420 GetDlgItem(IDOK
)->ShowWindow(SW_HIDE
);
423 // first start a thread to obtain the log messages without
424 // blocking the dialog
426 //m_tFrom = (DWORD)-1;
428 // scroll to user selected or current revision
429 if (!m_hightlightRevision
.IsEmpty() && m_hightlightRevision
.GetLength() >= GIT_HASH_SIZE
)
430 m_LogList
.m_lastSelectedHash
= m_hightlightRevision
;
433 if (g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, _T("HEAD")))
434 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
437 if (g_Git
.GetConfigValueBool(_T("tgit.logshowpatch")))
440 m_LogList
.FetchLogAsync(this);
444 GetDlgItem(IDC_LOGLIST
)->SetFocus();
446 m_History
.SetMaxHistoryItems((LONG
)CRegDWORD(_T("Software\\TortoiseGit\\MaxRefHistoryItems"), 5));
448 reg
.Format(_T("Software\\TortoiseGit\\History\\log-refs\\%s"), g_Git
.m_CurrentDir
);
449 reg
.Replace(_T(':'),_T('_'));
450 m_History
.Load(reg
, _T("ref"));
456 LRESULT
CLogDlg::OnLogListLoading(WPARAM wParam
, LPARAM
/*lParam*/)
460 if( cur
== GITLOG_START
)
463 temp
.LoadString(IDS_PROGRESSWAIT
);
465 this->m_LogList
.ShowText(temp
, true);
467 // We use a progress bar while getting the logs
468 m_LogProgress
.SetRange32(0, 100);
469 m_LogProgress
.SetPos(0);
472 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
473 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
476 GetDlgItem(IDC_PROGRESS
)->ShowWindow(TRUE
);
478 DialogEnableWindow(IDC_WALKBEHAVIOUR
, FALSE
);
479 DialogEnableWindow(IDC_STATBUTTON
, FALSE
);
480 //DialogEnableWindow(IDC_REFRESH, FALSE);
481 DialogEnableWindow(IDC_VIEW
, FALSE
);
484 else if( cur
== GITLOG_END
)
486 if(this->m_LogList
.HasText())
488 this->m_LogList
.ClearText();
490 UpdateLogInfoLabel();
493 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
495 DialogEnableWindow(IDC_SHOWWHOLEPROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
497 DialogEnableWindow(IDC_STATBUTTON
, !(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
));
498 DialogEnableWindow(IDC_REFRESH
, TRUE
);
499 DialogEnableWindow(IDC_VIEW
, TRUE
);
500 DialogEnableWindow(IDC_WALKBEHAVIOUR
, TRUE
);
501 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
502 GetDlgItem(IDC_PROGRESS
)->ShowWindow(FALSE
);
503 //CTime time=m_LogList.GetOldestTime();
505 m_LogList
.GetTimeRange(begin
,end
);
507 if(m_LogList
.m_From
== -1)
508 m_DateFrom
.SetTime(&begin
);
510 if(m_LogList
.m_To
== -1)
511 m_DateTo
.SetTime(&end
);
517 if(this->m_LogList
.HasText())
519 this->m_LogList
.ClearText();
520 this->m_LogList
.Invalidate();
522 UpdateLogInfoLabel();
523 m_LogProgress
.SetPos(cur
);
526 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
527 m_pTaskbarList
->SetProgressValue(m_hWnd
, cur
, 100);
532 void CLogDlg::SetDlgTitle()
534 if (m_sTitle
.IsEmpty())
535 GetWindowText(m_sTitle
);
537 if (m_LogList
.m_Path
.IsEmpty() || m_orgPath
.GetWinPathString().IsEmpty())
539 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
542 CAppUtils::SetWindowTitle(m_hWnd
, m_orgPath
.GetWinPathString(), m_sTitle
);
545 void CLogDlg::CheckRegexpTooltip()
547 CWnd
*pWnd
= GetDlgItem(IDC_SEARCHEDIT
);
548 // Since tooltip describes regexp features, show it only if regexps are enabled.
549 if (m_bFilterWithRegex
)
551 m_tooltips
.AddTool(pWnd
, IDS_LOG_FILTER_REGEX_TT
);
554 m_tooltips
.DelTool(pWnd
);
557 void CLogDlg::EnableOKButton()
561 // the dialog is used to select revisions
562 if (m_bSelectionMustBeSingle
)
564 // enable OK button if only a single revision is selected
565 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()==1));
567 else if (m_bSelectionMustBeContinuous
)
568 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()!=0)&&(m_LogList
.IsSelectionContinuous()));
570 DialogEnableWindow(IDOK
, m_LogList
.GetSelectedCount()!=0);
573 DialogEnableWindow(IDOK
, TRUE
);
576 bool LookLikeGitHash(const CString
& msg
, int &pos
)
579 for (; pos
< msg
.GetLength(); ++pos
)
581 if (msg
[pos
] >= '0' && msg
[pos
] <= '9' || msg
[pos
] >= 'a' && msg
[pos
] <= 'f')
587 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2;
590 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2;
593 std::vector
<CHARRANGE
> FindGitHashPositions(const CString
& msg
, int offset
)
595 std::vector
<CHARRANGE
> result
;
596 offset
= offset
< 0 ? 0 : offset
;
598 while (offset
< msg
.GetLength())
601 TCHAR e
= msg
[offset
];
605 if (msg
.Mid(offset
, 11) == _T("git-svn-id:")
606 || msg
.Mid(offset
, 14) == _T("Signed-off-by:")
607 || msg
.Mid(offset
, 10) == _T("Change-Id:")
611 while (offset
< msg
.GetLength())
613 if (msg
[offset
++] == '\n')
619 else if (e
>= 'A' && e
<= 'Z' || e
>= 'h' && e
<= 'z')
624 } while (offset
< msg
.GetLength() && (e
>= 'A' && e
<= 'Z' || e
>= 'a' && e
<= 'z' || e
>= '0' && e
<= '9'));
626 else if (e
>= 'a' && e
<= 'g' || e
>= '0' && e
<= '9')
633 if (LookLikeGitHash(msg
, offset
))
635 TCHAR d
= offset
< msg
.GetLength() ? msg
[offset
] : '\0';
636 if (!((d
>= 'A' && d
<= 'Z') || (d
>= 'a' && d
<= 'z') || (d
>= '0' && d
<= '9')))
638 CHARRANGE range
= { old
, offset
};
639 result
.push_back(range
);
653 BOOL
FindGitHash(const CString
& msg
, int offset
, CWnd
*pWnd
)
655 std::vector
<CHARRANGE
> positions
= FindGitHashPositions(msg
, offset
);
656 CAppUtils::SetCharFormat(pWnd
, CFM_LINK
, CFE_LINK
, positions
);
658 return positions
.empty() ? FALSE
: TRUE
;
661 void CLogDlg::FillLogMessageCtrl(bool bShow
/* = true*/)
663 // we fill here the log message rich edit control,
664 // and also populate the changed files list control
665 // according to the selected revision(s).
667 CRichEditCtrl
* pMsgView
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
668 // empty the log message view
669 pMsgView
->SetWindowText(_T(" "));
671 // empty the changed files list
672 m_ChangedFileListCtrl
.SetRedraw(FALSE
);
673 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
674 m_currentChangedArray
= NULL
;
675 m_ChangedFileListCtrl
.DeleteAllItems();
677 // if we're not here to really show a selected revision, just
678 // get out of here after clearing the views, which is what is intended
679 // if that flag is not set.
683 m_ChangedFileListCtrl
.Invalidate();
684 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
685 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
686 m_gravatar
.LoadGravatar();
690 // depending on how many revisions are selected, we have to do different
692 int selCount
= m_LogList
.GetSelectedCount();
695 // if nothing is selected, we have nothing more to do
696 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
697 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
698 m_gravatar
.LoadGravatar();
701 else if (selCount
== 1)
703 // if one revision is selected, we have to fill the log message view
704 // with the corresponding log message, and also fill the changed files
706 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
707 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
708 if (selIndex
>= m_LogList
.m_arShownList
.GetCount())
710 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
711 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
714 Locker
lock(m_LogList
.m_critSec_AsyncDiff
);
715 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
718 // set the log message text
719 pMsgView
->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH
)) + _T(": ") + pLogEntry
->m_CommitHash
.ToString() + _T("\r\n\r\n"));
720 // turn bug ID's into links if the bugtraq: properties have been set
721 // and we can find a match of those in the log message
723 pMsgView
->SetSel(-1,-1);
725 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
726 format
.cbSize
= sizeof(CHARFORMAT2
);
727 format
.dwMask
= CFM_BOLD
;
728 format
.dwEffects
= CFE_BOLD
;
729 pMsgView
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
731 CString msg
=_T("* ");
732 msg
+=pLogEntry
->GetSubject();
733 pMsgView
->ReplaceSel(msg
);
735 pMsgView
->SetSel(-1,-1);
736 format
.dwEffects
= 0;
737 pMsgView
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
740 msg
+=pLogEntry
->GetBody();
742 if(!pLogEntry
->m_Notes
.IsEmpty())
744 msg
+= _T("\n*") + CString(MAKEINTRESOURCE(IDS_NOTES
)) + _T("* ");
745 msg
+= pLogEntry
->m_Notes
;
749 CString tagInfo
= m_LogList
.GetTagInfo(pLogEntry
);
750 if(!tagInfo
.IsEmpty())
751 tagInfo
= _T("\n*") + CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO
)) + _T("*\n\n") + tagInfo
;
754 pMsgView
->ReplaceSel(msg
);
757 pMsgView
->GetWindowText(text
);
758 // the rich edit control doesn't count the CR char!
759 // to be exact: CRLF is treated as one char.
762 FindGitHash(text
, text
.Find('\n'), pMsgView
);
763 m_LogList
.m_ProjectProperties
.FindBugID(text
, pMsgView
);
764 if (((DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\StyleCommitMessages"), TRUE
)) == TRUE
)
765 CAppUtils::FormatTextInRichEditControl(pMsgView
);
770 pMsgView
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
772 CString matchpath
=this->m_path
.GetGitPathString();
774 int count
= pLogEntry
->GetFiles(&m_LogList
).GetCount();
775 for (int i
= 0 ; i
< count
&& (!matchpath
.IsEmpty()); ++i
)
777 if( m_bWholeProject
)
780 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
|CTGitPath::LOGACTIONS_GRAY
);
782 if(pLogEntry
->GetFiles(&m_LogList
)[i
].GetGitPathString().Left(matchpath
.GetLength()) != matchpath
&& pLogEntry
->GetFiles(&m_LogList
)[i
].GetGitOldPathString().Left(matchpath
.GetLength()) != matchpath
)
784 if (m_iHidePaths
== 1)
785 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
786 else if (m_iHidePaths
== 2)
787 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
|= CTGitPath::LOGACTIONS_GRAY
;
791 m_ChangedFileListCtrl
.UpdateWithGitPathList(pLogEntry
->GetFiles(&m_LogList
));
792 m_ChangedFileListCtrl
.m_CurrentVersion
=pLogEntry
->m_CommitHash
;
793 if (pLogEntry
->m_CommitHash
.IsEmpty() && m_bShowUnversioned
)
795 m_ChangedFileListCtrl
.UpdateUnRevFileList(pLogEntry
->GetUnRevFiles());
796 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
| GITSLC_SHOWUNVERSIONED
);
799 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
801 m_ChangedFileListCtrl
.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES
)));
803 if(!pLogEntry
->m_IsDiffFiles
)
804 m_ChangedFileListCtrl
.SetBusy(TRUE
);
806 m_ChangedFileListCtrl
.SetBusy(FALSE
);
808 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
809 m_gravatar
.LoadGravatar(pLogEntry
->GetAuthorEmail());
816 // more than one revision is selected:
817 // the log message view must be emptied
818 // the changed files list contains all the changed paths from all
819 // selected revisions, with 'doubles' removed
820 m_currentChangedPathList
= GetChangedPathsFromSelectedRevisions(true);
821 m_gravatar
.LoadGravatar();
825 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
827 if (m_currentChangedArray
)
829 m_ChangedFileListCtrl
.SetItemCountEx(m_currentChangedArray
->GetCount());
830 m_ChangedFileListCtrl
.RedrawItems(0, m_currentChangedArray
->GetCount());
832 else if (m_currentChangedPathList
.GetCount())
834 m_ChangedFileListCtrl
.SetItemCountEx(m_currentChangedPathList
.GetCount());
835 m_ChangedFileListCtrl
.RedrawItems(0, m_currentChangedPathList
.GetCount());
839 m_ChangedFileListCtrl
.SetItemCountEx(0);
840 m_ChangedFileListCtrl
.Invalidate();
843 // sort according to the settings
844 if (m_nSortColumnPathList
> 0)
845 SetSortArrow(&m_ChangedFileListCtrl
, m_nSortColumnPathList
, m_bAscendingPathList
);
847 SetSortArrow(&m_ChangedFileListCtrl
, -1, false);
848 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
852 void CLogDlg::FillPatchView(bool onlySetTimer
)
854 if (!::IsWindow(this->m_patchViewdlg
.m_hWnd
))
857 KillTimer(LOG_FILLPATCHVTIMER
);
860 SetTimer(LOG_FILLPATCHVTIMER
, 100, nullptr);
864 POSITION posLogList
= m_LogList
.GetFirstSelectedItemPosition();
865 if (posLogList
== nullptr)
867 m_patchViewdlg
.ClearView();
868 return; // nothing is selected, get out of here
871 GitRev
* pLogEntry
= reinterpret_cast<GitRev
* >(m_LogList
.m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(posLogList
)));
872 if (pLogEntry
== nullptr || m_LogList
.GetNextSelectedItem(posLogList
) != -1)
874 m_patchViewdlg
.ClearView();
878 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
884 if (CAppUtils::GetMsysgitVersion() > 0x01080100)
885 diffContext
= g_Git
.GetConfigValueInt32(_T("diff.context"), -1);
887 g_Git
.GetUnifiedDiff(CTGitPath(), pLogEntry
->m_CommitHash
.ToString() + _T("~1"), pLogEntry
->m_CommitHash
.ToString(), &outA
, false, false, diffContext
);
888 out
= CUnicodeUtils::GetUnicode(outA
);
894 int nSelect
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
895 CTGitPath
* p
= (CTGitPath
*)m_ChangedFileListCtrl
.GetItemData(nSelect
);
896 if (p
&& !(p
->m_Action
&CTGitPath::LOGACTIONS_UNVER
))
899 if (pLogEntry
->m_CommitHash
.IsEmpty())
900 cmd
.Format(_T("git.exe diff HEAD -- \"%s\""), p
->GetGitPathString());
902 cmd
.Format(_T("git.exe diff %s^%d..%s -- \"%s\""), pLogEntry
->m_CommitHash
.ToString(), p
->m_ParentNo
+ 1, pLogEntry
->m_CommitHash
.ToString(), p
->GetGitPathString());
903 g_Git
.Run(cmd
, &out
, CP_UTF8
);
908 m_patchViewdlg
.SetText(out
);
911 void CLogDlg::TogglePatchView()
913 m_patchViewdlg
.m_pProjectProperties
= &m_LogList
.m_ProjectProperties
;
914 m_patchViewdlg
.m_ParentDlg
= this;
915 if (!IsWindow(m_patchViewdlg
.m_hWnd
))
917 BOOL viewPatchEnabled
= FALSE
;
918 viewPatchEnabled
= g_Git
.GetConfigValueBool(_T("tgit.logshowpatch"));
919 if (viewPatchEnabled
== FALSE
)
920 g_Git
.SetConfigValue(_T("tgit.logshowpatch"), _T("true"));
921 m_patchViewdlg
.Create(IDD_PATCH_VIEW
, this);
922 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTHTRACKING
, TRUE
);
924 this->GetWindowRect(&rect
);
926 m_patchViewdlg
.ShowWindow(SW_SHOW
);
927 m_patchViewdlg
.SetWindowPos(nullptr, rect
.right
, rect
.top
, rect
.Width(), rect
.Height(), SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOZORDER
);
933 g_Git
.SetConfigValue(_T("tgit.logshowpatch"), _T("false"));
934 m_patchViewdlg
.ShowWindow(SW_HIDE
);
935 m_patchViewdlg
.DestroyWindow();
939 LRESULT
CLogDlg::OnFileListCtrlItemChanged(WPARAM
/*wparam*/, LPARAM
/*lparam*/)
945 void CLogDlg::OnMoving(UINT fwSide
, LPRECT pRect
)
947 __super::OnMoving(fwSide
, pRect
);
949 if (!::IsWindow(m_patchViewdlg
.m_hWnd
))
953 m_patchViewdlg
.GetWindowRect(&patchrect
);
954 if (!::IsWindow(m_hWnd
))
958 GetWindowRect(&thisrect
);
959 if (patchrect
.left
== thisrect
.right
)
961 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
);
965 void CLogDlg::OnSizing(UINT fwSide
, LPRECT pRect
)
967 __super::OnSizing(fwSide
, pRect
);
969 if (!::IsWindow(this->m_patchViewdlg
.m_hWnd
))
972 CRect thisrect
, patchrect
;
973 this->GetWindowRect(thisrect
);
974 this->m_patchViewdlg
.GetWindowRect(patchrect
);
975 if (thisrect
.right
!= patchrect
.left
)
978 patchrect
.left
-= (thisrect
.right
- pRect
->right
);
979 patchrect
.right
-= (thisrect
.right
- pRect
->right
);
981 if (patchrect
.bottom
== thisrect
.bottom
)
982 patchrect
.bottom
-= (thisrect
.bottom
- pRect
->bottom
);
983 if (patchrect
.top
== thisrect
.top
)
984 patchrect
.top
-= thisrect
.top
- pRect
->top
;
985 m_patchViewdlg
.MoveWindow(patchrect
);
988 void CLogDlg::GoBack()
990 GoBackForward(false, false);
993 void CLogDlg::GoForward()
995 GoBackForward(false, true);
998 void CLogDlg::GoBackAndSelect()
1000 GoBackForward(true, false);
1003 void CLogDlg::GoForwardAndSelect()
1005 GoBackForward(true, true);
1008 void CLogDlg::GoBackForward(bool select
, bool bForward
)
1010 m_LogList
.m_highlight
.Empty();
1012 if (bForward
? m_LogList
.m_selectionHistory
.GoForward(gotoHash
) : m_LogList
.m_selectionHistory
.GoBack(gotoHash
))
1015 for (i
= 0; i
< m_LogList
.m_arShownList
.GetCount(); ++i
)
1017 GitRev
*rev
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1019 if (rev
->m_CommitHash
== gotoHash
)
1021 m_LogList
.EnsureVisible(i
, FALSE
);
1024 m_LogList
.m_highlight
.Empty();
1025 m_LogList
.SetItemState(m_LogList
.GetSelectionMark(), 0, LVIS_SELECTED
);
1026 m_bNavigatingWithSelect
= true;
1027 m_LogList
.SetItemState(i
, LVIS_SELECTED
| LVIS_FOCUSED
, LVIS_SELECTED
| LVIS_FOCUSED
);
1028 m_LogList
.SetSelectionMark(i
);
1029 m_bNavigatingWithSelect
= false;
1032 m_LogList
.m_highlight
= gotoHash
;
1033 m_LogList
.Invalidate();
1037 if (i
== m_LogList
.m_arShownList
.GetCount())
1040 msg
.Format(IDS_LOG_NOT_VISIBLE
, gotoHash
.ToString());
1041 MessageBox(msg
, _T("TortoiseGit"), MB_OK
| MB_ICONINFORMATION
);
1045 PlaySound((LPCTSTR
)SND_ALIAS_SYSTEMASTERISK
, nullptr, SND_ASYNC
| SND_ALIAS_ID
);
1048 void CLogDlg::OnBnClickedRefresh()
1053 void CLogDlg::Refresh (bool clearfilter
/*autoGoOnline*/)
1056 m_LogList
.Refresh(clearfilter
);
1059 FillLogMessageCtrl(false);
1064 BOOL
CLogDlg::Cancel()
1066 return m_bCancelled
;
1069 void CLogDlg::SaveSplitterPos()
1073 CRegDWORD
regPos1(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
1074 CRegDWORD
regPos2(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
1076 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
1077 ScreenToClient(&rectSplitter
);
1078 regPos1
= rectSplitter
.top
;
1079 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
1080 ScreenToClient(&rectSplitter
);
1081 regPos2
= rectSplitter
.top
;
1085 void CLogDlg::OnCancel()
1087 this->ShowWindow(SW_HIDE
);
1089 // canceling means stopping the working thread if it's still running.
1090 m_LogList
.SafeTerminateAsyncDiffThread();
1091 if (this->IsThreadRunning())
1093 m_LogList
.SafeTerminateThread();
1098 __super::OnCancel();
1101 void CLogDlg::CopyChangedSelectionToClipBoard()
1104 POSITION posLogList
= m_LogList
.GetFirstSelectedItemPosition();
1105 if (posLogList
== nullptr)
1106 return; // nothing is selected, get out of here
1110 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1113 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1116 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1117 CTGitPath
*path
= (CTGitPath
*)m_ChangedFileListCtrl
.GetItemData(nItem
);
1119 sPaths
+= path
->GetGitPathString();
1120 sPaths
+= _T("\r\n");
1126 // only one revision is selected in the log dialog top pane
1127 // but multiple items could be selected in the changed items list
1128 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1131 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1132 LogChangedPath
* changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(nItem
);
1134 if ((m_cHidePaths
.GetState() & 0x0003)==BST_CHECKED
)
1136 // some items are hidden! So find out which item the user really selected
1137 INT_PTR selRealIndex
= -1;
1138 for (INT_PTR hiddenindex
=0; hiddenindex
<pLogEntry
->pArChangedPaths
->GetCount(); ++hiddenindex
)
1140 if (pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
)->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0)
1142 if (selRealIndex
== nItem
)
1144 changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
);
1151 sPaths
+= changedlogpath
->sPath
;
1152 sPaths
+= _T("\r\n");
1158 CStringUtils::WriteAsciiStringToClipboard(sPaths
, GetSafeHwnd());
1162 void CLogDlg::OnContextMenu(CWnd
* pWnd
, CPoint point
)
1164 // we have three separate context menus:
1165 // one for the branch label in the upper left
1166 // one shown on the log message list control,
1167 // one shown in the changed-files list control
1168 if (pWnd
== GetDlgItem(IDC_STATIC_REF
))
1171 if (!popup
.CreatePopupMenu())
1175 popup
.AppendMenuIcon(++cnt
, IDS_MENUREFBROWSE
);
1176 popup
.SetDefaultItem(cnt
);
1177 popup
.AppendMenuIcon(++cnt
, _T("HEAD"));
1178 popup
.AppendMenuIcon(++cnt
, IDS_ALL
);
1179 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1180 popup
.AppendMenuIcon(++cnt
, IDS_PROC_LOG_SELECT_LOCAL_BRANCHES
);
1181 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1183 if (m_History
.GetCount() > 0)
1185 popup
.AppendMenu(MF_SEPARATOR
, 0);
1186 for (size_t i
= 0; i
< m_History
.GetCount(); ++i
)
1188 CString entry
= m_History
.GetEntry(i
);
1189 if (entry
.GetLength() > 150)
1190 entry
= entry
.Left(150) + _T("...");
1191 popup
.AppendMenuIcon(cnt
++, entry
);
1195 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1200 OnBnClickedBrowseRef();
1204 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
);
1205 m_bAllBranch
= BST_UNCHECKED
;
1208 SetRange(g_Git
.GetCurrentBranch(true));
1212 m_bAllBranch
= BST_CHECKED
;
1213 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_ALL_BRANCH
;
1217 m_bAllBranch
= BST_INDETERMINATE
;
1218 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
1220 else if (cmd
>= offset
)
1222 SetRange(m_History
.GetEntry(cmd
- offset
));
1223 m_History
.AddEntry(m_LogList
.m_sRange
);
1230 FillLogMessageCtrl(false);
1234 int selCount
= m_LogList
.GetSelectedCount();
1235 if ((selCount
== 1)&&(pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1237 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1240 selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1242 GitRev
*pRev
= ((GitRev
*)m_LogList
.m_arShownList
[selIndex
]);
1244 if ((point
.x
== -1) && (point
.y
== -1))
1247 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(&rect
);
1248 ClientToScreen(&rect
);
1249 point
= rect
.CenterPoint();
1251 CString sMenuItemText
;
1253 if (popup
.CreatePopupMenu())
1255 long start
= -1, end
= -1;
1256 auto pEdit
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
1257 pEdit
->GetSel(start
, end
);
1258 // add the 'default' entries
1259 popup
.AppendMenuIcon(WM_COPY
, IDS_SCIEDIT_COPY
, IDI_COPYCLIP
);
1261 popup
.EnableMenuItem(WM_COPY
, MF_BYCOMMAND
| MF_DISABLED
| MF_GRAYED
);
1262 popup
.AppendMenu(MF_SEPARATOR
);
1263 sMenuItemText
.LoadString(IDS_STATUSLIST_CONTEXT_COPYEXT
);
1264 popup
.AppendMenuIcon(EM_SETSEL
, sMenuItemText
, IDI_COPYCLIP
);
1265 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1266 sMenuItemText
.LoadString(IDS_EDIT_NOTES
);
1267 popup
.AppendMenuIcon( CGitLogList::ID_EDITNOTE
, sMenuItemText
, IDI_EDIT
);
1269 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1273 break; // no command selected
1276 pEdit
->SetRedraw(FALSE
);
1277 int oldLine
= pEdit
->GetFirstVisibleLine();
1278 pEdit
->SetSel(0, -1);
1280 pEdit
->SetSel(start
, end
);
1281 int newLine
= pEdit
->GetFirstVisibleLine();
1282 pEdit
->LineScroll(oldLine
- newLine
);
1283 pEdit
->SetRedraw(TRUE
);
1284 pEdit
->RedrawWindow();
1288 ::SendMessage(GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), cmd
, 0, -1);
1290 case CGitLogList::ID_EDITNOTE
:
1291 CAppUtils::EditNote(pRev
);
1292 this->FillLogMessageCtrl(true);
1299 void CLogDlg::OnOK()
1301 // since the log dialog is also used to select revisions for other
1302 // dialogs, we have to do some work before closing this dialog
1303 if (GetFocus() != GetDlgItem(IDOK
))
1304 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
1306 m_LogList
.SafeTerminateAsyncDiffThread();
1307 if (this->IsThreadRunning())
1309 m_LogList
.SafeTerminateThread();
1312 // check that one and only one row is selected
1313 if (m_LogList
.GetSelectedCount() == 1)
1315 // get the selected row
1316 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1317 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1318 if (selIndex
< m_LogList
.m_arShownList
.GetCount())
1320 // all ok, pick up the revision
1321 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
1323 m_sSelectedHash
= pLogEntry
->m_CommitHash
;
1331 if (!GetDlgItem(IDOK
)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL
))
1332 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
1336 GetDlgItemText(IDOK
, buttontext
);
1337 temp
.LoadString(IDS_MSGBOX_CANCEL
);
1338 if (temp
.Compare(buttontext
) != 0)
1339 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
1340 m_bCancelled
= TRUE
;
1341 m_selectedRevs
.Clear();
1342 m_selectedRevsOneRange
.Clear();
1343 if (m_pNotifyWindow
)
1345 int selIndex
= m_LogList
.GetSelectionMark();
1348 PLOGENTRYDATA pLogEntry
= NULL
;
1349 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1350 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1351 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1352 git_revnum_t lowerRev
= pLogEntry
->Rev
;
1353 git_revnum_t higherRev
= lowerRev
;
1356 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1357 git_revnum_t rev
= pLogEntry
->Rev
;
1358 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1361 if (higherRev
< rev
)
1364 if (m_sFilterText
.IsEmpty() && m_nSortColumn
== 0 && IsSelectionContinuous())
1366 m_selectedRevsOneRange
.AddRevRange(lowerRev
, higherRev
);
1368 BOOL bSentMessage
= FALSE
;
1369 if (m_LogList
.GetSelectedCount() == 1)
1371 // if only one revision is selected, check if the path/url with which the dialog was started
1372 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1373 // if it was copied, use the copy from revision as lowerRev
1374 if ((pLogEntry
)&&(pLogEntry
->pArChangedPaths
)&&(lowerRev
== higherRev
))
1376 CString sUrl
= m_path
.GetGitPathString();
1377 if (!m_path
.IsUrl())
1379 sUrl
= GetURLFromPath(m_path
);
1381 sUrl
= sUrl
.Mid(m_sRepositoryRoot
.GetLength());
1382 for (int cp
= 0; cp
< pLogEntry
->pArChangedPaths
->GetCount(); ++cp
)
1384 LogChangedPath
* pData
= pLogEntry
->pArChangedPaths
->SafeGetAt(cp
);
1387 if (sUrl
.Compare(pData
->sPath
) == 0)
1389 if (!pData
->sCopyFromPath
.IsEmpty())
1391 lowerRev
= pData
->lCopyFromRev
;
1392 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
), lowerRev
);
1393 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
), higherRev
);
1394 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1395 bSentMessage
= TRUE
;
1402 if ( !bSentMessage
)
1404 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
| MERGE_REVSELECTMINUSONE
), lowerRev
);
1405 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
| MERGE_REVSELECTMINUSONE
), higherRev
);
1406 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1407 if (m_selectedRevsOneRange
.GetCount())
1408 m_pNotifyWindow
->SendMessage(WM_REVLISTONERANGE
, 0, (LPARAM
)&m_selectedRevsOneRange
);
1413 CRegDWORD
reg(_T("Software\\TortoiseGit\\ShowAllEntry"));
1418 void CLogDlg::DoDiffFromLog(INT_PTR selIndex
, GitRev
* rev1
, GitRev
* rev2
, bool /*blame*/, bool /*unified*/)
1420 DialogEnableWindow(IDOK
, FALSE
);
1421 // SetPromptApp(&theApp);
1422 theApp
.DoWaitCursor(1);
1425 GetTempPath(temppath
);
1428 file1
.Format(_T("%s%s_%s%s"),
1430 (*m_currentChangedArray
)[selIndex
].GetBaseFilename(),
1431 rev1
->m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()),
1432 (*m_currentChangedArray
)[selIndex
].GetFileExtension());
1435 file2
.Format(_T("%s\\%s_%s%s"),
1437 (*m_currentChangedArray
)[selIndex
].GetBaseFilename(),
1438 rev2
->m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()),
1439 (*m_currentChangedArray
)[selIndex
].GetFileExtension());
1442 CTGitPath
&path
= (CTGitPath
&)(*m_currentChangedArray
)[selIndex
];
1444 if (g_Git
.GetOneFile(rev1
->m_CommitHash
.ToString(), path
, file1
))
1447 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, path
.GetGitPathString(), rev1
->m_CommitHash
.ToString(), file1
);
1448 CMessageBox::Show(nullptr, g_Git
.GetGitLastErr(out
, CGit::GIT_CMD_GETONEFILE
), _T("TortoiseGit"), MB_OK
);
1449 theApp
.DoWaitCursor(-1);
1453 if (g_Git
.GetOneFile(rev2
->m_CommitHash
.ToString(), path
, file2
))
1456 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, path
.GetGitPathString(), rev2
->m_CommitHash
.ToString(), file2
);
1457 CMessageBox::Show(nullptr, g_Git
.GetGitLastErr(out
, CGit::GIT_CMD_GETONEFILE
), _T("TortoiseGit"), MB_OK
);
1458 theApp
.DoWaitCursor(-1);
1463 CAppUtils::DiffFlags flags
;
1464 CAppUtils::StartExtDiff(file1
,file2
,_T("A"),_T("B"),
1465 g_Git
.CombinePath(path
), g_Git
.CombinePath(path
),
1466 rev1
->m_CommitHash
.ToString(), rev2
->m_CommitHash
.ToString(),
1469 theApp
.DoWaitCursor(-1);
1473 BOOL
CLogDlg::PreTranslateMessage(MSG
* pMsg
)
1475 // Skip Ctrl-C when copying text out of the log message or search filter
1476 bool bSkipAccelerator
= (pMsg
->message
== WM_KEYDOWN
&& (pMsg
->wParam
== 'C' || pMsg
->wParam
== VK_INSERT
) && (GetFocus() == GetDlgItem(IDC_MSGVIEW
) || GetFocus() == GetDlgItem(IDC_SEARCHEDIT
)) && GetKeyState(VK_CONTROL
) & 0x8000);
1477 if (pMsg
->message
== WM_KEYDOWN
&& pMsg
->wParam
=='\r')
1479 if (GetFocus()==GetDlgItem(IDC_LOGLIST
))
1481 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE
))
1483 m_LogList
.DiffSelectedRevWithPrevious();
1487 if (GetFocus() == GetDlgItem(IDC_SEARCHEDIT
))
1489 KillTimer(LOGFILTER_TIMER
);
1491 m_LogList
.Refresh(FALSE
);
1492 FillLogMessageCtrl(false);
1495 else if (pMsg
->message
== WM_XBUTTONUP
)
1497 bool select
= (pMsg
->wParam
& MK_SHIFT
) == 0;
1498 if (HIWORD(pMsg
->wParam
) & XBUTTON1
)
1499 GoBackForward(select
, false);
1500 if (HIWORD(pMsg
->wParam
) & XBUTTON2
)
1501 GoBackForward(select
, true);
1502 if (HIWORD(pMsg
->wParam
) & (XBUTTON1
| XBUTTON2
))
1505 if (m_hAccel
&& !bSkipAccelerator
)
1507 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1512 if(::IsWindow(m_tooltips
.m_hWnd
))
1513 m_tooltips
.RelayEvent(pMsg
);
1514 return __super::PreTranslateMessage(pMsg
);
1518 BOOL
CLogDlg::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
1520 //if (this->IsThreadRunning())
1521 if(m_LogList
.m_bNoDispUpdates
)
1523 // only show the wait cursor over the list control
1525 ((pWnd
== GetDlgItem(IDC_LOGLIST
))||
1526 (pWnd
== GetDlgItem(IDC_MSGVIEW
))||
1527 (pWnd
== GetDlgItem(IDC_LOGMSG
))))
1529 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_WAIT
));
1534 if ((pWnd
) && (pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1535 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1537 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_ARROW
));
1539 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1542 void CLogDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1544 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1546 //if (this->IsThreadRunning())
1547 if(m_LogList
.m_bNoDispUpdates
)
1549 if (pNMLV
->iItem
>= 0)
1551 if (!m_LogList
.m_highlight
.IsEmpty())
1553 m_LogList
.m_highlight
.Empty();
1554 m_LogList
.Invalidate();
1556 this->m_LogList
.m_nSearchIndex
= pNMLV
->iItem
;
1557 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(pNMLV
->iItem
));
1558 if (pLogEntry
== nullptr)
1560 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1561 if (pNMLV
->iSubItem
!= 0)
1563 if ((pNMLV
->iItem
== m_LogList
.m_arShownList
.GetCount()))
1565 // remove the selected state
1566 if (pNMLV
->uChanged
& LVIF_STATE
)
1568 m_LogList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1569 FillLogMessageCtrl();
1571 UpdateLogInfoLabel();
1575 if (pNMLV
->uChanged
& LVIF_STATE
)
1577 if ((pNMLV
->uNewState
& LVIS_SELECTED
) && !m_bNavigatingWithSelect
)
1579 m_LogList
.m_selectionHistory
.Add(m_LogList
.m_lastSelectedHash
);
1580 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1582 FillLogMessageCtrl();
1588 m_LogList
.m_lastSelectedHash
.Empty();
1589 FillLogMessageCtrl();
1593 UpdateLogInfoLabel();
1596 void CLogDlg::OnLvnItemchangedLogmsg(NMHDR
* /*pNMHDR*/, LRESULT
* /*pResult*/)
1598 UpdateLogInfoLabel();
1601 void CLogDlg::OnEnLinkMsgview(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1603 ENLINK
*pEnLink
= reinterpret_cast<ENLINK
*>(pNMHDR
);
1604 if (pEnLink
->msg
== WM_LBUTTONUP
)
1607 GetDlgItemText(IDC_MSGVIEW
, msg
);
1608 msg
.Replace(_T("\r\n"), _T("\n"));
1609 url
= msg
.Mid(pEnLink
->chrg
.cpMin
, pEnLink
->chrg
.cpMax
-pEnLink
->chrg
.cpMin
);
1610 auto findResult
= m_LogList
.m_ProjectProperties
.FindBugIDPositions(msg
);
1611 if (std::find_if(findResult
.begin(), findResult
.end(),
1612 [=] (const CHARRANGE
&cr
) -> bool { return cr
.cpMin
== pEnLink
->chrg
.cpMin
&& cr
.cpMax
== pEnLink
->chrg
.cpMax
; }
1613 ) != findResult
.end())
1615 url
= m_LogList
.m_ProjectProperties
.GetBugIDUrl(url
);
1616 url
= GetAbsoluteUrlFromRelativeUrl(url
);
1618 if (::PathIsURL(url
))
1619 ShellExecute(this->m_hWnd
, _T("open"), url
, NULL
, NULL
, SW_SHOWDEFAULT
);
1623 if (LookLikeGitHash(url
, pos
))
1626 for (int i
= 0; i
< m_LogList
.m_arShownList
.GetCount(); ++i
)
1628 GitRev
*rev
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1630 if (rev
->m_CommitHash
.ToString().Left(url
.GetLength()) == url
)
1632 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1635 int index
= m_LogList
.GetNextSelectedItem(pos
);
1637 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1639 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
1640 m_LogList
.EnsureVisible(i
, FALSE
);
1641 m_LogList
.SetSelectionMark(i
);
1643 PostMessage(WM_TGIT_REFRESH_SELECTION
, 0, 0);
1649 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
1656 void CLogDlg::OnBnClickedStatbutton()
1658 if (this->IsThreadRunning())
1660 if (m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
)
1661 return; // nothing or just the working copy changes are shown, so no statistics.
1662 // the statistics dialog expects the log entries to be sorted by date
1663 SortByColumn(3, false);
1666 m_LogList
.RecalculateShownList(&dlg
.m_ShowList
);
1668 dlg
.m_path
= m_orgPath
;
1670 // restore the previous sorting
1671 SortByColumn(m_nSortColumn
, m_bAscending
);
1672 OnTimer(LOGFILTER_TIMER
);
1675 void CLogDlg::MoveToSameTop(CWnd
*pWndRef
, CWnd
*pWndTarget
)
1677 CRect rcWndPicAuthor
, rcWndMsgView
;
1678 pWndRef
->GetWindowRect(rcWndMsgView
);
1679 ScreenToClient(rcWndMsgView
);
1680 pWndTarget
->GetWindowRect(rcWndPicAuthor
);
1681 ScreenToClient(rcWndPicAuthor
);
1682 int diff
= rcWndMsgView
.top
- rcWndPicAuthor
.top
;
1683 rcWndPicAuthor
.top
+= diff
;
1684 rcWndPicAuthor
.bottom
+= diff
;
1685 pWndTarget
->MoveWindow(rcWndPicAuthor
);
1688 void CLogDlg::DoSizeV1(int delta
)
1691 RemoveAnchor(IDC_LOGLIST
);
1692 RemoveAnchor(IDC_SPLITTERTOP
);
1693 RemoveAnchor(IDC_MSGVIEW
);
1694 RemoveAnchor(IDC_PIC_AUTHOR
);
1695 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1696 RemoveAnchor(IDC_LOGMSG
);
1697 CSplitterControl::ChangeHeight(&m_LogList
, delta
, CW_TOPALIGN
);
1698 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), -delta
, CW_BOTTOMALIGN
);
1699 MoveToSameTop(GetDlgItem(IDC_MSGVIEW
), GetDlgItem(IDC_PIC_AUTHOR
));
1700 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
1701 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
1702 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
1703 AddAnchor(IDC_PIC_AUTHOR
, TOP_RIGHT
);
1704 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1705 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1709 m_LogList
.Invalidate();
1710 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1711 m_gravatar
.Invalidate();
1715 void CLogDlg::DoSizeV2(int delta
)
1718 RemoveAnchor(IDC_LOGLIST
);
1719 RemoveAnchor(IDC_SPLITTERTOP
);
1720 RemoveAnchor(IDC_MSGVIEW
);
1721 RemoveAnchor(IDC_PIC_AUTHOR
);
1722 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1723 RemoveAnchor(IDC_LOGMSG
);
1724 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), delta
, CW_TOPALIGN
);
1725 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl
, -delta
, CW_BOTTOMALIGN
);
1726 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
1727 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
1728 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
1729 AddAnchor(IDC_PIC_AUTHOR
, TOP_RIGHT
);
1730 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1731 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1735 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1736 m_ChangedFileListCtrl
.Invalidate();
1737 m_gravatar
.Invalidate();
1741 void CLogDlg::AdjustMinSize()
1743 // adjust the minimum size of the dialog to prevent the resizing from
1744 // moving the list control too far down.
1745 CRect rcChgListView
;
1746 m_ChangedFileListCtrl
.GetClientRect(rcChgListView
);
1748 m_LogList
.GetClientRect(rcLogList
);
1750 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(),
1751 m_DlgOrigRect
.Height()-m_ChgOrigRect
.Height()-m_LogListOrigRect
.Height()-m_MsgViewOrigRect
.Height()
1752 +rcChgListView
.Height()+rcLogList
.Height()+60));
1755 LRESULT
CLogDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
1759 if (wParam
== IDC_SPLITTERTOP
)
1761 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1762 DoSizeV1(pHdr
->delta
);
1764 else if (wParam
== IDC_SPLITTERBOTTOM
)
1766 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1767 DoSizeV2(pHdr
->delta
);
1772 return CResizableDialog::DefWindowProc(message
, wParam
, lParam
);
1775 void CLogDlg::SetSplitterRange()
1777 if ((m_LogList
)&&(m_ChangedFileListCtrl
))
1780 m_LogList
.GetWindowRect(rcTop
);
1781 ScreenToClient(rcTop
);
1783 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(rcMiddle
);
1784 ScreenToClient(rcMiddle
);
1785 m_wndSplitter1
.SetRange(rcTop
.top
+30, rcMiddle
.bottom
-20);
1787 m_ChangedFileListCtrl
.GetWindowRect(rcBottom
);
1788 ScreenToClient(rcBottom
);
1789 m_wndSplitter2
.SetRange(rcMiddle
.top
+30, rcBottom
.bottom
-20);
1793 LRESULT
CLogDlg::OnClickedInfoIcon(WPARAM
/*wParam*/, LPARAM lParam
)
1795 // FIXME: x64 version would get this function called with unexpected parameters.
1799 RECT
* rect
= (LPRECT
)lParam
;
1802 point
= CPoint(rect
->left
, rect
->bottom
);
1803 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_SelectedFilters & x ? MF_CHECKED : MF_UNCHECKED))
1805 if (popup
.CreatePopupMenu())
1807 temp
.LoadString(IDS_LOG_FILTER_SUBJECT
);
1808 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT
), LOGFILTER_SUBJECT
, temp
);
1810 temp
.LoadString(IDS_LOG_FILTER_MESSAGES
);
1811 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES
), LOGFILTER_MESSAGES
, temp
);
1813 temp
.LoadString(IDS_LOG_FILTER_PATHS
);
1814 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS
), LOGFILTER_PATHS
, temp
);
1816 temp
.LoadString(IDS_LOG_FILTER_AUTHORS
);
1817 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS
), LOGFILTER_AUTHORS
, temp
);
1819 temp
.LoadString(IDS_LOG_FILTER_EMAILS
);
1820 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_EMAILS
), LOGFILTER_EMAILS
, temp
);
1822 temp
.LoadString(IDS_LOG_FILTER_REVS
);
1823 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS
), LOGFILTER_REVS
, temp
);
1825 temp
.LoadString(IDS_LOG_FILTER_REFNAME
);
1826 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME
), LOGFILTER_REFNAME
, temp
);
1828 if (m_LogList
.m_bShowBugtraqColumn
== TRUE
) {
1829 temp
.LoadString(IDS_LOG_FILTER_BUGIDS
);
1830 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID
), LOGFILTER_BUGID
, temp
);
1833 temp
.LoadString(IDS_LOG_FILTER_TOGGLE
);
1834 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, LOGFILTER_TOGGLE
, temp
);
1836 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1838 temp
.LoadString(IDS_LOG_FILTER_REGEX
);
1839 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterWithRegex
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_REGEX
, temp
);
1841 temp
.LoadString(IDS_LOG_FILTER_CASESENSITIVE
);
1842 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterCaseSensitively
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_CASE
, temp
);
1845 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1849 if (selection
== LOGFILTER_REGEX
)
1851 m_bFilterWithRegex
= !m_bFilterWithRegex
;
1852 CRegDWORD
b(_T("Software\\TortoiseGit\\UseRegexFilter"), FALSE
);
1853 b
= m_bFilterWithRegex
;
1854 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
;
1856 CheckRegexpTooltip();
1858 else if (selection
== LOGFILTER_CASE
)
1860 m_bFilterCaseSensitively
= !m_bFilterCaseSensitively
;
1861 CRegDWORD
b(_T("Software\\TortoiseGit\\FilterCaseSensitively"), FALSE
);
1862 b
= m_bFilterCaseSensitively
;
1863 m_LogList
.m_bFilterCaseSensitively
= m_bFilterCaseSensitively
;
1865 else if (selection
== LOGFILTER_TOGGLE
)
1867 m_LogList
.m_SelectedFilters
= (~m_LogList
.m_SelectedFilters
) & LOGFILTER_ALL
;
1872 m_LogList
.m_SelectedFilters
^= selection
;
1875 // Reload only if a search text is entered
1876 if (m_LogList
.HasFilterText())
1877 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
1883 LRESULT
CLogDlg::OnClickedCancelFilter(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1886 KillTimer(LOGFILTER_TIMER
);
1888 m_LogList
.m_sFilterText
.Empty();
1890 theApp
.DoWaitCursor(1);
1891 CStoreSelection
storeselection(this);
1892 FillLogMessageCtrl(false);
1894 m_LogList
.RemoveFilter();
1899 m_LogList
.GetTimeRange(begin
,end
);
1900 m_DateFrom
.SetTime(&begin
);
1901 m_DateTo
.SetTime(&end
);
1903 theApp
.DoWaitCursor(-1);
1904 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
1905 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
1906 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
1907 UpdateLogInfoLabel();
1913 void CLogDlg::SetFilterCueText()
1915 CString
temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY
));
1918 if (m_LogList
.m_SelectedFilters
& LOGFILTER_SUBJECT
)
1920 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT
));
1923 if (m_LogList
.m_SelectedFilters
& LOGFILTER_MESSAGES
)
1925 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1927 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES
));
1930 if (m_LogList
.m_SelectedFilters
& LOGFILTER_PATHS
)
1932 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1934 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS
));
1937 if (m_LogList
.m_SelectedFilters
& LOGFILTER_AUTHORS
)
1939 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1941 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS
));
1944 if (m_LogList
.m_SelectedFilters
& LOGFILTER_EMAILS
)
1946 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1948 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_EMAILS
));
1951 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REVS
)
1953 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1955 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS
));
1958 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REFNAME
)
1960 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1962 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REFNAME
));
1965 if (m_LogList
.m_bShowBugtraqColumn
&& m_LogList
.m_SelectedFilters
& LOGFILTER_BUGID
)
1967 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1969 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS
));
1972 // to make the cue banner text appear more to the right of the edit control
1973 temp
= _T(" ")+temp
;
1974 m_cFilter
.SetCueBanner(temp
.TrimRight());
1977 bool CLogDlg::Validate(LPCTSTR string
)
1979 if (!m_bFilterWithRegex
)
1981 std::tr1::wregex pat
;
1982 return m_LogList
.ValidateRegexp(string
, pat
, false);
1986 void CLogDlg::OnTimer(UINT_PTR nIDEvent
)
1988 if (nIDEvent
== LOGFTIME_TIMER
)
1990 KillTimer(LOGFTIME_TIMER
);
1992 m_LogList
.Refresh(FALSE
);
1993 FillLogMessageCtrl(false);
1995 else if (nIDEvent
== LOG_FILLPATCHVTIMER
)
1999 else if (nIDEvent
== LOGFILTER_TIMER
)
2001 KillTimer(LOGFILTER_TIMER
);
2003 m_LogList
.Refresh(FALSE
);
2004 FillLogMessageCtrl(false);
2007 /* we will use git built-in grep to filter log */
2008 if (this->IsThreadRunning())
2010 // thread still running! So just restart the timer.
2011 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
2014 CWnd
* focusWnd
= GetFocus();
2015 bool bSetFocusToFilterControl
= ((focusWnd
!= GetDlgItem(IDC_DATEFROM
))&&(focusWnd
!= GetDlgItem(IDC_DATETO
))
2016 && (focusWnd
!= GetDlgItem(IDC_LOGLIST
)));
2017 if (m_LogList
.m_sFilterText
.IsEmpty())
2019 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
2020 // do not return here!
2021 // we also need to run the filter if the filter text is empty:
2022 // 1. to clear an existing filter
2023 // 2. to rebuild the m_arShownList after sorting
2025 theApp
.DoWaitCursor(1);
2026 CStoreSelection
storeselection(this);
2027 KillTimer(LOGFILTER_TIMER
);
2028 FillLogMessageCtrl(false);
2030 // now start filter the log list
2031 m_LogList
.StartFilter();
2033 if ( m_LogList
.GetItemCount()==1 )
2035 m_LogList
.SetSelectionMark(0);
2036 m_LogList
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
2038 theApp
.DoWaitCursor(-1);
2039 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2040 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2041 if (bSetFocusToFilterControl
)
2042 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2043 UpdateLogInfoLabel();
2045 } // if (nIDEvent == LOGFILTER_TIMER)
2046 else if (nIDEvent
== LOG_HEADER_ORDER_TIMER
)
2048 KillTimer(LOG_HEADER_ORDER_TIMER
);
2049 CLogOrdering orderDlg
;
2050 if (orderDlg
.DoModal() == IDOK
)
2053 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
))));
2054 __super::OnTimer(nIDEvent
);
2057 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2062 m_DateTo
.GetTime(_time
);
2064 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 23, 59, 59);
2065 if (time
.GetTime() != m_LogList
.m_To
)
2067 m_LogList
.m_To
= (DWORD
)time
.GetTime();
2068 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
2073 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2079 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2085 m_DateFrom
.GetTime(_time
);
2087 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 0, 0, 0);
2088 if (time
.GetTime() != m_LogList
.m_From
)
2090 m_LogList
.m_From
= (DWORD
)time
.GetTime();
2091 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
2096 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2102 void CLogDlg::OnCbnSelchangeJumpType()
2104 // reserved for future use
2107 void CLogDlg::OnBnClickedJumpUp()
2109 int sel
= m_JumpType
.GetCurSel();
2110 if (sel
< 0) return;
2111 JumpType jumpType
= (JumpType
)sel
;
2113 if (jumpType
== JumpType_History
)
2122 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2125 index
= m_LogList
.GetNextSelectedItem(pos
);
2126 if (index
== 0) return;
2128 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
2129 if (jumpType
== JumpType_AuthorEmail
)
2130 strValue
= data
->GetAuthorEmail();
2131 else if (jumpType
== JumpType_CommitterEmail
)
2132 strValue
= data
->GetCommitterEmail();
2133 else if (jumpType
== JumpType_Parent1
)
2134 hashValue
= data
->m_CommitHash
;
2135 else if (jumpType
== JumpType_Parent2
)
2136 hashValue
= data
->m_CommitHash
;
2137 else if (jumpType
== JumpType_TagFF
)
2138 hashValue
= data
->m_CommitHash
;
2139 else if (jumpType
== JumpType_BranchFF
)
2140 hashValue
= data
->m_CommitHash
;
2142 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2149 index
= m_LogList
.GetNextSelectedItem(pos
);
2150 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2152 m_LogList
.SetSelectionMark(-1);
2154 for (int i
= index
- 1; i
>= 0; i
--)
2157 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
2158 if (jumpType
== JumpType_AuthorEmail
)
2159 found
= strValue
== data
->GetAuthorEmail();
2160 else if (jumpType
== JumpType_CommitterEmail
)
2161 found
= strValue
== data
->GetCommitterEmail();
2162 else if (jumpType
== JumpType_MergePoint
)
2163 found
= data
->ParentsCount() > 1;
2164 else if (jumpType
== JumpType_Parent1
)
2166 if (data
->m_ParentHash
.size() > 0)
2167 found
= data
->m_ParentHash
[0] == hashValue
;
2169 else if (jumpType
== JumpType_Parent2
)
2171 if (data
->m_ParentHash
.size() > 1)
2172 found
= data
->m_ParentHash
[1] == hashValue
;
2174 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
2176 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2177 for (size_t j
= 0; j
< refList
.size(); ++j
)
2179 if (refList
[j
].Left(10) == _T("refs/tags/"))
2186 if (found
&& jumpType
== JumpType_TagFF
)
2187 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
2189 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2191 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2192 for (size_t j
= 0; j
< refList
.size(); ++j
)
2194 if (refList
[j
].Left(11) == _T("refs/heads/") || refList
[j
].Left(13) == _T("refs/remotes/"))
2201 if (found
&& jumpType
== JumpType_BranchFF
)
2202 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
2207 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2208 m_LogList
.EnsureVisible(i
, FALSE
);
2209 m_LogList
.SetSelectionMark(i
);
2214 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
2217 void CLogDlg::OnBnClickedJumpDown()
2219 int jumpType
= m_JumpType
.GetCurSel();
2220 if (jumpType
< 0) return;
2222 if (jumpType
== JumpType_History
)
2231 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2234 index
= m_LogList
.GetNextSelectedItem(pos
);
2235 if (index
== 0) return;
2237 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
2238 if (jumpType
== JumpType_AuthorEmail
)
2239 strValue
= data
->GetAuthorEmail();
2240 else if (jumpType
== JumpType_CommitterEmail
)
2241 strValue
= data
->GetCommitterEmail();
2242 else if (jumpType
== JumpType_Parent1
)
2244 if (data
->m_ParentHash
.size() > 0)
2245 hashValue
= data
->m_ParentHash
.at(0);
2249 else if (jumpType
== JumpType_Parent2
)
2251 if (data
->m_ParentHash
.size() > 1)
2252 hashValue
= data
->m_ParentHash
.at(1);
2256 else if (jumpType
== JumpType_TagFF
)
2257 hashValue
= data
->m_CommitHash
;
2258 else if (jumpType
== JumpType_BranchFF
)
2259 hashValue
= data
->m_CommitHash
;
2261 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2268 index
= m_LogList
.GetNextSelectedItem(pos
);
2269 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2271 m_LogList
.SetSelectionMark(-1);
2273 for (int i
= index
+ 1; i
< m_LogList
.GetItemCount(); ++i
)
2276 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
2277 if (jumpType
== JumpType_AuthorEmail
)
2278 found
= strValue
== data
->GetAuthorEmail();
2279 else if (jumpType
== JumpType_CommitterEmail
)
2280 found
= strValue
== data
->GetCommitterEmail();
2281 else if (jumpType
== JumpType_MergePoint
)
2282 found
= data
->ParentsCount() > 1;
2283 else if (jumpType
== JumpType_Parent1
)
2284 found
= data
->m_CommitHash
== hashValue
;
2285 else if (jumpType
== JumpType_Parent2
)
2286 found
= data
->m_CommitHash
== hashValue
;
2287 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
2289 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2290 for (size_t j
= 0; j
< refList
.size(); ++j
)
2292 if (refList
[j
].Left(10) == _T("refs/tags/"))
2299 if (found
&& jumpType
== JumpType_TagFF
)
2300 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
2302 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2304 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2305 for (size_t j
= 0; j
< refList
.size(); ++j
)
2307 if (refList
[j
].Left(11) == _T("refs/heads/") || refList
[j
].Left(13) == _T("refs/remotes/"))
2314 if (found
&& jumpType
== JumpType_BranchFF
)
2315 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
2320 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2321 m_LogList
.EnsureVisible(i
, FALSE
);
2322 m_LogList
.SetSelectionMark(i
);
2327 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
2330 CTGitPathList
CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)
2332 CTGitPathList pathList
;
2335 if (m_sRepositoryRoot
.IsEmpty() && (bRelativePaths
== false))
2337 m_sRepositoryRoot
= GetRepositoryRoot(m_path
);
2339 if (m_sRepositoryRoot
.IsEmpty() && (bRelativePaths
== false))
2342 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2347 int nextpos
= m_LogList
.GetNextSelectedItem(pos
);
2348 if (nextpos
>= m_arShownList
.GetCount())
2350 PLOGENTRYDATA pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(nextpos
));
2351 LogChangedPathArray
* cpatharray
= pLogEntry
->pArChangedPaths
;
2352 for (INT_PTR cpPathIndex
= 0; cpPathIndex
<cpatharray
->GetCount(); ++cpPathIndex
)
2354 LogChangedPath
* cpath
= cpatharray
->SafeGetAt(cpPathIndex
);
2358 if (!bRelativePaths
)
2359 path
.SetFromGit(m_sRepositoryRoot
);
2360 path
.AppendPathString(cpath
->sPath
);
2362 ((m_cHidePaths
.GetState() & 0x0003)!=BST_CHECKED
)||
2363 (cpath
->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0))
2364 pathList
.AddPath(path
);
2369 pathList
.RemoveDuplicates();
2374 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
2382 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscRevSort());
2384 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescRevSort());
2390 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscActionSort());
2392 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescActionSort());
2398 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscAuthorSort());
2400 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescAuthorSort());
2406 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscDateSort());
2408 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescDateSort());
2411 case 4: // Message or bug id
2412 if (m_bShowBugtraqColumn
)
2415 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscBugIDSort());
2417 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescBugIDSort());
2420 // fall through here
2424 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscMessageSort());
2426 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescMessageSort());
2436 void CLogDlg::OnLvnColumnclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2438 if (this->IsThreadRunning())
2439 return; //no sorting while the arrays are filled
2441 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
2442 const int nColumn
= pNMLV
->iSubItem
;
2443 m_bAscending
= nColumn
== m_nSortColumn
? !m_bAscending
: TRUE
;
2444 m_nSortColumn
= nColumn
;
2445 SortByColumn(m_nSortColumn
, m_bAscending
);
2446 SetSortArrow(&m_LogList
, m_nSortColumn
, !!m_bAscending
);
2447 SortShownListArray();
2448 m_LogList
.Invalidate();
2449 UpdateLogInfoLabel();
2451 UNREFERENCED_PARAMETER(pNMHDR
);
2455 SetTimer(LOG_HEADER_ORDER_TIMER
, 10, nullptr);
2458 void CLogDlg::SortShownListArray()
2460 // make sure the shown list still matches the filter after sorting.
2461 OnTimer(LOGFILTER_TIMER
);
2462 // clear the selection states
2463 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2466 m_LogList
.SetItemState(m_LogList
.GetNextSelectedItem(pos
), 0, LVIS_SELECTED
);
2468 m_LogList
.SetSelectionMark(-1);
2471 void CLogDlg::SetSortArrow(CListCtrl
* control
, int nColumn
, bool bAscending
)
2473 if (control
== NULL
)
2475 // set the sort arrow
2476 CHeaderCtrl
* pHeader
= control
->GetHeaderCtrl();
2477 HDITEM HeaderItem
= {0};
2478 HeaderItem
.mask
= HDI_FORMAT
;
2479 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
2481 pHeader
->GetItem(i
, &HeaderItem
);
2482 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
2483 pHeader
->SetItem(i
, &HeaderItem
);
2487 pHeader
->GetItem(nColumn
, &HeaderItem
);
2488 HeaderItem
.fmt
|= (bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
2489 pHeader
->SetItem(nColumn
, &HeaderItem
);
2493 int CLogDlg::m_nSortColumnPathList
= 0;
2494 bool CLogDlg::m_bAscendingPathList
= false;
2496 void CLogDlg::OnBnClickedHidepaths()
2498 FillLogMessageCtrl();
2499 m_ChangedFileListCtrl
.Invalidate();
2502 void CLogDlg::UpdateLogInfoLabel()
2507 long selectedrevs
= 0;
2508 long selectedfiles
= 0;
2509 int count
= (int)m_LogList
.m_arShownList
.GetCount();
2513 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(0)))->m_CommitHash
;
2514 if(this->m_LogList
.m_bShowWC
&& rev1
.IsEmpty()&&(count
>1))
2516 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(start
)))->m_CommitHash
;
2517 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_arShownList.GetCount()-1));
2518 rev2
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(count
-1)))->m_CommitHash
;
2519 selectedrevs
= m_LogList
.GetSelectedCount();
2521 selectedfiles
= m_ChangedFileListCtrl
.GetSelectedCount();
2524 sTemp
.Format(IDS_PROC_LOG_STATS
,
2526 rev2
.ToString().Left(g_Git
.GetShortHASHLength()), rev1
.ToString().Left(g_Git
.GetShortHASHLength()), selectedrevs
, selectedfiles
);
2528 if(selectedrevs
== 1)
2530 CString str
=m_ChangedFileListCtrl
.GetStatisticsString(true);
2531 str
.Replace(_T('\n'), _T(' '));
2532 sTemp
+= _T("\r\n") + str
;
2539 void CLogDlg::OnDtnDropdownDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2541 // the date control should not show the "today" button
2542 CMonthCalCtrl
* pCtrl
= m_DateFrom
.GetMonthCalCtrl();
2544 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
2548 void CLogDlg::OnDtnDropdownDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2550 // the date control should not show the "today" button
2551 CMonthCalCtrl
* pCtrl
= m_DateTo
.GetMonthCalCtrl();
2553 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
2557 void CLogDlg::OnSize(UINT nType
, int cx
, int cy
)
2559 __super::OnSize(nType
, cx
, cy
);
2564 void CLogDlg::OnRefresh()
2568 this->m_LogProgress
.SetPos(0);
2574 void CLogDlg::OnFocusFilter()
2576 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2579 void CLogDlg::OnEditCopy()
2581 if (GetFocus() == &m_ChangedFileListCtrl
)
2582 CopyChangedSelectionToClipBoard();
2584 m_LogList
.CopySelectionToClipBoard();
2587 CString
CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString
& url
)
2589 // is the URL a relative one?
2590 if (url
.Left(2).Compare(_T("^/")) == 0)
2592 // URL is relative to the repository root
2593 CString url1
= m_sRepositoryRoot
+ url
.Mid(1);
2594 TCHAR buf
[INTERNET_MAX_URL_LENGTH
] = { 0 };
2595 DWORD len
= url
.GetLength();
2596 if (UrlCanonicalize((LPCTSTR
)url1
, buf
, &len
, 0) == S_OK
)
2597 return CString(buf
, len
);
2600 else if (url
[0] == '/')
2602 // URL is relative to the server's hostname
2604 // find the server's hostname
2605 int schemepos
= m_sRepositoryRoot
.Find(_T("//"));
2608 sHost
= m_sRepositoryRoot
.Left(m_sRepositoryRoot
.Find('/', schemepos
+3));
2609 CString url1
= sHost
+ url
;
2610 TCHAR buf
[INTERNET_MAX_URL_LENGTH
] = { 0 };
2611 DWORD len
= url
.GetLength();
2612 if (UrlCanonicalize((LPCTSTR
)url
, buf
, &len
, 0) == S_OK
)
2613 return CString(buf
, len
);
2620 void CLogDlg::ShowGravatar()
2622 m_gravatar
.EnableGravatar(m_bShowGravatar
);
2623 RemoveAnchor(IDC_MSGVIEW
);
2624 if (m_gravatar
.IsGravatarEnabled())
2627 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
2628 ScreenToClient(&rect
);
2629 m_gravatar
.GetWindowRect(&rect2
);
2630 ScreenToClient(&rect2
);
2631 rect
.right
= rect2
.left
;
2632 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
2633 m_gravatar
.ShowWindow(SW_SHOW
);
2638 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
2639 ScreenToClient(&rect
);
2640 m_gravatar
.GetWindowRect(&rect2
);
2641 ScreenToClient(&rect2
);
2642 rect
.right
= rect2
.right
;
2643 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
2644 m_gravatar
.ShowWindow(SW_HIDE
);
2646 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
2650 void CLogDlg::OnEnChangeSearchedit()
2653 if (!m_LogList
.HasFilterText())
2655 CStoreSelection
storeselection(this);
2656 // clear the filter, i.e. make all entries appear
2657 theApp
.DoWaitCursor(1);
2658 KillTimer(LOGFILTER_TIMER
);
2659 FillLogMessageCtrl(false);
2662 //m_LogList.StartFilter();
2664 InterlockedExchange(&m_bNoDispUpdates
, TRUE
);
2665 m_arShownList
.RemoveAll();
2666 for (DWORD i
=0; i
<m_logEntries
.size(); ++i
)
2668 if (IsEntryInDateRange(i
))
2669 m_arShownList
.Add(m_logEntries
[i
]);
2671 InterlockedExchange(&m_bNoDispUpdates
, FALSE
);
2672 m_LogList
.DeleteAllItems();
2673 m_LogList
.SetItemCountEx(ShownCountWithStopped());
2674 m_LogList
.RedrawItems(0, ShownCountWithStopped());
2675 m_LogList
.SetRedraw(false);
2676 ResizeAllListCtrlCols();
2677 m_LogList
.SetRedraw(true);
2679 theApp
.DoWaitCursor(-1);
2680 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2681 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2682 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2683 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
2686 if (Validate(m_LogList
.m_sFilterText
))
2687 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
2689 KillTimer(LOGFILTER_TIMER
);
2693 void CLogDlg::OnBnClickedAllBranch()
2695 // m_bAllBranch is not auto-toggled by MFC, we have to handle it manually (in order to prevent the indeterminate state)
2697 m_LogList
.m_ShowMask
&=~ (CGit::LOG_INFO_LOCAL_BRANCHES
| CGit::LOG_INFO_ALL_BRANCH
);
2701 m_bAllBranch
= BST_UNCHECKED
;
2702 m_ChangedFileListCtrl
.m_sDisplayedBranch
= m_LogList
.GetRange();
2706 m_bAllBranch
= BST_CHECKED
;
2707 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
2708 m_ChangedFileListCtrl
.m_sDisplayedBranch
.Empty();
2711 // need to save value here, so that log dialogs started from now on also have AllBranch activated
2712 m_regbAllBranch
= m_bAllBranch
;
2718 FillLogMessageCtrl(false);
2721 void CLogDlg::OnBnClickedFollowRenames()
2723 if(m_bFollowRenames
)
2725 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_FOLLOW
;
2726 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_LOCAL_BRANCHES
;
2730 m_bAllBranch
= FALSE
;
2731 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_ALL_BRANCH
;
2736 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_FOLLOW
;
2738 DialogEnableWindow(IDC_LOG_ALLBRANCH
, !m_bFollowRenames
);
2739 DialogEnableWindow(IDC_SHOWWHOLEPROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
2743 FillLogMessageCtrl(false);
2746 void CLogDlg::HandleShowLabels(bool var
, int flag
)
2749 m_LogList
.m_ShowRefMask
|= flag
;
2751 m_LogList
.m_ShowRefMask
&= ~flag
;
2753 if ((m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_REFS
) && !(m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_ANYCOMMIT
))
2755 // Remove commits where labels are not shown.
2757 FillLogMessageCtrl(false);
2762 m_LogList
.Invalidate();
2766 void CLogDlg::OnBnClickedCompressedGraph()
2770 if (m_iCompressedGraph
== 2)
2771 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_REFS
;
2772 else if (m_iCompressedGraph
== 1)
2773 m_LogList
.m_ShowFilter
= static_cast<CGitLogListBase::FilterShow
>(CGitLogListBase::FILTERSHOW_REFS
| CGitLogListBase::FILTERSHOW_MERGEPOINTS
);
2775 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_ALL
;
2778 FillLogMessageCtrl(false);
2781 void CLogDlg::OnBnClickedBrowseRef()
2783 CString newRef
= CBrowseRefsDlg::PickRef(false, m_LogList
.GetRange(), gPickRef_All
, true);
2784 if(newRef
.IsEmpty())
2787 m_History
.AddEntry(newRef
);
2792 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
);
2793 m_bAllBranch
= BST_UNCHECKED
;
2797 FillLogMessageCtrl(false);
2800 void CLogDlg::ShowStartRef()
2802 //Show ref name on top
2803 if(!::IsWindow(m_hWnd
))
2805 if (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
))
2807 switch (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
))
2809 case CGit::LOG_INFO_ALL_BRANCH
:
2810 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES
)));
2813 case CGit::LOG_INFO_LOCAL_BRANCHES
:
2814 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_LOCAL_BRANCHES
)));
2818 m_staticRef
.Invalidate(TRUE
);
2819 m_tooltips
.DelTool(GetDlgItem(IDC_STATIC_REF
));
2823 CString showStartRef
= m_LogList
.GetRange();
2824 if (showStartRef
.IsEmpty() || showStartRef
== _T("HEAD"))
2826 showStartRef
.Empty();
2828 if (g_Git
.Run(L
"git.exe symbolic-ref HEAD", &showStartRef
, NULL
, CP_UTF8
))
2829 showStartRef
= CString(MAKEINTRESOURCE(IDS_PROC_LOG_NOBRANCH
));
2830 showStartRef
.Trim(L
"\r\n\t ");
2834 showStartRef
= g_Git
.StripRefName(showStartRef
);
2836 m_staticRef
.SetWindowText(showStartRef
);
2837 CWnd
*pWnd
= GetDlgItem(IDC_STATIC_REF
);
2838 m_tooltips
.AddTool(pWnd
, showStartRef
);
2839 m_staticRef
.Invalidate(TRUE
);
2842 void CLogDlg::SetRange(const CString
& range
)
2844 m_LogList
.SetRange(range
);
2845 m_ChangedFileListCtrl
.m_sDisplayedBranch
= range
;
2850 static void AppendMenuChecked(CMenu
&menu
, UINT nTextID
, UINT_PTR nItemID
, BOOL checked
= FALSE
, BOOL enabled
= TRUE
)
2853 text
.LoadString(nTextID
);
2854 menu
.AppendMenu(MF_STRING
| (enabled
? MF_ENABLED
: MF_DISABLED
) | (checked
? MF_CHECKED
: MF_UNCHECKED
), nItemID
, text
);
2857 #define WALKBEHAVIOUR_FIRSTPARENT 1
2858 #define WALKBEHAVIOUR_FOLLOWRENAMES 2
2859 #define WALKBEHAVIOUR_COMPRESSEDGRAPH 3
2860 #define WALKBEHAVIOUR_LABELEDCOMMITS 4
2861 #define WALKBEHAVIOUR_NOMERGES 5
2863 void CLogDlg::OnBnClickedWalkBehaviour()
2866 if (popup
.CreatePopupMenu())
2868 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FIRSTPARENT
, WALKBEHAVIOUR_FIRSTPARENT
, m_bFirstParent
);
2869 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_NOMERGES
, WALKBEHAVIOUR_NOMERGES
, m_bNoMerges
);
2870 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FOLLOWRENAMES
, WALKBEHAVIOUR_FOLLOWRENAMES
, m_bFollowRenames
, !(m_path
.IsEmpty() || m_path
.IsDirectory()));
2871 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2872 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_COMPRESSED
, WALKBEHAVIOUR_COMPRESSEDGRAPH
, m_iCompressedGraph
== 1);
2873 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_LABELEDCOMMITS
, WALKBEHAVIOUR_LABELEDCOMMITS
, m_iCompressedGraph
== 2);
2877 GetDlgItem(IDC_WALKBEHAVIOUR
)->GetWindowRect(&rect
);
2878 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, rect
.left
, rect
.top
, this, 0);
2881 case WALKBEHAVIOUR_FIRSTPARENT
:
2882 m_bFirstParent
= !m_bFirstParent
;
2883 OnBnClickedFirstParent();
2885 case WALKBEHAVIOUR_NOMERGES
:
2886 m_bNoMerges
= !m_bNoMerges
;
2887 OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges
2889 case WALKBEHAVIOUR_FOLLOWRENAMES
:
2890 m_bFollowRenames
= !m_bFollowRenames
;
2891 OnBnClickedFollowRenames();
2893 case WALKBEHAVIOUR_COMPRESSEDGRAPH
:
2894 m_iCompressedGraph
= (m_iCompressedGraph
== 1 ? 0 : 1);
2895 OnBnClickedCompressedGraph();
2897 case WALKBEHAVIOUR_LABELEDCOMMITS
:
2898 m_iCompressedGraph
= (m_iCompressedGraph
== 2 ? 0 : 2);
2899 OnBnClickedCompressedGraph();
2904 m_bWalkBehavior
= (m_bFirstParent
|| m_bNoMerges
|| m_bFollowRenames
|| m_iCompressedGraph
);
2909 #define VIEW_HIDEPATHS 1
2910 #define VIEW_GRAYPATHS 2
2911 #define VIEW_SHOWTAGS 3
2912 #define VIEW_SHOWLOCALBRANCHES 4
2913 #define VIEW_SHOWREMOTEBRANCHES 5
2914 #define VIEW_SHOWGRAVATAR 6
2915 #define VIEW_SHOWPATCH 7
2917 void CLogDlg::OnBnClickedView()
2920 if (popup
.CreatePopupMenu())
2922 AppendMenuChecked(popup
, IDS_SHOWFILES_HIDEPATHS
, VIEW_HIDEPATHS
, m_iHidePaths
== 1);
2923 AppendMenuChecked(popup
, IDS_SHOWFILES_GRAYPATHS
, VIEW_GRAYPATHS
, m_iHidePaths
== 2);
2924 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2925 CMenu showLabelsMenu
;
2926 if (showLabelsMenu
.CreatePopupMenu())
2928 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWTAGLABELS
, VIEW_SHOWTAGS
, m_bShowTags
);
2929 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWLOCALBRANCHLABELS
, VIEW_SHOWLOCALBRANCHES
, m_bShowLocalBranches
);
2930 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWREMOTEBRANCHLABELS
, VIEW_SHOWREMOTEBRANCHES
, m_bShowRemoteBranches
);
2931 popup
.AppendMenu(MF_STRING
| MF_POPUP
, (UINT
)showLabelsMenu
.m_hMenu
, (CString
)MAKEINTRESOURCE(IDS_VIEW_LABELS
));
2933 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2934 AppendMenuChecked(popup
, IDS_VIEW_SHOWGRAVATAR
, VIEW_SHOWGRAVATAR
, m_bShowGravatar
);
2935 AppendMenuChecked(popup
, IDS_MENU_VIEWPATCH
, VIEW_SHOWPATCH
, IsWindow(this->m_patchViewdlg
.m_hWnd
));
2939 GetDlgItem(IDC_VIEW
)->GetWindowRect(&rect
);
2940 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, rect
.left
, rect
.top
, this, 0);
2943 case VIEW_HIDEPATHS
:
2944 if (m_iHidePaths
== 1)
2948 OnBnClickedHidepaths();
2950 case VIEW_GRAYPATHS
:
2951 if (m_iHidePaths
== 2)
2955 OnBnClickedHidepaths();
2958 m_bShowTags
= !m_bShowTags
;
2959 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
2961 case VIEW_SHOWLOCALBRANCHES
:
2962 m_bShowLocalBranches
= !m_bShowLocalBranches
;
2963 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
2965 case VIEW_SHOWREMOTEBRANCHES
:
2966 m_bShowRemoteBranches
= !m_bShowRemoteBranches
;
2967 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
2969 case VIEW_SHOWGRAVATAR
:
2971 m_bShowGravatar
= !m_bShowGravatar
;
2975 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2978 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
2979 int moreSel
= m_LogList
.GetNextSelectedItem(pos
);
2982 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
2984 email
= pLogEntry
->GetAuthorEmail();
2987 m_gravatar
.LoadGravatar(email
);
2990 case VIEW_SHOWPATCH
:
2999 void CLogDlg::OnBnClickedFirstParent()
3001 if(this->m_bFirstParent
)
3002 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_FIRST_PARENT
;
3004 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_FIRST_PARENT
;
3007 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_NO_MERGE
;
3009 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_NO_MERGE
;
3013 FillLogMessageCtrl(false);
3017 void CLogDlg::OnBnClickShowWholeProject()
3021 if(this->m_bWholeProject
)
3023 m_LogList
.m_Path
.Reset();
3027 m_LogList
.m_Path
=m_path
;
3029 m_regShowWholeProject
= m_bWholeProject
;
3035 FillLogMessageCtrl(false);
3039 LRESULT
CLogDlg::OnRefLogChanged(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
3045 LRESULT
CLogDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
3047 m_pTaskbarList
.Release();
3048 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
3049 SetUUIDOverlayIcon(m_hWnd
);
3053 LRESULT
CLogDlg::OnRefreshSelection(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
3055 // it's enough to deselect, then select again one item of the whole selection
3056 int selMark
= m_LogList
.GetSelectionMark();
3059 m_LogList
.SetSelectionMark(selMark
);
3060 m_LogList
.SetItemState(selMark
, 0, LVIS_SELECTED
);
3061 m_LogList
.SetItemState(selMark
, LVIS_SELECTED
, LVIS_SELECTED
);