1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2018 - 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 IMPLEMENT_DYNAMIC(CChangedDlg
, CResizableStandAloneDialog
)
31 CChangedDlg::CChangedDlg(CWnd
* pParent
/*=nullptr*/)
32 : CResizableStandAloneDialog(CChangedDlg::IDD
, pParent
)
33 , m_bShowUnversioned(FALSE
)
34 , m_iShowUnmodified(0)
37 , m_bShowIgnored(FALSE
)
38 , m_bShowLocalChangesIgnored(FALSE
)
39 , m_bWholeProject(FALSE
)
44 CChangedDlg::~CChangedDlg()
48 void CChangedDlg::DoDataExchange(CDataExchange
* pDX
)
50 CResizableStandAloneDialog::DoDataExchange(pDX
);
51 DDX_Control(pDX
, IDC_CHANGEDLIST
, m_FileListCtrl
);
52 DDX_Control(pDX
, IDC_BUTTON_STASH
, m_ctrlStash
);
53 DDX_Check(pDX
, IDC_SHOWUNVERSIONED
, m_bShowUnversioned
);
54 DDX_Check(pDX
, IDC_SHOWUNMODIFIED
, m_iShowUnmodified
);
55 DDX_Check(pDX
, IDC_SHOWIGNORED
, m_bShowIgnored
);
56 DDX_Check(pDX
, IDC_SHOWLOCALCHANGESIGNORED
, m_bShowLocalChangesIgnored
);
57 DDX_Check(pDX
, IDC_WHOLE_PROJECT
, m_bWholeProject
);
61 BEGIN_MESSAGE_MAP(CChangedDlg
, CResizableStandAloneDialog
)
62 ON_BN_CLICKED(IDC_SHOWUNVERSIONED
, OnBnClickedShowunversioned
)
63 ON_BN_CLICKED(IDC_SHOWUNMODIFIED
, OnBnClickedShowUnmodified
)
64 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
, OnSVNStatusListCtrlNeedsRefresh
)
65 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
, OnSVNStatusListCtrlItemCountChanged
)
66 ON_BN_CLICKED(IDC_SHOWIGNORED
, &CChangedDlg::OnBnClickedShowignored
)
67 ON_BN_CLICKED(IDC_REFRESH
, &CChangedDlg::OnBnClickedRefresh
)
68 ON_BN_CLICKED(IDC_COMMIT
, &CChangedDlg::OnBnClickedCommit
)
69 ON_BN_CLICKED(IDC_BUTTON_STASH
, &CChangedDlg::OnBnClickedStash
)
70 ON_BN_CLICKED(IDC_BUTTON_UNIFIEDDIFF
, &CChangedDlg::OnBnClickedButtonUnifieddiff
)
71 ON_BN_CLICKED(IDC_SHOWLOCALCHANGESIGNORED
, &CChangedDlg::OnBnClickedShowlocalchangesignored
)
72 ON_BN_CLICKED(IDC_WHOLE_PROJECT
, OnBnClickedWholeProject
)
75 BOOL
CChangedDlg::OnInitDialog()
77 CResizableStandAloneDialog::OnInitDialog();
79 m_regAddBeforeCommit
= CRegDWORD(L
"Software\\TortoiseGit\\AddBeforeCommit", TRUE
);
80 m_bShowUnversioned
= m_regAddBeforeCommit
;
82 CString
regPath(g_Git
.m_CurrentDir
);
83 regPath
.Replace(L
':', L
'_');
84 m_regShowWholeProject
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\" + regPath
, FALSE
);
85 m_bWholeProject
= m_regShowWholeProject
;
88 if (m_pathList
.GetCount() == 1 && m_pathList
[0].GetWinPathString().IsEmpty())
90 m_bWholeProject
= BST_CHECKED
;
91 DialogEnableWindow(IDC_WHOLE_PROJECT
, FALSE
);
96 m_FileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
| GITSLC_COLMODIFICATIONDATE
, L
"ChangedDlg", (GITSLC_POPALL
^ (GITSLC_POPSAVEAS
| GITSLC_POPRESTORE
| GITSLC_POPPREPAREDIFF
)), false);
97 m_FileListCtrl
.SetCancelBool(&m_bCanceled
);
98 m_FileListCtrl
.SetBackgroundImage(IDI_CFM_BKG
);
99 m_FileListCtrl
.SetEmptyString(IDS_REPOSTATUS_EMPTYFILELIST
);
101 AdjustControlSize(IDC_SHOWUNVERSIONED
);
102 AdjustControlSize(IDC_SHOWUNMODIFIED
);
103 AdjustControlSize(IDC_SHOWLOCALCHANGESIGNORED
);
104 AdjustControlSize(IDC_SHOWIGNORED
);
105 AdjustControlSize(IDC_WHOLE_PROJECT
);
107 AddAnchor(IDC_CHANGEDLIST
, TOP_LEFT
, BOTTOM_RIGHT
);
108 AddAnchor(IDC_SUMMARYTEXT
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
109 AddAnchor(IDC_SHOWUNVERSIONED
, BOTTOM_LEFT
);
110 AddAnchor(IDC_SHOWUNMODIFIED
, BOTTOM_LEFT
);
111 AddAnchor(IDC_SHOWLOCALCHANGESIGNORED
, BOTTOM_LEFT
);
112 AddAnchor(IDC_SHOWIGNORED
, BOTTOM_LEFT
);
113 AddAnchor(IDC_WHOLE_PROJECT
, BOTTOM_LEFT
);
114 AddAnchor(IDC_INFOLABEL
, BOTTOM_RIGHT
);
115 AddAnchor(IDC_BUTTON_STASH
, BOTTOM_RIGHT
);
116 AddAnchor(IDC_BUTTON_UNIFIEDDIFF
, BOTTOM_RIGHT
);
117 AddAnchor(IDC_COMMIT
, BOTTOM_RIGHT
);
118 AddAnchor(IDC_REFRESH
, BOTTOM_RIGHT
);
119 AddAnchor(IDOK
, BOTTOM_RIGHT
);
120 // SetPromptParentWindow(m_hWnd);
121 if (GetExplorerHWND())
122 CenterWindow(CWnd::FromHandle(GetExplorerHWND()));
123 EnableSaveRestore(L
"ChangedDlg");
125 m_ctrlStash
.m_bAlwaysShowArrow
= true;
127 m_bRemote
= !!(DWORD
)CRegDWORD(L
"Software\\TortoiseGit\\CheckRepo", FALSE
);
129 // first start a thread to obtain the status without
130 // blocking the dialog
131 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
133 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
139 UINT
CChangedDlg::ChangedStatusThreadEntry(LPVOID pVoid
)
141 return reinterpret_cast<CChangedDlg
*>(pVoid
)->ChangedStatusThread();
144 UINT
CChangedDlg::ChangedStatusThread()
146 InterlockedExchange(&m_bBlock
, TRUE
);
149 SetDlgItemText(IDOK
, CString(MAKEINTRESOURCE(IDS_MSGBOX_CANCEL
)));
150 DialogEnableWindow(IDC_REFRESH
, FALSE
);
151 DialogEnableWindow(IDC_SHOWUNVERSIONED
, FALSE
);
152 DialogEnableWindow(IDC_SHOWUNMODIFIED
, FALSE
);
153 DialogEnableWindow(IDC_SHOWIGNORED
, FALSE
);
154 DialogEnableWindow(IDC_SHOWLOCALCHANGESIGNORED
, FALSE
);
156 g_Git
.RefreshGitIndex();
158 m_FileListCtrl
.StoreScrollPos();
159 m_FileListCtrl
.Clear();
160 if (!m_FileListCtrl
.GetStatus(m_bWholeProject
? nullptr : &m_pathList
, m_bRemote
, m_bShowIgnored
!= FALSE
, m_bShowUnversioned
!= FALSE
, m_bShowLocalChangesIgnored
!= FALSE
))
162 if (!m_FileListCtrl
.GetLastErrorMessage().IsEmpty())
163 m_FileListCtrl
.SetEmptyString(m_FileListCtrl
.GetLastErrorMessage());
165 unsigned int dwShow
= GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALS
| GITSLC_SHOWSWITCHED
| GITSLC_SHOWINCHANGELIST
;
166 dwShow
|= m_bShowUnversioned
? GITSLC_SHOWUNVERSIONED
: 0;
167 dwShow
|= m_iShowUnmodified
? GITSLC_SHOWNORMAL
: 0;
168 dwShow
|= m_bShowIgnored
? GITSLC_SHOWIGNORED
: 0;
169 dwShow
|= m_bShowLocalChangesIgnored
? GITSLC_SHOWASSUMEVALID
| GITSLC_SHOWSKIPWORKTREE
: 0;
170 m_FileListCtrl
.Show(dwShow
);
174 bool bIsDirectory
= false;
175 if (m_pathList
.GetCount() == 1)
176 bIsDirectory
= m_pathList
[0].IsDirectory() || m_pathList
[0].IsEmpty(); // if it is empty it is g_Git.m_CurrentDir which is a directory
178 SetDlgItemText(IDOK
, CString(MAKEINTRESOURCE(IDS_MSGBOX_OK
)));
179 DialogEnableWindow(IDC_REFRESH
, TRUE
);
180 DialogEnableWindow(IDC_SHOWUNVERSIONED
, bIsDirectory
);
181 //DialogEnableWindow(IDC_SHOWUNMODIFIED, bIsDirectory);
182 DialogEnableWindow(IDC_SHOWIGNORED
, bIsDirectory
);
183 DialogEnableWindow(IDC_SHOWLOCALCHANGESIGNORED
, TRUE
);
184 InterlockedExchange(&m_bBlock
, FALSE
);
185 // revert the remote flag back to the default
186 m_bRemote
= !!(DWORD
)CRegDWORD(L
"Software\\TortoiseGit\\CheckRepo", FALSE
);
191 void CChangedDlg::OnOK()
201 void CChangedDlg::OnCancel()
211 DWORD
CChangedDlg::UpdateShowFlags()
213 DWORD dwShow
= m_FileListCtrl
.GetShowFlags();
214 if (m_bShowUnversioned
)
215 dwShow
|= GITSLC_SHOWUNVERSIONED
;
217 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
218 if (m_iShowUnmodified
)
219 dwShow
|= GITSLC_SHOWNORMAL
;
221 dwShow
&= ~GITSLC_SHOWNORMAL
;
223 dwShow
|= GITSLC_SHOWIGNORED
;
225 dwShow
&= ~GITSLC_SHOWIGNORED
;
226 if (m_bShowLocalChangesIgnored
)
227 dwShow
|= GITSLC_SHOWASSUMEVALID
|GITSLC_SHOWSKIPWORKTREE
;
229 dwShow
&= ~(GITSLC_SHOWASSUMEVALID
|GITSLC_SHOWSKIPWORKTREE
);
231 // old bShowExternals:
232 dwShow
&= ~(GITSLC_SHOWEXTERNAL
| GITSLC_SHOWINEXTERNALS
| GITSLC_SHOWEXTERNALFROMDIFFERENTREPO
);
237 void CChangedDlg::SetDlgTitle()
239 if (m_sTitle
.IsEmpty())
240 GetWindowText(m_sTitle
);
243 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
246 if (m_pathList
.GetCount() == 1)
247 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.CombinePath(m_pathList
[0].GetUIPathString()), m_sTitle
);
249 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.CombinePath(m_FileListCtrl
.GetCommonDirectory(false)), m_sTitle
);
253 void CChangedDlg::OnBnClickedShowunversioned()
256 m_regAddBeforeCommit
= m_bShowUnversioned
;
257 if(m_FileListCtrl
.m_FileLoaded
& CGitStatusListCtrl::FILELIST_UNVER
)
259 m_FileListCtrl
.StoreScrollPos();
260 m_FileListCtrl
.Show(UpdateShowFlags());
264 if(m_bShowUnversioned
)
266 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
267 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
273 void CChangedDlg::OnBnClickedShowUnmodified()
276 m_FileListCtrl
.StoreScrollPos();
277 m_FileListCtrl
.Show(UpdateShowFlags());
278 m_regAddBeforeCommit
= m_bShowUnversioned
;
282 void CChangedDlg::OnBnClickedShowignored()
285 m_FileListCtrl
.StoreScrollPos();
286 if (m_FileListCtrl
.m_FileLoaded
& CGitStatusListCtrl::FILELIST_IGNORE
)
287 m_FileListCtrl
.Show(UpdateShowFlags());
288 else if (m_bShowIgnored
)
290 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
291 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
296 void CChangedDlg::OnBnClickedShowlocalchangesignored()
299 m_FileListCtrl
.StoreScrollPos();
300 if (m_FileListCtrl
.m_FileLoaded
& CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
)
301 m_FileListCtrl
.Show(UpdateShowFlags());
302 else if (m_bShowLocalChangesIgnored
)
304 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
305 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
310 LRESULT
CChangedDlg::OnSVNStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
312 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
313 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
317 LRESULT
CChangedDlg::OnSVNStatusListCtrlItemCountChanged(WPARAM
, LPARAM
)
323 BOOL
CChangedDlg::PreTranslateMessage(MSG
* pMsg
)
325 if (pMsg
->message
== WM_KEYDOWN
)
327 switch (pMsg
->wParam
)
332 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
333 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
335 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
342 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
345 void CChangedDlg::OnBnClickedRefresh()
349 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
350 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
354 void CChangedDlg::UpdateStatistics()
356 CString temp
= m_FileListCtrl
.GetStatisticsString();
357 temp
.Replace(L
" = ", L
"=");
358 temp
.Replace(L
"\n", L
", ");
359 SetDlgItemText(IDC_INFOLABEL
, temp
);
362 void CChangedDlg::OnBnClickedCommit()
364 CTGitPathList pathList
;
365 bool bSingleFile
= (m_pathList
.GetCount() >= 1 && !m_pathList
[0].IsEmpty() && !m_pathList
[0].IsDirectory());
367 pathList
.AddPath(m_pathList
[0]);
369 pathList
.AddPath(m_pathList
.GetCommonRoot().GetDirectory());
371 bool bSelectFilesForCommit
= !!DWORD(CRegStdDWORD(L
"Software\\TortoiseGit\\SelectFilesForCommit", TRUE
));
374 CAppUtils::Commit(GetSafeHwnd(),
379 bSelectFilesForCommit
);
381 OnBnClickedRefresh();
384 void CChangedDlg::OnBnClickedStash()
388 if (popup
.CreatePopupMenu())
390 popup
.AppendMenuIcon(ID_STASH_SAVE
, IDS_MENUSTASHSAVE
, IDI_SHELVE
);
392 CTGitPath root
= g_Git
.m_CurrentDir
;
393 if (root
.HasStashDir())
395 popup
.AppendMenuIcon(ID_STASH_POP
, IDS_MENUSTASHPOP
, IDI_UNSHELVE
);
396 popup
.AppendMenuIcon(ID_STASH_APPLY
, IDS_MENUSTASHAPPLY
, IDI_UNSHELVE
);
397 popup
.AppendMenuIcon(ID_STASH_LIST
, IDS_MENUSTASHLIST
, IDI_LOG
);
401 GetDlgItem(IDC_BUTTON_STASH
)->GetWindowRect(&rect
);
403 params
.cbSize
= sizeof(TPMPARAMS
);
404 params
.rcExclude
= rect
;
405 int cmd
= popup
.TrackPopupMenuEx(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
| TPM_VERTICAL
, rect
.left
, rect
.top
, this, ¶ms
);
407 switch (cmd
& 0xFFFF)
410 CAppUtils::StashSave(GetSafeHwnd());
413 CAppUtils::StashPop(GetSafeHwnd(), 2);
416 CAppUtils::StashApply(GetSafeHwnd(), L
"", false);
421 dlg
.m_CurrentBranch
= L
"refs/stash";
428 OnBnClickedRefresh();
432 void CChangedDlg::OnBnClickedButtonUnifieddiff()
434 CTGitPath commonDirectory
;
435 if (!m_bWholeProject
)
436 commonDirectory
= m_pathList
.GetCommonRoot().GetDirectory();
437 bool bSingleFile
= ((m_pathList
.GetCount()==1)&&(!m_pathList
[0].IsEmpty())&&(!m_pathList
[0].IsDirectory()));
439 commonDirectory
= m_pathList
[0];
441 sCmd
.Format(L
"/command:showcompare /unified /path:\"%s\" /revision1:HEAD /revision2:%s", (LPCTSTR
)g_Git
.CombinePath(commonDirectory
), (LPCTSTR
)GitRev::GetWorkingCopy());
442 if (!!(GetAsyncKeyState(VK_SHIFT
) & 0x8000))
443 sCmd
+= L
" /alternative";
444 CAppUtils::RunTortoiseGitProc(sCmd
);
447 void CChangedDlg::OnBnClickedWholeProject()
450 m_regShowWholeProject
= m_bWholeProject
;
451 OnBnClickedRefresh();