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