?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
High DPI fixes for splitters and dialog resising
[TortoiseGit.git] / src / TortoiseProc / CommitDlg.cpp
blob9c6dcf8ff086f2a4b421ac413c7492d994e15721
1 // TortoiseGit - a Windows shell extension for easy version control
2
3 // Copyright (C) 2003-2014 - TortoiseSVN
4 // Copyright (C) 2008-2018 - TortoiseGit
5
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.
10
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.
15
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.
19 //
20 #include "stdafx.h"
21 #include "TortoiseProc.h"
22 #include "CommitDlg.h"
23 #include "MessageBox.h"
24 #include "AppUtils.h"
25 #include "PathUtils.h"
26 #include "Git.h"
27 #include "HistoryDlg.h"
28 #include "Hooks.h"
29 #include "UnicodeUtils.h"
30 #include "../TGitCache/CacheInterface.h"
31 #include "ProgressDlg.h"
32 #include "ShellUpdater.h"
33 #include "Commands/PushCommand.h"
34 #include "COMError.h"
35 #include "Globals.h"
36 #include "SysProgressDlg.h"
37 #include "MassiveGitTask.h"
38 #include "LogDlg.h"
39 #include "BstrSafeVector.h"
40 #include "StringUtils.h"
41 #include "FileTextLines.h"
42 #include "DPIAware.h"
43
44 #ifdef _DEBUG
45 #define new DEBUG_NEW
46 #undef THIS_FILE
47 static char THIS_FILE[] = __FILE__;
48 #endif
49
50 UINT CCommitDlg::WM_AUTOLISTREADY = RegisterWindowMessage(L"TORTOISEGIT_AUTOLISTREADY_MSG");
51 UINT CCommitDlg::WM_UPDATEOKBUTTON = RegisterWindowMessage(L"TORTOISEGIT_COMMIT_UPDATEOKBUTTON");
52 UINT CCommitDlg::WM_UPDATEDATAFALSE = RegisterWindowMessage(L"TORTOISEGIT_COMMIT_UPDATEDATAFALSE");
53
54 IMPLEMENT_DYNAMIC(CCommitDlg, CResizableStandAloneDialog)
55 CCommitDlg::CCommitDlg(CWnd* pParent /*=nullptr*/)
56 : CResizableStandAloneDialog(CCommitDlg::IDD, pParent)
57 , m_bShowUnversioned(FALSE)
58 , m_bBlock(FALSE)
59 , m_bThreadRunning(FALSE)
60 , m_bRunThread(FALSE)
61 , m_pThread(nullptr)
62 , m_bWholeProject(FALSE)
63 , m_bWholeProject2(FALSE)
64 , m_bKeepChangeList(TRUE)
65 , m_bDoNotAutoselectSubmodules(FALSE)
66 , m_itemsCount(0)
67 , m_bSelectFilesForCommit(TRUE)
68 , m_bNoPostActions(FALSE)
69 , m_bAutoClose(false)
70 , m_bSetCommitDateTime(FALSE)
71 , m_bCreateNewBranch(FALSE)
72 , m_bForceCommitAmend(false)
73 , m_bCommitMessageOnly(FALSE)
74 , m_bSetAuthor(FALSE)
75 , m_bCancelled(false)
76 , m_PostCmd(GIT_POSTCOMMIT_CMD_NOTHING)
77 , m_bAmendDiffToLastCommit(FALSE)
78 , m_nPopupPasteListCmd(0)
79 , m_nPopupPasteLastMessage(0)
80 , m_nPopupRecentMessage(0)
81 , m_nPopupPickCommitHash(0)
82 , m_nPopupPickCommitMessage(0)
83 , m_hAccel(nullptr)
84 , m_bWarnDetachedHead(true)
85 , m_hAccelOkButton(nullptr)
86 , m_bDoNotStoreLastSelectedLine(true)
87 , m_bCommitAmend(FALSE)
88 {
89 }
90
91 CCommitDlg::~CCommitDlg()
92 {
93 if (m_hAccelOkButton)
94 DestroyAcceleratorTable(m_hAccelOkButton);
95 delete m_pThread;
96 }
97
98 void CCommitDlg::DoDataExchange(CDataExchange* pDX)
99 {
100 CResizableStandAloneDialog::DoDataExchange(pDX);
101 DDX_Control(pDX, IDC_FILELIST, m_ListCtrl);
102 DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);
103 DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);
104 DDX_Check(pDX, IDC_COMMIT_SETDATETIME, m_bSetCommitDateTime);
105 DDX_Check(pDX, IDC_CHECK_NEWBRANCH, m_bCreateNewBranch);
106 DDX_Text(pDX, IDC_NEWBRANCH, m_sCreateNewBranch);
107 DDX_Text(pDX, IDC_BUGID, m_sBugID);
108 DDX_Text(pDX, IDC_COMMIT_AUTHORDATA, m_sAuthor);
109 DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);
110 DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);
111 DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);
112 DDX_Check(pDX, IDC_NOAUTOSELECTSUBMODULES, m_bDoNotAutoselectSubmodules);
113 DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);
114 DDX_Check(pDX, IDC_COMMIT_MESSAGEONLY, m_bCommitMessageOnly);
115 DDX_Check(pDX,IDC_COMMIT_AMENDDIFF,m_bAmendDiffToLastCommit);
116 DDX_Check(pDX, IDC_COMMIT_SETAUTHOR, m_bSetAuthor);
117 DDX_Control(pDX,IDC_VIEW_PATCH,m_ctrlShowPatch);
118 DDX_Control(pDX, IDC_COMMIT_DATEPICKER, m_CommitDate);
119 DDX_Control(pDX, IDC_COMMIT_TIMEPICKER, m_CommitTime);
120 DDX_Control(pDX, IDC_COMMIT_AS_COMMIT_DATE, m_AsCommitDateCtrl);
121 DDX_Control(pDX, IDC_CHECKALL, m_CheckAll);
122 DDX_Control(pDX, IDC_CHECKNONE, m_CheckNone);
123 DDX_Control(pDX, IDC_CHECKUNVERSIONED, m_CheckUnversioned);
124 DDX_Control(pDX, IDC_CHECKVERSIONED, m_CheckVersioned);
125 DDX_Control(pDX, IDC_CHECKADDED, m_CheckAdded);
126 DDX_Control(pDX, IDC_CHECKDELETED, m_CheckDeleted);
127 DDX_Control(pDX, IDC_CHECKMODIFIED, m_CheckModified);
128 DDX_Control(pDX, IDC_CHECKFILES, m_CheckFiles);
129 DDX_Control(pDX, IDC_CHECKSUBMODULES, m_CheckSubmodules);
130 DDX_Control(pDX, IDOK, m_ctrlOkButton);
131 }
132
133 BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)
134 ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)
135 ON_NOTIFY(SCN_UPDATEUI, IDC_LOGMESSAGE, OnScnUpdateUI)
136 // ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)
137 ON_BN_CLICKED(IDC_BUGTRAQBUTTON, OnBnClickedBugtraqbutton)
138 ON_EN_CHANGE(IDC_LOGMESSAGE, OnEnChangeLogmessage)
139 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED, OnGitStatusListCtrlItemCountChanged)
140 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH, OnGitStatusListCtrlNeedsRefresh)
141 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ADDFILE, OnFileDropped)
142 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_CHECKCHANGED, &CCommitDlg::OnGitStatusListCtrlCheckChanged)
143 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED, &CCommitDlg::OnGitStatusListCtrlItemChanged)
144
145 ON_REGISTERED_MESSAGE(CLinkControl::LK_LINKITEMCLICKED, &CCommitDlg::OnCheck)
146 ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY, OnAutoListReady)
147 ON_REGISTERED_MESSAGE(WM_UPDATEOKBUTTON, OnUpdateOKButton)
148 ON_REGISTERED_MESSAGE(WM_UPDATEDATAFALSE, OnUpdateDataFalse)
149 ON_WM_TIMER()
150 ON_WM_SIZE()
151 ON_WM_SYSCOLORCHANGE()
152 ON_STN_CLICKED(IDC_EXTERNALWARNING, &CCommitDlg::OnStnClickedExternalwarning)
153 ON_BN_CLICKED(IDC_SIGNOFF, &CCommitDlg::OnBnClickedSignOff)
154 ON_BN_CLICKED(IDC_COMMIT_AMEND, &CCommitDlg::OnBnClickedCommitAmend)
155 ON_BN_CLICKED(IDC_COMMIT_MESSAGEONLY, &CCommitDlg::OnBnClickedCommitMessageOnly)
156 ON_BN_CLICKED(IDC_WHOLE_PROJECT, &CCommitDlg::OnBnClickedWholeProject)
157 ON_COMMAND(ID_FOCUS_MESSAGE,&CCommitDlg::OnFocusMessage)
158 ON_COMMAND(ID_FOCUS_FILELIST, OnFocusFileList)
159 ON_STN_CLICKED(IDC_VIEW_PATCH, &CCommitDlg::OnStnClickedViewPatch)
160 ON_WM_MOVE()
161 ON_WM_MOVING()
162 ON_WM_SIZING()
163 ON_NOTIFY(HDN_ITEMCHANGED, 0, &CCommitDlg::OnHdnItemchangedFilelist)
164 ON_BN_CLICKED(IDC_COMMIT_AMENDDIFF, &CCommitDlg::OnBnClickedCommitAmenddiff)
165 ON_BN_CLICKED(IDC_NOAUTOSELECTSUBMODULES, &CCommitDlg::OnBnClickedNoautoselectsubmodules)
166 ON_BN_CLICKED(IDC_COMMIT_SETDATETIME, &CCommitDlg::OnBnClickedCommitSetDateTime)
167 ON_BN_CLICKED(IDC_COMMIT_AS_COMMIT_DATE, &CCommitDlg::OnBnClickedCommitAsCommitDate)
168 ON_BN_CLICKED(IDC_CHECK_NEWBRANCH, &CCommitDlg::OnBnClickedCheckNewBranch)
169 ON_BN_CLICKED(IDC_COMMIT_SETAUTHOR, &CCommitDlg::OnBnClickedCommitSetauthor)
170 END_MESSAGE_MAP()
171
172 int GetCommitTemplate(CString &msg)
173 {
174 CString tplFilename = g_Git.GetConfigValue(L"commit.template");
175 if (tplFilename.IsEmpty())
176 return -1;
177
178 if (tplFilename[0] == L'/')
179 {
180 if (tplFilename.GetLength() >= 3)
181 {
182 // handle "/d/TortoiseGit/tpl.txt" -> "d:/TortoiseGit/tpl.txt"
183 if (tplFilename[2] == L'/')
184 {
185 LPWSTR buf = tplFilename.GetBuffer();
186 buf[0] = buf[1];
187 buf[1] = L':';
188 tplFilename.ReleaseBuffer();
189 }
190 }
191 }
192
193 tplFilename.Replace(L'/', L'\\');
194
195 if (!CGit::LoadTextFile(tplFilename, msg))
196 return -1;
197 return 0;
198 }
199
200 BOOL CCommitDlg::OnInitDialog()
201 {
202 CResizableStandAloneDialog::OnInitDialog();
203 CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
204
205 if (m_sLogMessage.IsEmpty())
206 {
207 if (!m_bForceCommitAmend)
208 GetCommitTemplate(m_sLogMessage);
209
210 CString dotGitPath;
211 GitAdminDir::GetWorktreeAdminDirPath(g_Git.m_CurrentDir, dotGitPath);
212 CGit::LoadTextFile(dotGitPath + L"SQUASH_MSG", m_sLogMessage);
213 CGit::LoadTextFile(dotGitPath + L"MERGE_MSG", m_sLogMessage);
214 }
215 if (!RunStartCommitHook())
216 {
217 EndDialog(IDCANCEL);
218 return FALSE;
219 }
220
221 m_regAddBeforeCommit = CRegDWORD(L"Software\\TortoiseGit\\AddBeforeCommit", TRUE);
222 m_bShowUnversioned = m_regAddBeforeCommit;
223
224 CString regPath(g_Git.m_CurrentDir);
225 regPath.Replace(L':', L'_');
226 m_regShowWholeProject = CRegDWORD(L"Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\" + regPath, FALSE);
227 m_bWholeProject = m_regShowWholeProject;
228
229 m_History.SetMaxHistoryItems((LONG)CRegDWORD(L"Software\\TortoiseGit\\MaxHistoryItems", 25));
230
231 m_regKeepChangelists = CRegDWORD(L"Software\\TortoiseGit\\KeepChangeLists", FALSE);
232 m_bKeepChangeList = m_regKeepChangelists;
233
234 m_regDoNotAutoselectSubmodules = CRegDWORD(L"Software\\TortoiseGit\\DoNotAutoselectSubmodules", FALSE);
235 m_bDoNotAutoselectSubmodules = m_regDoNotAutoselectSubmodules;
236
237 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_COMMITDLG));
238
239 if (m_pathList.IsEmpty())
240 m_bWholeProject2 = true;
241
242 if(this->m_pathList.GetCount() == 1 && m_pathList[0].IsEmpty())
243 m_bWholeProject2 = true;
244
245 SetDlgTitle();
246
247 if (m_bSetAuthor)
248 GetDlgItem(IDC_COMMIT_AUTHORDATA)->ShowWindow(SW_SHOW);
249
250 if (m_bSetCommitDateTime)
251 {
252 m_CommitDate.SetTime(&m_wantCommitTime);
253 m_CommitTime.SetTime(&m_wantCommitTime);
254 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_SHOW);
255 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_SHOW);
256 }
257
258 UpdateData(FALSE);
259
260 m_ListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD | GITSLC_COLDEL, L"CommitDlg", (GITSLC_POPALL ^ (GITSLC_POPCOMMIT | GITSLC_POPSAVEAS | GITSLC_POPPREPAREDIFF)), true, true);
261 m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));
262 m_ListCtrl.SetCancelBool(&m_bCancelled);
263 m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);
264 m_ListCtrl.EnableFileDrop();
265 m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);
266
267 //this->DialogEnableWindow(IDC_COMMIT_AMEND,FALSE);
268 m_ProjectProperties.ReadProps();
269
270 m_cLogMessage.Init(m_ProjectProperties);
271 m_cLogMessage.SetFont(CAppUtils::GetLogFontName(), CAppUtils::GetLogFontSize());
272 m_cLogMessage.RegisterContextMenuHandler(this);
273 std::map<int, UINT> icons;
274 icons[AUTOCOMPLETE_SPELLING] = IDI_SPELL;
275 icons[AUTOCOMPLETE_FILENAME] = IDI_FILE;
276 icons[AUTOCOMPLETE_PROGRAMCODE] = IDI_CODE;
277 icons[AUTOCOMPLETE_SNIPPET] = IDI_SNIPPET;
278 m_cLogMessage.SetIcon(icons);
279
280 OnEnChangeLogmessage();
281
282 m_tooltips.AddTool(IDC_EXTERNALWARNING, IDS_COMMITDLG_EXTERNALS);
283 m_tooltips.AddTool(IDC_COMMIT_AMEND,IDS_COMMIT_AMEND_TT);
284 m_tooltips.AddTool(IDC_MERGEACTIVE, IDC_MERGEACTIVE_TT);
285 m_tooltips.AddTool(IDC_COMMIT_MESSAGEONLY, IDS_COMMIT_MESSAGEONLY_TT);
286 m_tooltips.AddTool(IDC_COMMIT_AS_COMMIT_DATE, IDS_COMMIT_AS_COMMIT_DATE_TT);
287
288 CBugTraqAssociations bugtraq_associations;
289 bugtraq_associations.Load(m_ProjectProperties.GetProviderUUID(), m_ProjectProperties.sProviderParams);
290
291 if (bugtraq_associations.FindProvider(g_Git.m_CurrentDir, &m_bugtraq_association))
292 {
293 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
294 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
295
296 CComPtr<IBugTraqProvider> pProvider;
297 HRESULT hr = pProvider.CoCreateInstance(m_bugtraq_association.GetProviderClass());
298 if (SUCCEEDED(hr))
299 {
300 m_BugTraqProvider = pProvider;
301 ATL::CComBSTR temp;
302 ATL::CComBSTR parameters(m_bugtraq_association.GetParameters());
303 if (SUCCEEDED(hr = pProvider->GetLinkText(GetSafeHwnd(), parameters, &temp)))
304 {
305 SetDlgItemText(IDC_BUGTRAQBUTTON, temp);
306 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(TRUE);
307 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_SHOW);
308 }
309 }
310
311 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
312 }
313 else if (!m_ProjectProperties.sMessage.IsEmpty())
314 {
315 GetDlgItem(IDC_BUGID)->ShowWindow(SW_SHOW);
316 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_SHOW);
317 if (!m_ProjectProperties.sLabel.IsEmpty())
318 SetDlgItemText(IDC_BUGIDLABEL, m_ProjectProperties.sLabel);
319 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);
320 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);
321 GetDlgItem(IDC_BUGID)->SetFocus();
322 CString sBugID = m_ProjectProperties.GetBugIDFromLog(m_sLogMessage);
323 if (!sBugID.IsEmpty())
324 {
325 SetDlgItemText(IDC_BUGID, sBugID);
326 }
327 }
328 else
329 {
330 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
331 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
332 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);
333 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);
334 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
335 }
336
337 if (!m_sLogMessage.IsEmpty())
338 {
339 m_cLogMessage.SetText(m_sLogMessage);
340 m_cLogMessage.Call(SCI_SETCURRENTPOS, 0);
341 m_cLogMessage.Call(SCI_SETSEL, 0, 0);
342 }
343
344 GetWindowText(m_sWindowTitle);
345
346 AdjustControlSize(IDC_SHOWUNVERSIONED);
347 AdjustControlSize(IDC_WHOLE_PROJECT);
348 AdjustControlSize(IDC_CHECK_NEWBRANCH);
349 AdjustControlSize(IDC_COMMIT_AMEND);
350 AdjustControlSize(IDC_COMMIT_MESSAGEONLY);
351 AdjustControlSize(IDC_COMMIT_AMENDDIFF);
352 AdjustControlSize(IDC_COMMIT_SETDATETIME);
353 AdjustControlSize(IDC_COMMIT_SETAUTHOR);
354 AdjustControlSize(IDC_NOAUTOSELECTSUBMODULES);
355 AdjustControlSize(IDC_KEEPLISTS);
356 AdjustControlSize(IDC_COMMIT_AS_COMMIT_DATE);
357
358 // line up all controls and adjust their sizes.
359 #define LINKSPACING 9
360 RECT rc = AdjustControlSize(IDC_SELECTLABEL);
361 rc.right -= 15; // AdjustControlSize() adds 20 pixels for the checkbox/radio button bitmap, but this is a label...
362 rc = AdjustStaticSize(IDC_CHECKALL, rc, LINKSPACING);
363 rc = AdjustStaticSize(IDC_CHECKNONE, rc, LINKSPACING);
364 rc = AdjustStaticSize(IDC_CHECKUNVERSIONED, rc, LINKSPACING);
365 rc = AdjustStaticSize(IDC_CHECKVERSIONED, rc, LINKSPACING);
366 rc = AdjustStaticSize(IDC_CHECKADDED, rc, LINKSPACING);
367 rc = AdjustStaticSize(IDC_CHECKDELETED, rc, LINKSPACING);
368 rc = AdjustStaticSize(IDC_CHECKMODIFIED, rc, LINKSPACING);
369 rc = AdjustStaticSize(IDC_CHECKFILES, rc, LINKSPACING);
370 rc = AdjustStaticSize(IDC_CHECKSUBMODULES, rc, LINKSPACING);
371
372 GetClientRect(m_DlgOrigRect);
373 m_cLogMessage.GetClientRect(m_LogMsgOrigRect);
374
375 AddAnchor(IDC_COMMITLABEL, TOP_LEFT, TOP_RIGHT);
376 AddAnchor(IDC_BUGIDLABEL, TOP_RIGHT);
377 AddAnchor(IDC_BUGID, TOP_RIGHT);
378 AddAnchor(IDC_BUGTRAQBUTTON, TOP_RIGHT);
379 AddAnchor(IDC_COMMIT_TO, TOP_LEFT, TOP_RIGHT);
380 AddAnchor(IDC_CHECK_NEWBRANCH, TOP_RIGHT);
381 AddAnchor(IDC_NEWBRANCH, TOP_LEFT, TOP_RIGHT);
382 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
383 // AddAnchor(IDC_HISTORY, TOP_LEFT);
384 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
385 AddAnchor(IDC_SIGNOFF, TOP_RIGHT);
386 AddAnchor(IDC_VIEW_PATCH, BOTTOM_RIGHT);
387 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
388 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
389 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
390 AddAnchor(IDC_SHOWUNVERSIONED, BOTTOM_LEFT);
391 AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);
392 AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);
393 AddAnchor(IDC_TEXT_INFO, TOP_RIGHT);
394 AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);
395 AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);
396 AddAnchor(IDC_NOAUTOSELECTSUBMODULES, BOTTOM_LEFT);
397 AddAnchor(IDOK, BOTTOM_RIGHT);
398 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
399 AddAnchor(IDHELP, BOTTOM_RIGHT);
400 AddAnchor(IDC_MERGEACTIVE, BOTTOM_RIGHT);
401 AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
402 AddAnchor(IDC_COMMIT_MESSAGEONLY, BOTTOM_LEFT);
403 AddAnchor(IDC_COMMIT_AMENDDIFF,TOP_LEFT);
404 AddAnchor(IDC_COMMIT_SETDATETIME,TOP_LEFT);
405 AddAnchor(IDC_COMMIT_DATEPICKER,TOP_LEFT);
406 AddAnchor(IDC_COMMIT_TIMEPICKER,TOP_LEFT);
407 AddAnchor(IDC_COMMIT_AS_COMMIT_DATE, TOP_LEFT);
408 AddAnchor(IDC_COMMIT_SETAUTHOR, TOP_LEFT);
409 AddAnchor(IDC_COMMIT_AUTHORDATA, TOP_LEFT, TOP_RIGHT);
410
411 AddAnchor(IDC_SELECTLABEL, TOP_LEFT);
412 AddAnchor(IDC_CHECKALL, TOP_LEFT);
413 AddAnchor(IDC_CHECKNONE, TOP_LEFT);
414 AddAnchor(IDC_CHECKUNVERSIONED, TOP_LEFT);
415 AddAnchor(IDC_CHECKVERSIONED, TOP_LEFT);
416 AddAnchor(IDC_CHECKADDED, TOP_LEFT);
417 AddAnchor(IDC_CHECKDELETED, TOP_LEFT);
418 AddAnchor(IDC_CHECKMODIFIED, TOP_LEFT);
419 AddAnchor(IDC_CHECKFILES, TOP_LEFT);
420 AddAnchor(IDC_CHECKSUBMODULES, TOP_LEFT);
421
422 if (GetExplorerHWND())
423 CenterWindow(CWnd::FromHandle(GetExplorerHWND()));
424 EnableSaveRestore(L"CommitDlg");
425 DWORD yPos = CRegDWORD(L"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer");
426 RECT rcDlg, rcLogMsg, rcFileList;
427 GetClientRect(&rcDlg);
428 m_cLogMessage.GetWindowRect(&rcLogMsg);
429 ScreenToClient(&rcLogMsg);
430 m_ListCtrl.GetWindowRect(&rcFileList);
431 ScreenToClient(&rcFileList);
432 if (yPos)
433 {
434 RECT rectSplitter;
435 m_wndSplitter.GetWindowRect(&rectSplitter);
436 ScreenToClient(&rectSplitter);
437 int delta = yPos - rectSplitter.top;
438 if ((rcLogMsg.bottom + delta > rcLogMsg.top) && (rcLogMsg.bottom + delta < rcFileList.bottom - CDPIAware::Instance().ScaleY(30)))
439 {
440 m_wndSplitter.SetWindowPos(nullptr, rectSplitter.left, yPos, 0, 0, SWP_NOSIZE);
441 DoSize(delta);
442 Invalidate();
443 }
444 }
445
446 SetSplitterRange();
447
448 if (m_bForceCommitAmend || m_bCommitAmend)
449 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_SHOW);
450
451 // add all directories to the watcher
452 /*
453 for (int i=0; i<m_pathList.GetCount(); ++i)
454 {
455 if (m_pathList[i].IsDirectory())
456 m_pathwatcher.AddPath(m_pathList[i]);
457 }*/
458
459 StartStatusThread();
460 CRegDWORD err = CRegDWORD(L"Software\\TortoiseGit\\ErrorOccurred", FALSE);
461 CRegDWORD historyhint = CRegDWORD(L"Software\\TortoiseGit\\HistoryHintShown", FALSE);
462 if ((((DWORD)err)!=FALSE)&&((((DWORD)historyhint)==FALSE)))
463 {
464 historyhint = TRUE;
465 // ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);
466 }
467 err = FALSE;
468
469 this->m_ctrlShowPatch.SetURL(CString());
470
471 if (g_Git.GetConfigValueBool(L"tgit.commitshowpatch"))
472 OnStnClickedViewPatch();
473
474 if (CTGitPath(g_Git.m_CurrentDir).IsMergeActive())
475 {
476 DialogEnableWindow(IDC_CHECK_NEWBRANCH, FALSE);
477 m_bCreateNewBranch = FALSE;
478 GetDlgItem(IDC_MERGEACTIVE)->ShowWindow(SW_SHOW);
479 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_COMMIT_MERGE_HINT, IDS_APPNAME, MB_ICONINFORMATION, L"CommitMergeHint", IDS_MSGBOX_DONOTSHOWAGAIN);
480 }
481
482 PrepareOkButton();
483
484 return FALSE; // return TRUE unless you set the focus to a control
485 // EXCEPTION: OCX Property Pages should return FALSE
486 }
487
488 void CCommitDlg::PrepareOkButton()
489 {
490 if (m_bNoPostActions)
491 return;
492 m_regLastAction = CRegDWORD(L"Software\\TortoiseGit\\CommitLastAction", 0);
493 int i = 0;
494 for (auto labelId : { IDS_COMMIT_COMMIT, IDS_COMMIT_RECOMMIT, IDS_COMMIT_COMMITPUSH })
495 {
496 ++i;
497 CString label;
498 label.LoadString(labelId);
499 m_ctrlOkButton.AddEntry(label);
500 TCHAR accellerator = CStringUtils::GetAccellerator(label);
501 if (accellerator == L'\0')
502 continue;
503 ++m_accellerators[accellerator].cnt;
504 if (m_accellerators[accellerator].cnt > 1)
505 m_accellerators[accellerator].id = -1;
506 else
507 m_accellerators[accellerator].id = i - 1;
508 }
509 m_ctrlOkButton.SetCurrentEntry(m_regLastAction);
510 if (m_accellerators.size())
511 {
512 LPACCEL lpaccelNew = (LPACCEL)LocalAlloc(LPTR, m_accellerators.size() * sizeof(ACCEL));
513 if (!lpaccelNew)
514 return;
515 SCOPE_EXIT{ LocalFree(lpaccelNew); };
516 i = 0;
517 for (auto& entry : m_accellerators)
518 {
519 lpaccelNew[i].cmd = (WORD)(WM_USER + 1 + entry.second.id);
520 lpaccelNew[i].fVirt = FVIRTKEY | FALT;
521 lpaccelNew[i].key = entry.first;
522 entry.second.wmid = lpaccelNew[i].cmd;
523 ++i;
524 }
525 m_hAccelOkButton = CreateAcceleratorTable(lpaccelNew, (int)m_accellerators.size());
526 }
527 }
528
529 static bool UpdateIndex(CMassiveGitTask &mgt, CSysProgressDlg &sysProgressDlg, int progress, int maxProgress)
530 {
531 if (mgt.IsListEmpty())
532 return true;
533
534 if (sysProgressDlg.HasUserCancelled())
535 return false;
536
537 if (sysProgressDlg.IsVisible())
538 {
539 sysProgressDlg.SetTitle(IDS_APPNAME);
540 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_PREPARECOMMIT)));
541 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_UPDATEINDEX)));
542 sysProgressDlg.SetProgress(progress, maxProgress);
543 AfxGetThread()->PumpMessage(); // process messages, in order to avoid freezing
544 }
545
546 BOOL cancel = FALSE;
547 return mgt.Execute(cancel);
548 }
549
550 static void DoPush(HWND hWnd)
551 {
552 CString head;
553 if (g_Git.GetCurrentBranchFromFile(g_Git.m_CurrentDir, head))
554 return;
555 CString remote, remotebranch;
556 g_Git.GetRemotePushBranch(head, remote, remotebranch);
557 if (remote.IsEmpty() || remotebranch.IsEmpty())
558 {
559 CAppUtils::Push(hWnd);
560 return;
561 }
562
563 CAppUtils::DoPush(hWnd, CAppUtils::IsSSHPutty(), false, false, false, false, false, false, head, remote, remotebranch, false, 0);
564 }
565
566 void CCommitDlg::OnOK()
567 {
568 if (m_bBlock)
569 return;
570 if (m_bThreadRunning)
571 {
572 m_bCancelled = true;
573 StopStatusThread();
574 }
575 this->UpdateData();
576
577 auto locker(m_ListCtrl.AcquireReadLock());
578
579 if (m_ListCtrl.GetConflictedCount() != 0 && CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROGRS_CONFLICTSOCCURRED, IDS_APPNAME, 1, IDI_EXCLAMATION, IDS_OKBUTTON, IDS_IGNOREBUTTON, 0, L"CommitWarnOnUnresolved") == 1)
580 {
581 auto pos = m_ListCtrl.GetFirstSelectedItemPosition();
582 while (pos)
583 m_ListCtrl.SetItemState(m_ListCtrl.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
584 int nListItems = m_ListCtrl.GetItemCount();
585 for (int i = 0; i < nListItems; ++i)
586 {
587 auto entry = m_ListCtrl.GetListEntry(i);
588 if (entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
589 {
590 m_ListCtrl.EnsureVisible(i, FALSE);
591 m_ListCtrl.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
592 m_ListCtrl.SetFocus();
593 return;
594 }
595 }
596 return;
597 }
598
599 if (m_bCreateNewBranch)
600 {
601 if (!g_Git.IsBranchNameValid(m_sCreateNewBranch))
602 {
603 ShowEditBalloon(IDC_NEWBRANCH, IDS_B_T_NOTEMPTY, IDS_ERR_ERROR, TTI_ERROR);
604 return;
605 }
606 if (g_Git.BranchTagExists(m_sCreateNewBranch))
607 {
608 // branch already exists
609 CString msg;
610 msg.LoadString(IDS_B_EXISTS);
611 msg += L' ' + CString(MAKEINTRESOURCE(IDS_B_DELETEORDIFFERENTNAME));
612 ShowEditBalloon(IDC_NEWBRANCH, msg, CString(MAKEINTRESOURCE(IDS_WARN_WARNING)));
613 return;
614 }
615 if (g_Git.BranchTagExists(m_sCreateNewBranch, false))
616 {
617 // tag with the same name exists -> shortref is ambiguous
618 if (CMessageBox::Show(m_hWnd, IDS_B_SAMETAGNAMEEXISTS, IDS_APPNAME, 2, IDI_EXCLAMATION, IDS_CONTINUEBUTTON, IDS_ABORTBUTTON) == 2)
619 return;
620 }
621 }
622
623 CString id;
624 GetDlgItemText(IDC_BUGID, id);
625 if (!m_ProjectProperties.CheckBugID(id))
626 {
627 ShowEditBalloon(IDC_BUGID, IDS_COMMITDLG_ONLYNUMBERS, IDS_ERR_ERROR, TTI_ERROR);
628 return;
629 }
630 m_sLogMessage = m_cLogMessage.GetText();
631 if ( m_sLogMessage.IsEmpty() )
632 {
633 // no message entered, go round again
634 CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOMESSAGE, IDS_APPNAME, MB_OK | MB_ICONERROR);
635 return;
636 }
637 if ((m_ProjectProperties.bWarnIfNoIssue) && (id.IsEmpty() && !m_ProjectProperties.HasBugID(m_sLogMessage)))
638 {
639 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOISSUEWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)
640 return;
641 }
642
643 if (m_ProjectProperties.bWarnNoSignedOffBy == TRUE && m_cLogMessage.GetText().Find(GetSignedOffByLine()) == -1)
644 {
645 UINT retval = CMessageBox::Show(this->m_hWnd, IDS_PROC_COMMIT_NOSIGNOFFLINE, IDS_APPNAME, 1, IDI_WARNING, IDS_PROC_COMMIT_ADDSIGNOFFBUTTON, IDS_PROC_COMMIT_NOADDSIGNOFFBUTTON, IDS_ABORTBUTTON);
646 if (retval == 1)
647 {
648 OnBnClickedSignOff();
649 m_sLogMessage = m_cLogMessage.GetText();
650 }
651 else if (retval == 3)
652 return;
653 }
654
655 if (CAppUtils::MessageContainsConflictHints(GetSafeHwnd(), m_sLogMessage))
656 return;
657
658 if (CHooks::Instance().IsHookPresent(pre_commit_hook, g_Git.m_CurrentDir)) {
659 DWORD exitcode = 0xFFFFFFFF;
660 CString error;
661 CTGitPathList list;
662 m_ListCtrl.WriteCheckedNamesToPathList(list);
663 if (CHooks::Instance().PreCommit(g_Git.m_CurrentDir, list, m_sLogMessage, exitcode, error))
664 {
665 if (exitcode)
666 {
667 CString temp;
668 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
669 MessageBox(temp, L"TortoiseGit", MB_ICONERROR);
670 return;
671 }
672 }
673 }
674
675 int nListItems = m_ListCtrl.GetItemCount();
676 for (int i = 0; i < nListItems && !m_bCommitMessageOnly; ++i)
677 {
678 auto entry = m_ListCtrl.GetListEntry(i);
679 if (!entry->m_Checked || !entry->IsDirectory())
680 continue;
681
682 bool dirty = false;
683 if (entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
684 {
685 CGit subgit;
686 subgit.m_CurrentDir = g_Git.CombinePath(entry);
687 CString subcmdout;
688 subgit.Run(L"git.exe status --porcelain", &subcmdout, CP_UTF8);
689 dirty = !subcmdout.IsEmpty();
690 }
691 else
692 {
693 CString cmd, cmdout;
694 cmd.Format(L"git.exe diff -- \"%s\"", entry->GetWinPath());
695 g_Git.Run(cmd, &cmdout, CP_UTF8);
696 dirty = CStringUtils::EndsWith(cmdout, L"-dirty\n");
697 }
698
699 if (dirty)
700 {
701 CString message;
702 message.Format(IDS_COMMITDLG_SUBMODULEDIRTY, (LPCTSTR)entry->GetGitPathString());
703 int result = CMessageBox::Show(m_hWnd, message, L"TortoiseGit", 1, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_COMMIT)), CString(MAKEINTRESOURCE(IDS_MSGBOX_IGNORE)), CString(MAKEINTRESOURCE(IDS_MSGBOX_CANCEL)));
704 if (result == 1)
705 {
706 CString cmdCommit;
707 cmdCommit.Format(L"/command:commit /path:\"%s\\%s\"", (LPCTSTR)g_Git.m_CurrentDir, entry->GetWinPath());
708 CAppUtils::RunTortoiseGitProc(cmdCommit);
709 return;
710 }
711 else if (result == 2)
712 continue;
713 else
714 return;
715 }
716 }
717
718 if (!m_bCommitMessageOnly)
719 m_ListCtrl.WriteCheckedNamesToPathList(m_selectedPathList);
720 m_pathwatcher.Stop();
721 InterlockedExchange(&m_bBlock, TRUE);
722 //first add all the unversioned files the user selected
723 //and check if all versioned files are selected
724 int nchecked = 0;
725
726 CMassiveGitTask mgtReAddAfterCommit(L"add --ignore-errors -f");
727 CMassiveGitTask mgtReDelAfterCommit(L"rm --cached --ignore-unmatch");
728
729 CString cmd;
730 CString out;
731
732 bool bAddSuccess=true;
733 bool bCloseCommitDlg=false;
734
735 CSysProgressDlg sysProgressDlg;
736 if (nListItems >= 25)
737 {
738 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_PREPARECOMMIT)));
739 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_UPDATEINDEX)));
740 sysProgressDlg.SetTime(true);
741 sysProgressDlg.SetShowProgressBar(true);
742 sysProgressDlg.ShowModal(this, true);
743 }
744
745 CBlockCacheForPath cacheBlock(g_Git.m_CurrentDir);
746 ULONGLONG currentTicks = GetTickCount64();
747
748 if (g_Git.UsingLibGit2(CGit::GIT_CMD_COMMIT_UPDATE_INDEX))
749 {
750 bAddSuccess = false;
751 do
752 {
753 CAutoRepository repository(g_Git.GetGitRepository());
754 if (!repository)
755 {
756 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L"Could not open repository."), L"TortoiseGit", MB_OK | MB_ICONERROR);
757 break;
758 }
759
760 CGitHash revHash;
761 CString revRef = L"HEAD";
762 if (m_bCommitAmend && !m_bAmendDiffToLastCommit)
763 revRef = L"HEAD~1";
764 if (CGit::GetHash(repository, revHash, revRef))
765 {
766 MessageBox(g_Git.GetLibGit2LastErr(L"Could not get HEAD hash after committing."), L"TortoiseGit", MB_ICONERROR);
767 break;
768 }
769
770 CAutoCommit commit;
771 if (!revHash.IsEmpty() && git_commit_lookup(commit.GetPointer(), repository, (const git_oid*)revHash.m_hash))
772 {
773 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L"Could not get last commit."), L"TortoiseGit", MB_OK | MB_ICONERROR);
774 break;
775 }
776
777 CAutoTree tree;
778 if (!revHash.IsEmpty() && git_commit_tree(tree.GetPointer(), commit))
779 {
780 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L"Could not read tree of commit."), L"TortoiseGit", MB_OK | MB_ICONERROR);
781 break;
782 }
783
784 CAutoIndex index;
785 if (git_repository_index(index.GetPointer(), repository))
786 {
787 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L"Could not get the repository index."), L"TortoiseGit", MB_OK | MB_ICONERROR);
788 break;
789 }
790
791 CAutoIndex indexOld;
792 if (!revHash.IsEmpty() && (git_index_new(indexOld.GetPointer()) || git_index_read_tree(indexOld, tree)))
793 {
794 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L"Could not read the tree into the index."), L"TortoiseGit", MB_OK | MB_ICONERROR);
795 break;
796 }
797
798 bAddSuccess = true;
799
800 for (int j = 0; j < nListItems; ++j)
801 {
802 auto entry = m_ListCtrl.GetListEntry(j);
803
804 if (sysProgressDlg.IsVisible())
805 {
806 if (GetTickCount64() - currentTicks > 1000UL || j == nListItems - 1 || j == 0)
807 {
808 sysProgressDlg.SetLine(2, entry->GetGitPathString(), true);
809 sysProgressDlg.SetProgress(j, nListItems);
810 AfxGetThread()->PumpMessage(); // process messages, in order to avoid freezing; do not call this too often: this takes time!
811 currentTicks = GetTickCount64();
812 }
813 }
814
815 CStringA filePathA = CUnicodeUtils::GetMulti(entry->GetGitPathString(), CP_UTF8).TrimRight(L'/');
816
817 if (entry->m_Checked && !m_bCommitMessageOnly)
818 {
819 if (entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
820 git_index_remove_bypath(index, filePathA); // ignore error
821 else
822 {
823 if (git_index_add_bypath(index, filePathA))
824 {
825 bAddSuccess = false;
826 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L"Could not add \"" + entry->GetGitPathString() + L"\" to index."), L"TortoiseGit", MB_OK | MB_ICONERROR);
827 break;
828 }
829 }
830
831 if ((entry->m_Action & CTGitPath::LOGACTIONS_REPLACED) && !entry->GetGitOldPathString().IsEmpty())
832 git_index_remove_bypath(index, CUnicodeUtils::GetUTF8(entry->GetGitOldPathString())); // ignore error
833
834 ++nchecked;
835 }
836 else
837 {
838 if (entry->m_Action & CTGitPath::LOGACTIONS_ADDED || entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
839 {
840 git_index_remove_bypath(index, filePathA); // ignore error
841 mgtReAddAfterCommit.AddFile(*entry);
842
843 if (entry->m_Action & CTGitPath::LOGACTIONS_REPLACED && !entry->GetGitOldPathString().IsEmpty())
844 {
845 const git_index_entry* oldIndexEntry = nullptr;
846 if ((oldIndexEntry = git_index_get_bypath(indexOld, CUnicodeUtils::GetUTF8(entry->GetGitOldPathString()), 0)) == nullptr || git_index_add(index, oldIndexEntry))
847 {
848 bAddSuccess = false;
849 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L"Could not reset \"" + entry->GetGitOldPathString() + L"\" to old index entry."), L"TortoiseGit", MB_OK | MB_ICONERROR);
850 break;
851 }
852 mgtReDelAfterCommit.AddFile(entry->GetGitOldPathString());
853 }
854 }
855 else if (!(entry->m_Action & CTGitPath::LOGACTIONS_UNVER))
856 {
857 const git_index_entry* oldIndexEntry = nullptr;
858 if ((oldIndexEntry = git_index_get_bypath(indexOld, filePathA, 0)) == nullptr || git_index_add(index, oldIndexEntry))
859 {
860 bAddSuccess = false;
861 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L"Could not reset \"" + entry->GetGitPathString() + L"\" to old index entry."), L"TortoiseGit", MB_OK | MB_ICONERROR);
862 break;
863 }
864 if (entry->m_Action & CTGitPath::LOGACTIONS_DELETED && !(entry->m_Action & CTGitPath::LOGACTIONS_MISSING))
865 mgtReDelAfterCommit.AddFile(entry->GetGitPathString());
866 }
867 }
868
869 if (sysProgressDlg.HasUserCancelled())
870 {
871 bAddSuccess = false;
872 break;
873 }
874 }
875 if (bAddSuccess && git_index_write(index))
876 bAddSuccess = false;
877
878 for (int j = 0; bAddSuccess && j < nListItems; ++j)
879 CShellUpdater::Instance().AddPathForUpdate(*m_ListCtrl.GetListEntry(j));
880 } while (0);
881 }
882 else
883 {
884 // ***************************************************
885 // ATTENTION: Similar code in RebaseDlg.cpp!!!
886 // ***************************************************
887 CMassiveGitTask mgtAdd(L"add -f");
888 CMassiveGitTask mgtUpdateIndexForceRemove(L"update-index --force-remove");
889 CMassiveGitTask mgtUpdateIndex(L"update-index");
890 CMassiveGitTask mgtRm(L"rm --ignore-unmatch");
891 CMassiveGitTask mgtRmFCache(L"rm -f --cache");
892 CString resetCmd = L"reset";
893 if (m_bCommitAmend && !m_bAmendDiffToLastCommit)
894 resetCmd += L" HEAD~1";;
895 CMassiveGitTask mgtReset(resetCmd, TRUE, true);
896 for (int j = 0; j < nListItems; ++j)
897 {
898 auto entry = m_ListCtrl.GetListEntry(j);
899
900 if (entry->m_Checked && !m_bCommitMessageOnly)
901 {
902 if ((entry->m_Action & CTGitPath::LOGACTIONS_UNVER) || (entry->IsDirectory() && !(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)))
903 mgtAdd.AddFile(entry->GetGitPathString());
904 else if (entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
905 mgtUpdateIndexForceRemove.AddFile(entry->GetGitPathString());
906 else
907 mgtUpdateIndex.AddFile(entry->GetGitPathString());
908
909 if ((entry->m_Action & CTGitPath::LOGACTIONS_REPLACED) && !entry->GetGitOldPathString().IsEmpty())
910 mgtRm.AddFile(entry->GetGitOldPathString());
911
912 ++nchecked;
913 }
914 else
915 {
916 if (entry->m_Action & CTGitPath::LOGACTIONS_ADDED || entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
917 { //To init git repository, there are not HEAD, so we can use git reset command
918 mgtRmFCache.AddFile(entry->GetGitPathString());
919 mgtReAddAfterCommit.AddFile(*entry);
920
921 if (entry->m_Action & CTGitPath::LOGACTIONS_REPLACED && !entry->GetGitOldPathString().IsEmpty())
922 {
923 mgtReset.AddFile(entry->GetGitOldPathString());
924 mgtReDelAfterCommit.AddFile(entry->GetGitOldPathString());
925 }
926 }
927 else if (!(entry->m_Action & CTGitPath::LOGACTIONS_UNVER))
928 {
929 mgtReset.AddFile(entry->GetGitPathString());
930 if (entry->m_Action & CTGitPath::LOGACTIONS_DELETED && !(entry->m_Action & CTGitPath::LOGACTIONS_MISSING))
931 mgtReDelAfterCommit.AddFile(entry->GetGitPathString());
932 }
933 }
934
935 if (sysProgressDlg.HasUserCancelled())
936 {
937 bAddSuccess = false;
938 break;
939 }
940 }
941
942 CMassiveGitTask tasks[] = { mgtAdd, mgtUpdateIndexForceRemove, mgtUpdateIndex, mgtRm, mgtRmFCache, mgtReset };
943 int progress = 0, maxProgress = 0;
944 for (int j = 0; j < _countof(tasks); ++j)
945 maxProgress += tasks[j].GetListCount();
946 for (int j = 0; j < _countof(tasks); ++j)
947 bAddSuccess = bAddSuccess && UpdateIndex(tasks[j], sysProgressDlg, progress += tasks[j].GetListCount(), maxProgress);
948
949 if (sysProgressDlg.HasUserCancelled())
950 bAddSuccess = false;
951
952 for (int j = 0; bAddSuccess && j < nListItems; ++j)
953 CShellUpdater::Instance().AddPathForUpdate(*m_ListCtrl.GetListEntry(j));
954 }
955
956 if (sysProgressDlg.HasUserCancelled())
957 bAddSuccess = false;
958
959 sysProgressDlg.Stop();
960
961 if (bAddSuccess && m_bCreateNewBranch)
962 {
963 if (g_Git.Run(L"git.exe branch " + m_sCreateNewBranch, &out, CP_UTF8))
964 {
965 MessageBox(L"Creating new branch failed:\n" + out, L"TortoiseGit", MB_OK | MB_ICONERROR);
966 bAddSuccess = false;
967 }
968 if (g_Git.Run(L"git.exe checkout " + m_sCreateNewBranch + L" --", &out, CP_UTF8))
969 {
970 MessageBox(L"Switching to new branch failed:\n" + out, L"TortoiseGit", MB_OK | MB_ICONERROR);
971 bAddSuccess = false;
972 }
973 }
974
975 if (bAddSuccess && m_bWarnDetachedHead && CheckHeadDetach())
976 bAddSuccess = false;
977
978 m_sBugID.Trim();
979 CString sExistingBugID = m_ProjectProperties.FindBugID(m_sLogMessage);
980 sExistingBugID.Trim();
981 if (!m_sBugID.IsEmpty() && m_sBugID.Compare(sExistingBugID))
982 {
983 m_sBugID.Replace(L", ", L",");
984 m_sBugID.Replace(L" ,", L",");
985 CString sBugID = m_ProjectProperties.sMessage;
986 sBugID.Replace(L"%BUGID%", m_sBugID);
987 if (m_ProjectProperties.bAppend)
988 m_sLogMessage += L'\n' + sBugID + L'\n';
989 else
990 m_sLogMessage = sBugID + L'\n' + m_sLogMessage;
991 }
992
993 // now let the bugtraq plugin check the commit message
994 CComPtr<IBugTraqProvider2> pProvider2;
995 if (m_BugTraqProvider)
996 {
997 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
998 if (SUCCEEDED(hr))
999 {
1000 ATL::CComBSTR temp;
1001 ATL::CComBSTR repositoryRoot(g_Git.m_CurrentDir);
1002 ATL::CComBSTR parameters(m_bugtraq_association.GetParameters());
1003 ATL::CComBSTR commonRoot(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());
1004 ATL::CComBSTR commitMessage(m_sLogMessage);
1005 CBstrSafeVector pathList(m_selectedPathList.GetCount());
1006
1007 for (LONG index = 0; index < m_selectedPathList.GetCount(); ++index)
1008 pathList.PutElement(index, m_selectedPathList[index].GetGitPathString());
1009
1010 if (FAILED(hr = pProvider2->CheckCommit(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, commitMessage, &temp)))
1011 {
1012 COMError ce(hr);
1013 CString sErr;
1014 sErr.FormatMessage(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), ce.GetMessageAndDescription().c_str());
1015 CMessageBox::Show(GetSafeHwnd(), sErr, L"TortoiseGit", MB_ICONERROR);
1016 }
1017 else
1018 {
1019 CString sError = temp;
1020 if (!sError.IsEmpty())
1021 {
1022 CMessageBox::Show(GetSafeHwnd(), sError, L"TortoiseGit", MB_ICONERROR);
1023 InterlockedExchange(&m_bBlock, FALSE);
1024 return;
1025 }
1026 }
1027 }
1028 }
1029
1030 if (m_bCommitMessageOnly || bAddSuccess && (nchecked || m_bCommitAmend || CTGitPath(g_Git.m_CurrentDir).IsMergeActive()))
1031 {
1032 bCloseCommitDlg = true;
1033
1034 CString tempfile=::GetTempFile();
1035
1036 if (CAppUtils::SaveCommitUnicodeFile(tempfile, m_sLogMessage))
1037 {
1038 CMessageBox::Show(GetSafeHwnd(), L"Could not save commit message", L"TortoiseGit", MB_OK | MB_ICONERROR);
1039 InterlockedExchange(&m_bBlock, FALSE);
1040 return;
1041 }
1042
1043 CTGitPath path=g_Git.m_CurrentDir;
1044
1045 BOOL IsGitSVN = path.GetAdminDirMask() & ITEMIS_GITSVN;
1046
1047 out.Empty();
1048 CString amend;
1049 if(this->m_bCommitAmend)
1050 amend = L"--amend";
1051
1052 CString dateTime;
1053 if (m_bSetCommitDateTime)
1054 {
1055 CTime date, time;
1056 m_CommitDate.GetTime(date);
1057 m_CommitTime.GetTime(time);
1058 if (m_bCommitAmend && m_AsCommitDateCtrl.GetCheck())
1059 dateTime = L"--date=\"now\"";
1060 else
1061 dateTime.Format(L"--date=%sT%s", (LPCTSTR)date.Format(L"%Y-%m-%d"), (LPCTSTR)time.Format(L"%H:%M:%S"));
1062 }
1063 CString author;
1064 if (m_bSetAuthor)
1065 author.Format(L"--author=\"%s\"", (LPCTSTR)m_sAuthor);
1066 CString allowEmpty = m_bCommitMessageOnly ? L"--allow-empty" : L"";
1067 // TODO: make sure notes.amend.rewrite does still work when switching to libgit2
1068 cmd.Format(L"git.exe commit %s %s %s %s -F \"%s\"", (LPCTSTR)author, (LPCTSTR)dateTime, (LPCTSTR)amend, (LPCTSTR)allowEmpty, (LPCTSTR)tempfile);
1069
1070 CCommitProgressDlg progress;
1071 progress.m_bBufferAll=true; // improve show speed when there are many file added.
1072 progress.m_GitCmd=cmd;
1073 progress.m_bShowCommand = FALSE; // don't show the commit command
1074 progress.m_PreText = out; // show any output already generated in log window
1075 if (m_ctrlOkButton.GetCurrentEntry() > 0)
1076 progress.m_AutoClose = GitProgressAutoClose::AUTOCLOSE_IF_NO_ERRORS;
1077
1078 progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
1079 {
1080 if (status || m_bNoPostActions || m_bAutoClose)
1081 return;
1082
1083 if (IsGitSVN)
1084 postCmdList.emplace_back(IDI_COMMIT, IDS_MENUSVNDCOMMIT, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_DCOMMIT; });
1085
1086 postCmdList.emplace_back(IDI_PUSH, IDS_MENUPUSH, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_PUSH; });
1087 postCmdList.emplace_back(IDI_PULL, IDS_MENUPULL, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_PULL; });
1088 postCmdList.emplace_back(IDI_COMMIT, IDS_PROC_COMMIT_RECOMMIT, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_RECOMMIT; });
1089 postCmdList.emplace_back(IDI_TAG, IDS_MENUTAG, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_CREATETAG; });
1090 };
1091
1092 m_PostCmd = GIT_POSTCOMMIT_CMD_NOTHING;
1093 progress.DoModal();
1094
1095 if (!m_bNoPostActions)
1096 m_regLastAction = (int)m_ctrlOkButton.GetCurrentEntry();
1097 if (m_ctrlOkButton.GetCurrentEntry() == 1)
1098 m_PostCmd = GIT_POSTCOMMIT_CMD_RECOMMIT;
1099
1100 ::DeleteFile(tempfile);
1101
1102 if (m_BugTraqProvider && progress.m_GitStatus == 0)
1103 {
1104 CComPtr<IBugTraqProvider2> pProvider;
1105 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider);
1106 if (SUCCEEDED(hr))
1107 {
1108 ATL::CComBSTR commonRoot(g_Git.m_CurrentDir);
1109 CBstrSafeVector pathList(m_selectedPathList.GetCount());
1110
1111 for (LONG index = 0; index < m_selectedPathList.GetCount(); ++index)
1112 pathList.PutElement(index, m_selectedPathList[index].GetGitPathString());
1113
1114 ATL::CComBSTR logMessage(m_sLogMessage);
1115
1116 CGitHash hash;
1117 if (g_Git.GetHash(hash, L"HEAD"))
1118 MessageBox(g_Git.GetGitLastErr(L"Could not get HEAD hash after committing."), L"TortoiseGit", MB_ICONERROR);
1119 LONG version = g_Git.Hash2int(hash);
1120
1121 ATL::CComBSTR temp;
1122 if (FAILED(hr = pProvider->OnCommitFinished(GetSafeHwnd(),
1123 commonRoot,
1124 pathList,
1125 logMessage,
1126 (LONG)version,
1127 &temp)))
1128 {
1129 CString sErr = temp;
1130 if (!sErr.IsEmpty())
1131 CMessageBox::Show(GetSafeHwnd(), sErr, L"TortoiseGit", MB_OK | MB_ICONERROR);
1132 else
1133 {
1134 COMError ce(hr);
1135 sErr.FormatMessage(IDS_ERR_FAILEDISSUETRACKERCOM, ce.GetSource().c_str(), ce.GetMessageAndDescription().c_str());
1136 CMessageBox::Show(GetSafeHwnd(), sErr, L"TortoiseGit", MB_OK | MB_ICONERROR);
1137 }
1138 }
1139 }
1140 }
1141 RestoreFiles(progress.m_GitStatus == 0, false);
1142 if (((DWORD)CRegStdDWORD(L"Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit", TRUE)) == TRUE)
1143 {
1144 BOOL cancel = FALSE;
1145 mgtReAddAfterCommit.Execute(cancel);
1146 mgtReDelAfterCommit.Execute(cancel);
1147 }
1148
1149 if (!progress.m_GitStatus)
1150 {
1151 DWORD exitcode = 0xFFFFFFFF;
1152 CString error;
1153 if (CHooks::Instance().PostCommit(g_Git.m_CurrentDir, amend.IsEmpty(), exitcode, error))
1154 {
1155 if (exitcode)
1156 {
1157 CString temp;
1158 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
1159 MessageBox(temp, L"TortoiseGit", MB_ICONERROR);
1160 bCloseCommitDlg = false;
1161 }
1162 }
1163 }
1164
1165 if (progress.m_GitStatus || m_PostCmd == GIT_POSTCOMMIT_CMD_RECOMMIT)
1166 {
1167 bCloseCommitDlg = false;
1168 if (m_PostCmd == GIT_POSTCOMMIT_CMD_RECOMMIT)
1169 {
1170 if (!m_sLogMessage.IsEmpty())
1171 {
1172 ReloadHistoryEntries();
1173 m_History.AddEntry(m_sLogMessage);
1174 m_History.Save();
1175 }
1176
1177 this->m_sLogMessage.Empty();
1178 GetCommitTemplate(m_sLogMessage);
1179 m_cLogMessage.SetText(m_sLogMessage);
1180 if (m_bCreateNewBranch)
1181 {
1182 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_SHOW);
1183 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_HIDE);
1184 }
1185 m_bCreateNewBranch = FALSE;
1186 m_ListCtrl.Clear();
1187 if (!RunStartCommitHook())
1188 bCloseCommitDlg = true;
1189 }
1190
1191 if (!progress.m_GitStatus)
1192 {
1193 m_AmendStr.Empty();
1194 m_bCommitAmend = FALSE;
1195 }
1196
1197 UpdateData(FALSE);
1198 }
1199 }
1200 else if(bAddSuccess)
1201 {
1202 CMessageBox::Show(this->m_hWnd, IDS_ERROR_NOTHING_COMMIT, IDS_COMMIT_FINISH, MB_OK | MB_ICONINFORMATION);
1203 bCloseCommitDlg=false;
1204 }
1205
1206 UpdateData();
1207 m_regAddBeforeCommit = m_bShowUnversioned;
1208 m_regKeepChangelists = m_bKeepChangeList;
1209 m_regDoNotAutoselectSubmodules = m_bDoNotAutoselectSubmodules;
1210 if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())
1211 m_bKeepChangeList = FALSE;
1212 InterlockedExchange(&m_bBlock, FALSE);
1213
1214 if (!m_sLogMessage.IsEmpty())
1215 {
1216 ReloadHistoryEntries();
1217 m_History.AddEntry(m_sLogMessage);
1218 m_History.Save();
1219 }
1220
1221 SaveSplitterPos();
1222
1223 if (bCloseCommitDlg)
1224 {
1225 if (m_ctrlOkButton.GetCurrentEntry() == 2)
1226 DoPush(GetSafeHwnd());
1227 CResizableStandAloneDialog::OnOK();
1228 }
1229 else if (m_PostCmd == GIT_POSTCOMMIT_CMD_RECOMMIT)
1230 {
1231 m_bDoNotStoreLastSelectedLine = true;
1232 this->Refresh();
1233 this->BringWindowToTop();
1234 }
1235
1236 CShellUpdater::Instance().Flush();
1237 }
1238
1239 void CCommitDlg::SaveSplitterPos()
1240 {
1241 if (!IsIconic())
1242 {
1243 CRegDWORD regPos(L"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer");
1244 RECT rectSplitter;
1245 m_wndSplitter.GetWindowRect(&rectSplitter);
1246 ScreenToClient(&rectSplitter);
1247 regPos = rectSplitter.top;
1248 }
1249 }
1250
1251 UINT CCommitDlg::StatusThreadEntry(LPVOID pVoid)
1252 {
1253 return ((CCommitDlg*)pVoid)->StatusThread();
1254 }
1255
1256 void CCommitDlg::ReloadHistoryEntries()
1257 {
1258 CString reg;
1259 reg.Format(L"Software\\TortoiseGit\\History\\commit%s", (LPCTSTR)m_ListCtrl.m_sUUID);
1260 reg.Replace(L':', L'_');
1261 m_History.Load(reg, L"logmsgs");
1262 }
1263
1264 UINT CCommitDlg::StatusThread()
1265 {
1266 //get the status of all selected file/folders recursively
1267 //and show the ones which have to be committed to the user
1268 //in a list control.
1269 m_pathwatcher.Stop();
1270
1271 m_bCancelled = false;
1272
1273 DialogEnableWindow(IDOK, false);
1274 DialogEnableWindow(IDC_SHOWUNVERSIONED, false);
1275 DialogEnableWindow(IDC_WHOLE_PROJECT, false);
1276 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES, false);
1277 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_HIDE);
1278 DialogEnableWindow(IDC_EXTERNALWARNING, false);
1279 DialogEnableWindow(IDC_COMMIT_AMEND, FALSE);
1280 DialogEnableWindow(IDC_COMMIT_AMENDDIFF, FALSE);
1281 // read the list of recent log entries before querying the WC for status
1282 // -> the user may select one and modify / update it while we are crawling the WC
1283
1284 DialogEnableWindow(IDC_CHECKALL, false);
1285 DialogEnableWindow(IDC_CHECKNONE, false);
1286 DialogEnableWindow(IDC_CHECKUNVERSIONED, false);
1287 DialogEnableWindow(IDC_CHECKVERSIONED, false);
1288 DialogEnableWindow(IDC_CHECKADDED, false);
1289 DialogEnableWindow(IDC_CHECKDELETED, false);
1290 DialogEnableWindow(IDC_CHECKMODIFIED, false);
1291 DialogEnableWindow(IDC_CHECKFILES, false);
1292 DialogEnableWindow(IDC_CHECKSUBMODULES, false);
1293
1294 g_Git.RefreshGitIndex();
1295
1296 CString dotGitPath;
1297 GitAdminDir::GetWorktreeAdminDirPath(g_Git.m_CurrentDir, dotGitPath);
1298 if (PathFileExists(dotGitPath + L"CHERRY_PICK_HEAD"))
1299 {
1300 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_HIDE);
1301 m_bCommitAmend = FALSE;
1302 SendMessage(WM_UPDATEDATAFALSE);
1303 }
1304
1305 if (!m_bDoNotStoreLastSelectedLine)
1306 m_ListCtrl.StoreScrollPos();
1307 // Initialise the list control with the status of the files/folders below us
1308 m_ListCtrl.Clear();
1309 BOOL success;
1310 CTGitPathList *pList;
1311 m_ListCtrl.m_amend = (m_bCommitAmend==TRUE || m_bForceCommitAmend) && (m_bAmendDiffToLastCommit==FALSE);
1312 m_ListCtrl.m_bDoNotAutoselectSubmodules = (m_bDoNotAutoselectSubmodules == TRUE);
1313
1314 if(m_bWholeProject || m_bWholeProject2)
1315 pList = nullptr;
1316 else
1317 pList = &m_pathList;
1318
1319 success=m_ListCtrl.GetStatus(pList);
1320
1321 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
1322 if(this->m_bShowUnversioned)
1323 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER,true,pList);
1324
1325 m_ListCtrl.CheckIfChangelistsArePresent(false);
1326
1327 DWORD dwShow = GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GITSLC_SHOWINCHANGELIST | GITSLC_SHOWDIRECTFILES;
1328 dwShow |= DWORD(m_regAddBeforeCommit) ? GITSLC_SHOWUNVERSIONED : 0;
1329 if (success)
1330 {
1331 /*if (!m_checkedPathList.IsEmpty())
1332 m_ListCtrl.Show(dwShow, m_checkedPathList);
1333 else*/
1334 {
1335 DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;
1336 dwCheck &=~(CTGitPath::LOGACTIONS_UNVER); //don't check unversion file default.
1337 m_ListCtrl.Show(dwShow, dwCheck);
1338 }
1339
1340 if (m_ListCtrl.HasExternalsFromDifferentRepos())
1341 {
1342 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);
1343 DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);
1344 }
1345
1346 SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());
1347 m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());
1348 if (m_ListCtrl.GetItemCount() != 0 && m_ListCtrl.GetTopIndex() == 0 && (m_bDoNotStoreLastSelectedLine || CRegDWORD(L"Software\\TortoiseGit\\RememberFileListPosition", TRUE) != TRUE))
1349 m_ListCtrl.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
1350 }
1351 if (!success)
1352 {
1353 if (!m_ListCtrl.GetLastErrorMessage().IsEmpty())
1354 m_ListCtrl.SetEmptyString(m_ListCtrl.GetLastErrorMessage());
1355 m_ListCtrl.Show(dwShow);
1356 }
1357 m_bDoNotStoreLastSelectedLine = false;
1358
1359 if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems())
1360 && !PathFileExists(dotGitPath + L"MERGE_HEAD"))
1361 {
1362 CString temp;
1363 temp.LoadString(IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED);
1364 if (CMessageBox::ShowCheck(GetSafeHwnd(), temp, L"TortoiseGit", MB_ICONINFORMATION | MB_YESNO, L"NothingToCommitShowUnversioned", nullptr) == IDYES)
1365 {
1366 m_bShowUnversioned = TRUE;
1367 GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);
1368 dwShow = (DWORD)(GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GITSLC_SHOWUNVERSIONED);
1369 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);
1370 m_ListCtrl.Show(dwShow,dwShow&(~CTGitPath::LOGACTIONS_UNVER));
1371 }
1372 }
1373
1374 SetDlgTitle();
1375
1376 // we don't have to block the commit dialog while we fetch the
1377 // auto completion list.
1378 m_pathwatcher.ClearChangedPaths();
1379 InterlockedExchange(&m_bBlock, FALSE);
1380 std::map<CString, int> autolist;
1381 if ((DWORD)CRegDWORD(L"Software\\TortoiseGit\\Autocompletion", TRUE) == TRUE)
1382 {
1383 m_ListCtrl.BusyCursor(true);
1384 GetAutocompletionList(autolist);
1385 m_ListCtrl.BusyCursor(false);
1386 }
1387 SendMessage(WM_UPDATEOKBUTTON);
1388 m_ListCtrl.Invalidate();
1389 if (m_bRunThread)
1390 {
1391 DialogEnableWindow(IDC_SHOWUNVERSIONED, true);
1392 DialogEnableWindow(IDC_WHOLE_PROJECT, !m_bWholeProject2);
1393 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES, true);
1394 if (m_ListCtrl.HasChangeLists())
1395 DialogEnableWindow(IDC_KEEPLISTS, true);
1396
1397 // activate amend checkbox (if necessary)
1398 if (g_Git.IsInitRepos())
1399 {
1400 m_bCommitAmend = FALSE;
1401 SendMessage(WM_UPDATEDATAFALSE);
1402 }
1403 else
1404 {
1405 if (m_bForceCommitAmend)
1406 {
1407 m_bCommitAmend = TRUE;
1408 SendMessage(WM_UPDATEDATAFALSE);
1409 }
1410 else
1411 GetDlgItem(IDC_COMMIT_AMEND)->EnableWindow(!PathFileExists(dotGitPath + L"CHERRY_PICK_HEAD"));
1412
1413 CGitHash hash;
1414 if (g_Git.GetHash(hash, L"HEAD"))
1415 {
1416 MessageBox(g_Git.GetGitLastErr(L"Could not get HEAD hash."), L"TortoiseGit", MB_ICONERROR);
1417 }
1418 if (!hash.IsEmpty())
1419 {
1420 GitRev headRevision;
1421 if (headRevision.GetParentFromHash(hash))
1422 MessageBox(headRevision.GetLastErr(), L"TortoiseGit", MB_ICONERROR);
1423 // do not allow to show diff to "last" revision if it has more that one parent
1424 if (headRevision.ParentsCount() != 1)
1425 {
1426 m_bAmendDiffToLastCommit = TRUE;
1427 SendMessage(WM_UPDATEDATAFALSE);
1428 }
1429 else
1430 GetDlgItem(IDC_COMMIT_AMENDDIFF)->EnableWindow(TRUE);
1431 }
1432 }
1433
1434 UpdateCheckLinks();
1435
1436 // we have the list, now signal the main thread about it
1437 SendMessage(WM_AUTOLISTREADY, 0, (LPARAM)&autolist); // only send the message if the thread wasn't told to quit!
1438 }
1439
1440 InterlockedExchange(&m_bRunThread, FALSE);
1441 InterlockedExchange(&m_bThreadRunning, FALSE);
1442 // force the cursor to normal
1443 RefreshCursor();
1444
1445 return 0;
1446 }
1447
1448 void CCommitDlg::SetDlgTitle()
1449 {
1450 if (m_sTitle.IsEmpty())
1451 GetWindowText(m_sTitle);
1452
1453 if (m_bWholeProject || m_bWholeProject2)
1454 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, m_sTitle);
1455 else
1456 {
1457 if (m_pathList.GetCount() == 1)
1458 CAppUtils::SetWindowTitle(m_hWnd, g_Git.CombinePath(m_pathList[0].GetUIPathString()), m_sTitle);
1459 else
1460 CAppUtils::SetWindowTitle(m_hWnd, g_Git.CombinePath(m_ListCtrl.GetCommonDirectory(false)), m_sTitle);
1461 }
1462 }
1463
1464 void CCommitDlg::OnCancel()
1465 {
1466 UpdateData();
1467 m_sBugID.Trim();
1468 m_sLogMessage = m_cLogMessage.GetText();
1469 if (!m_sBugID.IsEmpty())
1470 {
1471 m_sBugID.Replace(L", ", L",");
1472 m_sBugID.Replace(L" ,", L",");
1473 CString sBugID = m_ProjectProperties.sMessage;
1474 sBugID.Replace(L"%BUGID%", m_sBugID);
1475 if (m_ProjectProperties.bAppend)
1476 m_sLogMessage += L'\n' + sBugID + L'\n';
1477 else
1478 m_sLogMessage = sBugID + L'\n' + m_sLogMessage;
1479 }
1480
1481 bool hasChangedMessage = (m_sLogTemplate.Compare(m_sLogMessage) != 0) && !m_sLogMessage.IsEmpty();
1482
1483 CString tmp;
1484 tmp.LoadString(IDS_REALLYCANCEL);
1485 tmp.AppendChar(L'\n');
1486 tmp.AppendChar(L'\n');
1487 tmp.Append(CString(MAKEINTRESOURCE(IDS_HINTLASTMESSAGES)));
1488 CString dontaskagain;
1489 dontaskagain.LoadString(IDS_MSGBOX_DONOTSHOWAGAIN);
1490 BOOL dontaskagainchecked = FALSE;
1491 if ((hasChangedMessage || m_ListCtrl.GetItemCount() > 0) && CMessageBox::ShowCheck(GetSafeHwnd(), tmp, L"TortoiseGit", MB_ICONQUESTION | MB_DEFBUTTON2 | MB_YESNO, L"CommitAskBeforeCancel", dontaskagain, &dontaskagainchecked) == IDNO)
1492 {
1493 if (dontaskagainchecked)
1494 CMessageBox::SetRegistryValue(L"CommitAskBeforeCancel", IDYES);
1495 return;
1496 }
1497
1498 m_bCancelled = true;
1499 m_pathwatcher.Stop();
1500
1501 if (m_bThreadRunning)
1502 StopStatusThread();
1503 if (!RestoreFiles())
1504 return;
1505 if (hasChangedMessage)
1506 {
1507 ReloadHistoryEntries();
1508 m_History.AddEntry(m_sLogMessage);
1509 m_History.Save();
1510 }
1511 SaveSplitterPos();
1512 CResizableStandAloneDialog::OnCancel();
1513 }
1514
1515 BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)
1516 {
1517 if (m_hAccel)
1518 {
1519 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
1520 if (ret)
1521 return TRUE;
1522 }
1523 if (m_hAccelOkButton && GetDlgItem(IDOK)->IsWindowEnabled() && TranslateAccelerator(m_hWnd, m_hAccelOkButton, pMsg))
1524 return TRUE;
1525
1526 if (pMsg->message == WM_KEYDOWN)
1527 {
1528 switch (pMsg->wParam)
1529 {
1530 case VK_F5:
1531 {
1532 if (m_bBlock)
1533 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
1534 Refresh();
1535 }
1536 break;
1537 case VK_RETURN:
1538 {
1539 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
1540 {
1541 if ( GetDlgItem(IDOK)->IsWindowEnabled() )
1542 PostMessage(WM_COMMAND, IDOK);
1543 return TRUE;
1544 }
1545 if ( GetFocus()==GetDlgItem(IDC_BUGID) )
1546 {
1547 // Pressing RETURN in the bug id control
1548 // moves the focus to the message
1549 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
1550 return TRUE;
1551 }
1552 }
1553 break;
1554 }
1555 }
1556
1557 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
1558 }
1559
1560 void CCommitDlg::Refresh()
1561 {
1562 if (m_bThreadRunning)
1563 return;
1564
1565 StartStatusThread();
1566 }
1567
1568 void CCommitDlg::StartStatusThread()
1569 {
1570 if (InterlockedExchange(&m_bBlock, TRUE) != FALSE)
1571 return;
1572
1573 delete m_pThread;
1574 m_pThread = nullptr;
1575
1576 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL, 0, CREATE_SUSPENDED);
1577 if (!m_pThread)
1578 {
1579 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
1580 InterlockedExchange(&m_bBlock, FALSE);
1581 return;
1582 }
1583 InterlockedExchange(&m_bThreadRunning, TRUE);// so the main thread knows that this thread is still running
1584 InterlockedExchange(&m_bRunThread, TRUE); // if this is set to FALSE, the thread should stop
1585 m_pThread->m_bAutoDelete = FALSE;
1586 m_pThread->ResumeThread();
1587 }
1588
1589 void CCommitDlg::StopStatusThread()
1590 {
1591 InterlockedExchange(&m_bRunThread, FALSE);
1592 WaitForSingleObject(m_pThread->m_hThread, 5000);
1593 if (!m_bThreadRunning)
1594 return;
1595
1596 // we gave the thread a chance to quit. Since the thread didn't
1597 // listen to us we have to kill it.
1598 g_Git.KillRelatedThreads(m_pThread);
1599 InterlockedExchange(&m_bThreadRunning, FALSE);
1600 }
1601
1602 void CCommitDlg::OnBnClickedShowunversioned()
1603 {
1604 m_tooltips.Pop(); // hide the tooltips
1605 UpdateData();
1606 m_regAddBeforeCommit = m_bShowUnversioned;
1607 if (!m_bBlock)
1608 {
1609 DWORD dwShow = m_ListCtrl.GetShowFlags();
1610 if (DWORD(m_regAddBeforeCommit))
1611 dwShow |= GITSLC_SHOWUNVERSIONED;
1612 else
1613 dwShow &= ~GITSLC_SHOWUNVERSIONED;
1614 if(dwShow & GITSLC_SHOWUNVERSIONED)
1615 {
1616 if (m_bWholeProject || m_bWholeProject2)
1617 m_ListCtrl.GetStatus(nullptr, false, false, true);
1618 else
1619 m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);
1620 }
1621 m_ListCtrl.StoreScrollPos();
1622 m_ListCtrl.Show(dwShow, 0, true, dwShow & ~(CTGitPath::LOGACTIONS_UNVER), true);
1623 UpdateCheckLinks();
1624 }
1625 }
1626
1627 void CCommitDlg::OnStnClickedExternalwarning()
1628 {
1629 m_tooltips.Popup();
1630 }
1631
1632 void CCommitDlg::OnEnChangeLogmessage()
1633 {
1634 SendMessage(WM_UPDATEOKBUTTON);
1635 }
1636
1637 LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)
1638 {
1639 #if 0
1640 if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))
1641 {
1642 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
1643 {
1644 m_bShowUnversioned = TRUE;
1645 DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED;
1646 m_ListCtrl.Show(dwShow);
1647 UpdateData(FALSE);
1648 }
1649 }
1650 #endif
1651 return 0;
1652 }
1653
1654 LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
1655 {
1656 Refresh();
1657 return 0;
1658 }
1659
1660 LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM lParam)
1661 {
1662 BringWindowToTop();
1663 SetForegroundWindow();
1664 SetActiveWindow();
1665 // if multiple files/folders are dropped
1666 // this handler is called for every single item
1667 // separately.
1668 // To avoid creating multiple refresh threads and
1669 // causing crashes, we only add the items to the
1670 // list control and start a timer.
1671 // When the timer expires, we start the refresh thread,
1672 // but only if it isn't already running - otherwise we
1673 // restart the timer.
1674 CTGitPath path;
1675 path.SetFromWin((LPCTSTR)lParam);
1676
1677 // check whether the dropped file belongs to the very same repository
1678 CString projectDir;
1679 if (!path.HasAdminDir(&projectDir) || !CPathUtils::ArePathStringsEqual(g_Git.m_CurrentDir, projectDir))
1680 return 0;
1681
1682 // just add all the items we get here.
1683 // if the item is versioned, the add will fail but nothing
1684 // more will happen.
1685 CString cmd;
1686 cmd.Format(L"git.exe add -- \"%s\"", (LPCTSTR)path.GetWinPathString());
1687 g_Git.Run(cmd, nullptr, CP_UTF8);
1688
1689 if (!m_ListCtrl.HasPath(path))
1690 {
1691 if (m_pathList.AreAllPathsFiles())
1692 {
1693 m_pathList.AddPath(path);
1694 m_pathList.RemoveDuplicates();
1695 }
1696 else
1697 {
1698 // if the path list contains folders, we have to check whether
1699 // our just (maybe) added path is a child of one of those. If it is
1700 // a child of a folder already in the list, we must not add it. Otherwise
1701 // that path could show up twice in the list.
1702 bool bHasParentInList = false;
1703 for (int i=0; i<m_pathList.GetCount(); ++i)
1704 {
1705 if (m_pathList[i].IsAncestorOf(path))
1706 {
1707 bHasParentInList = true;
1708 break;
1709 }
1710 }
1711 if (!bHasParentInList)
1712 {
1713 m_pathList.AddPath(path);
1714 m_pathList.RemoveDuplicates();
1715 }
1716 }
1717 }
1718 m_ListCtrl.ResetChecked(path);
1719
1720 // Always start the timer, since the status of an existing item might have changed
1721 SetTimer(REFRESHTIMER, 200, nullptr);
1722 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) L": Item %s dropped, timer started\n", path.GetWinPath());
1723 return 0;
1724 }
1725
1726 LRESULT CCommitDlg::OnAutoListReady(WPARAM, LPARAM lparam)
1727 {
1728 m_cLogMessage.SetAutoCompletionList(std::move(*reinterpret_cast<std::map<CString, int>*>(lparam)), '*');
1729 return 0;
1730 }
1731
1732 //////////////////////////////////////////////////////////////////////////
1733 // functions which run in the status thread
1734 //////////////////////////////////////////////////////////////////////////
1735
1736 void CCommitDlg::ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex)
1737 {
1738 CString strLine;
1739 try
1740 {
1741 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
1742 while (m_bRunThread && file.ReadString(strLine))
1743 {
1744 if (strLine.IsEmpty())
1745 continue;
1746 if (strLine[0] == L'#')
1747 continue;
1748 int eqpos = strLine.Find('=');
1749 CString rgx;
1750 rgx = strLine.Mid(eqpos+1).Trim();
1751
1752 int pos = -1;
1753 while (((pos = strLine.Find(','))>=0)&&(pos < eqpos))
1754 {
1755 mapRegex[strLine.Left(pos)] = rgx;
1756 strLine = strLine.Mid(pos+1).Trim();
1757 }
1758 mapRegex[strLine.Left(strLine.Find('=')).Trim()] = rgx;
1759 }
1760 file.Close();
1761 }
1762 catch (CFileException* pE)
1763 {
1764 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": CFileException loading auto list regex file\n");
1765 pE->Delete();
1766 }
1767 }
1768
1769 void CCommitDlg::ParseSnippetFile(const CString& sFile, std::map<CString, CString>& mapSnippet)
1770 {
1771 CString strLine;
1772 try
1773 {
1774 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
1775 while (m_bRunThread && file.ReadString(strLine))
1776 {
1777 if (strLine.IsEmpty())
1778 continue;
1779 if (strLine[0] == L'#') // comment char
1780 continue;
1781 int eqpos = strLine.Find(L'=');
1782 if (eqpos <= 0)
1783 continue;
1784 CString key = strLine.Left(eqpos);
1785 auto rawvalue = strLine.GetBuffer() + eqpos + 1;
1786 CString value;
1787 bool isEscaped = false;
1788 for (int i = 0, len = strLine.GetLength() - eqpos - 1; i < len; ++i)
1789 {
1790 wchar_t c = rawvalue[i];
1791 if (isEscaped)
1792 {
1793 switch (c)
1794 {
1795 case L't': c = L'\t'; break;
1796 case L'n': c = L'\n'; break;
1797 case L'r': c = L'\r'; break;
1798 case L'\\': c = L'\\'; break;
1799 default: value += rawvalue[i - 1]; break; // i is known to be > 0
1800 }
1801 value += c;
1802 isEscaped = false;
1803 }
1804 else if (c == L'\\')
1805 isEscaped = true;
1806 else
1807 value += c;
1808 }
1809 mapSnippet[key] = value;
1810 }
1811 file.Close();
1812 }
1813 catch (CFileException* pE)
1814 {
1815 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": CFileException loading auto list regex file\n");
1816 pE->Delete();
1817 }
1818 }
1819
1820 void CCommitDlg::GetAutocompletionList(std::map<CString, int>& autolist)
1821 {
1822 // the auto completion list is made of strings from each selected files.
1823 // the strings used are extracted from the files with regexes found
1824 // in the file "autolist.txt".
1825 // the format of that file is:
1826 // file extensions separated with commas '=' regular expression to use
1827 // example:
1828 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
1829 // .cpp = (?<=[^\s]::)\b\w+\b
1830
1831 std::map<CString, CString> mapRegex;
1832 CString sRegexFile = CPathUtils::GetAppDirectory();
1833 CRegDWORD regtimeout = CRegDWORD(L"Software\\TortoiseGit\\AutocompleteParseTimeout", 5);
1834 ULONGLONG timeoutvalue = ULONGLONG(DWORD(regtimeout)) * 1000UL;;
1835 sRegexFile += L"autolist.txt";
1836 if (!m_bRunThread)
1837 return;
1838 ParseRegexFile(sRegexFile, mapRegex);
1839 sRegexFile = CPathUtils::GetAppDataDirectory();
1840 sRegexFile += L"autolist.txt";
1841 if (PathFileExists(sRegexFile))
1842 ParseRegexFile(sRegexFile, mapRegex);
1843
1844 m_snippet.clear();
1845 CString sSnippetFile = CPathUtils::GetAppDirectory();
1846 sSnippetFile += L"snippet.txt";
1847 ParseSnippetFile(sSnippetFile, m_snippet);
1848 sSnippetFile = CPathUtils::GetAppDataDirectory();
1849 sSnippetFile += L"snippet.txt";
1850 if (PathFileExists(sSnippetFile))
1851 ParseSnippetFile(sSnippetFile, m_snippet);
1852 for (const auto& snip : m_snippet)
1853 autolist.emplace(snip.first, AUTOCOMPLETE_SNIPPET);
1854
1855 ULONGLONG starttime = GetTickCount64();
1856
1857 // now we have two arrays of strings, where the first array contains all
1858 // file extensions we can use and the second the corresponding regex strings
1859 // to apply to those files.
1860
1861 // the next step is to go over all files shown in the commit dialog
1862 // and scan them for strings we can use
1863 int nListItems = m_ListCtrl.GetItemCount();
1864
1865 for (int i=0; i<nListItems && m_bRunThread; ++i)
1866 {
1867 // stop parsing after timeout
1868 if ((!m_bRunThread) || (GetTickCount64() - starttime > timeoutvalue))
1869 return;
1870
1871 CString sWinPath;
1872 CString sPartPath;
1873 CString sExt;
1874 int action;
1875 {
1876 auto locker(m_ListCtrl.AcquireReadLock());
1877 auto path = m_ListCtrl.GetListEntry(i);
1878
1879 if (!path)
1880 continue;
1881
1882 sWinPath = path->GetWinPathString();
1883 sPartPath = path->GetGitPathString();
1884 sExt = path->GetFileExtension();
1885 action = path->m_Action;
1886 }
1887 autolist.emplace(sPartPath, AUTOCOMPLETE_FILENAME);
1888
1889 int pos = 0;
1890 int lastPos = 0;
1891 while ((pos = sPartPath.Find('/', pos)) >= 0)
1892 {
1893 ++pos;
1894 lastPos = pos;
1895 autolist.emplace(sPartPath.Mid(pos), AUTOCOMPLETE_FILENAME);
1896 }
1897
1898 // Last inserted entry is a file name.
1899 // Some users prefer to also list file name without extension.
1900 if (CRegDWORD(L"Software\\TortoiseGit\\AutocompleteRemovesExtensions", FALSE))
1901 {
1902 int dotPos = sPartPath.ReverseFind('.');
1903 if ((dotPos >= 0) && (dotPos > lastPos))
1904 autolist.emplace(sPartPath.Mid(lastPos, dotPos - lastPos), AUTOCOMPLETE_FILENAME);
1905 }
1906
1907 if (action == CTGitPath::LOGACTIONS_UNVER && !CRegDWORD(L"Software\\TortoiseGit\\AutocompleteParseUnversioned", FALSE))
1908 continue;
1909 if (action == CTGitPath::LOGACTIONS_IGNORE)
1910 continue;
1911
1912 sExt.MakeLower();
1913 // find the regex string which corresponds to the file extension
1914 CString rdata = mapRegex[sExt];
1915 if (rdata.IsEmpty())
1916 continue;
1917
1918 ScanFile(autolist, sWinPath, rdata, sExt);
1919 }
1920 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) L": Auto completion list loaded in %I64u msec\n", GetTickCount64() - starttime);
1921 }
1922
1923 void CCommitDlg::ScanFile(std::map<CString, int>& autolist, const CString& sFilePath, const CString& sRegex, const CString& sExt)
1924 {
1925 static std::map<CString, std::wregex> regexmap;
1926
1927 std::wstring sFileContent;
1928 CAutoFile hFile = CreateFile(sFilePath, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
1929 if (hFile)
1930 {
1931 DWORD size = GetFileSize(hFile, nullptr);
1932 if (size > CRegDWORD(L"Software\\TortoiseGit\\AutocompleteParseMaxSize", 300000L))
1933 {
1934 // no files bigger than 300k
1935 return;
1936 }
1937 // allocate memory to hold file contents
1938 CBuffer oFile;
1939 try
1940 {
1941 oFile.SetLength(size);
1942 }
1943 catch (CMemoryException*)
1944 {
1945 return;
1946 }
1947 DWORD readbytes;
1948 if (!ReadFile(hFile, oFile, size, &readbytes, nullptr))
1949 return;
1950 oFile.SetLength(readbytes);
1951 CFileTextLines filetextlines;
1952 CFileTextLines::UnicodeType type = filetextlines.CheckUnicodeType(oFile, readbytes);
1953 try
1954 {
1955 CBaseFilter* pFilter = nullptr;
1956 switch (type)
1957 {
1958 case CFileTextLines::BINARY:
1959 return;
1960 case CFileTextLines::UTF8:
1961 case CFileTextLines::UTF8BOM:
1962 pFilter = new CUtf8Filter(NULL);
1963 break;
1964 default:
1965 case CFileTextLines::ASCII:
1966 pFilter = new CAsciiFilter(NULL);
1967 break;
1968 case CFileTextLines::UTF16_BE:
1969 case CFileTextLines::UTF16_BEBOM:
1970 pFilter = new CUtf16beFilter(NULL);
1971 break;
1972 case CFileTextLines::UTF16_LE:
1973 case CFileTextLines::UTF16_LEBOM:
1974 pFilter = new CUtf16leFilter(NULL);
1975 break;
1976 case CFileTextLines::UTF32_BE:
1977 pFilter = new CUtf32beFilter(NULL);
1978 break;
1979 case CFileTextLines::UTF32_LE:
1980 pFilter = new CUtf32leFilter(NULL);
1981 break;
1982 }
1983 pFilter->Decode(oFile);
1984 delete pFilter;
1985 }
1986 catch (CMemoryException*)
1987 {
1988 return;
1989 }
1990 sFileContent = std::wstring((wchar_t*)oFile, oFile.GetLength() / sizeof(wchar_t));
1991 }
1992 if (sFileContent.empty() || !m_bRunThread)
1993 return;
1994
1995 try
1996 {
1997 std::wregex regCheck;
1998 std::map<CString, std::wregex>::const_iterator regIt;
1999 if ((regIt = regexmap.find(sExt)) != regexmap.end())
2000 regCheck = regIt->second;
2001 else
2002 {
2003 regCheck = std::wregex(sRegex, std::regex_constants::icase | std::regex_constants::ECMAScript);
2004 regexmap[sExt] = regCheck;
2005 }
2006 const std::wsregex_iterator end;
2007 for (std::wsregex_iterator it(sFileContent.cbegin(), sFileContent.cend(), regCheck); it != end; ++it)
2008 {
2009 const std::wsmatch match = *it;
2010 for (size_t i = 1; i < match.size(); ++i)
2011 {
2012 if (match[i].second-match[i].first)
2013 autolist.emplace(std::wstring(match[i]).c_str(), AUTOCOMPLETE_PROGRAMCODE);
2014 }
2015 }
2016 }
2017 catch (std::exception&) {}
2018 }
2019
2020 // CSciEditContextMenuInterface
2021 void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
2022 {
2023 CString sMenuItemText;
2024 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITHASH);
2025 m_nPopupPickCommitHash = nCmd++;
2026 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPickCommitHash, sMenuItemText);
2027
2028 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITMESSAGE);
2029 m_nPopupPickCommitMessage = nCmd++;
2030 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPickCommitMessage, sMenuItemText);
2031
2032 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTEFILELIST);
2033 m_nPopupPasteListCmd = nCmd++;
2034 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);
2035
2036 ReloadHistoryEntries();
2037 if (!m_History.IsEmpty())
2038 {
2039 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);
2040 m_nPopupPasteLastMessage = nCmd++;
2041 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);
2042
2043 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY);
2044 m_nPopupRecentMessage = nCmd++;
2045 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupRecentMessage, sMenuItemText);
2046 }
2047 }
2048
2049 bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
2050 {
2051 if (cmd == m_nPopupPickCommitHash)
2052 {
2053 // use the git log to allow selection of a version
2054 CLogDlg dlg;
2055 // tell the dialog to use mode for selecting revisions
2056 dlg.SetSelect(true);
2057 // only one revision must be selected however
2058 dlg.SingleSelection(true);
2059 dlg.ShowWorkingTreeChanges(false);
2060 if (dlg.DoModal() == IDOK && !dlg.GetSelectedHash().empty())
2061 pSciEdit->InsertText(dlg.GetSelectedHash().at(0).ToString());
2062 return true;
2063 }
2064
2065 if (cmd == m_nPopupPickCommitMessage)
2066 {
2067 // use the git log to allow selection of a version
2068 CLogDlg dlg;
2069 // tell the dialog to use mode for selecting revisions
2070 dlg.SetSelect(true);
2071 // only one revision must be selected however
2072 dlg.SingleSelection(true);
2073 dlg.ShowWorkingTreeChanges(false);
2074 if (dlg.DoModal() == IDOK && !dlg.GetSelectedHash().empty())
2075 {
2076 GitRev rev;
2077 if (rev.GetCommit(dlg.GetSelectedHash().at(0).ToString()))
2078 {
2079 MessageBox(rev.GetLastErr(), L"TortoiseGit", MB_ICONERROR);
2080 return false;
2081 }
2082 CString message = rev.GetSubject() + L"\r\n" + rev.GetBody();
2083 pSciEdit->InsertText(message);
2084 }
2085 return true;
2086 }
2087
2088 if (cmd == m_nPopupPasteListCmd)
2089 {
2090 CString logmsg;
2091 auto locker(m_ListCtrl.AcquireReadLock());
2092 int nListItems = m_ListCtrl.GetItemCount();
2093 for (int i=0; i<nListItems; ++i)
2094 {
2095 auto entry = m_ListCtrl.GetListEntry(i);
2096 if (entry&&entry->m_Checked)
2097 {
2098 CString status = entry->GetActionName();
2099 if(entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
2100 status = L"Add"; // I18N TODO
2101
2102 //git_wc_status_kind status = entry->status;
2103 WORD langID = (WORD)CRegStdDWORD(L"Software\\TortoiseGit\\LanguageID", GetUserDefaultLangID());
2104 if (m_ProjectProperties.bFileListInEnglish)
2105 langID = 1033;
2106
2107 logmsg.AppendFormat(L"%-10s %s\r\n", (LPCTSTR)status, (LPCTSTR)m_ListCtrl.GetItemText(i, 0));
2108 }
2109 }
2110 pSciEdit->InsertText(logmsg);
2111 return true;
2112 }
2113
2114 if(cmd == m_nPopupPasteLastMessage)
2115 {
2116 if (m_History.IsEmpty())
2117 return false;
2118
2119 CString logmsg;
2120 logmsg +=m_History.GetEntry(0);
2121 pSciEdit->InsertText(logmsg);
2122 return true;
2123 }
2124
2125 if(cmd == m_nPopupRecentMessage )
2126 {
2127 OnBnClickedHistory();
2128 return true;
2129 }
2130 return false;
2131 }
2132
2133 void CCommitDlg::HandleSnippet(int type, const CString &text, CSciEdit *pSciEdit)
2134 {
2135 if (type == AUTOCOMPLETE_SNIPPET)
2136 {
2137 CString target = m_snippet[text];
2138 pSciEdit->GetWordUnderCursor(true);
2139 pSciEdit->InsertText(target, false);
2140 }
2141 }
2142
2143 void CCommitDlg::OnTimer(UINT_PTR nIDEvent)
2144 {
2145 switch (nIDEvent)
2146 {
2147 case ENDDIALOGTIMER:
2148 KillTimer(ENDDIALOGTIMER);
2149 EndDialog(0);
2150 break;
2151 case REFRESHTIMER:
2152 if (m_bThreadRunning)
2153 {
2154 SetTimer(REFRESHTIMER, 200, nullptr);
2155 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": Wait some more before refreshing\n");
2156 }
2157 else
2158 {
2159 KillTimer(REFRESHTIMER);
2160 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": Refreshing after items dropped\n");
2161 Refresh();
2162 }
2163 break;
2164 case FILLPATCHVTIMER:
2165 FillPatchView();
2166 break;
2167 }
2168 __super::OnTimer(nIDEvent);
2169 }
2170
2171 void CCommitDlg::OnBnClickedHistory()
2172 {
2173 m_tooltips.Pop(); // hide the tooltips
2174 if (m_pathList.IsEmpty())
2175 return;
2176
2177 CHistoryDlg historyDlg;
2178 ReloadHistoryEntries();
2179 historyDlg.SetHistory(m_History);
2180 if (historyDlg.DoModal() != IDOK)
2181 return;
2182
2183 CString sMsg = historyDlg.GetSelectedText();
2184 if (sMsg != m_cLogMessage.GetText().Left(sMsg.GetLength()))
2185 {
2186 CString sBugID = m_ProjectProperties.FindBugID(sMsg);
2187 if ((!sBugID.IsEmpty()) && ((GetDlgItem(IDC_BUGID)->IsWindowVisible())))
2188 SetDlgItemText(IDC_BUGID, sBugID);
2189 if (m_sLogTemplate.Compare(m_cLogMessage.GetText()) != 0)
2190 m_cLogMessage.InsertText(sMsg, !m_cLogMessage.GetText().IsEmpty());
2191 else
2192 m_cLogMessage.SetText(sMsg);
2193 }
2194
2195 SendMessage(WM_UPDATEOKBUTTON);
2196 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
2197 }
2198
2199 void CCommitDlg::OnBnClickedBugtraqbutton()
2200 {
2201 m_tooltips.Pop(); // hide the tooltips
2202 CString sMsg = m_cLogMessage.GetText();
2203
2204 if (!m_BugTraqProvider)
2205 return;
2206
2207 ATL::CComBSTR parameters(m_bugtraq_association.GetParameters());
2208 ATL::CComBSTR commonRoot(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());
2209 CBstrSafeVector pathList(m_pathList.GetCount());
2210
2211 for (LONG index = 0; index < m_pathList.GetCount(); ++index)
2212 pathList.PutElement(index, m_pathList[index].GetGitPathString());
2213
2214 ATL::CComBSTR originalMessage(sMsg);
2215 ATL::CComBSTR temp;
2216
2217 // first try the IBugTraqProvider2 interface
2218 CComPtr<IBugTraqProvider2> pProvider2;
2219 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
2220 bool bugIdOutSet = false;
2221 if (SUCCEEDED(hr))
2222 {
2223 ATL::CComBSTR repositoryRoot(g_Git.m_CurrentDir);
2224 ATL::CComBSTR bugIDOut;
2225 GetDlgItemText(IDC_BUGID, m_sBugID);
2226 ATL::CComBSTR bugID(m_sBugID);
2227 CBstrSafeVector revPropNames;
2228 CBstrSafeVector revPropValues;
2229 if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, bugID, &bugIDOut, &revPropNames, &revPropValues, &temp)))
2230 {
2231 CString sErr;
2232 sErr.FormatMessage(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2233 CMessageBox::Show(GetSafeHwnd(), sErr, L"TortoiseGit", MB_ICONERROR);
2234 }
2235 else
2236 {
2237 if (bugIDOut)
2238 {
2239 bugIdOutSet = true;
2240 m_sBugID = bugIDOut;
2241 SetDlgItemText(IDC_BUGID, m_sBugID);
2242 }
2243 m_cLogMessage.SetText((LPCTSTR)temp);
2244 }
2245 }
2246 else
2247 {
2248 // if IBugTraqProvider2 failed, try IBugTraqProvider
2249 CComPtr<IBugTraqProvider> pProvider;
2250 hr = m_BugTraqProvider.QueryInterface(&pProvider);
2251 if (FAILED(hr))
2252 {
2253 CString sErr;
2254 sErr.FormatMessage(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2255 CMessageBox::Show(GetSafeHwnd(), sErr, L"TortoiseGit", MB_ICONERROR);
2256 return;
2257 }
2258
2259 if (FAILED(hr = pProvider->GetCommitMessage(GetSafeHwnd(), parameters, commonRoot, pathList, originalMessage, &temp)))
2260 {
2261 CString sErr;
2262 sErr.FormatMessage(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2263 CMessageBox::Show(GetSafeHwnd(), sErr, L"TortoiseGit", MB_ICONERROR);
2264 }
2265 else
2266 m_cLogMessage.SetText((LPCTSTR)temp);
2267 }
2268 m_sLogMessage = m_cLogMessage.GetText();
2269 if (!m_ProjectProperties.sMessage.IsEmpty())
2270 {
2271 CString sBugID = m_ProjectProperties.FindBugID(m_sLogMessage);
2272 if (!sBugID.IsEmpty() && !bugIdOutSet)
2273 SetDlgItemText(IDC_BUGID, sBugID);
2274 }
2275
2276 m_cLogMessage.SetFocus();
2277 }
2278
2279 void CCommitDlg::FillPatchView(bool onlySetTimer)
2280 {
2281 if(::IsWindow(this->m_patchViewdlg.m_hWnd))
2282 {
2283 KillTimer(FILLPATCHVTIMER);
2284 if (onlySetTimer)
2285 {
2286 SetTimer(FILLPATCHVTIMER, 100, nullptr);
2287 return;
2288 }
2289
2290 auto locker(m_ListCtrl.AcquireReadWeakLock(50));
2291 if (!locker.IsAcquired())
2292 {
2293 SetTimer(FILLPATCHVTIMER, 100, nullptr);
2294 return;
2295 }
2296 POSITION pos=m_ListCtrl.GetFirstSelectedItemPosition();
2297 CString cmd,out;
2298
2299 while(pos)
2300 {
2301 int nSelect = m_ListCtrl.GetNextSelectedItem(pos);
2302 auto p = m_ListCtrl.GetListEntry(nSelect);
2303 if(p && !(p->m_Action&CTGitPath::LOGACTIONS_UNVER) )
2304 {
2305 CString head = L"HEAD";
2306 if(m_bCommitAmend==TRUE && m_bAmendDiffToLastCommit==FALSE)
2307 head = L"HEAD~1";
2308 cmd.Format(L"git.exe diff %s -- \"%s\"", (LPCTSTR)head, (LPCTSTR)p->GetGitPathString());
2309 g_Git.Run(cmd, &out, CP_UTF8);
2310 }
2311 }
2312
2313 m_patchViewdlg.SetText(out);
2314 }
2315 }
2316 LRESULT CCommitDlg::OnGitStatusListCtrlItemChanged(WPARAM /*wparam*/, LPARAM /*lparam*/)
2317 {
2318 this->FillPatchView(true);
2319 return 0;
2320 }
2321
2322
2323 LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)
2324 {
2325 SendMessage(WM_UPDATEOKBUTTON);
2326 return 0;
2327 }
2328
2329 LRESULT CCommitDlg::OnCheck(WPARAM wnd, LPARAM)
2330 {
2331 HWND hwnd = (HWND)wnd;
2332 bool check = !(GetAsyncKeyState(VK_SHIFT) & 0x8000);
2333 if (hwnd == GetDlgItem(IDC_CHECKALL)->GetSafeHwnd())
2334 m_ListCtrl.Check(GITSLC_SHOWEVERYTHING, check);
2335 else if (hwnd == GetDlgItem(IDC_CHECKNONE)->GetSafeHwnd())
2336 m_ListCtrl.Check(GITSLC_SHOWEVERYTHING, !check);
2337 else if (hwnd == GetDlgItem(IDC_CHECKUNVERSIONED)->GetSafeHwnd())
2338 m_ListCtrl.Check(GITSLC_SHOWUNVERSIONED, check);
2339 else if (hwnd == GetDlgItem(IDC_CHECKVERSIONED)->GetSafeHwnd())
2340 m_ListCtrl.Check(GITSLC_SHOWVERSIONED, check);
2341 else if (hwnd == GetDlgItem(IDC_CHECKADDED)->GetSafeHwnd())
2342 m_ListCtrl.Check(GITSLC_SHOWADDED, check);
2343 else if (hwnd == GetDlgItem(IDC_CHECKDELETED)->GetSafeHwnd())
2344 m_ListCtrl.Check(GITSLC_SHOWREMOVED, check);
2345 else if (hwnd == GetDlgItem(IDC_CHECKMODIFIED)->GetSafeHwnd())
2346 m_ListCtrl.Check(GITSLC_SHOWMODIFIED, check);
2347 else if (hwnd == GetDlgItem(IDC_CHECKFILES)->GetSafeHwnd())
2348 m_ListCtrl.Check(GITSLC_SHOWFILES, check);
2349 else if (hwnd == GetDlgItem(IDC_CHECKSUBMODULES)->GetSafeHwnd())
2350 m_ListCtrl.Check(GITSLC_SHOWSUBMODULES, check);
2351
2352 return 0;
2353 }
2354
2355 LRESULT CCommitDlg::OnUpdateOKButton(WPARAM, LPARAM)
2356 {
2357 if (m_bBlock)
2358 return 0;
2359
2360 CString text = m_cLogMessage.GetText().Trim();
2361 bool bValidLogSize = !text.IsEmpty() && text.GetLength() >= m_ProjectProperties.nMinLogSize;
2362 bool bAmendOrSelectFilesOrMerge = m_ListCtrl.GetSelected() > 0 || (m_bCommitAmend && m_bAmendDiffToLastCommit) || CTGitPath(g_Git.m_CurrentDir).IsMergeActive();
2363
2364 DialogEnableWindow(IDOK, bValidLogSize && (m_bCommitMessageOnly || bAmendOrSelectFilesOrMerge));
2365
2366 return 0;
2367 }
2368
2369 LRESULT CCommitDlg::OnUpdateDataFalse(WPARAM, LPARAM)
2370 {
2371 UpdateData(FALSE);
2372 return 0;
2373 }
2374
2375 LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
2376 {
2377 switch (message) {
2378 case WM_NOTIFY:
2379 if (wParam == IDC_SPLITTER)
2380 {
2381 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
2382 DoSize(pHdr->delta);
2383 }
2384 break;
2385 case WM_COMMAND:
2386 if (m_hAccelOkButton && LOWORD(wParam) >= WM_USER && LOWORD(wParam) <= WM_USER + m_accellerators.size())
2387 {
2388 for (const auto& entry : m_accellerators)
2389 {
2390 if (entry.second.wmid != LOWORD(wParam))
2391 continue;
2392 if (entry.second.id == -1)
2393 m_ctrlOkButton.PostMessage(WM_KEYDOWN, VK_F4, NULL);
2394 else
2395 {
2396 m_ctrlOkButton.SetCurrentEntry(entry.second.id);
2397 OnOK();
2398 }
2399 return 0;
2400 }
2401 }
2402 break;
2403 }
2404
2405 return __super::DefWindowProc(message, wParam, lParam);
2406 }
2407
2408 void CCommitDlg::SetSplitterRange()
2409 {
2410 if ((m_ListCtrl)&&(m_cLogMessage))
2411 {
2412 CRect rcTop;
2413 m_cLogMessage.GetWindowRect(rcTop);
2414 ScreenToClient(rcTop);
2415 CRect rcMiddle;
2416 m_ListCtrl.GetWindowRect(rcMiddle);
2417 ScreenToClient(rcMiddle);
2418 if (rcMiddle.Height() && rcMiddle.Width())
2419 m_wndSplitter.SetRange(rcTop.top + CDPIAware::Instance().ScaleY(120), rcMiddle.bottom - CDPIAware::Instance().ScaleY(80));
2420 }
2421 }
2422
2423 void CCommitDlg::DoSize(int delta)
2424 {
2425 RemoveAnchor(IDC_MESSAGEGROUP);
2426 RemoveAnchor(IDC_LOGMESSAGE);
2427 RemoveAnchor(IDC_SPLITTER);
2428 RemoveAnchor(IDC_SIGNOFF);
2429 RemoveAnchor(IDC_COMMIT_AMEND);
2430 RemoveAnchor(IDC_COMMIT_AMENDDIFF);
2431 RemoveAnchor(IDC_COMMIT_SETDATETIME);
2432 RemoveAnchor(IDC_COMMIT_DATEPICKER);
2433 RemoveAnchor(IDC_COMMIT_TIMEPICKER);
2434 RemoveAnchor(IDC_COMMIT_AS_COMMIT_DATE);
2435 RemoveAnchor(IDC_COMMIT_SETAUTHOR);
2436 RemoveAnchor(IDC_COMMIT_AUTHORDATA);
2437 RemoveAnchor(IDC_LISTGROUP);
2438 RemoveAnchor(IDC_FILELIST);
2439 RemoveAnchor(IDC_TEXT_INFO);
2440 RemoveAnchor(IDC_SELECTLABEL);
2441 RemoveAnchor(IDC_CHECKALL);
2442 RemoveAnchor(IDC_CHECKNONE);
2443 RemoveAnchor(IDC_CHECKUNVERSIONED);
2444 RemoveAnchor(IDC_CHECKVERSIONED);
2445 RemoveAnchor(IDC_CHECKADDED);
2446 RemoveAnchor(IDC_CHECKDELETED);
2447 RemoveAnchor(IDC_CHECKMODIFIED);
2448 RemoveAnchor(IDC_CHECKFILES);
2449 RemoveAnchor(IDC_CHECKSUBMODULES);
2450
2451 auto hdwp = BeginDeferWindowPos(24);
2452 CSplitterControl::ChangeRect(hdwp, &m_cLogMessage, 0, 0, 0, delta);
2453 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_MESSAGEGROUP), 0, 0, 0, delta);
2454 CSplitterControl::ChangeRect(hdwp, &m_ListCtrl, 0, delta, 0, 0);
2455 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_LISTGROUP), 0, delta, 0, 0);
2456 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_SIGNOFF), 0, delta, 0, delta);
2457 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_COMMIT_AMEND), 0, delta, 0, delta);
2458 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_COMMIT_AMENDDIFF), 0, delta, 0, delta);
2459 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_COMMIT_SETDATETIME), 0, delta, 0, delta);
2460 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_COMMIT_DATEPICKER), 0, delta, 0, delta);
2461 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_COMMIT_TIMEPICKER), 0, delta, 0, delta);
2462 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_COMMIT_AS_COMMIT_DATE), 0, delta, 0, delta);
2463 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_COMMIT_SETAUTHOR), 0, delta, 0, delta);
2464 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_COMMIT_AUTHORDATA), 0, delta, 0, delta);
2465 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_TEXT_INFO), 0, delta, 0, delta);
2466 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_SELECTLABEL), 0, delta, 0, delta);
2467 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_CHECKALL), 0, delta, 0, delta);
2468 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_CHECKNONE), 0, delta, 0, delta);
2469 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_CHECKUNVERSIONED), 0, delta, 0, delta);
2470 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_CHECKVERSIONED), 0, delta, 0, delta);
2471 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_CHECKADDED), 0, delta, 0, delta);
2472 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_CHECKDELETED), 0, delta, 0, delta);
2473 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_CHECKMODIFIED), 0, delta, 0, delta);
2474 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_CHECKFILES), 0, delta, 0, delta);
2475 CSplitterControl::ChangeRect(hdwp, GetDlgItem(IDC_CHECKSUBMODULES), 0, delta, 0, delta);
2476 EndDeferWindowPos(hdwp);
2477
2478 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
2479 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
2480 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
2481 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
2482 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
2483 AddAnchor(IDC_SIGNOFF,TOP_RIGHT);
2484 AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
2485 AddAnchor(IDC_COMMIT_AMENDDIFF,TOP_LEFT);
2486 AddAnchor(IDC_COMMIT_SETDATETIME,TOP_LEFT);
2487 AddAnchor(IDC_COMMIT_DATEPICKER,TOP_LEFT);
2488 AddAnchor(IDC_COMMIT_TIMEPICKER,TOP_LEFT);
2489 AddAnchor(IDC_COMMIT_AS_COMMIT_DATE, TOP_LEFT);
2490 AddAnchor(IDC_COMMIT_SETAUTHOR, TOP_LEFT);
2491 AddAnchor(IDC_COMMIT_AUTHORDATA, TOP_LEFT, TOP_RIGHT);
2492 AddAnchor(IDC_TEXT_INFO,TOP_RIGHT);
2493 AddAnchor(IDC_SELECTLABEL, TOP_LEFT);
2494 AddAnchor(IDC_CHECKALL, TOP_LEFT);
2495 AddAnchor(IDC_CHECKNONE, TOP_LEFT);
2496 AddAnchor(IDC_CHECKUNVERSIONED, TOP_LEFT);
2497 AddAnchor(IDC_CHECKVERSIONED, TOP_LEFT);
2498 AddAnchor(IDC_CHECKADDED, TOP_LEFT);
2499 AddAnchor(IDC_CHECKDELETED, TOP_LEFT);
2500 AddAnchor(IDC_CHECKMODIFIED, TOP_LEFT);
2501 AddAnchor(IDC_CHECKFILES, TOP_LEFT);
2502 AddAnchor(IDC_CHECKSUBMODULES, TOP_LEFT);
2503 ArrangeLayout();
2504 // adjust the minimum size of the dialog to prevent the resizing from
2505 // moving the list control too far down.
2506 CRect rcLogMsg;
2507 m_cLogMessage.GetClientRect(rcLogMsg);
2508 SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_LogMsgOrigRect.Height()+rcLogMsg.Height()));
2509
2510 SetSplitterRange();
2511 m_cLogMessage.Invalidate();
2512 GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
2513 }
2514
2515 void CCommitDlg::OnSize(UINT nType, int cx, int cy)
2516 {
2517 // first, let the resizing take place
2518 __super::OnSize(nType, cx, cy);
2519
2520 //set range
2521 SetSplitterRange();
2522 }
2523
2524 CString CCommitDlg::GetSignedOffByLine()
2525 {
2526 CString str;
2527
2528 CString username = g_Git.GetUserName();
2529 CString email = g_Git.GetUserEmail();
2530 username.Remove(L'\n');
2531 email.Remove(L'\n');
2532
2533 str.Format(L"Signed-off-by: %s <%s>", (LPCTSTR)username, (LPCTSTR)email);
2534
2535 return str;
2536 }
2537
2538 void CCommitDlg::OnBnClickedSignOff()
2539 {
2540 CString str = GetSignedOffByLine();
2541
2542 if (m_cLogMessage.GetText().Find(str) == -1) {
2543 m_cLogMessage.SetText(m_cLogMessage.GetText().TrimRight());
2544 int lastNewline = m_cLogMessage.GetText().ReverseFind(L'\n');
2545 int foundByLine = -1;
2546 if (lastNewline > 0)
2547 foundByLine = m_cLogMessage.GetText().Find(L"-by: ", lastNewline);
2548
2549 if (foundByLine == -1 || foundByLine < lastNewline)
2550 str = L"\r\n" + str;
2551
2552 m_cLogMessage.SetText(m_cLogMessage.GetText() + L"\r\n" + str + L"\r\n");
2553 }
2554 }
2555
2556 void CCommitDlg::OnBnClickedCommitAmend()
2557 {
2558 this->UpdateData();
2559 if(this->m_bCommitAmend && this->m_AmendStr.IsEmpty())
2560 {
2561 GitRev rev;
2562 if (rev.GetCommit(L"HEAD"))
2563 MessageBox(rev.GetLastErr(), L"TortoiseGit", MB_ICONERROR);
2564 m_AmendStr = rev.GetSubject() + L'\n' + rev.GetBody();
2565 }
2566
2567 if(this->m_bCommitAmend)
2568 {
2569 this->m_NoAmendStr=this->m_cLogMessage.GetText();
2570 m_cLogMessage.SetText(m_AmendStr);
2571 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_SHOW);
2572 if (m_bSetCommitDateTime)
2573 m_AsCommitDateCtrl.ShowWindow(SW_SHOW);
2574 }
2575 else
2576 {
2577 this->m_AmendStr=this->m_cLogMessage.GetText();
2578 m_cLogMessage.SetText(m_NoAmendStr);
2579 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_HIDE);
2580 m_AsCommitDateCtrl.ShowWindow(SW_HIDE);
2581 m_AsCommitDateCtrl.SetCheck(FALSE);
2582 OnBnClickedCommitAsCommitDate();
2583 }
2584
2585 OnBnClickedCommitSetDateTime(); // to update the commit date and time
2586 OnBnClickedCommitSetauthor(); // to update the commit author
2587
2588 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
2589 Refresh();
2590 }
2591
2592 void CCommitDlg::OnBnClickedCommitMessageOnly()
2593 {
2594 this->UpdateData();
2595 this->m_ListCtrl.EnableWindow(m_bCommitMessageOnly ? FALSE : TRUE);
2596 SendMessage(WM_UPDATEOKBUTTON);
2597 }
2598
2599 void CCommitDlg::OnBnClickedWholeProject()
2600 {
2601 m_tooltips.Pop(); // hide the tooltips
2602 UpdateData();
2603 m_ListCtrl.Clear();
2604 if (!m_bBlock)
2605 {
2606 if (m_bWholeProject || m_bWholeProject2)
2607 m_ListCtrl.GetStatus(nullptr, true, false, true);
2608 else
2609 m_ListCtrl.GetStatus(&this->m_pathList,true,false,true);
2610
2611 m_regShowWholeProject = m_bWholeProject;
2612
2613 DWORD dwShow = m_ListCtrl.GetShowFlags();
2614 if (DWORD(m_regAddBeforeCommit))
2615 dwShow |= GITSLC_SHOWUNVERSIONED;
2616 else
2617 dwShow &= ~GITSLC_SHOWUNVERSIONED;
2618
2619 m_ListCtrl.StoreScrollPos();
2620 m_ListCtrl.Show(dwShow, dwShow & ~(CTGitPath::LOGACTIONS_UNVER), true);
2621 UpdateCheckLinks();
2622 }
2623
2624 SetDlgTitle();
2625 }
2626
2627 void CCommitDlg::OnFocusMessage()
2628 {
2629 m_cLogMessage.SetFocus();
2630 }
2631
2632 void CCommitDlg::OnFocusFileList()
2633 {
2634 m_ListCtrl.SetFocus();
2635 }
2636
2637 void CCommitDlg::OnScnUpdateUI(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2638 {
2639 auto pos = (Sci_Position)m_cLogMessage.Call(SCI_GETCURRENTPOS);
2640 auto line = (int)m_cLogMessage.Call(SCI_LINEFROMPOSITION, pos);
2641 auto column = (int)m_cLogMessage.Call(SCI_GETCOLUMN, pos);
2642
2643 CString str;
2644 str.Format(L"%d/%d", line + 1, column + 1);
2645 this->GetDlgItem(IDC_TEXT_INFO)->SetWindowText(str);
2646
2647 if(*pResult)
2648 *pResult=0;
2649 }
2650
2651 void CCommitDlg::TogglePatchView()
2652 {
2653 OnStnClickedViewPatch();
2654 }
2655
2656 void CCommitDlg::OnStnClickedViewPatch()
2657 {
2658 m_patchViewdlg.m_ParentDlg = this;
2659 if(!IsWindow(this->m_patchViewdlg.m_hWnd))
2660 {
2661 BOOL viewPatchEnabled = FALSE;
2662 viewPatchEnabled = g_Git.GetConfigValueBool(L"tgit.commitshowpatch");
2663 if (viewPatchEnabled == FALSE)
2664 g_Git.SetConfigValue(L"tgit.commitshowpatch", L"true");
2665 m_patchViewdlg.Create(IDD_PATCH_VIEW,this);
2666 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETSCROLLWIDTHTRACKING, TRUE);
2667 CRect rect;
2668 this->GetWindowRect(&rect);
2669
2670 m_patchViewdlg.ShowWindow(SW_SHOW);
2671
2672 m_patchViewdlg.SetWindowPos(nullptr, rect.right, rect.top, (DWORD)CRegStdDWORD(L"Software\\TortoiseGit\\TortoiseProc\\PatchDlgWidth", rect.Width()), rect.Height(),
2673 SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
2674
2675 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
2676
2677 ShowViewPatchText(false);
2678 FillPatchView();
2679 }
2680 else
2681 {
2682 g_Git.SetConfigValue(L"tgit.commitshowpatch", L"false");
2683 m_patchViewdlg.ShowWindow(SW_HIDE);
2684 m_patchViewdlg.DestroyWindow();
2685 ShowViewPatchText(true);
2686 }
2687 this->m_ctrlShowPatch.Invalidate();
2688 }
2689
2690 void CCommitDlg::OnMoving(UINT fwSide, LPRECT pRect)
2691 {
2692 __super::OnMoving(fwSide, pRect);
2693
2694 if (::IsWindow(m_patchViewdlg.m_hWnd))
2695 {
2696 RECT patchrect;
2697 m_patchViewdlg.GetWindowRect(&patchrect);
2698 if (::IsWindow(m_hWnd))
2699 {
2700 RECT thisrect;
2701 GetWindowRect(&thisrect);
2702 if (patchrect.left == thisrect.right)
2703 {
2704 m_patchViewdlg.SetWindowPos(nullptr, patchrect.left - (thisrect.left - pRect->left), patchrect.top - (thisrect.top - pRect->top),
2705 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
2706 }
2707 }
2708 }
2709 }
2710
2711 void CCommitDlg::OnSizing(UINT fwSide, LPRECT pRect)
2712 {
2713 __super::OnSizing(fwSide, pRect);
2714
2715 if(::IsWindow(this->m_patchViewdlg.m_hWnd))
2716 {
2717 CRect thisrect, patchrect;
2718 this->GetWindowRect(thisrect);
2719 this->m_patchViewdlg.GetWindowRect(patchrect);
2720 if(thisrect.right==patchrect.left)
2721 {
2722 patchrect.left -= (thisrect.right - pRect->right);
2723 patchrect.right-= (thisrect.right - pRect->right);
2724
2725 if( patchrect.bottom == thisrect.bottom)
2726 patchrect.bottom -= (thisrect.bottom - pRect->bottom);
2727 if( patchrect.top == thisrect.top)
2728 patchrect.top -= thisrect.top-pRect->top;
2729 m_patchViewdlg.MoveWindow(patchrect);
2730 }
2731 }
2732 }
2733
2734 void CCommitDlg::OnHdnItemchangedFilelist(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2735 {
2736 *pResult = 0;
2737 TRACE("Item Changed\r\n");
2738 }
2739
2740 int CCommitDlg::CheckHeadDetach()
2741 {
2742 CString output;
2743 if (CGit::GetCurrentBranchFromFile(g_Git.m_CurrentDir, output))
2744 {
2745 int retval = CMessageBox::Show(GetSafeHwnd(), IDS_PROC_COMMIT_DETACHEDWARNING, IDS_APPNAME, MB_YESNOCANCEL | MB_ICONWARNING);
2746 if(retval == IDYES)
2747 {
2748 if (CAppUtils::CreateBranchTag(GetSafeHwnd(), FALSE, nullptr, true) == FALSE)
2749 return 1;
2750 }
2751 else if (retval == IDCANCEL)
2752 return 1;
2753 }
2754 return 0;
2755 }
2756
2757 void CCommitDlg::OnBnClickedCommitAmenddiff()
2758 {
2759 UpdateData();
2760 Refresh();
2761 }
2762
2763 void CCommitDlg::OnBnClickedNoautoselectsubmodules()
2764 {
2765 UpdateData();
2766 Refresh();
2767 }
2768
2769 void CCommitDlg::OnBnClickedCommitSetDateTime()
2770 {
2771 UpdateData();
2772
2773 if (m_bSetCommitDateTime)
2774 {
2775 CTime authordate = CTime::GetCurrentTime();
2776 if (m_bCommitAmend)
2777 {
2778 GitRev headRevision;
2779 if (headRevision.GetCommit(L"HEAD"))
2780 MessageBox(headRevision.GetLastErr(), L"TortoiseGit", MB_ICONERROR);
2781 authordate = headRevision.GetAuthorDate();
2782 m_AsCommitDateCtrl.ShowWindow(SW_SHOW);
2783 }
2784
2785 m_CommitDate.SetTime(&authordate);
2786 m_CommitTime.SetTime(&authordate);
2787
2788 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_SHOW);
2789 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_SHOW);
2790 }
2791 else
2792 {
2793 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_HIDE);
2794 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_HIDE);
2795 m_AsCommitDateCtrl.ShowWindow(SW_HIDE);
2796 m_AsCommitDateCtrl.SetCheck(FALSE);
2797 OnBnClickedCommitAsCommitDate();
2798 }
2799 }
2800
2801 void CCommitDlg::OnBnClickedCommitAsCommitDate()
2802 {
2803 GetDlgItem(IDC_COMMIT_DATEPICKER)->EnableWindow(!m_AsCommitDateCtrl.GetCheck());
2804 GetDlgItem(IDC_COMMIT_TIMEPICKER)->EnableWindow(!m_AsCommitDateCtrl.GetCheck());
2805 }
2806
2807 void CCommitDlg::OnBnClickedCheckNewBranch()
2808 {
2809 UpdateData();
2810 if (m_bCreateNewBranch)
2811 {
2812 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_HIDE);
2813 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_SHOW);
2814 }
2815 else
2816 {
2817 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_HIDE);
2818 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_SHOW);
2819 }
2820 }
2821
2822 bool CCommitDlg::RestoreFiles(bool doNotAsk, bool allowCancel)
2823 {
2824 if (m_ListCtrl.m_restorepaths.empty())
2825 return true;
2826
2827 if (!doNotAsk)
2828 {
2829 auto ret = CMessageBox::Show(m_hWnd, IDS_PROC_COMMIT_RESTOREFILES, IDS_APPNAME, 2, IDI_QUESTION, IDS_PROC_COMMIT_RESTOREFILES_RESTORE, IDS_PROC_COMMIT_RESTOREFILES_KEEP, allowCancel ? IDS_MSGBOX_CANCEL : 0);
2830 if (ret == 3)
2831 return false;
2832 if (ret == 2)
2833 return true;
2834 }
2835
2836 for (const auto& item : m_ListCtrl.m_restorepaths)
2837 CopyFile(item.second, g_Git.CombinePath(item.first), FALSE);
2838 m_ListCtrl.m_restorepaths.clear();
2839
2840 return true;
2841 }
2842
2843 void CCommitDlg::UpdateCheckLinks()
2844 {
2845 DialogEnableWindow(IDC_CHECKALL, true);
2846 DialogEnableWindow(IDC_CHECKNONE, true);
2847 DialogEnableWindow(IDC_CHECKUNVERSIONED, m_ListCtrl.GetUnversionedCount() > 0);
2848 DialogEnableWindow(IDC_CHECKVERSIONED, m_ListCtrl.GetItemCount() > m_ListCtrl.GetUnversionedCount());
2849 DialogEnableWindow(IDC_CHECKADDED, m_ListCtrl.GetAddedCount() > 0);
2850 DialogEnableWindow(IDC_CHECKDELETED, m_ListCtrl.GetDeletedCount() > 0);
2851 DialogEnableWindow(IDC_CHECKMODIFIED, m_ListCtrl.GetModifiedCount() > 0);
2852 DialogEnableWindow(IDC_CHECKFILES, m_ListCtrl.GetFileCount() > 0);
2853 DialogEnableWindow(IDC_CHECKSUBMODULES, m_ListCtrl.GetSubmoduleCount() > 0);
2854 }
2855
2856 void CCommitDlg::OnBnClickedCommitSetauthor()
2857 {
2858 UpdateData();
2859
2860 if (m_bSetAuthor)
2861 {
2862 m_sAuthor.Format(L"%s <%s>", (LPCTSTR)g_Git.GetUserName(), (LPCTSTR)g_Git.GetUserEmail());
2863 if (m_bCommitAmend)
2864 {
2865 GitRev headRevision;
2866 if (headRevision.GetCommit(L"HEAD"))
2867 MessageBox(headRevision.GetLastErr(), L"TortoiseGit", MB_ICONERROR);
2868 m_sAuthor.Format(L"%s <%s>", (LPCTSTR)headRevision.GetAuthorName(), (LPCTSTR)headRevision.GetAuthorEmail());
2869 }
2870
2871 UpdateData(FALSE);
2872
2873 GetDlgItem(IDC_COMMIT_AUTHORDATA)->ShowWindow(SW_SHOW);
2874 }
2875 else
2876 GetDlgItem(IDC_COMMIT_AUTHORDATA)->ShowWindow(SW_HIDE);
2877 }
2878
2879 bool CCommitDlg::RunStartCommitHook()
2880 {
2881 DWORD exitcode = 0xFFFFFFFF;
2882 CString error;
2883 if (CHooks::Instance().StartCommit(g_Git.m_CurrentDir, m_pathList, m_sLogMessage, exitcode, error))
2884 {
2885 if (exitcode)
2886 {
2887 CString temp;
2888 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
2889 MessageBox(temp, L"TortoiseGit", MB_ICONERROR);
2890 return false;
2891 }
2892 }
2893 return true;
2894 }
2895
2896 void CCommitDlg::OnSysColorChange()
2897 {
2898 __super::OnSysColorChange();
2899 m_cLogMessage.SetColors(true);
2900 m_cLogMessage.SetFont(CAppUtils::GetLogFontName(), CAppUtils::GetLogFontSize());
2901 }
Windows Explorer Extension to Operate Git