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