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