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