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