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 "GitProperties.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
37 #define new DEBUG_NEW
\r
39 static char THIS_FILE[] = __FILE__;
\r
42 UINT CCommitDlg::WM_AUTOLISTREADY = RegisterWindowMessage(_T("TORTOISEGIT_AUTOLISTREADY_MSG"));
\r
44 IMPLEMENT_DYNAMIC(CCommitDlg, CResizableStandAloneDialog)
\r
45 CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)
\r
46 : CResizableStandAloneDialog(CCommitDlg::IDD, pParent)
\r
47 , m_bRecursive(FALSE)
\r
48 , m_bShowUnversioned(FALSE)
\r
50 , m_bThreadRunning(FALSE)
\r
51 , m_bRunThread(FALSE)
\r
53 , m_bKeepLocks(FALSE)
\r
54 , m_bKeepChangeList(TRUE)
\r
56 , m_bSelectFilesForCommit(TRUE)
\r
60 CCommitDlg::~CCommitDlg()
\r
62 if(m_pThread != NULL)
\r
68 void CCommitDlg::DoDataExchange(CDataExchange* pDX)
\r
70 CResizableStandAloneDialog::DoDataExchange(pDX);
\r
71 DDX_Control(pDX, IDC_FILELIST, m_ListCtrl);
\r
72 DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);
\r
73 DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);
\r
74 DDX_Control(pDX, IDC_SELECTALL, m_SelectAll);
\r
75 DDX_Text(pDX, IDC_BUGID, m_sBugID);
\r
76 DDX_Check(pDX, IDC_KEEPLOCK, m_bKeepLocks);
\r
77 DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);
\r
78 DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);
\r
79 DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);
\r
82 BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)
\r
83 ON_BN_CLICKED(IDC_SELECTALL, OnBnClickedSelectall)
\r
84 ON_BN_CLICKED(IDHELP, OnBnClickedHelp)
\r
85 ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)
\r
86 // ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)
\r
87 ON_BN_CLICKED(IDC_BUGTRAQBUTTON, OnBnClickedBugtraqbutton)
\r
88 ON_EN_CHANGE(IDC_LOGMESSAGE, OnEnChangeLogmessage)
\r
89 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED, OnGitStatusListCtrlItemCountChanged)
\r
90 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnGitStatusListCtrlNeedsRefresh)
\r
91 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped)
\r
92 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_CHECKCHANGED, &CCommitDlg::OnGitStatusListCtrlCheckChanged)
\r
93 ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY, OnAutoListReady)
\r
96 ON_STN_CLICKED(IDC_EXTERNALWARNING, &CCommitDlg::OnStnClickedExternalwarning)
\r
97 ON_BN_CLICKED(IDC_SIGNOFF, &CCommitDlg::OnBnClickedSignOff)
\r
98 ON_STN_CLICKED(IDC_COMMITLABEL, &CCommitDlg::OnStnClickedCommitlabel)
\r
99 ON_BN_CLICKED(IDC_COMMIT_AMEND, &CCommitDlg::OnBnClickedCommitAmend)
\r
102 BOOL CCommitDlg::OnInitDialog()
\r
104 CResizableStandAloneDialog::OnInitDialog();
\r
106 m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);
\r
107 m_bShowUnversioned = m_regAddBeforeCommit;
\r
109 m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));
\r
111 m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE);
\r
112 m_bKeepChangeList = m_regKeepChangelists;
\r
114 // GitConfig config;
\r
115 // m_bKeepLocks = config.KeepLocks();
\r
119 m_ListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS , _T("CommitDlg"));
\r
120 m_ListCtrl.SetSelectButton(&m_SelectAll);
\r
121 m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));
\r
122 m_ListCtrl.SetCancelBool(&m_bCancelled);
\r
123 m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);
\r
124 m_ListCtrl.EnableFileDrop();
\r
125 m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);
\r
127 //this->DialogEnableWindow(IDC_COMMIT_AMEND,FALSE);
\r
128 // m_ProjectProperties.ReadPropsPathList(m_pathList);
\r
129 m_cLogMessage.Init(m_ProjectProperties);
\r
130 m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));
\r
131 m_cLogMessage.RegisterContextMenuHandler(this);
\r
133 OnEnChangeLogmessage();
\r
135 m_tooltips.Create(this);
\r
136 m_tooltips.AddTool(IDC_EXTERNALWARNING, IDS_COMMITDLG_EXTERNALS);
\r
137 m_tooltips.AddTool(IDC_COMMIT_AMEND,IDS_COMMIT_AMEND_TT);
\r
138 // m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);
\r
140 m_SelectAll.SetCheck(BST_INDETERMINATE);
\r
143 CBugTraqAssociations bugtraq_associations;
\r
144 bugtraq_associations.Load();
\r
146 if (bugtraq_associations.FindProvider(m_pathList, &m_bugtraq_association))
\r
148 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
\r
149 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
\r
151 CComPtr<IBugTraqProvider> pProvider;
\r
152 HRESULT hr = pProvider.CoCreateInstance(m_bugtraq_association.GetProviderClass());
\r
155 m_BugTraqProvider = pProvider;
\r
157 if (SUCCEEDED(hr = pProvider->GetLinkText(GetSafeHwnd(), m_bugtraq_association.GetParameters().AllocSysString(), &temp)))
\r
159 SetDlgItemText(IDC_BUGTRAQBUTTON, temp);
\r
160 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(TRUE);
\r
161 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_SHOW);
\r
164 SysFreeString(temp);
\r
167 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
169 else if (!m_ProjectProperties.sMessage.IsEmpty())
\r
171 GetDlgItem(IDC_BUGID)->ShowWindow(SW_SHOW);
\r
172 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_SHOW);
\r
173 if (!m_ProjectProperties.sLabel.IsEmpty())
\r
174 SetDlgItemText(IDC_BUGIDLABEL, m_ProjectProperties.sLabel);
\r
175 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);
\r
176 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);
\r
177 GetDlgItem(IDC_BUGID)->SetFocus();
\r
178 CString sBugID = m_ProjectProperties.GetBugIDFromLog(m_sLogMessage);
\r
179 if (!sBugID.IsEmpty())
\r
181 SetDlgItemText(IDC_BUGID, sBugID);
\r
187 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
\r
188 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
\r
189 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);
\r
190 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);
\r
191 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
194 if (!m_sLogMessage.IsEmpty())
\r
195 m_cLogMessage.SetText(m_sLogMessage);
\r
197 GetWindowText(m_sWindowTitle);
\r
199 AdjustControlSize(IDC_SHOWUNVERSIONED);
\r
200 AdjustControlSize(IDC_SELECTALL);
\r
201 AdjustControlSize(IDC_KEEPLOCK);
\r
203 GetClientRect(m_DlgOrigRect);
\r
204 m_cLogMessage.GetClientRect(m_LogMsgOrigRect);
\r
206 AddAnchor(IDC_COMMITLABEL, TOP_LEFT, TOP_RIGHT);
\r
207 AddAnchor(IDC_BUGIDLABEL, TOP_RIGHT);
\r
208 AddAnchor(IDC_BUGID, TOP_RIGHT);
\r
209 AddAnchor(IDC_BUGTRAQBUTTON, TOP_RIGHT);
\r
210 AddAnchor(IDC_COMMIT_TO, TOP_LEFT, TOP_RIGHT);
\r
211 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
\r
212 // AddAnchor(IDC_HISTORY, TOP_LEFT);
\r
213 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
\r
214 AddAnchor(IDC_SIGNOFF, TOP_RIGHT);
\r
215 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
\r
216 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
\r
217 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
\r
218 AddAnchor(IDC_SHOWUNVERSIONED, BOTTOM_LEFT);
\r
219 AddAnchor(IDC_SELECTALL, BOTTOM_LEFT);
\r
220 AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);
\r
221 AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
222 AddAnchor(IDC_KEEPLOCK, BOTTOM_LEFT);
\r
223 AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);
\r
224 AddAnchor(IDOK, BOTTOM_RIGHT);
\r
225 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
\r
226 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
227 AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
\r
230 CenterWindow(CWnd::FromHandle(hWndExplorer));
\r
231 EnableSaveRestore(_T("CommitDlg"));
\r
232 DWORD yPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
\r
233 RECT rcDlg, rcLogMsg, rcFileList;
\r
234 GetClientRect(&rcDlg);
\r
235 m_cLogMessage.GetWindowRect(&rcLogMsg);
\r
236 ScreenToClient(&rcLogMsg);
\r
237 m_ListCtrl.GetWindowRect(&rcFileList);
\r
238 ScreenToClient(&rcFileList);
\r
242 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
243 ScreenToClient(&rectSplitter);
\r
244 int delta = yPos - rectSplitter.top;
\r
245 if ((rcLogMsg.bottom + delta > rcLogMsg.top)&&(rcLogMsg.bottom + delta < rcFileList.bottom - 30))
\r
247 m_wndSplitter.SetWindowPos(NULL, 0, yPos, 0, 0, SWP_NOSIZE);
\r
252 // add all directories to the watcher
\r
253 for (int i=0; i<m_pathList.GetCount(); ++i)
\r
255 if (m_pathList[i].IsDirectory())
\r
256 m_pathwatcher.AddPath(m_pathList[i]);
\r
259 m_updatedPathList = m_pathList;
\r
261 //first start a thread to obtain the file list with the status without
\r
262 //blocking the dialog
\r
263 InterlockedExchange(&m_bBlock, TRUE);
\r
264 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
\r
265 if (m_pThread==NULL)
\r
267 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
268 InterlockedExchange(&m_bBlock, FALSE);
\r
272 m_pThread->m_bAutoDelete = FALSE;
\r
273 m_pThread->ResumeThread();
\r
275 CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);
\r
276 CRegDWORD historyhint = CRegDWORD(_T("Software\\TortoiseGit\\HistoryHintShown"), FALSE);
\r
277 if ((((DWORD)err)!=FALSE)&&((((DWORD)historyhint)==FALSE)))
\r
279 historyhint = TRUE;
\r
280 // ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);
\r
284 this->UpdateData(TRUE);
\r
285 this->m_bCommitAmend=FALSE;
\r
286 this->UpdateData(FALSE);
\r
288 return FALSE; // return TRUE unless you set the focus to a control
\r
289 // EXCEPTION: OCX Property Pages should return FALSE
\r
292 void CCommitDlg::OnOK()
\r
296 if (m_bThreadRunning)
\r
298 m_bCancelled = true;
\r
299 InterlockedExchange(&m_bRunThread, FALSE);
\r
300 WaitForSingleObject(m_pThread->m_hThread, 1000);
\r
301 if (m_bThreadRunning)
\r
303 // we gave the thread a chance to quit. Since the thread didn't
\r
304 // listen to us we have to kill it.
\r
305 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
\r
306 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
309 this->UpdateData();
\r
312 GetDlgItemText(IDC_BUGID, id);
\r
313 if (!m_ProjectProperties.CheckBugID(id))
\r
315 ShowBalloon(IDC_BUGID, IDS_COMMITDLG_ONLYNUMBERS, IDI_EXCLAMATION);
\r
318 m_sLogMessage = m_cLogMessage.GetText();
\r
319 if ( m_sLogMessage.IsEmpty() )
\r
321 // no message entered, go round again
\r
322 CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOMESSAGE, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
325 if ((m_ProjectProperties.bWarnIfNoIssue) && (id.IsEmpty() && !m_ProjectProperties.HasBugID(m_sLogMessage)))
\r
327 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOISSUEWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)
\r
332 CRegDWORD regUnversionedRecurse (_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE);
\r
333 if (!(DWORD)regUnversionedRecurse)
\r
335 // Find unversioned directories which are marked for commit. The user might expect them
\r
336 // to be added recursively since he cannot the the files. Let's ask the user if he knows
\r
337 // what he is doing.
\r
338 int nListItems = m_ListCtrl.GetItemCount();
\r
339 for (int j=0; j<nListItems; j++)
\r
341 const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);
\r
342 if (entry->IsChecked() && (entry->status == Git_wc_status_unversioned) && entry->IsFolder() )
\r
344 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_UNVERSIONEDFOLDERWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)
\r
350 m_pathwatcher.Stop();
\r
351 InterlockedExchange(&m_bBlock, TRUE);
\r
352 CDWordArray arDeleted;
\r
353 //first add all the unversioned files the user selected
\r
354 //and check if all versioned files are selected
\r
356 m_bRecursive = true;
\r
357 int nListItems = m_ListCtrl.GetItemCount();
\r
359 CTGitPathList itemsToAdd;
\r
360 CTGitPathList itemsToRemove;
\r
361 //std::set<CString> checkedLists;
\r
362 //std::set<CString> uncheckedLists;
\r
364 //CString checkedfiles;
\r
365 //CString uncheckedfiles;
\r
370 for (int j=0; j<nListItems; j++)
\r
372 //const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);
\r
373 CTGitPath *entry = (CTGitPath*)m_ListCtrl.GetItemData(j);
\r
374 if (entry->m_Checked)
\r
377 if (entry->status == Git_wc_status_unversioned)
\r
379 itemsToAdd.AddPath(entry->GetPath());
\r
381 if (entry->status == Git_wc_status_conflicted)
\r
383 bHasConflicted = true;
\r
385 if (entry->status == Git_wc_status_missing)
\r
387 itemsToRemove.AddPath(entry->GetPath());
\r
389 if (entry->status == Git_wc_status_deleted)
\r
393 if (entry->IsInExternal())
\r
395 bCheckedInExternal = true;
\r
398 if( entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
\r
399 cmd.Format(_T("git.exe add -f -- \"%s\""),entry->GetGitPathString());
\r
400 else if ( entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
401 cmd.Format(_T("git.exe update-index --remove -- \"%s\""),entry->GetGitPathString());
\r
403 cmd.Format(_T("git.exe update-index -- \"%s\""),entry->GetGitPathString());
\r
405 g_Git.Run(cmd,&out,CP_OEMCP);
\r
407 //checkedLists.insert(entry->GetGitPathString());
\r
408 // checkedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");
\r
412 //uncheckedLists.insert(entry->GetGitPathString());
\r
413 if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
414 { //To init git repository, there are not HEAD, so we can use git reset command
\r
415 cmd.Format(_T("git.exe rm --cache -- \"%s\""),entry->GetGitPathString());
\r
416 g_Git.Run(cmd,&out,CP_OEMCP);
\r
420 cmd.Format(_T("git.exe reset -- %s"),entry->GetGitPathString());
\r
421 g_Git.Run(cmd,&out,CP_OEMCP);
\r
424 // uncheckedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");
\r
426 if ((entry->status != Git_wc_status_unversioned) &&
\r
427 (entry->status != Git_wc_status_ignored))
\r
430 uncheckedLists.insert(entry->GetChangeList());
\r
433 // This algorithm is for the sake of simplicity of the complexity O(N?
\r
434 for (int k=0; k<nListItems; k++)
\r
436 const CGitStatusListCtrl::FileEntry * entryK = m_ListCtrl.GetListEntry(k);
\r
437 if (entryK->IsChecked() && entryK->GetPath().IsAncestorOf(entry->GetPath()) )
\r
439 // Fall back to a non-recursive commit to prevent items being
\r
440 // committed which aren't checked although its parent is checked
\r
441 // (property change, directory deletion, ... )
\r
442 m_bRecursive = false;
\r
452 //if(uncheckedfiles.GetLength()>0)
\r
454 // cmd.Format(_T("git.exe reset -- %s"),uncheckedfiles);
\r
455 // g_Git.Run(cmd,&out);
\r
458 //if(checkedfiles.GetLength()>0)
\r
459 if(nchecked||m_bCommitAmend)
\r
461 // cmd.Format(_T("git.exe update-index -- %s"),checkedfiles);
\r
462 // g_Git.Run(cmd,&out);
\r
464 CString tempfile=::GetTempFile();
\r
465 CFile file(tempfile,CFile::modeReadWrite|CFile::modeCreate );
\r
466 CStringA log=CUnicodeUtils::GetUTF8( m_sLogMessage);
\r
467 file.Write(log,log.GetLength());
\r
468 //file.WriteString(m_sLogMessage);
\r
473 if(this->m_bCommitAmend)
\r
475 amend=_T("--amend");
\r
477 cmd.Format(_T("git.exe commit %s -F \"%s\""),amend, tempfile);
\r
478 g_Git.Run(cmd,&out,CP_OEMCP);
\r
480 CFile::Remove(tempfile);
\r
482 CMessageBox::Show(this->m_hWnd, out, _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);
\r
484 CMessageBox::Show(this->m_hWnd, _T("Nothing Commit"), _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);
\r
486 if (m_pathwatcher.GetNumberOfChangedPaths() && m_bRecursive)
\r
488 // There are paths which got changed (touched at least).
\r
489 // We have to find out if this affects the selection in the commit dialog
\r
490 // If it could affect the selection, revert back to a non-recursive commit
\r
491 CTGitPathList changedList = m_pathwatcher.GetChangedPaths();
\r
492 changedList.RemoveDuplicates();
\r
493 for (int i=0; i<changedList.GetCount(); ++i)
\r
495 if (changedList[i].IsAdminDir())
\r
497 // something inside an admin dir was changed.
\r
498 // if it's the entries file, then we have to fully refresh because
\r
499 // files may have been added/removed from version control
\r
500 if ((changedList[i].GetWinPathString().Right(7).CompareNoCase(_T("entries")) == 0) &&
\r
501 (changedList[i].GetWinPathString().Find(_T("\\tmp\\"))<0))
\r
503 m_bRecursive = false;
\r
507 else if (!m_ListCtrl.IsPathShown(changedList[i]))
\r
509 // a path which is not shown in the list has changed
\r
510 CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(changedList[i]);
\r
513 // check if the changed path would get committed by a recursive commit
\r
514 if ((!entry->IsFromDifferentRepository()) &&
\r
515 (!entry->IsInExternal()) &&
\r
516 (!entry->IsNested()) &&
\r
517 (!entry->IsChecked()))
\r
519 m_bRecursive = false;
\r
528 // Now, do all the adds - make sure that the list is sorted so that parents
\r
529 // are added before their children
\r
530 itemsToAdd.SortByPathname();
\r
532 if (!Git.Add(itemsToAdd, &m_ProjectProperties, Git_depth_empty, FALSE, FALSE, TRUE))
\r
534 CMessageBox::Show(m_hWnd, Git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
535 InterlockedExchange(&m_bBlock, FALSE);
\r
540 // Remove any missing items
\r
541 // Not sure that this sort is really necessary - indeed, it might be better to do a reverse sort at this point
\r
542 itemsToRemove.SortByPathname();
\r
543 Git.Remove(itemsToRemove, TRUE);
\r
545 //the next step: find all deleted files and check if they're
\r
546 //inside a deleted folder. If that's the case, then remove those
\r
547 //files from the list since they'll get deleted by the parent
\r
548 //folder automatically.
\r
549 m_ListCtrl.Block(TRUE, FALSE);
\r
550 INT_PTR nDeleted = arDeleted.GetCount();
\r
551 for (INT_PTR i=0; i<arDeleted.GetCount(); i++)
\r
553 if (m_ListCtrl.GetCheck(arDeleted.GetAt(i)))
\r
555 const CTGitPath& path = m_ListCtrl.GetListEntry(arDeleted.GetAt(i))->GetPath();
\r
556 if (path.IsDirectory())
\r
558 //now find all children of this directory
\r
559 for (int j=0; j<arDeleted.GetCount(); j++)
\r
563 CGitStatusListCtrl::FileEntry* childEntry = m_ListCtrl.GetListEntry(arDeleted.GetAt(j));
\r
564 if (childEntry->IsChecked())
\r
566 if (path.IsAncestorOf(childEntry->GetPath()))
\r
568 m_ListCtrl.SetEntryCheck(childEntry, arDeleted.GetAt(j), false);
\r
577 m_ListCtrl.Block(FALSE, FALSE);
\r
579 if ((nUnchecked != 0)||(bCheckedInExternal)||(bHasConflicted)||(!m_bRecursive))
\r
581 //save only the files the user has checked into the temporary file
\r
582 m_ListCtrl.WriteCheckedNamesToPathList(m_pathList);
\r
584 m_ListCtrl.WriteCheckedNamesToPathList(m_selectedPathList);
\r
585 // the item count is used in the progress dialog to show the overall commit
\r
587 // deleted items only send one notification event, all others send two
\r
588 m_itemsCount = ((m_selectedPathList.GetCount() - nDeleted - itemsToRemove.GetCount()) * 2) + nDeleted + itemsToRemove.GetCount();
\r
590 if ((m_bRecursive)&&(checkedLists.size() == 1))
\r
592 // all checked items belong to the same changelist
\r
593 // find out if there are any unchecked items which belong to that changelist
\r
594 if (uncheckedLists.find(*checkedLists.begin()) == uncheckedLists.end())
\r
595 m_sChangeList = *checkedLists.begin();
\r
599 m_regAddBeforeCommit = m_bShowUnversioned;
\r
600 if (!GetDlgItem(IDC_KEEPLOCK)->IsWindowEnabled())
\r
601 m_bKeepLocks = FALSE;
\r
602 m_regKeepChangelists = m_bKeepChangeList;
\r
603 if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())
\r
604 m_bKeepChangeList = FALSE;
\r
605 InterlockedExchange(&m_bBlock, FALSE);
\r
607 if (!m_sBugID.IsEmpty())
\r
609 m_sBugID.Replace(_T(", "), _T(","));
\r
610 m_sBugID.Replace(_T(" ,"), _T(","));
\r
611 CString sBugID = m_ProjectProperties.sMessage;
\r
612 sBugID.Replace(_T("%BUGID%"), m_sBugID);
\r
613 if (m_ProjectProperties.bAppend)
\r
614 m_sLogMessage += _T("\n") + sBugID + _T("\n");
\r
616 m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
\r
618 m_History.AddEntry(m_sLogMessage);
\r
623 CResizableStandAloneDialog::OnOK();
\r
626 void CCommitDlg::SaveSplitterPos()
\r
630 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
\r
632 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
633 ScreenToClient(&rectSplitter);
\r
634 regPos = rectSplitter.top;
\r
638 UINT CCommitDlg::StatusThreadEntry(LPVOID pVoid)
\r
640 return ((CCommitDlg*)pVoid)->StatusThread();
\r
643 UINT CCommitDlg::StatusThread()
\r
645 //get the status of all selected file/folders recursively
\r
646 //and show the ones which have to be committed to the user
\r
647 //in a list control.
\r
648 InterlockedExchange(&m_bBlock, TRUE);
\r
649 InterlockedExchange(&m_bThreadRunning, TRUE);// so the main thread knows that this thread is still running
\r
650 InterlockedExchange(&m_bRunThread, TRUE); // if this is set to FALSE, the thread should stop
\r
651 m_bCancelled = false;
\r
653 DialogEnableWindow(IDOK, false);
\r
654 DialogEnableWindow(IDC_SHOWUNVERSIONED, false);
\r
655 DialogEnableWindow(IDC_SELECTALL, false);
\r
656 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_HIDE);
\r
657 DialogEnableWindow(IDC_EXTERNALWARNING, false);
\r
658 // read the list of recent log entries before querying the WC for status
\r
659 // -> the user may select one and modify / update it while we are crawling the WC
\r
661 if (m_History.GetCount()==0)
\r
664 if (m_ListCtrl.m_sUUID.IsEmpty() && m_pathList.GetCount()>0)
\r
667 reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)Git.GetUUIDFromPath(m_pathList[0]));
\r
670 reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);
\r
671 m_History.Load(reg, _T("logmsgs"));
\r
674 // Initialise the list control with the status of the files/folders below us
\r
675 m_ListCtrl.Clear();
\r
676 BOOL success = m_ListCtrl.GetStatus(m_pathList);
\r
678 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
\r
679 if(this->m_bShowUnversioned)
\r
680 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);
\r
682 m_ListCtrl.CheckIfChangelistsArePresent(false);
\r
684 DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWLOCKS | SVNSLC_SHOWINCHANGELIST;
\r
685 dwShow |= DWORD(m_regAddBeforeCommit) ? SVNSLC_SHOWUNVERSIONED : 0;
\r
688 if (m_checkedPathList.GetCount())
\r
689 m_ListCtrl.Show(dwShow, m_checkedPathList);
\r
692 DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;
\r
693 m_ListCtrl.Show(dwShow, dwCheck);
\r
694 m_bSelectFilesForCommit = true;
\r
697 if (m_ListCtrl.HasExternalsFromDifferentRepos())
\r
699 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);
\r
700 DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);
\r
703 SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());
\r
704 m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());
\r
707 GetDlgItemText(IDC_LOGMESSAGE, logmsg);
\r
708 DialogEnableWindow(IDOK, logmsg.GetLength() >= m_ProjectProperties.nMinLogSize);
\r
711 if (!m_ListCtrl.GetLastErrorMessage().IsEmpty())
\r
712 m_ListCtrl.SetEmptyString(m_ListCtrl.GetLastErrorMessage());
\r
713 m_ListCtrl.Show(dwShow);
\r
715 if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems()))
\r
717 if (CMessageBox::Show(m_hWnd, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
\r
719 m_bShowUnversioned = TRUE;
\r
720 GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);
\r
721 DWORD dwShow = (DWORD)(SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS);
\r
722 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);
\r
723 m_ListCtrl.Show(dwShow);
\r
727 CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);
\r
728 SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());
\r
730 m_autolist.clear();
\r
731 // we don't have to block the commit dialog while we fetch the
\r
732 // auto completion list.
\r
733 m_pathwatcher.ClearChangedPaths();
\r
734 InterlockedExchange(&m_bBlock, FALSE);
\r
735 if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE)==TRUE)
\r
737 m_ListCtrl.Block(TRUE, TRUE);
\r
738 GetAutocompletionList();
\r
739 m_ListCtrl.Block(FALSE, FALSE);
\r
743 DialogEnableWindow(IDC_SHOWUNVERSIONED, true);
\r
744 DialogEnableWindow(IDC_SELECTALL, true);
\r
745 if (m_ListCtrl.HasChangeLists())
\r
746 DialogEnableWindow(IDC_KEEPLISTS, true);
\r
747 if (m_ListCtrl.HasLocks())
\r
748 DialogEnableWindow(IDC_KEEPLOCK, true);
\r
749 // we have the list, now signal the main thread about it
\r
750 SendMessage(WM_AUTOLISTREADY); // only send the message if the thread wasn't told to quit!
\r
753 InterlockedExchange(&m_bRunThread, FALSE);
\r
754 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
755 // force the cursor to normal
\r
761 void CCommitDlg::OnCancel()
\r
763 m_bCancelled = true;
\r
766 m_pathwatcher.Stop();
\r
767 if (m_bThreadRunning)
\r
769 InterlockedExchange(&m_bRunThread, FALSE);
\r
770 WaitForSingleObject(m_pThread->m_hThread, 1000);
\r
771 if (m_bThreadRunning)
\r
773 // we gave the thread a chance to quit. Since the thread didn't
\r
774 // listen to us we have to kill it.
\r
775 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
\r
776 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
781 m_sLogMessage = m_cLogMessage.GetText();
\r
782 if (!m_sBugID.IsEmpty())
\r
784 m_sBugID.Replace(_T(", "), _T(","));
\r
785 m_sBugID.Replace(_T(" ,"), _T(","));
\r
786 CString sBugID = m_ProjectProperties.sMessage;
\r
787 sBugID.Replace(_T("%BUGID%"), m_sBugID);
\r
788 if (m_ProjectProperties.bAppend)
\r
789 m_sLogMessage += _T("\n") + sBugID + _T("\n");
\r
791 m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
\r
793 if (m_ProjectProperties.sLogTemplate.Compare(m_sLogMessage) != 0)
\r
794 m_History.AddEntry(m_sLogMessage);
\r
797 CResizableStandAloneDialog::OnCancel();
\r
800 void CCommitDlg::OnBnClickedSelectall()
\r
802 m_tooltips.Pop(); // hide the tooltips
\r
803 UINT state = (m_SelectAll.GetState() & 0x0003);
\r
804 if (state == BST_INDETERMINATE)
\r
806 // It is not at all useful to manually place the checkbox into the indeterminate state...
\r
807 // We will force this on to the unchecked state
\r
808 state = BST_UNCHECKED;
\r
809 m_SelectAll.SetCheck(state);
\r
811 m_ListCtrl.SelectAll(state == BST_CHECKED);
\r
814 BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)
\r
817 m_tooltips.RelayEvent(pMsg);
\r
818 if (pMsg->message == WM_KEYDOWN)
\r
820 switch (pMsg->wParam)
\r
825 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
\r
831 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
833 if ( GetDlgItem(IDOK)->IsWindowEnabled() )
\r
835 PostMessage(WM_COMMAND, IDOK);
\r
839 if ( GetFocus()==GetDlgItem(IDC_BUGID) )
\r
841 // Pressing RETURN in the bug id control
\r
842 // moves the focus to the message
\r
843 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
851 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
\r
854 void CCommitDlg::Refresh()
\r
856 if (m_bThreadRunning)
\r
859 InterlockedExchange(&m_bBlock, TRUE);
\r
860 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
\r
861 if (m_pThread==NULL)
\r
863 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
864 InterlockedExchange(&m_bBlock, FALSE);
\r
868 m_pThread->m_bAutoDelete = FALSE;
\r
869 m_pThread->ResumeThread();
\r
873 void CCommitDlg::OnBnClickedHelp()
\r
878 void CCommitDlg::OnBnClickedShowunversioned()
\r
880 m_tooltips.Pop(); // hide the tooltips
\r
882 m_regAddBeforeCommit = m_bShowUnversioned;
\r
885 DWORD dwShow = m_ListCtrl.GetShowFlags();
\r
886 if (DWORD(m_regAddBeforeCommit))
\r
887 dwShow |= SVNSLC_SHOWUNVERSIONED;
\r
889 dwShow &= ~SVNSLC_SHOWUNVERSIONED;
\r
890 if(dwShow & SVNSLC_SHOWUNVERSIONED)
\r
892 m_ListCtrl.GetStatus(this->m_pathList,false,false,true);
\r
894 m_ListCtrl.Show(dwShow);
\r
898 void CCommitDlg::OnStnClickedExternalwarning()
\r
900 m_tooltips.Popup();
\r
903 void CCommitDlg::OnEnChangeLogmessage()
\r
908 LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)
\r
911 if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))
\r
913 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
\r
915 m_bShowUnversioned = TRUE;
\r
916 DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;
\r
917 m_ListCtrl.Show(dwShow);
\r
925 LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
\r
931 LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM /*lParam*/)
\r
934 BringWindowToTop();
\r
935 SetForegroundWindow();
\r
937 // if multiple files/folders are dropped
\r
938 // this handler is called for every single item
\r
940 // To avoid creating multiple refresh threads and
\r
941 // causing crashes, we only add the items to the
\r
942 // list control and start a timer.
\r
943 // When the timer expires, we start the refresh thread,
\r
944 // but only if it isn't already running - otherwise we
\r
945 // restart the timer.
\r
947 path.SetFromWin((LPCTSTR)lParam);
\r
949 // just add all the items we get here.
\r
950 // if the item is versioned, the add will fail but nothing
\r
951 // more will happen.
\r
953 Git.Add(CTGitPathList(path), &m_ProjectProperties, Git_depth_empty, false, true, true);
\r
955 if (!m_ListCtrl.HasPath(path))
\r
957 if (m_pathList.AreAllPathsFiles())
\r
959 m_pathList.AddPath(path);
\r
960 m_pathList.RemoveDuplicates();
\r
961 m_updatedPathList.AddPath(path);
\r
962 m_updatedPathList.RemoveDuplicates();
\r
966 // if the path list contains folders, we have to check whether
\r
967 // our just (maybe) added path is a child of one of those. If it is
\r
968 // a child of a folder already in the list, we must not add it. Otherwise
\r
969 // that path could show up twice in the list.
\r
970 bool bHasParentInList = false;
\r
971 for (int i=0; i<m_pathList.GetCount(); ++i)
\r
973 if (m_pathList[i].IsAncestorOf(path))
\r
975 bHasParentInList = true;
\r
979 if (!bHasParentInList)
\r
981 m_pathList.AddPath(path);
\r
982 m_pathList.RemoveDuplicates();
\r
983 m_updatedPathList.AddPath(path);
\r
984 m_updatedPathList.RemoveDuplicates();
\r
989 // Always start the timer, since the status of an existing item might have changed
\r
990 SetTimer(REFRESHTIMER, 200, NULL);
\r
991 ATLTRACE(_T("Item %s dropped, timer started\n"), path.GetWinPath());
\r
996 LRESULT CCommitDlg::OnAutoListReady(WPARAM, LPARAM)
\r
998 m_cLogMessage.SetAutoCompletionList(m_autolist, '*');
\r
1002 //////////////////////////////////////////////////////////////////////////
\r
1003 // functions which run in the status thread
\r
1004 //////////////////////////////////////////////////////////////////////////
\r
1006 void CCommitDlg::ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex)
\r
1011 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
\r
1012 while (m_bRunThread && file.ReadString(strLine))
\r
1014 int eqpos = strLine.Find('=');
\r
1016 rgx = strLine.Mid(eqpos+1).Trim();
\r
1019 while (((pos = strLine.Find(','))>=0)&&(pos < eqpos))
\r
1021 mapRegex[strLine.Left(pos)] = rgx;
\r
1022 strLine = strLine.Mid(pos+1).Trim();
\r
1024 mapRegex[strLine.Left(strLine.Find('=')).Trim()] = rgx;
\r
1028 catch (CFileException* pE)
\r
1030 TRACE("CFileException loading auto list regex file\n");
\r
1035 void CCommitDlg::GetAutocompletionList()
\r
1037 // the auto completion list is made of strings from each selected files.
\r
1038 // the strings used are extracted from the files with regexes found
\r
1039 // in the file "autolist.txt".
\r
1040 // the format of that file is:
\r
1041 // file extensions separated with commas '=' regular expression to use
\r
1043 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
\r
1044 // .cpp = (?<=[^\s]::)\b\w+\b
\r
1046 std::map<CString, CString> mapRegex;
\r
1047 CString sRegexFile = CPathUtils::GetAppDirectory();
\r
1048 CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);
\r
1049 DWORD timeoutvalue = regtimeout*1000;
\r
1050 sRegexFile += _T("autolist.txt");
\r
1051 if (!m_bRunThread)
\r
1053 ParseRegexFile(sRegexFile, mapRegex);
\r
1054 SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sRegexFile.GetBuffer(MAX_PATH+1));
\r
1055 sRegexFile.ReleaseBuffer();
\r
1056 sRegexFile += _T("\\TortoiseGit\\autolist.txt");
\r
1057 if (PathFileExists(sRegexFile))
\r
1059 ParseRegexFile(sRegexFile, mapRegex);
\r
1061 DWORD starttime = GetTickCount();
\r
1063 // now we have two arrays of strings, where the first array contains all
\r
1064 // file extensions we can use and the second the corresponding regex strings
\r
1065 // to apply to those files.
\r
1067 // the next step is to go over all files shown in the commit dialog
\r
1068 // and scan them for strings we can use
\r
1069 int nListItems = m_ListCtrl.GetItemCount();
\r
1071 for (int i=0; i<nListItems && m_bRunThread; ++i)
\r
1073 // stop parsing after timeout
\r
1074 if ((!m_bRunThread) || (GetTickCount() - starttime > timeoutvalue))
\r
1077 CTGitPath *path = (CTGitPath*)m_ListCtrl.GetItemData(i);
\r
1082 CString sPartPath =path->GetGitPathString();
\r
1083 m_autolist.insert(sPartPath);
\r
1085 // const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);
\r
1089 // add the path parts to the auto completion list too
\r
1090 // CString sPartPath = entry->GetRelativeGitPath();
\r
1091 // m_autolist.insert(sPartPath);
\r
1096 while ((pos = sPartPath.Find('/', pos)) >= 0)
\r
1100 m_autolist.insert(sPartPath.Mid(pos));
\r
1103 // Last inserted entry is a file name.
\r
1104 // Some users prefer to also list file name without extension.
\r
1105 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE))
\r
1107 int dotPos = sPartPath.ReverseFind('.');
\r
1108 if ((dotPos >= 0) && (dotPos > lastPos))
\r
1109 m_autolist.insert(sPartPath.Mid(lastPos, dotPos - lastPos));
\r
1112 if ((entry->status <= Git_wc_status_normal)||(entry->status == Git_wc_status_ignored))
\r
1115 CString sExt = entry->GetPath().GetFileExtension();
\r
1117 // find the regex string which corresponds to the file extension
\r
1118 CString rdata = mapRegex[sExt];
\r
1119 if (rdata.IsEmpty())
\r
1122 ScanFile(entry->GetPath().GetWinPathString(), rdata);
\r
1123 if ((entry->textstatus != Git_wc_status_unversioned) &&
\r
1124 (entry->textstatus != Git_wc_status_none) &&
\r
1125 (entry->textstatus != Git_wc_status_ignored) &&
\r
1126 (entry->textstatus != Git_wc_status_added) &&
\r
1127 (entry->textstatus != Git_wc_status_normal))
\r
1129 CTGitPath basePath = Git::GetPristinePath(entry->GetPath());
\r
1130 if (!basePath.IsEmpty())
\r
1131 ScanFile(basePath.GetWinPathString(), rdata);
\r
1135 ATLTRACE(_T("Auto completion list loaded in %d msec\n"), GetTickCount() - starttime);
\r
1138 void CCommitDlg::ScanFile(const CString& sFilePath, const CString& sRegex)
\r
1140 wstring sFileContent;
\r
1141 HANDLE hFile = CreateFile(sFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);
\r
1142 if (hFile != INVALID_HANDLE_VALUE)
\r
1144 DWORD size = GetFileSize(hFile, NULL);
\r
1145 if (size > 1000000L)
\r
1147 // no files bigger than 1 Meg
\r
1148 CloseHandle(hFile);
\r
1151 // allocate memory to hold file contents
\r
1152 char * buffer = new char[size];
\r
1154 ReadFile(hFile, buffer, size, &readbytes, NULL);
\r
1155 CloseHandle(hFile);
\r
1157 IsTextUnicode(buffer, readbytes, &opts);
\r
1158 if (opts & IS_TEXT_UNICODE_NULL_BYTES)
\r
1163 if (opts & IS_TEXT_UNICODE_UNICODE_MASK)
\r
1165 sFileContent = wstring((wchar_t*)buffer, readbytes/sizeof(WCHAR));
\r
1167 if ((opts & IS_TEXT_UNICODE_NOT_UNICODE_MASK)||(opts == 0))
\r
1169 int ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, NULL, 0);
\r
1170 wchar_t * pWideBuf = new wchar_t[ret];
\r
1171 int ret2 = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, pWideBuf, ret);
\r
1173 sFileContent = wstring(pWideBuf, ret);
\r
1174 delete [] pWideBuf;
\r
1178 if (sFileContent.empty()|| !m_bRunThread)
\r
1185 const tr1::wregex regCheck(sRegex, tr1::regex_constants::icase | tr1::regex_constants::ECMAScript);
\r
1186 const tr1::wsregex_iterator end;
\r
1187 wstring s = sFileContent;
\r
1188 for (tr1::wsregex_iterator it(s.begin(), s.end(), regCheck); it != end; ++it)
\r
1190 const tr1::wsmatch match = *it;
\r
1191 for (size_t i=1; i<match.size(); ++i)
\r
1193 if (match[i].second-match[i].first)
\r
1195 ATLTRACE(_T("matched keyword : %s\n"), wstring(match[i]).c_str());
\r
1196 m_autolist.insert(wstring(match[i]).c_str());
\r
1201 catch (exception) {}
\r
1204 // CSciEditContextMenuInterface
\r
1205 void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
\r
1207 CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));
\r
1208 m_nPopupPasteListCmd = nCmd++;
\r
1209 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);
\r
1212 bool CCommitDlg::HandleMenuItemClick(int /*cmd*/, CSciEdit * /*pSciEdit*/)
\r
1217 if (cmd == m_nPopupPasteListCmd)
\r
1220 TCHAR buf[MAX_STATUS_STRING_LENGTH];
\r
1221 int nListItems = m_ListCtrl.GetItemCount();
\r
1222 for (int i=0; i<nListItems; ++i)
\r
1224 CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);
\r
1225 if (entry->IsChecked())
\r
1228 Git_wc_status_kind status = entry->status;
\r
1229 if (status == Git_wc_status_unversioned)
\r
1230 status = Git_wc_status_added;
\r
1231 if (status == Git_wc_status_missing)
\r
1232 status = Git_wc_status_deleted;
\r
1233 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
1234 if (m_ProjectProperties.bFileListInEnglish)
\r
1236 GitStatus::GetStatusString(AfxGetResourceHandle(), status, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
1237 line.Format(_T("%-10s %s\r\n"), buf, (LPCTSTR)m_ListCtrl.GetItemText(i,0));
\r
1241 pSciEdit->InsertText(logmsg);
\r
1248 void CCommitDlg::OnTimer(UINT_PTR nIDEvent)
\r
1252 case ENDDIALOGTIMER:
\r
1253 KillTimer(ENDDIALOGTIMER);
\r
1256 case REFRESHTIMER:
\r
1257 if (m_bThreadRunning)
\r
1259 SetTimer(REFRESHTIMER, 200, NULL);
\r
1260 ATLTRACE("Wait some more before refreshing\n");
\r
1264 KillTimer(REFRESHTIMER);
\r
1265 ATLTRACE("Refreshing after items dropped\n");
\r
1270 __super::OnTimer(nIDEvent);
\r
1273 void CCommitDlg::OnBnClickedHistory()
\r
1275 m_tooltips.Pop(); // hide the tooltips
\r
1276 if (m_pathList.GetCount() == 0)
\r
1279 CHistoryDlg historyDlg;
\r
1280 historyDlg.SetHistory(m_History);
\r
1281 if (historyDlg.DoModal() != IDOK)
\r
1284 CString sMsg = historyDlg.GetSelectedText();
\r
1285 if (sMsg != m_cLogMessage.GetText().Left(sMsg.GetLength()))
\r
1287 CString sBugID = m_ProjectProperties.GetBugIDFromLog(sMsg);
\r
1288 if (!sBugID.IsEmpty())
\r
1290 SetDlgItemText(IDC_BUGID, sBugID);
\r
1292 if (m_ProjectProperties.sLogTemplate.Compare(m_cLogMessage.GetText())!=0)
\r
1293 m_cLogMessage.InsertText(sMsg, !m_cLogMessage.GetText().IsEmpty());
\r
1295 m_cLogMessage.SetText(sMsg);
\r
1299 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
1303 void CCommitDlg::OnBnClickedBugtraqbutton()
\r
1306 m_tooltips.Pop(); // hide the tooltips
\r
1307 CString sMsg = m_cLogMessage.GetText();
\r
1309 if (m_BugTraqProvider == NULL)
\r
1312 BSTR parameters = m_bugtraq_association.GetParameters().AllocSysString();
\r
1313 BSTR commonRoot = SysAllocString(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());
\r
1314 SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_pathList.GetCount());
\r
1316 for (LONG index = 0; index < m_pathList.GetCount(); ++index)
\r
1317 SafeArrayPutElement(pathList, &index, m_pathList[index].GetGitPathString().AllocSysString());
\r
1319 BSTR originalMessage = sMsg.AllocSysString();
\r
1322 // first try the IBugTraqProvider2 interface
\r
1323 CComPtr<IBugTraqProvider2> pProvider2 = NULL;
\r
1324 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
\r
1325 if (SUCCEEDED(hr))
\r
1327 CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();
\r
1328 BSTR repositoryRoot = common.AllocSysString();
\r
1329 if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, &temp)))
\r
1332 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
\r
1333 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
\r
1336 m_cLogMessage.SetText(temp);
\r
1340 // if IBugTraqProvider2 failed, try IBugTraqProvider
\r
1341 CComPtr<IBugTraqProvider> pProvider = NULL;
\r
1342 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider);
\r
1346 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
\r
1347 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
\r
1351 if (FAILED(hr = pProvider->GetCommitMessage(GetSafeHwnd(), parameters, commonRoot, pathList, originalMessage, &temp)))
\r
1354 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
\r
1355 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
\r
1358 m_cLogMessage.SetText(temp);
\r
1361 m_cLogMessage.SetFocus();
\r
1363 SysFreeString(temp);
\r
1367 LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)
\r
1373 void CCommitDlg::UpdateOKButton()
\r
1376 BOOL bValidLogSize = FALSE;
\r
1378 if (m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize)
\r
1379 bValidLogSize = !m_bBlock;
\r
1381 LONG nSelectedItems = m_ListCtrl.GetSelected();
\r
1382 DialogEnableWindow(IDOK, bValidLogSize && nSelectedItems>0);
\r
1387 LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
1389 switch (message) {
\r
1391 if (wParam == IDC_SPLITTER)
\r
1393 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
1394 DoSize(pHdr->delta);
\r
1399 return __super::DefWindowProc(message, wParam, lParam);
\r
1402 void CCommitDlg::SetSplitterRange()
\r
1404 if ((m_ListCtrl)&&(m_cLogMessage))
\r
1407 m_cLogMessage.GetWindowRect(rcTop);
\r
1408 ScreenToClient(rcTop);
\r
1410 m_ListCtrl.GetWindowRect(rcMiddle);
\r
1411 ScreenToClient(rcMiddle);
\r
1412 if (rcMiddle.Height() && rcMiddle.Width())
\r
1413 m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);
\r
1417 void CCommitDlg::DoSize(int delta)
\r
1419 RemoveAnchor(IDC_MESSAGEGROUP);
\r
1420 RemoveAnchor(IDC_LOGMESSAGE);
\r
1421 RemoveAnchor(IDC_SPLITTER);
\r
1422 RemoveAnchor(IDC_SIGNOFF);
\r
1423 RemoveAnchor(IDC_COMMIT_AMEND);
\r
1424 RemoveAnchor(IDC_LISTGROUP);
\r
1425 RemoveAnchor(IDC_FILELIST);
\r
1426 CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN);
\r
1427 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN);
\r
1428 CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN);
\r
1429 CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN);
\r
1430 CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta);
\r
1431 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND),0,delta);
\r
1432 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
\r
1433 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
\r
1434 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
\r
1435 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
\r
1436 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
\r
1437 AddAnchor(IDC_SIGNOFF,TOP_RIGHT);
\r
1438 AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
\r
1440 // adjust the minimum size of the dialog to prevent the resizing from
\r
1441 // moving the list control too far down.
\r
1443 m_cLogMessage.GetClientRect(rcLogMsg);
\r
1444 SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_LogMsgOrigRect.Height()+rcLogMsg.Height()));
\r
1446 SetSplitterRange();
\r
1447 m_cLogMessage.Invalidate();
\r
1448 GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
\r
1451 void CCommitDlg::OnSize(UINT nType, int cx, int cy)
\r
1453 // first, let the resizing take place
\r
1454 __super::OnSize(nType, cx, cy);
\r
1457 SetSplitterRange();
\r
1461 void CCommitDlg::OnBnClickedSignOff()
\r
1463 // TODO: Add your control notification handler code here
\r
1467 username=g_Git.GetUserName();
\r
1468 email=g_Git.GetUserEmail();
\r
1469 username.Remove(_T('\n'));
\r
1470 email.Remove(_T('\n'));
\r
1471 str.Format(_T("Signed-off-by: %s <%s>\n"),username,email);
\r
1473 m_cLogMessage.SetText(m_cLogMessage.GetText()+_T("\r\n\r\n")+str);
\r
1476 void CCommitDlg::OnStnClickedCommitlabel()
\r
1478 // TODO: Add your control notification handler code here
\r
1481 void CCommitDlg::OnBnClickedCommitAmend()
\r
1483 // TODO: Add your control notification handler code here
\r
1484 this->UpdateData();
\r
1485 if(this->m_bCommitAmend && this->m_AmendStr.IsEmpty())
\r
1488 BYTE_VECTOR vector;
\r
1489 CString head(_T("HEAD"));
\r
1490 g_Git.GetLog(vector,head,NULL,1);
\r
1491 rev.ParserFromLog(vector);
\r
1492 m_AmendStr=rev.m_Subject+_T("\n\n")+rev.m_Body;
\r
1495 if(this->m_bCommitAmend)
\r
1497 this->m_NoAmendStr=this->m_cLogMessage.GetText();
\r
1498 m_cLogMessage.SetText(m_AmendStr);
\r
1502 this->m_AmendStr=this->m_cLogMessage.GetText();
\r
1503 m_cLogMessage.SetText(m_NoAmendStr);
\r