1
// TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2019 - 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
)
45 CChangedDlg::~CChangedDlg()
49 void CChangedDlg::DoDataExchange(CDataExchange
* pDX
)
51 CResizableStandAloneDialog::DoDataExchange(pDX
);
52 DDX_Control(pDX
, IDC_CHANGEDLIST
, m_FileListCtrl
);
53 DDX_Control(pDX
, IDC_BUTTON_STASH
, m_ctrlStash
);
54 DDX_Check(pDX
, IDC_SHOWUNVERSIONED
, m_bShowUnversioned
);
55 DDX_Check(pDX
, IDC_SHOWUNMODIFIED
, m_iShowUnmodified
);
56 DDX_Check(pDX
, IDC_SHOWIGNORED
, m_bShowIgnored
);
57 DDX_Check(pDX
, IDC_SHOWLOCALCHANGESIGNORED
, m_bShowLocalChangesIgnored
);
58 DDX_Check(pDX
, IDC_WHOLE_PROJECT
, m_bWholeProject
);
59 DDX_Check(pDX
, IDC_SHOWSTAGED
, m_bShowStaged
);
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
)
75 ON_BN_CLICKED(IDC_SHOWSTAGED
, OnBnClickedShowStaged
)
78 BOOL
CChangedDlg::OnInitDialog()
80 CResizableStandAloneDialog::OnInitDialog();
82 m_regAddBeforeCommit
= CRegDWORD(L
"Software\\TortoiseGit\\AddBeforeCommit", TRUE
);
83 m_bShowUnversioned
= m_regAddBeforeCommit
;
85 CString
regPath(g_Git
.m_CurrentDir
);
86 regPath
.Replace(L
':', L
'_');
87 m_regShowWholeProject
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\" + regPath
, FALSE
);
88 m_bWholeProject
= m_regShowWholeProject
;
89 m_regShowStaged
= CRegDWORD(L
"Software\\TortoiseGit\\TortoiseProc\\ChangedFilesIncludeStaged", TRUE
);
90 m_bShowStaged
= m_regShowStaged
;
93 if (m_pathList
.GetCount() == 1 && m_pathList
[0].GetWinPathString().IsEmpty())
95 m_bWholeProject
= BST_CHECKED
;
96 DialogEnableWindow(IDC_WHOLE_PROJECT
, FALSE
);
101 m_FileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
| GITSLC_COLMODIFICATIONDATE
, L
"ChangedDlg", (GITSLC_POPALL
^ (GITSLC_POPSAVEAS
| GITSLC_POPRESTORE
| GITSLC_POPPREPAREDIFF
)), false);
102 m_FileListCtrl
.SetCancelBool(&m_bCanceled
);
103 m_FileListCtrl
.SetBackgroundImage(IDI_CFM_BKG
);
104 m_FileListCtrl
.SetEmptyString(IDS_REPOSTATUS_EMPTYFILELIST
);
106 AdjustControlSize(IDC_SHOWUNVERSIONED
);
107 AdjustControlSize(IDC_SHOWUNMODIFIED
);
108 AdjustControlSize(IDC_SHOWLOCALCHANGESIGNORED
);
109 AdjustControlSize(IDC_SHOWIGNORED
);
110 AdjustControlSize(IDC_WHOLE_PROJECT
);
111 AdjustControlSize(IDC_SHOWSTAGED
);
113 AddAnchor(IDC_CHANGEDLIST
, TOP_LEFT
, BOTTOM_RIGHT
);
114 AddAnchor(IDC_SUMMARYTEXT
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
115 AddAnchor(IDC_SHOWUNVERSIONED
, BOTTOM_LEFT
);
116 AddAnchor(IDC_SHOWUNMODIFIED
, BOTTOM_LEFT
);
117 AddAnchor(IDC_SHOWLOCALCHANGESIGNORED
, BOTTOM_LEFT
);
118 AddAnchor(IDC_SHOWIGNORED
, BOTTOM_LEFT
);
119 AddAnchor(IDC_WHOLE_PROJECT
, BOTTOM_LEFT
);
120 AddAnchor(IDC_SHOWSTAGED
, BOTTOM_LEFT
);
121 AddAnchor(IDC_INFOLABEL
, BOTTOM_RIGHT
);
122 AddAnchor(IDC_BUTTON_STASH
, BOTTOM_RIGHT
);
123 AddAnchor(IDC_BUTTON_UNIFIEDDIFF
, BOTTOM_RIGHT
);
124 AddAnchor(IDC_COMMIT
, BOTTOM_RIGHT
);
125 AddAnchor(IDC_REFRESH
, BOTTOM_RIGHT
);
126 AddAnchor(IDOK
, BOTTOM_RIGHT
);
127 // SetPromptParentWindow(m_hWnd);
128 if (GetExplorerHWND())
129 CenterWindow(CWnd::FromHandle(GetExplorerHWND()));
130 EnableSaveRestore(L
"ChangedDlg");
132 m_ctrlStash
.m_bAlwaysShowArrow
= true;
134 m_bRemote
= !!(DWORD
)CRegDWORD(L
"Software\\TortoiseGit\\CheckRepo", FALSE
);
136 // first start a thread to obtain the status without
137 // blocking the dialog
138 OnBnClickedRefresh();
143 UINT
CChangedDlg::ChangedStatusThreadEntry(LPVOID pVoid
)
145 return reinterpret_cast<CChangedDlg
*>(pVoid
)->ChangedStatusThread();
148 UINT
CChangedDlg::ChangedStatusThread()
151 SetDlgItemText(IDOK
, CString(MAKEINTRESOURCE(IDS_MSGBOX_CANCEL
)));
152 DialogEnableWindow(IDC_REFRESH
, FALSE
);
153 DialogEnableWindow(IDC_SHOWUNVERSIONED
, FALSE
);
154 DialogEnableWindow(IDC_SHOWUNMODIFIED
, FALSE
);
155 DialogEnableWindow(IDC_SHOWIGNORED
, FALSE
);
156 DialogEnableWindow(IDC_SHOWLOCALCHANGESIGNORED
, FALSE
);
157 DialogEnableWindow(IDC_SHOWSTAGED
, FALSE
);
159 g_Git
.RefreshGitIndex();
161 m_FileListCtrl
.StoreScrollPos();
162 m_FileListCtrl
.Clear();
163 m_FileListCtrl
.m_bIncludedStaged
= (m_bShowStaged
== TRUE
);
164 if (!m_FileListCtrl
.GetStatus(m_bWholeProject
? nullptr : &m_pathList
, m_bRemote
, m_bShowIgnored
!= FALSE
, m_bShowUnversioned
!= FALSE
, m_bShowLocalChangesIgnored
!= FALSE
))
166 if (!m_FileListCtrl
.GetLastErrorMessage().IsEmpty())
167 m_FileListCtrl
.SetEmptyString(m_FileListCtrl
.GetLastErrorMessage());
169 unsigned int dwShow
= GITSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALS
| GITSLC_SHOWSWITCHED
| GITSLC_SHOWINCHANGELIST
;
170 dwShow
|= m_bShowUnversioned
? GITSLC_SHOWUNVERSIONED
: 0;
171 dwShow
|= m_iShowUnmodified
? GITSLC_SHOWNORMAL
: 0;
172 dwShow
|= m_bShowIgnored
? GITSLC_SHOWIGNORED
: 0;
173 dwShow
|= m_bShowLocalChangesIgnored
? GITSLC_SHOWASSUMEVALID
| GITSLC_SHOWSKIPWORKTREE
: 0;
174 m_FileListCtrl
.Show(dwShow
);
178 bool bIsDirectory
= false;
179 if (m_pathList
.GetCount() == 1)
180 bIsDirectory
= m_pathList
[0].IsDirectory() || m_pathList
[0].IsEmpty(); // if it is empty it is g_Git.m_CurrentDir which is a directory
182 SetDlgItemText(IDOK
, CString(MAKEINTRESOURCE(IDS_MSGBOX_OK
)));
183 DialogEnableWindow(IDC_REFRESH
, TRUE
);
184 DialogEnableWindow(IDC_SHOWUNVERSIONED
, bIsDirectory
);
185 //DialogEnableWindow(IDC_SHOWUNMODIFIED, bIsDirectory);
186 DialogEnableWindow(IDC_SHOWIGNORED
, bIsDirectory
);
187 DialogEnableWindow(IDC_SHOWLOCALCHANGESIGNORED
, TRUE
);
188 DialogEnableWindow(IDC_SHOWSTAGED
, TRUE
);
189 InterlockedExchange(&m_bBlock
, FALSE
);
190 // revert the remote flag back to the default
191 m_bRemote
= !!(DWORD
)CRegDWORD(L
"Software\\TortoiseGit\\CheckRepo", FALSE
);
196 void CChangedDlg::OnOK()
206 void CChangedDlg::OnCancel()
216 DWORD
CChangedDlg::UpdateShowFlags()
218 DWORD dwShow
= m_FileListCtrl
.GetShowFlags();
219 if (m_bShowUnversioned
)
220 dwShow
|= GITSLC_SHOWUNVERSIONED
;
222 dwShow
&= ~GITSLC_SHOWUNVERSIONED
;
223 if (m_iShowUnmodified
)
224 dwShow
|= GITSLC_SHOWNORMAL
;
226 dwShow
&= ~GITSLC_SHOWNORMAL
;
228 dwShow
|= GITSLC_SHOWIGNORED
;
230 dwShow
&= ~GITSLC_SHOWIGNORED
;
231 if (m_bShowLocalChangesIgnored
)
232 dwShow
|= GITSLC_SHOWASSUMEVALID
|GITSLC_SHOWSKIPWORKTREE
;
234 dwShow
&= ~(GITSLC_SHOWASSUMEVALID
|GITSLC_SHOWSKIPWORKTREE
);
236 // old bShowExternals:
237 dwShow
&= ~(GITSLC_SHOWEXTERNAL
| GITSLC_SHOWINEXTERNALS
| GITSLC_SHOWEXTERNALFROMDIFFERENTREPO
);
242 void CChangedDlg::SetDlgTitle()
244 if (m_sTitle
.IsEmpty())
245 GetWindowText(m_sTitle
);
248 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
251 if (m_pathList
.GetCount() == 1)
252 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.CombinePath(m_pathList
[0].GetUIPathString()), m_sTitle
);
254 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.CombinePath(m_FileListCtrl
.GetCommonDirectory(false)), m_sTitle
);
258 void CChangedDlg::OnBnClickedShowunversioned()
261 m_regAddBeforeCommit
= m_bShowUnversioned
;
262 if(m_FileListCtrl
.m_FileLoaded
& CGitStatusListCtrl::FILELIST_UNVER
)
264 m_FileListCtrl
.StoreScrollPos();
265 m_FileListCtrl
.Show(UpdateShowFlags());
269 if(m_bShowUnversioned
)
270 OnBnClickedRefresh();
275 void CChangedDlg::OnBnClickedShowUnmodified()
278 m_FileListCtrl
.StoreScrollPos();
279 m_FileListCtrl
.Show(UpdateShowFlags());
280 m_regAddBeforeCommit
= m_bShowUnversioned
;
284 void CChangedDlg::OnBnClickedShowignored()
287 m_FileListCtrl
.StoreScrollPos();
288 if (m_FileListCtrl
.m_FileLoaded
& CGitStatusListCtrl::FILELIST_IGNORE
)
289 m_FileListCtrl
.Show(UpdateShowFlags());
290 else if (m_bShowIgnored
)
291 OnBnClickedRefresh();
295 void CChangedDlg::OnBnClickedShowlocalchangesignored()
298 m_FileListCtrl
.StoreScrollPos();
299 if (m_FileListCtrl
.m_FileLoaded
& CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
)
300 m_FileListCtrl
.Show(UpdateShowFlags());
301 else if (m_bShowLocalChangesIgnored
)
302 OnBnClickedRefresh();
306 LRESULT
CChangedDlg::OnSVNStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
308 OnBnClickedRefresh();
312 LRESULT
CChangedDlg::OnSVNStatusListCtrlItemCountChanged(WPARAM
, LPARAM
)
318 BOOL
CChangedDlg::PreTranslateMessage(MSG
* pMsg
)
320 if (pMsg
->message
== WM_KEYDOWN
)
322 switch (pMsg
->wParam
)
325 OnBnClickedRefresh();
330 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
333 void CChangedDlg::OnBnClickedRefresh()
335 if (InterlockedExchange(&m_bBlock
, TRUE
))
338 if (!AfxBeginThread(ChangedStatusThreadEntry
, this))
340 InterlockedExchange(&m_bBlock
, FALSE
);
341 CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
345 void CChangedDlg::UpdateStatistics()
347 CString temp
= m_FileListCtrl
.GetStatisticsString();
348 temp
.Replace(L
" = ", L
"=");
349 temp
.Replace(L
"\n", L
", ");
350 SetDlgItemText(IDC_INFOLABEL
, temp
);
353 void CChangedDlg::OnBnClickedCommit()
355 CTGitPathList pathList
;
356 bool bSingleFile
= (m_pathList
.GetCount() >= 1 && !m_pathList
[0].IsEmpty() && !m_pathList
[0].IsDirectory());
358 pathList
.AddPath(m_pathList
[0]);
360 pathList
.AddPath(m_pathList
.GetCommonRoot().GetDirectory());
362 bool bSelectFilesForCommit
= !!DWORD(CRegStdDWORD(L
"Software\\TortoiseGit\\SelectFilesForCommit", TRUE
));
365 CAppUtils::Commit(GetSafeHwnd(),
370 bSelectFilesForCommit
);
372 OnBnClickedRefresh();
375 void CChangedDlg::OnBnClickedStash()
379 if (popup
.CreatePopupMenu())
381 popup
.AppendMenuIcon(ID_STASH_SAVE
, IDS_MENUSTASHSAVE
, IDI_SHELVE
);
383 CTGitPath root
= g_Git
.m_CurrentDir
;
384 if (root
.HasStashDir())
386 popup
.AppendMenuIcon(ID_STASH_POP
, IDS_MENUSTASHPOP
, IDI_UNSHELVE
);
387 popup
.AppendMenuIcon(ID_STASH_APPLY
, IDS_MENUSTASHAPPLY
, IDI_UNSHELVE
);
388 popup
.AppendMenuIcon(ID_STASH_LIST
, IDS_MENUSTASHLIST
, IDI_LOG
);
392 GetDlgItem(IDC_BUTTON_STASH
)->GetWindowRect(&rect
);
394 params
.cbSize
= sizeof(TPMPARAMS
);
395 params
.rcExclude
= rect
;
396 int cmd
= popup
.TrackPopupMenuEx(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
| TPM_VERTICAL
, rect
.left
, rect
.top
, this, ¶ms
);
398 switch (cmd
& 0xFFFF)
401 CAppUtils::StashSave(GetSafeHwnd());
404 CAppUtils::StashPop(GetSafeHwnd(), 2);
407 CAppUtils::StashApply(GetSafeHwnd(), L
"", false);
412 dlg
.m_CurrentBranch
= L
"refs/stash";
419 OnBnClickedRefresh();
423 void CChangedDlg::OnBnClickedButtonUnifieddiff()
425 CTGitPath commonDirectory
;
426 if (!m_bWholeProject
)
427 commonDirectory
= m_pathList
.GetCommonRoot().GetDirectory();
428 bool bSingleFile
= ((m_pathList
.GetCount()==1)&&(!m_pathList
[0].IsEmpty())&&(!m_pathList
[0].IsDirectory()));
430 commonDirectory
= m_pathList
[0];
432 sCmd
.Format(L
"/command:showcompare /unified /path:\"%s\" /revision1:HEAD /revision2:%s", (LPCTSTR
)g_Git
.CombinePath(commonDirectory
), (LPCTSTR
)GitRev::GetWorkingCopy());
433 if (!!(GetAsyncKeyState(VK_SHIFT
) & 0x8000))
434 sCmd
+= L
" /alternative";
435 CAppUtils::RunTortoiseGitProc(sCmd
);
438 void CChangedDlg::OnBnClickedWholeProject()
441 m_regShowWholeProject
= m_bWholeProject
;
442 OnBnClickedRefresh();
445 void CChangedDlg::OnBnClickedShowStaged()
448 m_regShowStaged
= m_bShowStaged
;
449 OnBnClickedRefresh();