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 \r
  36 #ifdef _DEBUG\r
  37 #define new DEBUG_NEW\r
  38 #undef THIS_FILE\r
  39 static char THIS_FILE[] = __FILE__;\r
  40 #endif\r
  41 \r
  42 UINT CCommitDlg::WM_AUTOLISTREADY = RegisterWindowMessage(_T("TORTOISEGIT_AUTOLISTREADY_MSG"));\r
  43 \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
  49         , m_bBlock(FALSE)\r
  50         , m_bThreadRunning(FALSE)\r
  51         , m_bRunThread(FALSE)\r
  52         , m_pThread(NULL)\r
  53         , m_bKeepLocks(FALSE)\r
  54         , m_bKeepChangeList(TRUE)\r
  55         , m_itemsCount(0)\r
  56         , m_bSelectFilesForCommit(TRUE)\r
  57 {\r
  58 }\r
  59 \r
  60 CCommitDlg::~CCommitDlg()\r
  61 {\r
  62         if(m_pThread != NULL)\r
  63         {\r
  64                 delete m_pThread;\r
  65         }\r
  66 }\r
  67 \r
  68 void CCommitDlg::DoDataExchange(CDataExchange* pDX)\r
  69 {\r
  70         CResizableStandAloneDialog::DoDataExchange(pDX);\r
  71         DDX_Control(pDX, IDC_FILELIST, m_ListCtrl);\r
  72         DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);\r
  73         DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);\r
  74         DDX_Control(pDX, IDC_SELECTALL, m_SelectAll);\r
  75         DDX_Text(pDX, IDC_BUGID, m_sBugID);\r
  76         DDX_Check(pDX, IDC_KEEPLOCK, m_bKeepLocks);\r
  77         DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);\r
  78         DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);\r
  79 }\r
  80 \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
  93         ON_WM_TIMER()\r
  94     ON_WM_SIZE()\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
  98 END_MESSAGE_MAP()\r
  99 \r
 100 BOOL CCommitDlg::OnInitDialog()\r
 101 {\r
 102         CResizableStandAloneDialog::OnInitDialog();\r
 103         \r
 104         m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);\r
 105         m_bShowUnversioned = m_regAddBeforeCommit;\r
 106 \r
 107         m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));\r
 108 \r
 109         m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE);\r
 110         m_bKeepChangeList = m_regKeepChangelists;\r
 111 \r
 112 //      GitConfig config;\r
 113 //      m_bKeepLocks = config.KeepLocks();\r
 114 \r
 115         UpdateData(FALSE);\r
 116         \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
 124         \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
 129 \r
 130         OnEnChangeLogmessage();\r
 131 \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
 135         \r
 136         m_SelectAll.SetCheck(BST_INDETERMINATE);\r
 137 \r
 138 #if 0\r
 139         CBugTraqAssociations bugtraq_associations;\r
 140         bugtraq_associations.Load();\r
 141 \r
 142         if (bugtraq_associations.FindProvider(m_pathList, &m_bugtraq_association))\r
 143         {\r
 144                 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);\r
 145                 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);\r
 146 \r
 147                 CComPtr<IBugTraqProvider> pProvider;\r
 148                 HRESULT hr = pProvider.CoCreateInstance(m_bugtraq_association.GetProviderClass());\r
 149                 if (SUCCEEDED(hr))\r
 150                 {\r
 151                         m_BugTraqProvider = pProvider;\r
 152                         BSTR temp = NULL;\r
 153                         if (SUCCEEDED(hr = pProvider->GetLinkText(GetSafeHwnd(), m_bugtraq_association.GetParameters().AllocSysString(), &temp)))\r
 154                         {\r
 155                                 SetDlgItemText(IDC_BUGTRAQBUTTON, temp);\r
 156                                 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(TRUE);\r
 157                                 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_SHOW);\r
 158                         }\r
 159 \r
 160                         SysFreeString(temp);\r
 161                 }\r
 162 \r
 163                 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
 164         }\r
 165         else if (!m_ProjectProperties.sMessage.IsEmpty())\r
 166         {\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
 176                 {\r
 177                         SetDlgItemText(IDC_BUGID, sBugID);\r
 178                 }\r
 179         }\r
 180         else\r
 181 #endif\r
 182         {\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
 188         }\r
 189 \r
 190         if (!m_sLogMessage.IsEmpty())\r
 191                 m_cLogMessage.SetText(m_sLogMessage);\r
 192                 \r
 193         GetWindowText(m_sWindowTitle);\r
 194         \r
 195         AdjustControlSize(IDC_SHOWUNVERSIONED);\r
 196         AdjustControlSize(IDC_SELECTALL);\r
 197         AdjustControlSize(IDC_KEEPLOCK);\r
 198 \r
 199         GetClientRect(m_DlgOrigRect);\r
 200         m_cLogMessage.GetClientRect(m_LogMsgOrigRect);\r
 201 \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
 223         \r
 224         if (hWndExplorer)\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
 234         if (yPos)\r
 235         {\r
 236                 RECT rectSplitter;\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
 241                 {\r
 242                         m_wndSplitter.SetWindowPos(NULL, 0, yPos, 0, 0, SWP_NOSIZE);\r
 243                         DoSize(delta);\r
 244                 }\r
 245         }\r
 246 \r
 247         // add all directories to the watcher\r
 248         for (int i=0; i<m_pathList.GetCount(); ++i)\r
 249         {\r
 250                 if (m_pathList[i].IsDirectory())\r
 251                         m_pathwatcher.AddPath(m_pathList[i]);\r
 252         }\r
 253 \r
 254         m_updatedPathList = m_pathList;\r
 255 \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
 261         {\r
 262                 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);\r
 263                 InterlockedExchange(&m_bBlock, FALSE);\r
 264         }\r
 265         else\r
 266         {\r
 267                 m_pThread->m_bAutoDelete = FALSE;\r
 268                 m_pThread->ResumeThread();\r
 269         }\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
 273         {\r
 274                 historyhint = TRUE;\r
 275 //              ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);\r
 276         }\r
 277         err = FALSE;\r
 278 \r
 279 \r
 280         return FALSE;  // return TRUE unless you set the focus to a control\r
 281         // EXCEPTION: OCX Property Pages should return FALSE\r
 282 }\r
 283 \r
 284 void CCommitDlg::OnOK()\r
 285 {\r
 286         if (m_bBlock)\r
 287                 return;\r
 288         if (m_bThreadRunning)\r
 289         {\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
 294                 {\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
 299                 }\r
 300         }\r
 301         CString id;\r
 302         GetDlgItemText(IDC_BUGID, id);\r
 303         if (!m_ProjectProperties.CheckBugID(id))\r
 304         {\r
 305                 ShowBalloon(IDC_BUGID, IDS_COMMITDLG_ONLYNUMBERS, IDI_EXCLAMATION);\r
 306                 return;\r
 307         }\r
 308         m_sLogMessage = m_cLogMessage.GetText();\r
 309         if ((m_ProjectProperties.bWarnIfNoIssue) && (id.IsEmpty() && !m_ProjectProperties.HasBugID(m_sLogMessage)))\r
 310         {\r
 311                 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOISSUEWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)\r
 312                         return;\r
 313         }\r
 314 \r
 315 #if 0\r
 316         CRegDWORD regUnversionedRecurse (_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE);\r
 317         if (!(DWORD)regUnversionedRecurse)\r
 318         {\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
 324                 {\r
 325                         const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);\r
 326                         if (entry->IsChecked() && (entry->status == Git_wc_status_unversioned) && entry->IsFolder() )\r
 327                         {\r
 328                                 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_UNVERSIONEDFOLDERWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)\r
 329                                         return;\r
 330                         }\r
 331                 }\r
 332         }\r
 333 #endif\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
 340         int nchecked = 0;\r
 341         m_bRecursive = true;\r
 342         int nListItems = m_ListCtrl.GetItemCount();\r
 343 \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
 350 \r
 351         //CString checkedfiles;\r
 352         //CString uncheckedfiles;\r
 353 \r
 354         CString cmd;\r
 355         CString out;\r
 356 \r
 357         for (int j=0; j<nListItems; j++)\r
 358         {\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
 362                 {\r
 363 #if 0\r
 364                         if (entry->status == Git_wc_status_unversioned)\r
 365                         {\r
 366                                 itemsToAdd.AddPath(entry->GetPath());\r
 367                         }\r
 368                         if (entry->status == Git_wc_status_conflicted)\r
 369                         {\r
 370                                 bHasConflicted = true;\r
 371                         }\r
 372                         if (entry->status == Git_wc_status_missing)\r
 373                         {\r
 374                                 itemsToRemove.AddPath(entry->GetPath());\r
 375                         }\r
 376                         if (entry->status == Git_wc_status_deleted)\r
 377                         {\r
 378                                 arDeleted.Add(j);\r
 379                         }\r
 380                         if (entry->IsInExternal())\r
 381                         {\r
 382                                 bCheckedInExternal = true;\r
 383                         }\r
 384 #endif\r
 385                         cmd.Format(_T("git.exe update-index -- \"%s\""),entry->GetGitPathString());\r
 386                         g_Git.Run(cmd,&out);\r
 387                         nchecked++;\r
 388                         //checkedLists.insert(entry->GetGitPathString());\r
 389 //                      checkedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");\r
 390                 }\r
 391                 else\r
 392                 {\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);    \r
 398                         }\r
 399                         else\r
 400                         {\r
 401                                 cmd.Format(_T("git.exe reset -- %s"),entry->GetGitPathString());\r
 402                                 g_Git.Run(cmd,&out);\r
 403                         }\r
 404 \r
 405                 //      uncheckedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");\r
 406 #if 0\r
 407                         if ((entry->status != Git_wc_status_unversioned)        &&\r
 408                                 (entry->status != Git_wc_status_ignored))\r
 409                         {\r
 410                                 nUnchecked++;\r
 411                                 uncheckedLists.insert(entry->GetChangeList());\r
 412                                 if (m_bRecursive)\r
 413                                 {\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
 416                                         {\r
 417                                                 const CGitStatusListCtrl::FileEntry * entryK = m_ListCtrl.GetListEntry(k);\r
 418                                                 if (entryK->IsChecked() && entryK->GetPath().IsAncestorOf(entry->GetPath())  )\r
 419                                                 {\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
 424                                                         break;\r
 425                                                 }\r
 426                                         }\r
 427                                 }\r
 428                         }\r
 429 #endif\r
 430                 }\r
 431         }\r
 432 \r
 433         //if(uncheckedfiles.GetLength()>0)\r
 434         //{\r
 435         //      cmd.Format(_T("git.exe reset -- %s"),uncheckedfiles);\r
 436         //      g_Git.Run(cmd,&out);\r
 437         //}\r
 438 \r
 439         //if(checkedfiles.GetLength()>0)\r
 440         if(nchecked)\r
 441         {\r
 442         //      cmd.Format(_T("git.exe update-index -- %s"),checkedfiles);\r
 443         //      g_Git.Run(cmd,&out);\r
 444 \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
 450                 file.Close();\r
 451         \r
 452                 out =_T("");\r
 453                 cmd.Format(_T("git.exe commit -F \"%s\""), tempfile);\r
 454                 g_Git.Run(cmd,&out);\r
 455         \r
 456                 CFile::Remove(tempfile);\r
 457 \r
 458                 CMessageBox::Show(this->m_hWnd, out, _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);\r
 459         }else\r
 460                 CMessageBox::Show(this->m_hWnd, _T("Nothing Commit"), _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);\r
 461 #if 0\r
 462         if (m_pathwatcher.GetNumberOfChangedPaths() && m_bRecursive)\r
 463         {\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
 470                 {\r
 471                         if (changedList[i].IsAdminDir())\r
 472                         {\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
 478                                 {\r
 479                                         m_bRecursive = false;\r
 480                                         break;\r
 481                                 }\r
 482                         }\r
 483                         else if (!m_ListCtrl.IsPathShown(changedList[i]))\r
 484                         {\r
 485                                 // a path which is not shown in the list has changed\r
 486                                 CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(changedList[i]);\r
 487                                 if (entry)\r
 488                                 {\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
 494                                         {\r
 495                                                 m_bRecursive = false;\r
 496                                                 break;\r
 497                                         }\r
 498                                 }\r
 499                         }\r
 500                 }\r
 501         }\r
 502 \r
 503 \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
 507         Git Git;\r
 508         if (!Git.Add(itemsToAdd, &m_ProjectProperties, Git_depth_empty, FALSE, FALSE, TRUE))\r
 509         {\r
 510                 CMessageBox::Show(m_hWnd, Git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
 511                 InterlockedExchange(&m_bBlock, FALSE);\r
 512                 Refresh();\r
 513                 return;\r
 514         }\r
 515 \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
 520 \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
 528         {\r
 529                 if (m_ListCtrl.GetCheck(arDeleted.GetAt(i)))\r
 530                 {\r
 531                         const CTGitPath& path = m_ListCtrl.GetListEntry(arDeleted.GetAt(i))->GetPath();\r
 532                         if (path.IsDirectory())\r
 533                         {\r
 534                                 //now find all children of this directory\r
 535                                 for (int j=0; j<arDeleted.GetCount(); j++)\r
 536                                 {\r
 537                                         if (i!=j)\r
 538                                         {\r
 539                                                 CGitStatusListCtrl::FileEntry* childEntry = m_ListCtrl.GetListEntry(arDeleted.GetAt(j));\r
 540                                                 if (childEntry->IsChecked())\r
 541                                                 {\r
 542                                                         if (path.IsAncestorOf(childEntry->GetPath()))\r
 543                                                         {\r
 544                                                                 m_ListCtrl.SetEntryCheck(childEntry, arDeleted.GetAt(j), false);\r
 545                                                                 nDeleted--;\r
 546                                                         }\r
 547                                                 }\r
 548                                         }\r
 549                                 }\r
 550                         }\r
 551                 }\r
 552         } \r
 553         m_ListCtrl.Block(FALSE, FALSE);\r
 554 \r
 555         if ((nUnchecked != 0)||(bCheckedInExternal)||(bHasConflicted)||(!m_bRecursive))\r
 556         {\r
 557                 //save only the files the user has checked into the temporary file\r
 558                 m_ListCtrl.WriteCheckedNamesToPathList(m_pathList);\r
 559         }\r
 560         m_ListCtrl.WriteCheckedNamesToPathList(m_selectedPathList);\r
 561         // the item count is used in the progress dialog to show the overall commit\r
 562         // progress.\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
 565 \r
 566         if ((m_bRecursive)&&(checkedLists.size() == 1))\r
 567         {\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
 572         }\r
 573 #endif\r
 574         UpdateData();\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
 582         m_sBugID.Trim();\r
 583         if (!m_sBugID.IsEmpty())\r
 584         {\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
 591                 else\r
 592                         m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;\r
 593         }\r
 594         m_History.AddEntry(m_sLogMessage);\r
 595         m_History.Save();\r
 596 \r
 597         SaveSplitterPos();\r
 598 \r
 599         CResizableStandAloneDialog::OnOK();\r
 600 }\r
 601 \r
 602 void CCommitDlg::SaveSplitterPos()\r
 603 {\r
 604         if (!IsIconic())\r
 605         {\r
 606                 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));\r
 607                 RECT rectSplitter;\r
 608                 m_wndSplitter.GetWindowRect(&rectSplitter);\r
 609                 ScreenToClient(&rectSplitter);\r
 610                 regPos = rectSplitter.top;\r
 611         }\r
 612 }\r
 613 \r
 614 UINT CCommitDlg::StatusThreadEntry(LPVOID pVoid)\r
 615 {\r
 616         return ((CCommitDlg*)pVoid)->StatusThread();\r
 617 }\r
 618 \r
 619 UINT CCommitDlg::StatusThread()\r
 620 {\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
 628 \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
 636 #if 0\r
 637         if (m_History.GetCount()==0)\r
 638         {\r
 639                 CString reg;\r
 640                 if (m_ListCtrl.m_sUUID.IsEmpty() && m_pathList.GetCount()>0)\r
 641                 {\r
 642                         Git Git;\r
 643                         reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)Git.GetUUIDFromPath(m_pathList[0]));\r
 644                 }\r
 645                 else\r
 646                         reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);\r
 647                 m_History.Load(reg, _T("logmsgs"));\r
 648         }\r
 649 #endif\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
 652 \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
 656         \r
 657         m_ListCtrl.CheckIfChangelistsArePresent(false);\r
 658 \r
 659         DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWLOCKS | SVNSLC_SHOWINCHANGELIST;\r
 660         dwShow |= DWORD(m_regAddBeforeCommit) ? SVNSLC_SHOWUNVERSIONED : 0;\r
 661         if (success)\r
 662         {\r
 663                 if (m_checkedPathList.GetCount())\r
 664                         m_ListCtrl.Show(dwShow, m_checkedPathList);\r
 665                 else\r
 666                 {\r
 667                         DWORD dwCheck = m_bSelectFilesForCommit ?SVNSLC_SHOWDIRECTS|SVNSLC_SHOWMODIFIED|SVNSLC_SHOWADDED|SVNSLC_SHOWREMOVED\r
 668                                 |SVNSLC_SHOWREPLACED|SVNSLC_SHOWMERGED|SVNSLC_SHOWLOCKS : 0;\r
 669                         m_ListCtrl.Show(dwShow, dwCheck);\r
 670                         m_bSelectFilesForCommit = true;\r
 671                 }\r
 672 \r
 673                 if (m_ListCtrl.HasExternalsFromDifferentRepos())\r
 674                 {\r
 675                         GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);\r
 676                         DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);\r
 677                 }\r
 678                 \r
 679                 SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());\r
 680                 m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());\r
 681         }\r
 682         CString logmsg;\r
 683         GetDlgItemText(IDC_LOGMESSAGE, logmsg);\r
 684         DialogEnableWindow(IDOK, logmsg.GetLength() >= m_ProjectProperties.nMinLogSize);\r
 685         if (!success)\r
 686         {\r
 687                 if (!m_ListCtrl.GetLastErrorMessage().IsEmpty())\r
 688                         m_ListCtrl.SetEmptyString(m_ListCtrl.GetLastErrorMessage());\r
 689                 m_ListCtrl.Show(dwShow);\r
 690         }\r
 691         if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems()))\r
 692         {\r
 693 //              if (CMessageBox::Show(m_hWnd, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)\r
 694 //              {\r
 695 //                      m_bShowUnversioned = TRUE;\r
 696 //                      GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);\r
 697 //                      DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS;\r
 698 //                      m_ListCtrl.Show(dwShow);\r
 699 //              }\r
 700         }\r
 701 \r
 702 //      CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);\r
 703 //      SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());\r
 704 \r
 705         m_autolist.clear();\r
 706         // we don't have to block the commit dialog while we fetch the\r
 707         // auto completion list.\r
 708         m_pathwatcher.ClearChangedPaths();\r
 709         InterlockedExchange(&m_bBlock, FALSE);\r
 710         if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE)==TRUE)\r
 711         {\r
 712                 m_ListCtrl.Block(TRUE, TRUE);\r
 713                 GetAutocompletionList();\r
 714                 m_ListCtrl.Block(FALSE, FALSE);\r
 715         }\r
 716         if (m_bRunThread)\r
 717         {\r
 718                 DialogEnableWindow(IDC_SHOWUNVERSIONED, true);\r
 719                 DialogEnableWindow(IDC_SELECTALL, true);\r
 720                 if (m_ListCtrl.HasChangeLists())\r
 721                         DialogEnableWindow(IDC_KEEPLISTS, true);\r
 722                 if (m_ListCtrl.HasLocks())\r
 723                         DialogEnableWindow(IDC_KEEPLOCK, true);\r
 724                 // we have the list, now signal the main thread about it\r
 725                 SendMessage(WM_AUTOLISTREADY);  // only send the message if the thread wasn't told to quit!\r
 726         }\r
 727 \r
 728         InterlockedExchange(&m_bRunThread, FALSE);\r
 729         InterlockedExchange(&m_bThreadRunning, FALSE);\r
 730         // force the cursor to normal\r
 731         RefreshCursor();\r
 732 \r
 733         return 0;\r
 734 }\r
 735 \r
 736 void CCommitDlg::OnCancel()\r
 737 {\r
 738         m_bCancelled = true;\r
 739         if (m_bBlock)\r
 740                 return;\r
 741         m_pathwatcher.Stop();\r
 742         if (m_bThreadRunning)\r
 743         {\r
 744                 InterlockedExchange(&m_bRunThread, FALSE);\r
 745                 WaitForSingleObject(m_pThread->m_hThread, 1000);\r
 746                 if (m_bThreadRunning)\r
 747                 {\r
 748                         // we gave the thread a chance to quit. Since the thread didn't\r
 749                         // listen to us we have to kill it.\r
 750                         TerminateThread(m_pThread->m_hThread, (DWORD)-1);\r
 751                         InterlockedExchange(&m_bThreadRunning, FALSE);\r
 752                 }\r
 753         }\r
 754         UpdateData();\r
 755         m_sBugID.Trim();\r
 756         m_sLogMessage = m_cLogMessage.GetText();\r
 757         if (!m_sBugID.IsEmpty())\r
 758         {\r
 759                 m_sBugID.Replace(_T(", "), _T(","));\r
 760                 m_sBugID.Replace(_T(" ,"), _T(","));\r
 761                 CString sBugID = m_ProjectProperties.sMessage;\r
 762                 sBugID.Replace(_T("%BUGID%"), m_sBugID);\r
 763                 if (m_ProjectProperties.bAppend)\r
 764                         m_sLogMessage += _T("\n") + sBugID + _T("\n");\r
 765                 else\r
 766                         m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;\r
 767         }\r
 768         if (m_ProjectProperties.sLogTemplate.Compare(m_sLogMessage) != 0)\r
 769                 m_History.AddEntry(m_sLogMessage);\r
 770         m_History.Save();\r
 771         SaveSplitterPos();\r
 772         CResizableStandAloneDialog::OnCancel();\r
 773 }\r
 774 \r
 775 void CCommitDlg::OnBnClickedSelectall()\r
 776 {\r
 777         m_tooltips.Pop();       // hide the tooltips\r
 778         UINT state = (m_SelectAll.GetState() & 0x0003);\r
 779         if (state == BST_INDETERMINATE)\r
 780         {\r
 781                 // It is not at all useful to manually place the checkbox into the indeterminate state...\r
 782                 // We will force this on to the unchecked state\r
 783                 state = BST_UNCHECKED;\r
 784                 m_SelectAll.SetCheck(state);\r
 785         }\r
 786         m_ListCtrl.SelectAll(state == BST_CHECKED);\r
 787 }\r
 788 \r
 789 BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)\r
 790 {\r
 791         if (!m_bBlock)\r
 792                 m_tooltips.RelayEvent(pMsg);\r
 793         if (pMsg->message == WM_KEYDOWN)\r
 794         {\r
 795                 switch (pMsg->wParam)\r
 796                 {\r
 797                 case VK_F5:\r
 798                         {\r
 799                                 if (m_bBlock)\r
 800                                         return CResizableStandAloneDialog::PreTranslateMessage(pMsg);\r
 801                                 Refresh();\r
 802                         }\r
 803                         break;\r
 804                 case VK_RETURN:\r
 805                         {\r
 806                                 if (GetAsyncKeyState(VK_CONTROL)&0x8000)\r
 807                                 {\r
 808                                         if ( GetDlgItem(IDOK)->IsWindowEnabled() )\r
 809                                         {\r
 810                                                 PostMessage(WM_COMMAND, IDOK);\r
 811                                         }\r
 812                                         return TRUE;\r
 813                                 }\r
 814                                 if ( GetFocus()==GetDlgItem(IDC_BUGID) )\r
 815                                 {\r
 816                                         // Pressing RETURN in the bug id control\r
 817                                         // moves the focus to the message\r
 818                                         GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
 819                                         return TRUE;\r
 820                                 }\r
 821                         }\r
 822                         break;\r
 823                 }\r
 824         }\r
 825 \r
 826         return CResizableStandAloneDialog::PreTranslateMessage(pMsg);\r
 827 }\r
 828 \r
 829 void CCommitDlg::Refresh()\r
 830 {\r
 831         if (m_bThreadRunning)\r
 832                 return;\r
 833 \r
 834         InterlockedExchange(&m_bBlock, TRUE);\r
 835         m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);\r
 836         if (m_pThread==NULL)\r
 837         {\r
 838                 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);\r
 839                 InterlockedExchange(&m_bBlock, FALSE);\r
 840         }\r
 841         else\r
 842         {\r
 843                 m_pThread->m_bAutoDelete = FALSE;\r
 844                 m_pThread->ResumeThread();\r
 845         }\r
 846 }\r
 847 \r
 848 void CCommitDlg::OnBnClickedHelp()\r
 849 {\r
 850         OnHelp();\r
 851 }\r
 852 \r
 853 void CCommitDlg::OnBnClickedShowunversioned()\r
 854 {\r
 855         m_tooltips.Pop();       // hide the tooltips\r
 856         UpdateData();\r
 857         m_regAddBeforeCommit = m_bShowUnversioned;\r
 858         if (!m_bBlock)\r
 859         {\r
 860                 DWORD dwShow = m_ListCtrl.GetShowFlags();\r
 861                 if (DWORD(m_regAddBeforeCommit))\r
 862                         dwShow |= SVNSLC_SHOWUNVERSIONED;\r
 863                 else\r
 864                         dwShow &= ~SVNSLC_SHOWUNVERSIONED;\r
 865                 if(dwShow & SVNSLC_SHOWUNVERSIONED)\r
 866                 {\r
 867                         m_ListCtrl.GetStatus(this->m_pathList,false,false,true);\r
 868                 }\r
 869                 m_ListCtrl.Show(dwShow);\r
 870         }\r
 871 }\r
 872 \r
 873 void CCommitDlg::OnStnClickedExternalwarning()\r
 874 {\r
 875         m_tooltips.Popup();\r
 876 }\r
 877 \r
 878 void CCommitDlg::OnEnChangeLogmessage()\r
 879 {\r
 880         UpdateOKButton();\r
 881 }\r
 882 \r
 883 LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)\r
 884 {\r
 885 #if 0\r
 886         if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))\r
 887         {\r
 888                 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)\r
 889                 {\r
 890                         m_bShowUnversioned = TRUE;\r
 891                         DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;\r
 892                         m_ListCtrl.Show(dwShow);\r
 893                         UpdateData(FALSE);\r
 894                 }\r
 895         }\r
 896 #endif\r
 897         return 0;\r
 898 }\r
 899 \r
 900 LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)\r
 901 {\r
 902         Refresh();\r
 903         return 0;\r
 904 }\r
 905 \r
 906 LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM lParam)\r
 907 {\r
 908 #if 0\r
 909         BringWindowToTop();\r
 910         SetForegroundWindow();\r
 911         SetActiveWindow();\r
 912         // if multiple files/folders are dropped\r
 913         // this handler is called for every single item\r
 914         // separately.\r
 915         // To avoid creating multiple refresh threads and\r
 916         // causing crashes, we only add the items to the\r
 917         // list control and start a timer.\r
 918         // When the timer expires, we start the refresh thread,\r
 919         // but only if it isn't already running - otherwise we\r
 920         // restart the timer.\r
 921         CTGitPath path;\r
 922         path.SetFromWin((LPCTSTR)lParam);\r
 923 \r
 924         // just add all the items we get here.\r
 925         // if the item is versioned, the add will fail but nothing\r
 926         // more will happen.\r
 927         Git Git;\r
 928         Git.Add(CTGitPathList(path), &m_ProjectProperties, Git_depth_empty, false, true, true);\r
 929 \r
 930         if (!m_ListCtrl.HasPath(path))\r
 931         {\r
 932                 if (m_pathList.AreAllPathsFiles())\r
 933                 {\r
 934                         m_pathList.AddPath(path);\r
 935                         m_pathList.RemoveDuplicates();\r
 936                         m_updatedPathList.AddPath(path);\r
 937                         m_updatedPathList.RemoveDuplicates();\r
 938                 }\r
 939                 else\r
 940                 {\r
 941                         // if the path list contains folders, we have to check whether\r
 942                         // our just (maybe) added path is a child of one of those. If it is\r
 943                         // a child of a folder already in the list, we must not add it. Otherwise\r
 944                         // that path could show up twice in the list.\r
 945                         bool bHasParentInList = false;\r
 946                         for (int i=0; i<m_pathList.GetCount(); ++i)\r
 947                         {\r
 948                                 if (m_pathList[i].IsAncestorOf(path))\r
 949                                 {\r
 950                                         bHasParentInList = true;\r
 951                                         break;\r
 952                                 }\r
 953                         }\r
 954                         if (!bHasParentInList)\r
 955                         {\r
 956                                 m_pathList.AddPath(path);\r
 957                                 m_pathList.RemoveDuplicates();\r
 958                                 m_updatedPathList.AddPath(path);\r
 959                                 m_updatedPathList.RemoveDuplicates();\r
 960                         }\r
 961                 }\r
 962         }\r
 963         \r
 964         // Always start the timer, since the status of an existing item might have changed\r
 965         SetTimer(REFRESHTIMER, 200, NULL);\r
 966         ATLTRACE(_T("Item %s dropped, timer started\n"), path.GetWinPath());\r
 967 #endif\r
 968         return 0;\r
 969 }\r
 970 \r
 971 LRESULT CCommitDlg::OnAutoListReady(WPARAM, LPARAM)\r
 972 {\r
 973         m_cLogMessage.SetAutoCompletionList(m_autolist, '*');\r
 974         return 0;\r
 975 }\r
 976 \r
 977 //////////////////////////////////////////////////////////////////////////\r
 978 // functions which run in the status thread\r
 979 //////////////////////////////////////////////////////////////////////////\r
 980 \r
 981 void CCommitDlg::ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex)\r
 982 {\r
 983         CString strLine;\r
 984         try\r
 985         {\r
 986                 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);\r
 987                 while (m_bRunThread && file.ReadString(strLine))\r
 988                 {\r
 989                         int eqpos = strLine.Find('=');\r
 990                         CString rgx;\r
 991                         rgx = strLine.Mid(eqpos+1).Trim();\r
 992 \r
 993                         int pos = -1;\r
 994                         while (((pos = strLine.Find(','))>=0)&&(pos < eqpos))\r
 995                         {\r
 996                                 mapRegex[strLine.Left(pos)] = rgx;\r
 997                                 strLine = strLine.Mid(pos+1).Trim();\r
 998                         }\r
 999                         mapRegex[strLine.Left(strLine.Find('=')).Trim()] = rgx;\r
1000                 }\r
1001                 file.Close();\r
1002         }\r
1003         catch (CFileException* pE)\r
1004         {\r
1005                 TRACE("CFileException loading auto list regex file\n");\r
1006                 pE->Delete();\r
1007                 return;\r
1008         }\r
1009 }\r
1010 void CCommitDlg::GetAutocompletionList()\r
1011 {\r
1012         // the auto completion list is made of strings from each selected files.\r
1013         // the strings used are extracted from the files with regexes found\r
1014         // in the file "autolist.txt".\r
1015         // the format of that file is:\r
1016         // file extensions separated with commas '=' regular expression to use\r
1017         // example:\r
1018         // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))\r
1019         // .cpp = (?<=[^\s]::)\b\w+\b\r
1020         \r
1021         std::map<CString, CString> mapRegex;\r
1022         CString sRegexFile = CPathUtils::GetAppDirectory();\r
1023         CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);\r
1024         DWORD timeoutvalue = regtimeout*1000;\r
1025         sRegexFile += _T("autolist.txt");\r
1026         if (!m_bRunThread)\r
1027                 return;\r
1028         ParseRegexFile(sRegexFile, mapRegex);\r
1029         SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sRegexFile.GetBuffer(MAX_PATH+1));\r
1030         sRegexFile.ReleaseBuffer();\r
1031         sRegexFile += _T("\\TortoiseGit\\autolist.txt");\r
1032         if (PathFileExists(sRegexFile))\r
1033         {\r
1034                 ParseRegexFile(sRegexFile, mapRegex);\r
1035         }\r
1036         DWORD starttime = GetTickCount();\r
1037 \r
1038         // now we have two arrays of strings, where the first array contains all\r
1039         // file extensions we can use and the second the corresponding regex strings\r
1040         // to apply to those files.\r
1041 \r
1042         // the next step is to go over all files shown in the commit dialog\r
1043         // and scan them for strings we can use\r
1044         int nListItems = m_ListCtrl.GetItemCount();\r
1045 \r
1046         for (int i=0; i<nListItems && m_bRunThread; ++i)\r
1047         {\r
1048                 // stop parsing after timeout\r
1049                 if ((!m_bRunThread) || (GetTickCount() - starttime > timeoutvalue))\r
1050                         return;\r
1051 \r
1052                 CTGitPath *path = (CTGitPath*)m_ListCtrl.GetItemData(i);\r
1053 \r
1054                 if(path == NULL)\r
1055                         continue;\r
1056 \r
1057                 CString sPartPath =path->GetGitPathString();\r
1058                 m_autolist.insert(sPartPath);\r
1059 \r
1060 //              const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);\r
1061 //              if (!entry)\r
1062 //                      continue;\r
1063                 \r
1064                 // add the path parts to the auto completion list too\r
1065 //              CString sPartPath = entry->GetRelativeGitPath();\r
1066 //              m_autolist.insert(sPartPath);\r
1067 \r
1068 \r
1069                 int pos = 0;\r
1070                 int lastPos = 0;\r
1071                 while ((pos = sPartPath.Find('/', pos)) >= 0)\r
1072                 {\r
1073                         pos++;\r
1074                         lastPos = pos;\r
1075                         m_autolist.insert(sPartPath.Mid(pos));\r
1076                 }\r
1077 \r
1078                 // Last inserted entry is a file name.\r
1079                 // Some users prefer to also list file name without extension.\r
1080                 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE))\r
1081                 {\r
1082                         int dotPos = sPartPath.ReverseFind('.');\r
1083                         if ((dotPos >= 0) && (dotPos > lastPos))\r
1084                                 m_autolist.insert(sPartPath.Mid(lastPos, dotPos - lastPos));\r
1085                 }\r
1086 #if 0\r
1087                 if ((entry->status <= Git_wc_status_normal)||(entry->status == Git_wc_status_ignored))\r
1088                         continue;\r
1089 \r
1090                 CString sExt = entry->GetPath().GetFileExtension();\r
1091                 sExt.MakeLower();\r
1092                 // find the regex string which corresponds to the file extension\r
1093                 CString rdata = mapRegex[sExt];\r
1094                 if (rdata.IsEmpty())\r
1095                         continue;\r
1096 \r
1097                 ScanFile(entry->GetPath().GetWinPathString(), rdata);\r
1098                 if ((entry->textstatus != Git_wc_status_unversioned) &&\r
1099                         (entry->textstatus != Git_wc_status_none) &&\r
1100                         (entry->textstatus != Git_wc_status_ignored) &&\r
1101                         (entry->textstatus != Git_wc_status_added) &&\r
1102                         (entry->textstatus != Git_wc_status_normal))\r
1103                 {\r
1104                         CTGitPath basePath = Git::GetPristinePath(entry->GetPath());\r
1105                         if (!basePath.IsEmpty())\r
1106                                 ScanFile(basePath.GetWinPathString(), rdata);\r
1107                 }\r
1108 #endif\r
1109         }\r
1110         ATLTRACE(_T("Auto completion list loaded in %d msec\n"), GetTickCount() - starttime);\r
1111 }\r
1112 \r
1113 void CCommitDlg::ScanFile(const CString& sFilePath, const CString& sRegex)\r
1114 {\r
1115         wstring sFileContent;\r
1116         HANDLE hFile = CreateFile(sFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);\r
1117         if (hFile != INVALID_HANDLE_VALUE)\r
1118         {\r
1119                 DWORD size = GetFileSize(hFile, NULL);\r
1120                 if (size > 1000000L)\r
1121                 {\r
1122                         // no files bigger than 1 Meg\r
1123                         CloseHandle(hFile);\r
1124                         return;\r
1125                 }\r
1126                 // allocate memory to hold file contents\r
1127                 char * buffer = new char[size];\r
1128                 DWORD readbytes;\r
1129                 ReadFile(hFile, buffer, size, &readbytes, NULL);\r
1130                 CloseHandle(hFile);\r
1131                 int opts = 0;\r
1132                 IsTextUnicode(buffer, readbytes, &opts);\r
1133                 if (opts & IS_TEXT_UNICODE_NULL_BYTES)\r
1134                 {\r
1135                         delete [] buffer;\r
1136                         return;\r
1137                 }\r
1138                 if (opts & IS_TEXT_UNICODE_UNICODE_MASK)\r
1139                 {\r
1140                         sFileContent = wstring((wchar_t*)buffer, readbytes/sizeof(WCHAR));\r
1141                 }\r
1142                 if ((opts & IS_TEXT_UNICODE_NOT_UNICODE_MASK)||(opts == 0))\r
1143                 {\r
1144                         int ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, NULL, 0);\r
1145                         wchar_t * pWideBuf = new wchar_t[ret];\r
1146                         int ret2 = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer, readbytes, pWideBuf, ret);\r
1147                         if (ret2 == ret)\r
1148                                 sFileContent = wstring(pWideBuf, ret);\r
1149                         delete [] pWideBuf;\r
1150                 }\r
1151                 delete [] buffer;\r
1152         }\r
1153         if (sFileContent.empty()|| !m_bRunThread)\r
1154         {\r
1155                 return;\r
1156         }\r
1157 \r
1158         try\r
1159         {\r
1160                 const tr1::wregex regCheck(sRegex, tr1::regex_constants::icase | tr1::regex_constants::ECMAScript);\r
1161                 const tr1::wsregex_iterator end;\r
1162                 wstring s = sFileContent;\r
1163                 for (tr1::wsregex_iterator it(s.begin(), s.end(), regCheck); it != end; ++it)\r
1164                 {\r
1165                         const tr1::wsmatch match = *it;\r
1166                         for (size_t i=1; i<match.size(); ++i)\r
1167                         {\r
1168                                 if (match[i].second-match[i].first)\r
1169                                 {\r
1170                                         ATLTRACE(_T("matched keyword : %s\n"), wstring(match[i]).c_str());\r
1171                                         m_autolist.insert(wstring(match[i]).c_str());\r
1172                                 }\r
1173                         }\r
1174                 }\r
1175         }\r
1176         catch (exception) {}\r
1177 }\r
1178 \r
1179 // CSciEditContextMenuInterface\r
1180 void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)\r
1181 {\r
1182         CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));\r
1183         m_nPopupPasteListCmd = nCmd++;\r
1184         mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);\r
1185 }\r
1186 \r
1187 bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)\r
1188 {\r
1189 #if 0\r
1190         if (m_bBlock)\r
1191                 return false;\r
1192         if (cmd == m_nPopupPasteListCmd)\r
1193         {\r
1194                 CString logmsg;\r
1195                 TCHAR buf[MAX_STATUS_STRING_LENGTH];\r
1196                 int nListItems = m_ListCtrl.GetItemCount();\r
1197                 for (int i=0; i<nListItems; ++i)\r
1198                 {\r
1199                         CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);\r
1200                         if (entry->IsChecked())\r
1201                         {\r
1202                                 CString line;\r
1203                                 Git_wc_status_kind status = entry->status;\r
1204                                 if (status == Git_wc_status_unversioned)\r
1205                                         status = Git_wc_status_added;\r
1206                                 if (status == Git_wc_status_missing)\r
1207                                         status = Git_wc_status_deleted;\r
1208                                 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
1209                                 if (m_ProjectProperties.bFileListInEnglish)\r
1210                                         langID = 1033;\r
1211                                 GitStatus::GetStatusString(AfxGetResourceHandle(), status, buf, sizeof(buf)/sizeof(TCHAR), langID);\r
1212                                 line.Format(_T("%-10s %s\r\n"), buf, (LPCTSTR)m_ListCtrl.GetItemText(i,0));\r
1213                                 logmsg += line;\r
1214                         }\r
1215                 }\r
1216                 pSciEdit->InsertText(logmsg);\r
1217                 return true;\r
1218         }\r
1219 #endif\r
1220         return false;\r
1221 }\r
1222 \r
1223 void CCommitDlg::OnTimer(UINT_PTR nIDEvent)\r
1224 {\r
1225         switch (nIDEvent)\r
1226         {\r
1227         case ENDDIALOGTIMER:\r
1228                 KillTimer(ENDDIALOGTIMER);\r
1229                 EndDialog(0);\r
1230                 break;\r
1231         case REFRESHTIMER:\r
1232                 if (m_bThreadRunning)\r
1233                 {\r
1234                         SetTimer(REFRESHTIMER, 200, NULL);\r
1235                         ATLTRACE("Wait some more before refreshing\n");\r
1236                 }\r
1237                 else\r
1238                 {\r
1239                         KillTimer(REFRESHTIMER);\r
1240                         ATLTRACE("Refreshing after items dropped\n");\r
1241                         Refresh();\r
1242                 }\r
1243                 break;\r
1244         }\r
1245         __super::OnTimer(nIDEvent);\r
1246 }\r
1247 \r
1248 void CCommitDlg::OnBnClickedHistory()\r
1249 {\r
1250         m_tooltips.Pop();       // hide the tooltips\r
1251         if (m_pathList.GetCount() == 0)\r
1252                 return;\r
1253 #if 0\r
1254         CHistoryDlg historyDlg;\r
1255         historyDlg.SetHistory(m_History);\r
1256         if (historyDlg.DoModal() != IDOK)\r
1257                 return;\r
1258 \r
1259         CString sMsg = historyDlg.GetSelectedText();\r
1260         if (sMsg != m_cLogMessage.GetText().Left(sMsg.GetLength()))\r
1261         {\r
1262                 CString sBugID = m_ProjectProperties.GetBugIDFromLog(sMsg);\r
1263                 if (!sBugID.IsEmpty())\r
1264                 {\r
1265                         SetDlgItemText(IDC_BUGID, sBugID);\r
1266                 }\r
1267                 if (m_ProjectProperties.sLogTemplate.Compare(m_cLogMessage.GetText())!=0)\r
1268                         m_cLogMessage.InsertText(sMsg, !m_cLogMessage.GetText().IsEmpty());\r
1269                 else\r
1270                         m_cLogMessage.SetText(sMsg);\r
1271         }\r
1272 \r
1273         UpdateOKButton();\r
1274         GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
1275 #endif\r
1276 }\r
1277 \r
1278 void CCommitDlg::OnBnClickedBugtraqbutton()\r
1279 {\r
1280 #if 0\r
1281         m_tooltips.Pop();       // hide the tooltips\r
1282         CString sMsg = m_cLogMessage.GetText();\r
1283 \r
1284         if (m_BugTraqProvider == NULL)\r
1285                 return;\r
1286 \r
1287         BSTR parameters = m_bugtraq_association.GetParameters().AllocSysString();\r
1288         BSTR commonRoot = SysAllocString(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());\r
1289         SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_pathList.GetCount());\r
1290 \r
1291         for (LONG index = 0; index < m_pathList.GetCount(); ++index)\r
1292                 SafeArrayPutElement(pathList, &index, m_pathList[index].GetGitPathString().AllocSysString());\r
1293 \r
1294         BSTR originalMessage = sMsg.AllocSysString();\r
1295         BSTR temp = NULL;\r
1296 \r
1297         // first try the IBugTraqProvider2 interface\r
1298         CComPtr<IBugTraqProvider2> pProvider2 = NULL;\r
1299         HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);\r
1300         if (SUCCEEDED(hr))\r
1301         {\r
1302                 CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();\r
1303                 BSTR repositoryRoot = common.AllocSysString();\r
1304                 if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, &temp)))\r
1305                 {\r
1306                         CString sErr;\r
1307                         sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());\r
1308                         CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);\r
1309                 }\r
1310                 else\r
1311                         m_cLogMessage.SetText(temp);\r
1312         }\r
1313         else\r
1314         {\r
1315                 // if IBugTraqProvider2 failed, try IBugTraqProvider\r
1316                 CComPtr<IBugTraqProvider> pProvider = NULL;\r
1317                 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider);\r
1318                 if (FAILED(hr))\r
1319                 {\r
1320                         CString sErr;\r
1321                         sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());\r
1322                         CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);\r
1323                         return;\r
1324                 }\r
1325 \r
1326                 if (FAILED(hr = pProvider->GetCommitMessage(GetSafeHwnd(), parameters, commonRoot, pathList, originalMessage, &temp)))\r
1327                 {\r
1328                         CString sErr;\r
1329                         sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());\r
1330                         CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);\r
1331                 }\r
1332                 else\r
1333                         m_cLogMessage.SetText(temp);\r
1334         }\r
1335 \r
1336         m_cLogMessage.SetFocus();\r
1337 \r
1338         SysFreeString(temp);\r
1339 #endif\r
1340 }\r
1341 \r
1342 LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)\r
1343 {\r
1344         UpdateOKButton();\r
1345         return 0;\r
1346 }\r
1347 \r
1348 void CCommitDlg::UpdateOKButton()\r
1349 {\r
1350 #if 0\r
1351         BOOL bValidLogSize = FALSE;\r
1352 \r
1353     if (m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize)\r
1354                 bValidLogSize = !m_bBlock;\r
1355 \r
1356         LONG nSelectedItems = m_ListCtrl.GetSelected();\r
1357         DialogEnableWindow(IDOK, bValidLogSize && nSelectedItems>0);\r
1358 #endif\r
1359 }\r
1360 \r
1361 \r
1362 LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)\r
1363 {\r
1364         switch (message) {\r
1365         case WM_NOTIFY:\r
1366                 if (wParam == IDC_SPLITTER)\r
1367                 { \r
1368                         SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;\r
1369                         DoSize(pHdr->delta);\r
1370                 }\r
1371                 break;\r
1372         }\r
1373 \r
1374         return __super::DefWindowProc(message, wParam, lParam);\r
1375 }\r
1376 \r
1377 void CCommitDlg::SetSplitterRange()\r
1378 {\r
1379         if ((m_ListCtrl)&&(m_cLogMessage))\r
1380         {\r
1381                 CRect rcTop;\r
1382                 m_cLogMessage.GetWindowRect(rcTop);\r
1383                 ScreenToClient(rcTop);\r
1384                 CRect rcMiddle;\r
1385                 m_ListCtrl.GetWindowRect(rcMiddle);\r
1386                 ScreenToClient(rcMiddle);\r
1387                 if (rcMiddle.Height() && rcMiddle.Width())\r
1388                         m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);\r
1389         }\r
1390 }\r
1391 \r
1392 void CCommitDlg::DoSize(int delta)\r
1393 {\r
1394         RemoveAnchor(IDC_MESSAGEGROUP);\r
1395         RemoveAnchor(IDC_LOGMESSAGE);\r
1396         RemoveAnchor(IDC_SPLITTER);\r
1397         RemoveAnchor(IDC_SIGNOFF);\r
1398         RemoveAnchor(IDC_LISTGROUP);\r
1399         RemoveAnchor(IDC_FILELIST);\r
1400         CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN);\r
1401         CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN);\r
1402         CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN);\r
1403         CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN);\r
1404         CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta);\r
1405         AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);\r
1406         AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);\r
1407         AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);\r
1408         AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);\r
1409         AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);\r
1410         AddAnchor(IDC_SIGNOFF,TOP_RIGHT);\r
1411         ArrangeLayout();\r
1412         // adjust the minimum size of the dialog to prevent the resizing from\r
1413         // moving the list control too far down.\r
1414         CRect rcLogMsg;\r
1415         m_cLogMessage.GetClientRect(rcLogMsg);\r
1416         SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_LogMsgOrigRect.Height()+rcLogMsg.Height()));\r
1417 \r
1418         SetSplitterRange();\r
1419         m_cLogMessage.Invalidate();\r
1420         GetDlgItem(IDC_LOGMESSAGE)->Invalidate();\r
1421 }\r
1422 \r
1423 void CCommitDlg::OnSize(UINT nType, int cx, int cy)\r
1424 {\r
1425     // first, let the resizing take place\r
1426     __super::OnSize(nType, cx, cy);\r
1427 \r
1428     //set range\r
1429     SetSplitterRange();\r
1430 }\r
1431 \r
1432 \r
1433 void CCommitDlg::OnBnClickedSignOff()\r
1434 {\r
1435         // TODO: Add your control notification handler code here\r
1436         CString str;\r
1437         CString username;\r
1438         CString email;\r
1439         username=g_Git.GetUserName();\r
1440         email=g_Git.GetUserEmail();\r
1441         username.Remove(_T('\n'));\r
1442         email.Remove(_T('\n'));\r
1443         str.Format(_T("Signed-off-by: %s <%s>\n"),username,email);\r
1444 \r
1445         m_cLogMessage.SetText(m_cLogMessage.GetText()+_T("\r\n\r\n")+str);\r
1446 }\r
1447 \r
1448 void CCommitDlg::OnStnClickedCommitlabel()\r
1449 {\r
1450         // TODO: Add your control notification handler code here\r
1451 }\r