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