?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Handle comment char, empty line, escape \t \r \n \\
[TortoiseGit.git] / src / TortoiseProc / CommitDlg.cpp
blob91823f11e79e3db8b13e5d2403f5681f62d07591
1 // TortoiseGit - a Windows shell extension for easy version control
2
3 // Copyright (C) 2003-2013 - TortoiseSVN
4 // Copyright (C) 2008-2014 - TortoiseGit
5
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
10
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
15
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19 //
20 #include "stdafx.h"
21 #include "TortoiseProc.h"
22 #include "CommitDlg.h"
23 #include "DirFileEnum.h"
24 #include "MessageBox.h"
25 #include "AppUtils.h"
26 #include "PathUtils.h"
27 #include "Git.h"
28 #include "registry.h"
29 #include "GitStatus.h"
30 #include "HistoryDlg.h"
31 #include "Hooks.h"
32 #include "UnicodeUtils.h"
33 #include "../TGitCache/CacheInterface.h"
34 #include "ProgressDlg.h"
35 #include "ShellUpdater.h"
36 #include "Commands/PushCommand.h"
37 #include "COMError.h"
38 #include "Globals.h"
39 #include "SysProgressDlg.h"
40 #include "MassiveGitTask.h"
41 #include "LogDlg.h"
42
43 #ifdef _DEBUG
44 #define new DEBUG_NEW
45 #undef THIS_FILE
46 static char THIS_FILE[] = __FILE__;
47 #endif
48
49 UINT CCommitDlg::WM_AUTOLISTREADY = RegisterWindowMessage(_T("TORTOISEGIT_AUTOLISTREADY_MSG"));
50 UINT CCommitDlg::WM_UPDATEOKBUTTON = RegisterWindowMessage(_T("TORTOISEGIT_COMMIT_UPDATEOKBUTTON"));
51 UINT CCommitDlg::WM_UPDATEDATAFALSE = RegisterWindowMessage(_T("TORTOISEGIT_COMMIT_UPDATEDATAFALSE"));
52
53 IMPLEMENT_DYNAMIC(CCommitDlg, CResizableStandAloneDialog)
54 CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)
55 : CResizableStandAloneDialog(CCommitDlg::IDD, pParent)
56 , m_bShowUnversioned(FALSE)
57 , m_bBlock(FALSE)
58 , m_bThreadRunning(FALSE)
59 , m_bRunThread(FALSE)
60 , m_pThread(NULL)
61 , m_bWholeProject(FALSE)
62 , m_bWholeProject2(FALSE)
63 , m_bKeepChangeList(TRUE)
64 , m_bDoNotAutoselectSubmodules(FALSE)
65 , m_itemsCount(0)
66 , m_bSelectFilesForCommit(TRUE)
67 , m_bNoPostActions(FALSE)
68 , m_bAutoClose(false)
69 , m_bSetCommitDateTime(FALSE)
70 , m_bCreateNewBranch(FALSE)
71 , m_bForceCommitAmend(false)
72 , m_bCommitMessageOnly(FALSE)
73 , m_bSetAuthor(FALSE)
74 , m_bCancelled(false)
75 , m_PostCmd(GIT_POSTCOMMIT_CMD_NOTHING)
76 , m_bAmendDiffToLastCommit(FALSE)
77 , m_nPopupPasteListCmd(0)
78 , m_nPopupPasteLastMessage(0)
79 , m_nPopupRecentMessage(0)
80 , m_nPopupPickCommitHash(0)
81 , m_nPopupPickCommitMessage(0)
82 , m_hAccel(nullptr)
83 {
84 this->m_bCommitAmend=FALSE;
85 }
86
87 CCommitDlg::~CCommitDlg()
88 {
89 if(m_pThread != NULL)
90 {
91 delete m_pThread;
92 }
93 }
94
95 void CCommitDlg::DoDataExchange(CDataExchange* pDX)
96 {
97 CResizableStandAloneDialog::DoDataExchange(pDX);
98 DDX_Control(pDX, IDC_FILELIST, m_ListCtrl);
99 DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);
100 DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);
101 DDX_Check(pDX, IDC_COMMIT_SETDATETIME, m_bSetCommitDateTime);
102 DDX_Check(pDX, IDC_CHECK_NEWBRANCH, m_bCreateNewBranch);
103 DDX_Text(pDX, IDC_NEWBRANCH, m_sCreateNewBranch);
104 DDX_Text(pDX, IDC_BUGID, m_sBugID);
105 DDX_Text(pDX, IDC_COMMIT_AUTHORDATA, m_sAuthor);
106 DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);
107 DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);
108 DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);
109 DDX_Check(pDX, IDC_NOAUTOSELECTSUBMODULES, m_bDoNotAutoselectSubmodules);
110 DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);
111 DDX_Check(pDX, IDC_COMMIT_MESSAGEONLY, m_bCommitMessageOnly);
112 DDX_Check(pDX,IDC_COMMIT_AMENDDIFF,m_bAmendDiffToLastCommit);
113 DDX_Check(pDX, IDC_COMMIT_SETAUTHOR, m_bSetAuthor);
114 DDX_Control(pDX,IDC_VIEW_PATCH,m_ctrlShowPatch);
115 DDX_Control(pDX, IDC_COMMIT_DATEPICKER, m_CommitDate);
116 DDX_Control(pDX, IDC_COMMIT_TIMEPICKER, m_CommitTime);
117 }
118
119 BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)
120 ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)
121 ON_NOTIFY(SCN_UPDATEUI, IDC_LOGMESSAGE, OnScnUpdateUI)
122 // ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)
123 ON_BN_CLICKED(IDC_BUGTRAQBUTTON, OnBnClickedBugtraqbutton)
124 ON_EN_CHANGE(IDC_LOGMESSAGE, OnEnChangeLogmessage)
125 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED, OnGitStatusListCtrlItemCountChanged)
126 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH, OnGitStatusListCtrlNeedsRefresh)
127 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ADDFILE, OnFileDropped)
128 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_CHECKCHANGED, &CCommitDlg::OnGitStatusListCtrlCheckChanged)
129 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED, &CCommitDlg::OnGitStatusListCtrlItemChanged)
130
131 ON_REGISTERED_MESSAGE(CLinkControl::LK_LINKITEMCLICKED, &CCommitDlg::OnCheck)
132 ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY, OnAutoListReady)
133 ON_REGISTERED_MESSAGE(WM_UPDATEOKBUTTON, OnUpdateOKButton)
134 ON_REGISTERED_MESSAGE(WM_UPDATEDATAFALSE, OnUpdateDataFalse)
135 ON_WM_TIMER()
136 ON_WM_SIZE()
137 ON_STN_CLICKED(IDC_EXTERNALWARNING, &CCommitDlg::OnStnClickedExternalwarning)
138 ON_BN_CLICKED(IDC_SIGNOFF, &CCommitDlg::OnBnClickedSignOff)
139 ON_BN_CLICKED(IDC_COMMIT_AMEND, &CCommitDlg::OnBnClickedCommitAmend)
140 ON_BN_CLICKED(IDC_COMMIT_MESSAGEONLY, &CCommitDlg::OnBnClickedCommitMessageOnly)
141 ON_BN_CLICKED(IDC_WHOLE_PROJECT, &CCommitDlg::OnBnClickedWholeProject)
142 ON_COMMAND(ID_FOCUS_MESSAGE,&CCommitDlg::OnFocusMessage)
143 ON_COMMAND(ID_FOCUS_FILELIST, OnFocusFileList)
144 ON_STN_CLICKED(IDC_VIEW_PATCH, &CCommitDlg::OnStnClickedViewPatch)
145 ON_WM_MOVE()
146 ON_WM_MOVING()
147 ON_WM_SIZING()
148 ON_NOTIFY(HDN_ITEMCHANGED, 0, &CCommitDlg::OnHdnItemchangedFilelist)
149 ON_BN_CLICKED(IDC_COMMIT_AMENDDIFF, &CCommitDlg::OnBnClickedCommitAmenddiff)
150 ON_BN_CLICKED(IDC_NOAUTOSELECTSUBMODULES, &CCommitDlg::OnBnClickedNoautoselectsubmodules)
151 ON_BN_CLICKED(IDC_COMMIT_SETDATETIME, &CCommitDlg::OnBnClickedCommitSetDateTime)
152 ON_BN_CLICKED(IDC_CHECK_NEWBRANCH, &CCommitDlg::OnBnClickedCheckNewBranch)
153 ON_BN_CLICKED(IDC_COMMIT_SETAUTHOR, &CCommitDlg::OnBnClickedCommitSetauthor)
154 END_MESSAGE_MAP()
155
156 int GetCommitTemplate(CString &msg)
157 {
158 CString tplFilename = g_Git.GetConfigValue(_T("commit.template"));
159 if (tplFilename.IsEmpty())
160 return -1;
161
162 if (tplFilename[0] == _T('/'))
163 {
164 if (tplFilename.GetLength() >= 3)
165 {
166 // handle "/d/TortoiseGit/tpl.txt" -> "d:/TortoiseGit/tpl.txt"
167 if (tplFilename[2] == _T('/'))
168 {
169 tplFilename.GetBuffer()[0] = tplFilename[1];
170 tplFilename.GetBuffer()[1] = _T(':');
171 }
172 }
173 }
174
175 tplFilename.Replace(_T('/'), _T('\\'));
176
177 if (!CGit::LoadTextFile(tplFilename, msg))
178 return -1;
179 return 0;
180 }
181
182 BOOL CCommitDlg::OnInitDialog()
183 {
184 CResizableStandAloneDialog::OnInitDialog();
185 CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
186
187 if (m_sLogMessage.IsEmpty())
188 {
189 if (!m_bForceCommitAmend)
190 GetCommitTemplate(m_sLogMessage);
191
192 CString dotGitPath;
193 g_GitAdminDir.GetAdminDirPath(g_Git.m_CurrentDir, dotGitPath);
194 bool loadedMsg = !CGit::LoadTextFile(dotGitPath + _T("MERGE_MSG"), m_sLogMessage);
195 loadedMsg = loadedMsg && !CGit::LoadTextFile(dotGitPath + _T("SQUASH_MSG"), m_sLogMessage);
196 }
197 RunStartCommitHook();
198
199 if (CTGitPath(g_Git.m_CurrentDir).IsMergeActive())
200 {
201 DialogEnableWindow(IDC_CHECK_NEWBRANCH, FALSE);
202 m_bCreateNewBranch = FALSE;
203 GetDlgItem(IDC_MERGEACTIVE)->ShowWindow(SW_SHOW);
204 }
205
206 m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);
207 m_bShowUnversioned = m_regAddBeforeCommit;
208
209 CString regPath(g_Git.m_CurrentDir);
210 regPath.Replace(_T(":"), _T("_"));
211 m_regShowWholeProject = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\") + regPath, FALSE);
212 m_bWholeProject = m_regShowWholeProject;
213
214 m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));
215
216 m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE);
217 m_bKeepChangeList = m_regKeepChangelists;
218
219 m_regDoNotAutoselectSubmodules = CRegDWORD(_T("Software\\TortoiseGit\\DoNotAutoselectSubmodules"), FALSE);
220 m_bDoNotAutoselectSubmodules = m_regDoNotAutoselectSubmodules;
221
222 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_COMMITDLG));
223
224 if (m_pathList.IsEmpty())
225 m_bWholeProject2 = true;
226
227 if(this->m_pathList.GetCount() == 1 && m_pathList[0].IsEmpty())
228 m_bWholeProject2 = true;
229
230 SetDlgTitle();
231
232 UpdateData(FALSE);
233
234 m_ListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD | GITSLC_COLDEL, _T("CommitDlg"),(GITSLC_POPALL ^ (GITSLC_POPCOMMIT | GITSLC_POPSAVEAS)), true, true);
235 m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));
236 m_ListCtrl.SetCancelBool(&m_bCancelled);
237 m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);
238 m_ListCtrl.EnableFileDrop();
239 m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);
240
241 //this->DialogEnableWindow(IDC_COMMIT_AMEND,FALSE);
242 m_ProjectProperties.ReadProps();
243
244 m_cLogMessage.Init(m_ProjectProperties);
245 m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));
246 m_cLogMessage.RegisterContextMenuHandler(this);
247 std::map<int, UINT> icons;
248 icons[AUTOCOMPLETE_SPELLING] = IDI_SPELL;
249 icons[AUTOCOMPLETE_FILENAME] = IDI_FILE;
250 icons[AUTOCOMPLETE_PROGRAMCODE] = IDI_CODE;
251 icons[AUTOCOMPLETE_SNIPPET] = IDI_SNIPPET;
252 m_cLogMessage.SetIcon(icons);
253
254 OnEnChangeLogmessage();
255
256 m_tooltips.Create(this);
257 m_tooltips.AddTool(IDC_EXTERNALWARNING, IDS_COMMITDLG_EXTERNALS);
258 m_tooltips.AddTool(IDC_COMMIT_AMEND,IDS_COMMIT_AMEND_TT);
259 m_tooltips.AddTool(IDC_MERGEACTIVE, IDC_MERGEACTIVE_TT);
260 // m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);
261
262 CBugTraqAssociations bugtraq_associations;
263 bugtraq_associations.Load(m_ProjectProperties.GetProviderUUID(), m_ProjectProperties.sProviderParams);
264
265 if (bugtraq_associations.FindProvider(g_Git.m_CurrentDir, &m_bugtraq_association))
266 {
267 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
268 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
269
270 CComPtr<IBugTraqProvider> pProvider;
271 HRESULT hr = pProvider.CoCreateInstance(m_bugtraq_association.GetProviderClass());
272 if (SUCCEEDED(hr))
273 {
274 m_BugTraqProvider = pProvider;
275 BSTR temp = NULL;
276 if (SUCCEEDED(hr = pProvider->GetLinkText(GetSafeHwnd(), m_bugtraq_association.GetParameters().AllocSysString(), &temp)))
277 {
278 SetDlgItemText(IDC_BUGTRAQBUTTON, temp);
279 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(TRUE);
280 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_SHOW);
281 }
282
283 SysFreeString(temp);
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 BSTR temp = NULL;
902 CString common = g_Git.m_CurrentDir;
903 BSTR repositoryRoot = common.AllocSysString();
904 BSTR parameters = m_bugtraq_association.GetParameters().AllocSysString();
905 BSTR commonRoot = SysAllocString(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());
906 BSTR commitMessage = m_sLogMessage.AllocSysString();
907 SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_selectedPathList.GetCount());
908
909 for (LONG index = 0; index < m_selectedPathList.GetCount(); ++index)
910 SafeArrayPutElement(pathList, &index, m_selectedPathList[index].GetGitPathString().AllocSysString());
911
912 if (FAILED(hr = pProvider2->CheckCommit(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, commitMessage, &temp)))
913 {
914 COMError ce(hr);
915 CString sErr;
916 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), ce.GetMessageAndDescription().c_str());
917 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
918 }
919 else
920 {
921 CString sError = temp;
922 if (!sError.IsEmpty())
923 {
924 CMessageBox::Show(m_hWnd, sError, _T("TortoiseGit"), MB_ICONERROR);
925 return;
926 }
927 SysFreeString(temp);
928 }
929 }
930 }
931
932 if (m_bCommitMessageOnly || bAddSuccess && (nchecked || m_bCommitAmend || CTGitPath(g_Git.m_CurrentDir).IsMergeActive()))
933 {
934 bCloseCommitDlg = true;
935
936 CString tempfile=::GetTempFile();
937
938 CAppUtils::SaveCommitUnicodeFile(tempfile,m_sLogMessage);
939
940 CTGitPath path=g_Git.m_CurrentDir;
941
942 BOOL IsGitSVN = path.GetAdminDirMask() & ITEMIS_GITSVN;
943
944 out =_T("");
945 CString amend;
946 if(this->m_bCommitAmend)
947 {
948 amend=_T("--amend");
949 }
950 CString dateTime;
951 if (m_bSetCommitDateTime)
952 {
953 CTime date, time;
954 m_CommitDate.GetTime(date);
955 m_CommitTime.GetTime(time);
956 dateTime.Format(_T("--date=%sT%s"), date.Format(_T("%Y-%m-%d")), time.Format(_T("%H:%M:%S")));
957 }
958 CString author;
959 if (m_bSetAuthor)
960 author.Format(_T("--author=\"%s\""), m_sAuthor);
961 CString allowEmpty = m_bCommitMessageOnly ? _T("--allow-empty") : _T("");
962 cmd.Format(_T("git.exe commit %s %s %s %s -F \"%s\""), author, dateTime, amend, allowEmpty, tempfile);
963
964 CCommitProgressDlg progress;
965 progress.m_bBufferAll=true; // improve show speed when there are many file added.
966 progress.m_GitCmd=cmd;
967 progress.m_bShowCommand = FALSE; // don't show the commit command
968 progress.m_PreText = out; // show any output already generated in log window
969
970 int indexPull = -1;
971 int indexReCommit = -1;
972 int indexTag = -1;
973
974 if (!m_bNoPostActions && !m_bAutoClose)
975 {
976 if (IsGitSVN)
977 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUSVNDCOMMIT)));
978 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUPUSH)));
979 indexPull = (int)progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUPULL)));
980 indexReCommit = (int)progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_RECOMMIT)));
981 indexTag = (int)progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUTAG)));
982 }
983
984 INT_PTR userResponse = progress.DoModal();
985
986 m_PostCmd = GIT_POSTCOMMIT_CMD_NOTHING;
987 if(progress.m_GitStatus || userResponse == (IDC_PROGRESS_BUTTON1 + indexReCommit))
988 {
989 bCloseCommitDlg = false;
990 if (userResponse == IDC_PROGRESS_BUTTON1 + indexReCommit)
991 {
992 if (!m_sLogMessage.IsEmpty())
993 {
994 m_History.AddEntry(m_sLogMessage);
995 m_History.Save();
996 }
997
998 this->m_sLogMessage.Empty();
999 GetCommitTemplate(m_sLogMessage);
1000 RunStartCommitHook();
1001 m_cLogMessage.SetText(m_sLogMessage);
1002 if (m_bCreateNewBranch)
1003 {
1004 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_SHOW);
1005 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_HIDE);
1006 }
1007 m_bCreateNewBranch = FALSE;
1008 }
1009
1010 m_AmendStr.Empty();
1011 m_bCommitAmend = FALSE;
1012 UpdateData(FALSE);
1013 this->Refresh();
1014 this->BringWindowToTop();
1015 }
1016 else if (userResponse == IDC_PROGRESS_BUTTON1 + indexTag)
1017 m_PostCmd = GIT_POSTCOMMIT_CMD_CREATETAG;
1018 else if (userResponse == IDC_PROGRESS_BUTTON1 + indexPull)
1019 m_PostCmd = GIT_POSTCOMMIT_CMD_PULL;
1020 else if (userResponse >= IDC_PROGRESS_BUTTON1 && userResponse < IDC_PROGRESS_BUTTON1 + indexPull)
1021 {
1022 // User pressed 'DCommit' or 'Push' button after successful commit.
1023 if (userResponse == IDC_PROGRESS_BUTTON1 && IsGitSVN)
1024 m_PostCmd = GIT_POSTCOMMIT_CMD_DCOMMIT;
1025 else
1026 m_PostCmd = GIT_POSTCOMMIT_CMD_PUSH;
1027 }
1028
1029 ::DeleteFile(tempfile);
1030
1031 if (m_BugTraqProvider && progress.m_GitStatus == 0)
1032 {
1033 CComPtr<IBugTraqProvider2> pProvider = NULL;
1034 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider);
1035 if (SUCCEEDED(hr))
1036 {
1037 BSTR commonRoot = SysAllocString(g_Git.m_CurrentDir);
1038 SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0,this->m_selectedPathList.GetCount());
1039
1040 for (LONG index = 0; index < m_selectedPathList.GetCount(); ++index)
1041 SafeArrayPutElement(pathList, &index, m_selectedPathList[index].GetGitPathString().AllocSysString());
1042
1043 BSTR logMessage = m_sLogMessage.AllocSysString();
1044
1045 CGitHash hash;
1046 if (g_Git.GetHash(hash, _T("HEAD")))
1047 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash after committing.")), _T("TortoiseGit"), MB_ICONERROR);
1048 LONG version = g_Git.Hash2int(hash);
1049
1050 BSTR temp = NULL;
1051 if (FAILED(hr = pProvider->OnCommitFinished(GetSafeHwnd(),
1052 commonRoot,
1053 pathList,
1054 logMessage,
1055 (LONG)version,
1056 &temp)))
1057 {
1058 CString sErr = temp;
1059 if (!sErr.IsEmpty())
1060 CMessageBox::Show(NULL,(sErr),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1061 else
1062 {
1063 COMError ce(hr);
1064 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, ce.GetSource().c_str(), ce.GetMessageAndDescription().c_str());
1065 CMessageBox::Show(NULL,(sErr),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1066 }
1067 }
1068
1069 SysFreeString(logMessage);
1070 SysFreeString(temp);
1071 }
1072 }
1073 RestoreFiles(progress.m_GitStatus == 0);
1074 if (((DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit"), TRUE)) == TRUE)
1075 {
1076 BOOL cancel = FALSE;
1077 mgtReAddAfterCommit.Execute(cancel);
1078 }
1079 }
1080 else if(bAddSuccess)
1081 {
1082 CMessageBox::Show(this->m_hWnd, IDS_ERROR_NOTHING_COMMIT, IDS_COMMIT_FINISH, MB_OK | MB_ICONINFORMATION);
1083 bCloseCommitDlg=false;
1084 }
1085
1086 UpdateData();
1087 m_regAddBeforeCommit = m_bShowUnversioned;
1088 m_regKeepChangelists = m_bKeepChangeList;
1089 m_regDoNotAutoselectSubmodules = m_bDoNotAutoselectSubmodules;
1090 if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())
1091 m_bKeepChangeList = FALSE;
1092 InterlockedExchange(&m_bBlock, FALSE);
1093
1094 if (!m_sLogMessage.IsEmpty())
1095 {
1096 m_History.AddEntry(m_sLogMessage);
1097 m_History.Save();
1098 }
1099
1100 SaveSplitterPos();
1101
1102 if( bCloseCommitDlg )
1103 CResizableStandAloneDialog::OnOK();
1104
1105 CShellUpdater::Instance().Flush();
1106 }
1107
1108 void CCommitDlg::SaveSplitterPos()
1109 {
1110 if (!IsIconic())
1111 {
1112 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
1113 RECT rectSplitter;
1114 m_wndSplitter.GetWindowRect(&rectSplitter);
1115 ScreenToClient(&rectSplitter);
1116 regPos = rectSplitter.top;
1117 }
1118 }
1119
1120 UINT CCommitDlg::StatusThreadEntry(LPVOID pVoid)
1121 {
1122 return ((CCommitDlg*)pVoid)->StatusThread();
1123 }
1124
1125 UINT CCommitDlg::StatusThread()
1126 {
1127 //get the status of all selected file/folders recursively
1128 //and show the ones which have to be committed to the user
1129 //in a list control.
1130 InterlockedExchange(&m_bBlock, TRUE);
1131 InterlockedExchange(&m_bThreadRunning, TRUE);// so the main thread knows that this thread is still running
1132 InterlockedExchange(&m_bRunThread, TRUE); // if this is set to FALSE, the thread should stop
1133
1134 m_pathwatcher.Stop();
1135
1136 m_ListCtrl.SetBusy(true);
1137 g_Git.RefreshGitIndex();
1138
1139 m_bCancelled = false;
1140
1141 DialogEnableWindow(IDOK, false);
1142 DialogEnableWindow(IDC_SHOWUNVERSIONED, false);
1143 DialogEnableWindow(IDC_WHOLE_PROJECT, false);
1144 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES, false);
1145 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_HIDE);
1146 DialogEnableWindow(IDC_EXTERNALWARNING, false);
1147 DialogEnableWindow(IDC_COMMIT_AMEND, FALSE);
1148 DialogEnableWindow(IDC_COMMIT_AMENDDIFF, FALSE);
1149 // read the list of recent log entries before querying the WC for status
1150 // -> the user may select one and modify / update it while we are crawling the WC
1151
1152 DialogEnableWindow(IDC_CHECKALL, false);
1153 DialogEnableWindow(IDC_CHECKNONE, false);
1154 DialogEnableWindow(IDC_CHECKUNVERSIONED, false);
1155 DialogEnableWindow(IDC_CHECKVERSIONED, false);
1156 DialogEnableWindow(IDC_CHECKADDED, false);
1157 DialogEnableWindow(IDC_CHECKDELETED, false);
1158 DialogEnableWindow(IDC_CHECKMODIFIED, false);
1159 DialogEnableWindow(IDC_CHECKFILES, false);
1160 DialogEnableWindow(IDC_CHECKSUBMODULES, false);
1161
1162 if (m_History.IsEmpty())
1163 {
1164 CString reg;
1165 reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);
1166 reg.Replace(_T(':'),_T('_'));
1167 m_History.Load(reg, _T("logmsgs"));
1168 }
1169
1170 // Initialise the list control with the status of the files/folders below us
1171 m_ListCtrl.Clear();
1172 BOOL success;
1173 CTGitPathList *pList;
1174 m_ListCtrl.m_amend = (m_bCommitAmend==TRUE || m_bForceCommitAmend) && (m_bAmendDiffToLastCommit==FALSE);
1175 m_ListCtrl.m_bDoNotAutoselectSubmodules = (m_bDoNotAutoselectSubmodules == TRUE);
1176
1177 if(m_bWholeProject || m_bWholeProject2)
1178 pList=NULL;
1179 else
1180 pList = &m_pathList;
1181
1182 success=m_ListCtrl.GetStatus(pList);
1183
1184 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
1185 if(this->m_bShowUnversioned)
1186 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER,true,pList);
1187
1188 m_ListCtrl.CheckIfChangelistsArePresent(false);
1189
1190 DWORD dwShow = GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GITSLC_SHOWLOCKS | GITSLC_SHOWINCHANGELIST | GITSLC_SHOWDIRECTFILES;
1191 dwShow |= DWORD(m_regAddBeforeCommit) ? GITSLC_SHOWUNVERSIONED : 0;
1192 if (success)
1193 {
1194 if (!m_checkedPathList.IsEmpty())
1195 m_ListCtrl.Show(dwShow, m_checkedPathList);
1196 else
1197 {
1198 DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;
1199 dwCheck &=~(CTGitPath::LOGACTIONS_UNVER); //don't check unversion file default.
1200 m_ListCtrl.Show(dwShow, dwCheck);
1201 m_bSelectFilesForCommit = true;
1202 }
1203
1204 if (m_ListCtrl.HasExternalsFromDifferentRepos())
1205 {
1206 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);
1207 DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);
1208 }
1209
1210 SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());
1211 m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());
1212 }
1213 if (!success)
1214 {
1215 if (!m_ListCtrl.GetLastErrorMessage().IsEmpty())
1216 m_ListCtrl.SetEmptyString(m_ListCtrl.GetLastErrorMessage());
1217 m_ListCtrl.Show(dwShow);
1218 }
1219
1220 CString dotGitPath;
1221 g_GitAdminDir.GetAdminDirPath(g_Git.m_CurrentDir, dotGitPath);
1222 if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems())
1223 && !PathFileExists(dotGitPath + _T("MERGE_HEAD")))
1224 {
1225 CString temp;
1226 temp.LoadString(IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED);
1227 if (CMessageBox::ShowCheck(m_hWnd, temp, _T("TortoiseGit"), MB_ICONINFORMATION | MB_YESNO, _T("NothingToCommitShowUnversioned"), NULL)==IDYES)
1228 {
1229 m_bShowUnversioned = TRUE;
1230 GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);
1231 DWORD dwShow = (DWORD)(GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GITSLC_SHOWUNVERSIONED | GITSLC_SHOWLOCKS);
1232 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);
1233 m_ListCtrl.Show(dwShow,dwShow&(~CTGitPath::LOGACTIONS_UNVER));
1234 }
1235 }
1236
1237 SetDlgTitle();
1238
1239 m_autolist.clear();
1240 // we don't have to block the commit dialog while we fetch the
1241 // auto completion list.
1242 m_pathwatcher.ClearChangedPaths();
1243 InterlockedExchange(&m_bBlock, FALSE);
1244 if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE)==TRUE)
1245 {
1246 m_ListCtrl.Block(TRUE, TRUE);
1247 GetAutocompletionList();
1248 m_ListCtrl.Block(FALSE, FALSE);
1249 }
1250 SendMessage(WM_UPDATEOKBUTTON);
1251 if (m_bRunThread)
1252 {
1253 DialogEnableWindow(IDC_SHOWUNVERSIONED, true);
1254 DialogEnableWindow(IDC_WHOLE_PROJECT, !m_bWholeProject2);
1255 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES, true);
1256 if (m_ListCtrl.HasChangeLists())
1257 DialogEnableWindow(IDC_KEEPLISTS, true);
1258
1259 // activate amend checkbox (if necessary)
1260 if (g_Git.IsInitRepos())
1261 {
1262 m_bCommitAmend = FALSE;
1263 SendMessage(WM_UPDATEDATAFALSE);
1264 }
1265 else
1266 {
1267 if (m_bForceCommitAmend)
1268 {
1269 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_SHOW);
1270 m_bCommitAmend = TRUE;
1271 SendMessage(WM_UPDATEDATAFALSE);
1272 }
1273 else
1274 GetDlgItem(IDC_COMMIT_AMEND)->EnableWindow(TRUE);
1275
1276 CGitHash hash;
1277 if (g_Git.GetHash(hash, _T("HEAD")))
1278 {
1279 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
1280 }
1281 if (!hash.IsEmpty())
1282 {
1283 GitRev headRevision;
1284 try
1285 {
1286 headRevision.GetParentFromHash(hash);
1287 }
1288 catch (char* msg)
1289 {
1290 CString err(msg);
1291 MessageBox(_T("Could not get parent from HEAD.\nlibgit reports:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
1292 }
1293 // do not allow to show diff to "last" revision if it has more that one parent
1294 if (headRevision.ParentsCount() != 1)
1295 {
1296 m_bAmendDiffToLastCommit = TRUE;
1297 SendMessage(WM_UPDATEDATAFALSE);
1298 }
1299 else
1300 GetDlgItem(IDC_COMMIT_AMENDDIFF)->EnableWindow(TRUE);
1301 }
1302 }
1303
1304 UpdateCheckLinks();
1305
1306 // we have the list, now signal the main thread about it
1307 SendMessage(WM_AUTOLISTREADY); // only send the message if the thread wasn't told to quit!
1308 }
1309
1310 InterlockedExchange(&m_bRunThread, FALSE);
1311 InterlockedExchange(&m_bThreadRunning, FALSE);
1312 // force the cursor to normal
1313 RefreshCursor();
1314
1315 return 0;
1316 }
1317
1318 void CCommitDlg::SetDlgTitle()
1319 {
1320 if (m_sTitle.IsEmpty())
1321 GetWindowText(m_sTitle);
1322
1323 if (m_bWholeProject || m_bWholeProject2)
1324 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, m_sTitle);
1325 else
1326 {
1327 if (m_pathList.GetCount() == 1)
1328 CAppUtils::SetWindowTitle(m_hWnd, g_Git.CombinePath(m_pathList[0].GetUIPathString()), m_sTitle);
1329 else
1330 CAppUtils::SetWindowTitle(m_hWnd, g_Git.CombinePath(m_ListCtrl.GetCommonDirectory(false)), m_sTitle);
1331 }
1332 }
1333
1334 void CCommitDlg::OnCancel()
1335 {
1336 m_bCancelled = true;
1337 m_pathwatcher.Stop();
1338
1339 if (m_bThreadRunning)
1340 {
1341 InterlockedExchange(&m_bRunThread, FALSE);
1342 WaitForSingleObject(m_pThread->m_hThread, 1000);
1343 if (m_bThreadRunning)
1344 {
1345 // we gave the thread a chance to quit. Since the thread didn't
1346 // listen to us we have to kill it.
1347 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
1348 InterlockedExchange(&m_bThreadRunning, FALSE);
1349 }
1350 }
1351 UpdateData();
1352 m_sBugID.Trim();
1353 m_sLogMessage = m_cLogMessage.GetText();
1354 if (!m_sBugID.IsEmpty())
1355 {
1356 m_sBugID.Replace(_T(", "), _T(","));
1357 m_sBugID.Replace(_T(" ,"), _T(","));
1358 CString sBugID = m_ProjectProperties.sMessage;
1359 sBugID.Replace(_T("%BUGID%"), m_sBugID);
1360 if (m_ProjectProperties.bAppend)
1361 m_sLogMessage += _T("\n") + sBugID + _T("\n");
1362 else
1363 m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
1364 }
1365 if ((m_sLogTemplate.Compare(m_sLogMessage) != 0) && !m_sLogMessage.IsEmpty())
1366 {
1367 m_History.AddEntry(m_sLogMessage);
1368 m_History.Save();
1369 }
1370 RestoreFiles();
1371 SaveSplitterPos();
1372 CResizableStandAloneDialog::OnCancel();
1373 }
1374
1375 BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)
1376 {
1377 if (!m_bBlock)
1378 m_tooltips.RelayEvent(pMsg);
1379
1380 if (m_hAccel)
1381 {
1382 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
1383 if (ret)
1384 return TRUE;
1385 }
1386
1387 if (pMsg->message == WM_KEYDOWN)
1388 {
1389 switch (pMsg->wParam)
1390 {
1391 case VK_F5:
1392 {
1393 if (m_bBlock)
1394 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
1395 Refresh();
1396 }
1397 break;
1398 case VK_RETURN:
1399 {
1400 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
1401 {
1402 if ( GetDlgItem(IDOK)->IsWindowEnabled() )
1403 {
1404 PostMessage(WM_COMMAND, IDOK);
1405 }
1406 return TRUE;
1407 }
1408 if ( GetFocus()==GetDlgItem(IDC_BUGID) )
1409 {
1410 // Pressing RETURN in the bug id control
1411 // moves the focus to the message
1412 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
1413 return TRUE;
1414 }
1415 }
1416 break;
1417 }
1418 }
1419
1420 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
1421 }
1422
1423 void CCommitDlg::Refresh()
1424 {
1425 if (m_bThreadRunning)
1426 return;
1427
1428 InterlockedExchange(&m_bBlock, TRUE);
1429 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
1430 if (m_pThread==NULL)
1431 {
1432 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
1433 InterlockedExchange(&m_bBlock, FALSE);
1434 }
1435 else
1436 {
1437 m_pThread->m_bAutoDelete = FALSE;
1438 m_pThread->ResumeThread();
1439 }
1440 }
1441
1442 void CCommitDlg::OnBnClickedShowunversioned()
1443 {
1444 m_tooltips.Pop(); // hide the tooltips
1445 UpdateData();
1446 m_regAddBeforeCommit = m_bShowUnversioned;
1447 if (!m_bBlock)
1448 {
1449 DWORD dwShow = m_ListCtrl.GetShowFlags();
1450 if (DWORD(m_regAddBeforeCommit))
1451 dwShow |= GITSLC_SHOWUNVERSIONED;
1452 else
1453 dwShow &= ~GITSLC_SHOWUNVERSIONED;
1454 if(dwShow & GITSLC_SHOWUNVERSIONED)
1455 {
1456 if (m_bWholeProject || m_bWholeProject2)
1457 m_ListCtrl.GetStatus(NULL,false,false,true);
1458 else
1459 m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);
1460 }
1461 m_ListCtrl.Show(dwShow, 0, true, dwShow & ~(CTGitPath::LOGACTIONS_UNVER), true);
1462 UpdateCheckLinks();
1463 }
1464 }
1465
1466 void CCommitDlg::OnStnClickedExternalwarning()
1467 {
1468 m_tooltips.Popup();
1469 }
1470
1471 void CCommitDlg::OnEnChangeLogmessage()
1472 {
1473 SendMessage(WM_UPDATEOKBUTTON);
1474 }
1475
1476 LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)
1477 {
1478 #if 0
1479 if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))
1480 {
1481 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
1482 {
1483 m_bShowUnversioned = TRUE;
1484 DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;
1485 m_ListCtrl.Show(dwShow);
1486 UpdateData(FALSE);
1487 }
1488 }
1489 #endif
1490 return 0;
1491 }
1492
1493 LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
1494 {
1495 Refresh();
1496 return 0;
1497 }
1498
1499 LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM /*lParam*/)
1500 {
1501 #if 0
1502 BringWindowToTop();
1503 SetForegroundWindow();
1504 SetActiveWindow();
1505 // if multiple files/folders are dropped
1506 // this handler is called for every single item
1507 // separately.
1508 // To avoid creating multiple refresh threads and
1509 // causing crashes, we only add the items to the
1510 // list control and start a timer.
1511 // When the timer expires, we start the refresh thread,
1512 // but only if it isn't already running - otherwise we
1513 // restart the timer.
1514 CTGitPath path;
1515 path.SetFromWin((LPCTSTR)lParam);
1516
1517 // just add all the items we get here.
1518 // if the item is versioned, the add will fail but nothing
1519 // more will happen.
1520 Git Git;
1521 Git.Add(CTGitPathList(path), &m_ProjectProperties, Git_depth_empty, false, true, true);
1522
1523 if (!m_ListCtrl.HasPath(path))
1524 {
1525 if (m_pathList.AreAllPathsFiles())
1526 {
1527 m_pathList.AddPath(path);
1528 m_pathList.RemoveDuplicates();
1529 m_updatedPathList.AddPath(path);
1530 m_updatedPathList.RemoveDuplicates();
1531 }
1532 else
1533 {
1534 // if the path list contains folders, we have to check whether
1535 // our just (maybe) added path is a child of one of those. If it is
1536 // a child of a folder already in the list, we must not add it. Otherwise
1537 // that path could show up twice in the list.
1538 bool bHasParentInList = false;
1539 for (int i=0; i<m_pathList.GetCount(); ++i)
1540 {
1541 if (m_pathList[i].IsAncestorOf(path))
1542 {
1543 bHasParentInList = true;
1544 break;
1545 }
1546 }
1547 if (!bHasParentInList)
1548 {
1549 m_pathList.AddPath(path);
1550 m_pathList.RemoveDuplicates();
1551 m_updatedPathList.AddPath(path);
1552 m_updatedPathList.RemoveDuplicates();
1553 }
1554 }
1555 }
1556
1557 // Always start the timer, since the status of an existing item might have changed
1558 SetTimer(REFRESHTIMER, 200, NULL);
1559 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": Item %s dropped, timer started\n"), path.GetWinPath());
1560 #endif
1561 return 0;
1562 }
1563
1564 LRESULT CCommitDlg::OnAutoListReady(WPARAM, LPARAM)
1565 {
1566 m_cLogMessage.SetAutoCompletionList(m_autolist, '*');
1567 return 0;
1568 }
1569
1570 //////////////////////////////////////////////////////////////////////////
1571 // functions which run in the status thread
1572 //////////////////////////////////////////////////////////////////////////
1573
1574 void CCommitDlg::ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex)
1575 {
1576 CString strLine;
1577 try
1578 {
1579 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
1580 while (m_bRunThread && file.ReadString(strLine))
1581 {
1582 int eqpos = strLine.Find('=');
1583 CString rgx;
1584 rgx = strLine.Mid(eqpos+1).Trim();
1585
1586 int pos = -1;
1587 while (((pos = strLine.Find(','))>=0)&&(pos < eqpos))
1588 {
1589 mapRegex[strLine.Left(pos)] = rgx;
1590 strLine = strLine.Mid(pos+1).Trim();
1591 }
1592 mapRegex[strLine.Left(strLine.Find('=')).Trim()] = rgx;
1593 }
1594 file.Close();
1595 }
1596 catch (CFileException* pE)
1597 {
1598 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": CFileException loading auto list regex file\n");
1599 pE->Delete();
1600 }
1601 }
1602
1603 void CCommitDlg::ParseSnippetFile(const CString& sFile, std::map<CString, CString>& mapSnippet)
1604 {
1605 CString strLine;
1606 try
1607 {
1608 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
1609 while (m_bRunThread && file.ReadString(strLine))
1610 {
1611 if (strLine.IsEmpty())
1612 continue;
1613 if (strLine.Left(1) == _T('#')) // comment char
1614 continue;
1615 int eqpos = strLine.Find('=');
1616 CString key = strLine.Left(eqpos);
1617 CString value = strLine.Mid(eqpos + 1);
1618 value.Replace(_T("\\\t"), _T("\t"));
1619 value.Replace(_T("\\\r"), _T("\r"));
1620 value.Replace(_T("\\\n"), _T("\n"));
1621 value.Replace(_T("\\\\"), _T("\\"));
1622 mapSnippet[key] = value;
1623 }
1624 file.Close();
1625 }
1626 catch (CFileException* pE)
1627 {
1628 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": CFileException loading auto list regex file\n");
1629 pE->Delete();
1630 }
1631 }
1632
1633 void CCommitDlg::GetAutocompletionList()
1634 {
1635 // the auto completion list is made of strings from each selected files.
1636 // the strings used are extracted from the files with regexes found
1637 // in the file "autolist.txt".
1638 // the format of that file is:
1639 // file extensions separated with commas '=' regular expression to use
1640 // example:
1641 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
1642 // .cpp = (?<=[^\s]::)\b\w+\b
1643
1644 std::map<CString, CString> mapRegex;
1645 CString sRegexFile = CPathUtils::GetAppDirectory();
1646 CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);
1647 DWORD timeoutvalue = regtimeout*1000;
1648 sRegexFile += _T("autolist.txt");
1649 if (!m_bRunThread)
1650 return;
1651 ParseRegexFile(sRegexFile, mapRegex);
1652 SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sRegexFile.GetBuffer(MAX_PATH+1));
1653 sRegexFile.ReleaseBuffer();
1654 sRegexFile += _T("\\TortoiseGit\\autolist.txt");
1655 if (PathFileExists(sRegexFile))
1656 {
1657 ParseRegexFile(sRegexFile, mapRegex);
1658 }
1659
1660 m_snippet.clear();
1661 CString sSnippetFile = CPathUtils::GetAppDirectory();
1662 sSnippetFile += _T("snippet.txt");
1663 ParseSnippetFile(sSnippetFile, m_snippet);
1664 SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sSnippetFile.GetBuffer(MAX_PATH+1));
1665 sSnippetFile.ReleaseBuffer();
1666 sSnippetFile += _T("\\TortoiseGit\\snippet.txt");
1667 if (PathFileExists(sSnippetFile))
1668 ParseSnippetFile(sSnippetFile, m_snippet);
1669 for (auto snip : m_snippet)
1670 m_autolist.insert(std::make_pair(snip.first, AUTOCOMPLETE_SNIPPET));
1671
1672 DWORD starttime = GetTickCount();
1673
1674 // now we have two arrays of strings, where the first array contains all
1675 // file extensions we can use and the second the corresponding regex strings
1676 // to apply to those files.
1677
1678 // the next step is to go over all files shown in the commit dialog
1679 // and scan them for strings we can use
1680 int nListItems = m_ListCtrl.GetItemCount();
1681
1682 for (int i=0; i<nListItems && m_bRunThread; ++i)
1683 {
1684 // stop parsing after timeout
1685 if ((!m_bRunThread) || (GetTickCount() - starttime > timeoutvalue))
1686 return;
1687
1688 CTGitPath *path = (CTGitPath*)m_ListCtrl.GetItemData(i);
1689
1690 if(path == NULL)
1691 continue;
1692
1693 CString sPartPath =path->GetGitPathString();
1694 m_autolist.insert(std::make_pair(sPartPath, AUTOCOMPLETE_FILENAME));
1695
1696 int pos = 0;
1697 int lastPos = 0;
1698 while ((pos = sPartPath.Find('/', pos)) >= 0)
1699 {
1700 ++pos;
1701 lastPos = pos;
1702 m_autolist.insert(std::make_pair(sPartPath.Mid(pos), AUTOCOMPLETE_FILENAME));
1703 }
1704
1705 // Last inserted entry is a file name.
1706 // Some users prefer to also list file name without extension.
1707 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE))
1708 {
1709 int dotPos = sPartPath.ReverseFind('.');
1710 if ((dotPos >= 0) && (dotPos > lastPos))
1711 m_autolist.insert(std::make_pair(sPartPath.Mid(lastPos, dotPos - lastPos), AUTOCOMPLETE_FILENAME));
1712 }
1713
1714 if (path->m_Action == CTGitPath::LOGACTIONS_UNVER && !CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseUnversioned"), FALSE))
1715 continue;
1716 if (path->m_Action == CTGitPath::LOGACTIONS_IGNORE || path->m_Action == CTGitPath::LOGACTIONS_DELETED)
1717 continue;
1718
1719 CString sExt = path->GetFileExtension();
1720 sExt.MakeLower();
1721 // find the regex string which corresponds to the file extension
1722 CString rdata = mapRegex[sExt];
1723 if (rdata.IsEmpty())
1724 continue;
1725
1726 ScanFile(path->GetWinPathString(), rdata, sExt);
1727 }
1728 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": Auto completion list loaded in %d msec\n"), GetTickCount() - starttime);
1729 }
1730
1731 void CCommitDlg::ScanFile(const CString& sFilePath, const CString& sRegex, const CString& sExt)
1732 {
1733 static std::map<CString, std::tr1::wregex> regexmap;
1734
1735 std::wstring sFileContent;
1736 CAutoFile hFile = CreateFile(sFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);
1737 if (hFile)
1738 {
1739 DWORD size = GetFileSize(hFile, NULL);
1740 if (size > CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseMaxSize"), 300000L))
1741 {
1742 // no files bigger than 300k
1743 return;
1744 }
1745 // allocate memory to hold file contents
1746 std::unique_ptr<char[]> buffer(new char[size]);
1747 DWORD readbytes;
1748 if (!ReadFile(hFile, buffer.get(), size, &readbytes, NULL))
1749 return;
1750 int opts = 0;
1751 IsTextUnicode(buffer.get(), readbytes, &opts);
1752 if (opts & IS_TEXT_UNICODE_NULL_BYTES)
1753 {
1754 return;
1755 }
1756 if (opts & IS_TEXT_UNICODE_UNICODE_MASK)
1757 {
1758 sFileContent = std::wstring((wchar_t*)buffer.get(), readbytes / sizeof(WCHAR));
1759 }
1760 if ((opts & IS_TEXT_UNICODE_NOT_UNICODE_MASK) || (opts == 0))
1761 {
1762 const int ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer.get(), readbytes, NULL, 0);
1763 std::unique_ptr<wchar_t[]> pWideBuf(new wchar_t[ret]);
1764 const int ret2 = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer.get(), readbytes, pWideBuf.get(), ret);
1765 if (ret2 == ret)
1766 sFileContent = std::wstring(pWideBuf.get(), ret);
1767 }
1768 }
1769 if (sFileContent.empty() || !m_bRunThread)
1770 {
1771 return;
1772 }
1773
1774 try
1775 {
1776
1777 std::tr1::wregex regCheck;
1778 std::map<CString, std::tr1::wregex>::const_iterator regIt;
1779 if ((regIt = regexmap.find(sExt)) != regexmap.end())
1780 regCheck = regIt->second;
1781 else
1782 {
1783 regCheck = std::tr1::wregex(sRegex, std::tr1::regex_constants::icase | std::tr1::regex_constants::ECMAScript);
1784 regexmap[sExt] = regCheck;
1785 }
1786 const std::tr1::wsregex_iterator end;
1787 for (std::tr1::wsregex_iterator it(sFileContent.begin(), sFileContent.end(), regCheck); it != end; ++it)
1788 {
1789 const std::tr1::wsmatch match = *it;
1790 for (size_t i = 1; i < match.size(); ++i)
1791 {
1792 if (match[i].second-match[i].first)
1793 {
1794 m_autolist.insert(std::make_pair(std::wstring(match[i]).c_str(), AUTOCOMPLETE_PROGRAMCODE));
1795 }
1796 }
1797 }
1798 }
1799 catch (std::exception) {}
1800 }
1801
1802 // CSciEditContextMenuInterface
1803 void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
1804 {
1805 CString sMenuItemText;
1806 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITHASH);
1807 m_nPopupPickCommitHash = nCmd++;
1808 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPickCommitHash, sMenuItemText);
1809
1810 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITMESSAGE);
1811 m_nPopupPickCommitMessage = nCmd++;
1812 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPickCommitMessage, sMenuItemText);
1813
1814 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTEFILELIST);
1815 m_nPopupPasteListCmd = nCmd++;
1816 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);
1817
1818 if (!m_History.IsEmpty())
1819 {
1820 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);
1821 m_nPopupPasteLastMessage = nCmd++;
1822 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);
1823
1824 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY);
1825 m_nPopupRecentMessage = nCmd++;
1826 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupRecentMessage, sMenuItemText);
1827 }
1828 }
1829
1830 bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
1831 {
1832 if (cmd == m_nPopupPickCommitHash)
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 pSciEdit->InsertText(selectedHash);
1845 }
1846 return true;
1847 }
1848
1849 if (cmd == m_nPopupPickCommitMessage)
1850 {
1851 // use the git log to allow selection of a version
1852 CLogDlg dlg;
1853 // tell the dialog to use mode for selecting revisions
1854 dlg.SetSelect(true);
1855 // only one revision must be selected however
1856 dlg.SingleSelection(true);
1857 if (dlg.DoModal() == IDOK)
1858 {
1859 // get selected hash if any
1860 CString selectedHash = dlg.GetSelectedHash();
1861 GitRev rev;
1862 rev.GetCommit(selectedHash);
1863 CString message = rev.GetSubject() + _T("\r\n") + rev.GetBody();
1864 pSciEdit->InsertText(message);
1865 }
1866 return true;
1867 }
1868
1869 if (cmd == m_nPopupPasteListCmd)
1870 {
1871 CString logmsg;
1872 int nListItems = m_ListCtrl.GetItemCount();
1873 for (int i=0; i<nListItems; ++i)
1874 {
1875 CTGitPath * entry = (CTGitPath*)m_ListCtrl.GetItemData(i);
1876 if (entry&&entry->m_Checked)
1877 {
1878 CString line;
1879 CString status = entry->GetActionName();
1880 if(entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
1881 status = _T("Add"); // I18N TODO
1882
1883 //git_wc_status_kind status = entry->status;
1884 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1885 if (m_ProjectProperties.bFileListInEnglish)
1886 langID = 1033;
1887
1888 line.Format(_T("%-10s %s\r\n"),status , (LPCTSTR)m_ListCtrl.GetItemText(i,0));
1889 logmsg += line;
1890 }
1891 }
1892 pSciEdit->InsertText(logmsg);
1893 return true;
1894 }
1895
1896 if(cmd == m_nPopupPasteLastMessage)
1897 {
1898 if (m_History.IsEmpty())
1899 return false;
1900
1901 CString logmsg;
1902 logmsg +=m_History.GetEntry(0);
1903 pSciEdit->InsertText(logmsg);
1904 return true;
1905 }
1906
1907 if(cmd == m_nPopupRecentMessage )
1908 {
1909 OnBnClickedHistory();
1910 return true;
1911 }
1912 return false;
1913 }
1914
1915 void CCommitDlg::HandleSnippet(int type, const CString &text, CSciEdit *pSciEdit)
1916 {
1917 if (type == AUTOCOMPLETE_SNIPPET)
1918 {
1919 CString target = m_snippet[text];
1920 pSciEdit->GetWordUnderCursor(true);
1921 pSciEdit->InsertText(target, false);
1922 }
1923 }
1924
1925 void CCommitDlg::OnTimer(UINT_PTR nIDEvent)
1926 {
1927 switch (nIDEvent)
1928 {
1929 case ENDDIALOGTIMER:
1930 KillTimer(ENDDIALOGTIMER);
1931 EndDialog(0);
1932 break;
1933 case REFRESHTIMER:
1934 if (m_bThreadRunning)
1935 {
1936 SetTimer(REFRESHTIMER, 200, NULL);
1937 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": Wait some more before refreshing\n");
1938 }
1939 else
1940 {
1941 KillTimer(REFRESHTIMER);
1942 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": Refreshing after items dropped\n");
1943 Refresh();
1944 }
1945 break;
1946 case FILLPATCHVTIMER:
1947 FillPatchView();
1948 break;
1949 }
1950 __super::OnTimer(nIDEvent);
1951 }
1952
1953 void CCommitDlg::OnBnClickedHistory()
1954 {
1955 m_tooltips.Pop(); // hide the tooltips
1956 if (m_pathList.IsEmpty())
1957 return;
1958
1959 CHistoryDlg historyDlg;
1960 historyDlg.SetHistory(m_History);
1961 if (historyDlg.DoModal() != IDOK)
1962 return;
1963
1964 CString sMsg = historyDlg.GetSelectedText();
1965 if (sMsg != m_cLogMessage.GetText().Left(sMsg.GetLength()))
1966 {
1967 CString sBugID = m_ProjectProperties.FindBugID(sMsg);
1968 if ((!sBugID.IsEmpty()) && ((GetDlgItem(IDC_BUGID)->IsWindowVisible())))
1969 {
1970 SetDlgItemText(IDC_BUGID, sBugID);
1971 }
1972 if (m_sLogTemplate.Compare(m_cLogMessage.GetText()) != 0)
1973 m_cLogMessage.InsertText(sMsg, !m_cLogMessage.GetText().IsEmpty());
1974 else
1975 m_cLogMessage.SetText(sMsg);
1976 }
1977
1978 SendMessage(WM_UPDATEOKBUTTON);
1979 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
1980
1981 }
1982
1983 void CCommitDlg::OnBnClickedBugtraqbutton()
1984 {
1985 m_tooltips.Pop(); // hide the tooltips
1986 CString sMsg = m_cLogMessage.GetText();
1987
1988 if (m_BugTraqProvider == NULL)
1989 return;
1990
1991 BSTR parameters = m_bugtraq_association.GetParameters().AllocSysString();
1992 BSTR commonRoot = SysAllocString(g_Git.m_CurrentDir);
1993 SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_pathList.GetCount());
1994
1995 for (LONG index = 0; index < m_pathList.GetCount(); ++index)
1996 SafeArrayPutElement(pathList, &index, m_pathList[index].GetGitPathString().AllocSysString());
1997
1998 BSTR originalMessage = sMsg.AllocSysString();
1999 BSTR temp = NULL;
2000 // m_revProps.clear();
2001
2002 // first try the IBugTraqProvider2 interface
2003 CComPtr<IBugTraqProvider2> pProvider2 = NULL;
2004 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
2005 bool bugIdOutSet = false;
2006 if (SUCCEEDED(hr))
2007 {
2008 BSTR repositoryRoot = g_Git.m_CurrentDir.AllocSysString();
2009 BSTR bugIDOut = NULL;
2010 GetDlgItemText(IDC_BUGID, m_sBugID);
2011 BSTR bugID = m_sBugID.AllocSysString();
2012 SAFEARRAY * revPropNames = NULL;
2013 SAFEARRAY * revPropValues = NULL;
2014 if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, bugID, &bugIDOut, &revPropNames, &revPropValues, &temp)))
2015 {
2016 CString sErr;
2017 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2018 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
2019 SysFreeString(bugID);
2020 SysFreeString(repositoryRoot);
2021 }
2022 else
2023 {
2024 if (bugIDOut)
2025 {
2026 bugIdOutSet = true;
2027 m_sBugID = bugIDOut;
2028 SysFreeString(bugIDOut);
2029 SetDlgItemText(IDC_BUGID, m_sBugID);
2030 }
2031 SysFreeString(bugID);
2032 SysFreeString(repositoryRoot);
2033 m_cLogMessage.SetText(temp);
2034 BSTR HUGEP *pbRevNames;
2035 BSTR HUGEP *pbRevValues;
2036
2037 HRESULT hr1 = SafeArrayAccessData(revPropNames, (void HUGEP**)&pbRevNames);
2038 if (SUCCEEDED(hr1))
2039 {
2040 HRESULT hr2 = SafeArrayAccessData(revPropValues, (void HUGEP**)&pbRevValues);
2041 if (SUCCEEDED(hr2))
2042 {
2043 if (revPropNames->rgsabound->cElements == revPropValues->rgsabound->cElements)
2044 {
2045 for (ULONG i = 0; i < revPropNames->rgsabound->cElements; ++i)
2046 {
2047 // m_revProps[pbRevNames[i]] = pbRevValues[i];
2048 }
2049 }
2050 SafeArrayUnaccessData(revPropValues);
2051 }
2052 SafeArrayUnaccessData(revPropNames);
2053 }
2054 if (revPropNames)
2055 SafeArrayDestroy(revPropNames);
2056 if (revPropValues)
2057 SafeArrayDestroy(revPropValues);
2058 }
2059 }
2060 else
2061 {
2062 // if IBugTraqProvider2 failed, try IBugTraqProvider
2063 CComPtr<IBugTraqProvider> pProvider = NULL;
2064 hr = m_BugTraqProvider.QueryInterface(&pProvider);
2065 if (FAILED(hr))
2066 {
2067 CString sErr;
2068 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2069 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
2070 SysFreeString(parameters);
2071 SysFreeString(commonRoot);
2072 SafeArrayDestroy(pathList);
2073 SysFreeString(originalMessage);
2074 return;
2075 }
2076
2077 if (FAILED(hr = pProvider->GetCommitMessage(GetSafeHwnd(), parameters, commonRoot, pathList, originalMessage, &temp)))
2078 {
2079 CString sErr;
2080 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2081 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
2082 }
2083 else
2084 m_cLogMessage.SetText(temp);
2085 }
2086 m_sLogMessage = m_cLogMessage.GetText();
2087 if (!m_ProjectProperties.sMessage.IsEmpty())
2088 {
2089 CString sBugID = m_ProjectProperties.FindBugID(m_sLogMessage);
2090 if (!sBugID.IsEmpty() && !bugIdOutSet)
2091 {
2092 SetDlgItemText(IDC_BUGID, sBugID);
2093 }
2094 }
2095
2096 m_cLogMessage.SetFocus();
2097
2098 SysFreeString(parameters);
2099 SysFreeString(commonRoot);
2100 SafeArrayDestroy(pathList);
2101 SysFreeString(originalMessage);
2102 SysFreeString(temp);
2103 }
2104
2105 void CCommitDlg::FillPatchView(bool onlySetTimer)
2106 {
2107 if(::IsWindow(this->m_patchViewdlg.m_hWnd))
2108 {
2109 KillTimer(FILLPATCHVTIMER);
2110 if (onlySetTimer)
2111 {
2112 SetTimer(FILLPATCHVTIMER, 100, NULL);
2113 return;
2114 }
2115
2116 POSITION pos=m_ListCtrl.GetFirstSelectedItemPosition();
2117 CString cmd,out;
2118
2119 while(pos)
2120 {
2121 int nSelect = m_ListCtrl.GetNextSelectedItem(pos);
2122 CTGitPath * p=(CTGitPath*)m_ListCtrl.GetItemData(nSelect);
2123 if(p && !(p->m_Action&CTGitPath::LOGACTIONS_UNVER) )
2124 {
2125 CString head = _T("HEAD");
2126 if(m_bCommitAmend==TRUE && m_bAmendDiffToLastCommit==FALSE)
2127 head = _T("HEAD~1");
2128 cmd.Format(_T("git.exe diff %s -- \"%s\""), head, p->GetGitPathString());
2129 g_Git.Run(cmd, &out, CP_UTF8);
2130 }
2131 }
2132
2133 m_patchViewdlg.SetText(out);
2134 }
2135 }
2136 LRESULT CCommitDlg::OnGitStatusListCtrlItemChanged(WPARAM /*wparam*/, LPARAM /*lparam*/)
2137 {
2138 this->FillPatchView(true);
2139 return 0;
2140 }
2141
2142
2143 LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)
2144 {
2145 SendMessage(WM_UPDATEOKBUTTON);
2146 return 0;
2147 }
2148
2149 LRESULT CCommitDlg::OnCheck(WPARAM wnd, LPARAM)
2150 {
2151 HWND hwnd = (HWND)wnd;
2152 bool check = !(GetAsyncKeyState(VK_SHIFT) & 0x8000);
2153 if (hwnd == GetDlgItem(IDC_CHECKALL)->GetSafeHwnd())
2154 m_ListCtrl.Check(GITSLC_SHOWEVERYTHING, check);
2155 else if (hwnd == GetDlgItem(IDC_CHECKNONE)->GetSafeHwnd())
2156 m_ListCtrl.Check(GITSLC_SHOWEVERYTHING, !check);
2157 else if (hwnd == GetDlgItem(IDC_CHECKUNVERSIONED)->GetSafeHwnd())
2158 m_ListCtrl.Check(GITSLC_SHOWUNVERSIONED, check);
2159 else if (hwnd == GetDlgItem(IDC_CHECKVERSIONED)->GetSafeHwnd())
2160 m_ListCtrl.Check(GITSLC_SHOWVERSIONED, check);
2161 else if (hwnd == GetDlgItem(IDC_CHECKADDED)->GetSafeHwnd())
2162 m_ListCtrl.Check(GITSLC_SHOWADDED, check);
2163 else if (hwnd == GetDlgItem(IDC_CHECKDELETED)->GetSafeHwnd())
2164 m_ListCtrl.Check(GITSLC_SHOWREMOVED, check);
2165 else if (hwnd == GetDlgItem(IDC_CHECKMODIFIED)->GetSafeHwnd())
2166 m_ListCtrl.Check(GITSLC_SHOWMODIFIED, check);
2167 else if (hwnd == GetDlgItem(IDC_CHECKFILES)->GetSafeHwnd())
2168 m_ListCtrl.Check(GITSLC_SHOWFILES, check);
2169 else if (hwnd == GetDlgItem(IDC_CHECKSUBMODULES)->GetSafeHwnd())
2170 m_ListCtrl.Check(GITSLC_SHOWSUBMODULES, check);
2171
2172 return 0;
2173 }
2174
2175 LRESULT CCommitDlg::OnUpdateOKButton(WPARAM, LPARAM)
2176 {
2177 if (m_bBlock)
2178 return 0;
2179
2180 bool bValidLogSize = m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize && m_cLogMessage.GetText().GetLength() > 0;
2181 bool bAmendOrSelectFilesOrMerge = m_ListCtrl.GetSelected() > 0 || (m_bCommitAmend && m_bAmendDiffToLastCommit) || CTGitPath(g_Git.m_CurrentDir).IsMergeActive();
2182
2183 DialogEnableWindow(IDOK, bValidLogSize && (m_bCommitMessageOnly || bAmendOrSelectFilesOrMerge));
2184
2185 return 0;
2186 }
2187
2188 LRESULT CCommitDlg::OnUpdateDataFalse(WPARAM, LPARAM)
2189 {
2190 UpdateData(FALSE);
2191 return 0;
2192 }
2193
2194 LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
2195 {
2196 switch (message) {
2197 case WM_NOTIFY:
2198 if (wParam == IDC_SPLITTER)
2199 {
2200 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
2201 DoSize(pHdr->delta);
2202 }
2203 break;
2204 }
2205
2206 return __super::DefWindowProc(message, wParam, lParam);
2207 }
2208
2209 void CCommitDlg::SetSplitterRange()
2210 {
2211 if ((m_ListCtrl)&&(m_cLogMessage))
2212 {
2213 CRect rcTop;
2214 m_cLogMessage.GetWindowRect(rcTop);
2215 ScreenToClient(rcTop);
2216 CRect rcMiddle;
2217 m_ListCtrl.GetWindowRect(rcMiddle);
2218 ScreenToClient(rcMiddle);
2219 if (rcMiddle.Height() && rcMiddle.Width())
2220 m_wndSplitter.SetRange(rcTop.top + 100, rcMiddle.bottom - 80);
2221 }
2222 }
2223
2224 void CCommitDlg::DoSize(int delta)
2225 {
2226 RemoveAnchor(IDC_MESSAGEGROUP);
2227 RemoveAnchor(IDC_LOGMESSAGE);
2228 RemoveAnchor(IDC_SPLITTER);
2229 RemoveAnchor(IDC_SIGNOFF);
2230 RemoveAnchor(IDC_COMMIT_AMEND);
2231 RemoveAnchor(IDC_COMMIT_AMENDDIFF);
2232 RemoveAnchor(IDC_COMMIT_SETDATETIME);
2233 RemoveAnchor(IDC_COMMIT_DATEPICKER);
2234 RemoveAnchor(IDC_COMMIT_TIMEPICKER);
2235 RemoveAnchor(IDC_COMMIT_SETAUTHOR);
2236 RemoveAnchor(IDC_COMMIT_AUTHORDATA);
2237 RemoveAnchor(IDC_LISTGROUP);
2238 RemoveAnchor(IDC_FILELIST);
2239 RemoveAnchor(IDC_TEXT_INFO);
2240 RemoveAnchor(IDC_SELECTLABEL);
2241 RemoveAnchor(IDC_CHECKALL);
2242 RemoveAnchor(IDC_CHECKNONE);
2243 RemoveAnchor(IDC_CHECKUNVERSIONED);
2244 RemoveAnchor(IDC_CHECKVERSIONED);
2245 RemoveAnchor(IDC_CHECKADDED);
2246 RemoveAnchor(IDC_CHECKDELETED);
2247 RemoveAnchor(IDC_CHECKMODIFIED);
2248 RemoveAnchor(IDC_CHECKFILES);
2249 RemoveAnchor(IDC_CHECKSUBMODULES);
2250
2251 CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN);
2252 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN);
2253 CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN);
2254 CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN);
2255 CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta);
2256 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND),0,delta);
2257 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMENDDIFF),0,delta);
2258 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_SETDATETIME),0,delta);
2259 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_DATEPICKER),0,delta);
2260 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_TIMEPICKER),0,delta);
2261 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_SETAUTHOR), 0, delta);
2262 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AUTHORDATA), 0, delta);
2263 CSplitterControl::ChangePos(GetDlgItem(IDC_TEXT_INFO),0,delta);
2264 CSplitterControl::ChangePos(GetDlgItem(IDC_SELECTLABEL), 0, delta);
2265 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKALL), 0, delta);
2266 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKNONE), 0, delta);
2267 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKUNVERSIONED), 0, delta);
2268 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKVERSIONED), 0, delta);
2269 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKADDED), 0, delta);
2270 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKDELETED), 0, delta);
2271 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKMODIFIED), 0, delta);
2272 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKFILES), 0, delta);
2273 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKSUBMODULES), 0, delta);
2274
2275 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
2276 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
2277 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
2278 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
2279 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
2280 AddAnchor(IDC_SIGNOFF,TOP_RIGHT);
2281 AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
2282 AddAnchor(IDC_COMMIT_AMENDDIFF,TOP_LEFT);
2283 AddAnchor(IDC_COMMIT_SETDATETIME,TOP_LEFT);
2284 AddAnchor(IDC_COMMIT_DATEPICKER,TOP_LEFT);
2285 AddAnchor(IDC_COMMIT_TIMEPICKER,TOP_LEFT);
2286 AddAnchor(IDC_COMMIT_SETAUTHOR, TOP_LEFT);
2287 AddAnchor(IDC_COMMIT_AUTHORDATA, TOP_LEFT, TOP_RIGHT);
2288 AddAnchor(IDC_TEXT_INFO,TOP_RIGHT);
2289 AddAnchor(IDC_SELECTLABEL, TOP_LEFT);
2290 AddAnchor(IDC_CHECKALL, TOP_LEFT);
2291 AddAnchor(IDC_CHECKNONE, TOP_LEFT);
2292 AddAnchor(IDC_CHECKUNVERSIONED, TOP_LEFT);
2293 AddAnchor(IDC_CHECKVERSIONED, TOP_LEFT);
2294 AddAnchor(IDC_CHECKADDED, TOP_LEFT);
2295 AddAnchor(IDC_CHECKDELETED, TOP_LEFT);
2296 AddAnchor(IDC_CHECKMODIFIED, TOP_LEFT);
2297 AddAnchor(IDC_CHECKFILES, TOP_LEFT);
2298 AddAnchor(IDC_CHECKSUBMODULES, TOP_LEFT);
2299 ArrangeLayout();
2300 // adjust the minimum size of the dialog to prevent the resizing from
2301 // moving the list control too far down.
2302 CRect rcLogMsg;
2303 m_cLogMessage.GetClientRect(rcLogMsg);
2304 SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_LogMsgOrigRect.Height()+rcLogMsg.Height()));
2305
2306 SetSplitterRange();
2307 m_cLogMessage.Invalidate();
2308 GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
2309 }
2310
2311 void CCommitDlg::OnSize(UINT nType, int cx, int cy)
2312 {
2313 // first, let the resizing take place
2314 __super::OnSize(nType, cx, cy);
2315
2316 //set range
2317 SetSplitterRange();
2318 }
2319
2320 CString CCommitDlg::GetSignedOffByLine()
2321 {
2322 CString str;
2323
2324 CString username = g_Git.GetUserName();
2325 CString email = g_Git.GetUserEmail();
2326 username.Remove(_T('\n'));
2327 email.Remove(_T('\n'));
2328
2329 str.Format(_T("Signed-off-by: %s <%s>"), username, email);
2330
2331 return str;
2332 }
2333
2334 void CCommitDlg::OnBnClickedSignOff()
2335 {
2336 CString str = GetSignedOffByLine();
2337
2338 if (m_cLogMessage.GetText().Find(str) == -1) {
2339 m_cLogMessage.SetText(m_cLogMessage.GetText().TrimRight());
2340 int lastNewline = m_cLogMessage.GetText().ReverseFind(_T('\n'));
2341 int foundByLine = -1;
2342 if (lastNewline > 0)
2343 foundByLine = m_cLogMessage.GetText().Find(_T("-by: "), lastNewline);
2344
2345 if (foundByLine == -1 || foundByLine < lastNewline)
2346 str = _T("\r\n") + str;
2347
2348 m_cLogMessage.SetText(m_cLogMessage.GetText()+_T("\r\n")+str+_T("\r\n"));
2349 }
2350 }
2351
2352 void CCommitDlg::OnBnClickedCommitAmend()
2353 {
2354 this->UpdateData();
2355 if(this->m_bCommitAmend && this->m_AmendStr.IsEmpty())
2356 {
2357 GitRev rev;
2358 try
2359 {
2360 rev.GetCommit(CString(_T("HEAD")));
2361 }
2362 catch (const char *msg)
2363 {
2364 CMessageBox::Show(m_hWnd, _T("Could not get HEAD commit.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
2365 }
2366 m_AmendStr=rev.GetSubject()+_T("\n")+rev.GetBody();
2367 }
2368
2369 if(this->m_bCommitAmend)
2370 {
2371 this->m_NoAmendStr=this->m_cLogMessage.GetText();
2372 m_cLogMessage.SetText(m_AmendStr);
2373 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_SHOW);
2374 }
2375 else
2376 {
2377 this->m_AmendStr=this->m_cLogMessage.GetText();
2378 m_cLogMessage.SetText(m_NoAmendStr);
2379 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_HIDE);
2380 }
2381
2382 OnBnClickedCommitSetDateTime(); // to update the commit date and time
2383 OnBnClickedCommitSetauthor(); // to update the commit author
2384
2385 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
2386 Refresh();
2387 }
2388
2389 void CCommitDlg::OnBnClickedCommitMessageOnly()
2390 {
2391 this->UpdateData();
2392 this->m_ListCtrl.EnableWindow(m_bCommitMessageOnly ? FALSE : TRUE);
2393 SendMessage(WM_UPDATEOKBUTTON);
2394 }
2395
2396 void CCommitDlg::OnBnClickedWholeProject()
2397 {
2398 m_tooltips.Pop(); // hide the tooltips
2399 UpdateData();
2400 m_ListCtrl.Clear();
2401 if (!m_bBlock)
2402 {
2403 if (m_bWholeProject || m_bWholeProject2)
2404 m_ListCtrl.GetStatus(NULL,true,false,true);
2405 else
2406 m_ListCtrl.GetStatus(&this->m_pathList,true,false,true);
2407
2408 m_regShowWholeProject = m_bWholeProject;
2409
2410 DWORD dwShow = m_ListCtrl.GetShowFlags();
2411 if (DWORD(m_regAddBeforeCommit))
2412 dwShow |= GITSLC_SHOWUNVERSIONED;
2413 else
2414 dwShow &= ~GITSLC_SHOWUNVERSIONED;
2415
2416 m_ListCtrl.Show(dwShow, dwShow & ~(CTGitPath::LOGACTIONS_UNVER), true);
2417 UpdateCheckLinks();
2418 }
2419
2420 SetDlgTitle();
2421 }
2422
2423 void CCommitDlg::OnFocusMessage()
2424 {
2425 m_cLogMessage.SetFocus();
2426 }
2427
2428 void CCommitDlg::OnFocusFileList()
2429 {
2430 m_ListCtrl.SetFocus();
2431 }
2432
2433 void CCommitDlg::OnScnUpdateUI(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2434 {
2435 int pos = (int)this->m_cLogMessage.Call(SCI_GETCURRENTPOS);
2436 int line = (int)this->m_cLogMessage.Call(SCI_LINEFROMPOSITION,pos);
2437 int column = (int)this->m_cLogMessage.Call(SCI_GETCOLUMN,pos);
2438
2439 CString str;
2440 str.Format(_T("%d/%d"),line+1,column+1);
2441 this->GetDlgItem(IDC_TEXT_INFO)->SetWindowText(str);
2442
2443 if(*pResult)
2444 *pResult=0;
2445 }
2446
2447 void CCommitDlg::TogglePatchView()
2448 {
2449 OnStnClickedViewPatch();
2450 }
2451
2452 void CCommitDlg::OnStnClickedViewPatch()
2453 {
2454 m_patchViewdlg.m_pProjectProperties = &this->m_ProjectProperties;
2455 m_patchViewdlg.m_ParentDlg = this;
2456 if(!IsWindow(this->m_patchViewdlg.m_hWnd))
2457 {
2458 BOOL viewPatchEnabled = FALSE;
2459 viewPatchEnabled = g_Git.GetConfigValueBool(_T("tgit.commitshowpatch"));
2460 if (viewPatchEnabled == FALSE)
2461 g_Git.SetConfigValue(_T("tgit.commitshowpatch"), _T("true"));
2462 m_patchViewdlg.Create(IDD_PATCH_VIEW,this);
2463 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETSCROLLWIDTHTRACKING, TRUE);
2464 CRect rect;
2465 this->GetWindowRect(&rect);
2466
2467 m_patchViewdlg.ShowWindow(SW_SHOW);
2468
2469 m_patchViewdlg.SetWindowPos(NULL,rect.right,rect.top,rect.Width(),rect.Height(),
2470 SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
2471
2472 ShowViewPatchText(false);
2473 FillPatchView();
2474 }
2475 else
2476 {
2477 g_Git.SetConfigValue(_T("tgit.commitshowpatch"), _T("false"));
2478 m_patchViewdlg.ShowWindow(SW_HIDE);
2479 m_patchViewdlg.DestroyWindow();
2480 ShowViewPatchText(true);
2481 }
2482 this->m_ctrlShowPatch.Invalidate();
2483 }
2484
2485 void CCommitDlg::OnMoving(UINT fwSide, LPRECT pRect)
2486 {
2487 __super::OnMoving(fwSide, pRect);
2488
2489 if (::IsWindow(m_patchViewdlg.m_hWnd))
2490 {
2491 RECT patchrect;
2492 m_patchViewdlg.GetWindowRect(&patchrect);
2493 if (::IsWindow(m_hWnd))
2494 {
2495 RECT thisrect;
2496 GetWindowRect(&thisrect);
2497 if (patchrect.left == thisrect.right)
2498 {
2499 m_patchViewdlg.SetWindowPos(NULL, patchrect.left - (thisrect.left - pRect->left), patchrect.top - (thisrect.top - pRect->top),
2500 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
2501 }
2502 }
2503 }
2504
2505 }
2506
2507 void CCommitDlg::OnSizing(UINT fwSide, LPRECT pRect)
2508 {
2509 __super::OnSizing(fwSide, pRect);
2510
2511 if(::IsWindow(this->m_patchViewdlg.m_hWnd))
2512 {
2513 CRect thisrect, patchrect;
2514 this->GetWindowRect(thisrect);
2515 this->m_patchViewdlg.GetWindowRect(patchrect);
2516 if(thisrect.right==patchrect.left)
2517 {
2518 patchrect.left -= (thisrect.right - pRect->right);
2519 patchrect.right-= (thisrect.right - pRect->right);
2520
2521 if( patchrect.bottom == thisrect.bottom)
2522 {
2523 patchrect.bottom -= (thisrect.bottom - pRect->bottom);
2524 }
2525 if( patchrect.top == thisrect.top)
2526 {
2527 patchrect.top -= thisrect.top-pRect->top;
2528 }
2529 m_patchViewdlg.MoveWindow(patchrect);
2530 }
2531 }
2532 }
2533
2534 void CCommitDlg::OnHdnItemchangedFilelist(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2535 {
2536 *pResult = 0;
2537 TRACE("Item Changed\r\n");
2538 }
2539
2540 int CCommitDlg::CheckHeadDetach()
2541 {
2542 CString output;
2543 if (CGit::GetCurrentBranchFromFile(g_Git.m_CurrentDir, output))
2544 {
2545 int retval = CMessageBox::Show(NULL, IDS_PROC_COMMIT_DETACHEDWARNING, IDS_APPNAME, MB_YESNOCANCEL | MB_ICONWARNING);
2546 if(retval == IDYES)
2547 {
2548 if (CAppUtils::CreateBranchTag(FALSE, NULL, true) == FALSE)
2549 return 1;
2550 }
2551 else if (retval == IDCANCEL)
2552 return 1;
2553 }
2554 return 0;
2555 }
2556
2557 void CCommitDlg::OnBnClickedCommitAmenddiff()
2558 {
2559 UpdateData();
2560 Refresh();
2561 }
2562
2563 void CCommitDlg::OnBnClickedNoautoselectsubmodules()
2564 {
2565 UpdateData();
2566 Refresh();
2567 }
2568
2569 void CCommitDlg::OnBnClickedCommitSetDateTime()
2570 {
2571 UpdateData();
2572
2573 if (m_bSetCommitDateTime)
2574 {
2575 CTime authordate = CTime::GetCurrentTime();
2576 if (m_bCommitAmend)
2577 {
2578 GitRev headRevision;
2579 try
2580 {
2581 headRevision.GetCommit(_T("HEAD"));
2582 }
2583 catch (const char *msg)
2584 {
2585 CMessageBox::Show(m_hWnd, _T("Could not get HEAD commit.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
2586 }
2587 authordate = headRevision.GetAuthorDate();
2588 }
2589
2590 m_CommitDate.SetTime(&authordate);
2591 m_CommitTime.SetTime(&authordate);
2592
2593 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_SHOW);
2594 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_SHOW);
2595 }
2596 else
2597 {
2598 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_HIDE);
2599 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_HIDE);
2600 }
2601 }
2602
2603 void CCommitDlg::OnBnClickedCheckNewBranch()
2604 {
2605 UpdateData();
2606 if (m_bCreateNewBranch)
2607 {
2608 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_HIDE);
2609 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_SHOW);
2610 }
2611 else
2612 {
2613 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_HIDE);
2614 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_SHOW);
2615 }
2616 }
2617
2618 void CCommitDlg::RestoreFiles(bool doNotAsk)
2619 {
2620 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))
2621 {
2622 for (std::map<CString, CString>::iterator it = m_ListCtrl.m_restorepaths.begin(); it != m_ListCtrl.m_restorepaths.end(); ++it)
2623 CopyFile(it->second, g_Git.CombinePath(it->first), FALSE);
2624 m_ListCtrl.m_restorepaths.clear();
2625 }
2626 }
2627
2628 void CCommitDlg::UpdateCheckLinks()
2629 {
2630 DialogEnableWindow(IDC_CHECKALL, true);
2631 DialogEnableWindow(IDC_CHECKNONE, true);
2632 DialogEnableWindow(IDC_CHECKUNVERSIONED, m_ListCtrl.GetUnversionedCount() > 0);
2633 DialogEnableWindow(IDC_CHECKVERSIONED, m_ListCtrl.GetItemCount() > m_ListCtrl.GetUnversionedCount());
2634 DialogEnableWindow(IDC_CHECKADDED, m_ListCtrl.GetAddedCount() > 0);
2635 DialogEnableWindow(IDC_CHECKDELETED, m_ListCtrl.GetDeletedCount() > 0);
2636 DialogEnableWindow(IDC_CHECKMODIFIED, m_ListCtrl.GetModifiedCount() > 0);
2637 DialogEnableWindow(IDC_CHECKFILES, m_ListCtrl.GetFileCount() > 0);
2638 DialogEnableWindow(IDC_CHECKSUBMODULES, m_ListCtrl.GetSubmoduleCount() > 0);
2639 }
2640
2641 void CCommitDlg::OnBnClickedCommitSetauthor()
2642 {
2643 UpdateData();
2644
2645 if (m_bSetAuthor)
2646 {
2647 m_sAuthor.Format(_T("%s <%s>"), g_Git.GetUserName(), g_Git.GetUserEmail());
2648 if (m_bCommitAmend)
2649 {
2650 GitRev headRevision;
2651 try
2652 {
2653 headRevision.GetCommit(_T("HEAD"));
2654 }
2655 catch (const char *msg)
2656 {
2657 CMessageBox::Show(m_hWnd, _T("Could not get HEAD commit.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
2658 }
2659 m_sAuthor.Format(_T("%s <%s>"), headRevision.GetAuthorName(), headRevision.GetAuthorEmail());
2660 }
2661
2662 UpdateData(FALSE);
2663
2664 GetDlgItem(IDC_COMMIT_AUTHORDATA)->ShowWindow(SW_SHOW);
2665 }
2666 else
2667 GetDlgItem(IDC_COMMIT_AUTHORDATA)->ShowWindow(SW_HIDE);
2668 }
2669
2670 void CCommitDlg::RunStartCommitHook()
2671 {
2672 DWORD exitcode = 0xFFFFFFFF;
2673 CString error;
2674 if (CHooks::Instance().StartCommit(g_Git.m_CurrentDir, m_pathList, m_sLogMessage, exitcode, error))
2675 {
2676 if (exitcode)
2677 {
2678 CString temp;
2679 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
2680 MessageBox(temp, _T("TortoiseGit"), MB_ICONERROR);
2681 return;
2682 }
2683 }
2684 }
Windows Explorer Extension to Operate Git