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