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