1
// TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2019 - TortoiseGit
5 // This program is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU General Public License
7 // as published by the Free Software Foundation; either version 2
8 // of the License, or (at your option) any later version.
10 // This program is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 // GNU General Public License for more details.
15 // You should have received a copy of the GNU General Public License
16 // along with this program; if not, write to the Free Software Foundation,
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21 #include "StandAloneDlg.h"
22 #include "GitStatusListCtrl.h"
24 #include "SplitterControl.h"
25 #include "HistoryCombo.h"
26 #include "GitLogList.h"
27 #include "MenuButton.h"
28 #include "ProjectProperties.h"
32 #define IDC_REBASE_TAB 0x1000000
34 #define REBASE_TAB_CONFLICT 0
35 #define REBASE_TAB_MESSAGE 1
36 #define REBASE_TAB_LOG 2
38 #define MSG_REBASE_UPDATE_UI (WM_USER+151)
40 class CRebaseDlg
: public CResizableStandAloneDialog
42 DECLARE_DYNAMIC(CRebaseDlg
)
45 CRebaseDlg(CWnd
* pParent
= nullptr); // standard constructor
46 virtual ~CRebaseDlg();
49 enum { IDD
= IDD_REBASE
};
54 CHOOSE_COMMIT_PICK_MODE
,
62 REBASE_SQUASH_CONFLICT
,
68 virtual void DoDataExchange(CDataExchange
* pDX
) override
; // DDX/DDV support
69 virtual BOOL
OnInitDialog() override
;
71 virtual LRESULT
DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
) override
;
72 afx_msg HBRUSH
OnCtlColor(CDC
* pDC
, CWnd
* pWnd
, UINT nCtlColor
);
73 afx_msg LRESULT
OnRebaseUpdateUI(WPARAM wParam
, LPARAM lParam
);
74 void DoSize(int delta
);
75 void AddRebaseAnchor();
77 void SetSplitterRange();
78 void SaveSplitterPos();
80 void LoadBranchInfo();
82 void SetAllRebaseAction(int action
);
86 CRect m_CommitListOrigRect
;
87 CString m_sStatusText
;
88 bool m_bStatusWarning
;
89 virtual BOOL
PreTranslateMessage(MSG
* pMsg
) override
;
90 bool LogListHasFocus(HWND hwnd
);
91 bool LogListHasMenuItem(int i
);
93 CSciEdit m_wndOutputRebase
;
94 void SetContinueButtonText();
95 void SetControlEnable();
96 void UpdateProgress();
97 void UpdateCurrentStatus();
98 void ListConflictFile(bool noStoreScrollPosition
);
99 int RunGitCmdRetryOrAbort(const CString
& cmd
);
101 afx_msg LRESULT
OnGitStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
);
103 volatile LONG m_bThreadRunning
;
104 volatile LONG m_bAbort
;
106 static UINT
RebaseThreadEntry(LPVOID pVoid
) { return reinterpret_cast<CRebaseDlg
*>(pVoid
)->RebaseThread(); };
109 int IsCommitEmpty(const CGitHash
& hash
);
111 BOOL m_IsFastForward
;
113 CGitHash m_OrigBranchHash
;
114 CGitHash m_OrigUpstreamHash
;
115 CString m_OrigHEADBranch
;
116 CGitHash m_OrigHEADHash
;
118 ProjectProperties m_ProjectProperties
;
120 int VerifyNoConflict();
122 CString m_SquashMessage
;
123 bool m_CurrentCommitEmpty
;
124 struct SquashFirstMetaData
131 SquashFirstMetaData()
136 SquashFirstMetaData(GitRev
* rev
)
138 , name(rev
->GetAuthorName())
139 , email(rev
->GetAuthorEmail())
140 , time(rev
->GetAuthorDate())
144 void UpdateDate(GitRev
* rev
)
147 time
= rev
->GetAuthorDate();
158 CString
GetAuthor() const
163 temp
.Format(L
"%s <%s>", (LPCTSTR
)name
, (LPCTSTR
)email
);
167 CString
GetAsParam(bool now
) const
172 CString date
= time
.Format(L
"%Y-%m-%dT%H:%M:%S");
177 temp
.Format(L
"--date=%s --author=\"%s\" ", (LPCTSTR
)date
, (LPCTSTR
)GetAuthor());
180 } m_SquashFirstMetaData
;
183 int CheckNextCommitIsSquash();
184 int GetCurrentCommitID();
188 CMenuButton m_PostButton
;
190 afx_msg
void OnBnClickedRebaseSplit();
191 afx_msg
void OnSize(UINT nType
, int cx
, int cy
);
192 afx_msg
void OnCbnSelchangeBranch();
193 afx_msg
void OnCbnSelchangeUpstream();
194 afx_msg
void OnBnClickedContinue();
195 afx_msg
void OnBnClickedAbort();
196 afx_msg
void OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
);
197 afx_msg
void OnSysColorChange();
198 afx_msg LRESULT
OnThemeChanged();
199 void FillLogMessageCtrl();
201 CProgressCtrl m_ProgressBar
;
202 CStatic m_CtrlStatusText
;
205 BOOL m_bAddCherryPickedFrom
;
206 BOOL m_bAutoSkipFailedCommit
;
207 bool m_bRebaseAutoEnd
;
210 CStringArray m_PostButtonTexts
;
211 CGitLogList m_CommitList
;
218 bool m_bRebaseAutoStart
;
219 BOOL m_bPreserveMerges
;
221 CSplitterControl m_wndSplitter
;
222 CMFCTabCtrl m_ctrlTabCtrl
;
223 CGitStatusListCtrl m_FileListCtrl
;
224 CSciEdit m_LogMessageCtrl
;
226 CHistoryCombo m_BranchCtrl
;
227 CHistoryCombo m_UpstreamCtrl
;
229 CMenuButton m_SplitAllOptions
;
233 REBASE_STAGE m_RebaseStage
;
234 bool m_bFinishedRebase
;
237 std::unordered_map
<CGitHash
, CGitHash
> m_rewrittenCommitsMap
;
238 std::vector
<CGitHash
> m_forRewrite
;
239 std::unordered_map
<CGitHash
, GIT_REV_LIST
> m_droppedCommitsMap
;
240 std::vector
<CGitHash
> m_currentCommits
;
242 void AddBranchToolTips(CHistoryCombo
& pBranch
);
243 void AddLogString(const CString
& str
);
245 int CheckRebaseCondition();
246 void CheckRestoreStash();
247 int m_CurrentRebaseIndex
;
249 void ResetParentForSquash(const CString
& commitMessage
);
250 void CleanUpRebaseActiveFolder();
251 afx_msg
void OnBnClickedButtonReverse();
252 afx_msg
void OnBnClickedButtonBrowse();
253 afx_msg
void OnBnClickedRebaseCheckForce();
254 afx_msg
void OnBnClickedCheckCherryPickedFrom();
255 afx_msg
void OnBnClickedRebasePostButton();
256 afx_msg
void OnBnClickedSplitAllOptions();
257 afx_msg
void OnBnClickedButtonUp();
258 afx_msg
void OnBnClickedButtonDown();
259 afx_msg
void OnHelp();
261 afx_msg LRESULT
OnTaskbarBtnCreated(WPARAM wParam
, LPARAM lParam
);
262 CComPtr
<ITaskbarList3
> m_pTaskbarList
;
264 afx_msg LRESULT
OnRebaseActionMessage(WPARAM wParam
, LPARAM lParam
);
265 afx_msg LRESULT
OnCommitsReordered(WPARAM wParam
, LPARAM lParam
);
266 afx_msg
void OnBnClickedRebaseSplitCommit();
267 afx_msg
void OnBnClickedButtonOnto();
268 afx_msg
void OnBnClickedButtonAdd();