Perform a stable sort in order to preserve the order
[TortoiseGit.git] / src / TortoiseProc / LogDlg.cpp
blobfc47e7780236808e8e9ea3b994d309f1fd7295aa
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_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)
148 ON_MESSAGE(WM_TGIT_REFRESH_SELECTION, OnRefreshSelection)
149 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
150 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
152 ON_MESSAGE(MSG_LOAD_PERCENTAGE,OnLogListLoading)
154 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
155 ON_WM_TIMER()
156 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
157 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
158 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE, &CLogDlg::OnCbnSelchangeJumpType)
159 ON_COMMAND(IDC_LOG_JUMPUP, &CLogDlg::OnBnClickedJumpUp)
160 ON_COMMAND(IDC_LOG_JUMPDOWN, &CLogDlg::OnBnClickedJumpDown)
161 ON_COMMAND(ID_GO_UP, &CLogDlg::OnBnClickedJumpUp)
162 ON_COMMAND(ID_GO_DOWN, &CLogDlg::OnBnClickedJumpDown)
163 ON_BN_CLICKED(IDC_WALKBEHAVIOUR, OnBnClickedWalkBehaviour)
164 ON_BN_CLICKED(IDC_VIEW, OnBnClickedView)
165 ON_BN_CLICKED(IDC_SHOWWHOLEPROJECT, OnBnClickShowWholeProject)
166 ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST, OnLvnColumnclick)
167 ON_COMMAND(MSG_FETCHED_DIFF, OnBnClickedHidepaths)
168 ON_BN_CLICKED(IDC_LOG_ALLBRANCH, OnBnClickedAllBranch)
169 ON_EN_CHANGE(IDC_FILTER, OnEnChangeFileFilter)
171 ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)
172 ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)
173 ON_WM_SIZE()
174 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
175 ON_STN_CLICKED(IDC_STATIC_REF, &CLogDlg::OnBnClickedBrowseRef)
176 ON_COMMAND(ID_LOGDLG_REFRESH, &CLogDlg::OnBnClickedRefresh)
177 ON_COMMAND(ID_GO_BACKWARD_SELECT, &CLogDlg::GoBackAndSelect)
178 ON_COMMAND(ID_GO_FORWARD_SELECT, &CLogDlg::GoForwardAndSelect)
179 ON_COMMAND(ID_GO_BACKWARD, &CLogDlg::GoBack)
180 ON_COMMAND(ID_GO_FORWARD, &CLogDlg::GoForward)
181 ON_COMMAND(ID_SELECT_SEARCHFIELD, &CLogDlg::OnSelectSearchField)
182 ON_COMMAND(ID_LOGDLG_FIND, &CLogDlg::OnFind)
183 ON_COMMAND(ID_LOGDLG_FOCUSFILTER, &CLogDlg::OnFocusFilter)
184 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
185 ON_MESSAGE(MSG_REFLOG_CHANGED, OnRefLogChanged)
186 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED, OnTaskbarBtnCreated)
188 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED, &CLogDlg::OnFileListCtrlItemChanged)
189 ON_WM_MOVE()
190 ON_WM_MOVING()
191 ON_WM_SIZING()
192 END_MESSAGE_MAP()
194 enum JumpType
196 JumpType_AuthorEmail,
197 JumpType_CommitterEmail,
198 JumpType_MergePoint,
199 JumpType_Parent1,
200 JumpType_Parent2,
201 JumpType_Tag,
202 JumpType_TagFF,
203 JumpType_Branch,
204 JumpType_BranchFF,
205 JumpType_History,
208 void CLogDlg::SetParams(const CTGitPath& orgPath, const CTGitPath& path, CString hightlightRevision, CString range, int limit)
210 m_orgPath = orgPath;
211 m_path = path;
212 m_hightlightRevision = hightlightRevision;
214 if (!(range.IsEmpty() || range == _T("HEAD")))
215 m_bAllBranch = BST_UNCHECKED;
217 SetRange(range);
219 m_limit = limit;
220 if (::IsWindow(m_hWnd))
221 UpdateData(FALSE);
224 void CLogDlg::SetFilter(const CString& findstr, LONG findtype, bool findregex)
226 m_LogList.m_sFilterText = findstr;
227 if (findtype)
228 m_LogList.m_SelectedFilters = findtype;
229 m_LogList.m_bFilterWithRegex = m_bFilterWithRegex = findregex;
232 BOOL CLogDlg::OnInitDialog()
234 CString temp;
235 CResizableStandAloneDialog::OnInitDialog();
236 CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
238 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
239 // do this, Explorer would be unable to send that message to our window if we
240 // were running elevated. It's OK to make the call all the time, since if we're
241 // not elevated, this is a no-op.
242 CHANGEFILTERSTRUCT cfs = { sizeof(CHANGEFILTERSTRUCT) };
243 typedef BOOL STDAPICALLTYPE ChangeWindowMessageFilterExDFN(HWND hWnd, UINT message, DWORD action, PCHANGEFILTERSTRUCT pChangeFilterStruct);
244 CAutoLibrary hUser = AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
245 if (hUser)
247 ChangeWindowMessageFilterExDFN *pfnChangeWindowMessageFilterEx = (ChangeWindowMessageFilterExDFN*)GetProcAddress(hUser, "ChangeWindowMessageFilterEx");
248 if (pfnChangeWindowMessageFilterEx)
250 pfnChangeWindowMessageFilterEx(m_hWnd, WM_TASKBARBTNCREATED, MSGFLT_ALLOW, &cfs);
253 m_pTaskbarList.Release();
254 if (FAILED(m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList)))
255 m_pTaskbarList = nullptr;
257 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
259 // use the state of the "stop on copy/rename" option from the last time
260 UpdateData(FALSE);
262 // set the font to use in the log message view, configured in the settings dialog
263 CAppUtils::CreateFontForLogs(m_logFont);
264 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
265 // automatically detect URLs in the log message and turn them into links
266 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_AUTOURLDETECT, TRUE, NULL);
267 // make the log message rich edit control send a message when the mouse pointer is over a link
268 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK);
270 // "unrelated paths" should be in gray color
271 m_iHidePaths = 2;
273 // set up the columns
274 m_LogList.DeleteAllItems();
276 m_LogList.m_Path=m_path;
277 m_LogList.m_hasWC = m_LogList.m_bShowWC = !g_GitAdminDir.IsBareRepo(g_Git.m_CurrentDir);
278 m_LogList.InsertGitColumn();
280 if (m_bWholeProject)
281 m_LogList.m_Path.Reset();
283 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);
285 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
287 SetDlgTitle();
289 m_tooltips.Create(this);
290 CheckRegexpTooltip();
292 SetSplitterRange();
294 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
295 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
296 m_cFilter.SetInfoIcon(IDI_LOGFILTER);
297 m_cFilter.SetValidator(this);
299 AdjustControlSize(IDC_LOG_ALLBRANCH);
300 AdjustControlSize(IDC_SHOWWHOLEPROJECT);
302 GetClientRect(m_DlgOrigRect);
303 m_LogList.GetClientRect(m_LogListOrigRect);
304 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
305 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
307 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
308 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
310 m_staticRef.SetURL(CString());
312 // resizable stuff
313 AddAnchor(IDC_STATIC_REF, TOP_LEFT);
314 //AddAnchor(IDC_BUTTON_BROWSE_REF, TOP_LEFT);
315 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
316 AddAnchor(IDC_DATEFROM, TOP_LEFT);
317 AddAnchor(IDC_TOLABEL, TOP_LEFT);
318 AddAnchor(IDC_DATETO, TOP_LEFT);
320 SetFilterCueText();
321 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
322 AddAnchor(IDC_LOG_JUMPTYPE, TOP_RIGHT);
323 AddAnchor(IDC_LOG_JUMPUP, TOP_RIGHT);
324 AddAnchor(IDC_LOG_JUMPDOWN, TOP_RIGHT);
326 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
327 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
328 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
329 AddAnchor(IDC_PIC_AUTHOR, TOP_RIGHT);
330 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
331 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
333 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
334 AddAnchor(IDC_WALKBEHAVIOUR, BOTTOM_LEFT);
335 AddAnchor(IDC_VIEW, BOTTOM_LEFT);
336 AddAnchor(IDC_LOG_ALLBRANCH,BOTTOM_LEFT);
337 AddAnchor(IDC_FILTER, BOTTOM_LEFT, BOTTOM_RIGHT);
338 AddAnchor(IDC_SHOWWHOLEPROJECT, BOTTOM_LEFT);
339 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
340 AddAnchor(IDC_STATBUTTON, BOTTOM_LEFT);
341 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
342 AddAnchor(IDOK, BOTTOM_RIGHT);
343 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
344 AddAnchor(IDHELP, BOTTOM_RIGHT);
346 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_LOCAL_BRANCHES;
347 if (m_bAllBranch == BST_CHECKED)
348 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;
349 else if (m_bAllBranch == BST_INDETERMINATE)
350 m_LogList.m_ShowMask |= CGit::LOG_INFO_LOCAL_BRANCHES;
351 else
352 m_LogList.m_ShowMask&=~CGit::LOG_INFO_ALL_BRANCH;
354 HandleShowLabels(m_bShowTags, LOGLIST_SHOWTAGS);
355 HandleShowLabels(m_bShowLocalBranches, LOGLIST_SHOWLOCALBRANCHES);
356 HandleShowLabels(m_bShowRemoteBranches, LOGLIST_SHOWREMOTEBRANCHES);
358 // SetPromptParentWindow(m_hWnd);
359 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL)));
360 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL)));
361 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT)));
362 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1)));
363 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2)));
364 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG)));
365 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF)));
366 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH)));
367 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH_FF)));
368 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_SELECTION_HISTORY)));
369 m_JumpType.SetCurSel(0);
370 m_JumpUp.SetIcon((HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR));
371 m_JumpDown.SetIcon((HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR));
373 if (hWndExplorer)
374 CenterWindow(CWnd::FromHandle(hWndExplorer));
375 EnableSaveRestore(_T("LogDlg"));
377 DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
378 DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
379 RECT rcDlg, rcLogList, rcChgMsg;
380 GetClientRect(&rcDlg);
381 m_LogList.GetWindowRect(&rcLogList);
382 ScreenToClient(&rcLogList);
383 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
384 ScreenToClient(&rcChgMsg);
385 if (yPos1)
387 RECT rectSplitter;
388 m_wndSplitter1.GetWindowRect(&rectSplitter);
389 ScreenToClient(&rectSplitter);
390 int delta = yPos1 - rectSplitter.top;
392 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
394 m_wndSplitter1.SetWindowPos(NULL, rectSplitter.left, yPos1, 0, 0, SWP_NOSIZE);
395 DoSizeV1(delta);
398 if (yPos2)
400 RECT rectSplitter;
401 m_wndSplitter2.GetWindowRect(&rectSplitter);
402 ScreenToClient(&rectSplitter);
403 int delta = yPos2 - rectSplitter.top;
405 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
407 m_wndSplitter2.SetWindowPos(NULL, rectSplitter.left, yPos2, 0, 0, SWP_NOSIZE);
408 DoSizeV2(delta);
412 SetSplitterRange();
414 if (m_bSelect)
416 // the dialog is used to select revisions
417 // enable the OK button if appropriate
418 EnableOKButton();
420 else
422 // the dialog is used to just view log messages
423 // hide the OK button and set text on Cancel button to OK
424 GetDlgItemText(IDOK, temp);
425 SetDlgItemText(IDCANCEL, temp);
426 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
429 // first start a thread to obtain the log messages without
430 // blocking the dialog
431 //m_tTo = 0;
432 //m_tFrom = (DWORD)-1;
434 // scroll to user selected or current revision
435 if (m_hightlightRevision.IsEmpty() || g_Git.GetHash(m_LogList.m_lastSelectedHash, m_hightlightRevision))
437 if (g_Git.GetHash(m_LogList.m_lastSelectedHash, _T("HEAD")))
438 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
441 if (g_Git.GetConfigValueBool(_T("tgit.logshowpatch")))
442 TogglePatchView();
444 m_LogList.FetchLogAsync(this);
445 ShowGravatar();
446 m_gravatar.Init();
448 m_cFileFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
449 m_cFileFilter.SetInfoIcon(IDI_FILTEREDIT);
450 temp.LoadString(IDS_FILEDIFF_FILTERCUE);
451 temp = _T(" ") + temp;
452 m_cFileFilter.SetCueBanner(temp);
454 GetDlgItem(IDC_LOGLIST)->SetFocus();
456 m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxRefHistoryItems"), 5));
457 CString reg;
458 reg.Format(_T("Software\\TortoiseGit\\History\\log-refs\\%s"), g_Git.m_CurrentDir);
459 reg.Replace(_T(':'),_T('_'));
460 m_History.Load(reg, _T("ref"));
462 ShowStartRef();
463 return FALSE;
466 LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)
468 int cur=(int)wParam;
470 if( cur == GITLOG_START )
472 CString temp;
473 temp.LoadString(IDS_PROGRESSWAIT);
475 this->m_LogList.ShowText(temp, true);
477 // We use a progress bar while getting the logs
478 m_LogProgress.SetRange32(0, 100);
479 m_LogProgress.SetPos(0);
480 if (m_pTaskbarList)
482 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
483 m_pTaskbarList->SetProgressValue(m_hWnd, 0, 100);
486 GetDlgItem(IDC_WALKBEHAVIOUR)->ShowWindow(SW_HIDE);
487 GetDlgItem(IDC_VIEW)->ShowWindow(SW_HIDE);
488 GetDlgItem(IDC_STATBUTTON)->ShowWindow(SW_HIDE);
489 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
491 DialogEnableWindow(IDC_WALKBEHAVIOUR, FALSE);
492 DialogEnableWindow(IDC_STATBUTTON, FALSE);
493 //DialogEnableWindow(IDC_REFRESH, FALSE);
494 DialogEnableWindow(IDC_VIEW, FALSE);
497 else if( cur == GITLOG_END)
499 if(this->m_LogList.HasText())
501 this->m_LogList.ClearText();
503 UpdateLogInfoLabel();
505 if (m_pTaskbarList)
506 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
508 DialogEnableWindow(IDC_SHOWWHOLEPROJECT, !m_bFollowRenames && !m_path.IsEmpty());
510 DialogEnableWindow(IDC_STATBUTTON, !(m_LogList.m_arShownList.IsEmpty() || m_LogList.m_arShownList.GetCount() == 1 && m_LogList.m_bShowWC));
511 DialogEnableWindow(IDC_REFRESH, TRUE);
512 DialogEnableWindow(IDC_VIEW, TRUE);
513 DialogEnableWindow(IDC_WALKBEHAVIOUR, TRUE);
514 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
515 GetDlgItem(IDC_WALKBEHAVIOUR)->ShowWindow(SW_SHOW);
516 GetDlgItem(IDC_VIEW)->ShowWindow(SW_SHOW);
517 GetDlgItem(IDC_STATBUTTON)->ShowWindow(SW_SHOW);
518 GetDlgItem(IDC_PROGRESS)->ShowWindow(FALSE);
519 //CTime time=m_LogList.GetOldestTime();
520 CTime begin,end;
521 m_LogList.GetTimeRange(begin,end);
523 if(m_LogList.m_From == -1)
524 m_DateFrom.SetTime(&begin);
526 if(m_LogList.m_To == -1)
527 m_DateTo.SetTime(&end);
531 else
533 if(this->m_LogList.HasText())
535 this->m_LogList.ClearText();
536 this->m_LogList.Invalidate();
538 UpdateLogInfoLabel();
539 m_LogProgress.SetPos(cur);
540 if (m_pTaskbarList)
542 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
543 m_pTaskbarList->SetProgressValue(m_hWnd, cur, 100);
546 return 0;
548 void CLogDlg::SetDlgTitle()
550 if (m_sTitle.IsEmpty())
551 GetWindowText(m_sTitle);
553 if (m_LogList.m_Path.IsEmpty() || m_orgPath.GetWinPathString().IsEmpty())
555 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, m_sTitle);
557 else
558 CAppUtils::SetWindowTitle(m_hWnd, m_orgPath.GetWinPathString(), m_sTitle);
561 void CLogDlg::CheckRegexpTooltip()
563 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
564 // Since tooltip describes regexp features, show it only if regexps are enabled.
565 if (m_bFilterWithRegex)
567 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
569 else
570 m_tooltips.DelTool(pWnd);
573 void CLogDlg::EnableOKButton()
575 if (m_bSelect)
577 // the dialog is used to select revisions
578 if (m_bSelectionMustBeSingle)
580 // enable OK button if only a single revision is selected
581 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()==1));
583 else if (m_bSelectionMustBeContinuous)
584 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
585 else
586 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
588 else
589 DialogEnableWindow(IDOK, TRUE);
592 bool LookLikeGitHash(const CString& msg, int &pos)
594 int c = 0;
595 for (; pos < msg.GetLength(); ++pos)
597 if (msg[pos] >= '0' && msg[pos] <= '9' || msg[pos] >= 'a' && msg[pos] <= 'f')
599 c++;
601 else
603 return c >= g_Git.GetShortHASHLength() && c <= GIT_HASH_SIZE * 2;
606 return c >= g_Git.GetShortHASHLength() && c <= GIT_HASH_SIZE * 2;
609 std::vector<CHARRANGE> FindGitHashPositions(const CString& msg, int offset)
611 std::vector<CHARRANGE> result;
612 offset = offset < 0 ? 0 : offset;
613 int old = offset;
614 while (offset < msg.GetLength())
616 old = offset;
617 TCHAR e = msg[offset];
618 if (e == '\n')
620 ++offset;
621 if (msg.Mid(offset, 11) == _T("git-svn-id:")
622 || msg.Mid(offset, 14) == _T("Signed-off-by:")
623 || msg.Mid(offset, 10) == _T("Change-Id:")
626 offset += 10;
627 while (offset < msg.GetLength())
629 if (msg[offset++] == '\n')
630 break;
632 continue;
635 else if (e >= 'A' && e <= 'Z' || e >= 'h' && e <= 'z')
639 e = msg[++offset];
640 } while (offset < msg.GetLength() && (e >= 'A' && e <= 'Z' || e >= 'a' && e <= 'z' || e >= '0' && e <= '9'));
642 else if (e >= 'a' && e <= 'g' || e >= '0' && e <= '9')
644 if (e == 'g')
646 ++old;
647 ++offset;
649 if (LookLikeGitHash(msg, offset))
651 TCHAR d = offset < msg.GetLength() ? msg[offset] : '\0';
652 if (!((d >= 'A' && d <= 'Z') || (d >= 'a' && d <= 'z') || (d >= '0' && d <= '9')))
654 CHARRANGE range = { old, offset };
655 result.push_back(range);
658 ++offset;
660 else
662 ++offset;
666 return result;
669 BOOL FindGitHash(const CString& msg, int offset, CWnd *pWnd)
671 std::vector<CHARRANGE> positions = FindGitHashPositions(msg, offset);
672 CAppUtils::SetCharFormat(pWnd, CFM_LINK, CFE_LINK, positions);
674 return positions.empty() ? FALSE : TRUE;
677 static int DescribeCommit(CGitHash& hash, CString& result)
679 CAutoRepository repo(g_Git.GetGitRepository());
680 if (!repo)
681 return -1;
682 CAutoObject commit;
683 if (git_object_lookup(commit.GetPointer(), repo, (const git_oid *)hash.m_hash, GIT_OBJ_COMMIT))
684 return -1;
686 CAutoDescribeResult describe;
687 git_describe_options describe_options = GIT_DESCRIBE_OPTIONS_INIT;
688 describe_options.describe_strategy = CRegDWORD(_T("Software\\TortoiseGit\\DescribeStrategy"), GIT_DESCRIBE_DEFAULT);
689 if (git_describe_commit(describe.GetPointer(), (git_object *)commit, &describe_options))
690 return -1;
692 CAutoBuf describe_buf;
693 git_describe_format_options format_options = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
694 format_options.abbreviated_size = CRegDWORD(_T("Software\\TortoiseGit\\DescribeAbbreviatedSize"), GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE);
695 format_options.always_use_long_format = CRegDWORD(_T("Software\\TortoiseGit\\DescribeAlwaysLong"));
696 if (git_describe_format(describe_buf, describe, &format_options))
697 return -1;
699 result = CUnicodeUtils::GetUnicode(describe_buf->ptr);
700 return 0;
703 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
705 // we fill here the log message rich edit control,
706 // and also populate the changed files list control
707 // according to the selected revision(s).
709 CRichEditCtrl * pMsgView = (CRichEditCtrl*)GetDlgItem(IDC_MSGVIEW);
710 // empty the log message view
711 pMsgView->SetWindowText(_T(" "));
712 FillPatchView(true);
713 // empty the changed files list
714 m_ChangedFileListCtrl.SetRedraw(FALSE);
715 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
716 m_currentChangedArray = NULL;
717 m_ChangedFileListCtrl.DeleteAllItems();
719 // if we're not here to really show a selected revision, just
720 // get out of here after clearing the views, which is what is intended
721 // if that flag is not set.
722 if (!bShow)
724 // force a redraw
725 m_ChangedFileListCtrl.Invalidate();
726 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
727 m_ChangedFileListCtrl.SetRedraw(TRUE);
728 m_gravatar.LoadGravatar();
729 return;
732 // depending on how many revisions are selected, we have to do different
733 // tasks.
734 int selCount = m_LogList.GetSelectedCount();
735 if (selCount == 0)
737 // if nothing is selected, we have nothing more to do
738 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
739 m_ChangedFileListCtrl.SetRedraw(TRUE);
740 m_gravatar.LoadGravatar();
741 return;
743 else if (selCount == 1)
745 // if one revision is selected, we have to fill the log message view
746 // with the corresponding log message, and also fill the changed files
747 // list fully.
748 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
749 int selIndex = m_LogList.GetNextSelectedItem(pos);
750 if (selIndex >= m_LogList.m_arShownList.GetCount())
752 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
753 m_ChangedFileListCtrl.SetRedraw(TRUE);
754 return;
756 Locker lock(m_LogList.m_critSec_AsyncDiff);
757 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.SafeGetAt(selIndex));
760 CString out_describe;
761 if (m_bShowDescribe)
763 CString result;
764 if (!DescribeCommit(pLogEntry->m_CommitHash, result))
765 out_describe = _T("Describe: ") + result + _T("\r\n");
768 // set the log message text
769 pMsgView->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH)) + _T(": ") + pLogEntry->m_CommitHash.ToString() + _T("\r\n") + out_describe + _T("\r\n"));
770 // turn bug ID's into links if the bugtraq: properties have been set
771 // and we can find a match of those in the log message
773 pMsgView->SetSel(-1,-1);
774 CHARFORMAT2 format;
775 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
776 format.cbSize = sizeof(CHARFORMAT2);
777 format.dwMask = CFM_BOLD;
778 format.dwEffects = CFE_BOLD;
779 pMsgView->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
781 CString msg = m_bAsteriskLogPrefix ? _T("* ") : _T("");
782 msg+=pLogEntry->GetSubject();
783 pMsgView->ReplaceSel(msg);
785 pMsgView->SetSel(-1,-1);
786 format.dwEffects = 0;
787 pMsgView->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
789 msg=_T("\n");
790 msg+=pLogEntry->GetBody();
792 if(!pLogEntry->m_Notes.IsEmpty())
794 msg+= _T("\n*") + CString(MAKEINTRESOURCE(IDS_NOTES)) + _T("* ");
795 msg+= pLogEntry->m_Notes;
796 msg+= _T("\n\n");
799 CString tagInfo = m_LogList.GetTagInfo(pLogEntry);
800 if(!tagInfo.IsEmpty())
801 tagInfo = _T("\n*") + CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO)) + _T("*\n\n") + tagInfo;
802 msg += tagInfo;
804 pMsgView->ReplaceSel(msg);
806 CString text;
807 pMsgView->GetWindowText(text);
808 // the rich edit control doesn't count the CR char!
809 // to be exact: CRLF is treated as one char.
810 text.Remove('\r');
812 int findHashStart = text.Find('\n');
813 if (!out_describe.IsEmpty())
814 findHashStart = text.Find('\n', findHashStart + 1);
815 FindGitHash(text, findHashStart, pMsgView);
816 m_LogList.m_ProjectProperties.FindBugID(text, pMsgView);
817 if (((DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\StyleCommitMessages"), TRUE)) == TRUE)
818 CAppUtils::FormatTextInRichEditControl(pMsgView);
820 CHARRANGE range;
821 range.cpMin = 0;
822 range.cpMax = 0;
823 pMsgView->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
825 CString matchpath=this->m_path.GetGitPathString();
827 bool mightNeedReset = true;
829 int count = pLogEntry->GetFiles(&m_LogList).GetCount();
830 for (int i = 0 ; i < count && (!matchpath.IsEmpty()); ++i)
832 if( m_bWholeProject )
833 break;
835 ((CTGitPath&)pLogEntry->GetFiles(&m_LogList)[i]).m_Action &= ~(CTGitPath::LOGACTIONS_HIDE|CTGitPath::LOGACTIONS_GRAY);
836 mightNeedReset = false;
838 if(pLogEntry->GetFiles(&m_LogList)[i].GetGitPathString().Left(matchpath.GetLength()) != matchpath && pLogEntry->GetFiles(&m_LogList)[i].GetGitOldPathString().Left(matchpath.GetLength()) != matchpath)
840 if (m_iHidePaths == 1)
841 ((CTGitPath&)pLogEntry->GetFiles(&m_LogList)[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;
842 else if (m_iHidePaths == 2)
843 ((CTGitPath&)pLogEntry->GetFiles(&m_LogList)[i]).m_Action |= CTGitPath::LOGACTIONS_GRAY;
847 if (mightNeedReset)
849 for (int i = 0 ; i < count; ++i)
850 ((CTGitPath&)pLogEntry->GetFiles(&m_LogList)[i]).m_Action &= ~CTGitPath::LOGACTIONS_HIDE;
853 CString fileFilter;
854 m_cFileFilter.GetWindowText(fileFilter);
855 fileFilter.MakeLower();
856 for (int i = 0; i < count && (!fileFilter.IsEmpty()); ++i)
858 CString sPath = pLogEntry->GetFiles(&m_LogList)[i].GetGitPathString();
859 sPath.MakeLower();
860 if (sPath.Find(fileFilter) < 0)
861 ((CTGitPath&)pLogEntry->GetFiles(&m_LogList)[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;
864 m_ChangedFileListCtrl.UpdateWithGitPathList(pLogEntry->GetFiles(&m_LogList));
865 m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;
866 if (pLogEntry->m_CommitHash.IsEmpty() && m_bShowUnversioned)
868 m_ChangedFileListCtrl.UpdateUnRevFileList(pLogEntry->GetUnRevFiles());
869 m_ChangedFileListCtrl.Show(GITSLC_SHOWVERSIONED | GITSLC_SHOWUNVERSIONED);
871 else
872 m_ChangedFileListCtrl.Show(GITSLC_SHOWVERSIONED);
874 m_ChangedFileListCtrl.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES)));
876 if(!pLogEntry->m_IsDiffFiles)
877 m_ChangedFileListCtrl.SetBusy(TRUE);
878 else
879 m_ChangedFileListCtrl.SetBusy(FALSE);
881 m_ChangedFileListCtrl.SetRedraw(TRUE);
882 m_gravatar.LoadGravatar(pLogEntry->GetAuthorEmail());
883 return;
887 else
889 // more than one revision is selected:
890 // the log message view must be emptied
891 // the changed files list contains all the changed paths from all
892 // selected revisions, with 'doubles' removed
893 m_currentChangedPathList = GetChangedPathsFromSelectedRevisions(true);
894 m_gravatar.LoadGravatar();
897 // redraw the views
898 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
899 #if 0
900 if (m_currentChangedArray)
902 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedArray->GetCount());
903 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedArray->GetCount());
905 else if (m_currentChangedPathList.GetCount())
907 m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedPathList.GetCount());
908 m_ChangedFileListCtrl.RedrawItems(0, m_currentChangedPathList.GetCount());
910 else
912 m_ChangedFileListCtrl.SetItemCountEx(0);
913 m_ChangedFileListCtrl.Invalidate();
915 #endif
916 // sort according to the settings
917 if (m_nSortColumnPathList > 0)
918 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
919 else
920 SetSortArrow(&m_ChangedFileListCtrl, -1, false);
921 m_ChangedFileListCtrl.SetRedraw(TRUE);
925 void CLogDlg::FillPatchView(bool onlySetTimer)
927 if (!::IsWindow(this->m_patchViewdlg.m_hWnd))
928 return;
930 KillTimer(LOG_FILLPATCHVTIMER);
931 if (onlySetTimer)
933 SetTimer(LOG_FILLPATCHVTIMER, 100, nullptr);
934 return;
937 POSITION posLogList = m_LogList.GetFirstSelectedItemPosition();
938 if (posLogList == nullptr)
940 m_patchViewdlg.ClearView();
941 return; // nothing is selected, get out of here
944 GitRev * pLogEntry = reinterpret_cast<GitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(posLogList)));
945 if (pLogEntry == nullptr || m_LogList.GetNextSelectedItem(posLogList) != -1)
947 m_patchViewdlg.ClearView();
948 return;
951 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
952 CString out;
954 if (pos == nullptr)
956 int diffContext = 0;
957 if (CAppUtils::GetMsysgitVersion() > 0x01080100)
958 diffContext = g_Git.GetConfigValueInt32(_T("diff.context"), -1);
959 CStringA outA;
960 CString rev1 = pLogEntry->m_CommitHash.IsEmpty() ? _T("HEAD") : (pLogEntry->m_CommitHash.ToString() + _T("~1"));
961 CString rev2 = pLogEntry->m_CommitHash.IsEmpty() ? GIT_REV_ZERO : pLogEntry->m_CommitHash.ToString();
962 g_Git.GetUnifiedDiff(CTGitPath(), rev1, rev2, &outA, false, false, diffContext);
963 out = CUnicodeUtils::GetUnicode(outA);
965 else
967 while (pos)
969 int nSelect = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
970 CTGitPath * p = (CTGitPath*)m_ChangedFileListCtrl.GetItemData(nSelect);
971 if (p && !(p->m_Action&CTGitPath::LOGACTIONS_UNVER))
973 CString cmd;
974 if (pLogEntry->m_CommitHash.IsEmpty())
975 cmd.Format(_T("git.exe diff HEAD -- \"%s\""), p->GetGitPathString());
976 else
977 cmd.Format(_T("git.exe diff %s^%d..%s -- \"%s\""), pLogEntry->m_CommitHash.ToString(), p->m_ParentNo + 1, pLogEntry->m_CommitHash.ToString(), p->GetGitPathString());
978 g_Git.Run(cmd, &out, CP_UTF8);
983 m_patchViewdlg.SetText(out);
986 void CLogDlg::TogglePatchView()
988 m_patchViewdlg.m_pProjectProperties = &m_LogList.m_ProjectProperties;
989 m_patchViewdlg.m_ParentDlg = this;
990 if (!IsWindow(m_patchViewdlg.m_hWnd))
992 BOOL viewPatchEnabled = FALSE;
993 viewPatchEnabled = g_Git.GetConfigValueBool(_T("tgit.logshowpatch"));
994 if (viewPatchEnabled == FALSE)
995 g_Git.SetConfigValue(_T("tgit.logshowpatch"), _T("true"));
996 m_patchViewdlg.Create(IDD_PATCH_VIEW, this);
997 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETSCROLLWIDTHTRACKING, TRUE);
998 CRect rect;
999 this->GetWindowRect(&rect);
1001 m_patchViewdlg.ShowWindow(SW_SHOW);
1002 m_patchViewdlg.SetWindowPos(nullptr, rect.right, rect.top, rect.Width(), rect.Height(), SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
1004 FillPatchView();
1006 else
1008 g_Git.SetConfigValue(_T("tgit.logshowpatch"), _T("false"));
1009 m_patchViewdlg.ShowWindow(SW_HIDE);
1010 m_patchViewdlg.DestroyWindow();
1014 LRESULT CLogDlg::OnFileListCtrlItemChanged(WPARAM /*wparam*/, LPARAM /*lparam*/)
1016 FillPatchView(true);
1017 return 0;
1020 void CLogDlg::OnMoving(UINT fwSide, LPRECT pRect)
1022 __super::OnMoving(fwSide, pRect);
1024 if (!::IsWindow(m_patchViewdlg.m_hWnd))
1025 return;
1027 RECT patchrect;
1028 m_patchViewdlg.GetWindowRect(&patchrect);
1029 if (!::IsWindow(m_hWnd))
1030 return;
1032 RECT thisrect;
1033 GetWindowRect(&thisrect);
1034 if (patchrect.left == thisrect.right)
1036 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);
1040 void CLogDlg::OnSizing(UINT fwSide, LPRECT pRect)
1042 __super::OnSizing(fwSide, pRect);
1044 if (!::IsWindow(this->m_patchViewdlg.m_hWnd))
1045 return;
1047 CRect thisrect, patchrect;
1048 this->GetWindowRect(thisrect);
1049 this->m_patchViewdlg.GetWindowRect(patchrect);
1050 if (thisrect.right != patchrect.left)
1051 return;
1053 patchrect.left -= (thisrect.right - pRect->right);
1054 patchrect.right -= (thisrect.right - pRect->right);
1056 if (patchrect.bottom == thisrect.bottom)
1057 patchrect.bottom -= (thisrect.bottom - pRect->bottom);
1058 if (patchrect.top == thisrect.top)
1059 patchrect.top -= thisrect.top - pRect->top;
1060 m_patchViewdlg.MoveWindow(patchrect);
1063 void CLogDlg::OnSelectSearchField()
1065 m_cFilter.SetSel(0, -1, FALSE);
1066 m_cFilter.SetFocus();
1069 void CLogDlg::GoBack()
1071 GoBackForward(false, false);
1074 void CLogDlg::GoForward()
1076 GoBackForward(false, true);
1079 void CLogDlg::GoBackAndSelect()
1081 GoBackForward(true, false);
1084 void CLogDlg::GoForwardAndSelect()
1086 GoBackForward(true, true);
1089 void CLogDlg::GoBackForward(bool select, bool bForward)
1091 m_LogList.m_highlight.Empty();
1092 CGitHash gotoHash;
1093 if (bForward ? m_LogList.m_selectionHistory.GoForward(gotoHash) : m_LogList.m_selectionHistory.GoBack(gotoHash))
1095 int i;
1096 for (i = 0; i < m_LogList.m_arShownList.GetCount(); ++i)
1098 GitRev *rev = (GitRev *)m_LogList.m_arShownList.SafeGetAt(i);
1099 if (!rev) continue;
1100 if (rev->m_CommitHash == gotoHash)
1102 m_LogList.EnsureVisible(i, FALSE);
1103 if (select)
1105 m_LogList.m_highlight.Empty();
1106 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED);
1107 m_bNavigatingWithSelect = true;
1108 m_LogList.SetItemState(i, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
1109 m_LogList.SetSelectionMark(i);
1110 m_bNavigatingWithSelect = false;
1112 else
1113 m_LogList.m_highlight = gotoHash;
1114 m_LogList.Invalidate();
1115 return;
1118 if (i == m_LogList.m_arShownList.GetCount())
1120 CString msg;
1121 msg.Format(IDS_LOG_NOT_VISIBLE, gotoHash.ToString());
1122 MessageBox(msg, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
1123 return;
1126 PlaySound((LPCTSTR)SND_ALIAS_SYSTEMASTERISK, nullptr, SND_ASYNC | SND_ALIAS_ID);
1129 void CLogDlg::OnBnClickedRefresh()
1131 Refresh (true);
1134 void CLogDlg::Refresh (bool clearfilter /*autoGoOnline*/)
1136 m_limit = 0;
1137 m_LogList.Refresh(clearfilter);
1138 EnableOKButton();
1139 ShowStartRef();
1140 FillLogMessageCtrl(false);
1145 BOOL CLogDlg::Cancel()
1147 return m_bCancelled;
1150 void CLogDlg::SaveSplitterPos()
1152 if (!IsIconic())
1154 CRegDWORD regPos1(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
1155 CRegDWORD regPos2(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
1156 RECT rectSplitter;
1157 m_wndSplitter1.GetWindowRect(&rectSplitter);
1158 ScreenToClient(&rectSplitter);
1159 regPos1 = rectSplitter.top;
1160 m_wndSplitter2.GetWindowRect(&rectSplitter);
1161 ScreenToClient(&rectSplitter);
1162 regPos2 = rectSplitter.top;
1166 void CLogDlg::OnCancel()
1168 this->ShowWindow(SW_HIDE);
1170 // canceling means stopping the working thread if it's still running.
1171 m_LogList.SafeTerminateAsyncDiffThread();
1172 if (this->IsThreadRunning())
1174 m_LogList.SafeTerminateThread();
1176 UpdateData();
1178 SaveSplitterPos();
1179 __super::OnCancel();
1182 void CLogDlg::CopyChangedSelectionToClipBoard()
1185 POSITION posLogList = m_LogList.GetFirstSelectedItemPosition();
1186 if (posLogList == nullptr)
1187 return; // nothing is selected, get out of here
1189 CString sPaths;
1191 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1192 // if (posLogList)
1194 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
1195 while (pos)
1197 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
1198 CTGitPath *path = (CTGitPath*)m_ChangedFileListCtrl.GetItemData(nItem);
1199 if(path)
1200 sPaths += path->GetGitPathString();
1201 sPaths += _T("\r\n");
1204 #if 0
1205 else
1207 // only one revision is selected in the log dialog top pane
1208 // but multiple items could be selected in the changed items list
1209 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
1210 while (pos)
1212 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
1213 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->SafeGetAt(nItem);
1215 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
1217 // some items are hidden! So find out which item the user really selected
1218 INT_PTR selRealIndex = -1;
1219 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
1221 if (pLogEntry->pArChangedPaths->SafeGetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
1222 ++selRealIndex;
1223 if (selRealIndex == nItem)
1225 changedlogpath = pLogEntry->pArChangedPaths->SafeGetAt(hiddenindex);
1226 break;
1230 if (changedlogpath)
1232 sPaths += changedlogpath->sPath;
1233 sPaths += _T("\r\n");
1237 #endif
1238 sPaths.Trim();
1239 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
1243 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
1245 // we have three separate context menus:
1246 // one for the branch label in the upper left
1247 // one shown on the log message list control,
1248 // one shown in the changed-files list control
1249 if (pWnd == GetDlgItem(IDC_STATIC_REF))
1251 CIconMenu popup;
1252 if (!popup.CreatePopupMenu())
1253 return;
1255 int cnt = 0;
1256 popup.AppendMenuIcon(++cnt, IDS_MENUREFBROWSE);
1257 popup.SetDefaultItem(cnt);
1258 popup.AppendMenuIcon(++cnt, _T("HEAD"));
1259 CGitHash fetchHead;
1260 g_Git.GetHash(fetchHead, g_Git.FixBranchName(_T("FETCH_HEAD")));
1261 popup.AppendMenuIcon(++cnt, _T("FETCH_HEAD"));
1262 popup.EnableMenuItem(cnt, fetchHead.IsEmpty());
1263 popup.AppendMenuIcon(++cnt, IDS_ALL);
1264 popup.EnableMenuItem(cnt, m_bFollowRenames);
1265 popup.AppendMenuIcon(++cnt, IDS_PROC_LOG_SELECT_LOCAL_BRANCHES);
1266 popup.EnableMenuItem(cnt, m_bFollowRenames);
1267 int offset = ++cnt;
1268 if (m_History.GetCount() > 0)
1270 popup.AppendMenu(MF_SEPARATOR, 0);
1271 for (size_t i = 0; i < m_History.GetCount(); ++i)
1273 CString entry = m_History.GetEntry(i);
1274 if (entry.GetLength() > 150)
1275 entry = entry.Left(150) + _T("...");
1276 popup.AppendMenuIcon(cnt++, entry);
1280 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1281 if (cmd == 0)
1282 return;
1283 else if (cmd == 1)
1285 OnBnClickedBrowseRef();
1286 return;
1289 m_LogList.m_ShowMask &= ~(CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_LOCAL_BRANCHES);
1290 m_bAllBranch = BST_UNCHECKED;
1291 if (cmd == 2)
1293 SetRange(g_Git.GetCurrentBranch(true));
1295 else if (cmd == 3)
1297 SetRange(fetchHead.ToString());
1299 else if (cmd == 4)
1301 m_bAllBranch = BST_CHECKED;
1302 m_LogList.m_ShowMask |= CGit::LOG_INFO_ALL_BRANCH;
1304 else if (cmd == 5)
1306 m_bAllBranch = BST_INDETERMINATE;
1307 m_LogList.m_ShowMask |= CGit::LOG_INFO_LOCAL_BRANCHES;
1309 else if (cmd >= offset)
1311 SetRange(m_History.GetEntry(cmd - offset));
1312 m_History.AddEntry(m_LogList.m_sRange);
1313 m_History.Save();
1316 UpdateData(FALSE);
1318 OnRefresh();
1319 FillLogMessageCtrl(false);
1321 return;
1323 int selCount = m_LogList.GetSelectedCount();
1324 if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
1326 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1327 int selIndex = -1;
1328 if (pos)
1329 selIndex = m_LogList.GetNextSelectedItem(pos);
1331 GitRev *pRev = ((GitRev*)m_LogList.m_arShownList[selIndex]);
1333 if ((point.x == -1) && (point.y == -1))
1335 CRect rect;
1336 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
1337 ClientToScreen(&rect);
1338 point = rect.CenterPoint();
1340 CString sMenuItemText;
1341 CIconMenu popup;
1342 if (popup.CreatePopupMenu())
1344 long start = -1, end = -1;
1345 auto pEdit = (CRichEditCtrl *)GetDlgItem(IDC_MSGVIEW);
1346 pEdit->GetSel(start, end);
1347 // add the 'default' entries
1348 popup.AppendMenuIcon(WM_COPY, IDS_SCIEDIT_COPY, IDI_COPYCLIP);
1349 if (start >= end)
1350 popup.EnableMenuItem(WM_COPY, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
1351 popup.AppendMenu(MF_SEPARATOR);
1352 sMenuItemText.LoadString(IDS_STATUSLIST_CONTEXT_COPYEXT);
1353 popup.AppendMenuIcon(EM_SETSEL, sMenuItemText, IDI_COPYCLIP);
1354 popup.AppendMenu(MF_SEPARATOR, NULL);
1355 sMenuItemText.LoadString(IDS_EDIT_NOTES);
1356 popup.AppendMenuIcon( CGitLogList::ID_EDITNOTE, sMenuItemText, IDI_EDIT);
1358 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1359 switch (cmd)
1361 case 0:
1362 break; // no command selected
1363 case EM_SETSEL:
1365 pEdit->SetRedraw(FALSE);
1366 int oldLine = pEdit->GetFirstVisibleLine();
1367 pEdit->SetSel(0, -1);
1368 pEdit->Copy();
1369 pEdit->SetSel(start, end);
1370 int newLine = pEdit->GetFirstVisibleLine();
1371 pEdit->LineScroll(oldLine - newLine);
1372 pEdit->SetRedraw(TRUE);
1373 pEdit->RedrawWindow();
1375 break;
1376 case WM_COPY:
1377 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
1378 break;
1379 case CGitLogList::ID_EDITNOTE:
1380 CAppUtils::EditNote(pRev);
1381 this->FillLogMessageCtrl(true);
1382 break;
1388 void CLogDlg::OnOK()
1390 // since the log dialog is also used to select revisions for other
1391 // dialogs, we have to do some work before closing this dialog
1392 if (GetFocus() != GetDlgItem(IDOK))
1393 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
1395 m_LogList.SafeTerminateAsyncDiffThread();
1396 if (this->IsThreadRunning())
1398 m_LogList.SafeTerminateThread();
1400 UpdateData();
1401 // check that one and only one row is selected
1402 if (m_LogList.GetSelectedCount() == 1)
1404 // get the selected row
1405 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1406 int selIndex = m_LogList.GetNextSelectedItem(pos);
1407 if (selIndex < m_LogList.m_arShownList.GetCount())
1409 // all ok, pick up the revision
1410 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.SafeGetAt(selIndex));
1411 // extract the hash
1412 m_sSelectedHash = pLogEntry->m_CommitHash;
1415 UpdateData(FALSE);
1416 SaveSplitterPos();
1417 __super::OnOK();
1419 #if 0
1420 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
1421 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
1423 CString temp;
1424 CString buttontext;
1425 GetDlgItemText(IDOK, buttontext);
1426 temp.LoadString(IDS_MSGBOX_CANCEL);
1427 if (temp.Compare(buttontext) != 0)
1428 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
1429 m_bCancelled = TRUE;
1430 m_selectedRevs.Clear();
1431 m_selectedRevsOneRange.Clear();
1432 if (m_pNotifyWindow)
1434 int selIndex = m_LogList.GetSelectionMark();
1435 if (selIndex >= 0)
1437 PLOGENTRYDATA pLogEntry = NULL;
1438 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1439 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1440 m_selectedRevs.AddRevision(pLogEntry->Rev);
1441 git_revnum_t lowerRev = pLogEntry->Rev;
1442 git_revnum_t higherRev = lowerRev;
1443 while (pos)
1445 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1446 git_revnum_t rev = pLogEntry->Rev;
1447 m_selectedRevs.AddRevision(pLogEntry->Rev);
1448 if (lowerRev > rev)
1449 lowerRev = rev;
1450 if (higherRev < rev)
1451 higherRev = rev;
1453 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
1455 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
1457 BOOL bSentMessage = FALSE;
1458 if (m_LogList.GetSelectedCount() == 1)
1460 // if only one revision is selected, check if the path/url with which the dialog was started
1461 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1462 // if it was copied, use the copy from revision as lowerRev
1463 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
1465 CString sUrl = m_path.GetGitPathString();
1466 if (!m_path.IsUrl())
1468 sUrl = GetURLFromPath(m_path);
1470 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
1471 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
1473 LogChangedPath * pData = pLogEntry->pArChangedPaths->SafeGetAt(cp);
1474 if (pData)
1476 if (sUrl.Compare(pData->sPath) == 0)
1478 if (!pData->sCopyFromPath.IsEmpty())
1480 lowerRev = pData->lCopyFromRev;
1481 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
1482 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
1483 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
1484 bSentMessage = TRUE;
1491 if ( !bSentMessage )
1493 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
1494 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
1495 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
1496 if (m_selectedRevsOneRange.GetCount())
1497 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
1501 UpdateData();
1502 CRegDWORD reg(_T("Software\\TortoiseGit\\ShowAllEntry"));
1503 SaveSplitterPos();
1504 #endif
1507 void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool /*blame*/, bool /*unified*/)
1509 DialogEnableWindow(IDOK, FALSE);
1510 // SetPromptApp(&theApp);
1511 theApp.DoWaitCursor(1);
1513 CString temppath;
1514 GetTempPath(temppath);
1516 CString file1;
1517 file1.Format(_T("%s%s_%s%s"),
1518 temppath,
1519 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
1520 rev1->m_CommitHash.ToString().Left(g_Git.GetShortHASHLength()),
1521 (*m_currentChangedArray)[selIndex].GetFileExtension());
1523 CString file2;
1524 file2.Format(_T("%s\\%s_%s%s"),
1525 temppath,
1526 (*m_currentChangedArray)[selIndex].GetBaseFilename(),
1527 rev2->m_CommitHash.ToString().Left(g_Git.GetShortHASHLength()),
1528 (*m_currentChangedArray)[selIndex].GetFileExtension());
1530 CString cmd;
1531 CTGitPath &path = (CTGitPath &)(*m_currentChangedArray)[selIndex];
1533 if (g_Git.GetOneFile(rev1->m_CommitHash.ToString(), path, file1))
1535 CString out;
1536 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, path.GetGitPathString(), rev1->m_CommitHash.ToString(), file1);
1537 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
1538 theApp.DoWaitCursor(-1);
1539 EnableOKButton();
1540 return;
1542 if (g_Git.GetOneFile(rev2->m_CommitHash.ToString(), path, file2))
1544 CString out;
1545 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, path.GetGitPathString(), rev2->m_CommitHash.ToString(), file2);
1546 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
1547 theApp.DoWaitCursor(-1);
1548 EnableOKButton();
1549 return;
1552 CAppUtils::DiffFlags flags;
1553 CAppUtils::StartExtDiff(file1,file2,_T("A"),_T("B"),
1554 g_Git.CombinePath(path), g_Git.CombinePath(path),
1555 rev1->m_CommitHash.ToString(), rev2->m_CommitHash.ToString(),
1556 flags);
1558 theApp.DoWaitCursor(-1);
1559 EnableOKButton();
1562 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
1564 // Skip Ctrl-C when copying text out of the log message or search filter
1565 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);
1566 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
1568 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
1570 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))
1572 m_LogList.DiffSelectedRevWithPrevious();
1573 return TRUE;
1576 if (GetFocus() == GetDlgItem(IDC_SEARCHEDIT))
1578 KillTimer(LOGFILTER_TIMER);
1579 m_limit = 0;
1580 m_LogList.Refresh(FALSE);
1581 FillLogMessageCtrl(false);
1583 if (GetFocus() == GetDlgItem(IDC_FILTER))
1585 KillTimer(FILEFILTER_TIMER);
1586 FillLogMessageCtrl();
1587 return TRUE;
1590 else if (pMsg->message == WM_XBUTTONUP)
1592 bool select = (pMsg->wParam & MK_SHIFT) == 0;
1593 if (HIWORD(pMsg->wParam) & XBUTTON1)
1594 GoBackForward(select, false);
1595 if (HIWORD(pMsg->wParam) & XBUTTON2)
1596 GoBackForward(select, true);
1597 if (HIWORD(pMsg->wParam) & (XBUTTON1 | XBUTTON2))
1598 return TRUE;
1600 if (m_hAccel && !bSkipAccelerator)
1602 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
1603 if (ret)
1604 return TRUE;
1607 if(::IsWindow(m_tooltips.m_hWnd))
1608 m_tooltips.RelayEvent(pMsg);
1609 return __super::PreTranslateMessage(pMsg);
1613 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
1615 //if (this->IsThreadRunning())
1616 if(m_LogList.m_bNoDispUpdates)
1618 // only show the wait cursor over the list control
1619 if ((pWnd)&&
1620 ((pWnd == GetDlgItem(IDC_LOGLIST))||
1621 (pWnd == GetDlgItem(IDC_MSGVIEW))||
1622 (pWnd == GetDlgItem(IDC_LOGMSG))))
1624 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
1625 SetCursor(hCur);
1626 return TRUE;
1629 if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))
1630 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
1632 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
1633 SetCursor(hCur);
1634 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
1637 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
1639 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1640 *pResult = 0;
1641 //if (this->IsThreadRunning())
1642 if(m_LogList.m_bNoDispUpdates)
1643 return;
1644 if (pNMLV->iItem >= 0)
1646 if (!m_LogList.m_highlight.IsEmpty())
1648 m_LogList.m_highlight.Empty();
1649 m_LogList.Invalidate();
1651 this->m_LogList.m_nSearchIndex = pNMLV->iItem;
1652 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.SafeGetAt(pNMLV->iItem));
1653 if (pLogEntry == nullptr)
1654 return;
1655 m_LogList.m_lastSelectedHash = pLogEntry->m_CommitHash;
1656 if (pNMLV->iSubItem != 0)
1657 return;
1658 if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount()))
1660 // remove the selected state
1661 if (pNMLV->uChanged & LVIF_STATE)
1663 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
1664 FillLogMessageCtrl();
1665 UpdateData(FALSE);
1666 UpdateLogInfoLabel();
1668 return;
1670 if (pNMLV->uChanged & LVIF_STATE)
1672 if ((pNMLV->uNewState & LVIS_SELECTED) && !m_bNavigatingWithSelect)
1674 m_LogList.m_selectionHistory.Add(m_LogList.m_lastSelectedHash);
1675 m_LogList.m_lastSelectedHash = pLogEntry->m_CommitHash;
1677 FillLogMessageCtrl();
1678 UpdateData(FALSE);
1681 else
1683 m_LogList.m_lastSelectedHash.Empty();
1684 FillLogMessageCtrl();
1685 UpdateData(FALSE);
1687 EnableOKButton();
1688 UpdateLogInfoLabel();
1691 void CLogDlg::OnLvnItemchangedLogmsg(NMHDR * /*pNMHDR*/, LRESULT * /*pResult*/)
1693 UpdateLogInfoLabel();
1696 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
1698 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
1699 if (pEnLink->msg == WM_LBUTTONUP)
1701 CString url, msg;
1702 GetDlgItemText(IDC_MSGVIEW, msg);
1703 msg.Replace(_T("\r\n"), _T("\n"));
1704 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
1705 auto findResult = m_LogList.m_ProjectProperties.FindBugIDPositions(msg);
1706 if (std::find_if(findResult.begin(), findResult.end(),
1707 [=] (const CHARRANGE &cr) -> bool { return cr.cpMin == pEnLink->chrg.cpMin && cr.cpMax == pEnLink->chrg.cpMax; }
1708 ) != findResult.end())
1710 url = m_LogList.m_ProjectProperties.GetBugIDUrl(url);
1711 url = GetAbsoluteUrlFromRelativeUrl(url);
1713 if (::PathIsURL(url))
1714 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
1715 else
1717 int pos = 0;
1718 if (LookLikeGitHash(url, pos))
1720 bool found = false;
1721 for (int i = 0; i < m_LogList.m_arShownList.GetCount(); ++i)
1723 GitRev *rev = (GitRev *)m_LogList.m_arShownList.SafeGetAt(i);
1724 if (!rev) continue;
1725 if (rev->m_CommitHash.ToString().Left(url.GetLength()) == url)
1727 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1728 if (pos)
1730 int index = m_LogList.GetNextSelectedItem(pos);
1731 if (index > 0)
1732 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
1734 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
1735 m_LogList.EnsureVisible(i, FALSE);
1736 m_LogList.SetSelectionMark(i);
1737 found = true;
1738 PostMessage(WM_TGIT_REFRESH_SELECTION, 0, 0);
1739 break;
1743 if (!found)
1744 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN);
1748 *pResult = 0;
1751 void CLogDlg::OnBnClickedStatbutton()
1753 if (this->IsThreadRunning())
1754 return;
1755 if (m_LogList.m_arShownList.IsEmpty() || m_LogList.m_arShownList.GetCount() == 1 && m_LogList.m_bShowWC)
1756 return; // nothing or just the working copy changes are shown, so no statistics.
1757 // the statistics dialog expects the log entries to be sorted by date
1758 SortByColumn(3, false);
1760 CStatGraphDlg dlg;
1761 m_LogList.RecalculateShownList(&dlg.m_ShowList);
1763 dlg.m_path = m_orgPath;
1764 dlg.DoModal();
1765 // restore the previous sorting
1766 SortByColumn(m_nSortColumn, m_bAscending);
1767 OnTimer(LOGFILTER_TIMER);
1770 void CLogDlg::MoveToSameTop(CWnd *pWndRef, CWnd *pWndTarget)
1772 CRect rcWndPicAuthor, rcWndMsgView;
1773 pWndRef->GetWindowRect(rcWndMsgView);
1774 ScreenToClient(rcWndMsgView);
1775 pWndTarget->GetWindowRect(rcWndPicAuthor);
1776 ScreenToClient(rcWndPicAuthor);
1777 int diff = rcWndMsgView.top - rcWndPicAuthor.top;
1778 rcWndPicAuthor.top += diff;
1779 rcWndPicAuthor.bottom += diff;
1780 pWndTarget->MoveWindow(rcWndPicAuthor);
1783 void CLogDlg::DoSizeV1(int delta)
1786 RemoveAnchor(IDC_LOGLIST);
1787 RemoveAnchor(IDC_SPLITTERTOP);
1788 RemoveAnchor(IDC_MSGVIEW);
1789 RemoveAnchor(IDC_PIC_AUTHOR);
1790 RemoveAnchor(IDC_SPLITTERBOTTOM);
1791 RemoveAnchor(IDC_LOGMSG);
1792 CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);
1793 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), -delta, CW_BOTTOMALIGN);
1794 MoveToSameTop(GetDlgItem(IDC_MSGVIEW), GetDlgItem(IDC_PIC_AUTHOR));
1795 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
1796 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
1797 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
1798 AddAnchor(IDC_PIC_AUTHOR, TOP_RIGHT);
1799 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
1800 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
1801 ArrangeLayout();
1802 AdjustMinSize();
1803 SetSplitterRange();
1804 m_LogList.Invalidate();
1805 GetDlgItem(IDC_MSGVIEW)->Invalidate();
1806 m_gravatar.Invalidate();
1810 void CLogDlg::DoSizeV2(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(GetDlgItem(IDC_MSGVIEW), delta, CW_TOPALIGN);
1820 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);
1821 AddAnchor(IDC_LOGLIST, TOP_LEFT, TOP_RIGHT);
1822 AddAnchor(IDC_SPLITTERTOP, TOP_LEFT, TOP_RIGHT);
1823 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
1824 AddAnchor(IDC_PIC_AUTHOR, TOP_RIGHT);
1825 AddAnchor(IDC_SPLITTERBOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT);
1826 AddAnchor(IDC_LOGMSG, BOTTOM_LEFT, BOTTOM_RIGHT);
1827 ArrangeLayout();
1828 AdjustMinSize();
1829 SetSplitterRange();
1830 GetDlgItem(IDC_MSGVIEW)->Invalidate();
1831 m_ChangedFileListCtrl.Invalidate();
1832 m_gravatar.Invalidate();
1836 void CLogDlg::AdjustMinSize()
1838 // adjust the minimum size of the dialog to prevent the resizing from
1839 // moving the list control too far down.
1840 CRect rcChgListView;
1841 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
1842 CRect rcLogList;
1843 m_LogList.GetClientRect(rcLogList);
1845 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
1846 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
1847 +rcChgListView.Height()+rcLogList.Height()+60));
1850 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
1852 switch (message) {
1853 case WM_NOTIFY:
1854 if (wParam == IDC_SPLITTERTOP)
1856 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
1857 DoSizeV1(pHdr->delta);
1859 else if (wParam == IDC_SPLITTERBOTTOM)
1861 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
1862 DoSizeV2(pHdr->delta);
1864 break;
1867 return CResizableDialog::DefWindowProc(message, wParam, lParam);
1870 void CLogDlg::SetSplitterRange()
1872 if ((m_LogList)&&(m_ChangedFileListCtrl))
1874 CRect rcTop;
1875 m_LogList.GetWindowRect(rcTop);
1876 ScreenToClient(rcTop);
1877 CRect rcMiddle;
1878 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(rcMiddle);
1879 ScreenToClient(rcMiddle);
1880 m_wndSplitter1.SetRange(rcTop.top+30, rcMiddle.bottom-20);
1881 CRect rcBottom;
1882 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
1883 ScreenToClient(rcBottom);
1884 m_wndSplitter2.SetRange(rcMiddle.top+30, rcBottom.bottom-20);
1888 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM wParam, LPARAM lParam)
1890 if ((HWND)wParam == m_cFileFilter.GetSafeHwnd())
1891 return 0;
1893 // FIXME: x64 version would get this function called with unexpected parameters.
1894 if (!lParam)
1895 return 0;
1897 RECT * rect = (LPRECT)lParam;
1898 CPoint point;
1899 CString temp;
1900 point = CPoint(rect->left, rect->bottom);
1901 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_SelectedFilters & x ? MF_CHECKED : MF_UNCHECKED))
1902 CMenu popup;
1903 if (popup.CreatePopupMenu())
1905 temp.LoadString(IDS_LOG_FILTER_SUBJECT);
1906 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT), LOGFILTER_SUBJECT, temp);
1908 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
1909 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
1911 temp.LoadString(IDS_LOG_FILTER_PATHS);
1912 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
1914 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
1915 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
1917 temp.LoadString(IDS_LOG_FILTER_EMAILS);
1918 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_EMAILS), LOGFILTER_EMAILS, temp);
1920 temp.LoadString(IDS_LOG_FILTER_REVS);
1921 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
1923 temp.LoadString(IDS_LOG_FILTER_REFNAME);
1924 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME), LOGFILTER_REFNAME, temp);
1926 if (m_LogList.m_bShowBugtraqColumn == TRUE) {
1927 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
1928 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
1931 temp.LoadString(IDS_LOG_FILTER_TOGGLE);
1932 popup.AppendMenu(MF_STRING | MF_ENABLED, LOGFILTER_TOGGLE, temp);
1934 popup.AppendMenu(MF_SEPARATOR, NULL);
1936 temp.LoadString(IDS_LOG_FILTER_REGEX);
1937 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
1939 temp.LoadString(IDS_LOG_FILTER_CASESENSITIVE);
1940 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterCaseSensitively ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_CASE, temp);
1942 m_tooltips.Pop();
1943 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1944 if (selection != 0)
1947 if (selection == LOGFILTER_REGEX)
1949 m_bFilterWithRegex = !m_bFilterWithRegex;
1950 CRegDWORD b(_T("Software\\TortoiseGit\\UseRegexFilter"), FALSE);
1951 b = m_bFilterWithRegex;
1952 m_LogList.m_bFilterWithRegex = m_bFilterWithRegex;
1953 SetFilterCueText();
1954 CheckRegexpTooltip();
1956 else if (selection == LOGFILTER_CASE)
1958 m_bFilterCaseSensitively = !m_bFilterCaseSensitively;
1959 CRegDWORD b(_T("Software\\TortoiseGit\\FilterCaseSensitively"), FALSE);
1960 b = m_bFilterCaseSensitively;
1961 m_LogList.m_bFilterCaseSensitively = m_bFilterCaseSensitively;
1963 else if (selection == LOGFILTER_TOGGLE)
1965 m_LogList.m_SelectedFilters = (~m_LogList.m_SelectedFilters) & LOGFILTER_ALL;
1966 SetFilterCueText();
1968 else
1970 m_LogList.m_SelectedFilters ^= selection;
1971 SetFilterCueText();
1973 // Reload only if a search text is entered
1974 if (m_LogList.HasFilterText())
1975 SetTimer(LOGFILTER_TIMER, 1000, NULL);
1978 return 0L;
1981 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM wParam, LPARAM /*lParam*/)
1983 if ((HWND)wParam == m_cFileFilter.GetSafeHwnd())
1985 KillTimer(FILEFILTER_TIMER);
1987 FillLogMessageCtrl();
1988 return 0L;
1991 KillTimer(LOGFILTER_TIMER);
1993 m_LogList.m_sFilterText.Empty();
1994 UpdateData(FALSE);
1995 theApp.DoWaitCursor(1);
1996 CStoreSelection storeselection(this);
1997 FillLogMessageCtrl(false);
1999 m_LogList.RemoveFilter();
2001 Refresh();
2003 CTime begin,end;
2004 m_LogList.GetTimeRange(begin,end);
2005 m_DateFrom.SetTime(&begin);
2006 m_DateTo.SetTime(&end);
2008 theApp.DoWaitCursor(-1);
2009 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2010 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2011 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2012 UpdateLogInfoLabel();
2014 return 0L;
2018 void CLogDlg::SetFilterCueText()
2020 CString temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY));
2021 temp += _T(" ");
2023 if (m_LogList.m_SelectedFilters & LOGFILTER_SUBJECT)
2025 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT));
2028 if (m_LogList.m_SelectedFilters & LOGFILTER_MESSAGES)
2030 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2031 temp += _T(", ");
2032 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES));
2035 if (m_LogList.m_SelectedFilters & LOGFILTER_PATHS)
2037 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2038 temp += _T(", ");
2039 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS));
2042 if (m_LogList.m_SelectedFilters & LOGFILTER_AUTHORS)
2044 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2045 temp += _T(", ");
2046 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS));
2049 if (m_LogList.m_SelectedFilters & LOGFILTER_EMAILS)
2051 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2052 temp += _T(", ");
2053 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_EMAILS));
2056 if (m_LogList.m_SelectedFilters & LOGFILTER_REVS)
2058 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2059 temp += _T(", ");
2060 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS));
2063 if (m_LogList.m_SelectedFilters & LOGFILTER_REFNAME)
2065 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2066 temp += _T(", ");
2067 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REFNAME));
2070 if (m_LogList.m_bShowBugtraqColumn && m_LogList.m_SelectedFilters & LOGFILTER_BUGID)
2072 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2073 temp += _T(", ");
2074 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS));
2077 // to make the cue banner text appear more to the right of the edit control
2078 temp = _T(" ")+temp;
2079 m_cFilter.SetCueBanner(temp.TrimRight());
2082 bool CLogDlg::Validate(LPCTSTR string)
2084 if (!m_bFilterWithRegex)
2085 return true;
2086 std::tr1::wregex pat;
2087 return m_LogList.ValidateRegexp(string, pat, false);
2090 void CLogDlg::OnEnChangeFileFilter()
2092 SetTimer(FILEFILTER_TIMER, 1000, NULL);
2095 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
2097 if (nIDEvent == LOGFTIME_TIMER)
2099 KillTimer(LOGFTIME_TIMER);
2100 m_limit = 0;
2101 m_LogList.Refresh(FALSE);
2102 FillLogMessageCtrl(false);
2104 else if (nIDEvent == LOG_FILLPATCHVTIMER)
2106 FillPatchView();
2108 else if (nIDEvent == LOGFILTER_TIMER)
2110 KillTimer(LOGFILTER_TIMER);
2111 m_limit = 0;
2112 m_LogList.Refresh(FALSE);
2113 FillLogMessageCtrl(false);
2115 #if 0
2116 /* we will use git built-in grep to filter log */
2117 if (this->IsThreadRunning())
2119 // thread still running! So just restart the timer.
2120 SetTimer(LOGFILTER_TIMER, 1000, NULL);
2121 return;
2123 CWnd * focusWnd = GetFocus();
2124 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
2125 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
2126 if (m_LogList.m_sFilterText.IsEmpty())
2128 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
2129 // do not return here!
2130 // we also need to run the filter if the filter text is empty:
2131 // 1. to clear an existing filter
2132 // 2. to rebuild the m_arShownList after sorting
2134 theApp.DoWaitCursor(1);
2135 CStoreSelection storeselection(this);
2136 KillTimer(LOGFILTER_TIMER);
2137 FillLogMessageCtrl(false);
2139 // now start filter the log list
2140 m_LogList.StartFilter();
2142 if ( m_LogList.GetItemCount()==1 )
2144 m_LogList.SetSelectionMark(0);
2145 m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
2147 theApp.DoWaitCursor(-1);
2148 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2149 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2150 if (bSetFocusToFilterControl)
2151 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2152 UpdateLogInfoLabel();
2153 #endif
2154 } // if (nIDEvent == LOGFILTER_TIMER)
2155 else if (nIDEvent == LOG_HEADER_ORDER_TIMER)
2157 KillTimer(LOG_HEADER_ORDER_TIMER);
2158 CLogOrdering orderDlg;
2159 if (orderDlg.DoModal() == IDOK)
2160 Refresh();
2162 else if (nIDEvent == FILEFILTER_TIMER)
2164 KillTimer(FILEFILTER_TIMER);
2165 FillLogMessageCtrl();
2167 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty() || m_LogList.m_arShownList.GetCount() == 1 && m_LogList.m_bShowWC))));
2168 __super::OnTimer(nIDEvent);
2171 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2175 CTime _time;
2176 m_DateTo.GetTime(_time);
2178 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
2179 if (time.GetTime() != m_LogList.m_To)
2181 m_LogList.m_To = (DWORD)time.GetTime();
2182 SetTimer(LOGFTIME_TIMER, 10, NULL);
2185 catch (...)
2187 CMessageBox::Show(NULL,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
2190 *pResult = 0;
2193 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2198 CTime _time;
2199 m_DateFrom.GetTime(_time);
2201 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
2202 if (time.GetTime() != m_LogList.m_From)
2204 m_LogList.m_From = (DWORD)time.GetTime();
2205 SetTimer(LOGFTIME_TIMER, 10, NULL);
2208 catch (...)
2210 CMessageBox::Show(NULL,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
2213 *pResult = 0;
2216 void CLogDlg::OnCbnSelchangeJumpType()
2218 // reserved for future use
2221 void CLogDlg::OnBnClickedJumpUp()
2223 int sel = m_JumpType.GetCurSel();
2224 if (sel < 0) return;
2225 JumpType jumpType = (JumpType)sel;
2227 if (jumpType == JumpType_History)
2229 GoBack();
2230 return;
2233 CString strValue;
2234 CGitHash hashValue;
2235 int index = -1;
2236 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2237 if (pos)
2239 index = m_LogList.GetNextSelectedItem(pos);
2240 if (index == 0) return;
2242 GitRev* data = (GitRev*)m_LogList.m_arShownList.SafeGetAt(index);
2243 if (jumpType == JumpType_AuthorEmail)
2244 strValue = data->GetAuthorEmail();
2245 else if (jumpType == JumpType_CommitterEmail)
2246 strValue = data->GetCommitterEmail();
2247 else if (jumpType == JumpType_Parent1)
2248 hashValue = data->m_CommitHash;
2249 else if (jumpType == JumpType_Parent2)
2250 hashValue = data->m_CommitHash;
2251 else if (jumpType == JumpType_TagFF)
2252 hashValue = data->m_CommitHash;
2253 else if (jumpType == JumpType_BranchFF)
2254 hashValue = data->m_CommitHash;
2256 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2258 else
2259 return;
2261 while (pos)
2263 index = m_LogList.GetNextSelectedItem(pos);
2264 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2266 m_LogList.SetSelectionMark(-1);
2268 for (int i = index - 1; i >= 0; i--)
2270 bool found = false;
2271 GitRev* data = (GitRev*)m_LogList.m_arShownList.SafeGetAt(i);
2272 if (jumpType == JumpType_AuthorEmail)
2273 found = strValue == data->GetAuthorEmail();
2274 else if (jumpType == JumpType_CommitterEmail)
2275 found = strValue == data->GetCommitterEmail();
2276 else if (jumpType == JumpType_MergePoint)
2277 found = data->ParentsCount() > 1;
2278 else if (jumpType == JumpType_Parent1)
2280 if (data->m_ParentHash.size() > 0)
2281 found = data->m_ParentHash[0] == hashValue;
2283 else if (jumpType == JumpType_Parent2)
2285 if (data->m_ParentHash.size() > 1)
2286 found = data->m_ParentHash[1] == hashValue;
2288 else if (jumpType == JumpType_Tag || jumpType == JumpType_TagFF)
2290 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2291 for (size_t j = 0; j < refList.size(); ++j)
2293 if (refList[j].Left(10) == _T("refs/tags/"))
2295 found = true;
2296 break;
2300 if (found && jumpType == JumpType_TagFF)
2301 found = g_Git.IsFastForward(hashValue, data->m_CommitHash);
2303 else if (jumpType == JumpType_Branch || jumpType == JumpType_BranchFF)
2305 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2306 for (size_t j = 0; j < refList.size(); ++j)
2308 if (refList[j].Left(11) == _T("refs/heads/") || refList[j].Left(13) == _T("refs/remotes/"))
2310 found = true;
2311 break;
2315 if (found && jumpType == JumpType_BranchFF)
2316 found = g_Git.IsFastForward(hashValue, data->m_CommitHash);
2319 if (found)
2321 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
2322 m_LogList.EnsureVisible(i, FALSE);
2323 m_LogList.SetSelectionMark(i);
2324 return;
2328 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN);
2331 void CLogDlg::OnBnClickedJumpDown()
2333 int jumpType = m_JumpType.GetCurSel();
2334 if (jumpType < 0) return;
2336 if (jumpType == JumpType_History)
2338 GoForward();
2339 return;
2342 CString strValue;
2343 CGitHash hashValue;
2344 int index = -1;
2345 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2346 if (pos)
2348 index = m_LogList.GetNextSelectedItem(pos);
2349 if (index == 0) return;
2351 GitRev* data = (GitRev*)m_LogList.m_arShownList.SafeGetAt(index);
2352 if (jumpType == JumpType_AuthorEmail)
2353 strValue = data->GetAuthorEmail();
2354 else if (jumpType == JumpType_CommitterEmail)
2355 strValue = data->GetCommitterEmail();
2356 else if (jumpType == JumpType_Parent1)
2358 if (data->m_ParentHash.size() > 0)
2359 hashValue = data->m_ParentHash.at(0);
2360 else
2361 return;
2363 else if (jumpType == JumpType_Parent2)
2365 if (data->m_ParentHash.size() > 1)
2366 hashValue = data->m_ParentHash.at(1);
2367 else
2368 return;
2370 else if (jumpType == JumpType_TagFF)
2371 hashValue = data->m_CommitHash;
2372 else if (jumpType == JumpType_BranchFF)
2373 hashValue = data->m_CommitHash;
2375 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2377 else
2378 return;
2380 while (pos)
2382 index = m_LogList.GetNextSelectedItem(pos);
2383 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2385 m_LogList.SetSelectionMark(-1);
2387 for (int i = index + 1; i < m_LogList.GetItemCount(); ++i)
2389 bool found = false;
2390 GitRev* data = (GitRev*)m_LogList.m_arShownList.SafeGetAt(i);
2391 if (jumpType == JumpType_AuthorEmail)
2392 found = strValue == data->GetAuthorEmail();
2393 else if (jumpType == JumpType_CommitterEmail)
2394 found = strValue == data->GetCommitterEmail();
2395 else if (jumpType == JumpType_MergePoint)
2396 found = data->ParentsCount() > 1;
2397 else if (jumpType == JumpType_Parent1)
2398 found = data->m_CommitHash == hashValue;
2399 else if (jumpType == JumpType_Parent2)
2400 found = data->m_CommitHash == hashValue;
2401 else if (jumpType == JumpType_Tag || jumpType == JumpType_TagFF)
2403 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2404 for (size_t j = 0; j < refList.size(); ++j)
2406 if (refList[j].Left(10) == _T("refs/tags/"))
2408 found = true;
2409 break;
2413 if (found && jumpType == JumpType_TagFF)
2414 found = g_Git.IsFastForward(data->m_CommitHash, hashValue);
2416 else if (jumpType == JumpType_Branch || jumpType == JumpType_BranchFF)
2418 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2419 for (size_t j = 0; j < refList.size(); ++j)
2421 if (refList[j].Left(11) == _T("refs/heads/") || refList[j].Left(13) == _T("refs/remotes/"))
2423 found = true;
2424 break;
2428 if (found && jumpType == JumpType_BranchFF)
2429 found = g_Git.IsFastForward(data->m_CommitHash, hashValue);
2432 if (found)
2434 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
2435 m_LogList.EnsureVisible(i, FALSE);
2436 m_LogList.SetSelectionMark(i);
2437 return;
2441 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN);
2444 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)
2446 CTGitPathList pathList;
2447 #if 0
2449 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
2451 m_sRepositoryRoot = GetRepositoryRoot(m_path);
2453 if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))
2454 return pathList;
2456 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2457 if (pos != NULL)
2459 while (pos)
2461 int nextpos = m_LogList.GetNextSelectedItem(pos);
2462 if (nextpos >= m_arShownList.GetCount())
2463 continue;
2464 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(nextpos));
2465 LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;
2466 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount(); ++cpPathIndex)
2468 LogChangedPath * cpath = cpatharray->SafeGetAt(cpPathIndex);
2469 if (cpath == NULL)
2470 continue;
2471 CTGitPath path;
2472 if (!bRelativePaths)
2473 path.SetFromGit(m_sRepositoryRoot);
2474 path.AppendPathString(cpath->sPath);
2475 if ((!bUseFilter)||
2476 ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||
2477 (cpath->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0))
2478 pathList.AddPath(path);
2483 pathList.RemoveDuplicates();
2484 #endif
2485 return pathList;
2488 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
2490 #if 0
2491 switch(nSortColumn)
2493 case 0: // Revision
2495 if(bAscending)
2496 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
2497 else
2498 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
2500 break;
2501 case 1: // action
2503 if(bAscending)
2504 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
2505 else
2506 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
2508 break;
2509 case 2: // Author
2511 if(bAscending)
2512 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
2513 else
2514 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
2516 break;
2517 case 3: // Date
2519 if(bAscending)
2520 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
2521 else
2522 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
2524 break;
2525 case 4: // Message or bug id
2526 if (m_bShowBugtraqColumn)
2528 if(bAscending)
2529 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
2530 else
2531 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
2532 break;
2534 // fall through here
2535 case 5: // Message
2537 if(bAscending)
2538 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
2539 else
2540 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
2542 break;
2543 default:
2544 ATLASSERT(0);
2545 break;
2547 #endif
2550 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
2552 if (this->IsThreadRunning())
2553 return; //no sorting while the arrays are filled
2554 #if 0
2555 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2556 const int nColumn = pNMLV->iSubItem;
2557 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
2558 m_nSortColumn = nColumn;
2559 SortByColumn(m_nSortColumn, m_bAscending);
2560 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
2561 SortShownListArray();
2562 m_LogList.Invalidate();
2563 UpdateLogInfoLabel();
2564 #else
2565 UNREFERENCED_PARAMETER(pNMHDR);
2566 #endif
2567 *pResult = 0;
2569 SetTimer(LOG_HEADER_ORDER_TIMER, 10, nullptr);
2572 void CLogDlg::SortShownListArray()
2574 // make sure the shown list still matches the filter after sorting.
2575 OnTimer(LOGFILTER_TIMER);
2576 // clear the selection states
2577 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2578 while (pos)
2580 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
2582 m_LogList.SetSelectionMark(-1);
2585 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
2587 if (control == NULL)
2588 return;
2589 // set the sort arrow
2590 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
2591 HDITEM HeaderItem = {0};
2592 HeaderItem.mask = HDI_FORMAT;
2593 for (int i=0; i<pHeader->GetItemCount(); ++i)
2595 pHeader->GetItem(i, &HeaderItem);
2596 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
2597 pHeader->SetItem(i, &HeaderItem);
2599 if (nColumn >= 0)
2601 pHeader->GetItem(nColumn, &HeaderItem);
2602 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
2603 pHeader->SetItem(nColumn, &HeaderItem);
2607 int CLogDlg::m_nSortColumnPathList = 0;
2608 bool CLogDlg::m_bAscendingPathList = false;
2610 void CLogDlg::OnBnClickedHidepaths()
2612 FillLogMessageCtrl();
2613 m_ChangedFileListCtrl.Invalidate();
2616 void CLogDlg::UpdateLogInfoLabel()
2619 CGitHash rev1 ;
2620 CGitHash rev2 ;
2621 long selectedrevs = 0;
2622 long selectedfiles = 0;
2623 int count = (int)m_LogList.m_arShownList.GetCount();
2624 int start = 0;
2625 if (count)
2627 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.SafeGetAt(0)))->m_CommitHash;
2628 if(this->m_LogList.m_bShowWC && rev1.IsEmpty()&&(count>1))
2629 start = 1;
2630 rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.SafeGetAt(start)))->m_CommitHash;
2631 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_arShownList.GetCount()-1));
2632 rev2 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.SafeGetAt(count-1)))->m_CommitHash;
2633 selectedrevs = m_LogList.GetSelectedCount();
2634 if (selectedrevs)
2635 selectedfiles = m_ChangedFileListCtrl.GetSelectedCount();
2637 CString sTemp;
2638 sTemp.Format(IDS_PROC_LOG_STATS,
2639 count - start,
2640 rev2.ToString().Left(g_Git.GetShortHASHLength()), rev1.ToString().Left(g_Git.GetShortHASHLength()), selectedrevs, selectedfiles);
2642 if(selectedrevs == 1)
2644 CString str=m_ChangedFileListCtrl.GetStatisticsString(true);
2645 str.Replace(_T('\n'), _T(' '));
2646 sTemp += _T("\r\n") + str;
2648 m_sLogInfo = sTemp;
2650 UpdateData(FALSE);
2653 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2655 // the date control should not show the "today" button
2656 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
2657 if (pCtrl)
2658 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
2659 *pResult = 0;
2662 void CLogDlg::OnDtnDropdownDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2664 // the date control should not show the "today" button
2665 CMonthCalCtrl * pCtrl = m_DateTo.GetMonthCalCtrl();
2666 if (pCtrl)
2667 SetWindowLongPtr(pCtrl->GetSafeHwnd(), GWL_STYLE, LONG_PTR(pCtrl->GetStyle() | MCS_NOTODAY));
2668 *pResult = 0;
2671 void CLogDlg::OnSize(UINT nType, int cx, int cy)
2673 __super::OnSize(nType, cx, cy);
2674 //set range
2675 SetSplitterRange();
2678 void CLogDlg::OnRefresh()
2681 m_limit = 0;
2682 this->m_LogProgress.SetPos(0);
2684 Refresh (false);
2688 void CLogDlg::OnFocusFilter()
2690 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2693 void CLogDlg::OnEditCopy()
2695 if (GetFocus() == &m_ChangedFileListCtrl)
2696 CopyChangedSelectionToClipBoard();
2697 else
2698 m_LogList.CopySelectionToClipBoard();
2701 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
2703 // is the URL a relative one?
2704 if (url.Left(2).Compare(_T("^/")) == 0)
2706 // URL is relative to the repository root
2707 CString url1 = m_sRepositoryRoot + url.Mid(1);
2708 TCHAR buf[INTERNET_MAX_URL_LENGTH] = { 0 };
2709 DWORD len = url.GetLength();
2710 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
2711 return CString(buf, len);
2712 return url1;
2714 else if (url[0] == '/')
2716 // URL is relative to the server's hostname
2717 CString sHost;
2718 // find the server's hostname
2719 int schemepos = m_sRepositoryRoot.Find(_T("//"));
2720 if (schemepos >= 0)
2722 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));
2723 CString url1 = sHost + url;
2724 TCHAR buf[INTERNET_MAX_URL_LENGTH] = { 0 };
2725 DWORD len = url.GetLength();
2726 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
2727 return CString(buf, len);
2728 return url1;
2731 return url;
2734 void CLogDlg::ShowGravatar()
2736 m_gravatar.EnableGravatar(m_bShowGravatar);
2737 RemoveAnchor(IDC_MSGVIEW);
2738 if (m_gravatar.IsGravatarEnabled())
2740 RECT rect, rect2;
2741 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(&rect);
2742 ScreenToClient(&rect);
2743 m_gravatar.GetWindowRect(&rect2);
2744 ScreenToClient(&rect2);
2745 rect.right = rect2.left;
2746 GetDlgItem(IDC_MSGVIEW)->MoveWindow(&rect);
2747 m_gravatar.ShowWindow(SW_SHOW);
2749 else
2751 RECT rect, rect2;
2752 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(&rect);
2753 ScreenToClient(&rect);
2754 m_gravatar.GetWindowRect(&rect2);
2755 ScreenToClient(&rect2);
2756 rect.right = rect2.right;
2757 GetDlgItem(IDC_MSGVIEW)->MoveWindow(&rect);
2758 m_gravatar.ShowWindow(SW_HIDE);
2760 AddAnchor(IDC_MSGVIEW, TOP_LEFT, BOTTOM_RIGHT);
2764 void CLogDlg::OnEnChangeSearchedit()
2766 UpdateData();
2767 if (!m_LogList.HasFilterText())
2769 CStoreSelection storeselection(this);
2770 // clear the filter, i.e. make all entries appear
2771 theApp.DoWaitCursor(1);
2772 KillTimer(LOGFILTER_TIMER);
2773 FillLogMessageCtrl(false);
2775 Refresh();
2776 //m_LogList.StartFilter();
2777 #if 0
2778 InterlockedExchange(&m_bNoDispUpdates, TRUE);
2779 m_arShownList.RemoveAll();
2780 for (DWORD i=0; i<m_logEntries.size(); ++i)
2782 if (IsEntryInDateRange(i))
2783 m_arShownList.Add(m_logEntries[i]);
2785 InterlockedExchange(&m_bNoDispUpdates, FALSE);
2786 m_LogList.DeleteAllItems();
2787 m_LogList.SetItemCountEx(ShownCountWithStopped());
2788 m_LogList.RedrawItems(0, ShownCountWithStopped());
2789 m_LogList.SetRedraw(false);
2790 ResizeAllListCtrlCols();
2791 m_LogList.SetRedraw(true);
2792 #endif
2793 theApp.DoWaitCursor(-1);
2794 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2795 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2796 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2797 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
2798 return;
2800 if (Validate(m_LogList.m_sFilterText))
2801 SetTimer(LOGFILTER_TIMER, 1000, NULL);
2802 else
2803 KillTimer(LOGFILTER_TIMER);
2807 void CLogDlg::OnBnClickedAllBranch()
2809 // m_bAllBranch is not auto-toggled by MFC, we have to handle it manually (in order to prevent the indeterminate state)
2811 m_LogList.m_ShowMask &=~ (CGit::LOG_INFO_LOCAL_BRANCHES | CGit::LOG_INFO_ALL_BRANCH);
2813 if (m_bAllBranch)
2815 m_bAllBranch = BST_UNCHECKED;
2816 m_ChangedFileListCtrl.m_sDisplayedBranch = m_LogList.GetRange();
2818 else
2820 m_bAllBranch = BST_CHECKED;
2821 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;
2822 m_ChangedFileListCtrl.m_sDisplayedBranch.Empty();
2825 // need to save value here, so that log dialogs started from now on also have AllBranch activated
2826 m_regbAllBranch = m_bAllBranch;
2828 UpdateData(FALSE);
2830 OnRefresh();
2832 FillLogMessageCtrl(false);
2835 void CLogDlg::OnBnClickedFollowRenames()
2837 if(m_bFollowRenames)
2839 m_LogList.m_ShowMask |= CGit::LOG_INFO_FOLLOW;
2840 m_LogList.m_ShowMask &=~ CGit::LOG_INFO_LOCAL_BRANCHES;
2841 if (m_bAllBranch)
2844 m_bAllBranch = FALSE;
2845 m_LogList.m_ShowMask &=~ CGit::LOG_INFO_ALL_BRANCH;
2849 else
2850 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_FOLLOW;
2852 DialogEnableWindow(IDC_LOG_ALLBRANCH, !m_bFollowRenames);
2853 DialogEnableWindow(IDC_SHOWWHOLEPROJECT, !m_bFollowRenames && !m_path.IsEmpty());
2855 OnRefresh();
2857 FillLogMessageCtrl(false);
2860 void CLogDlg::HandleShowLabels(bool var, int flag)
2862 if (var)
2863 m_LogList.m_ShowRefMask |= flag;
2864 else
2865 m_LogList.m_ShowRefMask &= ~flag;
2867 if ((m_LogList.m_ShowFilter & CGitLogListBase::FILTERSHOW_REFS) && !(m_LogList.m_ShowFilter & CGitLogListBase::FILTERSHOW_ANYCOMMIT))
2869 // Remove commits where labels are not shown.
2870 OnRefresh();
2871 FillLogMessageCtrl(false);
2873 else
2875 // Just redraw
2876 m_LogList.Invalidate();
2880 void CLogDlg::OnBnClickedCompressedGraph()
2882 UpdateData();
2884 if (m_iCompressedGraph == 2)
2885 m_LogList.m_ShowFilter = CGitLogListBase::FILTERSHOW_REFS;
2886 else if (m_iCompressedGraph == 1)
2887 m_LogList.m_ShowFilter = static_cast<CGitLogListBase::FilterShow>(CGitLogListBase::FILTERSHOW_REFS | CGitLogListBase::FILTERSHOW_MERGEPOINTS);
2888 else
2889 m_LogList.m_ShowFilter = CGitLogListBase::FILTERSHOW_ALL;
2891 OnRefresh();
2892 FillLogMessageCtrl(false);
2895 void CLogDlg::OnBnClickedBrowseRef()
2897 CString newRef = CBrowseRefsDlg::PickRef(false, m_LogList.GetRange(), gPickRef_All, true);
2898 if(newRef.IsEmpty())
2899 return;
2901 m_History.AddEntry(newRef);
2902 m_History.Save();
2904 SetRange(newRef);
2906 m_LogList.m_ShowMask &= ~(CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_LOCAL_BRANCHES);
2907 m_bAllBranch = BST_UNCHECKED;
2908 UpdateData(FALSE);
2910 OnRefresh();
2911 FillLogMessageCtrl(false);
2914 void CLogDlg::ShowStartRef()
2916 //Show ref name on top
2917 if(!::IsWindow(m_hWnd))
2918 return;
2919 if (m_LogList.m_ShowMask & (CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_LOCAL_BRANCHES))
2921 switch (m_LogList.m_ShowMask & (CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_LOCAL_BRANCHES))
2923 case CGit::LOG_INFO_ALL_BRANCH:
2924 m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES)));
2925 break;
2927 case CGit::LOG_INFO_LOCAL_BRANCHES:
2928 m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_LOCAL_BRANCHES)));
2929 break;
2932 m_staticRef.Invalidate(TRUE);
2933 m_tooltips.DelTool(GetDlgItem(IDC_STATIC_REF));
2934 return;
2937 CString showStartRef = m_LogList.GetRange();
2938 if (showStartRef.IsEmpty() || showStartRef == _T("HEAD"))
2940 showStartRef.Empty();
2941 //Ref name is HEAD
2942 if (g_Git.Run(L"git.exe symbolic-ref HEAD", &showStartRef, NULL, CP_UTF8))
2943 showStartRef = CString(MAKEINTRESOURCE(IDS_PROC_LOG_NOBRANCH));
2944 showStartRef.Trim(L"\r\n\t ");
2948 showStartRef = g_Git.StripRefName(showStartRef);
2950 m_staticRef.SetWindowText(showStartRef);
2951 CWnd *pWnd = GetDlgItem(IDC_STATIC_REF);
2952 m_tooltips.AddTool(pWnd, showStartRef);
2953 m_staticRef.Invalidate(TRUE);
2956 void CLogDlg::SetRange(const CString& range)
2958 m_LogList.SetRange(range);
2959 m_ChangedFileListCtrl.m_sDisplayedBranch = range;
2961 ShowStartRef();
2964 static void AppendMenuChecked(CMenu &menu, UINT nTextID, UINT_PTR nItemID, BOOL checked = FALSE, BOOL enabled = TRUE)
2966 CString text;
2967 text.LoadString(nTextID);
2968 menu.AppendMenu(MF_STRING | (enabled ? MF_ENABLED : MF_DISABLED) | (checked ? MF_CHECKED : MF_UNCHECKED), nItemID, text);
2971 #define WALKBEHAVIOUR_FIRSTPARENT 1
2972 #define WALKBEHAVIOUR_FOLLOWRENAMES 2
2973 #define WALKBEHAVIOUR_COMPRESSEDGRAPH 3
2974 #define WALKBEHAVIOUR_LABELEDCOMMITS 4
2975 #define WALKBEHAVIOUR_NOMERGES 5
2977 void CLogDlg::OnBnClickedWalkBehaviour()
2979 CMenu popup;
2980 if (popup.CreatePopupMenu())
2982 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_FIRSTPARENT, WALKBEHAVIOUR_FIRSTPARENT, m_bFirstParent);
2983 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_NOMERGES, WALKBEHAVIOUR_NOMERGES, m_bNoMerges);
2984 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_FOLLOWRENAMES, WALKBEHAVIOUR_FOLLOWRENAMES, m_bFollowRenames, !(m_path.IsEmpty() || m_path.IsDirectory()));
2985 popup.AppendMenu(MF_SEPARATOR, NULL);
2986 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_COMPRESSED, WALKBEHAVIOUR_COMPRESSEDGRAPH, m_iCompressedGraph == 1);
2987 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_LABELEDCOMMITS, WALKBEHAVIOUR_LABELEDCOMMITS, m_iCompressedGraph == 2);
2989 m_tooltips.Pop();
2990 RECT rect;
2991 GetDlgItem(IDC_WALKBEHAVIOUR)->GetWindowRect(&rect);
2992 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, rect.left, rect.top, this, 0);
2993 switch (selection)
2995 case WALKBEHAVIOUR_FIRSTPARENT:
2996 m_bFirstParent = !m_bFirstParent;
2997 OnBnClickedFirstParent();
2998 break;
2999 case WALKBEHAVIOUR_NOMERGES:
3000 m_bNoMerges = !m_bNoMerges;
3001 OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges
3002 break;
3003 case WALKBEHAVIOUR_FOLLOWRENAMES:
3004 m_bFollowRenames = !m_bFollowRenames;
3005 OnBnClickedFollowRenames();
3006 break;
3007 case WALKBEHAVIOUR_COMPRESSEDGRAPH:
3008 m_iCompressedGraph = (m_iCompressedGraph == 1 ? 0 : 1);
3009 OnBnClickedCompressedGraph();
3010 break;
3011 case WALKBEHAVIOUR_LABELEDCOMMITS:
3012 m_iCompressedGraph = (m_iCompressedGraph == 2 ? 0 : 2);
3013 OnBnClickedCompressedGraph();
3014 break;
3015 default:
3016 break;
3018 m_bWalkBehavior = (m_bFirstParent || m_bNoMerges || m_bFollowRenames || m_iCompressedGraph);
3019 UpdateData(FALSE);
3023 #define VIEW_HIDEPATHS 1
3024 #define VIEW_GRAYPATHS 2
3025 #define VIEW_SHOWTAGS 3
3026 #define VIEW_SHOWLOCALBRANCHES 4
3027 #define VIEW_SHOWREMOTEBRANCHES 5
3028 #define VIEW_SHOWGRAVATAR 6
3029 #define VIEW_SHOWPATCH 7
3031 void CLogDlg::OnBnClickedView()
3033 CMenu popup;
3034 if (popup.CreatePopupMenu())
3036 AppendMenuChecked(popup, IDS_SHOWFILES_HIDEPATHS, VIEW_HIDEPATHS, m_iHidePaths == 1);
3037 AppendMenuChecked(popup, IDS_SHOWFILES_GRAYPATHS, VIEW_GRAYPATHS, m_iHidePaths == 2);
3038 popup.AppendMenu(MF_SEPARATOR, NULL);
3039 CMenu showLabelsMenu;
3040 if (showLabelsMenu.CreatePopupMenu())
3042 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWTAGLABELS, VIEW_SHOWTAGS, m_bShowTags);
3043 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWLOCALBRANCHLABELS, VIEW_SHOWLOCALBRANCHES, m_bShowLocalBranches);
3044 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWREMOTEBRANCHLABELS, VIEW_SHOWREMOTEBRANCHES, m_bShowRemoteBranches);
3045 popup.AppendMenu(MF_STRING | MF_POPUP, (UINT)showLabelsMenu.m_hMenu, (CString)MAKEINTRESOURCE(IDS_VIEW_LABELS));
3047 popup.AppendMenu(MF_SEPARATOR, NULL);
3048 AppendMenuChecked(popup, IDS_VIEW_SHOWGRAVATAR, VIEW_SHOWGRAVATAR, m_bShowGravatar);
3049 AppendMenuChecked(popup, IDS_MENU_VIEWPATCH, VIEW_SHOWPATCH, IsWindow(this->m_patchViewdlg.m_hWnd));
3051 m_tooltips.Pop();
3052 RECT rect;
3053 GetDlgItem(IDC_VIEW)->GetWindowRect(&rect);
3054 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, rect.left, rect.top, this, 0);
3055 switch (selection)
3057 case VIEW_HIDEPATHS:
3058 if (m_iHidePaths == 1)
3059 m_iHidePaths = 0;
3060 else
3061 m_iHidePaths = 1;
3062 OnBnClickedHidepaths();
3063 break;
3064 case VIEW_GRAYPATHS:
3065 if (m_iHidePaths == 2)
3066 m_iHidePaths = 0;
3067 else
3068 m_iHidePaths = 2;
3069 OnBnClickedHidepaths();
3070 break;
3071 case VIEW_SHOWTAGS:
3072 m_bShowTags = !m_bShowTags;
3073 HandleShowLabels(m_bShowTags, LOGLIST_SHOWTAGS);
3074 break;
3075 case VIEW_SHOWLOCALBRANCHES:
3076 m_bShowLocalBranches = !m_bShowLocalBranches;
3077 HandleShowLabels(m_bShowLocalBranches, LOGLIST_SHOWLOCALBRANCHES);
3078 break;
3079 case VIEW_SHOWREMOTEBRANCHES:
3080 m_bShowRemoteBranches = !m_bShowRemoteBranches;
3081 HandleShowLabels(m_bShowRemoteBranches, LOGLIST_SHOWREMOTEBRANCHES);
3082 break;
3083 case VIEW_SHOWGRAVATAR:
3085 m_bShowGravatar = !m_bShowGravatar;
3086 ShowGravatar();
3087 m_gravatar.Init();
3088 CString email;
3089 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
3090 if (pos)
3092 int selIndex = m_LogList.GetNextSelectedItem(pos);
3093 int moreSel = m_LogList.GetNextSelectedItem(pos);
3094 if (moreSel < 0)
3096 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.SafeGetAt(selIndex));
3097 if (pLogEntry)
3098 email = pLogEntry->GetAuthorEmail();
3101 m_gravatar.LoadGravatar(email);
3102 break;
3104 case VIEW_SHOWPATCH:
3105 TogglePatchView();
3106 break;
3107 default:
3108 break;
3113 void CLogDlg::OnBnClickedFirstParent()
3115 if(this->m_bFirstParent)
3116 m_LogList.m_ShowMask|=CGit::LOG_INFO_FIRST_PARENT;
3117 else
3118 m_LogList.m_ShowMask&=~CGit::LOG_INFO_FIRST_PARENT;
3120 if (m_bNoMerges)
3121 m_LogList.m_ShowMask |= CGit::LOG_INFO_NO_MERGE;
3122 else
3123 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_NO_MERGE;
3125 OnRefresh();
3127 FillLogMessageCtrl(false);
3131 void CLogDlg::OnBnClickShowWholeProject()
3133 this->UpdateData();
3135 if(this->m_bWholeProject)
3137 m_LogList.m_Path.Reset();
3138 SetDlgTitle();
3140 else
3141 m_LogList.m_Path=m_path;
3143 m_regShowWholeProject = m_bWholeProject;
3145 SetDlgTitle();
3147 OnRefresh();
3149 FillLogMessageCtrl(false);
3153 LRESULT CLogDlg::OnRefLogChanged(WPARAM /*wParam*/, LPARAM /*lParam*/)
3155 ShowStartRef();
3156 return 0;
3159 LRESULT CLogDlg::OnTaskbarBtnCreated(WPARAM /*wParam*/, LPARAM /*lParam*/)
3161 m_pTaskbarList.Release();
3162 m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
3163 SetUUIDOverlayIcon(m_hWnd);
3164 return 0;
3167 LRESULT CLogDlg::OnRefreshSelection(WPARAM /*wParam*/, LPARAM /*lParam*/)
3169 // it's enough to deselect, then select again one item of the whole selection
3170 int selMark = m_LogList.GetSelectionMark();
3171 if (selMark >= 0)
3173 m_LogList.SetSelectionMark(selMark);
3174 m_LogList.SetItemState(selMark, 0, LVIS_SELECTED);
3175 m_LogList.SetItemState(selMark, LVIS_SELECTED, LVIS_SELECTED);
3177 return 0;