1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2008 - TortoiseSVN
4 // Copyright (C) 2008-2012 - 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 "DirFileEnum.h"
24 //#include "GitConfig.h"
25 #include "ProjectProperties.h"
26 #include "MessageBox.h"
28 #include "PathUtils.h"
31 #include "GitStatus.h"
32 #include "HistoryDlg.h"
34 #include "UnicodeUtils.h"
35 #include "../TGitCache/CacheInterface.h"
36 #include "ProgressDlg.h"
37 #include "ShellUpdater.h"
38 #include "Commands/PushCommand.h"
39 #include "PatchViewDlg.h"
42 #include "SysProgressDlg.h"
43 #include "MassiveGitTask.h"
48 static char THIS_FILE
[] = __FILE__
;
51 UINT
CCommitDlg::WM_AUTOLISTREADY
= RegisterWindowMessage(_T("TORTOISEGIT_AUTOLISTREADY_MSG"));
52 UINT
CCommitDlg::WM_UPDATEOKBUTTON
= RegisterWindowMessage(_T("TORTOISEGIT_COMMIT_UPDATEOKBUTTON"));
54 IMPLEMENT_DYNAMIC(CCommitDlg
, CResizableStandAloneDialog
)
55 CCommitDlg::CCommitDlg(CWnd
* pParent
/*=NULL*/)
56 : CResizableStandAloneDialog(CCommitDlg::IDD
, pParent
)
58 , m_bShowUnversioned(FALSE
)
60 , m_bThreadRunning(FALSE
)
63 , m_bWholeProject(FALSE
)
64 , m_bKeepChangeList(TRUE
)
65 , m_bDoNotAutoselectSubmodules(FALSE
)
67 , m_bSelectFilesForCommit(TRUE
)
68 , m_bNoPostActions(FALSE
)
70 , m_bSetCommitDateTime(FALSE
)
71 , m_bCreateNewBranch(FALSE
)
72 , m_bCreateTagAfterCommit(FALSE
)
73 , m_bForceCommitAmend(false)
75 this->m_bCommitAmend
=FALSE
;
76 m_bPushAfterCommit
= FALSE
;
79 CCommitDlg::~CCommitDlg()
87 void CCommitDlg::DoDataExchange(CDataExchange
* pDX
)
89 CResizableStandAloneDialog::DoDataExchange(pDX
);
90 DDX_Control(pDX
, IDC_FILELIST
, m_ListCtrl
);
91 DDX_Control(pDX
, IDC_LOGMESSAGE
, m_cLogMessage
);
92 DDX_Check(pDX
, IDC_SHOWUNVERSIONED
, m_bShowUnversioned
);
93 DDX_Check(pDX
, IDC_COMMIT_SETDATETIME
, m_bSetCommitDateTime
);
94 DDX_Check(pDX
, IDC_CHECK_NEWBRANCH
, m_bCreateNewBranch
);
95 DDX_Text(pDX
, IDC_NEWBRANCH
, m_sCreateNewBranch
);
96 DDX_Text(pDX
, IDC_BUGID
, m_sBugID
);
97 DDX_Check(pDX
, IDC_WHOLE_PROJECT
, m_bWholeProject
);
98 DDX_Control(pDX
, IDC_SPLITTER
, m_wndSplitter
);
99 DDX_Check(pDX
, IDC_KEEPLISTS
, m_bKeepChangeList
);
100 DDX_Check(pDX
, IDC_NOAUTOSELECTSUBMODULES
, m_bDoNotAutoselectSubmodules
);
101 DDX_Check(pDX
,IDC_COMMIT_AMEND
,m_bCommitAmend
);
102 DDX_Check(pDX
,IDC_COMMIT_AMENDDIFF
,m_bAmendDiffToLastCommit
);
103 DDX_Control(pDX
,IDC_VIEW_PATCH
,m_ctrlShowPatch
);
104 DDX_Control(pDX
, IDC_COMMIT_DATEPICKER
, m_CommitDate
);
105 DDX_Control(pDX
, IDC_COMMIT_TIMEPICKER
, m_CommitTime
);
108 BEGIN_MESSAGE_MAP(CCommitDlg
, CResizableStandAloneDialog
)
109 ON_BN_CLICKED(IDHELP
, OnBnClickedHelp
)
110 ON_BN_CLICKED(IDC_SHOWUNVERSIONED
, OnBnClickedShowunversioned
)
111 ON_NOTIFY(SCN_UPDATEUI
, IDC_LOGMESSAGE
, OnScnUpdateUI
)
112 // ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)
113 ON_BN_CLICKED(IDC_BUGTRAQBUTTON
, OnBnClickedBugtraqbutton
)
114 ON_EN_CHANGE(IDC_LOGMESSAGE
, OnEnChangeLogmessage
)
115 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
, OnGitStatusListCtrlItemCountChanged
)
116 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
, OnGitStatusListCtrlNeedsRefresh
)
117 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ADDFILE
, OnFileDropped
)
118 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_CHECKCHANGED
, &CCommitDlg::OnGitStatusListCtrlCheckChanged
)
119 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED
, &CCommitDlg::OnGitStatusListCtrlItemChanged
)
121 ON_REGISTERED_MESSAGE(CLinkControl::LK_LINKITEMCLICKED
, &CCommitDlg::OnCheck
)
122 ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY
, OnAutoListReady
)
123 ON_REGISTERED_MESSAGE(WM_UPDATEOKBUTTON
, OnUpdateOKButton
)
126 ON_STN_CLICKED(IDC_EXTERNALWARNING
, &CCommitDlg::OnStnClickedExternalwarning
)
127 ON_BN_CLICKED(IDC_SIGNOFF
, &CCommitDlg::OnBnClickedSignOff
)
128 ON_BN_CLICKED(IDC_COMMIT_AMEND
, &CCommitDlg::OnBnClickedCommitAmend
)
129 ON_BN_CLICKED(IDC_WHOLE_PROJECT
, &CCommitDlg::OnBnClickedWholeProject
)
130 ON_COMMAND(ID_FOCUS_MESSAGE
,&CCommitDlg::OnFocusMessage
)
131 ON_STN_CLICKED(IDC_VIEW_PATCH
, &CCommitDlg::OnStnClickedViewPatch
)
135 ON_NOTIFY(HDN_ITEMCHANGED
, 0, &CCommitDlg::OnHdnItemchangedFilelist
)
136 ON_BN_CLICKED(IDC_COMMIT_AMENDDIFF
, &CCommitDlg::OnBnClickedCommitAmenddiff
)
137 ON_BN_CLICKED(IDC_NOAUTOSELECTSUBMODULES
, &CCommitDlg::OnBnClickedNoautoselectsubmodules
)
138 ON_BN_CLICKED(IDC_COMMIT_SETDATETIME
, &CCommitDlg::OnBnClickedCommitSetDateTime
)
139 ON_BN_CLICKED(IDC_CHECK_NEWBRANCH
, &CCommitDlg::OnBnClickedCheckNewBranch
)
142 BOOL
CCommitDlg::OnInitDialog()
144 CResizableStandAloneDialog::OnInitDialog();
145 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
147 CAppUtils::GetCommitTemplate(this->m_sLogMessage
);
150 g_GitAdminDir
.GetAdminDirPath(g_Git
.m_CurrentDir
, dotGitPath
);
151 if(PathFileExists(dotGitPath
+ _T("MERGE_MSG")))
154 if(file
.Open(dotGitPath
+ _T("MERGE_MSG"), CFile::modeRead
))
157 while(file
.ReadString(str
))
159 m_sLogMessage
+= str
;
161 m_sLogMessage
+= _T("\n");
166 if (CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive())
167 DialogEnableWindow(IDC_CHECK_NEWBRANCH
, FALSE
);
169 m_regAddBeforeCommit
= CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE
);
170 m_bShowUnversioned
= m_regAddBeforeCommit
;
172 m_History
.SetMaxHistoryItems((LONG
)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));
174 m_regKeepChangelists
= CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE
);
175 m_bKeepChangeList
= m_regKeepChangelists
;
177 m_regDoNotAutoselectSubmodules
= CRegDWORD(_T("Software\\TortoiseGit\\DoNotAutoselectSubmodules"), FALSE
);
178 m_bDoNotAutoselectSubmodules
= m_regDoNotAutoselectSubmodules
;
180 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_COMMITDLG
));
183 // m_bWholeProject = config.KeepLocks();
185 if(this->m_pathList
.GetCount() == 0)
186 m_bWholeProject
=true;
188 if(this->m_pathList
.GetCount() == 1 && m_pathList
[0].IsEmpty())
189 m_bWholeProject
=true;
195 m_ListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
, _T("CommitDlg"),(GITSLC_POPALL
^ (GITSLC_POPCOMMIT
| GITSLC_POPSAVEAS
)), true, true);
196 m_ListCtrl
.SetStatLabel(GetDlgItem(IDC_STATISTICS
));
197 m_ListCtrl
.SetCancelBool(&m_bCancelled
);
198 m_ListCtrl
.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT
);
199 m_ListCtrl
.EnableFileDrop();
200 m_ListCtrl
.SetBackgroundImage(IDI_COMMIT_BKG
);
202 //this->DialogEnableWindow(IDC_COMMIT_AMEND,FALSE);
203 m_ProjectProperties
.ReadPropsPathList(m_pathList
);
205 m_cLogMessage
.Init(m_ProjectProperties
);
206 m_cLogMessage
.SetFont((CString
)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));
207 m_cLogMessage
.RegisterContextMenuHandler(this);
209 OnEnChangeLogmessage();
211 m_tooltips
.Create(this);
212 m_tooltips
.AddTool(IDC_EXTERNALWARNING
, IDS_COMMITDLG_EXTERNALS
);
213 m_tooltips
.AddTool(IDC_COMMIT_AMEND
,IDS_COMMIT_AMEND_TT
);
214 // m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);
216 CBugTraqAssociations bugtraq_associations
;
217 bugtraq_associations
.Load();
219 if (bugtraq_associations
.FindProvider(g_Git
.m_CurrentDir
, &m_bugtraq_association
))
221 GetDlgItem(IDC_BUGID
)->ShowWindow(SW_HIDE
);
222 GetDlgItem(IDC_BUGIDLABEL
)->ShowWindow(SW_HIDE
);
224 CComPtr
<IBugTraqProvider
> pProvider
;
225 HRESULT hr
= pProvider
.CoCreateInstance(m_bugtraq_association
.GetProviderClass());
228 m_BugTraqProvider
= pProvider
;
230 if (SUCCEEDED(hr
= pProvider
->GetLinkText(GetSafeHwnd(), m_bugtraq_association
.GetParameters().AllocSysString(), &temp
)))
232 SetDlgItemText(IDC_BUGTRAQBUTTON
, temp
);
233 GetDlgItem(IDC_BUGTRAQBUTTON
)->EnableWindow(TRUE
);
234 GetDlgItem(IDC_BUGTRAQBUTTON
)->ShowWindow(SW_SHOW
);
240 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
242 else if (!m_ProjectProperties
.sMessage
.IsEmpty())
244 GetDlgItem(IDC_BUGID
)->ShowWindow(SW_SHOW
);
245 GetDlgItem(IDC_BUGIDLABEL
)->ShowWindow(SW_SHOW
);
246 if (!m_ProjectProperties
.sLabel
.IsEmpty())
247 SetDlgItemText(IDC_BUGIDLABEL
, m_ProjectProperties
.sLabel
);
248 GetDlgItem(IDC_BUGTRAQBUTTON
)->ShowWindow(SW_HIDE
);
249 GetDlgItem(IDC_BUGTRAQBUTTON
)->EnableWindow(FALSE
);
250 GetDlgItem(IDC_BUGID
)->SetFocus();
251 CString sBugID
= m_ProjectProperties
.GetBugIDFromLog(m_sLogMessage
);
252 if (!sBugID
.IsEmpty())
254 SetDlgItemText(IDC_BUGID
, sBugID
);
259 GetDlgItem(IDC_BUGID
)->ShowWindow(SW_HIDE
);
260 GetDlgItem(IDC_BUGIDLABEL
)->ShowWindow(SW_HIDE
);
261 GetDlgItem(IDC_BUGTRAQBUTTON
)->ShowWindow(SW_HIDE
);
262 GetDlgItem(IDC_BUGTRAQBUTTON
)->EnableWindow(FALSE
);
263 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
266 if (!m_sLogMessage
.IsEmpty())
267 m_cLogMessage
.SetText(m_sLogMessage
);
269 GetWindowText(m_sWindowTitle
);
271 AdjustControlSize(IDC_SHOWUNVERSIONED
);
272 AdjustControlSize(IDC_WHOLE_PROJECT
);
273 AdjustControlSize(IDC_CHECK_NEWBRANCH
);
274 AdjustControlSize(IDC_COMMIT_AMEND
);
275 AdjustControlSize(IDC_COMMIT_AMENDDIFF
);
276 AdjustControlSize(IDC_COMMIT_SETDATETIME
);
277 AdjustControlSize(IDC_NOAUTOSELECTSUBMODULES
);
278 AdjustControlSize(IDC_KEEPLISTS
);
280 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKALL
);
281 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKNONE
);
282 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKUNVERSIONED
);
283 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKVERSIONED
);
284 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKADDED
);
285 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKDELETED
);
286 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKMODIFIED
);
287 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKFILES
);
288 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKSUBMODULES
);
290 // line up all controls and adjust their sizes.
291 #define LINKSPACING 9
292 RECT rc
= AdjustControlSize(IDC_SELECTLABEL
);
293 rc
.right
-= 15; // AdjustControlSize() adds 20 pixels for the checkbox/radio button bitmap, but this is a label...
294 rc
= AdjustStaticSize(IDC_CHECKALL
, rc
, LINKSPACING
);
295 rc
= AdjustStaticSize(IDC_CHECKNONE
, rc
, LINKSPACING
);
296 rc
= AdjustStaticSize(IDC_CHECKUNVERSIONED
, rc
, LINKSPACING
);
297 rc
= AdjustStaticSize(IDC_CHECKVERSIONED
, rc
, LINKSPACING
);
298 rc
= AdjustStaticSize(IDC_CHECKADDED
, rc
, LINKSPACING
);
299 rc
= AdjustStaticSize(IDC_CHECKDELETED
, rc
, LINKSPACING
);
300 rc
= AdjustStaticSize(IDC_CHECKMODIFIED
, rc
, LINKSPACING
);
301 rc
= AdjustStaticSize(IDC_CHECKFILES
, rc
, LINKSPACING
);
302 rc
= AdjustStaticSize(IDC_CHECKSUBMODULES
, rc
, LINKSPACING
);
304 GetClientRect(m_DlgOrigRect
);
305 m_cLogMessage
.GetClientRect(m_LogMsgOrigRect
);
307 AddAnchor(IDC_COMMITLABEL
, TOP_LEFT
, TOP_RIGHT
);
308 AddAnchor(IDC_BUGIDLABEL
, TOP_RIGHT
);
309 AddAnchor(IDC_BUGID
, TOP_RIGHT
);
310 AddAnchor(IDC_BUGTRAQBUTTON
, TOP_RIGHT
);
311 AddAnchor(IDC_COMMIT_TO
, TOP_LEFT
, TOP_RIGHT
);
312 AddAnchor(IDC_CHECK_NEWBRANCH
, TOP_RIGHT
);
313 AddAnchor(IDC_NEWBRANCH
, TOP_LEFT
, TOP_RIGHT
);
314 AddAnchor(IDC_MESSAGEGROUP
, TOP_LEFT
, TOP_RIGHT
);
315 // AddAnchor(IDC_HISTORY, TOP_LEFT);
316 AddAnchor(IDC_LOGMESSAGE
, TOP_LEFT
, TOP_RIGHT
);
317 AddAnchor(IDC_SIGNOFF
, TOP_RIGHT
);
318 AddAnchor(IDC_VIEW_PATCH
, BOTTOM_RIGHT
);
319 AddAnchor(IDC_LISTGROUP
, TOP_LEFT
, BOTTOM_RIGHT
);
320 AddAnchor(IDC_SPLITTER
, TOP_LEFT
, TOP_RIGHT
);
321 AddAnchor(IDC_FILELIST
, TOP_LEFT
, BOTTOM_RIGHT
);
322 AddAnchor(IDC_SHOWUNVERSIONED
, BOTTOM_LEFT
);
323 AddAnchor(IDC_EXTERNALWARNING
, BOTTOM_RIGHT
);
324 AddAnchor(IDC_STATISTICS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
325 AddAnchor(IDC_TEXT_INFO
, TOP_RIGHT
);
326 AddAnchor(IDC_WHOLE_PROJECT
, BOTTOM_LEFT
);
327 AddAnchor(IDC_KEEPLISTS
, BOTTOM_LEFT
);
328 AddAnchor(IDC_NOAUTOSELECTSUBMODULES
, BOTTOM_LEFT
);
329 AddAnchor(IDOK
, BOTTOM_RIGHT
);
330 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
331 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
332 AddAnchor(IDC_COMMIT_AMEND
,TOP_LEFT
);
333 AddAnchor(IDC_COMMIT_AMENDDIFF
,TOP_LEFT
);
334 AddAnchor(IDC_COMMIT_SETDATETIME
,TOP_LEFT
);
335 AddAnchor(IDC_COMMIT_DATEPICKER
,TOP_LEFT
);
336 AddAnchor(IDC_COMMIT_TIMEPICKER
,TOP_LEFT
);
338 AddAnchor(IDC_SELECTLABEL
, TOP_LEFT
);
339 AddAnchor(IDC_CHECKALL
, TOP_LEFT
);
340 AddAnchor(IDC_CHECKNONE
, TOP_LEFT
);
341 AddAnchor(IDC_CHECKUNVERSIONED
, TOP_LEFT
);
342 AddAnchor(IDC_CHECKVERSIONED
, TOP_LEFT
);
343 AddAnchor(IDC_CHECKADDED
, TOP_LEFT
);
344 AddAnchor(IDC_CHECKDELETED
, TOP_LEFT
);
345 AddAnchor(IDC_CHECKMODIFIED
, TOP_LEFT
);
346 AddAnchor(IDC_CHECKFILES
, TOP_LEFT
);
347 AddAnchor(IDC_CHECKSUBMODULES
, TOP_LEFT
);
350 CenterWindow(CWnd::FromHandle(hWndExplorer
));
351 EnableSaveRestore(_T("CommitDlg"));
352 DWORD yPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
353 RECT rcDlg
, rcLogMsg
, rcFileList
;
354 GetClientRect(&rcDlg
);
355 m_cLogMessage
.GetWindowRect(&rcLogMsg
);
356 ScreenToClient(&rcLogMsg
);
357 m_ListCtrl
.GetWindowRect(&rcFileList
);
358 ScreenToClient(&rcFileList
);
362 m_wndSplitter
.GetWindowRect(&rectSplitter
);
363 ScreenToClient(&rectSplitter
);
364 int delta
= yPos
- rectSplitter
.top
;
365 if ((rcLogMsg
.bottom
+ delta
> rcLogMsg
.top
)&&(rcLogMsg
.bottom
+ delta
< rcFileList
.bottom
- 30))
367 m_wndSplitter
.SetWindowPos(NULL
, 0, yPos
, 0, 0, SWP_NOSIZE
);
372 // add all directories to the watcher
374 for (int i=0; i<m_pathList.GetCount(); ++i)
376 if (m_pathList[i].IsDirectory())
377 m_pathwatcher.AddPath(m_pathList[i]);
380 m_updatedPathList
= m_pathList
;
382 //first start a thread to obtain the file list with the status without
383 //blocking the dialog
384 InterlockedExchange(&m_bBlock
, TRUE
);
385 m_pThread
= AfxBeginThread(StatusThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
388 CMessageBox::Show(this->m_hWnd
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
389 InterlockedExchange(&m_bBlock
, FALSE
);
393 m_pThread
->m_bAutoDelete
= FALSE
;
394 m_pThread
->ResumeThread();
396 CRegDWORD err
= CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE
);
397 CRegDWORD historyhint
= CRegDWORD(_T("Software\\TortoiseGit\\HistoryHintShown"), FALSE
);
398 if ((((DWORD
)err
)!=FALSE
)&&((((DWORD
)historyhint
)==FALSE
)))
401 // ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);
405 this->m_ctrlShowPatch
.SetURL(CString());
407 BOOL viewPatchEnabled
= FALSE
;
408 m_ProjectProperties
.GetBOOLProps(viewPatchEnabled
, _T("tgit.commitshowpatch"));
409 if (viewPatchEnabled
)
410 OnStnClickedViewPatch();
412 return FALSE
; // return TRUE unless you set the focus to a control
413 // EXCEPTION: OCX Property Pages should return FALSE
416 void CCommitDlg::OnOK()
420 if (m_bThreadRunning
)
423 InterlockedExchange(&m_bRunThread
, FALSE
);
424 WaitForSingleObject(m_pThread
->m_hThread
, 1000);
425 if (m_bThreadRunning
)
427 // we gave the thread a chance to quit. Since the thread didn't
428 // listen to us we have to kill it.
429 TerminateThread(m_pThread
->m_hThread
, (DWORD
)-1);
430 InterlockedExchange(&m_bThreadRunning
, FALSE
);
435 if (m_bCreateNewBranch
)
437 if (!g_Git
.IsBranchNameValid(m_sCreateNewBranch
))
439 ShowEditBalloon(IDC_NEWBRANCH
, IDS_B_T_NOTEMPTY
, TTI_ERROR
);
442 if (g_Git
.BranchTagExists(m_sCreateNewBranch
))
444 // branch already exists
446 msg
.LoadString(IDS_B_EXISTS
);
447 msg
+= _T(" ") + CString(MAKEINTRESOURCE(IDS_B_DELETEORDIFFERENTNAME
));
448 ShowEditBalloon(IDC_NEWBRANCH
, msg
, CString(MAKEINTRESOURCE(IDS_WARN_WARNING
)));
451 if (g_Git
.BranchTagExists(m_sCreateNewBranch
, false))
453 // tag with the same name exists -> shortref is ambiguous
454 if (CMessageBox::Show(m_hWnd
, IDS_B_SAMETAGNAMEEXISTS
, IDS_APPNAME
, 2, IDI_EXCLAMATION
, IDS_CONTINUEBUTTON
, IDS_ABORTBUTTON
) == 2)
460 GetDlgItemText(IDC_BUGID
, id
);
461 if (!m_ProjectProperties
.CheckBugID(id
))
463 ShowEditBalloon(IDC_BUGID
, IDS_COMMITDLG_ONLYNUMBERS
, TTI_ERROR
);
466 m_sLogMessage
= m_cLogMessage
.GetText();
467 if ( m_sLogMessage
.IsEmpty() )
469 // no message entered, go round again
470 CMessageBox::Show(this->m_hWnd
, IDS_COMMITDLG_NOMESSAGE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
473 if ((m_ProjectProperties
.bWarnIfNoIssue
) && (id
.IsEmpty() && !m_ProjectProperties
.HasBugID(m_sLogMessage
)))
475 if (CMessageBox::Show(this->m_hWnd
, IDS_COMMITDLG_NOISSUEWARNING
, IDS_APPNAME
, MB_YESNO
| MB_ICONWARNING
)!=IDYES
)
479 BOOL bWarnNoSignedOffBy
= FALSE
;
480 ProjectProperties::GetBOOLProps(bWarnNoSignedOffBy
, _T("tgit.warnnosignedoffby"));
481 if (bWarnNoSignedOffBy
== TRUE
&& m_cLogMessage
.GetText().Find(GetSignedOffByLine()) == -1)
483 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
);
486 OnBnClickedSignOff();
487 m_sLogMessage
= m_cLogMessage
.GetText();
489 else if (retval
== 3)
493 int nListItems
= m_ListCtrl
.GetItemCount();
494 for (int i
= 0; i
< nListItems
; i
++)
496 CTGitPath
*entry
= (CTGitPath
*)m_ListCtrl
.GetItemData(i
);
497 if (!entry
->m_Checked
|| !entry
->IsDirectory())
501 if (entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
504 g_Git
.Run(_T("git.exe status --porcelain"), &subcmdout
, CP_UTF8
);
505 dirty
= !subcmdout
.IsEmpty();
510 cmd
.Format(_T("git.exe diff -- \"%s\""), entry
->GetWinPathString());
511 g_Git
.Run(cmd
, &cmdout
, CP_UTF8
);
512 dirty
= cmdout
.Right(7) == _T("-dirty\n");
518 message
.Format(CString(MAKEINTRESOURCE(IDS_COMMITDLG_SUBMODULEDIRTY
)), entry
->GetGitPathString());
519 int result
= CMessageBox::Show(m_hWnd
, message
, _T("TortoiseGit"), 1, IDI_QUESTION
, CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_COMMIT
)), CString(MAKEINTRESOURCE(IDS_MSGBOX_IGNORE
)), CString(MAKEINTRESOURCE(IDS_MSGBOX_CANCEL
)));
523 cmdCommit
.Format(_T("/command:commit /path:\"%s\\%s\""), g_Git
.m_CurrentDir
, entry
->GetWinPathString());
524 CAppUtils::RunTortoiseProc(cmdCommit
);
527 else if (result
== 2)
534 m_ListCtrl
.WriteCheckedNamesToPathList(m_selectedPathList
);
535 m_pathwatcher
.Stop();
536 InterlockedExchange(&m_bBlock
, TRUE
);
537 CDWordArray arDeleted
;
538 //first add all the unversioned files the user selected
539 //and check if all versioned files are selected
543 CTGitPathList itemsToAdd
;
544 CTGitPathList itemsToRemove
;
545 CMassiveGitTask
mgtReAddAfterCommit(_T("add --ignore-errors -f"));
550 bool bAddSuccess
=true;
551 bool bCloseCommitDlg
=false;
553 CSysProgressDlg sysProgressDlg
;
554 if (nListItems
>= 25 && sysProgressDlg
.IsValid())
556 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_PREPARECOMMIT
)));
557 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_UPDATEINDEX
)));
558 sysProgressDlg
.SetTime(true);
559 sysProgressDlg
.SetShowProgressBar(true);
560 sysProgressDlg
.ShowModal(this, true);
563 CBlockCacheForPath
cacheBlock(g_Git
.m_CurrentDir
);
564 DWORD currentTicks
= GetTickCount();
566 for (int j
=0; j
<nListItems
; j
++)
568 CTGitPath
*entry
= (CTGitPath
*)m_ListCtrl
.GetItemData(j
);
569 if (sysProgressDlg
.IsValid())
571 if (GetTickCount() - currentTicks
> 1000 || j
== nListItems
- 1 || j
== 0)
573 sysProgressDlg
.SetLine(2, entry
->GetGitPathString(), true);
574 sysProgressDlg
.SetProgress(j
, nListItems
);
575 AfxGetThread()->PumpMessage(); // process messages, in order to avoid freezing; do not call this too: this takes time!
576 currentTicks
= GetTickCount();
579 if (entry
->m_Checked
)
581 if( entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
582 cmd
.Format(_T("git.exe add -f -- \"%s\""),entry
->GetGitPathString());
583 else if ( entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
584 cmd
.Format(_T("git.exe update-index --force-remove -- \"%s\""),entry
->GetGitPathString());
586 cmd
.Format(_T("git.exe update-index -- \"%s\""),entry
->GetGitPathString());
588 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
590 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
591 bAddSuccess
= false ;
595 if( entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
596 cmd
.Format(_T("git.exe rm -- \"%s\""), entry
->GetGitOldPathString());
598 g_Git
.Run(cmd
, &out
, CP_UTF8
);
604 if(entry
->m_Action
& CTGitPath::LOGACTIONS_ADDED
|| entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
605 { //To init git repository, there are not HEAD, so we can use git reset command
606 cmd
.Format(_T("git.exe rm -f --cache -- \"%s\""),entry
->GetGitPathString());
607 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
609 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
610 bAddSuccess
= false ;
611 bCloseCommitDlg
=false;
614 mgtReAddAfterCommit
.AddFile(*entry
);
616 if (entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
&& !entry
->GetGitOldPathString().IsEmpty())
618 if (m_bCommitAmend
&& !m_bAmendDiffToLastCommit
)
619 cmd
.Format(_T("git.exe reset HEAD~1 -- \"%s\""), entry
->GetGitOldPathString());
621 cmd
.Format(_T("git.exe reset -- \"%s\""), entry
->GetGitOldPathString());
622 g_Git
.Run(cmd
, &out
, CP_UTF8
);
625 else if(!( entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
) )
627 if (m_bCommitAmend
&& !m_bAmendDiffToLastCommit
)
629 cmd
.Format(_T("git.exe reset HEAD~1 -- \"%s\""), entry
->GetGitPathString());
633 cmd
.Format(_T("git.exe reset -- \"%s\""), entry
->GetGitPathString());
635 g_Git
.Run(cmd
, &out
, CP_UTF8
);
636 if (m_bCommitAmend
&& !m_bAmendDiffToLastCommit
)
641 if (sysProgressDlg
.IsValid() && sysProgressDlg
.HasUserCancelled())
647 CShellUpdater::Instance().AddPathForUpdate(*entry
);
650 if (sysProgressDlg
.IsValid())
651 sysProgressDlg
.Stop();
653 if (bAddSuccess
&& m_bCreateNewBranch
)
655 if (g_Git
.Run(_T("git branch ") + m_sCreateNewBranch
, &out
, CP_UTF8
))
657 MessageBox(_T("Creating new branch failed:\n") + out
, _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
660 if (g_Git
.Run(_T("git checkout ") + m_sCreateNewBranch
, &out
, CP_UTF8
))
662 MessageBox(_T("Switching to new branch failed:\n") + out
, _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
667 if (bAddSuccess
&& CheckHeadDetach())
671 CString sExistingBugID
= m_ProjectProperties
.FindBugID(m_sLogMessage
);
672 sExistingBugID
.Trim();
673 if (!m_sBugID
.IsEmpty() && m_sBugID
.Compare(sExistingBugID
))
675 m_sBugID
.Replace(_T(", "), _T(","));
676 m_sBugID
.Replace(_T(" ,"), _T(","));
677 CString sBugID
= m_ProjectProperties
.sMessage
;
678 sBugID
.Replace(_T("%BUGID%"), m_sBugID
);
679 if (m_ProjectProperties
.bAppend
)
680 m_sLogMessage
+= _T("\n") + sBugID
+ _T("\n");
682 m_sLogMessage
= sBugID
+ _T("\n") + m_sLogMessage
;
685 // now let the bugtraq plugin check the commit message
686 CComPtr
<IBugTraqProvider2
> pProvider2
= NULL
;
687 if (m_BugTraqProvider
)
689 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider2
);
693 CString common
= g_Git
.m_CurrentDir
;
694 BSTR repositoryRoot
= common
.AllocSysString();
695 BSTR parameters
= m_bugtraq_association
.GetParameters().AllocSysString();
696 BSTR commonRoot
= SysAllocString(m_pathList
.GetCommonRoot().GetDirectory().GetWinPath());
697 BSTR commitMessage
= m_sLogMessage
.AllocSysString();
698 SAFEARRAY
*pathList
= SafeArrayCreateVector(VT_BSTR
, 0, m_selectedPathList
.GetCount());
700 for (LONG index
= 0; index
< m_selectedPathList
.GetCount(); ++index
)
701 SafeArrayPutElement(pathList
, &index
, m_selectedPathList
[index
].GetGitPathString().AllocSysString());
703 if (FAILED(hr
= pProvider2
->CheckCommit(GetSafeHwnd(), parameters
, repositoryRoot
, commonRoot
, pathList
, commitMessage
, &temp
)))
707 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, m_bugtraq_association
.GetProviderName(), ce
.GetMessageAndDescription().c_str());
708 CMessageBox::Show(m_hWnd
, sErr
, _T("TortoiseGit"), MB_ICONERROR
);
712 CString sError
= temp
;
713 if (!sError
.IsEmpty())
715 CMessageBox::Show(m_hWnd
, sError
, _T("TortoiseGit"), MB_ICONERROR
);
723 if (bAddSuccess
&& (nchecked
|| m_bCommitAmend
|| CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive()))
725 bCloseCommitDlg
= true;
727 CString tempfile
=::GetTempFile();
729 CAppUtils::SaveCommitUnicodeFile(tempfile
,m_sLogMessage
);
731 CTGitPath path
=g_Git
.m_CurrentDir
;
733 BOOL IsGitSVN
= path
.GetAdminDirMask() & ITEMIS_GITSVN
;
737 if(this->m_bCommitAmend
)
742 if (m_bSetCommitDateTime
)
745 m_CommitDate
.GetTime(date
);
746 m_CommitTime
.GetTime(time
);
747 dateTime
.Format(_T("--date=%sT%s"), date
.Format(_T("%Y-%m-%d")), time
.Format(_T("%H:%M:%S")));
749 cmd
.Format(_T("git.exe commit %s %s -F \"%s\""), dateTime
, amend
, tempfile
);
751 CCommitProgressDlg progress
;
752 progress
.m_bBufferAll
=true; // improve show speed when there are many file added.
753 progress
.m_GitCmd
=cmd
;
754 progress
.m_bShowCommand
= FALSE
; // don't show the commit command
755 progress
.m_PreText
= out
; // show any output already generated in log window
756 progress
.m_bAutoCloseOnSuccess
= m_bAutoClose
;
758 int indexReCommit
= -1;
761 if (!m_bNoPostActions
&& !m_bAutoClose
)
764 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUSVNDCOMMIT
)));
765 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUPUSH
)));
766 indexReCommit
= (int)progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_RECOMMIT
)));
767 indexTag
= (int)progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUTAG
)));
770 INT_PTR userResponse
= progress
.DoModal();
772 if(progress
.m_GitStatus
|| userResponse
== (IDC_PROGRESS_BUTTON1
+ indexReCommit
))
774 bCloseCommitDlg
= false;
775 if (userResponse
== IDC_PROGRESS_BUTTON1
+ indexReCommit
)
777 this->m_sLogMessage
.Empty();
778 m_cLogMessage
.SetText(m_sLogMessage
);
781 m_bCommitAmend
= FALSE
;
785 else if (userResponse
== IDC_PROGRESS_BUTTON1
+ indexTag
)
787 m_bCreateTagAfterCommit
=true;
789 else if (userResponse
>= IDC_PROGRESS_BUTTON1
&& userResponse
< IDC_PROGRESS_BUTTON1
+ indexReCommit
)
791 // User pressed 'DCommit' or 'Push' button after successful commit.
792 m_bPushAfterCommit
=true;
793 if (userResponse
== IDC_PROGRESS_BUTTON1
&& IsGitSVN
)
794 m_PostCmd
= GIT_POST_CMD_DCOMMIT
;
796 m_PostCmd
= GIT_POST_CMD_PUSH
;
799 CFile::Remove(tempfile
);
801 if (m_BugTraqProvider
&& progress
.m_GitStatus
== 0)
803 CComPtr
<IBugTraqProvider2
> pProvider
= NULL
;
804 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider
);
807 BSTR commonRoot
= SysAllocString(g_Git
.m_CurrentDir
);
808 SAFEARRAY
*pathList
= SafeArrayCreateVector(VT_BSTR
, 0,this->m_selectedPathList
.GetCount());
810 for (LONG index
= 0; index
< m_selectedPathList
.GetCount(); ++index
)
811 SafeArrayPutElement(pathList
, &index
, m_selectedPathList
[index
].GetGitPathString().AllocSysString());
813 BSTR logMessage
= m_sLogMessage
.AllocSysString();
815 CGitHash hash
=g_Git
.GetHash(_T("HEAD"));
816 LONG version
= g_Git
.Hash2int(hash
);
819 if (FAILED(hr
= pProvider
->OnCommitFinished(GetSafeHwnd(),
828 CMessageBox::Show(NULL
,(sErr
),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
832 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, ce
.GetSource().c_str(), ce
.GetMessageAndDescription().c_str());
833 CMessageBox::Show(NULL
,(sErr
),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
840 RestoreFiles(progress
.m_GitStatus
== 0);
841 if (((DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit"), TRUE
)) == TRUE
)
844 mgtReAddAfterCommit
.Execute(cancel
);
849 CMessageBox::Show(this->m_hWnd
, IDS_ERROR_NOTHING_COMMIT
, IDS_COMMIT_FINISH
, MB_OK
| MB_ICONINFORMATION
);
850 bCloseCommitDlg
=false;
854 m_regAddBeforeCommit
= m_bShowUnversioned
;
855 if (!GetDlgItem(IDC_WHOLE_PROJECT
)->IsWindowEnabled())
856 m_bWholeProject
= FALSE
;
857 m_regKeepChangelists
= m_bKeepChangeList
;
858 m_regDoNotAutoselectSubmodules
= m_bDoNotAutoselectSubmodules
;
859 if (!GetDlgItem(IDC_KEEPLISTS
)->IsWindowEnabled())
860 m_bKeepChangeList
= FALSE
;
861 InterlockedExchange(&m_bBlock
, FALSE
);
863 if (!m_sLogMessage
.IsEmpty())
865 m_History
.AddEntry(m_sLogMessage
);
871 if( bCloseCommitDlg
)
872 CResizableStandAloneDialog::OnOK();
874 CShellUpdater::Instance().Flush();
877 void CCommitDlg::SaveSplitterPos()
881 CRegDWORD regPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
883 m_wndSplitter
.GetWindowRect(&rectSplitter
);
884 ScreenToClient(&rectSplitter
);
885 regPos
= rectSplitter
.top
;
889 UINT
CCommitDlg::StatusThreadEntry(LPVOID pVoid
)
891 return ((CCommitDlg
*)pVoid
)->StatusThread();
894 UINT
CCommitDlg::StatusThread()
896 //get the status of all selected file/folders recursively
897 //and show the ones which have to be committed to the user
899 InterlockedExchange(&m_bBlock
, TRUE
);
900 InterlockedExchange(&m_bThreadRunning
, TRUE
);// so the main thread knows that this thread is still running
901 InterlockedExchange(&m_bRunThread
, TRUE
); // if this is set to FALSE, the thread should stop
903 m_pathwatcher
.Stop();
905 g_Git
.RefreshGitIndex();
907 m_bCancelled
= false;
909 DialogEnableWindow(IDOK
, false);
910 DialogEnableWindow(IDC_SHOWUNVERSIONED
, false);
911 DialogEnableWindow(IDC_WHOLE_PROJECT
, false);
912 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES
, false);
913 GetDlgItem(IDC_EXTERNALWARNING
)->ShowWindow(SW_HIDE
);
914 DialogEnableWindow(IDC_EXTERNALWARNING
, false);
915 DialogEnableWindow(IDC_COMMIT_AMEND
, FALSE
);
916 DialogEnableWindow(IDC_COMMIT_AMENDDIFF
, FALSE
);
917 // read the list of recent log entries before querying the WC for status
918 // -> the user may select one and modify / update it while we are crawling the WC
920 DialogEnableWindow(IDC_CHECKALL
, false);
921 DialogEnableWindow(IDC_CHECKNONE
, false);
922 DialogEnableWindow(IDC_CHECKUNVERSIONED
, false);
923 DialogEnableWindow(IDC_CHECKVERSIONED
, false);
924 DialogEnableWindow(IDC_CHECKADDED
, false);
925 DialogEnableWindow(IDC_CHECKDELETED
, false);
926 DialogEnableWindow(IDC_CHECKMODIFIED
, false);
927 DialogEnableWindow(IDC_CHECKFILES
, false);
928 DialogEnableWindow(IDC_CHECKSUBMODULES
, false);
930 if (m_History
.GetCount()==0)
933 reg
.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR
)m_ListCtrl
.m_sUUID
);
934 reg
.Replace(_T(':'),_T('_'));
935 m_History
.Load(reg
, _T("logmsgs"));
938 // Initialise the list control with the status of the files/folders below us
941 CTGitPathList
*pList
;
942 m_ListCtrl
.m_amend
= (m_bCommitAmend
==TRUE
|| m_bForceCommitAmend
) && (m_bAmendDiffToLastCommit
==FALSE
);
943 m_ListCtrl
.m_bDoNotAutoselectSubmodules
= (m_bDoNotAutoselectSubmodules
== TRUE
);
950 success
=m_ListCtrl
.GetStatus(pList
);
952 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
953 if(this->m_bShowUnversioned
)
954 m_ListCtrl
.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER
,true,pList
);
956 m_ListCtrl
.CheckIfChangelistsArePresent(false);
958 DWORD dwShow
= GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GITSLC_SHOWLOCKS
| GITSLC_SHOWINCHANGELIST
;
959 dwShow
|= DWORD(m_regAddBeforeCommit
) ? GITSLC_SHOWUNVERSIONED
: 0;
962 if (m_checkedPathList
.GetCount())
963 m_ListCtrl
.Show(dwShow
, m_checkedPathList
);
966 DWORD dwCheck
= m_bSelectFilesForCommit
? dwShow
: 0;
967 dwCheck
&=~(CTGitPath::LOGACTIONS_UNVER
); //don't check unversion file default.
968 m_ListCtrl
.Show(dwShow
, dwCheck
);
969 m_bSelectFilesForCommit
= true;
972 if (m_ListCtrl
.HasExternalsFromDifferentRepos())
974 GetDlgItem(IDC_EXTERNALWARNING
)->ShowWindow(SW_SHOW
);
975 DialogEnableWindow(IDC_EXTERNALWARNING
, TRUE
);
978 SetDlgItemText(IDC_COMMIT_TO
, g_Git
.GetCurrentBranch());
979 m_tooltips
.AddTool(GetDlgItem(IDC_STATISTICS
), m_ListCtrl
.GetStatisticsString());
983 if (!m_ListCtrl
.GetLastErrorMessage().IsEmpty())
984 m_ListCtrl
.SetEmptyString(m_ListCtrl
.GetLastErrorMessage());
985 m_ListCtrl
.Show(dwShow
);
989 g_GitAdminDir
.GetAdminDirPath(g_Git
.m_CurrentDir
, dotGitPath
);
990 if ((m_ListCtrl
.GetItemCount()==0)&&(m_ListCtrl
.HasUnversionedItems())
991 && !PathFileExists(dotGitPath
+ _T("MERGE_HEAD")))
994 temp
.LoadString(IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED
);
995 if (CMessageBox::ShowCheck(m_hWnd
, temp
, _T("TortoiseGit"), MB_ICONINFORMATION
| MB_YESNO
, _T("NothingToCommitShowUnversioned"), NULL
)==IDYES
)
997 m_bShowUnversioned
= TRUE
;
998 GetDlgItem(IDC_SHOWUNVERSIONED
)->SendMessage(BM_SETCHECK
, BST_CHECKED
);
999 DWORD dwShow
= (DWORD
)(GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GITSLC_SHOWUNVERSIONED
| GITSLC_SHOWLOCKS
);
1000 m_ListCtrl
.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER
);
1001 m_ListCtrl
.Show(dwShow
,dwShow
&(~CTGitPath::LOGACTIONS_UNVER
));
1008 // we don't have to block the commit dialog while we fetch the
1009 // auto completion list.
1010 m_pathwatcher
.ClearChangedPaths();
1011 InterlockedExchange(&m_bBlock
, FALSE
);
1012 if ((DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE
)==TRUE
)
1014 m_ListCtrl
.Block(TRUE
, TRUE
);
1015 GetAutocompletionList();
1016 m_ListCtrl
.Block(FALSE
, FALSE
);
1018 SendMessage(WM_UPDATEOKBUTTON
);
1021 DialogEnableWindow(IDC_SHOWUNVERSIONED
, true);
1022 DialogEnableWindow(IDC_WHOLE_PROJECT
, true);
1023 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES
, true);
1024 if (m_ListCtrl
.HasChangeLists())
1025 DialogEnableWindow(IDC_KEEPLISTS
, true);
1026 if (m_ListCtrl
.HasLocks())
1027 DialogEnableWindow(IDC_WHOLE_PROJECT
, true);
1029 // activate amend checkbox (if necessary)
1030 if (g_Git
.IsInitRepos())
1032 m_bCommitAmend
= FALSE
;
1037 if (m_bForceCommitAmend
)
1039 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_SHOW
);
1040 m_bCommitAmend
= TRUE
;
1044 GetDlgItem(IDC_COMMIT_AMEND
)->EnableWindow(TRUE
);
1049 hash
= g_Git
.GetHash(_T("HEAD"));
1054 MessageBox(_T("Could not get HEAD hash.\nlibgit reports:\n") + err
, _T("TortoiseGit"), MB_ICONERROR
);
1056 if (!hash
.IsEmpty())
1058 GitRev headRevision
;
1061 headRevision
.GetParentFromHash(hash
);
1066 MessageBox(_T("Could not get parent from HEAD.\nlibgit reports:\n") + err
, _T("TortoiseGit"), MB_ICONERROR
);
1068 // do not allow to show diff to "last" revision if it has more that one parent
1069 if (headRevision
.ParentsCount() != 1)
1071 m_bAmendDiffToLastCommit
= true;
1075 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->EnableWindow(TRUE
);
1081 // we have the list, now signal the main thread about it
1082 SendMessage(WM_AUTOLISTREADY
); // only send the message if the thread wasn't told to quit!
1085 InterlockedExchange(&m_bRunThread
, FALSE
);
1086 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1087 // force the cursor to normal
1093 void CCommitDlg::SetDlgTitle()
1095 if (m_sTitle
.IsEmpty())
1096 GetWindowText(m_sTitle
);
1098 if (m_bWholeProject
)
1099 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
1102 if (m_pathList
.GetCount() == 1)
1103 CAppUtils::SetWindowTitle(m_hWnd
, (g_Git
.m_CurrentDir
+ _T("\\") + m_pathList
[0].GetUIPathString()).TrimRight('\\'), m_sTitle
);
1105 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
+ _T("\\") + m_ListCtrl
.GetCommonDirectory(false), m_sTitle
);
1109 void CCommitDlg::OnCancel()
1111 m_bCancelled
= true;
1112 m_pathwatcher
.Stop();
1114 if (m_bThreadRunning
)
1116 InterlockedExchange(&m_bRunThread
, FALSE
);
1117 WaitForSingleObject(m_pThread
->m_hThread
, 1000);
1118 if (m_bThreadRunning
)
1120 // we gave the thread a chance to quit. Since the thread didn't
1121 // listen to us we have to kill it.
1122 TerminateThread(m_pThread
->m_hThread
, (DWORD
)-1);
1123 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1128 m_sLogMessage
= m_cLogMessage
.GetText();
1129 if (!m_sBugID
.IsEmpty())
1131 m_sBugID
.Replace(_T(", "), _T(","));
1132 m_sBugID
.Replace(_T(" ,"), _T(","));
1133 CString sBugID
= m_ProjectProperties
.sMessage
;
1134 sBugID
.Replace(_T("%BUGID%"), m_sBugID
);
1135 if (m_ProjectProperties
.bAppend
)
1136 m_sLogMessage
+= _T("\n") + sBugID
+ _T("\n");
1138 m_sLogMessage
= sBugID
+ _T("\n") + m_sLogMessage
;
1140 if ((m_ProjectProperties
.sLogTemplate
.Compare(m_sLogMessage
) != 0) && !m_sLogMessage
.IsEmpty())
1142 m_History
.AddEntry(m_sLogMessage
);
1147 CResizableStandAloneDialog::OnCancel();
1150 BOOL
CCommitDlg::PreTranslateMessage(MSG
* pMsg
)
1153 m_tooltips
.RelayEvent(pMsg
);
1157 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1162 if (pMsg
->message
== WM_KEYDOWN
)
1164 switch (pMsg
->wParam
)
1169 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
1175 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
1177 if ( GetDlgItem(IDOK
)->IsWindowEnabled() )
1179 PostMessage(WM_COMMAND
, IDOK
);
1183 if ( GetFocus()==GetDlgItem(IDC_BUGID
) )
1185 // Pressing RETURN in the bug id control
1186 // moves the focus to the message
1187 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
1195 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
1198 void CCommitDlg::Refresh()
1200 if (m_bThreadRunning
)
1203 InterlockedExchange(&m_bBlock
, TRUE
);
1204 m_pThread
= AfxBeginThread(StatusThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
1205 if (m_pThread
==NULL
)
1207 CMessageBox::Show(this->m_hWnd
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
1208 InterlockedExchange(&m_bBlock
, FALSE
);
1212 m_pThread
->m_bAutoDelete
= FALSE
;
1213 m_pThread
->ResumeThread();
1217 void CCommitDlg::OnBnClickedHelp()
1222 void CCommitDlg::OnBnClickedShowunversioned()
1224 m_tooltips
.Pop(); // hide the tooltips
1226 m_regAddBeforeCommit
= m_bShowUnversioned
;
1229 DWORD dwShow
= m_ListCtrl
.GetShowFlags();
1230 if (DWORD(m_regAddBeforeCommit
))
1231 dwShow
|= GITSLC_SHOWUNVERSIONED
;
1233 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
1234 if(dwShow
& GITSLC_SHOWUNVERSIONED
)
1237 m_ListCtrl
.GetStatus(NULL
,false,false,true);
1239 m_ListCtrl
.GetStatus(&this->m_pathList
,false,false,true);
1241 m_ListCtrl
.Show(dwShow
, 0, true, dwShow
& ~(CTGitPath::LOGACTIONS_UNVER
), true);
1246 void CCommitDlg::OnStnClickedExternalwarning()
1251 void CCommitDlg::OnEnChangeLogmessage()
1253 SendMessage(WM_UPDATEOKBUTTON
);
1256 LRESULT
CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM
, LPARAM
)
1259 if ((m_ListCtrl
.GetItemCount() == 0)&&(m_ListCtrl
.HasUnversionedItems())&&(!m_bShowUnversioned
))
1261 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED
, IDS_APPNAME
, MB_ICONINFORMATION
| MB_YESNO
)==IDYES
)
1263 m_bShowUnversioned
= TRUE
;
1264 DWORD dwShow
= GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GitSLC_SHOWUNVERSIONED
| GitSLC_SHOWLOCKS
;
1265 m_ListCtrl
.Show(dwShow
);
1273 LRESULT
CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
1279 LRESULT
CCommitDlg::OnFileDropped(WPARAM
, LPARAM
/*lParam*/)
1283 SetForegroundWindow();
1285 // if multiple files/folders are dropped
1286 // this handler is called for every single item
1288 // To avoid creating multiple refresh threads and
1289 // causing crashes, we only add the items to the
1290 // list control and start a timer.
1291 // When the timer expires, we start the refresh thread,
1292 // but only if it isn't already running - otherwise we
1293 // restart the timer.
1295 path
.SetFromWin((LPCTSTR
)lParam
);
1297 // just add all the items we get here.
1298 // if the item is versioned, the add will fail but nothing
1299 // more will happen.
1301 Git
.Add(CTGitPathList(path
), &m_ProjectProperties
, Git_depth_empty
, false, true, true);
1303 if (!m_ListCtrl
.HasPath(path
))
1305 if (m_pathList
.AreAllPathsFiles())
1307 m_pathList
.AddPath(path
);
1308 m_pathList
.RemoveDuplicates();
1309 m_updatedPathList
.AddPath(path
);
1310 m_updatedPathList
.RemoveDuplicates();
1314 // if the path list contains folders, we have to check whether
1315 // our just (maybe) added path is a child of one of those. If it is
1316 // a child of a folder already in the list, we must not add it. Otherwise
1317 // that path could show up twice in the list.
1318 bool bHasParentInList
= false;
1319 for (int i
=0; i
<m_pathList
.GetCount(); ++i
)
1321 if (m_pathList
[i
].IsAncestorOf(path
))
1323 bHasParentInList
= true;
1327 if (!bHasParentInList
)
1329 m_pathList
.AddPath(path
);
1330 m_pathList
.RemoveDuplicates();
1331 m_updatedPathList
.AddPath(path
);
1332 m_updatedPathList
.RemoveDuplicates();
1337 // Always start the timer, since the status of an existing item might have changed
1338 SetTimer(REFRESHTIMER
, 200, NULL
);
1339 ATLTRACE(_T("Item %s dropped, timer started\n"), path
.GetWinPath());
1344 LRESULT
CCommitDlg::OnAutoListReady(WPARAM
, LPARAM
)
1346 m_cLogMessage
.SetAutoCompletionList(m_autolist
, '*');
1350 //////////////////////////////////////////////////////////////////////////
1351 // functions which run in the status thread
1352 //////////////////////////////////////////////////////////////////////////
1354 void CCommitDlg::ParseRegexFile(const CString
& sFile
, std::map
<CString
, CString
>& mapRegex
)
1359 CStdioFile
file(sFile
, CFile::typeText
| CFile::modeRead
| CFile::shareDenyWrite
);
1360 while (m_bRunThread
&& file
.ReadString(strLine
))
1362 int eqpos
= strLine
.Find('=');
1364 rgx
= strLine
.Mid(eqpos
+1).Trim();
1367 while (((pos
= strLine
.Find(','))>=0)&&(pos
< eqpos
))
1369 mapRegex
[strLine
.Left(pos
)] = rgx
;
1370 strLine
= strLine
.Mid(pos
+1).Trim();
1372 mapRegex
[strLine
.Left(strLine
.Find('=')).Trim()] = rgx
;
1376 catch (CFileException
* pE
)
1378 TRACE("CFileException loading auto list regex file\n");
1383 void CCommitDlg::GetAutocompletionList()
1385 // the auto completion list is made of strings from each selected files.
1386 // the strings used are extracted from the files with regexes found
1387 // in the file "autolist.txt".
1388 // the format of that file is:
1389 // file extensions separated with commas '=' regular expression to use
1391 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
1392 // .cpp = (?<=[^\s]::)\b\w+\b
1394 std::map
<CString
, CString
> mapRegex
;
1395 CString sRegexFile
= CPathUtils::GetAppDirectory();
1396 CRegDWORD regtimeout
= CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);
1397 DWORD timeoutvalue
= regtimeout
*1000;
1398 sRegexFile
+= _T("autolist.txt");
1401 ParseRegexFile(sRegexFile
, mapRegex
);
1402 SHGetFolderPath(NULL
, CSIDL_APPDATA
, NULL
, SHGFP_TYPE_CURRENT
, sRegexFile
.GetBuffer(MAX_PATH
+1));
1403 sRegexFile
.ReleaseBuffer();
1404 sRegexFile
+= _T("\\TortoiseGit\\autolist.txt");
1405 if (PathFileExists(sRegexFile
))
1407 ParseRegexFile(sRegexFile
, mapRegex
);
1409 DWORD starttime
= GetTickCount();
1411 // now we have two arrays of strings, where the first array contains all
1412 // file extensions we can use and the second the corresponding regex strings
1413 // to apply to those files.
1415 // the next step is to go over all files shown in the commit dialog
1416 // and scan them for strings we can use
1417 int nListItems
= m_ListCtrl
.GetItemCount();
1419 for (int i
=0; i
<nListItems
&& m_bRunThread
; ++i
)
1421 // stop parsing after timeout
1422 if ((!m_bRunThread
) || (GetTickCount() - starttime
> timeoutvalue
))
1425 CTGitPath
*path
= (CTGitPath
*)m_ListCtrl
.GetItemData(i
);
1430 CString sPartPath
=path
->GetGitPathString();
1431 m_autolist
.insert(sPartPath
);
1433 // const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);
1437 // add the path parts to the auto completion list too
1438 // CString sPartPath = entry->GetRelativeGitPath();
1439 // m_autolist.insert(sPartPath);
1444 while ((pos
= sPartPath
.Find('/', pos
)) >= 0)
1448 m_autolist
.insert(sPartPath
.Mid(pos
));
1451 // Last inserted entry is a file name.
1452 // Some users prefer to also list file name without extension.
1453 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE
))
1455 int dotPos
= sPartPath
.ReverseFind('.');
1456 if ((dotPos
>= 0) && (dotPos
> lastPos
))
1457 m_autolist
.insert(sPartPath
.Mid(lastPos
, dotPos
- lastPos
));
1460 if ((entry
->status
<= Git_wc_status_normal
)||(entry
->status
== Git_wc_status_ignored
))
1463 CString sExt
= entry
->GetPath().GetFileExtension();
1465 // find the regex string which corresponds to the file extension
1466 CString rdata
= mapRegex
[sExt
];
1467 if (rdata
.IsEmpty())
1470 ScanFile(entry
->GetPath().GetWinPathString(), rdata
);
1471 if ((entry
->textstatus
!= Git_wc_status_unversioned
) &&
1472 (entry
->textstatus
!= Git_wc_status_none
) &&
1473 (entry
->textstatus
!= Git_wc_status_ignored
) &&
1474 (entry
->textstatus
!= Git_wc_status_added
) &&
1475 (entry
->textstatus
!= Git_wc_status_normal
))
1477 CTGitPath basePath
= Git::GetPristinePath(entry
->GetPath());
1478 if (!basePath
.IsEmpty())
1479 ScanFile(basePath
.GetWinPathString(), rdata
);
1483 ATLTRACE(_T("Auto completion list loaded in %d msec\n"), GetTickCount() - starttime
);
1486 void CCommitDlg::ScanFile(const CString
& sFilePath
, const CString
& sRegex
)
1488 wstring sFileContent
;
1489 HANDLE hFile
= CreateFile(sFilePath
, GENERIC_READ
, FILE_SHARE_READ
, NULL
, OPEN_EXISTING
, NULL
, NULL
);
1490 if (hFile
!= INVALID_HANDLE_VALUE
)
1492 DWORD size
= GetFileSize(hFile
, NULL
);
1493 if (size
> 1000000L)
1495 // no files bigger than 1 Meg
1499 // allocate memory to hold file contents
1500 char * buffer
= new char[size
];
1502 ReadFile(hFile
, buffer
, size
, &readbytes
, NULL
);
1505 IsTextUnicode(buffer
, readbytes
, &opts
);
1506 if (opts
& IS_TEXT_UNICODE_NULL_BYTES
)
1511 if (opts
& IS_TEXT_UNICODE_UNICODE_MASK
)
1513 sFileContent
= wstring((wchar_t*)buffer
, readbytes
/sizeof(WCHAR
));
1515 if ((opts
& IS_TEXT_UNICODE_NOT_UNICODE_MASK
)||(opts
== 0))
1517 int ret
= MultiByteToWideChar(CP_UTF8
, MB_PRECOMPOSED
, (LPCSTR
)buffer
, readbytes
, NULL
, 0);
1518 wchar_t * pWideBuf
= new wchar_t[ret
];
1519 int ret2
= MultiByteToWideChar(CP_UTF8
, MB_PRECOMPOSED
, (LPCSTR
)buffer
, readbytes
, pWideBuf
, ret
);
1521 sFileContent
= wstring(pWideBuf
, ret
);
1526 if (sFileContent
.empty()|| !m_bRunThread
)
1533 const tr1::wregex
regCheck(sRegex
, tr1::regex_constants::icase
| tr1::regex_constants::ECMAScript
);
1534 const tr1::wsregex_iterator end
;
1535 wstring s
= sFileContent
;
1536 for (tr1::wsregex_iterator
it(s
.begin(), s
.end(), regCheck
); it
!= end
; ++it
)
1538 const tr1::wsmatch match
= *it
;
1539 for (size_t i
=1; i
<match
.size(); ++i
)
1541 if (match
[i
].second
-match
[i
].first
)
1543 ATLTRACE(_T("matched keyword : %s\n"), wstring(match
[i
]).c_str());
1544 m_autolist
.insert(wstring(match
[i
]).c_str());
1549 catch (exception
) {}
1552 // CSciEditContextMenuInterface
1553 void CCommitDlg::InsertMenuItems(CMenu
& mPopup
, int& nCmd
)
1555 CString
sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST
));
1556 m_nPopupPasteListCmd
= nCmd
++;
1557 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPasteListCmd
, sMenuItemText
);
1559 //CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));
1560 if(m_History
.GetCount() > 0)
1562 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE
);
1563 m_nPopupPasteLastMessage
= nCmd
++;
1564 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPasteLastMessage
, sMenuItemText
);
1566 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY
);
1567 m_nPopupRecentMessage
= nCmd
++;
1568 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupRecentMessage
, sMenuItemText
);
1574 bool CCommitDlg::HandleMenuItemClick(int cmd
, CSciEdit
* pSciEdit
)
1579 if (cmd
== m_nPopupPasteListCmd
)
1582 int nListItems
= m_ListCtrl
.GetItemCount();
1583 for (int i
=0; i
<nListItems
; ++i
)
1585 CTGitPath
* entry
= (CTGitPath
*)m_ListCtrl
.GetItemData(i
);
1586 if (entry
&&entry
->m_Checked
)
1589 CString status
= entry
->GetActionName();
1590 if(entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
1591 status
= _T("Add"); // I18N TODO
1593 //git_wc_status_kind status = entry->status;
1594 WORD langID
= (WORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1595 if (m_ProjectProperties
.bFileListInEnglish
)
1598 line
.Format(_T("%-10s %s\r\n"),status
, (LPCTSTR
)m_ListCtrl
.GetItemText(i
,0));
1602 pSciEdit
->InsertText(logmsg
);
1606 if(cmd
== m_nPopupPasteLastMessage
)
1608 if(m_History
.GetCount() ==0 )
1612 logmsg
+=m_History
.GetEntry(0);
1613 pSciEdit
->InsertText(logmsg
);
1617 if(cmd
== m_nPopupRecentMessage
)
1619 OnBnClickedHistory();
1625 void CCommitDlg::OnTimer(UINT_PTR nIDEvent
)
1629 case ENDDIALOGTIMER
:
1630 KillTimer(ENDDIALOGTIMER
);
1634 if (m_bThreadRunning
)
1636 SetTimer(REFRESHTIMER
, 200, NULL
);
1637 ATLTRACE("Wait some more before refreshing\n");
1641 KillTimer(REFRESHTIMER
);
1642 ATLTRACE("Refreshing after items dropped\n");
1647 __super::OnTimer(nIDEvent
);
1650 void CCommitDlg::OnBnClickedHistory()
1652 m_tooltips
.Pop(); // hide the tooltips
1653 if (m_pathList
.GetCount() == 0)
1656 CHistoryDlg historyDlg
;
1657 historyDlg
.SetHistory(m_History
);
1658 if (historyDlg
.DoModal() != IDOK
)
1661 CString sMsg
= historyDlg
.GetSelectedText();
1662 if (sMsg
!= m_cLogMessage
.GetText().Left(sMsg
.GetLength()))
1664 CString sBugID
= m_ProjectProperties
.FindBugID(sMsg
);
1665 if ((!sBugID
.IsEmpty()) && ((GetDlgItem(IDC_BUGID
)->IsWindowVisible())))
1667 SetDlgItemText(IDC_BUGID
, sBugID
);
1669 if (m_ProjectProperties
.sLogTemplate
.Compare(m_cLogMessage
.GetText())!=0)
1670 m_cLogMessage
.InsertText(sMsg
, !m_cLogMessage
.GetText().IsEmpty());
1672 m_cLogMessage
.SetText(sMsg
);
1675 SendMessage(WM_UPDATEOKBUTTON
);
1676 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
1680 void CCommitDlg::OnBnClickedBugtraqbutton()
1682 m_tooltips
.Pop(); // hide the tooltips
1683 CString sMsg
= m_cLogMessage
.GetText();
1685 if (m_BugTraqProvider
== NULL
)
1688 BSTR parameters
= m_bugtraq_association
.GetParameters().AllocSysString();
1689 BSTR commonRoot
= SysAllocString(g_Git
.m_CurrentDir
);
1690 SAFEARRAY
*pathList
= SafeArrayCreateVector(VT_BSTR
, 0, m_pathList
.GetCount());
1692 for (LONG index
= 0; index
< m_pathList
.GetCount(); ++index
)
1693 SafeArrayPutElement(pathList
, &index
, m_pathList
[index
].GetGitPathString().AllocSysString());
1695 BSTR originalMessage
= sMsg
.AllocSysString();
1697 // m_revProps.clear();
1699 // first try the IBugTraqProvider2 interface
1700 CComPtr
<IBugTraqProvider2
> pProvider2
= NULL
;
1701 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider2
);
1702 bool bugIdOutSet
= false;
1705 //CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();
1706 BSTR repositoryRoot
= g_Git
.m_CurrentDir
.AllocSysString();
1707 BSTR bugIDOut
= NULL
;
1708 GetDlgItemText(IDC_BUGID
, m_sBugID
);
1709 BSTR bugID
= m_sBugID
.AllocSysString();
1710 SAFEARRAY
* revPropNames
= NULL
;
1711 SAFEARRAY
* revPropValues
= NULL
;
1712 if (FAILED(hr
= pProvider2
->GetCommitMessage2(GetSafeHwnd(), parameters
, repositoryRoot
, commonRoot
, pathList
, originalMessage
, bugID
, &bugIDOut
, &revPropNames
, &revPropValues
, &temp
)))
1715 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
1716 CMessageBox::Show(m_hWnd
, sErr
, _T("TortoiseGit"), MB_ICONERROR
);
1723 m_sBugID
= bugIDOut
;
1724 SysFreeString(bugIDOut
);
1725 SetDlgItemText(IDC_BUGID
, m_sBugID
);
1727 SysFreeString(bugID
);
1728 SysFreeString(repositoryRoot
);
1729 m_cLogMessage
.SetText(temp
);
1730 BSTR HUGEP
*pbRevNames
;
1731 BSTR HUGEP
*pbRevValues
;
1733 HRESULT hr1
= SafeArrayAccessData(revPropNames
, (void HUGEP
**)&pbRevNames
);
1736 HRESULT hr2
= SafeArrayAccessData(revPropValues
, (void HUGEP
**)&pbRevValues
);
1739 if (revPropNames
->rgsabound
->cElements
== revPropValues
->rgsabound
->cElements
)
1741 for (ULONG i
= 0; i
< revPropNames
->rgsabound
->cElements
; i
++)
1743 // m_revProps[pbRevNames[i]] = pbRevValues[i];
1746 SafeArrayUnaccessData(revPropValues
);
1748 SafeArrayUnaccessData(revPropNames
);
1751 SafeArrayDestroy(revPropNames
);
1753 SafeArrayDestroy(revPropValues
);
1758 // if IBugTraqProvider2 failed, try IBugTraqProvider
1759 CComPtr
<IBugTraqProvider
> pProvider
= NULL
;
1760 hr
= m_BugTraqProvider
.QueryInterface(&pProvider
);
1764 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, (LPCTSTR
)m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
1765 CMessageBox::Show(m_hWnd
, sErr
, _T("TortoiseGit"), MB_ICONERROR
);
1769 if (FAILED(hr
= pProvider
->GetCommitMessage(GetSafeHwnd(), parameters
, commonRoot
, pathList
, originalMessage
, &temp
)))
1772 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
1773 CMessageBox::Show(m_hWnd
, sErr
, _T("TortoiseGit"), MB_ICONERROR
);
1776 m_cLogMessage
.SetText(temp
);
1778 m_sLogMessage
= m_cLogMessage
.GetText();
1779 if (!m_ProjectProperties
.sMessage
.IsEmpty())
1781 CString sBugID
= m_ProjectProperties
.FindBugID(m_sLogMessage
);
1782 if (!sBugID
.IsEmpty() && !bugIdOutSet
)
1784 SetDlgItemText(IDC_BUGID
, sBugID
);
1788 m_cLogMessage
.SetFocus();
1790 SysFreeString(parameters
);
1791 SysFreeString(commonRoot
);
1792 SafeArrayDestroy(pathList
);
1793 SysFreeString(originalMessage
);
1794 SysFreeString(temp
);
1797 void CCommitDlg::FillPatchView()
1799 if(::IsWindow(this->m_patchViewdlg
.m_hWnd
))
1801 m_patchViewdlg
.m_ctrlPatchView
.SetText(CString());
1803 POSITION pos
=m_ListCtrl
.GetFirstSelectedItemPosition();
1804 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETREADONLY
, FALSE
);
1809 int nSelect
= m_ListCtrl
.GetNextSelectedItem(pos
);
1810 CTGitPath
* p
=(CTGitPath
*)m_ListCtrl
.GetItemData(nSelect
);
1811 if(p
&& !(p
->m_Action
&CTGitPath::LOGACTIONS_UNVER
) )
1813 CString head
= _T("HEAD");
1814 if(m_bCommitAmend
==TRUE
&& m_bAmendDiffToLastCommit
==FALSE
)
1815 head
= _T("HEAD~1");
1816 cmd
.Format(_T("git.exe diff %s -- \"%s\""), head
, p
->GetGitPathString());
1817 g_Git
.Run(cmd
, &out
, CP_UTF8
);
1821 m_patchViewdlg
.m_ctrlPatchView
.SetText(out
);
1822 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETREADONLY
, TRUE
);
1823 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_GOTOPOS
, 0);
1825 m_patchViewdlg
.m_ctrlPatchView
.GetClientRect(rect
);
1826 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTH
, rect
.Width() - 4);
1829 LRESULT
CCommitDlg::OnGitStatusListCtrlItemChanged(WPARAM
/*wparam*/, LPARAM
/*lparam*/)
1831 this->FillPatchView();
1836 LRESULT
CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM
, LPARAM
)
1838 SendMessage(WM_UPDATEOKBUTTON
);
1842 LRESULT
CCommitDlg::OnCheck(WPARAM wnd
, LPARAM
)
1844 HWND hwnd
= (HWND
)wnd
;
1845 bool check
= !(GetAsyncKeyState(VK_SHIFT
) & 0x8000);
1846 if (hwnd
== GetDlgItem(IDC_CHECKALL
)->GetSafeHwnd())
1847 m_ListCtrl
.Check(GITSLC_SHOWEVERYTHING
, check
);
1848 else if (hwnd
== GetDlgItem(IDC_CHECKNONE
)->GetSafeHwnd())
1849 m_ListCtrl
.Check(GITSLC_SHOWEVERYTHING
, !check
);
1850 else if (hwnd
== GetDlgItem(IDC_CHECKUNVERSIONED
)->GetSafeHwnd())
1851 m_ListCtrl
.Check(GITSLC_SHOWUNVERSIONED
, check
);
1852 else if (hwnd
== GetDlgItem(IDC_CHECKVERSIONED
)->GetSafeHwnd())
1853 m_ListCtrl
.Check(GITSLC_SHOWVERSIONED
, check
);
1854 else if (hwnd
== GetDlgItem(IDC_CHECKADDED
)->GetSafeHwnd())
1855 m_ListCtrl
.Check(GITSLC_SHOWADDED
, check
);
1856 else if (hwnd
== GetDlgItem(IDC_CHECKDELETED
)->GetSafeHwnd())
1857 m_ListCtrl
.Check(GITSLC_SHOWREMOVED
, check
);
1858 else if (hwnd
== GetDlgItem(IDC_CHECKMODIFIED
)->GetSafeHwnd())
1859 m_ListCtrl
.Check(GITSLC_SHOWMODIFIED
, check
);
1860 else if (hwnd
== GetDlgItem(IDC_CHECKFILES
)->GetSafeHwnd())
1861 m_ListCtrl
.Check(GITSLC_SHOWFILES
, check
);
1862 else if (hwnd
== GetDlgItem(IDC_CHECKSUBMODULES
)->GetSafeHwnd())
1863 m_ListCtrl
.Check(GITSLC_SHOWSUBMODULES
, check
);
1868 LRESULT
CCommitDlg::OnUpdateOKButton(WPARAM
, LPARAM
)
1873 bool bValidLogSize
= m_cLogMessage
.GetText().GetLength() >= m_ProjectProperties
.nMinLogSize
&& m_cLogMessage
.GetText().GetLength() > 0;
1874 bool bAmendOrSelectFilesOrMerge
= m_ListCtrl
.GetSelected() > 0 || (m_bCommitAmend
&& m_bAmendDiffToLastCommit
) || CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive();
1876 DialogEnableWindow(IDOK
, bValidLogSize
&& bAmendOrSelectFilesOrMerge
);
1881 LRESULT
CCommitDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
1885 if (wParam
== IDC_SPLITTER
)
1887 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1888 DoSize(pHdr
->delta
);
1893 return __super::DefWindowProc(message
, wParam
, lParam
);
1896 void CCommitDlg::SetSplitterRange()
1898 if ((m_ListCtrl
)&&(m_cLogMessage
))
1901 m_cLogMessage
.GetWindowRect(rcTop
);
1902 ScreenToClient(rcTop
);
1904 m_ListCtrl
.GetWindowRect(rcMiddle
);
1905 ScreenToClient(rcMiddle
);
1906 if (rcMiddle
.Height() && rcMiddle
.Width())
1907 m_wndSplitter
.SetRange(rcTop
.top
+60, rcMiddle
.bottom
-80);
1911 void CCommitDlg::DoSize(int delta
)
1913 RemoveAnchor(IDC_MESSAGEGROUP
);
1914 RemoveAnchor(IDC_LOGMESSAGE
);
1915 RemoveAnchor(IDC_SPLITTER
);
1916 RemoveAnchor(IDC_SIGNOFF
);
1917 RemoveAnchor(IDC_COMMIT_AMEND
);
1918 RemoveAnchor(IDC_COMMIT_AMENDDIFF
);
1919 RemoveAnchor(IDC_COMMIT_SETDATETIME
);
1920 RemoveAnchor(IDC_COMMIT_DATEPICKER
);
1921 RemoveAnchor(IDC_COMMIT_TIMEPICKER
);
1922 RemoveAnchor(IDC_LISTGROUP
);
1923 RemoveAnchor(IDC_FILELIST
);
1924 RemoveAnchor(IDC_TEXT_INFO
);
1925 RemoveAnchor(IDC_SELECTLABEL
);
1926 RemoveAnchor(IDC_CHECKALL
);
1927 RemoveAnchor(IDC_CHECKNONE
);
1928 RemoveAnchor(IDC_CHECKUNVERSIONED
);
1929 RemoveAnchor(IDC_CHECKVERSIONED
);
1930 RemoveAnchor(IDC_CHECKADDED
);
1931 RemoveAnchor(IDC_CHECKDELETED
);
1932 RemoveAnchor(IDC_CHECKMODIFIED
);
1933 RemoveAnchor(IDC_CHECKFILES
);
1934 RemoveAnchor(IDC_CHECKSUBMODULES
);
1936 CSplitterControl::ChangeHeight(&m_cLogMessage
, delta
, CW_TOPALIGN
);
1937 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP
), delta
, CW_TOPALIGN
);
1938 CSplitterControl::ChangeHeight(&m_ListCtrl
, -delta
, CW_BOTTOMALIGN
);
1939 CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP
), -delta
, CW_BOTTOMALIGN
);
1940 CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF
),0,delta
);
1941 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND
),0,delta
);
1942 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMENDDIFF
),0,delta
);
1943 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_SETDATETIME
),0,delta
);
1944 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_DATEPICKER
),0,delta
);
1945 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_TIMEPICKER
),0,delta
);
1946 CSplitterControl::ChangePos(GetDlgItem(IDC_TEXT_INFO
),0,delta
);
1947 CSplitterControl::ChangePos(GetDlgItem(IDC_SELECTLABEL
), 0, delta
);
1948 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKALL
), 0, delta
);
1949 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKNONE
), 0, delta
);
1950 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKUNVERSIONED
), 0, delta
);
1951 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKVERSIONED
), 0, delta
);
1952 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKADDED
), 0, delta
);
1953 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKDELETED
), 0, delta
);
1954 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKMODIFIED
), 0, delta
);
1955 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKFILES
), 0, delta
);
1956 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKSUBMODULES
), 0, delta
);
1958 AddAnchor(IDC_MESSAGEGROUP
, TOP_LEFT
, TOP_RIGHT
);
1959 AddAnchor(IDC_LOGMESSAGE
, TOP_LEFT
, TOP_RIGHT
);
1960 AddAnchor(IDC_SPLITTER
, TOP_LEFT
, TOP_RIGHT
);
1961 AddAnchor(IDC_LISTGROUP
, TOP_LEFT
, BOTTOM_RIGHT
);
1962 AddAnchor(IDC_FILELIST
, TOP_LEFT
, BOTTOM_RIGHT
);
1963 AddAnchor(IDC_SIGNOFF
,TOP_RIGHT
);
1964 AddAnchor(IDC_COMMIT_AMEND
,TOP_LEFT
);
1965 AddAnchor(IDC_COMMIT_AMENDDIFF
,TOP_LEFT
);
1966 AddAnchor(IDC_COMMIT_SETDATETIME
,TOP_LEFT
);
1967 AddAnchor(IDC_COMMIT_DATEPICKER
,TOP_LEFT
);
1968 AddAnchor(IDC_COMMIT_TIMEPICKER
,TOP_LEFT
);
1969 AddAnchor(IDC_TEXT_INFO
,TOP_RIGHT
);
1970 AddAnchor(IDC_SELECTLABEL
, TOP_LEFT
);
1971 AddAnchor(IDC_CHECKALL
, TOP_LEFT
);
1972 AddAnchor(IDC_CHECKNONE
, TOP_LEFT
);
1973 AddAnchor(IDC_CHECKUNVERSIONED
, TOP_LEFT
);
1974 AddAnchor(IDC_CHECKVERSIONED
, TOP_LEFT
);
1975 AddAnchor(IDC_CHECKADDED
, TOP_LEFT
);
1976 AddAnchor(IDC_CHECKDELETED
, TOP_LEFT
);
1977 AddAnchor(IDC_CHECKMODIFIED
, TOP_LEFT
);
1978 AddAnchor(IDC_CHECKFILES
, TOP_LEFT
);
1979 AddAnchor(IDC_CHECKSUBMODULES
, TOP_LEFT
);
1981 // adjust the minimum size of the dialog to prevent the resizing from
1982 // moving the list control too far down.
1984 m_cLogMessage
.GetClientRect(rcLogMsg
);
1985 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(), m_DlgOrigRect
.Height()-m_LogMsgOrigRect
.Height()+rcLogMsg
.Height()));
1988 m_cLogMessage
.Invalidate();
1989 GetDlgItem(IDC_LOGMESSAGE
)->Invalidate();
1992 void CCommitDlg::OnSize(UINT nType
, int cx
, int cy
)
1994 // first, let the resizing take place
1995 __super::OnSize(nType
, cx
, cy
);
2001 CString
CCommitDlg::GetSignedOffByLine()
2005 CString username
= g_Git
.GetUserName();
2006 CString email
= g_Git
.GetUserEmail();
2007 username
.Remove(_T('\n'));
2008 email
.Remove(_T('\n'));
2010 str
.Format(_T("Signed-off-by: %s <%s>"), username
, email
);
2015 void CCommitDlg::OnBnClickedSignOff()
2017 CString str
= GetSignedOffByLine();
2019 if (m_cLogMessage
.GetText().Find(str
) == -1) {
2020 m_cLogMessage
.SetText(m_cLogMessage
.GetText().TrimRight());
2021 int lastNewline
= m_cLogMessage
.GetText().ReverseFind(_T('\n'));
2022 int foundByLine
= -1;
2023 if (lastNewline
> 0)
2024 foundByLine
= m_cLogMessage
.GetText().Find(_T("-by: "), lastNewline
);
2026 if (foundByLine
== -1 || foundByLine
< lastNewline
)
2027 str
= _T("\r\n") + str
;
2029 m_cLogMessage
.SetText(m_cLogMessage
.GetText()+_T("\r\n")+str
+_T("\r\n"));
2033 void CCommitDlg::OnBnClickedCommitAmend()
2036 if(this->m_bCommitAmend
&& this->m_AmendStr
.IsEmpty())
2039 rev
.GetCommit(CString(_T("HEAD")));
2040 m_AmendStr
=rev
.GetSubject()+_T("\n")+rev
.GetBody();
2043 if(this->m_bCommitAmend
)
2045 this->m_NoAmendStr
=this->m_cLogMessage
.GetText();
2046 m_cLogMessage
.SetText(m_AmendStr
);
2047 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_SHOW
);
2051 this->m_AmendStr
=this->m_cLogMessage
.GetText();
2052 m_cLogMessage
.SetText(m_NoAmendStr
);
2053 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_HIDE
);
2056 OnBnClickedCommitSetDateTime(); // to update the commit date and time
2058 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
2062 void CCommitDlg::OnBnClickedWholeProject()
2064 m_tooltips
.Pop(); // hide the tooltips
2070 m_ListCtrl
.GetStatus(NULL
,true,false,true);
2072 m_ListCtrl
.GetStatus(&this->m_pathList
,true,false,true);
2074 DWORD dwShow
= m_ListCtrl
.GetShowFlags();
2075 if (DWORD(m_regAddBeforeCommit
))
2076 dwShow
|= GITSLC_SHOWUNVERSIONED
;
2078 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
2080 m_ListCtrl
.Show(dwShow
, dwShow
& ~(CTGitPath::LOGACTIONS_UNVER
), true);
2087 void CCommitDlg::OnFocusMessage()
2089 m_cLogMessage
.SetFocus();
2092 void CCommitDlg::OnScnUpdateUI(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2094 int pos
= (int)this->m_cLogMessage
.Call(SCI_GETCURRENTPOS
);
2095 int line
= (int)this->m_cLogMessage
.Call(SCI_LINEFROMPOSITION
,pos
);
2096 int column
= (int)this->m_cLogMessage
.Call(SCI_GETCOLUMN
,pos
);
2099 str
.Format(_T("%d/%d"),line
+1,column
+1);
2100 this->GetDlgItem(IDC_TEXT_INFO
)->SetWindowText(str
);
2105 void CCommitDlg::OnStnClickedViewPatch()
2107 m_patchViewdlg
.m_pProjectProperties
= &this->m_ProjectProperties
;
2108 m_patchViewdlg
.m_ParentCommitDlg
= this;
2109 if(!IsWindow(this->m_patchViewdlg
.m_hWnd
))
2111 BOOL viewPatchEnabled
= FALSE
;
2112 m_ProjectProperties
.GetBOOLProps(viewPatchEnabled
, _T("tgit.commitshowpatch"));
2113 if (viewPatchEnabled
== FALSE
)
2114 g_Git
.SetConfigValue(_T("tgit.commitshowpatch"), _T("true"));
2115 m_patchViewdlg
.Create(IDD_PATCH_VIEW
,this);
2116 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTHTRACKING
, TRUE
);
2118 this->GetWindowRect(&rect
);
2120 m_patchViewdlg
.ShowWindow(SW_SHOW
);
2122 m_patchViewdlg
.SetWindowPos(NULL
,rect
.right
,rect
.top
,rect
.Width(),rect
.Height(),
2123 SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOZORDER
);
2125 ShowViewPatchText(false);
2130 g_Git
.SetConfigValue(_T("tgit.commitshowpatch"), _T("false"));
2131 m_patchViewdlg
.ShowWindow(SW_HIDE
);
2132 m_patchViewdlg
.DestroyWindow();
2133 ShowViewPatchText(true);
2135 this->m_ctrlShowPatch
.Invalidate();
2138 void CCommitDlg::OnMoving(UINT fwSide
, LPRECT pRect
)
2140 __super::OnMoving(fwSide
, pRect
);
2142 if (::IsWindow(m_patchViewdlg
.m_hWnd
))
2145 m_patchViewdlg
.GetWindowRect(&patchrect
);
2146 if (::IsWindow(m_hWnd
))
2149 GetWindowRect(&thisrect
);
2150 if (patchrect
.left
== thisrect
.right
)
2152 m_patchViewdlg
.SetWindowPos(NULL
, patchrect
.left
- (thisrect
.left
- pRect
->left
), patchrect
.top
- (thisrect
.top
- pRect
->top
),
2153 0, 0, SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOSIZE
| SWP_NOZORDER
);
2160 void CCommitDlg::OnSizing(UINT fwSide
, LPRECT pRect
)
2162 __super::OnSizing(fwSide
, pRect
);
2164 if(::IsWindow(this->m_patchViewdlg
.m_hWnd
))
2166 CRect thisrect
, patchrect
;
2167 this->GetWindowRect(thisrect
);
2168 this->m_patchViewdlg
.GetWindowRect(patchrect
);
2169 if(thisrect
.right
==patchrect
.left
)
2171 patchrect
.left
-= (thisrect
.right
- pRect
->right
);
2172 patchrect
.right
-= (thisrect
.right
- pRect
->right
);
2174 if( patchrect
.bottom
== thisrect
.bottom
)
2176 patchrect
.bottom
-= (thisrect
.bottom
- pRect
->bottom
);
2178 if( patchrect
.top
== thisrect
.top
)
2180 patchrect
.top
-= thisrect
.top
-pRect
->top
;
2182 m_patchViewdlg
.MoveWindow(patchrect
);
2187 void CCommitDlg::OnHdnItemchangedFilelist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2189 UNREFERENCED_PARAMETER(pNMHDR
);
2191 TRACE("Item Changed\r\n");
2194 int CCommitDlg::CheckHeadDetach()
2197 if(g_Git
.GetCurrentBranchFromFile(g_Git
.m_CurrentDir
,output
))
2199 int retval
= CMessageBox::Show(NULL
, IDS_PROC_COMMIT_DETACHEDWARNING
, IDS_APPNAME
, MB_YESNOCANCEL
| MB_ICONWARNING
);
2202 if (CAppUtils::CreateBranchTag(FALSE
, NULL
, true) == FALSE
)
2205 else if (retval
== IDCANCEL
)
2211 void CCommitDlg::OnBnClickedCommitAmenddiff()
2217 void CCommitDlg::OnBnClickedNoautoselectsubmodules()
2223 void CCommitDlg::OnBnClickedCommitSetDateTime()
2227 if (m_bSetCommitDateTime
)
2229 CTime authordate
= CTime::GetCurrentTime();
2232 GitRev headRevision
;
2233 headRevision
.GetCommit(_T("HEAD"));
2234 authordate
= headRevision
.GetAuthorDate();
2237 m_CommitDate
.SetTime(&authordate
);
2238 m_CommitTime
.SetTime(&authordate
);
2240 GetDlgItem(IDC_COMMIT_DATEPICKER
)->ShowWindow(SW_SHOW
);
2241 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->ShowWindow(SW_SHOW
);
2245 GetDlgItem(IDC_COMMIT_DATEPICKER
)->ShowWindow(SW_HIDE
);
2246 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->ShowWindow(SW_HIDE
);
2250 void CCommitDlg::OnBnClickedCheckNewBranch()
2253 if (m_bCreateNewBranch
)
2255 GetDlgItem(IDC_COMMIT_TO
)->ShowWindow(SW_HIDE
);
2256 GetDlgItem(IDC_NEWBRANCH
)->ShowWindow(SW_SHOW
);
2260 GetDlgItem(IDC_NEWBRANCH
)->ShowWindow(SW_HIDE
);
2261 GetDlgItem(IDC_COMMIT_TO
)->ShowWindow(SW_SHOW
);
2265 void CCommitDlg::RestoreFiles(bool doNotAsk
)
2267 if (!m_ListCtrl
.m_restorepaths
.empty() && (doNotAsk
|| CMessageBox::Show(m_hWnd
, IDS_PROC_COMMIT_RESTOREFILES
, IDS_APPNAME
, 2, IDI_QUESTION
, IDS_PROC_COMMIT_RESTOREFILES_RESTORE
, IDS_PROC_COMMIT_RESTOREFILES_KEEP
) == 1))
2269 for (std::map
<CString
, CString
>::iterator it
= m_ListCtrl
.m_restorepaths
.begin(); it
!= m_ListCtrl
.m_restorepaths
.end(); ++it
)
2270 CopyFile(it
->second
, g_Git
.m_CurrentDir
+ _T("\\") + it
->first
, FALSE
);
2271 m_ListCtrl
.m_restorepaths
.clear();
2275 void CCommitDlg::UpdateCheckLinks()
2277 DialogEnableWindow(IDC_CHECKALL
, true);
2278 DialogEnableWindow(IDC_CHECKNONE
, true);
2279 DialogEnableWindow(IDC_CHECKUNVERSIONED
, m_ListCtrl
.GetUnversionedCount() > 0);
2280 DialogEnableWindow(IDC_CHECKVERSIONED
, m_ListCtrl
.GetItemCount() > m_ListCtrl
.GetUnversionedCount());
2281 DialogEnableWindow(IDC_CHECKADDED
, m_ListCtrl
.GetAddedCount() > 0);
2282 DialogEnableWindow(IDC_CHECKDELETED
, m_ListCtrl
.GetDeletedCount() > 0);
2283 DialogEnableWindow(IDC_CHECKMODIFIED
, m_ListCtrl
.GetModifiedCount() > 0);
2284 DialogEnableWindow(IDC_CHECKFILES
, m_ListCtrl
.GetFileCount() > 0);
2285 DialogEnableWindow(IDC_CHECKSUBMODULES
, m_ListCtrl
.GetSubmoduleCount() > 0);