1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2008 - TortoiseSVN
4 // Copyright (C) 2008-2013 - 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
== BST_CHECKED
) ? BST_CHECKED
: BST_UNCHECKED
;
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
)
178 JumpType_AuthorEmail
,
179 JumpType_CommitterEmail
,
189 void CLogDlg::SetParams(const CTGitPath
& orgPath
, const CTGitPath
& path
, CString hightlightRevision
, CString range
, int limit
)
193 m_hightlightRevision
= hightlightRevision
;
195 if (!(range
.IsEmpty() || range
== _T("HEAD")))
196 m_bAllBranch
= BST_UNCHECKED
;
201 if (::IsWindow(m_hWnd
))
205 void CLogDlg::SetFilter(const CString
& findstr
, LONG findtype
, bool findregex
)
207 m_LogList
.m_sFilterText
= findstr
;
209 m_LogList
.m_SelectedFilters
= findtype
;
210 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
= findregex
;
213 BOOL
CLogDlg::OnInitDialog()
216 CResizableStandAloneDialog::OnInitDialog();
217 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
219 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
220 // do this, Explorer would be unable to send that message to our window if we
221 // were running elevated. It's OK to make the call all the time, since if we're
222 // not elevated, this is a no-op.
223 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
224 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
225 CAutoLibrary hUser
= AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
228 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
229 if (pfnChangeWindowMessageFilterEx
)
231 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
234 m_pTaskbarList
.Release();
235 if (FAILED(m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
)))
236 m_pTaskbarList
= nullptr;
238 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG
));
240 // use the state of the "stop on copy/rename" option from the last time
243 // set the font to use in the log message view, configured in the settings dialog
244 CAppUtils::CreateFontForLogs(m_logFont
);
245 GetDlgItem(IDC_MSGVIEW
)->SetFont(&m_logFont
);
246 // automatically detect URLs in the log message and turn them into links
247 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_AUTOURLDETECT
, TRUE
, NULL
);
248 // make the log message rich edit control send a message when the mouse pointer is over a link
249 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_SETEVENTMASK
, NULL
, ENM_LINK
);
251 // "unrelated paths" should be in gray color
254 // set up the columns
255 m_LogList
.DeleteAllItems();
257 m_LogList
.m_Path
=m_path
;
258 m_LogList
.m_hasWC
= m_LogList
.m_bShowWC
= !g_GitAdminDir
.IsBareRepo(g_Git
.m_CurrentDir
);
259 m_LogList
.InsertGitColumn();
262 m_LogList
.m_Path
.Reset();
264 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
);
266 GetDlgItem(IDC_LOGLIST
)->UpdateData(FALSE
);
270 m_tooltips
.Create(this);
271 CheckRegexpTooltip();
275 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
276 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
);
277 m_cFilter
.SetInfoIcon(IDI_LOGFILTER
);
278 m_cFilter
.SetValidator(this);
280 AdjustControlSize(IDC_LOG_ALLBRANCH
);
281 AdjustControlSize(IDC_SHOWWHOLEPROJECT
);
285 GetClientRect(m_DlgOrigRect
);
286 m_LogList
.GetClientRect(m_LogListOrigRect
);
287 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(m_MsgViewOrigRect
);
288 m_ChangedFileListCtrl
.GetClientRect(m_ChgOrigRect
);
290 m_DateFrom
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
291 m_DateTo
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
293 m_staticRef
.SetURL(CString());
296 AddAnchor(IDC_STATIC_REF
, TOP_LEFT
);
297 //AddAnchor(IDC_BUTTON_BROWSE_REF, TOP_LEFT);
298 AddAnchor(IDC_FROMLABEL
, TOP_LEFT
);
299 AddAnchor(IDC_DATEFROM
, TOP_LEFT
);
300 AddAnchor(IDC_TOLABEL
, TOP_LEFT
);
301 AddAnchor(IDC_DATETO
, TOP_LEFT
);
304 AddAnchor(IDC_SEARCHEDIT
, TOP_LEFT
, TOP_RIGHT
);
305 AddAnchor(IDC_LOG_JUMPTYPE
, TOP_RIGHT
);
306 AddAnchor(IDC_LOG_JUMPUP
, TOP_RIGHT
);
307 AddAnchor(IDC_LOG_JUMPDOWN
, TOP_RIGHT
);
309 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
310 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
311 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
312 AddAnchor(IDC_PIC_AUTHOR
, TOP_RIGHT
);
313 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
314 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
316 AddAnchor(IDC_LOGINFO
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
317 AddAnchor(IDC_WALKBEHAVIOUR
, BOTTOM_LEFT
);
318 AddAnchor(IDC_VIEW
, BOTTOM_LEFT
);
319 AddAnchor(IDC_LOG_ALLBRANCH
,BOTTOM_LEFT
);
320 AddAnchor(IDC_SHOWWHOLEPROJECT
, BOTTOM_LEFT
);
321 AddAnchor(IDC_REFRESH
, BOTTOM_LEFT
);
322 AddAnchor(IDC_STATBUTTON
, BOTTOM_RIGHT
);
323 AddAnchor(IDC_PROGRESS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
324 AddAnchor(IDOK
, BOTTOM_RIGHT
);
325 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
326 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
328 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_LOCAL_BRANCHES
;
329 if(this->m_bAllBranch
)
330 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
332 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_ALL_BRANCH
;
334 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
335 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
336 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
338 // SetPromptParentWindow(m_hWnd);
339 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL
)));
340 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL
)));
341 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT
)));
342 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1
)));
343 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2
)));
344 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG
)));
345 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF
)));
346 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH
)));
347 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH_FF
)));
348 m_JumpType
.SetCurSel(0);
349 m_JumpUp
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
350 m_JumpDown
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
353 CenterWindow(CWnd::FromHandle(hWndExplorer
));
354 EnableSaveRestore(_T("LogDlg"));
356 DWORD yPos1
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
357 DWORD yPos2
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
358 RECT rcDlg
, rcLogList
, rcChgMsg
;
359 GetClientRect(&rcDlg
);
360 m_LogList
.GetWindowRect(&rcLogList
);
361 ScreenToClient(&rcLogList
);
362 m_ChangedFileListCtrl
.GetWindowRect(&rcChgMsg
);
363 ScreenToClient(&rcChgMsg
);
367 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
368 ScreenToClient(&rectSplitter
);
369 int delta
= yPos1
- rectSplitter
.top
;
371 if ((rcLogList
.bottom
+ delta
> rcLogList
.top
)&&(rcLogList
.bottom
+ delta
< rcChgMsg
.bottom
- 30))
373 m_wndSplitter1
.SetWindowPos(NULL
, rectSplitter
.left
, yPos1
, 0, 0, SWP_NOSIZE
);
380 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
381 ScreenToClient(&rectSplitter
);
382 int delta
= yPos2
- rectSplitter
.top
;
384 if ((rcChgMsg
.top
+ delta
< rcChgMsg
.bottom
)&&(rcChgMsg
.top
+ delta
> rcLogList
.top
+ 30))
386 m_wndSplitter2
.SetWindowPos(NULL
, rectSplitter
.left
, yPos2
, 0, 0, SWP_NOSIZE
);
395 // the dialog is used to select revisions
396 // enable the OK button if appropriate
401 // the dialog is used to just view log messages
402 // hide the OK button and set text on Cancel button to OK
403 GetDlgItemText(IDOK
, temp
);
404 SetDlgItemText(IDCANCEL
, temp
);
405 GetDlgItem(IDOK
)->ShowWindow(SW_HIDE
);
408 // first start a thread to obtain the log messages without
409 // blocking the dialog
411 //m_tFrom = (DWORD)-1;
413 // scroll to user selected or current revision
414 if (!m_hightlightRevision
.IsEmpty() && m_hightlightRevision
.GetLength() >= GIT_HASH_SIZE
)
415 m_LogList
.m_lastSelectedHash
= m_hightlightRevision
;
418 if (g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, _T("HEAD")))
419 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
422 m_LogList
.FetchLogAsync(this);
425 GetDlgItem(IDC_LOGLIST
)->SetFocus();
427 m_History
.SetMaxHistoryItems((LONG
)CRegDWORD(_T("Software\\TortoiseGit\\MaxRefHistoryItems"), 5));
429 reg
.Format(_T("Software\\TortoiseGit\\History\\log-refs\\%s"), g_Git
.m_CurrentDir
);
430 reg
.Replace(_T(':'),_T('_'));
431 m_History
.Load(reg
, _T("ref"));
437 LRESULT
CLogDlg::OnLogListLoading(WPARAM wParam
, LPARAM
/*lParam*/)
441 if( cur
== GITLOG_START
)
444 temp
.LoadString(IDS_PROGRESSWAIT
);
446 this->m_LogList
.ShowText(temp
, true);
448 // We use a progress bar while getting the logs
449 m_LogProgress
.SetRange32(0, 100);
450 m_LogProgress
.SetPos(0);
453 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
454 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
457 GetDlgItem(IDC_PROGRESS
)->ShowWindow(TRUE
);
459 DialogEnableWindow(IDC_WALKBEHAVIOUR
, FALSE
);
460 DialogEnableWindow(IDC_STATBUTTON
, FALSE
);
461 //DialogEnableWindow(IDC_REFRESH, FALSE);
462 DialogEnableWindow(IDC_VIEW
, FALSE
);
465 else if( cur
== GITLOG_END
)
467 if(this->m_LogList
.HasText())
469 this->m_LogList
.ClearText();
471 UpdateLogInfoLabel();
474 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
476 DialogEnableWindow(IDC_SHOWWHOLEPROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
478 DialogEnableWindow(IDC_STATBUTTON
, !(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
));
479 DialogEnableWindow(IDC_REFRESH
, TRUE
);
480 DialogEnableWindow(IDC_VIEW
, TRUE
);
481 DialogEnableWindow(IDC_WALKBEHAVIOUR
, TRUE
);
482 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
483 GetDlgItem(IDC_PROGRESS
)->ShowWindow(FALSE
);
484 //CTime time=m_LogList.GetOldestTime();
486 m_LogList
.GetTimeRange(begin
,end
);
488 if(m_LogList
.m_From
== -1)
489 m_DateFrom
.SetTime(&begin
);
491 if(m_LogList
.m_To
== -1)
492 m_DateTo
.SetTime(&end
);
498 if(this->m_LogList
.HasText())
500 this->m_LogList
.ClearText();
501 this->m_LogList
.Invalidate();
503 UpdateLogInfoLabel();
504 m_LogProgress
.SetPos(cur
);
507 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
508 m_pTaskbarList
->SetProgressValue(m_hWnd
, cur
, 100);
513 void CLogDlg::SetDlgTitle()
515 if (m_sTitle
.IsEmpty())
516 GetWindowText(m_sTitle
);
518 if (m_LogList
.m_Path
.IsEmpty() || m_orgPath
.GetWinPathString().IsEmpty())
520 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
523 CAppUtils::SetWindowTitle(m_hWnd
, m_orgPath
.GetWinPathString(), m_sTitle
);
526 void CLogDlg::CheckRegexpTooltip()
528 CWnd
*pWnd
= GetDlgItem(IDC_SEARCHEDIT
);
529 // Since tooltip describes regexp features, show it only if regexps are enabled.
530 if (m_bFilterWithRegex
)
532 m_tooltips
.AddTool(pWnd
, IDS_LOG_FILTER_REGEX_TT
);
535 m_tooltips
.DelTool(pWnd
);
538 void CLogDlg::EnableOKButton()
542 // the dialog is used to select revisions
543 if (m_bSelectionMustBeSingle
)
545 // enable OK button if only a single revision is selected
546 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()==1));
548 else if (m_bSelectionMustBeContinuous
)
549 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()!=0)&&(m_LogList
.IsSelectionContinuous()));
551 DialogEnableWindow(IDOK
, m_LogList
.GetSelectedCount()!=0);
554 DialogEnableWindow(IDOK
, TRUE
);
557 CString
CLogDlg::GetTagInfo(GitRev
* pLogEntry
)
562 if(m_LogList
.m_HashMap
.find(pLogEntry
->m_CommitHash
) != m_LogList
.m_HashMap
.end())
564 STRING_VECTOR
&vector
= m_LogList
.m_HashMap
[pLogEntry
->m_CommitHash
];
565 for (size_t i
= 0; i
< vector
.size(); ++i
)
567 if(vector
[i
].Find(_T("refs/tags/")) == 0 )
569 CString tag
= vector
[i
];
570 int start
= vector
[i
].Find(_T("^{}"));
576 cmd
.Format(_T("git.exe cat-file tag %s"), tag
);
578 if(g_Git
.Run(cmd
, &output
, NULL
, CP_UTF8
) == 0 )
584 if(!output
.IsEmpty())
586 output
= _T("\n*") + CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO
)) + _T("*\n\n") + output
;
592 bool LookLikeGitHash(const CString
& msg
, int &pos
)
595 for (; pos
< msg
.GetLength(); ++pos
)
597 if (msg
[pos
] >= '0' && msg
[pos
] <= '9' || msg
[pos
] >= 'a' && msg
[pos
] <= 'f')
603 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2;
606 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2;
609 std::vector
<CHARRANGE
> FindGitHashPositions(const CString
& msg
, int offset
)
611 std::vector
<CHARRANGE
> result
;
612 offset
= offset
< 0 ? 0 : offset
;
614 while (offset
< msg
.GetLength())
617 TCHAR b
= offset
> 1 ? msg
[offset
- 2] : '\0';
618 TCHAR c
= offset
> 0 ? msg
[offset
- 1] : '\0';
619 // git hash can optionally starts with 'g'
620 if ((c
== 'g' && (offset
== 0 || !((b
>= 'A' && b
<= 'Z') || (b
>= 'h' && b
<= 'z'))))
621 || (!((c
>= 'A' && c
<= 'Z') || (c
>= 'h' && c
<= 'z'))))
625 if (msg
.Mid(offset
, 11) == _T("git-svn-id:") || msg
.Mid(offset
, 14) == _T("Signed-off-by:"))
628 while (offset
< msg
.GetLength())
630 if (msg
[offset
++] == '\n')
637 if (LookLikeGitHash(msg
, offset
))
639 TCHAR d
= offset
< msg
.GetLength() ? msg
[offset
] : '\0';
640 if (!((d
>= 'A' && d
<= 'Z') || (d
>= 'g' && d
<= 'z')))
642 CHARRANGE range
= { old
, offset
};
643 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(" "));
670 // empty the changed files list
671 m_ChangedFileListCtrl
.SetRedraw(FALSE
);
672 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
673 m_currentChangedArray
= NULL
;
674 m_ChangedFileListCtrl
.DeleteAllItems();
676 // if we're not here to really show a selected revision, just
677 // get out of here after clearing the views, which is what is intended
678 // if that flag is not set.
682 m_ChangedFileListCtrl
.Invalidate();
683 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
684 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
685 m_gravatar
.LoadGravatar();
689 // depending on how many revisions are selected, we have to do different
691 int selCount
= m_LogList
.GetSelectedCount();
694 // if nothing is selected, we have nothing more to do
695 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
696 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
697 m_gravatar
.LoadGravatar();
700 else if (selCount
== 1)
702 // if one revision is selected, we have to fill the log message view
703 // with the corresponding log message, and also fill the changed files
705 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
706 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
707 if (selIndex
>= m_LogList
.m_arShownList
.GetCount())
709 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
710 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
713 Locker
lock(m_LogList
.m_critSec_AsyncDiff
);
714 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
717 // set the log message text
718 pMsgView
->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH
)) + _T(": ") + pLogEntry
->m_CommitHash
.ToString() + _T("\r\n\r\n"));
719 // turn bug ID's into links if the bugtraq: properties have been set
720 // and we can find a match of those in the log message
722 pMsgView
->SetSel(-1,-1);
724 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
725 format
.cbSize
= sizeof(CHARFORMAT2
);
726 format
.dwMask
= CFM_BOLD
;
727 format
.dwEffects
= CFE_BOLD
;
728 pMsgView
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
730 CString msg
=_T("* ");
731 msg
+=pLogEntry
->GetSubject();
732 pMsgView
->ReplaceSel(msg
);
734 pMsgView
->SetSel(-1,-1);
735 format
.dwEffects
= 0;
736 pMsgView
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
739 msg
+=pLogEntry
->GetBody();
741 if(!pLogEntry
->m_Notes
.IsEmpty())
743 msg
+= _T("\n*") + CString(MAKEINTRESOURCE(IDS_NOTES
)) + _T("* ");
744 msg
+= pLogEntry
->m_Notes
;
748 msg
+=GetTagInfo(pLogEntry
);
750 pMsgView
->ReplaceSel(msg
);
753 pMsgView
->GetWindowText(text
);
754 // the rich edit control doesn't count the CR char!
755 // to be exact: CRLF is treated as one char.
758 FindGitHash(text
, text
.Find('\n'), pMsgView
);
759 m_LogList
.m_ProjectProperties
.FindBugID(text
, pMsgView
);
760 if (((DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\StyleCommitMessages"), TRUE
)) == TRUE
)
761 CAppUtils::FormatTextInRichEditControl(pMsgView
);
766 pMsgView
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
768 CString matchpath
=this->m_path
.GetGitPathString();
770 int count
= pLogEntry
->GetFiles(&m_LogList
).GetCount();
771 for (int i
= 0 ; i
< count
&& (!matchpath
.IsEmpty()); ++i
)
773 if( m_bWholeProject
)
776 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
|CTGitPath::LOGACTIONS_GRAY
);
778 if(pLogEntry
->GetFiles(&m_LogList
)[i
].GetGitPathString().Left(matchpath
.GetLength()) != matchpath
&& pLogEntry
->GetFiles(&m_LogList
)[i
].GetGitOldPathString().Left(matchpath
.GetLength()) != matchpath
)
780 if (m_iHidePaths
== 1)
781 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
782 else if (m_iHidePaths
== 2)
783 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
|= CTGitPath::LOGACTIONS_GRAY
;
787 m_ChangedFileListCtrl
.UpdateWithGitPathList(pLogEntry
->GetFiles(&m_LogList
));
788 m_ChangedFileListCtrl
.m_CurrentVersion
=pLogEntry
->m_CommitHash
;
789 if (pLogEntry
->m_CommitHash
.IsEmpty() && m_bShowUnversioned
)
791 m_ChangedFileListCtrl
.UpdateUnRevFileList(pLogEntry
->GetUnRevFiles());
792 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
| GITSLC_SHOWUNVERSIONED
);
795 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
797 m_ChangedFileListCtrl
.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES
)));
799 if(!pLogEntry
->m_IsDiffFiles
)
800 m_ChangedFileListCtrl
.SetBusy(TRUE
);
802 m_ChangedFileListCtrl
.SetBusy(FALSE
);
804 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
805 m_gravatar
.LoadGravatar(pLogEntry
->GetAuthorEmail());
812 // more than one revision is selected:
813 // the log message view must be emptied
814 // the changed files list contains all the changed paths from all
815 // selected revisions, with 'doubles' removed
816 m_currentChangedPathList
= GetChangedPathsFromSelectedRevisions(true);
820 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
822 if (m_currentChangedArray
)
824 m_ChangedFileListCtrl
.SetItemCountEx(m_currentChangedArray
->GetCount());
825 m_ChangedFileListCtrl
.RedrawItems(0, m_currentChangedArray
->GetCount());
827 else if (m_currentChangedPathList
.GetCount())
829 m_ChangedFileListCtrl
.SetItemCountEx(m_currentChangedPathList
.GetCount());
830 m_ChangedFileListCtrl
.RedrawItems(0, m_currentChangedPathList
.GetCount());
834 m_ChangedFileListCtrl
.SetItemCountEx(0);
835 m_ChangedFileListCtrl
.Invalidate();
838 // sort according to the settings
839 if (m_nSortColumnPathList
> 0)
840 SetSortArrow(&m_ChangedFileListCtrl
, m_nSortColumnPathList
, m_bAscendingPathList
);
842 SetSortArrow(&m_ChangedFileListCtrl
, -1, false);
843 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
844 m_gravatar
.LoadGravatar();
848 void CLogDlg::OnBnClickedRefresh()
853 void CLogDlg::Refresh (bool clearfilter
/*autoGoOnline*/)
856 m_LogList
.Refresh(clearfilter
);
859 FillLogMessageCtrl(false);
864 BOOL
CLogDlg::Cancel()
869 void CLogDlg::SaveSplitterPos()
873 CRegDWORD regPos1
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
874 CRegDWORD regPos2
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
876 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
877 ScreenToClient(&rectSplitter
);
878 regPos1
= rectSplitter
.top
;
879 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
880 ScreenToClient(&rectSplitter
);
881 regPos2
= rectSplitter
.top
;
885 void CLogDlg::OnCancel()
887 this->ShowWindow(SW_HIDE
);
889 // canceling means stopping the working thread if it's still running.
890 m_LogList
.SafeTerminateAsyncDiffThread();
891 if (this->IsThreadRunning())
893 m_LogList
.SafeTerminateThread();
901 void CLogDlg::CopyChangedSelectionToClipBoard()
904 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
906 return; // nothing is selected, get out of here
910 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
913 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
916 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
917 CTGitPath
*path
= (CTGitPath
*)m_ChangedFileListCtrl
.GetItemData(nItem
);
919 sPaths
+= path
->GetGitPathString();
920 sPaths
+= _T("\r\n");
926 // only one revision is selected in the log dialog top pane
927 // but multiple items could be selected in the changed items list
928 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
931 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
932 LogChangedPath
* changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(nItem
);
934 if ((m_cHidePaths
.GetState() & 0x0003)==BST_CHECKED
)
936 // some items are hidden! So find out which item the user really selected
937 INT_PTR selRealIndex
= -1;
938 for (INT_PTR hiddenindex
=0; hiddenindex
<pLogEntry
->pArChangedPaths
->GetCount(); ++hiddenindex
)
940 if (pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
)->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0)
942 if (selRealIndex
== nItem
)
944 changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
);
951 sPaths
+= changedlogpath
->sPath
;
952 sPaths
+= _T("\r\n");
958 CStringUtils::WriteAsciiStringToClipboard(sPaths
, GetSafeHwnd());
962 void CLogDlg::OnContextMenu(CWnd
* pWnd
, CPoint point
)
964 // we have three separate context menus:
965 // one for the branch label in the upper left
966 // one shown on the log message list control,
967 // one shown in the changed-files list control
968 if (pWnd
== GetDlgItem(IDC_STATIC_REF
))
971 if (!popup
.CreatePopupMenu())
975 popup
.AppendMenuIcon(++cnt
, IDS_MENUREFBROWSE
);
976 popup
.SetDefaultItem(cnt
);
977 popup
.AppendMenuIcon(++cnt
, _T("HEAD"));
978 popup
.AppendMenuIcon(++cnt
, IDS_ALL
);
979 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
980 popup
.AppendMenuIcon(++cnt
, IDS_PROC_LOG_SELECT_LOCAL_BRANCHES
);
981 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
983 if (m_History
.GetCount() > 0)
985 popup
.AppendMenu(MF_SEPARATOR
, 0);
986 for (int i
= 0; i
< m_History
.GetCount(); ++i
)
987 popup
.AppendMenuIcon(cnt
++, m_History
.GetEntry(i
));
990 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
995 OnBnClickedBrowseRef();
999 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
);
1000 m_bAllBranch
= BST_UNCHECKED
;
1003 SetRange(g_Git
.GetCurrentBranch(true));
1007 m_bAllBranch
= BST_CHECKED
;
1008 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_ALL_BRANCH
;
1012 m_bAllBranch
= BST_INDETERMINATE
;
1013 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
1015 else if (cmd
>= offset
)
1017 SetRange(m_History
.GetEntry(cmd
- offset
));
1018 m_History
.AddEntry(m_LogList
.m_sRange
);
1025 FillLogMessageCtrl(false);
1029 int selCount
= m_LogList
.GetSelectedCount();
1030 if ((selCount
== 1)&&(pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1032 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1035 selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1037 GitRev
*pRev
= ((GitRev
*)m_LogList
.m_arShownList
[selIndex
]);
1039 if ((point
.x
== -1) && (point
.y
== -1))
1042 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(&rect
);
1043 ClientToScreen(&rect
);
1044 point
= rect
.CenterPoint();
1046 CString sMenuItemText
;
1048 if (popup
.CreatePopupMenu())
1050 // add the 'default' entries
1051 sMenuItemText
.LoadString(IDS_SCIEDIT_COPY
);
1052 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, WM_COPY
, sMenuItemText
);
1053 sMenuItemText
.LoadString(IDS_SCIEDIT_SELECTALL
);
1054 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, EM_SETSEL
, sMenuItemText
);
1055 sMenuItemText
.LoadString(IDS_EDIT_NOTES
);
1056 popup
.AppendMenuIcon( CGitLogList::ID_EDITNOTE
, sMenuItemText
, IDI_EDIT
);
1058 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1062 break; // no command selected
1065 ::SendMessage(GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), cmd
, 0, -1);
1067 case CGitLogList::ID_EDITNOTE
:
1068 CAppUtils::EditNote(pRev
);
1069 this->FillLogMessageCtrl(true);
1076 void CLogDlg::OnOK()
1078 // since the log dialog is also used to select revisions for other
1079 // dialogs, we have to do some work before closing this dialog
1080 if (GetFocus() != GetDlgItem(IDOK
))
1081 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
1083 m_LogList
.SafeTerminateAsyncDiffThread();
1084 if (this->IsThreadRunning())
1086 m_LogList
.SafeTerminateThread();
1089 // check that one and only one row is selected
1090 if (m_LogList
.GetSelectedCount() == 1)
1092 // get the selected row
1093 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1094 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1095 if (selIndex
< m_LogList
.m_arShownList
.GetCount())
1097 // all ok, pick up the revision
1098 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
1100 m_sSelectedHash
= pLogEntry
->m_CommitHash
;
1108 if (!GetDlgItem(IDOK
)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL
))
1109 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
1113 GetDlgItemText(IDOK
, buttontext
);
1114 temp
.LoadString(IDS_MSGBOX_CANCEL
);
1115 if (temp
.Compare(buttontext
) != 0)
1116 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
1117 m_bCancelled
= TRUE
;
1118 m_selectedRevs
.Clear();
1119 m_selectedRevsOneRange
.Clear();
1120 if (m_pNotifyWindow
)
1122 int selIndex
= m_LogList
.GetSelectionMark();
1125 PLOGENTRYDATA pLogEntry
= NULL
;
1126 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1127 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1128 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1129 git_revnum_t lowerRev
= pLogEntry
->Rev
;
1130 git_revnum_t higherRev
= lowerRev
;
1133 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1134 git_revnum_t rev
= pLogEntry
->Rev
;
1135 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1138 if (higherRev
< rev
)
1141 if (m_sFilterText
.IsEmpty() && m_nSortColumn
== 0 && IsSelectionContinuous())
1143 m_selectedRevsOneRange
.AddRevRange(lowerRev
, higherRev
);
1145 BOOL bSentMessage
= FALSE
;
1146 if (m_LogList
.GetSelectedCount() == 1)
1148 // if only one revision is selected, check if the path/url with which the dialog was started
1149 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1150 // if it was copied, use the copy from revision as lowerRev
1151 if ((pLogEntry
)&&(pLogEntry
->pArChangedPaths
)&&(lowerRev
== higherRev
))
1153 CString sUrl
= m_path
.GetGitPathString();
1154 if (!m_path
.IsUrl())
1156 sUrl
= GetURLFromPath(m_path
);
1158 sUrl
= sUrl
.Mid(m_sRepositoryRoot
.GetLength());
1159 for (int cp
= 0; cp
< pLogEntry
->pArChangedPaths
->GetCount(); ++cp
)
1161 LogChangedPath
* pData
= pLogEntry
->pArChangedPaths
->SafeGetAt(cp
);
1164 if (sUrl
.Compare(pData
->sPath
) == 0)
1166 if (!pData
->sCopyFromPath
.IsEmpty())
1168 lowerRev
= pData
->lCopyFromRev
;
1169 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
), lowerRev
);
1170 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
), higherRev
);
1171 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1172 bSentMessage
= TRUE
;
1179 if ( !bSentMessage
)
1181 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
| MERGE_REVSELECTMINUSONE
), lowerRev
);
1182 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
| MERGE_REVSELECTMINUSONE
), higherRev
);
1183 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1184 if (m_selectedRevsOneRange
.GetCount())
1185 m_pNotifyWindow
->SendMessage(WM_REVLISTONERANGE
, 0, (LPARAM
)&m_selectedRevsOneRange
);
1190 CRegDWORD reg
= CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
1195 void CLogDlg::DoDiffFromLog(INT_PTR selIndex
, GitRev
* rev1
, GitRev
* rev2
, bool /*blame*/, bool /*unified*/)
1197 DialogEnableWindow(IDOK
, FALSE
);
1198 // SetPromptApp(&theApp);
1199 theApp
.DoWaitCursor(1);
1202 GetTempPath(temppath
);
1205 file1
.Format(_T("%s%s_%s%s"),
1207 (*m_currentChangedArray
)[selIndex
].GetBaseFilename(),
1208 rev1
->m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()),
1209 (*m_currentChangedArray
)[selIndex
].GetFileExtension());
1212 file2
.Format(_T("%s\\%s_%s%s"),
1214 (*m_currentChangedArray
)[selIndex
].GetBaseFilename(),
1215 rev2
->m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()),
1216 (*m_currentChangedArray
)[selIndex
].GetFileExtension());
1219 CTGitPath
&path
= (CTGitPath
&)(*m_currentChangedArray
)[selIndex
];
1221 g_Git
.GetOneFile(rev1
->m_CommitHash
.ToString(), path
, file1
);
1222 g_Git
.GetOneFile(rev2
->m_CommitHash
.ToString(), path
, file2
);
1224 CAppUtils::DiffFlags flags
;
1225 CAppUtils::StartExtDiff(file1
,file2
,_T("A"),_T("B"),
1226 g_Git
.m_CurrentDir
+ _T("\\") + path
.GetWinPathString(), g_Git
.m_CurrentDir
+ _T("\\") + path
.GetWinPathString(),
1227 rev1
->m_CommitHash
.ToString(), rev2
->m_CommitHash
.ToString(),
1230 theApp
.DoWaitCursor(-1);
1234 BOOL
CLogDlg::PreTranslateMessage(MSG
* pMsg
)
1236 // Skip Ctrl-C when copying text out of the log message or search filter
1237 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);
1238 if (pMsg
->message
== WM_KEYDOWN
&& pMsg
->wParam
=='\r')
1240 if (GetFocus()==GetDlgItem(IDC_LOGLIST
))
1242 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE
))
1244 m_LogList
.DiffSelectedRevWithPrevious();
1248 if (GetFocus() == GetDlgItem(IDC_SEARCHEDIT
))
1250 KillTimer(LOGFILTER_TIMER
);
1252 m_LogList
.Refresh(FALSE
);
1253 FillLogMessageCtrl(false);
1256 if (m_hAccel
&& !bSkipAccelerator
)
1258 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1263 if(::IsWindow(m_tooltips
.m_hWnd
))
1264 m_tooltips
.RelayEvent(pMsg
);
1265 return __super::PreTranslateMessage(pMsg
);
1269 BOOL
CLogDlg::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
1271 //if (this->IsThreadRunning())
1272 if(m_LogList
.m_bNoDispUpdates
)
1274 // only show the wait cursor over the list control
1276 ((pWnd
== GetDlgItem(IDC_LOGLIST
))||
1277 (pWnd
== GetDlgItem(IDC_MSGVIEW
))||
1278 (pWnd
== GetDlgItem(IDC_LOGMSG
))))
1280 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_WAIT
));
1285 if ((pWnd
) && (pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1286 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1288 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_ARROW
));
1290 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1293 void CLogDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1295 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1297 //if (this->IsThreadRunning())
1298 if(m_LogList
.m_bNoDispUpdates
)
1300 if (pNMLV
->iItem
>= 0)
1302 this->m_LogList
.m_nSearchIndex
= pNMLV
->iItem
;
1303 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(pNMLV
->iItem
));
1304 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1305 if (pNMLV
->iSubItem
!= 0)
1307 if ((pNMLV
->iItem
== m_LogList
.m_arShownList
.GetCount()))
1309 // remove the selected state
1310 if (pNMLV
->uChanged
& LVIF_STATE
)
1312 m_LogList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1313 FillLogMessageCtrl();
1315 UpdateLogInfoLabel();
1319 if (pNMLV
->uChanged
& LVIF_STATE
)
1321 FillLogMessageCtrl();
1327 m_LogList
.m_lastSelectedHash
.Empty();
1328 FillLogMessageCtrl();
1332 UpdateLogInfoLabel();
1335 void CLogDlg::OnLvnItemchangedLogmsg(NMHDR
* /*pNMHDR*/, LRESULT
* /*pResult*/)
1337 UpdateLogInfoLabel();
1340 void CLogDlg::OnEnLinkMsgview(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1342 ENLINK
*pEnLink
= reinterpret_cast<ENLINK
*>(pNMHDR
);
1343 if (pEnLink
->msg
== WM_LBUTTONUP
)
1346 GetDlgItemText(IDC_MSGVIEW
, msg
);
1347 msg
.Replace(_T("\r\n"), _T("\n"));
1348 url
= msg
.Mid(pEnLink
->chrg
.cpMin
, pEnLink
->chrg
.cpMax
-pEnLink
->chrg
.cpMin
);
1350 if (LookLikeGitHash(url
, pos
))
1353 for (int i
= 0; i
< m_LogList
.m_arShownList
.GetCount(); ++i
)
1355 GitRev
*rev
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1357 if (rev
->m_CommitHash
.ToString().Left(url
.GetLength()) == url
)
1359 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1362 int index
= m_LogList
.GetNextSelectedItem(pos
);
1364 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1366 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
1367 m_LogList
.EnsureVisible(i
, FALSE
);
1368 m_LogList
.SetSelectionMark(i
);
1370 PostMessage(WM_TGIT_REFRESH_SELECTION
, 0, 0);
1376 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
1380 if (!::PathIsURL(url
))
1382 url
= m_LogList
.m_ProjectProperties
.GetBugIDUrl(url
);
1383 url
= GetAbsoluteUrlFromRelativeUrl(url
);
1386 ShellExecute(this->m_hWnd
, _T("open"), url
, NULL
, NULL
, SW_SHOWDEFAULT
);
1392 void CLogDlg::OnBnClickedStatbutton()
1394 if (this->IsThreadRunning())
1396 if (m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
)
1397 return; // nothing or just the working copy changes are shown, so no statistics.
1398 // the statistics dialog expects the log entries to be sorted by date
1399 SortByColumn(3, false);
1402 m_LogList
.RecalculateShownList(&dlg
.m_ShowList
);
1404 dlg
.m_path
= m_orgPath
;
1406 // restore the previous sorting
1407 SortByColumn(m_nSortColumn
, m_bAscending
);
1408 OnTimer(LOGFILTER_TIMER
);
1411 void CLogDlg::MoveToSameTop(CWnd
*pWndRef
, CWnd
*pWndTarget
)
1413 CRect rcWndPicAuthor
, rcWndMsgView
;
1414 pWndRef
->GetWindowRect(rcWndMsgView
);
1415 ScreenToClient(rcWndMsgView
);
1416 pWndTarget
->GetWindowRect(rcWndPicAuthor
);
1417 ScreenToClient(rcWndPicAuthor
);
1418 int diff
= rcWndMsgView
.top
- rcWndPicAuthor
.top
;
1419 rcWndPicAuthor
.top
+= diff
;
1420 rcWndPicAuthor
.bottom
+= diff
;
1421 pWndTarget
->MoveWindow(rcWndPicAuthor
);
1424 void CLogDlg::DoSizeV1(int delta
)
1427 RemoveAnchor(IDC_LOGLIST
);
1428 RemoveAnchor(IDC_SPLITTERTOP
);
1429 RemoveAnchor(IDC_MSGVIEW
);
1430 RemoveAnchor(IDC_PIC_AUTHOR
);
1431 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1432 RemoveAnchor(IDC_LOGMSG
);
1433 CSplitterControl::ChangeHeight(&m_LogList
, delta
, CW_TOPALIGN
);
1434 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), -delta
, CW_BOTTOMALIGN
);
1435 MoveToSameTop(GetDlgItem(IDC_MSGVIEW
), GetDlgItem(IDC_PIC_AUTHOR
));
1436 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
1437 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
1438 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
1439 AddAnchor(IDC_PIC_AUTHOR
, TOP_RIGHT
);
1440 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1441 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1445 m_LogList
.Invalidate();
1446 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1447 m_gravatar
.Invalidate();
1451 void CLogDlg::DoSizeV2(int delta
)
1454 RemoveAnchor(IDC_LOGLIST
);
1455 RemoveAnchor(IDC_SPLITTERTOP
);
1456 RemoveAnchor(IDC_MSGVIEW
);
1457 RemoveAnchor(IDC_PIC_AUTHOR
);
1458 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1459 RemoveAnchor(IDC_LOGMSG
);
1460 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), delta
, CW_TOPALIGN
);
1461 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl
, -delta
, CW_BOTTOMALIGN
);
1462 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
1463 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
1464 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
1465 AddAnchor(IDC_PIC_AUTHOR
, TOP_RIGHT
);
1466 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1467 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1471 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1472 m_ChangedFileListCtrl
.Invalidate();
1473 m_gravatar
.Invalidate();
1477 void CLogDlg::AdjustMinSize()
1479 // adjust the minimum size of the dialog to prevent the resizing from
1480 // moving the list control too far down.
1481 CRect rcChgListView
;
1482 m_ChangedFileListCtrl
.GetClientRect(rcChgListView
);
1484 m_LogList
.GetClientRect(rcLogList
);
1486 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(),
1487 m_DlgOrigRect
.Height()-m_ChgOrigRect
.Height()-m_LogListOrigRect
.Height()-m_MsgViewOrigRect
.Height()
1488 +rcChgListView
.Height()+rcLogList
.Height()+60));
1491 LRESULT
CLogDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
1495 if (wParam
== IDC_SPLITTERTOP
)
1497 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1498 DoSizeV1(pHdr
->delta
);
1500 else if (wParam
== IDC_SPLITTERBOTTOM
)
1502 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1503 DoSizeV2(pHdr
->delta
);
1508 return CResizableDialog::DefWindowProc(message
, wParam
, lParam
);
1511 void CLogDlg::SetSplitterRange()
1513 if ((m_LogList
)&&(m_ChangedFileListCtrl
))
1516 m_LogList
.GetWindowRect(rcTop
);
1517 ScreenToClient(rcTop
);
1519 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(rcMiddle
);
1520 ScreenToClient(rcMiddle
);
1521 m_wndSplitter1
.SetRange(rcTop
.top
+30, rcMiddle
.bottom
-20);
1523 m_ChangedFileListCtrl
.GetWindowRect(rcBottom
);
1524 ScreenToClient(rcBottom
);
1525 m_wndSplitter2
.SetRange(rcMiddle
.top
+30, rcBottom
.bottom
-20);
1529 LRESULT
CLogDlg::OnClickedInfoIcon(WPARAM
/*wParam*/, LPARAM lParam
)
1531 // FIXME: x64 version would get this function called with unexpected parameters.
1535 RECT
* rect
= (LPRECT
)lParam
;
1538 point
= CPoint(rect
->left
, rect
->bottom
);
1539 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_SelectedFilters & x ? MF_CHECKED : MF_UNCHECKED))
1541 if (popup
.CreatePopupMenu())
1543 temp
.LoadString(IDS_LOG_FILTER_SUBJECT
);
1544 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT
), LOGFILTER_SUBJECT
, temp
);
1546 temp
.LoadString(IDS_LOG_FILTER_MESSAGES
);
1547 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES
), LOGFILTER_MESSAGES
, temp
);
1549 temp
.LoadString(IDS_LOG_FILTER_PATHS
);
1550 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS
), LOGFILTER_PATHS
, temp
);
1552 temp
.LoadString(IDS_LOG_FILTER_AUTHORS
);
1553 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS
), LOGFILTER_AUTHORS
, temp
);
1555 temp
.LoadString(IDS_LOG_FILTER_EMAILS
);
1556 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_EMAILS
), LOGFILTER_EMAILS
, temp
);
1558 temp
.LoadString(IDS_LOG_FILTER_REVS
);
1559 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS
), LOGFILTER_REVS
, temp
);
1561 temp
.LoadString(IDS_LOG_FILTER_REFNAME
);
1562 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME
), LOGFILTER_REFNAME
, temp
);
1564 if (m_LogList
.m_bShowBugtraqColumn
== TRUE
) {
1565 temp
.LoadString(IDS_LOG_FILTER_BUGIDS
);
1566 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID
), LOGFILTER_BUGID
, temp
);
1569 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1571 temp
.LoadString(IDS_LOG_FILTER_REGEX
);
1572 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterWithRegex
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_REGEX
, temp
);
1575 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1579 if (selection
== LOGFILTER_REGEX
)
1581 m_bFilterWithRegex
= !m_bFilterWithRegex
;
1582 CRegDWORD b
= CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE
);
1583 b
= m_bFilterWithRegex
;
1584 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
;
1586 CheckRegexpTooltip();
1590 m_LogList
.m_SelectedFilters
^= selection
;
1593 // Reload only if a search text is entered
1594 if (!m_LogList
.m_sFilterText
.IsEmpty())
1595 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
1601 LRESULT
CLogDlg::OnClickedCancelFilter(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1604 KillTimer(LOGFILTER_TIMER
);
1606 m_LogList
.m_sFilterText
.Empty();
1608 theApp
.DoWaitCursor(1);
1609 CStoreSelection
storeselection(this);
1610 FillLogMessageCtrl(false);
1612 m_LogList
.RemoveFilter();
1617 m_LogList
.GetTimeRange(begin
,end
);
1618 m_DateFrom
.SetTime(&begin
);
1619 m_DateTo
.SetTime(&end
);
1621 theApp
.DoWaitCursor(-1);
1622 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
1623 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
1624 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
1625 UpdateLogInfoLabel();
1631 void CLogDlg::SetFilterCueText()
1633 CString
temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY
));
1636 if (m_LogList
.m_SelectedFilters
& LOGFILTER_SUBJECT
)
1638 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT
));
1641 if (m_LogList
.m_SelectedFilters
& LOGFILTER_MESSAGES
)
1643 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1645 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES
));
1648 if (m_LogList
.m_SelectedFilters
& LOGFILTER_PATHS
)
1650 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1652 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS
));
1655 if (m_LogList
.m_SelectedFilters
& LOGFILTER_AUTHORS
)
1657 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1659 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS
));
1662 if (m_LogList
.m_SelectedFilters
& LOGFILTER_EMAILS
)
1664 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1666 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_EMAILS
));
1669 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REVS
)
1671 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1673 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS
));
1676 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REFNAME
)
1678 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1680 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REFNAME
));
1683 if (m_LogList
.m_SelectedFilters
& LOGFILTER_BUGID
)
1685 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1687 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS
));
1690 // to make the cue banner text appear more to the right of the edit control
1691 temp
= _T(" ")+temp
;
1692 m_cFilter
.SetCueBanner(temp
.TrimRight());
1695 bool CLogDlg::Validate(LPCTSTR string
)
1697 if (!m_bFilterWithRegex
)
1699 std::tr1::wregex pat
;
1700 return m_LogList
.ValidateRegexp(string
, pat
, false);
1704 void CLogDlg::OnTimer(UINT_PTR nIDEvent
)
1706 if (nIDEvent
== LOGFTIME_TIMER
)
1708 KillTimer(LOGFTIME_TIMER
);
1710 m_LogList
.Refresh(FALSE
);
1711 FillLogMessageCtrl(false);
1714 if (nIDEvent
== LOGFILTER_TIMER
)
1716 KillTimer(LOGFILTER_TIMER
);
1718 m_LogList
.Refresh(FALSE
);
1719 FillLogMessageCtrl(false);
1722 /* we will use git built-in grep to filter log */
1723 if (this->IsThreadRunning())
1725 // thread still running! So just restart the timer.
1726 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
1729 CWnd
* focusWnd
= GetFocus();
1730 bool bSetFocusToFilterControl
= ((focusWnd
!= GetDlgItem(IDC_DATEFROM
))&&(focusWnd
!= GetDlgItem(IDC_DATETO
))
1731 && (focusWnd
!= GetDlgItem(IDC_LOGLIST
)));
1732 if (m_LogList
.m_sFilterText
.IsEmpty())
1734 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
1735 // do not return here!
1736 // we also need to run the filter if the filter text is empty:
1737 // 1. to clear an existing filter
1738 // 2. to rebuild the m_arShownList after sorting
1740 theApp
.DoWaitCursor(1);
1741 CStoreSelection
storeselection(this);
1742 KillTimer(LOGFILTER_TIMER
);
1743 FillLogMessageCtrl(false);
1745 // now start filter the log list
1746 m_LogList
.StartFilter();
1748 if ( m_LogList
.GetItemCount()==1 )
1750 m_LogList
.SetSelectionMark(0);
1751 m_LogList
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
1753 theApp
.DoWaitCursor(-1);
1754 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
1755 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
1756 if (bSetFocusToFilterControl
)
1757 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
1758 UpdateLogInfoLabel();
1760 } // if (nIDEvent == LOGFILTER_TIMER)
1761 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
))));
1762 __super::OnTimer(nIDEvent
);
1765 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
1770 m_DateTo
.GetTime(_time
);
1772 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 23, 59, 59);
1773 if (time
.GetTime() != m_LogList
.m_To
)
1775 m_LogList
.m_To
= (DWORD
)time
.GetTime();
1776 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
1781 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1787 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
1793 m_DateFrom
.GetTime(_time
);
1795 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 0, 0, 0);
1796 if (time
.GetTime() != m_LogList
.m_From
)
1798 m_LogList
.m_From
= (DWORD
)time
.GetTime();
1799 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
1804 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1810 void CLogDlg::OnCbnSelchangeJumpType()
1812 // reserved for future use
1815 void CLogDlg::OnBnClickedJumpUp()
1817 int sel
= m_JumpType
.GetCurSel();
1818 if (sel
< 0) return;
1819 JumpType jumpType
= (JumpType
)sel
;
1824 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1827 index
= m_LogList
.GetNextSelectedItem(pos
);
1828 if (index
== 0) return;
1830 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
1831 if (jumpType
== JumpType_AuthorEmail
)
1832 strValue
= data
->GetAuthorEmail();
1833 else if (jumpType
== JumpType_CommitterEmail
)
1834 strValue
= data
->GetCommitterEmail();
1835 else if (jumpType
== JumpType_Parent1
)
1836 hashValue
= data
->m_CommitHash
;
1837 else if (jumpType
== JumpType_Parent2
)
1838 hashValue
= data
->m_CommitHash
;
1839 else if (jumpType
== JumpType_TagFF
)
1840 hashValue
= data
->m_CommitHash
;
1841 else if (jumpType
== JumpType_BranchFF
)
1842 hashValue
= data
->m_CommitHash
;
1844 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1851 index
= m_LogList
.GetNextSelectedItem(pos
);
1852 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1854 m_LogList
.SetSelectionMark(-1);
1856 for (int i
= index
- 1; i
>= 0; i
--)
1859 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1860 if (jumpType
== JumpType_AuthorEmail
)
1861 found
= strValue
== data
->GetAuthorEmail();
1862 else if (jumpType
== JumpType_CommitterEmail
)
1863 found
= strValue
== data
->GetCommitterEmail();
1864 else if (jumpType
== JumpType_MergePoint
)
1865 found
= data
->ParentsCount() > 1;
1866 else if (jumpType
== JumpType_Parent1
)
1868 if (data
->m_ParentHash
.size() > 0)
1869 found
= data
->m_ParentHash
[0] == hashValue
;
1871 else if (jumpType
== JumpType_Parent2
)
1873 if (data
->m_ParentHash
.size() > 1)
1874 found
= data
->m_ParentHash
[1] == hashValue
;
1876 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
1878 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
1879 for (size_t j
= 0; j
< refList
.size(); ++j
)
1881 if (refList
[j
].Left(10) == _T("refs/tags/"))
1888 if (found
&& jumpType
== JumpType_TagFF
)
1889 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
1891 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
1893 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
1894 for (size_t j
= 0; j
< refList
.size(); ++j
)
1896 if (refList
[j
].Left(11) == _T("refs/heads/") || refList
[j
].Left(13) == _T("refs/remotes/"))
1903 if (found
&& jumpType
== JumpType_BranchFF
)
1904 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
1909 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
1910 m_LogList
.EnsureVisible(i
, FALSE
);
1911 m_LogList
.SetSelectionMark(i
);
1916 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
1919 void CLogDlg::OnBnClickedJumpDown()
1921 int jumpType
= m_JumpType
.GetCurSel();
1922 if (jumpType
< 0) return;
1927 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1930 index
= m_LogList
.GetNextSelectedItem(pos
);
1931 if (index
== 0) return;
1933 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
1934 if (jumpType
== JumpType_AuthorEmail
)
1935 strValue
= data
->GetAuthorEmail();
1936 else if (jumpType
== JumpType_CommitterEmail
)
1937 strValue
= data
->GetCommitterEmail();
1938 else if (jumpType
== JumpType_Parent1
)
1940 if (data
->m_ParentHash
.size() > 0)
1941 hashValue
= data
->m_ParentHash
.at(0);
1945 else if (jumpType
== JumpType_Parent2
)
1947 if (data
->m_ParentHash
.size() > 1)
1948 hashValue
= data
->m_ParentHash
.at(1);
1952 else if (jumpType
== JumpType_TagFF
)
1953 hashValue
= data
->m_CommitHash
;
1954 else if (jumpType
== JumpType_BranchFF
)
1955 hashValue
= data
->m_CommitHash
;
1957 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1964 index
= m_LogList
.GetNextSelectedItem(pos
);
1965 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1967 m_LogList
.SetSelectionMark(-1);
1969 for (int i
= index
+ 1; i
< m_LogList
.GetItemCount(); ++i
)
1972 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1973 if (jumpType
== JumpType_AuthorEmail
)
1974 found
= strValue
== data
->GetAuthorEmail();
1975 else if (jumpType
== JumpType_CommitterEmail
)
1976 found
= strValue
== data
->GetCommitterEmail();
1977 else if (jumpType
== JumpType_MergePoint
)
1978 found
= data
->ParentsCount() > 1;
1979 else if (jumpType
== JumpType_Parent1
)
1980 found
= data
->m_CommitHash
== hashValue
;
1981 else if (jumpType
== JumpType_Parent2
)
1982 found
= data
->m_CommitHash
== hashValue
;
1983 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
1985 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
1986 for (size_t j
= 0; j
< refList
.size(); ++j
)
1988 if (refList
[j
].Left(10) == _T("refs/tags/"))
1995 if (found
&& jumpType
== JumpType_TagFF
)
1996 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
1998 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2000 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2001 for (size_t j
= 0; j
< refList
.size(); ++j
)
2003 if (refList
[j
].Left(11) == _T("refs/heads/") || refList
[j
].Left(13) == _T("refs/remotes/"))
2010 if (found
&& jumpType
== JumpType_BranchFF
)
2011 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
2016 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2017 m_LogList
.EnsureVisible(i
, FALSE
);
2018 m_LogList
.SetSelectionMark(i
);
2023 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
2026 CTGitPathList
CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)
2028 CTGitPathList pathList
;
2031 if (m_sRepositoryRoot
.IsEmpty() && (bRelativePaths
== false))
2033 m_sRepositoryRoot
= GetRepositoryRoot(m_path
);
2035 if (m_sRepositoryRoot
.IsEmpty() && (bRelativePaths
== false))
2038 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2043 int nextpos
= m_LogList
.GetNextSelectedItem(pos
);
2044 if (nextpos
>= m_arShownList
.GetCount())
2046 PLOGENTRYDATA pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(nextpos
));
2047 LogChangedPathArray
* cpatharray
= pLogEntry
->pArChangedPaths
;
2048 for (INT_PTR cpPathIndex
= 0; cpPathIndex
<cpatharray
->GetCount(); ++cpPathIndex
)
2050 LogChangedPath
* cpath
= cpatharray
->SafeGetAt(cpPathIndex
);
2054 if (!bRelativePaths
)
2055 path
.SetFromGit(m_sRepositoryRoot
);
2056 path
.AppendPathString(cpath
->sPath
);
2058 ((m_cHidePaths
.GetState() & 0x0003)!=BST_CHECKED
)||
2059 (cpath
->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0))
2060 pathList
.AddPath(path
);
2065 pathList
.RemoveDuplicates();
2070 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
2078 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscRevSort());
2080 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescRevSort());
2086 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscActionSort());
2088 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescActionSort());
2094 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscAuthorSort());
2096 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescAuthorSort());
2102 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscDateSort());
2104 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescDateSort());
2107 case 4: // Message or bug id
2108 if (m_bShowBugtraqColumn
)
2111 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscBugIDSort());
2113 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescBugIDSort());
2116 // fall through here
2120 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscMessageSort());
2122 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescMessageSort());
2132 void CLogDlg::OnLvnColumnclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2134 if (this->IsThreadRunning())
2135 return; //no sorting while the arrays are filled
2137 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
2138 const int nColumn
= pNMLV
->iSubItem
;
2139 m_bAscending
= nColumn
== m_nSortColumn
? !m_bAscending
: TRUE
;
2140 m_nSortColumn
= nColumn
;
2141 SortByColumn(m_nSortColumn
, m_bAscending
);
2142 SetSortArrow(&m_LogList
, m_nSortColumn
, !!m_bAscending
);
2143 SortShownListArray();
2144 m_LogList
.Invalidate();
2145 UpdateLogInfoLabel();
2147 UNREFERENCED_PARAMETER(pNMHDR
);
2151 CLogOrdering orderDlg
;
2152 if (orderDlg
.DoModal() == IDOK
)
2156 void CLogDlg::SortShownListArray()
2158 // make sure the shown list still matches the filter after sorting.
2159 OnTimer(LOGFILTER_TIMER
);
2160 // clear the selection states
2161 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2164 m_LogList
.SetItemState(m_LogList
.GetNextSelectedItem(pos
), 0, LVIS_SELECTED
);
2166 m_LogList
.SetSelectionMark(-1);
2169 void CLogDlg::SetSortArrow(CListCtrl
* control
, int nColumn
, bool bAscending
)
2171 if (control
== NULL
)
2173 // set the sort arrow
2174 CHeaderCtrl
* pHeader
= control
->GetHeaderCtrl();
2175 HDITEM HeaderItem
= {0};
2176 HeaderItem
.mask
= HDI_FORMAT
;
2177 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
2179 pHeader
->GetItem(i
, &HeaderItem
);
2180 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
2181 pHeader
->SetItem(i
, &HeaderItem
);
2185 pHeader
->GetItem(nColumn
, &HeaderItem
);
2186 HeaderItem
.fmt
|= (bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
2187 pHeader
->SetItem(nColumn
, &HeaderItem
);
2191 int CLogDlg::m_nSortColumnPathList
= 0;
2192 bool CLogDlg::m_bAscendingPathList
= false;
2194 void CLogDlg::OnBnClickedHidepaths()
2196 FillLogMessageCtrl();
2197 m_ChangedFileListCtrl
.Invalidate();
2200 void CLogDlg::UpdateLogInfoLabel()
2205 long selectedrevs
= 0;
2206 long selectedfiles
= 0;
2207 int count
= (int)m_LogList
.m_arShownList
.GetCount();
2211 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(0)))->m_CommitHash
;
2212 if(this->m_LogList
.m_bShowWC
&& rev1
.IsEmpty()&&(count
>1))
2214 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(start
)))->m_CommitHash
;
2215 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_arShownList.GetCount()-1));
2216 rev2
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(count
-1)))->m_CommitHash
;
2217 selectedrevs
= m_LogList
.GetSelectedCount();
2219 selectedfiles
= m_ChangedFileListCtrl
.GetSelectedCount();
2222 sTemp
.Format(IDS_PROC_LOG_STATS
,
2224 rev2
.ToString().Left(g_Git
.GetShortHASHLength()), rev1
.ToString().Left(g_Git
.GetShortHASHLength()), selectedrevs
, selectedfiles
);
2226 if(selectedrevs
== 1)
2228 CString str
=m_ChangedFileListCtrl
.GetStatisticsString(true);
2229 str
.Replace(_T('\n'), _T(' '));
2230 sTemp
+= _T("\r\n") + str
;
2237 void CLogDlg::OnDtnDropdownDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2239 // the date control should not show the "today" button
2240 CMonthCalCtrl
* pCtrl
= m_DateFrom
.GetMonthCalCtrl();
2242 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
2246 void CLogDlg::OnDtnDropdownDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2248 // the date control should not show the "today" button
2249 CMonthCalCtrl
* pCtrl
= m_DateTo
.GetMonthCalCtrl();
2251 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
2255 void CLogDlg::OnSize(UINT nType
, int cx
, int cy
)
2257 __super::OnSize(nType
, cx
, cy
);
2262 void CLogDlg::OnRefresh()
2266 this->m_LogProgress
.SetPos(0);
2272 void CLogDlg::OnFocusFilter()
2274 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2277 void CLogDlg::OnEditCopy()
2279 if (GetFocus() == &m_ChangedFileListCtrl
)
2280 CopyChangedSelectionToClipBoard();
2282 m_LogList
.CopySelectionToClipBoard();
2285 CString
CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString
& url
)
2287 // is the URL a relative one?
2288 if (url
.Left(2).Compare(_T("^/")) == 0)
2290 // URL is relative to the repository root
2291 CString url1
= m_sRepositoryRoot
+ url
.Mid(1);
2292 TCHAR buf
[INTERNET_MAX_URL_LENGTH
];
2293 DWORD len
= url
.GetLength();
2294 if (UrlCanonicalize((LPCTSTR
)url1
, buf
, &len
, 0) == S_OK
)
2295 return CString(buf
, len
);
2298 else if (url
[0] == '/')
2300 // URL is relative to the server's hostname
2302 // find the server's hostname
2303 int schemepos
= m_sRepositoryRoot
.Find(_T("//"));
2306 sHost
= m_sRepositoryRoot
.Left(m_sRepositoryRoot
.Find('/', schemepos
+3));
2307 CString url1
= sHost
+ url
;
2308 TCHAR buf
[INTERNET_MAX_URL_LENGTH
];
2309 DWORD len
= url
.GetLength();
2310 if (UrlCanonicalize((LPCTSTR
)url
, buf
, &len
, 0) == S_OK
)
2311 return CString(buf
, len
);
2318 void CLogDlg::ShowGravatar()
2320 m_gravatar
.EnableGravatar(m_bShowGravatar
);
2321 if (m_gravatar
.IsGravatarEnabled())
2324 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
2325 ScreenToClient(&rect
);
2326 m_gravatar
.GetWindowRect(&rect2
);
2327 ScreenToClient(&rect2
);
2328 rect
.right
= rect2
.left
;
2329 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
2330 m_gravatar
.ShowWindow(SW_SHOW
);
2335 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
2336 ScreenToClient(&rect
);
2337 m_gravatar
.GetWindowRect(&rect2
);
2338 ScreenToClient(&rect2
);
2339 rect
.right
= rect2
.right
;
2340 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
2341 m_gravatar
.ShowWindow(SW_HIDE
);
2346 void CLogDlg::OnEnChangeSearchedit()
2349 if (m_LogList
.m_sFilterText
.IsEmpty())
2351 CStoreSelection
storeselection(this);
2352 // clear the filter, i.e. make all entries appear
2353 theApp
.DoWaitCursor(1);
2354 KillTimer(LOGFILTER_TIMER
);
2355 FillLogMessageCtrl(false);
2358 //m_LogList.StartFilter();
2360 InterlockedExchange(&m_bNoDispUpdates
, TRUE
);
2361 m_arShownList
.RemoveAll();
2362 for (DWORD i
=0; i
<m_logEntries
.size(); ++i
)
2364 if (IsEntryInDateRange(i
))
2365 m_arShownList
.Add(m_logEntries
[i
]);
2367 InterlockedExchange(&m_bNoDispUpdates
, FALSE
);
2368 m_LogList
.DeleteAllItems();
2369 m_LogList
.SetItemCountEx(ShownCountWithStopped());
2370 m_LogList
.RedrawItems(0, ShownCountWithStopped());
2371 m_LogList
.SetRedraw(false);
2372 ResizeAllListCtrlCols();
2373 m_LogList
.SetRedraw(true);
2375 theApp
.DoWaitCursor(-1);
2376 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2377 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2378 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2379 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
2382 if (Validate(m_LogList
.m_sFilterText
))
2383 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
2385 KillTimer(LOGFILTER_TIMER
);
2389 void CLogDlg::OnBnClickedAllBranch()
2391 // m_bAllBranch is not auto-toggled by MFC, we have to handle it manually (in order to prevent the indeterminate state)
2393 m_LogList
.m_ShowMask
&=~ (CGit::LOG_INFO_LOCAL_BRANCHES
| CGit::LOG_INFO_ALL_BRANCH
);
2396 m_bAllBranch
= BST_UNCHECKED
;
2399 m_bAllBranch
= BST_CHECKED
;
2400 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
2407 FillLogMessageCtrl(false);
2410 void CLogDlg::OnBnClickedFollowRenames()
2412 if(m_bFollowRenames
)
2414 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_FOLLOW
;
2415 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_LOCAL_BRANCHES
;
2419 m_bAllBranch
= FALSE
;
2420 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_ALL_BRANCH
;
2425 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_FOLLOW
;
2427 DialogEnableWindow(IDC_LOG_ALLBRANCH
, !m_bFollowRenames
);
2428 DialogEnableWindow(IDC_SHOWWHOLEPROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
2432 FillLogMessageCtrl(false);
2435 void CLogDlg::HandleShowLabels(bool var
, int flag
)
2438 m_LogList
.m_ShowRefMask
|= flag
;
2440 m_LogList
.m_ShowRefMask
&= ~flag
;
2442 if ((m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_REFS
) && !(m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_ANYCOMMIT
))
2444 // Remove commits where labels are not shown.
2446 FillLogMessageCtrl(false);
2451 m_LogList
.Invalidate();
2455 void CLogDlg::OnBnClickedCompressedGraph()
2459 if (m_iCompressedGraph
== 2)
2460 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_REFS
;
2461 else if (m_iCompressedGraph
== 1)
2462 m_LogList
.m_ShowFilter
= static_cast<CGitLogListBase::FilterShow
>(CGitLogListBase::FILTERSHOW_REFS
| CGitLogListBase::FILTERSHOW_MERGEPOINTS
);
2464 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_ALL
;
2467 FillLogMessageCtrl(false);
2470 void CLogDlg::OnBnClickedBrowseRef()
2472 CString newRef
= CBrowseRefsDlg::PickRef(false, m_LogList
.GetRange(), gPickRef_All
, true);
2473 if(newRef
.IsEmpty())
2476 m_History
.AddEntry(newRef
);
2481 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
);
2482 m_bAllBranch
= BST_UNCHECKED
;
2486 FillLogMessageCtrl(false);
2489 void CLogDlg::ShowStartRef()
2491 //Show ref name on top
2492 if(!::IsWindow(m_hWnd
))
2494 if (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
))
2496 switch (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
))
2498 case CGit::LOG_INFO_ALL_BRANCH
:
2499 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES
)));
2502 case CGit::LOG_INFO_LOCAL_BRANCHES
:
2503 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_LOCAL_BRANCHES
)));
2507 m_staticRef
.Invalidate(TRUE
);
2508 m_tooltips
.DelTool(GetDlgItem(IDC_STATIC_REF
));
2512 CString showStartRef
= m_LogList
.GetRange();
2513 if (showStartRef
.IsEmpty() || showStartRef
== _T("HEAD"))
2515 showStartRef
.Empty();
2517 if (g_Git
.Run(L
"git.exe symbolic-ref HEAD", &showStartRef
, NULL
, CP_UTF8
))
2518 showStartRef
= CString(MAKEINTRESOURCE(IDS_PROC_LOG_NOBRANCH
));
2519 showStartRef
.Trim(L
"\r\n\t ");
2523 showStartRef
= g_Git
.StripRefName(showStartRef
);
2525 m_staticRef
.SetWindowText(showStartRef
);
2526 CWnd
*pWnd
= GetDlgItem(IDC_STATIC_REF
);
2527 m_tooltips
.AddTool(pWnd
, showStartRef
);
2528 m_staticRef
.Invalidate(TRUE
);
2531 void CLogDlg::SetRange(const CString
& range
)
2533 m_LogList
.SetRange(range
);
2538 static void AppendMenuChecked(CMenu
&menu
, UINT nTextID
, UINT_PTR nItemID
, BOOL checked
= FALSE
, BOOL enabled
= TRUE
)
2541 text
.LoadString(nTextID
);
2542 menu
.AppendMenu(MF_STRING
| (enabled
? MF_ENABLED
: MF_DISABLED
) | (checked
? MF_CHECKED
: MF_UNCHECKED
), nItemID
, text
);
2545 #define WALKBEHAVIOUR_FIRSTPARENT 1
2546 #define WALKBEHAVIOUR_FOLLOWRENAMES 2
2547 #define WALKBEHAVIOUR_COMPRESSEDGRAPH 3
2548 #define WALKBEHAVIOUR_LABELEDCOMMITS 4
2549 #define WALKBEHAVIOUR_NOMERGES 5
2551 void CLogDlg::OnBnClickedWalkBehaviour()
2554 if (popup
.CreatePopupMenu())
2556 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FIRSTPARENT
, WALKBEHAVIOUR_FIRSTPARENT
, m_bFirstParent
);
2557 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_NOMERGES
, WALKBEHAVIOUR_NOMERGES
, m_bNoMerges
);
2558 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FOLLOWRENAMES
, WALKBEHAVIOUR_FOLLOWRENAMES
, m_bFollowRenames
, !(m_path
.IsEmpty() || m_path
.IsDirectory()));
2559 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2560 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_COMPRESSED
, WALKBEHAVIOUR_COMPRESSEDGRAPH
, m_iCompressedGraph
== 1);
2561 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_LABELEDCOMMITS
, WALKBEHAVIOUR_LABELEDCOMMITS
, m_iCompressedGraph
== 2);
2565 GetDlgItem(IDC_WALKBEHAVIOUR
)->GetWindowRect(&rect
);
2566 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, rect
.left
, rect
.top
, this, 0);
2569 case WALKBEHAVIOUR_FIRSTPARENT
:
2570 m_bFirstParent
= !m_bFirstParent
;
2571 OnBnClickedFirstParent();
2573 case WALKBEHAVIOUR_NOMERGES
:
2574 m_bNoMerges
= !m_bNoMerges
;
2575 OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges
2577 case WALKBEHAVIOUR_FOLLOWRENAMES
:
2578 m_bFollowRenames
= !m_bFollowRenames
;
2579 OnBnClickedFollowRenames();
2581 case WALKBEHAVIOUR_COMPRESSEDGRAPH
:
2582 m_iCompressedGraph
= (m_iCompressedGraph
== 1 ? 0 : 1);
2583 OnBnClickedCompressedGraph();
2585 case WALKBEHAVIOUR_LABELEDCOMMITS
:
2586 m_iCompressedGraph
= (m_iCompressedGraph
== 2 ? 0 : 2);
2587 OnBnClickedCompressedGraph();
2592 m_bWalkBehavior
= (m_bFirstParent
|| m_bNoMerges
|| m_bFollowRenames
|| m_iCompressedGraph
);
2597 #define VIEW_HIDEPATHS 1
2598 #define VIEW_GRAYPATHS 2
2599 #define VIEW_SHOWTAGS 3
2600 #define VIEW_SHOWLOCALBRANCHES 4
2601 #define VIEW_SHOWREMOTEBRANCHES 5
2602 #define VIEW_SHOWGRAVATAR 6
2604 void CLogDlg::OnBnClickedView()
2607 if (popup
.CreatePopupMenu())
2609 AppendMenuChecked(popup
, IDS_SHOWFILES_HIDEPATHS
, VIEW_HIDEPATHS
, m_iHidePaths
== 1);
2610 AppendMenuChecked(popup
, IDS_SHOWFILES_GRAYPATHS
, VIEW_GRAYPATHS
, m_iHidePaths
== 2);
2611 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2612 CMenu showLabelsMenu
;
2613 if (showLabelsMenu
.CreatePopupMenu())
2615 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWTAGLABELS
, VIEW_SHOWTAGS
, m_bShowTags
);
2616 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWLOCALBRANCHLABELS
, VIEW_SHOWLOCALBRANCHES
, m_bShowLocalBranches
);
2617 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWREMOTEBRANCHLABELS
, VIEW_SHOWREMOTEBRANCHES
, m_bShowRemoteBranches
);
2618 popup
.AppendMenu(MF_STRING
| MF_POPUP
, (UINT
)showLabelsMenu
.m_hMenu
, (CString
)MAKEINTRESOURCE(IDS_VIEW_LABELS
));
2620 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2621 AppendMenuChecked(popup
, IDS_VIEW_SHOWGRAVATAR
, VIEW_SHOWGRAVATAR
, m_bShowGravatar
);
2625 GetDlgItem(IDC_VIEW
)->GetWindowRect(&rect
);
2626 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, rect
.left
, rect
.top
, this, 0);
2629 case VIEW_HIDEPATHS
:
2630 if (m_iHidePaths
== 1)
2634 OnBnClickedHidepaths();
2636 case VIEW_GRAYPATHS
:
2637 if (m_iHidePaths
== 2)
2641 OnBnClickedHidepaths();
2644 m_bShowTags
= !m_bShowTags
;
2645 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
2647 case VIEW_SHOWLOCALBRANCHES
:
2648 m_bShowLocalBranches
= !m_bShowLocalBranches
;
2649 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
2651 case VIEW_SHOWREMOTEBRANCHES
:
2652 m_bShowRemoteBranches
= !m_bShowRemoteBranches
;
2653 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
2655 case VIEW_SHOWGRAVATAR
:
2657 m_bShowGravatar
= !m_bShowGravatar
;
2661 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2664 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
2665 int moreSel
= m_LogList
.GetNextSelectedItem(pos
);
2668 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
2670 email
= pLogEntry
->GetAuthorEmail();
2673 m_gravatar
.LoadGravatar(email
);
2682 void CLogDlg::OnBnClickedFirstParent()
2684 if(this->m_bFirstParent
)
2685 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_FIRST_PARENT
;
2687 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_FIRST_PARENT
;
2690 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_NO_MERGE
;
2692 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_NO_MERGE
;
2696 FillLogMessageCtrl(false);
2700 void CLogDlg::OnBnClickShowWholeProject()
2704 if(this->m_bWholeProject
)
2706 m_LogList
.m_Path
.Reset();
2710 m_LogList
.m_Path
=m_path
;
2712 m_regShowWholeProject
= m_bWholeProject
;
2718 FillLogMessageCtrl(false);
2722 LRESULT
CLogDlg::OnRefLogChanged(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
2728 LRESULT
CLogDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
2730 m_pTaskbarList
.Release();
2731 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
2732 SetUUIDOverlayIcon(m_hWnd
);
2736 LRESULT
CLogDlg::OnRefreshSelection(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
2738 // it's enough to deselect, then select again one item of the whole selection
2739 int selMark
= m_LogList
.GetSelectionMark();
2742 m_LogList
.SetSelectionMark(selMark
);
2743 m_LogList
.SetItemState(selMark
, 0, LVIS_SELECTED
);
2744 m_LogList
.SetItemState(selMark
, LVIS_SELECTED
, LVIS_SELECTED
);