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