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