Make sure member variables are initialized correctly
[TortoiseGit.git] / src / TortoiseProc / LogDlg.cpp
blob55c0fa13ed08ce914c47f4b50e7c268b358d5d35
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2009 - TortoiseSVN
4 // Copyright (C) 2008-2014 - TortoiseGit
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20 #include "stdafx.h"
21 #include "TortoiseProc.h"
22 #include "cursor.h"
23 #include "StatGraphDlg.h"
24 #include "LogDlg.h"
25 #include "MessageBox.h"
26 #include "registry.h"
27 #include "AppUtils.h"
28 #include "PathUtils.h"
29 #include "StringUtils.h"
30 #include "UnicodeUtils.h"
31 #include "TempFile.h"
32 #include "IconMenu.h"
33 #include "BrowseRefsDlg.h"
34 #include "SmartHandle.h"
35 #include "LogOrdering.h"
37 #define WM_TGIT_REFRESH_SELECTION (WM_APP + 1)
39 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)
40 CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
41 : CResizableStandAloneDialog(CLogDlg::IDD, pParent)
42 , m_wParam(0)
43 , m_currentChangedArray(NULL)
44 , m_nSortColumn(0)
45 , m_bFollowRenames(false)
46 , m_bSelect(false)
47 , m_bSelectionMustBeSingle(true)
48 , m_bShowTags(true)
49 , m_bShowLocalBranches(true)
50 , m_bShowRemoteBranches(true)
51 , m_bNoMerges(false)
52 , m_iHidePaths(0)
53 , m_bWalkBehavior(FALSE)
54 , m_bFirstParent(false)
55 , m_bWholeProject(FALSE)
56 , m_iCompressedGraph(0)
58 , m_bSelectionMustBeContinuous(false)
60 , m_sLogInfo(_T(""))
62 , m_bCancelled(FALSE)
63 , m_pNotifyWindow(NULL)
65 , m_bAscending(FALSE)
67 , m_limit(0)
68 , m_hAccel(NULL)
69 , m_bNavigatingWithSelect(false)
71 m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), FALSE);
72 m_bFilterCaseSensitively = !!CRegDWORD(L"Software\\TortoiseGit\\FilterCaseSensitively", FALSE);
73 m_bAsteriskLogPrefix = !!CRegDWORD(L"Software\\TortoiseGit\\AsteriskLogPrefix", TRUE);
75 CString str;
76 str=g_Git.m_CurrentDir;
77 str.Replace(_T(":"),_T("_"));
78 str=CString(_T("Software\\TortoiseGit\\LogDialog\\AllBranch\\"))+str;
80 m_regbAllBranch=CRegDWORD(str,FALSE);
82 m_bAllBranch=m_regbAllBranch;
84 str = g_Git.m_CurrentDir;
85 str.Replace(_T(":"),_T("_"));
86 m_regShowWholeProject = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\") + str, FALSE);
87 m_bWholeProject = m_regShowWholeProject;
88 m_regbShowTags = CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowTags\\") + str, TRUE);
89 m_bShowTags = !!m_regbShowTags;
90 m_regbShowLocalBranches = CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowLocalBranches\\") + str, TRUE);
91 m_bShowLocalBranches = !!m_regbShowLocalBranches;
92 m_regbShowRemoteBranches = CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowRemoteBranches\\") + str, TRUE);
93 m_bShowRemoteBranches = !!m_regbShowRemoteBranches;
95 m_bShowUnversioned = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);
97 m_bShowGravatar = !!CRegDWORD(_T("Software\\TortoiseGit\\EnableGravatar"), FALSE);
98 m_regbShowGravatar = CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowGravatar\\") + str, m_bShowGravatar);
99 m_bShowGravatar = !!m_regbShowGravatar;
100 m_bShowDescribe = !!CRegDWORD(_T("Software\\TortoiseGit\\ShowDescribe"));
103 CLogDlg::~CLogDlg()
106 m_regbAllBranch = m_bAllBranch;
107 m_regbShowTags = m_bShowTags;
108 m_regbShowLocalBranches = m_bShowLocalBranches;
109 m_regbShowRemoteBranches = m_bShowRemoteBranches;
110 m_regbShowGravatar = m_bShowGravatar;
112 m_CurrentFilteredChangedArray.RemoveAll();
116 void CLogDlg::DoDataExchange(CDataExchange* pDX)
118 CResizableStandAloneDialog::DoDataExchange(pDX);
119 DDX_Control(pDX, IDC_LOGLIST, m_LogList);
120 DDX_Control(pDX, IDC_LOGMSG, m_ChangedFileListCtrl);
121 DDX_Control(pDX, IDC_PROGRESS, m_LogProgress);
122 DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1);
123 DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2);
124 DDX_Text(pDX, IDC_SEARCHEDIT, m_LogList.m_sFilterText);
125 DDX_Control(pDX, IDC_DATEFROM, m_DateFrom);
126 DDX_Control(pDX, IDC_DATETO, m_DateTo);
127 DDX_Control(pDX, IDC_LOG_JUMPTYPE, m_JumpType);
128 DDX_Control(pDX, IDC_LOG_JUMPUP, m_JumpUp);
129 DDX_Control(pDX, IDC_LOG_JUMPDOWN, m_JumpDown);
130 DDX_Text(pDX, IDC_LOGINFO, m_sLogInfo);
131 DDX_Check(pDX, IDC_LOG_ALLBRANCH,m_bAllBranch);
132 DDX_Check(pDX, IDC_SHOWWHOLEPROJECT,m_bWholeProject);
133 DDX_Check(pDX, IDC_WALKBEHAVIOUR, m_bWalkBehavior);
134 DDX_Control(pDX, IDC_SEARCHEDIT, m_cFilter);
135 DDX_Control(pDX, IDC_STATIC_REF, m_staticRef);
136 DDX_Control(pDX, IDC_PIC_AUTHOR, m_gravatar);
137 DDX_Control(pDX, IDC_FILTER, m_cFileFilter);
140 BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
141 ON_WM_CONTEXTMENU()
142 ON_WM_SETCURSOR()
143 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)
144 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGMSG, OnLvnItemchangedLogmsg)
145 ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)
146 ON_EN_VSCROLL(IDC_MSGVIEW, OnEnscrollMsgview)
147 ON_EN_HSCROLL(IDC_MSGVIEW, OnEnscrollMsgview)
148 ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)
150 ON_MESSAGE(WM_TGIT_REFRESH_SELECTION, OnRefreshSelection)
151 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
152 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
154 ON_MESSAGE(MSG_LOAD_PERCENTAGE,OnLogListLoading)
156 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
157 ON_WM_TIMER()
158 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
159 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
160 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE, &CLogDlg::OnCbnSelchangeJumpType)
161 ON_COMMAND(IDC_LOG_JUMPUP, &CLogDlg::OnBnClickedJumpUp)
162 ON_COMMAND(IDC_LOG_JUMPDOWN, &CLogDlg::OnBnClickedJumpDown)
163 ON_COMMAND(ID_GO_UP, &CLogDlg::OnBnClickedJumpUp)
164 ON_COMMAND(ID_GO_DOWN, &CLogDlg::OnBnClickedJumpDown)
165 ON_BN_CLICKED(IDC_WALKBEHAVIOUR, OnBnClickedWalkBehaviour)
166 ON_BN_CLICKED(IDC_VIEW, OnBnClickedView)
167 ON_BN_CLICKED(IDC_SHOWWHOLEPROJECT, 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_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)
175 ON_WM_SIZE()
176 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
177 ON_STN_CLICKED(IDC_STATIC_REF, &CLogDlg::OnBnClickedBrowseRef)
178 ON_COMMAND(ID_LOGDLG_REFRESH, &CLogDlg::OnBnClickedRefresh)
179 ON_COMMAND(ID_GO_BACKWARD_SELECT, &CLogDlg::GoBackAndSelect)
180 ON_COMMAND(ID_GO_FORWARD_SELECT, &CLogDlg::GoForwardAndSelect)
181 ON_COMMAND(ID_GO_BACKWARD, &CLogDlg::GoBack)
182 ON_COMMAND(ID_GO_FORWARD, &CLogDlg::GoForward)
183 ON_COMMAND(ID_SELECT_SEARCHFIELD, &CLogDlg::OnSelectSearchField)
184 ON_COMMAND(ID_LOGDLG_FIND, &CLogDlg::OnFind)
185 ON_COMMAND(ID_LOGDLG_FOCUSFILTER, &CLogDlg::OnFocusFilter)
186 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
187 ON_MESSAGE(MSG_REFLOG_CHANGED, OnRefLogChanged)
188 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED, OnTaskbarBtnCreated)
190 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED, &CLogDlg::OnFileListCtrlItemChanged)
191 ON_WM_MOVE()
192 ON_WM_MOVING()
193 ON_WM_SIZING()
194 END_MESSAGE_MAP()
196 enum JumpType
198 JumpType_AuthorEmail,
199 JumpType_CommitterEmail,
200 JumpType_MergePoint,
201 JumpType_Parent1,
202 JumpType_Parent2,
203 JumpType_Tag,
204 JumpType_TagFF,
205 JumpType_Branch,
206 JumpType_BranchFF,
207 JumpType_History,
210 void CLogDlg::SetParams(const CTGitPath& orgPath, const CTGitPath& path, CString hightlightRevision, CString range, int limit)
212 m_orgPath = orgPath;
213 m_path = path;
214 m_hightlightRevision = hightlightRevision;
216 if (!(range.IsEmpty() || range == _T("HEAD")))
217 m_bAllBranch = BST_UNCHECKED;
219 SetRange(range);
221 m_limit = limit;
222 if (::IsWindow(m_hWnd))
223 UpdateData(FALSE);
226 void CLogDlg::SetFilter(const CString& findstr, LONG findtype, bool findregex)
228 m_LogList.m_sFilterText = findstr;
229 if (findtype)
230 m_LogList.m_SelectedFilters = findtype;
231 m_LogList.m_bFilterWithRegex = m_bFilterWithRegex = findregex;
234 BOOL CLogDlg::OnInitDialog()
236 CString temp;
237 CResizableStandAloneDialog::OnInitDialog();
238 CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
240 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
241 // do this, Explorer would be unable to send that message to our window if we
242 // were running elevated. It's OK to make the call all the time, since if we're
243 // not elevated, this is a no-op.
244 CHANGEFILTERSTRUCT cfs = { sizeof(CHANGEFILTERSTRUCT) };
245 typedef BOOL STDAPICALLTYPE ChangeWindowMessageFilterExDFN(HWND hWnd, UINT message, DWORD action, PCHANGEFILTERSTRUCT pChangeFilterStruct);
246 CAutoLibrary hUser = AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
247 if (hUser)
249 ChangeWindowMessageFilterExDFN *pfnChangeWindowMessageFilterEx = (ChangeWindowMessageFilterExDFN*)GetProcAddress(hUser, "ChangeWindowMessageFilterEx");
250 if (pfnChangeWindowMessageFilterEx)
252 pfnChangeWindowMessageFilterEx(m_hWnd, WM_TASKBARBTNCREATED, MSGFLT_ALLOW, &cfs);
255 m_pTaskbarList.Release();
256 if (FAILED(m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList)))
257 m_pTaskbarList = nullptr;
259 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
261 // use the state of the "stop on copy/rename" option from the last time
262 UpdateData(FALSE);
264 // set the font to use in the log message view, configured in the settings dialog
265 CAppUtils::CreateFontForLogs(m_logFont);
266 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
267 // automatically detect URLs in the log message and turn them into links
268 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_AUTOURLDETECT, TRUE, NULL);
269 // make the log message rich edit control send a message when the mouse pointer is over a link
270 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK | ENM_SCROLL);
272 // "unrelated paths" should be in gray color
273 m_iHidePaths = 2;
275 // set up the columns
276 m_LogList.DeleteAllItems();
278 m_LogList.m_Path=m_path;
279 m_LogList.m_hasWC = m_LogList.m_bShowWC = !g_GitAdminDir.IsBareRepo(g_Git.m_CurrentDir);
280 m_LogList.InsertGitColumn();
282 if (m_bWholeProject)
283 m_LogList.m_Path.Reset();
285 m_ChangedFileListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL, _T("LogDlg"), (GITSLC_POPALL ^ (GITSLC_POPIGNORE|GITSLC_POPRESTORE)), false, m_LogList.m_hasWC, GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD| GITSLC_COLDEL);
287 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
289 SetDlgTitle();
291 m_tooltips.Create(this);
292 CheckRegexpTooltip();
294 SetSplitterRange();
296 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
297 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
298 m_cFilter.SetInfoIcon(IDI_LOGFILTER);
299 m_cFilter.SetValidator(this);
301 AdjustControlSize(IDC_LOG_ALLBRANCH);
302 AdjustControlSize(IDC_SHOWWHOLEPROJECT);
304 GetClientRect(m_DlgOrigRect);
305 m_LogList.GetClientRect(m_LogListOrigRect);
306 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
307 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
309 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
310 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
312 m_staticRef.SetURL(CString());
314 // resizable stuff
315 AddAnchor(IDC_STATIC_REF, TOP_LEFT);
316 //AddAnchor(IDC_BUTTON_BROWSE_REF, TOP_LEFT);
317 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
318 AddAnchor(IDC_DATEFROM, TOP_LEFT);
319 AddAnchor(IDC_TOLABEL, TOP_LEFT);
320 AddAnchor(IDC_DATETO, TOP_LEFT);
322 SetFilterCueText();
323 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
324 AddAnchor(IDC_LOG_JUMPTYPE, TOP_RIGHT);
325 AddAnchor(IDC_LOG_JUMPUP, TOP_RIGHT);
326 AddAnchor(IDC_LOG_JUMPDOWN, TOP_RIGHT);
328 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
329 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
330 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
331 AddAnchor(IDC_PIC_AUTHOR, TOP_RIGHT);
332 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
333 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
335 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
336 AddAnchor(IDC_WALKBEHAVIOUR, BOTTOM_LEFT);
337 AddAnchor(IDC_VIEW, BOTTOM_LEFT);
338 AddAnchor(IDC_LOG_ALLBRANCH,BOTTOM_LEFT);
339 AddAnchor(IDC_FILTER, BOTTOM_LEFT, BOTTOM_RIGHT);
340 AddAnchor(IDC_SHOWWHOLEPROJECT, BOTTOM_LEFT);
341 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
342 AddAnchor(IDC_STATBUTTON, BOTTOM_LEFT);
343 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
344 AddAnchor(IDOK, BOTTOM_RIGHT);
345 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
346 AddAnchor(IDHELP, BOTTOM_RIGHT);
348 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_LOCAL_BRANCHES;
349 if (m_bAllBranch == BST_CHECKED)
350 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;
351 else if (m_bAllBranch == BST_INDETERMINATE)
352 m_LogList.m_ShowMask |= CGit::LOG_INFO_LOCAL_BRANCHES;
353 else
354 m_LogList.m_ShowMask&=~CGit::LOG_INFO_ALL_BRANCH;
356 HandleShowLabels(m_bShowTags, LOGLIST_SHOWTAGS);
357 HandleShowLabels(m_bShowLocalBranches, LOGLIST_SHOWLOCALBRANCHES);
358 HandleShowLabels(m_bShowRemoteBranches, LOGLIST_SHOWREMOTEBRANCHES);
360 // SetPromptParentWindow(m_hWnd);
361 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL)));
362 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL)));
363 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT)));
364 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1)));
365 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2)));
366 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG)));
367 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF)));
368 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH)));
369 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH_FF)));
370 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_SELECTION_HISTORY)));
371 m_JumpType.SetCurSel(0);
372 m_JumpUp.SetIcon((HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR));
373 m_JumpDown.SetIcon((HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR));
375 if (hWndExplorer)
376 CenterWindow(CWnd::FromHandle(hWndExplorer));
377 EnableSaveRestore(_T("LogDlg"));
379 DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
380 DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
381 RECT rcDlg, rcLogList, rcChgMsg;
382 GetClientRect(&rcDlg);
383 m_LogList.GetWindowRect(&rcLogList);
384 ScreenToClient(&rcLogList);
385 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
386 ScreenToClient(&rcChgMsg);
387 if (yPos1)
389 RECT rectSplitter;
390 m_wndSplitter1.GetWindowRect(&rectSplitter);
391 ScreenToClient(&rectSplitter);
392 int delta = yPos1 - rectSplitter.top;
394 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
396 m_wndSplitter1.SetWindowPos(NULL, rectSplitter.left, yPos1, 0, 0, SWP_NOSIZE);
397 DoSizeV1(delta);
400 if (yPos2)
402 RECT rectSplitter;
403 m_wndSplitter2.GetWindowRect(&rectSplitter);
404 ScreenToClient(&rectSplitter);
405 int delta = yPos2 - rectSplitter.top;
407 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
409 m_wndSplitter2.SetWindowPos(NULL, rectSplitter.left, yPos2, 0, 0, SWP_NOSIZE);
410 DoSizeV2(delta);
414 SetSplitterRange();
416 if (m_bSelect)
418 // the dialog is used to select revisions
419 // enable the OK button if appropriate
420 EnableOKButton();
422 else
424 // the dialog is used to just view log messages
425 // hide the OK button and set text on Cancel button to OK
426 GetDlgItemText(IDOK, temp);
427 SetDlgItemText(IDCANCEL, temp);
428 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
431 // first start a thread to obtain the log messages without
432 // blocking the dialog
433 //m_tTo = 0;
434 //m_tFrom = (DWORD)-1;
436 // scroll to user selected or current revision
437 if (m_hightlightRevision.IsEmpty() || g_Git.GetHash(m_LogList.m_lastSelectedHash, m_hightlightRevision))
439 if (g_Git.GetHash(m_LogList.m_lastSelectedHash, _T("HEAD")))
440 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
443 if (g_Git.GetConfigValueBool(_T("tgit.logshowpatch")))
444 TogglePatchView();
446 m_LogList.FetchLogAsync(this);
447 ShowGravatar();
448 m_gravatar.Init();
450 m_cFileFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
451 m_cFileFilter.SetInfoIcon(IDI_FILTEREDIT);
452 temp.LoadString(IDS_FILEDIFF_FILTERCUE);
453 temp = _T(" ") + temp;
454 m_cFileFilter.SetCueBanner(temp);
456 GetDlgItem(IDC_LOGLIST)->SetFocus();
458 m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxRefHistoryItems"), 5));
459 CString reg;
460 reg.Format(_T("Software\\TortoiseGit\\History\\log-refs\\%s"), g_Git.m_CurrentDir);
461 reg.Replace(_T(':'),_T('_'));
462 m_History.Load(reg, _T("ref"));
464 ShowStartRef();
465 return FALSE;
468 LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)
470 int cur=(int)wParam;
472 if( cur == GITLOG_START )
474 CString temp;
475 temp.LoadString(IDS_PROGRESSWAIT);
477 this->m_LogList.ShowText(temp, true);
479 // We use a progress bar while getting the logs
480 m_LogProgress.SetRange32(0, 100);
481 m_LogProgress.SetPos(0);
482 if (m_pTaskbarList)
484 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
485 m_pTaskbarList->SetProgressValue(m_hWnd, 0, 100);
488 GetDlgItem(IDC_WALKBEHAVIOUR)->ShowWindow(SW_HIDE);
489 GetDlgItem(IDC_VIEW)->ShowWindow(SW_HIDE);
490 GetDlgItem(IDC_STATBUTTON)->ShowWindow(SW_HIDE);
491 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
493 DialogEnableWindow(IDC_WALKBEHAVIOUR, FALSE);
494 DialogEnableWindow(IDC_STATBUTTON, FALSE);
495 //DialogEnableWindow(IDC_REFRESH, FALSE);
496 DialogEnableWindow(IDC_VIEW, FALSE);
499 else if( cur == GITLOG_END)
501 if(this->m_LogList.HasText())
503 this->m_LogList.ClearText();
505 UpdateLogInfoLabel();
507 if (m_pTaskbarList)
508 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
510 DialogEnableWindow(IDC_SHOWWHOLEPROJECT, !m_bFollowRenames && !m_path.IsEmpty());
512 DialogEnableWindow(IDC_STATBUTTON, !(m_LogList.m_arShownList.IsEmpty() || m_LogList.m_arShownList.GetCount() == 1 && m_LogList.m_bShowWC));
513 DialogEnableWindow(IDC_REFRESH, TRUE);
514 DialogEnableWindow(IDC_VIEW, TRUE);
515 DialogEnableWindow(IDC_WALKBEHAVIOUR, TRUE);
516 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
517 GetDlgItem(IDC_WALKBEHAVIOUR)->ShowWindow(SW_SHOW);
518 GetDlgItem(IDC_VIEW)->ShowWindow(SW_SHOW);
519 GetDlgItem(IDC_STATBUTTON)->ShowWindow(SW_SHOW);
520 GetDlgItem(IDC_PROGRESS)->ShowWindow(FALSE);
521 //CTime time=m_LogList.GetOldestTime();
522 CTime begin,end;
523 m_LogList.GetTimeRange(begin,end);
525 if(m_LogList.m_From == -1)
526 m_DateFrom.SetTime(&begin);
528 if(m_LogList.m_To == -1)
529 m_DateTo.SetTime(&end);
533 else
535 if(this->m_LogList.HasText())
537 this->m_LogList.ClearText();
538 this->m_LogList.Invalidate();
540 UpdateLogInfoLabel();
541 m_LogProgress.SetPos(cur);
542 if (m_pTaskbarList)
544 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
545 m_pTaskbarList->SetProgressValue(m_hWnd, cur, 100);
548 return 0;
550 void CLogDlg::SetDlgTitle()
552 if (m_sTitle.IsEmpty())
553 GetWindowText(m_sTitle);
555 if (m_LogList.m_Path.IsEmpty() || m_orgPath.GetWinPathString().IsEmpty())
557 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, m_sTitle);
559 else
560 CAppUtils::SetWindowTitle(m_hWnd, m_orgPath.GetWinPathString(), m_sTitle);
563 void CLogDlg::CheckRegexpTooltip()
565 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
566 // Since tooltip describes regexp features, show it only if regexps are enabled.
567 if (m_bFilterWithRegex)
569 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
571 else
572 m_tooltips.DelTool(pWnd);
575 void CLogDlg::EnableOKButton()
577 if (m_bSelect)
579 // the dialog is used to select revisions
580 if (m_bSelectionMustBeSingle)
582 // enable OK button if only a single revision is selected
583 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()==1));
585 else if (m_bSelectionMustBeContinuous)
586 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
587 else
588 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
590 else
591 DialogEnableWindow(IDOK, TRUE);
594 bool LookLikeGitHash(const CString& msg, int &pos)
596 int c = 0;
597 for (; pos < msg.GetLength(); ++pos)
599 if (msg[pos] >= '0' && msg[pos] <= '9' || msg[pos] >= 'a' && msg[pos] <= 'f')
601 c++;
603 else
605 return c >= g_Git.GetShortHASHLength() && c <= GIT_HASH_SIZE * 2;
608 return c >= g_Git.GetShortHASHLength() && c <= GIT_HASH_SIZE * 2;
611 std::vector<CHARRANGE> FindGitHashPositions(const CString& msg, int offset)
613 std::vector<CHARRANGE> result;
614 offset = offset < 0 ? 0 : offset;
615 int old = offset;
616 while (offset < msg.GetLength())
618 old = offset;
619 TCHAR e = msg[offset];
620 if (e == '\n')
622 ++offset;
623 if (msg.Mid(offset, 11) == _T("git-svn-id:")
624 || msg.Mid(offset, 14) == _T("Signed-off-by:")
625 || msg.Mid(offset, 10) == _T("Change-Id:")
628 offset += 10;
629 while (offset < msg.GetLength())
631 if (msg[offset++] == '\n')
632 break;
634 continue;
637 else if (e >= 'A' && e <= 'Z' || e >= 'h' && e <= 'z')
641 e = msg[++offset];
642 } while (offset < msg.GetLength() && (e >= 'A' && e <= 'Z' || e >= 'a' && e <= 'z' || e >= '0' && e <= '9'));
644 else if (e >= 'a' && e <= 'g' || e >= '0' && e <= '9')
646 if (e == 'g')
648 ++old;
649 ++offset;
651 if (LookLikeGitHash(msg, offset))
653 TCHAR d = offset < msg.GetLength() ? msg[offset] : '\0';
654 if (!((d >= 'A' && d <= 'Z') || (d >= 'a' && d <= 'z') || (d >= '0' && d <= '9')))
656 CHARRANGE range = { old, offset };
657 result.push_back(range);
660 ++offset;
662 else
664 ++offset;
668 return result;
671 BOOL FindGitHash(const CString& msg, int offset, CWnd *pWnd)
673 std::vector<CHARRANGE> positions = FindGitHashPositions(msg, offset);
674 CAppUtils::SetCharFormat(pWnd, CFM_LINK, CFE_LINK, positions);
676 return positions.empty() ? FALSE : TRUE;
679 static int DescribeCommit(CGitHash& hash, CString& result)
681 CAutoRepository repo(g_Git.GetGitRepository());
682 if (!repo)
683 return -1;
684 CAutoObject commit;
685 if (git_object_lookup(commit.GetPointer(), repo, (const git_oid *)hash.m_hash, GIT_OBJ_COMMIT))
686 return -1;
688 CAutoDescribeResult describe;
689 git_describe_options describe_options = GIT_DESCRIBE_OPTIONS_INIT;
690 describe_options.describe_strategy = CRegDWORD(_T("Software\\TortoiseGit\\DescribeStrategy"), GIT_DESCRIBE_DEFAULT);
691 if (git_describe_commit(describe.GetPointer(), (git_object *)commit, &describe_options))
692 return -1;
694 CAutoBuf describe_buf;
695 git_describe_format_options format_options = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
696 format_options.abbreviated_size = CRegDWORD(_T("Software\\TortoiseGit\\DescribeAbbreviatedSize"), GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE);
697 format_options.always_use_long_format = CRegDWORD(_T("Software\\TortoiseGit\\DescribeAlwaysLong"));
698 if (git_describe_format(describe_buf, describe, &format_options))
699 return -1;
701 result = CUnicodeUtils::GetUnicode(describe_buf->ptr);
702 return 0;
705 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
707 // we fill here the log message rich edit control,
708 // and also populate the changed files list control
709 // according to the selected revision(s).
711 CRichEditCtrl * pMsgView = (CRichEditCtrl*)GetDlgItem(IDC_MSGVIEW);
712 // empty the log message view
713 pMsgView->SetWindowText(_T(" "));
714 FillPatchView(true);
715 // empty the changed files list
716 m_ChangedFileListCtrl.SetRedraw(FALSE);
717 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
718 m_currentChangedArray = NULL;
719 m_ChangedFileListCtrl.DeleteAllItems();
721 // if we're not here to really show a selected revision, just
722 // get out of here after clearing the views, which is what is intended
723 // if that flag is not set.
724 if (!bShow)
726 // force a redraw
727 m_ChangedFileListCtrl.Invalidate();
728 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
729 m_ChangedFileListCtrl.SetRedraw(TRUE);
730 m_gravatar.LoadGravatar();
731 return;
734 // depending on how many revisions are selected, we have to do different
735 // tasks.
736 int selCount = m_LogList.GetSelectedCount();
737 if (selCount == 0)
739 // if nothing is selected, we have nothing more to do
740 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
741 m_ChangedFileListCtrl.SetRedraw(TRUE);
742 m_gravatar.LoadGravatar();
743 return;
745 else if (selCount == 1)
747 // if one revision is selected, we have to fill the log message view
748 // with the corresponding log message, and also fill the changed files
749 // list fully.
750 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
751 int selIndex = m_LogList.GetNextSelectedItem(pos);
752 if (selIndex >= m_LogList.m_arShownList.GetCount())
754 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
755 m_ChangedFileListCtrl.SetRedraw(TRUE);
756 return;
758 Locker lock(m_LogList.m_critSec_AsyncDiff);
759 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.SafeGetAt(selIndex));
762 CString out_describe;
763 if (m_bShowDescribe)
765 CString result;
766 if (!DescribeCommit(pLogEntry->m_CommitHash, result))
767 out_describe = _T("Describe: ") + result + _T("\r\n");
770 // set the log message text
771 pMsgView->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH)) + _T(": ") + pLogEntry->m_CommitHash.ToString() + _T("\r\n") + out_describe + _T("\r\n"));
772 // turn bug ID's into links if the bugtraq: properties have been set
773 // and we can find a match of those in the log message
775 pMsgView->SetSel(-1,-1);
776 CHARFORMAT2 format;
777 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
778 format.cbSize = sizeof(CHARFORMAT2);
779 format.dwMask = CFM_BOLD;
780 format.dwEffects = CFE_BOLD;
781 pMsgView->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
783 CString msg = m_bAsteriskLogPrefix ? _T("* ") : _T("");
784 msg+=pLogEntry->GetSubject();
785 pMsgView->ReplaceSel(msg);
787 pMsgView->SetSel(-1,-1);
788 format.dwEffects = 0;
789 pMsgView->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
791 msg=_T("\n");
792 msg+=pLogEntry->GetBody();
794 if(!pLogEntry->m_Notes.IsEmpty())
796 msg+= _T("\n*") + CString(MAKEINTRESOURCE(IDS_NOTES)) + _T("* ");
797 msg+= pLogEntry->m_Notes;
798 msg+= _T("\n\n");
801 CString tagInfo = m_LogList.GetTagInfo(pLogEntry);
802 if(!tagInfo.IsEmpty())
803 tagInfo = _T("\n*") + CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO)) + _T("*\n\n") + tagInfo;
804 msg += tagInfo;
806 pMsgView->ReplaceSel(msg);
808 CString text;
809 pMsgView->GetWindowText(text);
810 // the rich edit control doesn't count the CR char!
811 // to be exact: CRLF is treated as one char.
812 text.Remove('\r');
814 int findHashStart = text.Find('\n');
815 if (!out_describe.IsEmpty())
816 findHashStart = text.Find('\n', findHashStart + 1);
817 FindGitHash(text, findHashStart, pMsgView);
818 m_LogList.m_ProjectProperties.FindBugID(text, pMsgView);
819 if (((DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\StyleCommitMessages"), TRUE)) == TRUE)
820 CAppUtils::FormatTextInRichEditControl(pMsgView);
822 CHARRANGE range;
823 range.cpMin = 0;
824 range.cpMax = 0;
825 pMsgView->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
827 CString matchpath=this->m_path.GetGitPathString();
829 bool mightNeedReset = true;
831 int count = pLogEntry->GetFiles(&m_LogList).GetCount();
832 for (int i = 0 ; i < count && (!matchpath.IsEmpty()); ++i)
834 if( m_bWholeProject )
835 break;
837 ((CTGitPath&)pLogEntry->GetFiles(&m_LogList)[i]).m_Action &= ~(CTGitPath::LOGACTIONS_HIDE|CTGitPath::LOGACTIONS_GRAY);
838 mightNeedReset = false;
840 if(pLogEntry->GetFiles(&m_LogList)[i].GetGitPathString().Left(matchpath.GetLength()) != matchpath && pLogEntry->GetFiles(&m_LogList)[i].GetGitOldPathString().Left(matchpath.GetLength()) != matchpath)
842 if (m_iHidePaths == 1)
843 ((CTGitPath&)pLogEntry->GetFiles(&m_LogList)[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;
844 else if (m_iHidePaths == 2)
845 ((CTGitPath&)pLogEntry->GetFiles(&m_LogList)[i]).m_Action |= CTGitPath::LOGACTIONS_GRAY;
849 if (mightNeedReset)
851 for (int i = 0 ; i < count; ++i)
852 ((CTGitPath&)pLogEntry->GetFiles(&m_LogList)[i]).m_Action &= ~CTGitPath::LOGACTIONS_HIDE;
855 CString fileFilter;
856 m_cFileFilter.GetWindowText(fileFilter);
857 fileFilter.MakeLower();
858 for (int i = 0; i < count && (!fileFilter.IsEmpty()); ++i)
860 CString sPath = pLogEntry->GetFiles(&m_LogList)[i].GetGitPathString();
861 sPath.MakeLower();
862 if (sPath.Find(fileFilter) < 0)
863 ((CTGitPath&)pLogEntry->GetFiles(&m_LogList)[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;
866 m_ChangedFileListCtrl.UpdateWithGitPathList(pLogEntry->GetFiles(&m_LogList));
867 m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;
868 if (pLogEntry->m_CommitHash.IsEmpty() && m_bShowUnversioned)
870 m_ChangedFileListCtrl.UpdateUnRevFileList(pLogEntry->GetUnRevFiles());
871 m_ChangedFileListCtrl.Show(GITSLC_SHOWVERSIONED | GITSLC_SHOWUNVERSIONED);
873 else
874 m_ChangedFileListCtrl.Show(GITSLC_SHOWVERSIONED);
876 m_ChangedFileListCtrl.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES)));
878 if(!pLogEntry->m_IsDiffFiles)
879 m_ChangedFileListCtrl.SetBusy(TRUE);
880 else
881 m_ChangedFileListCtrl.SetBusy(FALSE);
883 m_ChangedFileListCtrl.SetRedraw(TRUE);
884 m_gravatar.LoadGravatar(pLogEntry->GetAuthorEmail());
885 return;
889 else
891 // more than one revision is selected:
892 // the log message view must be emptied
893 // the changed files list contains all the changed paths from all
894 // selected revisions, with 'doubles' removed
895 m_currentChangedPathList = GetChangedPathsFromSelectedRevisions(true);
896 m_gravatar.LoadGravatar();
899 // redraw the views
900 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
901 #if 0
902 if (m_currentChangedArray)
904 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedArray->GetCount());
905 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedArray->GetCount());
907 else if (m_currentChangedPathList.GetCount())
909 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedPathList.GetCount());
910 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedPathList.GetCount());
912 else
914 m_ChangedFileListCtrl.SetItemCountEx(0);
915 m_ChangedFileListCtrl.Invalidate();
917 #endif
918 // sort according to the settings
919 if (m_nSortColumnPathList > 0)
920 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
921 else
922 SetSortArrow(&m_ChangedFileListCtrl, -1, false);
923 m_ChangedFileListCtrl.SetRedraw(TRUE);
927 void CLogDlg::FillPatchView(bool onlySetTimer)
929 if (!::IsWindow(this->m_patchViewdlg.m_hWnd))
930 return;
932 KillTimer(LOG_FILLPATCHVTIMER);
933 if (onlySetTimer)
935 SetTimer(LOG_FILLPATCHVTIMER, 100, nullptr);
936 return;
939 POSITION posLogList = m_LogList.GetFirstSelectedItemPosition();
940 if (posLogList == nullptr)
942 m_patchViewdlg.ClearView();
943 return; // nothing is selected, get out of here
946 GitRev * pLogEntry = reinterpret_cast<GitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(posLogList)));
947 if (pLogEntry == nullptr || m_LogList.GetNextSelectedItem(posLogList) != -1)
949 m_patchViewdlg.ClearView();
950 return;
953 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
954 CString out;
956 if (pos == nullptr)
958 int diffContext = 0;
959 if (CAppUtils::GetMsysgitVersion() > 0x01080100)
960 diffContext = g_Git.GetConfigValueInt32(_T("diff.context"), -1);
961 CStringA outA;
962 CString rev1 = pLogEntry->m_CommitHash.IsEmpty() ? _T("HEAD") : (pLogEntry->m_CommitHash.ToString() + _T("~1"));
963 CString rev2 = pLogEntry->m_CommitHash.IsEmpty() ? GIT_REV_ZERO : pLogEntry->m_CommitHash.ToString();
964 g_Git.GetUnifiedDiff(CTGitPath(), rev1, rev2, &outA, false, false, diffContext);
965 out = CUnicodeUtils::GetUnicode(outA);
967 else
969 while (pos)
971 int nSelect = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
972 CTGitPath * p = (CTGitPath*)m_ChangedFileListCtrl.GetItemData(nSelect);
973 if (p && !(p->m_Action&CTGitPath::LOGACTIONS_UNVER))
975 CString cmd;
976 if (pLogEntry->m_CommitHash.IsEmpty())
977 cmd.Format(_T("git.exe diff HEAD -- \"%s\""), p->GetGitPathString());
978 else
979 cmd.Format(_T("git.exe diff %s^%d..%s -- \"%s\""), pLogEntry->m_CommitHash.ToString(), p->m_ParentNo + 1, pLogEntry->m_CommitHash.ToString(), p->GetGitPathString());
980 g_Git.Run(cmd, &out, CP_UTF8);
985 m_patchViewdlg.SetText(out);
988 void CLogDlg::TogglePatchView()
990 m_patchViewdlg.m_pProjectProperties = &m_LogList.m_ProjectProperties;
991 m_patchViewdlg.m_ParentDlg = this;
992 if (!IsWindow(m_patchViewdlg.m_hWnd))
994 BOOL viewPatchEnabled = FALSE;
995 viewPatchEnabled = g_Git.GetConfigValueBool(_T("tgit.logshowpatch"));
996 if (viewPatchEnabled == FALSE)
997 g_Git.SetConfigValue(_T("tgit.logshowpatch"), _T("true"));
998 m_patchViewdlg.Create(IDD_PATCH_VIEW, this);
999 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETSCROLLWIDTHTRACKING, TRUE);
1000 CRect rect;
1001 this->GetWindowRect(&rect);
1003 m_patchViewdlg.ShowWindow(SW_SHOW);
1004 m_patchViewdlg.SetWindowPos(nullptr, rect.right, rect.top, rect.Width(), rect.Height(), SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
1006 FillPatchView();
1008 else
1010 g_Git.SetConfigValue(_T("tgit.logshowpatch"), _T("false"));
1011 m_patchViewdlg.ShowWindow(SW_HIDE);
1012 m_patchViewdlg.DestroyWindow();
1016 LRESULT CLogDlg::OnFileListCtrlItemChanged(WPARAM /*wparam*/, LPARAM /*lparam*/)
1018 FillPatchView(true);
1019 return 0;
1022 void CLogDlg::OnMoving(UINT fwSide, LPRECT pRect)
1024 __super::OnMoving(fwSide, pRect);
1026 if (!::IsWindow(m_patchViewdlg.m_hWnd))
1027 return;
1029 RECT patchrect;
1030 m_patchViewdlg.GetWindowRect(&patchrect);
1031 if (!::IsWindow(m_hWnd))
1032 return;
1034 RECT thisrect;
1035 GetWindowRect(&thisrect);
1036 if (patchrect.left == thisrect.right)
1038 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);
1042 void CLogDlg::OnSizing(UINT fwSide, LPRECT pRect)
1044 __super::OnSizing(fwSide, pRect);
1046 if (!::IsWindow(this->m_patchViewdlg.m_hWnd))
1047 return;
1049 CRect thisrect, patchrect;
1050 this->GetWindowRect(thisrect);
1051 this->m_patchViewdlg.GetWindowRect(patchrect);
1052 if (thisrect.right != patchrect.left)
1053 return;
1055 patchrect.left -= (thisrect.right - pRect->right);
1056 patchrect.right -= (thisrect.right - pRect->right);
1058 if (patchrect.bottom == thisrect.bottom)
1059 patchrect.bottom -= (thisrect.bottom - pRect->bottom);
1060 if (patchrect.top == thisrect.top)
1061 patchrect.top -= thisrect.top - pRect->top;
1062 m_patchViewdlg.MoveWindow(patchrect);
1065 void CLogDlg::OnSelectSearchField()
1067 m_cFilter.SetSel(0, -1, FALSE);
1068 m_cFilter.SetFocus();
1071 void CLogDlg::GoBack()
1073 GoBackForward(false, false);
1076 void CLogDlg::GoForward()
1078 GoBackForward(false, true);
1081 void CLogDlg::GoBackAndSelect()
1083 GoBackForward(true, false);
1086 void CLogDlg::GoForwardAndSelect()
1088 GoBackForward(true, true);
1091 void CLogDlg::GoBackForward(bool select, bool bForward)
1093 m_LogList.m_highlight.Empty();
1094 CGitHash gotoHash;
1095 if (bForward ? m_LogList.m_selectionHistory.GoForward(gotoHash) : m_LogList.m_selectionHistory.GoBack(gotoHash))
1097 int i;
1098 for (i = 0; i < m_LogList.m_arShownList.GetCount(); ++i)
1100 GitRev *rev = (GitRev *)m_LogList.m_arShownList.SafeGetAt(i);
1101 if (!rev) continue;
1102 if (rev->m_CommitHash == gotoHash)
1104 m_LogList.EnsureVisible(i, FALSE);
1105 if (select)
1107 m_LogList.m_highlight.Empty();
1108 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);
1109 m_bNavigatingWithSelect = true;
1110 m_LogList.SetItemState(i, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
1111 m_LogList.SetSelectionMark(i);
1112 m_bNavigatingWithSelect = false;
1114 else
1115 m_LogList.m_highlight = gotoHash;
1116 m_LogList.Invalidate();
1117 return;
1120 if (i == m_LogList.m_arShownList.GetCount())
1122 CString msg;
1123 msg.Format(IDS_LOG_NOT_VISIBLE, gotoHash.ToString());
1124 MessageBox(msg, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
1125 return;
1128 PlaySound((LPCTSTR)SND_ALIAS_SYSTEMASTERISK, nullptr, SND_ASYNC | SND_ALIAS_ID);
1131 void CLogDlg::OnBnClickedRefresh()
1133 Refresh (true);
1136 void CLogDlg::Refresh (bool clearfilter /*autoGoOnline*/)
1138 m_limit = 0;
1139 m_LogList.Refresh(clearfilter);
1140 EnableOKButton();
1141 ShowStartRef();
1142 FillLogMessageCtrl(false);
1147 BOOL CLogDlg::Cancel()
1149 return m_bCancelled;
1152 void CLogDlg::SaveSplitterPos()
1154 if (!IsIconic())
1156 CRegDWORD regPos1(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
1157 CRegDWORD regPos2(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
1158 RECT rectSplitter;
1159 m_wndSplitter1.GetWindowRect(&rectSplitter);
1160 ScreenToClient(&rectSplitter);
1161 regPos1 = rectSplitter.top;
1162 m_wndSplitter2.GetWindowRect(&rectSplitter);
1163 ScreenToClient(&rectSplitter);
1164 regPos2 = rectSplitter.top;
1168 void CLogDlg::OnCancel()
1170 this->ShowWindow(SW_HIDE);
1172 // canceling means stopping the working thread if it's still running.
1173 m_LogList.SafeTerminateAsyncDiffThread();
1174 if (this->IsThreadRunning())
1176 m_LogList.SafeTerminateThread();
1178 UpdateData();
1180 SaveSplitterPos();
1181 __super::OnCancel();
1184 void CLogDlg::CopyChangedSelectionToClipBoard()
1187 POSITION posLogList = m_LogList.GetFirstSelectedItemPosition();
1188 if (posLogList == nullptr)
1189 return; // nothing is selected, get out of here
1191 CString sPaths;
1193 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1194 // if (posLogList)
1196 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
1197 while (pos)
1199 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
1200 CTGitPath *path = (CTGitPath*)m_ChangedFileListCtrl.GetItemData(nItem);
1201 if(path)
1202 sPaths += path->GetGitPathString();
1203 sPaths += _T("\r\n");
1206 #if 0
1207 else
1209 // only one revision is selected in the log dialog top pane
1210 // but multiple items could be selected in the changed items list
1211 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
1212 while (pos)
1214 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
1215 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->SafeGetAt(nItem);
1217 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
1219 // some items are hidden! So find out which item the user really selected
1220 INT_PTR selRealIndex = -1;
1221 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
1223 if (pLogEntry->pArChangedPaths->SafeGetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
1224 ++selRealIndex;
1225 if (selRealIndex == nItem)
1227 changedlogpath = pLogEntry->pArChangedPaths->SafeGetAt(hiddenindex);
1228 break;
1232 if (changedlogpath)
1234 sPaths += changedlogpath->sPath;
1235 sPaths += _T("\r\n");
1239 #endif
1240 sPaths.Trim();
1241 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
1245 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
1247 // we have three separate context menus:
1248 // one for the branch label in the upper left
1249 // one shown on the log message list control,
1250 // one shown in the changed-files list control
1251 if (pWnd == GetDlgItem(IDC_STATIC_REF))
1253 CIconMenu popup;
1254 if (!popup.CreatePopupMenu())
1255 return;
1257 int cnt = 0;
1258 popup.AppendMenuIcon(++cnt, IDS_MENUREFBROWSE);
1259 popup.SetDefaultItem(cnt);
1260 popup.AppendMenuIcon(++cnt, _T("HEAD"));
1261 CGitHash fetchHead;
1262 g_Git.GetHash(fetchHead, g_Git.FixBranchName(_T("FETCH_HEAD")));
1263 popup.AppendMenuIcon(++cnt, _T("FETCH_HEAD"));
1264 popup.EnableMenuItem(cnt, fetchHead.IsEmpty());
1265 popup.AppendMenuIcon(++cnt, IDS_ALL);
1266 popup.EnableMenuItem(cnt, m_bFollowRenames);
1267 popup.AppendMenuIcon(++cnt, IDS_PROC_LOG_SELECT_LOCAL_BRANCHES);
1268 popup.EnableMenuItem(cnt, m_bFollowRenames);
1269 int offset = ++cnt;
1270 if (m_History.GetCount() > 0)
1272 popup.AppendMenu(MF_SEPARATOR, 0);
1273 for (size_t i = 0; i < m_History.GetCount(); ++i)
1275 CString entry = m_History.GetEntry(i);
1276 if (entry.GetLength() > 150)
1277 entry = entry.Left(150) + _T("...");
1278 popup.AppendMenuIcon(cnt++, entry);
1282 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1283 if (cmd == 0)
1284 return;
1285 else if (cmd == 1)
1287 OnBnClickedBrowseRef();
1288 return;
1291 m_LogList.m_ShowMask &= ~(CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_LOCAL_BRANCHES);
1292 m_bAllBranch = BST_UNCHECKED;
1293 if (cmd == 2)
1295 SetRange(g_Git.GetCurrentBranch(true));
1297 else if (cmd == 3)
1299 SetRange(fetchHead.ToString());
1301 else if (cmd == 4)
1303 m_bAllBranch = BST_CHECKED;
1304 m_LogList.m_ShowMask |= CGit::LOG_INFO_ALL_BRANCH;
1306 else if (cmd == 5)
1308 m_bAllBranch = BST_INDETERMINATE;
1309 m_LogList.m_ShowMask |= CGit::LOG_INFO_LOCAL_BRANCHES;
1311 else if (cmd >= offset)
1313 SetRange(m_History.GetEntry(cmd - offset));
1314 m_History.AddEntry(m_LogList.m_sRange);
1315 m_History.Save();
1318 UpdateData(FALSE);
1320 OnRefresh();
1321 FillLogMessageCtrl(false);
1323 return;
1325 int selCount = m_LogList.GetSelectedCount();
1326 if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
1328 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1329 int selIndex = -1;
1330 if (pos)
1331 selIndex = m_LogList.GetNextSelectedItem(pos);
1333 GitRev *pRev = ((GitRev*)m_LogList.m_arShownList[selIndex]);
1335 if ((point.x == -1) && (point.y == -1))
1337 CRect rect;
1338 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
1339 ClientToScreen(&rect);
1340 point = rect.CenterPoint();
1342 CString sMenuItemText;
1343 CIconMenu popup;
1344 if (popup.CreatePopupMenu())
1346 long start = -1, end = -1;
1347 auto pEdit = (CRichEditCtrl *)GetDlgItem(IDC_MSGVIEW);
1348 pEdit->GetSel(start, end);
1349 // add the 'default' entries
1350 popup.AppendMenuIcon(WM_COPY, IDS_SCIEDIT_COPY, IDI_COPYCLIP);
1351 if (start >= end)
1352 popup.EnableMenuItem(WM_COPY, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
1353 popup.AppendMenu(MF_SEPARATOR);
1354 sMenuItemText.LoadString(IDS_STATUSLIST_CONTEXT_COPYEXT);
1355 popup.AppendMenuIcon(EM_SETSEL, sMenuItemText, IDI_COPYCLIP);
1356 popup.AppendMenu(MF_SEPARATOR, NULL);
1357 sMenuItemText.LoadString(IDS_EDIT_NOTES);
1358 popup.AppendMenuIcon( CGitLogList::ID_EDITNOTE, sMenuItemText, IDI_EDIT);
1360 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1361 switch (cmd)
1363 case 0:
1364 break; // no command selected
1365 case EM_SETSEL:
1367 pEdit->SetRedraw(FALSE);
1368 int oldLine = pEdit->GetFirstVisibleLine();
1369 pEdit->SetSel(0, -1);
1370 pEdit->Copy();
1371 pEdit->SetSel(start, end);
1372 int newLine = pEdit->GetFirstVisibleLine();
1373 pEdit->LineScroll(oldLine - newLine);
1374 pEdit->SetRedraw(TRUE);
1375 pEdit->RedrawWindow();
1377 break;
1378 case WM_COPY:
1379 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
1380 break;
1381 case CGitLogList::ID_EDITNOTE:
1382 CAppUtils::EditNote(pRev);
1383 this->FillLogMessageCtrl(true);
1384 break;
1390 void CLogDlg::OnOK()
1392 // since the log dialog is also used to select revisions for other
1393 // dialogs, we have to do some work before closing this dialog
1394 if (GetFocus() != GetDlgItem(IDOK))
1395 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
1397 m_LogList.SafeTerminateAsyncDiffThread();
1398 if (this->IsThreadRunning())
1400 m_LogList.SafeTerminateThread();
1402 UpdateData();
1403 // check that one and only one row is selected
1404 if (m_LogList.GetSelectedCount() == 1)
1406 // get the selected row
1407 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1408 int selIndex = m_LogList.GetNextSelectedItem(pos);
1409 if (selIndex < m_LogList.m_arShownList.GetCount())
1411 // all ok, pick up the revision
1412 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.SafeGetAt(selIndex));
1413 // extract the hash
1414 m_sSelectedHash = pLogEntry->m_CommitHash;
1417 UpdateData(FALSE);
1418 SaveSplitterPos();
1419 __super::OnOK();
1421 #if 0
1422 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
1423 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
1425 CString temp;
1426 CString buttontext;
1427 GetDlgItemText(IDOK, buttontext);
1428 temp.LoadString(IDS_MSGBOX_CANCEL);
1429 if (temp.Compare(buttontext) != 0)
1430 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
1431 m_bCancelled = TRUE;
1432 m_selectedRevs.Clear();
1433 m_selectedRevsOneRange.Clear();
1434 if (m_pNotifyWindow)
1436 int selIndex = m_LogList.GetSelectionMark();
1437 if (selIndex >= 0)
1439 PLOGENTRYDATA pLogEntry = NULL;
1440 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1441 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1442 m_selectedRevs.AddRevision(pLogEntry->Rev);
1443 git_revnum_t lowerRev = pLogEntry->Rev;
1444 git_revnum_t higherRev = lowerRev;
1445 while (pos)
1447 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1448 git_revnum_t rev = pLogEntry->Rev;
1449 m_selectedRevs.AddRevision(pLogEntry->Rev);
1450 if (lowerRev > rev)
1451 lowerRev = rev;
1452 if (higherRev < rev)
1453 higherRev = rev;
1455 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
1457 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
1459 BOOL bSentMessage = FALSE;
1460 if (m_LogList.GetSelectedCount() == 1)
1462 // if only one revision is selected, check if the path/url with which the dialog was started
1463 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1464 // if it was copied, use the copy from revision as lowerRev
1465 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
1467 CString sUrl = m_path.GetGitPathString();
1468 if (!m_path.IsUrl())
1470 sUrl = GetURLFromPath(m_path);
1472 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
1473 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
1475 LogChangedPath * pData = pLogEntry->pArChangedPaths->SafeGetAt(cp);
1476 if (pData)
1478 if (sUrl.Compare(pData->sPath) == 0)
1480 if (!pData->sCopyFromPath.IsEmpty())
1482 lowerRev = pData->lCopyFromRev;
1483 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
1484 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
1485 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
1486 bSentMessage = TRUE;
1493 if ( !bSentMessage )
1495 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
1496 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
1497 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
1498 if (m_selectedRevsOneRange.GetCount())
1499 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
1503 UpdateData();
1504 CRegDWORD reg(_T("Software\\TortoiseGit\\ShowAllEntry"));
1505 SaveSplitterPos();
1506 #endif
1509 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool /*blame*/, bool /*unified*/)
1511 DialogEnableWindow(IDOK, FALSE);
1512 // SetPromptApp(&theApp);
1513 theApp.DoWaitCursor(1);
1515 CString temppath;
1516 GetTempPath(temppath);
1518 CString file1;
1519 file1.Format(_T("%s%s_%s%s"),
1520 temppath,
1521 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
1522 rev1->m_CommitHash.ToString().Left(g_Git.GetShortHASHLength()),
1523 (*m_currentChangedArray)[selIndex].GetFileExtension());
1525 CString file2;
1526 file2.Format(_T("%s\\%s_%s%s"),
1527 temppath,
1528 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
1529 rev2->m_CommitHash.ToString().Left(g_Git.GetShortHASHLength()),
1530 (*m_currentChangedArray)[selIndex].GetFileExtension());
1532 CString cmd;
1533 CTGitPath &path = (CTGitPath &)(*m_currentChangedArray)[selIndex];
1535 if (g_Git.GetOneFile(rev1->m_CommitHash.ToString(), path, file1))
1537 CString out;
1538 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, path.GetGitPathString(), rev1->m_CommitHash.ToString(), file1);
1539 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
1540 theApp.DoWaitCursor(-1);
1541 EnableOKButton();
1542 return;
1544 if (g_Git.GetOneFile(rev2->m_CommitHash.ToString(), path, file2))
1546 CString out;
1547 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, path.GetGitPathString(), rev2->m_CommitHash.ToString(), file2);
1548 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
1549 theApp.DoWaitCursor(-1);
1550 EnableOKButton();
1551 return;
1554 CAppUtils::DiffFlags flags;
1555 CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),
1556 g_Git.CombinePath(path), g_Git.CombinePath(path),
1557 rev1->m_CommitHash.ToString(), rev2->m_CommitHash.ToString(),
1558 flags);
1560 theApp.DoWaitCursor(-1);
1561 EnableOKButton();
1564 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
1566 // Skip Ctrl-C when copying text out of the log message or search filter
1567 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);
1568 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
1570 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
1572 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))
1574 m_LogList.DiffSelectedRevWithPrevious();
1575 return TRUE;
1578 if (GetFocus() == GetDlgItem(IDC_SEARCHEDIT))
1580 KillTimer(LOGFILTER_TIMER);
1581 m_limit = 0;
1582 m_LogList.Refresh(FALSE);
1583 FillLogMessageCtrl(false);
1585 if (GetFocus() == GetDlgItem(IDC_FILTER))
1587 KillTimer(FILEFILTER_TIMER);
1588 FillLogMessageCtrl();
1589 return TRUE;
1592 else if (pMsg->message == WM_XBUTTONUP)
1594 bool select = (pMsg->wParam & MK_SHIFT) == 0;
1595 if (HIWORD(pMsg->wParam) & XBUTTON1)
1596 GoBackForward(select, false);
1597 if (HIWORD(pMsg->wParam) & XBUTTON2)
1598 GoBackForward(select, true);
1599 if (HIWORD(pMsg->wParam) & (XBUTTON1 | XBUTTON2))
1600 return TRUE;
1602 if (m_hAccel && !bSkipAccelerator)
1604 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
1605 if (ret)
1606 return TRUE;
1609 if(::IsWindow(m_tooltips.m_hWnd))
1610 m_tooltips.RelayEvent(pMsg);
1611 return __super::PreTranslateMessage(pMsg);
1615 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
1617 //if (this->IsThreadRunning())
1618 if(m_LogList.m_bNoDispUpdates)
1620 // only show the wait cursor over the list control
1621 if ((pWnd)&&
1622 ((pWnd == GetDlgItem(IDC_LOGLIST))||
1623 (pWnd == GetDlgItem(IDC_MSGVIEW))||
1624 (pWnd == GetDlgItem(IDC_LOGMSG))))
1626 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
1627 SetCursor(hCur);
1628 return TRUE;
1631 if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))
1632 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
1634 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
1635 SetCursor(hCur);
1636 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
1639 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
1641 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1642 *pResult = 0;
1643 //if (this->IsThreadRunning())
1644 if(m_LogList.m_bNoDispUpdates)
1645 return;
1646 if (pNMLV->iItem >= 0)
1648 if (!m_LogList.m_highlight.IsEmpty())
1650 m_LogList.m_highlight.Empty();
1651 m_LogList.Invalidate();
1653 this->m_LogList.m_nSearchIndex = pNMLV->iItem;
1654 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.SafeGetAt(pNMLV->iItem));
1655 if (pLogEntry == nullptr)
1656 return;
1657 m_LogList.m_lastSelectedHash = pLogEntry->m_CommitHash;
1658 if (pNMLV->iSubItem != 0)
1659 return;
1660 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount()))
1662 // remove the selected state
1663 if (pNMLV->uChanged & LVIF_STATE)
1665 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
1666 FillLogMessageCtrl();
1667 UpdateData(FALSE);
1668 UpdateLogInfoLabel();
1670 return;
1672 if (pNMLV->uChanged & LVIF_STATE)
1674 if ((pNMLV->uNewState & LVIS_SELECTED) && !m_bNavigatingWithSelect)
1676 m_LogList.m_selectionHistory.Add(m_LogList.m_lastSelectedHash);
1677 m_LogList.m_lastSelectedHash = pLogEntry->m_CommitHash;
1679 FillLogMessageCtrl();
1680 UpdateData(FALSE);
1683 else
1685 m_LogList.m_lastSelectedHash.Empty();
1686 FillLogMessageCtrl();
1687 UpdateData(FALSE);
1689 EnableOKButton();
1690 UpdateLogInfoLabel();
1693 void CLogDlg::OnLvnItemchangedLogmsg(NMHDR * /*pNMHDR*/, LRESULT * /*pResult*/)
1695 UpdateLogInfoLabel();
1698 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
1700 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
1701 if ((pEnLink->msg == WM_LBUTTONUP) || (pEnLink->msg == WM_SETCURSOR))
1703 CString url, msg;
1704 GetDlgItemText(IDC_MSGVIEW, msg);
1705 msg.Replace(_T("\r\n"), _T("\n"));
1706 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
1707 auto findResult = m_LogList.m_ProjectProperties.FindBugIDPositions(msg);
1708 if (std::find_if(findResult.begin(), findResult.end(),
1709 [=] (const CHARRANGE &cr) -> bool { return cr.cpMin == pEnLink->chrg.cpMin && cr.cpMax == pEnLink->chrg.cpMax; }
1710 ) != findResult.end())
1712 url = m_LogList.m_ProjectProperties.GetBugIDUrl(url);
1713 url = GetAbsoluteUrlFromRelativeUrl(url);
1715 if (::PathIsURL(url))
1717 if (pEnLink->msg == WM_LBUTTONUP)
1718 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
1719 else
1721 static RECT prevRect = { 0 };
1722 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
1723 if (pMsgView)
1725 RECT rc;
1726 POINTL pt;
1727 pMsgView->SendMessage(EM_POSFROMCHAR, (WPARAM)&pt, pEnLink->chrg.cpMin);
1728 rc.left = pt.x;
1729 rc.top = pt.y;
1730 pMsgView->SendMessage(EM_POSFROMCHAR, (WPARAM)&pt, pEnLink->chrg.cpMax);
1731 rc.right = pt.x;
1732 rc.bottom = pt.y + 12;
1733 if ((prevRect.left != rc.left) || (prevRect.top != rc.top))
1735 m_tooltips.DelTool(pMsgView, 1);
1736 m_tooltips.AddTool(pMsgView, url, &rc, 1);
1737 prevRect = rc;
1742 else if(pEnLink->msg == WM_LBUTTONUP)
1744 int pos = 0;
1745 if (LookLikeGitHash(url, pos))
1747 bool found = false;
1748 for (int i = 0; i < m_LogList.m_arShownList.GetCount(); ++i)
1750 GitRev *rev = (GitRev *)m_LogList.m_arShownList.SafeGetAt(i);
1751 if (!rev) continue;
1752 if (rev->m_CommitHash.ToString().Left(url.GetLength()) == url)
1754 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1755 if (pos)
1757 int index = m_LogList.GetNextSelectedItem(pos);
1758 if (index > 0)
1759 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
1761 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
1762 m_LogList.EnsureVisible(i, FALSE);
1763 m_LogList.SetSelectionMark(i);
1764 found = true;
1765 PostMessage(WM_TGIT_REFRESH_SELECTION, 0, 0);
1766 break;
1770 if (!found)
1771 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN);
1775 *pResult = 0;
1778 void CLogDlg::OnBnClickedStatbutton()
1780 if (this->IsThreadRunning())
1781 return;
1782 if (m_LogList.m_arShownList.IsEmpty() || m_LogList.m_arShownList.GetCount() == 1 && m_LogList.m_bShowWC)
1783 return; // nothing or just the working copy changes are shown, so no statistics.
1784 // the statistics dialog expects the log entries to be sorted by date
1785 SortByColumn(3, false);
1787 CStatGraphDlg dlg;
1788 m_LogList.RecalculateShownList(&dlg.m_ShowList);
1790 dlg.m_path = m_orgPath;
1791 dlg.DoModal();
1792 // restore the previous sorting
1793 SortByColumn(m_nSortColumn, m_bAscending);
1794 OnTimer(LOGFILTER_TIMER);
1797 void CLogDlg::MoveToSameTop(CWnd *pWndRef, CWnd *pWndTarget)
1799 CRect rcWndPicAuthor, rcWndMsgView;
1800 pWndRef->GetWindowRect(rcWndMsgView);
1801 ScreenToClient(rcWndMsgView);
1802 pWndTarget->GetWindowRect(rcWndPicAuthor);
1803 ScreenToClient(rcWndPicAuthor);
1804 int diff = rcWndMsgView.top - rcWndPicAuthor.top;
1805 rcWndPicAuthor.top += diff;
1806 rcWndPicAuthor.bottom += diff;
1807 pWndTarget->MoveWindow(rcWndPicAuthor);
1810 void CLogDlg::DoSizeV1(int delta)
1813 RemoveAnchor(IDC_LOGLIST);
1814 RemoveAnchor(IDC_SPLITTERTOP);
1815 RemoveAnchor(IDC_MSGVIEW);
1816 RemoveAnchor(IDC_PIC_AUTHOR);
1817 RemoveAnchor(IDC_SPLITTERBOTTOM);
1818 RemoveAnchor(IDC_LOGMSG);
1819 CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);
1820 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);
1821 MoveToSameTop(GetDlgItem(IDC_MSGVIEW), GetDlgItem(IDC_PIC_AUTHOR));
1822 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
1823 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
1824 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
1825 AddAnchor(IDC_PIC_AUTHOR, TOP_RIGHT);
1826 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
1827 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
1828 ArrangeLayout();
1829 AdjustMinSize();
1830 SetSplitterRange();
1831 m_LogList.Invalidate();
1832 GetDlgItem(IDC_MSGVIEW)->Invalidate();
1833 m_gravatar.Invalidate();
1837 void CLogDlg::DoSizeV2(int delta)
1840 RemoveAnchor(IDC_LOGLIST);
1841 RemoveAnchor(IDC_SPLITTERTOP);
1842 RemoveAnchor(IDC_MSGVIEW);
1843 RemoveAnchor(IDC_PIC_AUTHOR);
1844 RemoveAnchor(IDC_SPLITTERBOTTOM);
1845 RemoveAnchor(IDC_LOGMSG);
1846 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);
1847 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);
1848 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
1849 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
1850 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
1851 AddAnchor(IDC_PIC_AUTHOR, TOP_RIGHT);
1852 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
1853 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
1854 ArrangeLayout();
1855 AdjustMinSize();
1856 SetSplitterRange();
1857 GetDlgItem(IDC_MSGVIEW)->Invalidate();
1858 m_ChangedFileListCtrl.Invalidate();
1859 m_gravatar.Invalidate();
1863 void CLogDlg::AdjustMinSize()
1865 // adjust the minimum size of the dialog to prevent the resizing from
1866 // moving the list control too far down.
1867 CRect rcChgListView;
1868 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
1869 CRect rcLogList;
1870 m_LogList.GetClientRect(rcLogList);
1872 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
1873 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
1874 +rcChgListView.Height()+rcLogList.Height()+60));
1877 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
1879 switch (message) {
1880 case WM_NOTIFY:
1881 if (wParam == IDC_SPLITTERTOP)
1883 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
1884 DoSizeV1(pHdr->delta);
1886 else if (wParam == IDC_SPLITTERBOTTOM)
1888 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
1889 DoSizeV2(pHdr->delta);
1891 break;
1894 return CResizableDialog::DefWindowProc(message, wParam, lParam);
1897 void CLogDlg::SetSplitterRange()
1899 if ((m_LogList)&&(m_ChangedFileListCtrl))
1901 CRect rcTop;
1902 m_LogList.GetWindowRect(rcTop);
1903 ScreenToClient(rcTop);
1904 CRect rcMiddle;
1905 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);
1906 ScreenToClient(rcMiddle);
1907 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);
1908 CRect rcBottom;
1909 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
1910 ScreenToClient(rcBottom);
1911 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);
1915 void CLogDlg::OnEnscrollMsgview()
1917 m_tooltips.DelTool(GetDlgItem(IDC_MSGVIEW), 1);
1920 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM wParam, LPARAM lParam)
1922 if ((HWND)wParam == m_cFileFilter.GetSafeHwnd())
1923 return 0;
1925 // FIXME: x64 version would get this function called with unexpected parameters.
1926 if (!lParam)
1927 return 0;
1929 RECT * rect = (LPRECT)lParam;
1930 CPoint point;
1931 CString temp;
1932 point = CPoint(rect->left, rect->bottom);
1933 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_SelectedFilters & x ? MF_CHECKED : MF_UNCHECKED))
1934 CMenu popup;
1935 if (popup.CreatePopupMenu())
1937 temp.LoadString(IDS_LOG_FILTER_SUBJECT);
1938 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT), LOGFILTER_SUBJECT, temp);
1940 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
1941 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
1943 temp.LoadString(IDS_LOG_FILTER_PATHS);
1944 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
1946 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
1947 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
1949 temp.LoadString(IDS_LOG_FILTER_EMAILS);
1950 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_EMAILS), LOGFILTER_EMAILS, temp);
1952 temp.LoadString(IDS_LOG_FILTER_REVS);
1953 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
1955 temp.LoadString(IDS_LOG_FILTER_REFNAME);
1956 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME), LOGFILTER_REFNAME, temp);
1958 if (m_LogList.m_bShowBugtraqColumn == TRUE) {
1959 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
1960 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
1963 temp.LoadString(IDS_LOG_FILTER_TOGGLE);
1964 popup.AppendMenu(MF_STRING | MF_ENABLED, LOGFILTER_TOGGLE, temp);
1966 popup.AppendMenu(MF_SEPARATOR, NULL);
1968 temp.LoadString(IDS_LOG_FILTER_REGEX);
1969 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
1971 temp.LoadString(IDS_LOG_FILTER_CASESENSITIVE);
1972 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterCaseSensitively ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_CASE, temp);
1974 m_tooltips.Pop();
1975 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1976 if (selection != 0)
1979 if (selection == LOGFILTER_REGEX)
1981 m_bFilterWithRegex = !m_bFilterWithRegex;
1982 CRegDWORD b(_T("Software\\TortoiseGit\\UseRegexFilter"), FALSE);
1983 b = m_bFilterWithRegex;
1984 m_LogList.m_bFilterWithRegex = m_bFilterWithRegex;
1985 SetFilterCueText();
1986 CheckRegexpTooltip();
1988 else if (selection == LOGFILTER_CASE)
1990 m_bFilterCaseSensitively = !m_bFilterCaseSensitively;
1991 CRegDWORD b(_T("Software\\TortoiseGit\\FilterCaseSensitively"), FALSE);
1992 b = m_bFilterCaseSensitively;
1993 m_LogList.m_bFilterCaseSensitively = m_bFilterCaseSensitively;
1995 else if (selection == LOGFILTER_TOGGLE)
1997 m_LogList.m_SelectedFilters = (~m_LogList.m_SelectedFilters) & LOGFILTER_ALL;
1998 SetFilterCueText();
2000 else
2002 m_LogList.m_SelectedFilters ^= selection;
2003 SetFilterCueText();
2005 // Reload only if a search text is entered
2006 if (m_LogList.HasFilterText())
2007 SetTimer(LOGFILTER_TIMER, 1000, NULL);
2010 return 0L;
2013 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM wParam, LPARAM /*lParam*/)
2015 if ((HWND)wParam == m_cFileFilter.GetSafeHwnd())
2017 KillTimer(FILEFILTER_TIMER);
2019 FillLogMessageCtrl();
2020 return 0L;
2023 KillTimer(LOGFILTER_TIMER);
2025 m_LogList.m_sFilterText.Empty();
2026 UpdateData(FALSE);
2027 theApp.DoWaitCursor(1);
2028 CStoreSelection storeselection(this);
2029 FillLogMessageCtrl(false);
2031 m_LogList.RemoveFilter();
2033 Refresh();
2035 CTime begin,end;
2036 m_LogList.GetTimeRange(begin,end);
2037 m_DateFrom.SetTime(&begin);
2038 m_DateTo.SetTime(&end);
2040 theApp.DoWaitCursor(-1);
2041 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2042 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2043 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2044 UpdateLogInfoLabel();
2046 return 0L;
2050 void CLogDlg::SetFilterCueText()
2052 CString temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY));
2053 temp += _T(" ");
2055 if (m_LogList.m_SelectedFilters & LOGFILTER_SUBJECT)
2057 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT));
2060 if (m_LogList.m_SelectedFilters & LOGFILTER_MESSAGES)
2062 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2063 temp += _T(", ");
2064 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES));
2067 if (m_LogList.m_SelectedFilters & LOGFILTER_PATHS)
2069 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2070 temp += _T(", ");
2071 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS));
2074 if (m_LogList.m_SelectedFilters & LOGFILTER_AUTHORS)
2076 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2077 temp += _T(", ");
2078 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS));
2081 if (m_LogList.m_SelectedFilters & LOGFILTER_EMAILS)
2083 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2084 temp += _T(", ");
2085 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_EMAILS));
2088 if (m_LogList.m_SelectedFilters & LOGFILTER_REVS)
2090 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2091 temp += _T(", ");
2092 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS));
2095 if (m_LogList.m_SelectedFilters & LOGFILTER_REFNAME)
2097 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2098 temp += _T(", ");
2099 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REFNAME));
2102 if (m_LogList.m_bShowBugtraqColumn && m_LogList.m_SelectedFilters & LOGFILTER_BUGID)
2104 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2105 temp += _T(", ");
2106 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS));
2109 // to make the cue banner text appear more to the right of the edit control
2110 temp = _T(" ")+temp;
2111 m_cFilter.SetCueBanner(temp.TrimRight());
2114 bool CLogDlg::Validate(LPCTSTR string)
2116 if (!m_bFilterWithRegex)
2117 return true;
2118 std::tr1::wregex pat;
2119 return m_LogList.ValidateRegexp(string, pat, false);
2122 void CLogDlg::OnEnChangeFileFilter()
2124 SetTimer(FILEFILTER_TIMER, 1000, NULL);
2127 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
2129 if (nIDEvent == LOGFTIME_TIMER)
2131 KillTimer(LOGFTIME_TIMER);
2132 m_limit = 0;
2133 m_LogList.Refresh(FALSE);
2134 FillLogMessageCtrl(false);
2136 else if (nIDEvent == LOG_FILLPATCHVTIMER)
2138 FillPatchView();
2140 else if (nIDEvent == LOGFILTER_TIMER)
2142 KillTimer(LOGFILTER_TIMER);
2143 m_limit = 0;
2144 m_LogList.Refresh(FALSE);
2145 FillLogMessageCtrl(false);
2147 #if 0
2148 /* we will use git built-in grep to filter log */
2149 if (this->IsThreadRunning())
2151 // thread still running! So just restart the timer.
2152 SetTimer(LOGFILTER_TIMER, 1000, NULL);
2153 return;
2155 CWnd * focusWnd = GetFocus();
2156 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
2157 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
2158 if (m_LogList.m_sFilterText.IsEmpty())
2160 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
2161 // do not return here!
2162 // we also need to run the filter if the filter text is empty:
2163 // 1. to clear an existing filter
2164 // 2. to rebuild the m_arShownList after sorting
2166 theApp.DoWaitCursor(1);
2167 CStoreSelection storeselection(this);
2168 KillTimer(LOGFILTER_TIMER);
2169 FillLogMessageCtrl(false);
2171 // now start filter the log list
2172 m_LogList.StartFilter();
2174 if ( m_LogList.GetItemCount()==1 )
2176 m_LogList.SetSelectionMark(0);
2177 m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
2179 theApp.DoWaitCursor(-1);
2180 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2181 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2182 if (bSetFocusToFilterControl)
2183 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2184 UpdateLogInfoLabel();
2185 #endif
2186 } // if (nIDEvent == LOGFILTER_TIMER)
2187 else if (nIDEvent == LOG_HEADER_ORDER_TIMER)
2189 KillTimer(LOG_HEADER_ORDER_TIMER);
2190 CLogOrdering orderDlg;
2191 if (orderDlg.DoModal() == IDOK)
2192 Refresh();
2194 else if (nIDEvent == FILEFILTER_TIMER)
2196 KillTimer(FILEFILTER_TIMER);
2197 FillLogMessageCtrl();
2199 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty() || m_LogList.m_arShownList.GetCount() == 1 && m_LogList.m_bShowWC))));
2200 __super::OnTimer(nIDEvent);
2203 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2207 CTime _time;
2208 m_DateTo.GetTime(_time);
2210 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
2211 if (time.GetTime() != m_LogList.m_To)
2213 m_LogList.m_To = (DWORD)time.GetTime();
2214 SetTimer(LOGFTIME_TIMER, 10, NULL);
2217 catch (...)
2219 CMessageBox::Show(NULL,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
2222 *pResult = 0;
2225 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2230 CTime _time;
2231 m_DateFrom.GetTime(_time);
2233 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
2234 if (time.GetTime() != m_LogList.m_From)
2236 m_LogList.m_From = (DWORD)time.GetTime();
2237 SetTimer(LOGFTIME_TIMER, 10, NULL);
2240 catch (...)
2242 CMessageBox::Show(NULL,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
2245 *pResult = 0;
2248 void CLogDlg::OnCbnSelchangeJumpType()
2250 // reserved for future use
2253 void CLogDlg::OnBnClickedJumpUp()
2255 int sel = m_JumpType.GetCurSel();
2256 if (sel < 0) return;
2257 JumpType jumpType = (JumpType)sel;
2259 if (jumpType == JumpType_History)
2261 GoBack();
2262 return;
2265 CString strValue;
2266 CGitHash hashValue;
2267 int index = -1;
2268 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2269 if (pos)
2271 index = m_LogList.GetNextSelectedItem(pos);
2272 if (index == 0) return;
2274 GitRev* data = (GitRev*)m_LogList.m_arShownList.SafeGetAt(index);
2275 if (jumpType == JumpType_AuthorEmail)
2276 strValue = data->GetAuthorEmail();
2277 else if (jumpType == JumpType_CommitterEmail)
2278 strValue = data->GetCommitterEmail();
2279 else if (jumpType == JumpType_Parent1)
2280 hashValue = data->m_CommitHash;
2281 else if (jumpType == JumpType_Parent2)
2282 hashValue = data->m_CommitHash;
2283 else if (jumpType == JumpType_TagFF)
2284 hashValue = data->m_CommitHash;
2285 else if (jumpType == JumpType_BranchFF)
2286 hashValue = data->m_CommitHash;
2288 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2290 else
2291 return;
2293 while (pos)
2295 index = m_LogList.GetNextSelectedItem(pos);
2296 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2298 m_LogList.SetSelectionMark(-1);
2300 for (int i = index - 1; i >= 0; i--)
2302 bool found = false;
2303 GitRev* data = (GitRev*)m_LogList.m_arShownList.SafeGetAt(i);
2304 if (jumpType == JumpType_AuthorEmail)
2305 found = strValue == data->GetAuthorEmail();
2306 else if (jumpType == JumpType_CommitterEmail)
2307 found = strValue == data->GetCommitterEmail();
2308 else if (jumpType == JumpType_MergePoint)
2309 found = data->ParentsCount() > 1;
2310 else if (jumpType == JumpType_Parent1)
2312 if (data->m_ParentHash.size() > 0)
2313 found = data->m_ParentHash[0] == hashValue;
2315 else if (jumpType == JumpType_Parent2)
2317 if (data->m_ParentHash.size() > 1)
2318 found = data->m_ParentHash[1] == hashValue;
2320 else if (jumpType == JumpType_Tag || jumpType == JumpType_TagFF)
2322 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2323 for (size_t j = 0; j < refList.size(); ++j)
2325 if (refList[j].Left(10) == _T("refs/tags/"))
2327 found = true;
2328 break;
2332 if (found && jumpType == JumpType_TagFF)
2333 found = g_Git.IsFastForward(hashValue, data->m_CommitHash);
2335 else if (jumpType == JumpType_Branch || jumpType == JumpType_BranchFF)
2337 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2338 for (size_t j = 0; j < refList.size(); ++j)
2340 if (refList[j].Left(11) == _T("refs/heads/") || refList[j].Left(13) == _T("refs/remotes/"))
2342 found = true;
2343 break;
2347 if (found && jumpType == JumpType_BranchFF)
2348 found = g_Git.IsFastForward(hashValue, data->m_CommitHash);
2351 if (found)
2353 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
2354 m_LogList.EnsureVisible(i, FALSE);
2355 m_LogList.SetSelectionMark(i);
2356 return;
2360 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN);
2363 void CLogDlg::OnBnClickedJumpDown()
2365 int jumpType = m_JumpType.GetCurSel();
2366 if (jumpType < 0) return;
2368 if (jumpType == JumpType_History)
2370 GoForward();
2371 return;
2374 CString strValue;
2375 CGitHash hashValue;
2376 int index = -1;
2377 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2378 if (pos)
2380 index = m_LogList.GetNextSelectedItem(pos);
2381 if (index == 0) return;
2383 GitRev* data = (GitRev*)m_LogList.m_arShownList.SafeGetAt(index);
2384 if (jumpType == JumpType_AuthorEmail)
2385 strValue = data->GetAuthorEmail();
2386 else if (jumpType == JumpType_CommitterEmail)
2387 strValue = data->GetCommitterEmail();
2388 else if (jumpType == JumpType_Parent1)
2390 if (data->m_ParentHash.size() > 0)
2391 hashValue = data->m_ParentHash.at(0);
2392 else
2393 return;
2395 else if (jumpType == JumpType_Parent2)
2397 if (data->m_ParentHash.size() > 1)
2398 hashValue = data->m_ParentHash.at(1);
2399 else
2400 return;
2402 else if (jumpType == JumpType_TagFF)
2403 hashValue = data->m_CommitHash;
2404 else if (jumpType == JumpType_BranchFF)
2405 hashValue = data->m_CommitHash;
2407 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2409 else
2410 return;
2412 while (pos)
2414 index = m_LogList.GetNextSelectedItem(pos);
2415 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2417 m_LogList.SetSelectionMark(-1);
2419 for (int i = index + 1; i < m_LogList.GetItemCount(); ++i)
2421 bool found = false;
2422 GitRev* data = (GitRev*)m_LogList.m_arShownList.SafeGetAt(i);
2423 if (jumpType == JumpType_AuthorEmail)
2424 found = strValue == data->GetAuthorEmail();
2425 else if (jumpType == JumpType_CommitterEmail)
2426 found = strValue == data->GetCommitterEmail();
2427 else if (jumpType == JumpType_MergePoint)
2428 found = data->ParentsCount() > 1;
2429 else if (jumpType == JumpType_Parent1)
2430 found = data->m_CommitHash == hashValue;
2431 else if (jumpType == JumpType_Parent2)
2432 found = data->m_CommitHash == hashValue;
2433 else if (jumpType == JumpType_Tag || jumpType == JumpType_TagFF)
2435 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2436 for (size_t j = 0; j < refList.size(); ++j)
2438 if (refList[j].Left(10) == _T("refs/tags/"))
2440 found = true;
2441 break;
2445 if (found && jumpType == JumpType_TagFF)
2446 found = g_Git.IsFastForward(data->m_CommitHash, hashValue);
2448 else if (jumpType == JumpType_Branch || jumpType == JumpType_BranchFF)
2450 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2451 for (size_t j = 0; j < refList.size(); ++j)
2453 if (refList[j].Left(11) == _T("refs/heads/") || refList[j].Left(13) == _T("refs/remotes/"))
2455 found = true;
2456 break;
2460 if (found && jumpType == JumpType_BranchFF)
2461 found = g_Git.IsFastForward(data->m_CommitHash, hashValue);
2464 if (found)
2466 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
2467 m_LogList.EnsureVisible(i, FALSE);
2468 m_LogList.SetSelectionMark(i);
2469 return;
2473 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN);
2476 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)
2478 CTGitPathList pathList;
2479 #if 0
2481 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
2483 m_sRepositoryRoot = GetRepositoryRoot(m_path);
2485 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
2486 return pathList;
2488 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2489 if (pos != NULL)
2491 while (pos)
2493 int nextpos = m_LogList.GetNextSelectedItem(pos);
2494 if (nextpos >= m_arShownList.GetCount())
2495 continue;
2496 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(nextpos));
2497 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
2498 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
2500 LogChangedPath * cpath = cpatharray->SafeGetAt(cpPathIndex);
2501 if (cpath == NULL)
2502 continue;
2503 CTGitPath path;
2504 if (!bRelativePaths)
2505 path.SetFromGit(m_sRepositoryRoot);
2506 path.AppendPathString(cpath->sPath);
2507 if ((!bUseFilter)||
2508 ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||
2509 (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))
2510 pathList.AddPath(path);
2515 pathList.RemoveDuplicates();
2516 #endif
2517 return pathList;
2520 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
2522 #if 0
2523 switch(nSortColumn)
2525 case 0: // Revision
2527 if(bAscending)
2528 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
2529 else
2530 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
2532 break;
2533 case 1: // action
2535 if(bAscending)
2536 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
2537 else
2538 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
2540 break;
2541 case 2: // Author
2543 if(bAscending)
2544 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
2545 else
2546 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
2548 break;
2549 case 3: // Date
2551 if(bAscending)
2552 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
2553 else
2554 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
2556 break;
2557 case 4: // Message or bug id
2558 if (m_bShowBugtraqColumn)
2560 if(bAscending)
2561 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
2562 else
2563 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
2564 break;
2566 // fall through here
2567 case 5: // Message
2569 if(bAscending)
2570 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
2571 else
2572 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
2574 break;
2575 default:
2576 ATLASSERT(0);
2577 break;
2579 #endif
2582 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
2584 if (this->IsThreadRunning())
2585 return; //no sorting while the arrays are filled
2586 #if 0
2587 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2588 const int nColumn = pNMLV->iSubItem;
2589 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
2590 m_nSortColumn = nColumn;
2591 SortByColumn(m_nSortColumn, m_bAscending);
2592 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
2593 SortShownListArray();
2594 m_LogList.Invalidate();
2595 UpdateLogInfoLabel();
2596 #else
2597 UNREFERENCED_PARAMETER(pNMHDR);
2598 #endif
2599 *pResult = 0;
2601 SetTimer(LOG_HEADER_ORDER_TIMER, 10, nullptr);
2604 void CLogDlg::SortShownListArray()
2606 // make sure the shown list still matches the filter after sorting.
2607 OnTimer(LOGFILTER_TIMER);
2608 // clear the selection states
2609 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2610 while (pos)
2612 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
2614 m_LogList.SetSelectionMark(-1);
2617 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
2619 if (control == NULL)
2620 return;
2621 // set the sort arrow
2622 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
2623 HDITEM HeaderItem = {0};
2624 HeaderItem.mask = HDI_FORMAT;
2625 for (int i=0; i<pHeader->GetItemCount(); ++i)
2627 pHeader->GetItem(i, &HeaderItem);
2628 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
2629 pHeader->SetItem(i, &HeaderItem);
2631 if (nColumn >= 0)
2633 pHeader->GetItem(nColumn, &HeaderItem);
2634 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
2635 pHeader->SetItem(nColumn, &HeaderItem);
2639 int CLogDlg::m_nSortColumnPathList = 0;
2640 bool CLogDlg::m_bAscendingPathList = false;
2642 void CLogDlg::OnBnClickedHidepaths()
2644 FillLogMessageCtrl();
2645 m_ChangedFileListCtrl.Invalidate();
2648 void CLogDlg::UpdateLogInfoLabel()
2651 CGitHash rev1 ;
2652 CGitHash rev2 ;
2653 long selectedrevs = 0;
2654 long selectedfiles = 0;
2655 int count = (int)m_LogList.m_arShownList.GetCount();
2656 int start = 0;
2657 if (count)
2659 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.SafeGetAt(0)))->m_CommitHash;
2660 if(this->m_LogList.m_bShowWC && rev1.IsEmpty()&&(count>1))
2661 start = 1;
2662 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.SafeGetAt(start)))->m_CommitHash;
2663 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_arShownList.GetCount()-1));
2664 rev2 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.SafeGetAt(count-1)))->m_CommitHash;
2665 selectedrevs = m_LogList.GetSelectedCount();
2666 if (selectedrevs)
2667 selectedfiles = m_ChangedFileListCtrl.GetSelectedCount();
2669 CString sTemp;
2670 sTemp.Format(IDS_PROC_LOG_STATS,
2671 count - start,
2672 rev2.ToString().Left(g_Git.GetShortHASHLength()), rev1.ToString().Left(g_Git.GetShortHASHLength()), selectedrevs, selectedfiles);
2674 if(selectedrevs == 1)
2676 CString str=m_ChangedFileListCtrl.GetStatisticsString(true);
2677 str.Replace(_T('\n'), _T(' '));
2678 sTemp += _T("\r\n") + str;
2680 m_sLogInfo = sTemp;
2682 UpdateData(FALSE);
2685 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2687 // the date control should not show the "today" button
2688 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
2689 if (pCtrl)
2690 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
2691 *pResult = 0;
2694 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2696 // the date control should not show the "today" button
2697 CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();
2698 if (pCtrl)
2699 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
2700 *pResult = 0;
2703 void CLogDlg::OnSize(UINT nType, int cx, int cy)
2705 __super::OnSize(nType, cx, cy);
2706 //set range
2707 SetSplitterRange();
2710 void CLogDlg::OnRefresh()
2713 m_limit = 0;
2714 this->m_LogProgress.SetPos(0);
2716 Refresh (false);
2720 void CLogDlg::OnFocusFilter()
2722 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2725 void CLogDlg::OnEditCopy()
2727 if (GetFocus() == &m_ChangedFileListCtrl)
2728 CopyChangedSelectionToClipBoard();
2729 else
2730 m_LogList.CopySelectionToClipBoard();
2733 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
2735 // is the URL a relative one?
2736 if (url.Left(2).Compare(_T("^/")) == 0)
2738 // URL is relative to the repository root
2739 CString url1 = m_sRepositoryRoot + url.Mid(1);
2740 TCHAR buf[INTERNET_MAX_URL_LENGTH] = { 0 };
2741 DWORD len = url.GetLength();
2742 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
2743 return CString(buf, len);
2744 return url1;
2746 else if (url[0] == '/')
2748 // URL is relative to the server's hostname
2749 CString sHost;
2750 // find the server's hostname
2751 int schemepos = m_sRepositoryRoot.Find(_T("//"));
2752 if (schemepos >= 0)
2754 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));
2755 CString url1 = sHost + url;
2756 TCHAR buf[INTERNET_MAX_URL_LENGTH] = { 0 };
2757 DWORD len = url.GetLength();
2758 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
2759 return CString(buf, len);
2760 return url1;
2763 return url;
2766 void CLogDlg::ShowGravatar()
2768 m_gravatar.EnableGravatar(m_bShowGravatar);
2769 RemoveAnchor(IDC_MSGVIEW);
2770 if (m_gravatar.IsGravatarEnabled())
2772 RECT rect, rect2;
2773 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(&rect);
2774 ScreenToClient(&rect);
2775 m_gravatar.GetWindowRect(&rect2);
2776 ScreenToClient(&rect2);
2777 rect.right = rect2.left;
2778 GetDlgItem(IDC_MSGVIEW)->MoveWindow(&rect);
2779 m_gravatar.ShowWindow(SW_SHOW);
2781 else
2783 RECT rect, rect2;
2784 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(&rect);
2785 ScreenToClient(&rect);
2786 m_gravatar.GetWindowRect(&rect2);
2787 ScreenToClient(&rect2);
2788 rect.right = rect2.right;
2789 GetDlgItem(IDC_MSGVIEW)->MoveWindow(&rect);
2790 m_gravatar.ShowWindow(SW_HIDE);
2792 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
2796 void CLogDlg::OnEnChangeSearchedit()
2798 UpdateData();
2799 if (!m_LogList.HasFilterText())
2801 CStoreSelection storeselection(this);
2802 // clear the filter, i.e. make all entries appear
2803 theApp.DoWaitCursor(1);
2804 KillTimer(LOGFILTER_TIMER);
2805 FillLogMessageCtrl(false);
2807 Refresh();
2808 //m_LogList.StartFilter();
2809 #if 0
2810 InterlockedExchange(&m_bNoDispUpdates, TRUE);
2811 m_arShownList.RemoveAll();
2812 for (DWORD i=0; i<m_logEntries.size(); ++i)
2814 if (IsEntryInDateRange(i))
2815 m_arShownList.Add(m_logEntries[i]);
2817 InterlockedExchange(&m_bNoDispUpdates, FALSE);
2818 m_LogList.DeleteAllItems();
2819 m_LogList.SetItemCountEx(ShownCountWithStopped());
2820 m_LogList.RedrawItems(0, ShownCountWithStopped());
2821 m_LogList.SetRedraw(false);
2822 ResizeAllListCtrlCols();
2823 m_LogList.SetRedraw(true);
2824 #endif
2825 theApp.DoWaitCursor(-1);
2826 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2827 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2828 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2829 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
2830 return;
2832 if (Validate(m_LogList.m_sFilterText))
2833 SetTimer(LOGFILTER_TIMER, 1000, NULL);
2834 else
2835 KillTimer(LOGFILTER_TIMER);
2839 void CLogDlg::OnBnClickedAllBranch()
2841 // m_bAllBranch is not auto-toggled by MFC, we have to handle it manually (in order to prevent the indeterminate state)
2843 m_LogList.m_ShowMask &=~ (CGit::LOG_INFO_LOCAL_BRANCHES | CGit::LOG_INFO_ALL_BRANCH);
2845 if (m_bAllBranch)
2847 m_bAllBranch = BST_UNCHECKED;
2848 m_ChangedFileListCtrl.m_sDisplayedBranch = m_LogList.GetRange();
2850 else
2852 m_bAllBranch = BST_CHECKED;
2853 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;
2854 m_ChangedFileListCtrl.m_sDisplayedBranch.Empty();
2857 // need to save value here, so that log dialogs started from now on also have AllBranch activated
2858 m_regbAllBranch = m_bAllBranch;
2860 UpdateData(FALSE);
2862 OnRefresh();
2864 FillLogMessageCtrl(false);
2867 void CLogDlg::OnBnClickedFollowRenames()
2869 if(m_bFollowRenames)
2871 m_LogList.m_ShowMask |= CGit::LOG_INFO_FOLLOW;
2872 m_LogList.m_ShowMask &=~ CGit::LOG_INFO_LOCAL_BRANCHES;
2873 if (m_bAllBranch)
2876 m_bAllBranch = FALSE;
2877 m_LogList.m_ShowMask &=~ CGit::LOG_INFO_ALL_BRANCH;
2881 else
2882 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_FOLLOW;
2884 DialogEnableWindow(IDC_LOG_ALLBRANCH, !m_bFollowRenames);
2885 DialogEnableWindow(IDC_SHOWWHOLEPROJECT, !m_bFollowRenames && !m_path.IsEmpty());
2887 OnRefresh();
2889 FillLogMessageCtrl(false);
2892 void CLogDlg::HandleShowLabels(bool var, int flag)
2894 if (var)
2895 m_LogList.m_ShowRefMask |= flag;
2896 else
2897 m_LogList.m_ShowRefMask &= ~flag;
2899 if ((m_LogList.m_ShowFilter & CGitLogListBase::FILTERSHOW_REFS) && !(m_LogList.m_ShowFilter & CGitLogListBase::FILTERSHOW_ANYCOMMIT))
2901 // Remove commits where labels are not shown.
2902 OnRefresh();
2903 FillLogMessageCtrl(false);
2905 else
2907 // Just redraw
2908 m_LogList.Invalidate();
2912 void CLogDlg::OnBnClickedCompressedGraph()
2914 UpdateData();
2916 if (m_iCompressedGraph == 2)
2917 m_LogList.m_ShowFilter = CGitLogListBase::FILTERSHOW_REFS;
2918 else if (m_iCompressedGraph == 1)
2919 m_LogList.m_ShowFilter = static_cast<CGitLogListBase::FilterShow>(CGitLogListBase::FILTERSHOW_REFS | CGitLogListBase::FILTERSHOW_MERGEPOINTS);
2920 else
2921 m_LogList.m_ShowFilter = CGitLogListBase::FILTERSHOW_ALL;
2923 OnRefresh();
2924 FillLogMessageCtrl(false);
2927 void CLogDlg::OnBnClickedBrowseRef()
2929 CString newRef = CBrowseRefsDlg::PickRef(false, m_LogList.GetRange(), gPickRef_All, true);
2930 if(newRef.IsEmpty())
2931 return;
2933 m_History.AddEntry(newRef);
2934 m_History.Save();
2936 SetRange(newRef);
2938 m_LogList.m_ShowMask &= ~(CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_LOCAL_BRANCHES);
2939 m_bAllBranch = BST_UNCHECKED;
2940 UpdateData(FALSE);
2942 OnRefresh();
2943 FillLogMessageCtrl(false);
2946 void CLogDlg::ShowStartRef()
2948 //Show ref name on top
2949 if(!::IsWindow(m_hWnd))
2950 return;
2951 if (m_LogList.m_ShowMask & (CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_LOCAL_BRANCHES))
2953 switch (m_LogList.m_ShowMask & (CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_LOCAL_BRANCHES))
2955 case CGit::LOG_INFO_ALL_BRANCH:
2956 m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES)));
2957 break;
2959 case CGit::LOG_INFO_LOCAL_BRANCHES:
2960 m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_LOCAL_BRANCHES)));
2961 break;
2964 m_staticRef.Invalidate(TRUE);
2965 m_tooltips.DelTool(GetDlgItem(IDC_STATIC_REF));
2966 return;
2969 CString showStartRef = m_LogList.GetRange();
2970 if (showStartRef.IsEmpty() || showStartRef == _T("HEAD"))
2972 showStartRef.Empty();
2973 //Ref name is HEAD
2974 if (g_Git.Run(L"git.exe symbolic-ref HEAD", &showStartRef, NULL, CP_UTF8))
2975 showStartRef = CString(MAKEINTRESOURCE(IDS_PROC_LOG_NOBRANCH));
2976 showStartRef.Trim(L"\r\n\t ");
2980 showStartRef = g_Git.StripRefName(showStartRef);
2982 m_staticRef.SetWindowText(showStartRef);
2983 CWnd *pWnd = GetDlgItem(IDC_STATIC_REF);
2984 m_tooltips.AddTool(pWnd, showStartRef);
2985 m_staticRef.Invalidate(TRUE);
2988 void CLogDlg::SetRange(const CString& range)
2990 m_LogList.SetRange(range);
2991 m_ChangedFileListCtrl.m_sDisplayedBranch = range;
2993 ShowStartRef();
2996 static void AppendMenuChecked(CMenu &menu, UINT nTextID, UINT_PTR nItemID, BOOL checked = FALSE, BOOL enabled = TRUE)
2998 CString text;
2999 text.LoadString(nTextID);
3000 menu.AppendMenu(MF_STRING | (enabled ? MF_ENABLED : MF_DISABLED) | (checked ? MF_CHECKED : MF_UNCHECKED), nItemID, text);
3003 #define WALKBEHAVIOUR_FIRSTPARENT 1
3004 #define WALKBEHAVIOUR_FOLLOWRENAMES 2
3005 #define WALKBEHAVIOUR_COMPRESSEDGRAPH 3
3006 #define WALKBEHAVIOUR_LABELEDCOMMITS 4
3007 #define WALKBEHAVIOUR_NOMERGES 5
3009 void CLogDlg::OnBnClickedWalkBehaviour()
3011 CMenu popup;
3012 if (popup.CreatePopupMenu())
3014 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_FIRSTPARENT, WALKBEHAVIOUR_FIRSTPARENT, m_bFirstParent);
3015 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_NOMERGES, WALKBEHAVIOUR_NOMERGES, m_bNoMerges);
3016 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_FOLLOWRENAMES, WALKBEHAVIOUR_FOLLOWRENAMES, m_bFollowRenames, !(m_path.IsEmpty() || m_path.IsDirectory()));
3017 popup.AppendMenu(MF_SEPARATOR, NULL);
3018 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_COMPRESSED, WALKBEHAVIOUR_COMPRESSEDGRAPH, m_iCompressedGraph == 1);
3019 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_LABELEDCOMMITS, WALKBEHAVIOUR_LABELEDCOMMITS, m_iCompressedGraph == 2);
3021 m_tooltips.Pop();
3022 RECT rect;
3023 GetDlgItem(IDC_WALKBEHAVIOUR)->GetWindowRect(&rect);
3024 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, rect.left, rect.top, this, 0);
3025 switch (selection)
3027 case WALKBEHAVIOUR_FIRSTPARENT:
3028 m_bFirstParent = !m_bFirstParent;
3029 OnBnClickedFirstParent();
3030 break;
3031 case WALKBEHAVIOUR_NOMERGES:
3032 m_bNoMerges = !m_bNoMerges;
3033 OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges
3034 break;
3035 case WALKBEHAVIOUR_FOLLOWRENAMES:
3036 m_bFollowRenames = !m_bFollowRenames;
3037 OnBnClickedFollowRenames();
3038 break;
3039 case WALKBEHAVIOUR_COMPRESSEDGRAPH:
3040 m_iCompressedGraph = (m_iCompressedGraph == 1 ? 0 : 1);
3041 OnBnClickedCompressedGraph();
3042 break;
3043 case WALKBEHAVIOUR_LABELEDCOMMITS:
3044 m_iCompressedGraph = (m_iCompressedGraph == 2 ? 0 : 2);
3045 OnBnClickedCompressedGraph();
3046 break;
3047 default:
3048 break;
3050 m_bWalkBehavior = (m_bFirstParent || m_bNoMerges || m_bFollowRenames || m_iCompressedGraph);
3051 UpdateData(FALSE);
3055 #define VIEW_HIDEPATHS 1
3056 #define VIEW_GRAYPATHS 2
3057 #define VIEW_SHOWTAGS 3
3058 #define VIEW_SHOWLOCALBRANCHES 4
3059 #define VIEW_SHOWREMOTEBRANCHES 5
3060 #define VIEW_SHOWGRAVATAR 6
3061 #define VIEW_SHOWPATCH 7
3063 void CLogDlg::OnBnClickedView()
3065 CMenu popup;
3066 if (popup.CreatePopupMenu())
3068 AppendMenuChecked(popup, IDS_SHOWFILES_HIDEPATHS, VIEW_HIDEPATHS, m_iHidePaths == 1);
3069 AppendMenuChecked(popup, IDS_SHOWFILES_GRAYPATHS, VIEW_GRAYPATHS, m_iHidePaths == 2);
3070 popup.AppendMenu(MF_SEPARATOR, NULL);
3071 CMenu showLabelsMenu;
3072 if (showLabelsMenu.CreatePopupMenu())
3074 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWTAGLABELS, VIEW_SHOWTAGS, m_bShowTags);
3075 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWLOCALBRANCHLABELS, VIEW_SHOWLOCALBRANCHES, m_bShowLocalBranches);
3076 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWREMOTEBRANCHLABELS, VIEW_SHOWREMOTEBRANCHES, m_bShowRemoteBranches);
3077 popup.AppendMenu(MF_STRING | MF_POPUP, (UINT)showLabelsMenu.m_hMenu, (CString)MAKEINTRESOURCE(IDS_VIEW_LABELS));
3079 popup.AppendMenu(MF_SEPARATOR, NULL);
3080 AppendMenuChecked(popup, IDS_VIEW_SHOWGRAVATAR, VIEW_SHOWGRAVATAR, m_bShowGravatar);
3081 AppendMenuChecked(popup, IDS_MENU_VIEWPATCH, VIEW_SHOWPATCH, IsWindow(this->m_patchViewdlg.m_hWnd));
3083 m_tooltips.Pop();
3084 RECT rect;
3085 GetDlgItem(IDC_VIEW)->GetWindowRect(&rect);
3086 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, rect.left, rect.top, this, 0);
3087 switch (selection)
3089 case VIEW_HIDEPATHS:
3090 if (m_iHidePaths == 1)
3091 m_iHidePaths = 0;
3092 else
3093 m_iHidePaths = 1;
3094 OnBnClickedHidepaths();
3095 break;
3096 case VIEW_GRAYPATHS:
3097 if (m_iHidePaths == 2)
3098 m_iHidePaths = 0;
3099 else
3100 m_iHidePaths = 2;
3101 OnBnClickedHidepaths();
3102 break;
3103 case VIEW_SHOWTAGS:
3104 m_bShowTags = !m_bShowTags;
3105 HandleShowLabels(m_bShowTags, LOGLIST_SHOWTAGS);
3106 break;
3107 case VIEW_SHOWLOCALBRANCHES:
3108 m_bShowLocalBranches = !m_bShowLocalBranches;
3109 HandleShowLabels(m_bShowLocalBranches, LOGLIST_SHOWLOCALBRANCHES);
3110 break;
3111 case VIEW_SHOWREMOTEBRANCHES:
3112 m_bShowRemoteBranches = !m_bShowRemoteBranches;
3113 HandleShowLabels(m_bShowRemoteBranches, LOGLIST_SHOWREMOTEBRANCHES);
3114 break;
3115 case VIEW_SHOWGRAVATAR:
3117 m_bShowGravatar = !m_bShowGravatar;
3118 ShowGravatar();
3119 m_gravatar.Init();
3120 CString email;
3121 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
3122 if (pos)
3124 int selIndex = m_LogList.GetNextSelectedItem(pos);
3125 int moreSel = m_LogList.GetNextSelectedItem(pos);
3126 if (moreSel < 0)
3128 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.SafeGetAt(selIndex));
3129 if (pLogEntry)
3130 email = pLogEntry->GetAuthorEmail();
3133 m_gravatar.LoadGravatar(email);
3134 break;
3136 case VIEW_SHOWPATCH:
3137 TogglePatchView();
3138 break;
3139 default:
3140 break;
3145 void CLogDlg::OnBnClickedFirstParent()
3147 if(this->m_bFirstParent)
3148 m_LogList.m_ShowMask|=CGit::LOG_INFO_FIRST_PARENT;
3149 else
3150 m_LogList.m_ShowMask&=~CGit::LOG_INFO_FIRST_PARENT;
3152 if (m_bNoMerges)
3153 m_LogList.m_ShowMask |= CGit::LOG_INFO_NO_MERGE;
3154 else
3155 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_NO_MERGE;
3157 OnRefresh();
3159 FillLogMessageCtrl(false);
3163 void CLogDlg::OnBnClickShowWholeProject()
3165 this->UpdateData();
3167 if(this->m_bWholeProject)
3169 m_LogList.m_Path.Reset();
3170 SetDlgTitle();
3172 else
3173 m_LogList.m_Path=m_path;
3175 m_regShowWholeProject = m_bWholeProject;
3177 SetDlgTitle();
3179 OnRefresh();
3181 FillLogMessageCtrl(false);
3185 LRESULT CLogDlg::OnRefLogChanged(WPARAM /*wParam*/, LPARAM /*lParam*/)
3187 ShowStartRef();
3188 return 0;
3191 LRESULT CLogDlg::OnTaskbarBtnCreated(WPARAM /*wParam*/, LPARAM /*lParam*/)
3193 m_pTaskbarList.Release();
3194 m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
3195 SetUUIDOverlayIcon(m_hWnd);
3196 return 0;
3199 LRESULT CLogDlg::OnRefreshSelection(WPARAM /*wParam*/, LPARAM /*lParam*/)
3201 // it's enough to deselect, then select again one item of the whole selection
3202 int selMark = m_LogList.GetSelectionMark();
3203 if (selMark >= 0)
3205 m_LogList.SetSelectionMark(selMark);
3206 m_LogList.SetItemState(selMark, 0, LVIS_SELECTED);
3207 m_LogList.SetItemState(selMark, LVIS_SELECTED, LVIS_SELECTED);
3209 return 0;