?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Use .Empty() on CString instead of setting it to L""
[TortoiseGit.git] / src / TortoiseProc / CommitDlg.cpp
blob8e6155a2ec256c80888c88f77eff0865cd1392f0
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 /*=NULL*/)
56 : CResizableStandAloneDialog(CCommitDlg::IDD, pParent)
57 , m_bShowUnversioned(FALSE)
58 , m_bBlock(FALSE)
59 , m_bThreadRunning(FALSE)
60 , m_bRunThread(FALSE)
61 , m_pThread(NULL)
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(NULL, 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 = NULL;
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.Empty();
1018 CString amend;
1019 if(this->m_bCommitAmend)
1020 {
1021 amend=_T("--amend");
1022 }
1023 CString dateTime;
1024 if (m_bSetCommitDateTime)
1025 {
1026 CTime date, time;
1027 m_CommitDate.GetTime(date);
1028 m_CommitTime.GetTime(time);
1029 if (m_bCommitAmend && m_AsCommitDateCtrl.GetCheck())
1030 dateTime = CAppUtils::GetMsysgitVersion() > 0x02010000 ? L"--date=\"now\"" : L"--date=\"\"" ;
1031 else
1032 dateTime.Format(_T("--date=%sT%s"), (LPCTSTR)date.Format(_T("%Y-%m-%d")), (LPCTSTR)time.Format(_T("%H:%M:%S")));
1033 }
1034 CString author;
1035 if (m_bSetAuthor)
1036 author.Format(_T("--author=\"%s\""), (LPCTSTR)m_sAuthor);
1037 CString allowEmpty = m_bCommitMessageOnly ? _T("--allow-empty") : _T("");
1038 // TODO: make sure notes.amend.rewrite does still work when switching to libgit2
1039 cmd.Format(_T("git.exe commit %s %s %s %s -F \"%s\""), (LPCTSTR)author, (LPCTSTR)dateTime, (LPCTSTR)amend, (LPCTSTR)allowEmpty, (LPCTSTR)tempfile);
1040
1041 CCommitProgressDlg progress;
1042 progress.m_bBufferAll=true; // improve show speed when there are many file added.
1043 progress.m_GitCmd=cmd;
1044 progress.m_bShowCommand = FALSE; // don't show the commit command
1045 progress.m_PreText = out; // show any output already generated in log window
1046 if (m_ctrlOkButton.GetCurrentEntry() > 0)
1047 progress.m_AutoClose = GitProgressAutoClose::AUTOCLOSE_IF_NO_ERRORS;
1048
1049 progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
1050 {
1051 if (status || m_bNoPostActions || m_bAutoClose)
1052 return;
1053
1054 if (IsGitSVN)
1055 postCmdList.emplace_back(IDI_COMMIT, IDS_MENUSVNDCOMMIT, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_DCOMMIT; });
1056
1057 postCmdList.emplace_back(IDI_PUSH, IDS_MENUPUSH, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_PUSH; });
1058 postCmdList.emplace_back(IDI_PULL, IDS_MENUPULL, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_PULL; });
1059 postCmdList.emplace_back(IDI_COMMIT, IDS_PROC_COMMIT_RECOMMIT, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_RECOMMIT; });
1060 postCmdList.emplace_back(IDI_TAG, IDS_MENUTAG, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_CREATETAG; });
1061 };
1062
1063 m_PostCmd = GIT_POSTCOMMIT_CMD_NOTHING;
1064 progress.DoModal();
1065
1066 if (!m_bNoPostActions)
1067 m_regLastAction = (int)m_ctrlOkButton.GetCurrentEntry();
1068 if (m_ctrlOkButton.GetCurrentEntry() == 1)
1069 m_PostCmd = GIT_POSTCOMMIT_CMD_RECOMMIT;
1070
1071 if (progress.m_GitStatus || m_PostCmd == GIT_POSTCOMMIT_CMD_RECOMMIT)
1072 {
1073 bCloseCommitDlg = false;
1074 if (m_PostCmd == GIT_POSTCOMMIT_CMD_RECOMMIT)
1075 {
1076 if (!m_sLogMessage.IsEmpty())
1077 {
1078 ReloadHistoryEntries();
1079 m_History.AddEntry(m_sLogMessage);
1080 m_History.Save();
1081 }
1082
1083 this->m_sLogMessage.Empty();
1084 GetCommitTemplate(m_sLogMessage);
1085 RunStartCommitHook();
1086 m_cLogMessage.SetText(m_sLogMessage);
1087 if (m_bCreateNewBranch)
1088 {
1089 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_SHOW);
1090 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_HIDE);
1091 }
1092 m_bCreateNewBranch = FALSE;
1093 }
1094
1095 if (!progress.m_GitStatus)
1096 {
1097 m_AmendStr.Empty();
1098 m_bCommitAmend = FALSE;
1099 }
1100
1101 UpdateData(FALSE);
1102 }
1103
1104 ::DeleteFile(tempfile);
1105
1106 if (m_BugTraqProvider && progress.m_GitStatus == 0)
1107 {
1108 CComPtr<IBugTraqProvider2> pProvider = NULL;
1109 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider);
1110 if (SUCCEEDED(hr))
1111 {
1112 ATL::CComBSTR commonRoot(g_Git.m_CurrentDir);
1113 CBstrSafeVector pathList(m_selectedPathList.GetCount());
1114
1115 for (LONG index = 0; index < m_selectedPathList.GetCount(); ++index)
1116 pathList.PutElement(index, m_selectedPathList[index].GetGitPathString());
1117
1118 ATL::CComBSTR logMessage(m_sLogMessage);
1119
1120 CGitHash hash;
1121 if (g_Git.GetHash(hash, _T("HEAD")))
1122 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash after committing.")), _T("TortoiseGit"), MB_ICONERROR);
1123 LONG version = g_Git.Hash2int(hash);
1124
1125 ATL::CComBSTR temp;
1126 if (FAILED(hr = pProvider->OnCommitFinished(GetSafeHwnd(),
1127 commonRoot,
1128 pathList,
1129 logMessage,
1130 (LONG)version,
1131 &temp)))
1132 {
1133 CString sErr = temp;
1134 if (!sErr.IsEmpty())
1135 CMessageBox::Show(NULL,(sErr),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1136 else
1137 {
1138 COMError ce(hr);
1139 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, ce.GetSource().c_str(), ce.GetMessageAndDescription().c_str());
1140 CMessageBox::Show(NULL,(sErr),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1141 }
1142 }
1143 }
1144 }
1145 RestoreFiles(progress.m_GitStatus == 0, false);
1146 if (((DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit"), TRUE)) == TRUE)
1147 {
1148 BOOL cancel = FALSE;
1149 mgtReAddAfterCommit.Execute(cancel);
1150 mgtReDelAfterCommit.Execute(cancel);
1151 }
1152 }
1153 else if(bAddSuccess)
1154 {
1155 CMessageBox::Show(this->m_hWnd, IDS_ERROR_NOTHING_COMMIT, IDS_COMMIT_FINISH, MB_OK | MB_ICONINFORMATION);
1156 bCloseCommitDlg=false;
1157 }
1158
1159 UpdateData();
1160 m_regAddBeforeCommit = m_bShowUnversioned;
1161 m_regKeepChangelists = m_bKeepChangeList;
1162 m_regDoNotAutoselectSubmodules = m_bDoNotAutoselectSubmodules;
1163 if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())
1164 m_bKeepChangeList = FALSE;
1165 InterlockedExchange(&m_bBlock, FALSE);
1166
1167 if (!m_sLogMessage.IsEmpty())
1168 {
1169 ReloadHistoryEntries();
1170 m_History.AddEntry(m_sLogMessage);
1171 m_History.Save();
1172 }
1173
1174 SaveSplitterPos();
1175
1176 if (bCloseCommitDlg)
1177 {
1178 if (m_ctrlOkButton.GetCurrentEntry() == 2)
1179 DoPush();
1180 CResizableStandAloneDialog::OnOK();
1181 }
1182 else if (m_PostCmd == GIT_POSTCOMMIT_CMD_RECOMMIT)
1183 {
1184 this->Refresh();
1185 this->BringWindowToTop();
1186 }
1187
1188 CShellUpdater::Instance().Flush();
1189 }
1190
1191 void CCommitDlg::SaveSplitterPos()
1192 {
1193 if (!IsIconic())
1194 {
1195 CRegDWORD regPos(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
1196 RECT rectSplitter;
1197 m_wndSplitter.GetWindowRect(&rectSplitter);
1198 ScreenToClient(&rectSplitter);
1199 regPos = rectSplitter.top;
1200 }
1201 }
1202
1203 UINT CCommitDlg::StatusThreadEntry(LPVOID pVoid)
1204 {
1205 return ((CCommitDlg*)pVoid)->StatusThread();
1206 }
1207
1208 void CCommitDlg::ReloadHistoryEntries()
1209 {
1210 CString reg;
1211 reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);
1212 reg.Replace(_T(':'), _T('_'));
1213 m_History.Load(reg, _T("logmsgs"));
1214 }
1215
1216 UINT CCommitDlg::StatusThread()
1217 {
1218 //get the status of all selected file/folders recursively
1219 //and show the ones which have to be committed to the user
1220 //in a list control.
1221 m_pathwatcher.Stop();
1222
1223 m_ListCtrl.SetBusy(true);
1224 g_Git.RefreshGitIndex();
1225
1226 m_bCancelled = false;
1227
1228 DialogEnableWindow(IDOK, false);
1229 DialogEnableWindow(IDC_SHOWUNVERSIONED, false);
1230 DialogEnableWindow(IDC_WHOLE_PROJECT, false);
1231 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES, false);
1232 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_HIDE);
1233 DialogEnableWindow(IDC_EXTERNALWARNING, false);
1234 DialogEnableWindow(IDC_COMMIT_AMEND, FALSE);
1235 DialogEnableWindow(IDC_COMMIT_AMENDDIFF, FALSE);
1236 // read the list of recent log entries before querying the WC for status
1237 // -> the user may select one and modify / update it while we are crawling the WC
1238
1239 DialogEnableWindow(IDC_CHECKALL, false);
1240 DialogEnableWindow(IDC_CHECKNONE, false);
1241 DialogEnableWindow(IDC_CHECKUNVERSIONED, false);
1242 DialogEnableWindow(IDC_CHECKVERSIONED, false);
1243 DialogEnableWindow(IDC_CHECKADDED, false);
1244 DialogEnableWindow(IDC_CHECKDELETED, false);
1245 DialogEnableWindow(IDC_CHECKMODIFIED, false);
1246 DialogEnableWindow(IDC_CHECKFILES, false);
1247 DialogEnableWindow(IDC_CHECKSUBMODULES, false);
1248
1249 CString dotGitPath;
1250 GitAdminDir::GetAdminDirPath(g_Git.m_CurrentDir, dotGitPath);
1251 if (PathFileExists(dotGitPath + _T("CHERRY_PICK_HEAD")))
1252 {
1253 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_HIDE);
1254 m_bCommitAmend = FALSE;
1255 SendMessage(WM_UPDATEDATAFALSE);
1256 }
1257
1258 // Initialise the list control with the status of the files/folders below us
1259 m_ListCtrl.Clear();
1260 BOOL success;
1261 CTGitPathList *pList;
1262 m_ListCtrl.m_amend = (m_bCommitAmend==TRUE || m_bForceCommitAmend) && (m_bAmendDiffToLastCommit==FALSE);
1263 m_ListCtrl.m_bDoNotAutoselectSubmodules = (m_bDoNotAutoselectSubmodules == TRUE);
1264
1265 if(m_bWholeProject || m_bWholeProject2)
1266 pList=NULL;
1267 else
1268 pList = &m_pathList;
1269
1270 success=m_ListCtrl.GetStatus(pList);
1271
1272 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
1273 if(this->m_bShowUnversioned)
1274 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER,true,pList);
1275
1276 m_ListCtrl.CheckIfChangelistsArePresent(false);
1277
1278 DWORD dwShow = GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GITSLC_SHOWLOCKS | GITSLC_SHOWINCHANGELIST | GITSLC_SHOWDIRECTFILES;
1279 dwShow |= DWORD(m_regAddBeforeCommit) ? GITSLC_SHOWUNVERSIONED : 0;
1280 if (success)
1281 {
1282 if (!m_checkedPathList.IsEmpty())
1283 m_ListCtrl.Show(dwShow, m_checkedPathList);
1284 else
1285 {
1286 DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;
1287 dwCheck &=~(CTGitPath::LOGACTIONS_UNVER); //don't check unversion file default.
1288 m_ListCtrl.Show(dwShow, dwCheck);
1289 m_bSelectFilesForCommit = true;
1290 }
1291
1292 if (m_ListCtrl.HasExternalsFromDifferentRepos())
1293 {
1294 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);
1295 DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);
1296 }
1297
1298 SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());
1299 m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());
1300 if (m_ListCtrl.GetItemCount() != 0)
1301 m_ListCtrl.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
1302 }
1303 if (!success)
1304 {
1305 if (!m_ListCtrl.GetLastErrorMessage().IsEmpty())
1306 m_ListCtrl.SetEmptyString(m_ListCtrl.GetLastErrorMessage());
1307 m_ListCtrl.Show(dwShow);
1308 }
1309
1310 if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems())
1311 && !PathFileExists(dotGitPath + _T("MERGE_HEAD")))
1312 {
1313 CString temp;
1314 temp.LoadString(IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED);
1315 if (CMessageBox::ShowCheck(m_hWnd, temp, _T("TortoiseGit"), MB_ICONINFORMATION | MB_YESNO, _T("NothingToCommitShowUnversioned"), NULL)==IDYES)
1316 {
1317 m_bShowUnversioned = TRUE;
1318 GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);
1319 dwShow = (DWORD)(GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GITSLC_SHOWUNVERSIONED | GITSLC_SHOWLOCKS);
1320 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);
1321 m_ListCtrl.Show(dwShow,dwShow&(~CTGitPath::LOGACTIONS_UNVER));
1322 }
1323 }
1324
1325 SetDlgTitle();
1326
1327 m_autolist.clear();
1328 // we don't have to block the commit dialog while we fetch the
1329 // auto completion list.
1330 m_pathwatcher.ClearChangedPaths();
1331 InterlockedExchange(&m_bBlock, FALSE);
1332 if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE)==TRUE)
1333 {
1334 m_ListCtrl.Block(TRUE, TRUE);
1335 GetAutocompletionList();
1336 m_ListCtrl.Block(FALSE, FALSE);
1337 }
1338 SendMessage(WM_UPDATEOKBUTTON);
1339 if (m_bRunThread)
1340 {
1341 DialogEnableWindow(IDC_SHOWUNVERSIONED, true);
1342 DialogEnableWindow(IDC_WHOLE_PROJECT, !m_bWholeProject2);
1343 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES, true);
1344 if (m_ListCtrl.HasChangeLists())
1345 DialogEnableWindow(IDC_KEEPLISTS, true);
1346
1347 // activate amend checkbox (if necessary)
1348 if (g_Git.IsInitRepos())
1349 {
1350 m_bCommitAmend = FALSE;
1351 SendMessage(WM_UPDATEDATAFALSE);
1352 }
1353 else
1354 {
1355 if (m_bForceCommitAmend)
1356 {
1357 m_bCommitAmend = TRUE;
1358 SendMessage(WM_UPDATEDATAFALSE);
1359 }
1360 else
1361 GetDlgItem(IDC_COMMIT_AMEND)->EnableWindow(!PathFileExists(dotGitPath + _T("CHERRY_PICK_HEAD")));
1362
1363 CGitHash hash;
1364 if (g_Git.GetHash(hash, _T("HEAD")))
1365 {
1366 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
1367 }
1368 if (!hash.IsEmpty())
1369 {
1370 GitRev headRevision;
1371 if (headRevision.GetParentFromHash(hash))
1372 MessageBox(headRevision.GetLastErr(), _T("TortoiseGit"), MB_ICONERROR);
1373 // do not allow to show diff to "last" revision if it has more that one parent
1374 if (headRevision.ParentsCount() != 1)
1375 {
1376 m_bAmendDiffToLastCommit = TRUE;
1377 SendMessage(WM_UPDATEDATAFALSE);
1378 }
1379 else
1380 GetDlgItem(IDC_COMMIT_AMENDDIFF)->EnableWindow(TRUE);
1381 }
1382 }
1383
1384 UpdateCheckLinks();
1385
1386 // we have the list, now signal the main thread about it
1387 SendMessage(WM_AUTOLISTREADY); // only send the message if the thread wasn't told to quit!
1388 }
1389
1390 InterlockedExchange(&m_bRunThread, FALSE);
1391 InterlockedExchange(&m_bThreadRunning, FALSE);
1392 // force the cursor to normal
1393 RefreshCursor();
1394
1395 return 0;
1396 }
1397
1398 void CCommitDlg::SetDlgTitle()
1399 {
1400 if (m_sTitle.IsEmpty())
1401 GetWindowText(m_sTitle);
1402
1403 if (m_bWholeProject || m_bWholeProject2)
1404 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, m_sTitle);
1405 else
1406 {
1407 if (m_pathList.GetCount() == 1)
1408 CAppUtils::SetWindowTitle(m_hWnd, g_Git.CombinePath(m_pathList[0].GetUIPathString()), m_sTitle);
1409 else
1410 CAppUtils::SetWindowTitle(m_hWnd, g_Git.CombinePath(m_ListCtrl.GetCommonDirectory(false)), m_sTitle);
1411 }
1412 }
1413
1414 void CCommitDlg::OnCancel()
1415 {
1416 m_bCancelled = true;
1417 m_pathwatcher.Stop();
1418
1419 if (m_bThreadRunning)
1420 StopStatusThread();
1421 if (!RestoreFiles())
1422 return;
1423 UpdateData();
1424 m_sBugID.Trim();
1425 m_sLogMessage = m_cLogMessage.GetText();
1426 if (!m_sBugID.IsEmpty())
1427 {
1428 m_sBugID.Replace(_T(", "), _T(","));
1429 m_sBugID.Replace(_T(" ,"), _T(","));
1430 CString sBugID = m_ProjectProperties.sMessage;
1431 sBugID.Replace(_T("%BUGID%"), m_sBugID);
1432 if (m_ProjectProperties.bAppend)
1433 m_sLogMessage += _T("\n") + sBugID + _T("\n");
1434 else
1435 m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
1436 }
1437 if ((m_sLogTemplate.Compare(m_sLogMessage) != 0) && !m_sLogMessage.IsEmpty())
1438 {
1439 ReloadHistoryEntries();
1440 m_History.AddEntry(m_sLogMessage);
1441 m_History.Save();
1442 }
1443 SaveSplitterPos();
1444 CResizableStandAloneDialog::OnCancel();
1445 }
1446
1447 BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)
1448 {
1449 if (m_hAccel)
1450 {
1451 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
1452 if (ret)
1453 return TRUE;
1454 }
1455 if (m_hAccelOkButton && GetDlgItem(IDOK)->IsWindowEnabled() && TranslateAccelerator(m_hWnd, m_hAccelOkButton, pMsg))
1456 return TRUE;
1457
1458 if (pMsg->message == WM_KEYDOWN)
1459 {
1460 switch (pMsg->wParam)
1461 {
1462 case VK_F5:
1463 {
1464 if (m_bBlock)
1465 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
1466 Refresh();
1467 }
1468 break;
1469 case VK_RETURN:
1470 {
1471 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
1472 {
1473 if ( GetDlgItem(IDOK)->IsWindowEnabled() )
1474 {
1475 PostMessage(WM_COMMAND, IDOK);
1476 }
1477 return TRUE;
1478 }
1479 if ( GetFocus()==GetDlgItem(IDC_BUGID) )
1480 {
1481 // Pressing RETURN in the bug id control
1482 // moves the focus to the message
1483 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
1484 return TRUE;
1485 }
1486 }
1487 break;
1488 }
1489 }
1490
1491 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
1492 }
1493
1494 void CCommitDlg::Refresh()
1495 {
1496 if (m_bThreadRunning)
1497 return;
1498
1499 StartStatusThread();
1500 }
1501
1502 void CCommitDlg::StartStatusThread()
1503 {
1504 if (InterlockedExchange(&m_bBlock, TRUE) != FALSE)
1505 return;
1506
1507 delete m_pThread;
1508 m_pThread = nullptr;
1509
1510 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL, 0, CREATE_SUSPENDED);
1511 if (!m_pThread)
1512 {
1513 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
1514 InterlockedExchange(&m_bBlock, FALSE);
1515 return;
1516 }
1517 InterlockedExchange(&m_bThreadRunning, TRUE);// so the main thread knows that this thread is still running
1518 InterlockedExchange(&m_bRunThread, TRUE); // if this is set to FALSE, the thread should stop
1519 m_pThread->m_bAutoDelete = FALSE;
1520 m_pThread->ResumeThread();
1521 }
1522
1523 void CCommitDlg::StopStatusThread()
1524 {
1525 InterlockedExchange(&m_bRunThread, FALSE);
1526 WaitForSingleObject(m_pThread->m_hThread, 1000);
1527 if (!m_bThreadRunning)
1528 return;
1529
1530 // we gave the thread a chance to quit. Since the thread didn't
1531 // listen to us we have to kill it.
1532 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
1533 InterlockedExchange(&m_bThreadRunning, FALSE);
1534 }
1535
1536 void CCommitDlg::OnBnClickedShowunversioned()
1537 {
1538 m_tooltips.Pop(); // hide the tooltips
1539 UpdateData();
1540 m_regAddBeforeCommit = m_bShowUnversioned;
1541 if (!m_bBlock)
1542 {
1543 DWORD dwShow = m_ListCtrl.GetShowFlags();
1544 if (DWORD(m_regAddBeforeCommit))
1545 dwShow |= GITSLC_SHOWUNVERSIONED;
1546 else
1547 dwShow &= ~GITSLC_SHOWUNVERSIONED;
1548 if(dwShow & GITSLC_SHOWUNVERSIONED)
1549 {
1550 if (m_bWholeProject || m_bWholeProject2)
1551 m_ListCtrl.GetStatus(NULL,false,false,true);
1552 else
1553 m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);
1554 }
1555 m_ListCtrl.Show(dwShow, 0, true, dwShow & ~(CTGitPath::LOGACTIONS_UNVER), true);
1556 UpdateCheckLinks();
1557 }
1558 }
1559
1560 void CCommitDlg::OnStnClickedExternalwarning()
1561 {
1562 m_tooltips.Popup();
1563 }
1564
1565 void CCommitDlg::OnEnChangeLogmessage()
1566 {
1567 SendMessage(WM_UPDATEOKBUTTON);
1568 }
1569
1570 LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)
1571 {
1572 #if 0
1573 if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))
1574 {
1575 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
1576 {
1577 m_bShowUnversioned = TRUE;
1578 DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;
1579 m_ListCtrl.Show(dwShow);
1580 UpdateData(FALSE);
1581 }
1582 }
1583 #endif
1584 return 0;
1585 }
1586
1587 LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
1588 {
1589 Refresh();
1590 return 0;
1591 }
1592
1593 LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM /*lParam*/)
1594 {
1595 #if 0
1596 BringWindowToTop();
1597 SetForegroundWindow();
1598 SetActiveWindow();
1599 // if multiple files/folders are dropped
1600 // this handler is called for every single item
1601 // separately.
1602 // To avoid creating multiple refresh threads and
1603 // causing crashes, we only add the items to the
1604 // list control and start a timer.
1605 // When the timer expires, we start the refresh thread,
1606 // but only if it isn't already running - otherwise we
1607 // restart the timer.
1608 CTGitPath path;
1609 path.SetFromWin((LPCTSTR)lParam);
1610
1611 // just add all the items we get here.
1612 // if the item is versioned, the add will fail but nothing
1613 // more will happen.
1614 Git Git;
1615 Git.Add(CTGitPathList(path), &m_ProjectProperties, Git_depth_empty, false, true, true);
1616
1617 if (!m_ListCtrl.HasPath(path))
1618 {
1619 if (m_pathList.AreAllPathsFiles())
1620 {
1621 m_pathList.AddPath(path);
1622 m_pathList.RemoveDuplicates();
1623 m_updatedPathList.AddPath(path);
1624 m_updatedPathList.RemoveDuplicates();
1625 }
1626 else
1627 {
1628 // if the path list contains folders, we have to check whether
1629 // our just (maybe) added path is a child of one of those. If it is
1630 // a child of a folder already in the list, we must not add it. Otherwise
1631 // that path could show up twice in the list.
1632 bool bHasParentInList = false;
1633 for (int i=0; i<m_pathList.GetCount(); ++i)
1634 {
1635 if (m_pathList[i].IsAncestorOf(path))
1636 {
1637 bHasParentInList = true;
1638 break;
1639 }
1640 }
1641 if (!bHasParentInList)
1642 {
1643 m_pathList.AddPath(path);
1644 m_pathList.RemoveDuplicates();
1645 m_updatedPathList.AddPath(path);
1646 m_updatedPathList.RemoveDuplicates();
1647 }
1648 }
1649 }
1650
1651 // Always start the timer, since the status of an existing item might have changed
1652 SetTimer(REFRESHTIMER, 200, NULL);
1653 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": Item %s dropped, timer started\n"), path.GetWinPath());
1654 #endif
1655 return 0;
1656 }
1657
1658 LRESULT CCommitDlg::OnAutoListReady(WPARAM, LPARAM)
1659 {
1660 m_cLogMessage.SetAutoCompletionList(m_autolist, '*');
1661 return 0;
1662 }
1663
1664 //////////////////////////////////////////////////////////////////////////
1665 // functions which run in the status thread
1666 //////////////////////////////////////////////////////////////////////////
1667
1668 void CCommitDlg::ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex)
1669 {
1670 CString strLine;
1671 try
1672 {
1673 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
1674 while (m_bRunThread && file.ReadString(strLine))
1675 {
1676 int eqpos = strLine.Find('=');
1677 CString rgx;
1678 rgx = strLine.Mid(eqpos+1).Trim();
1679
1680 int pos = -1;
1681 while (((pos = strLine.Find(','))>=0)&&(pos < eqpos))
1682 {
1683 mapRegex[strLine.Left(pos)] = rgx;
1684 strLine = strLine.Mid(pos+1).Trim();
1685 }
1686 mapRegex[strLine.Left(strLine.Find('=')).Trim()] = rgx;
1687 }
1688 file.Close();
1689 }
1690 catch (CFileException* pE)
1691 {
1692 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": CFileException loading auto list regex file\n");
1693 pE->Delete();
1694 }
1695 }
1696
1697 void CCommitDlg::ParseSnippetFile(const CString& sFile, std::map<CString, CString>& mapSnippet)
1698 {
1699 CString strLine;
1700 try
1701 {
1702 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
1703 while (m_bRunThread && file.ReadString(strLine))
1704 {
1705 if (strLine.IsEmpty())
1706 continue;
1707 if (strLine.Left(1) == _T('#')) // comment char
1708 continue;
1709 int eqpos = strLine.Find('=');
1710 CString key = strLine.Left(eqpos);
1711 CString value = strLine.Mid(eqpos + 1);
1712 value.Replace(_T("\\\t"), _T("\t"));
1713 value.Replace(_T("\\\r"), _T("\r"));
1714 value.Replace(_T("\\\n"), _T("\n"));
1715 value.Replace(_T("\\\\"), _T("\\"));
1716 mapSnippet[key] = value;
1717 }
1718 file.Close();
1719 }
1720 catch (CFileException* pE)
1721 {
1722 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": CFileException loading auto list regex file\n");
1723 pE->Delete();
1724 }
1725 }
1726
1727 void CCommitDlg::GetAutocompletionList()
1728 {
1729 // the auto completion list is made of strings from each selected files.
1730 // the strings used are extracted from the files with regexes found
1731 // in the file "autolist.txt".
1732 // the format of that file is:
1733 // file extensions separated with commas '=' regular expression to use
1734 // example:
1735 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
1736 // .cpp = (?<=[^\s]::)\b\w+\b
1737
1738 std::map<CString, CString> mapRegex;
1739 CString sRegexFile = CPathUtils::GetAppDirectory();
1740 CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);
1741 ULONGLONG timeoutvalue = ULONGLONG(DWORD(regtimeout)) * 1000UL;;
1742 sRegexFile += _T("autolist.txt");
1743 if (!m_bRunThread)
1744 return;
1745 ParseRegexFile(sRegexFile, mapRegex);
1746 sRegexFile = CPathUtils::GetAppDataDirectory();
1747 sRegexFile += _T("autolist.txt");
1748 if (PathFileExists(sRegexFile))
1749 ParseRegexFile(sRegexFile, mapRegex);
1750
1751 m_snippet.clear();
1752 CString sSnippetFile = CPathUtils::GetAppDirectory();
1753 sSnippetFile += _T("snippet.txt");
1754 ParseSnippetFile(sSnippetFile, m_snippet);
1755 sSnippetFile = CPathUtils::GetAppDataDirectory();
1756 sSnippetFile += _T("snippet.txt");
1757 if (PathFileExists(sSnippetFile))
1758 ParseSnippetFile(sSnippetFile, m_snippet);
1759 for (const auto& snip : m_snippet)
1760 m_autolist.emplace(snip.first, AUTOCOMPLETE_SNIPPET);
1761
1762 ULONGLONG starttime = GetTickCount64();
1763
1764 // now we have two arrays of strings, where the first array contains all
1765 // file extensions we can use and the second the corresponding regex strings
1766 // to apply to those files.
1767
1768 // the next step is to go over all files shown in the commit dialog
1769 // and scan them for strings we can use
1770 int nListItems = m_ListCtrl.GetItemCount();
1771
1772 for (int i=0; i<nListItems && m_bRunThread; ++i)
1773 {
1774 // stop parsing after timeout
1775 if ((!m_bRunThread) || (GetTickCount64() - starttime > timeoutvalue))
1776 return;
1777
1778 CTGitPath *path = (CTGitPath*)m_ListCtrl.GetItemData(i);
1779
1780 if(path == NULL)
1781 continue;
1782
1783 CString sPartPath =path->GetGitPathString();
1784 m_autolist.emplace(sPartPath, AUTOCOMPLETE_FILENAME);
1785
1786 int pos = 0;
1787 int lastPos = 0;
1788 while ((pos = sPartPath.Find('/', pos)) >= 0)
1789 {
1790 ++pos;
1791 lastPos = pos;
1792 m_autolist.emplace(sPartPath.Mid(pos), AUTOCOMPLETE_FILENAME);
1793 }
1794
1795 // Last inserted entry is a file name.
1796 // Some users prefer to also list file name without extension.
1797 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE))
1798 {
1799 int dotPos = sPartPath.ReverseFind('.');
1800 if ((dotPos >= 0) && (dotPos > lastPos))
1801 m_autolist.emplace(sPartPath.Mid(lastPos, dotPos - lastPos), AUTOCOMPLETE_FILENAME);
1802 }
1803
1804 if (path->m_Action == CTGitPath::LOGACTIONS_UNVER && !CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseUnversioned"), FALSE))
1805 continue;
1806 if (path->m_Action == CTGitPath::LOGACTIONS_IGNORE)
1807 continue;
1808
1809 CString sExt = path->GetFileExtension();
1810 sExt.MakeLower();
1811 // find the regex string which corresponds to the file extension
1812 CString rdata = mapRegex[sExt];
1813 if (rdata.IsEmpty())
1814 continue;
1815
1816 ScanFile(path->GetWinPathString(), rdata, sExt);
1817 }
1818 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": Auto completion list loaded in %I64u msec\n"), GetTickCount64() - starttime);
1819 }
1820
1821 void CCommitDlg::ScanFile(const CString& sFilePath, const CString& sRegex, const CString& sExt)
1822 {
1823 static std::map<CString, std::tr1::wregex> regexmap;
1824
1825 std::wstring sFileContent;
1826 CAutoFile hFile = CreateFile(sFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);
1827 if (hFile)
1828 {
1829 DWORD size = GetFileSize(hFile, NULL);
1830 if (size > CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseMaxSize"), 300000L))
1831 {
1832 // no files bigger than 300k
1833 return;
1834 }
1835 // allocate memory to hold file contents
1836 auto buffer = std::make_unique<char[]>(size);
1837 DWORD readbytes;
1838 if (!ReadFile(hFile, buffer.get(), size, &readbytes, NULL))
1839 return;
1840 int opts = 0;
1841 IsTextUnicode(buffer.get(), readbytes, &opts);
1842 if (opts & IS_TEXT_UNICODE_NULL_BYTES)
1843 {
1844 return;
1845 }
1846 if (opts & IS_TEXT_UNICODE_UNICODE_MASK)
1847 {
1848 sFileContent = std::wstring((wchar_t*)buffer.get(), readbytes / sizeof(WCHAR));
1849 }
1850 if ((opts & IS_TEXT_UNICODE_NOT_UNICODE_MASK) || (opts == 0))
1851 {
1852 const int ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer.get(), readbytes, NULL, 0);
1853 auto pWideBuf = std::make_unique<wchar_t[]>(ret);
1854 const int ret2 = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer.get(), readbytes, pWideBuf.get(), ret);
1855 if (ret2 == ret)
1856 sFileContent = std::wstring(pWideBuf.get(), ret);
1857 }
1858 }
1859 if (sFileContent.empty() || !m_bRunThread)
1860 {
1861 return;
1862 }
1863
1864 try
1865 {
1866
1867 std::tr1::wregex regCheck;
1868 std::map<CString, std::tr1::wregex>::const_iterator regIt;
1869 if ((regIt = regexmap.find(sExt)) != regexmap.end())
1870 regCheck = regIt->second;
1871 else
1872 {
1873 regCheck = std::tr1::wregex(sRegex, std::tr1::regex_constants::icase | std::tr1::regex_constants::ECMAScript);
1874 regexmap[sExt] = regCheck;
1875 }
1876 const std::tr1::wsregex_iterator end;
1877 for (std::tr1::wsregex_iterator it(sFileContent.cbegin(), sFileContent.cend(), regCheck); it != end; ++it)
1878 {
1879 const std::tr1::wsmatch match = *it;
1880 for (size_t i = 1; i < match.size(); ++i)
1881 {
1882 if (match[i].second-match[i].first)
1883 {
1884 m_autolist.emplace(std::wstring(match[i]).c_str(), AUTOCOMPLETE_PROGRAMCODE);
1885 }
1886 }
1887 }
1888 }
1889 catch (std::exception) {}
1890 }
1891
1892 // CSciEditContextMenuInterface
1893 void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
1894 {
1895 CString sMenuItemText;
1896 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITHASH);
1897 m_nPopupPickCommitHash = nCmd++;
1898 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPickCommitHash, sMenuItemText);
1899
1900 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITMESSAGE);
1901 m_nPopupPickCommitMessage = nCmd++;
1902 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPickCommitMessage, sMenuItemText);
1903
1904 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTEFILELIST);
1905 m_nPopupPasteListCmd = nCmd++;
1906 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);
1907
1908 ReloadHistoryEntries();
1909 if (!m_History.IsEmpty())
1910 {
1911 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);
1912 m_nPopupPasteLastMessage = nCmd++;
1913 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);
1914
1915 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY);
1916 m_nPopupRecentMessage = nCmd++;
1917 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupRecentMessage, sMenuItemText);
1918 }
1919 }
1920
1921 bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
1922 {
1923 if (cmd == m_nPopupPickCommitHash)
1924 {
1925 // use the git log to allow selection of a version
1926 CLogDlg dlg;
1927 // tell the dialog to use mode for selecting revisions
1928 dlg.SetSelect(true);
1929 // only one revision must be selected however
1930 dlg.SingleSelection(true);
1931 dlg.ShowWorkingTreeChanges(false);
1932 if (dlg.DoModal() == IDOK)
1933 pSciEdit->InsertText(dlg.GetSelectedHash().at(0).ToString());
1934 return true;
1935 }
1936
1937 if (cmd == m_nPopupPickCommitMessage)
1938 {
1939 // use the git log to allow selection of a version
1940 CLogDlg dlg;
1941 // tell the dialog to use mode for selecting revisions
1942 dlg.SetSelect(true);
1943 // only one revision must be selected however
1944 dlg.SingleSelection(true);
1945 dlg.ShowWorkingTreeChanges(false);
1946 if (dlg.DoModal() == IDOK)
1947 {
1948 GitRev rev;
1949 if (rev.GetCommit(dlg.GetSelectedHash().at(0).ToString()))
1950 {
1951 MessageBox(rev.GetLastErr(), _T("TortoiseGit"), MB_ICONERROR);
1952 return false;
1953 }
1954 CString message = rev.GetSubject() + _T("\r\n") + rev.GetBody();
1955 pSciEdit->InsertText(message);
1956 }
1957 return true;
1958 }
1959
1960 if (cmd == m_nPopupPasteListCmd)
1961 {
1962 CString logmsg;
1963 int nListItems = m_ListCtrl.GetItemCount();
1964 for (int i=0; i<nListItems; ++i)
1965 {
1966 CTGitPath * entry = (CTGitPath*)m_ListCtrl.GetItemData(i);
1967 if (entry&&entry->m_Checked)
1968 {
1969 CString line;
1970 CString status = entry->GetActionName();
1971 if(entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
1972 status = _T("Add"); // I18N TODO
1973
1974 //git_wc_status_kind status = entry->status;
1975 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1976 if (m_ProjectProperties.bFileListInEnglish)
1977 langID = 1033;
1978
1979 line.Format(_T("%-10s %s\r\n"),status , (LPCTSTR)m_ListCtrl.GetItemText(i,0));
1980 logmsg += line;
1981 }
1982 }
1983 pSciEdit->InsertText(logmsg);
1984 return true;
1985 }
1986
1987 if(cmd == m_nPopupPasteLastMessage)
1988 {
1989 if (m_History.IsEmpty())
1990 return false;
1991
1992 CString logmsg;
1993 logmsg +=m_History.GetEntry(0);
1994 pSciEdit->InsertText(logmsg);
1995 return true;
1996 }
1997
1998 if(cmd == m_nPopupRecentMessage )
1999 {
2000 OnBnClickedHistory();
2001 return true;
2002 }
2003 return false;
2004 }
2005
2006 void CCommitDlg::HandleSnippet(int type, const CString &text, CSciEdit *pSciEdit)
2007 {
2008 if (type == AUTOCOMPLETE_SNIPPET)
2009 {
2010 CString target = m_snippet[text];
2011 pSciEdit->GetWordUnderCursor(true);
2012 pSciEdit->InsertText(target, false);
2013 }
2014 }
2015
2016 void CCommitDlg::OnTimer(UINT_PTR nIDEvent)
2017 {
2018 switch (nIDEvent)
2019 {
2020 case ENDDIALOGTIMER:
2021 KillTimer(ENDDIALOGTIMER);
2022 EndDialog(0);
2023 break;
2024 case REFRESHTIMER:
2025 if (m_bThreadRunning)
2026 {
2027 SetTimer(REFRESHTIMER, 200, NULL);
2028 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": Wait some more before refreshing\n");
2029 }
2030 else
2031 {
2032 KillTimer(REFRESHTIMER);
2033 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": Refreshing after items dropped\n");
2034 Refresh();
2035 }
2036 break;
2037 case FILLPATCHVTIMER:
2038 FillPatchView();
2039 break;
2040 }
2041 __super::OnTimer(nIDEvent);
2042 }
2043
2044 void CCommitDlg::OnBnClickedHistory()
2045 {
2046 m_tooltips.Pop(); // hide the tooltips
2047 if (m_pathList.IsEmpty())
2048 return;
2049
2050 CHistoryDlg historyDlg;
2051 ReloadHistoryEntries();
2052 historyDlg.SetHistory(m_History);
2053 if (historyDlg.DoModal() != IDOK)
2054 return;
2055
2056 CString sMsg = historyDlg.GetSelectedText();
2057 if (sMsg != m_cLogMessage.GetText().Left(sMsg.GetLength()))
2058 {
2059 CString sBugID = m_ProjectProperties.FindBugID(sMsg);
2060 if ((!sBugID.IsEmpty()) && ((GetDlgItem(IDC_BUGID)->IsWindowVisible())))
2061 {
2062 SetDlgItemText(IDC_BUGID, sBugID);
2063 }
2064 if (m_sLogTemplate.Compare(m_cLogMessage.GetText()) != 0)
2065 m_cLogMessage.InsertText(sMsg, !m_cLogMessage.GetText().IsEmpty());
2066 else
2067 m_cLogMessage.SetText(sMsg);
2068 }
2069
2070 SendMessage(WM_UPDATEOKBUTTON);
2071 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
2072
2073 }
2074
2075 void CCommitDlg::OnBnClickedBugtraqbutton()
2076 {
2077 m_tooltips.Pop(); // hide the tooltips
2078 CString sMsg = m_cLogMessage.GetText();
2079
2080 if (m_BugTraqProvider == NULL)
2081 return;
2082
2083 ATL::CComBSTR parameters(m_bugtraq_association.GetParameters());
2084 ATL::CComBSTR commonRoot(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());
2085 CBstrSafeVector pathList(m_pathList.GetCount());
2086
2087 for (LONG index = 0; index < m_pathList.GetCount(); ++index)
2088 pathList.PutElement(index, m_pathList[index].GetGitPathString());
2089
2090 ATL::CComBSTR originalMessage(sMsg);
2091 ATL::CComBSTR temp;
2092
2093 // first try the IBugTraqProvider2 interface
2094 CComPtr<IBugTraqProvider2> pProvider2 = NULL;
2095 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
2096 bool bugIdOutSet = false;
2097 if (SUCCEEDED(hr))
2098 {
2099 ATL::CComBSTR repositoryRoot(g_Git.m_CurrentDir);
2100 ATL::CComBSTR bugIDOut;
2101 GetDlgItemText(IDC_BUGID, m_sBugID);
2102 ATL::CComBSTR bugID(m_sBugID);
2103 CBstrSafeVector revPropNames;
2104 CBstrSafeVector revPropValues;
2105 if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, bugID, &bugIDOut, &revPropNames, &revPropValues, &temp)))
2106 {
2107 CString sErr;
2108 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2109 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
2110 }
2111 else
2112 {
2113 if (bugIDOut)
2114 {
2115 bugIdOutSet = true;
2116 m_sBugID = bugIDOut;
2117 SetDlgItemText(IDC_BUGID, m_sBugID);
2118 }
2119 m_cLogMessage.SetText((LPCTSTR)temp);
2120 BSTR HUGEP *pbRevNames;
2121 BSTR HUGEP *pbRevValues;
2122
2123 HRESULT hr1 = SafeArrayAccessData(revPropNames, (void HUGEP**)&pbRevNames);
2124 if (SUCCEEDED(hr1))
2125 {
2126 HRESULT hr2 = SafeArrayAccessData(revPropValues, (void HUGEP**)&pbRevValues);
2127 if (SUCCEEDED(hr2))
2128 {
2129 if (revPropNames->rgsabound->cElements == revPropValues->rgsabound->cElements)
2130 {
2131 for (ULONG i = 0; i < revPropNames->rgsabound->cElements; ++i)
2132 {
2133 // m_revProps[pbRevNames[i]] = pbRevValues[i];
2134 }
2135 }
2136 SafeArrayUnaccessData(revPropValues);
2137 }
2138 SafeArrayUnaccessData(revPropNames);
2139 }
2140 }
2141 }
2142 else
2143 {
2144 // if IBugTraqProvider2 failed, try IBugTraqProvider
2145 CComPtr<IBugTraqProvider> pProvider = NULL;
2146 hr = m_BugTraqProvider.QueryInterface(&pProvider);
2147 if (FAILED(hr))
2148 {
2149 CString sErr;
2150 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2151 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
2152 return;
2153 }
2154
2155 if (FAILED(hr = pProvider->GetCommitMessage(GetSafeHwnd(), parameters, commonRoot, pathList, originalMessage, &temp)))
2156 {
2157 CString sErr;
2158 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2159 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
2160 }
2161 else
2162 m_cLogMessage.SetText((LPCTSTR)temp);
2163 }
2164 m_sLogMessage = m_cLogMessage.GetText();
2165 if (!m_ProjectProperties.sMessage.IsEmpty())
2166 {
2167 CString sBugID = m_ProjectProperties.FindBugID(m_sLogMessage);
2168 if (!sBugID.IsEmpty() && !bugIdOutSet)
2169 {
2170 SetDlgItemText(IDC_BUGID, sBugID);
2171 }
2172 }
2173
2174 m_cLogMessage.SetFocus();
2175 }
2176
2177 void CCommitDlg::FillPatchView(bool onlySetTimer)
2178 {
2179 if(::IsWindow(this->m_patchViewdlg.m_hWnd))
2180 {
2181 KillTimer(FILLPATCHVTIMER);
2182 if (onlySetTimer)
2183 {
2184 SetTimer(FILLPATCHVTIMER, 100, NULL);
2185 return;
2186 }
2187
2188 POSITION pos=m_ListCtrl.GetFirstSelectedItemPosition();
2189 CString cmd,out;
2190
2191 while(pos)
2192 {
2193 int nSelect = m_ListCtrl.GetNextSelectedItem(pos);
2194 CTGitPath * p=(CTGitPath*)m_ListCtrl.GetItemData(nSelect);
2195 if(p && !(p->m_Action&CTGitPath::LOGACTIONS_UNVER) )
2196 {
2197 CString head = _T("HEAD");
2198 if(m_bCommitAmend==TRUE && m_bAmendDiffToLastCommit==FALSE)
2199 head = _T("HEAD~1");
2200 cmd.Format(_T("git.exe diff %s -- \"%s\""), (LPCTSTR)head, (LPCTSTR)p->GetGitPathString());
2201 g_Git.Run(cmd, &out, CP_UTF8);
2202 }
2203 }
2204
2205 m_patchViewdlg.SetText(out);
2206 }
2207 }
2208 LRESULT CCommitDlg::OnGitStatusListCtrlItemChanged(WPARAM /*wparam*/, LPARAM /*lparam*/)
2209 {
2210 this->FillPatchView(true);
2211 return 0;
2212 }
2213
2214
2215 LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)
2216 {
2217 SendMessage(WM_UPDATEOKBUTTON);
2218 return 0;
2219 }
2220
2221 LRESULT CCommitDlg::OnCheck(WPARAM wnd, LPARAM)
2222 {
2223 HWND hwnd = (HWND)wnd;
2224 bool check = !(GetAsyncKeyState(VK_SHIFT) & 0x8000);
2225 if (hwnd == GetDlgItem(IDC_CHECKALL)->GetSafeHwnd())
2226 m_ListCtrl.Check(GITSLC_SHOWEVERYTHING, check);
2227 else if (hwnd == GetDlgItem(IDC_CHECKNONE)->GetSafeHwnd())
2228 m_ListCtrl.Check(GITSLC_SHOWEVERYTHING, !check);
2229 else if (hwnd == GetDlgItem(IDC_CHECKUNVERSIONED)->GetSafeHwnd())
2230 m_ListCtrl.Check(GITSLC_SHOWUNVERSIONED, check);
2231 else if (hwnd == GetDlgItem(IDC_CHECKVERSIONED)->GetSafeHwnd())
2232 m_ListCtrl.Check(GITSLC_SHOWVERSIONED, check);
2233 else if (hwnd == GetDlgItem(IDC_CHECKADDED)->GetSafeHwnd())
2234 m_ListCtrl.Check(GITSLC_SHOWADDED, check);
2235 else if (hwnd == GetDlgItem(IDC_CHECKDELETED)->GetSafeHwnd())
2236 m_ListCtrl.Check(GITSLC_SHOWREMOVED, check);
2237 else if (hwnd == GetDlgItem(IDC_CHECKMODIFIED)->GetSafeHwnd())
2238 m_ListCtrl.Check(GITSLC_SHOWMODIFIED, check);
2239 else if (hwnd == GetDlgItem(IDC_CHECKFILES)->GetSafeHwnd())
2240 m_ListCtrl.Check(GITSLC_SHOWFILES, check);
2241 else if (hwnd == GetDlgItem(IDC_CHECKSUBMODULES)->GetSafeHwnd())
2242 m_ListCtrl.Check(GITSLC_SHOWSUBMODULES, check);
2243
2244 return 0;
2245 }
2246
2247 LRESULT CCommitDlg::OnUpdateOKButton(WPARAM, LPARAM)
2248 {
2249 if (m_bBlock)
2250 return 0;
2251
2252 CString text = m_cLogMessage.GetText().Trim();
2253 bool bValidLogSize = !text.IsEmpty() && text.GetLength() >= m_ProjectProperties.nMinLogSize;
2254 bool bAmendOrSelectFilesOrMerge = m_ListCtrl.GetSelected() > 0 || (m_bCommitAmend && m_bAmendDiffToLastCommit) || CTGitPath(g_Git.m_CurrentDir).IsMergeActive();
2255
2256 DialogEnableWindow(IDOK, bValidLogSize && (m_bCommitMessageOnly || bAmendOrSelectFilesOrMerge));
2257
2258 return 0;
2259 }
2260
2261 LRESULT CCommitDlg::OnUpdateDataFalse(WPARAM, LPARAM)
2262 {
2263 UpdateData(FALSE);
2264 return 0;
2265 }
2266
2267 LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
2268 {
2269 switch (message) {
2270 case WM_NOTIFY:
2271 if (wParam == IDC_SPLITTER)
2272 {
2273 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
2274 DoSize(pHdr->delta);
2275 }
2276 break;
2277 case WM_COMMAND:
2278 if (m_hAccelOkButton && LOWORD(wParam) >= WM_USER && LOWORD(wParam) <= WM_USER + m_accellerators.size())
2279 {
2280 for (const auto& entry : m_accellerators)
2281 {
2282 if (entry.second.wmid != LOWORD(wParam))
2283 continue;
2284 if (entry.second.id == -1)
2285 m_ctrlOkButton.PostMessage(WM_KEYDOWN, VK_F4, NULL);
2286 else
2287 {
2288 m_ctrlOkButton.SetCurrentEntry(entry.second.id);
2289 OnOK();
2290 }
2291 return 0;
2292 }
2293 }
2294 break;
2295 }
2296
2297 return __super::DefWindowProc(message, wParam, lParam);
2298 }
2299
2300 void CCommitDlg::SetSplitterRange()
2301 {
2302 if ((m_ListCtrl)&&(m_cLogMessage))
2303 {
2304 CRect rcTop;
2305 m_cLogMessage.GetWindowRect(rcTop);
2306 ScreenToClient(rcTop);
2307 CRect rcMiddle;
2308 m_ListCtrl.GetWindowRect(rcMiddle);
2309 ScreenToClient(rcMiddle);
2310 if (rcMiddle.Height() && rcMiddle.Width())
2311 m_wndSplitter.SetRange(rcTop.top + 100, rcMiddle.bottom - 80);
2312 }
2313 }
2314
2315 void CCommitDlg::DoSize(int delta)
2316 {
2317 RemoveAnchor(IDC_MESSAGEGROUP);
2318 RemoveAnchor(IDC_LOGMESSAGE);
2319 RemoveAnchor(IDC_SPLITTER);
2320 RemoveAnchor(IDC_SIGNOFF);
2321 RemoveAnchor(IDC_COMMIT_AMEND);
2322 RemoveAnchor(IDC_COMMIT_AMENDDIFF);
2323 RemoveAnchor(IDC_COMMIT_SETDATETIME);
2324 RemoveAnchor(IDC_COMMIT_DATEPICKER);
2325 RemoveAnchor(IDC_COMMIT_TIMEPICKER);
2326 RemoveAnchor(IDC_COMMIT_AS_COMMIT_DATE);
2327 RemoveAnchor(IDC_COMMIT_SETAUTHOR);
2328 RemoveAnchor(IDC_COMMIT_AUTHORDATA);
2329 RemoveAnchor(IDC_LISTGROUP);
2330 RemoveAnchor(IDC_FILELIST);
2331 RemoveAnchor(IDC_TEXT_INFO);
2332 RemoveAnchor(IDC_SELECTLABEL);
2333 RemoveAnchor(IDC_CHECKALL);
2334 RemoveAnchor(IDC_CHECKNONE);
2335 RemoveAnchor(IDC_CHECKUNVERSIONED);
2336 RemoveAnchor(IDC_CHECKVERSIONED);
2337 RemoveAnchor(IDC_CHECKADDED);
2338 RemoveAnchor(IDC_CHECKDELETED);
2339 RemoveAnchor(IDC_CHECKMODIFIED);
2340 RemoveAnchor(IDC_CHECKFILES);
2341 RemoveAnchor(IDC_CHECKSUBMODULES);
2342
2343 CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN);
2344 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN);
2345 CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN);
2346 CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN);
2347 CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta);
2348 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND),0,delta);
2349 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMENDDIFF),0,delta);
2350 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_SETDATETIME),0,delta);
2351 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_DATEPICKER),0,delta);
2352 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_TIMEPICKER),0,delta);
2353 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AS_COMMIT_DATE), 0, delta);
2354 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_SETAUTHOR), 0, delta);
2355 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AUTHORDATA), 0, delta);
2356 CSplitterControl::ChangePos(GetDlgItem(IDC_TEXT_INFO),0,delta);
2357 CSplitterControl::ChangePos(GetDlgItem(IDC_SELECTLABEL), 0, delta);
2358 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKALL), 0, delta);
2359 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKNONE), 0, delta);
2360 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKUNVERSIONED), 0, delta);
2361 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKVERSIONED), 0, delta);
2362 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKADDED), 0, delta);
2363 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKDELETED), 0, delta);
2364 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKMODIFIED), 0, delta);
2365 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKFILES), 0, delta);
2366 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKSUBMODULES), 0, delta);
2367
2368 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
2369 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
2370 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
2371 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
2372 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
2373 AddAnchor(IDC_SIGNOFF,TOP_RIGHT);
2374 AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
2375 AddAnchor(IDC_COMMIT_AMENDDIFF,TOP_LEFT);
2376 AddAnchor(IDC_COMMIT_SETDATETIME,TOP_LEFT);
2377 AddAnchor(IDC_COMMIT_DATEPICKER,TOP_LEFT);
2378 AddAnchor(IDC_COMMIT_TIMEPICKER,TOP_LEFT);
2379 AddAnchor(IDC_COMMIT_AS_COMMIT_DATE, TOP_LEFT);
2380 AddAnchor(IDC_COMMIT_SETAUTHOR, TOP_LEFT);
2381 AddAnchor(IDC_COMMIT_AUTHORDATA, TOP_LEFT, TOP_RIGHT);
2382 AddAnchor(IDC_TEXT_INFO,TOP_RIGHT);
2383 AddAnchor(IDC_SELECTLABEL, TOP_LEFT);
2384 AddAnchor(IDC_CHECKALL, TOP_LEFT);
2385 AddAnchor(IDC_CHECKNONE, TOP_LEFT);
2386 AddAnchor(IDC_CHECKUNVERSIONED, TOP_LEFT);
2387 AddAnchor(IDC_CHECKVERSIONED, TOP_LEFT);
2388 AddAnchor(IDC_CHECKADDED, TOP_LEFT);
2389 AddAnchor(IDC_CHECKDELETED, TOP_LEFT);
2390 AddAnchor(IDC_CHECKMODIFIED, TOP_LEFT);
2391 AddAnchor(IDC_CHECKFILES, TOP_LEFT);
2392 AddAnchor(IDC_CHECKSUBMODULES, TOP_LEFT);
2393 ArrangeLayout();
2394 // adjust the minimum size of the dialog to prevent the resizing from
2395 // moving the list control too far down.
2396 CRect rcLogMsg;
2397 m_cLogMessage.GetClientRect(rcLogMsg);
2398 SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_LogMsgOrigRect.Height()+rcLogMsg.Height()));
2399
2400 SetSplitterRange();
2401 m_cLogMessage.Invalidate();
2402 GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
2403 }
2404
2405 void CCommitDlg::OnSize(UINT nType, int cx, int cy)
2406 {
2407 // first, let the resizing take place
2408 __super::OnSize(nType, cx, cy);
2409
2410 //set range
2411 SetSplitterRange();
2412 }
2413
2414 CString CCommitDlg::GetSignedOffByLine()
2415 {
2416 CString str;
2417
2418 CString username = g_Git.GetUserName();
2419 CString email = g_Git.GetUserEmail();
2420 username.Remove(_T('\n'));
2421 email.Remove(_T('\n'));
2422
2423 str.Format(_T("Signed-off-by: %s <%s>"), (LPCTSTR)username, (LPCTSTR)email);
2424
2425 return str;
2426 }
2427
2428 void CCommitDlg::OnBnClickedSignOff()
2429 {
2430 CString str = GetSignedOffByLine();
2431
2432 if (m_cLogMessage.GetText().Find(str) == -1) {
2433 m_cLogMessage.SetText(m_cLogMessage.GetText().TrimRight());
2434 int lastNewline = m_cLogMessage.GetText().ReverseFind(_T('\n'));
2435 int foundByLine = -1;
2436 if (lastNewline > 0)
2437 foundByLine = m_cLogMessage.GetText().Find(_T("-by: "), lastNewline);
2438
2439 if (foundByLine == -1 || foundByLine < lastNewline)
2440 str = _T("\r\n") + str;
2441
2442 m_cLogMessage.SetText(m_cLogMessage.GetText()+_T("\r\n")+str+_T("\r\n"));
2443 }
2444 }
2445
2446 void CCommitDlg::OnBnClickedCommitAmend()
2447 {
2448 this->UpdateData();
2449 if(this->m_bCommitAmend && this->m_AmendStr.IsEmpty())
2450 {
2451 GitRev rev;
2452 if (rev.GetCommit(CString(_T("HEAD"))))
2453 MessageBox(rev.GetLastErr(), _T("TortoiseGit"), MB_ICONERROR);
2454 m_AmendStr=rev.GetSubject()+_T("\n")+rev.GetBody();
2455 }
2456
2457 if(this->m_bCommitAmend)
2458 {
2459 this->m_NoAmendStr=this->m_cLogMessage.GetText();
2460 m_cLogMessage.SetText(m_AmendStr);
2461 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_SHOW);
2462 if (m_bSetCommitDateTime)
2463 m_AsCommitDateCtrl.ShowWindow(SW_SHOW);
2464 }
2465 else
2466 {
2467 this->m_AmendStr=this->m_cLogMessage.GetText();
2468 m_cLogMessage.SetText(m_NoAmendStr);
2469 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_HIDE);
2470 m_AsCommitDateCtrl.ShowWindow(SW_HIDE);
2471 m_AsCommitDateCtrl.SetCheck(FALSE);
2472 OnBnClickedCommitAsCommitDate();
2473 }
2474
2475 OnBnClickedCommitSetDateTime(); // to update the commit date and time
2476 OnBnClickedCommitSetauthor(); // to update the commit author
2477
2478 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
2479 Refresh();
2480 }
2481
2482 void CCommitDlg::OnBnClickedCommitMessageOnly()
2483 {
2484 this->UpdateData();
2485 this->m_ListCtrl.EnableWindow(m_bCommitMessageOnly ? FALSE : TRUE);
2486 SendMessage(WM_UPDATEOKBUTTON);
2487 }
2488
2489 void CCommitDlg::OnBnClickedWholeProject()
2490 {
2491 m_tooltips.Pop(); // hide the tooltips
2492 UpdateData();
2493 m_ListCtrl.Clear();
2494 if (!m_bBlock)
2495 {
2496 if (m_bWholeProject || m_bWholeProject2)
2497 m_ListCtrl.GetStatus(NULL,true,false,true);
2498 else
2499 m_ListCtrl.GetStatus(&this->m_pathList,true,false,true);
2500
2501 m_regShowWholeProject = m_bWholeProject;
2502
2503 DWORD dwShow = m_ListCtrl.GetShowFlags();
2504 if (DWORD(m_regAddBeforeCommit))
2505 dwShow |= GITSLC_SHOWUNVERSIONED;
2506 else
2507 dwShow &= ~GITSLC_SHOWUNVERSIONED;
2508
2509 m_ListCtrl.Show(dwShow, dwShow & ~(CTGitPath::LOGACTIONS_UNVER), true);
2510 UpdateCheckLinks();
2511 }
2512
2513 SetDlgTitle();
2514 }
2515
2516 void CCommitDlg::OnFocusMessage()
2517 {
2518 m_cLogMessage.SetFocus();
2519 }
2520
2521 void CCommitDlg::OnFocusFileList()
2522 {
2523 m_ListCtrl.SetFocus();
2524 }
2525
2526 void CCommitDlg::OnScnUpdateUI(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2527 {
2528 int pos = (int)this->m_cLogMessage.Call(SCI_GETCURRENTPOS);
2529 int line = (int)this->m_cLogMessage.Call(SCI_LINEFROMPOSITION,pos);
2530 int column = (int)this->m_cLogMessage.Call(SCI_GETCOLUMN,pos);
2531
2532 CString str;
2533 str.Format(_T("%d/%d"),line+1,column+1);
2534 this->GetDlgItem(IDC_TEXT_INFO)->SetWindowText(str);
2535
2536 if(*pResult)
2537 *pResult=0;
2538 }
2539
2540 void CCommitDlg::TogglePatchView()
2541 {
2542 OnStnClickedViewPatch();
2543 }
2544
2545 void CCommitDlg::OnStnClickedViewPatch()
2546 {
2547 m_patchViewdlg.m_ParentDlg = this;
2548 if(!IsWindow(this->m_patchViewdlg.m_hWnd))
2549 {
2550 BOOL viewPatchEnabled = FALSE;
2551 viewPatchEnabled = g_Git.GetConfigValueBool(_T("tgit.commitshowpatch"));
2552 if (viewPatchEnabled == FALSE)
2553 g_Git.SetConfigValue(_T("tgit.commitshowpatch"), _T("true"));
2554 m_patchViewdlg.Create(IDD_PATCH_VIEW,this);
2555 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETSCROLLWIDTHTRACKING, TRUE);
2556 CRect rect;
2557 this->GetWindowRect(&rect);
2558
2559 m_patchViewdlg.ShowWindow(SW_SHOW);
2560
2561 m_patchViewdlg.SetWindowPos(NULL,rect.right,rect.top,rect.Width(),rect.Height(),
2562 SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
2563
2564 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
2565
2566 ShowViewPatchText(false);
2567 FillPatchView();
2568 }
2569 else
2570 {
2571 g_Git.SetConfigValue(_T("tgit.commitshowpatch"), _T("false"));
2572 m_patchViewdlg.ShowWindow(SW_HIDE);
2573 m_patchViewdlg.DestroyWindow();
2574 ShowViewPatchText(true);
2575 }
2576 this->m_ctrlShowPatch.Invalidate();
2577 }
2578
2579 void CCommitDlg::OnMoving(UINT fwSide, LPRECT pRect)
2580 {
2581 __super::OnMoving(fwSide, pRect);
2582
2583 if (::IsWindow(m_patchViewdlg.m_hWnd))
2584 {
2585 RECT patchrect;
2586 m_patchViewdlg.GetWindowRect(&patchrect);
2587 if (::IsWindow(m_hWnd))
2588 {
2589 RECT thisrect;
2590 GetWindowRect(&thisrect);
2591 if (patchrect.left == thisrect.right)
2592 {
2593 m_patchViewdlg.SetWindowPos(NULL, patchrect.left - (thisrect.left - pRect->left), patchrect.top - (thisrect.top - pRect->top),
2594 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
2595 }
2596 }
2597 }
2598
2599 }
2600
2601 void CCommitDlg::OnSizing(UINT fwSide, LPRECT pRect)
2602 {
2603 __super::OnSizing(fwSide, pRect);
2604
2605 if(::IsWindow(this->m_patchViewdlg.m_hWnd))
2606 {
2607 CRect thisrect, patchrect;
2608 this->GetWindowRect(thisrect);
2609 this->m_patchViewdlg.GetWindowRect(patchrect);
2610 if(thisrect.right==patchrect.left)
2611 {
2612 patchrect.left -= (thisrect.right - pRect->right);
2613 patchrect.right-= (thisrect.right - pRect->right);
2614
2615 if( patchrect.bottom == thisrect.bottom)
2616 {
2617 patchrect.bottom -= (thisrect.bottom - pRect->bottom);
2618 }
2619 if( patchrect.top == thisrect.top)
2620 {
2621 patchrect.top -= thisrect.top-pRect->top;
2622 }
2623 m_patchViewdlg.MoveWindow(patchrect);
2624 }
2625 }
2626 }
2627
2628 void CCommitDlg::OnHdnItemchangedFilelist(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2629 {
2630 *pResult = 0;
2631 TRACE("Item Changed\r\n");
2632 }
2633
2634 int CCommitDlg::CheckHeadDetach()
2635 {
2636 CString output;
2637 if (CGit::GetCurrentBranchFromFile(g_Git.m_CurrentDir, output))
2638 {
2639 int retval = CMessageBox::Show(NULL, IDS_PROC_COMMIT_DETACHEDWARNING, IDS_APPNAME, MB_YESNOCANCEL | MB_ICONWARNING);
2640 if(retval == IDYES)
2641 {
2642 if (CAppUtils::CreateBranchTag(FALSE, NULL, true) == FALSE)
2643 return 1;
2644 }
2645 else if (retval == IDCANCEL)
2646 return 1;
2647 }
2648 return 0;
2649 }
2650
2651 void CCommitDlg::OnBnClickedCommitAmenddiff()
2652 {
2653 UpdateData();
2654 Refresh();
2655 }
2656
2657 void CCommitDlg::OnBnClickedNoautoselectsubmodules()
2658 {
2659 UpdateData();
2660 Refresh();
2661 }
2662
2663 void CCommitDlg::OnBnClickedCommitSetDateTime()
2664 {
2665 UpdateData();
2666
2667 if (m_bSetCommitDateTime)
2668 {
2669 CTime authordate = CTime::GetCurrentTime();
2670 if (m_bCommitAmend)
2671 {
2672 GitRev headRevision;
2673 if (headRevision.GetCommit(_T("HEAD")))
2674 MessageBox(headRevision.GetLastErr(), _T("TortoiseGit"), MB_ICONERROR);
2675 authordate = headRevision.GetAuthorDate();
2676 m_AsCommitDateCtrl.ShowWindow(SW_SHOW);
2677 }
2678
2679 m_CommitDate.SetTime(&authordate);
2680 m_CommitTime.SetTime(&authordate);
2681
2682 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_SHOW);
2683 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_SHOW);
2684 }
2685 else
2686 {
2687 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_HIDE);
2688 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_HIDE);
2689 m_AsCommitDateCtrl.ShowWindow(SW_HIDE);
2690 m_AsCommitDateCtrl.SetCheck(FALSE);
2691 OnBnClickedCommitAsCommitDate();
2692 }
2693 }
2694
2695 void CCommitDlg::OnBnClickedCommitAsCommitDate()
2696 {
2697 GetDlgItem(IDC_COMMIT_DATEPICKER)->EnableWindow(!m_AsCommitDateCtrl.GetCheck());
2698 GetDlgItem(IDC_COMMIT_TIMEPICKER)->EnableWindow(!m_AsCommitDateCtrl.GetCheck());
2699 }
2700
2701 void CCommitDlg::OnBnClickedCheckNewBranch()
2702 {
2703 UpdateData();
2704 if (m_bCreateNewBranch)
2705 {
2706 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_HIDE);
2707 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_SHOW);
2708 }
2709 else
2710 {
2711 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_HIDE);
2712 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_SHOW);
2713 }
2714 }
2715
2716 bool CCommitDlg::RestoreFiles(bool doNotAsk, bool allowCancel)
2717 {
2718 if (m_ListCtrl.m_restorepaths.empty())
2719 return true;
2720
2721 if (!doNotAsk)
2722 {
2723 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);
2724 if (ret == 3)
2725 return false;
2726 if (ret == 2)
2727 return true;
2728 }
2729
2730 for (const auto& item : m_ListCtrl.m_restorepaths)
2731 CopyFile(item.second, g_Git.CombinePath(item.first), FALSE);
2732 m_ListCtrl.m_restorepaths.clear();
2733
2734 return true;
2735 }
2736
2737 void CCommitDlg::UpdateCheckLinks()
2738 {
2739 DialogEnableWindow(IDC_CHECKALL, true);
2740 DialogEnableWindow(IDC_CHECKNONE, true);
2741 DialogEnableWindow(IDC_CHECKUNVERSIONED, m_ListCtrl.GetUnversionedCount() > 0);
2742 DialogEnableWindow(IDC_CHECKVERSIONED, m_ListCtrl.GetItemCount() > m_ListCtrl.GetUnversionedCount());
2743 DialogEnableWindow(IDC_CHECKADDED, m_ListCtrl.GetAddedCount() > 0);
2744 DialogEnableWindow(IDC_CHECKDELETED, m_ListCtrl.GetDeletedCount() > 0);
2745 DialogEnableWindow(IDC_CHECKMODIFIED, m_ListCtrl.GetModifiedCount() > 0);
2746 DialogEnableWindow(IDC_CHECKFILES, m_ListCtrl.GetFileCount() > 0);
2747 DialogEnableWindow(IDC_CHECKSUBMODULES, m_ListCtrl.GetSubmoduleCount() > 0);
2748 }
2749
2750 void CCommitDlg::OnBnClickedCommitSetauthor()
2751 {
2752 UpdateData();
2753
2754 if (m_bSetAuthor)
2755 {
2756 m_sAuthor.Format(_T("%s <%s>"), (LPCTSTR)g_Git.GetUserName(), (LPCTSTR)g_Git.GetUserEmail());
2757 if (m_bCommitAmend)
2758 {
2759 GitRev headRevision;
2760 if (headRevision.GetCommit(_T("HEAD")))
2761 MessageBox(headRevision.GetLastErr(), _T("TortoiseGit"), MB_ICONERROR);
2762 m_sAuthor.Format(_T("%s <%s>"), (LPCTSTR)headRevision.GetAuthorName(), (LPCTSTR)headRevision.GetAuthorEmail());
2763 }
2764
2765 UpdateData(FALSE);
2766
2767 GetDlgItem(IDC_COMMIT_AUTHORDATA)->ShowWindow(SW_SHOW);
2768 }
2769 else
2770 GetDlgItem(IDC_COMMIT_AUTHORDATA)->ShowWindow(SW_HIDE);
2771 }
2772
2773 void CCommitDlg::RunStartCommitHook()
2774 {
2775 DWORD exitcode = 0xFFFFFFFF;
2776 CString error;
2777 if (CHooks::Instance().StartCommit(g_Git.m_CurrentDir, m_pathList, m_sLogMessage, exitcode, error))
2778 {
2779 if (exitcode)
2780 {
2781 CString temp;
2782 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
2783 MessageBox(temp, _T("TortoiseGit"), MB_ICONERROR);
2784 return;
2785 }
2786 }
2787 }
Windows Explorer Extension to Operate Git