src/TortoiseProc/CommitDlg.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2003-2013 - TortoiseSVN
   4 // Copyright (C) 2008-2014 - TortoiseGit
   5
   6 // This program is free software; you can redistribute it and/or
   7 // modify it under the terms of the GNU General Public License
   8 // as published by the Free Software Foundation; either version 2
   9 // of the License, or (at your option) any later version.
  10
  11 // This program is distributed in the hope that it will be useful,
  12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  14 // GNU General Public License for more details.
  15
  16 // You should have received a copy of the GNU General Public License
  17 // along with this program; if not, write to the Free Software Foundation,
  18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  19 //
  20 #include "stdafx.h"
  21 #include "TortoiseProc.h"
  22 #include "CommitDlg.h"
  23 #include "DirFileEnum.h"
  24 #include "MessageBox.h"
  25 #include "AppUtils.h"
  26 #include "PathUtils.h"
  27 #include "Git.h"
  28 #include "registry.h"
  29 #include "GitStatus.h"
  30 #include "HistoryDlg.h"
  31 #include "Hooks.h"
  32 #include "UnicodeUtils.h"
  33 #include "../TGitCache/CacheInterface.h"
  34 #include "ProgressDlg.h"
  35 #include "ShellUpdater.h"
  36 #include "Commands/PushCommand.h"
  37 #include "COMError.h"
  38 #include "Globals.h"
  39 #include "SysProgressDlg.h"
  40 #include "MassiveGitTask.h"
  41 #include "LogDlg.h"
  42 #include "BstrSafeVector.h"
  43
  44 #ifdef _DEBUG
  45 #define new DEBUG_NEW
  46 #undef THIS_FILE
  47 static char THIS_FILE[] = __FILE__;
  48 #endif
  49
  50 UINT CCommitDlg::WM_AUTOLISTREADY = RegisterWindowMessage(_T("TORTOISEGIT_AUTOLISTREADY_MSG"));
  51 UINT CCommitDlg::WM_UPDATEOKBUTTON = RegisterWindowMessage(_T("TORTOISEGIT_COMMIT_UPDATEOKBUTTON"));
  52 UINT CCommitDlg::WM_UPDATEDATAFALSE = RegisterWindowMessage(_T("TORTOISEGIT_COMMIT_UPDATEDATAFALSE"));
  53
  54 IMPLEMENT_DYNAMIC(CCommitDlg, CResizableStandAloneDialog)
  55 CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)
  56         : CResizableStandAloneDialog(CCommitDlg::IDD, pParent)
  57         , m_bShowUnversioned(FALSE)
  58         , m_bBlock(FALSE)
  59         , m_bThreadRunning(FALSE)
  60         , m_bRunThread(FALSE)
  61         , m_pThread(NULL)
  62         , m_bWholeProject(FALSE)
  63         , m_bWholeProject2(FALSE)
  64         , m_bKeepChangeList(TRUE)
  65         , m_bDoNotAutoselectSubmodules(FALSE)
  66         , m_itemsCount(0)
  67         , m_bSelectFilesForCommit(TRUE)
  68         , m_bNoPostActions(FALSE)
  69         , m_bAutoClose(false)
  70         , m_bSetCommitDateTime(FALSE)
  71         , m_bCreateNewBranch(FALSE)
  72         , m_bForceCommitAmend(false)
  73         , m_bCommitMessageOnly(FALSE)
  74         , m_bSetAuthor(FALSE)
  75         , m_bCancelled(false)
  76         , m_PostCmd(GIT_POSTCOMMIT_CMD_NOTHING)
  77         , m_bAmendDiffToLastCommit(FALSE)
  78         , m_nPopupPasteListCmd(0)
  79         , m_nPopupPasteLastMessage(0)
  80         , m_nPopupRecentMessage(0)
  81         , m_nPopupPickCommitHash(0)
  82         , m_nPopupPickCommitMessage(0)
  83         , m_hAccel(nullptr)
  84         , m_bWarnDetachedHead(true)
  85 {
  86         this->m_bCommitAmend=FALSE;
  87 }
  88
  89 CCommitDlg::~CCommitDlg()
  90 {
  91         if(m_pThread != NULL)
  92         {
  93                 delete m_pThread;
  94         }
  95 }
  96
  97 void CCommitDlg::DoDataExchange(CDataExchange* pDX)
  98 {
  99         CResizableStandAloneDialog::DoDataExchange(pDX);
 100         DDX_Control(pDX, IDC_FILELIST, m_ListCtrl);
 101         DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);
 102         DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);
 103         DDX_Check(pDX, IDC_COMMIT_SETDATETIME, m_bSetCommitDateTime);
 104         DDX_Check(pDX, IDC_CHECK_NEWBRANCH, m_bCreateNewBranch);
 105         DDX_Text(pDX, IDC_NEWBRANCH, m_sCreateNewBranch);
 106         DDX_Text(pDX, IDC_BUGID, m_sBugID);
 107         DDX_Text(pDX, IDC_COMMIT_AUTHORDATA, m_sAuthor);
 108         DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);
 109         DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);
 110         DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);
 111         DDX_Check(pDX, IDC_NOAUTOSELECTSUBMODULES, m_bDoNotAutoselectSubmodules);
 112         DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);
 113         DDX_Check(pDX, IDC_COMMIT_MESSAGEONLY, m_bCommitMessageOnly);
 114         DDX_Check(pDX,IDC_COMMIT_AMENDDIFF,m_bAmendDiffToLastCommit);
 115         DDX_Check(pDX, IDC_COMMIT_SETAUTHOR, m_bSetAuthor);
 116         DDX_Control(pDX,IDC_VIEW_PATCH,m_ctrlShowPatch);
 117         DDX_Control(pDX, IDC_COMMIT_DATEPICKER, m_CommitDate);
 118         DDX_Control(pDX, IDC_COMMIT_TIMEPICKER, m_CommitTime);
 119 }
 120
 121 BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)
 122         ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)
 123         ON_NOTIFY(SCN_UPDATEUI, IDC_LOGMESSAGE, OnScnUpdateUI)
 124 //      ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)
 125         ON_BN_CLICKED(IDC_BUGTRAQBUTTON, OnBnClickedBugtraqbutton)
 126         ON_EN_CHANGE(IDC_LOGMESSAGE, OnEnChangeLogmessage)
 127         ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED, OnGitStatusListCtrlItemCountChanged)
 128         ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH, OnGitStatusListCtrlNeedsRefresh)
 129         ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ADDFILE, OnFileDropped)
 130         ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_CHECKCHANGED, &CCommitDlg::OnGitStatusListCtrlCheckChanged)
 131         ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED, &CCommitDlg::OnGitStatusListCtrlItemChanged)
 132
 133         ON_REGISTERED_MESSAGE(CLinkControl::LK_LINKITEMCLICKED, &CCommitDlg::OnCheck)
 134         ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY, OnAutoListReady)
 135         ON_REGISTERED_MESSAGE(WM_UPDATEOKBUTTON, OnUpdateOKButton)
 136         ON_REGISTERED_MESSAGE(WM_UPDATEDATAFALSE, OnUpdateDataFalse)
 137         ON_WM_TIMER()
 138         ON_WM_SIZE()
 139         ON_STN_CLICKED(IDC_EXTERNALWARNING, &CCommitDlg::OnStnClickedExternalwarning)
 140         ON_BN_CLICKED(IDC_SIGNOFF, &CCommitDlg::OnBnClickedSignOff)
 141         ON_BN_CLICKED(IDC_COMMIT_AMEND, &CCommitDlg::OnBnClickedCommitAmend)
 142         ON_BN_CLICKED(IDC_COMMIT_MESSAGEONLY, &CCommitDlg::OnBnClickedCommitMessageOnly)
 143         ON_BN_CLICKED(IDC_WHOLE_PROJECT, &CCommitDlg::OnBnClickedWholeProject)
 144         ON_COMMAND(ID_FOCUS_MESSAGE,&CCommitDlg::OnFocusMessage)
 145         ON_COMMAND(ID_FOCUS_FILELIST, OnFocusFileList)
 146         ON_STN_CLICKED(IDC_VIEW_PATCH, &CCommitDlg::OnStnClickedViewPatch)
 147         ON_WM_MOVE()
 148         ON_WM_MOVING()
 149         ON_WM_SIZING()
 150         ON_NOTIFY(HDN_ITEMCHANGED, 0, &CCommitDlg::OnHdnItemchangedFilelist)
 151         ON_BN_CLICKED(IDC_COMMIT_AMENDDIFF, &CCommitDlg::OnBnClickedCommitAmenddiff)
 152         ON_BN_CLICKED(IDC_NOAUTOSELECTSUBMODULES, &CCommitDlg::OnBnClickedNoautoselectsubmodules)
 153         ON_BN_CLICKED(IDC_COMMIT_SETDATETIME, &CCommitDlg::OnBnClickedCommitSetDateTime)
 154         ON_BN_CLICKED(IDC_CHECK_NEWBRANCH, &CCommitDlg::OnBnClickedCheckNewBranch)
 155         ON_BN_CLICKED(IDC_COMMIT_SETAUTHOR, &CCommitDlg::OnBnClickedCommitSetauthor)
 156 END_MESSAGE_MAP()
 157
 158 int GetCommitTemplate(CString &msg)
 159 {
 160         CString tplFilename = g_Git.GetConfigValue(_T("commit.template"));
 161         if (tplFilename.IsEmpty())
 162                 return -1;
 163
 164         if (tplFilename[0] == _T('/'))
 165         {
 166                 if (tplFilename.GetLength() >= 3)
 167                 {
 168                         // handle "/d/TortoiseGit/tpl.txt" -> "d:/TortoiseGit/tpl.txt"
 169                         if (tplFilename[2] == _T('/'))
 170                         {
 171                                 tplFilename.GetBuffer()[0] = tplFilename[1];
 172                                 tplFilename.GetBuffer()[1] = _T(':');
 173                         }
 174                 }
 175         }
 176
 177         tplFilename.Replace(_T('/'), _T('\\'));
 178
 179         if (!CGit::LoadTextFile(tplFilename, msg))
 180                 return -1;
 181         return 0;
 182 }
 183
 184 BOOL CCommitDlg::OnInitDialog()
 185 {
 186         CResizableStandAloneDialog::OnInitDialog();
 187         CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
 188
 189         if (m_sLogMessage.IsEmpty())
 190         {
 191                 if (!m_bForceCommitAmend)
 192                         GetCommitTemplate(m_sLogMessage);
 193
 194                 CString dotGitPath;
 195                 g_GitAdminDir.GetAdminDirPath(g_Git.m_CurrentDir, dotGitPath);
 196                 bool loadedMsg = !CGit::LoadTextFile(dotGitPath + _T("MERGE_MSG"), m_sLogMessage);
 197                 loadedMsg = loadedMsg && !CGit::LoadTextFile(dotGitPath + _T("SQUASH_MSG"), m_sLogMessage);
 198         }
 199         RunStartCommitHook();
 200
 201         if (CTGitPath(g_Git.m_CurrentDir).IsMergeActive())
 202         {
 203                 DialogEnableWindow(IDC_CHECK_NEWBRANCH, FALSE);
 204                 m_bCreateNewBranch = FALSE;
 205                 GetDlgItem(IDC_MERGEACTIVE)->ShowWindow(SW_SHOW);
 206         }
 207
 208         m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);
 209         m_bShowUnversioned = m_regAddBeforeCommit;
 210
 211         CString regPath(g_Git.m_CurrentDir);
 212         regPath.Replace(_T(":"), _T("_"));
 213         m_regShowWholeProject = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\") + regPath, FALSE);
 214         m_bWholeProject = m_regShowWholeProject;
 215
 216         m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));
 217
 218         m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE);
 219         m_bKeepChangeList = m_regKeepChangelists;
 220
 221         m_regDoNotAutoselectSubmodules = CRegDWORD(_T("Software\\TortoiseGit\\DoNotAutoselectSubmodules"), FALSE);
 222         m_bDoNotAutoselectSubmodules = m_regDoNotAutoselectSubmodules;
 223
 224         m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_COMMITDLG));
 225
 226         if (m_pathList.IsEmpty())
 227                 m_bWholeProject2 = true;
 228
 229         if(this->m_pathList.GetCount() == 1 && m_pathList[0].IsEmpty())
 230                 m_bWholeProject2 = true;
 231
 232         SetDlgTitle();
 233
 234         UpdateData(FALSE);
 235
 236         m_ListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD | GITSLC_COLDEL, _T("CommitDlg"),(GITSLC_POPALL ^ (GITSLC_POPCOMMIT | GITSLC_POPSAVEAS)), true, true);
 237         m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));
 238         m_ListCtrl.SetCancelBool(&m_bCancelled);
 239         m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);
 240         m_ListCtrl.EnableFileDrop();
 241         m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);
 242
 243         //this->DialogEnableWindow(IDC_COMMIT_AMEND,FALSE);
 244         m_ProjectProperties.ReadProps();
 245
 246         m_cLogMessage.Init(m_ProjectProperties);
 247         m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));
 248         m_cLogMessage.RegisterContextMenuHandler(this);
 249         std::map<int, UINT> icons;
 250         icons[AUTOCOMPLETE_SPELLING] = IDI_SPELL;
 251         icons[AUTOCOMPLETE_FILENAME] = IDI_FILE;
 252         icons[AUTOCOMPLETE_PROGRAMCODE] = IDI_CODE;
 253         icons[AUTOCOMPLETE_SNIPPET] = IDI_SNIPPET;
 254         m_cLogMessage.SetIcon(icons);
 255
 256         OnEnChangeLogmessage();
 257
 258         m_tooltips.Create(this);
 259         m_tooltips.AddTool(IDC_EXTERNALWARNING, IDS_COMMITDLG_EXTERNALS);
 260         m_tooltips.AddTool(IDC_COMMIT_AMEND,IDS_COMMIT_AMEND_TT);
 261         m_tooltips.AddTool(IDC_MERGEACTIVE, IDC_MERGEACTIVE_TT);
 262         m_tooltips.AddTool(IDC_COMMIT_MESSAGEONLY, IDS_COMMIT_MESSAGEONLY_TT);
 263 //      m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);
 264
 265         CBugTraqAssociations bugtraq_associations;
 266         bugtraq_associations.Load(m_ProjectProperties.GetProviderUUID(), m_ProjectProperties.sProviderParams);
 267
 268         if (bugtraq_associations.FindProvider(g_Git.m_CurrentDir, &m_bugtraq_association))
 269         {
 270                 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
 271                 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
 272
 273                 CComPtr<IBugTraqProvider> pProvider;
 274                 HRESULT hr = pProvider.CoCreateInstance(m_bugtraq_association.GetProviderClass());
 275                 if (SUCCEEDED(hr))
 276                 {
 277                         m_BugTraqProvider = pProvider;
 278                         ATL::CComBSTR temp;
 279                         ATL::CComBSTR parameters(m_bugtraq_association.GetParameters());
 280                         if (SUCCEEDED(hr = pProvider->GetLinkText(GetSafeHwnd(), parameters, &temp)))
 281                         {
 282                                 SetDlgItemText(IDC_BUGTRAQBUTTON, temp);
 283                                 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(TRUE);
 284                                 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_SHOW);
 285                         }
 286                 }
 287
 288                 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
 289         }
 290         else if (!m_ProjectProperties.sMessage.IsEmpty())
 291         {
 292                 GetDlgItem(IDC_BUGID)->ShowWindow(SW_SHOW);
 293                 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_SHOW);
 294                 if (!m_ProjectProperties.sLabel.IsEmpty())
 295                         SetDlgItemText(IDC_BUGIDLABEL, m_ProjectProperties.sLabel);
 296                 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);
 297                 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);
 298                 GetDlgItem(IDC_BUGID)->SetFocus();
 299                 CString sBugID = m_ProjectProperties.GetBugIDFromLog(m_sLogMessage);
 300                 if (!sBugID.IsEmpty())
 301                 {
 302                         SetDlgItemText(IDC_BUGID, sBugID);
 303                 }
 304         }
 305         else
 306         {
 307                 GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);
 308                 GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);
 309                 GetDlgItem(IDC_BUGTRAQBUTTON)->ShowWindow(SW_HIDE);
 310                 GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);
 311                 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
 312         }
 313
 314         if (!m_sLogMessage.IsEmpty())
 315         {
 316                 m_cLogMessage.SetText(m_sLogMessage);
 317                 m_cLogMessage.Call(SCI_SETCURRENTPOS, 0);
 318                 m_cLogMessage.Call(SCI_SETSEL, 0, 0);
 319         }
 320
 321         GetWindowText(m_sWindowTitle);
 322
 323         AdjustControlSize(IDC_SHOWUNVERSIONED);
 324         AdjustControlSize(IDC_WHOLE_PROJECT);
 325         AdjustControlSize(IDC_CHECK_NEWBRANCH);
 326         AdjustControlSize(IDC_COMMIT_AMEND);
 327         AdjustControlSize(IDC_COMMIT_MESSAGEONLY);
 328         AdjustControlSize(IDC_COMMIT_AMENDDIFF);
 329         AdjustControlSize(IDC_COMMIT_SETDATETIME);
 330         AdjustControlSize(IDC_COMMIT_SETAUTHOR);
 331         AdjustControlSize(IDC_NOAUTOSELECTSUBMODULES);
 332         AdjustControlSize(IDC_KEEPLISTS);
 333
 334         m_linkControl.ConvertStaticToLink(m_hWnd, IDC_CHECKALL);
 335         m_linkControl.ConvertStaticToLink(m_hWnd, IDC_CHECKNONE);
 336         m_linkControl.ConvertStaticToLink(m_hWnd, IDC_CHECKUNVERSIONED);
 337         m_linkControl.ConvertStaticToLink(m_hWnd, IDC_CHECKVERSIONED);
 338         m_linkControl.ConvertStaticToLink(m_hWnd, IDC_CHECKADDED);
 339         m_linkControl.ConvertStaticToLink(m_hWnd, IDC_CHECKDELETED);
 340         m_linkControl.ConvertStaticToLink(m_hWnd, IDC_CHECKMODIFIED);
 341         m_linkControl.ConvertStaticToLink(m_hWnd, IDC_CHECKFILES);
 342         m_linkControl.ConvertStaticToLink(m_hWnd, IDC_CHECKSUBMODULES);
 343
 344         // line up all controls and adjust their sizes.
 345 #define LINKSPACING 9
 346         RECT rc = AdjustControlSize(IDC_SELECTLABEL);
 347         rc.right -= 15; // AdjustControlSize() adds 20 pixels for the checkbox/radio button bitmap, but this is a label...
 348         rc = AdjustStaticSize(IDC_CHECKALL, rc, LINKSPACING);
 349         rc = AdjustStaticSize(IDC_CHECKNONE, rc, LINKSPACING);
 350         rc = AdjustStaticSize(IDC_CHECKUNVERSIONED, rc, LINKSPACING);
 351         rc = AdjustStaticSize(IDC_CHECKVERSIONED, rc, LINKSPACING);
 352         rc = AdjustStaticSize(IDC_CHECKADDED, rc, LINKSPACING);
 353         rc = AdjustStaticSize(IDC_CHECKDELETED, rc, LINKSPACING);
 354         rc = AdjustStaticSize(IDC_CHECKMODIFIED, rc, LINKSPACING);
 355         rc = AdjustStaticSize(IDC_CHECKFILES, rc, LINKSPACING);
 356         rc = AdjustStaticSize(IDC_CHECKSUBMODULES, rc, LINKSPACING);
 357
 358         GetClientRect(m_DlgOrigRect);
 359         m_cLogMessage.GetClientRect(m_LogMsgOrigRect);
 360
 361         AddAnchor(IDC_COMMITLABEL, TOP_LEFT, TOP_RIGHT);
 362         AddAnchor(IDC_BUGIDLABEL, TOP_RIGHT);
 363         AddAnchor(IDC_BUGID, TOP_RIGHT);
 364         AddAnchor(IDC_BUGTRAQBUTTON, TOP_RIGHT);
 365         AddAnchor(IDC_COMMIT_TO, TOP_LEFT, TOP_RIGHT);
 366         AddAnchor(IDC_CHECK_NEWBRANCH, TOP_RIGHT);
 367         AddAnchor(IDC_NEWBRANCH, TOP_LEFT, TOP_RIGHT);
 368         AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
 369 //      AddAnchor(IDC_HISTORY, TOP_LEFT);
 370         AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
 371         AddAnchor(IDC_SIGNOFF, TOP_RIGHT);
 372         AddAnchor(IDC_VIEW_PATCH, BOTTOM_RIGHT);
 373         AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
 374         AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
 375         AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
 376         AddAnchor(IDC_SHOWUNVERSIONED, BOTTOM_LEFT);
 377         AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);
 378         AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);
 379         AddAnchor(IDC_TEXT_INFO, TOP_RIGHT);
 380         AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);
 381         AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);
 382         AddAnchor(IDC_NOAUTOSELECTSUBMODULES, BOTTOM_LEFT);
 383         AddAnchor(IDOK, BOTTOM_RIGHT);
 384         AddAnchor(IDCANCEL, BOTTOM_RIGHT);
 385         AddAnchor(IDHELP, BOTTOM_RIGHT);
 386         AddAnchor(IDC_MERGEACTIVE, BOTTOM_RIGHT);
 387         AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
 388         AddAnchor(IDC_COMMIT_MESSAGEONLY, BOTTOM_LEFT);
 389         AddAnchor(IDC_COMMIT_AMENDDIFF,TOP_LEFT);
 390         AddAnchor(IDC_COMMIT_SETDATETIME,TOP_LEFT);
 391         AddAnchor(IDC_COMMIT_DATEPICKER,TOP_LEFT);
 392         AddAnchor(IDC_COMMIT_TIMEPICKER,TOP_LEFT);
 393         AddAnchor(IDC_COMMIT_SETAUTHOR, TOP_LEFT);
 394         AddAnchor(IDC_COMMIT_AUTHORDATA, TOP_LEFT, TOP_RIGHT);
 395
 396         AddAnchor(IDC_SELECTLABEL, TOP_LEFT);
 397         AddAnchor(IDC_CHECKALL, TOP_LEFT);
 398         AddAnchor(IDC_CHECKNONE, TOP_LEFT);
 399         AddAnchor(IDC_CHECKUNVERSIONED, TOP_LEFT);
 400         AddAnchor(IDC_CHECKVERSIONED, TOP_LEFT);
 401         AddAnchor(IDC_CHECKADDED, TOP_LEFT);
 402         AddAnchor(IDC_CHECKDELETED, TOP_LEFT);
 403         AddAnchor(IDC_CHECKMODIFIED, TOP_LEFT);
 404         AddAnchor(IDC_CHECKFILES, TOP_LEFT);
 405         AddAnchor(IDC_CHECKSUBMODULES, TOP_LEFT);
 406
 407         if (hWndExplorer)
 408                 CenterWindow(CWnd::FromHandle(hWndExplorer));
 409         EnableSaveRestore(_T("CommitDlg"));
 410         DWORD yPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
 411         RECT rcDlg, rcLogMsg, rcFileList;
 412         GetClientRect(&rcDlg);
 413         m_cLogMessage.GetWindowRect(&rcLogMsg);
 414         ScreenToClient(&rcLogMsg);
 415         m_ListCtrl.GetWindowRect(&rcFileList);
 416         ScreenToClient(&rcFileList);
 417         if (yPos)
 418         {
 419                 RECT rectSplitter;
 420                 m_wndSplitter.GetWindowRect(&rectSplitter);
 421                 ScreenToClient(&rectSplitter);
 422                 int delta = yPos - rectSplitter.top;
 423                 if ((rcLogMsg.bottom + delta > rcLogMsg.top)&&(rcLogMsg.bottom + delta < rcFileList.bottom - 30))
 424                 {
 425                         m_wndSplitter.SetWindowPos(NULL, rectSplitter.left, yPos, 0, 0, SWP_NOSIZE);
 426                         DoSize(delta);
 427                 }
 428         }
 429
 430         SetSplitterRange();
 431
 432         if (m_bForceCommitAmend || m_bCommitAmend)
 433                 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_SHOW);
 434
 435         // add all directories to the watcher
 436         /*
 437         for (int i=0; i<m_pathList.GetCount(); ++i)
 438         {
 439                 if (m_pathList[i].IsDirectory())
 440                         m_pathwatcher.AddPath(m_pathList[i]);
 441         }*/
 442
 443         m_updatedPathList = m_pathList;
 444
 445         //first start a thread to obtain the file list with the status without
 446         //blocking the dialog
 447         InterlockedExchange(&m_bBlock, TRUE);
 448         m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
 449         if (m_pThread==NULL)
 450         {
 451                 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
 452                 InterlockedExchange(&m_bBlock, FALSE);
 453         }
 454         else
 455         {
 456                 m_pThread->m_bAutoDelete = FALSE;
 457                 m_pThread->ResumeThread();
 458         }
 459         CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);
 460         CRegDWORD historyhint = CRegDWORD(_T("Software\\TortoiseGit\\HistoryHintShown"), FALSE);
 461         if ((((DWORD)err)!=FALSE)&&((((DWORD)historyhint)==FALSE)))
 462         {
 463                 historyhint = TRUE;
 464 //              ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);
 465         }
 466         err = FALSE;
 467
 468         this->m_ctrlShowPatch.SetURL(CString());
 469
 470         if (g_Git.GetConfigValueBool(_T("tgit.commitshowpatch")))
 471                 OnStnClickedViewPatch();
 472
 473         return FALSE;  // return TRUE unless you set the focus to a control
 474         // EXCEPTION: OCX Property Pages should return FALSE
 475 }
 476
 477 static bool UpdateIndex(CMassiveGitTask &mgt, CSysProgressDlg &sysProgressDlg, int progress, int maxProgress)
 478 {
 479         if (!mgt.GetListCount())
 480                 return true;
 481
 482         if (sysProgressDlg.HasUserCancelled())
 483                 return false;
 484
 485         if (sysProgressDlg.IsVisible())
 486         {
 487                 sysProgressDlg.SetTitle(IDS_APPNAME);
 488                 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_PREPARECOMMIT)));
 489                 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_UPDATEINDEX)));
 490                 sysProgressDlg.SetProgress(progress, maxProgress);
 491                 AfxGetThread()->PumpMessage(); // process messages, in order to avoid freezing
 492         }
 493
 494         BOOL cancel = FALSE;
 495         return mgt.Execute(cancel);
 496 }
 497
 498 void CCommitDlg::OnOK()
 499 {
 500         if (m_bBlock)
 501                 return;
 502         if (m_bThreadRunning)
 503         {
 504                 m_bCancelled = true;
 505                 InterlockedExchange(&m_bRunThread, FALSE);
 506                 WaitForSingleObject(m_pThread->m_hThread, 1000);
 507                 if (m_bThreadRunning)
 508                 {
 509                         // we gave the thread a chance to quit. Since the thread didn't
 510                         // listen to us we have to kill it.
 511                         TerminateThread(m_pThread->m_hThread, (DWORD)-1);
 512                         InterlockedExchange(&m_bThreadRunning, FALSE);
 513                 }
 514         }
 515         this->UpdateData();
 516
 517         if (m_bCreateNewBranch)
 518         {
 519                 if (!g_Git.IsBranchNameValid(m_sCreateNewBranch))
 520                 {
 521                         ShowEditBalloon(IDC_NEWBRANCH, IDS_B_T_NOTEMPTY, IDS_ERR_ERROR, TTI_ERROR);
 522                         return;
 523                 }
 524                 if (g_Git.BranchTagExists(m_sCreateNewBranch))
 525                 {
 526                         // branch already exists
 527                         CString msg;
 528                         msg.LoadString(IDS_B_EXISTS);
 529                         msg += _T(" ") + CString(MAKEINTRESOURCE(IDS_B_DELETEORDIFFERENTNAME));
 530                         ShowEditBalloon(IDC_NEWBRANCH, msg, CString(MAKEINTRESOURCE(IDS_WARN_WARNING)));
 531                         return;
 532                 }
 533                 if (g_Git.BranchTagExists(m_sCreateNewBranch, false))
 534                 {
 535                         // tag with the same name exists -> shortref is ambiguous
 536                         if (CMessageBox::Show(m_hWnd, IDS_B_SAMETAGNAMEEXISTS, IDS_APPNAME, 2, IDI_EXCLAMATION, IDS_CONTINUEBUTTON, IDS_ABORTBUTTON) == 2)
 537                                 return;
 538                 }
 539         }
 540
 541         CString id;
 542         GetDlgItemText(IDC_BUGID, id);
 543         if (!m_ProjectProperties.CheckBugID(id))
 544         {
 545                 ShowEditBalloon(IDC_BUGID, IDS_COMMITDLG_ONLYNUMBERS, IDS_ERR_ERROR, TTI_ERROR);
 546                 return;
 547         }
 548         m_sLogMessage = m_cLogMessage.GetText();
 549         if ( m_sLogMessage.IsEmpty() )
 550         {
 551                 // no message entered, go round again
 552                 CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOMESSAGE, IDS_APPNAME, MB_OK | MB_ICONERROR);
 553                 return;
 554         }
 555         if ((m_ProjectProperties.bWarnIfNoIssue) && (id.IsEmpty() && !m_ProjectProperties.HasBugID(m_sLogMessage)))
 556         {
 557                 if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_NOISSUEWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)
 558                         return;
 559         }
 560
 561         if (m_ProjectProperties.bWarnNoSignedOffBy == TRUE && m_cLogMessage.GetText().Find(GetSignedOffByLine()) == -1)
 562         {
 563                 UINT retval = CMessageBox::Show(this->m_hWnd, IDS_PROC_COMMIT_NOSIGNOFFLINE, IDS_APPNAME, 1, IDI_WARNING, IDS_PROC_COMMIT_ADDSIGNOFFBUTTON, IDS_PROC_COMMIT_NOADDSIGNOFFBUTTON, IDS_ABORTBUTTON);
 564                 if (retval == 1)
 565                 {
 566                         OnBnClickedSignOff();
 567                         m_sLogMessage = m_cLogMessage.GetText();
 568                 }
 569                 else if (retval == 3)
 570                         return;
 571         }
 572
 573         if (CHooks::Instance().IsHookPresent(pre_commit_hook, g_Git.m_CurrentDir)) {
 574                 DWORD exitcode = 0xFFFFFFFF;
 575                 CString error;
 576                 CTGitPathList list;
 577                 m_ListCtrl.WriteCheckedNamesToPathList(list);
 578                 if (CHooks::Instance().PreCommit(g_Git.m_CurrentDir, list, m_sLogMessage, exitcode, error))
 579                 {
 580                         if (exitcode)
 581                         {
 582                                 CString temp;
 583                                 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
 584                                 MessageBox(temp, _T("TortoiseGit"), MB_ICONERROR);
 585                                 return;
 586                         }
 587                 }
 588         }
 589
 590         int nListItems = m_ListCtrl.GetItemCount();
 591         bool needResetIndex = false;
 592         for (int i = 0; i < nListItems && !m_bCommitMessageOnly; ++i)
 593         {
 594                 CTGitPath *entry = (CTGitPath *)m_ListCtrl.GetItemData(i);
 595                 if (!entry->m_Checked && !(entry->m_Action & CTGitPath::LOGACTIONS_UNVER))
 596                         needResetIndex = true;
 597                 if (!entry->m_Checked || !entry->IsDirectory())
 598                         continue;
 599
 600                 bool dirty = false;
 601                 if (entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
 602                 {
 603                         CGit subgit;
 604                         subgit.m_CurrentDir = g_Git.CombinePath(entry);
 605                         CString subcmdout;
 606                         subgit.Run(_T("git.exe status --porcelain"), &subcmdout, CP_UTF8);
 607                         dirty = !subcmdout.IsEmpty();
 608                 }
 609                 else
 610                 {
 611                         CString cmd, cmdout;
 612                         cmd.Format(_T("git.exe diff -- \"%s\""), entry->GetWinPathString());
 613                         g_Git.Run(cmd, &cmdout, CP_UTF8);
 614                         dirty = cmdout.Right(7) == _T("-dirty\n");
 615                 }
 616
 617                 if (dirty)
 618                 {
 619                         CString message;
 620                         message.Format(CString(MAKEINTRESOURCE(IDS_COMMITDLG_SUBMODULEDIRTY)), entry->GetGitPathString());
 621                         int result = CMessageBox::Show(m_hWnd, message, _T("TortoiseGit"), 1, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_COMMIT)), CString(MAKEINTRESOURCE(IDS_MSGBOX_IGNORE)), CString(MAKEINTRESOURCE(IDS_MSGBOX_CANCEL)));
 622                         if (result == 1)
 623                         {
 624                                 CString cmdCommit;
 625                                 cmdCommit.Format(_T("/command:commit /path:\"%s\\%s\""), g_Git.m_CurrentDir, entry->GetWinPathString());
 626                                 CAppUtils::RunTortoiseGitProc(cmdCommit);
 627                                 return;
 628                         }
 629                         else if (result == 2)
 630                                 continue;
 631                         else
 632                                 return;
 633                 }
 634         }
 635
 636         if (!m_bCommitMessageOnly)
 637                 m_ListCtrl.WriteCheckedNamesToPathList(m_selectedPathList);
 638         m_pathwatcher.Stop();
 639         InterlockedExchange(&m_bBlock, TRUE);
 640         //first add all the unversioned files the user selected
 641         //and check if all versioned files are selected
 642         int nchecked = 0;
 643
 644         CMassiveGitTask mgtReAddAfterCommit(_T("add --ignore-errors -f"));
 645
 646         CString cmd;
 647         CString out;
 648
 649         bool bAddSuccess=true;
 650         bool bCloseCommitDlg=false;
 651
 652         CSysProgressDlg sysProgressDlg;
 653         if (nListItems >= 25)
 654         {
 655                 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_PREPARECOMMIT)));
 656                 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_UPDATEINDEX)));
 657                 sysProgressDlg.SetTime(true);
 658                 sysProgressDlg.SetShowProgressBar(true);
 659                 sysProgressDlg.ShowModal(this, true);
 660         }
 661
 662         CBlockCacheForPath cacheBlock(g_Git.m_CurrentDir);
 663         DWORD currentTicks = GetTickCount();
 664
 665         if (g_Git.UsingLibGit2(CGit::GIT_CMD_COMMIT_UPDATE_INDEX))
 666         {
 667                 /*
 668                         Do not use the libgit2 implementation right now, since it has several flaws:
 669                         * https://code.google.com/p/tortoisegit/issues/detail?id=1690: possible access denied problem
 670                         * https://code.google.com/p/tortoisegit/issues/detail?id=2224: filters not correctly applied
 671                         * changes to x-bit are not correctly committed, since we reset the index
 672                 */
 673                 bAddSuccess = false;
 674                 do
 675                 {
 676                         CAutoRepository repository(g_Git.GetGitRepository());
 677                         if (!repository)
 678                         {
 679                                 CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not open repository.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 680                                 break;
 681                         }
 682
 683                         CGitHash revHash;
 684                         CString revRef = _T("HEAD");
 685                         if (m_bCommitAmend && !m_bAmendDiffToLastCommit)
 686                                 revRef = _T("HEAD~1");
 687                         if (CGit::GetHash(repository, revHash, revRef))
 688                         {
 689                                 MessageBox(g_Git.GetLibGit2LastErr(_T("Could not get HEAD hash after committing.")), _T("TortoiseGit"), MB_ICONERROR);
 690                                 break;
 691                         }
 692
 693                         CAutoCommit commit;
 694                         if (!revHash.IsEmpty() && needResetIndex && git_commit_lookup(commit.GetPointer(), repository, (const git_oid*)revHash.m_hash))
 695                         {
 696                                 CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not get last commit.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 697                                 break;
 698                         }
 699
 700                         CAutoTree tree;
 701                         if (!revHash.IsEmpty() && needResetIndex && git_commit_tree(tree.GetPointer(), commit))
 702                         {
 703                                 CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not read tree of commit.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 704                                 break;
 705                         }
 706
 707                         CAutoIndex index;
 708                         if (git_repository_index(index.GetPointer(), repository))
 709                         {
 710                                 CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not get the repository index.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 711                                 break;
 712                         }
 713
 714                         // reset index to the one of the reference commit (HEAD or HEAD~1)
 715                         if (!revHash.IsEmpty() && needResetIndex && git_index_read_tree(index, tree))
 716                         {
 717                                 CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not read the tree into the index.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 718                                 break;
 719                         }
 720                         else if (!revHash.IsEmpty() && !needResetIndex)
 721                         {
 722                                 git_index_read(index, true);
 723                         }
 724
 725                         bAddSuccess = true;
 726
 727                         for (int j = 0; j < nListItems; ++j)
 728                         {
 729                                 CTGitPath *entry = (CTGitPath*)m_ListCtrl.GetItemData(j);
 730
 731                                 if (sysProgressDlg.IsVisible())
 732                                 {
 733                                         if (GetTickCount() - currentTicks > 1000 || j == nListItems - 1 || j == 0)
 734                                         {
 735                                                 sysProgressDlg.SetLine(2, entry->GetGitPathString(), true);
 736                                                 sysProgressDlg.SetProgress(j, nListItems);
 737                                                 AfxGetThread()->PumpMessage(); // process messages, in order to avoid freezing; do not call this too often: this takes time!
 738                                                 currentTicks = GetTickCount();
 739                                         }
 740                                 }
 741
 742                                 CStringA filePathA = CUnicodeUtils::GetMulti(entry->GetGitPathString(), CP_UTF8);
 743
 744                                 if (entry->m_Checked && !m_bCommitMessageOnly)
 745                                 {
 746                                         if (entry->IsDirectory())
 747                                         {
 748                                                 git_submodule *submodule = nullptr;
 749                                                 if (git_submodule_lookup(&submodule, repository, filePathA))
 750                                                 {
 751                                                         bAddSuccess = false;
 752                                                         CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not open submodule \"") + entry->GetGitPathString() + _T("\".")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 753                                                         break;
 754                                                 }
 755                                                 if (git_submodule_add_to_index(submodule, FALSE))
 756                                                 {
 757                                                         bAddSuccess = false;
 758                                                         CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not add submodule \"") + entry->GetGitPathString() + _T("\" to index.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 759                                                         break;
 760                                                 }
 761                                         }
 762                                         else if (entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
 763                                         {
 764                                                 git_index_remove_bypath(index, filePathA); // ignore error
 765                                         }
 766                                         else
 767                                         {
 768                                                 if (git_index_add_bypath(index, filePathA))
 769                                                 {
 770                                                         bAddSuccess = false;
 771                                                         CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not add \"") + entry->GetGitPathString() + _T("\" to index.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 772                                                         break;
 773                                                 }
 774                                         }
 775
 776                                         if (entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
 777                                         {
 778                                                 git_index_remove_bypath(index, filePathA); // ignore error
 779                                         }
 780
 781                                         ++nchecked;
 782                                 }
 783                                 else if (entry->m_Action & CTGitPath::LOGACTIONS_ADDED || entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
 784                                         mgtReAddAfterCommit.AddFile(*entry);
 785
 786                                 if (sysProgressDlg.HasUserCancelled())
 787                                 {
 788                                         bAddSuccess = false;
 789                                         break;
 790                                 }
 791
 792                                 CShellUpdater::Instance().AddPathForUpdate(*entry);
 793                         }
 794                         if (bAddSuccess && git_index_write(index))
 795                                 bAddSuccess = false;
 796                 } while (0);
 797         }
 798         else
 799         {
 800                 // ***************************************************
 801                 // ATTENTION: Similar code in RebaseDlg.cpp!!!
 802                 // ***************************************************
 803                 CMassiveGitTask mgtAdd(_T("add -f"));
 804                 CMassiveGitTask mgtUpdateIndexForceRemove(_T("update-index --force-remove"));
 805                 CMassiveGitTask mgtUpdateIndex(_T("update-index"));
 806                 CMassiveGitTask mgtRm(_T("rm --ignore-unmatch"));
 807                 CMassiveGitTask mgtRmFCache(_T("rm -f --cache"));
 808                 CString resetCmd = _T("reset");
 809                 if (m_bCommitAmend && !m_bAmendDiffToLastCommit)
 810                         resetCmd += _T(" HEAD~1");;
 811                 CMassiveGitTask mgtReset(resetCmd, TRUE, true);
 812                 for (int j = 0; j < nListItems; ++j)
 813                 {
 814                         CTGitPath *entry = (CTGitPath*)m_ListCtrl.GetItemData(j);
 815
 816                         if (entry->m_Checked && !m_bCommitMessageOnly)
 817                         {
 818                                 if (entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
 819                                         mgtAdd.AddFile(entry->GetGitPathString());
 820                                 else if (entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
 821                                         mgtUpdateIndexForceRemove.AddFile(entry->GetGitPathString());
 822                                 else
 823                                         mgtUpdateIndex.AddFile(entry->GetGitPathString());
 824
 825                                 if ((entry->m_Action & CTGitPath::LOGACTIONS_REPLACED) && !entry->GetGitOldPathString().IsEmpty())
 826                                         mgtRm.AddFile(entry->GetGitOldPathString());
 827
 828                                 ++nchecked;
 829                         }
 830                         else
 831                         {
 832                                 if (entry->m_Action & CTGitPath::LOGACTIONS_ADDED || entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
 833                                 {       //To init git repository, there are not HEAD, so we can use git reset command
 834                                         mgtRmFCache.AddFile(entry->GetGitPathString());
 835                                         mgtReAddAfterCommit.AddFile(*entry);
 836
 837                                         if (entry->m_Action & CTGitPath::LOGACTIONS_REPLACED && !entry->GetGitOldPathString().IsEmpty())
 838                                                 mgtReset.AddFile(entry->GetGitOldPathString());
 839                                 }
 840                                 else if (!(entry->m_Action & CTGitPath::LOGACTIONS_UNVER))
 841                                         mgtReset.AddFile(entry->GetGitPathString());
 842                         }
 843
 844                         if (sysProgressDlg.HasUserCancelled())
 845                         {
 846                                 bAddSuccess = false;
 847                                 break;
 848                         }
 849                 }
 850
 851                 CMassiveGitTask tasks[] = { mgtAdd, mgtUpdateIndexForceRemove, mgtUpdateIndex, mgtRm, mgtRmFCache, mgtReset };
 852                 int progress = 0, maxProgress = 0;
 853                 for (int j = 0; j < _countof(tasks); ++j)
 854                         maxProgress += tasks[j].GetListCount();
 855                 for (int j = 0; j < _countof(tasks); ++j)
 856                         bAddSuccess = bAddSuccess && UpdateIndex(tasks[j], sysProgressDlg, progress += tasks[j].GetListCount(), maxProgress);
 857
 858                 if (sysProgressDlg.HasUserCancelled())
 859                         bAddSuccess = false;
 860
 861                 for (int j = 0; bAddSuccess && j < nListItems; ++j)
 862                         CShellUpdater::Instance().AddPathForUpdate(*(CTGitPath*)m_ListCtrl.GetItemData(j));
 863         }
 864
 865         if (sysProgressDlg.HasUserCancelled())
 866                 bAddSuccess = false;
 867
 868         //sysProgressDlg.Stop();
 869
 870         if (bAddSuccess && m_bCreateNewBranch)
 871         {
 872                 if (g_Git.Run(_T("git.exe branch ") + m_sCreateNewBranch, &out, CP_UTF8))
 873                 {
 874                         MessageBox(_T("Creating new branch failed:\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 875                         bAddSuccess = false;
 876                 }
 877                 if (g_Git.Run(_T("git.exe checkout ") + m_sCreateNewBranch + _T(" --"), &out, CP_UTF8))
 878                 {
 879                         MessageBox(_T("Switching to new branch failed:\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 880                         bAddSuccess = false;
 881                 }
 882         }
 883
 884         if (bAddSuccess && m_bWarnDetachedHead && CheckHeadDetach())
 885                 bAddSuccess = false;
 886
 887         m_sBugID.Trim();
 888         CString sExistingBugID = m_ProjectProperties.FindBugID(m_sLogMessage);
 889         sExistingBugID.Trim();
 890         if (!m_sBugID.IsEmpty() && m_sBugID.Compare(sExistingBugID))
 891         {
 892                 m_sBugID.Replace(_T(", "), _T(","));
 893                 m_sBugID.Replace(_T(" ,"), _T(","));
 894                 CString sBugID = m_ProjectProperties.sMessage;
 895                 sBugID.Replace(_T("%BUGID%"), m_sBugID);
 896                 if (m_ProjectProperties.bAppend)
 897                         m_sLogMessage += _T("\n") + sBugID + _T("\n");
 898                 else
 899                         m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
 900         }
 901
 902         // now let the bugtraq plugin check the commit message
 903         CComPtr<IBugTraqProvider2> pProvider2 = NULL;
 904         if (m_BugTraqProvider)
 905         {
 906                 HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
 907                 if (SUCCEEDED(hr))
 908                 {
 909                         ATL::CComBSTR temp;
 910                         ATL::CComBSTR repositoryRoot(g_Git.m_CurrentDir);
 911                         ATL::CComBSTR parameters(m_bugtraq_association.GetParameters());
 912                         ATL::CComBSTR commonRoot(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());
 913                         ATL::CComBSTR commitMessage(m_sLogMessage);
 914                         CBstrSafeVector pathList(m_selectedPathList.GetCount());
 915
 916                         for (LONG index = 0; index < m_selectedPathList.GetCount(); ++index)
 917                                 pathList.PutElement(index, m_selectedPathList[index].GetGitPathString());
 918
 919                         if (FAILED(hr = pProvider2->CheckCommit(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, commitMessage, &temp)))
 920                         {
 921                                 COMError ce(hr);
 922                                 CString sErr;
 923                                 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), ce.GetMessageAndDescription().c_str());
 924                                 CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
 925                         }
 926                         else
 927                         {
 928                                 CString sError = temp;
 929                                 if (!sError.IsEmpty())
 930                                 {
 931                                         CMessageBox::Show(m_hWnd, sError, _T("TortoiseGit"), MB_ICONERROR);
 932                                         return;
 933                                 }
 934                         }
 935                 }
 936         }
 937
 938         if (m_bCommitMessageOnly || bAddSuccess && (nchecked || m_bCommitAmend ||  CTGitPath(g_Git.m_CurrentDir).IsMergeActive()))
 939         {
 940                 bCloseCommitDlg = true;
 941
 942                 CString tempfile=::GetTempFile();
 943
 944                 if (CAppUtils::SaveCommitUnicodeFile(tempfile, m_sLogMessage))
 945                 {
 946                         CMessageBox::Show(nullptr, _T("Could not save commit message"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 947                         return;
 948                 }
 949
 950                 CTGitPath path=g_Git.m_CurrentDir;
 951
 952                 BOOL IsGitSVN = path.GetAdminDirMask() & ITEMIS_GITSVN;
 953
 954                 out =_T("");
 955                 CString amend;
 956                 if(this->m_bCommitAmend)
 957                 {
 958                         amend=_T("--amend");
 959                 }
 960                 CString dateTime;
 961                 if (m_bSetCommitDateTime)
 962                 {
 963                         CTime date, time;
 964                         m_CommitDate.GetTime(date);
 965                         m_CommitTime.GetTime(time);
 966                         dateTime.Format(_T("--date=%sT%s"), date.Format(_T("%Y-%m-%d")), time.Format(_T("%H:%M:%S")));
 967                 }
 968                 CString author;
 969                 if (m_bSetAuthor)
 970                         author.Format(_T("--author=\"%s\""), m_sAuthor);
 971                 CString allowEmpty = m_bCommitMessageOnly ? _T("--allow-empty") : _T("");
 972                 cmd.Format(_T("git.exe commit %s %s %s %s -F \"%s\""), author, dateTime, amend, allowEmpty, tempfile);
 973
 974                 CCommitProgressDlg progress;
 975                 progress.m_bBufferAll=true; // improve show speed when there are many file added.
 976                 progress.m_GitCmd=cmd;
 977                 progress.m_bShowCommand = FALSE;        // don't show the commit command
 978                 progress.m_PreText = out;                       // show any output already generated in log window
 979
 980                 progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
 981                 {
 982                         if (status || m_bNoPostActions || m_bAutoClose)
 983                                 return;
 984
 985                         if (IsGitSVN)
 986                                 postCmdList.push_back(PostCmd(IDI_COMMIT, IDS_MENUSVNDCOMMIT, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_DCOMMIT; }));
 987
 988                         postCmdList.push_back(PostCmd(IDI_PUSH, IDS_MENUPUSH, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_PUSH; }));
 989                         postCmdList.push_back(PostCmd(IDI_PULL, IDS_MENUPULL, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_PULL; }));
 990                         postCmdList.push_back(PostCmd(IDI_COMMIT, IDS_PROC_COMMIT_RECOMMIT, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_RECOMMIT; }));
 991                         postCmdList.push_back(PostCmd(IDI_TAG, IDS_MENUTAG, [&]{ m_PostCmd = GIT_POSTCOMMIT_CMD_CREATETAG; }));
 992                 };
 993
 994                 m_PostCmd = GIT_POSTCOMMIT_CMD_NOTHING;
 995                 progress.DoModal();
 996
 997                 if (progress.m_GitStatus || m_PostCmd == GIT_POSTCOMMIT_CMD_RECOMMIT)
 998                 {
 999                         bCloseCommitDlg = false;
1000                         if (m_PostCmd == GIT_POSTCOMMIT_CMD_RECOMMIT)
1001                         {
1002                                 if (!m_sLogMessage.IsEmpty())
1003                                 {
1004                                         m_History.AddEntry(m_sLogMessage);
1005                                         m_History.Save();
1006                                 }
1007
1008                                 this->m_sLogMessage.Empty();
1009                                 GetCommitTemplate(m_sLogMessage);
1010                                 RunStartCommitHook();
1011                                 m_cLogMessage.SetText(m_sLogMessage);
1012                                 if (m_bCreateNewBranch)
1013                                 {
1014                                         GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_SHOW);
1015                                         GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_HIDE);
1016                                 }
1017                                 m_bCreateNewBranch = FALSE;
1018                         }
1019
1020                         if (!progress.m_GitStatus)
1021                         {
1022                                 m_AmendStr.Empty();
1023                                 m_bCommitAmend = FALSE;
1024                         }
1025
1026                         UpdateData(FALSE);
1027                         this->Refresh();
1028                         this->BringWindowToTop();
1029                 }
1030
1031                 ::DeleteFile(tempfile);
1032
1033                 if (m_BugTraqProvider && progress.m_GitStatus == 0)
1034                 {
1035                         CComPtr<IBugTraqProvider2> pProvider = NULL;
1036                         HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider);
1037                         if (SUCCEEDED(hr))
1038                         {
1039                                 ATL::CComBSTR commonRoot(g_Git.m_CurrentDir);
1040                                 CBstrSafeVector pathList(m_selectedPathList.GetCount());
1041
1042                                 for (LONG index = 0; index < m_selectedPathList.GetCount(); ++index)
1043                                         pathList.PutElement(index, m_selectedPathList[index].GetGitPathString());
1044
1045                                 ATL::CComBSTR logMessage(m_sLogMessage);
1046
1047                                 CGitHash hash;
1048                                 if (g_Git.GetHash(hash, _T("HEAD")))
1049                                         MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash after committing.")), _T("TortoiseGit"), MB_ICONERROR);
1050                                 LONG version = g_Git.Hash2int(hash);
1051
1052                                 ATL::CComBSTR temp;
1053                                 if (FAILED(hr = pProvider->OnCommitFinished(GetSafeHwnd(),
1054                                         commonRoot,
1055                                         pathList,
1056                                         logMessage,
1057                                         (LONG)version,
1058                                         &temp)))
1059                                 {
1060                                         CString sErr = temp;
1061                                         if (!sErr.IsEmpty())
1062                                                 CMessageBox::Show(NULL,(sErr),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1063                                         else
1064                                         {
1065                                                 COMError ce(hr);
1066                                                 sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, ce.GetSource().c_str(), ce.GetMessageAndDescription().c_str());
1067                                                 CMessageBox::Show(NULL,(sErr),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1068                                         }
1069                                 }
1070                         }
1071                 }
1072                 RestoreFiles(progress.m_GitStatus == 0);
1073                 if (((DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit"), TRUE)) == TRUE)
1074                 {
1075                         BOOL cancel = FALSE;
1076                         mgtReAddAfterCommit.Execute(cancel);
1077                 }
1078         }
1079         else if(bAddSuccess)
1080         {
1081                 CMessageBox::Show(this->m_hWnd, IDS_ERROR_NOTHING_COMMIT, IDS_COMMIT_FINISH, MB_OK | MB_ICONINFORMATION);
1082                 bCloseCommitDlg=false;
1083         }
1084
1085         UpdateData();
1086         m_regAddBeforeCommit = m_bShowUnversioned;
1087         m_regKeepChangelists = m_bKeepChangeList;
1088         m_regDoNotAutoselectSubmodules = m_bDoNotAutoselectSubmodules;
1089         if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())
1090                 m_bKeepChangeList = FALSE;
1091         InterlockedExchange(&m_bBlock, FALSE);
1092
1093         if (!m_sLogMessage.IsEmpty())
1094         {
1095                 m_History.AddEntry(m_sLogMessage);
1096                 m_History.Save();
1097         }
1098
1099         SaveSplitterPos();
1100
1101         if( bCloseCommitDlg )
1102                 CResizableStandAloneDialog::OnOK();
1103
1104         CShellUpdater::Instance().Flush();
1105 }
1106
1107 void CCommitDlg::SaveSplitterPos()
1108 {
1109         if (!IsIconic())
1110         {
1111                 CRegDWORD regPos(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
1112                 RECT rectSplitter;
1113                 m_wndSplitter.GetWindowRect(&rectSplitter);
1114                 ScreenToClient(&rectSplitter);
1115                 regPos = rectSplitter.top;
1116         }
1117 }
1118
1119 UINT CCommitDlg::StatusThreadEntry(LPVOID pVoid)
1120 {
1121         return ((CCommitDlg*)pVoid)->StatusThread();
1122 }
1123
1124 UINT CCommitDlg::StatusThread()
1125 {
1126         //get the status of all selected file/folders recursively
1127         //and show the ones which have to be committed to the user
1128         //in a list control.
1129         InterlockedExchange(&m_bBlock, TRUE);
1130         InterlockedExchange(&m_bThreadRunning, TRUE);// so the main thread knows that this thread is still running
1131         InterlockedExchange(&m_bRunThread, TRUE);       // if this is set to FALSE, the thread should stop
1132
1133         m_pathwatcher.Stop();
1134
1135         m_ListCtrl.SetBusy(true);
1136         g_Git.RefreshGitIndex();
1137
1138         m_bCancelled = false;
1139
1140         DialogEnableWindow(IDOK, false);
1141         DialogEnableWindow(IDC_SHOWUNVERSIONED, false);
1142         DialogEnableWindow(IDC_WHOLE_PROJECT, false);
1143         DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES, false);
1144         GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_HIDE);
1145         DialogEnableWindow(IDC_EXTERNALWARNING, false);
1146         DialogEnableWindow(IDC_COMMIT_AMEND, FALSE);
1147         DialogEnableWindow(IDC_COMMIT_AMENDDIFF, FALSE);
1148         // read the list of recent log entries before querying the WC for status
1149         // -> the user may select one and modify / update it while we are crawling the WC
1150
1151         DialogEnableWindow(IDC_CHECKALL, false);
1152         DialogEnableWindow(IDC_CHECKNONE, false);
1153         DialogEnableWindow(IDC_CHECKUNVERSIONED, false);
1154         DialogEnableWindow(IDC_CHECKVERSIONED, false);
1155         DialogEnableWindow(IDC_CHECKADDED, false);
1156         DialogEnableWindow(IDC_CHECKDELETED, false);
1157         DialogEnableWindow(IDC_CHECKMODIFIED, false);
1158         DialogEnableWindow(IDC_CHECKFILES, false);
1159         DialogEnableWindow(IDC_CHECKSUBMODULES, false);
1160
1161         if (m_History.IsEmpty())
1162         {
1163                 CString reg;
1164                 reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);
1165                 reg.Replace(_T(':'),_T('_'));
1166                 m_History.Load(reg, _T("logmsgs"));
1167         }
1168
1169         CString dotGitPath;
1170         g_GitAdminDir.GetAdminDirPath(g_Git.m_CurrentDir, dotGitPath);
1171         if (PathFileExists(dotGitPath + _T("CHERRY_PICK_HEAD")))
1172         {
1173                 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_HIDE);
1174                 m_bCommitAmend = FALSE;
1175                 SendMessage(WM_UPDATEDATAFALSE);
1176         }
1177
1178         // Initialise the list control with the status of the files/folders below us
1179         m_ListCtrl.Clear();
1180         BOOL success;
1181         CTGitPathList *pList;
1182         m_ListCtrl.m_amend = (m_bCommitAmend==TRUE || m_bForceCommitAmend) && (m_bAmendDiffToLastCommit==FALSE);
1183         m_ListCtrl.m_bDoNotAutoselectSubmodules = (m_bDoNotAutoselectSubmodules == TRUE);
1184
1185         if(m_bWholeProject || m_bWholeProject2)
1186                 pList=NULL;
1187         else
1188                 pList = &m_pathList;
1189
1190         success=m_ListCtrl.GetStatus(pList);
1191
1192         //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
1193         if(this->m_bShowUnversioned)
1194                 m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER,true,pList);
1195
1196         m_ListCtrl.CheckIfChangelistsArePresent(false);
1197
1198         DWORD dwShow = GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GITSLC_SHOWLOCKS | GITSLC_SHOWINCHANGELIST | GITSLC_SHOWDIRECTFILES;
1199         dwShow |= DWORD(m_regAddBeforeCommit) ? GITSLC_SHOWUNVERSIONED : 0;
1200         if (success)
1201         {
1202                 if (!m_checkedPathList.IsEmpty())
1203                         m_ListCtrl.Show(dwShow, m_checkedPathList);
1204                 else
1205                 {
1206                         DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;
1207                         dwCheck &=~(CTGitPath::LOGACTIONS_UNVER); //don't check unversion file default.
1208                         m_ListCtrl.Show(dwShow, dwCheck);
1209                         m_bSelectFilesForCommit = true;
1210                 }
1211
1212                 if (m_ListCtrl.HasExternalsFromDifferentRepos())
1213                 {
1214                         GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);
1215                         DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);
1216                 }
1217
1218                 SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());
1219                 m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());
1220         }
1221         if (!success)
1222         {
1223                 if (!m_ListCtrl.GetLastErrorMessage().IsEmpty())
1224                         m_ListCtrl.SetEmptyString(m_ListCtrl.GetLastErrorMessage());
1225                 m_ListCtrl.Show(dwShow);
1226         }
1227
1228         if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems())
1229                  && !PathFileExists(dotGitPath + _T("MERGE_HEAD")))
1230         {
1231                 CString temp;
1232                 temp.LoadString(IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED);
1233                 if (CMessageBox::ShowCheck(m_hWnd, temp, _T("TortoiseGit"), MB_ICONINFORMATION | MB_YESNO, _T("NothingToCommitShowUnversioned"), NULL)==IDYES)
1234                 {
1235                         m_bShowUnversioned = TRUE;
1236                         GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);
1237                         DWORD dwShow = (DWORD)(GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GITSLC_SHOWUNVERSIONED | GITSLC_SHOWLOCKS);
1238                         m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);
1239                         m_ListCtrl.Show(dwShow,dwShow&(~CTGitPath::LOGACTIONS_UNVER));
1240                 }
1241         }
1242
1243         SetDlgTitle();
1244
1245         m_autolist.clear();
1246         // we don't have to block the commit dialog while we fetch the
1247         // auto completion list.
1248         m_pathwatcher.ClearChangedPaths();
1249         InterlockedExchange(&m_bBlock, FALSE);
1250         if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE)==TRUE)
1251         {
1252                 m_ListCtrl.Block(TRUE, TRUE);
1253                 GetAutocompletionList();
1254                 m_ListCtrl.Block(FALSE, FALSE);
1255         }
1256         SendMessage(WM_UPDATEOKBUTTON);
1257         if (m_bRunThread)
1258         {
1259                 DialogEnableWindow(IDC_SHOWUNVERSIONED, true);
1260                 DialogEnableWindow(IDC_WHOLE_PROJECT, !m_bWholeProject2);
1261                 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES, true);
1262                 if (m_ListCtrl.HasChangeLists())
1263                         DialogEnableWindow(IDC_KEEPLISTS, true);
1264
1265                 // activate amend checkbox (if necessary)
1266                 if (g_Git.IsInitRepos())
1267                 {
1268                         m_bCommitAmend = FALSE;
1269                         SendMessage(WM_UPDATEDATAFALSE);
1270                 }
1271                 else
1272                 {
1273                         if (m_bForceCommitAmend)
1274                         {
1275                                 m_bCommitAmend = TRUE;
1276                                 SendMessage(WM_UPDATEDATAFALSE);
1277                         }
1278                         else
1279                                 GetDlgItem(IDC_COMMIT_AMEND)->EnableWindow(!PathFileExists(dotGitPath + _T("CHERRY_PICK_HEAD")));
1280
1281                         CGitHash hash;
1282                         if (g_Git.GetHash(hash, _T("HEAD")))
1283                         {
1284                                 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
1285                         }
1286                         if (!hash.IsEmpty())
1287                         {
1288                                 GitRev headRevision;
1289                                 try
1290                                 {
1291                                         headRevision.GetParentFromHash(hash);
1292                                 }
1293                                 catch (char* msg)
1294                                 {
1295                                         CString err(msg);
1296                                         MessageBox(_T("Could not get parent from HEAD.\nlibgit reports:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
1297                                 }
1298                                 // do not allow to show diff to "last" revision if it has more that one parent
1299                                 if (headRevision.ParentsCount() != 1)
1300                                 {
1301                                         m_bAmendDiffToLastCommit = TRUE;
1302                                         SendMessage(WM_UPDATEDATAFALSE);
1303                                 }
1304                                 else
1305                                         GetDlgItem(IDC_COMMIT_AMENDDIFF)->EnableWindow(TRUE);
1306                         }
1307                 }
1308
1309                 UpdateCheckLinks();
1310
1311                 // we have the list, now signal the main thread about it
1312                 SendMessage(WM_AUTOLISTREADY);  // only send the message if the thread wasn't told to quit!
1313         }
1314
1315         InterlockedExchange(&m_bRunThread, FALSE);
1316         InterlockedExchange(&m_bThreadRunning, FALSE);
1317         // force the cursor to normal
1318         RefreshCursor();
1319
1320         return 0;
1321 }
1322
1323 void CCommitDlg::SetDlgTitle()
1324 {
1325         if (m_sTitle.IsEmpty())
1326                 GetWindowText(m_sTitle);
1327
1328         if (m_bWholeProject || m_bWholeProject2)
1329                 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, m_sTitle);
1330         else
1331         {
1332                 if (m_pathList.GetCount() == 1)
1333                         CAppUtils::SetWindowTitle(m_hWnd, g_Git.CombinePath(m_pathList[0].GetUIPathString()), m_sTitle);
1334                 else
1335                         CAppUtils::SetWindowTitle(m_hWnd, g_Git.CombinePath(m_ListCtrl.GetCommonDirectory(false)), m_sTitle);
1336         }
1337 }
1338
1339 void CCommitDlg::OnCancel()
1340 {
1341         m_bCancelled = true;
1342         m_pathwatcher.Stop();
1343
1344         if (m_bThreadRunning)
1345         {
1346                 InterlockedExchange(&m_bRunThread, FALSE);
1347                 WaitForSingleObject(m_pThread->m_hThread, 1000);
1348                 if (m_bThreadRunning)
1349                 {
1350                         // we gave the thread a chance to quit. Since the thread didn't
1351                         // listen to us we have to kill it.
1352                         TerminateThread(m_pThread->m_hThread, (DWORD)-1);
1353                         InterlockedExchange(&m_bThreadRunning, FALSE);
1354                 }
1355         }
1356         UpdateData();
1357         m_sBugID.Trim();
1358         m_sLogMessage = m_cLogMessage.GetText();
1359         if (!m_sBugID.IsEmpty())
1360         {
1361                 m_sBugID.Replace(_T(", "), _T(","));
1362                 m_sBugID.Replace(_T(" ,"), _T(","));
1363                 CString sBugID = m_ProjectProperties.sMessage;
1364                 sBugID.Replace(_T("%BUGID%"), m_sBugID);
1365                 if (m_ProjectProperties.bAppend)
1366                         m_sLogMessage += _T("\n") + sBugID + _T("\n");
1367                 else
1368                         m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;
1369         }
1370         if ((m_sLogTemplate.Compare(m_sLogMessage) != 0) && !m_sLogMessage.IsEmpty())
1371         {
1372                 m_History.AddEntry(m_sLogMessage);
1373                 m_History.Save();
1374         }
1375         RestoreFiles();
1376         SaveSplitterPos();
1377         CResizableStandAloneDialog::OnCancel();
1378 }
1379
1380 BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)
1381 {
1382         if (!m_bBlock)
1383                 m_tooltips.RelayEvent(pMsg);
1384
1385         if (m_hAccel)
1386         {
1387                 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
1388                 if (ret)
1389                         return TRUE;
1390         }
1391
1392         if (pMsg->message == WM_KEYDOWN)
1393         {
1394                 switch (pMsg->wParam)
1395                 {
1396                 case VK_F5:
1397                         {
1398                                 if (m_bBlock)
1399                                         return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
1400                                 Refresh();
1401                         }
1402                         break;
1403                 case VK_RETURN:
1404                         {
1405                                 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
1406                                 {
1407                                         if ( GetDlgItem(IDOK)->IsWindowEnabled() )
1408                                         {
1409                                                 PostMessage(WM_COMMAND, IDOK);
1410                                         }
1411                                         return TRUE;
1412                                 }
1413                                 if ( GetFocus()==GetDlgItem(IDC_BUGID) )
1414                                 {
1415                                         // Pressing RETURN in the bug id control
1416                                         // moves the focus to the message
1417                                         GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
1418                                         return TRUE;
1419                                 }
1420                         }
1421                         break;
1422                 }
1423         }
1424
1425         return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
1426 }
1427
1428 void CCommitDlg::Refresh()
1429 {
1430         if (m_bThreadRunning)
1431                 return;
1432
1433         InterlockedExchange(&m_bBlock, TRUE);
1434         m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
1435         if (m_pThread==NULL)
1436         {
1437                 CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
1438                 InterlockedExchange(&m_bBlock, FALSE);
1439         }
1440         else
1441         {
1442                 m_pThread->m_bAutoDelete = FALSE;
1443                 m_pThread->ResumeThread();
1444         }
1445 }
1446
1447 void CCommitDlg::OnBnClickedShowunversioned()
1448 {
1449         m_tooltips.Pop();       // hide the tooltips
1450         UpdateData();
1451         m_regAddBeforeCommit = m_bShowUnversioned;
1452         if (!m_bBlock)
1453         {
1454                 DWORD dwShow = m_ListCtrl.GetShowFlags();
1455                 if (DWORD(m_regAddBeforeCommit))
1456                         dwShow |= GITSLC_SHOWUNVERSIONED;
1457                 else
1458                         dwShow &= ~GITSLC_SHOWUNVERSIONED;
1459                 if(dwShow & GITSLC_SHOWUNVERSIONED)
1460                 {
1461                         if (m_bWholeProject || m_bWholeProject2)
1462                                 m_ListCtrl.GetStatus(NULL,false,false,true);
1463                         else
1464                                 m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);
1465                 }
1466                 m_ListCtrl.Show(dwShow, 0, true, dwShow & ~(CTGitPath::LOGACTIONS_UNVER), true);
1467                 UpdateCheckLinks();
1468         }
1469 }
1470
1471 void CCommitDlg::OnStnClickedExternalwarning()
1472 {
1473         m_tooltips.Popup();
1474 }
1475
1476 void CCommitDlg::OnEnChangeLogmessage()
1477 {
1478         SendMessage(WM_UPDATEOKBUTTON);
1479 }
1480
1481 LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)
1482 {
1483 #if 0
1484         if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))
1485         {
1486                 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
1487                 {
1488                         m_bShowUnversioned = TRUE;
1489                         DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;
1490                         m_ListCtrl.Show(dwShow);
1491                         UpdateData(FALSE);
1492                 }
1493         }
1494 #endif
1495         return 0;
1496 }
1497
1498 LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
1499 {
1500         Refresh();
1501         return 0;
1502 }
1503
1504 LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM /*lParam*/)
1505 {
1506 #if 0
1507         BringWindowToTop();
1508         SetForegroundWindow();
1509         SetActiveWindow();
1510         // if multiple files/folders are dropped
1511         // this handler is called for every single item
1512         // separately.
1513         // To avoid creating multiple refresh threads and
1514         // causing crashes, we only add the items to the
1515         // list control and start a timer.
1516         // When the timer expires, we start the refresh thread,
1517         // but only if it isn't already running - otherwise we
1518         // restart the timer.
1519         CTGitPath path;
1520         path.SetFromWin((LPCTSTR)lParam);
1521
1522         // just add all the items we get here.
1523         // if the item is versioned, the add will fail but nothing
1524         // more will happen.
1525         Git Git;
1526         Git.Add(CTGitPathList(path), &m_ProjectProperties, Git_depth_empty, false, true, true);
1527
1528         if (!m_ListCtrl.HasPath(path))
1529         {
1530                 if (m_pathList.AreAllPathsFiles())
1531                 {
1532                         m_pathList.AddPath(path);
1533                         m_pathList.RemoveDuplicates();
1534                         m_updatedPathList.AddPath(path);
1535                         m_updatedPathList.RemoveDuplicates();
1536                 }
1537                 else
1538                 {
1539                         // if the path list contains folders, we have to check whether
1540                         // our just (maybe) added path is a child of one of those. If it is
1541                         // a child of a folder already in the list, we must not add it. Otherwise
1542                         // that path could show up twice in the list.
1543                         bool bHasParentInList = false;
1544                         for (int i=0; i<m_pathList.GetCount(); ++i)
1545                         {
1546                                 if (m_pathList[i].IsAncestorOf(path))
1547                                 {
1548                                         bHasParentInList = true;
1549                                         break;
1550                                 }
1551                         }
1552                         if (!bHasParentInList)
1553                         {
1554                                 m_pathList.AddPath(path);
1555                                 m_pathList.RemoveDuplicates();
1556                                 m_updatedPathList.AddPath(path);
1557                                 m_updatedPathList.RemoveDuplicates();
1558                         }
1559                 }
1560         }
1561
1562         // Always start the timer, since the status of an existing item might have changed
1563         SetTimer(REFRESHTIMER, 200, NULL);
1564         CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": Item %s dropped, timer started\n"), path.GetWinPath());
1565 #endif
1566         return 0;
1567 }
1568
1569 LRESULT CCommitDlg::OnAutoListReady(WPARAM, LPARAM)
1570 {
1571         m_cLogMessage.SetAutoCompletionList(m_autolist, '*');
1572         return 0;
1573 }
1574
1575 //////////////////////////////////////////////////////////////////////////
1576 // functions which run in the status thread
1577 //////////////////////////////////////////////////////////////////////////
1578
1579 void CCommitDlg::ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex)
1580 {
1581         CString strLine;
1582         try
1583         {
1584                 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
1585                 while (m_bRunThread && file.ReadString(strLine))
1586                 {
1587                         int eqpos = strLine.Find('=');
1588                         CString rgx;
1589                         rgx = strLine.Mid(eqpos+1).Trim();
1590
1591                         int pos = -1;
1592                         while (((pos = strLine.Find(','))>=0)&&(pos < eqpos))
1593                         {
1594                                 mapRegex[strLine.Left(pos)] = rgx;
1595                                 strLine = strLine.Mid(pos+1).Trim();
1596                         }
1597                         mapRegex[strLine.Left(strLine.Find('=')).Trim()] = rgx;
1598                 }
1599                 file.Close();
1600         }
1601         catch (CFileException* pE)
1602         {
1603                 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": CFileException loading auto list regex file\n");
1604                 pE->Delete();
1605         }
1606 }
1607
1608 void CCommitDlg::ParseSnippetFile(const CString& sFile, std::map<CString, CString>& mapSnippet)
1609 {
1610         CString strLine;
1611         try
1612         {
1613                 CStdioFile file(sFile, CFile::typeText | CFile::modeRead | CFile::shareDenyWrite);
1614                 while (m_bRunThread && file.ReadString(strLine))
1615                 {
1616                         if (strLine.IsEmpty())
1617                                 continue;
1618                         if (strLine.Left(1) == _T('#')) // comment char
1619                                 continue;
1620                         int eqpos = strLine.Find('=');
1621                         CString key = strLine.Left(eqpos);
1622                         CString value = strLine.Mid(eqpos + 1);
1623                         value.Replace(_T("\\\t"), _T("\t"));
1624                         value.Replace(_T("\\\r"), _T("\r"));
1625                         value.Replace(_T("\\\n"), _T("\n"));
1626                         value.Replace(_T("\\\\"), _T("\\"));
1627                         mapSnippet[key] = value;
1628                 }
1629                 file.Close();
1630         }
1631         catch (CFileException* pE)
1632         {
1633                 CTraceToOutputDebugString::Instance()(__FUNCTION__ ": CFileException loading auto list regex file\n");
1634                 pE->Delete();
1635         }
1636 }
1637
1638 void CCommitDlg::GetAutocompletionList()
1639 {
1640         // the auto completion list is made of strings from each selected files.
1641         // the strings used are extracted from the files with regexes found
1642         // in the file "autolist.txt".
1643         // the format of that file is:
1644         // file extensions separated with commas '=' regular expression to use
1645         // example:
1646         // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
1647         // .cpp = (?<=[^\s]::)\b\w+\b
1648
1649         std::map<CString, CString> mapRegex;
1650         CString sRegexFile = CPathUtils::GetAppDirectory();
1651         CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);
1652         DWORD timeoutvalue = regtimeout*1000;
1653         sRegexFile += _T("autolist.txt");
1654         if (!m_bRunThread)
1655                 return;
1656         ParseRegexFile(sRegexFile, mapRegex);
1657         sRegexFile = CPathUtils::GetAppDataDirectory();
1658         sRegexFile += _T("autolist.txt");
1659         if (PathFileExists(sRegexFile))
1660                 ParseRegexFile(sRegexFile, mapRegex);
1661
1662         m_snippet.clear();
1663         CString sSnippetFile = CPathUtils::GetAppDirectory();
1664         sSnippetFile += _T("snippet.txt");
1665         ParseSnippetFile(sSnippetFile, m_snippet);
1666         sSnippetFile = CPathUtils::GetAppDataDirectory();
1667         sSnippetFile += _T("snippet.txt");
1668         if (PathFileExists(sSnippetFile))
1669                 ParseSnippetFile(sSnippetFile, m_snippet);
1670         for (auto snip : m_snippet)
1671                 m_autolist.insert(std::make_pair(snip.first, AUTOCOMPLETE_SNIPPET));
1672
1673         DWORD starttime = GetTickCount();
1674
1675         // now we have two arrays of strings, where the first array contains all
1676         // file extensions we can use and the second the corresponding regex strings
1677         // to apply to those files.
1678
1679         // the next step is to go over all files shown in the commit dialog
1680         // and scan them for strings we can use
1681         int nListItems = m_ListCtrl.GetItemCount();
1682
1683         for (int i=0; i<nListItems && m_bRunThread; ++i)
1684         {
1685                 // stop parsing after timeout
1686                 if ((!m_bRunThread) || (GetTickCount() - starttime > timeoutvalue))
1687                         return;
1688
1689                 CTGitPath *path = (CTGitPath*)m_ListCtrl.GetItemData(i);
1690
1691                 if(path == NULL)
1692                         continue;
1693
1694                 CString sPartPath =path->GetGitPathString();
1695                 m_autolist.insert(std::make_pair(sPartPath, AUTOCOMPLETE_FILENAME));
1696
1697                 int pos = 0;
1698                 int lastPos = 0;
1699                 while ((pos = sPartPath.Find('/', pos)) >= 0)
1700                 {
1701                         ++pos;
1702                         lastPos = pos;
1703                         m_autolist.insert(std::make_pair(sPartPath.Mid(pos), AUTOCOMPLETE_FILENAME));
1704                 }
1705
1706                 // Last inserted entry is a file name.
1707                 // Some users prefer to also list file name without extension.
1708                 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE))
1709                 {
1710                         int dotPos = sPartPath.ReverseFind('.');
1711                         if ((dotPos >= 0) && (dotPos > lastPos))
1712                                 m_autolist.insert(std::make_pair(sPartPath.Mid(lastPos, dotPos - lastPos), AUTOCOMPLETE_FILENAME));
1713                 }
1714
1715                 if (path->m_Action == CTGitPath::LOGACTIONS_UNVER && !CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseUnversioned"), FALSE))
1716                         continue;
1717                 if (path->m_Action == CTGitPath::LOGACTIONS_IGNORE || path->m_Action == CTGitPath::LOGACTIONS_DELETED)
1718                         continue;
1719
1720                 CString sExt = path->GetFileExtension();
1721                 sExt.MakeLower();
1722                 // find the regex string which corresponds to the file extension
1723                 CString rdata = mapRegex[sExt];
1724                 if (rdata.IsEmpty())
1725                         continue;
1726
1727                 ScanFile(path->GetWinPathString(), rdata, sExt);
1728         }
1729         CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": Auto completion list loaded in %d msec\n"), GetTickCount() - starttime);
1730 }
1731
1732 void CCommitDlg::ScanFile(const CString& sFilePath, const CString& sRegex, const CString& sExt)
1733 {
1734         static std::map<CString, std::tr1::wregex> regexmap;
1735
1736         std::wstring sFileContent;
1737         CAutoFile hFile = CreateFile(sFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);
1738         if (hFile)
1739         {
1740                 DWORD size = GetFileSize(hFile, NULL);
1741                 if (size > CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseMaxSize"), 300000L))
1742                 {
1743                         // no files bigger than 300k
1744                         return;
1745                 }
1746                 // allocate memory to hold file contents
1747                 std::unique_ptr<char[]> buffer(new char[size]);
1748                 DWORD readbytes;
1749                 if (!ReadFile(hFile, buffer.get(), size, &readbytes, NULL))
1750                         return;
1751                 int opts = 0;
1752                 IsTextUnicode(buffer.get(), readbytes, &opts);
1753                 if (opts & IS_TEXT_UNICODE_NULL_BYTES)
1754                 {
1755                         return;
1756                 }
1757                 if (opts & IS_TEXT_UNICODE_UNICODE_MASK)
1758                 {
1759                         sFileContent = std::wstring((wchar_t*)buffer.get(), readbytes / sizeof(WCHAR));
1760                 }
1761                 if ((opts & IS_TEXT_UNICODE_NOT_UNICODE_MASK) || (opts == 0))
1762                 {
1763                         const int ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer.get(), readbytes, NULL, 0);
1764                         std::unique_ptr<wchar_t[]> pWideBuf(new wchar_t[ret]);
1765                         const int ret2 = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPCSTR)buffer.get(), readbytes, pWideBuf.get(), ret);
1766                         if (ret2 == ret)
1767                                 sFileContent = std::wstring(pWideBuf.get(), ret);
1768                 }
1769         }
1770         if (sFileContent.empty() || !m_bRunThread)
1771         {
1772                 return;
1773         }
1774
1775         try
1776         {
1777
1778                 std::tr1::wregex regCheck;
1779                 std::map<CString, std::tr1::wregex>::const_iterator regIt;
1780                 if ((regIt = regexmap.find(sExt)) != regexmap.end())
1781                         regCheck = regIt->second;
1782                 else
1783                 {
1784                         regCheck = std::tr1::wregex(sRegex, std::tr1::regex_constants::icase | std::tr1::regex_constants::ECMAScript);
1785                         regexmap[sExt] = regCheck;
1786                 }
1787                 const std::tr1::wsregex_iterator end;
1788                 for (std::tr1::wsregex_iterator it(sFileContent.begin(), sFileContent.end(), regCheck); it != end; ++it)
1789                 {
1790                         const std::tr1::wsmatch match = *it;
1791                         for (size_t i = 1; i < match.size(); ++i)
1792                         {
1793                                 if (match[i].second-match[i].first)
1794                                 {
1795                                         m_autolist.insert(std::make_pair(std::wstring(match[i]).c_str(), AUTOCOMPLETE_PROGRAMCODE));
1796                                 }
1797                         }
1798                 }
1799         }
1800         catch (std::exception) {}
1801 }
1802
1803 // CSciEditContextMenuInterface
1804 void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
1805 {
1806         CString sMenuItemText;
1807         sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITHASH);
1808         m_nPopupPickCommitHash = nCmd++;
1809         mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPickCommitHash, sMenuItemText);
1810
1811         sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITMESSAGE);
1812         m_nPopupPickCommitMessage = nCmd++;
1813         mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPickCommitMessage, sMenuItemText);
1814
1815         sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTEFILELIST);
1816         m_nPopupPasteListCmd = nCmd++;
1817         mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);
1818
1819         if (!m_History.IsEmpty())
1820         {
1821                 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);
1822                 m_nPopupPasteLastMessage = nCmd++;
1823                 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);
1824
1825                 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY);
1826                 m_nPopupRecentMessage = nCmd++;
1827                 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupRecentMessage, sMenuItemText);
1828         }
1829 }
1830
1831 bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
1832 {
1833         if (cmd == m_nPopupPickCommitHash)
1834         {
1835                 // use the git log to allow selection of a version
1836                 CLogDlg dlg;
1837                 // tell the dialog to use mode for selecting revisions
1838                 dlg.SetSelect(true);
1839                 // only one revision must be selected however
1840                 dlg.SingleSelection(true);
1841                 if (dlg.DoModal() == IDOK)
1842                 {
1843                         // get selected hash if any
1844                         CString selectedHash = dlg.GetSelectedHash();
1845                         pSciEdit->InsertText(selectedHash);
1846                 }
1847                 return true;
1848         }
1849
1850         if (cmd == m_nPopupPickCommitMessage)
1851         {
1852                 // use the git log to allow selection of a version
1853                 CLogDlg dlg;
1854                 // tell the dialog to use mode for selecting revisions
1855                 dlg.SetSelect(true);
1856                 // only one revision must be selected however
1857                 dlg.SingleSelection(true);
1858                 if (dlg.DoModal() == IDOK)
1859                 {
1860                         // get selected hash if any
1861                         CString selectedHash = dlg.GetSelectedHash();
1862                         GitRev rev;
1863                         rev.GetCommit(selectedHash);
1864                         CString message = rev.GetSubject() + _T("\r\n") + rev.GetBody();
1865                         pSciEdit->InsertText(message);
1866                 }
1867                 return true;
1868         }
1869
1870         if (cmd == m_nPopupPasteListCmd)
1871         {
1872                 CString logmsg;
1873                 int nListItems = m_ListCtrl.GetItemCount();
1874                 for (int i=0; i<nListItems; ++i)
1875                 {
1876                         CTGitPath * entry = (CTGitPath*)m_ListCtrl.GetItemData(i);
1877                         if (entry&&entry->m_Checked)
1878                         {
1879                                 CString line;
1880                                 CString status = entry->GetActionName();
1881                                 if(entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
1882                                         status = _T("Add"); // I18N TODO
1883
1884                                 //git_wc_status_kind status = entry->status;
1885                                 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1886                                 if (m_ProjectProperties.bFileListInEnglish)
1887                                         langID = 1033;
1888
1889                                 line.Format(_T("%-10s %s\r\n"),status , (LPCTSTR)m_ListCtrl.GetItemText(i,0));
1890                                 logmsg += line;
1891                         }
1892                 }
1893                 pSciEdit->InsertText(logmsg);
1894                 return true;
1895         }
1896
1897         if(cmd == m_nPopupPasteLastMessage)
1898         {
1899                 if (m_History.IsEmpty())
1900                         return false;
1901
1902                 CString logmsg;
1903                 logmsg +=m_History.GetEntry(0);
1904                 pSciEdit->InsertText(logmsg);
1905                 return true;
1906         }
1907
1908         if(cmd == m_nPopupRecentMessage )
1909         {
1910                 OnBnClickedHistory();
1911                 return true;
1912         }
1913         return false;
1914 }
1915
1916 void CCommitDlg::HandleSnippet(int type, const CString &text, CSciEdit *pSciEdit)
1917 {
1918         if (type == AUTOCOMPLETE_SNIPPET)
1919         {
1920                 CString target = m_snippet[text];
1921                 pSciEdit->GetWordUnderCursor(true);
1922                 pSciEdit->InsertText(target, false);
1923         }
1924 }
1925
1926 void CCommitDlg::OnTimer(UINT_PTR nIDEvent)
1927 {
1928         switch (nIDEvent)
1929         {
1930         case ENDDIALOGTIMER:
1931                 KillTimer(ENDDIALOGTIMER);
1932                 EndDialog(0);
1933                 break;
1934         case REFRESHTIMER:
1935                 if (m_bThreadRunning)
1936                 {
1937                         SetTimer(REFRESHTIMER, 200, NULL);
1938                         CTraceToOutputDebugString::Instance()(__FUNCTION__ ": Wait some more before refreshing\n");
1939                 }
1940                 else
1941                 {
1942                         KillTimer(REFRESHTIMER);
1943                         CTraceToOutputDebugString::Instance()(__FUNCTION__ ": Refreshing after items dropped\n");
1944                         Refresh();
1945                 }
1946                 break;
1947         case FILLPATCHVTIMER:
1948                 FillPatchView();
1949                 break;
1950         }
1951         __super::OnTimer(nIDEvent);
1952 }
1953
1954 void CCommitDlg::OnBnClickedHistory()
1955 {
1956         m_tooltips.Pop();       // hide the tooltips
1957         if (m_pathList.IsEmpty())
1958                 return;
1959
1960         CHistoryDlg historyDlg;
1961         historyDlg.SetHistory(m_History);
1962         if (historyDlg.DoModal() != IDOK)
1963                 return;
1964
1965         CString sMsg = historyDlg.GetSelectedText();
1966         if (sMsg != m_cLogMessage.GetText().Left(sMsg.GetLength()))
1967         {
1968                 CString sBugID = m_ProjectProperties.FindBugID(sMsg);
1969                 if ((!sBugID.IsEmpty()) && ((GetDlgItem(IDC_BUGID)->IsWindowVisible())))
1970                 {
1971                         SetDlgItemText(IDC_BUGID, sBugID);
1972                 }
1973                 if (m_sLogTemplate.Compare(m_cLogMessage.GetText()) != 0)
1974                         m_cLogMessage.InsertText(sMsg, !m_cLogMessage.GetText().IsEmpty());
1975                 else
1976                         m_cLogMessage.SetText(sMsg);
1977         }
1978
1979         SendMessage(WM_UPDATEOKBUTTON);
1980         GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
1981
1982 }
1983
1984 void CCommitDlg::OnBnClickedBugtraqbutton()
1985 {
1986         m_tooltips.Pop();       // hide the tooltips
1987         CString sMsg = m_cLogMessage.GetText();
1988
1989         if (m_BugTraqProvider == NULL)
1990                 return;
1991
1992         ATL::CComBSTR parameters(m_bugtraq_association.GetParameters());
1993         ATL::CComBSTR commonRoot(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());
1994         CBstrSafeVector pathList(m_pathList.GetCount());
1995
1996         for (LONG index = 0; index < m_pathList.GetCount(); ++index)
1997                 pathList.PutElement(index, m_pathList[index].GetGitPathString());
1998
1999         ATL::CComBSTR originalMessage(sMsg);
2000         ATL::CComBSTR temp;
2001
2002         // first try the IBugTraqProvider2 interface
2003         CComPtr<IBugTraqProvider2> pProvider2 = NULL;
2004         HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);
2005         bool bugIdOutSet = false;
2006         if (SUCCEEDED(hr))
2007         {
2008                 ATL::CComBSTR repositoryRoot(g_Git.m_CurrentDir);
2009                 ATL::CComBSTR bugIDOut;
2010                 GetDlgItemText(IDC_BUGID, m_sBugID);
2011                 ATL::CComBSTR bugID(m_sBugID);
2012                 CBstrSafeVector revPropNames;
2013                 CBstrSafeVector revPropValues;
2014                 if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, bugID, &bugIDOut, &revPropNames, &revPropValues, &temp)))
2015                 {
2016                         CString sErr;
2017                         sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2018                         CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
2019                 }
2020                 else
2021                 {
2022                         if (bugIDOut)
2023                         {
2024                                 bugIdOutSet = true;
2025                                 m_sBugID = bugIDOut;
2026                                 SetDlgItemText(IDC_BUGID, m_sBugID);
2027                         }
2028                         m_cLogMessage.SetText((LPCTSTR)temp);
2029                         BSTR HUGEP *pbRevNames;
2030                         BSTR HUGEP *pbRevValues;
2031
2032                         HRESULT hr1 = SafeArrayAccessData(revPropNames, (void HUGEP**)&pbRevNames);
2033                         if (SUCCEEDED(hr1))
2034                         {
2035                                 HRESULT hr2 = SafeArrayAccessData(revPropValues, (void HUGEP**)&pbRevValues);
2036                                 if (SUCCEEDED(hr2))
2037                                 {
2038                                         if (revPropNames->rgsabound->cElements == revPropValues->rgsabound->cElements)
2039                                         {
2040                                                 for (ULONG i = 0; i < revPropNames->rgsabound->cElements; ++i)
2041                                                 {
2042 //                                                      m_revProps[pbRevNames[i]] = pbRevValues[i];
2043                                                 }
2044                                         }
2045                                         SafeArrayUnaccessData(revPropValues);
2046                                 }
2047                                 SafeArrayUnaccessData(revPropNames);
2048                         }
2049                 }
2050         }
2051         else
2052         {
2053                 // if IBugTraqProvider2 failed, try IBugTraqProvider
2054                 CComPtr<IBugTraqProvider> pProvider = NULL;
2055                 hr = m_BugTraqProvider.QueryInterface(&pProvider);
2056                 if (FAILED(hr))
2057                 {
2058                         CString sErr;
2059                         sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2060                         CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
2061                         return;
2062                 }
2063
2064                 if (FAILED(hr = pProvider->GetCommitMessage(GetSafeHwnd(), parameters, commonRoot, pathList, originalMessage, &temp)))
2065                 {
2066                         CString sErr;
2067                         sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());
2068                         CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);
2069                 }
2070                 else
2071                         m_cLogMessage.SetText((LPCTSTR)temp);
2072         }
2073         m_sLogMessage = m_cLogMessage.GetText();
2074         if (!m_ProjectProperties.sMessage.IsEmpty())
2075         {
2076                 CString sBugID = m_ProjectProperties.FindBugID(m_sLogMessage);
2077                 if (!sBugID.IsEmpty() && !bugIdOutSet)
2078                 {
2079                         SetDlgItemText(IDC_BUGID, sBugID);
2080                 }
2081         }
2082
2083         m_cLogMessage.SetFocus();
2084 }
2085
2086 void CCommitDlg::FillPatchView(bool onlySetTimer)
2087 {
2088         if(::IsWindow(this->m_patchViewdlg.m_hWnd))
2089         {
2090                 KillTimer(FILLPATCHVTIMER);
2091                 if (onlySetTimer)
2092                 {
2093                         SetTimer(FILLPATCHVTIMER, 100, NULL);
2094                         return;
2095                 }
2096
2097                 POSITION pos=m_ListCtrl.GetFirstSelectedItemPosition();
2098                 CString cmd,out;
2099
2100                 while(pos)
2101                 {
2102                         int nSelect = m_ListCtrl.GetNextSelectedItem(pos);
2103                         CTGitPath * p=(CTGitPath*)m_ListCtrl.GetItemData(nSelect);
2104                         if(p && !(p->m_Action&CTGitPath::LOGACTIONS_UNVER) )
2105                         {
2106                                 CString head = _T("HEAD");
2107                                 if(m_bCommitAmend==TRUE && m_bAmendDiffToLastCommit==FALSE)
2108                                         head = _T("HEAD~1");
2109                                 cmd.Format(_T("git.exe diff %s -- \"%s\""), head, p->GetGitPathString());
2110                                 g_Git.Run(cmd, &out, CP_UTF8);
2111                         }
2112                 }
2113
2114                 m_patchViewdlg.SetText(out);
2115         }
2116 }
2117 LRESULT CCommitDlg::OnGitStatusListCtrlItemChanged(WPARAM /*wparam*/, LPARAM /*lparam*/)
2118 {
2119         this->FillPatchView(true);
2120         return 0;
2121 }
2122
2123
2124 LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)
2125 {
2126         SendMessage(WM_UPDATEOKBUTTON);
2127         return 0;
2128 }
2129
2130 LRESULT CCommitDlg::OnCheck(WPARAM wnd, LPARAM)
2131 {
2132         HWND hwnd = (HWND)wnd;
2133         bool check = !(GetAsyncKeyState(VK_SHIFT) & 0x8000);
2134         if (hwnd == GetDlgItem(IDC_CHECKALL)->GetSafeHwnd())
2135                 m_ListCtrl.Check(GITSLC_SHOWEVERYTHING, check);
2136         else if (hwnd == GetDlgItem(IDC_CHECKNONE)->GetSafeHwnd())
2137                 m_ListCtrl.Check(GITSLC_SHOWEVERYTHING, !check);
2138         else if (hwnd == GetDlgItem(IDC_CHECKUNVERSIONED)->GetSafeHwnd())
2139                 m_ListCtrl.Check(GITSLC_SHOWUNVERSIONED, check);
2140         else if (hwnd == GetDlgItem(IDC_CHECKVERSIONED)->GetSafeHwnd())
2141                 m_ListCtrl.Check(GITSLC_SHOWVERSIONED, check);
2142         else if (hwnd == GetDlgItem(IDC_CHECKADDED)->GetSafeHwnd())
2143                 m_ListCtrl.Check(GITSLC_SHOWADDED, check);
2144         else if (hwnd == GetDlgItem(IDC_CHECKDELETED)->GetSafeHwnd())
2145                 m_ListCtrl.Check(GITSLC_SHOWREMOVED, check);
2146         else if (hwnd == GetDlgItem(IDC_CHECKMODIFIED)->GetSafeHwnd())
2147                 m_ListCtrl.Check(GITSLC_SHOWMODIFIED, check);
2148         else if (hwnd == GetDlgItem(IDC_CHECKFILES)->GetSafeHwnd())
2149                 m_ListCtrl.Check(GITSLC_SHOWFILES, check);
2150         else if (hwnd == GetDlgItem(IDC_CHECKSUBMODULES)->GetSafeHwnd())
2151                 m_ListCtrl.Check(GITSLC_SHOWSUBMODULES, check);
2152
2153         return 0;
2154 }
2155
2156 LRESULT CCommitDlg::OnUpdateOKButton(WPARAM, LPARAM)
2157 {
2158         if (m_bBlock)
2159                 return 0;
2160
2161         bool bValidLogSize = m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize && m_cLogMessage.GetText().GetLength() > 0;
2162         bool bAmendOrSelectFilesOrMerge = m_ListCtrl.GetSelected() > 0 || (m_bCommitAmend && m_bAmendDiffToLastCommit) || CTGitPath(g_Git.m_CurrentDir).IsMergeActive();
2163
2164         DialogEnableWindow(IDOK, bValidLogSize && (m_bCommitMessageOnly || bAmendOrSelectFilesOrMerge));
2165
2166         return 0;
2167 }
2168
2169 LRESULT CCommitDlg::OnUpdateDataFalse(WPARAM, LPARAM)
2170 {
2171         UpdateData(FALSE);
2172         return 0;
2173 }
2174
2175 LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
2176 {
2177         switch (message) {
2178         case WM_NOTIFY:
2179                 if (wParam == IDC_SPLITTER)
2180                 {
2181                         SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
2182                         DoSize(pHdr->delta);
2183                 }
2184                 break;
2185         }
2186
2187         return __super::DefWindowProc(message, wParam, lParam);
2188 }
2189
2190 void CCommitDlg::SetSplitterRange()
2191 {
2192         if ((m_ListCtrl)&&(m_cLogMessage))
2193         {
2194                 CRect rcTop;
2195                 m_cLogMessage.GetWindowRect(rcTop);
2196                 ScreenToClient(rcTop);
2197                 CRect rcMiddle;
2198                 m_ListCtrl.GetWindowRect(rcMiddle);
2199                 ScreenToClient(rcMiddle);
2200                 if (rcMiddle.Height() && rcMiddle.Width())
2201                         m_wndSplitter.SetRange(rcTop.top + 100, rcMiddle.bottom - 80);
2202         }
2203 }
2204
2205 void CCommitDlg::DoSize(int delta)
2206 {
2207         RemoveAnchor(IDC_MESSAGEGROUP);
2208         RemoveAnchor(IDC_LOGMESSAGE);
2209         RemoveAnchor(IDC_SPLITTER);
2210         RemoveAnchor(IDC_SIGNOFF);
2211         RemoveAnchor(IDC_COMMIT_AMEND);
2212         RemoveAnchor(IDC_COMMIT_AMENDDIFF);
2213         RemoveAnchor(IDC_COMMIT_SETDATETIME);
2214         RemoveAnchor(IDC_COMMIT_DATEPICKER);
2215         RemoveAnchor(IDC_COMMIT_TIMEPICKER);
2216         RemoveAnchor(IDC_COMMIT_SETAUTHOR);
2217         RemoveAnchor(IDC_COMMIT_AUTHORDATA);
2218         RemoveAnchor(IDC_LISTGROUP);
2219         RemoveAnchor(IDC_FILELIST);
2220         RemoveAnchor(IDC_TEXT_INFO);
2221         RemoveAnchor(IDC_SELECTLABEL);
2222         RemoveAnchor(IDC_CHECKALL);
2223         RemoveAnchor(IDC_CHECKNONE);
2224         RemoveAnchor(IDC_CHECKUNVERSIONED);
2225         RemoveAnchor(IDC_CHECKVERSIONED);
2226         RemoveAnchor(IDC_CHECKADDED);
2227         RemoveAnchor(IDC_CHECKDELETED);
2228         RemoveAnchor(IDC_CHECKMODIFIED);
2229         RemoveAnchor(IDC_CHECKFILES);
2230         RemoveAnchor(IDC_CHECKSUBMODULES);
2231
2232         CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN);
2233         CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN);
2234         CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN);
2235         CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN);
2236         CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta);
2237         CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND),0,delta);
2238         CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMENDDIFF),0,delta);
2239         CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_SETDATETIME),0,delta);
2240         CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_DATEPICKER),0,delta);
2241         CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_TIMEPICKER),0,delta);
2242         CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_SETAUTHOR), 0, delta);
2243         CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AUTHORDATA), 0, delta);
2244         CSplitterControl::ChangePos(GetDlgItem(IDC_TEXT_INFO),0,delta);
2245         CSplitterControl::ChangePos(GetDlgItem(IDC_SELECTLABEL), 0, delta);
2246         CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKALL), 0, delta);
2247         CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKNONE), 0, delta);
2248         CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKUNVERSIONED), 0, delta);
2249         CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKVERSIONED), 0, delta);
2250         CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKADDED), 0, delta);
2251         CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKDELETED), 0, delta);
2252         CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKMODIFIED), 0, delta);
2253         CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKFILES), 0, delta);
2254         CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKSUBMODULES), 0, delta);
2255
2256         AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);
2257         AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);
2258         AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);
2259         AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);
2260         AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
2261         AddAnchor(IDC_SIGNOFF,TOP_RIGHT);
2262         AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);
2263         AddAnchor(IDC_COMMIT_AMENDDIFF,TOP_LEFT);
2264         AddAnchor(IDC_COMMIT_SETDATETIME,TOP_LEFT);
2265         AddAnchor(IDC_COMMIT_DATEPICKER,TOP_LEFT);
2266         AddAnchor(IDC_COMMIT_TIMEPICKER,TOP_LEFT);
2267         AddAnchor(IDC_COMMIT_SETAUTHOR, TOP_LEFT);
2268         AddAnchor(IDC_COMMIT_AUTHORDATA, TOP_LEFT, TOP_RIGHT);
2269         AddAnchor(IDC_TEXT_INFO,TOP_RIGHT);
2270         AddAnchor(IDC_SELECTLABEL, TOP_LEFT);
2271         AddAnchor(IDC_CHECKALL, TOP_LEFT);
2272         AddAnchor(IDC_CHECKNONE, TOP_LEFT);
2273         AddAnchor(IDC_CHECKUNVERSIONED, TOP_LEFT);
2274         AddAnchor(IDC_CHECKVERSIONED, TOP_LEFT);
2275         AddAnchor(IDC_CHECKADDED, TOP_LEFT);
2276         AddAnchor(IDC_CHECKDELETED, TOP_LEFT);
2277         AddAnchor(IDC_CHECKMODIFIED, TOP_LEFT);
2278         AddAnchor(IDC_CHECKFILES, TOP_LEFT);
2279         AddAnchor(IDC_CHECKSUBMODULES, TOP_LEFT);
2280         ArrangeLayout();
2281         // adjust the minimum size of the dialog to prevent the resizing from
2282         // moving the list control too far down.
2283         CRect rcLogMsg;
2284         m_cLogMessage.GetClientRect(rcLogMsg);
2285         SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_LogMsgOrigRect.Height()+rcLogMsg.Height()));
2286
2287         SetSplitterRange();
2288         m_cLogMessage.Invalidate();
2289         GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
2290 }
2291
2292 void CCommitDlg::OnSize(UINT nType, int cx, int cy)
2293 {
2294         // first, let the resizing take place
2295         __super::OnSize(nType, cx, cy);
2296
2297         //set range
2298         SetSplitterRange();
2299 }
2300
2301 CString CCommitDlg::GetSignedOffByLine()
2302 {
2303         CString str;
2304
2305         CString username = g_Git.GetUserName();
2306         CString email = g_Git.GetUserEmail();
2307         username.Remove(_T('\n'));
2308         email.Remove(_T('\n'));
2309
2310         str.Format(_T("Signed-off-by: %s <%s>"), username, email);
2311
2312         return str;
2313 }
2314
2315 void CCommitDlg::OnBnClickedSignOff()
2316 {
2317         CString str = GetSignedOffByLine();
2318
2319         if (m_cLogMessage.GetText().Find(str) == -1) {
2320                 m_cLogMessage.SetText(m_cLogMessage.GetText().TrimRight());
2321                 int lastNewline = m_cLogMessage.GetText().ReverseFind(_T('\n'));
2322                 int foundByLine = -1;
2323                 if (lastNewline > 0)
2324                         foundByLine = m_cLogMessage.GetText().Find(_T("-by: "), lastNewline);
2325
2326                 if (foundByLine == -1 || foundByLine < lastNewline)
2327                         str = _T("\r\n") + str;
2328
2329                 m_cLogMessage.SetText(m_cLogMessage.GetText()+_T("\r\n")+str+_T("\r\n"));
2330         }
2331 }
2332
2333 void CCommitDlg::OnBnClickedCommitAmend()
2334 {
2335         this->UpdateData();
2336         if(this->m_bCommitAmend && this->m_AmendStr.IsEmpty())
2337         {
2338                 GitRev rev;
2339                 try
2340                 {
2341                         rev.GetCommit(CString(_T("HEAD")));
2342                 }
2343                 catch (const char *msg)
2344                 {
2345                         CMessageBox::Show(m_hWnd, _T("Could not get HEAD commit.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
2346                 }
2347                 m_AmendStr=rev.GetSubject()+_T("\n")+rev.GetBody();
2348         }
2349
2350         if(this->m_bCommitAmend)
2351         {
2352                 this->m_NoAmendStr=this->m_cLogMessage.GetText();
2353                 m_cLogMessage.SetText(m_AmendStr);
2354                 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_SHOW);
2355         }
2356         else
2357         {
2358                 this->m_AmendStr=this->m_cLogMessage.GetText();
2359                 m_cLogMessage.SetText(m_NoAmendStr);
2360                 GetDlgItem(IDC_COMMIT_AMENDDIFF)->ShowWindow(SW_HIDE);
2361         }
2362
2363         OnBnClickedCommitSetDateTime(); // to update the commit date and time
2364         OnBnClickedCommitSetauthor(); // to update the commit author
2365
2366         GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
2367         Refresh();
2368 }
2369
2370 void CCommitDlg::OnBnClickedCommitMessageOnly()
2371 {
2372         this->UpdateData();
2373         this->m_ListCtrl.EnableWindow(m_bCommitMessageOnly ? FALSE : TRUE);
2374         SendMessage(WM_UPDATEOKBUTTON);
2375 }
2376
2377 void CCommitDlg::OnBnClickedWholeProject()
2378 {
2379         m_tooltips.Pop();       // hide the tooltips
2380         UpdateData();
2381         m_ListCtrl.Clear();
2382         if (!m_bBlock)
2383         {
2384                 if (m_bWholeProject || m_bWholeProject2)
2385                         m_ListCtrl.GetStatus(NULL,true,false,true);
2386                 else
2387                         m_ListCtrl.GetStatus(&this->m_pathList,true,false,true);
2388
2389                 m_regShowWholeProject = m_bWholeProject;
2390
2391                 DWORD dwShow = m_ListCtrl.GetShowFlags();
2392                 if (DWORD(m_regAddBeforeCommit))
2393                         dwShow |= GITSLC_SHOWUNVERSIONED;
2394                 else
2395                         dwShow &= ~GITSLC_SHOWUNVERSIONED;
2396
2397                 m_ListCtrl.Show(dwShow, dwShow & ~(CTGitPath::LOGACTIONS_UNVER), true);
2398                 UpdateCheckLinks();
2399         }
2400
2401         SetDlgTitle();
2402 }
2403
2404 void CCommitDlg::OnFocusMessage()
2405 {
2406         m_cLogMessage.SetFocus();
2407 }
2408
2409 void CCommitDlg::OnFocusFileList()
2410 {
2411         m_ListCtrl.SetFocus();
2412 }
2413
2414 void CCommitDlg::OnScnUpdateUI(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2415 {
2416         int pos = (int)this->m_cLogMessage.Call(SCI_GETCURRENTPOS);
2417         int line = (int)this->m_cLogMessage.Call(SCI_LINEFROMPOSITION,pos);
2418         int column = (int)this->m_cLogMessage.Call(SCI_GETCOLUMN,pos);
2419
2420         CString str;
2421         str.Format(_T("%d/%d"),line+1,column+1);
2422         this->GetDlgItem(IDC_TEXT_INFO)->SetWindowText(str);
2423
2424         if(*pResult)
2425                 *pResult=0;
2426 }
2427
2428 void CCommitDlg::TogglePatchView()
2429 {
2430         OnStnClickedViewPatch();
2431 }
2432
2433 void CCommitDlg::OnStnClickedViewPatch()
2434 {
2435         m_patchViewdlg.m_pProjectProperties = &this->m_ProjectProperties;
2436         m_patchViewdlg.m_ParentDlg = this;
2437         if(!IsWindow(this->m_patchViewdlg.m_hWnd))
2438         {
2439                 BOOL viewPatchEnabled = FALSE;
2440                 viewPatchEnabled = g_Git.GetConfigValueBool(_T("tgit.commitshowpatch"));
2441                 if (viewPatchEnabled == FALSE)
2442                         g_Git.SetConfigValue(_T("tgit.commitshowpatch"), _T("true"));
2443                 m_patchViewdlg.Create(IDD_PATCH_VIEW,this);
2444                 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETSCROLLWIDTHTRACKING, TRUE);
2445                 CRect rect;
2446                 this->GetWindowRect(&rect);
2447
2448                 m_patchViewdlg.ShowWindow(SW_SHOW);
2449
2450                 m_patchViewdlg.SetWindowPos(NULL,rect.right,rect.top,rect.Width(),rect.Height(),
2451                                 SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
2452
2453                 ShowViewPatchText(false);
2454                 FillPatchView();
2455         }
2456         else
2457         {
2458                 g_Git.SetConfigValue(_T("tgit.commitshowpatch"), _T("false"));
2459                 m_patchViewdlg.ShowWindow(SW_HIDE);
2460                 m_patchViewdlg.DestroyWindow();
2461                 ShowViewPatchText(true);
2462         }
2463         this->m_ctrlShowPatch.Invalidate();
2464 }
2465
2466 void CCommitDlg::OnMoving(UINT fwSide, LPRECT pRect)
2467 {
2468         __super::OnMoving(fwSide, pRect);
2469
2470         if (::IsWindow(m_patchViewdlg.m_hWnd))
2471         {
2472                 RECT patchrect;
2473                 m_patchViewdlg.GetWindowRect(&patchrect);
2474                 if (::IsWindow(m_hWnd))
2475                 {
2476                         RECT thisrect;
2477                         GetWindowRect(&thisrect);
2478                         if (patchrect.left == thisrect.right)
2479                         {
2480                                 m_patchViewdlg.SetWindowPos(NULL, patchrect.left - (thisrect.left - pRect->left), patchrect.top - (thisrect.top - pRect->top),
2481                                         0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
2482                         }
2483                 }
2484         }
2485
2486 }
2487
2488 void CCommitDlg::OnSizing(UINT fwSide, LPRECT pRect)
2489 {
2490         __super::OnSizing(fwSide, pRect);
2491
2492         if(::IsWindow(this->m_patchViewdlg.m_hWnd))
2493         {
2494                 CRect thisrect, patchrect;
2495                 this->GetWindowRect(thisrect);
2496                 this->m_patchViewdlg.GetWindowRect(patchrect);
2497                 if(thisrect.right==patchrect.left)
2498                 {
2499                         patchrect.left -= (thisrect.right - pRect->right);
2500                         patchrect.right-= (thisrect.right - pRect->right);
2501
2502                         if(     patchrect.bottom == thisrect.bottom)
2503                         {
2504                                 patchrect.bottom -= (thisrect.bottom - pRect->bottom);
2505                         }
2506                         if(     patchrect.top == thisrect.top)
2507                         {
2508                                 patchrect.top -=  thisrect.top-pRect->top;
2509                         }
2510                         m_patchViewdlg.MoveWindow(patchrect);
2511                 }
2512         }
2513 }
2514
2515 void CCommitDlg::OnHdnItemchangedFilelist(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2516 {
2517         *pResult = 0;
2518         TRACE("Item Changed\r\n");
2519 }
2520
2521 int CCommitDlg::CheckHeadDetach()
2522 {
2523         CString output;
2524         if (CGit::GetCurrentBranchFromFile(g_Git.m_CurrentDir, output))
2525         {
2526                 int retval = CMessageBox::Show(NULL, IDS_PROC_COMMIT_DETACHEDWARNING, IDS_APPNAME, MB_YESNOCANCEL | MB_ICONWARNING);
2527                 if(retval == IDYES)
2528                 {
2529                         if (CAppUtils::CreateBranchTag(FALSE, NULL, true) == FALSE)
2530                                 return 1;
2531                 }
2532                 else if (retval == IDCANCEL)
2533                         return 1;
2534         }
2535         return 0;
2536 }
2537
2538 void CCommitDlg::OnBnClickedCommitAmenddiff()
2539 {
2540         UpdateData();
2541         Refresh();
2542 }
2543
2544 void CCommitDlg::OnBnClickedNoautoselectsubmodules()
2545 {
2546         UpdateData();
2547         Refresh();
2548 }
2549
2550 void CCommitDlg::OnBnClickedCommitSetDateTime()
2551 {
2552         UpdateData();
2553
2554         if (m_bSetCommitDateTime)
2555         {
2556                 CTime authordate = CTime::GetCurrentTime();
2557                 if (m_bCommitAmend)
2558                 {
2559                         GitRev headRevision;
2560                         try
2561                         {
2562                                 headRevision.GetCommit(_T("HEAD"));
2563                         }
2564                         catch (const char *msg)
2565                         {
2566                                 CMessageBox::Show(m_hWnd, _T("Could not get HEAD commit.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
2567                         }
2568                         authordate = headRevision.GetAuthorDate();
2569                 }
2570
2571                 m_CommitDate.SetTime(&authordate);
2572                 m_CommitTime.SetTime(&authordate);
2573
2574                 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_SHOW);
2575                 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_SHOW);
2576         }
2577         else
2578         {
2579                 GetDlgItem(IDC_COMMIT_DATEPICKER)->ShowWindow(SW_HIDE);
2580                 GetDlgItem(IDC_COMMIT_TIMEPICKER)->ShowWindow(SW_HIDE);
2581         }
2582 }
2583
2584 void CCommitDlg::OnBnClickedCheckNewBranch()
2585 {
2586         UpdateData();
2587         if (m_bCreateNewBranch)
2588         {
2589                 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_HIDE);
2590                 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_SHOW);
2591         }
2592         else
2593         {
2594                 GetDlgItem(IDC_NEWBRANCH)->ShowWindow(SW_HIDE);
2595                 GetDlgItem(IDC_COMMIT_TO)->ShowWindow(SW_SHOW);
2596         }
2597 }
2598
2599 void CCommitDlg::RestoreFiles(bool doNotAsk)
2600 {
2601         if (!m_ListCtrl.m_restorepaths.empty() && (doNotAsk || CMessageBox::Show(m_hWnd, IDS_PROC_COMMIT_RESTOREFILES, IDS_APPNAME, 2, IDI_QUESTION, IDS_PROC_COMMIT_RESTOREFILES_RESTORE, IDS_PROC_COMMIT_RESTOREFILES_KEEP) == 1))
2602         {
2603                 for (std::map<CString, CString>::iterator it = m_ListCtrl.m_restorepaths.begin(); it != m_ListCtrl.m_restorepaths.end(); ++it)
2604                         CopyFile(it->second, g_Git.CombinePath(it->first), FALSE);
2605                 m_ListCtrl.m_restorepaths.clear();
2606         }
2607 }
2608
2609 void CCommitDlg::UpdateCheckLinks()
2610 {
2611         DialogEnableWindow(IDC_CHECKALL, true);
2612         DialogEnableWindow(IDC_CHECKNONE, true);
2613         DialogEnableWindow(IDC_CHECKUNVERSIONED, m_ListCtrl.GetUnversionedCount() > 0);
2614         DialogEnableWindow(IDC_CHECKVERSIONED, m_ListCtrl.GetItemCount() > m_ListCtrl.GetUnversionedCount());
2615         DialogEnableWindow(IDC_CHECKADDED, m_ListCtrl.GetAddedCount() > 0);
2616         DialogEnableWindow(IDC_CHECKDELETED, m_ListCtrl.GetDeletedCount() > 0);
2617         DialogEnableWindow(IDC_CHECKMODIFIED, m_ListCtrl.GetModifiedCount() > 0);
2618         DialogEnableWindow(IDC_CHECKFILES, m_ListCtrl.GetFileCount() > 0);
2619         DialogEnableWindow(IDC_CHECKSUBMODULES, m_ListCtrl.GetSubmoduleCount() > 0);
2620 }
2621
2622 void CCommitDlg::OnBnClickedCommitSetauthor()
2623 {
2624         UpdateData();
2625
2626         if (m_bSetAuthor)
2627         {
2628                 m_sAuthor.Format(_T("%s <%s>"), g_Git.GetUserName(), g_Git.GetUserEmail());
2629                 if (m_bCommitAmend)
2630                 {
2631                         GitRev headRevision;
2632                         try
2633                         {
2634                                 headRevision.GetCommit(_T("HEAD"));
2635                         }
2636                         catch (const char *msg)
2637                         {
2638                                 CMessageBox::Show(m_hWnd, _T("Could not get HEAD commit.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
2639                         }
2640                         m_sAuthor.Format(_T("%s <%s>"), headRevision.GetAuthorName(), headRevision.GetAuthorEmail());
2641                 }
2642
2643                 UpdateData(FALSE);
2644
2645                 GetDlgItem(IDC_COMMIT_AUTHORDATA)->ShowWindow(SW_SHOW);
2646         }
2647         else
2648                 GetDlgItem(IDC_COMMIT_AUTHORDATA)->ShowWindow(SW_HIDE);
2649 }
2650
2651 void CCommitDlg::RunStartCommitHook()
2652 {
2653         DWORD exitcode = 0xFFFFFFFF;
2654         CString error;
2655         if (CHooks::Instance().StartCommit(g_Git.m_CurrentDir, m_pathList, m_sLogMessage, exitcode, error))
2656         {
2657                 if (exitcode)
2658                 {
2659                         CString temp;
2660                         temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
2661                         MessageBox(temp, _T("TortoiseGit"), MB_ICONERROR);
2662                         return;
2663                 }
2664         }
2665 }