1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2008 - TortoiseSVN
4 // Copyright (C) 2008-2013 - 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)
74 , m_bCommitMessageOnly(FALSE
)
76 this->m_bCommitAmend
=FALSE
;
77 m_bPushAfterCommit
= FALSE
;
80 CCommitDlg::~CCommitDlg()
88 void CCommitDlg::DoDataExchange(CDataExchange
* pDX
)
90 CResizableStandAloneDialog::DoDataExchange(pDX
);
91 DDX_Control(pDX
, IDC_FILELIST
, m_ListCtrl
);
92 DDX_Control(pDX
, IDC_LOGMESSAGE
, m_cLogMessage
);
93 DDX_Check(pDX
, IDC_SHOWUNVERSIONED
, m_bShowUnversioned
);
94 DDX_Check(pDX
, IDC_COMMIT_SETDATETIME
, m_bSetCommitDateTime
);
95 DDX_Check(pDX
, IDC_CHECK_NEWBRANCH
, m_bCreateNewBranch
);
96 DDX_Text(pDX
, IDC_NEWBRANCH
, m_sCreateNewBranch
);
97 DDX_Text(pDX
, IDC_BUGID
, m_sBugID
);
98 DDX_Check(pDX
, IDC_WHOLE_PROJECT
, m_bWholeProject
);
99 DDX_Control(pDX
, IDC_SPLITTER
, m_wndSplitter
);
100 DDX_Check(pDX
, IDC_KEEPLISTS
, m_bKeepChangeList
);
101 DDX_Check(pDX
, IDC_NOAUTOSELECTSUBMODULES
, m_bDoNotAutoselectSubmodules
);
102 DDX_Check(pDX
,IDC_COMMIT_AMEND
,m_bCommitAmend
);
103 DDX_Check(pDX
, IDC_COMMIT_MESSAGEONLY
, m_bCommitMessageOnly
);
104 DDX_Check(pDX
,IDC_COMMIT_AMENDDIFF
,m_bAmendDiffToLastCommit
);
105 DDX_Control(pDX
,IDC_VIEW_PATCH
,m_ctrlShowPatch
);
106 DDX_Control(pDX
, IDC_COMMIT_DATEPICKER
, m_CommitDate
);
107 DDX_Control(pDX
, IDC_COMMIT_TIMEPICKER
, m_CommitTime
);
110 BEGIN_MESSAGE_MAP(CCommitDlg
, CResizableStandAloneDialog
)
111 ON_BN_CLICKED(IDHELP
, OnBnClickedHelp
)
112 ON_BN_CLICKED(IDC_SHOWUNVERSIONED
, OnBnClickedShowunversioned
)
113 ON_NOTIFY(SCN_UPDATEUI
, IDC_LOGMESSAGE
, OnScnUpdateUI
)
114 // ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)
115 ON_BN_CLICKED(IDC_BUGTRAQBUTTON
, OnBnClickedBugtraqbutton
)
116 ON_EN_CHANGE(IDC_LOGMESSAGE
, OnEnChangeLogmessage
)
117 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
, OnGitStatusListCtrlItemCountChanged
)
118 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
, OnGitStatusListCtrlNeedsRefresh
)
119 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ADDFILE
, OnFileDropped
)
120 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_CHECKCHANGED
, &CCommitDlg::OnGitStatusListCtrlCheckChanged
)
121 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED
, &CCommitDlg::OnGitStatusListCtrlItemChanged
)
123 ON_REGISTERED_MESSAGE(CLinkControl::LK_LINKITEMCLICKED
, &CCommitDlg::OnCheck
)
124 ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY
, OnAutoListReady
)
125 ON_REGISTERED_MESSAGE(WM_UPDATEOKBUTTON
, OnUpdateOKButton
)
128 ON_STN_CLICKED(IDC_EXTERNALWARNING
, &CCommitDlg::OnStnClickedExternalwarning
)
129 ON_BN_CLICKED(IDC_SIGNOFF
, &CCommitDlg::OnBnClickedSignOff
)
130 ON_BN_CLICKED(IDC_COMMIT_AMEND
, &CCommitDlg::OnBnClickedCommitAmend
)
131 ON_BN_CLICKED(IDC_COMMIT_MESSAGEONLY
, &CCommitDlg::OnBnClickedCommitMessageOnly
)
132 ON_BN_CLICKED(IDC_WHOLE_PROJECT
, &CCommitDlg::OnBnClickedWholeProject
)
133 ON_COMMAND(ID_FOCUS_MESSAGE
,&CCommitDlg::OnFocusMessage
)
134 ON_STN_CLICKED(IDC_VIEW_PATCH
, &CCommitDlg::OnStnClickedViewPatch
)
138 ON_NOTIFY(HDN_ITEMCHANGED
, 0, &CCommitDlg::OnHdnItemchangedFilelist
)
139 ON_BN_CLICKED(IDC_COMMIT_AMENDDIFF
, &CCommitDlg::OnBnClickedCommitAmenddiff
)
140 ON_BN_CLICKED(IDC_NOAUTOSELECTSUBMODULES
, &CCommitDlg::OnBnClickedNoautoselectsubmodules
)
141 ON_BN_CLICKED(IDC_COMMIT_SETDATETIME
, &CCommitDlg::OnBnClickedCommitSetDateTime
)
142 ON_BN_CLICKED(IDC_CHECK_NEWBRANCH
, &CCommitDlg::OnBnClickedCheckNewBranch
)
145 BOOL
CCommitDlg::OnInitDialog()
147 CResizableStandAloneDialog::OnInitDialog();
148 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
150 CAppUtils::GetCommitTemplate(this->m_sLogMessage
);
153 g_GitAdminDir
.GetAdminDirPath(g_Git
.m_CurrentDir
, dotGitPath
);
154 if(PathFileExists(dotGitPath
+ _T("MERGE_MSG")))
157 if(file
.Open(dotGitPath
+ _T("MERGE_MSG"), CFile::modeRead
))
160 while(file
.ReadString(str
))
162 m_sLogMessage
+= str
;
164 m_sLogMessage
+= _T("\n");
169 if (CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive())
170 DialogEnableWindow(IDC_CHECK_NEWBRANCH
, FALSE
);
172 m_regAddBeforeCommit
= CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE
);
173 m_bShowUnversioned
= m_regAddBeforeCommit
;
175 m_History
.SetMaxHistoryItems((LONG
)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));
177 m_regKeepChangelists
= CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE
);
178 m_bKeepChangeList
= m_regKeepChangelists
;
180 m_regDoNotAutoselectSubmodules
= CRegDWORD(_T("Software\\TortoiseGit\\DoNotAutoselectSubmodules"), FALSE
);
181 m_bDoNotAutoselectSubmodules
= m_regDoNotAutoselectSubmodules
;
183 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_COMMITDLG
));
186 // m_bWholeProject = config.KeepLocks();
188 if(this->m_pathList
.GetCount() == 0)
189 m_bWholeProject
=true;
191 if(this->m_pathList
.GetCount() == 1 && m_pathList
[0].IsEmpty())
192 m_bWholeProject
=true;
198 m_ListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
, _T("CommitDlg"),(GITSLC_POPALL
^ (GITSLC_POPCOMMIT
| GITSLC_POPSAVEAS
)), true, true);
199 m_ListCtrl
.SetStatLabel(GetDlgItem(IDC_STATISTICS
));
200 m_ListCtrl
.SetCancelBool(&m_bCancelled
);
201 m_ListCtrl
.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT
);
202 m_ListCtrl
.EnableFileDrop();
203 m_ListCtrl
.SetBackgroundImage(IDI_COMMIT_BKG
);
205 //this->DialogEnableWindow(IDC_COMMIT_AMEND,FALSE);
206 m_ProjectProperties
.ReadPropsPathList(m_pathList
);
208 m_cLogMessage
.Init(m_ProjectProperties
);
209 m_cLogMessage
.SetFont((CString
)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));
210 m_cLogMessage
.RegisterContextMenuHandler(this);
212 OnEnChangeLogmessage();
214 m_tooltips
.Create(this);
215 m_tooltips
.AddTool(IDC_EXTERNALWARNING
, IDS_COMMITDLG_EXTERNALS
);
216 m_tooltips
.AddTool(IDC_COMMIT_AMEND
,IDS_COMMIT_AMEND_TT
);
217 // m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);
219 CBugTraqAssociations bugtraq_associations
;
220 bugtraq_associations
.Load();
222 if (bugtraq_associations
.FindProvider(g_Git
.m_CurrentDir
, &m_bugtraq_association
))
224 GetDlgItem(IDC_BUGID
)->ShowWindow(SW_HIDE
);
225 GetDlgItem(IDC_BUGIDLABEL
)->ShowWindow(SW_HIDE
);
227 CComPtr
<IBugTraqProvider
> pProvider
;
228 HRESULT hr
= pProvider
.CoCreateInstance(m_bugtraq_association
.GetProviderClass());
231 m_BugTraqProvider
= pProvider
;
233 if (SUCCEEDED(hr
= pProvider
->GetLinkText(GetSafeHwnd(), m_bugtraq_association
.GetParameters().AllocSysString(), &temp
)))
235 SetDlgItemText(IDC_BUGTRAQBUTTON
, temp
);
236 GetDlgItem(IDC_BUGTRAQBUTTON
)->EnableWindow(TRUE
);
237 GetDlgItem(IDC_BUGTRAQBUTTON
)->ShowWindow(SW_SHOW
);
243 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
245 else if (!m_ProjectProperties
.sMessage
.IsEmpty())
247 GetDlgItem(IDC_BUGID
)->ShowWindow(SW_SHOW
);
248 GetDlgItem(IDC_BUGIDLABEL
)->ShowWindow(SW_SHOW
);
249 if (!m_ProjectProperties
.sLabel
.IsEmpty())
250 SetDlgItemText(IDC_BUGIDLABEL
, m_ProjectProperties
.sLabel
);
251 GetDlgItem(IDC_BUGTRAQBUTTON
)->ShowWindow(SW_HIDE
);
252 GetDlgItem(IDC_BUGTRAQBUTTON
)->EnableWindow(FALSE
);
253 GetDlgItem(IDC_BUGID
)->SetFocus();
254 CString sBugID
= m_ProjectProperties
.GetBugIDFromLog(m_sLogMessage
);
255 if (!sBugID
.IsEmpty())
257 SetDlgItemText(IDC_BUGID
, sBugID
);
262 GetDlgItem(IDC_BUGID
)->ShowWindow(SW_HIDE
);
263 GetDlgItem(IDC_BUGIDLABEL
)->ShowWindow(SW_HIDE
);
264 GetDlgItem(IDC_BUGTRAQBUTTON
)->ShowWindow(SW_HIDE
);
265 GetDlgItem(IDC_BUGTRAQBUTTON
)->EnableWindow(FALSE
);
266 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
269 if (!m_sLogMessage
.IsEmpty())
270 m_cLogMessage
.SetText(m_sLogMessage
);
272 GetWindowText(m_sWindowTitle
);
274 AdjustControlSize(IDC_SHOWUNVERSIONED
);
275 AdjustControlSize(IDC_WHOLE_PROJECT
);
276 AdjustControlSize(IDC_CHECK_NEWBRANCH
);
277 AdjustControlSize(IDC_COMMIT_AMEND
);
278 AdjustControlSize(IDC_COMMIT_MESSAGEONLY
);
279 AdjustControlSize(IDC_COMMIT_AMENDDIFF
);
280 AdjustControlSize(IDC_COMMIT_SETDATETIME
);
281 AdjustControlSize(IDC_NOAUTOSELECTSUBMODULES
);
282 AdjustControlSize(IDC_KEEPLISTS
);
284 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKALL
);
285 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKNONE
);
286 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKUNVERSIONED
);
287 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKVERSIONED
);
288 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKADDED
);
289 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKDELETED
);
290 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKMODIFIED
);
291 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKFILES
);
292 m_linkControl
.ConvertStaticToLink(m_hWnd
, IDC_CHECKSUBMODULES
);
294 // line up all controls and adjust their sizes.
295 #define LINKSPACING 9
296 RECT rc
= AdjustControlSize(IDC_SELECTLABEL
);
297 rc
.right
-= 15; // AdjustControlSize() adds 20 pixels for the checkbox/radio button bitmap, but this is a label...
298 rc
= AdjustStaticSize(IDC_CHECKALL
, rc
, LINKSPACING
);
299 rc
= AdjustStaticSize(IDC_CHECKNONE
, rc
, LINKSPACING
);
300 rc
= AdjustStaticSize(IDC_CHECKUNVERSIONED
, rc
, LINKSPACING
);
301 rc
= AdjustStaticSize(IDC_CHECKVERSIONED
, rc
, LINKSPACING
);
302 rc
= AdjustStaticSize(IDC_CHECKADDED
, rc
, LINKSPACING
);
303 rc
= AdjustStaticSize(IDC_CHECKDELETED
, rc
, LINKSPACING
);
304 rc
= AdjustStaticSize(IDC_CHECKMODIFIED
, rc
, LINKSPACING
);
305 rc
= AdjustStaticSize(IDC_CHECKFILES
, rc
, LINKSPACING
);
306 rc
= AdjustStaticSize(IDC_CHECKSUBMODULES
, rc
, LINKSPACING
);
308 GetClientRect(m_DlgOrigRect
);
309 m_cLogMessage
.GetClientRect(m_LogMsgOrigRect
);
311 AddAnchor(IDC_COMMITLABEL
, TOP_LEFT
, TOP_RIGHT
);
312 AddAnchor(IDC_BUGIDLABEL
, TOP_RIGHT
);
313 AddAnchor(IDC_BUGID
, TOP_RIGHT
);
314 AddAnchor(IDC_BUGTRAQBUTTON
, TOP_RIGHT
);
315 AddAnchor(IDC_COMMIT_TO
, TOP_LEFT
, TOP_RIGHT
);
316 AddAnchor(IDC_CHECK_NEWBRANCH
, TOP_RIGHT
);
317 AddAnchor(IDC_NEWBRANCH
, TOP_LEFT
, TOP_RIGHT
);
318 AddAnchor(IDC_MESSAGEGROUP
, TOP_LEFT
, TOP_RIGHT
);
319 // AddAnchor(IDC_HISTORY, TOP_LEFT);
320 AddAnchor(IDC_LOGMESSAGE
, TOP_LEFT
, TOP_RIGHT
);
321 AddAnchor(IDC_SIGNOFF
, TOP_RIGHT
);
322 AddAnchor(IDC_VIEW_PATCH
, BOTTOM_RIGHT
);
323 AddAnchor(IDC_LISTGROUP
, TOP_LEFT
, BOTTOM_RIGHT
);
324 AddAnchor(IDC_SPLITTER
, TOP_LEFT
, TOP_RIGHT
);
325 AddAnchor(IDC_FILELIST
, TOP_LEFT
, BOTTOM_RIGHT
);
326 AddAnchor(IDC_SHOWUNVERSIONED
, BOTTOM_LEFT
);
327 AddAnchor(IDC_EXTERNALWARNING
, BOTTOM_RIGHT
);
328 AddAnchor(IDC_STATISTICS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
329 AddAnchor(IDC_TEXT_INFO
, TOP_RIGHT
);
330 AddAnchor(IDC_WHOLE_PROJECT
, BOTTOM_LEFT
);
331 AddAnchor(IDC_KEEPLISTS
, BOTTOM_LEFT
);
332 AddAnchor(IDC_NOAUTOSELECTSUBMODULES
, BOTTOM_LEFT
);
333 AddAnchor(IDOK
, BOTTOM_RIGHT
);
334 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
335 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
336 AddAnchor(IDC_COMMIT_AMEND
,TOP_LEFT
);
337 AddAnchor(IDC_COMMIT_MESSAGEONLY
, BOTTOM_LEFT
);
338 AddAnchor(IDC_COMMIT_AMENDDIFF
,TOP_LEFT
);
339 AddAnchor(IDC_COMMIT_SETDATETIME
,TOP_LEFT
);
340 AddAnchor(IDC_COMMIT_DATEPICKER
,TOP_LEFT
);
341 AddAnchor(IDC_COMMIT_TIMEPICKER
,TOP_LEFT
);
343 AddAnchor(IDC_SELECTLABEL
, TOP_LEFT
);
344 AddAnchor(IDC_CHECKALL
, TOP_LEFT
);
345 AddAnchor(IDC_CHECKNONE
, TOP_LEFT
);
346 AddAnchor(IDC_CHECKUNVERSIONED
, TOP_LEFT
);
347 AddAnchor(IDC_CHECKVERSIONED
, TOP_LEFT
);
348 AddAnchor(IDC_CHECKADDED
, TOP_LEFT
);
349 AddAnchor(IDC_CHECKDELETED
, TOP_LEFT
);
350 AddAnchor(IDC_CHECKMODIFIED
, TOP_LEFT
);
351 AddAnchor(IDC_CHECKFILES
, TOP_LEFT
);
352 AddAnchor(IDC_CHECKSUBMODULES
, TOP_LEFT
);
355 CenterWindow(CWnd::FromHandle(hWndExplorer
));
356 EnableSaveRestore(_T("CommitDlg"));
357 DWORD yPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
358 RECT rcDlg
, rcLogMsg
, rcFileList
;
359 GetClientRect(&rcDlg
);
360 m_cLogMessage
.GetWindowRect(&rcLogMsg
);
361 ScreenToClient(&rcLogMsg
);
362 m_ListCtrl
.GetWindowRect(&rcFileList
);
363 ScreenToClient(&rcFileList
);
367 m_wndSplitter
.GetWindowRect(&rectSplitter
);
368 ScreenToClient(&rectSplitter
);
369 int delta
= yPos
- rectSplitter
.top
;
370 if ((rcLogMsg
.bottom
+ delta
> rcLogMsg
.top
)&&(rcLogMsg
.bottom
+ delta
< rcFileList
.bottom
- 30))
372 m_wndSplitter
.SetWindowPos(NULL
, rectSplitter
.left
, yPos
, 0, 0, SWP_NOSIZE
);
379 // add all directories to the watcher
381 for (int i=0; i<m_pathList.GetCount(); ++i)
383 if (m_pathList[i].IsDirectory())
384 m_pathwatcher.AddPath(m_pathList[i]);
387 m_updatedPathList
= m_pathList
;
389 //first start a thread to obtain the file list with the status without
390 //blocking the dialog
391 InterlockedExchange(&m_bBlock
, TRUE
);
392 m_pThread
= AfxBeginThread(StatusThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
395 CMessageBox::Show(this->m_hWnd
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
396 InterlockedExchange(&m_bBlock
, FALSE
);
400 m_pThread
->m_bAutoDelete
= FALSE
;
401 m_pThread
->ResumeThread();
403 CRegDWORD err
= CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE
);
404 CRegDWORD historyhint
= CRegDWORD(_T("Software\\TortoiseGit\\HistoryHintShown"), FALSE
);
405 if ((((DWORD
)err
)!=FALSE
)&&((((DWORD
)historyhint
)==FALSE
)))
408 // ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);
412 this->m_ctrlShowPatch
.SetURL(CString());
414 BOOL viewPatchEnabled
= FALSE
;
415 m_ProjectProperties
.GetBOOLProps(viewPatchEnabled
, _T("tgit.commitshowpatch"));
416 if (viewPatchEnabled
)
417 OnStnClickedViewPatch();
419 return FALSE
; // return TRUE unless you set the focus to a control
420 // EXCEPTION: OCX Property Pages should return FALSE
423 void CCommitDlg::OnOK()
427 if (m_bThreadRunning
)
430 InterlockedExchange(&m_bRunThread
, FALSE
);
431 WaitForSingleObject(m_pThread
->m_hThread
, 1000);
432 if (m_bThreadRunning
)
434 // we gave the thread a chance to quit. Since the thread didn't
435 // listen to us we have to kill it.
436 TerminateThread(m_pThread
->m_hThread
, (DWORD
)-1);
437 InterlockedExchange(&m_bThreadRunning
, FALSE
);
442 if (m_bCreateNewBranch
)
444 if (!g_Git
.IsBranchNameValid(m_sCreateNewBranch
))
446 ShowEditBalloon(IDC_NEWBRANCH
, IDS_B_T_NOTEMPTY
, TTI_ERROR
);
449 if (g_Git
.BranchTagExists(m_sCreateNewBranch
))
451 // branch already exists
453 msg
.LoadString(IDS_B_EXISTS
);
454 msg
+= _T(" ") + CString(MAKEINTRESOURCE(IDS_B_DELETEORDIFFERENTNAME
));
455 ShowEditBalloon(IDC_NEWBRANCH
, msg
, CString(MAKEINTRESOURCE(IDS_WARN_WARNING
)));
458 if (g_Git
.BranchTagExists(m_sCreateNewBranch
, false))
460 // tag with the same name exists -> shortref is ambiguous
461 if (CMessageBox::Show(m_hWnd
, IDS_B_SAMETAGNAMEEXISTS
, IDS_APPNAME
, 2, IDI_EXCLAMATION
, IDS_CONTINUEBUTTON
, IDS_ABORTBUTTON
) == 2)
467 GetDlgItemText(IDC_BUGID
, id
);
468 if (!m_ProjectProperties
.CheckBugID(id
))
470 ShowEditBalloon(IDC_BUGID
, IDS_COMMITDLG_ONLYNUMBERS
, TTI_ERROR
);
473 m_sLogMessage
= m_cLogMessage
.GetText();
474 if ( m_sLogMessage
.IsEmpty() )
476 // no message entered, go round again
477 CMessageBox::Show(this->m_hWnd
, IDS_COMMITDLG_NOMESSAGE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
480 if ((m_ProjectProperties
.bWarnIfNoIssue
) && (id
.IsEmpty() && !m_ProjectProperties
.HasBugID(m_sLogMessage
)))
482 if (CMessageBox::Show(this->m_hWnd
, IDS_COMMITDLG_NOISSUEWARNING
, IDS_APPNAME
, MB_YESNO
| MB_ICONWARNING
)!=IDYES
)
486 BOOL bWarnNoSignedOffBy
= FALSE
;
487 ProjectProperties::GetBOOLProps(bWarnNoSignedOffBy
, _T("tgit.warnnosignedoffby"));
488 if (bWarnNoSignedOffBy
== TRUE
&& m_cLogMessage
.GetText().Find(GetSignedOffByLine()) == -1)
490 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
);
493 OnBnClickedSignOff();
494 m_sLogMessage
= m_cLogMessage
.GetText();
496 else if (retval
== 3)
500 int nListItems
= m_ListCtrl
.GetItemCount();
501 for (int i
= 0; i
< nListItems
&& !m_bCommitMessageOnly
; ++i
)
503 CTGitPath
*entry
= (CTGitPath
*)m_ListCtrl
.GetItemData(i
);
504 if (!entry
->m_Checked
|| !entry
->IsDirectory())
508 if (entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
511 subgit
.m_CurrentDir
= g_Git
.m_CurrentDir
+ _T("\\") + entry
->GetWinPathString();
513 subgit
.Run(_T("git.exe status --porcelain"), &subcmdout
, CP_UTF8
);
514 dirty
= !subcmdout
.IsEmpty();
519 cmd
.Format(_T("git.exe diff -- \"%s\""), entry
->GetWinPathString());
520 g_Git
.Run(cmd
, &cmdout
, CP_UTF8
);
521 dirty
= cmdout
.Right(7) == _T("-dirty\n");
527 message
.Format(CString(MAKEINTRESOURCE(IDS_COMMITDLG_SUBMODULEDIRTY
)), entry
->GetGitPathString());
528 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
)));
532 cmdCommit
.Format(_T("/command:commit /path:\"%s\\%s\""), g_Git
.m_CurrentDir
, entry
->GetWinPathString());
533 CAppUtils::RunTortoiseGitProc(cmdCommit
);
536 else if (result
== 2)
543 if (!m_bCommitMessageOnly
)
544 m_ListCtrl
.WriteCheckedNamesToPathList(m_selectedPathList
);
545 m_pathwatcher
.Stop();
546 InterlockedExchange(&m_bBlock
, TRUE
);
547 CDWordArray arDeleted
;
548 //first add all the unversioned files the user selected
549 //and check if all versioned files are selected
553 CTGitPathList itemsToAdd
;
554 CTGitPathList itemsToRemove
;
555 CMassiveGitTask
mgtReAddAfterCommit(_T("add --ignore-errors -f"));
560 bool bAddSuccess
=true;
561 bool bCloseCommitDlg
=false;
563 CSysProgressDlg sysProgressDlg
;
564 if (nListItems
>= 25)
566 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_PREPARECOMMIT
)));
567 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_UPDATEINDEX
)));
568 sysProgressDlg
.SetTime(true);
569 sysProgressDlg
.SetShowProgressBar(true);
570 sysProgressDlg
.ShowModal(this, true);
573 CBlockCacheForPath
cacheBlock(g_Git
.m_CurrentDir
);
574 DWORD currentTicks
= GetTickCount();
576 for (int j
= 0; j
< nListItems
; ++j
)
578 CTGitPath
*entry
= (CTGitPath
*)m_ListCtrl
.GetItemData(j
);
579 if (sysProgressDlg
.IsVisible())
581 if (GetTickCount() - currentTicks
> 1000 || j
== nListItems
- 1 || j
== 0)
583 sysProgressDlg
.SetLine(2, entry
->GetGitPathString(), true);
584 sysProgressDlg
.SetProgress(j
, nListItems
);
585 AfxGetThread()->PumpMessage(); // process messages, in order to avoid freezing; do not call this too: this takes time!
586 currentTicks
= GetTickCount();
589 if (entry
->m_Checked
&& !m_bCommitMessageOnly
)
591 if( entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
592 cmd
.Format(_T("git.exe add -f -- \"%s\""),entry
->GetGitPathString());
593 else if ( entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
594 cmd
.Format(_T("git.exe update-index --force-remove -- \"%s\""),entry
->GetGitPathString());
596 cmd
.Format(_T("git.exe update-index -- \"%s\""),entry
->GetGitPathString());
598 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
600 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
601 bAddSuccess
= false ;
605 if( entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
606 cmd
.Format(_T("git.exe rm -- \"%s\""), entry
->GetGitOldPathString());
608 g_Git
.Run(cmd
, &out
, CP_UTF8
);
614 if(entry
->m_Action
& CTGitPath::LOGACTIONS_ADDED
|| entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
615 { //To init git repository, there are not HEAD, so we can use git reset command
616 cmd
.Format(_T("git.exe rm -f --cache -- \"%s\""),entry
->GetGitPathString());
617 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
619 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
620 bAddSuccess
= false ;
621 bCloseCommitDlg
=false;
624 mgtReAddAfterCommit
.AddFile(*entry
);
626 if (entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
&& !entry
->GetGitOldPathString().IsEmpty())
628 if (m_bCommitAmend
&& !m_bAmendDiffToLastCommit
)
629 cmd
.Format(_T("git.exe reset HEAD~1 -- \"%s\""), entry
->GetGitOldPathString());
631 cmd
.Format(_T("git.exe reset -- \"%s\""), entry
->GetGitOldPathString());
632 g_Git
.Run(cmd
, &out
, CP_UTF8
);
635 else if(!( entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
) )
637 if (m_bCommitAmend
&& !m_bAmendDiffToLastCommit
)
639 cmd
.Format(_T("git.exe reset HEAD~1 -- \"%s\""), entry
->GetGitPathString());
643 cmd
.Format(_T("git.exe reset -- \"%s\""), entry
->GetGitPathString());
645 g_Git
.Run(cmd
, &out
, CP_UTF8
);
646 if (m_bCommitAmend
&& !m_bAmendDiffToLastCommit
)
651 if (sysProgressDlg
.HasUserCancelled())
657 CShellUpdater::Instance().AddPathForUpdate(*entry
);
660 sysProgressDlg
.Stop();
662 if (bAddSuccess
&& m_bCreateNewBranch
)
664 if (g_Git
.Run(_T("git branch ") + m_sCreateNewBranch
, &out
, CP_UTF8
))
666 MessageBox(_T("Creating new branch failed:\n") + out
, _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
669 if (g_Git
.Run(_T("git checkout ") + m_sCreateNewBranch
, &out
, CP_UTF8
))
671 MessageBox(_T("Switching to new branch failed:\n") + out
, _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
676 if (bAddSuccess
&& CheckHeadDetach())
680 CString sExistingBugID
= m_ProjectProperties
.FindBugID(m_sLogMessage
);
681 sExistingBugID
.Trim();
682 if (!m_sBugID
.IsEmpty() && m_sBugID
.Compare(sExistingBugID
))
684 m_sBugID
.Replace(_T(", "), _T(","));
685 m_sBugID
.Replace(_T(" ,"), _T(","));
686 CString sBugID
= m_ProjectProperties
.sMessage
;
687 sBugID
.Replace(_T("%BUGID%"), m_sBugID
);
688 if (m_ProjectProperties
.bAppend
)
689 m_sLogMessage
+= _T("\n") + sBugID
+ _T("\n");
691 m_sLogMessage
= sBugID
+ _T("\n") + m_sLogMessage
;
694 // now let the bugtraq plugin check the commit message
695 CComPtr
<IBugTraqProvider2
> pProvider2
= NULL
;
696 if (m_BugTraqProvider
)
698 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider2
);
702 CString common
= g_Git
.m_CurrentDir
;
703 BSTR repositoryRoot
= common
.AllocSysString();
704 BSTR parameters
= m_bugtraq_association
.GetParameters().AllocSysString();
705 BSTR commonRoot
= SysAllocString(m_pathList
.GetCommonRoot().GetDirectory().GetWinPath());
706 BSTR commitMessage
= m_sLogMessage
.AllocSysString();
707 SAFEARRAY
*pathList
= SafeArrayCreateVector(VT_BSTR
, 0, m_selectedPathList
.GetCount());
709 for (LONG index
= 0; index
< m_selectedPathList
.GetCount(); ++index
)
710 SafeArrayPutElement(pathList
, &index
, m_selectedPathList
[index
].GetGitPathString().AllocSysString());
712 if (FAILED(hr
= pProvider2
->CheckCommit(GetSafeHwnd(), parameters
, repositoryRoot
, commonRoot
, pathList
, commitMessage
, &temp
)))
716 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, m_bugtraq_association
.GetProviderName(), ce
.GetMessageAndDescription().c_str());
717 CMessageBox::Show(m_hWnd
, sErr
, _T("TortoiseGit"), MB_ICONERROR
);
721 CString sError
= temp
;
722 if (!sError
.IsEmpty())
724 CMessageBox::Show(m_hWnd
, sError
, _T("TortoiseGit"), MB_ICONERROR
);
732 if (m_bCommitMessageOnly
|| bAddSuccess
&& (nchecked
|| m_bCommitAmend
|| CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive()))
734 bCloseCommitDlg
= true;
736 CString tempfile
=::GetTempFile();
738 CAppUtils::SaveCommitUnicodeFile(tempfile
,m_sLogMessage
);
740 CTGitPath path
=g_Git
.m_CurrentDir
;
742 BOOL IsGitSVN
= path
.GetAdminDirMask() & ITEMIS_GITSVN
;
746 if(this->m_bCommitAmend
)
751 if (m_bSetCommitDateTime
)
754 m_CommitDate
.GetTime(date
);
755 m_CommitTime
.GetTime(time
);
756 dateTime
.Format(_T("--date=%sT%s"), date
.Format(_T("%Y-%m-%d")), time
.Format(_T("%H:%M:%S")));
758 CString allowEmpty
= m_bCommitMessageOnly
? _T("--allow-empty") : _T("");
759 cmd
.Format(_T("git.exe commit %s %s %s -F \"%s\""), dateTime
, amend
, allowEmpty
, tempfile
);
761 CCommitProgressDlg progress
;
762 progress
.m_bBufferAll
=true; // improve show speed when there are many file added.
763 progress
.m_GitCmd
=cmd
;
764 progress
.m_bShowCommand
= FALSE
; // don't show the commit command
765 progress
.m_PreText
= out
; // show any output already generated in log window
766 progress
.m_bAutoCloseOnSuccess
= m_bAutoClose
;
768 int indexReCommit
= -1;
771 if (!m_bNoPostActions
&& !m_bAutoClose
)
774 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUSVNDCOMMIT
)));
775 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUPUSH
)));
776 indexReCommit
= (int)progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_RECOMMIT
)));
777 indexTag
= (int)progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUTAG
)));
780 INT_PTR userResponse
= progress
.DoModal();
782 if(progress
.m_GitStatus
|| userResponse
== (IDC_PROGRESS_BUTTON1
+ indexReCommit
))
784 bCloseCommitDlg
= false;
785 if (userResponse
== IDC_PROGRESS_BUTTON1
+ indexReCommit
)
787 this->m_sLogMessage
.Empty();
788 m_cLogMessage
.SetText(m_sLogMessage
);
791 m_bCommitAmend
= FALSE
;
795 else if (userResponse
== IDC_PROGRESS_BUTTON1
+ indexTag
)
797 m_bCreateTagAfterCommit
=true;
799 else if (userResponse
>= IDC_PROGRESS_BUTTON1
&& userResponse
< IDC_PROGRESS_BUTTON1
+ indexReCommit
)
801 // User pressed 'DCommit' or 'Push' button after successful commit.
802 m_bPushAfterCommit
=true;
803 if (userResponse
== IDC_PROGRESS_BUTTON1
&& IsGitSVN
)
804 m_PostCmd
= GIT_POST_CMD_DCOMMIT
;
806 m_PostCmd
= GIT_POST_CMD_PUSH
;
809 CFile::Remove(tempfile
);
811 if (m_BugTraqProvider
&& progress
.m_GitStatus
== 0)
813 CComPtr
<IBugTraqProvider2
> pProvider
= NULL
;
814 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider
);
817 BSTR commonRoot
= SysAllocString(g_Git
.m_CurrentDir
);
818 SAFEARRAY
*pathList
= SafeArrayCreateVector(VT_BSTR
, 0,this->m_selectedPathList
.GetCount());
820 for (LONG index
= 0; index
< m_selectedPathList
.GetCount(); ++index
)
821 SafeArrayPutElement(pathList
, &index
, m_selectedPathList
[index
].GetGitPathString().AllocSysString());
823 BSTR logMessage
= m_sLogMessage
.AllocSysString();
826 if (g_Git
.GetHash(hash
, _T("HEAD")))
827 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash after committing.")), _T("TortoiseGit"), MB_ICONERROR
);
828 LONG version
= g_Git
.Hash2int(hash
);
831 if (FAILED(hr
= pProvider
->OnCommitFinished(GetSafeHwnd(),
840 CMessageBox::Show(NULL
,(sErr
),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
844 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, ce
.GetSource().c_str(), ce
.GetMessageAndDescription().c_str());
845 CMessageBox::Show(NULL
,(sErr
),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
852 RestoreFiles(progress
.m_GitStatus
== 0);
853 if (((DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit"), TRUE
)) == TRUE
)
856 mgtReAddAfterCommit
.Execute(cancel
);
861 CMessageBox::Show(this->m_hWnd
, IDS_ERROR_NOTHING_COMMIT
, IDS_COMMIT_FINISH
, MB_OK
| MB_ICONINFORMATION
);
862 bCloseCommitDlg
=false;
866 m_regAddBeforeCommit
= m_bShowUnversioned
;
867 if (!GetDlgItem(IDC_WHOLE_PROJECT
)->IsWindowEnabled())
868 m_bWholeProject
= FALSE
;
869 m_regKeepChangelists
= m_bKeepChangeList
;
870 m_regDoNotAutoselectSubmodules
= m_bDoNotAutoselectSubmodules
;
871 if (!GetDlgItem(IDC_KEEPLISTS
)->IsWindowEnabled())
872 m_bKeepChangeList
= FALSE
;
873 InterlockedExchange(&m_bBlock
, FALSE
);
875 if (!m_sLogMessage
.IsEmpty())
877 m_History
.AddEntry(m_sLogMessage
);
883 if( bCloseCommitDlg
)
884 CResizableStandAloneDialog::OnOK();
886 CShellUpdater::Instance().Flush();
889 void CCommitDlg::SaveSplitterPos()
893 CRegDWORD regPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));
895 m_wndSplitter
.GetWindowRect(&rectSplitter
);
896 ScreenToClient(&rectSplitter
);
897 regPos
= rectSplitter
.top
;
901 UINT
CCommitDlg::StatusThreadEntry(LPVOID pVoid
)
903 return ((CCommitDlg
*)pVoid
)->StatusThread();
906 UINT
CCommitDlg::StatusThread()
908 //get the status of all selected file/folders recursively
909 //and show the ones which have to be committed to the user
911 InterlockedExchange(&m_bBlock
, TRUE
);
912 InterlockedExchange(&m_bThreadRunning
, TRUE
);// so the main thread knows that this thread is still running
913 InterlockedExchange(&m_bRunThread
, TRUE
); // if this is set to FALSE, the thread should stop
915 m_pathwatcher
.Stop();
917 g_Git
.RefreshGitIndex();
919 m_bCancelled
= false;
921 DialogEnableWindow(IDOK
, false);
922 DialogEnableWindow(IDC_SHOWUNVERSIONED
, false);
923 DialogEnableWindow(IDC_WHOLE_PROJECT
, false);
924 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES
, false);
925 GetDlgItem(IDC_EXTERNALWARNING
)->ShowWindow(SW_HIDE
);
926 DialogEnableWindow(IDC_EXTERNALWARNING
, false);
927 DialogEnableWindow(IDC_COMMIT_AMEND
, FALSE
);
928 DialogEnableWindow(IDC_COMMIT_AMENDDIFF
, FALSE
);
929 // read the list of recent log entries before querying the WC for status
930 // -> the user may select one and modify / update it while we are crawling the WC
932 DialogEnableWindow(IDC_CHECKALL
, false);
933 DialogEnableWindow(IDC_CHECKNONE
, false);
934 DialogEnableWindow(IDC_CHECKUNVERSIONED
, false);
935 DialogEnableWindow(IDC_CHECKVERSIONED
, false);
936 DialogEnableWindow(IDC_CHECKADDED
, false);
937 DialogEnableWindow(IDC_CHECKDELETED
, false);
938 DialogEnableWindow(IDC_CHECKMODIFIED
, false);
939 DialogEnableWindow(IDC_CHECKFILES
, false);
940 DialogEnableWindow(IDC_CHECKSUBMODULES
, false);
942 if (m_History
.GetCount()==0)
945 reg
.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR
)m_ListCtrl
.m_sUUID
);
946 reg
.Replace(_T(':'),_T('_'));
947 m_History
.Load(reg
, _T("logmsgs"));
950 // Initialise the list control with the status of the files/folders below us
953 CTGitPathList
*pList
;
954 m_ListCtrl
.m_amend
= (m_bCommitAmend
==TRUE
|| m_bForceCommitAmend
) && (m_bAmendDiffToLastCommit
==FALSE
);
955 m_ListCtrl
.m_bDoNotAutoselectSubmodules
= (m_bDoNotAutoselectSubmodules
== TRUE
);
962 success
=m_ListCtrl
.GetStatus(pList
);
964 //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));
965 if(this->m_bShowUnversioned
)
966 m_ListCtrl
.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER
,true,pList
);
968 m_ListCtrl
.CheckIfChangelistsArePresent(false);
970 DWORD dwShow
= GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GITSLC_SHOWLOCKS
| GITSLC_SHOWINCHANGELIST
;
971 dwShow
|= DWORD(m_regAddBeforeCommit
) ? GITSLC_SHOWUNVERSIONED
: 0;
974 if (m_checkedPathList
.GetCount())
975 m_ListCtrl
.Show(dwShow
, m_checkedPathList
);
978 DWORD dwCheck
= m_bSelectFilesForCommit
? dwShow
: 0;
979 dwCheck
&=~(CTGitPath::LOGACTIONS_UNVER
); //don't check unversion file default.
980 m_ListCtrl
.Show(dwShow
, dwCheck
);
981 m_bSelectFilesForCommit
= true;
984 if (m_ListCtrl
.HasExternalsFromDifferentRepos())
986 GetDlgItem(IDC_EXTERNALWARNING
)->ShowWindow(SW_SHOW
);
987 DialogEnableWindow(IDC_EXTERNALWARNING
, TRUE
);
990 SetDlgItemText(IDC_COMMIT_TO
, g_Git
.GetCurrentBranch());
991 m_tooltips
.AddTool(GetDlgItem(IDC_STATISTICS
), m_ListCtrl
.GetStatisticsString());
995 if (!m_ListCtrl
.GetLastErrorMessage().IsEmpty())
996 m_ListCtrl
.SetEmptyString(m_ListCtrl
.GetLastErrorMessage());
997 m_ListCtrl
.Show(dwShow
);
1001 g_GitAdminDir
.GetAdminDirPath(g_Git
.m_CurrentDir
, dotGitPath
);
1002 if ((m_ListCtrl
.GetItemCount()==0)&&(m_ListCtrl
.HasUnversionedItems())
1003 && !PathFileExists(dotGitPath
+ _T("MERGE_HEAD")))
1006 temp
.LoadString(IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED
);
1007 if (CMessageBox::ShowCheck(m_hWnd
, temp
, _T("TortoiseGit"), MB_ICONINFORMATION
| MB_YESNO
, _T("NothingToCommitShowUnversioned"), NULL
)==IDYES
)
1009 m_bShowUnversioned
= TRUE
;
1010 GetDlgItem(IDC_SHOWUNVERSIONED
)->SendMessage(BM_SETCHECK
, BST_CHECKED
);
1011 DWORD dwShow
= (DWORD
)(GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GITSLC_SHOWUNVERSIONED
| GITSLC_SHOWLOCKS
);
1012 m_ListCtrl
.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER
);
1013 m_ListCtrl
.Show(dwShow
,dwShow
&(~CTGitPath::LOGACTIONS_UNVER
));
1020 // we don't have to block the commit dialog while we fetch the
1021 // auto completion list.
1022 m_pathwatcher
.ClearChangedPaths();
1023 InterlockedExchange(&m_bBlock
, FALSE
);
1024 if ((DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE
)==TRUE
)
1026 m_ListCtrl
.Block(TRUE
, TRUE
);
1027 GetAutocompletionList();
1028 m_ListCtrl
.Block(FALSE
, FALSE
);
1030 SendMessage(WM_UPDATEOKBUTTON
);
1033 DialogEnableWindow(IDC_SHOWUNVERSIONED
, true);
1034 DialogEnableWindow(IDC_WHOLE_PROJECT
, true);
1035 DialogEnableWindow(IDC_NOAUTOSELECTSUBMODULES
, true);
1036 if (m_ListCtrl
.HasChangeLists())
1037 DialogEnableWindow(IDC_KEEPLISTS
, true);
1038 if (m_ListCtrl
.HasLocks())
1039 DialogEnableWindow(IDC_WHOLE_PROJECT
, true);
1041 // activate amend checkbox (if necessary)
1042 if (g_Git
.IsInitRepos())
1044 m_bCommitAmend
= FALSE
;
1049 if (m_bForceCommitAmend
)
1051 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_SHOW
);
1052 m_bCommitAmend
= TRUE
;
1056 GetDlgItem(IDC_COMMIT_AMEND
)->EnableWindow(TRUE
);
1059 if (g_Git
.GetHash(hash
, _T("HEAD")))
1061 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
1063 if (!hash
.IsEmpty())
1065 GitRev headRevision
;
1068 headRevision
.GetParentFromHash(hash
);
1073 MessageBox(_T("Could not get parent from HEAD.\nlibgit reports:\n") + err
, _T("TortoiseGit"), MB_ICONERROR
);
1075 // do not allow to show diff to "last" revision if it has more that one parent
1076 if (headRevision
.ParentsCount() != 1)
1078 m_bAmendDiffToLastCommit
= true;
1082 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->EnableWindow(TRUE
);
1088 // we have the list, now signal the main thread about it
1089 SendMessage(WM_AUTOLISTREADY
); // only send the message if the thread wasn't told to quit!
1092 InterlockedExchange(&m_bRunThread
, FALSE
);
1093 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1094 // force the cursor to normal
1100 void CCommitDlg::SetDlgTitle()
1102 if (m_sTitle
.IsEmpty())
1103 GetWindowText(m_sTitle
);
1105 if (m_bWholeProject
)
1106 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
1109 if (m_pathList
.GetCount() == 1)
1110 CAppUtils::SetWindowTitle(m_hWnd
, (g_Git
.m_CurrentDir
+ _T("\\") + m_pathList
[0].GetUIPathString()).TrimRight('\\'), m_sTitle
);
1112 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
+ _T("\\") + m_ListCtrl
.GetCommonDirectory(false), m_sTitle
);
1116 void CCommitDlg::OnCancel()
1118 m_bCancelled
= true;
1119 m_pathwatcher
.Stop();
1121 if (m_bThreadRunning
)
1123 InterlockedExchange(&m_bRunThread
, FALSE
);
1124 WaitForSingleObject(m_pThread
->m_hThread
, 1000);
1125 if (m_bThreadRunning
)
1127 // we gave the thread a chance to quit. Since the thread didn't
1128 // listen to us we have to kill it.
1129 TerminateThread(m_pThread
->m_hThread
, (DWORD
)-1);
1130 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1135 m_sLogMessage
= m_cLogMessage
.GetText();
1136 if (!m_sBugID
.IsEmpty())
1138 m_sBugID
.Replace(_T(", "), _T(","));
1139 m_sBugID
.Replace(_T(" ,"), _T(","));
1140 CString sBugID
= m_ProjectProperties
.sMessage
;
1141 sBugID
.Replace(_T("%BUGID%"), m_sBugID
);
1142 if (m_ProjectProperties
.bAppend
)
1143 m_sLogMessage
+= _T("\n") + sBugID
+ _T("\n");
1145 m_sLogMessage
= sBugID
+ _T("\n") + m_sLogMessage
;
1147 if ((m_ProjectProperties
.sLogTemplate
.Compare(m_sLogMessage
) != 0) && !m_sLogMessage
.IsEmpty())
1149 m_History
.AddEntry(m_sLogMessage
);
1154 CResizableStandAloneDialog::OnCancel();
1157 BOOL
CCommitDlg::PreTranslateMessage(MSG
* pMsg
)
1160 m_tooltips
.RelayEvent(pMsg
);
1164 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1169 if (pMsg
->message
== WM_KEYDOWN
)
1171 switch (pMsg
->wParam
)
1176 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
1182 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
1184 if ( GetDlgItem(IDOK
)->IsWindowEnabled() )
1186 PostMessage(WM_COMMAND
, IDOK
);
1190 if ( GetFocus()==GetDlgItem(IDC_BUGID
) )
1192 // Pressing RETURN in the bug id control
1193 // moves the focus to the message
1194 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
1202 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
1205 void CCommitDlg::Refresh()
1207 if (m_bThreadRunning
)
1210 InterlockedExchange(&m_bBlock
, TRUE
);
1211 m_pThread
= AfxBeginThread(StatusThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
1212 if (m_pThread
==NULL
)
1214 CMessageBox::Show(this->m_hWnd
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
1215 InterlockedExchange(&m_bBlock
, FALSE
);
1219 m_pThread
->m_bAutoDelete
= FALSE
;
1220 m_pThread
->ResumeThread();
1224 void CCommitDlg::OnBnClickedHelp()
1229 void CCommitDlg::OnBnClickedShowunversioned()
1231 m_tooltips
.Pop(); // hide the tooltips
1233 m_regAddBeforeCommit
= m_bShowUnversioned
;
1236 DWORD dwShow
= m_ListCtrl
.GetShowFlags();
1237 if (DWORD(m_regAddBeforeCommit
))
1238 dwShow
|= GITSLC_SHOWUNVERSIONED
;
1240 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
1241 if(dwShow
& GITSLC_SHOWUNVERSIONED
)
1244 m_ListCtrl
.GetStatus(NULL
,false,false,true);
1246 m_ListCtrl
.GetStatus(&this->m_pathList
,false,false,true);
1248 m_ListCtrl
.Show(dwShow
, 0, true, dwShow
& ~(CTGitPath::LOGACTIONS_UNVER
), true);
1253 void CCommitDlg::OnStnClickedExternalwarning()
1258 void CCommitDlg::OnEnChangeLogmessage()
1260 SendMessage(WM_UPDATEOKBUTTON
);
1263 LRESULT
CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM
, LPARAM
)
1266 if ((m_ListCtrl
.GetItemCount() == 0)&&(m_ListCtrl
.HasUnversionedItems())&&(!m_bShowUnversioned
))
1268 if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED
, IDS_APPNAME
, MB_ICONINFORMATION
| MB_YESNO
)==IDYES
)
1270 m_bShowUnversioned
= TRUE
;
1271 DWORD dwShow
= GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS
| GitSLC_SHOWUNVERSIONED
| GitSLC_SHOWLOCKS
;
1272 m_ListCtrl
.Show(dwShow
);
1280 LRESULT
CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
1286 LRESULT
CCommitDlg::OnFileDropped(WPARAM
, LPARAM
/*lParam*/)
1290 SetForegroundWindow();
1292 // if multiple files/folders are dropped
1293 // this handler is called for every single item
1295 // To avoid creating multiple refresh threads and
1296 // causing crashes, we only add the items to the
1297 // list control and start a timer.
1298 // When the timer expires, we start the refresh thread,
1299 // but only if it isn't already running - otherwise we
1300 // restart the timer.
1302 path
.SetFromWin((LPCTSTR
)lParam
);
1304 // just add all the items we get here.
1305 // if the item is versioned, the add will fail but nothing
1306 // more will happen.
1308 Git
.Add(CTGitPathList(path
), &m_ProjectProperties
, Git_depth_empty
, false, true, true);
1310 if (!m_ListCtrl
.HasPath(path
))
1312 if (m_pathList
.AreAllPathsFiles())
1314 m_pathList
.AddPath(path
);
1315 m_pathList
.RemoveDuplicates();
1316 m_updatedPathList
.AddPath(path
);
1317 m_updatedPathList
.RemoveDuplicates();
1321 // if the path list contains folders, we have to check whether
1322 // our just (maybe) added path is a child of one of those. If it is
1323 // a child of a folder already in the list, we must not add it. Otherwise
1324 // that path could show up twice in the list.
1325 bool bHasParentInList
= false;
1326 for (int i
=0; i
<m_pathList
.GetCount(); ++i
)
1328 if (m_pathList
[i
].IsAncestorOf(path
))
1330 bHasParentInList
= true;
1334 if (!bHasParentInList
)
1336 m_pathList
.AddPath(path
);
1337 m_pathList
.RemoveDuplicates();
1338 m_updatedPathList
.AddPath(path
);
1339 m_updatedPathList
.RemoveDuplicates();
1344 // Always start the timer, since the status of an existing item might have changed
1345 SetTimer(REFRESHTIMER
, 200, NULL
);
1346 ATLTRACE(_T("Item %s dropped, timer started\n"), path
.GetWinPath());
1351 LRESULT
CCommitDlg::OnAutoListReady(WPARAM
, LPARAM
)
1353 m_cLogMessage
.SetAutoCompletionList(m_autolist
, '*');
1357 //////////////////////////////////////////////////////////////////////////
1358 // functions which run in the status thread
1359 //////////////////////////////////////////////////////////////////////////
1361 void CCommitDlg::ParseRegexFile(const CString
& sFile
, std::map
<CString
, CString
>& mapRegex
)
1366 CStdioFile
file(sFile
, CFile::typeText
| CFile::modeRead
| CFile::shareDenyWrite
);
1367 while (m_bRunThread
&& file
.ReadString(strLine
))
1369 int eqpos
= strLine
.Find('=');
1371 rgx
= strLine
.Mid(eqpos
+1).Trim();
1374 while (((pos
= strLine
.Find(','))>=0)&&(pos
< eqpos
))
1376 mapRegex
[strLine
.Left(pos
)] = rgx
;
1377 strLine
= strLine
.Mid(pos
+1).Trim();
1379 mapRegex
[strLine
.Left(strLine
.Find('=')).Trim()] = rgx
;
1383 catch (CFileException
* pE
)
1385 TRACE("CFileException loading auto list regex file\n");
1390 void CCommitDlg::GetAutocompletionList()
1392 // the auto completion list is made of strings from each selected files.
1393 // the strings used are extracted from the files with regexes found
1394 // in the file "autolist.txt".
1395 // the format of that file is:
1396 // file extensions separated with commas '=' regular expression to use
1398 // .h, .hpp = (?<=class[\s])\b\w+\b|(\b\w+(?=[\s ]?\(\);))
1399 // .cpp = (?<=[^\s]::)\b\w+\b
1401 std::map
<CString
, CString
> mapRegex
;
1402 CString sRegexFile
= CPathUtils::GetAppDirectory();
1403 CRegDWORD regtimeout
= CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);
1404 DWORD timeoutvalue
= regtimeout
*1000;
1405 sRegexFile
+= _T("autolist.txt");
1408 ParseRegexFile(sRegexFile
, mapRegex
);
1409 SHGetFolderPath(NULL
, CSIDL_APPDATA
, NULL
, SHGFP_TYPE_CURRENT
, sRegexFile
.GetBuffer(MAX_PATH
+1));
1410 sRegexFile
.ReleaseBuffer();
1411 sRegexFile
+= _T("\\TortoiseGit\\autolist.txt");
1412 if (PathFileExists(sRegexFile
))
1414 ParseRegexFile(sRegexFile
, mapRegex
);
1416 DWORD starttime
= GetTickCount();
1418 // now we have two arrays of strings, where the first array contains all
1419 // file extensions we can use and the second the corresponding regex strings
1420 // to apply to those files.
1422 // the next step is to go over all files shown in the commit dialog
1423 // and scan them for strings we can use
1424 int nListItems
= m_ListCtrl
.GetItemCount();
1426 for (int i
=0; i
<nListItems
&& m_bRunThread
; ++i
)
1428 // stop parsing after timeout
1429 if ((!m_bRunThread
) || (GetTickCount() - starttime
> timeoutvalue
))
1432 CTGitPath
*path
= (CTGitPath
*)m_ListCtrl
.GetItemData(i
);
1437 CString sPartPath
=path
->GetGitPathString();
1438 m_autolist
.insert(sPartPath
);
1440 // const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);
1444 // add the path parts to the auto completion list too
1445 // CString sPartPath = entry->GetRelativeGitPath();
1446 // m_autolist.insert(sPartPath);
1451 while ((pos
= sPartPath
.Find('/', pos
)) >= 0)
1455 m_autolist
.insert(sPartPath
.Mid(pos
));
1458 // Last inserted entry is a file name.
1459 // Some users prefer to also list file name without extension.
1460 if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE
))
1462 int dotPos
= sPartPath
.ReverseFind('.');
1463 if ((dotPos
>= 0) && (dotPos
> lastPos
))
1464 m_autolist
.insert(sPartPath
.Mid(lastPos
, dotPos
- lastPos
));
1467 if ((entry
->status
<= Git_wc_status_normal
)||(entry
->status
== Git_wc_status_ignored
))
1470 CString sExt
= entry
->GetPath().GetFileExtension();
1472 // find the regex string which corresponds to the file extension
1473 CString rdata
= mapRegex
[sExt
];
1474 if (rdata
.IsEmpty())
1477 ScanFile(entry
->GetPath().GetWinPathString(), rdata
);
1478 if ((entry
->textstatus
!= Git_wc_status_unversioned
) &&
1479 (entry
->textstatus
!= Git_wc_status_none
) &&
1480 (entry
->textstatus
!= Git_wc_status_ignored
) &&
1481 (entry
->textstatus
!= Git_wc_status_added
) &&
1482 (entry
->textstatus
!= Git_wc_status_normal
))
1484 CTGitPath basePath
= Git::GetPristinePath(entry
->GetPath());
1485 if (!basePath
.IsEmpty())
1486 ScanFile(basePath
.GetWinPathString(), rdata
);
1490 ATLTRACE(_T("Auto completion list loaded in %d msec\n"), GetTickCount() - starttime
);
1493 void CCommitDlg::ScanFile(const CString
& sFilePath
, const CString
& sRegex
)
1495 wstring sFileContent
;
1496 HANDLE hFile
= CreateFile(sFilePath
, GENERIC_READ
, FILE_SHARE_READ
, NULL
, OPEN_EXISTING
, NULL
, NULL
);
1497 if (hFile
!= INVALID_HANDLE_VALUE
)
1499 DWORD size
= GetFileSize(hFile
, NULL
);
1500 if (size
> 1000000L)
1502 // no files bigger than 1 Meg
1506 // allocate memory to hold file contents
1507 char * buffer
= new char[size
];
1509 ReadFile(hFile
, buffer
, size
, &readbytes
, NULL
);
1512 IsTextUnicode(buffer
, readbytes
, &opts
);
1513 if (opts
& IS_TEXT_UNICODE_NULL_BYTES
)
1518 if (opts
& IS_TEXT_UNICODE_UNICODE_MASK
)
1520 sFileContent
= wstring((wchar_t*)buffer
, readbytes
/sizeof(WCHAR
));
1522 if ((opts
& IS_TEXT_UNICODE_NOT_UNICODE_MASK
)||(opts
== 0))
1524 int ret
= MultiByteToWideChar(CP_UTF8
, MB_PRECOMPOSED
, (LPCSTR
)buffer
, readbytes
, NULL
, 0);
1525 wchar_t * pWideBuf
= new wchar_t[ret
];
1526 int ret2
= MultiByteToWideChar(CP_UTF8
, MB_PRECOMPOSED
, (LPCSTR
)buffer
, readbytes
, pWideBuf
, ret
);
1528 sFileContent
= wstring(pWideBuf
, ret
);
1533 if (sFileContent
.empty()|| !m_bRunThread
)
1540 const tr1::wregex
regCheck(sRegex
, tr1::regex_constants::icase
| tr1::regex_constants::ECMAScript
);
1541 const tr1::wsregex_iterator end
;
1542 wstring s
= sFileContent
;
1543 for (tr1::wsregex_iterator
it(s
.begin(), s
.end(), regCheck
); it
!= end
; ++it
)
1545 const tr1::wsmatch match
= *it
;
1546 for (size_t i
=1; i
<match
.size(); ++i
)
1548 if (match
[i
].second
-match
[i
].first
)
1550 ATLTRACE(_T("matched keyword : %s\n"), wstring(match
[i
]).c_str());
1551 m_autolist
.insert(wstring(match
[i
]).c_str());
1556 catch (exception
) {}
1559 // CSciEditContextMenuInterface
1560 void CCommitDlg::InsertMenuItems(CMenu
& mPopup
, int& nCmd
)
1562 CString
sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST
));
1563 m_nPopupPasteListCmd
= nCmd
++;
1564 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPasteListCmd
, sMenuItemText
);
1566 //CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));
1567 if(m_History
.GetCount() > 0)
1569 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE
);
1570 m_nPopupPasteLastMessage
= nCmd
++;
1571 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupPasteLastMessage
, sMenuItemText
);
1573 sMenuItemText
.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY
);
1574 m_nPopupRecentMessage
= nCmd
++;
1575 mPopup
.AppendMenu(MF_STRING
| MF_ENABLED
, m_nPopupRecentMessage
, sMenuItemText
);
1581 bool CCommitDlg::HandleMenuItemClick(int cmd
, CSciEdit
* pSciEdit
)
1586 if (cmd
== m_nPopupPasteListCmd
)
1589 int nListItems
= m_ListCtrl
.GetItemCount();
1590 for (int i
=0; i
<nListItems
; ++i
)
1592 CTGitPath
* entry
= (CTGitPath
*)m_ListCtrl
.GetItemData(i
);
1593 if (entry
&&entry
->m_Checked
)
1596 CString status
= entry
->GetActionName();
1597 if(entry
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
1598 status
= _T("Add"); // I18N TODO
1600 //git_wc_status_kind status = entry->status;
1601 WORD langID
= (WORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1602 if (m_ProjectProperties
.bFileListInEnglish
)
1605 line
.Format(_T("%-10s %s\r\n"),status
, (LPCTSTR
)m_ListCtrl
.GetItemText(i
,0));
1609 pSciEdit
->InsertText(logmsg
);
1613 if(cmd
== m_nPopupPasteLastMessage
)
1615 if(m_History
.GetCount() ==0 )
1619 logmsg
+=m_History
.GetEntry(0);
1620 pSciEdit
->InsertText(logmsg
);
1624 if(cmd
== m_nPopupRecentMessage
)
1626 OnBnClickedHistory();
1632 void CCommitDlg::OnTimer(UINT_PTR nIDEvent
)
1636 case ENDDIALOGTIMER
:
1637 KillTimer(ENDDIALOGTIMER
);
1641 if (m_bThreadRunning
)
1643 SetTimer(REFRESHTIMER
, 200, NULL
);
1644 ATLTRACE("Wait some more before refreshing\n");
1648 KillTimer(REFRESHTIMER
);
1649 ATLTRACE("Refreshing after items dropped\n");
1653 case FILLPATCHVTIMER
:
1657 __super::OnTimer(nIDEvent
);
1660 void CCommitDlg::OnBnClickedHistory()
1662 m_tooltips
.Pop(); // hide the tooltips
1663 if (m_pathList
.GetCount() == 0)
1666 CHistoryDlg historyDlg
;
1667 historyDlg
.SetHistory(m_History
);
1668 if (historyDlg
.DoModal() != IDOK
)
1671 CString sMsg
= historyDlg
.GetSelectedText();
1672 if (sMsg
!= m_cLogMessage
.GetText().Left(sMsg
.GetLength()))
1674 CString sBugID
= m_ProjectProperties
.FindBugID(sMsg
);
1675 if ((!sBugID
.IsEmpty()) && ((GetDlgItem(IDC_BUGID
)->IsWindowVisible())))
1677 SetDlgItemText(IDC_BUGID
, sBugID
);
1679 if (m_ProjectProperties
.sLogTemplate
.Compare(m_cLogMessage
.GetText())!=0)
1680 m_cLogMessage
.InsertText(sMsg
, !m_cLogMessage
.GetText().IsEmpty());
1682 m_cLogMessage
.SetText(sMsg
);
1685 SendMessage(WM_UPDATEOKBUTTON
);
1686 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
1690 void CCommitDlg::OnBnClickedBugtraqbutton()
1692 m_tooltips
.Pop(); // hide the tooltips
1693 CString sMsg
= m_cLogMessage
.GetText();
1695 if (m_BugTraqProvider
== NULL
)
1698 BSTR parameters
= m_bugtraq_association
.GetParameters().AllocSysString();
1699 BSTR commonRoot
= SysAllocString(g_Git
.m_CurrentDir
);
1700 SAFEARRAY
*pathList
= SafeArrayCreateVector(VT_BSTR
, 0, m_pathList
.GetCount());
1702 for (LONG index
= 0; index
< m_pathList
.GetCount(); ++index
)
1703 SafeArrayPutElement(pathList
, &index
, m_pathList
[index
].GetGitPathString().AllocSysString());
1705 BSTR originalMessage
= sMsg
.AllocSysString();
1707 // m_revProps.clear();
1709 // first try the IBugTraqProvider2 interface
1710 CComPtr
<IBugTraqProvider2
> pProvider2
= NULL
;
1711 HRESULT hr
= m_BugTraqProvider
.QueryInterface(&pProvider2
);
1712 bool bugIdOutSet
= false;
1715 //CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();
1716 BSTR repositoryRoot
= g_Git
.m_CurrentDir
.AllocSysString();
1717 BSTR bugIDOut
= NULL
;
1718 GetDlgItemText(IDC_BUGID
, m_sBugID
);
1719 BSTR bugID
= m_sBugID
.AllocSysString();
1720 SAFEARRAY
* revPropNames
= NULL
;
1721 SAFEARRAY
* revPropValues
= NULL
;
1722 if (FAILED(hr
= pProvider2
->GetCommitMessage2(GetSafeHwnd(), parameters
, repositoryRoot
, commonRoot
, pathList
, originalMessage
, bugID
, &bugIDOut
, &revPropNames
, &revPropValues
, &temp
)))
1725 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
1726 CMessageBox::Show(m_hWnd
, sErr
, _T("TortoiseGit"), MB_ICONERROR
);
1733 m_sBugID
= bugIDOut
;
1734 SysFreeString(bugIDOut
);
1735 SetDlgItemText(IDC_BUGID
, m_sBugID
);
1737 SysFreeString(bugID
);
1738 SysFreeString(repositoryRoot
);
1739 m_cLogMessage
.SetText(temp
);
1740 BSTR HUGEP
*pbRevNames
;
1741 BSTR HUGEP
*pbRevValues
;
1743 HRESULT hr1
= SafeArrayAccessData(revPropNames
, (void HUGEP
**)&pbRevNames
);
1746 HRESULT hr2
= SafeArrayAccessData(revPropValues
, (void HUGEP
**)&pbRevValues
);
1749 if (revPropNames
->rgsabound
->cElements
== revPropValues
->rgsabound
->cElements
)
1751 for (ULONG i
= 0; i
< revPropNames
->rgsabound
->cElements
; ++i
)
1753 // m_revProps[pbRevNames[i]] = pbRevValues[i];
1756 SafeArrayUnaccessData(revPropValues
);
1758 SafeArrayUnaccessData(revPropNames
);
1761 SafeArrayDestroy(revPropNames
);
1763 SafeArrayDestroy(revPropValues
);
1768 // if IBugTraqProvider2 failed, try IBugTraqProvider
1769 CComPtr
<IBugTraqProvider
> pProvider
= NULL
;
1770 hr
= m_BugTraqProvider
.QueryInterface(&pProvider
);
1774 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, (LPCTSTR
)m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
1775 CMessageBox::Show(m_hWnd
, sErr
, _T("TortoiseGit"), MB_ICONERROR
);
1779 if (FAILED(hr
= pProvider
->GetCommitMessage(GetSafeHwnd(), parameters
, commonRoot
, pathList
, originalMessage
, &temp
)))
1782 sErr
.Format(IDS_ERR_FAILEDISSUETRACKERCOM
, m_bugtraq_association
.GetProviderName(), _com_error(hr
).ErrorMessage());
1783 CMessageBox::Show(m_hWnd
, sErr
, _T("TortoiseGit"), MB_ICONERROR
);
1786 m_cLogMessage
.SetText(temp
);
1788 m_sLogMessage
= m_cLogMessage
.GetText();
1789 if (!m_ProjectProperties
.sMessage
.IsEmpty())
1791 CString sBugID
= m_ProjectProperties
.FindBugID(m_sLogMessage
);
1792 if (!sBugID
.IsEmpty() && !bugIdOutSet
)
1794 SetDlgItemText(IDC_BUGID
, sBugID
);
1798 m_cLogMessage
.SetFocus();
1800 SysFreeString(parameters
);
1801 SysFreeString(commonRoot
);
1802 SafeArrayDestroy(pathList
);
1803 SysFreeString(originalMessage
);
1804 SysFreeString(temp
);
1807 void CCommitDlg::FillPatchView(bool onlySetTimer
)
1809 if(::IsWindow(this->m_patchViewdlg
.m_hWnd
))
1811 KillTimer(FILLPATCHVTIMER
);
1814 SetTimer(FILLPATCHVTIMER
, 100, NULL
);
1817 m_patchViewdlg
.m_ctrlPatchView
.SetText(CString());
1819 POSITION pos
=m_ListCtrl
.GetFirstSelectedItemPosition();
1820 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETREADONLY
, FALSE
);
1825 int nSelect
= m_ListCtrl
.GetNextSelectedItem(pos
);
1826 CTGitPath
* p
=(CTGitPath
*)m_ListCtrl
.GetItemData(nSelect
);
1827 if(p
&& !(p
->m_Action
&CTGitPath::LOGACTIONS_UNVER
) )
1829 CString head
= _T("HEAD");
1830 if(m_bCommitAmend
==TRUE
&& m_bAmendDiffToLastCommit
==FALSE
)
1831 head
= _T("HEAD~1");
1832 cmd
.Format(_T("git.exe diff %s -- \"%s\""), head
, p
->GetGitPathString());
1833 g_Git
.Run(cmd
, &out
, CP_UTF8
);
1837 m_patchViewdlg
.m_ctrlPatchView
.SetText(out
);
1838 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETREADONLY
, TRUE
);
1839 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_GOTOPOS
, 0);
1841 m_patchViewdlg
.m_ctrlPatchView
.GetClientRect(rect
);
1842 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTH
, rect
.Width() - 4);
1845 LRESULT
CCommitDlg::OnGitStatusListCtrlItemChanged(WPARAM
/*wparam*/, LPARAM
/*lparam*/)
1847 this->FillPatchView(true);
1852 LRESULT
CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM
, LPARAM
)
1854 SendMessage(WM_UPDATEOKBUTTON
);
1858 LRESULT
CCommitDlg::OnCheck(WPARAM wnd
, LPARAM
)
1860 HWND hwnd
= (HWND
)wnd
;
1861 bool check
= !(GetAsyncKeyState(VK_SHIFT
) & 0x8000);
1862 if (hwnd
== GetDlgItem(IDC_CHECKALL
)->GetSafeHwnd())
1863 m_ListCtrl
.Check(GITSLC_SHOWEVERYTHING
, check
);
1864 else if (hwnd
== GetDlgItem(IDC_CHECKNONE
)->GetSafeHwnd())
1865 m_ListCtrl
.Check(GITSLC_SHOWEVERYTHING
, !check
);
1866 else if (hwnd
== GetDlgItem(IDC_CHECKUNVERSIONED
)->GetSafeHwnd())
1867 m_ListCtrl
.Check(GITSLC_SHOWUNVERSIONED
, check
);
1868 else if (hwnd
== GetDlgItem(IDC_CHECKVERSIONED
)->GetSafeHwnd())
1869 m_ListCtrl
.Check(GITSLC_SHOWVERSIONED
, check
);
1870 else if (hwnd
== GetDlgItem(IDC_CHECKADDED
)->GetSafeHwnd())
1871 m_ListCtrl
.Check(GITSLC_SHOWADDED
, check
);
1872 else if (hwnd
== GetDlgItem(IDC_CHECKDELETED
)->GetSafeHwnd())
1873 m_ListCtrl
.Check(GITSLC_SHOWREMOVED
, check
);
1874 else if (hwnd
== GetDlgItem(IDC_CHECKMODIFIED
)->GetSafeHwnd())
1875 m_ListCtrl
.Check(GITSLC_SHOWMODIFIED
, check
);
1876 else if (hwnd
== GetDlgItem(IDC_CHECKFILES
)->GetSafeHwnd())
1877 m_ListCtrl
.Check(GITSLC_SHOWFILES
, check
);
1878 else if (hwnd
== GetDlgItem(IDC_CHECKSUBMODULES
)->GetSafeHwnd())
1879 m_ListCtrl
.Check(GITSLC_SHOWSUBMODULES
, check
);
1884 LRESULT
CCommitDlg::OnUpdateOKButton(WPARAM
, LPARAM
)
1889 bool bValidLogSize
= m_cLogMessage
.GetText().GetLength() >= m_ProjectProperties
.nMinLogSize
&& m_cLogMessage
.GetText().GetLength() > 0;
1890 bool bAmendOrSelectFilesOrMerge
= m_ListCtrl
.GetSelected() > 0 || (m_bCommitAmend
&& m_bAmendDiffToLastCommit
) || CTGitPath(g_Git
.m_CurrentDir
).IsMergeActive();
1892 DialogEnableWindow(IDOK
, bValidLogSize
&& (m_bCommitMessageOnly
|| bAmendOrSelectFilesOrMerge
));
1897 LRESULT
CCommitDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
1901 if (wParam
== IDC_SPLITTER
)
1903 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1904 DoSize(pHdr
->delta
);
1909 return __super::DefWindowProc(message
, wParam
, lParam
);
1912 void CCommitDlg::SetSplitterRange()
1914 if ((m_ListCtrl
)&&(m_cLogMessage
))
1917 m_cLogMessage
.GetWindowRect(rcTop
);
1918 ScreenToClient(rcTop
);
1920 m_ListCtrl
.GetWindowRect(rcMiddle
);
1921 ScreenToClient(rcMiddle
);
1922 if (rcMiddle
.Height() && rcMiddle
.Width())
1923 m_wndSplitter
.SetRange(rcTop
.top
+ 100, rcMiddle
.bottom
- 80);
1927 void CCommitDlg::DoSize(int delta
)
1929 RemoveAnchor(IDC_MESSAGEGROUP
);
1930 RemoveAnchor(IDC_LOGMESSAGE
);
1931 RemoveAnchor(IDC_SPLITTER
);
1932 RemoveAnchor(IDC_SIGNOFF
);
1933 RemoveAnchor(IDC_COMMIT_AMEND
);
1934 RemoveAnchor(IDC_COMMIT_AMENDDIFF
);
1935 RemoveAnchor(IDC_COMMIT_SETDATETIME
);
1936 RemoveAnchor(IDC_COMMIT_DATEPICKER
);
1937 RemoveAnchor(IDC_COMMIT_TIMEPICKER
);
1938 RemoveAnchor(IDC_LISTGROUP
);
1939 RemoveAnchor(IDC_FILELIST
);
1940 RemoveAnchor(IDC_TEXT_INFO
);
1941 RemoveAnchor(IDC_SELECTLABEL
);
1942 RemoveAnchor(IDC_CHECKALL
);
1943 RemoveAnchor(IDC_CHECKNONE
);
1944 RemoveAnchor(IDC_CHECKUNVERSIONED
);
1945 RemoveAnchor(IDC_CHECKVERSIONED
);
1946 RemoveAnchor(IDC_CHECKADDED
);
1947 RemoveAnchor(IDC_CHECKDELETED
);
1948 RemoveAnchor(IDC_CHECKMODIFIED
);
1949 RemoveAnchor(IDC_CHECKFILES
);
1950 RemoveAnchor(IDC_CHECKSUBMODULES
);
1952 CSplitterControl::ChangeHeight(&m_cLogMessage
, delta
, CW_TOPALIGN
);
1953 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP
), delta
, CW_TOPALIGN
);
1954 CSplitterControl::ChangeHeight(&m_ListCtrl
, -delta
, CW_BOTTOMALIGN
);
1955 CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP
), -delta
, CW_BOTTOMALIGN
);
1956 CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF
),0,delta
);
1957 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND
),0,delta
);
1958 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMENDDIFF
),0,delta
);
1959 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_SETDATETIME
),0,delta
);
1960 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_DATEPICKER
),0,delta
);
1961 CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_TIMEPICKER
),0,delta
);
1962 CSplitterControl::ChangePos(GetDlgItem(IDC_TEXT_INFO
),0,delta
);
1963 CSplitterControl::ChangePos(GetDlgItem(IDC_SELECTLABEL
), 0, delta
);
1964 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKALL
), 0, delta
);
1965 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKNONE
), 0, delta
);
1966 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKUNVERSIONED
), 0, delta
);
1967 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKVERSIONED
), 0, delta
);
1968 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKADDED
), 0, delta
);
1969 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKDELETED
), 0, delta
);
1970 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKMODIFIED
), 0, delta
);
1971 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKFILES
), 0, delta
);
1972 CSplitterControl::ChangePos(GetDlgItem(IDC_CHECKSUBMODULES
), 0, delta
);
1974 AddAnchor(IDC_MESSAGEGROUP
, TOP_LEFT
, TOP_RIGHT
);
1975 AddAnchor(IDC_LOGMESSAGE
, TOP_LEFT
, TOP_RIGHT
);
1976 AddAnchor(IDC_SPLITTER
, TOP_LEFT
, TOP_RIGHT
);
1977 AddAnchor(IDC_LISTGROUP
, TOP_LEFT
, BOTTOM_RIGHT
);
1978 AddAnchor(IDC_FILELIST
, TOP_LEFT
, BOTTOM_RIGHT
);
1979 AddAnchor(IDC_SIGNOFF
,TOP_RIGHT
);
1980 AddAnchor(IDC_COMMIT_AMEND
,TOP_LEFT
);
1981 AddAnchor(IDC_COMMIT_AMENDDIFF
,TOP_LEFT
);
1982 AddAnchor(IDC_COMMIT_SETDATETIME
,TOP_LEFT
);
1983 AddAnchor(IDC_COMMIT_DATEPICKER
,TOP_LEFT
);
1984 AddAnchor(IDC_COMMIT_TIMEPICKER
,TOP_LEFT
);
1985 AddAnchor(IDC_TEXT_INFO
,TOP_RIGHT
);
1986 AddAnchor(IDC_SELECTLABEL
, TOP_LEFT
);
1987 AddAnchor(IDC_CHECKALL
, TOP_LEFT
);
1988 AddAnchor(IDC_CHECKNONE
, TOP_LEFT
);
1989 AddAnchor(IDC_CHECKUNVERSIONED
, TOP_LEFT
);
1990 AddAnchor(IDC_CHECKVERSIONED
, TOP_LEFT
);
1991 AddAnchor(IDC_CHECKADDED
, TOP_LEFT
);
1992 AddAnchor(IDC_CHECKDELETED
, TOP_LEFT
);
1993 AddAnchor(IDC_CHECKMODIFIED
, TOP_LEFT
);
1994 AddAnchor(IDC_CHECKFILES
, TOP_LEFT
);
1995 AddAnchor(IDC_CHECKSUBMODULES
, TOP_LEFT
);
1997 // adjust the minimum size of the dialog to prevent the resizing from
1998 // moving the list control too far down.
2000 m_cLogMessage
.GetClientRect(rcLogMsg
);
2001 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(), m_DlgOrigRect
.Height()-m_LogMsgOrigRect
.Height()+rcLogMsg
.Height()));
2004 m_cLogMessage
.Invalidate();
2005 GetDlgItem(IDC_LOGMESSAGE
)->Invalidate();
2008 void CCommitDlg::OnSize(UINT nType
, int cx
, int cy
)
2010 // first, let the resizing take place
2011 __super::OnSize(nType
, cx
, cy
);
2017 CString
CCommitDlg::GetSignedOffByLine()
2021 CString username
= g_Git
.GetUserName();
2022 CString email
= g_Git
.GetUserEmail();
2023 username
.Remove(_T('\n'));
2024 email
.Remove(_T('\n'));
2026 str
.Format(_T("Signed-off-by: %s <%s>"), username
, email
);
2031 void CCommitDlg::OnBnClickedSignOff()
2033 CString str
= GetSignedOffByLine();
2035 if (m_cLogMessage
.GetText().Find(str
) == -1) {
2036 m_cLogMessage
.SetText(m_cLogMessage
.GetText().TrimRight());
2037 int lastNewline
= m_cLogMessage
.GetText().ReverseFind(_T('\n'));
2038 int foundByLine
= -1;
2039 if (lastNewline
> 0)
2040 foundByLine
= m_cLogMessage
.GetText().Find(_T("-by: "), lastNewline
);
2042 if (foundByLine
== -1 || foundByLine
< lastNewline
)
2043 str
= _T("\r\n") + str
;
2045 m_cLogMessage
.SetText(m_cLogMessage
.GetText()+_T("\r\n")+str
+_T("\r\n"));
2049 void CCommitDlg::OnBnClickedCommitAmend()
2052 if(this->m_bCommitAmend
&& this->m_AmendStr
.IsEmpty())
2055 rev
.GetCommit(CString(_T("HEAD")));
2056 m_AmendStr
=rev
.GetSubject()+_T("\n")+rev
.GetBody();
2059 if(this->m_bCommitAmend
)
2061 this->m_NoAmendStr
=this->m_cLogMessage
.GetText();
2062 m_cLogMessage
.SetText(m_AmendStr
);
2063 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_SHOW
);
2067 this->m_AmendStr
=this->m_cLogMessage
.GetText();
2068 m_cLogMessage
.SetText(m_NoAmendStr
);
2069 GetDlgItem(IDC_COMMIT_AMENDDIFF
)->ShowWindow(SW_HIDE
);
2072 OnBnClickedCommitSetDateTime(); // to update the commit date and time
2074 GetDlgItem(IDC_LOGMESSAGE
)->SetFocus();
2078 void CCommitDlg::OnBnClickedCommitMessageOnly()
2081 this->m_ListCtrl
.EnableWindow(m_bCommitMessageOnly
? FALSE
: TRUE
);
2082 SendMessage(WM_UPDATEOKBUTTON
);
2085 void CCommitDlg::OnBnClickedWholeProject()
2087 m_tooltips
.Pop(); // hide the tooltips
2093 m_ListCtrl
.GetStatus(NULL
,true,false,true);
2095 m_ListCtrl
.GetStatus(&this->m_pathList
,true,false,true);
2097 DWORD dwShow
= m_ListCtrl
.GetShowFlags();
2098 if (DWORD(m_regAddBeforeCommit
))
2099 dwShow
|= GITSLC_SHOWUNVERSIONED
;
2101 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
2103 m_ListCtrl
.Show(dwShow
, dwShow
& ~(CTGitPath::LOGACTIONS_UNVER
), true);
2110 void CCommitDlg::OnFocusMessage()
2112 m_cLogMessage
.SetFocus();
2115 void CCommitDlg::OnScnUpdateUI(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2117 int pos
= (int)this->m_cLogMessage
.Call(SCI_GETCURRENTPOS
);
2118 int line
= (int)this->m_cLogMessage
.Call(SCI_LINEFROMPOSITION
,pos
);
2119 int column
= (int)this->m_cLogMessage
.Call(SCI_GETCOLUMN
,pos
);
2122 str
.Format(_T("%d/%d"),line
+1,column
+1);
2123 this->GetDlgItem(IDC_TEXT_INFO
)->SetWindowText(str
);
2128 void CCommitDlg::OnStnClickedViewPatch()
2130 m_patchViewdlg
.m_pProjectProperties
= &this->m_ProjectProperties
;
2131 m_patchViewdlg
.m_ParentCommitDlg
= this;
2132 if(!IsWindow(this->m_patchViewdlg
.m_hWnd
))
2134 BOOL viewPatchEnabled
= FALSE
;
2135 m_ProjectProperties
.GetBOOLProps(viewPatchEnabled
, _T("tgit.commitshowpatch"));
2136 if (viewPatchEnabled
== FALSE
)
2137 g_Git
.SetConfigValue(_T("tgit.commitshowpatch"), _T("true"));
2138 m_patchViewdlg
.Create(IDD_PATCH_VIEW
,this);
2139 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTHTRACKING
, TRUE
);
2141 this->GetWindowRect(&rect
);
2143 m_patchViewdlg
.ShowWindow(SW_SHOW
);
2145 m_patchViewdlg
.SetWindowPos(NULL
,rect
.right
,rect
.top
,rect
.Width(),rect
.Height(),
2146 SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOZORDER
);
2148 ShowViewPatchText(false);
2153 g_Git
.SetConfigValue(_T("tgit.commitshowpatch"), _T("false"));
2154 m_patchViewdlg
.ShowWindow(SW_HIDE
);
2155 m_patchViewdlg
.DestroyWindow();
2156 ShowViewPatchText(true);
2158 this->m_ctrlShowPatch
.Invalidate();
2161 void CCommitDlg::OnMoving(UINT fwSide
, LPRECT pRect
)
2163 __super::OnMoving(fwSide
, pRect
);
2165 if (::IsWindow(m_patchViewdlg
.m_hWnd
))
2168 m_patchViewdlg
.GetWindowRect(&patchrect
);
2169 if (::IsWindow(m_hWnd
))
2172 GetWindowRect(&thisrect
);
2173 if (patchrect
.left
== thisrect
.right
)
2175 m_patchViewdlg
.SetWindowPos(NULL
, patchrect
.left
- (thisrect
.left
- pRect
->left
), patchrect
.top
- (thisrect
.top
- pRect
->top
),
2176 0, 0, SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOSIZE
| SWP_NOZORDER
);
2183 void CCommitDlg::OnSizing(UINT fwSide
, LPRECT pRect
)
2185 __super::OnSizing(fwSide
, pRect
);
2187 if(::IsWindow(this->m_patchViewdlg
.m_hWnd
))
2189 CRect thisrect
, patchrect
;
2190 this->GetWindowRect(thisrect
);
2191 this->m_patchViewdlg
.GetWindowRect(patchrect
);
2192 if(thisrect
.right
==patchrect
.left
)
2194 patchrect
.left
-= (thisrect
.right
- pRect
->right
);
2195 patchrect
.right
-= (thisrect
.right
- pRect
->right
);
2197 if( patchrect
.bottom
== thisrect
.bottom
)
2199 patchrect
.bottom
-= (thisrect
.bottom
- pRect
->bottom
);
2201 if( patchrect
.top
== thisrect
.top
)
2203 patchrect
.top
-= thisrect
.top
-pRect
->top
;
2205 m_patchViewdlg
.MoveWindow(patchrect
);
2210 void CCommitDlg::OnHdnItemchangedFilelist(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2213 TRACE("Item Changed\r\n");
2216 int CCommitDlg::CheckHeadDetach()
2219 if(g_Git
.GetCurrentBranchFromFile(g_Git
.m_CurrentDir
,output
))
2221 int retval
= CMessageBox::Show(NULL
, IDS_PROC_COMMIT_DETACHEDWARNING
, IDS_APPNAME
, MB_YESNOCANCEL
| MB_ICONWARNING
);
2224 if (CAppUtils::CreateBranchTag(FALSE
, NULL
, true) == FALSE
)
2227 else if (retval
== IDCANCEL
)
2233 void CCommitDlg::OnBnClickedCommitAmenddiff()
2239 void CCommitDlg::OnBnClickedNoautoselectsubmodules()
2245 void CCommitDlg::OnBnClickedCommitSetDateTime()
2249 if (m_bSetCommitDateTime
)
2251 CTime authordate
= CTime::GetCurrentTime();
2254 GitRev headRevision
;
2255 headRevision
.GetCommit(_T("HEAD"));
2256 authordate
= headRevision
.GetAuthorDate();
2259 m_CommitDate
.SetTime(&authordate
);
2260 m_CommitTime
.SetTime(&authordate
);
2262 GetDlgItem(IDC_COMMIT_DATEPICKER
)->ShowWindow(SW_SHOW
);
2263 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->ShowWindow(SW_SHOW
);
2267 GetDlgItem(IDC_COMMIT_DATEPICKER
)->ShowWindow(SW_HIDE
);
2268 GetDlgItem(IDC_COMMIT_TIMEPICKER
)->ShowWindow(SW_HIDE
);
2272 void CCommitDlg::OnBnClickedCheckNewBranch()
2275 if (m_bCreateNewBranch
)
2277 GetDlgItem(IDC_COMMIT_TO
)->ShowWindow(SW_HIDE
);
2278 GetDlgItem(IDC_NEWBRANCH
)->ShowWindow(SW_SHOW
);
2282 GetDlgItem(IDC_NEWBRANCH
)->ShowWindow(SW_HIDE
);
2283 GetDlgItem(IDC_COMMIT_TO
)->ShowWindow(SW_SHOW
);
2287 void CCommitDlg::RestoreFiles(bool doNotAsk
)
2289 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))
2291 for (std::map
<CString
, CString
>::iterator it
= m_ListCtrl
.m_restorepaths
.begin(); it
!= m_ListCtrl
.m_restorepaths
.end(); ++it
)
2292 CopyFile(it
->second
, g_Git
.m_CurrentDir
+ _T("\\") + it
->first
, FALSE
);
2293 m_ListCtrl
.m_restorepaths
.clear();
2297 void CCommitDlg::UpdateCheckLinks()
2299 DialogEnableWindow(IDC_CHECKALL
, true);
2300 DialogEnableWindow(IDC_CHECKNONE
, true);
2301 DialogEnableWindow(IDC_CHECKUNVERSIONED
, m_ListCtrl
.GetUnversionedCount() > 0);
2302 DialogEnableWindow(IDC_CHECKVERSIONED
, m_ListCtrl
.GetItemCount() > m_ListCtrl
.GetUnversionedCount());
2303 DialogEnableWindow(IDC_CHECKADDED
, m_ListCtrl
.GetAddedCount() > 0);
2304 DialogEnableWindow(IDC_CHECKDELETED
, m_ListCtrl
.GetDeletedCount() > 0);
2305 DialogEnableWindow(IDC_CHECKMODIFIED
, m_ListCtrl
.GetModifiedCount() > 0);
2306 DialogEnableWindow(IDC_CHECKFILES
, m_ListCtrl
.GetFileCount() > 0);
2307 DialogEnableWindow(IDC_CHECKSUBMODULES
, m_ListCtrl
.GetSubmoduleCount() > 0);