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