1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2014 - TortoiseSVN
4 // Copyright (C) 2008-2017 - 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_PREPAREDIFF
)), 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
);
422 CenterWindow(CWnd::FromHandle(hWndExplorer
));
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]);
458 m_updatedPathList
= m_pathList
;
461 CRegDWORD err
= CRegDWORD(L
"Software\\TortoiseGit\\ErrorOccurred", FALSE
);
462 CRegDWORD historyhint
= CRegDWORD(L
"Software\\TortoiseGit\\HistoryHintShown", FALSE
);
463 if ((((DWORD
)err
)!=FALSE
)&&((((DWORD
)historyhint
)==FALSE
)))
466 // ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);
470 this->m_ctrlShowPatch
.SetURL(CString());
472 if (g_Git
.GetConfigValueBool(L
"tgit.commitshowpatch"))
473 OnStnClickedViewPatch();
475 if (CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive())
477 DialogEnableWindow(IDC_CHECK_NEWBRANCH
, FALSE
);
478 m_bCreateNewBranch
= FALSE
;
479 GetDlgItem(IDC_MERGEACTIVE
)->ShowWindow(SW_SHOW
);
480 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_COMMIT_MERGE_HINT
, IDS_APPNAME
, MB_ICONINFORMATION
, L
"CommitMergeHint", IDS_MSGBOX_DONOTSHOWAGAIN
);
485 return FALSE
; // return TRUE unless you set the focus to a control
486 // EXCEPTION: OCX Property Pages should return FALSE
489 void CCommitDlg::PrepareOkButton()
491 if (m_bNoPostActions
)
493 m_regLastAction
= CRegDWORD(L
"Software\\TortoiseGit\\CommitLastAction", 0);
495 for (auto labelId
: { IDS_COMMIT_COMMIT
, IDS_COMMIT_RECOMMIT
, IDS_COMMIT_COMMITPUSH
})
499 label
.LoadString(labelId
);
500 m_ctrlOkButton
.AddEntry(label
);
501 TCHAR accellerator
= CStringUtils::GetAccellerator(label
);
502 if (accellerator
== L
'\0')
504 ++m_accellerators
[accellerator
].cnt
;
505 if (m_accellerators
[accellerator
].cnt
> 1)
506 m_accellerators
[accellerator
].id
= -1;
508 m_accellerators
[accellerator
].id
= i
- 1;
510 m_ctrlOkButton
.SetCurrentEntry(m_regLastAction
);
511 if (m_accellerators
.size())
513 LPACCEL lpaccelNew
= (LPACCEL
)LocalAlloc(LPTR
, m_accellerators
.size() * sizeof(ACCEL
));
516 SCOPE_EXIT
{ LocalFree(lpaccelNew
); };
518 for (auto& entry
: m_accellerators
)
520 lpaccelNew
[i
].cmd
= (WORD
)(WM_USER
+ 1 + entry
.second
.id
);
521 lpaccelNew
[i
].fVirt
= FVIRTKEY
| FALT
;
522 lpaccelNew
[i
].key
= entry
.first
;
523 entry
.second
.wmid
= lpaccelNew
[i
].cmd
;
526 m_hAccelOkButton
= CreateAcceleratorTable(lpaccelNew
, (int)m_accellerators
.size());
530 static bool UpdateIndex(CMassiveGitTask
&mgt
, CSysProgressDlg
&sysProgressDlg
, int progress
, int maxProgress
)
532 if (mgt
.IsListEmpty())
535 if (sysProgressDlg
.HasUserCancelled())
538 if (sysProgressDlg
.IsVisible())
540 sysProgressDlg
.SetTitle(IDS_APPNAME
);
541 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_PREPARECOMMIT
)));
542 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_UPDATEINDEX
)));
543 sysProgressDlg
.SetProgress(progress
, maxProgress
);
544 AfxGetThread()->PumpMessage(); // process messages, in order to avoid freezing
548 return mgt
.Execute(cancel
);
554 if (g_Git
.GetCurrentBranchFromFile(g_Git
.m_CurrentDir
, head
))
556 CString remote
, remotebranch
;
557 g_Git
.GetRemotePushBranch(head
, remote
, remotebranch
);
558 if (remote
.IsEmpty() || remotebranch
.IsEmpty())
564 CAppUtils::DoPush(CAppUtils::IsSSHPutty(), false, false, false, false, false, false, head
, remote
, remotebranch
, false, 0);
567 void CCommitDlg::OnOK()
571 if (m_bThreadRunning
)
578 auto locker(m_ListCtrl
.AcquireReadLock());
580 if (m_ListCtrl
.GetConflictedCount() != 0 && CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROGRS_CONFLICTSOCCURED
, IDS_APPNAME
, 1, IDI_EXCLAMATION
, IDS_OKBUTTON
, IDS_IGNOREBUTTON
, 0, L
"CommitWarnOnUnresolved") == 1)
582 auto pos
= m_ListCtrl
.GetFirstSelectedItemPosition();
584 m_ListCtrl
.SetItemState(m_ListCtrl
.GetNextSelectedItem(pos
), 0, LVIS_SELECTED
);
585 int nListItems
= m_ListCtrl
.GetItemCount();
586 for (int i
= 0; i
< nListItems
; ++i
)
588 auto entry
= m_ListCtrl
.GetListEntry(i
);
589 if (entry
->m_Action
& CTGitPath::LOGACTIONS_UNMERGED
)
591 m_ListCtrl
.EnsureVisible(i
, FALSE
);
592 m_ListCtrl
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
593 m_ListCtrl
.SetFocus();
600 if (m_bCreateNewBranch
)
602 if (!g_Git
.IsBranchNameValid(m_sCreateNewBranch
))
604 ShowEditBalloon(IDC_NEWBRANCH
, IDS_B_T_NOTEMPTY
, IDS_ERR_ERROR
, TTI_ERROR
);
607 if (g_Git
.BranchTagExists(m_sCreateNewBranch
))
609 // branch already exists
611 msg
.LoadString(IDS_B_EXISTS
);
612 msg
+= L
' ' + CString(MAKEINTRESOURCE(IDS_B_DELETEORDIFFERENTNAME
));
613 ShowEditBalloon(IDC_NEWBRANCH
, msg
, CString(MAKEINTRESOURCE(IDS_WARN_WARNING
)));
616 if (g_Git
.BranchTagExists(m_sCreateNewBranch
, false))
618 // tag with the same name exists -> shortref is ambiguous
619 if (CMessageBox::Show(m_hWnd
, IDS_B_SAMETAGNAMEEXISTS
, IDS_APPNAME
, 2, IDI_EXCLAMATION
, IDS_CONTINUEBUTTON
, IDS_ABORTBUTTON
) == 2)
625 GetDlgItemText(IDC_BUGID
, id
);
626 if (!m_ProjectProperties
.CheckBugID(id
))
628 ShowEditBalloon(IDC_BUGID
, IDS_COMMITDLG_ONLYNUMBERS
, IDS_ERR_ERROR
, TTI_ERROR
);
631 m_sLogMessage
= m_cLogMessage
.GetText();
632 if ( m_sLogMessage
.IsEmpty() )
634 // no message entered, go round again
635 CMessageBox::Show(this->m_hWnd
, IDS_COMMITDLG_NOMESSAGE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
638 if ((m_ProjectProperties
.bWarnIfNoIssue
) && (id
.IsEmpty() && !m_ProjectProperties
.HasBugID(m_sLogMessage
)))
640 if (CMessageBox::Show(this->m_hWnd
, IDS_COMMITDLG_NOISSUEWARNING
, IDS_APPNAME
, MB_YESNO
| MB_ICONWARNING
)!=IDYES
)
644 if (m_ProjectProperties
.bWarnNoSignedOffBy
== TRUE
&& m_cLogMessage
.GetText().Find(GetSignedOffByLine()) == -1)
646 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
);
649 OnBnClickedSignOff();
650 m_sLogMessage
= m_cLogMessage
.GetText();
652 else if (retval
== 3)
656 if (CHooks::Instance().IsHookPresent(pre_commit_hook
, g_Git
.m_CurrentDir
)) {
657 DWORD exitcode
= 0xFFFFFFFF;
660 m_ListCtrl
.WriteCheckedNamesToPathList(list
);
661 if (CHooks::Instance().PreCommit(g_Git
.m_CurrentDir
, list
, m_sLogMessage
, exitcode
, error
))
666 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
667 MessageBox(temp
, L
"TortoiseGit", MB_ICONERROR
);
673 int nListItems
= m_ListCtrl
.GetItemCount();
674 for (int i
= 0; i
< nListItems
&& !m_bCommitMessageOnly
; ++i
)
676 auto entry
= m_ListCtrl
.GetListEntry(i
);
677 if (!entry
->m_Checked
|| !entry
->IsDirectory())
681 if (entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
684 subgit
.m_CurrentDir
= g_Git
.CombinePath(entry
);
686 subgit
.Run(L
"git.exe status --porcelain", &subcmdout
, CP_UTF8
);
687 dirty
= !subcmdout
.IsEmpty();
692 cmd
.Format(L
"git.exe diff -- \"%s\"", entry
->GetWinPath());
693 g_Git
.Run(cmd
, &cmdout
, CP_UTF8
);
694 dirty
= CStringUtils::EndsWith(cmdout
, L
"-dirty\n");
700 message
.Format(IDS_COMMITDLG_SUBMODULEDIRTY
, (LPCTSTR
)entry
->GetGitPathString());
701 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
)));
705 cmdCommit
.Format(L
"/command:commit /path:\"%s\\%s\"", (LPCTSTR
)g_Git
.m_CurrentDir
, entry
->GetWinPath());
706 CAppUtils::RunTortoiseGitProc(cmdCommit
);
709 else if (result
== 2)
716 if (!m_bCommitMessageOnly
)
717 m_ListCtrl
.WriteCheckedNamesToPathList(m_selectedPathList
);
718 m_pathwatcher
.Stop();
719 InterlockedExchange(&m_bBlock
, TRUE
);
720 //first add all the unversioned files the user selected
721 //and check if all versioned files are selected
724 CMassiveGitTask
mgtReAddAfterCommit(L
"add --ignore-errors -f");
725 CMassiveGitTask
mgtReDelAfterCommit(L
"rm --cached --ignore-unmatch");
730 bool bAddSuccess
=true;
731 bool bCloseCommitDlg
=false;
733 CSysProgressDlg sysProgressDlg
;
734 if (nListItems
>= 25)
736 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_PREPARECOMMIT
)));
737 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_UPDATEINDEX
)));
738 sysProgressDlg
.SetTime(true);
739 sysProgressDlg
.SetShowProgressBar(true);
740 sysProgressDlg
.ShowModal(this, true);
743 CBlockCacheForPath
cacheBlock(g_Git
.m_CurrentDir
);
744 ULONGLONG currentTicks
= GetTickCount64();
746 if (g_Git
.UsingLibGit2(CGit::GIT_CMD_COMMIT_UPDATE_INDEX
))
751 CAutoRepository
repository(g_Git
.GetGitRepository());
754 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not open repository."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
759 CString revRef
= L
"HEAD";
760 if (m_bCommitAmend
&& !m_bAmendDiffToLastCommit
)
762 if (CGit::GetHash(repository
, revHash
, revRef
))
764 MessageBox(g_Git
.GetLibGit2LastErr(L
"Could not get HEAD hash after committing."), L
"TortoiseGit", MB_ICONERROR
);
769 if (!revHash
.IsEmpty() && git_commit_lookup(commit
.GetPointer(), repository
, (const git_oid
*)revHash
.m_hash
))
771 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not get last commit."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
776 if (!revHash
.IsEmpty() && git_commit_tree(tree
.GetPointer(), commit
))
778 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not read tree of commit."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
783 if (git_repository_index(index
.GetPointer(), repository
))
785 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not get the repository index."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
790 if (!revHash
.IsEmpty() && (git_index_new(indexOld
.GetPointer()) || git_index_read_tree(indexOld
, tree
)))
792 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not read the tree into the index."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
798 for (int j
= 0; j
< nListItems
; ++j
)
800 auto entry
= m_ListCtrl
.GetListEntry(j
);
802 if (sysProgressDlg
.IsVisible())
804 if (GetTickCount64() - currentTicks
> 1000UL || j
== nListItems
- 1 || j
== 0)
806 sysProgressDlg
.SetLine(2, entry
->GetGitPathString(), true);
807 sysProgressDlg
.SetProgress(j
, nListItems
);
808 AfxGetThread()->PumpMessage(); // process messages, in order to avoid freezing; do not call this too often: this takes time!
809 currentTicks
= GetTickCount64();
813 CStringA filePathA
= CUnicodeUtils::GetMulti(entry
->GetGitPathString(), CP_UTF8
).TrimRight(L
'/');
815 if (entry
->m_Checked
&& !m_bCommitMessageOnly
)
817 if (entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
818 git_index_remove_bypath(index
, filePathA
); // ignore error
821 if (git_index_add_bypath(index
, filePathA
))
824 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not add \"" + entry
->GetGitPathString() + L
"\" to index."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
829 if ((entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
) && !entry
->GetGitOldPathString().IsEmpty())
830 git_index_remove_bypath(index
, CUnicodeUtils::GetUTF8(entry
->GetGitOldPathString())); // ignore error
836 if (entry
->m_Action
& CTGitPath::LOGACTIONS_ADDED
|| entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
838 git_index_remove_bypath(index
, filePathA
); // ignore error
839 mgtReAddAfterCommit
.AddFile(*entry
);
841 if (entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
&& !entry
->GetGitOldPathString().IsEmpty())
843 const git_index_entry
* oldIndexEntry
= nullptr;
844 if ((oldIndexEntry
= git_index_get_bypath(indexOld
, CUnicodeUtils::GetUTF8(entry
->GetGitOldPathString()), 0)) == nullptr || git_index_add(index
, oldIndexEntry
))
847 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not reset \"" + entry
->GetGitOldPathString() + L
"\" to old index entry."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
850 mgtReDelAfterCommit
.AddFile(entry
->GetGitOldPathString());
853 else if (!(entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
))
855 const git_index_entry
* oldIndexEntry
= nullptr;
856 if ((oldIndexEntry
= git_index_get_bypath(indexOld
, filePathA
, 0)) == nullptr || git_index_add(index
, oldIndexEntry
))
859 CMessageBox::Show(GetSafeHwnd(), CGit::GetLibGit2LastErr(L
"Could not reset \"" + entry
->GetGitPathString() + L
"\" to old index entry."), L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
862 if (entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
&& !(entry
->m_Action
& CTGitPath::LOGACTIONS_MISSING
))
863 mgtReDelAfterCommit
.AddFile(entry
->GetGitPathString());
867 if (sysProgressDlg
.HasUserCancelled())
873 if (bAddSuccess
&& git_index_write(index
))
876 for (int j
= 0; bAddSuccess
&& j
< nListItems
; ++j
)
877 CShellUpdater::Instance().AddPathForUpdate(*m_ListCtrl
.GetListEntry(j
));
882 // ***************************************************
883 // ATTENTION: Similar code in RebaseDlg.cpp!!!
884 // ***************************************************
885 CMassiveGitTask
mgtAdd(L
"add -f");
886 CMassiveGitTask
mgtUpdateIndexForceRemove(L
"update-index --force-remove");
887 CMassiveGitTask
mgtUpdateIndex(L
"update-index");
888 CMassiveGitTask
mgtRm(L
"rm --ignore-unmatch");
889 CMassiveGitTask
mgtRmFCache(L
"rm -f --cache");
890 CString resetCmd
= L
"reset";
891 if (m_bCommitAmend
&& !m_bAmendDiffToLastCommit
)
892 resetCmd
+= L
" HEAD~1";;
893 CMassiveGitTask
mgtReset(resetCmd
, TRUE
, true);
894 for (int j
= 0; j
< nListItems
; ++j
)
896 auto entry
= m_ListCtrl
.GetListEntry(j
);
898 if (entry
->m_Checked
&& !m_bCommitMessageOnly
)
900 if ((entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
) || entry
->IsDirectory())
901 mgtAdd
.AddFile(entry
->GetGitPathString());
902 else if (entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
903 mgtUpdateIndexForceRemove
.AddFile(entry
->GetGitPathString());
905 mgtUpdateIndex
.AddFile(entry
->GetGitPathString());
907 if ((entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
) && !entry
->GetGitOldPathString().IsEmpty())
908 mgtRm
.AddFile(entry
->GetGitOldPathString());
914 if (entry
->m_Action
& CTGitPath::LOGACTIONS_ADDED
|| entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
915 { //To init git repository, there are not HEAD, so we can use git reset command
916 mgtRmFCache
.AddFile(entry
->GetGitPathString());
917 mgtReAddAfterCommit
.AddFile(*entry
);
919 if (entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
&& !entry
->GetGitOldPathString().IsEmpty())
921 mgtReset
.AddFile(entry
->GetGitOldPathString());
922 mgtReDelAfterCommit
.AddFile(entry
->GetGitOldPathString());
925 else if (!(entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
))
927 mgtReset
.AddFile(entry
->GetGitPathString());
928 if (entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
&& !(entry
->m_Action
& CTGitPath::LOGACTIONS_MISSING
))
929 mgtReDelAfterCommit
.AddFile(entry
->GetGitPathString());
933 if (sysProgressDlg
.HasUserCancelled())
940 CMassiveGitTask tasks
[] = { mgtAdd
, mgtUpdateIndexForceRemove
, mgtUpdateIndex
, mgtRm
, mgtRmFCache
, mgtReset
};
941 int progress
= 0, maxProgress
= 0;
942 for (int j
= 0; j
< _countof(tasks
); ++j
)
943 maxProgress
+= tasks
[j
].GetListCount();
944 for (int j
= 0; j
< _countof(tasks
); ++j
)
945 bAddSuccess
= bAddSuccess
&& UpdateIndex(tasks
[j
], sysProgressDlg
, progress
+= tasks
[j
].GetListCount(), maxProgress
);
947 if (sysProgressDlg
.HasUserCancelled())
950 for (int j
= 0; bAddSuccess
&& j
< nListItems
; ++j
)
951 CShellUpdater::Instance().AddPathForUpdate(*m_ListCtrl
.GetListEntry(j
));
954 if (sysProgressDlg
.HasUserCancelled())
957 sysProgressDlg
.Stop();
959 if (bAddSuccess
&& m_bCreateNewBranch
)
961 if (g_Git
.Run(L
"git.exe branch " + m_sCreateNewBranch
, &out
, CP_UTF8
))
963 MessageBox(L
"Creating new branch failed:\n" + out
, L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
966 if (g_Git
.Run(L
"git.exe checkout " + m_sCreateNewBranch
+ L
" --", &out
, CP_UTF8
))
968 MessageBox(L
"Switching to new branch failed:\n" + out
, L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
973 if (bAddSuccess
&& m_bWarnDetachedHead
&& CheckHeadDetach())
977 CString sExistingBugID
= m_ProjectProperties
.FindBugID(m_sLogMessage
);
978 sExistingBugID
.Trim();
979 if (!m_sBugID
.IsEmpty() && m_sBugID
.Compare(sExistingBugID
))
981 m_sBugID
.Replace(L
", ", L
",");
982 m_sBugID
.Replace(L
" ,", L
",");
983 CString sBugID
= m_ProjectProperties
.sMessage
;
984 sBugID
.Replace(L
"%BUGID%", m_sBugID
);
985 if (m_ProjectProperties
.bAppend
)
986 m_sLogMessage
+= L
'\n' + sBugID
+ L
'\n';
988 m_sLogMessage
= sBugID
+ L
'\n' + m_sLogMessage
;
991 // now let the bugtraq plugin check the commit message
992 CComPtr
<IBugTraqProvider2
> pProvider2
;
993 if (m_BugTraqProvider
)
995 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider2
);
999 ATL::CComBSTR
repositoryRoot(g_Git
.m_CurrentDir
);
1000 ATL::CComBSTR
parameters(m_bugtraq_association
.GetParameters());
1001 ATL::CComBSTR
commonRoot(m_pathList
.GetCommonRoot().GetDirectory().GetWinPath());
1002 ATL::CComBSTR
commitMessage(m_sLogMessage
);
1003 CBstrSafeVector
pathList(m_selectedPathList
.GetCount());
1005 for (LONG index
= 0; index
< m_selectedPathList
.GetCount(); ++index
)
1006 pathList
.PutElement(index
, m_selectedPathList
[index
].GetGitPathString());
1008 if (FAILED(hr
= pProvider2
->CheckCommit(GetSafeHwnd(), parameters
, repositoryRoot
, commonRoot
, pathList
, commitMessage
, &temp
)))
1012 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, (LPCTSTR
)m_bugtraq_association
.GetProviderName(), ce
.GetMessageAndDescription().c_str());
1013 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_ICONERROR
);
1017 CString sError
= temp
;
1018 if (!sError
.IsEmpty())
1020 CMessageBox::Show(GetSafeHwnd(), sError
, L
"TortoiseGit", MB_ICONERROR
);
1021 InterlockedExchange(&m_bBlock
, FALSE
);
1028 if (m_bCommitMessageOnly
|| bAddSuccess
&& (nchecked
|| m_bCommitAmend
|| CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive()))
1030 bCloseCommitDlg
= true;
1032 CString tempfile
=::GetTempFile();
1034 if (CAppUtils::SaveCommitUnicodeFile(tempfile
, m_sLogMessage
))
1036 CMessageBox::Show(GetSafeHwnd(), L
"Could not save commit message", L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
1037 InterlockedExchange(&m_bBlock
, FALSE
);
1041 CTGitPath path
=g_Git
.m_CurrentDir
;
1043 BOOL IsGitSVN
= path
.GetAdminDirMask() & ITEMIS_GITSVN
;
1047 if(this->m_bCommitAmend
)
1051 if (m_bSetCommitDateTime
)
1054 m_CommitDate
.GetTime(date
);
1055 m_CommitTime
.GetTime(time
);
1056 if (m_bCommitAmend
&& m_AsCommitDateCtrl
.GetCheck())
1057 dateTime
= CAppUtils::GetMsysgitVersion() > 0x02010000 ? L
"--date=\"now\"" : L
"--date=\"\"" ;
1059 dateTime
.Format(L
"--date=%sT%s", (LPCTSTR
)date
.Format(L
"%Y-%m-%d"), (LPCTSTR
)time
.Format(L
"%H:%M:%S"));
1063 author
.Format(L
"--author=\"%s\"", (LPCTSTR
)m_sAuthor
);
1064 CString allowEmpty
= m_bCommitMessageOnly
? L
"--allow-empty" : L
"";
1065 // TODO: make sure notes.amend.rewrite does still work when switching to libgit2
1066 cmd
.Format(L
"git.exe commit %s %s %s %s -F \"%s\"", (LPCTSTR
)author
, (LPCTSTR
)dateTime
, (LPCTSTR
)amend
, (LPCTSTR
)allowEmpty
, (LPCTSTR
)tempfile
);
1068 CCommitProgressDlg progress
;
1069 progress
.m_bBufferAll
=true; // improve show speed when there are many file added.
1070 progress
.m_GitCmd
=cmd
;
1071 progress
.m_bShowCommand
= FALSE
; // don't show the commit command
1072 progress
.m_PreText
= out
; // show any output already generated in log window
1073 if (m_ctrlOkButton
.GetCurrentEntry() > 0)
1074 progress
.m_AutoClose
= GitProgressAutoClose::AUTOCLOSE_IF_NO_ERRORS
;
1076 progress
.m_PostCmdCallback
= [&](DWORD status
, PostCmdList
& postCmdList
)
1078 if (status
|| m_bNoPostActions
|| m_bAutoClose
)
1082 postCmdList
.emplace_back(IDI_COMMIT
, IDS_MENUSVNDCOMMIT
, [&]{ m_PostCmd
= GIT_POSTCOMMIT_CMD_DCOMMIT
; });
1084 postCmdList
.emplace_back(IDI_PUSH
, IDS_MENUPUSH
, [&]{ m_PostCmd
= GIT_POSTCOMMIT_CMD_PUSH
; });
1085 postCmdList
.emplace_back(IDI_PULL
, IDS_MENUPULL
, [&]{ m_PostCmd
= GIT_POSTCOMMIT_CMD_PULL
; });
1086 postCmdList
.emplace_back(IDI_COMMIT
, IDS_PROC_COMMIT_RECOMMIT
, [&]{ m_PostCmd
= GIT_POSTCOMMIT_CMD_RECOMMIT
; });
1087 postCmdList
.emplace_back(IDI_TAG
, IDS_MENUTAG
, [&]{ m_PostCmd
= GIT_POSTCOMMIT_CMD_CREATETAG
; });
1090 m_PostCmd
= GIT_POSTCOMMIT_CMD_NOTHING
;
1093 if (!m_bNoPostActions
)
1094 m_regLastAction
= (int)m_ctrlOkButton
.GetCurrentEntry();
1095 if (m_ctrlOkButton
.GetCurrentEntry() == 1)
1096 m_PostCmd
= GIT_POSTCOMMIT_CMD_RECOMMIT
;
1098 ::DeleteFile(tempfile
);
1100 if (m_BugTraqProvider
&& progress
.m_GitStatus
== 0)
1102 CComPtr
<IBugTraqProvider2
> pProvider
;
1103 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider
);
1106 ATL::CComBSTR
commonRoot(g_Git
.m_CurrentDir
);
1107 CBstrSafeVector
pathList(m_selectedPathList
.GetCount());
1109 for (LONG index
= 0; index
< m_selectedPathList
.GetCount(); ++index
)
1110 pathList
.PutElement(index
, m_selectedPathList
[index
].GetGitPathString());
1112 ATL::CComBSTR
logMessage(m_sLogMessage
);
1115 if (g_Git
.GetHash(hash
, L
"HEAD"))
1116 MessageBox(g_Git
.GetGitLastErr(L
"Could not get HEAD hash after committing."), L
"TortoiseGit", MB_ICONERROR
);
1117 LONG version
= g_Git
.Hash2int(hash
);
1120 if (FAILED(hr
= pProvider
->OnCommitFinished(GetSafeHwnd(),
1127 CString sErr
= temp
;
1128 if (!sErr
.IsEmpty())
1129 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
1133 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, ce
.GetSource().c_str(), ce
.GetMessageAndDescription().c_str());
1134 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_OK
| MB_ICONERROR
);
1139 RestoreFiles(progress
.m_GitStatus
== 0, false);
1140 if (((DWORD
)CRegStdDWORD(L
"Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit", TRUE
)) == TRUE
)
1142 BOOL cancel
= FALSE
;
1143 mgtReAddAfterCommit
.Execute(cancel
);
1144 mgtReDelAfterCommit
.Execute(cancel
);
1147 if (!progress
.m_GitStatus
)
1149 DWORD exitcode
= 0xFFFFFFFF;
1151 if (CHooks::Instance().PostCommit(g_Git
.m_CurrentDir
, amend
.IsEmpty(), exitcode
, error
))
1156 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
1157 MessageBox(temp
, L
"TortoiseGit", MB_ICONERROR
);
1158 bCloseCommitDlg
= false;
1163 if (progress
.m_GitStatus
|| m_PostCmd
== GIT_POSTCOMMIT_CMD_RECOMMIT
)
1165 bCloseCommitDlg
= false;
1166 if (m_PostCmd
== GIT_POSTCOMMIT_CMD_RECOMMIT
)
1168 if (!m_sLogMessage
.IsEmpty())
1170 ReloadHistoryEntries();
1171 m_History
.AddEntry(m_sLogMessage
);
1175 this->m_sLogMessage
.Empty();
1176 GetCommitTemplate(m_sLogMessage
);
1177 m_cLogMessage
.SetText(m_sLogMessage
);
1178 if (m_bCreateNewBranch
)
1180 GetDlgItem(IDC_COMMIT_TO
)->ShowWindow(SW_SHOW
);
1181 GetDlgItem(IDC_NEWBRANCH
)->ShowWindow(SW_HIDE
);
1183 m_bCreateNewBranch
= FALSE
;
1185 if (!RunStartCommitHook())
1186 bCloseCommitDlg
= true;
1189 if (!progress
.m_GitStatus
)
1192 m_bCommitAmend
= FALSE
;
1198 else if(bAddSuccess
)
1200 CMessageBox::Show(this->m_hWnd
, IDS_ERROR_NOTHING_COMMIT
, IDS_COMMIT_FINISH
, MB_OK
| MB_ICONINFORMATION
);
1201 bCloseCommitDlg
=false;
1205 m_regAddBeforeCommit
= m_bShowUnversioned
;
1206 m_regKeepChangelists
= m_bKeepChangeList
;
1207 m_regDoNotAutoselectSubmodules
= m_bDoNotAutoselectSubmodules
;
1208 if (!GetDlgItem(IDC_KEEPLISTS
)->IsWindowEnabled())
1209 m_bKeepChangeList
= FALSE
;
1210 InterlockedExchange(&m_bBlock
, FALSE
);
1212 if (!m_sLogMessage
.IsEmpty())
1214 ReloadHistoryEntries();
1215 m_History
.AddEntry(m_sLogMessage
);
1221 if (bCloseCommitDlg
)
1223 if (m_ctrlOkButton
.GetCurrentEntry() == 2)
1225 CResizableStandAloneDialog::OnOK();
1227 else if (m_PostCmd
== GIT_POSTCOMMIT_CMD_RECOMMIT
)
1229 m_bDoNotStoreLastSelectedLine
= true;
1231 this->BringWindowToTop();
1234 CShellUpdater::Instance().Flush();
1237 void CCommitDlg::SaveSplitterPos()
1241 CRegDWORD
regPos(L
"Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer");
1243 m_wndSplitter
.GetWindowRect(&rectSplitter
);
1244 ScreenToClient(&rectSplitter
);
1245 regPos
= rectSplitter
.top
;
1249 UINT
CCommitDlg::StatusThreadEntry(LPVOID pVoid
)
1251 return ((CCommitDlg
*)pVoid
)->StatusThread();
1254 void CCommitDlg::ReloadHistoryEntries()
1257 reg
.Format(L
"Software\\TortoiseGit\\History\\commit%s", (LPCTSTR
)m_ListCtrl
.m_sUUID
);
1258 reg
.Replace(L
':', L
'_');
1259 m_History
.Load(reg
, L
"logmsgs");
1262 UINT
CCommitDlg::StatusThread()
1264 //get the status of all selected file/folders recursively
1265 //and show the ones which have to be committed to the user
1266 //in a list control.
1267 m_pathwatcher
.Stop();
1269 g_Git
.RefreshGitIndex();
1271 m_bCancelled
= false;
1273 DialogEnableWindow(IDOK
, false);
1274 DialogEnableWindow(IDC_SHOWUNVERSIONED
, false);
1275 DialogEnableWindow(IDC_WHOLE_PROJECT
, false);
1276 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES
, false);
1277 GetDlgItem(IDC_EXTERNALWARNING
)->ShowWindow(SW_HIDE
);
1278 DialogEnableWindow(IDC_EXTERNALWARNING
, false);
1279 DialogEnableWindow(IDC_COMMIT_AMEND
, FALSE
);
1280 DialogEnableWindow(IDC_COMMIT_AMENDDIFF
, FALSE
);
1281 // read the list of recent log entries before querying the WC for status
1282 // -> the user may select one and modify / update it while we are crawling the WC
1284 DialogEnableWindow(IDC_CHECKALL
, false);
1285 DialogEnableWindow(IDC_CHECKNONE
, false);
1286 DialogEnableWindow(IDC_CHECKUNVERSIONED
, false);
1287 DialogEnableWindow(IDC_CHECKVERSIONED
, false);
1288 DialogEnableWindow(IDC_CHECKADDED
, false);
1289 DialogEnableWindow(IDC_CHECKDELETED
, false);
1290 DialogEnableWindow(IDC_CHECKMODIFIED
, false);
1291 DialogEnableWindow(IDC_CHECKFILES
, false);
1292 DialogEnableWindow(IDC_CHECKSUBMODULES
, false);
1295 GitAdminDir::GetWorktreeAdminDirPath(g_Git
.m_CurrentDir
, dotGitPath
);
1296 if (PathFileExists(dotGitPath
+ L
"CHERRY_PICK_HEAD"))
1298 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_HIDE
);
1299 m_bCommitAmend
= FALSE
;
1300 SendMessage(WM_UPDATEDATAFALSE
);
1303 if (!m_bDoNotStoreLastSelectedLine
)
1304 m_ListCtrl
.StoreScrollPos();
1305 // Initialise the list control with the status of the files/folders below us
1308 CTGitPathList
*pList
;
1309 m_ListCtrl
.m_amend
= (m_bCommitAmend
==TRUE
|| m_bForceCommitAmend
) && (m_bAmendDiffToLastCommit
==FALSE
);
1310 m_ListCtrl
.m_bDoNotAutoselectSubmodules
= (m_bDoNotAutoselectSubmodules
== TRUE
);
1312 if(m_bWholeProject
|| m_bWholeProject2
)
1315 pList
= &m_pathList
;
1317 success
=m_ListCtrl
.GetStatus(pList
);
1319 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
1320 if(this->m_bShowUnversioned
)
1321 m_ListCtrl
.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER
,true,pList
);
1323 m_ListCtrl
.CheckIfChangelistsArePresent(false);
1325 DWORD dwShow
= GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GITSLC_SHOWINCHANGELIST
| GITSLC_SHOWDIRECTFILES
;
1326 dwShow
|= DWORD(m_regAddBeforeCommit
) ? GITSLC_SHOWUNVERSIONED
: 0;
1329 /*if (!m_checkedPathList.IsEmpty())
1330 m_ListCtrl.Show(dwShow, m_checkedPathList);
1333 DWORD dwCheck
= m_bSelectFilesForCommit
? dwShow
: 0;
1334 dwCheck
&=~(CTGitPath::LOGACTIONS_UNVER
); //don't check unversion file default.
1335 m_ListCtrl
.Show(dwShow
, dwCheck
);
1338 if (m_ListCtrl
.HasExternalsFromDifferentRepos())
1340 GetDlgItem(IDC_EXTERNALWARNING
)->ShowWindow(SW_SHOW
);
1341 DialogEnableWindow(IDC_EXTERNALWARNING
, TRUE
);
1344 SetDlgItemText(IDC_COMMIT_TO
, g_Git
.GetCurrentBranch());
1345 m_tooltips
.AddTool(GetDlgItem(IDC_STATISTICS
), m_ListCtrl
.GetStatisticsString());
1346 if (m_ListCtrl
.GetItemCount() != 0 && m_ListCtrl
.GetTopIndex() == 0 && (m_bDoNotStoreLastSelectedLine
|| CRegDWORD(L
"Software\\TortoiseGit\\RememberFileListPosition", TRUE
) != TRUE
))
1347 m_ListCtrl
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
1351 if (!m_ListCtrl
.GetLastErrorMessage().IsEmpty())
1352 m_ListCtrl
.SetEmptyString(m_ListCtrl
.GetLastErrorMessage());
1353 m_ListCtrl
.Show(dwShow
);
1355 m_bDoNotStoreLastSelectedLine
= false;
1357 if ((m_ListCtrl
.GetItemCount()==0)&&(m_ListCtrl
.HasUnversionedItems())
1358 && !PathFileExists(dotGitPath
+ L
"MERGE_HEAD"))
1361 temp
.LoadString(IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED
);
1362 if (CMessageBox::ShowCheck(GetSafeHwnd(), temp
, L
"TortoiseGit", MB_ICONINFORMATION
| MB_YESNO
, L
"NothingToCommitShowUnversioned", nullptr) == IDYES
)
1364 m_bShowUnversioned
= TRUE
;
1365 GetDlgItem(IDC_SHOWUNVERSIONED
)->SendMessage(BM_SETCHECK
, BST_CHECKED
);
1366 dwShow
= (DWORD
)(GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GITSLC_SHOWUNVERSIONED
);
1367 m_ListCtrl
.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER
);
1368 m_ListCtrl
.Show(dwShow
,dwShow
&(~CTGitPath::LOGACTIONS_UNVER
));
1374 // we don't have to block the commit dialog while we fetch the
1375 // auto completion list.
1376 m_pathwatcher
.ClearChangedPaths();
1377 InterlockedExchange(&m_bBlock
, FALSE
);
1378 std::map
<CString
, int> autolist
;
1379 if ((DWORD
)CRegDWORD(L
"Software\\TortoiseGit\\Autocompletion", TRUE
) == TRUE
)
1381 m_ListCtrl
.BusyCursor(true);
1382 GetAutocompletionList(autolist
);
1383 m_ListCtrl
.BusyCursor(false);
1385 SendMessage(WM_UPDATEOKBUTTON
);
1386 m_ListCtrl
.Invalidate();
1389 DialogEnableWindow(IDC_SHOWUNVERSIONED
, true);
1390 DialogEnableWindow(IDC_WHOLE_PROJECT
, !m_bWholeProject2
);
1391 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES
, true);
1392 if (m_ListCtrl
.HasChangeLists())
1393 DialogEnableWindow(IDC_KEEPLISTS
, true);
1395 // activate amend checkbox (if necessary)
1396 if (g_Git
.IsInitRepos())
1398 m_bCommitAmend
= FALSE
;
1399 SendMessage(WM_UPDATEDATAFALSE
);
1403 if (m_bForceCommitAmend
)
1405 m_bCommitAmend
= TRUE
;
1406 SendMessage(WM_UPDATEDATAFALSE
);
1409 GetDlgItem(IDC_COMMIT_AMEND
)->EnableWindow(!PathFileExists(dotGitPath
+ L
"CHERRY_PICK_HEAD"));
1412 if (g_Git
.GetHash(hash
, L
"HEAD"))
1414 MessageBox(g_Git
.GetGitLastErr(L
"Could not get HEAD hash."), L
"TortoiseGit", MB_ICONERROR
);
1416 if (!hash
.IsEmpty())
1418 GitRev headRevision
;
1419 if (headRevision
.GetParentFromHash(hash
))
1420 MessageBox(headRevision
.GetLastErr(), L
"TortoiseGit", MB_ICONERROR
);
1421 // do not allow to show diff to "last" revision if it has more that one parent
1422 if (headRevision
.ParentsCount() != 1)
1424 m_bAmendDiffToLastCommit
= TRUE
;
1425 SendMessage(WM_UPDATEDATAFALSE
);
1428 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->EnableWindow(TRUE
);
1434 // we have the list, now signal the main thread about it
1435 SendMessage(WM_AUTOLISTREADY
, 0, (LPARAM
)&autolist
); // only send the message if the thread wasn't told to quit!
1438 InterlockedExchange(&m_bRunThread
, FALSE
);
1439 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1440 // force the cursor to normal
1446 void CCommitDlg::SetDlgTitle()
1448 if (m_sTitle
.IsEmpty())
1449 GetWindowText(m_sTitle
);
1451 if (m_bWholeProject
|| m_bWholeProject2
)
1452 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
1455 if (m_pathList
.GetCount() == 1)
1456 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.CombinePath(m_pathList
[0].GetUIPathString()), m_sTitle
);
1458 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.CombinePath(m_ListCtrl
.GetCommonDirectory(false)), m_sTitle
);
1462 void CCommitDlg::OnCancel()
1466 m_sLogMessage
= m_cLogMessage
.GetText();
1467 if (!m_sBugID
.IsEmpty())
1469 m_sBugID
.Replace(L
", ", L
",");
1470 m_sBugID
.Replace(L
" ,", L
",");
1471 CString sBugID
= m_ProjectProperties
.sMessage
;
1472 sBugID
.Replace(L
"%BUGID%", m_sBugID
);
1473 if (m_ProjectProperties
.bAppend
)
1474 m_sLogMessage
+= L
'\n' + sBugID
+ L
'\n';
1476 m_sLogMessage
= sBugID
+ L
'\n' + m_sLogMessage
;
1479 bool hasChangedMessage
= (m_sLogTemplate
.Compare(m_sLogMessage
) != 0) && !m_sLogMessage
.IsEmpty();
1482 tmp
.LoadString(IDS_REALLYCANCEL
);
1483 tmp
.AppendChar(L
'\n');
1484 tmp
.AppendChar(L
'\n');
1485 tmp
.Append(CString(MAKEINTRESOURCE(IDS_HINTLASTMESSAGES
)));
1486 CString dontaskagain
;
1487 dontaskagain
.LoadString(IDS_MSGBOX_DONOTSHOWAGAIN
);
1488 BOOL dontaskagainchecked
= FALSE
;
1489 if ((hasChangedMessage
|| m_ListCtrl
.GetItemCount() > 0) && CMessageBox::ShowCheck(GetSafeHwnd(), tmp
, L
"TortoiseGit", MB_ICONQUESTION
| MB_DEFBUTTON2
| MB_YESNO
, L
"CommitAskBeforeCancel", dontaskagain
, &dontaskagainchecked
) == IDNO
)
1491 if (dontaskagainchecked
)
1492 CMessageBox::SetRegistryValue(L
"CommitAskBeforeCancel", IDYES
);
1496 m_bCancelled
= true;
1497 m_pathwatcher
.Stop();
1499 if (m_bThreadRunning
)
1501 if (!RestoreFiles())
1503 if (hasChangedMessage
)
1505 ReloadHistoryEntries();
1506 m_History
.AddEntry(m_sLogMessage
);
1510 CResizableStandAloneDialog::OnCancel();
1513 BOOL
CCommitDlg::PreTranslateMessage(MSG
* pMsg
)
1517 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1521 if (m_hAccelOkButton
&& GetDlgItem(IDOK
)->IsWindowEnabled() && TranslateAccelerator(m_hWnd
, m_hAccelOkButton
, pMsg
))
1524 if (pMsg
->message
== WM_KEYDOWN
)
1526 switch (pMsg
->wParam
)
1531 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
1537 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
1539 if ( GetDlgItem(IDOK
)->IsWindowEnabled() )
1540 PostMessage(WM_COMMAND
, IDOK
);
1543 if ( GetFocus()==GetDlgItem(IDC_BUGID
) )
1545 // Pressing RETURN in the bug id control
1546 // moves the focus to the message
1547 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
1555 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
1558 void CCommitDlg::Refresh()
1560 if (m_bThreadRunning
)
1563 StartStatusThread();
1566 void CCommitDlg::StartStatusThread()
1568 if (InterlockedExchange(&m_bBlock
, TRUE
) != FALSE
)
1572 m_pThread
= nullptr;
1574 m_pThread
= AfxBeginThread(StatusThreadEntry
, this, THREAD_PRIORITY_NORMAL
, 0, CREATE_SUSPENDED
);
1577 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
1578 InterlockedExchange(&m_bBlock
, FALSE
);
1581 InterlockedExchange(&m_bThreadRunning
, TRUE
);// so the main thread knows that this thread is still running
1582 InterlockedExchange(&m_bRunThread
, TRUE
); // if this is set to FALSE, the thread should stop
1583 m_pThread
->m_bAutoDelete
= FALSE
;
1584 m_pThread
->ResumeThread();
1587 void CCommitDlg::StopStatusThread()
1589 InterlockedExchange(&m_bRunThread
, FALSE
);
1590 WaitForSingleObject(m_pThread
->m_hThread
, 5000);
1591 if (!m_bThreadRunning
)
1594 // we gave the thread a chance to quit. Since the thread didn't
1595 // listen to us we have to kill it.
1596 g_Git
.KillRelatedThreads(m_pThread
);
1597 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1600 void CCommitDlg::OnBnClickedShowunversioned()
1602 m_tooltips
.Pop(); // hide the tooltips
1604 m_regAddBeforeCommit
= m_bShowUnversioned
;
1607 DWORD dwShow
= m_ListCtrl
.GetShowFlags();
1608 if (DWORD(m_regAddBeforeCommit
))
1609 dwShow
|= GITSLC_SHOWUNVERSIONED
;
1611 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
1612 if(dwShow
& GITSLC_SHOWUNVERSIONED
)
1614 if (m_bWholeProject
|| m_bWholeProject2
)
1615 m_ListCtrl
.GetStatus(nullptr, false, false, true);
1617 m_ListCtrl
.GetStatus(&this->m_pathList
,false,false,true);
1619 m_ListCtrl
.StoreScrollPos();
1620 m_ListCtrl
.Show(dwShow
, 0, true, dwShow
& ~(CTGitPath::LOGACTIONS_UNVER
), true);
1625 void CCommitDlg::OnStnClickedExternalwarning()
1630 void CCommitDlg::OnEnChangeLogmessage()
1632 SendMessage(WM_UPDATEOKBUTTON
);
1635 LRESULT
CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM
, LPARAM
)
1638 if ((m_ListCtrl
.GetItemCount() == 0)&&(m_ListCtrl
.HasUnversionedItems())&&(!m_bShowUnversioned
))
1640 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED
, IDS_APPNAME
, MB_ICONINFORMATION
| MB_YESNO
)==IDYES
)
1642 m_bShowUnversioned
= TRUE
;
1643 DWORD dwShow
= GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GitSLC_SHOWUNVERSIONED
;
1644 m_ListCtrl
.Show(dwShow
);
1652 LRESULT
CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
1658 LRESULT
CCommitDlg::OnFileDropped(WPARAM
, LPARAM lParam
)
1661 SetForegroundWindow();
1663 // if multiple files/folders are dropped
1664 // this handler is called for every single item
1666 // To avoid creating multiple refresh threads and
1667 // causing crashes, we only add the items to the
1668 // list control and start a timer.
1669 // When the timer expires, we start the refresh thread,
1670 // but only if it isn't already running - otherwise we
1671 // restart the timer.
1673 path
.SetFromWin((LPCTSTR
)lParam
);
1675 // check whether the dropped file belongs to the very same repository
1677 if (!path
.HasAdminDir(&projectDir
) || !CPathUtils::ArePathStringsEqual(g_Git
.m_CurrentDir
, projectDir
))
1680 // just add all the items we get here.
1681 // if the item is versioned, the add will fail but nothing
1682 // more will happen.
1684 cmd
.Format(L
"git.exe add -- \"%s\"", (LPCTSTR
)path
.GetWinPathString());
1685 g_Git
.Run(cmd
, nullptr, CP_UTF8
);
1687 if (!m_ListCtrl
.HasPath(path
))
1689 if (m_pathList
.AreAllPathsFiles())
1691 m_pathList
.AddPath(path
);
1692 m_pathList
.RemoveDuplicates();
1693 m_updatedPathList
.AddPath(path
);
1694 m_updatedPathList
.RemoveDuplicates();
1698 // if the path list contains folders, we have to check whether
1699 // our just (maybe) added path is a child of one of those. If it is
1700 // a child of a folder already in the list, we must not add it. Otherwise
1701 // that path could show up twice in the list.
1702 bool bHasParentInList
= false;
1703 for (int i
=0; i
<m_pathList
.GetCount(); ++i
)
1705 if (m_pathList
[i
].IsAncestorOf(path
))
1707 bHasParentInList
= true;
1711 if (!bHasParentInList
)
1713 m_pathList
.AddPath(path
);
1714 m_pathList
.RemoveDuplicates();
1715 m_updatedPathList
.AddPath(path
);
1716 m_updatedPathList
.RemoveDuplicates();
1720 m_ListCtrl
.ResetChecked(path
);
1722 // Always start the timer, since the status of an existing item might have changed
1723 SetTimer(REFRESHTIMER
, 200, nullptr);
1724 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__
) L
": Item %s dropped, timer started\n", path
.GetWinPath());
1728 LRESULT
CCommitDlg::OnAutoListReady(WPARAM
, LPARAM lparam
)
1730 m_cLogMessage
.SetAutoCompletionList(std::move(*reinterpret_cast<std::map
<CString
, int>*>(lparam
)), '*');
1734 //////////////////////////////////////////////////////////////////////////
1735 // functions which run in the status thread
1736 //////////////////////////////////////////////////////////////////////////
1738 void CCommitDlg::ParseRegexFile(const CString
& sFile
, std::map
<CString
, CString
>& mapRegex
)
1743 CStdioFile
file(sFile
, CFile::typeText
| CFile::modeRead
| CFile::shareDenyWrite
);
1744 while (m_bRunThread
&& file
.ReadString(strLine
))
1746 if (strLine
.IsEmpty())
1748 if (strLine
[0] == L
'#')
1750 int eqpos
= strLine
.Find('=');
1752 rgx
= strLine
.Mid(eqpos
+1).Trim();
1755 while (((pos
= strLine
.Find(','))>=0)&&(pos
< eqpos
))
1757 mapRegex
[strLine
.Left(pos
)] = rgx
;
1758 strLine
= strLine
.Mid(pos
+1).Trim();
1760 mapRegex
[strLine
.Left(strLine
.Find('=')).Trim()] = rgx
;
1764 catch (CFileException
* pE
)
1766 CTraceToOutputDebugString::Instance()(__FUNCTION__
": CFileException loading auto list regex file\n");
1771 void CCommitDlg::ParseSnippetFile(const CString
& sFile
, std::map
<CString
, CString
>& mapSnippet
)
1776 CStdioFile
file(sFile
, CFile::typeText
| CFile::modeRead
| CFile::shareDenyWrite
);
1777 while (m_bRunThread
&& file
.ReadString(strLine
))
1779 if (strLine
.IsEmpty())
1781 if (strLine
[0] == L
'#') // comment char
1783 int eqpos
= strLine
.Find(L
'=');
1786 CString key
= strLine
.Left(eqpos
);
1787 auto rawvalue
= strLine
.GetBuffer() + eqpos
+ 1;
1789 bool isEscaped
= false;
1790 for (int i
= 0, len
= strLine
.GetLength() - eqpos
- 1; i
< len
; ++i
)
1792 wchar_t c
= rawvalue
[i
];
1797 case L
't': c
= L
'\t'; break;
1798 case L
'n': c
= L
'\n'; break;
1799 case L
'r': c
= L
'\r'; break;
1800 case L
'\\': c
= L
'\\'; break;
1801 default: value
+= rawvalue
[i
- 1]; break; // i is known to be > 0
1806 else if (c
== L
'\\')
1811 mapSnippet
[key
] = value
;
1815 catch (CFileException
* pE
)
1817 CTraceToOutputDebugString::Instance()(__FUNCTION__
": CFileException loading auto list regex file\n");
1822 void CCommitDlg::GetAutocompletionList(std::map
<CString
, int>& autolist
)
1824 // the auto completion list is made of strings from each selected files.
1825 // the strings used are extracted from the files with regexes found
1826 // in the file "autolist.txt".
1827 // the format of that file is:
1828 // file extensions separated with commas '=' regular expression to use
1830 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
1831 // .cpp = (?<=[^\s]::)\b\w+\b
1833 std::map
<CString
, CString
> mapRegex
;
1834 CString sRegexFile
= CPathUtils::GetAppDirectory();
1835 CRegDWORD regtimeout
= CRegDWORD(L
"Software\\TortoiseGit\\AutocompleteParseTimeout", 5);
1836 ULONGLONG timeoutvalue
= ULONGLONG(DWORD(regtimeout
)) * 1000UL;;
1837 sRegexFile
+= L
"autolist.txt";
1840 ParseRegexFile(sRegexFile
, mapRegex
);
1841 sRegexFile
= CPathUtils::GetAppDataDirectory();
1842 sRegexFile
+= L
"autolist.txt";
1843 if (PathFileExists(sRegexFile
))
1844 ParseRegexFile(sRegexFile
, mapRegex
);
1847 CString sSnippetFile
= CPathUtils::GetAppDirectory();
1848 sSnippetFile
+= L
"snippet.txt";
1849 ParseSnippetFile(sSnippetFile
, m_snippet
);
1850 sSnippetFile
= CPathUtils::GetAppDataDirectory();
1851 sSnippetFile
+= L
"snippet.txt";
1852 if (PathFileExists(sSnippetFile
))
1853 ParseSnippetFile(sSnippetFile
, m_snippet
);
1854 for (const auto& snip
: m_snippet
)
1855 autolist
.emplace(snip
.first
, AUTOCOMPLETE_SNIPPET
);
1857 ULONGLONG starttime
= GetTickCount64();
1859 // now we have two arrays of strings, where the first array contains all
1860 // file extensions we can use and the second the corresponding regex strings
1861 // to apply to those files.
1863 // the next step is to go over all files shown in the commit dialog
1864 // and scan them for strings we can use
1865 int nListItems
= m_ListCtrl
.GetItemCount();
1867 for (int i
=0; i
<nListItems
&& m_bRunThread
; ++i
)
1869 // stop parsing after timeout
1870 if ((!m_bRunThread
) || (GetTickCount64() - starttime
> timeoutvalue
))
1878 auto locker(m_ListCtrl
.AcquireReadLock());
1879 auto path
= m_ListCtrl
.GetListEntry(i
);
1884 sWinPath
= path
->GetWinPathString();
1885 sPartPath
= path
->GetGitPathString();
1886 sExt
= path
->GetFileExtension();
1887 action
= path
->m_Action
;
1889 autolist
.emplace(sPartPath
, AUTOCOMPLETE_FILENAME
);
1893 while ((pos
= sPartPath
.Find('/', pos
)) >= 0)
1897 autolist
.emplace(sPartPath
.Mid(pos
), AUTOCOMPLETE_FILENAME
);
1900 // Last inserted entry is a file name.
1901 // Some users prefer to also list file name without extension.
1902 if (CRegDWORD(L
"Software\\TortoiseGit\\AutocompleteRemovesExtensions", FALSE
))
1904 int dotPos
= sPartPath
.ReverseFind('.');
1905 if ((dotPos
>= 0) && (dotPos
> lastPos
))
1906 autolist
.emplace(sPartPath
.Mid(lastPos
, dotPos
- lastPos
), AUTOCOMPLETE_FILENAME
);
1909 if (action
== CTGitPath::LOGACTIONS_UNVER
&& !CRegDWORD(L
"Software\\TortoiseGit\\AutocompleteParseUnversioned", FALSE
))
1911 if (action
== CTGitPath::LOGACTIONS_IGNORE
)
1915 // find the regex string which corresponds to the file extension
1916 CString rdata
= mapRegex
[sExt
];
1917 if (rdata
.IsEmpty())
1920 ScanFile(autolist
, sWinPath
, rdata
, sExt
);
1922 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__
) L
": Auto completion list loaded in %I64u msec\n", GetTickCount64() - starttime
);
1925 void CCommitDlg::ScanFile(std::map
<CString
, int>& autolist
, const CString
& sFilePath
, const CString
& sRegex
, const CString
& sExt
)
1927 static std::map
<CString
, std::wregex
> regexmap
;
1929 std::wstring sFileContent
;
1930 CAutoFile hFile
= CreateFile(sFilePath
, GENERIC_READ
, FILE_SHARE_READ
, nullptr, OPEN_EXISTING
, FILE_ATTRIBUTE_NORMAL
, nullptr);
1933 DWORD size
= GetFileSize(hFile
, nullptr);
1934 if (size
> CRegDWORD(L
"Software\\TortoiseGit\\AutocompleteParseMaxSize", 300000L))
1936 // no files bigger than 300k
1939 // allocate memory to hold file contents
1943 oFile
.SetLength(size
);
1945 catch (CMemoryException
*)
1950 if (!ReadFile(hFile
, oFile
, size
, &readbytes
, nullptr))
1952 oFile
.SetLength(readbytes
);
1953 CFileTextLines filetextlines
;
1954 CFileTextLines::UnicodeType type
= filetextlines
.CheckUnicodeType(oFile
, readbytes
);
1957 CBaseFilter
* pFilter
= nullptr;
1960 case CFileTextLines::BINARY
:
1962 case CFileTextLines::UTF8
:
1963 case CFileTextLines::UTF8BOM
:
1964 pFilter
= new CUtf8Filter(NULL
);
1967 case CFileTextLines::ASCII
:
1968 pFilter
= new CAsciiFilter(NULL
);
1970 case CFileTextLines::UTF16_BE
:
1971 case CFileTextLines::UTF16_BEBOM
:
1972 pFilter
= new CUtf16beFilter(NULL
);
1974 case CFileTextLines::UTF16_LE
:
1975 case CFileTextLines::UTF16_LEBOM
:
1976 pFilter
= new CUtf16leFilter(NULL
);
1978 case CFileTextLines::UTF32_BE
:
1979 pFilter
= new CUtf32beFilter(NULL
);
1981 case CFileTextLines::UTF32_LE
:
1982 pFilter
= new CUtf32leFilter(NULL
);
1985 pFilter
->Decode(oFile
);
1988 catch (CMemoryException
*)
1992 sFileContent
= std::wstring((wchar_t*)oFile
, oFile
.GetLength() / sizeof(wchar_t));
1994 if (sFileContent
.empty() || !m_bRunThread
)
1999 std::wregex regCheck
;
2000 std::map
<CString
, std::wregex
>::const_iterator regIt
;
2001 if ((regIt
= regexmap
.find(sExt
)) != regexmap
.end())
2002 regCheck
= regIt
->second
;
2005 regCheck
= std::wregex(sRegex
, std::regex_constants::icase
| std::regex_constants::ECMAScript
);
2006 regexmap
[sExt
] = regCheck
;
2008 const std::wsregex_iterator end
;
2009 for (std::wsregex_iterator
it(sFileContent
.cbegin(), sFileContent
.cend(), regCheck
); it
!= end
; ++it
)
2011 const std::wsmatch match
= *it
;
2012 for (size_t i
= 1; i
< match
.size(); ++i
)
2014 if (match
[i
].second
-match
[i
].first
)
2015 autolist
.emplace(std::wstring(match
[i
]).c_str(), AUTOCOMPLETE_PROGRAMCODE
);
2019 catch (std::exception
&) {}
2022 // CSciEditContextMenuInterface
2023 void CCommitDlg::InsertMenuItems(CMenu
& mPopup
, int& nCmd
)
2025 CString sMenuItemText
;
2026 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITHASH
);
2027 m_nPopupPickCommitHash
= nCmd
++;
2028 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPickCommitHash
, sMenuItemText
);
2030 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_PICKCOMMITMESSAGE
);
2031 m_nPopupPickCommitMessage
= nCmd
++;
2032 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPickCommitMessage
, sMenuItemText
);
2034 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_PASTEFILELIST
);
2035 m_nPopupPasteListCmd
= nCmd
++;
2036 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPasteListCmd
, sMenuItemText
);
2038 ReloadHistoryEntries();
2039 if (!m_History
.IsEmpty())
2041 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE
);
2042 m_nPopupPasteLastMessage
= nCmd
++;
2043 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPasteLastMessage
, sMenuItemText
);
2045 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY
);
2046 m_nPopupRecentMessage
= nCmd
++;
2047 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupRecentMessage
, sMenuItemText
);
2051 bool CCommitDlg::HandleMenuItemClick(int cmd
, CSciEdit
* pSciEdit
)
2053 if (cmd
== m_nPopupPickCommitHash
)
2055 // use the git log to allow selection of a version
2057 // tell the dialog to use mode for selecting revisions
2058 dlg
.SetSelect(true);
2059 // only one revision must be selected however
2060 dlg
.SingleSelection(true);
2061 dlg
.ShowWorkingTreeChanges(false);
2062 if (dlg
.DoModal() == IDOK
&& !dlg
.GetSelectedHash().empty())
2063 pSciEdit
->InsertText(dlg
.GetSelectedHash().at(0).ToString());
2067 if (cmd
== m_nPopupPickCommitMessage
)
2069 // use the git log to allow selection of a version
2071 // tell the dialog to use mode for selecting revisions
2072 dlg
.SetSelect(true);
2073 // only one revision must be selected however
2074 dlg
.SingleSelection(true);
2075 dlg
.ShowWorkingTreeChanges(false);
2076 if (dlg
.DoModal() == IDOK
&& !dlg
.GetSelectedHash().empty())
2079 if (rev
.GetCommit(dlg
.GetSelectedHash().at(0).ToString()))
2081 MessageBox(rev
.GetLastErr(), L
"TortoiseGit", MB_ICONERROR
);
2084 CString message
= rev
.GetSubject() + L
"\r\n" + rev
.GetBody();
2085 pSciEdit
->InsertText(message
);
2090 if (cmd
== m_nPopupPasteListCmd
)
2093 auto locker(m_ListCtrl
.AcquireReadLock());
2094 int nListItems
= m_ListCtrl
.GetItemCount();
2095 for (int i
=0; i
<nListItems
; ++i
)
2097 auto entry
= m_ListCtrl
.GetListEntry(i
);
2098 if (entry
&&entry
->m_Checked
)
2100 CString status
= entry
->GetActionName();
2101 if(entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
2102 status
= L
"Add"; // I18N TODO
2104 //git_wc_status_kind status = entry->status;
2105 WORD langID
= (WORD
)CRegStdDWORD(L
"Software\\TortoiseGit\\LanguageID", GetUserDefaultLangID());
2106 if (m_ProjectProperties
.bFileListInEnglish
)
2109 logmsg
.AppendFormat(L
"%-10s %s\r\n", (LPCTSTR
)status
, (LPCTSTR
)m_ListCtrl
.GetItemText(i
, 0));
2112 pSciEdit
->InsertText(logmsg
);
2116 if(cmd
== m_nPopupPasteLastMessage
)
2118 if (m_History
.IsEmpty())
2122 logmsg
+=m_History
.GetEntry(0);
2123 pSciEdit
->InsertText(logmsg
);
2127 if(cmd
== m_nPopupRecentMessage
)
2129 OnBnClickedHistory();
2135 void CCommitDlg::HandleSnippet(int type
, const CString
&text
, CSciEdit
*pSciEdit
)
2137 if (type
== AUTOCOMPLETE_SNIPPET
)
2139 CString target
= m_snippet
[text
];
2140 pSciEdit
->GetWordUnderCursor(true);
2141 pSciEdit
->InsertText(target
, false);
2145 void CCommitDlg::OnTimer(UINT_PTR nIDEvent
)
2149 case ENDDIALOGTIMER
:
2150 KillTimer(ENDDIALOGTIMER
);
2154 if (m_bThreadRunning
)
2156 SetTimer(REFRESHTIMER
, 200, nullptr);
2157 CTraceToOutputDebugString::Instance()(__FUNCTION__
": Wait some more before refreshing\n");
2161 KillTimer(REFRESHTIMER
);
2162 CTraceToOutputDebugString::Instance()(__FUNCTION__
": Refreshing after items dropped\n");
2166 case FILLPATCHVTIMER
:
2170 __super::OnTimer(nIDEvent
);
2173 void CCommitDlg::OnBnClickedHistory()
2175 m_tooltips
.Pop(); // hide the tooltips
2176 if (m_pathList
.IsEmpty())
2179 CHistoryDlg historyDlg
;
2180 ReloadHistoryEntries();
2181 historyDlg
.SetHistory(m_History
);
2182 if (historyDlg
.DoModal() != IDOK
)
2185 CString sMsg
= historyDlg
.GetSelectedText();
2186 if (sMsg
!= m_cLogMessage
.GetText().Left(sMsg
.GetLength()))
2188 CString sBugID
= m_ProjectProperties
.FindBugID(sMsg
);
2189 if ((!sBugID
.IsEmpty()) && ((GetDlgItem(IDC_BUGID
)->IsWindowVisible())))
2190 SetDlgItemText(IDC_BUGID
, sBugID
);
2191 if (m_sLogTemplate
.Compare(m_cLogMessage
.GetText()) != 0)
2192 m_cLogMessage
.InsertText(sMsg
, !m_cLogMessage
.GetText().IsEmpty());
2194 m_cLogMessage
.SetText(sMsg
);
2197 SendMessage(WM_UPDATEOKBUTTON
);
2198 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
2201 void CCommitDlg::OnBnClickedBugtraqbutton()
2203 m_tooltips
.Pop(); // hide the tooltips
2204 CString sMsg
= m_cLogMessage
.GetText();
2206 if (!m_BugTraqProvider
)
2209 ATL::CComBSTR
parameters(m_bugtraq_association
.GetParameters());
2210 ATL::CComBSTR
commonRoot(m_pathList
.GetCommonRoot().GetDirectory().GetWinPath());
2211 CBstrSafeVector
pathList(m_pathList
.GetCount());
2213 for (LONG index
= 0; index
< m_pathList
.GetCount(); ++index
)
2214 pathList
.PutElement(index
, m_pathList
[index
].GetGitPathString());
2216 ATL::CComBSTR
originalMessage(sMsg
);
2219 // first try the IBugTraqProvider2 interface
2220 CComPtr
<IBugTraqProvider2
> pProvider2
;
2221 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider2
);
2222 bool bugIdOutSet
= false;
2225 ATL::CComBSTR
repositoryRoot(g_Git
.m_CurrentDir
);
2226 ATL::CComBSTR bugIDOut
;
2227 GetDlgItemText(IDC_BUGID
, m_sBugID
);
2228 ATL::CComBSTR
bugID(m_sBugID
);
2229 CBstrSafeVector revPropNames
;
2230 CBstrSafeVector revPropValues
;
2231 if (FAILED(hr
= pProvider2
->GetCommitMessage2(GetSafeHwnd(), parameters
, repositoryRoot
, commonRoot
, pathList
, originalMessage
, bugID
, &bugIDOut
, &revPropNames
, &revPropValues
, &temp
)))
2234 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, (LPCTSTR
)m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
2235 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_ICONERROR
);
2242 m_sBugID
= bugIDOut
;
2243 SetDlgItemText(IDC_BUGID
, m_sBugID
);
2245 m_cLogMessage
.SetText((LPCTSTR
)temp
);
2250 // if IBugTraqProvider2 failed, try IBugTraqProvider
2251 CComPtr
<IBugTraqProvider
> pProvider
;
2252 hr
= m_BugTraqProvider
.QueryInterface(&pProvider
);
2256 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, (LPCTSTR
)m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
2257 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_ICONERROR
);
2261 if (FAILED(hr
= pProvider
->GetCommitMessage(GetSafeHwnd(), parameters
, commonRoot
, pathList
, originalMessage
, &temp
)))
2264 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, (LPCTSTR
)m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
2265 CMessageBox::Show(GetSafeHwnd(), sErr
, L
"TortoiseGit", MB_ICONERROR
);
2268 m_cLogMessage
.SetText((LPCTSTR
)temp
);
2270 m_sLogMessage
= m_cLogMessage
.GetText();
2271 if (!m_ProjectProperties
.sMessage
.IsEmpty())
2273 CString sBugID
= m_ProjectProperties
.FindBugID(m_sLogMessage
);
2274 if (!sBugID
.IsEmpty() && !bugIdOutSet
)
2275 SetDlgItemText(IDC_BUGID
, sBugID
);
2278 m_cLogMessage
.SetFocus();
2281 void CCommitDlg::FillPatchView(bool onlySetTimer
)
2283 if(::IsWindow(this->m_patchViewdlg
.m_hWnd
))
2285 KillTimer(FILLPATCHVTIMER
);
2288 SetTimer(FILLPATCHVTIMER
, 100, nullptr);
2292 auto locker(m_ListCtrl
.AcquireReadLock());
2293 POSITION pos
=m_ListCtrl
.GetFirstSelectedItemPosition();
2298 int nSelect
= m_ListCtrl
.GetNextSelectedItem(pos
);
2299 auto p
= m_ListCtrl
.GetListEntry(nSelect
);
2300 if(p
&& !(p
->m_Action
&CTGitPath::LOGACTIONS_UNVER
) )
2302 CString head
= L
"HEAD";
2303 if(m_bCommitAmend
==TRUE
&& m_bAmendDiffToLastCommit
==FALSE
)
2305 cmd
.Format(L
"git.exe diff %s -- \"%s\"", (LPCTSTR
)head
, (LPCTSTR
)p
->GetGitPathString());
2306 g_Git
.Run(cmd
, &out
, CP_UTF8
);
2310 m_patchViewdlg
.SetText(out
);
2313 LRESULT
CCommitDlg::OnGitStatusListCtrlItemChanged(WPARAM
/*wparam*/, LPARAM
/*lparam*/)
2315 this->FillPatchView(true);
2320 LRESULT
CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM
, LPARAM
)
2322 SendMessage(WM_UPDATEOKBUTTON
);
2326 LRESULT
CCommitDlg::OnCheck(WPARAM wnd
, LPARAM
)
2328 HWND hwnd
= (HWND
)wnd
;
2329 bool check
= !(GetAsyncKeyState(VK_SHIFT
) & 0x8000);
2330 if (hwnd
== GetDlgItem(IDC_CHECKALL
)->GetSafeHwnd())
2331 m_ListCtrl
.Check(GITSLC_SHOWEVERYTHING
, check
);
2332 else if (hwnd
== GetDlgItem(IDC_CHECKNONE
)->GetSafeHwnd())
2333 m_ListCtrl
.Check(GITSLC_SHOWEVERYTHING
, !check
);
2334 else if (hwnd
== GetDlgItem(IDC_CHECKUNVERSIONED
)->GetSafeHwnd())
2335 m_ListCtrl
.Check(GITSLC_SHOWUNVERSIONED
, check
);
2336 else if (hwnd
== GetDlgItem(IDC_CHECKVERSIONED
)->GetSafeHwnd())
2337 m_ListCtrl
.Check(GITSLC_SHOWVERSIONED
, check
);
2338 else if (hwnd
== GetDlgItem(IDC_CHECKADDED
)->GetSafeHwnd())
2339 m_ListCtrl
.Check(GITSLC_SHOWADDED
, check
);
2340 else if (hwnd
== GetDlgItem(IDC_CHECKDELETED
)->GetSafeHwnd())
2341 m_ListCtrl
.Check(GITSLC_SHOWREMOVED
, check
);
2342 else if (hwnd
== GetDlgItem(IDC_CHECKMODIFIED
)->GetSafeHwnd())
2343 m_ListCtrl
.Check(GITSLC_SHOWMODIFIED
, check
);
2344 else if (hwnd
== GetDlgItem(IDC_CHECKFILES
)->GetSafeHwnd())
2345 m_ListCtrl
.Check(GITSLC_SHOWFILES
, check
);
2346 else if (hwnd
== GetDlgItem(IDC_CHECKSUBMODULES
)->GetSafeHwnd())
2347 m_ListCtrl
.Check(GITSLC_SHOWSUBMODULES
, check
);
2352 LRESULT
CCommitDlg::OnUpdateOKButton(WPARAM
, LPARAM
)
2357 CString text
= m_cLogMessage
.GetText().Trim();
2358 bool bValidLogSize
= !text
.IsEmpty() && text
.GetLength() >= m_ProjectProperties
.nMinLogSize
;
2359 bool bAmendOrSelectFilesOrMerge
= m_ListCtrl
.GetSelected() > 0 || (m_bCommitAmend
&& m_bAmendDiffToLastCommit
) || CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive();
2361 DialogEnableWindow(IDOK
, bValidLogSize
&& (m_bCommitMessageOnly
|| bAmendOrSelectFilesOrMerge
));
2366 LRESULT
CCommitDlg::OnUpdateDataFalse(WPARAM
, LPARAM
)
2372 LRESULT
CCommitDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
2376 if (wParam
== IDC_SPLITTER
)
2378 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
2379 DoSize(pHdr
->delta
);
2383 if (m_hAccelOkButton
&& LOWORD(wParam
) >= WM_USER
&& LOWORD(wParam
) <= WM_USER
+ m_accellerators
.size())
2385 for (const auto& entry
: m_accellerators
)
2387 if (entry
.second
.wmid
!= LOWORD(wParam
))
2389 if (entry
.second
.id
== -1)
2390 m_ctrlOkButton
.PostMessage(WM_KEYDOWN
, VK_F4
, NULL
);
2393 m_ctrlOkButton
.SetCurrentEntry(entry
.second
.id
);
2402 return __super::DefWindowProc(message
, wParam
, lParam
);
2405 void CCommitDlg::SetSplitterRange()
2407 if ((m_ListCtrl
)&&(m_cLogMessage
))
2410 m_cLogMessage
.GetWindowRect(rcTop
);
2411 ScreenToClient(rcTop
);
2413 m_ListCtrl
.GetWindowRect(rcMiddle
);
2414 ScreenToClient(rcMiddle
);
2415 if (rcMiddle
.Height() && rcMiddle
.Width())
2416 m_wndSplitter
.SetRange(rcTop
.top
+ 100, rcMiddle
.bottom
- 80);
2420 void CCommitDlg::DoSize(int delta
)
2422 RemoveAnchor(IDC_MESSAGEGROUP
);
2423 RemoveAnchor(IDC_LOGMESSAGE
);
2424 RemoveAnchor(IDC_SPLITTER
);
2425 RemoveAnchor(IDC_SIGNOFF
);
2426 RemoveAnchor(IDC_COMMIT_AMEND
);
2427 RemoveAnchor(IDC_COMMIT_AMENDDIFF
);
2428 RemoveAnchor(IDC_COMMIT_SETDATETIME
);
2429 RemoveAnchor(IDC_COMMIT_DATEPICKER
);
2430 RemoveAnchor(IDC_COMMIT_TIMEPICKER
);
2431 RemoveAnchor(IDC_COMMIT_AS_COMMIT_DATE
);
2432 RemoveAnchor(IDC_COMMIT_SETAUTHOR
);
2433 RemoveAnchor(IDC_COMMIT_AUTHORDATA
);
2434 RemoveAnchor(IDC_LISTGROUP
);
2435 RemoveAnchor(IDC_FILELIST
);
2436 RemoveAnchor(IDC_TEXT_INFO
);
2437 RemoveAnchor(IDC_SELECTLABEL
);
2438 RemoveAnchor(IDC_CHECKALL
);
2439 RemoveAnchor(IDC_CHECKNONE
);
2440 RemoveAnchor(IDC_CHECKUNVERSIONED
);
2441 RemoveAnchor(IDC_CHECKVERSIONED
);
2442 RemoveAnchor(IDC_CHECKADDED
);
2443 RemoveAnchor(IDC_CHECKDELETED
);
2444 RemoveAnchor(IDC_CHECKMODIFIED
);
2445 RemoveAnchor(IDC_CHECKFILES
);
2446 RemoveAnchor(IDC_CHECKSUBMODULES
);
2448 auto hdwp
= BeginDeferWindowPos(24);
2449 CSplitterControl::ChangeRect(hdwp
, &m_cLogMessage
, 0, 0, 0, delta
);
2450 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_MESSAGEGROUP
), 0, 0, 0, delta
);
2451 CSplitterControl::ChangeRect(hdwp
, &m_ListCtrl
, 0, delta
, 0, 0);
2452 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_LISTGROUP
), 0, delta
, 0, 0);
2453 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_SIGNOFF
), 0, delta
, 0, delta
);
2454 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_AMEND
), 0, delta
, 0, delta
);
2455 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_AMENDDIFF
), 0, delta
, 0, delta
);
2456 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_SETDATETIME
), 0, delta
, 0, delta
);
2457 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_DATEPICKER
), 0, delta
, 0, delta
);
2458 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_TIMEPICKER
), 0, delta
, 0, delta
);
2459 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_AS_COMMIT_DATE
), 0, delta
, 0, delta
);
2460 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_SETAUTHOR
), 0, delta
, 0, delta
);
2461 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_COMMIT_AUTHORDATA
), 0, delta
, 0, delta
);
2462 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_TEXT_INFO
), 0, delta
, 0, delta
);
2463 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_SELECTLABEL
), 0, delta
, 0, delta
);
2464 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKALL
), 0, delta
, 0, delta
);
2465 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKNONE
), 0, delta
, 0, delta
);
2466 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKUNVERSIONED
), 0, delta
, 0, delta
);
2467 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKVERSIONED
), 0, delta
, 0, delta
);
2468 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKADDED
), 0, delta
, 0, delta
);
2469 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKDELETED
), 0, delta
, 0, delta
);
2470 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKMODIFIED
), 0, delta
, 0, delta
);
2471 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKFILES
), 0, delta
, 0, delta
);
2472 CSplitterControl::ChangeRect(hdwp
, GetDlgItem(IDC_CHECKSUBMODULES
), 0, delta
, 0, delta
);
2473 EndDeferWindowPos(hdwp
);
2475 AddAnchor(IDC_MESSAGEGROUP
, TOP_LEFT
, TOP_RIGHT
);
2476 AddAnchor(IDC_LOGMESSAGE
, TOP_LEFT
, TOP_RIGHT
);
2477 AddAnchor(IDC_SPLITTER
, TOP_LEFT
, TOP_RIGHT
);
2478 AddAnchor(IDC_LISTGROUP
, TOP_LEFT
, BOTTOM_RIGHT
);
2479 AddAnchor(IDC_FILELIST
, TOP_LEFT
, BOTTOM_RIGHT
);
2480 AddAnchor(IDC_SIGNOFF
,TOP_RIGHT
);
2481 AddAnchor(IDC_COMMIT_AMEND
,TOP_LEFT
);
2482 AddAnchor(IDC_COMMIT_AMENDDIFF
,TOP_LEFT
);
2483 AddAnchor(IDC_COMMIT_SETDATETIME
,TOP_LEFT
);
2484 AddAnchor(IDC_COMMIT_DATEPICKER
,TOP_LEFT
);
2485 AddAnchor(IDC_COMMIT_TIMEPICKER
,TOP_LEFT
);
2486 AddAnchor(IDC_COMMIT_AS_COMMIT_DATE
, TOP_LEFT
);
2487 AddAnchor(IDC_COMMIT_SETAUTHOR
, TOP_LEFT
);
2488 AddAnchor(IDC_COMMIT_AUTHORDATA
, TOP_LEFT
, TOP_RIGHT
);
2489 AddAnchor(IDC_TEXT_INFO
,TOP_RIGHT
);
2490 AddAnchor(IDC_SELECTLABEL
, TOP_LEFT
);
2491 AddAnchor(IDC_CHECKALL
, TOP_LEFT
);
2492 AddAnchor(IDC_CHECKNONE
, TOP_LEFT
);
2493 AddAnchor(IDC_CHECKUNVERSIONED
, TOP_LEFT
);
2494 AddAnchor(IDC_CHECKVERSIONED
, TOP_LEFT
);
2495 AddAnchor(IDC_CHECKADDED
, TOP_LEFT
);
2496 AddAnchor(IDC_CHECKDELETED
, TOP_LEFT
);
2497 AddAnchor(IDC_CHECKMODIFIED
, TOP_LEFT
);
2498 AddAnchor(IDC_CHECKFILES
, TOP_LEFT
);
2499 AddAnchor(IDC_CHECKSUBMODULES
, TOP_LEFT
);
2501 // adjust the minimum size of the dialog to prevent the resizing from
2502 // moving the list control too far down.
2504 m_cLogMessage
.GetClientRect(rcLogMsg
);
2505 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(), m_DlgOrigRect
.Height()-m_LogMsgOrigRect
.Height()+rcLogMsg
.Height()));
2508 m_cLogMessage
.Invalidate();
2509 GetDlgItem(IDC_LOGMESSAGE
)->Invalidate();
2512 void CCommitDlg::OnSize(UINT nType
, int cx
, int cy
)
2514 // first, let the resizing take place
2515 __super::OnSize(nType
, cx
, cy
);
2521 CString
CCommitDlg::GetSignedOffByLine()
2525 CString username
= g_Git
.GetUserName();
2526 CString email
= g_Git
.GetUserEmail();
2527 username
.Remove(L
'\n');
2528 email
.Remove(L
'\n');
2530 str
.Format(L
"Signed-off-by: %s <%s>", (LPCTSTR
)username
, (LPCTSTR
)email
);
2535 void CCommitDlg::OnBnClickedSignOff()
2537 CString str
= GetSignedOffByLine();
2539 if (m_cLogMessage
.GetText().Find(str
) == -1) {
2540 m_cLogMessage
.SetText(m_cLogMessage
.GetText().TrimRight());
2541 int lastNewline
= m_cLogMessage
.GetText().ReverseFind(L
'\n');
2542 int foundByLine
= -1;
2543 if (lastNewline
> 0)
2544 foundByLine
= m_cLogMessage
.GetText().Find(L
"-by: ", lastNewline
);
2546 if (foundByLine
== -1 || foundByLine
< lastNewline
)
2547 str
= L
"\r\n" + str
;
2549 m_cLogMessage
.SetText(m_cLogMessage
.GetText() + L
"\r\n" + str
+ L
"\r\n");
2553 void CCommitDlg::OnBnClickedCommitAmend()
2556 if(this->m_bCommitAmend
&& this->m_AmendStr
.IsEmpty())
2559 if (rev
.GetCommit(L
"HEAD"))
2560 MessageBox(rev
.GetLastErr(), L
"TortoiseGit", MB_ICONERROR
);
2561 m_AmendStr
= rev
.GetSubject() + L
'\n' + rev
.GetBody();
2564 if(this->m_bCommitAmend
)
2566 this->m_NoAmendStr
=this->m_cLogMessage
.GetText();
2567 m_cLogMessage
.SetText(m_AmendStr
);
2568 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_SHOW
);
2569 if (m_bSetCommitDateTime
)
2570 m_AsCommitDateCtrl
.ShowWindow(SW_SHOW
);
2574 this->m_AmendStr
=this->m_cLogMessage
.GetText();
2575 m_cLogMessage
.SetText(m_NoAmendStr
);
2576 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_HIDE
);
2577 m_AsCommitDateCtrl
.ShowWindow(SW_HIDE
);
2578 m_AsCommitDateCtrl
.SetCheck(FALSE
);
2579 OnBnClickedCommitAsCommitDate();
2582 OnBnClickedCommitSetDateTime(); // to update the commit date and time
2583 OnBnClickedCommitSetauthor(); // to update the commit author
2585 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
2589 void CCommitDlg::OnBnClickedCommitMessageOnly()
2592 this->m_ListCtrl
.EnableWindow(m_bCommitMessageOnly
? FALSE
: TRUE
);
2593 SendMessage(WM_UPDATEOKBUTTON
);
2596 void CCommitDlg::OnBnClickedWholeProject()
2598 m_tooltips
.Pop(); // hide the tooltips
2603 if (m_bWholeProject
|| m_bWholeProject2
)
2604 m_ListCtrl
.GetStatus(nullptr, true, false, true);
2606 m_ListCtrl
.GetStatus(&this->m_pathList
,true,false,true);
2608 m_regShowWholeProject
= m_bWholeProject
;
2610 DWORD dwShow
= m_ListCtrl
.GetShowFlags();
2611 if (DWORD(m_regAddBeforeCommit
))
2612 dwShow
|= GITSLC_SHOWUNVERSIONED
;
2614 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
2616 m_ListCtrl
.StoreScrollPos();
2617 m_ListCtrl
.Show(dwShow
, dwShow
& ~(CTGitPath::LOGACTIONS_UNVER
), true);
2624 void CCommitDlg::OnFocusMessage()
2626 m_cLogMessage
.SetFocus();
2629 void CCommitDlg::OnFocusFileList()
2631 m_ListCtrl
.SetFocus();
2634 void CCommitDlg::OnScnUpdateUI(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2636 int pos
= (int)this->m_cLogMessage
.Call(SCI_GETCURRENTPOS
);
2637 int line
= (int)this->m_cLogMessage
.Call(SCI_LINEFROMPOSITION
,pos
);
2638 int column
= (int)this->m_cLogMessage
.Call(SCI_GETCOLUMN
,pos
);
2641 str
.Format(L
"%d/%d", line
+ 1, column
+ 1);
2642 this->GetDlgItem(IDC_TEXT_INFO
)->SetWindowText(str
);
2648 void CCommitDlg::TogglePatchView()
2650 OnStnClickedViewPatch();
2653 void CCommitDlg::OnStnClickedViewPatch()
2655 m_patchViewdlg
.m_ParentDlg
= this;
2656 if(!IsWindow(this->m_patchViewdlg
.m_hWnd
))
2658 BOOL viewPatchEnabled
= FALSE
;
2659 viewPatchEnabled
= g_Git
.GetConfigValueBool(L
"tgit.commitshowpatch");
2660 if (viewPatchEnabled
== FALSE
)
2661 g_Git
.SetConfigValue(L
"tgit.commitshowpatch", L
"true");
2662 m_patchViewdlg
.Create(IDD_PATCH_VIEW
,this);
2663 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTHTRACKING
, TRUE
);
2665 this->GetWindowRect(&rect
);
2667 m_patchViewdlg
.ShowWindow(SW_SHOW
);
2669 m_patchViewdlg
.SetWindowPos(nullptr, rect
.right
, rect
.top
, (DWORD
)CRegStdDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\PatchDlgWidth", rect
.Width()), rect
.Height(),
2670 SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOZORDER
);
2672 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
2674 ShowViewPatchText(false);
2679 g_Git
.SetConfigValue(L
"tgit.commitshowpatch", L
"false");
2680 m_patchViewdlg
.ShowWindow(SW_HIDE
);
2681 m_patchViewdlg
.DestroyWindow();
2682 ShowViewPatchText(true);
2684 this->m_ctrlShowPatch
.Invalidate();
2687 void CCommitDlg::OnMoving(UINT fwSide
, LPRECT pRect
)
2689 __super::OnMoving(fwSide
, pRect
);
2691 if (::IsWindow(m_patchViewdlg
.m_hWnd
))
2694 m_patchViewdlg
.GetWindowRect(&patchrect
);
2695 if (::IsWindow(m_hWnd
))
2698 GetWindowRect(&thisrect
);
2699 if (patchrect
.left
== thisrect
.right
)
2701 m_patchViewdlg
.SetWindowPos(nullptr, patchrect
.left
- (thisrect
.left
- pRect
->left
), patchrect
.top
- (thisrect
.top
- pRect
->top
),
2702 0, 0, SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOSIZE
| SWP_NOZORDER
);
2708 void CCommitDlg::OnSizing(UINT fwSide
, LPRECT pRect
)
2710 __super::OnSizing(fwSide
, pRect
);
2712 if(::IsWindow(this->m_patchViewdlg
.m_hWnd
))
2714 CRect thisrect
, patchrect
;
2715 this->GetWindowRect(thisrect
);
2716 this->m_patchViewdlg
.GetWindowRect(patchrect
);
2717 if(thisrect
.right
==patchrect
.left
)
2719 patchrect
.left
-= (thisrect
.right
- pRect
->right
);
2720 patchrect
.right
-= (thisrect
.right
- pRect
->right
);
2722 if( patchrect
.bottom
== thisrect
.bottom
)
2723 patchrect
.bottom
-= (thisrect
.bottom
- pRect
->bottom
);
2724 if( patchrect
.top
== thisrect
.top
)
2725 patchrect
.top
-= thisrect
.top
-pRect
->top
;
2726 m_patchViewdlg
.MoveWindow(patchrect
);
2731 void CCommitDlg::OnHdnItemchangedFilelist(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2734 TRACE("Item Changed\r\n");
2737 int CCommitDlg::CheckHeadDetach()
2740 if (CGit::GetCurrentBranchFromFile(g_Git
.m_CurrentDir
, output
))
2742 int retval
= CMessageBox::Show(GetSafeHwnd(), IDS_PROC_COMMIT_DETACHEDWARNING
, IDS_APPNAME
, MB_YESNOCANCEL
| MB_ICONWARNING
);
2745 if (CAppUtils::CreateBranchTag(FALSE
, nullptr, true) == FALSE
)
2748 else if (retval
== IDCANCEL
)
2754 void CCommitDlg::OnBnClickedCommitAmenddiff()
2760 void CCommitDlg::OnBnClickedNoautoselectsubmodules()
2766 void CCommitDlg::OnBnClickedCommitSetDateTime()
2770 if (m_bSetCommitDateTime
)
2772 CTime authordate
= CTime::GetCurrentTime();
2775 GitRev headRevision
;
2776 if (headRevision
.GetCommit(L
"HEAD"))
2777 MessageBox(headRevision
.GetLastErr(), L
"TortoiseGit", MB_ICONERROR
);
2778 authordate
= headRevision
.GetAuthorDate();
2779 m_AsCommitDateCtrl
.ShowWindow(SW_SHOW
);
2782 m_CommitDate
.SetTime(&authordate
);
2783 m_CommitTime
.SetTime(&authordate
);
2785 GetDlgItem(IDC_COMMIT_DATEPICKER
)->ShowWindow(SW_SHOW
);
2786 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->ShowWindow(SW_SHOW
);
2790 GetDlgItem(IDC_COMMIT_DATEPICKER
)->ShowWindow(SW_HIDE
);
2791 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->ShowWindow(SW_HIDE
);
2792 m_AsCommitDateCtrl
.ShowWindow(SW_HIDE
);
2793 m_AsCommitDateCtrl
.SetCheck(FALSE
);
2794 OnBnClickedCommitAsCommitDate();
2798 void CCommitDlg::OnBnClickedCommitAsCommitDate()
2800 GetDlgItem(IDC_COMMIT_DATEPICKER
)->EnableWindow(!m_AsCommitDateCtrl
.GetCheck());
2801 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->EnableWindow(!m_AsCommitDateCtrl
.GetCheck());
2804 void CCommitDlg::OnBnClickedCheckNewBranch()
2807 if (m_bCreateNewBranch
)
2809 GetDlgItem(IDC_COMMIT_TO
)->ShowWindow(SW_HIDE
);
2810 GetDlgItem(IDC_NEWBRANCH
)->ShowWindow(SW_SHOW
);
2814 GetDlgItem(IDC_NEWBRANCH
)->ShowWindow(SW_HIDE
);
2815 GetDlgItem(IDC_COMMIT_TO
)->ShowWindow(SW_SHOW
);
2819 bool CCommitDlg::RestoreFiles(bool doNotAsk
, bool allowCancel
)
2821 if (m_ListCtrl
.m_restorepaths
.empty())
2826 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);
2833 for (const auto& item
: m_ListCtrl
.m_restorepaths
)
2834 CopyFile(item
.second
, g_Git
.CombinePath(item
.first
), FALSE
);
2835 m_ListCtrl
.m_restorepaths
.clear();
2840 void CCommitDlg::UpdateCheckLinks()
2842 DialogEnableWindow(IDC_CHECKALL
, true);
2843 DialogEnableWindow(IDC_CHECKNONE
, true);
2844 DialogEnableWindow(IDC_CHECKUNVERSIONED
, m_ListCtrl
.GetUnversionedCount() > 0);
2845 DialogEnableWindow(IDC_CHECKVERSIONED
, m_ListCtrl
.GetItemCount() > m_ListCtrl
.GetUnversionedCount());
2846 DialogEnableWindow(IDC_CHECKADDED
, m_ListCtrl
.GetAddedCount() > 0);
2847 DialogEnableWindow(IDC_CHECKDELETED
, m_ListCtrl
.GetDeletedCount() > 0);
2848 DialogEnableWindow(IDC_CHECKMODIFIED
, m_ListCtrl
.GetModifiedCount() > 0);
2849 DialogEnableWindow(IDC_CHECKFILES
, m_ListCtrl
.GetFileCount() > 0);
2850 DialogEnableWindow(IDC_CHECKSUBMODULES
, m_ListCtrl
.GetSubmoduleCount() > 0);
2853 void CCommitDlg::OnBnClickedCommitSetauthor()
2859 m_sAuthor
.Format(L
"%s <%s>", (LPCTSTR
)g_Git
.GetUserName(), (LPCTSTR
)g_Git
.GetUserEmail());
2862 GitRev headRevision
;
2863 if (headRevision
.GetCommit(L
"HEAD"))
2864 MessageBox(headRevision
.GetLastErr(), L
"TortoiseGit", MB_ICONERROR
);
2865 m_sAuthor
.Format(L
"%s <%s>", (LPCTSTR
)headRevision
.GetAuthorName(), (LPCTSTR
)headRevision
.GetAuthorEmail());
2870 GetDlgItem(IDC_COMMIT_AUTHORDATA
)->ShowWindow(SW_SHOW
);
2873 GetDlgItem(IDC_COMMIT_AUTHORDATA
)->ShowWindow(SW_HIDE
);
2876 bool CCommitDlg::RunStartCommitHook()
2878 DWORD exitcode
= 0xFFFFFFFF;
2880 if (CHooks::Instance().StartCommit(g_Git
.m_CurrentDir
, m_pathList
, m_sLogMessage
, exitcode
, error
))
2885 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
2886 MessageBox(temp
, L
"TortoiseGit", MB_ICONERROR
);
2893 void CCommitDlg::OnSysColorChange()
2895 __super::OnSysColorChange();
2896 m_cLogMessage
.SetColors(true);
2897 m_cLogMessage
.SetFont(CAppUtils::GetLogFontName(), CAppUtils::GetLogFontSize());