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