Fixed issue #3076: Commit dialog opens with incomplete rendering in Windows 7 classic...
[TortoiseGit.git] / src / TortoiseProc / LogDlg.cpp
blob39a750e1aa7e2ddbe60a75fab576dd0ee5916f91
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2009, 2015 - TortoiseSVN
4 // Copyright (C) 2008-2017 - 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.
20 #include "stdafx.h"
21 #include "TortoiseProc.h"
22 #include "StatGraphDlg.h"
23 #include "LogDlg.h"
24 #include "MessageBox.h"
25 #include "AppUtils.h"
26 #include "StringUtils.h"
27 #include "UnicodeUtils.h"
28 #include "TempFile.h"
29 #include "IconMenu.h"
30 #include "BrowseRefsDlg.h"
31 #include "SmartHandle.h"
32 #include "LogOrdering.h"
33 #include "ClipboardHelper.h"
35 #define WM_TGIT_REFRESH_SELECTION (WM_APP + 1)
37 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)
38 CLogDlg::CLogDlg(CWnd* pParent /*=nullptr*/)
39 : CResizableStandAloneDialog(CLogDlg::IDD, pParent)
40 , m_wParam(0)
41 , m_nSortColumn(0)
42 , m_bFollowRenames(false)
43 , m_bSelect(false)
44 , m_bSelectionMustBeSingle(true)
45 , m_bShowTags(true)
46 , m_bShowLocalBranches(true)
47 , m_bShowRemoteBranches(true)
48 , m_bNoMerges(false)
49 , m_iHidePaths(0)
50 , m_bFirstParent(false)
51 , m_bWholeProject(FALSE)
52 , m_iCompressedGraph(0)
53 , m_bShowWC(true)
55 , m_bSelectionMustBeContinuous(false)
57 , m_pNotifyWindow(nullptr)
59 , m_bAscending(FALSE)
60 , m_hAccel(nullptr)
61 , m_bNavigatingWithSelect(false)
63 m_bFilterWithRegex = !!CRegDWORD(L"Software\\TortoiseGit\\UseRegexFilter", FALSE);
64 m_bFilterCaseSensitively = !!CRegDWORD(L"Software\\TortoiseGit\\FilterCaseSensitively", FALSE);
65 m_bAsteriskLogPrefix = !!CRegDWORD(L"Software\\TortoiseGit\\AsteriskLogPrefix", TRUE);
66 m_LogList.m_SelectedFilters = CRegDWORD(L"Software\\TortoiseGit\\SelectedLogFilters", LOGFILTER_ALL);
68 CString str = g_Git.m_CurrentDir;
69 str.Replace(L':', L'_');
71 m_regbAllBranch = CRegDWORD(L"Software\\TortoiseGit\\LogDialog\\AllBranch\\" + str, FALSE);
72 m_AllBranchType = (AllBranchType)(DWORD)m_regbAllBranch;
73 switch (m_AllBranchType)
75 case AllBranchType::None:
76 m_bAllBranch = FALSE;
77 break;
78 case AllBranchType::AllBranches:
79 m_bAllBranch = TRUE;
80 break;
81 default:
82 m_bAllBranch = BST_INDETERMINATE;
85 m_regShowWholeProject = CRegDWORD(L"Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\" + str, FALSE);
86 m_bWholeProject = m_regShowWholeProject;
87 m_regbShowTags = CRegDWORD(L"Software\\TortoiseGit\\LogDialog\\ShowTags\\" + str, TRUE);
88 m_bShowTags = !!m_regbShowTags;
89 m_regbShowLocalBranches = CRegDWORD(L"Software\\TortoiseGit\\LogDialog\\ShowLocalBranches\\" + str, TRUE);
90 m_bShowLocalBranches = !!m_regbShowLocalBranches;
91 m_regbShowRemoteBranches = CRegDWORD(L"Software\\TortoiseGit\\LogDialog\\ShowRemoteBranches\\" + str, TRUE);
92 m_bShowRemoteBranches = !!m_regbShowRemoteBranches;
94 m_regAddBeforeCommit = CRegDWORD(L"Software\\TortoiseGit\\AddBeforeCommit", TRUE);
95 m_bShowUnversioned = !!m_regAddBeforeCommit;
97 m_bShowGravatar = !!CRegDWORD(L"Software\\TortoiseGit\\EnableGravatar", FALSE);
98 m_regbShowGravatar = CRegDWORD(L"Software\\TortoiseGit\\LogDialog\\ShowGravatar\\" + str, m_bShowGravatar);
99 m_bShowGravatar = !!m_regbShowGravatar;
100 m_bShowDescribe = !!CRegDWORD(L"Software\\TortoiseGit\\ShowDescribe");
101 m_bShowBranchRevNo = !!CRegDWORD(L"Software\\TortoiseGit\\ShowBranchRevisionNumber", FALSE);
104 CLogDlg::~CLogDlg()
106 m_regbAllBranch = (DWORD)m_AllBranchType;
107 m_regbShowTags = m_bShowTags;
108 m_regbShowLocalBranches = m_bShowLocalBranches;
109 m_regbShowRemoteBranches = m_bShowRemoteBranches;
110 m_regbShowGravatar = m_bShowGravatar;
111 m_regAddBeforeCommit = m_bShowUnversioned;
114 void CLogDlg::DoDataExchange(CDataExchange* pDX)
116 CResizableStandAloneDialog::DoDataExchange(pDX);
117 DDX_Control(pDX, IDC_LOGLIST, m_LogList);
118 DDX_Control(pDX, IDC_LOGMSG, m_ChangedFileListCtrl);
119 DDX_Control(pDX, IDC_PROGRESS, m_LogProgress);
120 DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1);
121 DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2);
122 DDX_Text(pDX, IDC_SEARCHEDIT, m_LogList.m_sFilterText);
123 DDX_Control(pDX, IDC_DATEFROM, m_DateFrom);
124 DDX_Control(pDX, IDC_DATETO, m_DateTo);
125 DDX_Control(pDX, IDC_LOG_JUMPTYPE, m_JumpType);
126 DDX_Control(pDX, IDC_LOG_JUMPUP, m_JumpUp);
127 DDX_Control(pDX, IDC_LOG_JUMPDOWN, m_JumpDown);
128 DDX_Text(pDX, IDC_LOGINFO, m_sLogInfo);
129 DDX_Check(pDX, IDC_LOG_ALLBRANCH,m_bAllBranch);
130 DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);
131 DDX_Control(pDX, IDC_WALKBEHAVIOUR, m_ctrlWalkBehavior);
132 DDX_Control(pDX, IDC_VIEW, m_ctrlView);
133 DDX_Control(pDX, IDC_SEARCHEDIT, m_cFilter);
134 DDX_Control(pDX, IDC_STATIC_REF, m_staticRef);
135 DDX_Control(pDX, IDC_PIC_AUTHOR, m_gravatar);
136 DDX_Control(pDX, IDC_FILTER, m_cFileFilter);
139 BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
140 ON_WM_CONTEXTMENU()
141 ON_WM_SETCURSOR()
142 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)
143 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGMSG, OnLvnItemchangedLogmsg)
144 ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)
145 ON_EN_VSCROLL(IDC_MSGVIEW, OnEnscrollMsgview)
146 ON_EN_HSCROLL(IDC_MSGVIEW, OnEnscrollMsgview)
147 ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)
149 ON_MESSAGE(WM_TGIT_REFRESH_SELECTION, OnRefreshSelection)
150 ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
151 ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
153 ON_MESSAGE(MSG_LOAD_PERCENTAGE,OnLogListLoading)
155 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
156 ON_WM_TIMER()
157 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
158 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
159 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE, &CLogDlg::OnCbnSelchangeJumpType)
160 ON_COMMAND(IDC_LOG_JUMPUP, &CLogDlg::OnBnClickedJumpUp)
161 ON_COMMAND(IDC_LOG_JUMPDOWN, &CLogDlg::OnBnClickedJumpDown)
162 ON_COMMAND(ID_GO_UP, &CLogDlg::OnBnClickedJumpUp)
163 ON_COMMAND(ID_GO_DOWN, &CLogDlg::OnBnClickedJumpDown)
164 ON_COMMAND(ID_EXITCLEARFILTER, OnExitClearFilter)
165 ON_BN_CLICKED(IDC_WALKBEHAVIOUR, OnBnClickedWalkBehaviour)
166 ON_BN_CLICKED(IDC_VIEW, OnBnClickedView)
167 ON_BN_CLICKED(IDC_WHOLE_PROJECT, OnBnClickShowWholeProject)
168 ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST, OnLvnColumnclick)
169 ON_COMMAND(MSG_FETCHED_DIFF, OnBnClickedHidepaths)
170 ON_BN_CLICKED(IDC_LOG_ALLBRANCH, OnBnClickedAllBranch)
171 ON_EN_CHANGE(IDC_FILTER, OnEnChangeFileFilter)
173 ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)
174 ON_WM_SIZE()
175 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
176 ON_STN_CLICKED(IDC_STATIC_REF, &CLogDlg::OnBnClickedBrowseRef)
177 ON_COMMAND(ID_LOGDLG_REFRESH, &CLogDlg::OnBnClickedRefresh)
178 ON_COMMAND(ID_GO_BACKWARD_SELECT, &CLogDlg::GoBackAndSelect)
179 ON_COMMAND(ID_GO_FORWARD_SELECT, &CLogDlg::GoForwardAndSelect)
180 ON_COMMAND(ID_GO_BACKWARD, &CLogDlg::GoBack)
181 ON_COMMAND(ID_GO_FORWARD, &CLogDlg::GoForward)
182 ON_COMMAND(ID_SELECT_SEARCHFIELD, &CLogDlg::OnSelectSearchField)
183 ON_COMMAND(ID_LOGDLG_FIND, &CLogDlg::OnFind)
184 ON_COMMAND(ID_LOGDLG_FOCUSFILTER, &CLogDlg::OnFocusFilter)
185 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
186 ON_MESSAGE(MSG_REFLOG_CHANGED, OnRefLogChanged)
187 ON_REGISTERED_MESSAGE(TaskBarButtonCreated, OnTaskbarBtnCreated)
189 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED, &CLogDlg::OnFileListCtrlItemChanged)
190 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH, OnGitStatusListCtrlNeedsRefresh)
191 ON_REGISTERED_MESSAGE(CGitLogListBase::LOGLIST_RESET_WCREV, OnResetWcRev)
192 ON_WM_MOVE()
193 ON_WM_MOVING()
194 ON_WM_SIZING()
195 ON_WM_CTLCOLOR()
196 ON_WM_PAINT()
197 END_MESSAGE_MAP()
199 enum JumpType
201 JumpType_AuthorEmail,
202 JumpType_CommitterEmail,
203 JumpType_MergePoint,
204 JumpType_Parent1,
205 JumpType_Parent2,
206 JumpType_Tag,
207 JumpType_TagFF,
208 JumpType_Branch,
209 JumpType_BranchFF,
210 JumpType_History,
213 LRESULT CLogDlg::OnResetWcRev(WPARAM, LPARAM)
215 if (m_LogList.m_hasWC && (m_ChangedFileListCtrl.m_CurrentVersion.IsEmpty() || m_ChangedFileListCtrl.m_CurrentVersion == GIT_REV_ZERO))
216 m_ChangedFileListCtrl.Clear();
218 return 0;
221 LRESULT CLogDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
223 if (m_LogList.m_hasWC && m_LogList.GetSelectedCount() == 1)
225 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
226 size_t selIndex = m_LogList.GetNextSelectedItem(pos);
227 GitRevLoglist* pLogEntry = m_LogList.m_arShownList.SafeGetAt(selIndex);
228 if (pLogEntry && pLogEntry->m_CommitHash.IsEmpty())
229 m_ChangedFileListCtrl.StoreScrollPos();
231 m_LogList.ResetWcRev(true);
232 m_LogList.Invalidate();
233 return 0;
236 void CLogDlg::SetParams(const CTGitPath& orgPath, const CTGitPath& path, CString hightlightRevision, CString range, DWORD limit, int limitScale/*=-1*/)
238 m_orgPath = orgPath;
239 m_path = path;
240 m_hightlightRevision = hightlightRevision;
242 if (range == GIT_REV_ZERO)
243 range = L"HEAD";
245 if (!(range.IsEmpty() || range == L"HEAD"))
247 m_bAllBranch = BST_UNCHECKED;
248 m_AllBranchType = AllBranchType::None;
251 SetRange(range);
253 if (limitScale == CFilterData::SHOW_NO_LIMIT || (!range.IsEmpty() && m_LogList.m_Filter.m_NumberOfLogsScale != CFilterData::SHOW_LAST_N_COMMITS))
254 m_LogList.m_Filter.m_NumberOfLogsScale = CFilterData::SHOW_NO_LIMIT;
255 if (limitScale >= CFilterData::SHOW_LAST_N_COMMITS && limit > 0)
257 // limitation from command line argument, so override the filter.
258 m_LogList.m_Filter.m_NumberOfLogs = limit;
259 m_LogList.m_Filter.m_NumberOfLogsScale = limitScale;
262 if (::IsWindow(m_hWnd))
263 UpdateData(FALSE);
266 void CLogDlg::SetFilter(const CString& findstr, LONG findtype, bool findregex)
268 m_LogList.m_sFilterText = findstr;
269 if (findtype)
270 m_LogList.m_SelectedFilters = findtype;
271 m_LogList.m_bFilterWithRegex = m_bFilterWithRegex = findregex;
274 BOOL CLogDlg::OnInitDialog()
276 CString temp;
277 CResizableStandAloneDialog::OnInitDialog();
278 CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
280 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
281 // do this, Explorer would be unable to send that message to our window if we
282 // were running elevated. It's OK to make the call all the time, since if we're
283 // not elevated, this is a no-op.
284 CHANGEFILTERSTRUCT cfs = { sizeof(CHANGEFILTERSTRUCT) };
285 typedef BOOL STDAPICALLTYPE ChangeWindowMessageFilterExDFN(HWND hWnd, UINT message, DWORD action, PCHANGEFILTERSTRUCT pChangeFilterStruct);
286 CAutoLibrary hUser = AtlLoadSystemLibraryUsingFullPath(L"user32.dll");
287 if (hUser)
289 ChangeWindowMessageFilterExDFN *pfnChangeWindowMessageFilterEx = (ChangeWindowMessageFilterExDFN*)GetProcAddress(hUser, "ChangeWindowMessageFilterEx");
290 if (pfnChangeWindowMessageFilterEx)
292 pfnChangeWindowMessageFilterEx(m_hWnd, TaskBarButtonCreated, MSGFLT_ALLOW, &cfs);
295 m_pTaskbarList.Release();
296 if (FAILED(m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList)))
297 m_pTaskbarList = nullptr;
299 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
301 // use the state of the "stop on copy/rename" option from the last time
302 UpdateData(FALSE);
304 // set the font to use in the log message view, configured in the settings dialog
305 CAppUtils::CreateFontForLogs(m_logFont);
306 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
307 // make the log message rich edit control send a message when the mouse pointer is over a link
308 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK | ENM_SCROLL);
310 // "unrelated paths" should be in gray color
311 m_iHidePaths = 2;
313 // set up the columns
314 m_LogList.DeleteAllItems();
316 m_LogList.m_Path=m_path;
317 m_LogList.m_hasWC = !GitAdminDir::IsBareRepo(g_Git.m_CurrentDir);
318 m_LogList.m_bShowWC = m_LogList.m_hasWC && m_bShowWC;
319 m_LogList.InsertGitColumn();
321 if (m_bWholeProject)
322 m_LogList.m_Path.Reset();
324 m_ChangedFileListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD | GITSLC_COLDEL, L"LogDlg", (GITSLC_POPALL ^ (GITSLC_POPIGNORE | GITSLC_POPRESTORE)), false, m_LogList.m_hasWC, GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD| GITSLC_COLDEL);
326 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
328 SetDlgTitle();
330 CheckRegexpTooltip();
332 SetSplitterRange();
334 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
335 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED, 14, 14);
336 m_cFilter.SetInfoIcon(IDI_LOGFILTER, 19, 19);
337 m_cFilter.SetValidator(this);
339 AdjustControlSize(IDC_LOG_ALLBRANCH);
340 AdjustControlSize(IDC_WHOLE_PROJECT);
342 GetClientRect(m_DlgOrigRect);
343 m_LogList.GetClientRect(m_LogListOrigRect);
344 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
345 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
347 m_Brush.CreateSolidBrush(RGB(174, 200, 255));
349 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
350 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS | MCS_NOTRAILINGDATES | MCS_NOSELCHANGEONNAV);
352 m_staticRef.SetURL(CString());
354 AddMainAnchors();
355 SetFilterCueText();
357 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_LOCAL_BRANCHES;
358 if (m_AllBranchType == AllBranchType::AllBranches)
359 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;
360 else if (m_AllBranchType == AllBranchType::AllLocalBranches)
361 m_LogList.m_ShowMask |= CGit::LOG_INFO_LOCAL_BRANCHES;
362 else if (m_AllBranchType == AllBranchType::AllBasicRefs)
363 m_LogList.m_ShowMask |= CGit::LOG_INFO_BASIC_REFS;
364 else
365 m_LogList.m_ShowMask&=~CGit::LOG_INFO_ALL_BRANCH;
367 HandleShowLabels(m_bShowTags, LOGLIST_SHOWTAGS);
368 HandleShowLabels(m_bShowLocalBranches, LOGLIST_SHOWLOCALBRANCHES);
369 HandleShowLabels(m_bShowRemoteBranches, LOGLIST_SHOWREMOTEBRANCHES);
371 // SetPromptParentWindow(m_hWnd);
372 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL)));
373 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL)));
374 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT)));
375 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1)));
376 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2)));
377 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG)));
378 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF)));
379 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH)));
380 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH_FF)));
381 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_SELECTION_HISTORY)));
382 m_JumpType.SetCurSel(0);
383 int iconWidth = GetSystemMetrics(SM_CXSMICON);
384 int iconHeight = GetSystemMetrics(SM_CYSMICON);
385 m_JumpUp.SetIcon((HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP), IMAGE_ICON, iconWidth, iconHeight, LR_DEFAULTCOLOR));
386 m_JumpDown.SetIcon((HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN), IMAGE_ICON, iconWidth, iconHeight, LR_DEFAULTCOLOR));
388 if (hWndExplorer)
389 CenterWindow(CWnd::FromHandle(hWndExplorer));
390 EnableSaveRestore(L"LogDlg");
392 DWORD yPos1 = CRegDWORD(L"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1");
393 DWORD yPos2 = CRegDWORD(L"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2");
394 RECT rcDlg, rcLogList, rcChgMsg;
395 GetClientRect(&rcDlg);
396 m_LogList.GetWindowRect(&rcLogList);
397 ScreenToClient(&rcLogList);
398 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
399 ScreenToClient(&rcChgMsg);
400 if (yPos1 && ((LONG)yPos1 < rcDlg.bottom - 185))
402 RECT rectSplitter;
403 m_wndSplitter1.GetWindowRect(&rectSplitter);
404 ScreenToClient(&rectSplitter);
405 int delta = yPos1 - rectSplitter.top;
407 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
409 m_wndSplitter1.SetWindowPos(nullptr, rectSplitter.left, yPos1, 0, 0, SWP_NOSIZE);
410 DoSizeV1(delta);
413 if (yPos2 && ((LONG)yPos2 < rcDlg.bottom - 153))
415 RECT rectSplitter;
416 m_wndSplitter2.GetWindowRect(&rectSplitter);
417 ScreenToClient(&rectSplitter);
418 int delta = yPos2 - rectSplitter.top;
420 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
422 m_wndSplitter2.SetWindowPos(nullptr, rectSplitter.left, yPos2, 0, 0, SWP_NOSIZE);
423 DoSizeV2(delta);
427 SetSplitterRange();
428 Invalidate();
430 if (m_bSelect)
432 // the dialog is used to select revisions
433 // enable the OK button if appropriate
434 EnableOKButton();
436 else
438 // the dialog is used to just view log messages
439 // hide the OK button and set text on Cancel button to OK
440 GetDlgItemText(IDOK, temp);
441 SetDlgItemText(IDCANCEL, temp);
442 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
445 // first start a thread to obtain the log messages without
446 // blocking the dialog
447 //m_tTo = 0;
448 //m_tFrom = (DWORD)-1;
450 // scroll to user selected or current revision
451 if (m_hightlightRevision.IsEmpty() || g_Git.GetHash(m_LogList.m_lastSelectedHash, m_hightlightRevision))
453 if (g_Git.GetHash(m_LogList.m_lastSelectedHash, L"HEAD"))
454 MessageBox(g_Git.GetGitLastErr(L"Could not get HEAD hash."), L"TortoiseGit", MB_ICONERROR);
457 if (g_Git.GetConfigValueBool(L"tgit.logshowpatch"))
458 TogglePatchView();
460 m_LogList.FetchLogAsync(this);
461 ShowGravatar();
462 m_gravatar.Init();
464 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED, 14, 14);
465 m_cFilter.SetInfoIcon(IDI_LOGFILTER, 19, 19);
466 temp.LoadString(IDS_FILEDIFF_FILTERCUE);
467 temp = L" " + temp;
468 m_cFileFilter.SetCueBanner(temp);
470 GetDlgItem(IDC_LOGLIST)->SetFocus();
472 m_History.SetMaxHistoryItems((LONG)CRegDWORD(L"Software\\TortoiseGit\\MaxRefHistoryItems", 5));
473 CString reg;
474 reg.Format(L"Software\\TortoiseGit\\History\\log-refs\\%s", (LPCTSTR)g_Git.m_CurrentDir);
475 reg.Replace(L':', L'_');
476 m_History.Load(reg, L"ref");
478 reg.Format(L"Software\\TortoiseGit\\History\\LogDlg_Limits\\%s\\FromDate", (LPCTSTR)g_Git.m_CurrentDir);
479 reg.Replace(L':', L'_');
480 m_regLastSelectedFromDate = CRegString(reg);
482 m_ctrlWalkBehavior.m_bAlwaysShowArrow = true;
483 m_ctrlView.m_bAlwaysShowArrow = true;
485 ShowStartRef();
486 return FALSE;
489 HBRUSH CLogDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
491 HBRUSH hbr = __super::OnCtlColor(pDC, pWnd, nCtlColor);
493 if ((m_LogList.m_Filter.m_NumberOfLogsScale >= CFilterData::SHOW_LAST_N_COMMITS || m_LogList.m_Filter.m_NumberOfLogsScale == CFilterData::SHOW_LAST_SEL_DATE && m_LogList.m_Filter.m_From != -1) && pWnd->GetDlgCtrlID() == IDC_FROMLABEL)
495 pDC->SetBkMode(TRANSPARENT);
496 return m_Brush;
499 return hbr;
502 void CLogDlg::OnPaint()
504 CPaintDC dc(this);
506 if (!(m_LogList.m_Filter.m_NumberOfLogsScale >= CFilterData::SHOW_LAST_N_COMMITS || m_LogList.m_Filter.m_NumberOfLogsScale == CFilterData::SHOW_LAST_SEL_DATE && m_LogList.m_Filter.m_From != -1))
507 return;
509 CWnd* pWnd = GetDlgItem(IDC_FROMLABEL);
510 if (!pWnd)
511 return;
513 CRect rect;
514 pWnd->GetWindowRect(&rect);
515 ScreenToClient(rect);
516 rect.left -= 5;
517 rect.top -= 3;
518 rect.bottom += 3;
520 dc.FillRect(rect, &m_Brush);
523 LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)
525 int cur=(int)wParam;
527 if( cur == GITLOG_START )
529 CString temp;
530 temp.LoadString(IDS_PROGRESSWAIT);
532 this->m_LogList.ShowText(temp, true);
534 // We use a progress bar while getting the logs
535 m_LogProgress.SetRange32(0, 100);
536 m_LogProgress.SetPos(0);
537 if (m_pTaskbarList)
539 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
540 m_pTaskbarList->SetProgressValue(m_hWnd, 0, 100);
543 GetDlgItem(IDC_WALKBEHAVIOUR)->ShowWindow(SW_HIDE);
544 GetDlgItem(IDC_VIEW)->ShowWindow(SW_HIDE);
545 GetDlgItem(IDC_STATBUTTON)->ShowWindow(SW_HIDE);
546 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
548 DialogEnableWindow(IDC_WALKBEHAVIOUR, FALSE);
549 DialogEnableWindow(IDC_STATBUTTON, FALSE);
550 //DialogEnableWindow(IDC_REFRESH, FALSE);
551 DialogEnableWindow(IDC_VIEW, FALSE);
554 else if( cur == GITLOG_END)
556 if(this->m_LogList.HasText())
558 this->m_LogList.ClearText();
560 UpdateLogInfoLabel();
562 if (m_pTaskbarList)
563 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
565 DialogEnableWindow(IDC_WHOLE_PROJECT, !m_bFollowRenames && !m_path.IsEmpty());
567 DialogEnableWindow(IDC_STATBUTTON, !(m_LogList.m_arShownList.empty() || m_LogList.m_arShownList.size() == 1 && m_LogList.m_bShowWC));
568 DialogEnableWindow(IDC_REFRESH, TRUE);
569 DialogEnableWindow(IDC_VIEW, TRUE);
570 DialogEnableWindow(IDC_WALKBEHAVIOUR, TRUE);
571 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
572 GetDlgItem(IDC_WALKBEHAVIOUR)->ShowWindow(SW_SHOW);
573 GetDlgItem(IDC_VIEW)->ShowWindow(SW_SHOW);
574 GetDlgItem(IDC_STATBUTTON)->ShowWindow(SW_SHOW);
575 GetDlgItem(IDC_PROGRESS)->ShowWindow(FALSE);
576 //CTime time=m_LogList.GetOldestTime();
577 CTime begin,end;
578 m_LogList.GetTimeRange(begin,end);
580 if (m_LogList.m_Filter.m_From > 0 && m_LogList.m_Filter.m_NumberOfLogsScale >= CFilterData::SHOW_LAST_SEL_DATE)
581 begin = m_LogList.m_Filter.m_From;
582 m_DateFrom.SetTime(&begin);
583 if (m_LogList.m_Filter.m_To != -1)
584 end = m_LogList.m_Filter.m_To;
585 m_DateTo.SetTime(&end);
586 Invalidate();
588 else
590 if(this->m_LogList.HasText())
592 this->m_LogList.ClearText();
593 this->m_LogList.Invalidate();
595 UpdateLogInfoLabel();
596 m_LogProgress.SetPos(cur);
597 if (m_pTaskbarList)
599 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
600 m_pTaskbarList->SetProgressValue(m_hWnd, cur, 100);
603 return 0;
605 void CLogDlg::SetDlgTitle()
607 if (m_sTitle.IsEmpty())
608 GetWindowText(m_sTitle);
610 if (m_LogList.m_Path.IsEmpty() || m_orgPath.GetWinPathString().IsEmpty())
611 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, m_sTitle);
612 else
613 CAppUtils::SetWindowTitle(m_hWnd, m_orgPath.GetWinPathString(), m_sTitle);
616 void CLogDlg::CheckRegexpTooltip()
618 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
619 // Since tooltip describes regexp features, show it only if regexps are enabled.
620 if (m_bFilterWithRegex)
621 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
622 else
623 m_tooltips.DelTool(pWnd);
626 void CLogDlg::EnableOKButton()
628 if (m_bSelect)
630 // the dialog is used to select revisions
631 if (m_bSelectionMustBeSingle)
633 // enable OK button if only a single revision is selected
634 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()==1));
636 else if (m_bSelectionMustBeContinuous)
637 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
638 else
639 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
641 else
642 DialogEnableWindow(IDOK, TRUE);
645 bool LookLikeGitHash(const CString& msg, int &pos)
647 int c = 0;
648 for (; pos < msg.GetLength(); ++pos)
650 if (msg[pos] >= '0' && msg[pos] <= '9' || msg[pos] >= 'a' && msg[pos] <= 'f')
651 c++;
652 else
653 return c >= g_Git.GetShortHASHLength() && c <= GIT_HASH_SIZE * 2 && msg[pos] != '@';
655 return c >= g_Git.GetShortHASHLength() && c <= GIT_HASH_SIZE * 2;
658 std::vector<CHARRANGE> FindGitHashPositions(const CString& msg, int offset)
660 std::vector<CHARRANGE> result;
661 offset = offset < 0 ? 0 : offset;
662 int old = offset;
663 while (offset < msg.GetLength())
665 old = offset;
666 TCHAR e = msg[offset];
667 if (e == '\n')
669 ++offset;
670 if (msg.Mid(offset, 11) == L"git-svn-id:"
671 || msg.Mid(offset, 14) == L"Signed-off-by:"
672 || msg.Mid(offset, 10) == L"Change-Id:"
675 offset += 10;
676 while (offset < msg.GetLength())
678 if (msg[++offset] == '\n')
679 break;
681 continue;
684 else if (e >= 'A' && e <= 'Z' || e >= 'h' && e <= 'z')
688 e = msg[++offset];
689 } while (offset < msg.GetLength() && (e >= 'A' && e <= 'Z' || e >= 'a' && e <= 'z' || e >= '0' && e <= '9'));
691 else if (e >= 'a' && e <= 'g' || e >= '0' && e <= '9')
693 if (e == 'g')
695 ++old;
696 ++offset;
698 if (LookLikeGitHash(msg, offset))
700 TCHAR d = offset < msg.GetLength() ? msg[offset] : '\0';
701 if (!((d >= 'A' && d <= 'Z') || (d >= 'a' && d <= 'z') || (d >= '0' && d <= '9')))
703 CHARRANGE range = { old, offset };
704 result.push_back(range);
707 ++offset;
709 else
710 ++offset;
713 return result;
716 BOOL FindGitHash(const CString& msg, int offset, CWnd *pWnd)
718 std::vector<CHARRANGE> positions = FindGitHashPositions(msg, offset);
719 CAppUtils::SetCharFormat(pWnd, CFM_LINK, CFE_LINK, positions);
721 return positions.empty() ? FALSE : TRUE;
724 static int DescribeCommit(CGitHash& hash, CString& result)
726 CAutoRepository repo(g_Git.GetGitRepository());
727 if (!repo)
728 return -1;
729 CAutoObject commit;
730 if (git_object_lookup(commit.GetPointer(), repo, (const git_oid *)hash.m_hash, GIT_OBJ_COMMIT))
731 return -1;
733 CAutoDescribeResult describe;
734 git_describe_options describe_options = GIT_DESCRIBE_OPTIONS_INIT;
735 describe_options.describe_strategy = CRegDWORD(L"Software\\TortoiseGit\\DescribeStrategy", GIT_DESCRIBE_DEFAULT);
736 if (git_describe_commit(describe.GetPointer(), (git_object *)commit, &describe_options))
737 return -1;
739 CAutoBuf describe_buf;
740 git_describe_format_options format_options = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
741 format_options.abbreviated_size = CRegDWORD(L"Software\\TortoiseGit\\DescribeAbbreviatedSize", GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE);
742 format_options.always_use_long_format = CRegDWORD(L"Software\\TortoiseGit\\DescribeAlwaysLong");
743 if (git_describe_format(describe_buf, describe, &format_options))
744 return -1;
746 result = CUnicodeUtils::GetUnicode(describe_buf->ptr);
747 return 0;
750 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
752 // we fill here the log message rich edit control,
753 // and also populate the changed files list control
754 // according to the selected revision(s).
756 CRichEditCtrl * pMsgView = (CRichEditCtrl*)GetDlgItem(IDC_MSGVIEW);
757 // empty the log message view
758 pMsgView->SetWindowText(L" ");
759 FillPatchView(true);
760 // empty the changed files list
761 m_ChangedFileListCtrl.SetRedraw(FALSE);
762 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
763 m_ChangedFileListCtrl.Clear();
765 // if we're not here to really show a selected revision, just
766 // get out of here after clearing the views, which is what is intended
767 // if that flag is not set.
768 if (!bShow)
770 // force a redraw
771 m_ChangedFileListCtrl.Invalidate();
772 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
773 m_ChangedFileListCtrl.SetRedraw(TRUE);
774 m_gravatar.LoadGravatar();
775 return;
778 // depending on how many revisions are selected, we have to do different
779 // tasks.
780 int selCount = m_LogList.GetSelectedCount();
781 if (selCount == 0)
783 // if nothing is selected, we have nothing more to do
784 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
785 m_ChangedFileListCtrl.SetRedraw(TRUE);
786 m_gravatar.LoadGravatar();
787 return;
789 else if (selCount == 1)
791 // if one revision is selected, we have to fill the log message view
792 // with the corresponding log message, and also fill the changed files
793 // list fully.
794 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
795 size_t selIndex = m_LogList.GetNextSelectedItem(pos);
796 if (selIndex >= m_LogList.m_arShownList.size())
798 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
799 m_ChangedFileListCtrl.SetRedraw(TRUE);
800 return;
802 GitRevLoglist* pLogEntry = m_LogList.m_arShownList.SafeGetAt(selIndex);
805 m_gravatar.LoadGravatar(pLogEntry->GetAuthorEmail());
807 CString out_describe;
808 if (m_bShowDescribe)
810 CString result;
811 if (!DescribeCommit(pLogEntry->m_CommitHash, result))
812 out_describe = L"Describe: " + result + L"\r\n";
815 CString out_counter;
816 if (m_bShowBranchRevNo && !pLogEntry->m_CommitHash.IsEmpty())
818 bool isFirstParentCommit = !pLogEntry->m_Lanes.empty() && Lanes::isActive(pLogEntry->m_Lanes[0]);
820 if (isFirstParentCommit)
822 CString rev_counter, rev_err;
823 if (g_Git.Run(L"git.exe rev-list --count --first-parent " + pLogEntry->m_CommitHash.ToString(), &rev_counter, &rev_err, CP_UTF8))
824 CMessageBox::Show(GetSafeHwnd(), L"Could not get rev count\n" + rev_counter + L'\n' + rev_err, L"TortoiseGit", MB_ICONERROR);
825 else
826 out_counter = L", " + CString(MAKEINTRESOURCE(IDS_REV_COUNTER)) + L": " + rev_counter.Trim();
830 // set the log message text
831 pMsgView->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH)) + L": " + pLogEntry->m_CommitHash.ToString() + out_counter + L"\r\n" + out_describe + L"\r\n");
832 // turn bug ID's into links if the bugtraq: properties have been set
833 // and we can find a match of those in the log message
835 pMsgView->SetSel(-1,-1);
836 CAppUtils::SetCharFormat(pMsgView, CFM_BOLD, CFE_BOLD);
838 CString msg = m_bAsteriskLogPrefix ? L"* " : L"";
839 msg+=pLogEntry->GetSubject();
840 pMsgView->ReplaceSel(msg);
842 pMsgView->SetSel(-1,-1);
843 CAppUtils::SetCharFormat(pMsgView, CFM_BOLD, 0);
845 HCURSOR old = GetCursor(); // hack to fix issue #2792
847 msg = L'\n';
848 msg+=pLogEntry->GetBody();
849 pMsgView->ReplaceSel(msg);
851 if(!pLogEntry->m_Notes.IsEmpty())
853 pMsgView->SetSel(-1, -1);
854 CAppUtils::SetCharFormat(pMsgView, CFM_BOLD, CFE_BOLD);
855 msg = L'\n';
856 if (m_bAsteriskLogPrefix)
857 msg += L"* ";
858 msg += CString(MAKEINTRESOURCE(IDS_NOTES)) + L":\n";
859 pMsgView->ReplaceSel(msg);
860 pMsgView->SetSel(-1, -1);
861 CAppUtils::SetCharFormat(pMsgView, CFM_BOLD, 0);
862 pMsgView->ReplaceSel(pLogEntry->m_Notes);
865 CString tagInfo = m_LogList.GetTagInfo(pLogEntry);
866 if (!tagInfo.IsEmpty())
868 pMsgView->SetSel(-1, -1);
869 CAppUtils::SetCharFormat(pMsgView, CFM_BOLD, CFE_BOLD);
870 msg = L'\n';
871 if (m_bAsteriskLogPrefix)
872 msg += L"* ";
873 msg += CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO)) + L":\n";
874 pMsgView->ReplaceSel(msg);
875 pMsgView->SetSel(-1, -1);
876 CAppUtils::SetCharFormat(pMsgView, CFM_BOLD, 0);
877 pMsgView->ReplaceSel(tagInfo);
880 SetCursor(old);
882 CString text;
883 pMsgView->GetWindowText(text);
884 // the rich edit control doesn't count the CR char!
885 // to be exact: CRLF is treated as one char.
886 text.Remove('\r');
888 int findHashStart = text.Find('\n');
889 if (!out_describe.IsEmpty())
890 findHashStart = text.Find('\n', findHashStart + 1);
891 FindGitHash(text, findHashStart, pMsgView);
892 m_LogList.m_ProjectProperties.FindBugID(text, pMsgView);
893 CAppUtils::StyleURLs(text, pMsgView);
894 if (((DWORD)CRegStdDWORD(L"Software\\TortoiseGit\\StyleCommitMessages", TRUE)) == TRUE)
895 CAppUtils::FormatTextInRichEditControl(pMsgView);
897 CHARRANGE range;
898 range.cpMin = 0;
899 range.cpMax = 0;
900 pMsgView->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
902 if (!pLogEntry->m_IsDiffFiles)
904 m_ChangedFileListCtrl.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES)));
905 m_ChangedFileListCtrl.SetBusy(TRUE);
906 m_ChangedFileListCtrl.SetRedraw(TRUE);
907 // entry might not already been enqueued for updating, issue #3090
908 pLogEntry->GetAction(&m_LogList);
909 return;
912 CString matchpath=this->m_path.GetGitPathString();
914 CTGitPathList& files = pLogEntry->GetFiles(&m_LogList);
915 int count = files.GetCount();
916 if (!m_bWholeProject && !matchpath.IsEmpty() && m_iHidePaths)
918 int matchPathLen = matchpath.GetLength();
919 bool somethingHidden = false;
920 for (int i = 0; i < count; ++i)
922 ((CTGitPath&)files[i]).m_Action &= ~(CTGitPath::LOGACTIONS_HIDE | CTGitPath::LOGACTIONS_GRAY);
924 if (wcsncmp(files[i].GetGitPathString(), matchpath, matchPathLen) && ((files[i].m_Action & (CTGitPath::LOGACTIONS_REPLACED | CTGitPath::LOGACTIONS_COPY)) == 0 || wcsncmp(files[i].GetGitOldPathString(), matchpath, matchPathLen)))
926 somethingHidden = true;
927 if (m_iHidePaths == 1)
928 ((CTGitPath&)files[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;
929 else if (m_iHidePaths == 2)
930 ((CTGitPath&)files[i]).m_Action |= CTGitPath::LOGACTIONS_GRAY;
933 if (somethingHidden)
934 pLogEntry->GetAction(&m_LogList) |= CTGitPath::LOGACTIONS_HIDE;
935 else
936 pLogEntry->GetAction(&m_LogList) &= ~CTGitPath::LOGACTIONS_HIDE;
938 else if (pLogEntry->GetAction(&m_LogList) & CTGitPath::LOGACTIONS_HIDE)
940 pLogEntry->GetAction(&m_LogList) &= ~CTGitPath::LOGACTIONS_HIDE;
941 for (int i = 0 ; i < count; ++i)
942 ((CTGitPath&)files[i]).m_Action &= ~(CTGitPath::LOGACTIONS_HIDE | CTGitPath::LOGACTIONS_GRAY);
945 CString fileFilter;
946 m_cFileFilter.GetWindowText(fileFilter);
947 if (!fileFilter.IsEmpty())
949 fileFilter.MakeLower();
950 bool somethingHidden = false;
951 for (int i = 0; i < count; ++i)
953 CString sPath(files[i].GetGitPathString());
954 sPath.MakeLower();
955 if (sPath.Find(fileFilter) < 0)
957 ((CTGitPath&)files[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;
958 somethingHidden = true;
961 if (somethingHidden)
962 pLogEntry->GetAction(&m_LogList) |= CTGitPath::LOGACTIONS_HIDE;
965 m_ChangedFileListCtrl.UpdateWithGitPathList(files);
966 m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;
967 if (pLogEntry->m_CommitHash.IsEmpty() && m_bShowUnversioned)
969 m_ChangedFileListCtrl.UpdateUnRevFileList(pLogEntry->GetUnRevFiles());
970 m_ChangedFileListCtrl.Show(GITSLC_SHOWVERSIONED | GITSLC_SHOWUNVERSIONED);
972 else
973 m_ChangedFileListCtrl.Show(GITSLC_SHOWVERSIONED);
975 m_ChangedFileListCtrl.SetBusy(FALSE);
977 m_ChangedFileListCtrl.SetRedraw(TRUE);
978 return;
982 else
984 // more than one revision is selected:
985 // the log message view must be emptied
986 // the changed files list contains all the changed paths from all
987 // selected revisions, with 'doubles' removed
988 m_gravatar.LoadGravatar();
991 // redraw the views
992 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
994 // sort according to the settings
995 if (m_nSortColumnPathList > 0)
996 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
997 else
998 SetSortArrow(&m_ChangedFileListCtrl, -1, false);
999 m_ChangedFileListCtrl.SetRedraw(TRUE);
1002 void CLogDlg::FillPatchView(bool onlySetTimer)
1004 if (!::IsWindow(this->m_patchViewdlg.m_hWnd))
1005 return;
1007 KillTimer(LOG_FILLPATCHVTIMER);
1008 if (onlySetTimer)
1010 SetTimer(LOG_FILLPATCHVTIMER, 100, nullptr);
1011 return;
1014 POSITION posLogList = m_LogList.GetFirstSelectedItemPosition();
1015 if (posLogList == nullptr)
1017 m_patchViewdlg.ClearView();
1018 return; // nothing is selected, get out of here
1021 GitRev* pLogEntry = m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(posLogList));
1022 if (pLogEntry == nullptr || m_LogList.GetNextSelectedItem(posLogList) != -1)
1024 m_patchViewdlg.ClearView();
1025 return;
1028 auto locker(m_ChangedFileListCtrl.AcquireReadLock());
1029 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
1030 CString out;
1032 if (pos == nullptr)
1034 int diffContext = g_Git.GetConfigValueInt32(L"diff.context", -1);
1035 CStringA outA;
1036 CString rev1 = pLogEntry->m_CommitHash.IsEmpty() ? L"HEAD" : (pLogEntry->m_CommitHash.ToString() + L"~1");
1037 CString rev2 = pLogEntry->m_CommitHash.IsEmpty() ? GIT_REV_ZERO : pLogEntry->m_CommitHash.ToString();
1038 g_Git.GetUnifiedDiff(CTGitPath(), rev1, rev2, &outA, false, false, diffContext);
1039 out = CUnicodeUtils::GetUnicode(outA);
1041 else
1043 while (pos)
1045 int nSelect = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
1046 auto p = m_ChangedFileListCtrl.GetListEntry(nSelect);
1047 if (p && !(p->m_Action&CTGitPath::LOGACTIONS_UNVER))
1049 CString cmd;
1050 if (pLogEntry->m_CommitHash.IsEmpty())
1051 cmd.Format(L"git.exe diff HEAD -- \"%s\"", (LPCTSTR)p->GetGitPathString());
1052 else
1053 cmd.Format(L"git.exe diff %s^%d..%s -- \"%s\"", (LPCTSTR)pLogEntry->m_CommitHash.ToString(), p->m_ParentNo + 1, (LPCTSTR)pLogEntry->m_CommitHash.ToString(), (LPCTSTR)p->GetGitPathString());
1054 g_Git.Run(cmd, &out, CP_UTF8);
1059 m_patchViewdlg.SetText(out);
1062 void CLogDlg::TogglePatchView()
1064 m_patchViewdlg.m_ParentDlg = this;
1065 if (!IsWindow(m_patchViewdlg.m_hWnd))
1067 if (g_Git.GetConfigValueBool(L"tgit.logshowpatch") == FALSE)
1068 g_Git.SetConfigValue(L"tgit.logshowpatch", L"true");
1069 m_patchViewdlg.Create(IDD_PATCH_VIEW, this);
1070 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETSCROLLWIDTHTRACKING, TRUE);
1071 CRect rect;
1072 this->GetWindowRect(&rect);
1074 m_patchViewdlg.ShowWindow(SW_SHOW);
1075 m_patchViewdlg.SetWindowPos(nullptr, rect.right, rect.top, (DWORD)CRegStdDWORD(L"Software\\TortoiseGit\\TortoiseProc\\PatchDlgWidth", rect.Width()), rect.Height(), SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
1077 FillPatchView();
1079 else
1081 g_Git.SetConfigValue(L"tgit.logshowpatch", L"false");
1082 m_patchViewdlg.ShowWindow(SW_HIDE);
1083 m_patchViewdlg.DestroyWindow();
1087 LRESULT CLogDlg::OnFileListCtrlItemChanged(WPARAM /*wparam*/, LPARAM /*lparam*/)
1089 FillPatchView(true);
1090 return 0;
1093 void CLogDlg::OnMoving(UINT fwSide, LPRECT pRect)
1095 __super::OnMoving(fwSide, pRect);
1097 if (!::IsWindow(m_patchViewdlg.m_hWnd))
1098 return;
1100 RECT patchrect;
1101 m_patchViewdlg.GetWindowRect(&patchrect);
1102 if (!::IsWindow(m_hWnd))
1103 return;
1105 RECT thisrect;
1106 GetWindowRect(&thisrect);
1107 if (patchrect.left == thisrect.right)
1109 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);
1113 void CLogDlg::OnSizing(UINT fwSide, LPRECT pRect)
1115 __super::OnSizing(fwSide, pRect);
1117 if (!::IsWindow(this->m_patchViewdlg.m_hWnd))
1118 return;
1120 CRect thisrect, patchrect;
1121 this->GetWindowRect(thisrect);
1122 this->m_patchViewdlg.GetWindowRect(patchrect);
1123 if (thisrect.right != patchrect.left)
1124 return;
1126 patchrect.left -= (thisrect.right - pRect->right);
1127 patchrect.right -= (thisrect.right - pRect->right);
1129 if (patchrect.bottom == thisrect.bottom)
1130 patchrect.bottom -= (thisrect.bottom - pRect->bottom);
1131 if (patchrect.top == thisrect.top)
1132 patchrect.top -= thisrect.top - pRect->top;
1133 m_patchViewdlg.MoveWindow(patchrect);
1136 void CLogDlg::OnSelectSearchField()
1138 m_cFilter.SetSel(0, -1, FALSE);
1139 m_cFilter.SetFocus();
1142 void CLogDlg::GoBack()
1144 GoBackForward(false, false);
1147 void CLogDlg::GoForward()
1149 GoBackForward(false, true);
1152 void CLogDlg::GoBackAndSelect()
1154 GoBackForward(true, false);
1157 void CLogDlg::GoForwardAndSelect()
1159 GoBackForward(true, true);
1162 void CLogDlg::GoBackForward(bool select, bool bForward)
1164 m_LogList.m_highlight.Empty();
1165 CGitHash gotoHash;
1166 if (bForward ? m_LogList.m_selectionHistory.GoForward(gotoHash) : m_LogList.m_selectionHistory.GoBack(gotoHash))
1168 int i;
1169 for (i = 0; i < (int)m_LogList.m_arShownList.size(); ++i)
1171 GitRev* rev = m_LogList.m_arShownList.SafeGetAt(i);
1172 if (!rev) continue;
1173 if (rev->m_CommitHash == gotoHash)
1175 m_LogList.EnsureVisible(i, FALSE);
1176 if (select)
1178 m_LogList.m_highlight.Empty();
1179 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED | LVIS_FOCUSED);
1180 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1181 while (pos)
1183 int index = m_LogList.GetNextSelectedItem(pos);
1184 if (index >= 0)
1185 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
1187 m_bNavigatingWithSelect = true;
1188 m_LogList.SetItemState(i, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
1189 m_LogList.SetSelectionMark(i);
1190 m_bNavigatingWithSelect = false;
1192 else
1193 m_LogList.m_highlight = gotoHash;
1194 m_LogList.Invalidate();
1195 return;
1198 if (i == (int)m_LogList.m_arShownList.size())
1200 CString msg;
1201 msg.Format(IDS_LOG_NOT_VISIBLE, (LPCTSTR)gotoHash.ToString());
1202 MessageBox(msg, L"TortoiseGit", MB_OK | MB_ICONINFORMATION);
1203 return;
1206 PlaySound((LPCTSTR)SND_ALIAS_SYSTEMASTERISK, nullptr, SND_ASYNC | SND_ALIAS_ID);
1209 void CLogDlg::OnBnClickedRefresh()
1211 Refresh (true);
1214 void CLogDlg::Refresh (bool clearfilter /*autoGoOnline*/)
1216 if (m_bSelect)
1217 DialogEnableWindow(IDOK, FALSE);
1218 m_LogList.Refresh(clearfilter);
1219 EnableOKButton();
1220 ShowStartRef();
1221 FillLogMessageCtrl(false);
1224 void CLogDlg::SaveSplitterPos()
1226 if (!IsIconic())
1228 CRegDWORD regPos1(L"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1");
1229 CRegDWORD regPos2(L"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2");
1230 RECT rectSplitter;
1231 m_wndSplitter1.GetWindowRect(&rectSplitter);
1232 ScreenToClient(&rectSplitter);
1233 regPos1 = rectSplitter.top;
1234 m_wndSplitter2.GetWindowRect(&rectSplitter);
1235 ScreenToClient(&rectSplitter);
1236 regPos2 = rectSplitter.top;
1240 void CLogDlg::OnCancel()
1242 this->ShowWindow(SW_HIDE);
1244 // canceling means stopping the working thread if it's still running.
1245 m_LogList.SafeTerminateAsyncDiffThread();
1246 if (this->IsThreadRunning())
1248 m_LogList.SafeTerminateThread();
1250 UpdateData();
1252 SaveSplitterPos();
1253 __super::OnCancel();
1256 void CLogDlg::CopyChangedSelectionToClipBoard()
1258 POSITION posLogList = m_LogList.GetFirstSelectedItemPosition();
1259 if (posLogList == nullptr)
1260 return; // nothing is selected, get out of here
1262 CString sPaths;
1264 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1265 // if (posLogList)
1267 auto locker(m_ChangedFileListCtrl.AcquireReadLock());
1268 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
1269 while (pos)
1271 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
1272 auto path = m_ChangedFileListCtrl.GetListEntry(nItem);
1273 if (!path)
1274 continue;
1275 sPaths += path->GetGitPathString();
1276 sPaths += L"\r\n";
1279 #if 0
1280 else
1282 // only one revision is selected in the log dialog top pane
1283 // but multiple items could be selected in the changed items list
1284 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
1285 while (pos)
1287 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
1288 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->SafeGetAt(nItem);
1290 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
1292 // some items are hidden! So find out which item the user really selected
1293 INT_PTR selRealIndex = -1;
1294 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
1296 if (pLogEntry->pArChangedPaths->SafeGetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
1297 ++selRealIndex;
1298 if (selRealIndex == nItem)
1300 changedlogpath = pLogEntry->pArChangedPaths->SafeGetAt(hiddenindex);
1301 break;
1305 if (changedlogpath)
1307 sPaths += changedlogpath->sPath;
1308 sPaths += L"\r\n";
1312 #endif
1313 sPaths.Trim();
1314 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
1317 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
1319 // we have 4 separate context menus:
1320 // one for the branch label in the upper left
1321 // one for FROM date control
1322 // one shown on the log message list control,
1323 // one shown in the changed-files list control
1324 if (pWnd == GetDlgItem(IDC_STATIC_REF))
1326 CIconMenu popup;
1327 if (!popup.CreatePopupMenu())
1328 return;
1330 int cnt = 0;
1331 popup.AppendMenuIcon(++cnt, IDS_MENUREFBROWSE);
1332 popup.SetDefaultItem(cnt);
1333 CString head = L"HEAD";
1334 CString curBranch = g_Git.GetCurrentBranch();
1335 if (!curBranch.IsEmpty())
1336 head.AppendFormat(L" -> \"%s\"", (LPCTSTR)curBranch);
1337 popup.AppendMenuIcon(++cnt, head);
1338 CGitHash fetchHead;
1339 g_Git.GetHash(fetchHead, g_Git.FixBranchName(L"FETCH_HEAD"));
1340 popup.AppendMenuIcon(++cnt, L"FETCH_HEAD");
1341 popup.EnableMenuItem(cnt, fetchHead.IsEmpty());
1342 popup.AppendMenuIcon(++cnt, IDS_ALL);
1343 popup.EnableMenuItem(cnt, m_bFollowRenames);
1344 popup.AppendMenuIcon(++cnt, IDS_PROC_LOG_SELECT_BASIC_REFS);
1345 popup.EnableMenuItem(cnt, m_bFollowRenames);
1346 popup.AppendMenuIcon(++cnt, IDS_PROC_LOG_SELECT_LOCAL_BRANCHES);
1347 popup.EnableMenuItem(cnt, m_bFollowRenames);
1348 int offset = ++cnt;
1349 if (m_History.GetCount() > 0)
1351 popup.AppendMenu(MF_SEPARATOR, 0);
1352 for (size_t i = 0; i < m_History.GetCount(); ++i)
1354 CString entry = m_History.GetEntry(i);
1355 if (entry.GetLength() > 150)
1356 entry = entry.Left(150) + L"...";
1357 popup.AppendMenuIcon(cnt++, entry);
1361 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this);
1362 if (cmd == 0)
1363 return;
1364 else if (cmd == 1)
1366 OnBnClickedBrowseRef();
1367 return;
1370 m_LogList.m_ShowMask &= ~(CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_BASIC_REFS | CGit::LOG_INFO_LOCAL_BRANCHES);
1371 m_bAllBranch = BST_UNCHECKED;
1372 m_AllBranchType = AllBranchType::None;
1373 if (cmd == 2)
1375 SetRange(g_Git.GetCurrentBranch(true));
1377 else if (cmd == 3)
1379 SetRange(fetchHead.ToString());
1381 else if (cmd == 4)
1383 m_bAllBranch = BST_CHECKED;
1384 m_AllBranchType = AllBranchType::AllBranches;
1385 m_LogList.m_ShowMask |= CGit::LOG_INFO_ALL_BRANCH;
1387 else if (cmd == 5)
1389 m_bAllBranch = BST_INDETERMINATE;
1390 m_AllBranchType = AllBranchType::AllBasicRefs;
1391 m_LogList.m_ShowMask |= CGit::LOG_INFO_BASIC_REFS;
1393 else if (cmd == 6)
1395 m_bAllBranch = BST_INDETERMINATE;
1396 m_AllBranchType = AllBranchType::AllLocalBranches;
1397 m_LogList.m_ShowMask |= CGit::LOG_INFO_LOCAL_BRANCHES;
1399 else if (cmd >= offset)
1401 SetRange(m_History.GetEntry(cmd - offset));
1402 m_History.AddEntry(m_LogList.m_sRange);
1403 m_History.Save();
1406 UpdateData(FALSE);
1408 OnRefresh();
1409 FillLogMessageCtrl(false);
1411 return;
1414 if (pWnd == GetDlgItem(IDC_DATEFROM))
1416 CIconMenu popup;
1417 if (!popup.CreatePopupMenu())
1418 return;
1420 int cnt = 0;
1422 popup.AppendMenuIcon(++cnt, IDS_NO_LIMIT);
1424 DWORD scale = (DWORD)CRegDWORD(L"Software\\TortoiseGit\\LogDialog\\NumberOfLogsScale", CFilterData::SHOW_NO_LIMIT);
1425 CString strScale;
1426 switch (scale)
1428 case CFilterData::SHOW_LAST_N_COMMITS:
1429 strScale.LoadString(IDS_LAST_N_COMMITS);
1430 break;
1431 case CFilterData::SHOW_LAST_N_YEARS:
1432 strScale.LoadString(IDS_LAST_N_YEARS);
1433 break;
1434 case CFilterData::SHOW_LAST_N_MONTHS:
1435 strScale.LoadString(IDS_LAST_N_MONTHS);
1436 break;
1437 case CFilterData::SHOW_LAST_N_WEEKS:
1438 strScale.LoadString(IDS_LAST_N_WEEKS);
1439 break;
1441 if (!strScale.IsEmpty() && m_LogList.m_Filter.m_NumberOfLogs > 0)
1443 popup.AppendMenu(MF_SEPARATOR, 0);
1444 CString number;
1445 number.Format(L"%ld", m_LogList.m_Filter.m_NumberOfLogs);
1446 CString item;
1447 item.Format(strScale, (LPCTSTR)number);
1448 popup.AppendMenuIcon(++cnt, item);
1451 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this);
1452 if (cmd <= 0)
1453 return;
1454 else if (cmd == 1)
1456 m_LogList.m_Filter.m_NumberOfLogsScale = CFilterData::SHOW_NO_LIMIT;
1457 // reset last selected date
1458 m_regLastSelectedFromDate.removeValue();
1460 else if (cmd == 2)
1461 m_LogList.m_Filter.m_NumberOfLogsScale = scale;
1463 UpdateData(FALSE);
1464 OnRefresh();
1465 FillLogMessageCtrl(false);
1467 return;
1470 int selCount = m_LogList.GetSelectedCount();
1471 if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
1473 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1474 int selIndex = -1;
1475 if (pos)
1476 selIndex = m_LogList.GetNextSelectedItem(pos);
1478 GitRevLoglist* pRev = nullptr;
1479 if (selIndex >= 0)
1480 pRev = m_LogList.m_arShownList.SafeGetAt(selIndex);
1482 if ((point.x == -1) && (point.y == -1))
1484 CRect rect;
1485 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
1486 ClientToScreen(&rect);
1487 point = rect.CenterPoint();
1489 CString sMenuItemText;
1490 CIconMenu popup;
1491 if (popup.CreatePopupMenu())
1493 long start = -1, end = -1;
1494 auto pEdit = (CRichEditCtrl *)GetDlgItem(IDC_MSGVIEW);
1495 pEdit->GetSel(start, end);
1496 // add the 'default' entries
1497 popup.AppendMenuIcon(WM_COPY, IDS_SCIEDIT_COPY, IDI_COPYCLIP);
1498 if (start >= end)
1499 popup.EnableMenuItem(WM_COPY, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
1500 popup.AppendMenu(MF_SEPARATOR);
1501 sMenuItemText.LoadString(IDS_STATUSLIST_CONTEXT_COPYEXT);
1502 popup.AppendMenuIcon(EM_SETSEL, sMenuItemText, IDI_COPYCLIP);
1503 if (pRev && !pRev->m_CommitHash.IsEmpty())
1505 popup.AppendMenu(MF_SEPARATOR, NULL);
1506 sMenuItemText.LoadString(IDS_EDIT_NOTES);
1507 popup.AppendMenuIcon(CGitLogList::ID_EDITNOTE, sMenuItemText, IDI_EDIT);
1510 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this);
1511 switch (cmd)
1513 case 0:
1514 break; // no command selected
1515 case EM_SETSEL:
1517 pEdit->SetRedraw(FALSE);
1518 int oldLine = pEdit->GetFirstVisibleLine();
1519 pEdit->SetSel(0, -1);
1520 pEdit->Copy();
1521 pEdit->SetSel(start, end);
1522 int newLine = pEdit->GetFirstVisibleLine();
1523 pEdit->LineScroll(oldLine - newLine);
1524 pEdit->SetRedraw(TRUE);
1525 pEdit->RedrawWindow();
1527 break;
1528 case WM_COPY:
1529 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
1530 break;
1531 case CGitLogList::ID_EDITNOTE:
1532 CAppUtils::EditNote(pRev, &m_LogList.m_ProjectProperties);
1533 this->FillLogMessageCtrl(true);
1534 break;
1540 void CLogDlg::OnOK()
1542 // since the log dialog is also used to select revisions for other
1543 // dialogs, we have to do some work before closing this dialog
1544 if (GetFocus() != GetDlgItem(IDOK))
1545 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
1547 m_LogList.SafeTerminateAsyncDiffThread();
1548 if (this->IsThreadRunning())
1550 m_LogList.SafeTerminateThread();
1552 UpdateData();
1553 // get the selected row(s)
1554 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1555 while (pos)
1557 int selIndex = m_LogList.GetNextSelectedItem(pos);
1558 GitRev* pLogEntry = m_LogList.m_arShownList.SafeGetAt(selIndex);
1559 if (!pLogEntry)
1560 continue;
1561 m_sSelectedHash.push_back(pLogEntry->m_CommitHash);
1563 UpdateData(FALSE);
1564 SaveSplitterPos();
1565 __super::OnOK();
1567 #if 0
1568 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
1569 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
1571 CString temp;
1572 CString buttontext;
1573 GetDlgItemText(IDOK, buttontext);
1574 temp.LoadString(IDS_MSGBOX_CANCEL);
1575 if (temp.Compare(buttontext) != 0)
1576 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
1577 m_selectedRevs.Clear();
1578 m_selectedRevsOneRange.Clear();
1579 if (m_pNotifyWindow)
1581 int selIndex = m_LogList.GetSelectionMark();
1582 if (selIndex >= 0)
1584 PLOGENTRYDATA pLogEntry = nullptr;
1585 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1586 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1587 m_selectedRevs.AddRevision(pLogEntry->Rev);
1588 git_revnum_t lowerRev = pLogEntry->Rev;
1589 git_revnum_t higherRev = lowerRev;
1590 while (pos)
1592 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1593 git_revnum_t rev = pLogEntry->Rev;
1594 m_selectedRevs.AddRevision(pLogEntry->Rev);
1595 if (lowerRev > rev)
1596 lowerRev = rev;
1597 if (higherRev < rev)
1598 higherRev = rev;
1600 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
1602 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
1604 BOOL bSentMessage = FALSE;
1605 if (m_LogList.GetSelectedCount() == 1)
1607 // if only one revision is selected, check if the path/url with which the dialog was started
1608 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1609 // if it was copied, use the copy from revision as lowerRev
1610 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
1612 CString sUrl = m_path.GetGitPathString();
1613 if (!m_path.IsUrl())
1615 sUrl = GetURLFromPath(m_path);
1617 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
1618 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
1620 LogChangedPath * pData = pLogEntry->pArChangedPaths->SafeGetAt(cp);
1621 if (pData)
1623 if (sUrl.Compare(pData->sPath) == 0)
1625 if (!pData->sCopyFromPath.IsEmpty())
1627 lowerRev = pData->lCopyFromRev;
1628 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
1629 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
1630 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
1631 bSentMessage = TRUE;
1638 if ( !bSentMessage )
1640 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
1641 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
1642 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
1643 if (m_selectedRevsOneRange.GetCount())
1644 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
1648 UpdateData();
1649 CRegDWORD reg(L"Software\\TortoiseGit\\ShowAllEntry");
1650 SaveSplitterPos();
1651 #endif
1654 void CLogDlg::OnPasteGitHash()
1656 if (!IsClipboardFormatAvailable(CF_TEXT))
1657 return;
1659 CClipboardHelper clipboardHelper;
1660 if (!clipboardHelper.Open(GetSafeHwnd()))
1661 return;
1663 HGLOBAL hClipboardData = GetClipboardData(CF_TEXT);
1664 if (!hClipboardData)
1665 return;
1667 char* pStr = (char*)GlobalLock(hClipboardData);
1668 CString str(pStr);
1669 GlobalUnlock(hClipboardData);
1670 if (str.IsEmpty())
1671 return;
1673 int pos = 0;
1674 if (LookLikeGitHash(str, pos))
1675 JumpToGitHash(str);
1678 void CLogDlg::JumpToGitHash(CString hash)
1680 int prefixLen = hash.GetLength();
1681 while (hash.GetLength() < 2 * GIT_HASH_SIZE)
1682 hash += L'0';
1683 CGitHash prefixHash(hash);
1684 // start searching downwards, because it's unlikely that a hash is a forward reference
1685 int currentPos = m_LogList.GetSelectionMark();
1686 int cnt = (int)m_LogList.m_arShownList.size();
1687 if (!cnt || currentPos < 0)
1688 return;
1689 for (int i = currentPos + 1; i != currentPos; ++i)
1691 if (i >= cnt)
1692 i = 0;
1694 GitRev* rev = m_LogList.m_arShownList.SafeGetAt(i);
1695 if (!rev) continue;
1696 if (!rev->m_CommitHash.MatchesPrefix(prefixHash, hash, prefixLen))
1697 continue;
1699 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED | LVIS_FOCUSED);
1700 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1701 while (pos)
1703 int index = m_LogList.GetNextSelectedItem(pos);
1704 if (index >= 0)
1705 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
1707 m_LogList.EnsureVisible(i, FALSE);
1708 m_LogList.SetSelectionMark(i);
1709 m_LogList.SetItemState(i, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
1710 // refresh of selection needs to be queued instead of done immediately, to ensure hyperlinks in target selection are created
1711 PostMessage(WM_TGIT_REFRESH_SELECTION, 0, 0);
1712 return;
1715 FlashWindowEx(FLASHW_ALL, 3, 100);
1716 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, L"NoJumpNotFoundWarning", IDS_MSGBOX_DONOTSHOWAGAIN);
1719 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
1721 // Skip Ctrl-C when copying text out of the log message or search filter
1722 bool bSkipAccelerator = (pMsg->message == WM_KEYDOWN && (pMsg->wParam == 'C' || pMsg->wParam == VK_INSERT) && (GetFocus() == GetDlgItem(IDC_MSGVIEW) || GetFocus() == GetDlgItem(IDC_SEARCHEDIT) || GetFocus() == GetDlgItem(IDC_FILTER)) && GetKeyState(VK_CONTROL) & 0x8000);
1723 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
1725 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
1727 if (CRegDWORD(L"Software\\TortoiseGit\\DiffByDoubleClickInLog", FALSE))
1729 m_LogList.DiffSelectedRevWithPrevious();
1730 return TRUE;
1733 if (GetFocus() == GetDlgItem(IDC_SEARCHEDIT))
1735 KillTimer(LOGFILTER_TIMER);
1736 Refresh(false);
1738 if (GetFocus() == GetDlgItem(IDC_FILTER))
1740 KillTimer(FILEFILTER_TIMER);
1741 FillLogMessageCtrl();
1742 return TRUE;
1745 else if (pMsg->message == WM_KEYDOWN && ((pMsg->wParam == 'V' && GetKeyState(VK_CONTROL) < 0) || (pMsg->wParam == VK_INSERT && GetKeyState(VK_SHIFT) < 0 && GetKeyState(VK_CONTROL) >= 0)) && GetKeyState(VK_MENU) >= 0)
1747 if (GetFocus() != GetDlgItem(IDC_SEARCHEDIT) && GetFocus() != GetDlgItem(IDC_FILTER))
1749 OnPasteGitHash();
1750 return TRUE;
1753 else if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_ESCAPE && GetFocus() == GetDlgItem(IDC_FILTER) && m_cFileFilter.GetWindowTextLength())
1755 m_cFileFilter.SetWindowText(L"");
1756 KillTimer(FILEFILTER_TIMER);
1757 FillLogMessageCtrl();
1758 return TRUE;
1760 else if (pMsg->message == WM_XBUTTONUP)
1762 bool select = (pMsg->wParam & MK_SHIFT) == 0;
1763 if (HIWORD(pMsg->wParam) & XBUTTON1)
1764 GoBackForward(select, false);
1765 if (HIWORD(pMsg->wParam) & XBUTTON2)
1766 GoBackForward(select, true);
1767 if (HIWORD(pMsg->wParam) & (XBUTTON1 | XBUTTON2))
1768 return TRUE;
1770 if (m_hAccel && !bSkipAccelerator)
1772 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
1773 if (ret)
1774 return TRUE;
1777 return __super::PreTranslateMessage(pMsg);
1781 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
1783 //if (this->IsThreadRunning())
1784 if(m_LogList.m_bNoDispUpdates)
1786 // only show the wait cursor over the list control
1787 if ((pWnd)&&
1788 ((pWnd == GetDlgItem(IDC_LOGLIST))||
1789 (pWnd == GetDlgItem(IDC_MSGVIEW))||
1790 (pWnd == GetDlgItem(IDC_LOGMSG))))
1792 HCURSOR hCur = LoadCursor(nullptr, IDC_WAIT);
1793 SetCursor(hCur);
1794 return TRUE;
1797 if (pWnd && (pWnd == GetDlgItem(IDC_MSGVIEW) || pWnd == GetDlgItem(IDC_SEARCHEDIT) || pWnd == GetDlgItem(IDC_FILTER)))
1798 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
1800 HCURSOR hCur = LoadCursor(nullptr, IDC_ARROW);
1801 SetCursor(hCur);
1802 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
1805 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
1807 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1808 *pResult = 0;
1809 //if (this->IsThreadRunning())
1810 if(m_LogList.m_bNoDispUpdates)
1811 return;
1812 if (pNMLV->iItem >= 0)
1814 if (!m_LogList.m_highlight.IsEmpty())
1816 m_LogList.m_highlight.Empty();
1817 m_LogList.Invalidate();
1819 this->m_LogList.m_nSearchIndex = pNMLV->iItem;
1820 GitRev* pLogEntry = m_LogList.m_arShownList.SafeGetAt(pNMLV->iItem);
1821 if (pLogEntry == nullptr)
1822 return;
1823 m_LogList.m_lastSelectedHash = pLogEntry->m_CommitHash;
1824 if (pNMLV->iSubItem != 0)
1825 return;
1826 if (pNMLV->iItem == (int)m_LogList.m_arShownList.size())
1828 // remove the selected state
1829 if (pNMLV->uChanged & LVIF_STATE)
1831 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
1832 FillLogMessageCtrl();
1833 UpdateData(FALSE);
1834 UpdateLogInfoLabel();
1836 return;
1838 if (pNMLV->uChanged & LVIF_STATE)
1840 if ((pNMLV->uNewState & LVIS_SELECTED) && !m_bNavigatingWithSelect)
1842 m_LogList.m_selectionHistory.Add(m_LogList.m_lastSelectedHash);
1843 m_LogList.m_lastSelectedHash = pLogEntry->m_CommitHash;
1845 FillLogMessageCtrl();
1846 UpdateData(FALSE);
1849 else
1851 m_LogList.m_lastSelectedHash.Empty();
1852 FillLogMessageCtrl();
1853 UpdateData(FALSE);
1855 EnableOKButton();
1856 if (pNMLV->iItem < 0)
1857 return;
1858 UpdateLogInfoLabel();
1861 void CLogDlg::OnLvnItemchangedLogmsg(NMHDR * /*pNMHDR*/, LRESULT * /*pResult*/)
1863 if (m_ChangedFileListCtrl.IsBusy())
1864 return;
1865 UpdateLogInfoLabel();
1868 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
1870 // similar code in ProgressDlg.cpp and SyncDlg.cpp
1871 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
1872 if ((pEnLink->msg == WM_LBUTTONUP) || (pEnLink->msg == WM_SETCURSOR))
1874 CString url, msg;
1875 GetDlgItemText(IDC_MSGVIEW, msg);
1876 msg.Replace(L"\r\n", L"\n");
1877 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
1878 auto findResult = m_LogList.m_ProjectProperties.FindBugIDPositions(msg);
1879 if (std::find_if(findResult.cbegin(), findResult.cend(),
1880 [=] (const CHARRANGE &cr) -> bool { return cr.cpMin == pEnLink->chrg.cpMin && cr.cpMax == pEnLink->chrg.cpMax; }
1881 ) != findResult.cend())
1883 url = m_LogList.m_ProjectProperties.GetBugIDUrl(url);
1884 url = GetAbsoluteUrlFromRelativeUrl(url);
1886 // check if it's an email address
1887 auto atpos = url.Find(L'@');
1888 if ((atpos > 0) && (url.ReverseFind(L'.') > atpos) && !::PathIsURL(url))
1889 url = L"mailto:" + url;
1890 if (::PathIsURL(url))
1892 if (pEnLink->msg == WM_LBUTTONUP)
1893 ShellExecute(GetSafeHwnd(), L"open", url, nullptr, nullptr, SW_SHOWDEFAULT);
1894 else
1896 static RECT prevRect = { 0 };
1897 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
1898 if (pMsgView)
1900 RECT rc;
1901 POINTL pt;
1902 pMsgView->SendMessage(EM_POSFROMCHAR, (WPARAM)&pt, pEnLink->chrg.cpMin);
1903 rc.left = pt.x;
1904 rc.top = pt.y;
1905 pMsgView->SendMessage(EM_POSFROMCHAR, (WPARAM)&pt, pEnLink->chrg.cpMax);
1906 rc.right = pt.x;
1907 rc.bottom = pt.y + 12;
1908 if ((prevRect.left != rc.left) || (prevRect.top != rc.top))
1910 m_tooltips.DelTool(pMsgView, 1);
1911 m_tooltips.AddTool(pMsgView, url, &rc, 1);
1912 prevRect = rc;
1917 else if(pEnLink->msg == WM_LBUTTONUP)
1919 int pos = 0;
1920 if (LookLikeGitHash(url, pos))
1921 JumpToGitHash(url);
1924 *pResult = 0;
1927 void CLogDlg::OnBnClickedStatbutton()
1929 if (this->IsThreadRunning())
1930 return;
1932 if (m_LogList.m_arShownList.empty() || m_LogList.m_arShownList.size() == 1 && m_LogList.m_bShowWC)
1933 return; // nothing or just the working copy changes are shown, so no statistics.
1935 CStatGraphDlg dlg;
1936 dlg.m_ShowList.reserve(m_LogList.m_arShownList.size());
1937 for (size_t i = m_LogList.m_bShowWC ? 1 : 0; i < m_LogList.m_arShownList.size(); ++i)
1938 dlg.m_ShowList.emplace_back(m_LogList.m_arShownList.SafeGetAt(i));
1940 dlg.m_path = m_orgPath;
1941 dlg.DoModal();
1944 void CLogDlg::MoveToSameTop(CWnd *pWndRef, CWnd *pWndTarget)
1946 CRect rcWndPicAuthor, rcWndMsgView;
1947 pWndRef->GetWindowRect(rcWndMsgView);
1948 ScreenToClient(rcWndMsgView);
1949 pWndTarget->GetWindowRect(rcWndPicAuthor);
1950 ScreenToClient(rcWndPicAuthor);
1951 int diff = rcWndMsgView.top - rcWndPicAuthor.top;
1952 rcWndPicAuthor.top += diff;
1953 rcWndPicAuthor.bottom += diff;
1954 pWndTarget->MoveWindow(rcWndPicAuthor);
1957 void CLogDlg::DoSizeV1(int delta)
1959 RemoveMainAnchors();
1961 // first, reduce the middle section to a minimum.
1962 // if that is not sufficient, minimize the lower section
1964 CRect changeListViewRect;
1965 m_ChangedFileListCtrl.GetClientRect(changeListViewRect);
1966 CRect messageViewRect;
1967 GetDlgItem(IDC_MSGVIEW)->GetClientRect(messageViewRect);
1969 int messageViewDelta = max(-delta, 20 - messageViewRect.Height());
1970 int changeFileListDelta = -delta - messageViewDelta;
1972 // set new sizes & positions
1973 auto hdwp = BeginDeferWindowPos(5);
1974 hdwp = CSplitterControl::ChangeRect(hdwp, &m_LogList, 0, 0, 0, delta);
1975 hdwp = CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_MSGVIEW), 0, delta, 0, delta + messageViewDelta);
1976 MoveToSameTop(GetDlgItem(IDC_MSGVIEW), GetDlgItem(IDC_PIC_AUTHOR));
1977 hdwp = CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_SPLITTERBOTTOM), 0, -changeFileListDelta, 0, -changeFileListDelta);
1978 hdwp = CSplitterControl::ChangeRect(hdwp, &m_ChangedFileListCtrl, 0, -changeFileListDelta, 0, 0);
1979 EndDeferWindowPos(hdwp);
1981 AddMainAnchors();
1982 ArrangeLayout();
1983 AdjustMinSize();
1984 SetSplitterRange();
1985 m_LogList.Invalidate();
1986 m_ChangedFileListCtrl.Invalidate();
1987 GetDlgItem(IDC_MSGVIEW)->Invalidate();
1988 m_gravatar.Invalidate();
1991 void CLogDlg::DoSizeV2(int delta)
1993 RemoveMainAnchors();
1995 // first, reduce the middle section to a minimum.
1996 // if that is not sufficient, minimize the top section
1998 CRect logViewRect;
1999 m_LogList.GetClientRect(logViewRect);
2000 CRect messageViewRect;
2001 GetDlgItem(IDC_MSGVIEW)->GetClientRect(messageViewRect);
2003 int messageViewDelta = max(delta, 20 - messageViewRect.Height());
2004 int logListDelta = delta - messageViewDelta;
2006 // set new sizes & positions
2007 auto hdwp = BeginDeferWindowPos(5);
2008 hdwp = CSplitterControl::ChangeRect(hdwp, &m_LogList, 0, 0, 0, logListDelta);
2009 hdwp = CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_SPLITTERTOP), 0, logListDelta, 0, logListDelta);
2010 hdwp = CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_MSGVIEW), 0, logListDelta, 0, logListDelta + messageViewDelta);
2011 MoveToSameTop(GetDlgItem(IDC_MSGVIEW), GetDlgItem(IDC_PIC_AUTHOR));
2012 hdwp = CSplitterControl::ChangeRect(hdwp, &m_ChangedFileListCtrl, 0, delta, 0, 0);
2013 EndDeferWindowPos(hdwp);
2015 AddMainAnchors();
2016 ArrangeLayout();
2017 AdjustMinSize();
2018 SetSplitterRange();
2019 GetDlgItem(IDC_MSGVIEW)->Invalidate();
2020 m_ChangedFileListCtrl.Invalidate();
2021 m_gravatar.Invalidate();
2024 void CLogDlg::AddMainAnchors()
2026 AddAnchor(IDC_STATIC_REF, TOP_LEFT);
2027 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
2028 AddAnchor(IDC_DATEFROM, TOP_LEFT);
2029 AddAnchor(IDC_TOLABEL, TOP_LEFT);
2030 AddAnchor(IDC_DATETO, TOP_LEFT);
2032 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
2033 AddAnchor(IDC_LOG_JUMPTYPE, TOP_RIGHT);
2034 AddAnchor(IDC_LOG_JUMPUP, TOP_RIGHT);
2035 AddAnchor(IDC_LOG_JUMPDOWN, TOP_RIGHT);
2037 AddAnchor(IDC_LOGLIST, TOP_LEFT, MIDDLE_RIGHT);
2038 AddAnchor(IDC_SPLITTERTOP, MIDDLE_LEFT, MIDDLE_RIGHT);
2039 AddAnchor(IDC_MSGVIEW, MIDDLE_LEFT, MIDDLE_RIGHT); // keep in sync with ShowGravatar()
2040 AddAnchor(IDC_PIC_AUTHOR, MIDDLE_RIGHT);
2041 AddAnchor(IDC_SPLITTERBOTTOM, MIDDLE_LEFT, MIDDLE_RIGHT);
2042 AddAnchor(IDC_LOGMSG, MIDDLE_LEFT, BOTTOM_RIGHT);
2044 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
2045 AddAnchor(IDC_WALKBEHAVIOUR, BOTTOM_LEFT);
2046 AddAnchor(IDC_VIEW, BOTTOM_LEFT);
2047 AddAnchor(IDC_LOG_ALLBRANCH, BOTTOM_LEFT);
2048 AddAnchor(IDC_FILTER, BOTTOM_LEFT, BOTTOM_RIGHT);
2049 AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);
2050 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
2051 AddAnchor(IDC_STATBUTTON, BOTTOM_LEFT);
2052 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
2053 AddAnchor(IDOK, BOTTOM_RIGHT);
2054 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
2055 AddAnchor(IDHELP, BOTTOM_RIGHT);
2058 void CLogDlg::RemoveMainAnchors()
2060 RemoveAnchor(IDC_STATIC_REF);
2061 RemoveAnchor(IDC_FROMLABEL);
2062 RemoveAnchor(IDC_DATEFROM);
2063 RemoveAnchor(IDC_TOLABEL);
2064 RemoveAnchor(IDC_DATETO);
2066 RemoveAnchor(IDC_SEARCHEDIT);
2067 RemoveAnchor(IDC_LOG_JUMPTYPE);
2068 RemoveAnchor(IDC_LOG_JUMPUP);
2069 RemoveAnchor(IDC_LOG_JUMPDOWN);
2071 RemoveAnchor(IDC_LOGLIST);
2072 RemoveAnchor(IDC_SPLITTERTOP);
2073 RemoveAnchor(IDC_MSGVIEW);
2074 RemoveAnchor(IDC_PIC_AUTHOR);
2075 RemoveAnchor(IDC_SPLITTERBOTTOM);
2076 RemoveAnchor(IDC_LOGMSG);
2078 RemoveAnchor(IDC_LOGINFO);
2079 RemoveAnchor(IDC_WALKBEHAVIOUR);
2080 RemoveAnchor(IDC_VIEW);
2081 RemoveAnchor(IDC_LOG_ALLBRANCH);
2082 RemoveAnchor(IDC_FILTER);
2083 RemoveAnchor(IDC_WHOLE_PROJECT);
2084 RemoveAnchor(IDC_REFRESH);
2085 RemoveAnchor(IDC_STATBUTTON);
2086 RemoveAnchor(IDC_PROGRESS);
2087 RemoveAnchor(IDOK);
2088 RemoveAnchor(IDCANCEL);
2089 RemoveAnchor(IDHELP);
2092 void CLogDlg::AdjustMinSize()
2094 // adjust the minimum size of the dialog to prevent the resizing from
2095 // moving the list control too far down.
2096 CRect rcChgListView;
2097 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
2098 CRect rcLogList;
2099 m_LogList.GetClientRect(rcLogList);
2100 CRect rcLogMsg;
2101 GetDlgItem(IDC_MSGVIEW)->GetClientRect(rcLogMsg);
2103 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
2104 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
2105 + rcLogMsg.Height() + abs(rcChgListView.Height() - rcLogList.Height()) + 60));
2108 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
2110 switch (message) {
2111 case WM_NOTIFY:
2112 if (wParam == IDC_SPLITTERTOP)
2114 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
2115 DoSizeV1(pHdr->delta);
2117 else if (wParam == IDC_SPLITTERBOTTOM)
2119 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
2120 DoSizeV2(pHdr->delta);
2122 break;
2125 return CResizableDialog::DefWindowProc(message, wParam, lParam);
2128 void CLogDlg::SetSplitterRange()
2130 if ((m_LogList)&&(m_ChangedFileListCtrl))
2132 CRect rcTop;
2133 m_LogList.GetWindowRect(rcTop);
2134 ScreenToClient(rcTop);
2135 CRect rcBottom;
2136 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
2137 ScreenToClient(rcBottom);
2138 m_wndSplitter1.SetRange(rcTop.top + 20, rcBottom.bottom - 50);
2139 m_wndSplitter2.SetRange(rcTop.top + 50, rcBottom.bottom - 20);
2143 void CLogDlg::OnEnscrollMsgview()
2145 m_tooltips.DelTool(GetDlgItem(IDC_MSGVIEW), 1);
2148 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM wParam, LPARAM lParam)
2150 if ((HWND)wParam == m_cFileFilter.GetSafeHwnd())
2151 return 0;
2153 // FIXME: x64 version would get this function called with unexpected parameters.
2154 if (!lParam)
2155 return 0;
2157 RECT * rect = (LPRECT)lParam;
2158 CPoint point;
2159 CString temp;
2160 point = CPoint(rect->left, rect->bottom);
2161 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | ((m_LogList.m_SelectedFilters & x) ? MF_CHECKED : MF_UNCHECKED))
2162 CMenu popup;
2163 if (popup.CreatePopupMenu())
2165 temp.LoadString(IDS_LOG_FILTER_SUBJECT);
2166 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT), LOGFILTER_SUBJECT, temp);
2168 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
2169 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
2171 temp.LoadString(IDS_LOG_FILTER_PATHS);
2172 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
2174 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
2175 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
2177 temp.LoadString(IDS_LOG_FILTER_EMAILS);
2178 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_EMAILS), LOGFILTER_EMAILS, temp);
2180 temp.LoadString(IDS_LOG_FILTER_REVS);
2181 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
2183 temp.LoadString(IDS_LOG_FILTER_REFNAME);
2184 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME), LOGFILTER_REFNAME, temp);
2186 temp.LoadString(IDS_PROC_LOG_TAGINFO);
2187 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ANNOTATEDTAG), LOGFILTER_ANNOTATEDTAG, temp);
2189 temp.LoadString(IDS_NOTES);
2190 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_NOTES), LOGFILTER_NOTES, temp);
2192 if (m_LogList.m_bShowBugtraqColumn == TRUE) {
2193 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
2194 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
2197 popup.AppendMenu(MF_SEPARATOR, NULL);
2199 temp.LoadString(IDS_LOG_FILTER_TOGGLE);
2200 popup.AppendMenu(MF_STRING | MF_ENABLED, LOGFILTER_TOGGLE, temp);
2202 temp.LoadString(IDS_ALL);
2203 popup.AppendMenu(MF_STRING | MF_ENABLED, LOGFILTER_ALL, temp);
2205 popup.AppendMenu(MF_SEPARATOR, NULL);
2207 temp.LoadString(IDS_LOG_FILTER_REGEX);
2208 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
2210 temp.LoadString(IDS_LOG_FILTER_CASESENSITIVE);
2211 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterCaseSensitively ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_CASE, temp);
2213 m_tooltips.Pop();
2214 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this);
2215 if (selection != 0)
2217 if (selection == LOGFILTER_REGEX)
2219 m_bFilterWithRegex = !m_bFilterWithRegex;
2220 CRegDWORD b(L"Software\\TortoiseGit\\UseRegexFilter", FALSE);
2221 b = m_bFilterWithRegex;
2222 m_LogList.m_bFilterWithRegex = m_bFilterWithRegex;
2223 SetFilterCueText();
2224 CheckRegexpTooltip();
2225 m_cFilter.ValidateAndRedraw();
2227 else if (selection == LOGFILTER_CASE)
2229 m_bFilterCaseSensitively = !m_bFilterCaseSensitively;
2230 CRegDWORD b(L"Software\\TortoiseGit\\FilterCaseSensitively", FALSE);
2231 b = m_bFilterCaseSensitively;
2232 m_LogList.m_bFilterCaseSensitively = m_bFilterCaseSensitively;
2234 else if (selection == LOGFILTER_TOGGLE)
2236 m_LogList.m_SelectedFilters = (~m_LogList.m_SelectedFilters) & LOGFILTER_ALL;
2237 SetFilterCueText();
2239 else if (selection == LOGFILTER_ALL)
2241 m_LogList.m_SelectedFilters = selection;
2242 SetFilterCueText();
2244 else
2246 m_LogList.m_SelectedFilters ^= selection;
2247 SetFilterCueText();
2249 CRegDWORD(L"Software\\TortoiseGit\\SelectedLogFilters") = m_LogList.m_SelectedFilters;
2250 // Reload only if a search text is entered
2251 if (m_LogList.HasFilterText())
2252 SetTimer(LOGFILTER_TIMER, 1000, nullptr);
2255 return 0L;
2258 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM wParam, LPARAM /*lParam*/)
2260 if ((HWND)wParam == m_cFileFilter.GetSafeHwnd())
2262 KillTimer(FILEFILTER_TIMER);
2264 FillLogMessageCtrl();
2265 return 0L;
2268 KillTimer(LOGFILTER_TIMER);
2270 m_LogList.m_sFilterText.Empty();
2271 UpdateData(FALSE);
2272 theApp.DoWaitCursor(1);
2273 FillLogMessageCtrl(false);
2275 m_LogList.RemoveFilter();
2277 Refresh();
2279 theApp.DoWaitCursor(-1);
2280 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2281 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2282 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2283 UpdateLogInfoLabel();
2285 return 0L;
2289 void CLogDlg::SetFilterCueText()
2291 CString temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY));
2292 temp += L' ';
2294 if (m_LogList.m_SelectedFilters & LOGFILTER_SUBJECT)
2296 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT));
2299 if (m_LogList.m_SelectedFilters & LOGFILTER_MESSAGES)
2301 if (!CStringUtils::EndsWith(temp, L' '))
2302 temp += L", ";
2303 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES));
2306 if (m_LogList.m_SelectedFilters & LOGFILTER_PATHS)
2308 if (!CStringUtils::EndsWith(temp, L' '))
2309 temp += L", ";
2310 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS));
2313 if (m_LogList.m_SelectedFilters & LOGFILTER_AUTHORS)
2315 if (!CStringUtils::EndsWith(temp, L' '))
2316 temp += L", ";
2317 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS));
2320 if (m_LogList.m_SelectedFilters & LOGFILTER_EMAILS)
2322 if (!CStringUtils::EndsWith(temp, L' '))
2323 temp += L", ";
2324 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_EMAILS));
2327 if (m_LogList.m_SelectedFilters & LOGFILTER_REVS)
2329 if (!CStringUtils::EndsWith(temp, L' '))
2330 temp += L", ";
2331 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS));
2334 if (m_LogList.m_SelectedFilters & LOGFILTER_REFNAME)
2336 if (!CStringUtils::EndsWith(temp, L' '))
2337 temp += L", ";
2338 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REFNAME));
2341 if (m_LogList.m_SelectedFilters & LOGFILTER_NOTES)
2343 if (!CStringUtils::EndsWith(temp, L' '))
2344 temp += L", ";
2345 temp += CString(MAKEINTRESOURCE(IDS_NOTES));
2348 if (m_LogList.m_bShowBugtraqColumn && m_LogList.m_SelectedFilters & LOGFILTER_BUGID)
2350 if (!CStringUtils::EndsWith(temp, L' '))
2351 temp += L", ";
2352 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS));
2355 // to make the cue banner text appear more to the right of the edit control
2356 temp = L" " + temp;
2357 m_cFilter.SetCueBanner(temp.TrimRight());
2360 bool CLogDlg::Validate(LPCTSTR string)
2362 if (!m_bFilterWithRegex)
2363 return true;
2364 std::tr1::wregex pat;
2365 return m_LogList.ValidateRegexp(string, pat, false);
2368 void CLogDlg::OnEnChangeFileFilter()
2370 SetTimer(FILEFILTER_TIMER, 1000, nullptr);
2373 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
2375 if (nIDEvent == LOGFTIME_TIMER)
2377 KillTimer(LOGFTIME_TIMER);
2378 Refresh(false);
2380 else if (nIDEvent == LOG_FILLPATCHVTIMER)
2381 FillPatchView();
2382 else if (nIDEvent == LOGFILTER_TIMER)
2384 KillTimer(LOGFILTER_TIMER);
2385 Refresh(false);
2387 #if 0
2388 /* we will use git built-in grep to filter log */
2389 if (this->IsThreadRunning())
2391 // thread still running! So just restart the timer.
2392 SetTimer(LOGFILTER_TIMER, 1000, nullptr);
2393 return;
2395 CWnd * focusWnd = GetFocus();
2396 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
2397 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
2398 if (m_LogList.m_sFilterText.IsEmpty())
2400 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
2401 // do not return here!
2402 // we also need to run the filter if the filter text is empty:
2403 // 1. to clear an existing filter
2404 // 2. to rebuild the m_arShownList after sorting
2406 theApp.DoWaitCursor(1);
2407 CStoreSelection storeselection(this);
2408 KillTimer(LOGFILTER_TIMER);
2409 FillLogMessageCtrl(false);
2411 // now start filter the log list
2412 m_LogList.StartFilter();
2414 if ( m_LogList.GetItemCount()==1 )
2416 m_LogList.SetSelectionMark(0);
2417 m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
2419 theApp.DoWaitCursor(-1);
2420 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2421 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2422 if (bSetFocusToFilterControl)
2423 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2424 UpdateLogInfoLabel();
2425 #endif
2426 } // if (nIDEvent == LOGFILTER_TIMER)
2427 else if (nIDEvent == LOG_HEADER_ORDER_TIMER)
2429 KillTimer(LOG_HEADER_ORDER_TIMER);
2430 CLogOrdering orderDlg;
2431 if (orderDlg.DoModal() == IDOK)
2432 Refresh();
2434 else if (nIDEvent == FILEFILTER_TIMER)
2436 KillTimer(FILEFILTER_TIMER);
2437 FillLogMessageCtrl();
2439 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.empty() || m_LogList.m_arShownList.size() == 1 && m_LogList.m_bShowWC))));
2440 __super::OnTimer(nIDEvent);
2443 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2447 CTime _time;
2448 m_DateTo.GetTime(_time);
2450 CTime fromTime;
2451 m_DateFrom.GetTime(fromTime);
2452 if (_time < fromTime)
2454 _time = fromTime;
2455 m_DateTo.SetTime(&_time);
2458 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
2459 if (time.GetTime() != m_LogList.m_Filter.m_To)
2461 m_LogList.m_Filter.m_To = (DWORD)time.GetTime();
2462 SetTimer(LOGFTIME_TIMER, 10, nullptr);
2465 catch (...)
2467 CMessageBox::Show(GetSafeHwnd(), L"Invalidate Parameter", L"TortoiseGit", MB_OK | MB_ICONERROR);
2470 *pResult = 0;
2473 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2477 CTime _time;
2478 m_DateFrom.GetTime(_time);
2480 CTime toTime;
2481 m_DateTo.GetTime(toTime);
2482 if (_time > toTime)
2484 _time = toTime;
2485 m_DateFrom.SetTime(&_time);
2488 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
2489 if (time.GetTime() != m_LogList.m_Filter.m_From)
2491 m_LogList.m_Filter.m_From = (DWORD)time.GetTime();
2492 m_LogList.m_Filter.m_NumberOfLogsScale = CFilterData::SHOW_LAST_SEL_DATE;
2494 if (CFilterData::SHOW_LAST_SEL_DATE == (DWORD)CRegDWORD(L"Software\\TortoiseGit\\LogDialog\\NumberOfLogsScale", CFilterData::SHOW_NO_LIMIT))
2495 m_regLastSelectedFromDate = time.Format(L"%Y-%m-%d");
2497 SetTimer(LOGFTIME_TIMER, 10, nullptr);
2500 catch (...)
2502 CMessageBox::Show(GetSafeHwnd(), L"Invalidate Parameter", L"TortoiseGit", MB_OK | MB_ICONERROR);
2505 *pResult = 0;
2508 void CLogDlg::OnCbnSelchangeJumpType()
2510 // reserved for future use
2513 void CLogDlg::OnBnClickedJumpUp()
2515 int sel = m_JumpType.GetCurSel();
2516 if (sel < 0) return;
2517 JumpType jumpType = (JumpType)sel;
2519 if (jumpType == JumpType_History)
2521 GoBack();
2522 return;
2525 CString strValue;
2526 CGitHash hashValue;
2527 int index = -1;
2528 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2529 if (pos)
2531 index = m_LogList.GetNextSelectedItem(pos);
2532 if (index == 0) return;
2534 GitRev* data = m_LogList.m_arShownList.SafeGetAt(index);
2535 if (jumpType == JumpType_AuthorEmail)
2536 strValue = data->GetAuthorEmail();
2537 else if (jumpType == JumpType_CommitterEmail)
2538 strValue = data->GetCommitterEmail();
2539 else if (jumpType == JumpType_Parent1)
2540 hashValue = data->m_CommitHash;
2541 else if (jumpType == JumpType_Parent2)
2542 hashValue = data->m_CommitHash;
2543 else if (jumpType == JumpType_TagFF)
2544 hashValue = data->m_CommitHash;
2545 else if (jumpType == JumpType_BranchFF)
2546 hashValue = data->m_CommitHash;
2548 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2550 else
2551 return;
2553 while (pos)
2555 index = m_LogList.GetNextSelectedItem(pos);
2556 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2558 m_LogList.SetSelectionMark(-1);
2560 for (int i = index - 1; i >= 0; i--)
2562 bool found = false;
2563 GitRev* data = m_LogList.m_arShownList.SafeGetAt(i);
2564 if (jumpType == JumpType_AuthorEmail)
2565 found = strValue == data->GetAuthorEmail();
2566 else if (jumpType == JumpType_CommitterEmail)
2567 found = strValue == data->GetCommitterEmail();
2568 else if (jumpType == JumpType_MergePoint)
2569 found = data->ParentsCount() > 1;
2570 else if (jumpType == JumpType_Parent1)
2572 if (!data->m_ParentHash.empty())
2573 found = data->m_ParentHash[0] == hashValue;
2575 else if (jumpType == JumpType_Parent2)
2577 if (data->m_ParentHash.size() > 1)
2578 found = data->m_ParentHash[1] == hashValue;
2580 else if (jumpType == JumpType_Tag || jumpType == JumpType_TagFF)
2582 auto refList = m_LogList.m_HashMap.find(data->m_CommitHash);
2583 if (refList != m_LogList.m_HashMap.cend())
2584 found = find_if((*refList).second, [](const auto& ref) { return CStringUtils::StartsWith(ref, L"refs/tags/"); }) != (*refList).second.cend();
2586 if (found && jumpType == JumpType_TagFF)
2587 found = g_Git.IsFastForward(hashValue, data->m_CommitHash);
2589 else if (jumpType == JumpType_Branch || jumpType == JumpType_BranchFF)
2591 auto refList = m_LogList.m_HashMap.find(data->m_CommitHash);
2592 if (refList != m_LogList.m_HashMap.cend())
2593 found = find_if((*refList).second, [](const auto& ref) { return CStringUtils::StartsWith(ref, L"refs/heads/") || CStringUtils::StartsWith(ref, L"refs/remotes/"); }) != (*refList).second.cend();
2595 if (found && jumpType == JumpType_BranchFF)
2596 found = g_Git.IsFastForward(hashValue, data->m_CommitHash);
2599 if (found)
2601 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
2602 m_LogList.EnsureVisible(i, FALSE);
2603 m_LogList.SetSelectionMark(i);
2604 return;
2608 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, L"NoJumpNotFoundWarning", IDS_MSGBOX_DONOTSHOWAGAIN);
2611 void CLogDlg::OnBnClickedJumpDown()
2613 int jumpType = m_JumpType.GetCurSel();
2614 if (jumpType < 0) return;
2616 if (jumpType == JumpType_History)
2618 GoForward();
2619 return;
2622 CString strValue;
2623 CGitHash hashValue;
2624 int index = -1;
2625 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2626 if (pos)
2628 index = m_LogList.GetNextSelectedItem(pos);
2629 if (index == 0) return;
2631 GitRev* data = m_LogList.m_arShownList.SafeGetAt(index);
2632 if (jumpType == JumpType_AuthorEmail)
2633 strValue = data->GetAuthorEmail();
2634 else if (jumpType == JumpType_CommitterEmail)
2635 strValue = data->GetCommitterEmail();
2636 else if (jumpType == JumpType_Parent1)
2638 if (!data->m_ParentHash.empty())
2639 hashValue = data->m_ParentHash.at(0);
2640 else
2641 return;
2643 else if (jumpType == JumpType_Parent2)
2645 if (data->m_ParentHash.size() > 1)
2646 hashValue = data->m_ParentHash.at(1);
2647 else
2648 return;
2650 else if (jumpType == JumpType_TagFF)
2651 hashValue = data->m_CommitHash;
2652 else if (jumpType == JumpType_BranchFF)
2653 hashValue = data->m_CommitHash;
2655 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2657 else
2658 return;
2660 while (pos)
2662 index = m_LogList.GetNextSelectedItem(pos);
2663 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2665 m_LogList.SetSelectionMark(-1);
2667 for (int i = index + 1; i < m_LogList.GetItemCount(); ++i)
2669 bool found = false;
2670 GitRev* data = m_LogList.m_arShownList.SafeGetAt(i);
2671 if (jumpType == JumpType_AuthorEmail)
2672 found = strValue == data->GetAuthorEmail();
2673 else if (jumpType == JumpType_CommitterEmail)
2674 found = strValue == data->GetCommitterEmail();
2675 else if (jumpType == JumpType_MergePoint)
2676 found = data->ParentsCount() > 1;
2677 else if (jumpType == JumpType_Parent1)
2678 found = data->m_CommitHash == hashValue;
2679 else if (jumpType == JumpType_Parent2)
2680 found = data->m_CommitHash == hashValue;
2681 else if (jumpType == JumpType_Tag || jumpType == JumpType_TagFF)
2683 auto refList = m_LogList.m_HashMap.find(data->m_CommitHash);
2684 if (refList != m_LogList.m_HashMap.cend())
2685 found = find_if((*refList).second, [](const auto& ref) { return CStringUtils::StartsWith(ref, L"refs/tags/"); }) != (*refList).second.cend();
2687 if (found && jumpType == JumpType_TagFF)
2688 found = g_Git.IsFastForward(data->m_CommitHash, hashValue);
2690 else if (jumpType == JumpType_Branch || jumpType == JumpType_BranchFF)
2692 auto refList = m_LogList.m_HashMap.find(data->m_CommitHash);
2693 if (refList != m_LogList.m_HashMap.cend())
2694 found = find_if((*refList).second, [](const auto& ref) { return CStringUtils::StartsWith(ref, L"refs/heads/") || CStringUtils::StartsWith(ref, L"refs/remotes/"); }) != (*refList).second.cend();
2696 if (found && jumpType == JumpType_BranchFF)
2697 found = g_Git.IsFastForward(data->m_CommitHash, hashValue);
2700 if (found)
2702 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
2703 m_LogList.EnsureVisible(i, FALSE);
2704 m_LogList.SetSelectionMark(i);
2705 return;
2709 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, L"NoJumpNotFoundWarning", IDS_MSGBOX_DONOTSHOWAGAIN);
2712 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
2714 #if 0
2715 switch(nSortColumn)
2717 case 0: // Revision
2719 if(bAscending)
2720 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
2721 else
2722 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
2724 break;
2725 case 1: // action
2727 if(bAscending)
2728 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
2729 else
2730 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
2732 break;
2733 case 2: // Author
2735 if(bAscending)
2736 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
2737 else
2738 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
2740 break;
2741 case 3: // Date
2743 if(bAscending)
2744 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
2745 else
2746 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
2748 break;
2749 case 4: // Message or bug id
2750 if (m_bShowBugtraqColumn)
2752 if(bAscending)
2753 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
2754 else
2755 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
2756 break;
2758 // fall through here
2759 case 5: // Message
2761 if(bAscending)
2762 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
2763 else
2764 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
2766 break;
2767 default:
2768 ATLASSERT(0);
2769 break;
2771 #endif
2774 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
2776 if (this->IsThreadRunning())
2777 return; //no sorting while the arrays are filled
2778 #if 0
2779 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2780 const int nColumn = pNMLV->iSubItem;
2781 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
2782 m_nSortColumn = nColumn;
2783 SortByColumn(m_nSortColumn, m_bAscending);
2784 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
2785 SortShownListArray();
2786 m_LogList.Invalidate();
2787 UpdateLogInfoLabel();
2788 #else
2789 UNREFERENCED_PARAMETER(pNMHDR);
2790 #endif
2791 *pResult = 0;
2793 SetTimer(LOG_HEADER_ORDER_TIMER, 10, nullptr);
2796 void CLogDlg::SortShownListArray()
2798 // make sure the shown list still matches the filter after sorting.
2799 OnTimer(LOGFILTER_TIMER);
2800 // clear the selection states
2801 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2802 while (pos)
2804 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
2806 m_LogList.SetSelectionMark(-1);
2809 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
2811 if (!control)
2812 return;
2813 // set the sort arrow
2814 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
2815 HDITEM HeaderItem = {0};
2816 HeaderItem.mask = HDI_FORMAT;
2817 for (int i=0; i<pHeader->GetItemCount(); ++i)
2819 pHeader->GetItem(i, &HeaderItem);
2820 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
2821 pHeader->SetItem(i, &HeaderItem);
2823 if (nColumn >= 0)
2825 pHeader->GetItem(nColumn, &HeaderItem);
2826 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
2827 pHeader->SetItem(nColumn, &HeaderItem);
2831 int CLogDlg::m_nSortColumnPathList = 0;
2832 bool CLogDlg::m_bAscendingPathList = false;
2834 void CLogDlg::OnBnClickedHidepaths()
2836 FillLogMessageCtrl();
2837 m_ChangedFileListCtrl.Invalidate();
2840 void CLogDlg::UpdateLogInfoLabel()
2842 CGitHash rev1 ;
2843 CGitHash rev2 ;
2844 long selectedrevs = 0;
2845 long selectedfiles = 0;
2846 int count = (int)m_LogList.m_arShownList.size();
2847 int start = 0;
2848 if (count >= 1)
2850 auto pRev = m_LogList.m_arShownList.SafeGetAt(0);
2851 if (pRev)
2853 rev1 = m_LogList.m_arShownList.SafeGetAt(0)->m_CommitHash;
2854 if (m_LogList.m_bShowWC && rev1.IsEmpty() && count > 1)
2856 start = 1;
2857 pRev = m_LogList.m_arShownList.SafeGetAt(start);
2858 if (pRev)
2859 rev1 = pRev->m_CommitHash;
2862 pRev = m_LogList.m_arShownList.SafeGetAt(count - 1);
2863 if (pRev)
2864 rev2 = pRev->m_CommitHash;
2865 selectedrevs = m_LogList.GetSelectedCount();
2866 if (selectedrevs)
2867 selectedfiles = m_ChangedFileListCtrl.GetSelectedCount();
2869 CString sTemp;
2870 sTemp.Format(IDS_PROC_LOG_STATS,
2871 count - start,
2872 (LPCTSTR)rev2.ToString().Left(g_Git.GetShortHASHLength()), (LPCTSTR)rev1.ToString().Left(g_Git.GetShortHASHLength()), selectedrevs, selectedfiles);
2874 if(selectedrevs == 1)
2876 CString str=m_ChangedFileListCtrl.GetStatisticsString(true);
2877 str.Replace(L'\n', L' ');
2878 sTemp += L"; " + str;
2880 m_sLogInfo = sTemp;
2882 UpdateData(FALSE);
2885 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2887 // the date control should not show the "today" button
2888 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
2889 if (pCtrl)
2890 pCtrl->ModifyStyle(0, MCS_NOTODAY);
2891 *pResult = 0;
2894 void CLogDlg::OnSize(UINT nType, int cx, int cy)
2896 __super::OnSize(nType, cx, cy);
2897 //set range
2898 SetSplitterRange();
2901 void CLogDlg::OnRefresh()
2904 this->m_LogProgress.SetPos(0);
2906 Refresh (false);
2910 void CLogDlg::OnFocusFilter()
2912 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2915 void CLogDlg::OnEditCopy()
2917 if (GetFocus() == &m_ChangedFileListCtrl)
2918 CopyChangedSelectionToClipBoard();
2919 else
2920 m_LogList.CopySelectionToClipBoard();
2923 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
2925 // is the URL a relative one?
2926 if (CStringUtils::StartsWith(url, L"^/"))
2928 // URL is relative to the repository root
2929 CString url1 = m_sRepositoryRoot + url.Mid(1);
2930 TCHAR buf[INTERNET_MAX_URL_LENGTH] = { 0 };
2931 DWORD len = url.GetLength();
2932 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
2933 return CString(buf, len);
2934 return url1;
2936 else if (url[0] == '/')
2938 // URL is relative to the server's hostname
2939 CString sHost;
2940 // find the server's hostname
2941 int schemepos = m_sRepositoryRoot.Find(L"//");
2942 if (schemepos >= 0)
2944 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find(L'/', schemepos + 3));
2945 CString url1 = sHost + url;
2946 TCHAR buf[INTERNET_MAX_URL_LENGTH] = { 0 };
2947 DWORD len = url.GetLength();
2948 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
2949 return CString(buf, len);
2950 return url1;
2953 return url;
2956 void CLogDlg::ShowGravatar()
2958 m_gravatar.EnableGravatar(m_bShowGravatar);
2959 RemoveAnchor(IDC_MSGVIEW);
2960 if (m_gravatar.IsGravatarEnabled())
2962 RECT rect, rect2;
2963 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(&rect);
2964 ScreenToClient(&rect);
2965 m_gravatar.GetWindowRect(&rect2);
2966 ScreenToClient(&rect2);
2967 rect.right = rect2.left;
2968 GetDlgItem(IDC_MSGVIEW)->MoveWindow(&rect);
2969 m_gravatar.ShowWindow(SW_SHOW);
2971 else
2973 RECT rect, rect2;
2974 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(&rect);
2975 ScreenToClient(&rect);
2976 m_gravatar.GetWindowRect(&rect2);
2977 ScreenToClient(&rect2);
2978 rect.right = rect2.right;
2979 GetDlgItem(IDC_MSGVIEW)->MoveWindow(&rect);
2980 m_gravatar.ShowWindow(SW_HIDE);
2982 AddAnchor(IDC_MSGVIEW, MIDDLE_LEFT, MIDDLE_RIGHT); // keep in sync with AddMainAnchors
2986 void CLogDlg::OnEnChangeSearchedit()
2988 UpdateData();
2989 if (!m_LogList.HasFilterText())
2991 // clear the filter, i.e. make all entries appear
2992 theApp.DoWaitCursor(1);
2993 KillTimer(LOGFILTER_TIMER);
2994 FillLogMessageCtrl(false);
2996 Refresh();
2997 //m_LogList.StartFilter();
2998 #if 0
2999 InterlockedExchange(&m_bNoDispUpdates, TRUE);
3000 m_arShownList.RemoveAll();
3001 for (DWORD i=0; i<m_logEntries.size(); ++i)
3003 if (IsEntryInDateRange(i))
3004 m_arShownList.Add(m_logEntries[i]);
3006 InterlockedExchange(&m_bNoDispUpdates, FALSE);
3007 m_LogList.DeleteAllItems();
3008 m_LogList.SetItemCountEx(ShownCountWithStopped());
3009 m_LogList.RedrawItems(0, ShownCountWithStopped());
3010 m_LogList.SetRedraw(false);
3011 m_LogList.SetRedraw(true);
3012 #endif
3013 theApp.DoWaitCursor(-1);
3014 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
3015 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
3016 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
3017 DialogEnableWindow(IDC_STATBUTTON, !(this->IsThreadRunning() || m_LogList.m_arShownList.empty()));
3018 return;
3020 if (Validate(m_LogList.m_sFilterText))
3021 SetTimer(LOGFILTER_TIMER, 1000, nullptr);
3022 else
3023 KillTimer(LOGFILTER_TIMER);
3026 void CLogDlg::OnBnClickedAllBranch()
3028 // m_bAllBranch is not auto-toggled by MFC, we have to handle it manually (in order to prevent the indeterminate state)
3030 m_LogList.m_ShowMask &=~ (CGit::LOG_INFO_LOCAL_BRANCHES | CGit::LOG_INFO_BASIC_REFS | CGit::LOG_INFO_ALL_BRANCH);
3032 if (m_bAllBranch)
3034 m_bAllBranch = BST_UNCHECKED;
3035 m_AllBranchType = AllBranchType::None;
3036 m_ChangedFileListCtrl.m_sDisplayedBranch = m_LogList.GetRange();
3038 else
3040 m_bAllBranch = BST_CHECKED;
3041 m_AllBranchType = AllBranchType::AllBranches;
3042 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;
3043 m_ChangedFileListCtrl.m_sDisplayedBranch.Empty();
3046 // need to save value here, so that log dialogs started from now on also have AllBranch activated
3047 m_regbAllBranch = (DWORD)m_AllBranchType;
3049 UpdateData(FALSE);
3051 OnRefresh();
3053 FillLogMessageCtrl(false);
3056 void CLogDlg::OnBnClickedFollowRenames()
3058 if(m_bFollowRenames)
3060 m_LogList.m_ShowMask |= CGit::LOG_INFO_FOLLOW;
3061 m_LogList.m_ShowMask &=~ CGit::LOG_INFO_LOCAL_BRANCHES;
3062 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_BASIC_REFS;
3063 if (m_bAllBranch)
3065 m_bAllBranch = FALSE;
3066 m_AllBranchType = AllBranchType::None;
3067 m_LogList.m_ShowMask &=~ CGit::LOG_INFO_ALL_BRANCH;
3070 else
3071 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_FOLLOW;
3073 DialogEnableWindow(IDC_LOG_ALLBRANCH, !m_bFollowRenames);
3074 DialogEnableWindow(IDC_WHOLE_PROJECT, !m_bFollowRenames && !m_path.IsEmpty());
3076 OnRefresh();
3078 FillLogMessageCtrl(false);
3081 void CLogDlg::HandleShowLabels(bool var, int flag)
3083 if (var)
3084 m_LogList.m_ShowRefMask |= flag;
3085 else
3086 m_LogList.m_ShowRefMask &= ~flag;
3088 if ((m_LogList.m_ShowFilter & CGitLogListBase::FILTERSHOW_REFS) && !(m_LogList.m_ShowFilter & CGitLogListBase::FILTERSHOW_ANYCOMMIT))
3090 // Remove commits where labels are not shown.
3091 OnRefresh();
3092 FillLogMessageCtrl(false);
3094 else
3096 // Just redraw
3097 m_LogList.Invalidate();
3101 void CLogDlg::OnBnClickedCompressedGraph()
3103 UpdateData();
3105 if (m_iCompressedGraph == 2)
3106 m_LogList.m_ShowFilter = CGitLogListBase::FILTERSHOW_REFS;
3107 else if (m_iCompressedGraph == 1)
3108 m_LogList.m_ShowFilter = static_cast<CGitLogListBase::FilterShow>(CGitLogListBase::FILTERSHOW_REFS | CGitLogListBase::FILTERSHOW_MERGEPOINTS);
3109 else
3110 m_LogList.m_ShowFilter = CGitLogListBase::FILTERSHOW_ALL;
3112 OnRefresh();
3113 FillLogMessageCtrl(false);
3116 void CLogDlg::OnBnClickedBrowseRef()
3118 CString newRef = CBrowseRefsDlg::PickRef(false, m_LogList.GetRange(), gPickRef_All, true);
3119 if(newRef.IsEmpty())
3120 return;
3122 m_History.AddEntry(newRef);
3123 m_History.Save();
3125 SetRange(newRef);
3127 m_LogList.m_ShowMask &= ~(CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_BASIC_REFS | CGit::LOG_INFO_LOCAL_BRANCHES);
3128 m_bAllBranch = BST_UNCHECKED;
3129 m_AllBranchType = AllBranchType::None;
3130 UpdateData(FALSE);
3132 OnRefresh();
3133 FillLogMessageCtrl(false);
3136 void CLogDlg::ShowStartRef()
3138 //Show ref name on top
3139 if(!::IsWindow(m_hWnd))
3140 return;
3141 if (m_LogList.m_ShowMask & (CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_BASIC_REFS | CGit::LOG_INFO_LOCAL_BRANCHES))
3143 switch (m_LogList.m_ShowMask & (CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_BASIC_REFS | CGit::LOG_INFO_LOCAL_BRANCHES))
3145 case CGit::LOG_INFO_ALL_BRANCH:
3146 m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES)));
3147 break;
3149 case CGit::LOG_INFO_BASIC_REFS:
3150 m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_BASIC_REFS)));
3151 break;
3153 case CGit::LOG_INFO_LOCAL_BRANCHES:
3154 m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_LOCAL_BRANCHES)));
3155 break;
3158 m_staticRef.Invalidate(TRUE);
3159 m_tooltips.DelTool(GetDlgItem(IDC_STATIC_REF));
3160 return;
3163 CString showStartRef = m_LogList.GetRange();
3164 if (showStartRef.IsEmpty() || showStartRef == L"HEAD")
3166 showStartRef.Empty();
3167 //Ref name is HEAD
3168 if (g_Git.Run(L"git.exe symbolic-ref HEAD", &showStartRef, nullptr, CP_UTF8))
3169 showStartRef.LoadString(IDS_PROC_LOG_NOBRANCH);
3170 showStartRef.Trim(L"\r\n\t ");
3174 showStartRef = g_Git.StripRefName(showStartRef);
3176 m_staticRef.SetWindowText(showStartRef);
3177 CWnd *pWnd = GetDlgItem(IDC_STATIC_REF);
3178 m_tooltips.AddTool(pWnd, showStartRef);
3179 m_staticRef.Invalidate(TRUE);
3182 void CLogDlg::SetRange(const CString& range)
3184 m_LogList.SetRange(range);
3185 m_ChangedFileListCtrl.m_sDisplayedBranch = range;
3187 ShowStartRef();
3190 static void AppendMenuChecked(CMenu &menu, UINT nTextID, UINT_PTR nItemID, BOOL checked = FALSE, BOOL enabled = TRUE)
3192 CString text;
3193 text.LoadString(nTextID);
3194 menu.AppendMenu(MF_STRING | (enabled ? MF_ENABLED : MF_DISABLED) | (checked ? MF_CHECKED : MF_UNCHECKED), nItemID, text);
3197 #define WALKBEHAVIOUR_FIRSTPARENT 1
3198 #define WALKBEHAVIOUR_FOLLOWRENAMES 2
3199 #define WALKBEHAVIOUR_COMPRESSEDGRAPH 3
3200 #define WALKBEHAVIOUR_LABELEDCOMMITS 4
3201 #define WALKBEHAVIOUR_NOMERGES 5
3203 void CLogDlg::OnBnClickedWalkBehaviour()
3205 CMenu popup;
3206 if (popup.CreatePopupMenu())
3208 m_ctrlWalkBehavior.SetCheck(BST_CHECKED);
3209 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_FIRSTPARENT, WALKBEHAVIOUR_FIRSTPARENT, m_bFirstParent);
3210 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_NOMERGES, WALKBEHAVIOUR_NOMERGES, m_bNoMerges);
3211 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_FOLLOWRENAMES, WALKBEHAVIOUR_FOLLOWRENAMES, m_bFollowRenames, !(m_path.IsEmpty() || m_path.IsDirectory()));
3212 popup.AppendMenu(MF_SEPARATOR, NULL);
3213 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_COMPRESSED, WALKBEHAVIOUR_COMPRESSEDGRAPH, m_iCompressedGraph == 1);
3214 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_LABELEDCOMMITS, WALKBEHAVIOUR_LABELEDCOMMITS, m_iCompressedGraph == 2);
3216 m_tooltips.Pop();
3217 RECT rect;
3218 GetDlgItem(IDC_WALKBEHAVIOUR)->GetWindowRect(&rect);
3219 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, rect.left, rect.top, this);
3220 switch (selection)
3222 case WALKBEHAVIOUR_FIRSTPARENT:
3223 m_bFirstParent = !m_bFirstParent;
3224 OnBnClickedFirstParent();
3225 break;
3226 case WALKBEHAVIOUR_NOMERGES:
3227 m_bNoMerges = !m_bNoMerges;
3228 OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges
3229 break;
3230 case WALKBEHAVIOUR_FOLLOWRENAMES:
3231 m_bFollowRenames = !m_bFollowRenames;
3232 OnBnClickedFollowRenames();
3233 break;
3234 case WALKBEHAVIOUR_COMPRESSEDGRAPH:
3235 m_iCompressedGraph = (m_iCompressedGraph == 1 ? 0 : 1);
3236 OnBnClickedCompressedGraph();
3237 break;
3238 case WALKBEHAVIOUR_LABELEDCOMMITS:
3239 m_iCompressedGraph = (m_iCompressedGraph == 2 ? 0 : 2);
3240 OnBnClickedCompressedGraph();
3241 break;
3242 default:
3243 break;
3245 m_ctrlWalkBehavior.SetCheck((m_bFirstParent || m_bNoMerges || m_bFollowRenames || m_iCompressedGraph) ? BST_CHECKED : BST_UNCHECKED);
3249 #define VIEW_HIDEPATHS 1
3250 #define VIEW_GRAYPATHS 2
3251 #define VIEW_SHOWTAGS 3
3252 #define VIEW_SHOWLOCALBRANCHES 4
3253 #define VIEW_SHOWREMOTEBRANCHES 5
3254 #define VIEW_SHOWGRAVATAR 6
3255 #define VIEW_SHOWPATCH 7
3256 #define VIEW_SHOWWCUNVERSIONED 8
3258 void CLogDlg::OnBnClickedView()
3260 CMenu popup;
3261 if (popup.CreatePopupMenu())
3263 m_ctrlView.SetCheck(BST_CHECKED);
3264 AppendMenuChecked(popup, IDS_SHOWFILES_HIDEPATHS, VIEW_HIDEPATHS, m_iHidePaths == 1);
3265 AppendMenuChecked(popup, IDS_SHOWFILES_GRAYPATHS, VIEW_GRAYPATHS, m_iHidePaths == 2);
3266 popup.AppendMenu(MF_SEPARATOR, NULL);
3267 AppendMenuChecked(popup, IDS_PROC_LOG_SHOWUNVERSIONED, VIEW_SHOWWCUNVERSIONED, m_bShowUnversioned == BST_CHECKED);
3268 popup.AppendMenu(MF_SEPARATOR, NULL);
3269 CMenu showLabelsMenu;
3270 if (showLabelsMenu.CreatePopupMenu())
3272 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWTAGLABELS, VIEW_SHOWTAGS, m_bShowTags);
3273 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWLOCALBRANCHLABELS, VIEW_SHOWLOCALBRANCHES, m_bShowLocalBranches);
3274 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWREMOTEBRANCHLABELS, VIEW_SHOWREMOTEBRANCHES, m_bShowRemoteBranches);
3275 popup.AppendMenu(MF_STRING | MF_POPUP, (UINT_PTR)showLabelsMenu.m_hMenu, (CString)MAKEINTRESOURCE(IDS_VIEW_LABELS));
3277 popup.AppendMenu(MF_SEPARATOR, NULL);
3278 AppendMenuChecked(popup, IDS_VIEW_SHOWGRAVATAR, VIEW_SHOWGRAVATAR, m_bShowGravatar);
3279 AppendMenuChecked(popup, IDS_MENU_VIEWPATCH, VIEW_SHOWPATCH, IsWindow(this->m_patchViewdlg.m_hWnd));
3281 m_tooltips.Pop();
3282 RECT rect;
3283 GetDlgItem(IDC_VIEW)->GetWindowRect(&rect);
3284 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, rect.left, rect.top, this);
3285 switch (selection)
3287 case VIEW_HIDEPATHS:
3288 if (m_iHidePaths == 1)
3289 m_iHidePaths = 0;
3290 else
3291 m_iHidePaths = 1;
3292 OnBnClickedHidepaths();
3293 break;
3294 case VIEW_GRAYPATHS:
3295 if (m_iHidePaths == 2)
3296 m_iHidePaths = 0;
3297 else
3298 m_iHidePaths = 2;
3299 OnBnClickedHidepaths();
3300 break;
3301 case VIEW_SHOWTAGS:
3302 m_bShowTags = !m_bShowTags;
3303 HandleShowLabels(m_bShowTags, LOGLIST_SHOWTAGS);
3304 break;
3305 case VIEW_SHOWLOCALBRANCHES:
3306 m_bShowLocalBranches = !m_bShowLocalBranches;
3307 HandleShowLabels(m_bShowLocalBranches, LOGLIST_SHOWLOCALBRANCHES);
3308 break;
3309 case VIEW_SHOWREMOTEBRANCHES:
3310 m_bShowRemoteBranches = !m_bShowRemoteBranches;
3311 HandleShowLabels(m_bShowRemoteBranches, LOGLIST_SHOWREMOTEBRANCHES);
3312 break;
3313 case VIEW_SHOWGRAVATAR:
3315 m_bShowGravatar = !m_bShowGravatar;
3316 ShowGravatar();
3317 m_gravatar.Init();
3318 CString email;
3319 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
3320 if (pos)
3322 int selIndex = m_LogList.GetNextSelectedItem(pos);
3323 int moreSel = m_LogList.GetNextSelectedItem(pos);
3324 if (moreSel < 0)
3326 GitRev* pLogEntry = m_LogList.m_arShownList.SafeGetAt(selIndex);
3327 if (pLogEntry)
3328 email = pLogEntry->GetAuthorEmail();
3331 m_gravatar.LoadGravatar(email);
3332 break;
3334 case VIEW_SHOWPATCH:
3335 TogglePatchView();
3336 break;
3337 case VIEW_SHOWWCUNVERSIONED:
3338 m_bShowUnversioned = !m_bShowUnversioned;
3339 FillLogMessageCtrl();
3340 m_ChangedFileListCtrl.Invalidate();
3341 break;
3342 default:
3343 break;
3345 m_ctrlView.SetCheck(BST_UNCHECKED);
3349 void CLogDlg::OnBnClickedFirstParent()
3351 if(this->m_bFirstParent)
3352 m_LogList.m_ShowMask|=CGit::LOG_INFO_FIRST_PARENT;
3353 else
3354 m_LogList.m_ShowMask&=~CGit::LOG_INFO_FIRST_PARENT;
3356 if (m_bNoMerges)
3357 m_LogList.m_ShowMask |= CGit::LOG_INFO_NO_MERGE;
3358 else
3359 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_NO_MERGE;
3361 OnRefresh();
3363 FillLogMessageCtrl(false);
3366 void CLogDlg::OnBnClickShowWholeProject()
3368 this->UpdateData();
3370 if(this->m_bWholeProject)
3372 m_LogList.m_Path.Reset();
3373 SetDlgTitle();
3375 else
3376 m_LogList.m_Path=m_path;
3378 m_regShowWholeProject = m_bWholeProject;
3380 SetDlgTitle();
3382 OnRefresh();
3384 FillLogMessageCtrl(false);
3387 LRESULT CLogDlg::OnRefLogChanged(WPARAM /*wParam*/, LPARAM /*lParam*/)
3389 ShowStartRef();
3390 return 0;
3393 LRESULT CLogDlg::OnTaskbarBtnCreated(WPARAM wParam, LPARAM lParam)
3395 m_pTaskbarList.Release();
3396 m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
3397 return __super::OnTaskbarButtonCreated(wParam, lParam);
3400 LRESULT CLogDlg::OnRefreshSelection(WPARAM /*wParam*/, LPARAM /*lParam*/)
3402 // it's enough to deselect, then select again one item of the whole selection
3403 int selMark = m_LogList.GetSelectionMark();
3404 if (selMark >= 0)
3406 m_LogList.SetSelectionMark(selMark);
3407 m_LogList.SetItemState(selMark, 0, LVIS_SELECTED);
3408 m_LogList.SetItemState(selMark, LVIS_SELECTED, LVIS_SELECTED);
3410 return 0;
3413 void CLogDlg::OnExitClearFilter()
3415 if (!m_LogList.m_sFilterText.IsEmpty())
3417 OnClickedCancelFilter(NULL, NULL);
3418 return;
3420 SendMessage(WM_CLOSE);