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
81 BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)
\r
82 ON_BN_CLICKED(IDC_SELECTALL, OnBnClickedSelectall)
\r
83 ON_BN_CLICKED(IDHELP, OnBnClickedHelp)
\r
84 ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)
\r
85 // ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)
\r
86 ON_BN_CLICKED(IDC_BUGTRAQBUTTON, OnBnClickedBugtraqbutton)
\r
87 ON_EN_CHANGE(IDC_LOGMESSAGE, OnEnChangeLogmessage)
\r
88 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED, OnGitStatusListCtrlItemCountChanged)
\r
89 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnGitStatusListCtrlNeedsRefresh)
\r
90 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped)
\r
91 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_CHECKCHANGED, &CCommitDlg::OnGitStatusListCtrlCheckChanged)
\r
92 ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY, OnAutoListReady)
\r
95 ON_STN_CLICKED(IDC_EXTERNALWARNING, &CCommitDlg::OnStnClickedExternalwarning)
\r
96 ON_BN_CLICKED(IDC_SIGNOFF, &CCommitDlg::OnBnClickedSignOff)
\r
97 ON_STN_CLICKED(IDC_COMMITLABEL, &CCommitDlg::OnStnClickedCommitlabel)
\r
100 BOOL CCommitDlg::OnInitDialog()
\r
102 CResizableStandAloneDialog::OnInitDialog();
\r
104 m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);
\r
105 m_bShowUnversioned = m_regAddBeforeCommit;
\r
107 m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));
\r
109 m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE);
\r
110 m_bKeepChangeList = m_regKeepChangelists;
\r
112 // GitConfig config;
\r
113 // m_bKeepLocks = config.KeepLocks();
\r
117 m_ListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS , _T("CommitDlg"));
\r
118 m_ListCtrl.SetSelectButton(&m_SelectAll);
\r
119 m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));
\r
120 m_ListCtrl.SetCancelBool(&m_bCancelled);
\r
121 m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);
\r
122 m_ListCtrl.EnableFileDrop();
\r
123 m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);
\r
125 // m_ProjectProperties.ReadPropsPathList(m_pathList);
\r
126 m_cLogMessage.Init(m_ProjectProperties);
\r
127 m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));
\r
128 m_cLogMessage.RegisterContextMenuHandler(this);
\r
130 OnEnChangeLogmessage();
\r
132 m_tooltips.Create(this);
\r
133 m_tooltips.AddTool(IDC_EXTERNALWARNING, IDS_COMMITDLG_EXTERNALS);
\r
134 // m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);
\r
136 m_SelectAll.SetCheck(BST_INDETERMINATE);
\r
139 CBugTraqAssociations bugtraq_associations;
\r
140 bugtraq_associations.Load();
\r
142 if (bugtraq_associations.FindProvider(m_pathList, &m_bugtraq_association))
\r
144 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
\r
145 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
\r
147 CComPtr<IBugTraqProvider> pProvider;
\r
148 HRESULT hr = pProvider.CoCreateInstance(m_bugtraq_association.GetProviderClass());
\r
151 m_BugTraqProvider = pProvider;
\r
153 if (SUCCEEDED(hr = pProvider->GetLinkText(GetSafeHwnd(), m_bugtraq_association.GetParameters().AllocSysString(), &temp)))
\r
155 SetDlgItemText(IDC_BUGTRAQBUTTON, temp);
\r
156 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(TRUE);
\r
157 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_SHOW);
\r
160 SysFreeString(temp);
\r
163 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
165 else if (!m_ProjectProperties.sMessage.IsEmpty())
\r
167 GetDlgItem(IDC_BUGID)->ShowWindow(SW_SHOW);
\r
168 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_SHOW);
\r
169 if (!m_ProjectProperties.sLabel.IsEmpty())
\r
170 SetDlgItemText(IDC_BUGIDLABEL, m_ProjectProperties.sLabel);
\r
171 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);
\r
172 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);
\r
173 GetDlgItem(IDC_BUGID)->SetFocus();
\r
174 CString sBugID = m_ProjectProperties.GetBugIDFromLog(m_sLogMessage);
\r
175 if (!sBugID.IsEmpty())
\r
177 SetDlgItemText(IDC_BUGID, sBugID);
\r
183 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
\r
184 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
\r
185 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);
\r
186 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);
\r
187 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
190 if (!m_sLogMessage.IsEmpty())
\r
191 m_cLogMessage.SetText(m_sLogMessage);
\r
193 GetWindowText(m_sWindowTitle);
\r
195 AdjustControlSize(IDC_SHOWUNVERSIONED);
\r
196 AdjustControlSize(IDC_SELECTALL);
\r
197 AdjustControlSize(IDC_KEEPLOCK);
\r
199 GetClientRect(m_DlgOrigRect);
\r
200 m_cLogMessage.GetClientRect(m_LogMsgOrigRect);
\r
202 AddAnchor(IDC_COMMITLABEL, TOP_LEFT, TOP_RIGHT);
\r
203 AddAnchor(IDC_BUGIDLABEL, TOP_RIGHT);
\r
204 AddAnchor(IDC_BUGID, TOP_RIGHT);
\r
205 AddAnchor(IDC_BUGTRAQBUTTON, TOP_RIGHT);
\r
206 AddAnchor(IDC_COMMIT_TO, TOP_LEFT, TOP_RIGHT);
\r
207 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
\r
208 // AddAnchor(IDC_HISTORY, TOP_LEFT);
\r
209 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
\r
210 AddAnchor(IDC_SIGNOFF, TOP_RIGHT);
\r
211 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
\r
212 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
\r
213 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
\r
214 AddAnchor(IDC_SHOWUNVERSIONED, BOTTOM_LEFT);
\r
215 AddAnchor(IDC_SELECTALL, BOTTOM_LEFT);
\r
216 AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);
\r
217 AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);
\r
218 AddAnchor(IDC_KEEPLOCK, BOTTOM_LEFT);
\r
219 AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);
\r
220 AddAnchor(IDOK, BOTTOM_RIGHT);
\r
221 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
\r
222 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
225 CenterWindow(CWnd::FromHandle(hWndExplorer));
\r
226 EnableSaveRestore(_T("CommitDlg"));
\r
227 DWORD yPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
\r
228 RECT rcDlg, rcLogMsg, rcFileList;
\r
229 GetClientRect(&rcDlg);
\r
230 m_cLogMessage.GetWindowRect(&rcLogMsg);
\r
231 ScreenToClient(&rcLogMsg);
\r
232 m_ListCtrl.GetWindowRect(&rcFileList);
\r
233 ScreenToClient(&rcFileList);
\r
237 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
238 ScreenToClient(&rectSplitter);
\r
239 int delta = yPos - rectSplitter.top;
\r
240 if ((rcLogMsg.bottom + delta > rcLogMsg.top)&&(rcLogMsg.bottom + delta < rcFileList.bottom - 30))
\r
242 m_wndSplitter.SetWindowPos(NULL, 0, yPos, 0, 0, SWP_NOSIZE);
\r
247 // add all directories to the watcher
\r
248 for (int i=0; i<m_pathList.GetCount(); ++i)
\r
250 if (m_pathList[i].IsDirectory())
\r
251 m_pathwatcher.AddPath(m_pathList[i]);
\r
254 m_updatedPathList = m_pathList;
\r
256 //first start a thread to obtain the file list with the status without
\r
257 //blocking the dialog
\r
258 InterlockedExchange(&m_bBlock, TRUE);
\r
259 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
\r
260 if (m_pThread==NULL)
\r
262 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
263 InterlockedExchange(&m_bBlock, FALSE);
\r
267 m_pThread->m_bAutoDelete = FALSE;
\r
268 m_pThread->ResumeThread();
\r
270 CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);
\r
271 CRegDWORD historyhint = CRegDWORD(_T("Software\\TortoiseGit\\HistoryHintShown"), FALSE);
\r
272 if ((((DWORD)err)!=FALSE)&&((((DWORD)historyhint)==FALSE)))
\r
274 historyhint = TRUE;
\r
275 // ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);
\r
280 return FALSE; // return TRUE unless you set the focus to a control
\r
281 // EXCEPTION: OCX Property Pages should return FALSE
\r
284 void CCommitDlg::OnOK()
\r
288 if (m_bThreadRunning)
\r
290 m_bCancelled = true;
\r
291 InterlockedExchange(&m_bRunThread, FALSE);
\r
292 WaitForSingleObject(m_pThread->m_hThread, 1000);
\r
293 if (m_bThreadRunning)
\r
295 // we gave the thread a chance to quit. Since the thread didn't
\r
296 // listen to us we have to kill it.
\r
297 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
\r
298 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
302 GetDlgItemText(IDC_BUGID, id);
\r
303 if (!m_ProjectProperties.CheckBugID(id))
\r
305 ShowBalloon(IDC_BUGID, IDS_COMMITDLG_ONLYNUMBERS, IDI_EXCLAMATION);
\r
308 m_sLogMessage = m_cLogMessage.GetText();
\r
309 if ((m_ProjectProperties.bWarnIfNoIssue) && (id.IsEmpty() && !m_ProjectProperties.HasBugID(m_sLogMessage)))
\r
311 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOISSUEWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)
\r
316 CRegDWORD regUnversionedRecurse (_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE);
\r
317 if (!(DWORD)regUnversionedRecurse)
\r
319 // Find unversioned directories which are marked for commit. The user might expect them
\r
320 // to be added recursively since he cannot the the files. Let's ask the user if he knows
\r
321 // what he is doing.
\r
322 int nListItems = m_ListCtrl.GetItemCount();
\r
323 for (int j=0; j<nListItems; j++)
\r
325 const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);
\r
326 if (entry->IsChecked() && (entry->status == Git_wc_status_unversioned) && entry->IsFolder() )
\r
328 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_UNVERSIONEDFOLDERWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)
\r
334 m_pathwatcher.Stop();
\r
335 InterlockedExchange(&m_bBlock, TRUE);
\r
336 CDWordArray arDeleted;
\r
337 //first add all the unversioned files the user selected
\r
338 //and check if all versioned files are selected
\r
339 int nUnchecked = 0;
\r
341 m_bRecursive = true;
\r
342 int nListItems = m_ListCtrl.GetItemCount();
\r
344 CTGitPathList itemsToAdd;
\r
345 CTGitPathList itemsToRemove;
\r
346 bool bCheckedInExternal = false;
\r
347 bool bHasConflicted = false;
\r
348 //std::set<CString> checkedLists;
\r
349 //std::set<CString> uncheckedLists;
\r
351 //CString checkedfiles;
\r
352 //CString uncheckedfiles;
\r
357 for (int j=0; j<nListItems; j++)
\r
359 //const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);
\r
360 CTGitPath *entry = (CTGitPath*)m_ListCtrl.GetItemData(j);
\r
361 if (entry->m_Checked)
\r
364 if (entry->status == Git_wc_status_unversioned)
\r
366 itemsToAdd.AddPath(entry->GetPath());
\r
368 if (entry->status == Git_wc_status_conflicted)
\r
370 bHasConflicted = true;
\r
372 if (entry->status == Git_wc_status_missing)
\r
374 itemsToRemove.AddPath(entry->GetPath());
\r
376 if (entry->status == Git_wc_status_deleted)
\r
380 if (entry->IsInExternal())
\r
382 bCheckedInExternal = true;
\r
385 cmd.Format(_T("git.exe update-index -- \"%s\""),entry->GetGitPathString());
\r
386 g_Git.Run(cmd,&out,CP_OEMCP);
\r
388 //checkedLists.insert(entry->GetGitPathString());
\r
389 // checkedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");
\r
393 //uncheckedLists.insert(entry->GetGitPathString());
\r
394 if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
395 { //To init git repository, there are not HEAD, so we can use git reset command
\r
396 cmd.Format(_T("git.exe rm --cache -- \"%s\""),entry->GetGitPathString());
\r
397 g_Git.Run(cmd,&out,CP_OEMCP);
\r
401 cmd.Format(_T("git.exe reset -- %s"),entry->GetGitPathString());
\r
402 g_Git.Run(cmd,&out,CP_OEMCP);
\r
405 // uncheckedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");
\r
407 if ((entry->status != Git_wc_status_unversioned) &&
\r
408 (entry->status != Git_wc_status_ignored))
\r
411 uncheckedLists.insert(entry->GetChangeList());
\r
414 // This algorithm is for the sake of simplicity of the complexity O(N?
\r
415 for (int k=0; k<nListItems; k++)
\r
417 const CGitStatusListCtrl::FileEntry * entryK = m_ListCtrl.GetListEntry(k);
\r
418 if (entryK->IsChecked() && entryK->GetPath().IsAncestorOf(entry->GetPath()) )
\r
420 // Fall back to a non-recursive commit to prevent items being
\r
421 // committed which aren't checked although its parent is checked
\r
422 // (property change, directory deletion, ... )
\r
423 m_bRecursive = false;
\r
433 //if(uncheckedfiles.GetLength()>0)
\r
435 // cmd.Format(_T("git.exe reset -- %s"),uncheckedfiles);
\r
436 // g_Git.Run(cmd,&out);
\r
439 //if(checkedfiles.GetLength()>0)
\r
442 // cmd.Format(_T("git.exe update-index -- %s"),checkedfiles);
\r
443 // g_Git.Run(cmd,&out);
\r
445 CString tempfile=::GetTempFile();
\r
446 CFile file(tempfile,CFile::modeReadWrite|CFile::modeCreate );
\r
447 CStringA log=CUnicodeUtils::GetUTF8( m_sLogMessage);
\r
448 file.Write(log,log.GetLength());
\r
449 //file.WriteString(m_sLogMessage);
\r
453 cmd.Format(_T("git.exe commit -F \"%s\""), tempfile);
\r
454 g_Git.Run(cmd,&out,CP_OEMCP);
\r
456 CFile::Remove(tempfile);
\r
458 CMessageBox::Show(this->m_hWnd, out, _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);
\r
460 CMessageBox::Show(this->m_hWnd, _T("Nothing Commit"), _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);
\r
462 if (m_pathwatcher.GetNumberOfChangedPaths() && m_bRecursive)
\r
464 // There are paths which got changed (touched at least).
\r
465 // We have to find out if this affects the selection in the commit dialog
\r
466 // If it could affect the selection, revert back to a non-recursive commit
\r
467 CTGitPathList changedList = m_pathwatcher.GetChangedPaths();
\r
468 changedList.RemoveDuplicates();
\r
469 for (int i=0; i<changedList.GetCount(); ++i)
\r
471 if (changedList[i].IsAdminDir())
\r
473 // something inside an admin dir was changed.
\r
474 // if it's the entries file, then we have to fully refresh because
\r
475 // files may have been added/removed from version control
\r
476 if ((changedList[i].GetWinPathString().Right(7).CompareNoCase(_T("entries")) == 0) &&
\r
477 (changedList[i].GetWinPathString().Find(_T("\\tmp\\"))<0))
\r
479 m_bRecursive = false;
\r
483 else if (!m_ListCtrl.IsPathShown(changedList[i]))
\r
485 // a path which is not shown in the list has changed
\r
486 CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(changedList[i]);
\r
489 // check if the changed path would get committed by a recursive commit
\r
490 if ((!entry->IsFromDifferentRepository()) &&
\r
491 (!entry->IsInExternal()) &&
\r
492 (!entry->IsNested()) &&
\r
493 (!entry->IsChecked()))
\r
495 m_bRecursive = false;
\r
504 // Now, do all the adds - make sure that the list is sorted so that parents
\r
505 // are added before their children
\r
506 itemsToAdd.SortByPathname();
\r
508 if (!Git.Add(itemsToAdd, &m_ProjectProperties, Git_depth_empty, FALSE, FALSE, TRUE))
\r
510 CMessageBox::Show(m_hWnd, Git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
511 InterlockedExchange(&m_bBlock, FALSE);
\r
516 // Remove any missing items
\r
517 // Not sure that this sort is really necessary - indeed, it might be better to do a reverse sort at this point
\r
518 itemsToRemove.SortByPathname();
\r
519 Git.Remove(itemsToRemove, TRUE);
\r
521 //the next step: find all deleted files and check if they're
\r
522 //inside a deleted folder. If that's the case, then remove those
\r
523 //files from the list since they'll get deleted by the parent
\r
524 //folder automatically.
\r
525 m_ListCtrl.Block(TRUE, FALSE);
\r
526 INT_PTR nDeleted = arDeleted.GetCount();
\r
527 for (INT_PTR i=0; i<arDeleted.GetCount(); i++)
\r
529 if (m_ListCtrl.GetCheck(arDeleted.GetAt(i)))
\r
531 const CTGitPath& path = m_ListCtrl.GetListEntry(arDeleted.GetAt(i))->GetPath();
\r
532 if (path.IsDirectory())
\r
534 //now find all children of this directory
\r
535 for (int j=0; j<arDeleted.GetCount(); j++)
\r
539 CGitStatusListCtrl::FileEntry* childEntry = m_ListCtrl.GetListEntry(arDeleted.GetAt(j));
\r
540 if (childEntry->IsChecked())
\r
542 if (path.IsAncestorOf(childEntry->GetPath()))
\r
544 m_ListCtrl.SetEntryCheck(childEntry, arDeleted.GetAt(j), false);
\r
553 m_ListCtrl.Block(FALSE, FALSE);
\r
555 if ((nUnchecked != 0)||(bCheckedInExternal)||(bHasConflicted)||(!m_bRecursive))
\r
557 //save only the files the user has checked into the temporary file
\r
558 m_ListCtrl.WriteCheckedNamesToPathList(m_pathList);
\r
560 m_ListCtrl.WriteCheckedNamesToPathList(m_selectedPathList);
\r
561 // the item count is used in the progress dialog to show the overall commit
\r
563 // deleted items only send one notification event, all others send two
\r
564 m_itemsCount = ((m_selectedPathList.GetCount() - nDeleted - itemsToRemove.GetCount()) * 2) + nDeleted + itemsToRemove.GetCount();
\r
566 if ((m_bRecursive)&&(checkedLists.size() == 1))
\r
568 // all checked items belong to the same changelist
\r
569 // find out if there are any unchecked items which belong to that changelist
\r
570 if (uncheckedLists.find(*checkedLists.begin()) == uncheckedLists.end())
\r
571 m_sChangeList = *checkedLists.begin();
\r
575 m_regAddBeforeCommit = m_bShowUnversioned;
\r
576 if (!GetDlgItem(IDC_KEEPLOCK)->IsWindowEnabled())
\r
577 m_bKeepLocks = FALSE;
\r
578 m_regKeepChangelists = m_bKeepChangeList;
\r
579 if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())
\r
580 m_bKeepChangeList = FALSE;
\r
581 InterlockedExchange(&m_bBlock, FALSE);
\r
583 if (!m_sBugID.IsEmpty())
\r
585 m_sBugID.Replace(_T(", "), _T(","));
\r
586 m_sBugID.Replace(_T(" ,"), _T(","));
\r
587 CString sBugID = m_ProjectProperties.sMessage;
\r
588 sBugID.Replace(_T("%BUGID%"), m_sBugID);
\r
589 if (m_ProjectProperties.bAppend)
\r
590 m_sLogMessage += _T("\n") + sBugID + _T("\n");
\r
592 m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
\r
594 m_History.AddEntry(m_sLogMessage);
\r
599 CResizableStandAloneDialog::OnOK();
\r
602 void CCommitDlg::SaveSplitterPos()
\r
606 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
\r
608 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
609 ScreenToClient(&rectSplitter);
\r
610 regPos = rectSplitter.top;
\r
614 UINT CCommitDlg::StatusThreadEntry(LPVOID pVoid)
\r
616 return ((CCommitDlg*)pVoid)->StatusThread();
\r
619 UINT CCommitDlg::StatusThread()
\r
621 //get the status of all selected file/folders recursively
\r
622 //and show the ones which have to be committed to the user
\r
623 //in a list control.
\r
624 InterlockedExchange(&m_bBlock, TRUE);
\r
625 InterlockedExchange(&m_bThreadRunning, TRUE);// so the main thread knows that this thread is still running
\r
626 InterlockedExchange(&m_bRunThread, TRUE); // if this is set to FALSE, the thread should stop
\r
627 m_bCancelled = false;
\r
629 DialogEnableWindow(IDOK, false);
\r
630 DialogEnableWindow(IDC_SHOWUNVERSIONED, false);
\r
631 DialogEnableWindow(IDC_SELECTALL, false);
\r
632 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_HIDE);
\r
633 DialogEnableWindow(IDC_EXTERNALWARNING, false);
\r
634 // read the list of recent log entries before querying the WC for status
\r
635 // -> the user may select one and modify / update it while we are crawling the WC
\r
637 if (m_History.GetCount()==0)
\r
640 if (m_ListCtrl.m_sUUID.IsEmpty() && m_pathList.GetCount()>0)
\r
643 reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)Git.GetUUIDFromPath(m_pathList[0]));
\r
646 reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);
\r
647 m_History.Load(reg, _T("logmsgs"));
\r
650 // Initialise the list control with the status of the files/folders below us
\r
651 BOOL success = m_ListCtrl.GetStatus(m_pathList);
\r
653 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
\r
654 if(this->m_bShowUnversioned)
\r
655 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);
\r
657 m_ListCtrl.CheckIfChangelistsArePresent(false);
\r
659 DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWLOCKS | SVNSLC_SHOWINCHANGELIST;
\r
660 dwShow |= DWORD(m_regAddBeforeCommit) ? SVNSLC_SHOWUNVERSIONED : 0;
\r
663 if (m_checkedPathList.GetCount())
\r
664 m_ListCtrl.Show(dwShow, m_checkedPathList);
\r
667 DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;
\r
668 m_ListCtrl.Show(dwShow, dwCheck);
\r
669 m_bSelectFilesForCommit = true;
\r
672 if (m_ListCtrl.HasExternalsFromDifferentRepos())
\r
674 GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);
\r
675 DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);
\r
678 SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());
\r
679 m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());
\r
682 GetDlgItemText(IDC_LOGMESSAGE, logmsg);
\r
683 DialogEnableWindow(IDOK, logmsg.GetLength() >= m_ProjectProperties.nMinLogSize);
\r
686 if (!m_ListCtrl.GetLastErrorMessage().IsEmpty())
\r
687 m_ListCtrl.SetEmptyString(m_ListCtrl.GetLastErrorMessage());
\r
688 m_ListCtrl.Show(dwShow);
\r
690 if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems()))
\r
692 if (CMessageBox::Show(m_hWnd, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
\r
694 m_bShowUnversioned = TRUE;
\r
695 GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);
\r
696 DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS;
\r
697 m_ListCtrl.Show(dwShow);
\r
701 CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);
\r
702 SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());
\r
704 m_autolist.clear();
\r
705 // we don't have to block the commit dialog while we fetch the
\r
706 // auto completion list.
\r
707 m_pathwatcher.ClearChangedPaths();
\r
708 InterlockedExchange(&m_bBlock, FALSE);
\r
709 if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE)==TRUE)
\r
711 m_ListCtrl.Block(TRUE, TRUE);
\r
712 GetAutocompletionList();
\r
713 m_ListCtrl.Block(FALSE, FALSE);
\r
717 DialogEnableWindow(IDC_SHOWUNVERSIONED, true);
\r
718 DialogEnableWindow(IDC_SELECTALL, true);
\r
719 if (m_ListCtrl.HasChangeLists())
\r
720 DialogEnableWindow(IDC_KEEPLISTS, true);
\r
721 if (m_ListCtrl.HasLocks())
\r
722 DialogEnableWindow(IDC_KEEPLOCK, true);
\r
723 // we have the list, now signal the main thread about it
\r
724 SendMessage(WM_AUTOLISTREADY); // only send the message if the thread wasn't told to quit!
\r
727 InterlockedExchange(&m_bRunThread, FALSE);
\r
728 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
729 // force the cursor to normal
\r
735 void CCommitDlg::OnCancel()
\r
737 m_bCancelled = true;
\r
740 m_pathwatcher.Stop();
\r
741 if (m_bThreadRunning)
\r
743 InterlockedExchange(&m_bRunThread, FALSE);
\r
744 WaitForSingleObject(m_pThread->m_hThread, 1000);
\r
745 if (m_bThreadRunning)
\r
747 // we gave the thread a chance to quit. Since the thread didn't
\r
748 // listen to us we have to kill it.
\r
749 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
\r
750 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
755 m_sLogMessage = m_cLogMessage.GetText();
\r
756 if (!m_sBugID.IsEmpty())
\r
758 m_sBugID.Replace(_T(", "), _T(","));
\r
759 m_sBugID.Replace(_T(" ,"), _T(","));
\r
760 CString sBugID = m_ProjectProperties.sMessage;
\r
761 sBugID.Replace(_T("%BUGID%"), m_sBugID);
\r
762 if (m_ProjectProperties.bAppend)
\r
763 m_sLogMessage += _T("\n") + sBugID + _T("\n");
\r
765 m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
\r
767 if (m_ProjectProperties.sLogTemplate.Compare(m_sLogMessage) != 0)
\r
768 m_History.AddEntry(m_sLogMessage);
\r
771 CResizableStandAloneDialog::OnCancel();
\r
774 void CCommitDlg::OnBnClickedSelectall()
\r
776 m_tooltips.Pop(); // hide the tooltips
\r
777 UINT state = (m_SelectAll.GetState() & 0x0003);
\r
778 if (state == BST_INDETERMINATE)
\r
780 // It is not at all useful to manually place the checkbox into the indeterminate state...
\r
781 // We will force this on to the unchecked state
\r
782 state = BST_UNCHECKED;
\r
783 m_SelectAll.SetCheck(state);
\r
785 m_ListCtrl.SelectAll(state == BST_CHECKED);
\r
788 BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)
\r
791 m_tooltips.RelayEvent(pMsg);
\r
792 if (pMsg->message == WM_KEYDOWN)
\r
794 switch (pMsg->wParam)
\r
799 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
\r
805 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
807 if ( GetDlgItem(IDOK)->IsWindowEnabled() )
\r
809 PostMessage(WM_COMMAND, IDOK);
\r
813 if ( GetFocus()==GetDlgItem(IDC_BUGID) )
\r
815 // Pressing RETURN in the bug id control
\r
816 // moves the focus to the message
\r
817 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
825 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
\r
828 void CCommitDlg::Refresh()
\r
830 if (m_bThreadRunning)
\r
833 InterlockedExchange(&m_bBlock, TRUE);
\r
834 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
\r
835 if (m_pThread==NULL)
\r
837 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
838 InterlockedExchange(&m_bBlock, FALSE);
\r
842 m_pThread->m_bAutoDelete = FALSE;
\r
843 m_pThread->ResumeThread();
\r
847 void CCommitDlg::OnBnClickedHelp()
\r
852 void CCommitDlg::OnBnClickedShowunversioned()
\r
854 m_tooltips.Pop(); // hide the tooltips
\r
856 m_regAddBeforeCommit = m_bShowUnversioned;
\r
859 DWORD dwShow = m_ListCtrl.GetShowFlags();
\r
860 if (DWORD(m_regAddBeforeCommit))
\r
861 dwShow |= SVNSLC_SHOWUNVERSIONED;
\r
863 dwShow &= ~SVNSLC_SHOWUNVERSIONED;
\r
864 if(dwShow & SVNSLC_SHOWUNVERSIONED)
\r
866 m_ListCtrl.GetStatus(this->m_pathList,false,false,true);
\r
868 m_ListCtrl.Show(dwShow);
\r
872 void CCommitDlg::OnStnClickedExternalwarning()
\r
874 m_tooltips.Popup();
\r
877 void CCommitDlg::OnEnChangeLogmessage()
\r
882 LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)
\r
885 if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))
\r
887 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
\r
889 m_bShowUnversioned = TRUE;
\r
890 DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;
\r
891 m_ListCtrl.Show(dwShow);
\r
899 LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
\r
905 LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM lParam)
\r
908 BringWindowToTop();
\r
909 SetForegroundWindow();
\r
911 // if multiple files/folders are dropped
\r
912 // this handler is called for every single item
\r
914 // To avoid creating multiple refresh threads and
\r
915 // causing crashes, we only add the items to the
\r
916 // list control and start a timer.
\r
917 // When the timer expires, we start the refresh thread,
\r
918 // but only if it isn't already running - otherwise we
\r
919 // restart the timer.
\r
921 path.SetFromWin((LPCTSTR)lParam);
\r
923 // just add all the items we get here.
\r
924 // if the item is versioned, the add will fail but nothing
\r
925 // more will happen.
\r
927 Git.Add(CTGitPathList(path), &m_ProjectProperties, Git_depth_empty, false, true, true);
\r
929 if (!m_ListCtrl.HasPath(path))
\r
931 if (m_pathList.AreAllPathsFiles())
\r
933 m_pathList.AddPath(path);
\r
934 m_pathList.RemoveDuplicates();
\r
935 m_updatedPathList.AddPath(path);
\r
936 m_updatedPathList.RemoveDuplicates();
\r
940 // if the path list contains folders, we have to check whether
\r
941 // our just (maybe) added path is a child of one of those. If it is
\r
942 // a child of a folder already in the list, we must not add it. Otherwise
\r
943 // that path could show up twice in the list.
\r
944 bool bHasParentInList = false;
\r
945 for (int i=0; i<m_pathList.GetCount(); ++i)
\r
947 if (m_pathList[i].IsAncestorOf(path))
\r
949 bHasParentInList = true;
\r
953 if (!bHasParentInList)
\r
955 m_pathList.AddPath(path);
\r
956 m_pathList.RemoveDuplicates();
\r
957 m_updatedPathList.AddPath(path);
\r
958 m_updatedPathList.RemoveDuplicates();
\r
963 // Always start the timer, since the status of an existing item might have changed
\r
964 SetTimer(REFRESHTIMER, 200, NULL);
\r
965 ATLTRACE(_T("Item %s dropped, timer started\n"), path.GetWinPath());
\r
970 LRESULT CCommitDlg::OnAutoListReady(WPARAM, LPARAM)
\r
972 m_cLogMessage.SetAutoCompletionList(m_autolist, '*');
\r
976 //////////////////////////////////////////////////////////////////////////
\r
977 // functions which run in the status thread
\r
978 //////////////////////////////////////////////////////////////////////////
\r
980 void CCommitDlg::ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex)
\r
985 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
\r
986 while (m_bRunThread && file.ReadString(strLine))
\r
988 int eqpos = strLine.Find('=');
\r
990 rgx = strLine.Mid(eqpos+1).Trim();
\r
993 while (((pos = strLine.Find(','))>=0)&&(pos < eqpos))
\r
995 mapRegex[strLine.Left(pos)] = rgx;
\r
996 strLine = strLine.Mid(pos+1).Trim();
\r
998 mapRegex[strLine.Left(strLine.Find('=')).Trim()] = rgx;
\r
1002 catch (CFileException* pE)
\r
1004 TRACE("CFileException loading auto list regex file\n");
\r
1009 void CCommitDlg::GetAutocompletionList()
\r
1011 // the auto completion list is made of strings from each selected files.
\r
1012 // the strings used are extracted from the files with regexes found
\r
1013 // in the file "autolist.txt".
\r
1014 // the format of that file is:
\r
1015 // file extensions separated with commas '=' regular expression to use
\r
1017 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
\r
1018 // .cpp = (?<=[^\s]::)\b\w+\b
\r
1020 std::map<CString, CString> mapRegex;
\r
1021 CString sRegexFile = CPathUtils::GetAppDirectory();
\r
1022 CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);
\r
1023 DWORD timeoutvalue = regtimeout*1000;
\r
1024 sRegexFile += _T("autolist.txt");
\r
1025 if (!m_bRunThread)
\r
1027 ParseRegexFile(sRegexFile, mapRegex);
\r
1028 SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sRegexFile.GetBuffer(MAX_PATH+1));
\r
1029 sRegexFile.ReleaseBuffer();
\r
1030 sRegexFile += _T("\\TortoiseGit\\autolist.txt");
\r
1031 if (PathFileExists(sRegexFile))
\r
1033 ParseRegexFile(sRegexFile, mapRegex);
\r
1035 DWORD starttime = GetTickCount();
\r
1037 // now we have two arrays of strings, where the first array contains all
\r
1038 // file extensions we can use and the second the corresponding regex strings
\r
1039 // to apply to those files.
\r
1041 // the next step is to go over all files shown in the commit dialog
\r
1042 // and scan them for strings we can use
\r
1043 int nListItems = m_ListCtrl.GetItemCount();
\r
1045 for (int i=0; i<nListItems && m_bRunThread; ++i)
\r
1047 // stop parsing after timeout
\r
1048 if ((!m_bRunThread) || (GetTickCount() - starttime > timeoutvalue))
\r
1051 CTGitPath *path = (CTGitPath*)m_ListCtrl.GetItemData(i);
\r
1056 CString sPartPath =path->GetGitPathString();
\r
1057 m_autolist.insert(sPartPath);
\r
1059 // const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);
\r
1063 // add the path parts to the auto completion list too
\r
1064 // CString sPartPath = entry->GetRelativeGitPath();
\r
1065 // m_autolist.insert(sPartPath);
\r
1070 while ((pos = sPartPath.Find('/', pos)) >= 0)
\r
1074 m_autolist.insert(sPartPath.Mid(pos));
\r
1077 // Last inserted entry is a file name.
\r
1078 // Some users prefer to also list file name without extension.
\r
1079 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE))
\r
1081 int dotPos = sPartPath.ReverseFind('.');
\r
1082 if ((dotPos >= 0) && (dotPos > lastPos))
\r
1083 m_autolist.insert(sPartPath.Mid(lastPos, dotPos - lastPos));
\r
1086 if ((entry->status <= Git_wc_status_normal)||(entry->status == Git_wc_status_ignored))
\r
1089 CString sExt = entry->GetPath().GetFileExtension();
\r
1091 // find the regex string which corresponds to the file extension
\r
1092 CString rdata = mapRegex[sExt];
\r
1093 if (rdata.IsEmpty())
\r
1096 ScanFile(entry->GetPath().GetWinPathString(), rdata);
\r
1097 if ((entry->textstatus != Git_wc_status_unversioned) &&
\r
1098 (entry->textstatus != Git_wc_status_none) &&
\r
1099 (entry->textstatus != Git_wc_status_ignored) &&
\r
1100 (entry->textstatus != Git_wc_status_added) &&
\r
1101 (entry->textstatus != Git_wc_status_normal))
\r
1103 CTGitPath basePath = Git::GetPristinePath(entry->GetPath());
\r
1104 if (!basePath.IsEmpty())
\r
1105 ScanFile(basePath.GetWinPathString(), rdata);
\r
1109 ATLTRACE(_T("Auto completion list loaded in %d msec\n"), GetTickCount() - starttime);
\r
1112 void CCommitDlg::ScanFile(const CString& sFilePath, const CString& sRegex)
\r
1114 wstring sFileContent;
\r
1115 HANDLE hFile = CreateFile(sFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);
\r
1116 if (hFile != INVALID_HANDLE_VALUE)
\r
1118 DWORD size = GetFileSize(hFile, NULL);
\r
1119 if (size > 1000000L)
\r
1121 // no files bigger than 1 Meg
\r
1122 CloseHandle(hFile);
\r
1125 // allocate memory to hold file contents
\r
1126 char * buffer = new char[size];
\r
1128 ReadFile(hFile, buffer, size, &readbytes, NULL);
\r
1129 CloseHandle(hFile);
\r
1131 IsTextUnicode(buffer, readbytes, &opts);
\r
1132 if (opts & IS_TEXT_UNICODE_NULL_BYTES)
\r
1137 if (opts & IS_TEXT_UNICODE_UNICODE_MASK)
\r
1139 sFileContent = wstring((wchar_t*)buffer, readbytes/sizeof(WCHAR));
\r
1141 if ((opts & IS_TEXT_UNICODE_NOT_UNICODE_MASK)||(opts == 0))
\r
1143 int ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, NULL, 0);
\r
1144 wchar_t * pWideBuf = new wchar_t[ret];
\r
1145 int ret2 = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, pWideBuf, ret);
\r
1147 sFileContent = wstring(pWideBuf, ret);
\r
1148 delete [] pWideBuf;
\r
1152 if (sFileContent.empty()|| !m_bRunThread)
\r
1159 const tr1::wregex regCheck(sRegex, tr1::regex_constants::icase | tr1::regex_constants::ECMAScript);
\r
1160 const tr1::wsregex_iterator end;
\r
1161 wstring s = sFileContent;
\r
1162 for (tr1::wsregex_iterator it(s.begin(), s.end(), regCheck); it != end; ++it)
\r
1164 const tr1::wsmatch match = *it;
\r
1165 for (size_t i=1; i<match.size(); ++i)
\r
1167 if (match[i].second-match[i].first)
\r
1169 ATLTRACE(_T("matched keyword : %s\n"), wstring(match[i]).c_str());
\r
1170 m_autolist.insert(wstring(match[i]).c_str());
\r
1175 catch (exception) {}
\r
1178 // CSciEditContextMenuInterface
\r
1179 void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
\r
1181 CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));
\r
1182 m_nPopupPasteListCmd = nCmd++;
\r
1183 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);
\r
1186 bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
\r
1191 if (cmd == m_nPopupPasteListCmd)
\r
1194 TCHAR buf[MAX_STATUS_STRING_LENGTH];
\r
1195 int nListItems = m_ListCtrl.GetItemCount();
\r
1196 for (int i=0; i<nListItems; ++i)
\r
1198 CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);
\r
1199 if (entry->IsChecked())
\r
1202 Git_wc_status_kind status = entry->status;
\r
1203 if (status == Git_wc_status_unversioned)
\r
1204 status = Git_wc_status_added;
\r
1205 if (status == Git_wc_status_missing)
\r
1206 status = Git_wc_status_deleted;
\r
1207 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
1208 if (m_ProjectProperties.bFileListInEnglish)
\r
1210 GitStatus::GetStatusString(AfxGetResourceHandle(), status, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
1211 line.Format(_T("%-10s %s\r\n"), buf, (LPCTSTR)m_ListCtrl.GetItemText(i,0));
\r
1215 pSciEdit->InsertText(logmsg);
\r
1222 void CCommitDlg::OnTimer(UINT_PTR nIDEvent)
\r
1226 case ENDDIALOGTIMER:
\r
1227 KillTimer(ENDDIALOGTIMER);
\r
1230 case REFRESHTIMER:
\r
1231 if (m_bThreadRunning)
\r
1233 SetTimer(REFRESHTIMER, 200, NULL);
\r
1234 ATLTRACE("Wait some more before refreshing\n");
\r
1238 KillTimer(REFRESHTIMER);
\r
1239 ATLTRACE("Refreshing after items dropped\n");
\r
1244 __super::OnTimer(nIDEvent);
\r
1247 void CCommitDlg::OnBnClickedHistory()
\r
1249 m_tooltips.Pop(); // hide the tooltips
\r
1250 if (m_pathList.GetCount() == 0)
\r
1253 CHistoryDlg historyDlg;
\r
1254 historyDlg.SetHistory(m_History);
\r
1255 if (historyDlg.DoModal() != IDOK)
\r
1258 CString sMsg = historyDlg.GetSelectedText();
\r
1259 if (sMsg != m_cLogMessage.GetText().Left(sMsg.GetLength()))
\r
1261 CString sBugID = m_ProjectProperties.GetBugIDFromLog(sMsg);
\r
1262 if (!sBugID.IsEmpty())
\r
1264 SetDlgItemText(IDC_BUGID, sBugID);
\r
1266 if (m_ProjectProperties.sLogTemplate.Compare(m_cLogMessage.GetText())!=0)
\r
1267 m_cLogMessage.InsertText(sMsg, !m_cLogMessage.GetText().IsEmpty());
\r
1269 m_cLogMessage.SetText(sMsg);
\r
1273 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
\r
1277 void CCommitDlg::OnBnClickedBugtraqbutton()
\r
1280 m_tooltips.Pop(); // hide the tooltips
\r
1281 CString sMsg = m_cLogMessage.GetText();
\r
1283 if (m_BugTraqProvider == NULL)
\r
1286 BSTR parameters = m_bugtraq_association.GetParameters().AllocSysString();
\r
1287 BSTR commonRoot = SysAllocString(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());
\r
1288 SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_pathList.GetCount());
\r
1290 for (LONG index = 0; index < m_pathList.GetCount(); ++index)
\r
1291 SafeArrayPutElement(pathList, &index, m_pathList[index].GetGitPathString().AllocSysString());
\r
1293 BSTR originalMessage = sMsg.AllocSysString();
\r
1296 // first try the IBugTraqProvider2 interface
\r
1297 CComPtr<IBugTraqProvider2> pProvider2 = NULL;
\r
1298 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
\r
1299 if (SUCCEEDED(hr))
\r
1301 CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();
\r
1302 BSTR repositoryRoot = common.AllocSysString();
\r
1303 if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, &temp)))
\r
1306 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
\r
1307 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
\r
1310 m_cLogMessage.SetText(temp);
\r
1314 // if IBugTraqProvider2 failed, try IBugTraqProvider
\r
1315 CComPtr<IBugTraqProvider> pProvider = NULL;
\r
1316 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider);
\r
1320 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
\r
1321 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
\r
1325 if (FAILED(hr = pProvider->GetCommitMessage(GetSafeHwnd(), parameters, commonRoot, pathList, originalMessage, &temp)))
\r
1328 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
\r
1329 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
\r
1332 m_cLogMessage.SetText(temp);
\r
1335 m_cLogMessage.SetFocus();
\r
1337 SysFreeString(temp);
\r
1341 LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)
\r
1347 void CCommitDlg::UpdateOKButton()
\r
1350 BOOL bValidLogSize = FALSE;
\r
1352 if (m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize)
\r
1353 bValidLogSize = !m_bBlock;
\r
1355 LONG nSelectedItems = m_ListCtrl.GetSelected();
\r
1356 DialogEnableWindow(IDOK, bValidLogSize && nSelectedItems>0);
\r
1361 LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
1363 switch (message) {
\r
1365 if (wParam == IDC_SPLITTER)
\r
1367 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
1368 DoSize(pHdr->delta);
\r
1373 return __super::DefWindowProc(message, wParam, lParam);
\r
1376 void CCommitDlg::SetSplitterRange()
\r
1378 if ((m_ListCtrl)&&(m_cLogMessage))
\r
1381 m_cLogMessage.GetWindowRect(rcTop);
\r
1382 ScreenToClient(rcTop);
\r
1384 m_ListCtrl.GetWindowRect(rcMiddle);
\r
1385 ScreenToClient(rcMiddle);
\r
1386 if (rcMiddle.Height() && rcMiddle.Width())
\r
1387 m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);
\r
1391 void CCommitDlg::DoSize(int delta)
\r
1393 RemoveAnchor(IDC_MESSAGEGROUP);
\r
1394 RemoveAnchor(IDC_LOGMESSAGE);
\r
1395 RemoveAnchor(IDC_SPLITTER);
\r
1396 RemoveAnchor(IDC_SIGNOFF);
\r
1397 RemoveAnchor(IDC_LISTGROUP);
\r
1398 RemoveAnchor(IDC_FILELIST);
\r
1399 CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN);
\r
1400 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN);
\r
1401 CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN);
\r
1402 CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN);
\r
1403 CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta);
\r
1404 AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
\r
1405 AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
\r
1406 AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
\r
1407 AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
\r
1408 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
\r
1409 AddAnchor(IDC_SIGNOFF,TOP_RIGHT);
\r
1411 // adjust the minimum size of the dialog to prevent the resizing from
\r
1412 // moving the list control too far down.
\r
1414 m_cLogMessage.GetClientRect(rcLogMsg);
\r
1415 SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_LogMsgOrigRect.Height()+rcLogMsg.Height()));
\r
1417 SetSplitterRange();
\r
1418 m_cLogMessage.Invalidate();
\r
1419 GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
\r
1422 void CCommitDlg::OnSize(UINT nType, int cx, int cy)
\r
1424 // first, let the resizing take place
\r
1425 __super::OnSize(nType, cx, cy);
\r
1428 SetSplitterRange();
\r
1432 void CCommitDlg::OnBnClickedSignOff()
\r
1434 // TODO: Add your control notification handler code here
\r
1438 username=g_Git.GetUserName();
\r
1439 email=g_Git.GetUserEmail();
\r
1440 username.Remove(_T('\n'));
\r
1441 email.Remove(_T('\n'));
\r
1442 str.Format(_T("Signed-off-by: %s <%s>\n"),username,email);
\r
1444 m_cLogMessage.SetText(m_cLogMessage.GetText()+_T("\r\n\r\n")+str);
\r
1447 void CCommitDlg::OnStnClickedCommitlabel()
\r
1449 // TODO: Add your control notification handler code here
\r