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