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