1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2016 - TortoiseGit
4 // Copyright (C) 2003-2008 - TortoiseSVN
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 "ChangedDlg.h"
23 #include "MessageBox.h"
26 #include "ChangedDlg.h"
28 #include "RefLogDlg.h"
30 #include "GitStatusListCtrl.h"
32 IMPLEMENT_DYNAMIC(CChangedDlg
, CResizableStandAloneDialog
)
33 CChangedDlg::CChangedDlg(CWnd
* pParent
/*=nullptr*/)
34 : CResizableStandAloneDialog(CChangedDlg::IDD
, pParent
)
35 , m_bShowUnversioned(FALSE
)
36 , m_iShowUnmodified(0)
39 , m_bShowIgnored(FALSE
)
40 , m_bShowLocalChangesIgnored(FALSE
)
41 , m_bWholeProject(FALSE
)
46 CChangedDlg::~CChangedDlg()
50 void CChangedDlg::DoDataExchange(CDataExchange
* pDX
)
52 CResizableStandAloneDialog::DoDataExchange(pDX
);
53 DDX_Control(pDX
, IDC_CHANGEDLIST
, m_FileListCtrl
);
54 DDX_Control(pDX
, IDC_BUTTON_STASH
, m_ctrlStash
);
55 DDX_Check(pDX
, IDC_SHOWUNVERSIONED
, m_bShowUnversioned
);
56 DDX_Check(pDX
, IDC_SHOWUNMODIFIED
, m_iShowUnmodified
);
57 DDX_Check(pDX
, IDC_SHOWIGNORED
, m_bShowIgnored
);
58 DDX_Check(pDX
, IDC_SHOWLOCALCHANGESIGNORED
, m_bShowLocalChangesIgnored
);
59 DDX_Check(pDX
, IDC_WHOLE_PROJECT
, m_bWholeProject
);
63 BEGIN_MESSAGE_MAP(CChangedDlg
, CResizableStandAloneDialog
)
64 ON_BN_CLICKED(IDC_SHOWUNVERSIONED
, OnBnClickedShowunversioned
)
65 ON_BN_CLICKED(IDC_SHOWUNMODIFIED
, OnBnClickedShowUnmodified
)
66 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
, OnSVNStatusListCtrlNeedsRefresh
)
67 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
, OnSVNStatusListCtrlItemCountChanged
)
68 ON_BN_CLICKED(IDC_SHOWIGNORED
, &CChangedDlg::OnBnClickedShowignored
)
69 ON_BN_CLICKED(IDC_REFRESH
, &CChangedDlg::OnBnClickedRefresh
)
70 ON_BN_CLICKED(IDC_COMMIT
, &CChangedDlg::OnBnClickedCommit
)
71 ON_BN_CLICKED(IDC_BUTTON_STASH
, &CChangedDlg::OnBnClickedStash
)
72 ON_BN_CLICKED(IDC_BUTTON_UNIFIEDDIFF
, &CChangedDlg::OnBnClickedButtonUnifieddiff
)
73 ON_BN_CLICKED(IDC_SHOWLOCALCHANGESIGNORED
, &CChangedDlg::OnBnClickedShowlocalchangesignored
)
74 ON_BN_CLICKED(IDC_WHOLE_PROJECT
, OnBnClickedWholeProject
)
77 BOOL
CChangedDlg::OnInitDialog()
79 CResizableStandAloneDialog::OnInitDialog();
81 m_regAddBeforeCommit
= CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE
);
82 m_bShowUnversioned
= m_regAddBeforeCommit
;
84 CString
regPath(g_Git
.m_CurrentDir
);
85 regPath
.Replace(_T(":"), _T("_"));
86 m_regShowWholeProject
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\") + regPath
, FALSE
);
87 m_bWholeProject
= m_regShowWholeProject
;
92 m_FileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
| GITSLC_COLMODIFICATIONDATE
, _T("ChangedDlg"), (GITSLC_POPALL
^ (GITSLC_POPSAVEAS
| GITSLC_POPRESTORE
| GITSLC_PREPAREDIFF
)), false);
93 m_FileListCtrl
.SetCancelBool(&m_bCanceled
);
94 m_FileListCtrl
.SetBackgroundImage(IDI_CFM_BKG
);
95 m_FileListCtrl
.SetEmptyString(IDS_REPOSTATUS_EMPTYFILELIST
);
97 AdjustControlSize(IDC_SHOWUNVERSIONED
);
98 AdjustControlSize(IDC_SHOWUNMODIFIED
);
99 AdjustControlSize(IDC_SHOWLOCALCHANGESIGNORED
);
100 AdjustControlSize(IDC_SHOWIGNORED
);
101 AdjustControlSize(IDC_WHOLE_PROJECT
);
103 AddAnchor(IDC_CHANGEDLIST
, TOP_LEFT
, BOTTOM_RIGHT
);
104 AddAnchor(IDC_SUMMARYTEXT
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
105 AddAnchor(IDC_SHOWUNVERSIONED
, BOTTOM_LEFT
);
106 AddAnchor(IDC_SHOWUNMODIFIED
, BOTTOM_LEFT
);
107 AddAnchor(IDC_SHOWLOCALCHANGESIGNORED
, BOTTOM_LEFT
);
108 AddAnchor(IDC_SHOWIGNORED
, BOTTOM_LEFT
);
109 AddAnchor(IDC_WHOLE_PROJECT
, BOTTOM_LEFT
);
110 AddAnchor(IDC_INFOLABEL
, BOTTOM_RIGHT
);
111 AddAnchor(IDC_BUTTON_STASH
, BOTTOM_RIGHT
);
112 AddAnchor(IDC_BUTTON_UNIFIEDDIFF
, BOTTOM_RIGHT
);
113 AddAnchor(IDC_COMMIT
, BOTTOM_RIGHT
);
114 AddAnchor(IDC_REFRESH
, BOTTOM_RIGHT
);
115 AddAnchor(IDOK
, BOTTOM_RIGHT
);
116 // SetPromptParentWindow(m_hWnd);
118 CenterWindow(CWnd::FromHandle(hWndExplorer
));
119 EnableSaveRestore(_T("ChangedDlg"));
121 m_bRemote
= !!(DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\CheckRepo"), FALSE
);
123 // first start a thread to obtain the status without
124 // blocking the dialog
125 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
127 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
133 UINT
CChangedDlg::ChangedStatusThreadEntry(LPVOID pVoid
)
135 return ((CChangedDlg
*)pVoid
)->ChangedStatusThread();
138 UINT
CChangedDlg::ChangedStatusThread()
140 InterlockedExchange(&m_bBlock
, TRUE
);
142 g_Git
.RefreshGitIndex();
145 SetDlgItemText(IDOK
, CString(MAKEINTRESOURCE(IDS_MSGBOX_CANCEL
)));
146 DialogEnableWindow(IDC_REFRESH
, FALSE
);
147 DialogEnableWindow(IDC_SHOWUNVERSIONED
, FALSE
);
148 DialogEnableWindow(IDC_SHOWUNMODIFIED
, FALSE
);
149 DialogEnableWindow(IDC_SHOWIGNORED
, FALSE
);
150 DialogEnableWindow(IDC_SHOWLOCALCHANGESIGNORED
, FALSE
);
152 m_FileListCtrl
.Clear();
153 if (!m_FileListCtrl
.GetStatus(m_bWholeProject
? nullptr : &m_pathList
, m_bRemote
, m_bShowIgnored
!= FALSE
, m_bShowUnversioned
!= FALSE
, m_bShowLocalChangesIgnored
!= FALSE
))
155 if (!m_FileListCtrl
.GetLastErrorMessage().IsEmpty())
156 m_FileListCtrl
.SetEmptyString(m_FileListCtrl
.GetLastErrorMessage());
158 unsigned int dwShow
= GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALS
| GITSLC_SHOWLOCKS
| GITSLC_SHOWSWITCHED
| GITSLC_SHOWINCHANGELIST
;
159 dwShow
|= m_bShowUnversioned
? GITSLC_SHOWUNVERSIONED
: 0;
160 dwShow
|= m_iShowUnmodified
? GITSLC_SHOWNORMAL
: 0;
161 dwShow
|= m_bShowIgnored
? GITSLC_SHOWIGNORED
: 0;
162 dwShow
|= m_bShowLocalChangesIgnored
? GITSLC_SHOWASSUMEVALID
| GITSLC_SHOWSKIPWORKTREE
: 0;
163 m_FileListCtrl
.Show(dwShow
);
167 bool bIsDirectory
= false;
168 if (m_pathList
.GetCount() == 1)
169 bIsDirectory
= m_pathList
[0].IsDirectory() || m_pathList
[0].IsEmpty(); // if it is empty it is g_Git.m_CurrentDir which is a directory
171 SetDlgItemText(IDOK
, CString(MAKEINTRESOURCE(IDS_MSGBOX_OK
)));
172 DialogEnableWindow(IDC_REFRESH
, TRUE
);
173 DialogEnableWindow(IDC_SHOWUNVERSIONED
, bIsDirectory
);
174 //DialogEnableWindow(IDC_SHOWUNMODIFIED, bIsDirectory);
175 DialogEnableWindow(IDC_SHOWIGNORED
, bIsDirectory
);
176 DialogEnableWindow(IDC_SHOWLOCALCHANGESIGNORED
, TRUE
);
177 InterlockedExchange(&m_bBlock
, FALSE
);
178 // revert the remote flag back to the default
179 m_bRemote
= !!(DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\CheckRepo"), FALSE
);
184 void CChangedDlg::OnOK()
194 void CChangedDlg::OnCancel()
204 DWORD
CChangedDlg::UpdateShowFlags()
206 DWORD dwShow
= m_FileListCtrl
.GetShowFlags();
207 if (m_bShowUnversioned
)
208 dwShow
|= GITSLC_SHOWUNVERSIONED
;
210 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
211 if (m_iShowUnmodified
)
212 dwShow
|= GITSLC_SHOWNORMAL
;
214 dwShow
&= ~GITSLC_SHOWNORMAL
;
216 dwShow
|= GITSLC_SHOWIGNORED
;
218 dwShow
&= ~GITSLC_SHOWIGNORED
;
219 if (m_bShowLocalChangesIgnored
)
220 dwShow
|= GITSLC_SHOWASSUMEVALID
|GITSLC_SHOWSKIPWORKTREE
;
222 dwShow
&= ~(GITSLC_SHOWASSUMEVALID
|GITSLC_SHOWSKIPWORKTREE
);
224 // old bShowExternals:
225 dwShow
&= ~(GITSLC_SHOWEXTERNAL
| GITSLC_SHOWINEXTERNALS
| GITSLC_SHOWEXTERNALFROMDIFFERENTREPO
);
230 void CChangedDlg::SetDlgTitle()
232 if (m_sTitle
.IsEmpty())
233 GetWindowText(m_sTitle
);
236 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
239 if (m_pathList
.GetCount() == 1)
240 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.CombinePath(m_pathList
[0].GetUIPathString()), m_sTitle
);
242 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.CombinePath(m_FileListCtrl
.GetCommonDirectory(false)), m_sTitle
);
246 void CChangedDlg::OnBnClickedShowunversioned()
249 m_regAddBeforeCommit
= m_bShowUnversioned
;
250 if(m_FileListCtrl
.m_FileLoaded
& CGitStatusListCtrl::FILELIST_UNVER
)
252 m_FileListCtrl
.Show(UpdateShowFlags());
256 if(m_bShowUnversioned
)
258 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
259 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
265 void CChangedDlg::OnBnClickedShowUnmodified()
268 m_FileListCtrl
.Show(UpdateShowFlags());
269 m_regAddBeforeCommit
= m_bShowUnversioned
;
273 void CChangedDlg::OnBnClickedShowignored()
276 if (m_FileListCtrl
.m_FileLoaded
& CGitStatusListCtrl::FILELIST_IGNORE
)
277 m_FileListCtrl
.Show(UpdateShowFlags());
278 else if (m_bShowIgnored
)
280 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
281 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
286 void CChangedDlg::OnBnClickedShowlocalchangesignored()
289 if (m_FileListCtrl
.m_FileLoaded
& CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
)
290 m_FileListCtrl
.Show(UpdateShowFlags());
291 else if (m_bShowLocalChangesIgnored
)
293 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
294 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
299 LRESULT
CChangedDlg::OnSVNStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
301 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
302 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
306 LRESULT
CChangedDlg::OnSVNStatusListCtrlItemCountChanged(WPARAM
, LPARAM
)
312 BOOL
CChangedDlg::PreTranslateMessage(MSG
* pMsg
)
314 if (pMsg
->message
== WM_KEYDOWN
)
316 switch (pMsg
->wParam
)
321 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
322 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
324 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
331 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
334 void CChangedDlg::OnBnClickedRefresh()
338 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
339 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
343 void CChangedDlg::UpdateStatistics()
349 m_FileListCtrl
.GetMinMaxRevisions(lMin
, lMax
, true, false);
350 if (LONG(m_FileListCtrl
.m_HeadRev
) >= 0)
352 temp
.Format(IDS_REPOSTATUS_HEADREV
, lMin
, lMax
, LONG(m_FileListCtrl
.m_HeadRev
));
353 SetDlgItemText(IDC_SUMMARYTEXT
, temp
);
357 temp
.Format(IDS_REPOSTATUS_WCINFO
, lMin
, lMax
);
358 SetDlgItemText(IDC_SUMMARYTEXT
, temp
);
361 temp
= m_FileListCtrl
.GetStatisticsString();
362 temp
.Replace(_T(" = "), _T("="));
363 temp
.Replace(_T("\n"), _T(", "));
364 SetDlgItemText(IDC_INFOLABEL
, temp
);
367 void CChangedDlg::OnBnClickedCommit()
369 CString cmd
= _T("/command:commit /path:\"");
370 bool bSingleFile
= ((m_pathList
.GetCount()==1)&&(!m_pathList
[0].IsEmpty())&&(!m_pathList
[0].IsDirectory()));
372 cmd
+= m_pathList
[0].GetWinPathString();
374 cmd
+= g_Git
.CombinePath(m_pathList
.GetCommonRoot().GetDirectory());
376 CAppUtils::RunTortoiseGitProc(cmd
);
379 void CChangedDlg::OnBnClickedStash()
383 if (popup
.CreatePopupMenu())
385 popup
.AppendMenuIcon(ID_STASH_SAVE
, IDS_MENUSTASHSAVE
, IDI_COMMIT
);
387 CTGitPath root
= g_Git
.m_CurrentDir
;
388 if (root
.HasStashDir())
390 popup
.AppendMenuIcon(ID_STASH_POP
, IDS_MENUSTASHPOP
, IDI_RELOCATE
);
391 popup
.AppendMenuIcon(ID_STASH_APPLY
, IDS_MENUSTASHAPPLY
, IDI_RELOCATE
);
392 popup
.AppendMenuIcon(ID_STASH_LIST
, IDS_MENUSTASHLIST
, IDI_LOG
);
396 GetCursorPos(&cursorPos
);
397 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, cursorPos
.x
, cursorPos
.y
, this, 0);
399 switch (cmd
& 0xFFFF)
402 CAppUtils::StashSave();
405 CAppUtils::StashPop(2);
408 CAppUtils::StashApply(_T(""), false);
413 dlg
.m_CurrentBranch
= _T("refs/stash");
420 OnBnClickedRefresh();
424 void CChangedDlg::OnBnClickedButtonUnifieddiff()
426 CTGitPath commonDirectory
;
427 if (!m_bWholeProject
)
428 commonDirectory
= m_pathList
.GetCommonRoot().GetDirectory();
429 bool bSingleFile
= ((m_pathList
.GetCount()==1)&&(!m_pathList
[0].IsEmpty())&&(!m_pathList
[0].IsDirectory()));
431 commonDirectory
= m_pathList
[0];
432 CAppUtils::StartShowUnifiedDiff(m_hWnd
, commonDirectory
, GitRev::GetHead(), commonDirectory
, GitRev::GetWorkingCopy());
435 void CChangedDlg::OnBnClickedWholeProject()
438 m_regShowWholeProject
= m_bWholeProject
;
439 OnBnClickedRefresh();