1
// TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2014 - TortoiseSVN
4 // Copyright (C) 2008-2018 - TortoiseGit
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.
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.
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.
21 #include "TortoiseProc.h"
22 #include "CommitDlg.h"
23 #include "MessageBox.h"
25 #include "PathUtils.h"
27 #include "HistoryDlg.h"
29 #include "UnicodeUtils.h"
30 #include "../TGitCache/CacheInterface.h"
31 #include "ProgressDlg.h"
32 #include "ShellUpdater.h"
33 #include "Commands/PushCommand.h"
36 #include "SysProgressDlg.h"
37 #include "MassiveGitTask.h"
39 #include "BstrSafeVector.h"
40 #include "StringUtils.h"
41 #include "FileTextLines.h"
46 static char THIS_FILE
[] = __FILE__
;
49 UINT
CCommitDlg::WM_AUTOLISTREADY
= RegisterWindowMessage(L
"TORTOISEGIT_AUTOLISTREADY_MSG");
50 UINT
CCommitDlg::WM_UPDATEOKBUTTON
= RegisterWindowMessage(L
"TORTOISEGIT_COMMIT_UPDATEOKBUTTON");
51 UINT
CCommitDlg::WM_UPDATEDATAFALSE
= RegisterWindowMessage(L
"TORTOISEGIT_COMMIT_UPDATEDATAFALSE");
53 IMPLEMENT_DYNAMIC(CCommitDlg
, CResizableStandAloneDialog
)
54 CCommitDlg::CCommitDlg(CWnd
* pParent
/*=nullptr*/)
55 : CResizableStandAloneDialog(CCommitDlg::IDD
, pParent
)
56 , m_bShowUnversioned(FALSE
)
58 , m_bThreadRunning(FALSE
)
61 , m_bWholeProject(FALSE
)
62 , m_bWholeProject2(FALSE
)
63 , m_bKeepChangeList(TRUE
)
64 , m_bDoNotAutoselectSubmodules(FALSE
)
66 , m_bSelectFilesForCommit(TRUE
)
67 , m_bNoPostActions(FALSE
)
69 , m_bSetCommitDateTime(FALSE
)
70 , m_bCreateNewBranch(FALSE
)
71 , m_bForceCommitAmend(false)
72 , m_bCommitMessageOnly(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)
83 , m_bWarnDetachedHead(true)
84 , m_hAccelOkButton(nullptr)
85 , m_bDoNotStoreLastSelectedLine(true)
86 , m_bCommitAmend(FALSE
)
90 CCommitDlg::~CCommitDlg()
93 DestroyAcceleratorTable(m_hAccelOkButton
);
97 void CCommitDlg::DoDataExchange(CDataExchange
* pDX
)
99 CResizableStandAloneDialog::DoDataExchange(pDX
);
100 DDX_Control(pDX
, IDC_FILELIST
, m_ListCtrl
);
101 DDX_Control(pDX
, IDC_LOGMESSAGE
, m_cLogMessage
);
102 DDX_Check(pDX
, IDC_SHOWUNVERSIONED
, m_bShowUnversioned
);
103 DDX_Check(pDX
, IDC_COMMIT_SETDATETIME
, m_bSetCommitDateTime
);
104 DDX_Check(pDX
, IDC_CHECK_NEWBRANCH
, m_bCreateNewBranch
);
105 DDX_Text(pDX
, IDC_NEWBRANCH
, m_sCreateNewBranch
);
106 DDX_Text(pDX
, IDC_BUGID
, m_sBugID
);
107 DDX_Text(pDX
, IDC_COMMIT_AUTHORDATA
, m_sAuthor
);
108 DDX_Check(pDX
, IDC_WHOLE_PROJECT
, m_bWholeProject
);
109 DDX_Control(pDX
, IDC_SPLITTER
, m_wndSplitter
);
110 DDX_Check(pDX
, IDC_KEEPLISTS
, m_bKeepChangeList
);
111 DDX_Check(pDX
, IDC_NOAUTOSELECTSUBMODULES
, m_bDoNotAutoselectSubmodules
);
112 DDX_Check(pDX
,IDC_COMMIT_AMEND
,m_bCommitAmend
);
113 DDX_Check(pDX
, IDC_COMMIT_MESSAGEONLY
, m_bCommitMessageOnly
);
114 DDX_Check(pDX
,IDC_COMMIT_AMENDDIFF
,m_bAmendDiffToLastCommit
);
115 DDX_Check(pDX
, IDC_COMMIT_SETAUTHOR
, m_bSetAuthor
);
116 DDX_Control(pDX
,IDC_VIEW_PATCH
,m_ctrlShowPatch
);
117 DDX_Control(pDX
, IDC_COMMIT_DATEPICKER
, m_CommitDate
);
118 DDX_Control(pDX
, IDC_COMMIT_TIMEPICKER
, m_CommitTime
);
119 DDX_Control(pDX
, IDC_COMMIT_AS_COMMIT_DATE
, m_AsCommitDateCtrl
);
120 DDX_Control(pDX
, IDC_CHECKALL
, m_CheckAll
);
121 DDX_Control(pDX
, IDC_CHECKNONE
, m_CheckNone
);
122 DDX_Control(pDX
, IDC_CHECKUNVERSIONED
, m_CheckUnversioned
);
123 DDX_Control(pDX
, IDC_CHECKVERSIONED
, m_CheckVersioned
);
124 DDX_Control(pDX
, IDC_CHECKADDED
, m_CheckAdded
);
125 DDX_Control(pDX
, IDC_CHECKDELETED
, m_CheckDeleted
);
126 DDX_Control(pDX
, IDC_CHECKMODIFIED
, m_CheckModified
);
127 DDX_Control(pDX
, IDC_CHECKFILES
, m_CheckFiles
);
128 DDX_Control(pDX
, IDC_CHECKSUBMODULES
, m_CheckSubmodules
);
129 DDX_Control(pDX
, IDOK
, m_ctrlOkButton
);
132 BEGIN_MESSAGE_MAP(CCommitDlg
, CResizableStandAloneDialog
)
133 ON_BN_CLICKED(IDC_SHOWUNVERSIONED
, OnBnClickedShowunversioned
)
134 ON_NOTIFY(SCN_UPDATEUI
, IDC_LOGMESSAGE
, OnScnUpdateUI
)
135 // ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)
136 ON_BN_CLICKED(IDC_BUGTRAQBUTTON
, OnBnClickedBugtraqbutton
)
137 ON_EN_CHANGE(IDC_LOGMESSAGE
, OnEnChangeLogmessage
)
138 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
, OnGitStatusListCtrlItemCountChanged
)
139 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
, OnGitStatusListCtrlNeedsRefresh
)
140 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ADDFILE
, OnFileDropped
)
141 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_CHECKCHANGED
, &CCommitDlg::OnGitStatusListCtrlCheckChanged
)
142 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED
, &CCommitDlg::OnGitStatusListCtrlItemChanged
)
144 ON_REGISTERED_MESSAGE(CLinkControl::LK_LINKITEMCLICKED
, &CCommitDlg::OnCheck
)
145 ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY
, OnAutoListReady
)
146 ON_REGISTERED_MESSAGE(WM_UPDATEOKBUTTON
, OnUpdateOKButton
)
147 ON_REGISTERED_MESSAGE(WM_UPDATEDATAFALSE
, OnUpdateDataFalse
)
150 ON_WM_SYSCOLORCHANGE()
151 ON_STN_CLICKED(IDC_EXTERNALWARNING
, &CCommitDlg::OnStnClickedExternalwarning
)
152 ON_BN_CLICKED(IDC_SIGNOFF
, &CCommitDlg::OnBnClickedSignOff
)
153 ON_BN_CLICKED(IDC_COMMIT_AMEND
, &CCommitDlg::OnBnClickedCommitAmend
)
154 ON_BN_CLICKED(IDC_COMMIT_MESSAGEONLY
, &CCommitDlg::OnBnClickedCommitMessageOnly
)
155 ON_BN_CLICKED(IDC_WHOLE_PROJECT
, &CCommitDlg::OnBnClickedWholeProject
)
156 ON_COMMAND(ID_FOCUS_MESSAGE
,&CCommitDlg::OnFocusMessage
)
157 ON_COMMAND(ID_FOCUS_FILELIST
, OnFocusFileList
)
158 ON_STN_CLICKED(IDC_VIEW_PATCH
, &CCommitDlg::OnStnClickedViewPatch
)
162 ON_NOTIFY(HDN_ITEMCHANGED
, 0, &CCommitDlg::OnHdnItemchangedFilelist
)
163 ON_BN_CLICKED(IDC_COMMIT_AMENDDIFF
, &CCommitDlg::OnBnClickedCommitAmenddiff
)
164 ON_BN_CLICKED(IDC_NOAUTOSELECTSUBMODULES
, &CCommitDlg::OnBnClickedNoautoselectsubmodules
)
165 ON_BN_CLICKED(IDC_COMMIT_SETDATETIME
, &CCommitDlg::OnBnClickedCommitSetDateTime
)
166 ON_BN_CLICKED(IDC_COMMIT_AS_COMMIT_DATE
, &CCommitDlg::OnBnClickedCommitAsCommitDate
)
167 ON_BN_CLICKED(IDC_CHECK_NEWBRANCH
, &CCommitDlg::OnBnClickedCheckNewBranch
)
168 ON_BN_CLICKED(IDC_COMMIT_SETAUTHOR
, &CCommitDlg::OnBnClickedCommitSetauthor
)
171 int GetCommitTemplate(CString
&msg
)
173 CString tplFilename
= g_Git
.GetConfigValue(L
"commit.template");
174 if (tplFilename
.IsEmpty())
177 if (tplFilename
[0] == L
'/')
179 if (tplFilename
.GetLength() >= 3)
181 // handle "/d/TortoiseGit/tpl.txt" -> "d:/TortoiseGit/tpl.txt"
182 if (tplFilename
[2] == L
'/')
184 LPWSTR buf
= tplFilename
.GetBuffer();
187 tplFilename
.ReleaseBuffer();
192 tplFilename
.Replace(L
'/', L
'\\');
194 if (!CGit::LoadTextFile(tplFilename
, msg
))
199 BOOL
CCommitDlg::OnInitDialog()
201 CResizableStandAloneDialog::OnInitDialog();
202 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
204 if (m_sLogMessage
.IsEmpty())
206 if (!m_bForceCommitAmend
)
207 GetCommitTemplate(m_sLogMessage
);
210 GitAdminDir::GetWorktreeAdminDirPath(g_Git
.m_CurrentDir
, dotGitPath
);
211 CGit::LoadTextFile(dotGitPath
+ L
"SQUASH_MSG", m_sLogMessage
);
212 CGit::LoadTextFile(dotGitPath
+ L
"MERGE_MSG", m_sLogMessage
);
214 if (!RunStartCommitHook())
220 m_regAddBeforeCommit
= CRegDWORD(L
"Software\\TortoiseGit\\AddBeforeCommit", TRUE
);
221 m_bShowUnversioned
= m_regAddBeforeCommit
;
223 CString
regPath(g_Git
.m_CurrentDir
);
224 regPath
.Replace(L
':', L
'_');
225 m_regShowWholeProject
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\" + regPath
, FALSE
);
226 m_bWholeProject
= m_regShowWholeProject
;
228 m_History
.SetMaxHistoryItems((LONG
)CRegDWORD(L
"Software\\TortoiseGit\\MaxHistoryItems", 25));
230 m_regKeepChangelists
= CRegDWORD(L
"Software\\TortoiseGit\\KeepChangeLists", FALSE
);
231 m_bKeepChangeList
= m_regKeepChangelists
;
233 m_regDoNotAutoselectSubmodules
= CRegDWORD(L
"Software\\TortoiseGit\\DoNotAutoselectSubmodules", FALSE
);
234 m_bDoNotAutoselectSubmodules
= m_regDoNotAutoselectSubmodules
;
236 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_COMMITDLG
));
238 if (m_pathList
.IsEmpty())
239 m_bWholeProject2
= true;
241 if(this->m_pathList
.GetCount() == 1 && m_pathList
[0].IsEmpty())
242 m_bWholeProject2
= true;
247 GetDlgItem(IDC_COMMIT_AUTHORDATA
)->ShowWindow(SW_SHOW
);
249 if (m_bSetCommitDateTime
)
251 m_CommitDate
.SetTime(&m_wantCommitTime
);
252 m_CommitTime
.SetTime(&m_wantCommitTime
);
253 GetDlgItem(IDC_COMMIT_DATEPICKER
)->ShowWindow(SW_SHOW
);
254 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->ShowWindow(SW_SHOW
);
259 m_ListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
, L
"CommitDlg", (GITSLC_POPALL
^ (GITSLC_POPCOMMIT
| GITSLC_POPSAVEAS
| GITSLC_POPPREPAREDIFF
)), true, true);
260 m_ListCtrl
.SetStatLabel(GetDlgItem(IDC_STATISTICS
));
261 m_ListCtrl
.SetCancelBool(&m_bCancelled
);
262 m_ListCtrl
.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT
);
263 m_ListCtrl
.EnableFileDrop();
264 m_ListCtrl
.SetBackgroundImage(IDI_COMMIT_BKG
);
266 //this->DialogEnableWindow(IDC_COMMIT_AMEND,FALSE);
267 m_ProjectProperties
.ReadProps();
269 m_cLogMessage
.Init(m_ProjectProperties
);
270 m_cLogMessage
.SetFont(CAppUtils::GetLogFontName(), CAppUtils::GetLogFontSize());
271 m_cLogMessage
.RegisterContextMenuHandler(this);
272 std::map
<int, UINT
> icons
;
273 icons
[AUTOCOMPLETE_SPELLING
] = IDI_SPELL
;
274 icons
[AUTOCOMPLETE_FILENAME
] = IDI_FILE
;
275 icons
[AUTOCOMPLETE_PROGRAMCODE
] = IDI_CODE
;
276 icons
[AUTOCOMPLETE_SNIPPET
] = IDI_SNIPPET
;
277 m_cLogMessage
.SetIcon(icons
);
279 OnEnChangeLogmessage();
281 m_tooltips
.AddTool(IDC_EXTERNALWARNING
, IDS_COMMITDLG_EXTERNALS
);
282 m_tooltips
.AddTool(IDC_COMMIT_AMEND
,IDS_COMMIT_AMEND_TT
);
283 m_tooltips
.AddTool(IDC_MERGEACTIVE
, IDC_MERGEACTIVE_TT
);
284 m_tooltips
.AddTool(IDC_COMMIT_MESSAGEONLY
, IDS_COMMIT_MESSAGEONLY_TT
);
285 m_tooltips
.AddTool(IDC_COMMIT_AS_COMMIT_DATE
, IDS_COMMIT_AS_COMMIT_DATE_TT
);
287 CBugTraqAssociations bugtraq_associations
;
288 bugtraq_associations
.Load(m_ProjectProperties
.GetProviderUUID(), m_ProjectProperties
.sProviderParams
);
290 if (bugtraq_associations
.FindProvider(g_Git
.m_CurrentDir
, &m_bugtraq_association
))
292 GetDlgItem(IDC_BUGID
)->ShowWindow(SW_HIDE
);
293 GetDlgItem(IDC_BUGIDLABEL
)->ShowWindow(SW_HIDE
);
295 CComPtr
<IBugTraqProvider
> pProvider
;
296 HRESULT hr
= pProvider
.CoCreateInstance(m_bugtraq_association
.GetProviderClass());
299 m_BugTraqProvider
= pProvider
;
301 ATL::CComBSTR
parameters(m_bugtraq_association
.GetParameters());
302 if (SUCCEEDED(hr
= pProvider
->GetLinkText(GetSafeHwnd(), parameters
, &temp
)))
304 SetDlgItemText(IDC_BUGTRAQBUTTON
, temp
);
305 GetDlgItem(IDC_BUGTRAQBUTTON
)->EnableWindow(TRUE
);
306 GetDlgItem(IDC_BUGTRAQBUTTON
)->ShowWindow(SW_SHOW
);
310 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
312 else if (!m_ProjectProperties
.sMessage
.IsEmpty())
314 GetDlgItem(IDC_BUGID
)->ShowWindow(SW_SHOW
);
315 GetDlgItem(IDC_BUGIDLABEL
)->ShowWindow(SW_SHOW
);
316 if (!m_ProjectProperties
.sLabel
.IsEmpty())
317 SetDlgItemText(IDC_BUGIDLABEL
, m_ProjectProperties
.sLabel
);
318 GetDlgItem(IDC_BUGTRAQBUTTON
)->ShowWindow(SW_HIDE
);
319 GetDlgItem(IDC_BUGTRAQBUTTON
)->EnableWindow(FALSE
);
320 GetDlgItem(IDC_BUGID
)->SetFocus();
321 CString sBugID
= m_ProjectProperties
.GetBugIDFromLog(m_sLogMessage
);
322 if (!sBugID
.IsEmpty())
324 SetDlgItemText(IDC_BUGID
, sBugID
);
329 GetDlgItem(IDC_BUGID
)->ShowWindow(SW_HIDE
);
330 GetDlgItem(IDC_BUGIDLABEL
)->ShowWindow(SW_HIDE
);
331 GetDlgItem(IDC_BUGTRAQBUTTON
)->ShowWindow(SW_HIDE
);
332 GetDlgItem(IDC_BUGTRAQBUTTON
)->EnableWindow(FALSE
);
333 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
336 if (!m_sLogMessage
.IsEmpty())
338 m_cLogMessage
.SetText(m_sLogMessage
);
339 m_cLogMessage
.Call(SCI_SETCURRENTPOS
, 0);
340 m_cLogMessage
.Call(SCI_SETSEL
, 0, 0);
343 GetWindowText(m_sWindowTitle
);
345 AdjustControlSize(IDC_SHOWUNVERSIONED
);
346 AdjustControlSize(IDC_WHOLE_PROJECT
);
347 AdjustControlSize(IDC_CHECK_NEWBRANCH
);
348 AdjustControlSize(IDC_COMMIT_AMEND
);
349 AdjustControlSize(IDC_COMMIT_MESSAGEONLY
);
350 AdjustControlSize(IDC_COMMIT_AMENDDIFF
);
351 AdjustControlSize(IDC_COMMIT_SETDATETIME
);
352 AdjustControlSize(IDC_COMMIT_SETAUTHOR
);
353 AdjustControlSize(IDC_NOAUTOSELECTSUBMODULES
);
354 AdjustControlSize(IDC_KEEPLISTS
);
355 AdjustControlSize(IDC_COMMIT_AS_COMMIT_DATE
);
357 // line up all controls and adjust their sizes.
358 #define LINKSPACING 9
359 RECT rc
= AdjustControlSize(IDC_SELECTLABEL
);
360 rc
.right
-= 15; // AdjustControlSize() adds 20 pixels for the checkbox/radio button bitmap, but this is a label...
361 rc
= AdjustStaticSize(IDC_CHECKALL
, rc
, LINKSPACING
);
362 rc
= AdjustStaticSize(IDC_CHECKNONE
, rc
, LINKSPACING
);
363 rc
= AdjustStaticSize(IDC_CHECKUNVERSIONED
, rc
, LINKSPACING
);
364 rc
= AdjustStaticSize(IDC_CHECKVERSIONED
, rc
, LINKSPACING
);
365 rc
= AdjustStaticSize(IDC_CHECKADDED
, rc
, LINKSPACING
);
366 rc
= AdjustStaticSize(IDC_CHECKDELETED
, rc
, LINKSPACING
);
367 rc
= AdjustStaticSize(IDC_CHECKMODIFIED
, rc
, LINKSPACING
);
368 rc
= AdjustStaticSize(IDC_CHECKFILES
, rc
, LINKSPACING
);
369 rc
= AdjustStaticSize(IDC_CHECKSUBMODULES
, rc
, LINKSPACING
);
371 GetClientRect(m_DlgOrigRect
);
372 m_cLogMessage
.GetClientRect(m_LogMsgOrigRect
);
374 AddAnchor(IDC_COMMITLABEL
, TOP_LEFT
, TOP_RIGHT
);
375 AddAnchor(IDC_BUGIDLABEL
, TOP_RIGHT
);
376 AddAnchor(IDC_BUGID
, TOP_RIGHT
);
377 AddAnchor(IDC_BUGTRAQBUTTON
, TOP_RIGHT
);
378 AddAnchor(IDC_COMMIT_TO
, TOP_LEFT
, TOP_RIGHT
);
379 AddAnchor(IDC_CHECK_NEWBRANCH
, TOP_RIGHT
);
380 AddAnchor(IDC_NEWBRANCH
, TOP_LEFT
, TOP_RIGHT
);
381 AddAnchor(IDC_MESSAGEGROUP
, TOP_LEFT
, TOP_RIGHT
);
382 // AddAnchor(IDC_HISTORY, TOP_LEFT);
383 AddAnchor(IDC_LOGMESSAGE
, TOP_LEFT
, TOP_RIGHT
);
384 AddAnchor(IDC_SIGNOFF
, TOP_RIGHT
);
385 AddAnchor(IDC_VIEW_PATCH
, BOTTOM_RIGHT
);
386 AddAnchor(IDC_LISTGROUP
, TOP_LEFT
, BOTTOM_RIGHT
);
387 AddAnchor(IDC_SPLITTER
, TOP_LEFT
, TOP_RIGHT
);
388 AddAnchor(IDC_FILELIST
, TOP_LEFT
, BOTTOM_RIGHT
);
389 AddAnchor(IDC_SHOWUNVERSIONED
, BOTTOM_LEFT
);
390 AddAnchor(IDC_EXTERNALWARNING
, BOTTOM_RIGHT
);
391 AddAnchor(IDC_STATISTICS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
392 AddAnchor(IDC_TEXT_INFO
, TOP_RIGHT
);
393 AddAnchor(IDC_WHOLE_PROJECT
, BOTTOM_LEFT
);
394 AddAnchor(IDC_KEEPLISTS
, BOTTOM_LEFT
);
395 AddAnchor(IDC_NOAUTOSELECTSUBMODULES
, BOTTOM_LEFT
);
396 AddAnchor(IDOK
, BOTTOM_RIGHT
);
397 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
398 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
399 AddAnchor(IDC_MERGEACTIVE
, BOTTOM_RIGHT
);
400 AddAnchor(IDC_COMMIT_AMEND
,TOP_LEFT
);
401 AddAnchor(IDC_COMMIT_MESSAGEONLY
, BOTTOM_LEFT
);
402 AddAnchor(IDC_COMMIT_AMENDDIFF
,TOP_LEFT
);
403 AddAnchor(IDC_COMMIT_SETDATETIME
,TOP_LEFT
);
404 AddAnchor(IDC_COMMIT_DATEPICKER
,TOP_LEFT
);
405 AddAnchor(IDC_COMMIT_TIMEPICKER
,TOP_LEFT
);
406 AddAnchor(IDC_COMMIT_AS_COMMIT_DATE
, TOP_LEFT
);
407 AddAnchor(IDC_COMMIT_SETAUTHOR
, TOP_LEFT
);
408 AddAnchor(IDC_COMMIT_AUTHORDATA
, TOP_LEFT
, TOP_RIGHT
);
410 AddAnchor(IDC_SELECTLABEL
, TOP_LEFT
);
411 AddAnchor(IDC_CHECKALL
, TOP_LEFT
);
412 AddAnchor(IDC_CHECKNONE
, TOP_LEFT
);
413 AddAnchor(IDC_CHECKUNVERSIONED
, TOP_LEFT
);
414 AddAnchor(IDC_CHECKVERSIONED
, TOP_LEFT
);
415 AddAnchor(IDC_CHECKADDED
, TOP_LEFT
);
416 AddAnchor(IDC_CHECKDELETED
, TOP_LEFT
);
417 AddAnchor(IDC_CHECKMODIFIED
, TOP_LEFT
);
418 AddAnchor(IDC_CHECKFILES
, TOP_LEFT
);
419 AddAnchor(IDC_CHECKSUBMODULES
, TOP_LEFT
);
421 if (GetExplorerHWND())
422 CenterWindow(CWnd::FromHandle(GetExplorerHWND()));
423 EnableSaveRestore(L
"CommitDlg");
424 DWORD yPos
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer");
425 RECT rcDlg
, rcLogMsg
, rcFileList
;
426 GetClientRect(&rcDlg
);
427 m_cLogMessage
.GetWindowRect(&rcLogMsg
);
428 ScreenToClient(&rcLogMsg
);
429 m_ListCtrl
.GetWindowRect(&rcFileList
);
430 ScreenToClient(&rcFileList
);
434 m_wndSplitter
.GetWindowRect(&rectSplitter
);
435 ScreenToClient(&rectSplitter
);
436 int delta
= yPos
- rectSplitter
.top
;
437 if ((rcLogMsg
.bottom
+ delta
> rcLogMsg
.top
)&&(rcLogMsg
.bottom
+ delta
< rcFileList
.bottom
- 30))
439 m_wndSplitter
.SetWindowPos(nullptr, rectSplitter
.left
, yPos
, 0, 0, SWP_NOSIZE
);
447 if (m_bForceCommitAmend
|| m_bCommitAmend
)
448 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_SHOW
);
450 // add all directories to the watcher
452 for (int i=0; i<m_pathList.GetCount(); ++i)
454 if (m_pathList[i].IsDirectory())
455 m_pathwatcher.AddPath(m_pathList[i]);
459 CRegDWORD err
= CRegDWORD(L
"Software\\TortoiseGit\\ErrorOccurred", FALSE
);
460 CRegDWORD historyhint
= CRegDWORD(L
"Software\\TortoiseGit\\HistoryHintShown", FALSE
);
461 if ((((DWORD
)err
)!=FALSE
)&&((((DWORD
)historyhint
)==FALSE
)))
464 // ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);
468 this->m_ctrlShowPatch
.SetURL(CString());
470 if (g_Git
.GetConfigValueBool(L
"tgit.commitshowpatch"))
471 OnStnClickedViewPatch();
473 if (CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive())
475 DialogEnableWindow(IDC_CHECK_NEWBRANCH
, FALSE
);
476 m_bCreateNewBranch
= FALSE
;
477 GetDlgItem(IDC_MERGEACTIVE
)->ShowWindow(SW_SHOW
);
478 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_COMMIT_MERGE_HINT
, IDS_APPNAME
, MB_ICONINFORMATION
, L
"CommitMergeHint", IDS_MSGBOX_DONOTSHOWAGAIN
);
483 return FALSE
; // return TRUE unless you set the focus to a control
484 // EXCEPTION: OCX Property Pages should return FALSE
487 void CCommitDlg::PrepareOkButton()
489 if (m_bNoPostActions
)
491 m_regLastAction
= CRegDWORD(L
"Software\\TortoiseGit\\CommitLastAction", 0);
493 for (auto labelId
: { IDS_COMMIT_COMMIT
, IDS_COMMIT_RECOMMIT
, IDS_COMMIT_COMMITPUSH
})
497 label
.LoadString(labelId
);
498 m_ctrlOkButton
.AddEntry(label
);
499 TCHAR accellerator
= CStringUtils::GetAccellerator(label
);
500 if (accellerator
== L
'\0')
502 ++m_accellerators
[accellerator
].cnt
;
503 if (m_accellerators
[accellerator
].cnt
> 1)
504 m_accellerators
[accellerator
].id
= -1;
506 m_accellerators
[accellerator
].id
= i
- 1;
508 m_ctrlOkButton
.SetCurrentEntry(m_regLastAction
);
509 if (m_accellerators
.size())
511 LPACCEL lpaccelNew
= (LPACCEL
)LocalAlloc(LPTR
, m_accellerators
.size() * sizeof(ACCEL
));
514 SCOPE_EXIT
{ LocalFree(lpaccelNew
); };
516 for (auto& entry
: m_accellerators
)
518 lpaccelNew
[i
].cmd
= (WORD
)(WM_USER
+ 1 + entry
.second
.id
);
519 lpaccelNew
[i
].fVirt
= FVIRTKEY
| FALT
;
520 lpaccelNew
[i
].key
= entry
.first
;
521 entry
.second
.wmid
= lpaccelNew
[i
].cmd
;
524 m_hAccelOkButton
= CreateAcceleratorTable(lpaccelNew
, (int)m_accellerators
.size());
528 static bool UpdateIndex(CMassiveGitTask
&mgt
, CSysProgressDlg
&sysProgressDlg
, int progress
, int maxProgress
)
530 if (mgt
.IsListEmpty())
533 if (sysProgressDlg
.HasUserCancelled())
536 if (sysProgressDlg
.IsVisible())
538 sysProgressDlg
.SetTitle(IDS_APPNAME
);
539 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_PREPARECOMMIT
)));
540 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_UPDATEINDEX
)));
541 sysProgressDlg
.SetProgress(progress
, maxProgress
);
542 AfxGetThread()->PumpMessage(); // process messages, in order to avoid freezing
546 return mgt
.Execute(cancel
);
549 static void DoPush(HWND hWnd
)
552 if (g_Git
.GetCurrentBranchFromFile(g_Git
.m_CurrentDir
, head
))
554 CString remote
, remotebranch
;
555 g_Git
.GetRemotePushBranch(head
, remote
, remotebranch
);
556 if (remote
.IsEmpty() || remotebranch
.IsEmpty())
558 CAppUtils::Push(hWnd
);
562 CAppUtils::DoPush(hWnd
, CAppUtils::IsSSHPutty(), false, false, false, false, false, false, head
, remote
, remotebranch
, false, 0);
565 void CCommitDlg::OnOK()
569 if (m_bThreadRunning
)
576 auto locker(m_ListCtrl
.AcquireReadLock());
578 if (m_ListCtrl
.GetConflictedCount() != 0 && CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROGRS_CONFLICTSOCCURRED
, IDS_APPNAME
, 1, IDI_EXCLAMATION
, IDS_OKBUTTON
, IDS_IGNOREBUTTON
, 0, L
"CommitWarnOnUnresolved") == 1)
580 auto pos
= m_ListCtrl
.GetFirstSelectedItemPosition();
582 m_ListCtrl
.SetItemState(m_ListCtrl
.GetNextSelectedItem(pos
), 0, LVIS_SELECTED
);
583 int nListItems
= m_ListCtrl
.GetItemCount();
584 for (int i
= 0; i
< nListItems
; ++i
)
586 auto entry
= m_ListCtrl
.GetListEntry(i
);
587 if (entry
->m_Action
& CTGitPath::LOGACTIONS_UNMERGED
)
589 m_ListCtrl
.EnsureVisible(i
, FALSE
);
590 m_ListCtrl
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
591 m_ListCtrl
.SetFocus();
598 if (m_bCreateNewBranch
)
600 if (!g_Git
.IsBranchNameValid(m_sCreateNewBranch
))
602 ShowEditBalloon(IDC_NEWBRANCH
, IDS_B_T_NOTEMPTY
, IDS_ERR_ERROR
, TTI_ERROR
);
605 if (g_Git
.BranchTagExists(m_sCreateNewBranch
))
607 // branch already exists
609 msg
.LoadString(IDS_B_EXISTS
);
610 msg
+= L
' ' + CString(MAKEINTRESOURCE(IDS_B_DELETEORDIFFERENTNAME
));
611 ShowEditBalloon(IDC_NEWBRANCH
, msg
, CString(MAKEINTRESOURCE(IDS_WARN_WARNING
)));
614 if (g_Git
.BranchTagExists(m_sCreateNewBranch
, false))
616 // tag with the same name exists -> shortref is ambiguous
617 if (CMessageBox::Show(m_hWnd
, IDS_B_SAMETAGNAMEEXISTS
, IDS_APPNAME
, 2, IDI_EXCLAMATION
, IDS_CONTINUEBUTTON
, IDS_ABORTBUTTON
) == 2)
623 GetDlgItemText(IDC_BUGID
, id
);
624 if (!m_ProjectProperties
.CheckBugID(id
))
626 ShowEditBalloon(IDC_BUGID
, IDS_COMMITDLG_ONLYNUMBERS
, IDS_ERR_ERROR
, TTI_ERROR
);
629 m_sLogMessage
= m_cLogMessage
.GetText();
630 if ( m_sLogMessage
.IsEmpty() )
632 // no message entered, go round again
633 CMessageBox::Show(this->m_hWnd
, IDS_COMMITDLG_NOMESSAGE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
636 if ((m_ProjectProperties
.bWarnIfNoIssue
) && (id
.IsEmpty() && !m_ProjectProperties
.HasBugID(m_sLogMessage
)))
638 if (CMessageBox::Show(this->m_hWnd
, IDS_COMMITDLG_NOISSUEWARNING
, IDS_APPNAME
, MB_YESNO
| MB_ICONWARNING
)!=IDYES
)
642 if (m_ProjectProperties
.bWarnNoSignedOffBy
== TRUE
&& m_cLogMessage
.GetText().Find(GetSignedOffByLine()) == -1)
644 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
);
647 OnBnClickedSignOff();
648 m_sLogMessage
= m_cLogMessage
.GetText();
650 else if (retval
== 3)
654 if (CAppUtils::MessageContainsConflictHints(GetSafeHwnd(), m_sLogMessage
))
657 if (CHooks::Instance().IsHookPresent(pre_commit_hook
, g_Git
.m_CurrentDir
)) {
658 DWORD exitcode
= 0xFFFFFFFF;
661 m_ListCtrl
.WriteCheckedNamesToPathList(list
);
662 if (CHooks::Instance().PreCommit(g_Git
.m_CurrentDir
, list
, m_sLogMessage
, exitcode
, error
))
667 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
668 MessageBox(temp
, L
"TortoiseGit", MB_ICONERROR
);
674 int nListItems
= m_ListCtrl
.GetItemCount();
675 for (int i
= 0; i
< nListItems
&& !m_bCommitMessageOnly
; ++i
)
677 auto entry
= m_ListCtrl
.GetListEntry(i
);
678 if (!entry
->m_Checked
|| !entry
->IsDirectory())
682 if (entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
685 subgit
.m_CurrentDir
= g_Git
.CombinePath(entry
);
687 subgit
.Run(L
"git.exe status --porcelain", &subcmdout
, CP_UTF8
);
688 dirty
= !subcmdout
.IsEmpty();
693 cmd
.Format(L
"git.exe diff -- \"%s\"", entry
->GetWinPath());
694 g_Git
.Run(cmd
, &cmdout
, CP_UTF8
);
695 dirty
= CStringUtils::EndsWith(cmdout
, L
"-dirty\n");
701 message
.Format(IDS_COMMITDLG_SUBMODULEDIRTY
, (LPCTSTR
)entry
->GetGitPathString());
702 int result
= CMessageBox::Show(m_hWnd
, message
, L
"TortoiseGit", 1, IDI_QUESTION
, CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_COMMIT
)), CString(MAKEINTRESOURCE(IDS_MSGBOX_IGNORE
)), CString(MAKEINTRESOURCE(IDS_MSGBOX_CANCEL
)));
706 cmdCommit
.Format(L
"/command:commit /path:\"%s\\%s\"", (LPCTSTR
)g_Git
.m_CurrentDir
, entry
->GetWinPath());
707 CAppUtils::RunTortoiseGitProc(cmdCommit
);
710 else if (result
== 2)
717 if (!m_bCommitMessageOnly
)
718 m_ListCtrl
.WriteCheckedNamesToPathList(m_selectedPathList
);
719 m_pathwatcher
.Stop();
720 InterlockedExchange(&m_bBlock
, TRUE
);
721 //first add all the unversioned files the user selected
722 //and check if all versioned files are selected
725 CMassiveGitTask
mgtReAddAfterCommit(L
"add --ignore-errors -f");
726 CMassiveGitTask
mgtReDelAfterCommit(L
"rm --cached --ignore-unmatch");
731 bool bAddSuccess
=true;
732 bool bCloseCommitDlg
=false;
734 CSysProgressDlg sysProgressDlg
;
735 if (nListItems
>= 25)
737 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_PREPARECOMMIT
)));
738 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_UPDATEINDEX
)));
739 sysProgressDlg
.SetTime(true);
740 sysProgressDlg
.SetShowProgressBar(true);
741 sysProgressDlg
.ShowModal(this, true);
744 CBlockCacheForPath
cacheBlock(g_Git
.m_CurrentDir
);
745 ULONGLONG currentTicks
= GetTickCount64();
747 if (g_Git
.UsingLibGit2(CGit::GIT_CMD_COMMIT_UPDATE_INDEX
))
752 CAutoRepository
repository(g_Git
.GetGitRepository());
755 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not open repository."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
760 CString revRef
= L
"HEAD";
761 if (m_bCommitAmend
&& !m_bAmendDiffToLastCommit
)
763 if (CGit::GetHash(repository
, revHash
, revRef
))
765 MessageBox(g_Git
.GetLibGit2LastErr(L
"Could not get HEAD hash after committing."), L
"TortoiseGit", MB_ICONERROR
);
770 if (!revHash
.IsEmpty() && git_commit_lookup(commit
.GetPointer(), repository
, (const git_oid
*)revHash
.m_hash
))
772 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not get last commit."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
777 if (!revHash
.IsEmpty() && git_commit_tree(tree
.GetPointer(), commit
))
779 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not read tree of commit."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
784 if (git_repository_index(index
.GetPointer(), repository
))
786 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not get the repository index."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
791 if (!revHash
.IsEmpty() && (git_index_new(indexOld
.GetPointer()) || git_index_read_tree(indexOld
, tree
)))
793 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not read the tree into the index."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
799 for (int j
= 0; j
< nListItems
; ++j
)
801 auto entry
= m_ListCtrl
.GetListEntry(j
);
803 if (sysProgressDlg
.IsVisible())
805 if (GetTickCount64() - currentTicks
> 1000UL || j
== nListItems
- 1 || j
== 0)
807 sysProgressDlg
.SetLine(2, entry
->GetGitPathString(), true);
808 sysProgressDlg
.SetProgress(j
, nListItems
);
809 AfxGetThread()->PumpMessage(); // process messages, in order to avoid freezing; do not call this too often: this takes time!
810 currentTicks
= GetTickCount64();
814 CStringA filePathA
= CUnicodeUtils::GetMulti(entry
->GetGitPathString(), CP_UTF8
).TrimRight(L
'/');
816 if (entry
->m_Checked
&& !m_bCommitMessageOnly
)
818 if (entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
819 git_index_remove_bypath(index
, filePathA
); // ignore error
822 if (git_index_add_bypath(index
, filePathA
))
825 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not add \"" + entry
->GetGitPathString() + L
"\" to index."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
830 if ((entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
) && !entry
->GetGitOldPathString().IsEmpty())
831 git_index_remove_bypath(index
, CUnicodeUtils::GetUTF8(entry
->GetGitOldPathString())); // ignore error
837 if (entry
->m_Action
& CTGitPath::LOGACTIONS_ADDED
|| entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
839 git_index_remove_bypath(index
, filePathA
); // ignore error
840 mgtReAddAfterCommit
.AddFile(*entry
);
842 if (entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
&& !entry
->GetGitOldPathString().IsEmpty())
844 const git_index_entry
* oldIndexEntry
= nullptr;
845 if ((oldIndexEntry
= git_index_get_bypath(indexOld
, CUnicodeUtils::GetUTF8(entry
->GetGitOldPathString()), 0)) == nullptr || git_index_add(index
, oldIndexEntry
))
848 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not reset \"" + entry
->GetGitOldPathString() + L
"\" to old index entry."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
851 mgtReDelAfterCommit
.AddFile(entry
->GetGitOldPathString());
854 else if (!(entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
))
856 const git_index_entry
* oldIndexEntry
= nullptr;
857 if ((oldIndexEntry
= git_index_get_bypath(indexOld
, filePathA
, 0)) == nullptr || git_index_add(index
, oldIndexEntry
))
860 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not reset \"" + entry
->GetGitPathString() + L
"\" to old index entry."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
863 if (entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
&& !(entry
->m_Action
& CTGitPath::LOGACTIONS_MISSING
))
864 mgtReDelAfterCommit
.AddFile(entry
->GetGitPathString());
868 if (sysProgressDlg
.HasUserCancelled())
874 if (bAddSuccess
&& git_index_write(index
))
877 for (int j
= 0; bAddSuccess
&& j
< nListItems
; ++j
)
878 CShellUpdater::Instance().AddPathForUpdate(*m_ListCtrl
.GetListEntry(j
));
883 // ***************************************************
884 // ATTENTION: Similar code in RebaseDlg.cpp!!!
885 // ***************************************************
886 CMassiveGitTask
mgtAdd(L
"add -f");
887 CMassiveGitTask
mgtUpdateIndexForceRemove(L
"update-index --force-remove");
888 CMassiveGitTask
mgtUpdateIndex(L
"update-index");
889 CMassiveGitTask
mgtRm(L
"rm --ignore-unmatch");
890 CMassiveGitTask
mgtRmFCache(L
"rm -f --cache");
891 CString resetCmd
= L
"reset";
892 if (m_bCommitAmend
&& !m_bAmendDiffToLastCommit
)
893 resetCmd
+= L
" HEAD~1";;
894 CMassiveGitTask
mgtReset(resetCmd
, TRUE
, true);
895 for (int j
= 0; j
< nListItems
; ++j
)
897 auto entry
= m_ListCtrl
.GetListEntry(j
);
899 if (entry
->m_Checked
&& !m_bCommitMessageOnly
)
901 if ((entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
) || (entry
->IsDirectory() && !(entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)))
902 mgtAdd
.AddFile(entry
->GetGitPathString());
903 else if (entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
904 mgtUpdateIndexForceRemove
.AddFile(entry
->GetGitPathString());
906 mgtUpdateIndex
.AddFile(entry
->GetGitPathString());
908 if ((entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
) && !entry
->GetGitOldPathString().IsEmpty())
909 mgtRm
.AddFile(entry
->GetGitOldPathString());
915 if (entry
->m_Action
& CTGitPath::LOGACTIONS_ADDED
|| entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
916 { //To init git repository, there are not HEAD, so we can use git reset command
917 mgtRmFCache
.AddFile(entry
->GetGitPathString());
918 mgtReAddAfterCommit
.AddFile(*entry
);
920 if (entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
&& !entry
->GetGitOldPathString().IsEmpty())
922 mgtReset
.AddFile(entry
->GetGitOldPathString());
923 mgtReDelAfterCommit
.AddFile(entry
->GetGitOldPathString());
926 else if (!(entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
))
928 mgtReset
.AddFile(entry
->GetGitPathString());
929 if (entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
&& !(entry
->m_Action
& CTGitPath::LOGACTIONS_MISSING
))
930 mgtReDelAfterCommit
.AddFile(entry
->GetGitPathString());
934 if (sysProgressDlg
.HasUserCancelled())
941 CMassiveGitTask tasks
[] = { mgtAdd
, mgtUpdateIndexForceRemove
, mgtUpdateIndex
, mgtRm
, mgtRmFCache
, mgtReset
};
942 int progress
= 0, maxProgress
= 0;
943 for (int j
= 0; j
< _countof(tasks
); ++j
)
944 maxProgress
+= tasks
[j
].GetListCount();
945 for (int j
= 0; j
< _countof(tasks
); ++j
)
946 bAddSuccess
= bAddSuccess
&& UpdateIndex(tasks
[j
], sysProgressDlg
, progress
+= tasks
[j
].GetListCount(), maxProgress
);
948 if (sysProgressDlg
.HasUserCancelled())
951 for (int j
= 0; bAddSuccess
&& j
< nListItems
; ++j
)
952 CShellUpdater::Instance().AddPathForUpdate(*m_ListCtrl
.GetListEntry(j
));
955 if (sysProgressDlg
.HasUserCancelled())
958 sysProgressDlg
.Stop();
960 if (bAddSuccess
&& m_bCreateNewBranch
)
962 if (g_Git
.Run(L
"git.exe branch " + m_sCreateNewBranch
, &out
, CP_UTF8
))
964 MessageBox(L
"Creating new branch failed:\n" + out
, L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
967 if (g_Git
.Run(L
"git.exe checkout " + m_sCreateNewBranch
+ L
" --", &out
, CP_UTF8
))
969 MessageBox(L
"Switching to new branch failed:\n" + out
, L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
974 if (bAddSuccess
&& m_bWarnDetachedHead
&& CheckHeadDetach())
978 CString sExistingBugID
= m_ProjectProperties
.FindBugID(m_sLogMessage
);
979 sExistingBugID
.Trim();
980 if (!m_sBugID
.IsEmpty() && m_sBugID
.Compare(sExistingBugID
))
982 m_sBugID
.Replace(L
", ", L
",");
983 m_sBugID
.Replace(L
" ,", L
",");
984 CString sBugID
= m_ProjectProperties
.sMessage
;
985 sBugID
.Replace(L
"%BUGID%", m_sBugID
);
986 if (m_ProjectProperties
.bAppend
)
987 m_sLogMessage
+= L
'\n' + sBugID
+ L
'\n';
989 m_sLogMessage
= sBugID
+ L
'\n' + m_sLogMessage
;
992 // now let the bugtraq plugin check the commit message
993 CComPtr
<IBugTraqProvider2
> pProvider2
;
994 if (m_BugTraqProvider
)
996 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider2
);
1000 ATL::CComBSTR
repositoryRoot(g_Git
.m_CurrentDir
);
1001 ATL::CComBSTR
parameters(m_bugtraq_association
.GetParameters());
1002 ATL::CComBSTR
commonRoot(m_pathList
.GetCommonRoot().GetDirectory().GetWinPath());
1003 ATL::CComBSTR
commitMessage(m_sLogMessage
);
1004 CBstrSafeVector
pathList(m_selectedPathList
.GetCount());
1006 for (LONG index
= 0; index
< m_selectedPathList
.GetCount(); ++index
)
1007 pathList
.PutElement(index
, m_selectedPathList
[index
].GetGitPathString());
1009 if (FAILED(hr
= pProvider2
->CheckCommit(GetSafeHwnd(), parameters
, repositoryRoot
, commonRoot
, pathList
, commitMessage
, &temp
)))
1013 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, (LPCTSTR
)m_bugtraq_association
.GetProviderName(), ce
.GetMessageAndDescription().c_str());
1014 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_ICONERROR
);
1018 CString sError
= temp
;
1019 if (!sError
.IsEmpty())
1021 CMessageBox::Show(GetSafeHwnd(), sError
, L
"TortoiseGit", MB_ICONERROR
);
1022 InterlockedExchange(&m_bBlock
, FALSE
);
1029 if (m_bCommitMessageOnly
|| bAddSuccess
&& (nchecked
|| m_bCommitAmend
|| CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive()))
1031 bCloseCommitDlg
= true;
1033 CString tempfile
=::GetTempFile();
1035 if (CAppUtils::SaveCommitUnicodeFile(tempfile
, m_sLogMessage
))
1037 CMessageBox::Show(GetSafeHwnd(), L
"Could not save commit message", L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
1038 InterlockedExchange(&m_bBlock
, FALSE
);
1042 CTGitPath path
=g_Git
.m_CurrentDir
;
1044 BOOL IsGitSVN
= path
.GetAdminDirMask() & ITEMIS_GITSVN
;
1048 if(this->m_bCommitAmend
)
1052 if (m_bSetCommitDateTime
)
1055 m_CommitDate
.GetTime(date
);
1056 m_CommitTime
.GetTime(time
);
1057 if (m_bCommitAmend
&& m_AsCommitDateCtrl
.GetCheck())
1058 dateTime
= L
"--date=\"now\"";
1060 dateTime
.Format(L
"--date=%sT%s", (LPCTSTR
)date
.Format(L
"%Y-%m-%d"), (LPCTSTR
)time
.Format(L
"%H:%M:%S"));
1064 author
.Format(L
"--author=\"%s\"", (LPCTSTR
)m_sAuthor
);
1065 CString allowEmpty
= m_bCommitMessageOnly
? L
"--allow-empty" : L
"";
1066 // TODO: make sure notes.amend.rewrite does still work when switching to libgit2
1067 cmd
.Format(L
"git.exe commit %s %s %s %s -F \"%s\"", (LPCTSTR
)author
, (LPCTSTR
)dateTime
, (LPCTSTR
)amend
, (LPCTSTR
)allowEmpty
, (LPCTSTR
)tempfile
);
1069 CCommitProgressDlg progress
;
1070 progress
.m_bBufferAll
=true; // improve show speed when there are many file added.
1071 progress
.m_GitCmd
=cmd
;
1072 progress
.m_bShowCommand
= FALSE
; // don't show the commit command
1073 progress
.m_PreText
= out
; // show any output already generated in log window
1074 if (m_ctrlOkButton
.GetCurrentEntry() > 0)
1075 progress
.m_AutoClose
= GitProgressAutoClose::AUTOCLOSE_IF_NO_ERRORS
;
1077 progress
.m_PostCmdCallback
= [&](DWORD status
, PostCmdList
& postCmdList
)
1079 if (status
|| m_bNoPostActions
|| m_bAutoClose
)
1083 postCmdList
.emplace_back(IDI_COMMIT
, IDS_MENUSVNDCOMMIT
, [&]{ m_PostCmd
= GIT_POSTCOMMIT_CMD_DCOMMIT
; });
1085 postCmdList
.emplace_back(IDI_PUSH
, IDS_MENUPUSH
, [&]{ m_PostCmd
= GIT_POSTCOMMIT_CMD_PUSH
; });
1086 postCmdList
.emplace_back(IDI_PULL
, IDS_MENUPULL
, [&]{ m_PostCmd
= GIT_POSTCOMMIT_CMD_PULL
; });
1087 postCmdList
.emplace_back(IDI_COMMIT
, IDS_PROC_COMMIT_RECOMMIT
, [&]{ m_PostCmd
= GIT_POSTCOMMIT_CMD_RECOMMIT
; });
1088 postCmdList
.emplace_back(IDI_TAG
, IDS_MENUTAG
, [&]{ m_PostCmd
= GIT_POSTCOMMIT_CMD_CREATETAG
; });
1091 m_PostCmd
= GIT_POSTCOMMIT_CMD_NOTHING
;
1094 if (!m_bNoPostActions
)
1095 m_regLastAction
= (int)m_ctrlOkButton
.GetCurrentEntry();
1096 if (m_ctrlOkButton
.GetCurrentEntry() == 1)
1097 m_PostCmd
= GIT_POSTCOMMIT_CMD_RECOMMIT
;
1099 ::DeleteFile(tempfile
);
1101 if (m_BugTraqProvider
&& progress
.m_GitStatus
== 0)
1103 CComPtr
<IBugTraqProvider2
> pProvider
;
1104 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider
);
1107 ATL::CComBSTR
commonRoot(g_Git
.m_CurrentDir
);
1108 CBstrSafeVector
pathList(m_selectedPathList
.GetCount());
1110 for (LONG index
= 0; index
< m_selectedPathList
.GetCount(); ++index
)
1111 pathList
.PutElement(index
, m_selectedPathList
[index
].GetGitPathString());
1113 ATL::CComBSTR
logMessage(m_sLogMessage
);
1116 if (g_Git
.GetHash(hash
, L
"HEAD"))
1117 MessageBox(g_Git
.GetGitLastErr(L
"Could not get HEAD hash after committing."), L
"TortoiseGit", MB_ICONERROR
);
1118 LONG version
= g_Git
.Hash2int(hash
);
1121 if (FAILED(hr
= pProvider
->OnCommitFinished(GetSafeHwnd(),
1128 CString sErr
= temp
;
1129 if (!sErr
.IsEmpty())
1130 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
1134 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, ce
.GetSource().c_str(), ce
.GetMessageAndDescription().c_str());
1135 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
1140 RestoreFiles(progress
.m_GitStatus
== 0, false);
1141 if (((DWORD
)CRegStdDWORD(L
"Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit", TRUE
)) == TRUE
)
1143 BOOL cancel
= FALSE
;
1144 mgtReAddAfterCommit
.Execute(cancel
);
1145 mgtReDelAfterCommit
.Execute(cancel
);
1148 if (!progress
.m_GitStatus
)
1150 DWORD exitcode
= 0xFFFFFFFF;
1152 if (CHooks::Instance().PostCommit(g_Git
.m_CurrentDir
, amend
.IsEmpty(), exitcode
, error
))
1157 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
1158 MessageBox(temp
, L
"TortoiseGit", MB_ICONERROR
);
1159 bCloseCommitDlg
= false;
1164 if (progress
.m_GitStatus
|| m_PostCmd
== GIT_POSTCOMMIT_CMD_RECOMMIT
)
1166 bCloseCommitDlg
= false;
1167 if (m_PostCmd
== GIT_POSTCOMMIT_CMD_RECOMMIT
)
1169 if (!m_sLogMessage
.IsEmpty())
1171 ReloadHistoryEntries();
1172 m_History
.AddEntry(m_sLogMessage
);
1176 this->m_sLogMessage
.Empty();
1177 GetCommitTemplate(m_sLogMessage
);
1178 m_cLogMessage
.SetText(m_sLogMessage
);
1179 if (m_bCreateNewBranch
)
1181 GetDlgItem(IDC_COMMIT_TO
)->ShowWindow(SW_SHOW
);
1182 GetDlgItem(IDC_NEWBRANCH
)->ShowWindow(SW_HIDE
);
1184 m_bCreateNewBranch
= FALSE
;
1186 if (!RunStartCommitHook())
1187 bCloseCommitDlg
= true;
1190 if (!progress
.m_GitStatus
)
1193 m_bCommitAmend
= FALSE
;
1199 else if(bAddSuccess
)
1201 CMessageBox::Show(this->m_hWnd
, IDS_ERROR_NOTHING_COMMIT
, IDS_COMMIT_FINISH
, MB_OK
| MB_ICONINFORMATION
);
1202 bCloseCommitDlg
=false;
1206 m_regAddBeforeCommit
= m_bShowUnversioned
;
1207 m_regKeepChangelists
= m_bKeepChangeList
;
1208 m_regDoNotAutoselectSubmodules
= m_bDoNotAutoselectSubmodules
;
1209 if (!GetDlgItem(IDC_KEEPLISTS
)->IsWindowEnabled())
1210 m_bKeepChangeList
= FALSE
;
1211 InterlockedExchange(&m_bBlock
, FALSE
);
1213 if (!m_sLogMessage
.IsEmpty())
1215 ReloadHistoryEntries();
1216 m_History
.AddEntry(m_sLogMessage
);
1222 if (bCloseCommitDlg
)
1224 if (m_ctrlOkButton
.GetCurrentEntry() == 2)
1225 DoPush(GetSafeHwnd());
1226 CResizableStandAloneDialog::OnOK();
1228 else if (m_PostCmd
== GIT_POSTCOMMIT_CMD_RECOMMIT
)
1230 m_bDoNotStoreLastSelectedLine
= true;
1232 this->BringWindowToTop();
1235 CShellUpdater::Instance().Flush();
1238 void CCommitDlg::SaveSplitterPos()
1242 CRegDWORD
regPos(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer");
1244 m_wndSplitter
.GetWindowRect(&rectSplitter
);
1245 ScreenToClient(&rectSplitter
);
1246 regPos
= rectSplitter
.top
;
1250 UINT
CCommitDlg::StatusThreadEntry(LPVOID pVoid
)
1252 return ((CCommitDlg
*)pVoid
)->StatusThread();
1255 void CCommitDlg::ReloadHistoryEntries()
1258 reg
.Format(L
"Software\\TortoiseGit\\History\\commit%s", (LPCTSTR
)m_ListCtrl
.m_sUUID
);
1259 reg
.Replace(L
':', L
'_');
1260 m_History
.Load(reg
, L
"logmsgs");
1263 UINT
CCommitDlg::StatusThread()
1265 //get the status of all selected file/folders recursively
1266 //and show the ones which have to be committed to the user
1267 //in a list control.
1268 m_pathwatcher
.Stop();
1270 g_Git
.RefreshGitIndex();
1272 m_bCancelled
= false;
1274 DialogEnableWindow(IDOK
, false);
1275 DialogEnableWindow(IDC_SHOWUNVERSIONED
, false);
1276 DialogEnableWindow(IDC_WHOLE_PROJECT
, false);
1277 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES
, false);
1278 GetDlgItem(IDC_EXTERNALWARNING
)->ShowWindow(SW_HIDE
);
1279 DialogEnableWindow(IDC_EXTERNALWARNING
, false);
1280 DialogEnableWindow(IDC_COMMIT_AMEND
, FALSE
);
1281 DialogEnableWindow(IDC_COMMIT_AMENDDIFF
, FALSE
);
1282 // read the list of recent log entries before querying the WC for status
1283 // -> the user may select one and modify / update it while we are crawling the WC
1285 DialogEnableWindow(IDC_CHECKALL
, false);
1286 DialogEnableWindow(IDC_CHECKNONE
, false);
1287 DialogEnableWindow(IDC_CHECKUNVERSIONED
, false);
1288 DialogEnableWindow(IDC_CHECKVERSIONED
, false);
1289 DialogEnableWindow(IDC_CHECKADDED
, false);
1290 DialogEnableWindow(IDC_CHECKDELETED
, false);
1291 DialogEnableWindow(IDC_CHECKMODIFIED
, false);
1292 DialogEnableWindow(IDC_CHECKFILES
, false);
1293 DialogEnableWindow(IDC_CHECKSUBMODULES
, false);
1296 GitAdminDir::GetWorktreeAdminDirPath(g_Git
.m_CurrentDir
, dotGitPath
);
1297 if (PathFileExists(dotGitPath
+ L
"CHERRY_PICK_HEAD"))
1299 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_HIDE
);
1300 m_bCommitAmend
= FALSE
;
1301 SendMessage(WM_UPDATEDATAFALSE
);
1304 if (!m_bDoNotStoreLastSelectedLine
)
1305 m_ListCtrl
.StoreScrollPos();
1306 // Initialise the list control with the status of the files/folders below us
1309 CTGitPathList
*pList
;
1310 m_ListCtrl
.m_amend
= (m_bCommitAmend
==TRUE
|| m_bForceCommitAmend
) && (m_bAmendDiffToLastCommit
==FALSE
);
1311 m_ListCtrl
.m_bDoNotAutoselectSubmodules
= (m_bDoNotAutoselectSubmodules
== TRUE
);
1313 if(m_bWholeProject
|| m_bWholeProject2
)
1316 pList
= &m_pathList
;
1318 success
=m_ListCtrl
.GetStatus(pList
);
1320 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
1321 if(this->m_bShowUnversioned
)
1322 m_ListCtrl
.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER
,true,pList
);
1324 m_ListCtrl
.CheckIfChangelistsArePresent(false);
1326 DWORD dwShow
= GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GITSLC_SHOWINCHANGELIST
| GITSLC_SHOWDIRECTFILES
;
1327 dwShow
|= DWORD(m_regAddBeforeCommit
) ? GITSLC_SHOWUNVERSIONED
: 0;
1330 /*if (!m_checkedPathList.IsEmpty())
1331 m_ListCtrl.Show(dwShow, m_checkedPathList);
1334 DWORD dwCheck
= m_bSelectFilesForCommit
? dwShow
: 0;
1335 dwCheck
&=~(CTGitPath::LOGACTIONS_UNVER
); //don't check unversion file default.
1336 m_ListCtrl
.Show(dwShow
, dwCheck
);
1339 if (m_ListCtrl
.HasExternalsFromDifferentRepos())
1341 GetDlgItem(IDC_EXTERNALWARNING
)->ShowWindow(SW_SHOW
);
1342 DialogEnableWindow(IDC_EXTERNALWARNING
, TRUE
);
1345 SetDlgItemText(IDC_COMMIT_TO
, g_Git
.GetCurrentBranch());
1346 m_tooltips
.AddTool(GetDlgItem(IDC_STATISTICS
), m_ListCtrl
.GetStatisticsString());
1347 if (m_ListCtrl
.GetItemCount() != 0 && m_ListCtrl
.GetTopIndex() == 0 && (m_bDoNotStoreLastSelectedLine
|| CRegDWORD(L
"Software\\TortoiseGit\\RememberFileListPosition", TRUE
) != TRUE
))
1348 m_ListCtrl
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
1352 if (!m_ListCtrl
.GetLastErrorMessage().IsEmpty())
1353 m_ListCtrl
.SetEmptyString(m_ListCtrl
.GetLastErrorMessage());
1354 m_ListCtrl
.Show(dwShow
);
1356 m_bDoNotStoreLastSelectedLine
= false;
1358 if ((m_ListCtrl
.GetItemCount()==0)&&(m_ListCtrl
.HasUnversionedItems())
1359 && !PathFileExists(dotGitPath
+ L
"MERGE_HEAD"))
1362 temp
.LoadString(IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED
);
1363 if (CMessageBox::ShowCheck(GetSafeHwnd(), temp
, L
"TortoiseGit", MB_ICONINFORMATION
| MB_YESNO
, L
"NothingToCommitShowUnversioned", nullptr) == IDYES
)
1365 m_bShowUnversioned
= TRUE
;
1366 GetDlgItem(IDC_SHOWUNVERSIONED
)->SendMessage(BM_SETCHECK
, BST_CHECKED
);
1367 dwShow
= (DWORD
)(GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GITSLC_SHOWUNVERSIONED
);
1368 m_ListCtrl
.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER
);
1369 m_ListCtrl
.Show(dwShow
,dwShow
&(~CTGitPath::LOGACTIONS_UNVER
));
1375 // we don't have to block the commit dialog while we fetch the
1376 // auto completion list.
1377 m_pathwatcher
.ClearChangedPaths();
1378 InterlockedExchange(&m_bBlock
, FALSE
);
1379 std::map
<CString
, int> autolist
;
1380 if ((DWORD
)CRegDWORD(L
"Software\\TortoiseGit\\Autocompletion", TRUE
) == TRUE
)
1382 m_ListCtrl
.BusyCursor(true);
1383 GetAutocompletionList(autolist
);
1384 m_ListCtrl
.BusyCursor(false);
1386 SendMessage(WM_UPDATEOKBUTTON
);
1387 m_ListCtrl
.Invalidate();
1390 DialogEnableWindow(IDC_SHOWUNVERSIONED
, true);
1391 DialogEnableWindow(IDC_WHOLE_PROJECT
, !m_bWholeProject2
);
1392 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES
, true);
1393 if (m_ListCtrl
.HasChangeLists())
1394 DialogEnableWindow(IDC_KEEPLISTS
, true);
1396 // activate amend checkbox (if necessary)
1397 if (g_Git
.IsInitRepos())
1399 m_bCommitAmend
= FALSE
;
1400 SendMessage(WM_UPDATEDATAFALSE
);
1404 if (m_bForceCommitAmend
)
1406 m_bCommitAmend
= TRUE
;
1407 SendMessage(WM_UPDATEDATAFALSE
);
1410 GetDlgItem(IDC_COMMIT_AMEND
)->EnableWindow(!PathFileExists(dotGitPath
+ L
"CHERRY_PICK_HEAD"));
1413 if (g_Git
.GetHash(hash
, L
"HEAD"))
1415 MessageBox(g_Git
.GetGitLastErr(L
"Could not get HEAD hash."), L
"TortoiseGit", MB_ICONERROR
);
1417 if (!hash
.IsEmpty())
1419 GitRev headRevision
;
1420 if (headRevision
.GetParentFromHash(hash
))
1421 MessageBox(headRevision
.GetLastErr(), L
"TortoiseGit", MB_ICONERROR
);
1422 // do not allow to show diff to "last" revision if it has more that one parent
1423 if (headRevision
.ParentsCount() != 1)
1425 m_bAmendDiffToLastCommit
= TRUE
;
1426 SendMessage(WM_UPDATEDATAFALSE
);
1429 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->EnableWindow(TRUE
);
1435 // we have the list, now signal the main thread about it
1436 SendMessage(WM_AUTOLISTREADY
, 0, (LPARAM
)&autolist
); // only send the message if the thread wasn't told to quit!
1439 InterlockedExchange(&m_bRunThread
, FALSE
);
1440 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1441 // force the cursor to normal
1447 void CCommitDlg::SetDlgTitle()
1449 if (m_sTitle
.IsEmpty())
1450 GetWindowText(m_sTitle
);
1452 if (m_bWholeProject
|| m_bWholeProject2
)
1453 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
1456 if (m_pathList
.GetCount() == 1)
1457 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.CombinePath(m_pathList
[0].GetUIPathString()), m_sTitle
);
1459 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.CombinePath(m_ListCtrl
.GetCommonDirectory(false)), m_sTitle
);
1463 void CCommitDlg::OnCancel()
1467 m_sLogMessage
= m_cLogMessage
.GetText();
1468 if (!m_sBugID
.IsEmpty())
1470 m_sBugID
.Replace(L
", ", L
",");
1471 m_sBugID
.Replace(L
" ,", L
",");
1472 CString sBugID
= m_ProjectProperties
.sMessage
;
1473 sBugID
.Replace(L
"%BUGID%", m_sBugID
);
1474 if (m_ProjectProperties
.bAppend
)
1475 m_sLogMessage
+= L
'\n' + sBugID
+ L
'\n';
1477 m_sLogMessage
= sBugID
+ L
'\n' + m_sLogMessage
;
1480 bool hasChangedMessage
= (m_sLogTemplate
.Compare(m_sLogMessage
) != 0) && !m_sLogMessage
.IsEmpty();
1483 tmp
.LoadString(IDS_REALLYCANCEL
);
1484 tmp
.AppendChar(L
'\n');
1485 tmp
.AppendChar(L
'\n');
1486 tmp
.Append(CString(MAKEINTRESOURCE(IDS_HINTLASTMESSAGES
)));
1487 CString dontaskagain
;
1488 dontaskagain
.LoadString(IDS_MSGBOX_DONOTSHOWAGAIN
);
1489 BOOL dontaskagainchecked
= FALSE
;
1490 if ((hasChangedMessage
|| m_ListCtrl
.GetItemCount() > 0) && CMessageBox::ShowCheck(GetSafeHwnd(), tmp
, L
"TortoiseGit", MB_ICONQUESTION
| MB_DEFBUTTON2
| MB_YESNO
, L
"CommitAskBeforeCancel", dontaskagain
, &dontaskagainchecked
) == IDNO
)
1492 if (dontaskagainchecked
)
1493 CMessageBox::SetRegistryValue(L
"CommitAskBeforeCancel", IDYES
);
1497 m_bCancelled
= true;
1498 m_pathwatcher
.Stop();
1500 if (m_bThreadRunning
)
1502 if (!RestoreFiles())
1504 if (hasChangedMessage
)
1506 ReloadHistoryEntries();
1507 m_History
.AddEntry(m_sLogMessage
);
1511 CResizableStandAloneDialog::OnCancel();
1514 BOOL
CCommitDlg::PreTranslateMessage(MSG
* pMsg
)
1518 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1522 if (m_hAccelOkButton
&& GetDlgItem(IDOK
)->IsWindowEnabled() && TranslateAccelerator(m_hWnd
, m_hAccelOkButton
, pMsg
))
1525 if (pMsg
->message
== WM_KEYDOWN
)
1527 switch (pMsg
->wParam
)
1532 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
1538 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
1540 if ( GetDlgItem(IDOK
)->IsWindowEnabled() )
1541 PostMessage(WM_COMMAND
, IDOK
);
1544 if ( GetFocus()==GetDlgItem(IDC_BUGID
) )
1546 // Pressing RETURN in the bug id control
1547 // moves the focus to the message
1548 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
1556 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
1559 void CCommitDlg::Refresh()
1561 if (m_bThreadRunning
)
1564 StartStatusThread();
1567 void CCommitDlg::StartStatusThread()
1569 if (InterlockedExchange(&m_bBlock
, TRUE
) != FALSE
)
1573 m_pThread
= nullptr;
1575 m_pThread
= AfxBeginThread(StatusThreadEntry
, this, THREAD_PRIORITY_NORMAL
, 0, CREATE_SUSPENDED
);
1578 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
1579 InterlockedExchange(&m_bBlock
, FALSE
);
1582 InterlockedExchange(&m_bThreadRunning
, TRUE
);// so the main thread knows that this thread is still running
1583 InterlockedExchange(&m_bRunThread
, TRUE
); // if this is set to FALSE, the thread should stop
1584 m_pThread
->m_bAutoDelete
= FALSE
;
1585 m_pThread
->ResumeThread();
1588 void CCommitDlg::StopStatusThread()
1590 InterlockedExchange(&m_bRunThread
, FALSE
);
1591 WaitForSingleObject(m_pThread
->m_hThread
, 5000);
1592 if (!m_bThreadRunning
)
1595 // we gave the thread a chance to quit. Since the thread didn't
1596 // listen to us we have to kill it.
1597 g_Git
.KillRelatedThreads(m_pThread
);
1598 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1601 void CCommitDlg::OnBnClickedShowunversioned()
1603 m_tooltips
.Pop(); // hide the tooltips
1605 m_regAddBeforeCommit
= m_bShowUnversioned
;
1608 DWORD dwShow
= m_ListCtrl
.GetShowFlags();
1609 if (DWORD(m_regAddBeforeCommit
))
1610 dwShow
|= GITSLC_SHOWUNVERSIONED
;
1612 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
1613 if(dwShow
& GITSLC_SHOWUNVERSIONED
)
1615 if (m_bWholeProject
|| m_bWholeProject2
)
1616 m_ListCtrl
.GetStatus(nullptr, false, false, true);
1618 m_ListCtrl
.GetStatus(&this->m_pathList
,false,false,true);
1620 m_ListCtrl
.StoreScrollPos();
1621 m_ListCtrl
.Show(dwShow
, 0, true, dwShow
& ~(CTGitPath::LOGACTIONS_UNVER
), true);
1626 void CCommitDlg::OnStnClickedExternalwarning()
1631 void CCommitDlg::OnEnChangeLogmessage()
1633 SendMessage(WM_UPDATEOKBUTTON
);
1636 LRESULT
CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM
, LPARAM
)
1639 if ((m_ListCtrl
.GetItemCount() == 0)&&(m_ListCtrl
.HasUnversionedItems())&&(!m_bShowUnversioned
))
1641 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED
, IDS_APPNAME
, MB_ICONINFORMATION
| MB_YESNO
)==IDYES
)
1643 m_bShowUnversioned
= TRUE
;
1644 DWORD dwShow
= GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GitSLC_SHOWUNVERSIONED
;
1645 m_ListCtrl
.Show(dwShow
);
1653 LRESULT
CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
1659 LRESULT
CCommitDlg::OnFileDropped(WPARAM
, LPARAM lParam
)
1662 SetForegroundWindow();
1664 // if multiple files/folders are dropped
1665 // this handler is called for every single item
1667 // To avoid creating multiple refresh threads and
1668 // causing crashes, we only add the items to the
1669 // list control and start a timer.
1670 // When the timer expires, we start the refresh thread,
1671 // but only if it isn't already running - otherwise we
1672 // restart the timer.
1674 path
.SetFromWin((LPCTSTR
)lParam
);
1676 // check whether the dropped file belongs to the very same repository
1678 if (!path
.HasAdminDir(&projectDir
) || !CPathUtils::ArePathStringsEqual(g_Git
.m_CurrentDir
, projectDir
))
1681 // just add all the items we get here.
1682 // if the item is versioned, the add will fail but nothing
1683 // more will happen.
1685 cmd
.Format(L
"git.exe add -- \"%s\"", (LPCTSTR
)path
.GetWinPathString());
1686 g_Git
.Run(cmd
, nullptr, CP_UTF8
);
1688 if (!m_ListCtrl
.HasPath(path
))
1690 if (m_pathList
.AreAllPathsFiles())
1692 m_pathList
.AddPath(path
);
1693 m_pathList
.RemoveDuplicates();
1697 // if the path list contains folders, we have to check whether
1698 // our just (maybe) added path is a child of one of those. If it is
1699 // a child of a folder already in the list, we must not add it. Otherwise
1700 // that path could show up twice in the list.
1701 bool bHasParentInList
= false;
1702 for (int i
=0; i
<m_pathList
.GetCount(); ++i
)
1704 if (m_pathList
[i
].IsAncestorOf(path
))
1706 bHasParentInList
= true;
1710 if (!bHasParentInList
)
1712 m_pathList
.AddPath(path
);
1713 m_pathList
.RemoveDuplicates();
1717 m_ListCtrl
.ResetChecked(path
);
1719 // Always start the timer, since the status of an existing item might have changed
1720 SetTimer(REFRESHTIMER
, 200, nullptr);
1721 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__
) L
": Item %s dropped, timer started\n", path
.GetWinPath());
1725 LRESULT
CCommitDlg::OnAutoListReady(WPARAM
, LPARAM lparam
)
1727 m_cLogMessage
.SetAutoCompletionList(std::move(*reinterpret_cast<std::map
<CString
, int>*>(lparam
)), '*');
1731 //////////////////////////////////////////////////////////////////////////
1732 // functions which run in the status thread
1733 //////////////////////////////////////////////////////////////////////////
1735 void CCommitDlg::ParseRegexFile(const CString
& sFile
, std::map
<CString
, CString
>& mapRegex
)
1740 CStdioFile
file(sFile
, CFile::typeText
| CFile::modeRead
| CFile::shareDenyWrite
);
1741 while (m_bRunThread
&& file
.ReadString(strLine
))
1743 if (strLine
.IsEmpty())
1745 if (strLine
[0] == L
'#')
1747 int eqpos
= strLine
.Find('=');
1749 rgx
= strLine
.Mid(eqpos
+1).Trim();
1752 while (((pos
= strLine
.Find(','))>=0)&&(pos
< eqpos
))
1754 mapRegex
[strLine
.Left(pos
)] = rgx
;
1755 strLine
= strLine
.Mid(pos
+1).Trim();
1757 mapRegex
[strLine
.Left(strLine
.Find('=')).Trim()] = rgx
;
1761 catch (CFileException
* pE
)
1763 CTraceToOutputDebugString::Instance()(__FUNCTION__
": CFileException loading auto list regex file\n");
1768 void CCommitDlg::ParseSnippetFile(const CString
& sFile
, std::map
<CString
, CString
>& mapSnippet
)
1773 CStdioFile
file(sFile
, CFile::typeText
| CFile::modeRead
| CFile::shareDenyWrite
);
1774 while (m_bRunThread
&& file
.ReadString(strLine
))
1776 if (strLine
.IsEmpty())
1778 if (strLine
[0] == L
'#') // comment char
1780 int eqpos
= strLine
.Find(L
'=');
1783 CString key
= strLine
.Left(eqpos
);
1784 auto rawvalue
= strLine
.GetBuffer() + eqpos
+ 1;
1786 bool isEscaped
= false;
1787 for (int i
= 0, len
= strLine
.GetLength() - eqpos
- 1; i
< len
; ++i
)
1789 wchar_t c
= rawvalue
[i
];
1794 case L
't': c
= L
'\t'; break;
1795 case L
'n': c
= L
'\n'; break;
1796 case L
'r': c
= L
'\r'; break;
1797 case L
'\\': c
= L
'\\'; break;
1798 default: value
+= rawvalue
[i
- 1]; break; // i is known to be > 0
1803 else if (c
== L
'\\')
1808 mapSnippet
[key
] = value
;
1812 catch (CFileException
* pE
)
1814 CTraceToOutputDebugString::Instance()(__FUNCTION__
": CFileException loading auto list regex file\n");
1819 void CCommitDlg::GetAutocompletionList(std::map
<CString
, int>& autolist
)
1821 // the auto completion list is made of strings from each selected files.
1822 // the strings used are extracted from the files with regexes found
1823 // in the file "autolist.txt".
1824 // the format of that file is:
1825 // file extensions separated with commas '=' regular expression to use
1827 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
1828 // .cpp = (?<=[^\s]::)\b\w+\b
1830 std::map
<CString
, CString
> mapRegex
;
1831 CString sRegexFile
= CPathUtils::GetAppDirectory();
1832 CRegDWORD regtimeout
= CRegDWORD(L
"Software\\TortoiseGit\\AutocompleteParseTimeout", 5);
1833 ULONGLONG timeoutvalue
= ULONGLONG(DWORD(regtimeout
)) * 1000UL;;
1834 sRegexFile
+= L
"autolist.txt";
1837 ParseRegexFile(sRegexFile
, mapRegex
);
1838 sRegexFile
= CPathUtils::GetAppDataDirectory();
1839 sRegexFile
+= L
"autolist.txt";
1840 if (PathFileExists(sRegexFile
))
1841 ParseRegexFile(sRegexFile
, mapRegex
);
1844 CString sSnippetFile
= CPathUtils::GetAppDirectory();
1845 sSnippetFile
+= L
"snippet.txt";
1846 ParseSnippetFile(sSnippetFile
, m_snippet
);
1847 sSnippetFile
= CPathUtils::GetAppDataDirectory();
1848 sSnippetFile
+= L
"snippet.txt";
1849 if (PathFileExists(sSnippetFile
))
1850 ParseSnippetFile(sSnippetFile
, m_snippet
);
1851 for (const auto& snip
: m_snippet
)
1852 autolist
.emplace(snip
.first
, AUTOCOMPLETE_SNIPPET
);
1854 ULONGLONG starttime
= GetTickCount64();
1856 // now we have two arrays of strings, where the first array contains all
1857 // file extensions we can use and the second the corresponding regex strings
1858 // to apply to those files.
1860 // the next step is to go over all files shown in the commit dialog
1861 // and scan them for strings we can use
1862 int nListItems
= m_ListCtrl
.GetItemCount();
1864 for (int i
=0; i
<nListItems
&& m_bRunThread
; ++i
)
1866 // stop parsing after timeout
1867 if ((!m_bRunThread
) || (GetTickCount64() - starttime
> timeoutvalue
))
1875 auto locker(m_ListCtrl
.AcquireReadLock());
1876 auto path
= m_ListCtrl
.GetListEntry(i
);
1881 sWinPath
= path
->GetWinPathString();
1882 sPartPath
= path
->GetGitPathString();
1883 sExt
= path
->GetFileExtension();
1884 action
= path
->m_Action
;
1886 autolist
.emplace(sPartPath
, AUTOCOMPLETE_FILENAME
);
1890 while ((pos
= sPartPath
.Find('/', pos
)) >= 0)
1894 autolist
.emplace(sPartPath
.Mid(pos
), AUTOCOMPLETE_FILENAME
);
1897 // Last inserted entry is a file name.
1898 // Some users prefer to also list file name without extension.
1899 if (CRegDWORD(L
"Software\\TortoiseGit\\AutocompleteRemovesExtensions", FALSE
))
1901 int dotPos
= sPartPath
.ReverseFind('.');
1902 if ((dotPos
>= 0) && (dotPos
> lastPos
))
1903 autolist
.emplace(sPartPath
.Mid(lastPos
, dotPos
- lastPos
), AUTOCOMPLETE_FILENAME
);
1906 if (action
== CTGitPath::LOGACTIONS_UNVER
&& !CRegDWORD(L
"Software\\TortoiseGit\\AutocompleteParseUnversioned", FALSE
))
1908 if (action
== CTGitPath::LOGACTIONS_IGNORE
)
1912 // find the regex string which corresponds to the file extension
1913 CString rdata
= mapRegex
[sExt
];
1914 if (rdata
.IsEmpty())
1917 ScanFile(autolist
, sWinPath
, rdata
, sExt
);
1919 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__
) L
": Auto completion list loaded in %I64u msec\n", GetTickCount64() - starttime
);
1922 void CCommitDlg::ScanFile(std::map
<CString
, int>& autolist
, const CString
& sFilePath
, const CString
& sRegex
, const CString
& sExt
)
1924 static std::map
<CString
, std::wregex
> regexmap
;
1926 std::wstring sFileContent
;
1927 CAutoFile hFile
= CreateFile(sFilePath
, GENERIC_READ
, FILE_SHARE_READ
, nullptr, OPEN_EXISTING
, FILE_ATTRIBUTE_NORMAL
, nullptr);
1930 DWORD size
= GetFileSize(hFile
, nullptr);
1931 if (size
> CRegDWORD(L
"Software\\TortoiseGit\\AutocompleteParseMaxSize", 300000L))
1933 // no files bigger than 300k
1936 // allocate memory to hold file contents
1940 oFile
.SetLength(size
);
1942 catch (CMemoryException
*)
1947 if (!ReadFile(hFile
, oFile
, size
, &readbytes
, nullptr))
1949 oFile
.SetLength(readbytes
);
1950 CFileTextLines filetextlines
;
1951 CFileTextLines::UnicodeType type
= filetextlines
.CheckUnicodeType(oFile
, readbytes
);
1954 CBaseFilter
* pFilter
= nullptr;
1957 case CFileTextLines::BINARY
:
1959 case CFileTextLines::UTF8
:
1960 case CFileTextLines::UTF8BOM
:
1961 pFilter
= new CUtf8Filter(NULL
);
1964 case CFileTextLines::ASCII
:
1965 pFilter
= new CAsciiFilter(NULL
);
1967 case CFileTextLines::UTF16_BE
:
1968 case CFileTextLines::UTF16_BEBOM
:
1969 pFilter
= new CUtf16beFilter(NULL
);
1971 case CFileTextLines::UTF16_LE
:
1972 case CFileTextLines::UTF16_LEBOM
:
1973 pFilter
= new CUtf16leFilter(NULL
);
1975 case CFileTextLines::UTF32_BE
:
1976 pFilter
= new CUtf32beFilter(NULL
);
1978 case CFileTextLines::UTF32_LE
:
1979 pFilter
= new CUtf32leFilter(NULL
);
1982 pFilter
->Decode(oFile
);
1985 catch (CMemoryException
*)
1989 sFileContent
= std::wstring((wchar_t*)oFile
, oFile
.GetLength() / sizeof(wchar_t));
1991 if (sFileContent
.empty() || !m_bRunThread
)
1996 std::wregex regCheck
;
1997 std::map
<CString
, std::wregex
>::const_iterator regIt
;
1998 if ((regIt
= regexmap
.find(sExt
)) != regexmap
.end())
1999 regCheck
= regIt
->second
;
2002 regCheck
= std::wregex(sRegex
, std::regex_constants::icase
| std::regex_constants::ECMAScript
);
2003 regexmap
[sExt
] = regCheck
;
2005 const std::wsregex_iterator end
;
2006 for (std::wsregex_iterator
it(sFileContent
.cbegin(), sFileContent
.cend(), regCheck
); it
!= end
; ++it
)
2008 const std::wsmatch match
= *it
;
2009 for (size_t i
= 1; i
< match
.size(); ++i
)
2011 if (match
[i
].second
-match
[i
].first
)
2012 autolist
.emplace(std::wstring(match
[i
]).c_str(), AUTOCOMPLETE_PROGRAMCODE
);
2016 catch (std::exception
&) {}
2019 // CSciEditContextMenuInterface
2020 void CCommitDlg::InsertMenuItems(CMenu
& mPopup
, int& nCmd
)
2022 CString sMenuItemText
;
2023 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITHASH
);
2024 m_nPopupPickCommitHash
= nCmd
++;
2025 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPickCommitHash
, sMenuItemText
);
2027 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITMESSAGE
);
2028 m_nPopupPickCommitMessage
= nCmd
++;
2029 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPickCommitMessage
, sMenuItemText
);
2031 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_PASTEFILELIST
);
2032 m_nPopupPasteListCmd
= nCmd
++;
2033 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPasteListCmd
, sMenuItemText
);
2035 ReloadHistoryEntries();
2036 if (!m_History
.IsEmpty())
2038 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE
);
2039 m_nPopupPasteLastMessage
= nCmd
++;
2040 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPasteLastMessage
, sMenuItemText
);
2042 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY
);
2043 m_nPopupRecentMessage
= nCmd
++;
2044 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupRecentMessage
, sMenuItemText
);
2048 bool CCommitDlg::HandleMenuItemClick(int cmd
, CSciEdit
* pSciEdit
)
2050 if (cmd
== m_nPopupPickCommitHash
)
2052 // use the git log to allow selection of a version
2054 // tell the dialog to use mode for selecting revisions
2055 dlg
.SetSelect(true);
2056 // only one revision must be selected however
2057 dlg
.SingleSelection(true);
2058 dlg
.ShowWorkingTreeChanges(false);
2059 if (dlg
.DoModal() == IDOK
&& !dlg
.GetSelectedHash().empty())
2060 pSciEdit
->InsertText(dlg
.GetSelectedHash().at(0).ToString());
2064 if (cmd
== m_nPopupPickCommitMessage
)
2066 // use the git log to allow selection of a version
2068 // tell the dialog to use mode for selecting revisions
2069 dlg
.SetSelect(true);
2070 // only one revision must be selected however
2071 dlg
.SingleSelection(true);
2072 dlg
.ShowWorkingTreeChanges(false);
2073 if (dlg
.DoModal() == IDOK
&& !dlg
.GetSelectedHash().empty())
2076 if (rev
.GetCommit(dlg
.GetSelectedHash().at(0).ToString()))
2078 MessageBox(rev
.GetLastErr(), L
"TortoiseGit", MB_ICONERROR
);
2081 CString message
= rev
.GetSubject() + L
"\r\n" + rev
.GetBody();
2082 pSciEdit
->InsertText(message
);
2087 if (cmd
== m_nPopupPasteListCmd
)
2090 auto locker(m_ListCtrl
.AcquireReadLock());
2091 int nListItems
= m_ListCtrl
.GetItemCount();
2092 for (int i
=0; i
<nListItems
; ++i
)
2094 auto entry
= m_ListCtrl
.GetListEntry(i
);
2095 if (entry
&&entry
->m_Checked
)
2097 CString status
= entry
->GetActionName();
2098 if(entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
2099 status
= L
"Add"; // I18N TODO
2101 //git_wc_status_kind status = entry->status;
2102 WORD langID
= (WORD
)CRegStdDWORD(L
"Software\\TortoiseGit\\LanguageID", GetUserDefaultLangID());
2103 if (m_ProjectProperties
.bFileListInEnglish
)
2106 logmsg
.AppendFormat(L
"%-10s %s\r\n", (LPCTSTR
)status
, (LPCTSTR
)m_ListCtrl
.GetItemText(i
, 0));
2109 pSciEdit
->InsertText(logmsg
);
2113 if(cmd
== m_nPopupPasteLastMessage
)
2115 if (m_History
.IsEmpty())
2119 logmsg
+=m_History
.GetEntry(0);
2120 pSciEdit
->InsertText(logmsg
);
2124 if(cmd
== m_nPopupRecentMessage
)
2126 OnBnClickedHistory();
2132 void CCommitDlg::HandleSnippet(int type
, const CString
&text
, CSciEdit
*pSciEdit
)
2134 if (type
== AUTOCOMPLETE_SNIPPET
)
2136 CString target
= m_snippet
[text
];
2137 pSciEdit
->GetWordUnderCursor(true);
2138 pSciEdit
->InsertText(target
, false);
2142 void CCommitDlg::OnTimer(UINT_PTR nIDEvent
)
2146 case ENDDIALOGTIMER
:
2147 KillTimer(ENDDIALOGTIMER
);
2151 if (m_bThreadRunning
)
2153 SetTimer(REFRESHTIMER
, 200, nullptr);
2154 CTraceToOutputDebugString::Instance()(__FUNCTION__
": Wait some more before refreshing\n");
2158 KillTimer(REFRESHTIMER
);
2159 CTraceToOutputDebugString::Instance()(__FUNCTION__
": Refreshing after items dropped\n");
2163 case FILLPATCHVTIMER
:
2167 __super::OnTimer(nIDEvent
);
2170 void CCommitDlg::OnBnClickedHistory()
2172 m_tooltips
.Pop(); // hide the tooltips
2173 if (m_pathList
.IsEmpty())
2176 CHistoryDlg historyDlg
;
2177 ReloadHistoryEntries();
2178 historyDlg
.SetHistory(m_History
);
2179 if (historyDlg
.DoModal() != IDOK
)
2182 CString sMsg
= historyDlg
.GetSelectedText();
2183 if (sMsg
!= m_cLogMessage
.GetText().Left(sMsg
.GetLength()))
2185 CString sBugID
= m_ProjectProperties
.FindBugID(sMsg
);
2186 if ((!sBugID
.IsEmpty()) && ((GetDlgItem(IDC_BUGID
)->IsWindowVisible())))
2187 SetDlgItemText(IDC_BUGID
, sBugID
);
2188 if (m_sLogTemplate
.Compare(m_cLogMessage
.GetText()) != 0)
2189 m_cLogMessage
.InsertText(sMsg
, !m_cLogMessage
.GetText().IsEmpty());
2191 m_cLogMessage
.SetText(sMsg
);
2194 SendMessage(WM_UPDATEOKBUTTON
);
2195 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
2198 void CCommitDlg::OnBnClickedBugtraqbutton()
2200 m_tooltips
.Pop(); // hide the tooltips
2201 CString sMsg
= m_cLogMessage
.GetText();
2203 if (!m_BugTraqProvider
)
2206 ATL::CComBSTR
parameters(m_bugtraq_association
.GetParameters());
2207 ATL::CComBSTR
commonRoot(m_pathList
.GetCommonRoot().GetDirectory().GetWinPath());
2208 CBstrSafeVector
pathList(m_pathList
.GetCount());
2210 for (LONG index
= 0; index
< m_pathList
.GetCount(); ++index
)
2211 pathList
.PutElement(index
, m_pathList
[index
].GetGitPathString());
2213 ATL::CComBSTR
originalMessage(sMsg
);
2216 // first try the IBugTraqProvider2 interface
2217 CComPtr
<IBugTraqProvider2
> pProvider2
;
2218 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider2
);
2219 bool bugIdOutSet
= false;
2222 ATL::CComBSTR
repositoryRoot(g_Git
.m_CurrentDir
);
2223 ATL::CComBSTR bugIDOut
;
2224 GetDlgItemText(IDC_BUGID
, m_sBugID
);
2225 ATL::CComBSTR
bugID(m_sBugID
);
2226 CBstrSafeVector revPropNames
;
2227 CBstrSafeVector revPropValues
;
2228 if (FAILED(hr
= pProvider2
->GetCommitMessage2(GetSafeHwnd(), parameters
, repositoryRoot
, commonRoot
, pathList
, originalMessage
, bugID
, &bugIDOut
, &revPropNames
, &revPropValues
, &temp
)))
2231 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, (LPCTSTR
)m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
2232 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_ICONERROR
);
2239 m_sBugID
= bugIDOut
;
2240 SetDlgItemText(IDC_BUGID
, m_sBugID
);
2242 m_cLogMessage
.SetText((LPCTSTR
)temp
);
2247 // if IBugTraqProvider2 failed, try IBugTraqProvider
2248 CComPtr
<IBugTraqProvider
> pProvider
;
2249 hr
= m_BugTraqProvider
.QueryInterface(&pProvider
);
2253 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, (LPCTSTR
)m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
2254 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_ICONERROR
);
2258 if (FAILED(hr
= pProvider
->GetCommitMessage(GetSafeHwnd(), parameters
, commonRoot
, pathList
, originalMessage
, &temp
)))
2261 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, (LPCTSTR
)m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
2262 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_ICONERROR
);
2265 m_cLogMessage
.SetText((LPCTSTR
)temp
);
2267 m_sLogMessage
= m_cLogMessage
.GetText();
2268 if (!m_ProjectProperties
.sMessage
.IsEmpty())
2270 CString sBugID
= m_ProjectProperties
.FindBugID(m_sLogMessage
);
2271 if (!sBugID
.IsEmpty() && !bugIdOutSet
)
2272 SetDlgItemText(IDC_BUGID
, sBugID
);
2275 m_cLogMessage
.SetFocus();
2278 void CCommitDlg::FillPatchView(bool onlySetTimer
)
2280 if(::IsWindow(this->m_patchViewdlg
.m_hWnd
))
2282 KillTimer(FILLPATCHVTIMER
);
2285 SetTimer(FILLPATCHVTIMER
, 100, nullptr);
2289 auto locker(m_ListCtrl
.AcquireReadWeakLock(50));
2290 if (!locker
.IsAcquired())
2292 SetTimer(FILLPATCHVTIMER
, 100, nullptr);
2295 POSITION pos
=m_ListCtrl
.GetFirstSelectedItemPosition();
2300 int nSelect
= m_ListCtrl
.GetNextSelectedItem(pos
);
2301 auto p
= m_ListCtrl
.GetListEntry(nSelect
);
2302 if(p
&& !(p
->m_Action
&CTGitPath::LOGACTIONS_UNVER
) )
2304 CString head
= L
"HEAD";
2305 if(m_bCommitAmend
==TRUE
&& m_bAmendDiffToLastCommit
==FALSE
)
2307 cmd
.Format(L
"git.exe diff %s -- \"%s\"", (LPCTSTR
)head
, (LPCTSTR
)p
->GetGitPathString());
2308 g_Git
.Run(cmd
, &out
, CP_UTF8
);
2312 m_patchViewdlg
.SetText(out
);
2315 LRESULT
CCommitDlg::OnGitStatusListCtrlItemChanged(WPARAM
/*wparam*/, LPARAM
/*lparam*/)
2317 this->FillPatchView(true);
2322 LRESULT
CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM
, LPARAM
)
2324 SendMessage(WM_UPDATEOKBUTTON
);
2328 LRESULT
CCommitDlg::OnCheck(WPARAM wnd
, LPARAM
)
2330 HWND hwnd
= (HWND
)wnd
;
2331 bool check
= !(GetAsyncKeyState(VK_SHIFT
) & 0x8000);
2332 if (hwnd
== GetDlgItem(IDC_CHECKALL
)->GetSafeHwnd())
2333 m_ListCtrl
.Check(GITSLC_SHOWEVERYTHING
, check
);
2334 else if (hwnd
== GetDlgItem(IDC_CHECKNONE
)->GetSafeHwnd())
2335 m_ListCtrl
.Check(GITSLC_SHOWEVERYTHING
, !check
);
2336 else if (hwnd
== GetDlgItem(IDC_CHECKUNVERSIONED
)->GetSafeHwnd())
2337 m_ListCtrl
.Check(GITSLC_SHOWUNVERSIONED
, check
);
2338 else if (hwnd
== GetDlgItem(IDC_CHECKVERSIONED
)->GetSafeHwnd())
2339 m_ListCtrl
.Check(GITSLC_SHOWVERSIONED
, check
);
2340 else if (hwnd
== GetDlgItem(IDC_CHECKADDED
)->GetSafeHwnd())
2341 m_ListCtrl
.Check(GITSLC_SHOWADDED
, check
);
2342 else if (hwnd
== GetDlgItem(IDC_CHECKDELETED
)->GetSafeHwnd())
2343 m_ListCtrl
.Check(GITSLC_SHOWREMOVED
, check
);
2344 else if (hwnd
== GetDlgItem(IDC_CHECKMODIFIED
)->GetSafeHwnd())
2345 m_ListCtrl
.Check(GITSLC_SHOWMODIFIED
, check
);
2346 else if (hwnd
== GetDlgItem(IDC_CHECKFILES
)->GetSafeHwnd())
2347 m_ListCtrl
.Check(GITSLC_SHOWFILES
, check
);
2348 else if (hwnd
== GetDlgItem(IDC_CHECKSUBMODULES
)->GetSafeHwnd())
2349 m_ListCtrl
.Check(GITSLC_SHOWSUBMODULES
, check
);
2354 LRESULT
CCommitDlg::OnUpdateOKButton(WPARAM
, LPARAM
)
2359 CString text
= m_cLogMessage
.GetText().Trim();
2360 bool bValidLogSize
= !text
.IsEmpty() && text
.GetLength() >= m_ProjectProperties
.nMinLogSize
;
2361 bool bAmendOrSelectFilesOrMerge
= m_ListCtrl
.GetSelected() > 0 || (m_bCommitAmend
&& m_bAmendDiffToLastCommit
) || CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive();
2363 DialogEnableWindow(IDOK
, bValidLogSize
&& (m_bCommitMessageOnly
|| bAmendOrSelectFilesOrMerge
));
2368 LRESULT
CCommitDlg::OnUpdateDataFalse(WPARAM
, LPARAM
)
2374 LRESULT
CCommitDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
2378 if (wParam
== IDC_SPLITTER
)
2380 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
2381 DoSize(pHdr
->delta
);
2385 if (m_hAccelOkButton
&& LOWORD(wParam
) >= WM_USER
&& LOWORD(wParam
) <= WM_USER
+ m_accellerators
.size())
2387 for (const auto& entry
: m_accellerators
)
2389 if (entry
.second
.wmid
!= LOWORD(wParam
))
2391 if (entry
.second
.id
== -1)
2392 m_ctrlOkButton
.PostMessage(WM_KEYDOWN
, VK_F4
, NULL
);
2395 m_ctrlOkButton
.SetCurrentEntry(entry
.second
.id
);
2404 return __super::DefWindowProc(message
, wParam
, lParam
);
2407 void CCommitDlg::SetSplitterRange()
2409 if ((m_ListCtrl
)&&(m_cLogMessage
))
2412 m_cLogMessage
.GetWindowRect(rcTop
);
2413 ScreenToClient(rcTop
);
2415 m_ListCtrl
.GetWindowRect(rcMiddle
);
2416 ScreenToClient(rcMiddle
);
2417 if (rcMiddle
.Height() && rcMiddle
.Width())
2418 m_wndSplitter
.SetRange(rcTop
.top
+ 100, rcMiddle
.bottom
- 80);
2422 void CCommitDlg::DoSize(int delta
)
2424 RemoveAnchor(IDC_MESSAGEGROUP
);
2425 RemoveAnchor(IDC_LOGMESSAGE
);
2426 RemoveAnchor(IDC_SPLITTER
);
2427 RemoveAnchor(IDC_SIGNOFF
);
2428 RemoveAnchor(IDC_COMMIT_AMEND
);
2429 RemoveAnchor(IDC_COMMIT_AMENDDIFF
);
2430 RemoveAnchor(IDC_COMMIT_SETDATETIME
);
2431 RemoveAnchor(IDC_COMMIT_DATEPICKER
);
2432 RemoveAnchor(IDC_COMMIT_TIMEPICKER
);
2433 RemoveAnchor(IDC_COMMIT_AS_COMMIT_DATE
);
2434 RemoveAnchor(IDC_COMMIT_SETAUTHOR
);
2435 RemoveAnchor(IDC_COMMIT_AUTHORDATA
);
2436 RemoveAnchor(IDC_LISTGROUP
);
2437 RemoveAnchor(IDC_FILELIST
);
2438 RemoveAnchor(IDC_TEXT_INFO
);
2439 RemoveAnchor(IDC_SELECTLABEL
);
2440 RemoveAnchor(IDC_CHECKALL
);
2441 RemoveAnchor(IDC_CHECKNONE
);
2442 RemoveAnchor(IDC_CHECKUNVERSIONED
);
2443 RemoveAnchor(IDC_CHECKVERSIONED
);
2444 RemoveAnchor(IDC_CHECKADDED
);
2445 RemoveAnchor(IDC_CHECKDELETED
);
2446 RemoveAnchor(IDC_CHECKMODIFIED
);
2447 RemoveAnchor(IDC_CHECKFILES
);
2448 RemoveAnchor(IDC_CHECKSUBMODULES
);
2450 auto hdwp
= BeginDeferWindowPos(24);
2451 CSplitterControl::ChangeRect(hdwp
, &m_cLogMessage
, 0, 0, 0, delta
);
2452 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_MESSAGEGROUP
), 0, 0, 0, delta
);
2453 CSplitterControl::ChangeRect(hdwp
, &m_ListCtrl
, 0, delta
, 0, 0);
2454 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_LISTGROUP
), 0, delta
, 0, 0);
2455 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_SIGNOFF
), 0, delta
, 0, delta
);
2456 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_AMEND
), 0, delta
, 0, delta
);
2457 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_AMENDDIFF
), 0, delta
, 0, delta
);
2458 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_SETDATETIME
), 0, delta
, 0, delta
);
2459 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_DATEPICKER
), 0, delta
, 0, delta
);
2460 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_TIMEPICKER
), 0, delta
, 0, delta
);
2461 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_AS_COMMIT_DATE
), 0, delta
, 0, delta
);
2462 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_SETAUTHOR
), 0, delta
, 0, delta
);
2463 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_AUTHORDATA
), 0, delta
, 0, delta
);
2464 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_TEXT_INFO
), 0, delta
, 0, delta
);
2465 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_SELECTLABEL
), 0, delta
, 0, delta
);
2466 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKALL
), 0, delta
, 0, delta
);
2467 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKNONE
), 0, delta
, 0, delta
);
2468 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKUNVERSIONED
), 0, delta
, 0, delta
);
2469 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKVERSIONED
), 0, delta
, 0, delta
);
2470 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKADDED
), 0, delta
, 0, delta
);
2471 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKDELETED
), 0, delta
, 0, delta
);
2472 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKMODIFIED
), 0, delta
, 0, delta
);
2473 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKFILES
), 0, delta
, 0, delta
);
2474 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKSUBMODULES
), 0, delta
, 0, delta
);
2475 EndDeferWindowPos(hdwp
);
2477 AddAnchor(IDC_MESSAGEGROUP
, TOP_LEFT
, TOP_RIGHT
);
2478 AddAnchor(IDC_LOGMESSAGE
, TOP_LEFT
, TOP_RIGHT
);
2479 AddAnchor(IDC_SPLITTER
, TOP_LEFT
, TOP_RIGHT
);
2480 AddAnchor(IDC_LISTGROUP
, TOP_LEFT
, BOTTOM_RIGHT
);
2481 AddAnchor(IDC_FILELIST
, TOP_LEFT
, BOTTOM_RIGHT
);
2482 AddAnchor(IDC_SIGNOFF
,TOP_RIGHT
);
2483 AddAnchor(IDC_COMMIT_AMEND
,TOP_LEFT
);
2484 AddAnchor(IDC_COMMIT_AMENDDIFF
,TOP_LEFT
);
2485 AddAnchor(IDC_COMMIT_SETDATETIME
,TOP_LEFT
);
2486 AddAnchor(IDC_COMMIT_DATEPICKER
,TOP_LEFT
);
2487 AddAnchor(IDC_COMMIT_TIMEPICKER
,TOP_LEFT
);
2488 AddAnchor(IDC_COMMIT_AS_COMMIT_DATE
, TOP_LEFT
);
2489 AddAnchor(IDC_COMMIT_SETAUTHOR
, TOP_LEFT
);
2490 AddAnchor(IDC_COMMIT_AUTHORDATA
, TOP_LEFT
, TOP_RIGHT
);
2491 AddAnchor(IDC_TEXT_INFO
,TOP_RIGHT
);
2492 AddAnchor(IDC_SELECTLABEL
, TOP_LEFT
);
2493 AddAnchor(IDC_CHECKALL
, TOP_LEFT
);
2494 AddAnchor(IDC_CHECKNONE
, TOP_LEFT
);
2495 AddAnchor(IDC_CHECKUNVERSIONED
, TOP_LEFT
);
2496 AddAnchor(IDC_CHECKVERSIONED
, TOP_LEFT
);
2497 AddAnchor(IDC_CHECKADDED
, TOP_LEFT
);
2498 AddAnchor(IDC_CHECKDELETED
, TOP_LEFT
);
2499 AddAnchor(IDC_CHECKMODIFIED
, TOP_LEFT
);
2500 AddAnchor(IDC_CHECKFILES
, TOP_LEFT
);
2501 AddAnchor(IDC_CHECKSUBMODULES
, TOP_LEFT
);
2503 // adjust the minimum size of the dialog to prevent the resizing from
2504 // moving the list control too far down.
2506 m_cLogMessage
.GetClientRect(rcLogMsg
);
2507 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(), m_DlgOrigRect
.Height()-m_LogMsgOrigRect
.Height()+rcLogMsg
.Height()));
2510 m_cLogMessage
.Invalidate();
2511 GetDlgItem(IDC_LOGMESSAGE
)->Invalidate();
2514 void CCommitDlg::OnSize(UINT nType
, int cx
, int cy
)
2516 // first, let the resizing take place
2517 __super::OnSize(nType
, cx
, cy
);
2523 CString
CCommitDlg::GetSignedOffByLine()
2527 CString username
= g_Git
.GetUserName();
2528 CString email
= g_Git
.GetUserEmail();
2529 username
.Remove(L
'\n');
2530 email
.Remove(L
'\n');
2532 str
.Format(L
"Signed-off-by: %s <%s>", (LPCTSTR
)username
, (LPCTSTR
)email
);
2537 void CCommitDlg::OnBnClickedSignOff()
2539 CString str
= GetSignedOffByLine();
2541 if (m_cLogMessage
.GetText().Find(str
) == -1) {
2542 m_cLogMessage
.SetText(m_cLogMessage
.GetText().TrimRight());
2543 int lastNewline
= m_cLogMessage
.GetText().ReverseFind(L
'\n');
2544 int foundByLine
= -1;
2545 if (lastNewline
> 0)
2546 foundByLine
= m_cLogMessage
.GetText().Find(L
"-by: ", lastNewline
);
2548 if (foundByLine
== -1 || foundByLine
< lastNewline
)
2549 str
= L
"\r\n" + str
;
2551 m_cLogMessage
.SetText(m_cLogMessage
.GetText() + L
"\r\n" + str
+ L
"\r\n");
2555 void CCommitDlg::OnBnClickedCommitAmend()
2558 if(this->m_bCommitAmend
&& this->m_AmendStr
.IsEmpty())
2561 if (rev
.GetCommit(L
"HEAD"))
2562 MessageBox(rev
.GetLastErr(), L
"TortoiseGit", MB_ICONERROR
);
2563 m_AmendStr
= rev
.GetSubject() + L
'\n' + rev
.GetBody();
2566 if(this->m_bCommitAmend
)
2568 this->m_NoAmendStr
=this->m_cLogMessage
.GetText();
2569 m_cLogMessage
.SetText(m_AmendStr
);
2570 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_SHOW
);
2571 if (m_bSetCommitDateTime
)
2572 m_AsCommitDateCtrl
.ShowWindow(SW_SHOW
);
2576 this->m_AmendStr
=this->m_cLogMessage
.GetText();
2577 m_cLogMessage
.SetText(m_NoAmendStr
);
2578 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_HIDE
);
2579 m_AsCommitDateCtrl
.ShowWindow(SW_HIDE
);
2580 m_AsCommitDateCtrl
.SetCheck(FALSE
);
2581 OnBnClickedCommitAsCommitDate();
2584 OnBnClickedCommitSetDateTime(); // to update the commit date and time
2585 OnBnClickedCommitSetauthor(); // to update the commit author
2587 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
2591 void CCommitDlg::OnBnClickedCommitMessageOnly()
2594 this->m_ListCtrl
.EnableWindow(m_bCommitMessageOnly
? FALSE
: TRUE
);
2595 SendMessage(WM_UPDATEOKBUTTON
);
2598 void CCommitDlg::OnBnClickedWholeProject()
2600 m_tooltips
.Pop(); // hide the tooltips
2605 if (m_bWholeProject
|| m_bWholeProject2
)
2606 m_ListCtrl
.GetStatus(nullptr, true, false, true);
2608 m_ListCtrl
.GetStatus(&this->m_pathList
,true,false,true);
2610 m_regShowWholeProject
= m_bWholeProject
;
2612 DWORD dwShow
= m_ListCtrl
.GetShowFlags();
2613 if (DWORD(m_regAddBeforeCommit
))
2614 dwShow
|= GITSLC_SHOWUNVERSIONED
;
2616 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
2618 m_ListCtrl
.StoreScrollPos();
2619 m_ListCtrl
.Show(dwShow
, dwShow
& ~(CTGitPath::LOGACTIONS_UNVER
), true);
2626 void CCommitDlg::OnFocusMessage()
2628 m_cLogMessage
.SetFocus();
2631 void CCommitDlg::OnFocusFileList()
2633 m_ListCtrl
.SetFocus();
2636 void CCommitDlg::OnScnUpdateUI(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2638 auto pos
= (Sci_Position
)m_cLogMessage
.Call(SCI_GETCURRENTPOS
);
2639 auto line
= (int)m_cLogMessage
.Call(SCI_LINEFROMPOSITION
, pos
);
2640 auto column
= (int)m_cLogMessage
.Call(SCI_GETCOLUMN
, pos
);
2643 str
.Format(L
"%d/%d", line
+ 1, column
+ 1);
2644 this->GetDlgItem(IDC_TEXT_INFO
)->SetWindowText(str
);
2650 void CCommitDlg::TogglePatchView()
2652 OnStnClickedViewPatch();
2655 void CCommitDlg::OnStnClickedViewPatch()
2657 m_patchViewdlg
.m_ParentDlg
= this;
2658 if(!IsWindow(this->m_patchViewdlg
.m_hWnd
))
2660 BOOL viewPatchEnabled
= FALSE
;
2661 viewPatchEnabled
= g_Git
.GetConfigValueBool(L
"tgit.commitshowpatch");
2662 if (viewPatchEnabled
== FALSE
)
2663 g_Git
.SetConfigValue(L
"tgit.commitshowpatch", L
"true");
2664 m_patchViewdlg
.Create(IDD_PATCH_VIEW
,this);
2665 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTHTRACKING
, TRUE
);
2667 this->GetWindowRect(&rect
);
2669 m_patchViewdlg
.ShowWindow(SW_SHOW
);
2671 m_patchViewdlg
.SetWindowPos(nullptr, rect
.right
, rect
.top
, (DWORD
)CRegStdDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\PatchDlgWidth", rect
.Width()), rect
.Height(),
2672 SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOZORDER
);
2674 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
2676 ShowViewPatchText(false);
2681 g_Git
.SetConfigValue(L
"tgit.commitshowpatch", L
"false");
2682 m_patchViewdlg
.ShowWindow(SW_HIDE
);
2683 m_patchViewdlg
.DestroyWindow();
2684 ShowViewPatchText(true);
2686 this->m_ctrlShowPatch
.Invalidate();
2689 void CCommitDlg::OnMoving(UINT fwSide
, LPRECT pRect
)
2691 __super::OnMoving(fwSide
, pRect
);
2693 if (::IsWindow(m_patchViewdlg
.m_hWnd
))
2696 m_patchViewdlg
.GetWindowRect(&patchrect
);
2697 if (::IsWindow(m_hWnd
))
2700 GetWindowRect(&thisrect
);
2701 if (patchrect
.left
== thisrect
.right
)
2703 m_patchViewdlg
.SetWindowPos(nullptr, patchrect
.left
- (thisrect
.left
- pRect
->left
), patchrect
.top
- (thisrect
.top
- pRect
->top
),
2704 0, 0, SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOSIZE
| SWP_NOZORDER
);
2710 void CCommitDlg::OnSizing(UINT fwSide
, LPRECT pRect
)
2712 __super::OnSizing(fwSide
, pRect
);
2714 if(::IsWindow(this->m_patchViewdlg
.m_hWnd
))
2716 CRect thisrect
, patchrect
;
2717 this->GetWindowRect(thisrect
);
2718 this->m_patchViewdlg
.GetWindowRect(patchrect
);
2719 if(thisrect
.right
==patchrect
.left
)
2721 patchrect
.left
-= (thisrect
.right
- pRect
->right
);
2722 patchrect
.right
-= (thisrect
.right
- pRect
->right
);
2724 if( patchrect
.bottom
== thisrect
.bottom
)
2725 patchrect
.bottom
-= (thisrect
.bottom
- pRect
->bottom
);
2726 if( patchrect
.top
== thisrect
.top
)
2727 patchrect
.top
-= thisrect
.top
-pRect
->top
;
2728 m_patchViewdlg
.MoveWindow(patchrect
);
2733 void CCommitDlg::OnHdnItemchangedFilelist(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2736 TRACE("Item Changed\r\n");
2739 int CCommitDlg::CheckHeadDetach()
2742 if (CGit::GetCurrentBranchFromFile(g_Git
.m_CurrentDir
, output
))
2744 int retval
= CMessageBox::Show(GetSafeHwnd(), IDS_PROC_COMMIT_DETACHEDWARNING
, IDS_APPNAME
, MB_YESNOCANCEL
| MB_ICONWARNING
);
2747 if (CAppUtils::CreateBranchTag(GetSafeHwnd(), FALSE
, nullptr, true) == FALSE
)
2750 else if (retval
== IDCANCEL
)
2756 void CCommitDlg::OnBnClickedCommitAmenddiff()
2762 void CCommitDlg::OnBnClickedNoautoselectsubmodules()
2768 void CCommitDlg::OnBnClickedCommitSetDateTime()
2772 if (m_bSetCommitDateTime
)
2774 CTime authordate
= CTime::GetCurrentTime();
2777 GitRev headRevision
;
2778 if (headRevision
.GetCommit(L
"HEAD"))
2779 MessageBox(headRevision
.GetLastErr(), L
"TortoiseGit", MB_ICONERROR
);
2780 authordate
= headRevision
.GetAuthorDate();
2781 m_AsCommitDateCtrl
.ShowWindow(SW_SHOW
);
2784 m_CommitDate
.SetTime(&authordate
);
2785 m_CommitTime
.SetTime(&authordate
);
2787 GetDlgItem(IDC_COMMIT_DATEPICKER
)->ShowWindow(SW_SHOW
);
2788 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->ShowWindow(SW_SHOW
);
2792 GetDlgItem(IDC_COMMIT_DATEPICKER
)->ShowWindow(SW_HIDE
);
2793 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->ShowWindow(SW_HIDE
);
2794 m_AsCommitDateCtrl
.ShowWindow(SW_HIDE
);
2795 m_AsCommitDateCtrl
.SetCheck(FALSE
);
2796 OnBnClickedCommitAsCommitDate();
2800 void CCommitDlg::OnBnClickedCommitAsCommitDate()
2802 GetDlgItem(IDC_COMMIT_DATEPICKER
)->EnableWindow(!m_AsCommitDateCtrl
.GetCheck());
2803 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->EnableWindow(!m_AsCommitDateCtrl
.GetCheck());
2806 void CCommitDlg::OnBnClickedCheckNewBranch()
2809 if (m_bCreateNewBranch
)
2811 GetDlgItem(IDC_COMMIT_TO
)->ShowWindow(SW_HIDE
);
2812 GetDlgItem(IDC_NEWBRANCH
)->ShowWindow(SW_SHOW
);
2816 GetDlgItem(IDC_NEWBRANCH
)->ShowWindow(SW_HIDE
);
2817 GetDlgItem(IDC_COMMIT_TO
)->ShowWindow(SW_SHOW
);
2821 bool CCommitDlg::RestoreFiles(bool doNotAsk
, bool allowCancel
)
2823 if (m_ListCtrl
.m_restorepaths
.empty())
2828 auto ret
= CMessageBox::Show(m_hWnd
, IDS_PROC_COMMIT_RESTOREFILES
, IDS_APPNAME
, 2, IDI_QUESTION
, IDS_PROC_COMMIT_RESTOREFILES_RESTORE
, IDS_PROC_COMMIT_RESTOREFILES_KEEP
, allowCancel
? IDS_MSGBOX_CANCEL
: 0);
2835 for (const auto& item
: m_ListCtrl
.m_restorepaths
)
2836 CopyFile(item
.second
, g_Git
.CombinePath(item
.first
), FALSE
);
2837 m_ListCtrl
.m_restorepaths
.clear();
2842 void CCommitDlg::UpdateCheckLinks()
2844 DialogEnableWindow(IDC_CHECKALL
, true);
2845 DialogEnableWindow(IDC_CHECKNONE
, true);
2846 DialogEnableWindow(IDC_CHECKUNVERSIONED
, m_ListCtrl
.GetUnversionedCount() > 0);
2847 DialogEnableWindow(IDC_CHECKVERSIONED
, m_ListCtrl
.GetItemCount() > m_ListCtrl
.GetUnversionedCount());
2848 DialogEnableWindow(IDC_CHECKADDED
, m_ListCtrl
.GetAddedCount() > 0);
2849 DialogEnableWindow(IDC_CHECKDELETED
, m_ListCtrl
.GetDeletedCount() > 0);
2850 DialogEnableWindow(IDC_CHECKMODIFIED
, m_ListCtrl
.GetModifiedCount() > 0);
2851 DialogEnableWindow(IDC_CHECKFILES
, m_ListCtrl
.GetFileCount() > 0);
2852 DialogEnableWindow(IDC_CHECKSUBMODULES
, m_ListCtrl
.GetSubmoduleCount() > 0);
2855 void CCommitDlg::OnBnClickedCommitSetauthor()
2861 m_sAuthor
.Format(L
"%s <%s>", (LPCTSTR
)g_Git
.GetUserName(), (LPCTSTR
)g_Git
.GetUserEmail());
2864 GitRev headRevision
;
2865 if (headRevision
.GetCommit(L
"HEAD"))
2866 MessageBox(headRevision
.GetLastErr(), L
"TortoiseGit", MB_ICONERROR
);
2867 m_sAuthor
.Format(L
"%s <%s>", (LPCTSTR
)headRevision
.GetAuthorName(), (LPCTSTR
)headRevision
.GetAuthorEmail());
2872 GetDlgItem(IDC_COMMIT_AUTHORDATA
)->ShowWindow(SW_SHOW
);
2875 GetDlgItem(IDC_COMMIT_AUTHORDATA
)->ShowWindow(SW_HIDE
);
2878 bool CCommitDlg::RunStartCommitHook()
2880 DWORD exitcode
= 0xFFFFFFFF;
2882 if (CHooks::Instance().StartCommit(g_Git
.m_CurrentDir
, m_pathList
, m_sLogMessage
, exitcode
, error
))
2887 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
2888 MessageBox(temp
, L
"TortoiseGit", MB_ICONERROR
);
2895 void CCommitDlg::OnSysColorChange()
2897 __super::OnSysColorChange();
2898 m_cLogMessage
.SetColors(true);
2899 m_cLogMessage
.SetFont(CAppUtils::GetLogFontName(), CAppUtils::GetLogFontSize());