OSDN Git Service

Don't close commit dlg if commit fail
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / CommitDlg.cpp
1 // TortoiseGit - a Windows shell extension for easy version control\r
2 \r
3 // Copyright (C) 2003-2008 - TortoiseGit\r
4 \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
9 \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
14 \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
18 //\r
19 #include "stdafx.h"\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
28 #include "Git.h"\r
29 #include "Registry.h"\r
30 #include "GitStatus.h"\r
31 #include "HistoryDlg.h"\r
32 #include "Hooks.h"\r
33 #include "CommonResource.h"\r
34 #include "UnicodeUtils.h"\r
35 #include "ProgressDlg.h"\r
36 #include "ShellUpdater.h"\r
37 \r
38 #ifdef _DEBUG\r
39 #define new DEBUG_NEW\r
40 #undef THIS_FILE\r
41 static char THIS_FILE[] = __FILE__;\r
42 #endif\r
43 \r
44 UINT CCommitDlg::WM_AUTOLISTREADY = RegisterWindowMessage(_T("TORTOISEGIT_AUTOLISTREADY_MSG"));\r
45 \r
46 IMPLEMENT_DYNAMIC(CCommitDlg, CResizableStandAloneDialog)\r
47 CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)\r
48         : CResizableStandAloneDialog(CCommitDlg::IDD, pParent)\r
49         , m_bRecursive(FALSE)\r
50         , m_bShowUnversioned(FALSE)\r
51         , m_bBlock(FALSE)\r
52         , m_bThreadRunning(FALSE)\r
53         , m_bRunThread(FALSE)\r
54         , m_pThread(NULL)\r
55         , m_bWholeProject(FALSE)\r
56         , m_bKeepChangeList(TRUE)\r
57         , m_itemsCount(0)\r
58         , m_bSelectFilesForCommit(TRUE)\r
59 {\r
60         this->m_bCommitAmend=FALSE;\r
61 }\r
62 \r
63 CCommitDlg::~CCommitDlg()\r
64 {\r
65         if(m_pThread != NULL)\r
66         {\r
67                 delete m_pThread;\r
68         }\r
69 }\r
70 \r
71 void CCommitDlg::DoDataExchange(CDataExchange* pDX)\r
72 {\r
73         CResizableStandAloneDialog::DoDataExchange(pDX);\r
74         DDX_Control(pDX, IDC_FILELIST, m_ListCtrl);\r
75         DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);\r
76         DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);\r
77         DDX_Control(pDX, IDC_SELECTALL, m_SelectAll);\r
78         DDX_Text(pDX, IDC_BUGID, m_sBugID);\r
79         DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);\r
80         DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);\r
81         DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);\r
82         DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);\r
83 }\r
84 \r
85 BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)\r
86         ON_BN_CLICKED(IDC_SELECTALL, OnBnClickedSelectall)\r
87         ON_BN_CLICKED(IDHELP, OnBnClickedHelp)\r
88         ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)\r
89 //      ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)\r
90         ON_BN_CLICKED(IDC_BUGTRAQBUTTON, OnBnClickedBugtraqbutton)\r
91         ON_EN_CHANGE(IDC_LOGMESSAGE, OnEnChangeLogmessage)\r
92         ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED, OnGitStatusListCtrlItemCountChanged)\r
93         ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnGitStatusListCtrlNeedsRefresh)\r
94         ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped)\r
95         ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_CHECKCHANGED, &CCommitDlg::OnGitStatusListCtrlCheckChanged)\r
96         ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY, OnAutoListReady) \r
97         ON_WM_TIMER()\r
98     ON_WM_SIZE()\r
99         ON_STN_CLICKED(IDC_EXTERNALWARNING, &CCommitDlg::OnStnClickedExternalwarning)\r
100         ON_BN_CLICKED(IDC_SIGNOFF, &CCommitDlg::OnBnClickedSignOff)\r
101         ON_STN_CLICKED(IDC_COMMITLABEL, &CCommitDlg::OnStnClickedCommitlabel)\r
102     ON_BN_CLICKED(IDC_COMMIT_AMEND, &CCommitDlg::OnBnClickedCommitAmend)\r
103     ON_BN_CLICKED(IDC_WHOLE_PROJECT, &CCommitDlg::OnBnClickedWholeProject)\r
104 END_MESSAGE_MAP()\r
105 \r
106 BOOL CCommitDlg::OnInitDialog()\r
107 {\r
108         CResizableStandAloneDialog::OnInitDialog();\r
109         \r
110         m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);\r
111         m_bShowUnversioned = m_regAddBeforeCommit;\r
112 \r
113         m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));\r
114 \r
115         m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE);\r
116         m_bKeepChangeList = m_regKeepChangelists;\r
117 \r
118 //      GitConfig config;\r
119 //      m_bWholeProject = config.KeepLocks();\r
120 \r
121         UpdateData(FALSE);\r
122         \r
123         m_ListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS | SVNSLC_COLADD |SVNSLC_COLDEL, _T("CommitDlg"));\r
124         m_ListCtrl.SetSelectButton(&m_SelectAll);\r
125         m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));\r
126         m_ListCtrl.SetCancelBool(&m_bCancelled);\r
127         m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);\r
128         m_ListCtrl.EnableFileDrop();\r
129         m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);\r
130         \r
131         //this->DialogEnableWindow(IDC_COMMIT_AMEND,FALSE);\r
132 //      m_ProjectProperties.ReadPropsPathList(m_pathList);\r
133         m_cLogMessage.Init(m_ProjectProperties);\r
134         m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));\r
135         m_cLogMessage.RegisterContextMenuHandler(this);\r
136 \r
137         OnEnChangeLogmessage();\r
138 \r
139         m_tooltips.Create(this);\r
140         m_tooltips.AddTool(IDC_EXTERNALWARNING, IDS_COMMITDLG_EXTERNALS);\r
141         m_tooltips.AddTool(IDC_COMMIT_AMEND,IDS_COMMIT_AMEND_TT);\r
142 //      m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);\r
143         \r
144         m_SelectAll.SetCheck(BST_INDETERMINATE);\r
145 \r
146 #if 0\r
147         CBugTraqAssociations bugtraq_associations;\r
148         bugtraq_associations.Load();\r
149 \r
150         if (bugtraq_associations.FindProvider(m_pathList, &m_bugtraq_association))\r
151         {\r
152                 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);\r
153                 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);\r
154 \r
155                 CComPtr<IBugTraqProvider> pProvider;\r
156                 HRESULT hr = pProvider.CoCreateInstance(m_bugtraq_association.GetProviderClass());\r
157                 if (SUCCEEDED(hr))\r
158                 {\r
159                         m_BugTraqProvider = pProvider;\r
160                         BSTR temp = NULL;\r
161                         if (SUCCEEDED(hr = pProvider->GetLinkText(GetSafeHwnd(), m_bugtraq_association.GetParameters().AllocSysString(), &temp)))\r
162                         {\r
163                                 SetDlgItemText(IDC_BUGTRAQBUTTON, temp);\r
164                                 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(TRUE);\r
165                                 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_SHOW);\r
166                         }\r
167 \r
168                         SysFreeString(temp);\r
169                 }\r
170 \r
171                 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
172         }\r
173         else if (!m_ProjectProperties.sMessage.IsEmpty())\r
174         {\r
175                 GetDlgItem(IDC_BUGID)->ShowWindow(SW_SHOW);\r
176                 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_SHOW);\r
177                 if (!m_ProjectProperties.sLabel.IsEmpty())\r
178                         SetDlgItemText(IDC_BUGIDLABEL, m_ProjectProperties.sLabel);\r
179                 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);\r
180                 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);\r
181                 GetDlgItem(IDC_BUGID)->SetFocus();\r
182                 CString sBugID = m_ProjectProperties.GetBugIDFromLog(m_sLogMessage);\r
183                 if (!sBugID.IsEmpty())\r
184                 {\r
185                         SetDlgItemText(IDC_BUGID, sBugID);\r
186                 }\r
187         }\r
188         else\r
189 #endif\r
190         {\r
191                 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);\r
192                 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);\r
193                 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);\r
194                 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);\r
195                 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
196         }\r
197 \r
198         if (!m_sLogMessage.IsEmpty())\r
199                 m_cLogMessage.SetText(m_sLogMessage);\r
200                 \r
201         GetWindowText(m_sWindowTitle);\r
202         \r
203         AdjustControlSize(IDC_SHOWUNVERSIONED);\r
204         AdjustControlSize(IDC_SELECTALL);\r
205         AdjustControlSize(IDC_WHOLE_PROJECT);\r
206 \r
207         GetClientRect(m_DlgOrigRect);\r
208         m_cLogMessage.GetClientRect(m_LogMsgOrigRect);\r
209 \r
210         AddAnchor(IDC_COMMITLABEL, TOP_LEFT, TOP_RIGHT);\r
211         AddAnchor(IDC_BUGIDLABEL, TOP_RIGHT);\r
212         AddAnchor(IDC_BUGID, TOP_RIGHT);\r
213         AddAnchor(IDC_BUGTRAQBUTTON, TOP_RIGHT);\r
214         AddAnchor(IDC_COMMIT_TO, TOP_LEFT, TOP_RIGHT);\r
215         AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);\r
216 //      AddAnchor(IDC_HISTORY, TOP_LEFT);\r
217         AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);\r
218         AddAnchor(IDC_SIGNOFF,   TOP_RIGHT);\r
219         AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);\r
220         AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);\r
221         AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);\r
222         AddAnchor(IDC_SHOWUNVERSIONED, BOTTOM_LEFT);\r
223         AddAnchor(IDC_SELECTALL, BOTTOM_LEFT);\r
224         AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);\r
225         AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);\r
226         AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);\r
227         AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);\r
228         AddAnchor(IDOK, BOTTOM_RIGHT);\r
229         AddAnchor(IDCANCEL, BOTTOM_RIGHT);\r
230         AddAnchor(IDHELP, BOTTOM_RIGHT);\r
231         AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);\r
232         \r
233         if (hWndExplorer)\r
234                 CenterWindow(CWnd::FromHandle(hWndExplorer));\r
235         EnableSaveRestore(_T("CommitDlg"));\r
236         DWORD yPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));\r
237         RECT rcDlg, rcLogMsg, rcFileList;\r
238         GetClientRect(&rcDlg);\r
239         m_cLogMessage.GetWindowRect(&rcLogMsg);\r
240         ScreenToClient(&rcLogMsg);\r
241         m_ListCtrl.GetWindowRect(&rcFileList);\r
242         ScreenToClient(&rcFileList);\r
243         if (yPos)\r
244         {\r
245                 RECT rectSplitter;\r
246                 m_wndSplitter.GetWindowRect(&rectSplitter);\r
247                 ScreenToClient(&rectSplitter);\r
248                 int delta = yPos - rectSplitter.top;\r
249                 if ((rcLogMsg.bottom + delta > rcLogMsg.top)&&(rcLogMsg.bottom + delta < rcFileList.bottom - 30))\r
250                 {\r
251                         m_wndSplitter.SetWindowPos(NULL, 0, yPos, 0, 0, SWP_NOSIZE);\r
252                         DoSize(delta);\r
253                 }\r
254         }\r
255 \r
256         // add all directories to the watcher\r
257         for (int i=0; i<m_pathList.GetCount(); ++i)\r
258         {\r
259                 if (m_pathList[i].IsDirectory())\r
260                         m_pathwatcher.AddPath(m_pathList[i]);\r
261         }\r
262 \r
263         m_updatedPathList = m_pathList;\r
264 \r
265         //first start a thread to obtain the file list with the status without\r
266         //blocking the dialog\r
267         InterlockedExchange(&m_bBlock, TRUE);\r
268         m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);\r
269         if (m_pThread==NULL)\r
270         {\r
271                 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);\r
272                 InterlockedExchange(&m_bBlock, FALSE);\r
273         }\r
274         else\r
275         {\r
276                 m_pThread->m_bAutoDelete = FALSE;\r
277                 m_pThread->ResumeThread();\r
278         }\r
279         CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);\r
280         CRegDWORD historyhint = CRegDWORD(_T("Software\\TortoiseGit\\HistoryHintShown"), FALSE);\r
281         if ((((DWORD)err)!=FALSE)&&((((DWORD)historyhint)==FALSE)))\r
282         {\r
283                 historyhint = TRUE;\r
284 //              ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);\r
285         }\r
286         err = FALSE;\r
287 \r
288         //this->UpdateData(TRUE);\r
289         //this->m_bCommitAmend=FALSE;\r
290         //this->UpdateData(FALSE);\r
291 \r
292         return FALSE;  // return TRUE unless you set the focus to a control\r
293         // EXCEPTION: OCX Property Pages should return FALSE\r
294 }\r
295 \r
296 void CCommitDlg::OnOK()\r
297 {\r
298         if (m_bBlock)\r
299                 return;\r
300         if (m_bThreadRunning)\r
301         {\r
302                 m_bCancelled = true;\r
303                 InterlockedExchange(&m_bRunThread, FALSE);\r
304                 WaitForSingleObject(m_pThread->m_hThread, 1000);\r
305                 if (m_bThreadRunning)\r
306                 {\r
307                         // we gave the thread a chance to quit. Since the thread didn't\r
308                         // listen to us we have to kill it.\r
309                         TerminateThread(m_pThread->m_hThread, (DWORD)-1);\r
310                         InterlockedExchange(&m_bThreadRunning, FALSE);\r
311                 }\r
312         }\r
313         this->UpdateData();\r
314 \r
315         CString id;\r
316         GetDlgItemText(IDC_BUGID, id);\r
317         if (!m_ProjectProperties.CheckBugID(id))\r
318         {\r
319                 ShowBalloon(IDC_BUGID, IDS_COMMITDLG_ONLYNUMBERS, IDI_EXCLAMATION);\r
320                 return;\r
321         }\r
322         m_sLogMessage = m_cLogMessage.GetText();\r
323         if ( m_sLogMessage.IsEmpty() )\r
324         {\r
325                 // no message entered, go round again\r
326                 CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOMESSAGE, IDS_APPNAME, MB_OK | MB_ICONERROR);\r
327                 return;\r
328         }\r
329         if ((m_ProjectProperties.bWarnIfNoIssue) && (id.IsEmpty() && !m_ProjectProperties.HasBugID(m_sLogMessage)))\r
330         {\r
331                 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOISSUEWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)\r
332                         return;\r
333         }\r
334 \r
335 #if 0\r
336         CRegDWORD regUnversionedRecurse (_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE);\r
337         if (!(DWORD)regUnversionedRecurse)\r
338         {\r
339                 // Find unversioned directories which are marked for commit. The user might expect them\r
340                 // to be added recursively since he cannot the the files. Let's ask the user if he knows\r
341                 // what he is doing.\r
342                 int nListItems = m_ListCtrl.GetItemCount();\r
343                 for (int j=0; j<nListItems; j++)\r
344                 {\r
345                         const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);\r
346                         if (entry->IsChecked() && (entry->status == Git_wc_status_unversioned) && entry->IsFolder() )\r
347                         {\r
348                                 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_UNVERSIONEDFOLDERWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)\r
349                                         return;\r
350                         }\r
351                 }\r
352         }\r
353 #endif\r
354         m_pathwatcher.Stop();\r
355         InterlockedExchange(&m_bBlock, TRUE);\r
356         CDWordArray arDeleted;\r
357         //first add all the unversioned files the user selected\r
358         //and check if all versioned files are selected\r
359         int nchecked = 0;\r
360         m_bRecursive = true;\r
361         int nListItems = m_ListCtrl.GetItemCount();\r
362 \r
363         CTGitPathList itemsToAdd;\r
364         CTGitPathList itemsToRemove;\r
365         //std::set<CString> checkedLists;\r
366         //std::set<CString> uncheckedLists;\r
367 \r
368         //CString checkedfiles;\r
369         //CString uncheckedfiles;\r
370 \r
371         CString cmd;\r
372         CString out;\r
373 \r
374         for (int j=0; j<nListItems; j++)\r
375         {\r
376                 //const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);\r
377                 CTGitPath *entry = (CTGitPath*)m_ListCtrl.GetItemData(j);\r
378                 if (entry->m_Checked)\r
379                 {\r
380 #if 0\r
381                         if (entry->status == Git_wc_status_unversioned)\r
382                         {\r
383                                 itemsToAdd.AddPath(entry->GetPath());\r
384                         }\r
385                         if (entry->status == Git_wc_status_conflicted)\r
386                         {\r
387                                 bHasConflicted = true;\r
388                         }\r
389                         if (entry->status == Git_wc_status_missing)\r
390                         {\r
391                                 itemsToRemove.AddPath(entry->GetPath());\r
392                         }\r
393                         if (entry->status == Git_wc_status_deleted)\r
394                         {\r
395                                 arDeleted.Add(j);\r
396                         }\r
397                         if (entry->IsInExternal())\r
398                         {\r
399                                 bCheckedInExternal = true;\r
400                         }\r
401 #endif\r
402                         if( entry->m_Action & CTGitPath::LOGACTIONS_UNVER)\r
403                                 cmd.Format(_T("git.exe add -f -- \"%s\""),entry->GetGitPathString());\r
404                         else if ( entry->m_Action & CTGitPath::LOGACTIONS_DELETED)\r
405                                 cmd.Format(_T("git.exe update-index --remove -- \"%s\""),entry->GetGitPathString());\r
406                         else\r
407                                 cmd.Format(_T("git.exe update-index  -- \"%s\""),entry->GetGitPathString());\r
408 \r
409                         g_Git.Run(cmd,&out,CP_ACP);\r
410                         nchecked++;\r
411 \r
412                         //checkedLists.insert(entry->GetGitPathString());\r
413 //                      checkedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");\r
414                 }\r
415                 else\r
416                 {\r
417                         //uncheckedLists.insert(entry->GetGitPathString());\r
418                         if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)\r
419                         {       //To init git repository, there are not HEAD, so we can use git reset command\r
420                                 cmd.Format(_T("git.exe rm --cache -- \"%s\""),entry->GetGitPathString());\r
421                                 g_Git.Run(cmd,&out,CP_ACP);     \r
422                         }\r
423                         else if(!( entry->m_Action & CTGitPath::LOGACTIONS_UNVER ) )\r
424                         {\r
425                                 cmd.Format(_T("git.exe reset -- \"%s\""),entry->GetGitPathString());\r
426                                 g_Git.Run(cmd,&out,CP_ACP);\r
427                         }\r
428 \r
429                 //      uncheckedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");\r
430 #if 0\r
431                         if ((entry->status != Git_wc_status_unversioned)        &&\r
432                                 (entry->status != Git_wc_status_ignored))\r
433                         {\r
434                                 nUnchecked++;\r
435                                 uncheckedLists.insert(entry->GetChangeList());\r
436                                 if (m_bRecursive)\r
437                                 {\r
438                                         // This algorithm is for the sake of simplicity of the complexity O(N?\r
439                                         for (int k=0; k<nListItems; k++)\r
440                                         {\r
441                                                 const CGitStatusListCtrl::FileEntry * entryK = m_ListCtrl.GetListEntry(k);\r
442                                                 if (entryK->IsChecked() && entryK->GetPath().IsAncestorOf(entry->GetPath())  )\r
443                                                 {\r
444                                                         // Fall back to a non-recursive commit to prevent items being\r
445                                                         // committed which aren't checked although its parent is checked\r
446                                                         // (property change, directory deletion, ... )\r
447                                                         m_bRecursive = false;\r
448                                                         break;\r
449                                                 }\r
450                                         }\r
451                                 }\r
452                         }\r
453 #endif\r
454                 }\r
455 \r
456                 CShellUpdater::Instance().AddPathForUpdate(*entry);\r
457         }\r
458 \r
459         //if(uncheckedfiles.GetLength()>0)\r
460         //{\r
461         //      cmd.Format(_T("git.exe reset -- %s"),uncheckedfiles);\r
462         //      g_Git.Run(cmd,&out);\r
463         //}\r
464 \r
465         BOOL bCloseCommitDlg=true;\r
466         //if(checkedfiles.GetLength()>0)\r
467         if(nchecked||m_bCommitAmend)\r
468         {\r
469         //      cmd.Format(_T("git.exe update-index -- %s"),checkedfiles);\r
470         //      g_Git.Run(cmd,&out);\r
471 \r
472                 CString tempfile=::GetTempFile();\r
473                 CFile file(tempfile,CFile::modeReadWrite|CFile::modeCreate );\r
474                 CStringA log=CUnicodeUtils::GetUTF8( m_sLogMessage);\r
475                 file.Write(log,log.GetLength());\r
476                 //file.WriteString(m_sLogMessage);\r
477                 file.Close();\r
478         \r
479                 out =_T("");\r
480                 CString amend;\r
481                 if(this->m_bCommitAmend)\r
482                 {\r
483                         amend=_T("--amend");\r
484                 }\r
485                 cmd.Format(_T("git.exe commit %s -F \"%s\""),amend, tempfile);\r
486                 \r
487                 CProgressDlg progress;\r
488                 progress.m_GitCmd=cmd;\r
489                 progress.m_bShowCommand = FALSE;        // don't show the commit command\r
490                 progress.m_PreText = out;                       // show any output already generated in log window\r
491                 progress.DoModal();\r
492                 \r
493                 if(progress.m_GitStatus)\r
494                 {\r
495                         bCloseCommitDlg = false;\r
496                         this->Refresh();\r
497                 }\r
498 \r
499                 CFile::Remove(tempfile);\r
500         }else\r
501                 CMessageBox::Show(this->m_hWnd, _T("Nothing Commit"), _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);\r
502 #if 0\r
503         if (m_pathwatcher.GetNumberOfChangedPaths() && m_bRecursive)\r
504         {\r
505                 // There are paths which got changed (touched at least).\r
506                 // We have to find out if this affects the selection in the commit dialog\r
507                 // If it could affect the selection, revert back to a non-recursive commit\r
508                 CTGitPathList changedList = m_pathwatcher.GetChangedPaths();\r
509                 changedList.RemoveDuplicates();\r
510                 for (int i=0; i<changedList.GetCount(); ++i)\r
511                 {\r
512                         if (changedList[i].IsAdminDir())\r
513                         {\r
514                                 // something inside an admin dir was changed.\r
515                                 // if it's the entries file, then we have to fully refresh because\r
516                                 // files may have been added/removed from version control\r
517                                 if ((changedList[i].GetWinPathString().Right(7).CompareNoCase(_T("entries")) == 0) &&\r
518                                         (changedList[i].GetWinPathString().Find(_T("\\tmp\\"))<0))\r
519                                 {\r
520                                         m_bRecursive = false;\r
521                                         break;\r
522                                 }\r
523                         }\r
524                         else if (!m_ListCtrl.IsPathShown(changedList[i]))\r
525                         {\r
526                                 // a path which is not shown in the list has changed\r
527                                 CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(changedList[i]);\r
528                                 if (entry)\r
529                                 {\r
530                                         // check if the changed path would get committed by a recursive commit\r
531                                         if ((!entry->IsFromDifferentRepository()) &&\r
532                                                 (!entry->IsInExternal()) &&\r
533                                                 (!entry->IsNested()) && \r
534                                                 (!entry->IsChecked()))\r
535                                         {\r
536                                                 m_bRecursive = false;\r
537                                                 break;\r
538                                         }\r
539                                 }\r
540                         }\r
541                 }\r
542         }\r
543 \r
544 \r
545         // Now, do all the adds - make sure that the list is sorted so that parents \r
546         // are added before their children\r
547         itemsToAdd.SortByPathname();\r
548         Git Git;\r
549         if (!Git.Add(itemsToAdd, &m_ProjectProperties, Git_depth_empty, FALSE, FALSE, TRUE))\r
550         {\r
551                 CMessageBox::Show(m_hWnd, Git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
552                 InterlockedExchange(&m_bBlock, FALSE);\r
553                 Refresh();\r
554                 return;\r
555         }\r
556 \r
557         // Remove any missing items\r
558         // Not sure that this sort is really necessary - indeed, it might be better to do a reverse sort at this point\r
559         itemsToRemove.SortByPathname();\r
560         Git.Remove(itemsToRemove, TRUE);\r
561 \r
562         //the next step: find all deleted files and check if they're \r
563         //inside a deleted folder. If that's the case, then remove those\r
564         //files from the list since they'll get deleted by the parent\r
565         //folder automatically.\r
566         m_ListCtrl.Block(TRUE, FALSE);\r
567         INT_PTR nDeleted = arDeleted.GetCount();\r
568         for (INT_PTR i=0; i<arDeleted.GetCount(); i++)\r
569         {\r
570                 if (m_ListCtrl.GetCheck(arDeleted.GetAt(i)))\r
571                 {\r
572                         const CTGitPath& path = m_ListCtrl.GetListEntry(arDeleted.GetAt(i))->GetPath();\r
573                         if (path.IsDirectory())\r
574                         {\r
575                                 //now find all children of this directory\r
576                                 for (int j=0; j<arDeleted.GetCount(); j++)\r
577                                 {\r
578                                         if (i!=j)\r
579                                         {\r
580                                                 CGitStatusListCtrl::FileEntry* childEntry = m_ListCtrl.GetListEntry(arDeleted.GetAt(j));\r
581                                                 if (childEntry->IsChecked())\r
582                                                 {\r
583                                                         if (path.IsAncestorOf(childEntry->GetPath()))\r
584                                                         {\r
585                                                                 m_ListCtrl.SetEntryCheck(childEntry, arDeleted.GetAt(j), false);\r
586                                                                 nDeleted--;\r
587                                                         }\r
588                                                 }\r
589                                         }\r
590                                 }\r
591                         }\r
592                 }\r
593         } \r
594         m_ListCtrl.Block(FALSE, FALSE);\r
595 \r
596         if ((nUnchecked != 0)||(bCheckedInExternal)||(bHasConflicted)||(!m_bRecursive))\r
597         {\r
598                 //save only the files the user has checked into the temporary file\r
599                 m_ListCtrl.WriteCheckedNamesToPathList(m_pathList);\r
600         }\r
601         m_ListCtrl.WriteCheckedNamesToPathList(m_selectedPathList);\r
602         // the item count is used in the progress dialog to show the overall commit\r
603         // progress.\r
604         // deleted items only send one notification event, all others send two\r
605         m_itemsCount = ((m_selectedPathList.GetCount() - nDeleted - itemsToRemove.GetCount()) * 2) + nDeleted + itemsToRemove.GetCount();\r
606 \r
607         if ((m_bRecursive)&&(checkedLists.size() == 1))\r
608         {\r
609                 // all checked items belong to the same changelist\r
610                 // find out if there are any unchecked items which belong to that changelist\r
611                 if (uncheckedLists.find(*checkedLists.begin()) == uncheckedLists.end())\r
612                         m_sChangeList = *checkedLists.begin();\r
613         }\r
614 #endif\r
615         UpdateData();\r
616         m_regAddBeforeCommit = m_bShowUnversioned;\r
617         if (!GetDlgItem(IDC_WHOLE_PROJECT)->IsWindowEnabled())\r
618                 m_bWholeProject = FALSE;\r
619         m_regKeepChangelists = m_bKeepChangeList;\r
620         if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())\r
621                 m_bKeepChangeList = FALSE;\r
622         InterlockedExchange(&m_bBlock, FALSE);\r
623         m_sBugID.Trim();\r
624         if (!m_sBugID.IsEmpty())\r
625         {\r
626                 m_sBugID.Replace(_T(", "), _T(","));\r
627                 m_sBugID.Replace(_T(" ,"), _T(","));\r
628                 CString sBugID = m_ProjectProperties.sMessage;\r
629                 sBugID.Replace(_T("%BUGID%"), m_sBugID);\r
630                 if (m_ProjectProperties.bAppend)\r
631                         m_sLogMessage += _T("\n") + sBugID + _T("\n");\r
632                 else\r
633                         m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;\r
634         }\r
635         m_History.AddEntry(m_sLogMessage);\r
636         m_History.Save();\r
637 \r
638         SaveSplitterPos();\r
639 \r
640         if( bCloseCommitDlg )\r
641                 CResizableStandAloneDialog::OnOK();\r
642 \r
643         CShellUpdater::Instance().Flush();\r
644 }\r
645 \r
646 void CCommitDlg::SaveSplitterPos()\r
647 {\r
648         if (!IsIconic())\r
649         {\r
650                 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));\r
651                 RECT rectSplitter;\r
652                 m_wndSplitter.GetWindowRect(&rectSplitter);\r
653                 ScreenToClient(&rectSplitter);\r
654                 regPos = rectSplitter.top;\r
655         }\r
656 }\r
657 \r
658 UINT CCommitDlg::StatusThreadEntry(LPVOID pVoid)\r
659 {\r
660         return ((CCommitDlg*)pVoid)->StatusThread();\r
661 }\r
662 \r
663 UINT CCommitDlg::StatusThread()\r
664 {\r
665         //get the status of all selected file/folders recursively\r
666         //and show the ones which have to be committed to the user\r
667         //in a list control. \r
668         InterlockedExchange(&m_bBlock, TRUE);\r
669         InterlockedExchange(&m_bThreadRunning, TRUE);// so the main thread knows that this thread is still running\r
670         InterlockedExchange(&m_bRunThread, TRUE);       // if this is set to FALSE, the thread should stop\r
671         m_bCancelled = false;\r
672 \r
673         DialogEnableWindow(IDOK, false);\r
674         DialogEnableWindow(IDC_SHOWUNVERSIONED, false);\r
675     DialogEnableWindow(IDC_WHOLE_PROJECT, false);\r
676         DialogEnableWindow(IDC_SELECTALL, false);\r
677         GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_HIDE);\r
678         DialogEnableWindow(IDC_EXTERNALWARNING, false);\r
679     // read the list of recent log entries before querying the WC for status\r
680     // -> the user may select one and modify / update it while we are crawling the WC\r
681 #if 0\r
682         if (m_History.GetCount()==0)\r
683         {\r
684                 CString reg;\r
685                 if (m_ListCtrl.m_sUUID.IsEmpty() && m_pathList.GetCount()>0)\r
686                 {\r
687                         Git Git;\r
688                         reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)Git.GetUUIDFromPath(m_pathList[0]));\r
689                 }\r
690                 else\r
691                         reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);\r
692                 m_History.Load(reg, _T("logmsgs"));\r
693         }\r
694 #endif\r
695     // Initialise the list control with the status of the files/folders below us\r
696         m_ListCtrl.Clear();\r
697         BOOL success;\r
698     if(m_bWholeProject)\r
699         success=m_ListCtrl.GetStatus(NULL);\r
700     else\r
701         success=m_ListCtrl.GetStatus(&m_pathList);\r
702 \r
703         //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));\r
704         if(this->m_bShowUnversioned)\r
705                 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER,true,&m_pathList);\r
706         \r
707         m_ListCtrl.CheckIfChangelistsArePresent(false);\r
708 \r
709         DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWLOCKS | SVNSLC_SHOWINCHANGELIST;\r
710         dwShow |= DWORD(m_regAddBeforeCommit) ? SVNSLC_SHOWUNVERSIONED : 0;\r
711         if (success)\r
712         {\r
713                 if (m_checkedPathList.GetCount())\r
714                         m_ListCtrl.Show(dwShow, m_checkedPathList);\r
715                 else\r
716                 {\r
717                         DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;\r
718                         dwCheck &=~(CTGitPath::LOGACTIONS_UNVER); //don't check unversion file default. \r
719                         m_ListCtrl.Show(dwShow, dwCheck);\r
720                         m_bSelectFilesForCommit = true;\r
721                 }\r
722 \r
723                 if (m_ListCtrl.HasExternalsFromDifferentRepos())\r
724                 {\r
725                         GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);\r
726                         DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);\r
727                 }\r
728                 \r
729                 SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());\r
730                 m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());\r
731         }\r
732         CString logmsg;\r
733         GetDlgItemText(IDC_LOGMESSAGE, logmsg);\r
734         DialogEnableWindow(IDOK, logmsg.GetLength() >= m_ProjectProperties.nMinLogSize);\r
735         if (!success)\r
736         {\r
737                 if (!m_ListCtrl.GetLastErrorMessage().IsEmpty())\r
738                         m_ListCtrl.SetEmptyString(m_ListCtrl.GetLastErrorMessage());\r
739                 m_ListCtrl.Show(dwShow);\r
740         }\r
741         if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems()))\r
742         {\r
743                 if (CMessageBox::Show(m_hWnd, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)\r
744                 {\r
745                         m_bShowUnversioned = TRUE;\r
746                         GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);\r
747                         DWORD dwShow = (DWORD)(SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS);\r
748                         m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);\r
749                         m_ListCtrl.Show(dwShow,dwShow&(~CTGitPath::LOGACTIONS_UNVER));\r
750                 }\r
751         }\r
752 \r
753         CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);\r
754 \r
755     if(this->m_bWholeProject)   \r
756         SetWindowText(m_sWindowTitle + _T(" - ") + CString(_T("Whole Project")));\r
757     else\r
758             SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());\r
759 \r
760         m_autolist.clear();\r
761         // we don't have to block the commit dialog while we fetch the\r
762         // auto completion list.\r
763         m_pathwatcher.ClearChangedPaths();\r
764         InterlockedExchange(&m_bBlock, FALSE);\r
765         if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE)==TRUE)\r
766         {\r
767                 m_ListCtrl.Block(TRUE, TRUE);\r
768                 GetAutocompletionList();\r
769                 m_ListCtrl.Block(FALSE, FALSE);\r
770         }\r
771         if (m_bRunThread)\r
772         {\r
773                 DialogEnableWindow(IDC_SHOWUNVERSIONED, true);\r
774         DialogEnableWindow(IDC_WHOLE_PROJECT, true);\r
775                 DialogEnableWindow(IDC_SELECTALL, true);\r
776                 if (m_ListCtrl.HasChangeLists())\r
777                         DialogEnableWindow(IDC_KEEPLISTS, true);\r
778                 if (m_ListCtrl.HasLocks())\r
779                         DialogEnableWindow(IDC_WHOLE_PROJECT, true);\r
780                 // we have the list, now signal the main thread about it\r
781                 SendMessage(WM_AUTOLISTREADY);  // only send the message if the thread wasn't told to quit!\r
782         }\r
783 \r
784         InterlockedExchange(&m_bRunThread, FALSE);\r
785         InterlockedExchange(&m_bThreadRunning, FALSE);\r
786         // force the cursor to normal\r
787         RefreshCursor();\r
788 \r
789         return 0;\r
790 }\r
791 \r
792 void CCommitDlg::OnCancel()\r
793 {\r
794         m_bCancelled = true;\r
795         if (m_bBlock)\r
796                 return;\r
797         m_pathwatcher.Stop();\r
798         if (m_bThreadRunning)\r
799         {\r
800                 InterlockedExchange(&m_bRunThread, FALSE);\r
801                 WaitForSingleObject(m_pThread->m_hThread, 1000);\r
802                 if (m_bThreadRunning)\r
803                 {\r
804                         // we gave the thread a chance to quit. Since the thread didn't\r
805                         // listen to us we have to kill it.\r
806                         TerminateThread(m_pThread->m_hThread, (DWORD)-1);\r
807                         InterlockedExchange(&m_bThreadRunning, FALSE);\r
808                 }\r
809         }\r
810         UpdateData();\r
811         m_sBugID.Trim();\r
812         m_sLogMessage = m_cLogMessage.GetText();\r
813         if (!m_sBugID.IsEmpty())\r
814         {\r
815                 m_sBugID.Replace(_T(", "), _T(","));\r
816                 m_sBugID.Replace(_T(" ,"), _T(","));\r
817                 CString sBugID = m_ProjectProperties.sMessage;\r
818                 sBugID.Replace(_T("%BUGID%"), m_sBugID);\r
819                 if (m_ProjectProperties.bAppend)\r
820                         m_sLogMessage += _T("\n") + sBugID + _T("\n");\r
821                 else\r
822                         m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;\r
823         }\r
824         if (m_ProjectProperties.sLogTemplate.Compare(m_sLogMessage) != 0)\r
825                 m_History.AddEntry(m_sLogMessage);\r
826         m_History.Save();\r
827         SaveSplitterPos();\r
828         CResizableStandAloneDialog::OnCancel();\r
829 }\r
830 \r
831 void CCommitDlg::OnBnClickedSelectall()\r
832 {\r
833         m_tooltips.Pop();       // hide the tooltips\r
834         UINT state = (m_SelectAll.GetState() & 0x0003);\r
835         if (state == BST_INDETERMINATE)\r
836         {\r
837                 // It is not at all useful to manually place the checkbox into the indeterminate state...\r
838                 // We will force this on to the unchecked state\r
839                 state = BST_UNCHECKED;\r
840                 m_SelectAll.SetCheck(state);\r
841         }\r
842         m_ListCtrl.SelectAll(state == BST_CHECKED);\r
843 }\r
844 \r
845 BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)\r
846 {\r
847         if (!m_bBlock)\r
848                 m_tooltips.RelayEvent(pMsg);\r
849         if (pMsg->message == WM_KEYDOWN)\r
850         {\r
851                 switch (pMsg->wParam)\r
852                 {\r
853                 case VK_F5:\r
854                         {\r
855                                 if (m_bBlock)\r
856                                         return CResizableStandAloneDialog::PreTranslateMessage(pMsg);\r
857                                 Refresh();\r
858                         }\r
859                         break;\r
860                 case VK_RETURN:\r
861                         {\r
862                                 if (GetAsyncKeyState(VK_CONTROL)&0x8000)\r
863                                 {\r
864                                         if ( GetDlgItem(IDOK)->IsWindowEnabled() )\r
865                                         {\r
866                                                 PostMessage(WM_COMMAND, IDOK);\r
867                                         }\r
868                                         return TRUE;\r
869                                 }\r
870                                 if ( GetFocus()==GetDlgItem(IDC_BUGID) )\r
871                                 {\r
872                                         // Pressing RETURN in the bug id control\r
873                                         // moves the focus to the message\r
874                                         GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
875                                         return TRUE;\r
876                                 }\r
877                         }\r
878                         break;\r
879                 }\r
880         }\r
881 \r
882         return CResizableStandAloneDialog::PreTranslateMessage(pMsg);\r
883 }\r
884 \r
885 void CCommitDlg::Refresh()\r
886 {\r
887         if (m_bThreadRunning)\r
888                 return;\r
889 \r
890         InterlockedExchange(&m_bBlock, TRUE);\r
891         m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);\r
892         if (m_pThread==NULL)\r
893         {\r
894                 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);\r
895                 InterlockedExchange(&m_bBlock, FALSE);\r
896         }\r
897         else\r
898         {\r
899                 m_pThread->m_bAutoDelete = FALSE;\r
900                 m_pThread->ResumeThread();\r
901         }\r
902 }\r
903 \r
904 void CCommitDlg::OnBnClickedHelp()\r
905 {\r
906         OnHelp();\r
907 }\r
908 \r
909 void CCommitDlg::OnBnClickedShowunversioned()\r
910 {\r
911         m_tooltips.Pop();       // hide the tooltips\r
912         UpdateData();\r
913         m_regAddBeforeCommit = m_bShowUnversioned;\r
914         if (!m_bBlock)\r
915         {\r
916                 DWORD dwShow = m_ListCtrl.GetShowFlags();\r
917                 if (DWORD(m_regAddBeforeCommit))\r
918                         dwShow |= SVNSLC_SHOWUNVERSIONED;\r
919                 else\r
920                         dwShow &= ~SVNSLC_SHOWUNVERSIONED;\r
921                 if(dwShow & SVNSLC_SHOWUNVERSIONED)\r
922                 {\r
923             if(m_bWholeProject)\r
924                 m_ListCtrl.GetStatus(NULL,false,false,true);\r
925             else\r
926                             m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);\r
927                 }\r
928                 m_ListCtrl.Show(dwShow);\r
929         }\r
930 }\r
931 \r
932 void CCommitDlg::OnStnClickedExternalwarning()\r
933 {\r
934         m_tooltips.Popup();\r
935 }\r
936 \r
937 void CCommitDlg::OnEnChangeLogmessage()\r
938 {\r
939         UpdateOKButton();\r
940 }\r
941 \r
942 LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)\r
943 {\r
944 #if 0\r
945         if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))\r
946         {\r
947                 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)\r
948                 {\r
949                         m_bShowUnversioned = TRUE;\r
950                         DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;\r
951                         m_ListCtrl.Show(dwShow);\r
952                         UpdateData(FALSE);\r
953                 }\r
954         }\r
955 #endif\r
956         return 0;\r
957 }\r
958 \r
959 LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)\r
960 {\r
961         Refresh();\r
962         return 0;\r
963 }\r
964 \r
965 LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM /*lParam*/)\r
966 {\r
967 #if 0\r
968         BringWindowToTop();\r
969         SetForegroundWindow();\r
970         SetActiveWindow();\r
971         // if multiple files/folders are dropped\r
972         // this handler is called for every single item\r
973         // separately.\r
974         // To avoid creating multiple refresh threads and\r
975         // causing crashes, we only add the items to the\r
976         // list control and start a timer.\r
977         // When the timer expires, we start the refresh thread,\r
978         // but only if it isn't already running - otherwise we\r
979         // restart the timer.\r
980         CTGitPath path;\r
981         path.SetFromWin((LPCTSTR)lParam);\r
982 \r
983         // just add all the items we get here.\r
984         // if the item is versioned, the add will fail but nothing\r
985         // more will happen.\r
986         Git Git;\r
987         Git.Add(CTGitPathList(path), &m_ProjectProperties, Git_depth_empty, false, true, true);\r
988 \r
989         if (!m_ListCtrl.HasPath(path))\r
990         {\r
991                 if (m_pathList.AreAllPathsFiles())\r
992                 {\r
993                         m_pathList.AddPath(path);\r
994                         m_pathList.RemoveDuplicates();\r
995                         m_updatedPathList.AddPath(path);\r
996                         m_updatedPathList.RemoveDuplicates();\r
997                 }\r
998                 else\r
999                 {\r
1000                         // if the path list contains folders, we have to check whether\r
1001                         // our just (maybe) added path is a child of one of those. If it is\r
1002                         // a child of a folder already in the list, we must not add it. Otherwise\r
1003                         // that path could show up twice in the list.\r
1004                         bool bHasParentInList = false;\r
1005                         for (int i=0; i<m_pathList.GetCount(); ++i)\r
1006                         {\r
1007                                 if (m_pathList[i].IsAncestorOf(path))\r
1008                                 {\r
1009                                         bHasParentInList = true;\r
1010                                         break;\r
1011                                 }\r
1012                         }\r
1013                         if (!bHasParentInList)\r
1014                         {\r
1015                                 m_pathList.AddPath(path);\r
1016                                 m_pathList.RemoveDuplicates();\r
1017                                 m_updatedPathList.AddPath(path);\r
1018                                 m_updatedPathList.RemoveDuplicates();\r
1019                         }\r
1020                 }\r
1021         }\r
1022         \r
1023         // Always start the timer, since the status of an existing item might have changed\r
1024         SetTimer(REFRESHTIMER, 200, NULL);\r
1025         ATLTRACE(_T("Item %s dropped, timer started\n"), path.GetWinPath());\r
1026 #endif\r
1027         return 0;\r
1028 }\r
1029 \r
1030 LRESULT CCommitDlg::OnAutoListReady(WPARAM, LPARAM)\r
1031 {\r
1032         m_cLogMessage.SetAutoCompletionList(m_autolist, '*');\r
1033         return 0;\r
1034 }\r
1035 \r
1036 //////////////////////////////////////////////////////////////////////////\r
1037 // functions which run in the status thread\r
1038 //////////////////////////////////////////////////////////////////////////\r
1039 \r
1040 void CCommitDlg::ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex)\r
1041 {\r
1042         CString strLine;\r
1043         try\r
1044         {\r
1045                 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);\r
1046                 while (m_bRunThread && file.ReadString(strLine))\r
1047                 {\r
1048                         int eqpos = strLine.Find('=');\r
1049                         CString rgx;\r
1050                         rgx = strLine.Mid(eqpos+1).Trim();\r
1051 \r
1052                         int pos = -1;\r
1053                         while (((pos = strLine.Find(','))>=0)&&(pos < eqpos))\r
1054                         {\r
1055                                 mapRegex[strLine.Left(pos)] = rgx;\r
1056                                 strLine = strLine.Mid(pos+1).Trim();\r
1057                         }\r
1058                         mapRegex[strLine.Left(strLine.Find('=')).Trim()] = rgx;\r
1059                 }\r
1060                 file.Close();\r
1061         }\r
1062         catch (CFileException* pE)\r
1063         {\r
1064                 TRACE("CFileException loading auto list regex file\n");\r
1065                 pE->Delete();\r
1066                 return;\r
1067         }\r
1068 }\r
1069 void CCommitDlg::GetAutocompletionList()\r
1070 {\r
1071         // the auto completion list is made of strings from each selected files.\r
1072         // the strings used are extracted from the files with regexes found\r
1073         // in the file "autolist.txt".\r
1074         // the format of that file is:\r
1075         // file extensions separated with commas '=' regular expression to use\r
1076         // example:\r
1077         // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))\r
1078         // .cpp = (?<=[^\s]::)\b\w+\b\r
1079         \r
1080         std::map<CString, CString> mapRegex;\r
1081         CString sRegexFile = CPathUtils::GetAppDirectory();\r
1082         CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);\r
1083         DWORD timeoutvalue = regtimeout*1000;\r
1084         sRegexFile += _T("autolist.txt");\r
1085         if (!m_bRunThread)\r
1086                 return;\r
1087         ParseRegexFile(sRegexFile, mapRegex);\r
1088         SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sRegexFile.GetBuffer(MAX_PATH+1));\r
1089         sRegexFile.ReleaseBuffer();\r
1090         sRegexFile += _T("\\TortoiseGit\\autolist.txt");\r
1091         if (PathFileExists(sRegexFile))\r
1092         {\r
1093                 ParseRegexFile(sRegexFile, mapRegex);\r
1094         }\r
1095         DWORD starttime = GetTickCount();\r
1096 \r
1097         // now we have two arrays of strings, where the first array contains all\r
1098         // file extensions we can use and the second the corresponding regex strings\r
1099         // to apply to those files.\r
1100 \r
1101         // the next step is to go over all files shown in the commit dialog\r
1102         // and scan them for strings we can use\r
1103         int nListItems = m_ListCtrl.GetItemCount();\r
1104 \r
1105         for (int i=0; i<nListItems && m_bRunThread; ++i)\r
1106         {\r
1107                 // stop parsing after timeout\r
1108                 if ((!m_bRunThread) || (GetTickCount() - starttime > timeoutvalue))\r
1109                         return;\r
1110 \r
1111                 CTGitPath *path = (CTGitPath*)m_ListCtrl.GetItemData(i);\r
1112 \r
1113                 if(path == NULL)\r
1114                         continue;\r
1115 \r
1116                 CString sPartPath =path->GetGitPathString();\r
1117                 m_autolist.insert(sPartPath);\r
1118 \r
1119 //              const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);\r
1120 //              if (!entry)\r
1121 //                      continue;\r
1122                 \r
1123                 // add the path parts to the auto completion list too\r
1124 //              CString sPartPath = entry->GetRelativeGitPath();\r
1125 //              m_autolist.insert(sPartPath);\r
1126 \r
1127 \r
1128                 int pos = 0;\r
1129                 int lastPos = 0;\r
1130                 while ((pos = sPartPath.Find('/', pos)) >= 0)\r
1131                 {\r
1132                         pos++;\r
1133                         lastPos = pos;\r
1134                         m_autolist.insert(sPartPath.Mid(pos));\r
1135                 }\r
1136 \r
1137                 // Last inserted entry is a file name.\r
1138                 // Some users prefer to also list file name without extension.\r
1139                 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE))\r
1140                 {\r
1141                         int dotPos = sPartPath.ReverseFind('.');\r
1142                         if ((dotPos >= 0) && (dotPos > lastPos))\r
1143                                 m_autolist.insert(sPartPath.Mid(lastPos, dotPos - lastPos));\r
1144                 }\r
1145 #if 0\r
1146                 if ((entry->status <= Git_wc_status_normal)||(entry->status == Git_wc_status_ignored))\r
1147                         continue;\r
1148 \r
1149                 CString sExt = entry->GetPath().GetFileExtension();\r
1150                 sExt.MakeLower();\r
1151                 // find the regex string which corresponds to the file extension\r
1152                 CString rdata = mapRegex[sExt];\r
1153                 if (rdata.IsEmpty())\r
1154                         continue;\r
1155 \r
1156                 ScanFile(entry->GetPath().GetWinPathString(), rdata);\r
1157                 if ((entry->textstatus != Git_wc_status_unversioned) &&\r
1158                         (entry->textstatus != Git_wc_status_none) &&\r
1159                         (entry->textstatus != Git_wc_status_ignored) &&\r
1160                         (entry->textstatus != Git_wc_status_added) &&\r
1161                         (entry->textstatus != Git_wc_status_normal))\r
1162                 {\r
1163                         CTGitPath basePath = Git::GetPristinePath(entry->GetPath());\r
1164                         if (!basePath.IsEmpty())\r
1165                                 ScanFile(basePath.GetWinPathString(), rdata);\r
1166                 }\r
1167 #endif\r
1168         }\r
1169         ATLTRACE(_T("Auto completion list loaded in %d msec\n"), GetTickCount() - starttime);\r
1170 }\r
1171 \r
1172 void CCommitDlg::ScanFile(const CString& sFilePath, const CString& sRegex)\r
1173 {\r
1174         wstring sFileContent;\r
1175         HANDLE hFile = CreateFile(sFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);\r
1176         if (hFile != INVALID_HANDLE_VALUE)\r
1177         {\r
1178                 DWORD size = GetFileSize(hFile, NULL);\r
1179                 if (size > 1000000L)\r
1180                 {\r
1181                         // no files bigger than 1 Meg\r
1182                         CloseHandle(hFile);\r
1183                         return;\r
1184                 }\r
1185                 // allocate memory to hold file contents\r
1186                 char * buffer = new char[size];\r
1187                 DWORD readbytes;\r
1188                 ReadFile(hFile, buffer, size, &readbytes, NULL);\r
1189                 CloseHandle(hFile);\r
1190                 int opts = 0;\r
1191                 IsTextUnicode(buffer, readbytes, &opts);\r
1192                 if (opts & IS_TEXT_UNICODE_NULL_BYTES)\r
1193                 {\r
1194                         delete [] buffer;\r
1195                         return;\r
1196                 }\r
1197                 if (opts & IS_TEXT_UNICODE_UNICODE_MASK)\r
1198                 {\r
1199                         sFileContent = wstring((wchar_t*)buffer, readbytes/sizeof(WCHAR));\r
1200                 }\r
1201                 if ((opts & IS_TEXT_UNICODE_NOT_UNICODE_MASK)||(opts == 0))\r
1202                 {\r
1203                         int ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, NULL, 0);\r
1204                         wchar_t * pWideBuf = new wchar_t[ret];\r
1205                         int ret2 = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, pWideBuf, ret);\r
1206                         if (ret2 == ret)\r
1207                                 sFileContent = wstring(pWideBuf, ret);\r
1208                         delete [] pWideBuf;\r
1209                 }\r
1210                 delete [] buffer;\r
1211         }\r
1212         if (sFileContent.empty()|| !m_bRunThread)\r
1213         {\r
1214                 return;\r
1215         }\r
1216 \r
1217         try\r
1218         {\r
1219                 const tr1::wregex regCheck(sRegex, tr1::regex_constants::icase | tr1::regex_constants::ECMAScript);\r
1220                 const tr1::wsregex_iterator end;\r
1221                 wstring s = sFileContent;\r
1222                 for (tr1::wsregex_iterator it(s.begin(), s.end(), regCheck); it != end; ++it)\r
1223                 {\r
1224                         const tr1::wsmatch match = *it;\r
1225                         for (size_t i=1; i<match.size(); ++i)\r
1226                         {\r
1227                                 if (match[i].second-match[i].first)\r
1228                                 {\r
1229                                         ATLTRACE(_T("matched keyword : %s\n"), wstring(match[i]).c_str());\r
1230                                         m_autolist.insert(wstring(match[i]).c_str());\r
1231                                 }\r
1232                         }\r
1233                 }\r
1234         }\r
1235         catch (exception) {}\r
1236 }\r
1237 \r
1238 // CSciEditContextMenuInterface\r
1239 void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)\r
1240 {\r
1241         CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));\r
1242         m_nPopupPasteListCmd = nCmd++;\r
1243         mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);\r
1244 }\r
1245 \r
1246 bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)\r
1247 {\r
1248 \r
1249         if (m_bBlock)\r
1250                 return false;\r
1251         if (cmd == m_nPopupPasteListCmd)\r
1252         {\r
1253                 CString logmsg;\r
1254                 TCHAR buf[MAX_STATUS_STRING_LENGTH];\r
1255                 int nListItems = m_ListCtrl.GetItemCount();\r
1256                 for (int i=0; i<nListItems; ++i)\r
1257                 {\r
1258                         CTGitPath * entry = (CTGitPath*)m_ListCtrl.GetItemData(i);\r
1259                         if (entry&&entry->m_Checked)\r
1260                         {\r
1261                                 CString line;\r
1262                                 CString status = entry->GetActionName();\r
1263                                 if(entry->m_Action & CTGitPath::LOGACTIONS_UNVER)\r
1264                                         status = _T("Add");\r
1265 \r
1266                                 //git_wc_status_kind status = entry->status;\r
1267                                 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
1268                                 if (m_ProjectProperties.bFileListInEnglish)\r
1269                                         langID = 1033;\r
1270                                 \r
1271                                 line.Format(_T("%-10s %s\r\n"),status , (LPCTSTR)m_ListCtrl.GetItemText(i,0));\r
1272                                 logmsg += line;\r
1273                         }\r
1274                 }\r
1275                 pSciEdit->InsertText(logmsg);\r
1276                 return true;\r
1277         }\r
1278 \r
1279         return false;\r
1280 }\r
1281 \r
1282 void CCommitDlg::OnTimer(UINT_PTR nIDEvent)\r
1283 {\r
1284         switch (nIDEvent)\r
1285         {\r
1286         case ENDDIALOGTIMER:\r
1287                 KillTimer(ENDDIALOGTIMER);\r
1288                 EndDialog(0);\r
1289                 break;\r
1290         case REFRESHTIMER:\r
1291                 if (m_bThreadRunning)\r
1292                 {\r
1293                         SetTimer(REFRESHTIMER, 200, NULL);\r
1294                         ATLTRACE("Wait some more before refreshing\n");\r
1295                 }\r
1296                 else\r
1297                 {\r
1298                         KillTimer(REFRESHTIMER);\r
1299                         ATLTRACE("Refreshing after items dropped\n");\r
1300                         Refresh();\r
1301                 }\r
1302                 break;\r
1303         }\r
1304         __super::OnTimer(nIDEvent);\r
1305 }\r
1306 \r
1307 void CCommitDlg::OnBnClickedHistory()\r
1308 {\r
1309         m_tooltips.Pop();       // hide the tooltips\r
1310         if (m_pathList.GetCount() == 0)\r
1311                 return;\r
1312 #if 0\r
1313         CHistoryDlg historyDlg;\r
1314         historyDlg.SetHistory(m_History);\r
1315         if (historyDlg.DoModal() != IDOK)\r
1316                 return;\r
1317 \r
1318         CString sMsg = historyDlg.GetSelectedText();\r
1319         if (sMsg != m_cLogMessage.GetText().Left(sMsg.GetLength()))\r
1320         {\r
1321                 CString sBugID = m_ProjectProperties.GetBugIDFromLog(sMsg);\r
1322                 if (!sBugID.IsEmpty())\r
1323                 {\r
1324                         SetDlgItemText(IDC_BUGID, sBugID);\r
1325                 }\r
1326                 if (m_ProjectProperties.sLogTemplate.Compare(m_cLogMessage.GetText())!=0)\r
1327                         m_cLogMessage.InsertText(sMsg, !m_cLogMessage.GetText().IsEmpty());\r
1328                 else\r
1329                         m_cLogMessage.SetText(sMsg);\r
1330         }\r
1331 \r
1332         UpdateOKButton();\r
1333         GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
1334 #endif\r
1335 }\r
1336 \r
1337 void CCommitDlg::OnBnClickedBugtraqbutton()\r
1338 {\r
1339 #if 0\r
1340         m_tooltips.Pop();       // hide the tooltips\r
1341         CString sMsg = m_cLogMessage.GetText();\r
1342 \r
1343         if (m_BugTraqProvider == NULL)\r
1344                 return;\r
1345 \r
1346         BSTR parameters = m_bugtraq_association.GetParameters().AllocSysString();\r
1347         BSTR commonRoot = SysAllocString(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());\r
1348         SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_pathList.GetCount());\r
1349 \r
1350         for (LONG index = 0; index < m_pathList.GetCount(); ++index)\r
1351                 SafeArrayPutElement(pathList, &index, m_pathList[index].GetGitPathString().AllocSysString());\r
1352 \r
1353         BSTR originalMessage = sMsg.AllocSysString();\r
1354         BSTR temp = NULL;\r
1355 \r
1356         // first try the IBugTraqProvider2 interface\r
1357         CComPtr<IBugTraqProvider2> pProvider2 = NULL;\r
1358         HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);\r
1359         if (SUCCEEDED(hr))\r
1360         {\r
1361                 CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();\r
1362                 BSTR repositoryRoot = common.AllocSysString();\r
1363                 if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, &temp)))\r
1364                 {\r
1365                         CString sErr;\r
1366                         sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());\r
1367                         CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);\r
1368                 }\r
1369                 else\r
1370                         m_cLogMessage.SetText(temp);\r
1371         }\r
1372         else\r
1373         {\r
1374                 // if IBugTraqProvider2 failed, try IBugTraqProvider\r
1375                 CComPtr<IBugTraqProvider> pProvider = NULL;\r
1376                 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider);\r
1377                 if (FAILED(hr))\r
1378                 {\r
1379                         CString sErr;\r
1380                         sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());\r
1381                         CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);\r
1382                         return;\r
1383                 }\r
1384 \r
1385                 if (FAILED(hr = pProvider->GetCommitMessage(GetSafeHwnd(), parameters, commonRoot, pathList, originalMessage, &temp)))\r
1386                 {\r
1387                         CString sErr;\r
1388                         sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());\r
1389                         CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);\r
1390                 }\r
1391                 else\r
1392                         m_cLogMessage.SetText(temp);\r
1393         }\r
1394 \r
1395         m_cLogMessage.SetFocus();\r
1396 \r
1397         SysFreeString(temp);\r
1398 #endif\r
1399 }\r
1400 \r
1401 LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)\r
1402 {\r
1403         UpdateOKButton();\r
1404         return 0;\r
1405 }\r
1406 \r
1407 void CCommitDlg::UpdateOKButton()\r
1408 {\r
1409 #if 0\r
1410         BOOL bValidLogSize = FALSE;\r
1411 \r
1412     if (m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize)\r
1413                 bValidLogSize = !m_bBlock;\r
1414 \r
1415         LONG nSelectedItems = m_ListCtrl.GetSelected();\r
1416         DialogEnableWindow(IDOK, bValidLogSize && nSelectedItems>0);\r
1417 #endif\r
1418 }\r
1419 \r
1420 \r
1421 LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)\r
1422 {\r
1423         switch (message) {\r
1424         case WM_NOTIFY:\r
1425                 if (wParam == IDC_SPLITTER)\r
1426                 { \r
1427                         SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;\r
1428                         DoSize(pHdr->delta);\r
1429                 }\r
1430                 break;\r
1431         }\r
1432 \r
1433         return __super::DefWindowProc(message, wParam, lParam);\r
1434 }\r
1435 \r
1436 void CCommitDlg::SetSplitterRange()\r
1437 {\r
1438         if ((m_ListCtrl)&&(m_cLogMessage))\r
1439         {\r
1440                 CRect rcTop;\r
1441                 m_cLogMessage.GetWindowRect(rcTop);\r
1442                 ScreenToClient(rcTop);\r
1443                 CRect rcMiddle;\r
1444                 m_ListCtrl.GetWindowRect(rcMiddle);\r
1445                 ScreenToClient(rcMiddle);\r
1446                 if (rcMiddle.Height() && rcMiddle.Width())\r
1447                         m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);\r
1448         }\r
1449 }\r
1450 \r
1451 void CCommitDlg::DoSize(int delta)\r
1452 {\r
1453         RemoveAnchor(IDC_MESSAGEGROUP);\r
1454         RemoveAnchor(IDC_LOGMESSAGE);\r
1455         RemoveAnchor(IDC_SPLITTER);\r
1456         RemoveAnchor(IDC_SIGNOFF);\r
1457         RemoveAnchor(IDC_COMMIT_AMEND);\r
1458         RemoveAnchor(IDC_LISTGROUP);\r
1459         RemoveAnchor(IDC_FILELIST);\r
1460         CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN);\r
1461         CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN);\r
1462         CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN);\r
1463         CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN);\r
1464         CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta);\r
1465         CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND),0,delta);\r
1466         AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);\r
1467         AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);\r
1468         AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);\r
1469         AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);\r
1470         AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);\r
1471         AddAnchor(IDC_SIGNOFF,TOP_RIGHT);\r
1472         AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);\r
1473         ArrangeLayout();\r
1474         // adjust the minimum size of the dialog to prevent the resizing from\r
1475         // moving the list control too far down.\r
1476         CRect rcLogMsg;\r
1477         m_cLogMessage.GetClientRect(rcLogMsg);\r
1478         SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_LogMsgOrigRect.Height()+rcLogMsg.Height()));\r
1479 \r
1480         SetSplitterRange();\r
1481         m_cLogMessage.Invalidate();\r
1482         GetDlgItem(IDC_LOGMESSAGE)->Invalidate();\r
1483 }\r
1484 \r
1485 void CCommitDlg::OnSize(UINT nType, int cx, int cy)\r
1486 {\r
1487     // first, let the resizing take place\r
1488     __super::OnSize(nType, cx, cy);\r
1489 \r
1490     //set range\r
1491     SetSplitterRange();\r
1492 }\r
1493 \r
1494 \r
1495 void CCommitDlg::OnBnClickedSignOff()\r
1496 {\r
1497         // TODO: Add your control notification handler code here\r
1498         CString str;\r
1499         CString username;\r
1500         CString email;\r
1501         username=g_Git.GetUserName();\r
1502         email=g_Git.GetUserEmail();\r
1503         username.Remove(_T('\n'));\r
1504         email.Remove(_T('\n'));\r
1505         str.Format(_T("Signed-off-by: %s <%s>\n"),username,email);\r
1506 \r
1507         m_cLogMessage.SetText(m_cLogMessage.GetText()+_T("\r\n\r\n")+str);\r
1508 }\r
1509 \r
1510 void CCommitDlg::OnStnClickedCommitlabel()\r
1511 {\r
1512         // TODO: Add your control notification handler code here\r
1513 }\r
1514 \r
1515 void CCommitDlg::OnBnClickedCommitAmend()\r
1516 {\r
1517     // TODO: Add your control notification handler code here\r
1518         this->UpdateData();\r
1519         if(this->m_bCommitAmend && this->m_AmendStr.IsEmpty())\r
1520         {\r
1521                 GitRev rev;\r
1522                 BYTE_VECTOR vector;\r
1523                 CString head(_T("HEAD"));\r
1524                 g_Git.GetLog(vector,head,NULL,1);\r
1525                 rev.ParserFromLog(vector);\r
1526                 m_AmendStr=rev.m_Subject+_T("\n\n")+rev.m_Body;\r
1527         }\r
1528 \r
1529         if(this->m_bCommitAmend)\r
1530         {\r
1531                 this->m_NoAmendStr=this->m_cLogMessage.GetText();\r
1532                 m_cLogMessage.SetText(m_AmendStr);\r
1533 \r
1534         }else\r
1535         {\r
1536                 this->m_AmendStr=this->m_cLogMessage.GetText();\r
1537                 m_cLogMessage.SetText(m_NoAmendStr);\r
1538 \r
1539         }\r
1540 \r
1541 }\r
1542 \r
1543 void CCommitDlg::OnBnClickedWholeProject()\r
1544 {\r
1545     // TODO: Add your control notification handler code here\r
1546     m_tooltips.Pop();   // hide the tooltips\r
1547         UpdateData();\r
1548     m_ListCtrl.Clear();\r
1549         if (!m_bBlock)\r
1550         {\r
1551             if(m_bWholeProject)\r
1552             m_ListCtrl.GetStatus(NULL,true,false,true);\r
1553         else\r
1554                     m_ListCtrl.GetStatus(&this->m_pathList,true,false,true);\r
1555                 \r
1556                 m_ListCtrl.Show(m_ListCtrl.GetShowFlags());\r
1557         }\r
1558 \r
1559         CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);\r
1560 \r
1561     if(this->m_bWholeProject)   \r
1562         SetWindowText(m_sWindowTitle + _T(" - ") + CString(_T("Whole Project")));\r
1563     else\r
1564             SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());\r
1565 \r
1566 }\r