1 // TortoiseGit - a Windows shell extension for easy version control
\r
3 // Copyright (C) 2003-2008 - TortoiseGit
\r
5 // This program is free software; you can redistribute it and/or
\r
6 // modify it under the terms of the GNU General Public License
\r
7 // as published by the Free Software Foundation; either version 2
\r
8 // of the License, or (at your option) any later version.
\r
10 // This program is distributed in the hope that it will be useful,
\r
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
13 // GNU General Public License for more details.
\r
15 // You should have received a copy of the GNU General Public License
\r
16 // along with this program; if not, write to the Free Software Foundation,
\r
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
20 #include "TortoiseProc.h"
\r
21 #include "CommitDlg.h"
\r
22 #include "DirFileEnum.h"
\r
23 //#include "GitConfig.h"
\r
24 #include "ProjectProperties.h"
\r
25 #include "MessageBox.h"
\r
26 #include "AppUtils.h"
\r
27 #include "PathUtils.h"
\r
29 #include "Registry.h"
\r
30 #include "GitStatus.h"
\r
31 #include "HistoryDlg.h"
\r
33 #include "CommonResource.h"
\r
34 #include "UnicodeUtils.h"
\r
35 #include "ProgressDlg.h"
\r
36 #include "ShellUpdater.h"
\r
37 #include "Commands/PushCommand.h"
\r
40 #define new DEBUG_NEW
\r
42 static char THIS_FILE[] = __FILE__;
\r
45 UINT CCommitDlg::WM_AUTOLISTREADY = RegisterWindowMessage(_T("TORTOISEGIT_AUTOLISTREADY_MSG"));
\r
47 IMPLEMENT_DYNAMIC(CCommitDlg, CResizableStandAloneDialog)
\r
48 CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)
\r
49 : CResizableStandAloneDialog(CCommitDlg::IDD, pParent)
\r
50 , m_bRecursive(FALSE)
\r
51 , m_bShowUnversioned(FALSE)
\r
53 , m_bThreadRunning(FALSE)
\r
54 , m_bRunThread(FALSE)
\r
56 , m_bWholeProject(FALSE)
\r
57 , m_bKeepChangeList(TRUE)
\r
59 , m_bSelectFilesForCommit(TRUE)
\r
61 this->m_bCommitAmend=FALSE;
\r
62 m_bPushAfterCommit = FALSE;
\r
65 CCommitDlg::~CCommitDlg()
\r
67 if(m_pThread != NULL)
\r
73 void CCommitDlg::DoDataExchange(CDataExchange* pDX)
\r
75 CResizableStandAloneDialog::DoDataExchange(pDX);
\r
76 DDX_Control(pDX, IDC_FILELIST, m_ListCtrl);
\r
77 DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);
\r
78 DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);
\r
79 DDX_Control(pDX, IDC_SELECTALL, m_SelectAll);
\r
80 DDX_Text(pDX, IDC_BUGID, m_sBugID);
\r
81 DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);
\r
82 DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);
\r
83 DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);
\r
84 DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);
\r
87 BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)
\r
88 ON_BN_CLICKED(IDC_SELECTALL, OnBnClickedSelectall)
\r
89 ON_BN_CLICKED(IDHELP, OnBnClickedHelp)
\r
90 ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)
\r
91 // ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)
\r
92 ON_BN_CLICKED(IDC_BUGTRAQBUTTON, OnBnClickedBugtraqbutton)
\r
93 ON_EN_CHANGE(IDC_LOGMESSAGE, OnEnChangeLogmessage)
\r
94 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED, OnGitStatusListCtrlItemCountChanged)
\r
95 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnGitStatusListCtrlNeedsRefresh)
\r
96 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped)
\r
97 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_CHECKCHANGED, &CCommitDlg::OnGitStatusListCtrlCheckChanged)
\r
98 ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY, OnAutoListReady)
\r
101 ON_STN_CLICKED(IDC_EXTERNALWARNING, &CCommitDlg::OnStnClickedExternalwarning)
\r
102 ON_BN_CLICKED(IDC_SIGNOFF, &CCommitDlg::OnBnClickedSignOff)
\r
103 ON_STN_CLICKED(IDC_COMMITLABEL, &CCommitDlg::OnStnClickedCommitlabel)
\r
104 ON_BN_CLICKED(IDC_COMMIT_AMEND, &CCommitDlg::OnBnClickedCommitAmend)
\r
105 ON_BN_CLICKED(IDC_WHOLE_PROJECT, &CCommitDlg::OnBnClickedWholeProject)
\r
106 ON_STN_CLICKED(IDC_BUGIDLABEL, &CCommitDlg::OnStnClickedBugidlabel)
\r
107 ON_COMMAND(ID_FOCUS_MESSAGE,&CCommitDlg::OnFocusMessage)
\r
110 BOOL CCommitDlg::OnInitDialog()
\r
112 CResizableStandAloneDialog::OnInitDialog();
\r
114 m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);
\r
115 m_bShowUnversioned = m_regAddBeforeCommit;
\r
117 m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));
\r
119 m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE);
\r
120 m_bKeepChangeList = m_regKeepChangelists;
\r
122 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_COMMITDLG));
\r
124 // GitConfig config;
\r
125 // m_bWholeProject = config.KeepLocks();
\r
127 if(this->m_pathList.GetCount() == 0)
\r
128 m_bWholeProject =true;
\r
130 if(this->m_pathList.GetCount() == 1 && m_pathList[0].IsEmpty())
\r
131 m_bWholeProject =true;
\r
135 m_ListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS | SVNSLC_COLADD |SVNSLC_COLDEL, _T("CommitDlg"));
\r
136 m_ListCtrl.SetSelectButton(&m_SelectAll);
\r
137 m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));
\r
138 m_ListCtrl.SetCancelBool(&m_bCancelled);
\r
139 m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);
\r
140 m_ListCtrl.EnableFileDrop();
\r
141 m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);
\r
143 //this->DialogEnableWindow(IDC_COMMIT_AMEND,FALSE);
\r
144 m_ProjectProperties.ReadPropsPathList(m_pathList);
\r
146 m_cLogMessage.Init(m_ProjectProperties);
\r
147 m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));
\r
148 m_cLogMessage.RegisterContextMenuHandler(this);
\r
150 OnEnChangeLogmessage();
\r
152 m_tooltips.Create(this);
\r
153 m_tooltips.AddTool(IDC_EXTERNALWARNING, IDS_COMMITDLG_EXTERNALS);
\r
154 m_tooltips.AddTool(IDC_COMMIT_AMEND,IDS_COMMIT_AMEND_TT);
\r
155 // m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);
\r
157 m_SelectAll.SetCheck(BST_INDETERMINATE);
\r
160 CBugTraqAssociations bugtraq_associations;
\r
161 bugtraq_associations.Load();
\r
163 if (bugtraq_associations.FindProvider(g_Git.m_CurrentDir, &m_bugtraq_association))
\r
165 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
\r
166 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
\r
168 CComPtr<IBugTraqProvider> pProvider;
\r
169 HRESULT hr = pProvider.CoCreateInstance(m_bugtraq_association.GetProviderClass());
\r
172 m_BugTraqProvider = pProvider;
\r
174 if (SUCCEEDED(hr = pProvider->GetLinkText(GetSafeHwnd(), m_bugtraq_association.GetParameters().AllocSysString(), &temp)))
\r
176 SetDlgItemText(IDC_BUGTRAQBUTTON, temp);
\r
177 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(TRUE);
\r
178 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_SHOW);
\r
181 SysFreeString(temp);
\r
184 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
186 else if (!m_ProjectProperties.sMessage.IsEmpty())
\r
188 GetDlgItem(IDC_BUGID)->ShowWindow(SW_SHOW);
\r
189 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_SHOW);
\r
190 if (!m_ProjectProperties.sLabel.IsEmpty())
\r
191 SetDlgItemText(IDC_BUGIDLABEL, m_ProjectProperties.sLabel);
\r
192 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);
\r
193 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);
\r
194 GetDlgItem(IDC_BUGID)->SetFocus();
\r
195 CString sBugID = m_ProjectProperties.GetBugIDFromLog(m_sLogMessage);
\r
196 if (!sBugID.IsEmpty())
\r
198 SetDlgItemText(IDC_BUGID, sBugID);
\r
203 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
\r
204 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
\r
205 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);
\r
206 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);
\r
207 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
210 if (!m_sLogMessage.IsEmpty())
\r
211 m_cLogMessage.SetText(m_sLogMessage);
\r
213 GetWindowText(m_sWindowTitle);
\r
215 AdjustControlSize(IDC_SHOWUNVERSIONED);
\r
216 AdjustControlSize(IDC_SELECTALL);
\r
217 AdjustControlSize(IDC_WHOLE_PROJECT);
\r
219 GetClientRect(m_DlgOrigRect);
\r
220 m_cLogMessage.GetClientRect(m_LogMsgOrigRect);
\r
222 AddAnchor(IDC_COMMITLABEL, TOP_LEFT, TOP_RIGHT);
\r
223 AddAnchor(IDC_BUGIDLABEL, TOP_RIGHT);
\r
224 AddAnchor(IDC_BUGID, TOP_RIGHT);
\r
225 AddAnchor(IDC_BUGTRAQBUTTON, TOP_RIGHT);
\r
226 AddAnchor(IDC_COMMIT_TO, TOP_LEFT, TOP_RIGHT);
\r
227 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
\r
228 // AddAnchor(IDC_HISTORY, TOP_LEFT);
\r
229 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
\r
230 AddAnchor(IDC_SIGNOFF, TOP_RIGHT);
\r
231 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
\r
232 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
\r
233 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
\r
234 AddAnchor(IDC_SHOWUNVERSIONED, BOTTOM_LEFT);
\r
235 AddAnchor(IDC_SELECTALL, BOTTOM_LEFT);
\r
236 AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);
\r
237 AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
238 AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);
\r
239 AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);
\r
240 AddAnchor(IDOK, BOTTOM_RIGHT);
\r
241 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
\r
242 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
243 AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
\r
246 CenterWindow(CWnd::FromHandle(hWndExplorer));
\r
247 EnableSaveRestore(_T("CommitDlg"));
\r
248 DWORD yPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
\r
249 RECT rcDlg, rcLogMsg, rcFileList;
\r
250 GetClientRect(&rcDlg);
\r
251 m_cLogMessage.GetWindowRect(&rcLogMsg);
\r
252 ScreenToClient(&rcLogMsg);
\r
253 m_ListCtrl.GetWindowRect(&rcFileList);
\r
254 ScreenToClient(&rcFileList);
\r
258 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
259 ScreenToClient(&rectSplitter);
\r
260 int delta = yPos - rectSplitter.top;
\r
261 if ((rcLogMsg.bottom + delta > rcLogMsg.top)&&(rcLogMsg.bottom + delta < rcFileList.bottom - 30))
\r
263 m_wndSplitter.SetWindowPos(NULL, 0, yPos, 0, 0, SWP_NOSIZE);
\r
268 // add all directories to the watcher
\r
269 for (int i=0; i<m_pathList.GetCount(); ++i)
\r
271 if (m_pathList[i].IsDirectory())
\r
272 m_pathwatcher.AddPath(m_pathList[i]);
\r
275 m_updatedPathList = m_pathList;
\r
277 //first start a thread to obtain the file list with the status without
\r
278 //blocking the dialog
\r
279 InterlockedExchange(&m_bBlock, TRUE);
\r
280 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
\r
281 if (m_pThread==NULL)
\r
283 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
284 InterlockedExchange(&m_bBlock, FALSE);
\r
288 m_pThread->m_bAutoDelete = FALSE;
\r
289 m_pThread->ResumeThread();
\r
291 CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);
\r
292 CRegDWORD historyhint = CRegDWORD(_T("Software\\TortoiseGit\\HistoryHintShown"), FALSE);
\r
293 if ((((DWORD)err)!=FALSE)&&((((DWORD)historyhint)==FALSE)))
\r
295 historyhint = TRUE;
\r
296 // ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);
\r
300 //this->UpdateData(TRUE);
\r
301 //this->m_bCommitAmend=FALSE;
\r
302 //this->UpdateData(FALSE);
\r
304 return FALSE; // return TRUE unless you set the focus to a control
\r
305 // EXCEPTION: OCX Property Pages should return FALSE
\r
308 void CCommitDlg::OnOK()
\r
312 if (m_bThreadRunning)
\r
314 m_bCancelled = true;
\r
315 InterlockedExchange(&m_bRunThread, FALSE);
\r
316 WaitForSingleObject(m_pThread->m_hThread, 1000);
\r
317 if (m_bThreadRunning)
\r
319 // we gave the thread a chance to quit. Since the thread didn't
\r
320 // listen to us we have to kill it.
\r
321 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
\r
322 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
325 this->UpdateData();
\r
328 GetDlgItemText(IDC_BUGID, id);
\r
329 if (!m_ProjectProperties.CheckBugID(id))
\r
331 ShowBalloon(IDC_BUGID, IDS_COMMITDLG_ONLYNUMBERS, IDI_EXCLAMATION);
\r
334 m_sLogMessage = m_cLogMessage.GetText();
\r
335 if ( m_sLogMessage.IsEmpty() )
\r
337 // no message entered, go round again
\r
338 CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOMESSAGE, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
341 if ((m_ProjectProperties.bWarnIfNoIssue) && (id.IsEmpty() && !m_ProjectProperties.HasBugID(m_sLogMessage)))
\r
343 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOISSUEWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)
\r
348 CRegDWORD regUnversionedRecurse (_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE);
\r
349 if (!(DWORD)regUnversionedRecurse)
\r
351 // Find unversioned directories which are marked for commit. The user might expect them
\r
352 // to be added recursively since he cannot the the files. Let's ask the user if he knows
\r
353 // what he is doing.
\r
354 int nListItems = m_ListCtrl.GetItemCount();
\r
355 for (int j=0; j<nListItems; j++)
\r
357 const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);
\r
358 if (entry->IsChecked() && (entry->status == Git_wc_status_unversioned) && entry->IsFolder() )
\r
360 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_UNVERSIONEDFOLDERWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)
\r
366 m_pathwatcher.Stop();
\r
367 InterlockedExchange(&m_bBlock, TRUE);
\r
368 CDWordArray arDeleted;
\r
369 //first add all the unversioned files the user selected
\r
370 //and check if all versioned files are selected
\r
372 m_bRecursive = true;
\r
373 int nListItems = m_ListCtrl.GetItemCount();
\r
375 CTGitPathList itemsToAdd;
\r
376 CTGitPathList itemsToRemove;
\r
377 //std::set<CString> checkedLists;
\r
378 //std::set<CString> uncheckedLists;
\r
380 //CString checkedfiles;
\r
381 //CString uncheckedfiles;
\r
386 for (int j=0; j<nListItems; j++)
\r
388 //const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);
\r
389 CTGitPath *entry = (CTGitPath*)m_ListCtrl.GetItemData(j);
\r
390 if (entry->m_Checked)
\r
393 if (entry->status == Git_wc_status_unversioned)
\r
395 itemsToAdd.AddPath(entry->GetPath());
\r
397 if (entry->status == Git_wc_status_conflicted)
\r
399 bHasConflicted = true;
\r
401 if (entry->status == Git_wc_status_missing)
\r
403 itemsToRemove.AddPath(entry->GetPath());
\r
405 if (entry->status == Git_wc_status_deleted)
\r
409 if (entry->IsInExternal())
\r
411 bCheckedInExternal = true;
\r
414 if( entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
\r
415 cmd.Format(_T("git.exe add -f -- \"%s\""),entry->GetGitPathString());
\r
416 else if ( entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
417 cmd.Format(_T("git.exe update-index --remove -- \"%s\""),entry->GetGitPathString());
\r
419 cmd.Format(_T("git.exe update-index -- \"%s\""),entry->GetGitPathString());
\r
421 g_Git.Run(cmd,&out,CP_ACP);
\r
424 //checkedLists.insert(entry->GetGitPathString());
\r
425 // checkedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");
\r
429 //uncheckedLists.insert(entry->GetGitPathString());
\r
430 if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
431 { //To init git repository, there are not HEAD, so we can use git reset command
\r
432 cmd.Format(_T("git.exe rm --cache -- \"%s\""),entry->GetGitPathString());
\r
433 g_Git.Run(cmd,&out,CP_ACP);
\r
435 else if(!( entry->m_Action & CTGitPath::LOGACTIONS_UNVER ) )
\r
437 cmd.Format(_T("git.exe reset -- \"%s\""),entry->GetGitPathString());
\r
438 g_Git.Run(cmd,&out,CP_ACP);
\r
441 // uncheckedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");
\r
443 if ((entry->status != Git_wc_status_unversioned) &&
\r
444 (entry->status != Git_wc_status_ignored))
\r
447 uncheckedLists.insert(entry->GetChangeList());
\r
450 // This algorithm is for the sake of simplicity of the complexity O(N?
\r
451 for (int k=0; k<nListItems; k++)
\r
453 const CGitStatusListCtrl::FileEntry * entryK = m_ListCtrl.GetListEntry(k);
\r
454 if (entryK->IsChecked() && entryK->GetPath().IsAncestorOf(entry->GetPath()) )
\r
456 // Fall back to a non-recursive commit to prevent items being
\r
457 // committed which aren't checked although its parent is checked
\r
458 // (property change, directory deletion, ... )
\r
459 m_bRecursive = false;
\r
468 CShellUpdater::Instance().AddPathForUpdate(*entry);
\r
471 //if(uncheckedfiles.GetLength()>0)
\r
473 // cmd.Format(_T("git.exe reset -- %s"),uncheckedfiles);
\r
474 // g_Git.Run(cmd,&out);
\r
478 if (!m_sBugID.IsEmpty())
\r
480 m_sBugID.Replace(_T(", "), _T(","));
\r
481 m_sBugID.Replace(_T(" ,"), _T(","));
\r
482 CString sBugID = m_ProjectProperties.sMessage;
\r
483 sBugID.Replace(_T("%BUGID%"), m_sBugID);
\r
484 if (m_ProjectProperties.bAppend)
\r
485 m_sLogMessage += _T("\n") + sBugID + _T("\n");
\r
487 m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
\r
490 BOOL bCloseCommitDlg=true;
\r
491 //if(checkedfiles.GetLength()>0)
\r
492 if(nchecked||m_bCommitAmend)
\r
494 // cmd.Format(_T("git.exe update-index -- %s"),checkedfiles);
\r
495 // g_Git.Run(cmd,&out);
\r
497 CString tempfile=::GetTempFile();
\r
499 CAppUtils::SaveCommitUnicodeFile(tempfile,m_sLogMessage);
\r
500 //file.WriteString(m_sLogMessage);
\r
505 if(this->m_bCommitAmend)
\r
507 amend=_T("--amend");
\r
509 cmd.Format(_T("git.exe commit %s -F \"%s\""),amend, tempfile);
\r
511 CProgressDlg progress;
\r
512 progress.m_GitCmd=cmd;
\r
513 progress.m_bShowCommand = FALSE; // don't show the commit command
\r
514 progress.m_PreText = out; // show any output already generated in log window
\r
515 progress.m_changeAbortButtonOnSuccessTo = "Push";
\r
516 DWORD userResponse = progress.DoModal();
\r
518 if(progress.m_GitStatus)
\r
520 bCloseCommitDlg = false;
\r
523 else if(userResponse == IDCANCEL)
\r
525 //User pressed 'Push' button after successful commit.
\r
526 m_bPushAfterCommit=true;
\r
529 CFile::Remove(tempfile);
\r
532 CMessageBox::Show(this->m_hWnd, IDS_ERROR_NOTHING_COMMIT, IDS_COMMIT_FINISH, MB_OK | MB_ICONINFORMATION);
\r
533 bCloseCommitDlg=false;
\r
536 if (m_pathwatcher.GetNumberOfChangedPaths() && m_bRecursive)
\r
538 // There are paths which got changed (touched at least).
\r
539 // We have to find out if this affects the selection in the commit dialog
\r
540 // If it could affect the selection, revert back to a non-recursive commit
\r
541 CTGitPathList changedList = m_pathwatcher.GetChangedPaths();
\r
542 changedList.RemoveDuplicates();
\r
543 for (int i=0; i<changedList.GetCount(); ++i)
\r
545 if (changedList[i].IsAdminDir())
\r
547 // something inside an admin dir was changed.
\r
548 // if it's the entries file, then we have to fully refresh because
\r
549 // files may have been added/removed from version control
\r
550 if ((changedList[i].GetWinPathString().Right(7).CompareNoCase(_T("entries")) == 0) &&
\r
551 (changedList[i].GetWinPathString().Find(_T("\\tmp\\"))<0))
\r
553 m_bRecursive = false;
\r
557 else if (!m_ListCtrl.IsPathShown(changedList[i]))
\r
559 // a path which is not shown in the list has changed
\r
560 CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(changedList[i]);
\r
563 // check if the changed path would get committed by a recursive commit
\r
564 if ((!entry->IsFromDifferentRepository()) &&
\r
565 (!entry->IsInExternal()) &&
\r
566 (!entry->IsNested()) &&
\r
567 (!entry->IsChecked()))
\r
569 m_bRecursive = false;
\r
578 // Now, do all the adds - make sure that the list is sorted so that parents
\r
579 // are added before their children
\r
580 itemsToAdd.SortByPathname();
\r
582 if (!Git.Add(itemsToAdd, &m_ProjectProperties, Git_depth_empty, FALSE, FALSE, TRUE))
\r
584 CMessageBox::Show(m_hWnd, Git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
585 InterlockedExchange(&m_bBlock, FALSE);
\r
590 // Remove any missing items
\r
591 // Not sure that this sort is really necessary - indeed, it might be better to do a reverse sort at this point
\r
592 itemsToRemove.SortByPathname();
\r
593 Git.Remove(itemsToRemove, TRUE);
\r
595 //the next step: find all deleted files and check if they're
\r
596 //inside a deleted folder. If that's the case, then remove those
\r
597 //files from the list since they'll get deleted by the parent
\r
598 //folder automatically.
\r
599 m_ListCtrl.Block(TRUE, FALSE);
\r
600 INT_PTR nDeleted = arDeleted.GetCount();
\r
601 for (INT_PTR i=0; i<arDeleted.GetCount(); i++)
\r
603 if (m_ListCtrl.GetCheck(arDeleted.GetAt(i)))
\r
605 const CTGitPath& path = m_ListCtrl.GetListEntry(arDeleted.GetAt(i))->GetPath();
\r
606 if (path.IsDirectory())
\r
608 //now find all children of this directory
\r
609 for (int j=0; j<arDeleted.GetCount(); j++)
\r
613 CGitStatusListCtrl::FileEntry* childEntry = m_ListCtrl.GetListEntry(arDeleted.GetAt(j));
\r
614 if (childEntry->IsChecked())
\r
616 if (path.IsAncestorOf(childEntry->GetPath()))
\r
618 m_ListCtrl.SetEntryCheck(childEntry, arDeleted.GetAt(j), false);
\r
627 m_ListCtrl.Block(FALSE, FALSE);
\r
629 if ((nUnchecked != 0)||(bCheckedInExternal)||(bHasConflicted)||(!m_bRecursive))
\r
631 //save only the files the user has checked into the temporary file
\r
632 m_ListCtrl.WriteCheckedNamesToPathList(m_pathList);
\r
634 m_ListCtrl.WriteCheckedNamesToPathList(m_selectedPathList);
\r
635 // the item count is used in the progress dialog to show the overall commit
\r
637 // deleted items only send one notification event, all others send two
\r
638 m_itemsCount = ((m_selectedPathList.GetCount() - nDeleted - itemsToRemove.GetCount()) * 2) + nDeleted + itemsToRemove.GetCount();
\r
640 if ((m_bRecursive)&&(checkedLists.size() == 1))
\r
642 // all checked items belong to the same changelist
\r
643 // find out if there are any unchecked items which belong to that changelist
\r
644 if (uncheckedLists.find(*checkedLists.begin()) == uncheckedLists.end())
\r
645 m_sChangeList = *checkedLists.begin();
\r
649 m_regAddBeforeCommit = m_bShowUnversioned;
\r
650 if (!GetDlgItem(IDC_WHOLE_PROJECT)->IsWindowEnabled())
\r
651 m_bWholeProject = FALSE;
\r
652 m_regKeepChangelists = m_bKeepChangeList;
\r
653 if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())
\r
654 m_bKeepChangeList = FALSE;
\r
655 InterlockedExchange(&m_bBlock, FALSE);
\r
657 m_History.AddEntry(m_sLogMessage);
\r
662 if( bCloseCommitDlg )
\r
663 CResizableStandAloneDialog::OnOK();
\r
665 CShellUpdater::Instance().Flush();
\r
668 void CCommitDlg::SaveSplitterPos()
\r
672 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
\r
674 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
675 ScreenToClient(&rectSplitter);
\r
676 regPos = rectSplitter.top;
\r
680 UINT CCommitDlg::StatusThreadEntry(LPVOID pVoid)
\r
682 return ((CCommitDlg*)pVoid)->StatusThread();
\r
685 UINT CCommitDlg::StatusThread()
\r
687 //get the status of all selected file/folders recursively
\r
688 //and show the ones which have to be committed to the user
\r
689 //in a list control.
\r
690 InterlockedExchange(&m_bBlock, TRUE);
\r
691 InterlockedExchange(&m_bThreadRunning, TRUE);// so the main thread knows that this thread is still running
\r
692 InterlockedExchange(&m_bRunThread, TRUE); // if this is set to FALSE, the thread should stop
\r
693 m_bCancelled = false;
\r
695 DialogEnableWindow(IDOK, false);
\r
696 DialogEnableWindow(IDC_SHOWUNVERSIONED, false);
\r
697 DialogEnableWindow(IDC_WHOLE_PROJECT, false);
\r
698 DialogEnableWindow(IDC_SELECTALL, false);
\r
699 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_HIDE);
\r
700 DialogEnableWindow(IDC_EXTERNALWARNING, false);
\r
701 // read the list of recent log entries before querying the WC for status
\r
702 // -> the user may select one and modify / update it while we are crawling the WC
\r
704 if (m_History.GetCount()==0)
\r
707 reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);
\r
708 reg.Replace(_T(':'),_T('_'));
\r
709 m_History.Load(reg, _T("logmsgs"));
\r
712 // Initialise the list control with the status of the files/folders below us
\r
713 m_ListCtrl.Clear();
\r
715 if(m_bWholeProject)
\r
716 success=m_ListCtrl.GetStatus(NULL);
\r
718 success=m_ListCtrl.GetStatus(&m_pathList);
\r
720 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
\r
721 if(this->m_bShowUnversioned)
\r
722 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER,true,&m_pathList);
\r
724 m_ListCtrl.CheckIfChangelistsArePresent(false);
\r
726 DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWLOCKS | SVNSLC_SHOWINCHANGELIST;
\r
727 dwShow |= DWORD(m_regAddBeforeCommit) ? SVNSLC_SHOWUNVERSIONED : 0;
\r
730 if (m_checkedPathList.GetCount())
\r
731 m_ListCtrl.Show(dwShow, m_checkedPathList);
\r
734 DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;
\r
735 dwCheck &=~(CTGitPath::LOGACTIONS_UNVER); //don't check unversion file default.
\r
736 m_ListCtrl.Show(dwShow, dwCheck);
\r
737 m_bSelectFilesForCommit = true;
\r
740 if (m_ListCtrl.HasExternalsFromDifferentRepos())
\r
742 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);
\r
743 DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);
\r
746 SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());
\r
747 m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());
\r
750 GetDlgItemText(IDC_LOGMESSAGE, logmsg);
\r
751 DialogEnableWindow(IDOK, logmsg.GetLength() >= m_ProjectProperties.nMinLogSize);
\r
754 if (!m_ListCtrl.GetLastErrorMessage().IsEmpty())
\r
755 m_ListCtrl.SetEmptyString(m_ListCtrl.GetLastErrorMessage());
\r
756 m_ListCtrl.Show(dwShow);
\r
758 if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems()))
\r
760 if (CMessageBox::Show(m_hWnd, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
\r
762 m_bShowUnversioned = TRUE;
\r
763 GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);
\r
764 DWORD dwShow = (DWORD)(SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS);
\r
765 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);
\r
766 m_ListCtrl.Show(dwShow,dwShow&(~CTGitPath::LOGACTIONS_UNVER));
\r
770 CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);
\r
772 if(this->m_bWholeProject)
\r
773 SetWindowText(m_sWindowTitle + _T(" - ") + CString(_T("Whole Project")));
\r
775 SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());
\r
777 m_autolist.clear();
\r
778 // we don't have to block the commit dialog while we fetch the
\r
779 // auto completion list.
\r
780 m_pathwatcher.ClearChangedPaths();
\r
781 InterlockedExchange(&m_bBlock, FALSE);
\r
782 if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE)==TRUE)
\r
784 m_ListCtrl.Block(TRUE, TRUE);
\r
785 GetAutocompletionList();
\r
786 m_ListCtrl.Block(FALSE, FALSE);
\r
790 DialogEnableWindow(IDC_SHOWUNVERSIONED, true);
\r
791 DialogEnableWindow(IDC_WHOLE_PROJECT, true);
\r
792 DialogEnableWindow(IDC_SELECTALL, true);
\r
793 if (m_ListCtrl.HasChangeLists())
\r
794 DialogEnableWindow(IDC_KEEPLISTS, true);
\r
795 if (m_ListCtrl.HasLocks())
\r
796 DialogEnableWindow(IDC_WHOLE_PROJECT, true);
\r
797 // we have the list, now signal the main thread about it
\r
798 SendMessage(WM_AUTOLISTREADY); // only send the message if the thread wasn't told to quit!
\r
801 InterlockedExchange(&m_bRunThread, FALSE);
\r
802 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
803 // force the cursor to normal
\r
809 void CCommitDlg::OnCancel()
\r
811 m_bCancelled = true;
\r
814 m_pathwatcher.Stop();
\r
815 if (m_bThreadRunning)
\r
817 InterlockedExchange(&m_bRunThread, FALSE);
\r
818 WaitForSingleObject(m_pThread->m_hThread, 1000);
\r
819 if (m_bThreadRunning)
\r
821 // we gave the thread a chance to quit. Since the thread didn't
\r
822 // listen to us we have to kill it.
\r
823 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
\r
824 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
829 m_sLogMessage = m_cLogMessage.GetText();
\r
830 if (!m_sBugID.IsEmpty())
\r
832 m_sBugID.Replace(_T(", "), _T(","));
\r
833 m_sBugID.Replace(_T(" ,"), _T(","));
\r
834 CString sBugID = m_ProjectProperties.sMessage;
\r
835 sBugID.Replace(_T("%BUGID%"), m_sBugID);
\r
836 if (m_ProjectProperties.bAppend)
\r
837 m_sLogMessage += _T("\n") + sBugID + _T("\n");
\r
839 m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
\r
841 if (m_ProjectProperties.sLogTemplate.Compare(m_sLogMessage) != 0)
\r
842 m_History.AddEntry(m_sLogMessage);
\r
845 CResizableStandAloneDialog::OnCancel();
\r
848 void CCommitDlg::OnBnClickedSelectall()
\r
850 m_tooltips.Pop(); // hide the tooltips
\r
851 UINT state = (m_SelectAll.GetState() & 0x0003);
\r
852 if (state == BST_INDETERMINATE)
\r
854 // It is not at all useful to manually place the checkbox into the indeterminate state...
\r
855 // We will force this on to the unchecked state
\r
856 state = BST_UNCHECKED;
\r
857 m_SelectAll.SetCheck(state);
\r
859 m_ListCtrl.SelectAll(state == BST_CHECKED);
\r
862 BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)
\r
865 m_tooltips.RelayEvent(pMsg);
\r
869 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
\r
874 if (pMsg->message == WM_KEYDOWN)
\r
876 switch (pMsg->wParam)
\r
881 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
\r
887 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
889 if ( GetDlgItem(IDOK)->IsWindowEnabled() )
\r
891 PostMessage(WM_COMMAND, IDOK);
\r
895 if ( GetFocus()==GetDlgItem(IDC_BUGID) )
\r
897 // Pressing RETURN in the bug id control
\r
898 // moves the focus to the message
\r
899 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
907 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
\r
910 void CCommitDlg::Refresh()
\r
912 if (m_bThreadRunning)
\r
915 InterlockedExchange(&m_bBlock, TRUE);
\r
916 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
\r
917 if (m_pThread==NULL)
\r
919 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
920 InterlockedExchange(&m_bBlock, FALSE);
\r
924 m_pThread->m_bAutoDelete = FALSE;
\r
925 m_pThread->ResumeThread();
\r
929 void CCommitDlg::OnBnClickedHelp()
\r
934 void CCommitDlg::OnBnClickedShowunversioned()
\r
936 m_tooltips.Pop(); // hide the tooltips
\r
938 m_regAddBeforeCommit = m_bShowUnversioned;
\r
941 DWORD dwShow = m_ListCtrl.GetShowFlags();
\r
942 if (DWORD(m_regAddBeforeCommit))
\r
943 dwShow |= SVNSLC_SHOWUNVERSIONED;
\r
945 dwShow &= ~SVNSLC_SHOWUNVERSIONED;
\r
946 if(dwShow & SVNSLC_SHOWUNVERSIONED)
\r
948 if(m_bWholeProject)
\r
949 m_ListCtrl.GetStatus(NULL,false,false,true);
\r
951 m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);
\r
953 m_ListCtrl.Show(dwShow);
\r
957 void CCommitDlg::OnStnClickedExternalwarning()
\r
959 m_tooltips.Popup();
\r
962 void CCommitDlg::OnEnChangeLogmessage()
\r
967 LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)
\r
970 if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))
\r
972 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
\r
974 m_bShowUnversioned = TRUE;
\r
975 DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;
\r
976 m_ListCtrl.Show(dwShow);
\r
984 LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
\r
990 LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM /*lParam*/)
\r
993 BringWindowToTop();
\r
994 SetForegroundWindow();
\r
996 // if multiple files/folders are dropped
\r
997 // this handler is called for every single item
\r
999 // To avoid creating multiple refresh threads and
\r
1000 // causing crashes, we only add the items to the
\r
1001 // list control and start a timer.
\r
1002 // When the timer expires, we start the refresh thread,
\r
1003 // but only if it isn't already running - otherwise we
\r
1004 // restart the timer.
\r
1006 path.SetFromWin((LPCTSTR)lParam);
\r
1008 // just add all the items we get here.
\r
1009 // if the item is versioned, the add will fail but nothing
\r
1010 // more will happen.
\r
1012 Git.Add(CTGitPathList(path), &m_ProjectProperties, Git_depth_empty, false, true, true);
\r
1014 if (!m_ListCtrl.HasPath(path))
\r
1016 if (m_pathList.AreAllPathsFiles())
\r
1018 m_pathList.AddPath(path);
\r
1019 m_pathList.RemoveDuplicates();
\r
1020 m_updatedPathList.AddPath(path);
\r
1021 m_updatedPathList.RemoveDuplicates();
\r
1025 // if the path list contains folders, we have to check whether
\r
1026 // our just (maybe) added path is a child of one of those. If it is
\r
1027 // a child of a folder already in the list, we must not add it. Otherwise
\r
1028 // that path could show up twice in the list.
\r
1029 bool bHasParentInList = false;
\r
1030 for (int i=0; i<m_pathList.GetCount(); ++i)
\r
1032 if (m_pathList[i].IsAncestorOf(path))
\r
1034 bHasParentInList = true;
\r
1038 if (!bHasParentInList)
\r
1040 m_pathList.AddPath(path);
\r
1041 m_pathList.RemoveDuplicates();
\r
1042 m_updatedPathList.AddPath(path);
\r
1043 m_updatedPathList.RemoveDuplicates();
\r
1048 // Always start the timer, since the status of an existing item might have changed
\r
1049 SetTimer(REFRESHTIMER, 200, NULL);
\r
1050 ATLTRACE(_T("Item %s dropped, timer started\n"), path.GetWinPath());
\r
1055 LRESULT CCommitDlg::OnAutoListReady(WPARAM, LPARAM)
\r
1057 m_cLogMessage.SetAutoCompletionList(m_autolist, '*');
\r
1061 //////////////////////////////////////////////////////////////////////////
\r
1062 // functions which run in the status thread
\r
1063 //////////////////////////////////////////////////////////////////////////
\r
1065 void CCommitDlg::ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex)
\r
1070 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
\r
1071 while (m_bRunThread && file.ReadString(strLine))
\r
1073 int eqpos = strLine.Find('=');
\r
1075 rgx = strLine.Mid(eqpos+1).Trim();
\r
1078 while (((pos = strLine.Find(','))>=0)&&(pos < eqpos))
\r
1080 mapRegex[strLine.Left(pos)] = rgx;
\r
1081 strLine = strLine.Mid(pos+1).Trim();
\r
1083 mapRegex[strLine.Left(strLine.Find('=')).Trim()] = rgx;
\r
1087 catch (CFileException* pE)
\r
1089 TRACE("CFileException loading auto list regex file\n");
\r
1094 void CCommitDlg::GetAutocompletionList()
\r
1096 // the auto completion list is made of strings from each selected files.
\r
1097 // the strings used are extracted from the files with regexes found
\r
1098 // in the file "autolist.txt".
\r
1099 // the format of that file is:
\r
1100 // file extensions separated with commas '=' regular expression to use
\r
1102 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
\r
1103 // .cpp = (?<=[^\s]::)\b\w+\b
\r
1105 std::map<CString, CString> mapRegex;
\r
1106 CString sRegexFile = CPathUtils::GetAppDirectory();
\r
1107 CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);
\r
1108 DWORD timeoutvalue = regtimeout*1000;
\r
1109 sRegexFile += _T("autolist.txt");
\r
1110 if (!m_bRunThread)
\r
1112 ParseRegexFile(sRegexFile, mapRegex);
\r
1113 SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sRegexFile.GetBuffer(MAX_PATH+1));
\r
1114 sRegexFile.ReleaseBuffer();
\r
1115 sRegexFile += _T("\\TortoiseGit\\autolist.txt");
\r
1116 if (PathFileExists(sRegexFile))
\r
1118 ParseRegexFile(sRegexFile, mapRegex);
\r
1120 DWORD starttime = GetTickCount();
\r
1122 // now we have two arrays of strings, where the first array contains all
\r
1123 // file extensions we can use and the second the corresponding regex strings
\r
1124 // to apply to those files.
\r
1126 // the next step is to go over all files shown in the commit dialog
\r
1127 // and scan them for strings we can use
\r
1128 int nListItems = m_ListCtrl.GetItemCount();
\r
1130 for (int i=0; i<nListItems && m_bRunThread; ++i)
\r
1132 // stop parsing after timeout
\r
1133 if ((!m_bRunThread) || (GetTickCount() - starttime > timeoutvalue))
\r
1136 CTGitPath *path = (CTGitPath*)m_ListCtrl.GetItemData(i);
\r
1141 CString sPartPath =path->GetGitPathString();
\r
1142 m_autolist.insert(sPartPath);
\r
1144 // const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);
\r
1148 // add the path parts to the auto completion list too
\r
1149 // CString sPartPath = entry->GetRelativeGitPath();
\r
1150 // m_autolist.insert(sPartPath);
\r
1155 while ((pos = sPartPath.Find('/', pos)) >= 0)
\r
1159 m_autolist.insert(sPartPath.Mid(pos));
\r
1162 // Last inserted entry is a file name.
\r
1163 // Some users prefer to also list file name without extension.
\r
1164 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE))
\r
1166 int dotPos = sPartPath.ReverseFind('.');
\r
1167 if ((dotPos >= 0) && (dotPos > lastPos))
\r
1168 m_autolist.insert(sPartPath.Mid(lastPos, dotPos - lastPos));
\r
1171 if ((entry->status <= Git_wc_status_normal)||(entry->status == Git_wc_status_ignored))
\r
1174 CString sExt = entry->GetPath().GetFileExtension();
\r
1176 // find the regex string which corresponds to the file extension
\r
1177 CString rdata = mapRegex[sExt];
\r
1178 if (rdata.IsEmpty())
\r
1181 ScanFile(entry->GetPath().GetWinPathString(), rdata);
\r
1182 if ((entry->textstatus != Git_wc_status_unversioned) &&
\r
1183 (entry->textstatus != Git_wc_status_none) &&
\r
1184 (entry->textstatus != Git_wc_status_ignored) &&
\r
1185 (entry->textstatus != Git_wc_status_added) &&
\r
1186 (entry->textstatus != Git_wc_status_normal))
\r
1188 CTGitPath basePath = Git::GetPristinePath(entry->GetPath());
\r
1189 if (!basePath.IsEmpty())
\r
1190 ScanFile(basePath.GetWinPathString(), rdata);
\r
1194 ATLTRACE(_T("Auto completion list loaded in %d msec\n"), GetTickCount() - starttime);
\r
1197 void CCommitDlg::ScanFile(const CString& sFilePath, const CString& sRegex)
\r
1199 wstring sFileContent;
\r
1200 HANDLE hFile = CreateFile(sFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);
\r
1201 if (hFile != INVALID_HANDLE_VALUE)
\r
1203 DWORD size = GetFileSize(hFile, NULL);
\r
1204 if (size > 1000000L)
\r
1206 // no files bigger than 1 Meg
\r
1207 CloseHandle(hFile);
\r
1210 // allocate memory to hold file contents
\r
1211 char * buffer = new char[size];
\r
1213 ReadFile(hFile, buffer, size, &readbytes, NULL);
\r
1214 CloseHandle(hFile);
\r
1216 IsTextUnicode(buffer, readbytes, &opts);
\r
1217 if (opts & IS_TEXT_UNICODE_NULL_BYTES)
\r
1222 if (opts & IS_TEXT_UNICODE_UNICODE_MASK)
\r
1224 sFileContent = wstring((wchar_t*)buffer, readbytes/sizeof(WCHAR));
\r
1226 if ((opts & IS_TEXT_UNICODE_NOT_UNICODE_MASK)||(opts == 0))
\r
1228 int ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, NULL, 0);
\r
1229 wchar_t * pWideBuf = new wchar_t[ret];
\r
1230 int ret2 = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, pWideBuf, ret);
\r
1232 sFileContent = wstring(pWideBuf, ret);
\r
1233 delete [] pWideBuf;
\r
1237 if (sFileContent.empty()|| !m_bRunThread)
\r
1244 const tr1::wregex regCheck(sRegex, tr1::regex_constants::icase | tr1::regex_constants::ECMAScript);
\r
1245 const tr1::wsregex_iterator end;
\r
1246 wstring s = sFileContent;
\r
1247 for (tr1::wsregex_iterator it(s.begin(), s.end(), regCheck); it != end; ++it)
\r
1249 const tr1::wsmatch match = *it;
\r
1250 for (size_t i=1; i<match.size(); ++i)
\r
1252 if (match[i].second-match[i].first)
\r
1254 ATLTRACE(_T("matched keyword : %s\n"), wstring(match[i]).c_str());
\r
1255 m_autolist.insert(wstring(match[i]).c_str());
\r
1260 catch (exception) {}
\r
1263 // CSciEditContextMenuInterface
\r
1264 void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
\r
1266 CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));
\r
1267 m_nPopupPasteListCmd = nCmd++;
\r
1268 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);
\r
1270 //CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));
\r
1271 if(m_History.GetCount() > 0)
\r
1273 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);
\r
1274 m_nPopupPasteLastMessage = nCmd++;
\r
1275 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);
\r
1280 bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
\r
1285 if (cmd == m_nPopupPasteListCmd)
\r
1288 TCHAR buf[MAX_STATUS_STRING_LENGTH];
\r
1289 int nListItems = m_ListCtrl.GetItemCount();
\r
1290 for (int i=0; i<nListItems; ++i)
\r
1292 CTGitPath * entry = (CTGitPath*)m_ListCtrl.GetItemData(i);
\r
1293 if (entry&&entry->m_Checked)
\r
1296 CString status = entry->GetActionName();
\r
1297 if(entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
\r
1298 status = _T("Add");
\r
1300 //git_wc_status_kind status = entry->status;
\r
1301 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
1302 if (m_ProjectProperties.bFileListInEnglish)
\r
1305 line.Format(_T("%-10s %s\r\n"),status , (LPCTSTR)m_ListCtrl.GetItemText(i,0));
\r
1309 pSciEdit->InsertText(logmsg);
\r
1313 if(cmd == m_nPopupPasteLastMessage)
\r
1315 if(m_History.GetCount() ==0 )
\r
1319 logmsg +=m_History.GetEntry(0);
\r
1320 pSciEdit->InsertText(logmsg);
\r
1326 void CCommitDlg::OnTimer(UINT_PTR nIDEvent)
\r
1330 case ENDDIALOGTIMER:
\r
1331 KillTimer(ENDDIALOGTIMER);
\r
1334 case REFRESHTIMER:
\r
1335 if (m_bThreadRunning)
\r
1337 SetTimer(REFRESHTIMER, 200, NULL);
\r
1338 ATLTRACE("Wait some more before refreshing\n");
\r
1342 KillTimer(REFRESHTIMER);
\r
1343 ATLTRACE("Refreshing after items dropped\n");
\r
1348 __super::OnTimer(nIDEvent);
\r
1351 void CCommitDlg::OnBnClickedHistory()
\r
1353 m_tooltips.Pop(); // hide the tooltips
\r
1354 if (m_pathList.GetCount() == 0)
\r
1357 CHistoryDlg historyDlg;
\r
1358 historyDlg.SetHistory(m_History);
\r
1359 if (historyDlg.DoModal() != IDOK)
\r
1362 CString sMsg = historyDlg.GetSelectedText();
\r
1363 if (sMsg != m_cLogMessage.GetText().Left(sMsg.GetLength()))
\r
1365 CString sBugID = m_ProjectProperties.GetBugIDFromLog(sMsg);
\r
1366 if (!sBugID.IsEmpty())
\r
1368 SetDlgItemText(IDC_BUGID, sBugID);
\r
1370 if (m_ProjectProperties.sLogTemplate.Compare(m_cLogMessage.GetText())!=0)
\r
1371 m_cLogMessage.InsertText(sMsg, !m_cLogMessage.GetText().IsEmpty());
\r
1373 m_cLogMessage.SetText(sMsg);
\r
1377 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
1381 void CCommitDlg::OnBnClickedBugtraqbutton()
\r
1383 m_tooltips.Pop(); // hide the tooltips
\r
1384 CString sMsg = m_cLogMessage.GetText();
\r
1386 if (m_BugTraqProvider == NULL)
\r
1389 BSTR parameters = m_bugtraq_association.GetParameters().AllocSysString();
\r
1390 BSTR commonRoot = SysAllocString(g_Git.m_CurrentDir);
\r
1391 SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_pathList.GetCount());
\r
1393 for (LONG index = 0; index < m_pathList.GetCount(); ++index)
\r
1394 SafeArrayPutElement(pathList, &index, m_pathList[index].GetGitPathString().AllocSysString());
\r
1396 BSTR originalMessage = sMsg.AllocSysString();
\r
1398 // m_revProps.clear();
\r
1400 // first try the IBugTraqProvider2 interface
\r
1401 CComPtr<IBugTraqProvider2> pProvider2 = NULL;
\r
1402 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
\r
1403 if (SUCCEEDED(hr))
\r
1405 //CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();
\r
1406 BSTR repositoryRoot = g_Git.m_CurrentDir.AllocSysString();
\r
1407 BSTR bugIDOut = NULL;
\r
1408 GetDlgItemText(IDC_BUGID, m_sBugID);
\r
1409 BSTR bugID = m_sBugID.AllocSysString();
\r
1410 SAFEARRAY * revPropNames = NULL;
\r
1411 SAFEARRAY * revPropValues = NULL;
\r
1412 if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, bugID, &bugIDOut, &revPropNames, &revPropValues, &temp)))
\r
1415 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
\r
1416 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
\r
1422 m_sBugID = bugIDOut;
\r
1423 SysFreeString(bugIDOut);
\r
1424 SetDlgItemText(IDC_BUGID, m_sBugID);
\r
1426 SysFreeString(bugID);
\r
1427 SysFreeString(repositoryRoot);
\r
1428 m_cLogMessage.SetText(temp);
\r
1429 BSTR HUGEP *pbRevNames;
\r
1430 BSTR HUGEP *pbRevValues;
\r
1432 HRESULT hr1 = SafeArrayAccessData(revPropNames, (void HUGEP**)&pbRevNames);
\r
1433 if (SUCCEEDED(hr1))
\r
1435 HRESULT hr2 = SafeArrayAccessData(revPropValues, (void HUGEP**)&pbRevValues);
\r
1436 if (SUCCEEDED(hr2))
\r
1438 if (revPropNames->rgsabound->cElements == revPropValues->rgsabound->cElements)
\r
1440 for (ULONG i = 0; i < revPropNames->rgsabound->cElements; i++)
\r
1442 // m_revProps[pbRevNames[i]] = pbRevValues[i];
\r
1445 SafeArrayUnaccessData(revPropValues);
\r
1447 SafeArrayUnaccessData(revPropNames);
\r
1450 SafeArrayDestroy(revPropNames);
\r
1451 if (revPropValues)
\r
1452 SafeArrayDestroy(revPropValues);
\r
1457 // if IBugTraqProvider2 failed, try IBugTraqProvider
\r
1458 CComPtr<IBugTraqProvider> pProvider = NULL;
\r
1459 hr = m_BugTraqProvider.QueryInterface(&pProvider);
\r
1463 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
\r
1464 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
\r
1468 if (FAILED(hr = pProvider->GetCommitMessage(GetSafeHwnd(), parameters, commonRoot, pathList, originalMessage, &temp)))
\r
1471 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
\r
1472 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
\r
1475 m_cLogMessage.SetText(temp);
\r
1477 m_sLogMessage = m_cLogMessage.GetText();
\r
1478 if (!m_ProjectProperties.sMessage.IsEmpty())
\r
1480 CString sBugID = m_ProjectProperties.FindBugID(m_sLogMessage);
\r
1481 if (!sBugID.IsEmpty())
\r
1483 SetDlgItemText(IDC_BUGID, sBugID);
\r
1487 m_cLogMessage.SetFocus();
\r
1489 SysFreeString(parameters);
\r
1490 SysFreeString(commonRoot);
\r
1491 SafeArrayDestroy(pathList);
\r
1492 SysFreeString(originalMessage);
\r
1493 SysFreeString(temp);
\r
1497 LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)
\r
1503 void CCommitDlg::UpdateOKButton()
\r
1506 BOOL bValidLogSize = FALSE;
\r
1508 if (m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize)
\r
1509 bValidLogSize = !m_bBlock;
\r
1511 LONG nSelectedItems = m_ListCtrl.GetSelected();
\r
1512 DialogEnableWindow(IDOK, bValidLogSize && nSelectedItems>0);
\r
1517 LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
1519 switch (message) {
\r
1521 if (wParam == IDC_SPLITTER)
\r
1523 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
1524 DoSize(pHdr->delta);
\r
1529 return __super::DefWindowProc(message, wParam, lParam);
\r
1532 void CCommitDlg::SetSplitterRange()
\r
1534 if ((m_ListCtrl)&&(m_cLogMessage))
\r
1537 m_cLogMessage.GetWindowRect(rcTop);
\r
1538 ScreenToClient(rcTop);
\r
1540 m_ListCtrl.GetWindowRect(rcMiddle);
\r
1541 ScreenToClient(rcMiddle);
\r
1542 if (rcMiddle.Height() && rcMiddle.Width())
\r
1543 m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);
\r
1547 void CCommitDlg::DoSize(int delta)
\r
1549 RemoveAnchor(IDC_MESSAGEGROUP);
\r
1550 RemoveAnchor(IDC_LOGMESSAGE);
\r
1551 RemoveAnchor(IDC_SPLITTER);
\r
1552 RemoveAnchor(IDC_SIGNOFF);
\r
1553 RemoveAnchor(IDC_COMMIT_AMEND);
\r
1554 RemoveAnchor(IDC_LISTGROUP);
\r
1555 RemoveAnchor(IDC_FILELIST);
\r
1556 CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN);
\r
1557 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN);
\r
1558 CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN);
\r
1559 CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN);
\r
1560 CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta);
\r
1561 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND),0,delta);
\r
1562 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
\r
1563 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
\r
1564 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
\r
1565 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
\r
1566 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
\r
1567 AddAnchor(IDC_SIGNOFF,TOP_RIGHT);
\r
1568 AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
\r
1570 // adjust the minimum size of the dialog to prevent the resizing from
\r
1571 // moving the list control too far down.
\r
1573 m_cLogMessage.GetClientRect(rcLogMsg);
\r
1574 SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_LogMsgOrigRect.Height()+rcLogMsg.Height()));
\r
1576 SetSplitterRange();
\r
1577 m_cLogMessage.Invalidate();
\r
1578 GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
\r
1581 void CCommitDlg::OnSize(UINT nType, int cx, int cy)
\r
1583 // first, let the resizing take place
\r
1584 __super::OnSize(nType, cx, cy);
\r
1587 SetSplitterRange();
\r
1591 void CCommitDlg::OnBnClickedSignOff()
\r
1593 // TODO: Add your control notification handler code here
\r
1597 username=g_Git.GetUserName();
\r
1598 email=g_Git.GetUserEmail();
\r
1599 username.Remove(_T('\n'));
\r
1600 email.Remove(_T('\n'));
\r
1601 str.Format(_T("Signed-off-by: %s <%s>\n"),username,email);
\r
1603 m_cLogMessage.SetText(m_cLogMessage.GetText()+_T("\r\n\r\n")+str);
\r
1606 void CCommitDlg::OnStnClickedCommitlabel()
\r
1608 // TODO: Add your control notification handler code here
\r
1611 void CCommitDlg::OnBnClickedCommitAmend()
\r
1613 // TODO: Add your control notification handler code here
\r
1614 this->UpdateData();
\r
1615 if(this->m_bCommitAmend && this->m_AmendStr.IsEmpty())
\r
1618 BYTE_VECTOR vector;
\r
1619 CString head(_T("HEAD"));
\r
1620 g_Git.GetLog(vector,head,NULL,1);
\r
1621 rev.ParserFromLog(vector);
\r
1622 m_AmendStr=rev.m_Subject+_T("\n\n")+rev.m_Body;
\r
1625 if(this->m_bCommitAmend)
\r
1627 this->m_NoAmendStr=this->m_cLogMessage.GetText();
\r
1628 m_cLogMessage.SetText(m_AmendStr);
\r
1632 this->m_AmendStr=this->m_cLogMessage.GetText();
\r
1633 m_cLogMessage.SetText(m_NoAmendStr);
\r
1639 void CCommitDlg::OnBnClickedWholeProject()
\r
1641 // TODO: Add your control notification handler code here
\r
1642 m_tooltips.Pop(); // hide the tooltips
\r
1644 m_ListCtrl.Clear();
\r
1647 if(m_bWholeProject)
\r
1648 m_ListCtrl.GetStatus(NULL,true,false,true);
\r
1650 m_ListCtrl.GetStatus(&this->m_pathList,true,false,true);
\r
1652 m_ListCtrl.Show(m_ListCtrl.GetShowFlags());
\r
1655 CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);
\r
1657 if(this->m_bWholeProject)
\r
1658 SetWindowText(m_sWindowTitle + _T(" - ") + CString(_T("Whole Project")));
\r
1660 SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());
\r
1664 void CCommitDlg::OnStnClickedBugidlabel()
\r
1666 // TODO: Add your control notification handler code here
\r
1669 void CCommitDlg::OnFocusMessage()
\r
1671 m_cLogMessage.SetFocus();
\r