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