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