?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Fixed issue #1472: Commit dialog can amend message only without affecting any files
[TortoiseGit.git] / src / TortoiseProc / CommitDlg.cpp
blob6fcd3d2ecd1594dc7287a3d38a499d2aaa6ba464
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, TOP_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 && sysProgressDlg.IsValid())
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.IsValid())
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.IsValid() && sysProgressDlg.HasUserCancelled())
648 {
649 bAddSuccess = false;
650 break;
651 }
652
653 CShellUpdater::Instance().AddPathForUpdate(*entry);
654 }
655
656 if (sysProgressDlg.IsValid())
657 sysProgressDlg.Stop();
658
659 if (bAddSuccess && m_bCreateNewBranch)
660 {
661 if (g_Git.Run(_T("git branch ") + m_sCreateNewBranch, &out, CP_UTF8))
662 {
663 MessageBox(_T("Creating new branch failed:\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
664 bAddSuccess = false;
665 }
666 if (g_Git.Run(_T("git checkout ") + m_sCreateNewBranch, &out, CP_UTF8))
667 {
668 MessageBox(_T("Switching to new branch failed:\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
669 bAddSuccess = false;
670 }
671 }
672
673 if (bAddSuccess && CheckHeadDetach())
674 bAddSuccess = false;
675
676 m_sBugID.Trim();
677 CString sExistingBugID = m_ProjectProperties.FindBugID(m_sLogMessage);
678 sExistingBugID.Trim();
679 if (!m_sBugID.IsEmpty() && m_sBugID.Compare(sExistingBugID))
680 {
681 m_sBugID.Replace(_T(", "), _T(","));
682 m_sBugID.Replace(_T(" ,"), _T(","));
683 CString sBugID = m_ProjectProperties.sMessage;
684 sBugID.Replace(_T("%BUGID%"), m_sBugID);
685 if (m_ProjectProperties.bAppend)
686 m_sLogMessage += _T("\n") + sBugID + _T("\n");
687 else
688 m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
689 }
690
691 // now let the bugtraq plugin check the commit message
692 CComPtr<IBugTraqProvider2> pProvider2 = NULL;
693 if (m_BugTraqProvider)
694 {
695 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
696 if (SUCCEEDED(hr))
697 {
698 BSTR temp = NULL;
699 CString common = g_Git.m_CurrentDir;
700 BSTR repositoryRoot = common.AllocSysString();
701 BSTR parameters = m_bugtraq_association.GetParameters().AllocSysString();
702 BSTR commonRoot = SysAllocString(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());
703 BSTR commitMessage = m_sLogMessage.AllocSysString();
704 SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_selectedPathList.GetCount());
705
706 for (LONG index = 0; index < m_selectedPathList.GetCount(); ++index)
707 SafeArrayPutElement(pathList, &index, m_selectedPathList[index].GetGitPathString().AllocSysString());
708
709 if (FAILED(hr = pProvider2->CheckCommit(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, commitMessage, &temp)))
710 {
711 COMError ce(hr);
712 CString sErr;
713 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), ce.GetMessageAndDescription().c_str());
714 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
715 }
716 else
717 {
718 CString sError = temp;
719 if (!sError.IsEmpty())
720 {
721 CMessageBox::Show(m_hWnd, sError, _T("TortoiseGit"), MB_ICONERROR);
722 return;
723 }
724 SysFreeString(temp);
725 }
726 }
727 }
728
729 if (m_bCommitMessageOnly || bAddSuccess && (nchecked || m_bCommitAmend || CTGitPath(g_Git.m_CurrentDir).IsMergeActive()))
730 {
731 bCloseCommitDlg = true;
732
733 CString tempfile=::GetTempFile();
734
735 CAppUtils::SaveCommitUnicodeFile(tempfile,m_sLogMessage);
736
737 CTGitPath path=g_Git.m_CurrentDir;
738
739 BOOL IsGitSVN = path.GetAdminDirMask() & ITEMIS_GITSVN;
740
741 out =_T("");
742 CString amend;
743 if(this->m_bCommitAmend)
744 {
745 amend=_T("--amend");
746 }
747 CString dateTime;
748 if (m_bSetCommitDateTime)
749 {
750 CTime date, time;
751 m_CommitDate.GetTime(date);
752 m_CommitTime.GetTime(time);
753 dateTime.Format(_T("--date=%sT%s"), date.Format(_T("%Y-%m-%d")), time.Format(_T("%H:%M:%S")));
754 }
755 CString allowEmpty = m_bCommitMessageOnly ? _T("--allow-empty") : _T("");
756 cmd.Format(_T("git.exe commit %s %s %s -F \"%s\""), dateTime, amend, allowEmpty, tempfile);
757
758 CCommitProgressDlg progress;
759 progress.m_bBufferAll=true; // improve show speed when there are many file added.
760 progress.m_GitCmd=cmd;
761 progress.m_bShowCommand = FALSE; // don't show the commit command
762 progress.m_PreText = out; // show any output already generated in log window
763 progress.m_bAutoCloseOnSuccess = m_bAutoClose;
764
765 int indexReCommit = -1;
766 int indexTag = -1;
767
768 if (!m_bNoPostActions && !m_bAutoClose)
769 {
770 if (IsGitSVN)
771 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUSVNDCOMMIT)));
772 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUPUSH)));
773 indexReCommit = (int)progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_RECOMMIT)));
774 indexTag = (int)progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUTAG)));
775 }
776
777 INT_PTR userResponse = progress.DoModal();
778
779 if(progress.m_GitStatus || userResponse == (IDC_PROGRESS_BUTTON1 + indexReCommit))
780 {
781 bCloseCommitDlg = false;
782 if (userResponse == IDC_PROGRESS_BUTTON1 + indexReCommit)
783 {
784 this->m_sLogMessage.Empty();
785 m_cLogMessage.SetText(m_sLogMessage);
786 }
787
788 m_bCommitAmend = FALSE;
789 UpdateData(FALSE);
790 this->Refresh();
791 }
792 else if (userResponse == IDC_PROGRESS_BUTTON1 + indexTag)
793 {
794 m_bCreateTagAfterCommit=true;
795 }
796 else if (userResponse >= IDC_PROGRESS_BUTTON1 && userResponse < IDC_PROGRESS_BUTTON1 + indexReCommit)
797 {
798 // User pressed 'DCommit' or 'Push' button after successful commit.
799 m_bPushAfterCommit=true;
800 if (userResponse == IDC_PROGRESS_BUTTON1 && IsGitSVN)
801 m_PostCmd = GIT_POST_CMD_DCOMMIT;
802 else
803 m_PostCmd = GIT_POST_CMD_PUSH;
804 }
805
806 CFile::Remove(tempfile);
807
808 if (m_BugTraqProvider && progress.m_GitStatus == 0)
809 {
810 CComPtr<IBugTraqProvider2> pProvider = NULL;
811 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider);
812 if (SUCCEEDED(hr))
813 {
814 BSTR commonRoot = SysAllocString(g_Git.m_CurrentDir);
815 SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0,this->m_selectedPathList.GetCount());
816
817 for (LONG index = 0; index < m_selectedPathList.GetCount(); ++index)
818 SafeArrayPutElement(pathList, &index, m_selectedPathList[index].GetGitPathString().AllocSysString());
819
820 BSTR logMessage = m_sLogMessage.AllocSysString();
821
822 CGitHash hash=g_Git.GetHash(_T("HEAD"));
823 LONG version = g_Git.Hash2int(hash);
824
825 BSTR temp = NULL;
826 if (FAILED(hr = pProvider->OnCommitFinished(GetSafeHwnd(),
827 commonRoot,
828 pathList,
829 logMessage,
830 (LONG)version,
831 &temp)))
832 {
833 CString sErr = temp;
834 if (!sErr.IsEmpty())
835 CMessageBox::Show(NULL,(sErr),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
836 else
837 {
838 COMError ce(hr);
839 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, ce.GetSource().c_str(), ce.GetMessageAndDescription().c_str());
840 CMessageBox::Show(NULL,(sErr),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
841 }
842 }
843
844 SysFreeString(temp);
845 }
846 }
847 RestoreFiles(progress.m_GitStatus == 0);
848 if (((DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit"), TRUE)) == TRUE)
849 {
850 BOOL cancel;
851 mgtReAddAfterCommit.Execute(cancel);
852 }
853 }
854 else if(bAddSuccess)
855 {
856 CMessageBox::Show(this->m_hWnd, IDS_ERROR_NOTHING_COMMIT, IDS_COMMIT_FINISH, MB_OK | MB_ICONINFORMATION);
857 bCloseCommitDlg=false;
858 }
859
860 UpdateData();
861 m_regAddBeforeCommit = m_bShowUnversioned;
862 if (!GetDlgItem(IDC_WHOLE_PROJECT)->IsWindowEnabled())
863 m_bWholeProject = FALSE;
864 m_regKeepChangelists = m_bKeepChangeList;
865 m_regDoNotAutoselectSubmodules = m_bDoNotAutoselectSubmodules;
866 if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())
867 m_bKeepChangeList = FALSE;
868 InterlockedExchange(&m_bBlock, FALSE);
869
870 if (!m_sLogMessage.IsEmpty())
871 {
872 m_History.AddEntry(m_sLogMessage);
873 m_History.Save();
874 }
875
876 SaveSplitterPos();
877
878 if( bCloseCommitDlg )
879 CResizableStandAloneDialog::OnOK();
880
881 CShellUpdater::Instance().Flush();
882 }
883
884 void CCommitDlg::SaveSplitterPos()
885 {
886 if (!IsIconic())
887 {
888 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
889 RECT rectSplitter;
890 m_wndSplitter.GetWindowRect(&rectSplitter);
891 ScreenToClient(&rectSplitter);
892 regPos = rectSplitter.top;
893 }
894 }
895
896 UINT CCommitDlg::StatusThreadEntry(LPVOID pVoid)
897 {
898 return ((CCommitDlg*)pVoid)->StatusThread();
899 }
900
901 UINT CCommitDlg::StatusThread()
902 {
903 //get the status of all selected file/folders recursively
904 //and show the ones which have to be committed to the user
905 //in a list control.
906 InterlockedExchange(&m_bBlock, TRUE);
907 InterlockedExchange(&m_bThreadRunning, TRUE);// so the main thread knows that this thread is still running
908 InterlockedExchange(&m_bRunThread, TRUE); // if this is set to FALSE, the thread should stop
909
910 m_pathwatcher.Stop();
911
912 g_Git.RefreshGitIndex();
913
914 m_bCancelled = false;
915
916 DialogEnableWindow(IDOK, false);
917 DialogEnableWindow(IDC_SHOWUNVERSIONED, false);
918 DialogEnableWindow(IDC_WHOLE_PROJECT, false);
919 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES, false);
920 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_HIDE);
921 DialogEnableWindow(IDC_EXTERNALWARNING, false);
922 DialogEnableWindow(IDC_COMMIT_AMEND, FALSE);
923 DialogEnableWindow(IDC_COMMIT_AMENDDIFF, FALSE);
924 // read the list of recent log entries before querying the WC for status
925 // -> the user may select one and modify / update it while we are crawling the WC
926
927 DialogEnableWindow(IDC_CHECKALL, false);
928 DialogEnableWindow(IDC_CHECKNONE, false);
929 DialogEnableWindow(IDC_CHECKUNVERSIONED, false);
930 DialogEnableWindow(IDC_CHECKVERSIONED, false);
931 DialogEnableWindow(IDC_CHECKADDED, false);
932 DialogEnableWindow(IDC_CHECKDELETED, false);
933 DialogEnableWindow(IDC_CHECKMODIFIED, false);
934 DialogEnableWindow(IDC_CHECKFILES, false);
935 DialogEnableWindow(IDC_CHECKSUBMODULES, false);
936
937 if (m_History.GetCount()==0)
938 {
939 CString reg;
940 reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);
941 reg.Replace(_T(':'),_T('_'));
942 m_History.Load(reg, _T("logmsgs"));
943 }
944
945 // Initialise the list control with the status of the files/folders below us
946 m_ListCtrl.Clear();
947 BOOL success;
948 CTGitPathList *pList;
949 m_ListCtrl.m_amend = (m_bCommitAmend==TRUE || m_bForceCommitAmend) && (m_bAmendDiffToLastCommit==FALSE);
950 m_ListCtrl.m_bDoNotAutoselectSubmodules = (m_bDoNotAutoselectSubmodules == TRUE);
951
952 if(m_bWholeProject)
953 pList=NULL;
954 else
955 pList = &m_pathList;
956
957 success=m_ListCtrl.GetStatus(pList);
958
959 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
960 if(this->m_bShowUnversioned)
961 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER,true,pList);
962
963 m_ListCtrl.CheckIfChangelistsArePresent(false);
964
965 DWORD dwShow = GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GITSLC_SHOWLOCKS | GITSLC_SHOWINCHANGELIST;
966 dwShow |= DWORD(m_regAddBeforeCommit) ? GITSLC_SHOWUNVERSIONED : 0;
967 if (success)
968 {
969 if (m_checkedPathList.GetCount())
970 m_ListCtrl.Show(dwShow, m_checkedPathList);
971 else
972 {
973 DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;
974 dwCheck &=~(CTGitPath::LOGACTIONS_UNVER); //don't check unversion file default.
975 m_ListCtrl.Show(dwShow, dwCheck);
976 m_bSelectFilesForCommit = true;
977 }
978
979 if (m_ListCtrl.HasExternalsFromDifferentRepos())
980 {
981 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);
982 DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);
983 }
984
985 SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());
986 m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());
987 }
988 if (!success)
989 {
990 if (!m_ListCtrl.GetLastErrorMessage().IsEmpty())
991 m_ListCtrl.SetEmptyString(m_ListCtrl.GetLastErrorMessage());
992 m_ListCtrl.Show(dwShow);
993 }
994
995 CString dotGitPath;
996 g_GitAdminDir.GetAdminDirPath(g_Git.m_CurrentDir, dotGitPath);
997 if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems())
998 && !PathFileExists(dotGitPath + _T("MERGE_HEAD")))
999 {
1000 CString temp;
1001 temp.LoadString(IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED);
1002 if (CMessageBox::ShowCheck(m_hWnd, temp, _T("TortoiseGit"), MB_ICONINFORMATION | MB_YESNO, _T("NothingToCommitShowUnversioned"), NULL)==IDYES)
1003 {
1004 m_bShowUnversioned = TRUE;
1005 GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);
1006 DWORD dwShow = (DWORD)(GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GITSLC_SHOWUNVERSIONED | GITSLC_SHOWLOCKS);
1007 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);
1008 m_ListCtrl.Show(dwShow,dwShow&(~CTGitPath::LOGACTIONS_UNVER));
1009 }
1010 }
1011
1012 SetDlgTitle();
1013
1014 m_autolist.clear();
1015 // we don't have to block the commit dialog while we fetch the
1016 // auto completion list.
1017 m_pathwatcher.ClearChangedPaths();
1018 InterlockedExchange(&m_bBlock, FALSE);
1019 if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE)==TRUE)
1020 {
1021 m_ListCtrl.Block(TRUE, TRUE);
1022 GetAutocompletionList();
1023 m_ListCtrl.Block(FALSE, FALSE);
1024 }
1025 SendMessage(WM_UPDATEOKBUTTON);
1026 if (m_bRunThread)
1027 {
1028 DialogEnableWindow(IDC_SHOWUNVERSIONED, true);
1029 DialogEnableWindow(IDC_WHOLE_PROJECT, true);
1030 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES, true);
1031 if (m_ListCtrl.HasChangeLists())
1032 DialogEnableWindow(IDC_KEEPLISTS, true);
1033 if (m_ListCtrl.HasLocks())
1034 DialogEnableWindow(IDC_WHOLE_PROJECT, true);
1035
1036 // activate amend checkbox (if necessary)
1037 if (g_Git.IsInitRepos())
1038 {
1039 m_bCommitAmend = FALSE;
1040 UpdateData(FALSE);
1041 }
1042 else
1043 {
1044 if (m_bForceCommitAmend)
1045 {
1046 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_SHOW);
1047 m_bCommitAmend = TRUE;
1048 UpdateData(FALSE);
1049 }
1050 else
1051 GetDlgItem(IDC_COMMIT_AMEND)->EnableWindow(TRUE);
1052
1053 CGitHash hash;
1054 try
1055 {
1056 hash = g_Git.GetHash(_T("HEAD"));
1057 }
1058 catch (char* msg)
1059 {
1060 CString err(msg);
1061 MessageBox(_T("Could not get HEAD hash.\nlibgit reports:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
1062 }
1063 if (!hash.IsEmpty())
1064 {
1065 GitRev headRevision;
1066 try
1067 {
1068 headRevision.GetParentFromHash(hash);
1069 }
1070 catch (char* msg)
1071 {
1072 CString err(msg);
1073 MessageBox(_T("Could not get parent from HEAD.\nlibgit reports:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
1074 }
1075 // do not allow to show diff to "last" revision if it has more that one parent
1076 if (headRevision.ParentsCount() != 1)
1077 {
1078 m_bAmendDiffToLastCommit = true;
1079 UpdateData(FALSE);
1080 }
1081 else
1082 GetDlgItem(IDC_COMMIT_AMENDDIFF)->EnableWindow(TRUE);
1083 }
1084 }
1085
1086 UpdateCheckLinks();
1087
1088 // we have the list, now signal the main thread about it
1089 SendMessage(WM_AUTOLISTREADY); // only send the message if the thread wasn't told to quit!
1090 }
1091
1092 InterlockedExchange(&m_bRunThread, FALSE);
1093 InterlockedExchange(&m_bThreadRunning, FALSE);
1094 // force the cursor to normal
1095 RefreshCursor();
1096
1097 return 0;
1098 }
1099
1100 void CCommitDlg::SetDlgTitle()
1101 {
1102 if (m_sTitle.IsEmpty())
1103 GetWindowText(m_sTitle);
1104
1105 if (m_bWholeProject)
1106 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, m_sTitle);
1107 else
1108 {
1109 if (m_pathList.GetCount() == 1)
1110 CAppUtils::SetWindowTitle(m_hWnd, (g_Git.m_CurrentDir + _T("\\") + m_pathList[0].GetUIPathString()).TrimRight('\\'), m_sTitle);
1111 else
1112 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir + _T("\\") + m_ListCtrl.GetCommonDirectory(false), m_sTitle);
1113 }
1114 }
1115
1116 void CCommitDlg::OnCancel()
1117 {
1118 m_bCancelled = true;
1119 m_pathwatcher.Stop();
1120
1121 if (m_bThreadRunning)
1122 {
1123 InterlockedExchange(&m_bRunThread, FALSE);
1124 WaitForSingleObject(m_pThread->m_hThread, 1000);
1125 if (m_bThreadRunning)
1126 {
1127 // we gave the thread a chance to quit. Since the thread didn't
1128 // listen to us we have to kill it.
1129 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
1130 InterlockedExchange(&m_bThreadRunning, FALSE);
1131 }
1132 }
1133 UpdateData();
1134 m_sBugID.Trim();
1135 m_sLogMessage = m_cLogMessage.GetText();
1136 if (!m_sBugID.IsEmpty())
1137 {
1138 m_sBugID.Replace(_T(", "), _T(","));
1139 m_sBugID.Replace(_T(" ,"), _T(","));
1140 CString sBugID = m_ProjectProperties.sMessage;
1141 sBugID.Replace(_T("%BUGID%"), m_sBugID);
1142 if (m_ProjectProperties.bAppend)
1143 m_sLogMessage += _T("\n") + sBugID + _T("\n");
1144 else
1145 m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
1146 }
1147 if ((m_ProjectProperties.sLogTemplate.Compare(m_sLogMessage) != 0) && !m_sLogMessage.IsEmpty())
1148 {
1149 m_History.AddEntry(m_sLogMessage);
1150 m_History.Save();
1151 }
1152 RestoreFiles();
1153 SaveSplitterPos();
1154 CResizableStandAloneDialog::OnCancel();
1155 }
1156
1157 BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)
1158 {
1159 if (!m_bBlock)
1160 m_tooltips.RelayEvent(pMsg);
1161
1162 if (m_hAccel)
1163 {
1164 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
1165 if (ret)
1166 return TRUE;
1167 }
1168
1169 if (pMsg->message == WM_KEYDOWN)
1170 {
1171 switch (pMsg->wParam)
1172 {
1173 case VK_F5:
1174 {
1175 if (m_bBlock)
1176 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
1177 Refresh();
1178 }
1179 break;
1180 case VK_RETURN:
1181 {
1182 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
1183 {
1184 if ( GetDlgItem(IDOK)->IsWindowEnabled() )
1185 {
1186 PostMessage(WM_COMMAND, IDOK);
1187 }
1188 return TRUE;
1189 }
1190 if ( GetFocus()==GetDlgItem(IDC_BUGID) )
1191 {
1192 // Pressing RETURN in the bug id control
1193 // moves the focus to the message
1194 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
1195 return TRUE;
1196 }
1197 }
1198 break;
1199 }
1200 }
1201
1202 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
1203 }
1204
1205 void CCommitDlg::Refresh()
1206 {
1207 if (m_bThreadRunning)
1208 return;
1209
1210 InterlockedExchange(&m_bBlock, TRUE);
1211 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
1212 if (m_pThread==NULL)
1213 {
1214 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
1215 InterlockedExchange(&m_bBlock, FALSE);
1216 }
1217 else
1218 {
1219 m_pThread->m_bAutoDelete = FALSE;
1220 m_pThread->ResumeThread();
1221 }
1222 }
1223
1224 void CCommitDlg::OnBnClickedHelp()
1225 {
1226 OnHelp();
1227 }
1228
1229 void CCommitDlg::OnBnClickedShowunversioned()
1230 {
1231 m_tooltips.Pop(); // hide the tooltips
1232 UpdateData();
1233 m_regAddBeforeCommit = m_bShowUnversioned;
1234 if (!m_bBlock)
1235 {
1236 DWORD dwShow = m_ListCtrl.GetShowFlags();
1237 if (DWORD(m_regAddBeforeCommit))
1238 dwShow |= GITSLC_SHOWUNVERSIONED;
1239 else
1240 dwShow &= ~GITSLC_SHOWUNVERSIONED;
1241 if(dwShow & GITSLC_SHOWUNVERSIONED)
1242 {
1243 if(m_bWholeProject)
1244 m_ListCtrl.GetStatus(NULL,false,false,true);
1245 else
1246 m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);
1247 }
1248 m_ListCtrl.Show(dwShow, 0, true, dwShow & ~(CTGitPath::LOGACTIONS_UNVER), true);
1249 UpdateCheckLinks();
1250 }
1251 }
1252
1253 void CCommitDlg::OnStnClickedExternalwarning()
1254 {
1255 m_tooltips.Popup();
1256 }
1257
1258 void CCommitDlg::OnEnChangeLogmessage()
1259 {
1260 SendMessage(WM_UPDATEOKBUTTON);
1261 }
1262
1263 LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)
1264 {
1265 #if 0
1266 if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))
1267 {
1268 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
1269 {
1270 m_bShowUnversioned = TRUE;
1271 DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;
1272 m_ListCtrl.Show(dwShow);
1273 UpdateData(FALSE);
1274 }
1275 }
1276 #endif
1277 return 0;
1278 }
1279
1280 LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
1281 {
1282 Refresh();
1283 return 0;
1284 }
1285
1286 LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM /*lParam*/)
1287 {
1288 #if 0
1289 BringWindowToTop();
1290 SetForegroundWindow();
1291 SetActiveWindow();
1292 // if multiple files/folders are dropped
1293 // this handler is called for every single item
1294 // separately.
1295 // To avoid creating multiple refresh threads and
1296 // causing crashes, we only add the items to the
1297 // list control and start a timer.
1298 // When the timer expires, we start the refresh thread,
1299 // but only if it isn't already running - otherwise we
1300 // restart the timer.
1301 CTGitPath path;
1302 path.SetFromWin((LPCTSTR)lParam);
1303
1304 // just add all the items we get here.
1305 // if the item is versioned, the add will fail but nothing
1306 // more will happen.
1307 Git Git;
1308 Git.Add(CTGitPathList(path), &m_ProjectProperties, Git_depth_empty, false, true, true);
1309
1310 if (!m_ListCtrl.HasPath(path))
1311 {
1312 if (m_pathList.AreAllPathsFiles())
1313 {
1314 m_pathList.AddPath(path);
1315 m_pathList.RemoveDuplicates();
1316 m_updatedPathList.AddPath(path);
1317 m_updatedPathList.RemoveDuplicates();
1318 }
1319 else
1320 {
1321 // if the path list contains folders, we have to check whether
1322 // our just (maybe) added path is a child of one of those. If it is
1323 // a child of a folder already in the list, we must not add it. Otherwise
1324 // that path could show up twice in the list.
1325 bool bHasParentInList = false;
1326 for (int i=0; i<m_pathList.GetCount(); ++i)
1327 {
1328 if (m_pathList[i].IsAncestorOf(path))
1329 {
1330 bHasParentInList = true;
1331 break;
1332 }
1333 }
1334 if (!bHasParentInList)
1335 {
1336 m_pathList.AddPath(path);
1337 m_pathList.RemoveDuplicates();
1338 m_updatedPathList.AddPath(path);
1339 m_updatedPathList.RemoveDuplicates();
1340 }
1341 }
1342 }
1343
1344 // Always start the timer, since the status of an existing item might have changed
1345 SetTimer(REFRESHTIMER, 200, NULL);
1346 ATLTRACE(_T("Item %s dropped, timer started\n"), path.GetWinPath());
1347 #endif
1348 return 0;
1349 }
1350
1351 LRESULT CCommitDlg::OnAutoListReady(WPARAM, LPARAM)
1352 {
1353 m_cLogMessage.SetAutoCompletionList(m_autolist, '*');
1354 return 0;
1355 }
1356
1357 //////////////////////////////////////////////////////////////////////////
1358 // functions which run in the status thread
1359 //////////////////////////////////////////////////////////////////////////
1360
1361 void CCommitDlg::ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex)
1362 {
1363 CString strLine;
1364 try
1365 {
1366 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
1367 while (m_bRunThread && file.ReadString(strLine))
1368 {
1369 int eqpos = strLine.Find('=');
1370 CString rgx;
1371 rgx = strLine.Mid(eqpos+1).Trim();
1372
1373 int pos = -1;
1374 while (((pos = strLine.Find(','))>=0)&&(pos < eqpos))
1375 {
1376 mapRegex[strLine.Left(pos)] = rgx;
1377 strLine = strLine.Mid(pos+1).Trim();
1378 }
1379 mapRegex[strLine.Left(strLine.Find('=')).Trim()] = rgx;
1380 }
1381 file.Close();
1382 }
1383 catch (CFileException* pE)
1384 {
1385 TRACE("CFileException loading auto list regex file\n");
1386 pE->Delete();
1387 return;
1388 }
1389 }
1390 void CCommitDlg::GetAutocompletionList()
1391 {
1392 // the auto completion list is made of strings from each selected files.
1393 // the strings used are extracted from the files with regexes found
1394 // in the file "autolist.txt".
1395 // the format of that file is:
1396 // file extensions separated with commas '=' regular expression to use
1397 // example:
1398 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
1399 // .cpp = (?<=[^\s]::)\b\w+\b
1400
1401 std::map<CString, CString> mapRegex;
1402 CString sRegexFile = CPathUtils::GetAppDirectory();
1403 CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);
1404 DWORD timeoutvalue = regtimeout*1000;
1405 sRegexFile += _T("autolist.txt");
1406 if (!m_bRunThread)
1407 return;
1408 ParseRegexFile(sRegexFile, mapRegex);
1409 SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sRegexFile.GetBuffer(MAX_PATH+1));
1410 sRegexFile.ReleaseBuffer();
1411 sRegexFile += _T("\\TortoiseGit\\autolist.txt");
1412 if (PathFileExists(sRegexFile))
1413 {
1414 ParseRegexFile(sRegexFile, mapRegex);
1415 }
1416 DWORD starttime = GetTickCount();
1417
1418 // now we have two arrays of strings, where the first array contains all
1419 // file extensions we can use and the second the corresponding regex strings
1420 // to apply to those files.
1421
1422 // the next step is to go over all files shown in the commit dialog
1423 // and scan them for strings we can use
1424 int nListItems = m_ListCtrl.GetItemCount();
1425
1426 for (int i=0; i<nListItems && m_bRunThread; ++i)
1427 {
1428 // stop parsing after timeout
1429 if ((!m_bRunThread) || (GetTickCount() - starttime > timeoutvalue))
1430 return;
1431
1432 CTGitPath *path = (CTGitPath*)m_ListCtrl.GetItemData(i);
1433
1434 if(path == NULL)
1435 continue;
1436
1437 CString sPartPath =path->GetGitPathString();
1438 m_autolist.insert(sPartPath);
1439
1440 // const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);
1441 // if (!entry)
1442 // continue;
1443
1444 // add the path parts to the auto completion list too
1445 // CString sPartPath = entry->GetRelativeGitPath();
1446 // m_autolist.insert(sPartPath);
1447
1448
1449 int pos = 0;
1450 int lastPos = 0;
1451 while ((pos = sPartPath.Find('/', pos)) >= 0)
1452 {
1453 pos++;
1454 lastPos = pos;
1455 m_autolist.insert(sPartPath.Mid(pos));
1456 }
1457
1458 // Last inserted entry is a file name.
1459 // Some users prefer to also list file name without extension.
1460 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE))
1461 {
1462 int dotPos = sPartPath.ReverseFind('.');
1463 if ((dotPos >= 0) && (dotPos > lastPos))
1464 m_autolist.insert(sPartPath.Mid(lastPos, dotPos - lastPos));
1465 }
1466 #if 0
1467 if ((entry->status <= Git_wc_status_normal)||(entry->status == Git_wc_status_ignored))
1468 continue;
1469
1470 CString sExt = entry->GetPath().GetFileExtension();
1471 sExt.MakeLower();
1472 // find the regex string which corresponds to the file extension
1473 CString rdata = mapRegex[sExt];
1474 if (rdata.IsEmpty())
1475 continue;
1476
1477 ScanFile(entry->GetPath().GetWinPathString(), rdata);
1478 if ((entry->textstatus != Git_wc_status_unversioned) &&
1479 (entry->textstatus != Git_wc_status_none) &&
1480 (entry->textstatus != Git_wc_status_ignored) &&
1481 (entry->textstatus != Git_wc_status_added) &&
1482 (entry->textstatus != Git_wc_status_normal))
1483 {
1484 CTGitPath basePath = Git::GetPristinePath(entry->GetPath());
1485 if (!basePath.IsEmpty())
1486 ScanFile(basePath.GetWinPathString(), rdata);
1487 }
1488 #endif
1489 }
1490 ATLTRACE(_T("Auto completion list loaded in %d msec\n"), GetTickCount() - starttime);
1491 }
1492
1493 void CCommitDlg::ScanFile(const CString& sFilePath, const CString& sRegex)
1494 {
1495 wstring sFileContent;
1496 HANDLE hFile = CreateFile(sFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);
1497 if (hFile != INVALID_HANDLE_VALUE)
1498 {
1499 DWORD size = GetFileSize(hFile, NULL);
1500 if (size > 1000000L)
1501 {
1502 // no files bigger than 1 Meg
1503 CloseHandle(hFile);
1504 return;
1505 }
1506 // allocate memory to hold file contents
1507 char * buffer = new char[size];
1508 DWORD readbytes;
1509 ReadFile(hFile, buffer, size, &readbytes, NULL);
1510 CloseHandle(hFile);
1511 int opts = 0;
1512 IsTextUnicode(buffer, readbytes, &opts);
1513 if (opts & IS_TEXT_UNICODE_NULL_BYTES)
1514 {
1515 delete [] buffer;
1516 return;
1517 }
1518 if (opts & IS_TEXT_UNICODE_UNICODE_MASK)
1519 {
1520 sFileContent = wstring((wchar_t*)buffer, readbytes/sizeof(WCHAR));
1521 }
1522 if ((opts & IS_TEXT_UNICODE_NOT_UNICODE_MASK)||(opts == 0))
1523 {
1524 int ret = MultiByteToWideChar(CP_UTF8, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, NULL, 0);
1525 wchar_t * pWideBuf = new wchar_t[ret];
1526 int ret2 = MultiByteToWideChar(CP_UTF8, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, pWideBuf, ret);
1527 if (ret2 == ret)
1528 sFileContent = wstring(pWideBuf, ret);
1529 delete [] pWideBuf;
1530 }
1531 delete [] buffer;
1532 }
1533 if (sFileContent.empty()|| !m_bRunThread)
1534 {
1535 return;
1536 }
1537
1538 try
1539 {
1540 const tr1::wregex regCheck(sRegex, tr1::regex_constants::icase | tr1::regex_constants::ECMAScript);
1541 const tr1::wsregex_iterator end;
1542 wstring s = sFileContent;
1543 for (tr1::wsregex_iterator it(s.begin(), s.end(), regCheck); it != end; ++it)
1544 {
1545 const tr1::wsmatch match = *it;
1546 for (size_t i=1; i<match.size(); ++i)
1547 {
1548 if (match[i].second-match[i].first)
1549 {
1550 ATLTRACE(_T("matched keyword : %s\n"), wstring(match[i]).c_str());
1551 m_autolist.insert(wstring(match[i]).c_str());
1552 }
1553 }
1554 }
1555 }
1556 catch (exception) {}
1557 }
1558
1559 // CSciEditContextMenuInterface
1560 void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
1561 {
1562 CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));
1563 m_nPopupPasteListCmd = nCmd++;
1564 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);
1565
1566 //CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));
1567 if(m_History.GetCount() > 0)
1568 {
1569 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);
1570 m_nPopupPasteLastMessage = nCmd++;
1571 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);
1572
1573 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY);
1574 m_nPopupRecentMessage = nCmd++;
1575 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupRecentMessage, sMenuItemText);
1576
1577 }
1578
1579 }
1580
1581 bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
1582 {
1583
1584 if (m_bBlock)
1585 return false;
1586 if (cmd == m_nPopupPasteListCmd)
1587 {
1588 CString logmsg;
1589 int nListItems = m_ListCtrl.GetItemCount();
1590 for (int i=0; i<nListItems; ++i)
1591 {
1592 CTGitPath * entry = (CTGitPath*)m_ListCtrl.GetItemData(i);
1593 if (entry&&entry->m_Checked)
1594 {
1595 CString line;
1596 CString status = entry->GetActionName();
1597 if(entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
1598 status = _T("Add"); // I18N TODO
1599
1600 //git_wc_status_kind status = entry->status;
1601 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1602 if (m_ProjectProperties.bFileListInEnglish)
1603 langID = 1033;
1604
1605 line.Format(_T("%-10s %s\r\n"),status , (LPCTSTR)m_ListCtrl.GetItemText(i,0));
1606 logmsg += line;
1607 }
1608 }
1609 pSciEdit->InsertText(logmsg);
1610 return true;
1611 }
1612
1613 if(cmd == m_nPopupPasteLastMessage)
1614 {
1615 if(m_History.GetCount() ==0 )
1616 return false;
1617
1618 CString logmsg;
1619 logmsg +=m_History.GetEntry(0);
1620 pSciEdit->InsertText(logmsg);
1621 return true;
1622 }
1623
1624 if(cmd == m_nPopupRecentMessage )
1625 {
1626 OnBnClickedHistory();
1627 return true;
1628 }
1629 return false;
1630 }
1631
1632 void CCommitDlg::OnTimer(UINT_PTR nIDEvent)
1633 {
1634 switch (nIDEvent)
1635 {
1636 case ENDDIALOGTIMER:
1637 KillTimer(ENDDIALOGTIMER);
1638 EndDialog(0);
1639 break;
1640 case REFRESHTIMER:
1641 if (m_bThreadRunning)
1642 {
1643 SetTimer(REFRESHTIMER, 200, NULL);
1644 ATLTRACE("Wait some more before refreshing\n");
1645 }
1646 else
1647 {
1648 KillTimer(REFRESHTIMER);
1649 ATLTRACE("Refreshing after items dropped\n");
1650 Refresh();
1651 }
1652 break;
1653 }
1654 __super::OnTimer(nIDEvent);
1655 }
1656
1657 void CCommitDlg::OnBnClickedHistory()
1658 {
1659 m_tooltips.Pop(); // hide the tooltips
1660 if (m_pathList.GetCount() == 0)
1661 return;
1662
1663 CHistoryDlg historyDlg;
1664 historyDlg.SetHistory(m_History);
1665 if (historyDlg.DoModal() != IDOK)
1666 return;
1667
1668 CString sMsg = historyDlg.GetSelectedText();
1669 if (sMsg != m_cLogMessage.GetText().Left(sMsg.GetLength()))
1670 {
1671 CString sBugID = m_ProjectProperties.FindBugID(sMsg);
1672 if ((!sBugID.IsEmpty()) && ((GetDlgItem(IDC_BUGID)->IsWindowVisible())))
1673 {
1674 SetDlgItemText(IDC_BUGID, sBugID);
1675 }
1676 if (m_ProjectProperties.sLogTemplate.Compare(m_cLogMessage.GetText())!=0)
1677 m_cLogMessage.InsertText(sMsg, !m_cLogMessage.GetText().IsEmpty());
1678 else
1679 m_cLogMessage.SetText(sMsg);
1680 }
1681
1682 SendMessage(WM_UPDATEOKBUTTON);
1683 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
1684
1685 }
1686
1687 void CCommitDlg::OnBnClickedBugtraqbutton()
1688 {
1689 m_tooltips.Pop(); // hide the tooltips
1690 CString sMsg = m_cLogMessage.GetText();
1691
1692 if (m_BugTraqProvider == NULL)
1693 return;
1694
1695 BSTR parameters = m_bugtraq_association.GetParameters().AllocSysString();
1696 BSTR commonRoot = SysAllocString(g_Git.m_CurrentDir);
1697 SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_pathList.GetCount());
1698
1699 for (LONG index = 0; index < m_pathList.GetCount(); ++index)
1700 SafeArrayPutElement(pathList, &index, m_pathList[index].GetGitPathString().AllocSysString());
1701
1702 BSTR originalMessage = sMsg.AllocSysString();
1703 BSTR temp = NULL;
1704 // m_revProps.clear();
1705
1706 // first try the IBugTraqProvider2 interface
1707 CComPtr<IBugTraqProvider2> pProvider2 = NULL;
1708 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
1709 bool bugIdOutSet = false;
1710 if (SUCCEEDED(hr))
1711 {
1712 //CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();
1713 BSTR repositoryRoot = g_Git.m_CurrentDir.AllocSysString();
1714 BSTR bugIDOut = NULL;
1715 GetDlgItemText(IDC_BUGID, m_sBugID);
1716 BSTR bugID = m_sBugID.AllocSysString();
1717 SAFEARRAY * revPropNames = NULL;
1718 SAFEARRAY * revPropValues = NULL;
1719 if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, bugID, &bugIDOut, &revPropNames, &revPropValues, &temp)))
1720 {
1721 CString sErr;
1722 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
1723 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
1724 }
1725 else
1726 {
1727 if (bugIDOut)
1728 {
1729 bugIdOutSet = true;
1730 m_sBugID = bugIDOut;
1731 SysFreeString(bugIDOut);
1732 SetDlgItemText(IDC_BUGID, m_sBugID);
1733 }
1734 SysFreeString(bugID);
1735 SysFreeString(repositoryRoot);
1736 m_cLogMessage.SetText(temp);
1737 BSTR HUGEP *pbRevNames;
1738 BSTR HUGEP *pbRevValues;
1739
1740 HRESULT hr1 = SafeArrayAccessData(revPropNames, (void HUGEP**)&pbRevNames);
1741 if (SUCCEEDED(hr1))
1742 {
1743 HRESULT hr2 = SafeArrayAccessData(revPropValues, (void HUGEP**)&pbRevValues);
1744 if (SUCCEEDED(hr2))
1745 {
1746 if (revPropNames->rgsabound->cElements == revPropValues->rgsabound->cElements)
1747 {
1748 for (ULONG i = 0; i < revPropNames->rgsabound->cElements; i++)
1749 {
1750 // m_revProps[pbRevNames[i]] = pbRevValues[i];
1751 }
1752 }
1753 SafeArrayUnaccessData(revPropValues);
1754 }
1755 SafeArrayUnaccessData(revPropNames);
1756 }
1757 if (revPropNames)
1758 SafeArrayDestroy(revPropNames);
1759 if (revPropValues)
1760 SafeArrayDestroy(revPropValues);
1761 }
1762 }
1763 else
1764 {
1765 // if IBugTraqProvider2 failed, try IBugTraqProvider
1766 CComPtr<IBugTraqProvider> pProvider = NULL;
1767 hr = m_BugTraqProvider.QueryInterface(&pProvider);
1768 if (FAILED(hr))
1769 {
1770 CString sErr;
1771 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
1772 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
1773 return;
1774 }
1775
1776 if (FAILED(hr = pProvider->GetCommitMessage(GetSafeHwnd(), parameters, commonRoot, pathList, originalMessage, &temp)))
1777 {
1778 CString sErr;
1779 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
1780 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
1781 }
1782 else
1783 m_cLogMessage.SetText(temp);
1784 }
1785 m_sLogMessage = m_cLogMessage.GetText();
1786 if (!m_ProjectProperties.sMessage.IsEmpty())
1787 {
1788 CString sBugID = m_ProjectProperties.FindBugID(m_sLogMessage);
1789 if (!sBugID.IsEmpty() && !bugIdOutSet)
1790 {
1791 SetDlgItemText(IDC_BUGID, sBugID);
1792 }
1793 }
1794
1795 m_cLogMessage.SetFocus();
1796
1797 SysFreeString(parameters);
1798 SysFreeString(commonRoot);
1799 SafeArrayDestroy(pathList);
1800 SysFreeString(originalMessage);
1801 SysFreeString(temp);
1802 }
1803
1804 void CCommitDlg::FillPatchView()
1805 {
1806 if(::IsWindow(this->m_patchViewdlg.m_hWnd))
1807 {
1808 m_patchViewdlg.m_ctrlPatchView.SetText(CString());
1809
1810 POSITION pos=m_ListCtrl.GetFirstSelectedItemPosition();
1811 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETREADONLY, FALSE);
1812 CString cmd,out;
1813
1814 while(pos)
1815 {
1816 int nSelect = m_ListCtrl.GetNextSelectedItem(pos);
1817 CTGitPath * p=(CTGitPath*)m_ListCtrl.GetItemData(nSelect);
1818 if(p && !(p->m_Action&CTGitPath::LOGACTIONS_UNVER) )
1819 {
1820 CString head = _T("HEAD");
1821 if(m_bCommitAmend==TRUE && m_bAmendDiffToLastCommit==FALSE)
1822 head = _T("HEAD~1");
1823 cmd.Format(_T("git.exe diff %s -- \"%s\""), head, p->GetGitPathString());
1824 g_Git.Run(cmd, &out, CP_UTF8);
1825 }
1826 }
1827
1828 m_patchViewdlg.m_ctrlPatchView.SetText(out);
1829 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETREADONLY, TRUE);
1830 m_patchViewdlg.m_ctrlPatchView.Call(SCI_GOTOPOS, 0);
1831 CRect rect;
1832 m_patchViewdlg.m_ctrlPatchView.GetClientRect(rect);
1833 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETSCROLLWIDTH, rect.Width() - 4);
1834 }
1835 }
1836 LRESULT CCommitDlg::OnGitStatusListCtrlItemChanged(WPARAM /*wparam*/, LPARAM /*lparam*/)
1837 {
1838 this->FillPatchView();
1839 return 0;
1840 }
1841
1842
1843 LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)
1844 {
1845 SendMessage(WM_UPDATEOKBUTTON);
1846 return 0;
1847 }
1848
1849 LRESULT CCommitDlg::OnCheck(WPARAM wnd, LPARAM)
1850 {
1851 HWND hwnd = (HWND)wnd;
1852 bool check = !(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1853 if (hwnd == GetDlgItem(IDC_CHECKALL)->GetSafeHwnd())
1854 m_ListCtrl.Check(GITSLC_SHOWEVERYTHING, check);
1855 else if (hwnd == GetDlgItem(IDC_CHECKNONE)->GetSafeHwnd())
1856 m_ListCtrl.Check(GITSLC_SHOWEVERYTHING, !check);
1857 else if (hwnd == GetDlgItem(IDC_CHECKUNVERSIONED)->GetSafeHwnd())
1858 m_ListCtrl.Check(GITSLC_SHOWUNVERSIONED, check);
1859 else if (hwnd == GetDlgItem(IDC_CHECKVERSIONED)->GetSafeHwnd())
1860 m_ListCtrl.Check(GITSLC_SHOWVERSIONED, check);
1861 else if (hwnd == GetDlgItem(IDC_CHECKADDED)->GetSafeHwnd())
1862 m_ListCtrl.Check(GITSLC_SHOWADDED, check);
1863 else if (hwnd == GetDlgItem(IDC_CHECKDELETED)->GetSafeHwnd())
1864 m_ListCtrl.Check(GITSLC_SHOWREMOVED, check);
1865 else if (hwnd == GetDlgItem(IDC_CHECKMODIFIED)->GetSafeHwnd())
1866 m_ListCtrl.Check(GITSLC_SHOWMODIFIED, check);
1867 else if (hwnd == GetDlgItem(IDC_CHECKFILES)->GetSafeHwnd())
1868 m_ListCtrl.Check(GITSLC_SHOWFILES, check);
1869 else if (hwnd == GetDlgItem(IDC_CHECKSUBMODULES)->GetSafeHwnd())
1870 m_ListCtrl.Check(GITSLC_SHOWSUBMODULES, check);
1871
1872 return 0;
1873 }
1874
1875 LRESULT CCommitDlg::OnUpdateOKButton(WPARAM, LPARAM)
1876 {
1877 if (m_bBlock)
1878 return 0;
1879
1880 bool bValidLogSize = m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize && m_cLogMessage.GetText().GetLength() > 0;
1881 bool bAmendOrSelectFilesOrMerge = m_ListCtrl.GetSelected() > 0 || (m_bCommitAmend && m_bAmendDiffToLastCommit) || CTGitPath(g_Git.m_CurrentDir).IsMergeActive();
1882
1883 DialogEnableWindow(IDOK, bValidLogSize && (m_bCommitMessageOnly || bAmendOrSelectFilesOrMerge));
1884
1885 return 0;
1886 }
1887
1888 LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
1889 {
1890 switch (message) {
1891 case WM_NOTIFY:
1892 if (wParam == IDC_SPLITTER)
1893 {
1894 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
1895 DoSize(pHdr->delta);
1896 }
1897 break;
1898 }
1899
1900 return __super::DefWindowProc(message, wParam, lParam);
1901 }
1902
1903 void CCommitDlg::SetSplitterRange()
1904 {
1905 if ((m_ListCtrl)&&(m_cLogMessage))
1906 {
1907 CRect rcTop;
1908 m_cLogMessage.GetWindowRect(rcTop);
1909 ScreenToClient(rcTop);
1910 CRect rcMiddle;
1911 m_ListCtrl.GetWindowRect(rcMiddle);
1912 ScreenToClient(rcMiddle);
1913 if (rcMiddle.Height() && rcMiddle.Width())
1914 m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);
1915 }
1916 }
1917
1918 void CCommitDlg::DoSize(int delta)
1919 {
1920 RemoveAnchor(IDC_MESSAGEGROUP);
1921 RemoveAnchor(IDC_LOGMESSAGE);
1922 RemoveAnchor(IDC_SPLITTER);
1923 RemoveAnchor(IDC_SIGNOFF);
1924 RemoveAnchor(IDC_COMMIT_AMEND);
1925 RemoveAnchor(IDC_COMMIT_MESSAGEONLY);
1926 RemoveAnchor(IDC_COMMIT_AMENDDIFF);
1927 RemoveAnchor(IDC_COMMIT_SETDATETIME);
1928 RemoveAnchor(IDC_COMMIT_DATEPICKER);
1929 RemoveAnchor(IDC_COMMIT_TIMEPICKER);
1930 RemoveAnchor(IDC_LISTGROUP);
1931 RemoveAnchor(IDC_FILELIST);
1932 RemoveAnchor(IDC_TEXT_INFO);
1933 RemoveAnchor(IDC_SELECTLABEL);
1934 RemoveAnchor(IDC_CHECKALL);
1935 RemoveAnchor(IDC_CHECKNONE);
1936 RemoveAnchor(IDC_CHECKUNVERSIONED);
1937 RemoveAnchor(IDC_CHECKVERSIONED);
1938 RemoveAnchor(IDC_CHECKADDED);
1939 RemoveAnchor(IDC_CHECKDELETED);
1940 RemoveAnchor(IDC_CHECKMODIFIED);
1941 RemoveAnchor(IDC_CHECKFILES);
1942 RemoveAnchor(IDC_CHECKSUBMODULES);
1943
1944 CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN);
1945 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN);
1946 CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN);
1947 CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN);
1948 CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta);
1949 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND),0,delta);
1950 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_MESSAGEONLY), 0, delta);
1951 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMENDDIFF),0,delta);
1952 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_SETDATETIME),0,delta);
1953 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_DATEPICKER),0,delta);
1954 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_TIMEPICKER),0,delta);
1955 CSplitterControl::ChangePos(GetDlgItem(IDC_TEXT_INFO),0,delta);
1956 CSplitterControl::ChangePos(GetDlgItem(IDC_SELECTLABEL), 0, delta);
1957 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKALL), 0, delta);
1958 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKNONE), 0, delta);
1959 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKUNVERSIONED), 0, delta);
1960 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKVERSIONED), 0, delta);
1961 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKADDED), 0, delta);
1962 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKDELETED), 0, delta);
1963 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKMODIFIED), 0, delta);
1964 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKFILES), 0, delta);
1965 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKSUBMODULES), 0, delta);
1966
1967 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
1968 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
1969 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
1970 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
1971 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
1972 AddAnchor(IDC_SIGNOFF,TOP_RIGHT);
1973 AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
1974 AddAnchor(IDC_COMMIT_MESSAGEONLY, TOP_LEFT);
1975 AddAnchor(IDC_COMMIT_AMENDDIFF,TOP_LEFT);
1976 AddAnchor(IDC_COMMIT_SETDATETIME,TOP_LEFT);
1977 AddAnchor(IDC_COMMIT_DATEPICKER,TOP_LEFT);
1978 AddAnchor(IDC_COMMIT_TIMEPICKER,TOP_LEFT);
1979 AddAnchor(IDC_TEXT_INFO,TOP_RIGHT);
1980 AddAnchor(IDC_SELECTLABEL, TOP_LEFT);
1981 AddAnchor(IDC_CHECKALL, TOP_LEFT);
1982 AddAnchor(IDC_CHECKNONE, TOP_LEFT);
1983 AddAnchor(IDC_CHECKUNVERSIONED, TOP_LEFT);
1984 AddAnchor(IDC_CHECKVERSIONED, TOP_LEFT);
1985 AddAnchor(IDC_CHECKADDED, TOP_LEFT);
1986 AddAnchor(IDC_CHECKDELETED, TOP_LEFT);
1987 AddAnchor(IDC_CHECKMODIFIED, TOP_LEFT);
1988 AddAnchor(IDC_CHECKFILES, TOP_LEFT);
1989 AddAnchor(IDC_CHECKSUBMODULES, TOP_LEFT);
1990 ArrangeLayout();
1991 // adjust the minimum size of the dialog to prevent the resizing from
1992 // moving the list control too far down.
1993 CRect rcLogMsg;
1994 m_cLogMessage.GetClientRect(rcLogMsg);
1995 SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_LogMsgOrigRect.Height()+rcLogMsg.Height()));
1996
1997 SetSplitterRange();
1998 m_cLogMessage.Invalidate();
1999 GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
2000 }
2001
2002 void CCommitDlg::OnSize(UINT nType, int cx, int cy)
2003 {
2004 // first, let the resizing take place
2005 __super::OnSize(nType, cx, cy);
2006
2007 //set range
2008 SetSplitterRange();
2009 }
2010
2011 CString CCommitDlg::GetSignedOffByLine()
2012 {
2013 CString str;
2014
2015 CString username = g_Git.GetUserName();
2016 CString email = g_Git.GetUserEmail();
2017 username.Remove(_T('\n'));
2018 email.Remove(_T('\n'));
2019
2020 str.Format(_T("Signed-off-by: %s <%s>"), username, email);
2021
2022 return str;
2023 }
2024
2025 void CCommitDlg::OnBnClickedSignOff()
2026 {
2027 CString str = GetSignedOffByLine();
2028
2029 if (m_cLogMessage.GetText().Find(str) == -1) {
2030 m_cLogMessage.SetText(m_cLogMessage.GetText().TrimRight());
2031 int lastNewline = m_cLogMessage.GetText().ReverseFind(_T('\n'));
2032 int foundByLine = -1;
2033 if (lastNewline > 0)
2034 foundByLine = m_cLogMessage.GetText().Find(_T("-by: "), lastNewline);
2035
2036 if (foundByLine == -1 || foundByLine < lastNewline)
2037 str = _T("\r\n") + str;
2038
2039 m_cLogMessage.SetText(m_cLogMessage.GetText()+_T("\r\n")+str+_T("\r\n"));
2040 }
2041 }
2042
2043 void CCommitDlg::OnBnClickedCommitAmend()
2044 {
2045 this->UpdateData();
2046 if(this->m_bCommitAmend && this->m_AmendStr.IsEmpty())
2047 {
2048 GitRev rev;
2049 rev.GetCommit(CString(_T("HEAD")));
2050 m_AmendStr=rev.GetSubject()+_T("\n")+rev.GetBody();
2051 }
2052
2053 if(this->m_bCommitAmend)
2054 {
2055 this->m_NoAmendStr=this->m_cLogMessage.GetText();
2056 m_cLogMessage.SetText(m_AmendStr);
2057 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_SHOW);
2058 }
2059 else
2060 {
2061 this->m_AmendStr=this->m_cLogMessage.GetText();
2062 m_cLogMessage.SetText(m_NoAmendStr);
2063 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_HIDE);
2064 }
2065
2066 OnBnClickedCommitSetDateTime(); // to update the commit date and time
2067
2068 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
2069 Refresh();
2070 }
2071
2072 void CCommitDlg::OnBnClickedCommitMessageOnly()
2073 {
2074 this->UpdateData();
2075 this->m_ListCtrl.EnableWindow(m_bCommitMessageOnly ? FALSE : TRUE);
2076 SendMessage(WM_UPDATEOKBUTTON);
2077 }
2078
2079 void CCommitDlg::OnBnClickedWholeProject()
2080 {
2081 m_tooltips.Pop(); // hide the tooltips
2082 UpdateData();
2083 m_ListCtrl.Clear();
2084 if (!m_bBlock)
2085 {
2086 if(m_bWholeProject)
2087 m_ListCtrl.GetStatus(NULL,true,false,true);
2088 else
2089 m_ListCtrl.GetStatus(&this->m_pathList,true,false,true);
2090
2091 DWORD dwShow = m_ListCtrl.GetShowFlags();
2092 if (DWORD(m_regAddBeforeCommit))
2093 dwShow |= GITSLC_SHOWUNVERSIONED;
2094 else
2095 dwShow &= ~GITSLC_SHOWUNVERSIONED;
2096
2097 m_ListCtrl.Show(dwShow, dwShow & ~(CTGitPath::LOGACTIONS_UNVER), true);
2098 UpdateCheckLinks();
2099 }
2100
2101 SetDlgTitle();
2102 }
2103
2104 void CCommitDlg::OnFocusMessage()
2105 {
2106 m_cLogMessage.SetFocus();
2107 }
2108
2109 void CCommitDlg::OnScnUpdateUI(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2110 {
2111 int pos = (int)this->m_cLogMessage.Call(SCI_GETCURRENTPOS);
2112 int line = (int)this->m_cLogMessage.Call(SCI_LINEFROMPOSITION,pos);
2113 int column = (int)this->m_cLogMessage.Call(SCI_GETCOLUMN,pos);
2114
2115 CString str;
2116 str.Format(_T("%d/%d"),line+1,column+1);
2117 this->GetDlgItem(IDC_TEXT_INFO)->SetWindowText(str);
2118
2119 if(*pResult)
2120 *pResult=0;
2121 }
2122 void CCommitDlg::OnStnClickedViewPatch()
2123 {
2124 m_patchViewdlg.m_pProjectProperties = &this->m_ProjectProperties;
2125 m_patchViewdlg.m_ParentCommitDlg = this;
2126 if(!IsWindow(this->m_patchViewdlg.m_hWnd))
2127 {
2128 BOOL viewPatchEnabled = FALSE;
2129 m_ProjectProperties.GetBOOLProps(viewPatchEnabled, _T("tgit.commitshowpatch"));
2130 if (viewPatchEnabled == FALSE)
2131 g_Git.SetConfigValue(_T("tgit.commitshowpatch"), _T("true"));
2132 m_patchViewdlg.Create(IDD_PATCH_VIEW,this);
2133 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETSCROLLWIDTHTRACKING, TRUE);
2134 CRect rect;
2135 this->GetWindowRect(&rect);
2136
2137 m_patchViewdlg.ShowWindow(SW_SHOW);
2138
2139 m_patchViewdlg.SetWindowPos(NULL,rect.right,rect.top,rect.Width(),rect.Height(),
2140 SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
2141
2142 ShowViewPatchText(false);
2143 FillPatchView();
2144 }
2145 else
2146 {
2147 g_Git.SetConfigValue(_T("tgit.commitshowpatch"), _T("false"));
2148 m_patchViewdlg.ShowWindow(SW_HIDE);
2149 m_patchViewdlg.DestroyWindow();
2150 ShowViewPatchText(true);
2151 }
2152 this->m_ctrlShowPatch.Invalidate();
2153 }
2154
2155 void CCommitDlg::OnMoving(UINT fwSide, LPRECT pRect)
2156 {
2157 __super::OnMoving(fwSide, pRect);
2158
2159 if (::IsWindow(m_patchViewdlg.m_hWnd))
2160 {
2161 RECT patchrect;
2162 m_patchViewdlg.GetWindowRect(&patchrect);
2163 if (::IsWindow(m_hWnd))
2164 {
2165 RECT thisrect;
2166 GetWindowRect(&thisrect);
2167 if (patchrect.left == thisrect.right)
2168 {
2169 m_patchViewdlg.SetWindowPos(NULL, patchrect.left - (thisrect.left - pRect->left), patchrect.top - (thisrect.top - pRect->top),
2170 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
2171 }
2172 }
2173 }
2174
2175 }
2176
2177 void CCommitDlg::OnSizing(UINT fwSide, LPRECT pRect)
2178 {
2179 __super::OnSizing(fwSide, pRect);
2180
2181 if(::IsWindow(this->m_patchViewdlg.m_hWnd))
2182 {
2183 CRect thisrect, patchrect;
2184 this->GetWindowRect(thisrect);
2185 this->m_patchViewdlg.GetWindowRect(patchrect);
2186 if(thisrect.right==patchrect.left)
2187 {
2188 patchrect.left -= (thisrect.right - pRect->right);
2189 patchrect.right-= (thisrect.right - pRect->right);
2190
2191 if( patchrect.bottom == thisrect.bottom)
2192 {
2193 patchrect.bottom -= (thisrect.bottom - pRect->bottom);
2194 }
2195 if( patchrect.top == thisrect.top)
2196 {
2197 patchrect.top -= thisrect.top-pRect->top;
2198 }
2199 m_patchViewdlg.MoveWindow(patchrect);
2200 }
2201 }
2202 }
2203
2204 void CCommitDlg::OnHdnItemchangedFilelist(NMHDR *pNMHDR, LRESULT *pResult)
2205 {
2206 UNREFERENCED_PARAMETER(pNMHDR);
2207 *pResult = 0;
2208 TRACE("Item Changed\r\n");
2209 }
2210
2211 int CCommitDlg::CheckHeadDetach()
2212 {
2213 CString output;
2214 if(g_Git.GetCurrentBranchFromFile(g_Git.m_CurrentDir,output))
2215 {
2216 int retval = CMessageBox::Show(NULL, IDS_PROC_COMMIT_DETACHEDWARNING, IDS_APPNAME, MB_YESNOCANCEL | MB_ICONWARNING);
2217 if(retval == IDYES)
2218 {
2219 if (CAppUtils::CreateBranchTag(FALSE, NULL, true) == FALSE)
2220 return 1;
2221 }
2222 else if (retval == IDCANCEL)
2223 return 1;
2224 }
2225 return 0;
2226 }
2227
2228 void CCommitDlg::OnBnClickedCommitAmenddiff()
2229 {
2230 UpdateData();
2231 Refresh();
2232 }
2233
2234 void CCommitDlg::OnBnClickedNoautoselectsubmodules()
2235 {
2236 UpdateData();
2237 Refresh();
2238 }
2239
2240 void CCommitDlg::OnBnClickedCommitSetDateTime()
2241 {
2242 UpdateData();
2243
2244 if (m_bSetCommitDateTime)
2245 {
2246 CTime authordate = CTime::GetCurrentTime();
2247 if (m_bCommitAmend)
2248 {
2249 GitRev headRevision;
2250 headRevision.GetCommit(_T("HEAD"));
2251 authordate = headRevision.GetAuthorDate();
2252 }
2253
2254 m_CommitDate.SetTime(&authordate);
2255 m_CommitTime.SetTime(&authordate);
2256
2257 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_SHOW);
2258 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_SHOW);
2259 }
2260 else
2261 {
2262 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_HIDE);
2263 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_HIDE);
2264 }
2265 }
2266
2267 void CCommitDlg::OnBnClickedCheckNewBranch()
2268 {
2269 UpdateData();
2270 if (m_bCreateNewBranch)
2271 {
2272 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_HIDE);
2273 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_SHOW);
2274 }
2275 else
2276 {
2277 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_HIDE);
2278 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_SHOW);
2279 }
2280 }
2281
2282 void CCommitDlg::RestoreFiles(bool doNotAsk)
2283 {
2284 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))
2285 {
2286 for (std::map<CString, CString>::iterator it = m_ListCtrl.m_restorepaths.begin(); it != m_ListCtrl.m_restorepaths.end(); ++it)
2287 CopyFile(it->second, g_Git.m_CurrentDir + _T("\\") + it->first, FALSE);
2288 m_ListCtrl.m_restorepaths.clear();
2289 }
2290 }
2291
2292 void CCommitDlg::UpdateCheckLinks()
2293 {
2294 DialogEnableWindow(IDC_CHECKALL, true);
2295 DialogEnableWindow(IDC_CHECKNONE, true);
2296 DialogEnableWindow(IDC_CHECKUNVERSIONED, m_ListCtrl.GetUnversionedCount() > 0);
2297 DialogEnableWindow(IDC_CHECKVERSIONED, m_ListCtrl.GetItemCount() > m_ListCtrl.GetUnversionedCount());
2298 DialogEnableWindow(IDC_CHECKADDED, m_ListCtrl.GetAddedCount() > 0);
2299 DialogEnableWindow(IDC_CHECKDELETED, m_ListCtrl.GetDeletedCount() > 0);
2300 DialogEnableWindow(IDC_CHECKMODIFIED, m_ListCtrl.GetModifiedCount() > 0);
2301 DialogEnableWindow(IDC_CHECKFILES, m_ListCtrl.GetFileCount() > 0);
2302 DialogEnableWindow(IDC_CHECKSUBMODULES, m_ListCtrl.GetSubmoduleCount() > 0);
2303 }
Windows Explorer Extension to Operate Git