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