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