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