1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2008 - 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
)
70 m_bFilterWithRegex
= !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE
);
73 str
=g_Git
.m_CurrentDir
;
74 str
.Replace(_T(":"),_T("_"));
75 str
=CString(_T("Software\\TortoiseGit\\LogDialog\\AllBranch\\"))+str
;
77 m_regbAllBranch
=CRegDWORD(str
,FALSE
);
79 m_bAllBranch
=m_regbAllBranch
;
81 str
= g_Git
.m_CurrentDir
;
82 str
.Replace(_T(":"),_T("_"));
83 m_regShowWholeProject
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\") + str
, FALSE
);
84 m_bWholeProject
= m_regShowWholeProject
;
85 m_regbShowTags
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowTags\\") + str
, TRUE
);
86 m_bShowTags
= !!m_regbShowTags
;
87 m_regbShowLocalBranches
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowLocalBranches\\") + str
, TRUE
);
88 m_bShowLocalBranches
= !!m_regbShowLocalBranches
;
89 m_regbShowRemoteBranches
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowRemoteBranches\\") + str
, TRUE
);
90 m_bShowRemoteBranches
= !!m_regbShowRemoteBranches
;
92 m_bShowUnversioned
= CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE
);
94 m_bShowGravatar
= !!CRegDWORD(_T("Software\\TortoiseGit\\EnableGravatar"), FALSE
);
95 m_regbShowGravatar
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowGravatar\\") + str
, m_bShowGravatar
);
96 m_bShowGravatar
= !!m_regbShowGravatar
;
102 m_regbAllBranch
= m_bAllBranch
;
103 m_regbShowTags
= m_bShowTags
;
104 m_regbShowLocalBranches
= m_bShowLocalBranches
;
105 m_regbShowRemoteBranches
= m_bShowRemoteBranches
;
106 m_regbShowGravatar
= m_bShowGravatar
;
108 m_CurrentFilteredChangedArray
.RemoveAll();
112 void CLogDlg::DoDataExchange(CDataExchange
* pDX
)
114 CResizableStandAloneDialog::DoDataExchange(pDX
);
115 DDX_Control(pDX
, IDC_LOGLIST
, m_LogList
);
116 DDX_Control(pDX
, IDC_LOGMSG
, m_ChangedFileListCtrl
);
117 DDX_Control(pDX
, IDC_PROGRESS
, m_LogProgress
);
118 DDX_Control(pDX
, IDC_SPLITTERTOP
, m_wndSplitter1
);
119 DDX_Control(pDX
, IDC_SPLITTERBOTTOM
, m_wndSplitter2
);
120 DDX_Text(pDX
, IDC_SEARCHEDIT
, m_LogList
.m_sFilterText
);
121 DDX_Control(pDX
, IDC_DATEFROM
, m_DateFrom
);
122 DDX_Control(pDX
, IDC_DATETO
, m_DateTo
);
123 DDX_Control(pDX
, IDC_LOG_JUMPTYPE
, m_JumpType
);
124 DDX_Control(pDX
, IDC_LOG_JUMPUP
, m_JumpUp
);
125 DDX_Control(pDX
, IDC_LOG_JUMPDOWN
, m_JumpDown
);
126 DDX_Text(pDX
, IDC_LOGINFO
, m_sLogInfo
);
127 DDX_Check(pDX
, IDC_LOG_ALLBRANCH
,m_bAllBranch
);
128 DDX_Check(pDX
, IDC_SHOWWHOLEPROJECT
,m_bWholeProject
);
129 DDX_Check(pDX
, IDC_WALKBEHAVIOUR
, m_bWalkBehavior
);
130 DDX_Control(pDX
, IDC_SEARCHEDIT
, m_cFilter
);
131 DDX_Control(pDX
, IDC_STATIC_REF
, m_staticRef
);
132 DDX_Control(pDX
, IDC_PIC_AUTHOR
, m_gravatar
);
135 BEGIN_MESSAGE_MAP(CLogDlg
, CResizableStandAloneDialog
)
138 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGLIST
, OnLvnItemchangedLoglist
)
139 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGMSG
, OnLvnItemchangedLogmsg
)
140 ON_NOTIFY(EN_LINK
, IDC_MSGVIEW
, OnEnLinkMsgview
)
141 ON_BN_CLICKED(IDC_STATBUTTON
, OnBnClickedStatbutton
)
143 ON_MESSAGE(WM_TGIT_REFRESH_SELECTION
, OnRefreshSelection
)
144 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED
, OnClickedInfoIcon
)
145 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED
, OnClickedCancelFilter
)
147 ON_MESSAGE(MSG_LOAD_PERCENTAGE
,OnLogListLoading
)
149 ON_EN_CHANGE(IDC_SEARCHEDIT
, OnEnChangeSearchedit
)
151 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATETO
, OnDtnDatetimechangeDateto
)
152 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATEFROM
, OnDtnDatetimechangeDatefrom
)
153 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE
, &CLogDlg::OnCbnSelchangeJumpType
)
154 ON_COMMAND(IDC_LOG_JUMPUP
, &CLogDlg::OnBnClickedJumpUp
)
155 ON_COMMAND(IDC_LOG_JUMPDOWN
, &CLogDlg::OnBnClickedJumpDown
)
156 ON_BN_CLICKED(IDC_WALKBEHAVIOUR
, OnBnClickedWalkBehaviour
)
157 ON_BN_CLICKED(IDC_VIEW
, OnBnClickedView
)
158 ON_BN_CLICKED(IDC_SHOWWHOLEPROJECT
, OnBnClickShowWholeProject
)
159 ON_NOTIFY(LVN_COLUMNCLICK
,IDC_LOGLIST
, OnLvnColumnclick
)
160 ON_COMMAND(MSG_FETCHED_DIFF
, OnBnClickedHidepaths
)
161 ON_BN_CLICKED(IDC_LOG_ALLBRANCH
, OnBnClickedAllBranch
)
163 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATEFROM
, &CLogDlg::OnDtnDropdownDatefrom
)
164 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATETO
, &CLogDlg::OnDtnDropdownDateto
)
166 ON_BN_CLICKED(IDC_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
167 ON_STN_CLICKED(IDC_STATIC_REF
, &CLogDlg::OnBnClickedBrowseRef
)
168 ON_COMMAND(ID_LOGDLG_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
169 ON_COMMAND(ID_LOGDLG_FIND
, &CLogDlg::OnFind
)
170 ON_COMMAND(ID_LOGDLG_FOCUSFILTER
, &CLogDlg::OnFocusFilter
)
171 ON_COMMAND(ID_EDIT_COPY
, &CLogDlg::OnEditCopy
)
172 ON_MESSAGE(MSG_REFLOG_CHANGED
, OnRefLogChanged
)
173 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
175 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED
, &CLogDlg::OnFileListCtrlItemChanged
)
183 JumpType_AuthorEmail
,
184 JumpType_CommitterEmail
,
194 void CLogDlg::SetParams(const CTGitPath
& orgPath
, const CTGitPath
& path
, CString hightlightRevision
, CString range
, int limit
)
198 m_hightlightRevision
= hightlightRevision
;
200 if (!(range
.IsEmpty() || range
== _T("HEAD")))
201 m_bAllBranch
= BST_UNCHECKED
;
206 if (::IsWindow(m_hWnd
))
210 void CLogDlg::SetFilter(const CString
& findstr
, LONG findtype
, bool findregex
)
212 m_LogList
.m_sFilterText
= findstr
;
214 m_LogList
.m_SelectedFilters
= findtype
;
215 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
= findregex
;
218 BOOL
CLogDlg::OnInitDialog()
221 CResizableStandAloneDialog::OnInitDialog();
222 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
224 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
225 // do this, Explorer would be unable to send that message to our window if we
226 // were running elevated. It's OK to make the call all the time, since if we're
227 // not elevated, this is a no-op.
228 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
229 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
230 CAutoLibrary hUser
= AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
233 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
234 if (pfnChangeWindowMessageFilterEx
)
236 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
239 m_pTaskbarList
.Release();
240 if (FAILED(m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
)))
241 m_pTaskbarList
= nullptr;
243 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG
));
245 // use the state of the "stop on copy/rename" option from the last time
248 // set the font to use in the log message view, configured in the settings dialog
249 CAppUtils::CreateFontForLogs(m_logFont
);
250 GetDlgItem(IDC_MSGVIEW
)->SetFont(&m_logFont
);
251 // automatically detect URLs in the log message and turn them into links
252 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_AUTOURLDETECT
, TRUE
, NULL
);
253 // make the log message rich edit control send a message when the mouse pointer is over a link
254 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_SETEVENTMASK
, NULL
, ENM_LINK
);
256 // "unrelated paths" should be in gray color
259 // set up the columns
260 m_LogList
.DeleteAllItems();
262 m_LogList
.m_Path
=m_path
;
263 m_LogList
.m_hasWC
= m_LogList
.m_bShowWC
= !g_GitAdminDir
.IsBareRepo(g_Git
.m_CurrentDir
);
264 m_LogList
.InsertGitColumn();
267 m_LogList
.m_Path
.Reset();
269 m_ChangedFileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("LogDlg"), (GITSLC_POPALL
^ (GITSLC_POPCOMMIT
|GITSLC_POPIGNORE
|GITSLC_POPRESTORE
)), false, m_LogList
.m_hasWC
, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
271 GetDlgItem(IDC_LOGLIST
)->UpdateData(FALSE
);
275 m_tooltips
.Create(this);
276 CheckRegexpTooltip();
280 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
281 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
);
282 m_cFilter
.SetInfoIcon(IDI_LOGFILTER
);
283 m_cFilter
.SetValidator(this);
285 AdjustControlSize(IDC_LOG_ALLBRANCH
);
286 AdjustControlSize(IDC_SHOWWHOLEPROJECT
);
288 GetClientRect(m_DlgOrigRect
);
289 m_LogList
.GetClientRect(m_LogListOrigRect
);
290 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(m_MsgViewOrigRect
);
291 m_ChangedFileListCtrl
.GetClientRect(m_ChgOrigRect
);
293 m_DateFrom
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
294 m_DateTo
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
296 m_staticRef
.SetURL(CString());
299 AddAnchor(IDC_STATIC_REF
, TOP_LEFT
);
300 //AddAnchor(IDC_BUTTON_BROWSE_REF, TOP_LEFT);
301 AddAnchor(IDC_FROMLABEL
, TOP_LEFT
);
302 AddAnchor(IDC_DATEFROM
, TOP_LEFT
);
303 AddAnchor(IDC_TOLABEL
, TOP_LEFT
);
304 AddAnchor(IDC_DATETO
, TOP_LEFT
);
307 AddAnchor(IDC_SEARCHEDIT
, TOP_LEFT
, TOP_RIGHT
);
308 AddAnchor(IDC_LOG_JUMPTYPE
, TOP_RIGHT
);
309 AddAnchor(IDC_LOG_JUMPUP
, TOP_RIGHT
);
310 AddAnchor(IDC_LOG_JUMPDOWN
, TOP_RIGHT
);
312 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
313 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
314 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
315 AddAnchor(IDC_PIC_AUTHOR
, TOP_RIGHT
);
316 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
317 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
319 AddAnchor(IDC_LOGINFO
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
320 AddAnchor(IDC_WALKBEHAVIOUR
, BOTTOM_LEFT
);
321 AddAnchor(IDC_VIEW
, BOTTOM_LEFT
);
322 AddAnchor(IDC_LOG_ALLBRANCH
,BOTTOM_LEFT
);
323 AddAnchor(IDC_SHOWWHOLEPROJECT
, BOTTOM_LEFT
);
324 AddAnchor(IDC_REFRESH
, BOTTOM_LEFT
);
325 AddAnchor(IDC_STATBUTTON
, BOTTOM_RIGHT
);
326 AddAnchor(IDC_PROGRESS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
327 AddAnchor(IDOK
, BOTTOM_RIGHT
);
328 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
329 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
331 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_LOCAL_BRANCHES
;
332 if (m_bAllBranch
== BST_CHECKED
)
333 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
334 else if (m_bAllBranch
== BST_INDETERMINATE
)
335 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
337 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_ALL_BRANCH
;
339 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
340 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
341 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
343 // SetPromptParentWindow(m_hWnd);
344 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL
)));
345 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL
)));
346 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT
)));
347 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1
)));
348 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2
)));
349 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG
)));
350 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF
)));
351 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH
)));
352 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH_FF
)));
353 m_JumpType
.SetCurSel(0);
354 m_JumpUp
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
355 m_JumpDown
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
358 CenterWindow(CWnd::FromHandle(hWndExplorer
));
359 EnableSaveRestore(_T("LogDlg"));
361 DWORD yPos1
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
362 DWORD yPos2
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
363 RECT rcDlg
, rcLogList
, rcChgMsg
;
364 GetClientRect(&rcDlg
);
365 m_LogList
.GetWindowRect(&rcLogList
);
366 ScreenToClient(&rcLogList
);
367 m_ChangedFileListCtrl
.GetWindowRect(&rcChgMsg
);
368 ScreenToClient(&rcChgMsg
);
372 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
373 ScreenToClient(&rectSplitter
);
374 int delta
= yPos1
- rectSplitter
.top
;
376 if ((rcLogList
.bottom
+ delta
> rcLogList
.top
)&&(rcLogList
.bottom
+ delta
< rcChgMsg
.bottom
- 30))
378 m_wndSplitter1
.SetWindowPos(NULL
, rectSplitter
.left
, yPos1
, 0, 0, SWP_NOSIZE
);
385 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
386 ScreenToClient(&rectSplitter
);
387 int delta
= yPos2
- rectSplitter
.top
;
389 if ((rcChgMsg
.top
+ delta
< rcChgMsg
.bottom
)&&(rcChgMsg
.top
+ delta
> rcLogList
.top
+ 30))
391 m_wndSplitter2
.SetWindowPos(NULL
, rectSplitter
.left
, yPos2
, 0, 0, SWP_NOSIZE
);
400 // the dialog is used to select revisions
401 // enable the OK button if appropriate
406 // the dialog is used to just view log messages
407 // hide the OK button and set text on Cancel button to OK
408 GetDlgItemText(IDOK
, temp
);
409 SetDlgItemText(IDCANCEL
, temp
);
410 GetDlgItem(IDOK
)->ShowWindow(SW_HIDE
);
413 // first start a thread to obtain the log messages without
414 // blocking the dialog
416 //m_tFrom = (DWORD)-1;
418 // scroll to user selected or current revision
419 if (!m_hightlightRevision
.IsEmpty() && m_hightlightRevision
.GetLength() >= GIT_HASH_SIZE
)
420 m_LogList
.m_lastSelectedHash
= m_hightlightRevision
;
423 if (g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, _T("HEAD")))
424 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
427 if (g_Git
.GetConfigValueBool(_T("tgit.logshowpatch")))
430 m_LogList
.FetchLogAsync(this);
434 GetDlgItem(IDC_LOGLIST
)->SetFocus();
436 m_History
.SetMaxHistoryItems((LONG
)CRegDWORD(_T("Software\\TortoiseGit\\MaxRefHistoryItems"), 5));
438 reg
.Format(_T("Software\\TortoiseGit\\History\\log-refs\\%s"), g_Git
.m_CurrentDir
);
439 reg
.Replace(_T(':'),_T('_'));
440 m_History
.Load(reg
, _T("ref"));
446 LRESULT
CLogDlg::OnLogListLoading(WPARAM wParam
, LPARAM
/*lParam*/)
450 if( cur
== GITLOG_START
)
453 temp
.LoadString(IDS_PROGRESSWAIT
);
455 this->m_LogList
.ShowText(temp
, true);
457 // We use a progress bar while getting the logs
458 m_LogProgress
.SetRange32(0, 100);
459 m_LogProgress
.SetPos(0);
462 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
463 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
466 GetDlgItem(IDC_PROGRESS
)->ShowWindow(TRUE
);
468 DialogEnableWindow(IDC_WALKBEHAVIOUR
, FALSE
);
469 DialogEnableWindow(IDC_STATBUTTON
, FALSE
);
470 //DialogEnableWindow(IDC_REFRESH, FALSE);
471 DialogEnableWindow(IDC_VIEW
, FALSE
);
474 else if( cur
== GITLOG_END
)
476 if(this->m_LogList
.HasText())
478 this->m_LogList
.ClearText();
480 UpdateLogInfoLabel();
483 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
485 DialogEnableWindow(IDC_SHOWWHOLEPROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
487 DialogEnableWindow(IDC_STATBUTTON
, !(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
));
488 DialogEnableWindow(IDC_REFRESH
, TRUE
);
489 DialogEnableWindow(IDC_VIEW
, TRUE
);
490 DialogEnableWindow(IDC_WALKBEHAVIOUR
, TRUE
);
491 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
492 GetDlgItem(IDC_PROGRESS
)->ShowWindow(FALSE
);
493 //CTime time=m_LogList.GetOldestTime();
495 m_LogList
.GetTimeRange(begin
,end
);
497 if(m_LogList
.m_From
== -1)
498 m_DateFrom
.SetTime(&begin
);
500 if(m_LogList
.m_To
== -1)
501 m_DateTo
.SetTime(&end
);
507 if(this->m_LogList
.HasText())
509 this->m_LogList
.ClearText();
510 this->m_LogList
.Invalidate();
512 UpdateLogInfoLabel();
513 m_LogProgress
.SetPos(cur
);
516 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
517 m_pTaskbarList
->SetProgressValue(m_hWnd
, cur
, 100);
522 void CLogDlg::SetDlgTitle()
524 if (m_sTitle
.IsEmpty())
525 GetWindowText(m_sTitle
);
527 if (m_LogList
.m_Path
.IsEmpty() || m_orgPath
.GetWinPathString().IsEmpty())
529 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
532 CAppUtils::SetWindowTitle(m_hWnd
, m_orgPath
.GetWinPathString(), m_sTitle
);
535 void CLogDlg::CheckRegexpTooltip()
537 CWnd
*pWnd
= GetDlgItem(IDC_SEARCHEDIT
);
538 // Since tooltip describes regexp features, show it only if regexps are enabled.
539 if (m_bFilterWithRegex
)
541 m_tooltips
.AddTool(pWnd
, IDS_LOG_FILTER_REGEX_TT
);
544 m_tooltips
.DelTool(pWnd
);
547 void CLogDlg::EnableOKButton()
551 // the dialog is used to select revisions
552 if (m_bSelectionMustBeSingle
)
554 // enable OK button if only a single revision is selected
555 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()==1));
557 else if (m_bSelectionMustBeContinuous
)
558 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()!=0)&&(m_LogList
.IsSelectionContinuous()));
560 DialogEnableWindow(IDOK
, m_LogList
.GetSelectedCount()!=0);
563 DialogEnableWindow(IDOK
, TRUE
);
566 CString
CLogDlg::GetTagInfo(GitRev
* pLogEntry
)
571 if(m_LogList
.m_HashMap
.find(pLogEntry
->m_CommitHash
) != m_LogList
.m_HashMap
.end())
573 STRING_VECTOR
&vector
= m_LogList
.m_HashMap
[pLogEntry
->m_CommitHash
];
574 for (size_t i
= 0; i
< vector
.size(); ++i
)
576 if(vector
[i
].Find(_T("refs/tags/")) == 0 )
578 CString tag
= vector
[i
];
579 int start
= vector
[i
].Find(_T("^{}"));
585 cmd
.Format(_T("git.exe cat-file tag %s"), tag
);
587 if(g_Git
.Run(cmd
, &output
, NULL
, CP_UTF8
) == 0 )
593 if(!output
.IsEmpty())
595 output
= _T("\n*") + CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO
)) + _T("*\n\n") + output
;
601 bool LookLikeGitHash(const CString
& msg
, int &pos
)
604 for (; pos
< msg
.GetLength(); ++pos
)
606 if (msg
[pos
] >= '0' && msg
[pos
] <= '9' || msg
[pos
] >= 'a' && msg
[pos
] <= 'f')
612 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2;
615 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2;
618 std::vector
<CHARRANGE
> FindGitHashPositions(const CString
& msg
, int offset
)
620 std::vector
<CHARRANGE
> result
;
621 offset
= offset
< 0 ? 0 : offset
;
623 while (offset
< msg
.GetLength())
626 TCHAR b
= offset
> 1 ? msg
[offset
- 2] : '\0';
627 TCHAR c
= offset
> 0 ? msg
[offset
- 1] : '\0';
628 // git hash can optionally starts with 'g'
629 if ((c
== 'g' && (offset
== 0 || !((b
>= 'A' && b
<= 'Z') || (b
>= 'h' && b
<= 'z'))))
630 || (!((c
>= 'A' && c
<= 'Z') || (c
>= 'h' && c
<= 'z'))))
634 if (msg
.Mid(offset
, 11) == _T("git-svn-id:") || msg
.Mid(offset
, 14) == _T("Signed-off-by:"))
637 while (offset
< msg
.GetLength())
639 if (msg
[offset
++] == '\n')
646 if (LookLikeGitHash(msg
, offset
))
648 TCHAR d
= offset
< msg
.GetLength() ? msg
[offset
] : '\0';
649 if (!((d
>= 'A' && d
<= 'Z') || (d
>= 'g' && d
<= 'z')))
651 CHARRANGE range
= { old
, offset
};
652 result
.push_back(range
);
662 BOOL
FindGitHash(const CString
& msg
, int offset
, CWnd
*pWnd
)
664 std::vector
<CHARRANGE
> positions
= FindGitHashPositions(msg
, offset
);
665 CAppUtils::SetCharFormat(pWnd
, CFM_LINK
, CFE_LINK
, positions
);
667 return positions
.empty() ? FALSE
: TRUE
;
670 void CLogDlg::FillLogMessageCtrl(bool bShow
/* = true*/)
672 // we fill here the log message rich edit control,
673 // and also populate the changed files list control
674 // according to the selected revision(s).
676 CRichEditCtrl
* pMsgView
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
677 // empty the log message view
678 pMsgView
->SetWindowText(_T(" "));
680 // empty the changed files list
681 m_ChangedFileListCtrl
.SetRedraw(FALSE
);
682 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
683 m_currentChangedArray
= NULL
;
684 m_ChangedFileListCtrl
.DeleteAllItems();
686 // if we're not here to really show a selected revision, just
687 // get out of here after clearing the views, which is what is intended
688 // if that flag is not set.
692 m_ChangedFileListCtrl
.Invalidate();
693 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
694 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
695 m_gravatar
.LoadGravatar();
699 // depending on how many revisions are selected, we have to do different
701 int selCount
= m_LogList
.GetSelectedCount();
704 // if nothing is selected, we have nothing more to do
705 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
706 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
707 m_gravatar
.LoadGravatar();
710 else if (selCount
== 1)
712 // if one revision is selected, we have to fill the log message view
713 // with the corresponding log message, and also fill the changed files
715 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
716 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
717 if (selIndex
>= m_LogList
.m_arShownList
.GetCount())
719 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
720 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
723 Locker
lock(m_LogList
.m_critSec_AsyncDiff
);
724 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
727 // set the log message text
728 pMsgView
->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH
)) + _T(": ") + pLogEntry
->m_CommitHash
.ToString() + _T("\r\n\r\n"));
729 // turn bug ID's into links if the bugtraq: properties have been set
730 // and we can find a match of those in the log message
732 pMsgView
->SetSel(-1,-1);
734 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
735 format
.cbSize
= sizeof(CHARFORMAT2
);
736 format
.dwMask
= CFM_BOLD
;
737 format
.dwEffects
= CFE_BOLD
;
738 pMsgView
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
740 CString msg
=_T("* ");
741 msg
+=pLogEntry
->GetSubject();
742 pMsgView
->ReplaceSel(msg
);
744 pMsgView
->SetSel(-1,-1);
745 format
.dwEffects
= 0;
746 pMsgView
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
749 msg
+=pLogEntry
->GetBody();
751 if(!pLogEntry
->m_Notes
.IsEmpty())
753 msg
+= _T("\n*") + CString(MAKEINTRESOURCE(IDS_NOTES
)) + _T("* ");
754 msg
+= pLogEntry
->m_Notes
;
758 msg
+=GetTagInfo(pLogEntry
);
760 pMsgView
->ReplaceSel(msg
);
763 pMsgView
->GetWindowText(text
);
764 // the rich edit control doesn't count the CR char!
765 // to be exact: CRLF is treated as one char.
768 FindGitHash(text
, text
.Find('\n'), pMsgView
);
769 m_LogList
.m_ProjectProperties
.FindBugID(text
, pMsgView
);
770 if (((DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\StyleCommitMessages"), TRUE
)) == TRUE
)
771 CAppUtils::FormatTextInRichEditControl(pMsgView
);
776 pMsgView
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
778 CString matchpath
=this->m_path
.GetGitPathString();
780 int count
= pLogEntry
->GetFiles(&m_LogList
).GetCount();
781 for (int i
= 0 ; i
< count
&& (!matchpath
.IsEmpty()); ++i
)
783 if( m_bWholeProject
)
786 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
|CTGitPath::LOGACTIONS_GRAY
);
788 if(pLogEntry
->GetFiles(&m_LogList
)[i
].GetGitPathString().Left(matchpath
.GetLength()) != matchpath
&& pLogEntry
->GetFiles(&m_LogList
)[i
].GetGitOldPathString().Left(matchpath
.GetLength()) != matchpath
)
790 if (m_iHidePaths
== 1)
791 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
792 else if (m_iHidePaths
== 2)
793 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
|= CTGitPath::LOGACTIONS_GRAY
;
797 m_ChangedFileListCtrl
.UpdateWithGitPathList(pLogEntry
->GetFiles(&m_LogList
));
798 m_ChangedFileListCtrl
.m_CurrentVersion
=pLogEntry
->m_CommitHash
;
799 if (pLogEntry
->m_CommitHash
.IsEmpty() && m_bShowUnversioned
)
801 m_ChangedFileListCtrl
.UpdateUnRevFileList(pLogEntry
->GetUnRevFiles());
802 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
| GITSLC_SHOWUNVERSIONED
);
805 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
807 m_ChangedFileListCtrl
.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES
)));
809 if(!pLogEntry
->m_IsDiffFiles
)
810 m_ChangedFileListCtrl
.SetBusy(TRUE
);
812 m_ChangedFileListCtrl
.SetBusy(FALSE
);
814 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
815 m_gravatar
.LoadGravatar(pLogEntry
->GetAuthorEmail());
822 // more than one revision is selected:
823 // the log message view must be emptied
824 // the changed files list contains all the changed paths from all
825 // selected revisions, with 'doubles' removed
826 m_currentChangedPathList
= GetChangedPathsFromSelectedRevisions(true);
827 m_gravatar
.LoadGravatar();
831 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
833 if (m_currentChangedArray
)
835 m_ChangedFileListCtrl
.SetItemCountEx(m_currentChangedArray
->GetCount());
836 m_ChangedFileListCtrl
.RedrawItems(0, m_currentChangedArray
->GetCount());
838 else if (m_currentChangedPathList
.GetCount())
840 m_ChangedFileListCtrl
.SetItemCountEx(m_currentChangedPathList
.GetCount());
841 m_ChangedFileListCtrl
.RedrawItems(0, m_currentChangedPathList
.GetCount());
845 m_ChangedFileListCtrl
.SetItemCountEx(0);
846 m_ChangedFileListCtrl
.Invalidate();
849 // sort according to the settings
850 if (m_nSortColumnPathList
> 0)
851 SetSortArrow(&m_ChangedFileListCtrl
, m_nSortColumnPathList
, m_bAscendingPathList
);
853 SetSortArrow(&m_ChangedFileListCtrl
, -1, false);
854 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
858 void CLogDlg::FillPatchView(bool onlySetTimer
)
860 if (!::IsWindow(this->m_patchViewdlg
.m_hWnd
))
863 KillTimer(LOG_FILLPATCHVTIMER
);
866 SetTimer(LOG_FILLPATCHVTIMER
, 100, nullptr);
870 POSITION posLogList
= m_LogList
.GetFirstSelectedItemPosition();
871 if (posLogList
== nullptr)
873 m_patchViewdlg
.ClearView();
874 return; // nothing is selected, get out of here
877 GitRev
* pLogEntry
= reinterpret_cast<GitRev
* >(m_LogList
.m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(posLogList
)));
878 if (pLogEntry
== nullptr || m_LogList
.GetNextSelectedItem(posLogList
) != -1)
880 m_patchViewdlg
.ClearView();
884 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
889 int nSelect
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
890 CTGitPath
* p
= (CTGitPath
*)m_ChangedFileListCtrl
.GetItemData(nSelect
);
891 if (p
&& !(p
->m_Action
&CTGitPath::LOGACTIONS_UNVER
))
894 cmd
.Format(_T("git.exe diff %s~1..%s -- \"%s\""), pLogEntry
->m_CommitHash
.ToString(), pLogEntry
->m_CommitHash
.ToString(), p
->GetGitPathString());
895 g_Git
.Run(cmd
, &out
, CP_UTF8
);
899 m_patchViewdlg
.SetText(out
);
902 void CLogDlg::TogglePatchView()
904 m_patchViewdlg
.m_pProjectProperties
= &m_LogList
.m_ProjectProperties
;
905 m_patchViewdlg
.m_ParentDlg
= this;
906 if (!IsWindow(m_patchViewdlg
.m_hWnd
))
908 BOOL viewPatchEnabled
= FALSE
;
909 viewPatchEnabled
= g_Git
.GetConfigValueBool(_T("tgit.logshowpatch"));
910 if (viewPatchEnabled
== FALSE
)
911 g_Git
.SetConfigValue(_T("tgit.logshowpatch"), _T("true"));
912 m_patchViewdlg
.Create(IDD_PATCH_VIEW
, this);
913 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTHTRACKING
, TRUE
);
915 this->GetWindowRect(&rect
);
917 m_patchViewdlg
.ShowWindow(SW_SHOW
);
918 m_patchViewdlg
.SetWindowPos(nullptr, rect
.right
, rect
.top
, rect
.Width(), rect
.Height(), SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOZORDER
);
924 g_Git
.SetConfigValue(_T("tgit.logshowpatch"), _T("false"));
925 m_patchViewdlg
.ShowWindow(SW_HIDE
);
926 m_patchViewdlg
.DestroyWindow();
930 LRESULT
CLogDlg::OnFileListCtrlItemChanged(WPARAM
/*wparam*/, LPARAM
/*lparam*/)
936 void CLogDlg::OnMoving(UINT fwSide
, LPRECT pRect
)
938 __super::OnMoving(fwSide
, pRect
);
940 if (!::IsWindow(m_patchViewdlg
.m_hWnd
))
944 m_patchViewdlg
.GetWindowRect(&patchrect
);
945 if (!::IsWindow(m_hWnd
))
949 GetWindowRect(&thisrect
);
950 if (patchrect
.left
== thisrect
.right
)
952 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
);
956 void CLogDlg::OnSizing(UINT fwSide
, LPRECT pRect
)
958 __super::OnSizing(fwSide
, pRect
);
960 if (!::IsWindow(this->m_patchViewdlg
.m_hWnd
))
963 CRect thisrect
, patchrect
;
964 this->GetWindowRect(thisrect
);
965 this->m_patchViewdlg
.GetWindowRect(patchrect
);
966 if (thisrect
.right
!= patchrect
.left
)
969 patchrect
.left
-= (thisrect
.right
- pRect
->right
);
970 patchrect
.right
-= (thisrect
.right
- pRect
->right
);
972 if (patchrect
.bottom
== thisrect
.bottom
)
973 patchrect
.bottom
-= (thisrect
.bottom
- pRect
->bottom
);
974 if (patchrect
.top
== thisrect
.top
)
975 patchrect
.top
-= thisrect
.top
- pRect
->top
;
976 m_patchViewdlg
.MoveWindow(patchrect
);
979 void CLogDlg::OnBnClickedRefresh()
984 void CLogDlg::Refresh (bool clearfilter
/*autoGoOnline*/)
987 m_LogList
.Refresh(clearfilter
);
990 FillLogMessageCtrl(false);
995 BOOL
CLogDlg::Cancel()
1000 void CLogDlg::SaveSplitterPos()
1004 CRegDWORD regPos1
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
1005 CRegDWORD regPos2
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
1007 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
1008 ScreenToClient(&rectSplitter
);
1009 regPos1
= rectSplitter
.top
;
1010 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
1011 ScreenToClient(&rectSplitter
);
1012 regPos2
= rectSplitter
.top
;
1016 void CLogDlg::OnCancel()
1018 this->ShowWindow(SW_HIDE
);
1020 // canceling means stopping the working thread if it's still running.
1021 m_LogList
.SafeTerminateAsyncDiffThread();
1022 if (this->IsThreadRunning())
1024 m_LogList
.SafeTerminateThread();
1029 __super::OnCancel();
1032 void CLogDlg::CopyChangedSelectionToClipBoard()
1035 POSITION posLogList
= m_LogList
.GetFirstSelectedItemPosition();
1036 if (posLogList
== nullptr)
1037 return; // nothing is selected, get out of here
1041 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1044 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1047 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1048 CTGitPath
*path
= (CTGitPath
*)m_ChangedFileListCtrl
.GetItemData(nItem
);
1050 sPaths
+= path
->GetGitPathString();
1051 sPaths
+= _T("\r\n");
1057 // only one revision is selected in the log dialog top pane
1058 // but multiple items could be selected in the changed items list
1059 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1062 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1063 LogChangedPath
* changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(nItem
);
1065 if ((m_cHidePaths
.GetState() & 0x0003)==BST_CHECKED
)
1067 // some items are hidden! So find out which item the user really selected
1068 INT_PTR selRealIndex
= -1;
1069 for (INT_PTR hiddenindex
=0; hiddenindex
<pLogEntry
->pArChangedPaths
->GetCount(); ++hiddenindex
)
1071 if (pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
)->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0)
1073 if (selRealIndex
== nItem
)
1075 changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
);
1082 sPaths
+= changedlogpath
->sPath
;
1083 sPaths
+= _T("\r\n");
1089 CStringUtils::WriteAsciiStringToClipboard(sPaths
, GetSafeHwnd());
1093 void CLogDlg::OnContextMenu(CWnd
* pWnd
, CPoint point
)
1095 // we have three separate context menus:
1096 // one for the branch label in the upper left
1097 // one shown on the log message list control,
1098 // one shown in the changed-files list control
1099 if (pWnd
== GetDlgItem(IDC_STATIC_REF
))
1102 if (!popup
.CreatePopupMenu())
1106 popup
.AppendMenuIcon(++cnt
, IDS_MENUREFBROWSE
);
1107 popup
.SetDefaultItem(cnt
);
1108 popup
.AppendMenuIcon(++cnt
, _T("HEAD"));
1109 popup
.AppendMenuIcon(++cnt
, IDS_ALL
);
1110 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1111 popup
.AppendMenuIcon(++cnt
, IDS_PROC_LOG_SELECT_LOCAL_BRANCHES
);
1112 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1114 if (m_History
.GetCount() > 0)
1116 popup
.AppendMenu(MF_SEPARATOR
, 0);
1117 for (size_t i
= 0; i
< m_History
.GetCount(); ++i
)
1119 CString entry
= m_History
.GetEntry(i
);
1120 if (entry
.GetLength() > 150)
1121 entry
= entry
.Left(150) + _T("...");
1122 popup
.AppendMenuIcon(cnt
++, entry
);
1126 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1131 OnBnClickedBrowseRef();
1135 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
);
1136 m_bAllBranch
= BST_UNCHECKED
;
1139 SetRange(g_Git
.GetCurrentBranch(true));
1143 m_bAllBranch
= BST_CHECKED
;
1144 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_ALL_BRANCH
;
1148 m_bAllBranch
= BST_INDETERMINATE
;
1149 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
1151 else if (cmd
>= offset
)
1153 SetRange(m_History
.GetEntry(cmd
- offset
));
1154 m_History
.AddEntry(m_LogList
.m_sRange
);
1161 FillLogMessageCtrl(false);
1165 int selCount
= m_LogList
.GetSelectedCount();
1166 if ((selCount
== 1)&&(pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1168 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1171 selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1173 GitRev
*pRev
= ((GitRev
*)m_LogList
.m_arShownList
[selIndex
]);
1175 if ((point
.x
== -1) && (point
.y
== -1))
1178 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(&rect
);
1179 ClientToScreen(&rect
);
1180 point
= rect
.CenterPoint();
1182 CString sMenuItemText
;
1184 if (popup
.CreatePopupMenu())
1186 // add the 'default' entries
1187 sMenuItemText
.LoadString(IDS_SCIEDIT_COPY
);
1188 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, WM_COPY
, sMenuItemText
);
1189 sMenuItemText
.LoadString(IDS_SCIEDIT_SELECTALL
);
1190 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, EM_SETSEL
, sMenuItemText
);
1191 sMenuItemText
.LoadString(IDS_EDIT_NOTES
);
1192 popup
.AppendMenuIcon( CGitLogList::ID_EDITNOTE
, sMenuItemText
, IDI_EDIT
);
1194 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1198 break; // no command selected
1201 ::SendMessage(GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), cmd
, 0, -1);
1203 case CGitLogList::ID_EDITNOTE
:
1204 CAppUtils::EditNote(pRev
);
1205 this->FillLogMessageCtrl(true);
1212 void CLogDlg::OnOK()
1214 // since the log dialog is also used to select revisions for other
1215 // dialogs, we have to do some work before closing this dialog
1216 if (GetFocus() != GetDlgItem(IDOK
))
1217 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
1219 m_LogList
.SafeTerminateAsyncDiffThread();
1220 if (this->IsThreadRunning())
1222 m_LogList
.SafeTerminateThread();
1225 // check that one and only one row is selected
1226 if (m_LogList
.GetSelectedCount() == 1)
1228 // get the selected row
1229 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1230 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1231 if (selIndex
< m_LogList
.m_arShownList
.GetCount())
1233 // all ok, pick up the revision
1234 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
1236 m_sSelectedHash
= pLogEntry
->m_CommitHash
;
1244 if (!GetDlgItem(IDOK
)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL
))
1245 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
1249 GetDlgItemText(IDOK
, buttontext
);
1250 temp
.LoadString(IDS_MSGBOX_CANCEL
);
1251 if (temp
.Compare(buttontext
) != 0)
1252 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
1253 m_bCancelled
= TRUE
;
1254 m_selectedRevs
.Clear();
1255 m_selectedRevsOneRange
.Clear();
1256 if (m_pNotifyWindow
)
1258 int selIndex
= m_LogList
.GetSelectionMark();
1261 PLOGENTRYDATA pLogEntry
= NULL
;
1262 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1263 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1264 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1265 git_revnum_t lowerRev
= pLogEntry
->Rev
;
1266 git_revnum_t higherRev
= lowerRev
;
1269 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1270 git_revnum_t rev
= pLogEntry
->Rev
;
1271 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1274 if (higherRev
< rev
)
1277 if (m_sFilterText
.IsEmpty() && m_nSortColumn
== 0 && IsSelectionContinuous())
1279 m_selectedRevsOneRange
.AddRevRange(lowerRev
, higherRev
);
1281 BOOL bSentMessage
= FALSE
;
1282 if (m_LogList
.GetSelectedCount() == 1)
1284 // if only one revision is selected, check if the path/url with which the dialog was started
1285 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1286 // if it was copied, use the copy from revision as lowerRev
1287 if ((pLogEntry
)&&(pLogEntry
->pArChangedPaths
)&&(lowerRev
== higherRev
))
1289 CString sUrl
= m_path
.GetGitPathString();
1290 if (!m_path
.IsUrl())
1292 sUrl
= GetURLFromPath(m_path
);
1294 sUrl
= sUrl
.Mid(m_sRepositoryRoot
.GetLength());
1295 for (int cp
= 0; cp
< pLogEntry
->pArChangedPaths
->GetCount(); ++cp
)
1297 LogChangedPath
* pData
= pLogEntry
->pArChangedPaths
->SafeGetAt(cp
);
1300 if (sUrl
.Compare(pData
->sPath
) == 0)
1302 if (!pData
->sCopyFromPath
.IsEmpty())
1304 lowerRev
= pData
->lCopyFromRev
;
1305 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
), lowerRev
);
1306 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
), higherRev
);
1307 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1308 bSentMessage
= TRUE
;
1315 if ( !bSentMessage
)
1317 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
| MERGE_REVSELECTMINUSONE
), lowerRev
);
1318 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
| MERGE_REVSELECTMINUSONE
), higherRev
);
1319 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1320 if (m_selectedRevsOneRange
.GetCount())
1321 m_pNotifyWindow
->SendMessage(WM_REVLISTONERANGE
, 0, (LPARAM
)&m_selectedRevsOneRange
);
1326 CRegDWORD reg
= CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
1331 void CLogDlg::DoDiffFromLog(INT_PTR selIndex
, GitRev
* rev1
, GitRev
* rev2
, bool /*blame*/, bool /*unified*/)
1333 DialogEnableWindow(IDOK
, FALSE
);
1334 // SetPromptApp(&theApp);
1335 theApp
.DoWaitCursor(1);
1338 GetTempPath(temppath
);
1341 file1
.Format(_T("%s%s_%s%s"),
1343 (*m_currentChangedArray
)[selIndex
].GetBaseFilename(),
1344 rev1
->m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()),
1345 (*m_currentChangedArray
)[selIndex
].GetFileExtension());
1348 file2
.Format(_T("%s\\%s_%s%s"),
1350 (*m_currentChangedArray
)[selIndex
].GetBaseFilename(),
1351 rev2
->m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()),
1352 (*m_currentChangedArray
)[selIndex
].GetFileExtension());
1355 CTGitPath
&path
= (CTGitPath
&)(*m_currentChangedArray
)[selIndex
];
1357 g_Git
.GetOneFile(rev1
->m_CommitHash
.ToString(), path
, file1
);
1358 g_Git
.GetOneFile(rev2
->m_CommitHash
.ToString(), path
, file2
);
1360 CAppUtils::DiffFlags flags
;
1361 CAppUtils::StartExtDiff(file1
,file2
,_T("A"),_T("B"),
1362 g_Git
.m_CurrentDir
+ _T("\\") + path
.GetWinPathString(), g_Git
.m_CurrentDir
+ _T("\\") + path
.GetWinPathString(),
1363 rev1
->m_CommitHash
.ToString(), rev2
->m_CommitHash
.ToString(),
1366 theApp
.DoWaitCursor(-1);
1370 BOOL
CLogDlg::PreTranslateMessage(MSG
* pMsg
)
1372 // Skip Ctrl-C when copying text out of the log message or search filter
1373 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);
1374 if (pMsg
->message
== WM_KEYDOWN
&& pMsg
->wParam
=='\r')
1376 if (GetFocus()==GetDlgItem(IDC_LOGLIST
))
1378 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE
))
1380 m_LogList
.DiffSelectedRevWithPrevious();
1384 if (GetFocus() == GetDlgItem(IDC_SEARCHEDIT
))
1386 KillTimer(LOGFILTER_TIMER
);
1388 m_LogList
.Refresh(FALSE
);
1389 FillLogMessageCtrl(false);
1392 if (m_hAccel
&& !bSkipAccelerator
)
1394 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1399 if(::IsWindow(m_tooltips
.m_hWnd
))
1400 m_tooltips
.RelayEvent(pMsg
);
1401 return __super::PreTranslateMessage(pMsg
);
1405 BOOL
CLogDlg::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
1407 //if (this->IsThreadRunning())
1408 if(m_LogList
.m_bNoDispUpdates
)
1410 // only show the wait cursor over the list control
1412 ((pWnd
== GetDlgItem(IDC_LOGLIST
))||
1413 (pWnd
== GetDlgItem(IDC_MSGVIEW
))||
1414 (pWnd
== GetDlgItem(IDC_LOGMSG
))))
1416 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_WAIT
));
1421 if ((pWnd
) && (pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1422 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1424 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_ARROW
));
1426 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1429 void CLogDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1431 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1433 //if (this->IsThreadRunning())
1434 if(m_LogList
.m_bNoDispUpdates
)
1436 if (pNMLV
->iItem
>= 0)
1438 this->m_LogList
.m_nSearchIndex
= pNMLV
->iItem
;
1439 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(pNMLV
->iItem
));
1440 if (pLogEntry
== nullptr)
1442 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1443 if (pNMLV
->iSubItem
!= 0)
1445 if ((pNMLV
->iItem
== m_LogList
.m_arShownList
.GetCount()))
1447 // remove the selected state
1448 if (pNMLV
->uChanged
& LVIF_STATE
)
1450 m_LogList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1451 FillLogMessageCtrl();
1453 UpdateLogInfoLabel();
1457 if (pNMLV
->uChanged
& LVIF_STATE
)
1459 FillLogMessageCtrl();
1465 m_LogList
.m_lastSelectedHash
.Empty();
1466 FillLogMessageCtrl();
1470 UpdateLogInfoLabel();
1473 void CLogDlg::OnLvnItemchangedLogmsg(NMHDR
* /*pNMHDR*/, LRESULT
* /*pResult*/)
1475 UpdateLogInfoLabel();
1478 void CLogDlg::OnEnLinkMsgview(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1480 ENLINK
*pEnLink
= reinterpret_cast<ENLINK
*>(pNMHDR
);
1481 if (pEnLink
->msg
== WM_LBUTTONUP
)
1484 GetDlgItemText(IDC_MSGVIEW
, msg
);
1485 msg
.Replace(_T("\r\n"), _T("\n"));
1486 url
= msg
.Mid(pEnLink
->chrg
.cpMin
, pEnLink
->chrg
.cpMax
-pEnLink
->chrg
.cpMin
);
1488 if (LookLikeGitHash(url
, pos
))
1491 for (int i
= 0; i
< m_LogList
.m_arShownList
.GetCount(); ++i
)
1493 GitRev
*rev
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1495 if (rev
->m_CommitHash
.ToString().Left(url
.GetLength()) == url
)
1497 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1500 int index
= m_LogList
.GetNextSelectedItem(pos
);
1502 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1504 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
1505 m_LogList
.EnsureVisible(i
, FALSE
);
1506 m_LogList
.SetSelectionMark(i
);
1508 PostMessage(WM_TGIT_REFRESH_SELECTION
, 0, 0);
1514 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
1518 if (!::PathIsURL(url
))
1520 url
= m_LogList
.m_ProjectProperties
.GetBugIDUrl(url
);
1521 url
= GetAbsoluteUrlFromRelativeUrl(url
);
1524 ShellExecute(this->m_hWnd
, _T("open"), url
, NULL
, NULL
, SW_SHOWDEFAULT
);
1530 void CLogDlg::OnBnClickedStatbutton()
1532 if (this->IsThreadRunning())
1534 if (m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
)
1535 return; // nothing or just the working copy changes are shown, so no statistics.
1536 // the statistics dialog expects the log entries to be sorted by date
1537 SortByColumn(3, false);
1540 m_LogList
.RecalculateShownList(&dlg
.m_ShowList
);
1542 dlg
.m_path
= m_orgPath
;
1544 // restore the previous sorting
1545 SortByColumn(m_nSortColumn
, m_bAscending
);
1546 OnTimer(LOGFILTER_TIMER
);
1549 void CLogDlg::MoveToSameTop(CWnd
*pWndRef
, CWnd
*pWndTarget
)
1551 CRect rcWndPicAuthor
, rcWndMsgView
;
1552 pWndRef
->GetWindowRect(rcWndMsgView
);
1553 ScreenToClient(rcWndMsgView
);
1554 pWndTarget
->GetWindowRect(rcWndPicAuthor
);
1555 ScreenToClient(rcWndPicAuthor
);
1556 int diff
= rcWndMsgView
.top
- rcWndPicAuthor
.top
;
1557 rcWndPicAuthor
.top
+= diff
;
1558 rcWndPicAuthor
.bottom
+= diff
;
1559 pWndTarget
->MoveWindow(rcWndPicAuthor
);
1562 void CLogDlg::DoSizeV1(int delta
)
1565 RemoveAnchor(IDC_LOGLIST
);
1566 RemoveAnchor(IDC_SPLITTERTOP
);
1567 RemoveAnchor(IDC_MSGVIEW
);
1568 RemoveAnchor(IDC_PIC_AUTHOR
);
1569 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1570 RemoveAnchor(IDC_LOGMSG
);
1571 CSplitterControl::ChangeHeight(&m_LogList
, delta
, CW_TOPALIGN
);
1572 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), -delta
, CW_BOTTOMALIGN
);
1573 MoveToSameTop(GetDlgItem(IDC_MSGVIEW
), GetDlgItem(IDC_PIC_AUTHOR
));
1574 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
1575 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
1576 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
1577 AddAnchor(IDC_PIC_AUTHOR
, TOP_RIGHT
);
1578 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1579 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1583 m_LogList
.Invalidate();
1584 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1585 m_gravatar
.Invalidate();
1589 void CLogDlg::DoSizeV2(int delta
)
1592 RemoveAnchor(IDC_LOGLIST
);
1593 RemoveAnchor(IDC_SPLITTERTOP
);
1594 RemoveAnchor(IDC_MSGVIEW
);
1595 RemoveAnchor(IDC_PIC_AUTHOR
);
1596 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1597 RemoveAnchor(IDC_LOGMSG
);
1598 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), delta
, CW_TOPALIGN
);
1599 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl
, -delta
, CW_BOTTOMALIGN
);
1600 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
1601 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
1602 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
1603 AddAnchor(IDC_PIC_AUTHOR
, TOP_RIGHT
);
1604 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1605 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1609 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1610 m_ChangedFileListCtrl
.Invalidate();
1611 m_gravatar
.Invalidate();
1615 void CLogDlg::AdjustMinSize()
1617 // adjust the minimum size of the dialog to prevent the resizing from
1618 // moving the list control too far down.
1619 CRect rcChgListView
;
1620 m_ChangedFileListCtrl
.GetClientRect(rcChgListView
);
1622 m_LogList
.GetClientRect(rcLogList
);
1624 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(),
1625 m_DlgOrigRect
.Height()-m_ChgOrigRect
.Height()-m_LogListOrigRect
.Height()-m_MsgViewOrigRect
.Height()
1626 +rcChgListView
.Height()+rcLogList
.Height()+60));
1629 LRESULT
CLogDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
1633 if (wParam
== IDC_SPLITTERTOP
)
1635 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1636 DoSizeV1(pHdr
->delta
);
1638 else if (wParam
== IDC_SPLITTERBOTTOM
)
1640 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1641 DoSizeV2(pHdr
->delta
);
1646 return CResizableDialog::DefWindowProc(message
, wParam
, lParam
);
1649 void CLogDlg::SetSplitterRange()
1651 if ((m_LogList
)&&(m_ChangedFileListCtrl
))
1654 m_LogList
.GetWindowRect(rcTop
);
1655 ScreenToClient(rcTop
);
1657 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(rcMiddle
);
1658 ScreenToClient(rcMiddle
);
1659 m_wndSplitter1
.SetRange(rcTop
.top
+30, rcMiddle
.bottom
-20);
1661 m_ChangedFileListCtrl
.GetWindowRect(rcBottom
);
1662 ScreenToClient(rcBottom
);
1663 m_wndSplitter2
.SetRange(rcMiddle
.top
+30, rcBottom
.bottom
-20);
1667 LRESULT
CLogDlg::OnClickedInfoIcon(WPARAM
/*wParam*/, LPARAM lParam
)
1669 // FIXME: x64 version would get this function called with unexpected parameters.
1673 RECT
* rect
= (LPRECT
)lParam
;
1676 point
= CPoint(rect
->left
, rect
->bottom
);
1677 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_SelectedFilters & x ? MF_CHECKED : MF_UNCHECKED))
1679 if (popup
.CreatePopupMenu())
1681 temp
.LoadString(IDS_LOG_FILTER_SUBJECT
);
1682 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT
), LOGFILTER_SUBJECT
, temp
);
1684 temp
.LoadString(IDS_LOG_FILTER_MESSAGES
);
1685 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES
), LOGFILTER_MESSAGES
, temp
);
1687 temp
.LoadString(IDS_LOG_FILTER_PATHS
);
1688 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS
), LOGFILTER_PATHS
, temp
);
1690 temp
.LoadString(IDS_LOG_FILTER_AUTHORS
);
1691 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS
), LOGFILTER_AUTHORS
, temp
);
1693 temp
.LoadString(IDS_LOG_FILTER_EMAILS
);
1694 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_EMAILS
), LOGFILTER_EMAILS
, temp
);
1696 temp
.LoadString(IDS_LOG_FILTER_REVS
);
1697 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS
), LOGFILTER_REVS
, temp
);
1699 temp
.LoadString(IDS_LOG_FILTER_REFNAME
);
1700 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME
), LOGFILTER_REFNAME
, temp
);
1702 if (m_LogList
.m_bShowBugtraqColumn
== TRUE
) {
1703 temp
.LoadString(IDS_LOG_FILTER_BUGIDS
);
1704 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID
), LOGFILTER_BUGID
, temp
);
1707 temp
.LoadString(IDS_LOG_FILTER_TOGGLE
);
1708 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, LOGFILTER_TOGGLE
, temp
);
1710 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1712 temp
.LoadString(IDS_LOG_FILTER_REGEX
);
1713 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterWithRegex
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_REGEX
, temp
);
1716 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1720 if (selection
== LOGFILTER_REGEX
)
1722 m_bFilterWithRegex
= !m_bFilterWithRegex
;
1723 CRegDWORD b
= CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE
);
1724 b
= m_bFilterWithRegex
;
1725 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
;
1727 CheckRegexpTooltip();
1729 else if (selection
== LOGFILTER_TOGGLE
)
1731 m_LogList
.m_SelectedFilters
= (~m_LogList
.m_SelectedFilters
) & LOGFILTER_ALL
;
1736 m_LogList
.m_SelectedFilters
^= selection
;
1739 // Reload only if a search text is entered
1740 if (m_LogList
.HasFilterText())
1741 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
1747 LRESULT
CLogDlg::OnClickedCancelFilter(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1750 KillTimer(LOGFILTER_TIMER
);
1752 m_LogList
.m_sFilterText
.Empty();
1754 theApp
.DoWaitCursor(1);
1755 CStoreSelection
storeselection(this);
1756 FillLogMessageCtrl(false);
1758 m_LogList
.RemoveFilter();
1763 m_LogList
.GetTimeRange(begin
,end
);
1764 m_DateFrom
.SetTime(&begin
);
1765 m_DateTo
.SetTime(&end
);
1767 theApp
.DoWaitCursor(-1);
1768 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
1769 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
1770 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
1771 UpdateLogInfoLabel();
1777 void CLogDlg::SetFilterCueText()
1779 CString
temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY
));
1782 if (m_LogList
.m_SelectedFilters
& LOGFILTER_SUBJECT
)
1784 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT
));
1787 if (m_LogList
.m_SelectedFilters
& LOGFILTER_MESSAGES
)
1789 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1791 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES
));
1794 if (m_LogList
.m_SelectedFilters
& LOGFILTER_PATHS
)
1796 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1798 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS
));
1801 if (m_LogList
.m_SelectedFilters
& LOGFILTER_AUTHORS
)
1803 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1805 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS
));
1808 if (m_LogList
.m_SelectedFilters
& LOGFILTER_EMAILS
)
1810 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1812 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_EMAILS
));
1815 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REVS
)
1817 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1819 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS
));
1822 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REFNAME
)
1824 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1826 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REFNAME
));
1829 if (m_LogList
.m_SelectedFilters
& LOGFILTER_BUGID
)
1831 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1833 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS
));
1836 // to make the cue banner text appear more to the right of the edit control
1837 temp
= _T(" ")+temp
;
1838 m_cFilter
.SetCueBanner(temp
.TrimRight());
1841 bool CLogDlg::Validate(LPCTSTR string
)
1843 if (!m_bFilterWithRegex
)
1845 std::tr1::wregex pat
;
1846 return m_LogList
.ValidateRegexp(string
, pat
, false);
1850 void CLogDlg::OnTimer(UINT_PTR nIDEvent
)
1852 if (nIDEvent
== LOGFTIME_TIMER
)
1854 KillTimer(LOGFTIME_TIMER
);
1856 m_LogList
.Refresh(FALSE
);
1857 FillLogMessageCtrl(false);
1859 else if (nIDEvent
== LOG_FILLPATCHVTIMER
)
1863 else if (nIDEvent
== LOGFILTER_TIMER
)
1865 KillTimer(LOGFILTER_TIMER
);
1867 m_LogList
.Refresh(FALSE
);
1868 FillLogMessageCtrl(false);
1871 /* we will use git built-in grep to filter log */
1872 if (this->IsThreadRunning())
1874 // thread still running! So just restart the timer.
1875 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
1878 CWnd
* focusWnd
= GetFocus();
1879 bool bSetFocusToFilterControl
= ((focusWnd
!= GetDlgItem(IDC_DATEFROM
))&&(focusWnd
!= GetDlgItem(IDC_DATETO
))
1880 && (focusWnd
!= GetDlgItem(IDC_LOGLIST
)));
1881 if (m_LogList
.m_sFilterText
.IsEmpty())
1883 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
1884 // do not return here!
1885 // we also need to run the filter if the filter text is empty:
1886 // 1. to clear an existing filter
1887 // 2. to rebuild the m_arShownList after sorting
1889 theApp
.DoWaitCursor(1);
1890 CStoreSelection
storeselection(this);
1891 KillTimer(LOGFILTER_TIMER
);
1892 FillLogMessageCtrl(false);
1894 // now start filter the log list
1895 m_LogList
.StartFilter();
1897 if ( m_LogList
.GetItemCount()==1 )
1899 m_LogList
.SetSelectionMark(0);
1900 m_LogList
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
1902 theApp
.DoWaitCursor(-1);
1903 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
1904 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
1905 if (bSetFocusToFilterControl
)
1906 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
1907 UpdateLogInfoLabel();
1909 } // if (nIDEvent == LOGFILTER_TIMER)
1910 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
))));
1911 __super::OnTimer(nIDEvent
);
1914 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
1919 m_DateTo
.GetTime(_time
);
1921 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 23, 59, 59);
1922 if (time
.GetTime() != m_LogList
.m_To
)
1924 m_LogList
.m_To
= (DWORD
)time
.GetTime();
1925 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
1930 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1936 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
1942 m_DateFrom
.GetTime(_time
);
1944 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 0, 0, 0);
1945 if (time
.GetTime() != m_LogList
.m_From
)
1947 m_LogList
.m_From
= (DWORD
)time
.GetTime();
1948 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
1953 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1959 void CLogDlg::OnCbnSelchangeJumpType()
1961 // reserved for future use
1964 void CLogDlg::OnBnClickedJumpUp()
1966 int sel
= m_JumpType
.GetCurSel();
1967 if (sel
< 0) return;
1968 JumpType jumpType
= (JumpType
)sel
;
1973 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1976 index
= m_LogList
.GetNextSelectedItem(pos
);
1977 if (index
== 0) return;
1979 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
1980 if (jumpType
== JumpType_AuthorEmail
)
1981 strValue
= data
->GetAuthorEmail();
1982 else if (jumpType
== JumpType_CommitterEmail
)
1983 strValue
= data
->GetCommitterEmail();
1984 else if (jumpType
== JumpType_Parent1
)
1985 hashValue
= data
->m_CommitHash
;
1986 else if (jumpType
== JumpType_Parent2
)
1987 hashValue
= data
->m_CommitHash
;
1988 else if (jumpType
== JumpType_TagFF
)
1989 hashValue
= data
->m_CommitHash
;
1990 else if (jumpType
== JumpType_BranchFF
)
1991 hashValue
= data
->m_CommitHash
;
1993 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2000 index
= m_LogList
.GetNextSelectedItem(pos
);
2001 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2003 m_LogList
.SetSelectionMark(-1);
2005 for (int i
= index
- 1; i
>= 0; i
--)
2008 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
2009 if (jumpType
== JumpType_AuthorEmail
)
2010 found
= strValue
== data
->GetAuthorEmail();
2011 else if (jumpType
== JumpType_CommitterEmail
)
2012 found
= strValue
== data
->GetCommitterEmail();
2013 else if (jumpType
== JumpType_MergePoint
)
2014 found
= data
->ParentsCount() > 1;
2015 else if (jumpType
== JumpType_Parent1
)
2017 if (data
->m_ParentHash
.size() > 0)
2018 found
= data
->m_ParentHash
[0] == hashValue
;
2020 else if (jumpType
== JumpType_Parent2
)
2022 if (data
->m_ParentHash
.size() > 1)
2023 found
= data
->m_ParentHash
[1] == hashValue
;
2025 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
2027 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2028 for (size_t j
= 0; j
< refList
.size(); ++j
)
2030 if (refList
[j
].Left(10) == _T("refs/tags/"))
2037 if (found
&& jumpType
== JumpType_TagFF
)
2038 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
2040 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2042 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2043 for (size_t j
= 0; j
< refList
.size(); ++j
)
2045 if (refList
[j
].Left(11) == _T("refs/heads/") || refList
[j
].Left(13) == _T("refs/remotes/"))
2052 if (found
&& jumpType
== JumpType_BranchFF
)
2053 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
2058 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2059 m_LogList
.EnsureVisible(i
, FALSE
);
2060 m_LogList
.SetSelectionMark(i
);
2065 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
2068 void CLogDlg::OnBnClickedJumpDown()
2070 int jumpType
= m_JumpType
.GetCurSel();
2071 if (jumpType
< 0) return;
2076 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2079 index
= m_LogList
.GetNextSelectedItem(pos
);
2080 if (index
== 0) return;
2082 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
2083 if (jumpType
== JumpType_AuthorEmail
)
2084 strValue
= data
->GetAuthorEmail();
2085 else if (jumpType
== JumpType_CommitterEmail
)
2086 strValue
= data
->GetCommitterEmail();
2087 else if (jumpType
== JumpType_Parent1
)
2089 if (data
->m_ParentHash
.size() > 0)
2090 hashValue
= data
->m_ParentHash
.at(0);
2094 else if (jumpType
== JumpType_Parent2
)
2096 if (data
->m_ParentHash
.size() > 1)
2097 hashValue
= data
->m_ParentHash
.at(1);
2101 else if (jumpType
== JumpType_TagFF
)
2102 hashValue
= data
->m_CommitHash
;
2103 else if (jumpType
== JumpType_BranchFF
)
2104 hashValue
= data
->m_CommitHash
;
2106 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2113 index
= m_LogList
.GetNextSelectedItem(pos
);
2114 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2116 m_LogList
.SetSelectionMark(-1);
2118 for (int i
= index
+ 1; i
< m_LogList
.GetItemCount(); ++i
)
2121 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
2122 if (jumpType
== JumpType_AuthorEmail
)
2123 found
= strValue
== data
->GetAuthorEmail();
2124 else if (jumpType
== JumpType_CommitterEmail
)
2125 found
= strValue
== data
->GetCommitterEmail();
2126 else if (jumpType
== JumpType_MergePoint
)
2127 found
= data
->ParentsCount() > 1;
2128 else if (jumpType
== JumpType_Parent1
)
2129 found
= data
->m_CommitHash
== hashValue
;
2130 else if (jumpType
== JumpType_Parent2
)
2131 found
= data
->m_CommitHash
== hashValue
;
2132 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
2134 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2135 for (size_t j
= 0; j
< refList
.size(); ++j
)
2137 if (refList
[j
].Left(10) == _T("refs/tags/"))
2144 if (found
&& jumpType
== JumpType_TagFF
)
2145 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
2147 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2149 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2150 for (size_t j
= 0; j
< refList
.size(); ++j
)
2152 if (refList
[j
].Left(11) == _T("refs/heads/") || refList
[j
].Left(13) == _T("refs/remotes/"))
2159 if (found
&& jumpType
== JumpType_BranchFF
)
2160 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
2165 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2166 m_LogList
.EnsureVisible(i
, FALSE
);
2167 m_LogList
.SetSelectionMark(i
);
2172 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
2175 CTGitPathList
CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)
2177 CTGitPathList pathList
;
2180 if (m_sRepositoryRoot
.IsEmpty() && (bRelativePaths
== false))
2182 m_sRepositoryRoot
= GetRepositoryRoot(m_path
);
2184 if (m_sRepositoryRoot
.IsEmpty() && (bRelativePaths
== false))
2187 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2192 int nextpos
= m_LogList
.GetNextSelectedItem(pos
);
2193 if (nextpos
>= m_arShownList
.GetCount())
2195 PLOGENTRYDATA pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(nextpos
));
2196 LogChangedPathArray
* cpatharray
= pLogEntry
->pArChangedPaths
;
2197 for (INT_PTR cpPathIndex
= 0; cpPathIndex
<cpatharray
->GetCount(); ++cpPathIndex
)
2199 LogChangedPath
* cpath
= cpatharray
->SafeGetAt(cpPathIndex
);
2203 if (!bRelativePaths
)
2204 path
.SetFromGit(m_sRepositoryRoot
);
2205 path
.AppendPathString(cpath
->sPath
);
2207 ((m_cHidePaths
.GetState() & 0x0003)!=BST_CHECKED
)||
2208 (cpath
->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0))
2209 pathList
.AddPath(path
);
2214 pathList
.RemoveDuplicates();
2219 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
2227 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscRevSort());
2229 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescRevSort());
2235 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscActionSort());
2237 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescActionSort());
2243 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscAuthorSort());
2245 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescAuthorSort());
2251 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscDateSort());
2253 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescDateSort());
2256 case 4: // Message or bug id
2257 if (m_bShowBugtraqColumn
)
2260 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscBugIDSort());
2262 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescBugIDSort());
2265 // fall through here
2269 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscMessageSort());
2271 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescMessageSort());
2281 void CLogDlg::OnLvnColumnclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2283 if (this->IsThreadRunning())
2284 return; //no sorting while the arrays are filled
2286 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
2287 const int nColumn
= pNMLV
->iSubItem
;
2288 m_bAscending
= nColumn
== m_nSortColumn
? !m_bAscending
: TRUE
;
2289 m_nSortColumn
= nColumn
;
2290 SortByColumn(m_nSortColumn
, m_bAscending
);
2291 SetSortArrow(&m_LogList
, m_nSortColumn
, !!m_bAscending
);
2292 SortShownListArray();
2293 m_LogList
.Invalidate();
2294 UpdateLogInfoLabel();
2296 UNREFERENCED_PARAMETER(pNMHDR
);
2300 CLogOrdering orderDlg
;
2301 if (orderDlg
.DoModal() == IDOK
)
2305 void CLogDlg::SortShownListArray()
2307 // make sure the shown list still matches the filter after sorting.
2308 OnTimer(LOGFILTER_TIMER
);
2309 // clear the selection states
2310 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2313 m_LogList
.SetItemState(m_LogList
.GetNextSelectedItem(pos
), 0, LVIS_SELECTED
);
2315 m_LogList
.SetSelectionMark(-1);
2318 void CLogDlg::SetSortArrow(CListCtrl
* control
, int nColumn
, bool bAscending
)
2320 if (control
== NULL
)
2322 // set the sort arrow
2323 CHeaderCtrl
* pHeader
= control
->GetHeaderCtrl();
2324 HDITEM HeaderItem
= {0};
2325 HeaderItem
.mask
= HDI_FORMAT
;
2326 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
2328 pHeader
->GetItem(i
, &HeaderItem
);
2329 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
2330 pHeader
->SetItem(i
, &HeaderItem
);
2334 pHeader
->GetItem(nColumn
, &HeaderItem
);
2335 HeaderItem
.fmt
|= (bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
2336 pHeader
->SetItem(nColumn
, &HeaderItem
);
2340 int CLogDlg::m_nSortColumnPathList
= 0;
2341 bool CLogDlg::m_bAscendingPathList
= false;
2343 void CLogDlg::OnBnClickedHidepaths()
2345 FillLogMessageCtrl();
2346 m_ChangedFileListCtrl
.Invalidate();
2349 void CLogDlg::UpdateLogInfoLabel()
2354 long selectedrevs
= 0;
2355 long selectedfiles
= 0;
2356 int count
= (int)m_LogList
.m_arShownList
.GetCount();
2360 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(0)))->m_CommitHash
;
2361 if(this->m_LogList
.m_bShowWC
&& rev1
.IsEmpty()&&(count
>1))
2363 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(start
)))->m_CommitHash
;
2364 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_arShownList.GetCount()-1));
2365 rev2
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(count
-1)))->m_CommitHash
;
2366 selectedrevs
= m_LogList
.GetSelectedCount();
2368 selectedfiles
= m_ChangedFileListCtrl
.GetSelectedCount();
2371 sTemp
.Format(IDS_PROC_LOG_STATS
,
2373 rev2
.ToString().Left(g_Git
.GetShortHASHLength()), rev1
.ToString().Left(g_Git
.GetShortHASHLength()), selectedrevs
, selectedfiles
);
2375 if(selectedrevs
== 1)
2377 CString str
=m_ChangedFileListCtrl
.GetStatisticsString(true);
2378 str
.Replace(_T('\n'), _T(' '));
2379 sTemp
+= _T("\r\n") + str
;
2386 void CLogDlg::OnDtnDropdownDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2388 // the date control should not show the "today" button
2389 CMonthCalCtrl
* pCtrl
= m_DateFrom
.GetMonthCalCtrl();
2391 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
2395 void CLogDlg::OnDtnDropdownDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2397 // the date control should not show the "today" button
2398 CMonthCalCtrl
* pCtrl
= m_DateTo
.GetMonthCalCtrl();
2400 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
2404 void CLogDlg::OnSize(UINT nType
, int cx
, int cy
)
2406 __super::OnSize(nType
, cx
, cy
);
2411 void CLogDlg::OnRefresh()
2415 this->m_LogProgress
.SetPos(0);
2421 void CLogDlg::OnFocusFilter()
2423 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2426 void CLogDlg::OnEditCopy()
2428 if (GetFocus() == &m_ChangedFileListCtrl
)
2429 CopyChangedSelectionToClipBoard();
2431 m_LogList
.CopySelectionToClipBoard();
2434 CString
CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString
& url
)
2436 // is the URL a relative one?
2437 if (url
.Left(2).Compare(_T("^/")) == 0)
2439 // URL is relative to the repository root
2440 CString url1
= m_sRepositoryRoot
+ url
.Mid(1);
2441 TCHAR buf
[INTERNET_MAX_URL_LENGTH
] = { 0 };
2442 DWORD len
= url
.GetLength();
2443 if (UrlCanonicalize((LPCTSTR
)url1
, buf
, &len
, 0) == S_OK
)
2444 return CString(buf
, len
);
2447 else if (url
[0] == '/')
2449 // URL is relative to the server's hostname
2451 // find the server's hostname
2452 int schemepos
= m_sRepositoryRoot
.Find(_T("//"));
2455 sHost
= m_sRepositoryRoot
.Left(m_sRepositoryRoot
.Find('/', schemepos
+3));
2456 CString url1
= sHost
+ url
;
2457 TCHAR buf
[INTERNET_MAX_URL_LENGTH
] = { 0 };
2458 DWORD len
= url
.GetLength();
2459 if (UrlCanonicalize((LPCTSTR
)url
, buf
, &len
, 0) == S_OK
)
2460 return CString(buf
, len
);
2467 void CLogDlg::ShowGravatar()
2469 m_gravatar
.EnableGravatar(m_bShowGravatar
);
2470 RemoveAnchor(IDC_MSGVIEW
);
2471 if (m_gravatar
.IsGravatarEnabled())
2474 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
2475 ScreenToClient(&rect
);
2476 m_gravatar
.GetWindowRect(&rect2
);
2477 ScreenToClient(&rect2
);
2478 rect
.right
= rect2
.left
;
2479 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
2480 m_gravatar
.ShowWindow(SW_SHOW
);
2485 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
2486 ScreenToClient(&rect
);
2487 m_gravatar
.GetWindowRect(&rect2
);
2488 ScreenToClient(&rect2
);
2489 rect
.right
= rect2
.right
;
2490 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
2491 m_gravatar
.ShowWindow(SW_HIDE
);
2493 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
2497 void CLogDlg::OnEnChangeSearchedit()
2500 if (!m_LogList
.HasFilterText())
2502 CStoreSelection
storeselection(this);
2503 // clear the filter, i.e. make all entries appear
2504 theApp
.DoWaitCursor(1);
2505 KillTimer(LOGFILTER_TIMER
);
2506 FillLogMessageCtrl(false);
2509 //m_LogList.StartFilter();
2511 InterlockedExchange(&m_bNoDispUpdates
, TRUE
);
2512 m_arShownList
.RemoveAll();
2513 for (DWORD i
=0; i
<m_logEntries
.size(); ++i
)
2515 if (IsEntryInDateRange(i
))
2516 m_arShownList
.Add(m_logEntries
[i
]);
2518 InterlockedExchange(&m_bNoDispUpdates
, FALSE
);
2519 m_LogList
.DeleteAllItems();
2520 m_LogList
.SetItemCountEx(ShownCountWithStopped());
2521 m_LogList
.RedrawItems(0, ShownCountWithStopped());
2522 m_LogList
.SetRedraw(false);
2523 ResizeAllListCtrlCols();
2524 m_LogList
.SetRedraw(true);
2526 theApp
.DoWaitCursor(-1);
2527 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2528 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2529 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2530 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
2533 if (Validate(m_LogList
.m_sFilterText
))
2534 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
2536 KillTimer(LOGFILTER_TIMER
);
2540 void CLogDlg::OnBnClickedAllBranch()
2542 // m_bAllBranch is not auto-toggled by MFC, we have to handle it manually (in order to prevent the indeterminate state)
2544 m_LogList
.m_ShowMask
&=~ (CGit::LOG_INFO_LOCAL_BRANCHES
| CGit::LOG_INFO_ALL_BRANCH
);
2547 m_bAllBranch
= BST_UNCHECKED
;
2550 m_bAllBranch
= BST_CHECKED
;
2551 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
2558 FillLogMessageCtrl(false);
2561 void CLogDlg::OnBnClickedFollowRenames()
2563 if(m_bFollowRenames
)
2565 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_FOLLOW
;
2566 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_LOCAL_BRANCHES
;
2570 m_bAllBranch
= FALSE
;
2571 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_ALL_BRANCH
;
2576 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_FOLLOW
;
2578 DialogEnableWindow(IDC_LOG_ALLBRANCH
, !m_bFollowRenames
);
2579 DialogEnableWindow(IDC_SHOWWHOLEPROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
2583 FillLogMessageCtrl(false);
2586 void CLogDlg::HandleShowLabels(bool var
, int flag
)
2589 m_LogList
.m_ShowRefMask
|= flag
;
2591 m_LogList
.m_ShowRefMask
&= ~flag
;
2593 if ((m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_REFS
) && !(m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_ANYCOMMIT
))
2595 // Remove commits where labels are not shown.
2597 FillLogMessageCtrl(false);
2602 m_LogList
.Invalidate();
2606 void CLogDlg::OnBnClickedCompressedGraph()
2610 if (m_iCompressedGraph
== 2)
2611 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_REFS
;
2612 else if (m_iCompressedGraph
== 1)
2613 m_LogList
.m_ShowFilter
= static_cast<CGitLogListBase::FilterShow
>(CGitLogListBase::FILTERSHOW_REFS
| CGitLogListBase::FILTERSHOW_MERGEPOINTS
);
2615 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_ALL
;
2618 FillLogMessageCtrl(false);
2621 void CLogDlg::OnBnClickedBrowseRef()
2623 CString newRef
= CBrowseRefsDlg::PickRef(false, m_LogList
.GetRange(), gPickRef_All
, true);
2624 if(newRef
.IsEmpty())
2627 m_History
.AddEntry(newRef
);
2632 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
);
2633 m_bAllBranch
= BST_UNCHECKED
;
2637 FillLogMessageCtrl(false);
2640 void CLogDlg::ShowStartRef()
2642 //Show ref name on top
2643 if(!::IsWindow(m_hWnd
))
2645 if (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
))
2647 switch (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
))
2649 case CGit::LOG_INFO_ALL_BRANCH
:
2650 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES
)));
2653 case CGit::LOG_INFO_LOCAL_BRANCHES
:
2654 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_LOCAL_BRANCHES
)));
2658 m_staticRef
.Invalidate(TRUE
);
2659 m_tooltips
.DelTool(GetDlgItem(IDC_STATIC_REF
));
2663 CString showStartRef
= m_LogList
.GetRange();
2664 if (showStartRef
.IsEmpty() || showStartRef
== _T("HEAD"))
2666 showStartRef
.Empty();
2668 if (g_Git
.Run(L
"git.exe symbolic-ref HEAD", &showStartRef
, NULL
, CP_UTF8
))
2669 showStartRef
= CString(MAKEINTRESOURCE(IDS_PROC_LOG_NOBRANCH
));
2670 showStartRef
.Trim(L
"\r\n\t ");
2674 showStartRef
= g_Git
.StripRefName(showStartRef
);
2676 m_staticRef
.SetWindowText(showStartRef
);
2677 CWnd
*pWnd
= GetDlgItem(IDC_STATIC_REF
);
2678 m_tooltips
.AddTool(pWnd
, showStartRef
);
2679 m_staticRef
.Invalidate(TRUE
);
2682 void CLogDlg::SetRange(const CString
& range
)
2684 m_LogList
.SetRange(range
);
2689 static void AppendMenuChecked(CMenu
&menu
, UINT nTextID
, UINT_PTR nItemID
, BOOL checked
= FALSE
, BOOL enabled
= TRUE
)
2692 text
.LoadString(nTextID
);
2693 menu
.AppendMenu(MF_STRING
| (enabled
? MF_ENABLED
: MF_DISABLED
) | (checked
? MF_CHECKED
: MF_UNCHECKED
), nItemID
, text
);
2696 #define WALKBEHAVIOUR_FIRSTPARENT 1
2697 #define WALKBEHAVIOUR_FOLLOWRENAMES 2
2698 #define WALKBEHAVIOUR_COMPRESSEDGRAPH 3
2699 #define WALKBEHAVIOUR_LABELEDCOMMITS 4
2700 #define WALKBEHAVIOUR_NOMERGES 5
2702 void CLogDlg::OnBnClickedWalkBehaviour()
2705 if (popup
.CreatePopupMenu())
2707 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FIRSTPARENT
, WALKBEHAVIOUR_FIRSTPARENT
, m_bFirstParent
);
2708 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_NOMERGES
, WALKBEHAVIOUR_NOMERGES
, m_bNoMerges
);
2709 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FOLLOWRENAMES
, WALKBEHAVIOUR_FOLLOWRENAMES
, m_bFollowRenames
, !(m_path
.IsEmpty() || m_path
.IsDirectory()));
2710 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2711 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_COMPRESSED
, WALKBEHAVIOUR_COMPRESSEDGRAPH
, m_iCompressedGraph
== 1);
2712 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_LABELEDCOMMITS
, WALKBEHAVIOUR_LABELEDCOMMITS
, m_iCompressedGraph
== 2);
2716 GetDlgItem(IDC_WALKBEHAVIOUR
)->GetWindowRect(&rect
);
2717 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, rect
.left
, rect
.top
, this, 0);
2720 case WALKBEHAVIOUR_FIRSTPARENT
:
2721 m_bFirstParent
= !m_bFirstParent
;
2722 OnBnClickedFirstParent();
2724 case WALKBEHAVIOUR_NOMERGES
:
2725 m_bNoMerges
= !m_bNoMerges
;
2726 OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges
2728 case WALKBEHAVIOUR_FOLLOWRENAMES
:
2729 m_bFollowRenames
= !m_bFollowRenames
;
2730 OnBnClickedFollowRenames();
2732 case WALKBEHAVIOUR_COMPRESSEDGRAPH
:
2733 m_iCompressedGraph
= (m_iCompressedGraph
== 1 ? 0 : 1);
2734 OnBnClickedCompressedGraph();
2736 case WALKBEHAVIOUR_LABELEDCOMMITS
:
2737 m_iCompressedGraph
= (m_iCompressedGraph
== 2 ? 0 : 2);
2738 OnBnClickedCompressedGraph();
2743 m_bWalkBehavior
= (m_bFirstParent
|| m_bNoMerges
|| m_bFollowRenames
|| m_iCompressedGraph
);
2748 #define VIEW_HIDEPATHS 1
2749 #define VIEW_GRAYPATHS 2
2750 #define VIEW_SHOWTAGS 3
2751 #define VIEW_SHOWLOCALBRANCHES 4
2752 #define VIEW_SHOWREMOTEBRANCHES 5
2753 #define VIEW_SHOWGRAVATAR 6
2754 #define VIEW_SHOWPATCH 7
2756 void CLogDlg::OnBnClickedView()
2759 if (popup
.CreatePopupMenu())
2761 AppendMenuChecked(popup
, IDS_SHOWFILES_HIDEPATHS
, VIEW_HIDEPATHS
, m_iHidePaths
== 1);
2762 AppendMenuChecked(popup
, IDS_SHOWFILES_GRAYPATHS
, VIEW_GRAYPATHS
, m_iHidePaths
== 2);
2763 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2764 CMenu showLabelsMenu
;
2765 if (showLabelsMenu
.CreatePopupMenu())
2767 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWTAGLABELS
, VIEW_SHOWTAGS
, m_bShowTags
);
2768 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWLOCALBRANCHLABELS
, VIEW_SHOWLOCALBRANCHES
, m_bShowLocalBranches
);
2769 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWREMOTEBRANCHLABELS
, VIEW_SHOWREMOTEBRANCHES
, m_bShowRemoteBranches
);
2770 popup
.AppendMenu(MF_STRING
| MF_POPUP
, (UINT
)showLabelsMenu
.m_hMenu
, (CString
)MAKEINTRESOURCE(IDS_VIEW_LABELS
));
2772 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2773 AppendMenuChecked(popup
, IDS_VIEW_SHOWGRAVATAR
, VIEW_SHOWGRAVATAR
, m_bShowGravatar
);
2774 AppendMenuChecked(popup
, IDS_MENU_VIEWPATCH
, VIEW_SHOWPATCH
, IsWindow(this->m_patchViewdlg
.m_hWnd
));
2778 GetDlgItem(IDC_VIEW
)->GetWindowRect(&rect
);
2779 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, rect
.left
, rect
.top
, this, 0);
2782 case VIEW_HIDEPATHS
:
2783 if (m_iHidePaths
== 1)
2787 OnBnClickedHidepaths();
2789 case VIEW_GRAYPATHS
:
2790 if (m_iHidePaths
== 2)
2794 OnBnClickedHidepaths();
2797 m_bShowTags
= !m_bShowTags
;
2798 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
2800 case VIEW_SHOWLOCALBRANCHES
:
2801 m_bShowLocalBranches
= !m_bShowLocalBranches
;
2802 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
2804 case VIEW_SHOWREMOTEBRANCHES
:
2805 m_bShowRemoteBranches
= !m_bShowRemoteBranches
;
2806 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
2808 case VIEW_SHOWGRAVATAR
:
2810 m_bShowGravatar
= !m_bShowGravatar
;
2814 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2817 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
2818 int moreSel
= m_LogList
.GetNextSelectedItem(pos
);
2821 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
2823 email
= pLogEntry
->GetAuthorEmail();
2826 m_gravatar
.LoadGravatar(email
);
2829 case VIEW_SHOWPATCH
:
2838 void CLogDlg::OnBnClickedFirstParent()
2840 if(this->m_bFirstParent
)
2841 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_FIRST_PARENT
;
2843 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_FIRST_PARENT
;
2846 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_NO_MERGE
;
2848 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_NO_MERGE
;
2852 FillLogMessageCtrl(false);
2856 void CLogDlg::OnBnClickShowWholeProject()
2860 if(this->m_bWholeProject
)
2862 m_LogList
.m_Path
.Reset();
2866 m_LogList
.m_Path
=m_path
;
2868 m_regShowWholeProject
= m_bWholeProject
;
2874 FillLogMessageCtrl(false);
2878 LRESULT
CLogDlg::OnRefLogChanged(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
2884 LRESULT
CLogDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
2886 m_pTaskbarList
.Release();
2887 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
2888 SetUUIDOverlayIcon(m_hWnd
);
2892 LRESULT
CLogDlg::OnRefreshSelection(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
2894 // it's enough to deselect, then select again one item of the whole selection
2895 int selMark
= m_LogList
.GetSelectionMark();
2898 m_LogList
.SetSelectionMark(selMark
);
2899 m_LogList
.SetItemState(selMark
, 0, LVIS_SELECTED
);
2900 m_LogList
.SetItemState(selMark
, LVIS_SELECTED
, LVIS_SELECTED
);