src/TortoiseProc/MergeDlg.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2008-2017, 2019-2020, 2023-2024 - TortoiseGit
   4
   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.
   9
  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.
  14
  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.
  18 //
  19
  20 // MergeDlg.cpp : implementation file
  21 //
  22
  23 #include "stdafx.h"
  24
  25 #include "Git.h"
  26 #include "TortoiseProc.h"
  27 #include "MergeDlg.h"
  28 #include "AppUtils.h"
  29 #include "HistoryDlg.h"
  30
  31 // CMergeDlg dialog
  32
  33 IMPLEMENT_DYNAMIC(CMergeDlg, CResizableStandAloneDialog)
  34
  35 CMergeDlg::CMergeDlg(CWnd* pParent /*=nullptr*/)
  36         : CResizableStandAloneDialog(CMergeDlg::IDD, pParent)
  37         , CChooseVersion(this)
  38         , m_pDefaultText(MAKEINTRESOURCE(IDS_PROC_AUTOGENERATEDBYGIT))
  39         , m_bSquash(BST_UNCHECKED)
  40         , m_bNoCommit(BST_UNCHECKED)
  41         , m_bLog(BST_UNCHECKED)
  42         , m_bNoFF(BST_UNCHECKED)
  43         , m_bFFonly(BST_UNCHECKED)
  44 {
  45         CString mergeLog = g_Git.GetConfigValue(L"merge.log");
  46         int nLog = _wtoi(mergeLog);
  47         m_nLog = nLog > 0 ? nLog : 20;
  48         m_bSkipCurrentBranch = true;
  49 }
  50
  51 CMergeDlg::~CMergeDlg()
  52 {
  53 }
  54
  55 void CMergeDlg::DoDataExchange(CDataExchange* pDX)
  56 {
  57         CDialog::DoDataExchange(pDX);
  58
  59         CHOOSE_VERSION_DDX;
  60
  61         DDX_Check(pDX,IDC_CHECK_NOFF,this->m_bNoFF);
  62         DDX_Check(pDX,IDC_CHECK_SQUASH,this->m_bSquash);
  63         DDX_Check(pDX,IDC_CHECK_NOCOMMIT,this->m_bNoCommit);
  64         DDX_Check(pDX, IDC_CHECK_MERGE_LOG, m_bLog);
  65         DDX_Text(pDX, IDC_EDIT_MERGE_LOGNUM, m_nLog);
  66         DDX_Text(pDX, IDC_COMBO_MERGESTRATEGY, m_MergeStrategy);
  67         DDX_Text(pDX, IDC_COMBO_STRATEGYOPTION, m_StrategyOption);
  68         DDX_Text(pDX, IDC_EDIT_STRATEGYPARAM, m_StrategyParam);
  69         DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);
  70         DDX_Check(pDX, IDC_CHECK_FFONLY, m_bFFonly);
  71 }
  72
  73
  74 BEGIN_MESSAGE_MAP(CMergeDlg, CResizableStandAloneDialog)
  75         CHOOSE_VERSION_EVENT
  76         ON_BN_CLICKED(IDOK, &CMergeDlg::OnBnClickedOk)
  77         ON_WM_DESTROY()
  78         ON_BN_CLICKED(IDC_CHECK_SQUASH, &CMergeDlg::OnBnClickedCheckSquash)
  79         ON_BN_CLICKED(IDC_CHECK_MERGE_LOG, &CMergeDlg::OnBnClickedCheckMergeLog)
  80         ON_CBN_SELCHANGE(IDC_COMBO_MERGESTRATEGY, &CMergeDlg::OnCbnSelchangeComboMergestrategy)
  81         ON_CBN_SELCHANGE(IDC_COMBO_STRATEGYOPTION, &CMergeDlg::OnCbnSelchangeComboStrategyoption)
  82         ON_BN_CLICKED(IDC_CHECK_FFONLY, OnBnClickedCheckFFonlyOrNoFF)
  83         ON_BN_CLICKED(IDC_CHECK_NOFF, OnBnClickedCheckFFonlyOrNoFF)
  84 END_MESSAGE_MAP()
  85
  86 void CMergeDlg::ReloadHistoryEntries()
  87 {
  88         m_History.Load(L"Software\\TortoiseGit\\History\\merge", L"logmsgs");
  89 }
  90
  91 BOOL CMergeDlg::OnInitDialog()
  92 {
  93         CResizableStandAloneDialog::OnInitDialog();
  94         CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
  95
  96         AdjustControlSize(IDC_RADIO_BRANCH);
  97         AdjustControlSize(IDC_RADIO_TAGS);
  98         AdjustControlSize(IDC_RADIO_VERSION);
  99         AdjustControlSize(IDC_CHECK_SQUASH);
 100         AdjustControlSize(IDC_CHECK_NOFF);
 101         AdjustControlSize(IDC_CHECK_NOCOMMIT);
 102         AdjustControlSize(IDC_CHECK_MERGE_LOG);
 103
 104         CHOOSE_VERSION_ADDANCHOR;
 105
 106         AddAnchor(IDC_GROUP_OPTION, TOP_LEFT, TOP_RIGHT);
 107         AddAnchor(IDC_STATIC_MERGE_MESSAGE,TOP_LEFT,BOTTOM_RIGHT);
 108         AddAnchor(IDC_LOGMESSAGE,TOP_LEFT,BOTTOM_RIGHT);
 109
 110         AddAnchor(IDOK,BOTTOM_RIGHT);
 111         AddAnchor(IDCANCEL,BOTTOM_RIGHT);
 112         AddAnchor(IDHELP, BOTTOM_RIGHT);
 113
 114         this->AddOthersToAnchor();
 115
 116         CheckRadioButton(IDC_RADIO_BRANCH,IDC_RADIO_VERSION,IDC_RADIO_BRANCH);
 117         this->SetDefaultChoose(IDC_RADIO_BRANCH);
 118
 119         CAppUtils::SetWindowTitle(*this, g_Git.m_CurrentDir);
 120
 121         m_ProjectProperties.ReadProps();
 122
 123         m_cLogMessage.Init(m_ProjectProperties);
 124         m_cLogMessage.SetFont(CAppUtils::GetLogFontName(), CAppUtils::GetLogFontSize());
 125         m_cLogMessage.RegisterContextMenuHandler(this);
 126
 127         m_cLogMessage.SetText(m_pDefaultText);
 128         m_cLogMessage.Call(SCI_EMPTYUNDOBUFFER);
 129         m_cLogMessage.EnableWindow(!m_bSquash);
 130
 131         m_History.SetMaxHistoryItems(CRegDWORD(L"Software\\TortoiseGit\\MaxHistoryItems", 25));
 132         ReloadHistoryEntries();
 133
 134         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_MERGESTRATEGY))->AddString(L"resolve");
 135         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_MERGESTRATEGY))->AddString(L"recursive");
 136         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_MERGESTRATEGY))->AddString(L"ours");
 137         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_MERGESTRATEGY))->AddString(L"subtree");
 138         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(L"ours");
 139         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(L"theirs");
 140         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(L"patience");
 141         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(L"ignore-space-change");
 142         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(L"ignore-all-space");
 143         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(L"ignore-space-at-eol");
 144         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(L"renormalize");
 145         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(L"no-renormalize");
 146         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(L"rename-threshold");
 147         static_cast<CComboBox*>(GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(L"subtree");
 148
 149         EnableSaveRestore(L"MergeDlg");
 150         GetDlgItem(IDOK)->SetFocus();
 151
 152         if (m_initialRefName.IsEmpty())
 153         {
 154                 CString currentBranch;
 155                 if (g_Git.GetCurrentBranchFromFile(g_Git.m_CurrentDir, currentBranch))
 156                         currentBranch.Empty();
 157
 158                 CString pr, pb;
 159                 g_Git.GetRemotePushBranch(currentBranch, pr, pb);
 160                 if (!pr.IsEmpty() && !pb.IsEmpty())
 161                         m_initialRefName = L"remotes/" + pr + L'/' + pb;
 162         }
 163
 164         InitChooseVersion(true);
 165
 166         SetTheme(CTheme::Instance().IsDarkTheme());
 167
 168         return FALSE;
 169 }
 170
 171 // CMergeDlg message handlers
 172
 173
 174 void CMergeDlg::OnBnClickedOk()
 175 {
 176         this->UpdateData(TRUE);
 177
 178         this->UpdateRevsionName();
 179
 180         if (GetCheckedRadioButton(IDC_RADIO_HEAD, IDC_RADIO_VERSION) == IDC_RADIO_BRANCH && m_ChooseVersioinBranch.GetCurSel() == -1)
 181         {
 182                 CMessageBox::Show(GetSafeHwnd(), IDS_B_T_NOTEMPTY, IDS_APPNAME, MB_ICONEXCLAMATION);
 183                 return;
 184         }
 185
 186         this->m_strLogMesage = m_cLogMessage.GetText() ;
 187         if( m_strLogMesage == CString(this->m_pDefaultText) )
 188         {
 189                 m_strLogMesage.Empty();
 190         }
 191
 192         if (!m_strLogMesage.IsEmpty() && !m_bNoCommit)
 193         {
 194                 ReloadHistoryEntries();
 195                 m_History.AddEntry(m_strLogMesage);
 196                 m_History.Save();
 197         }
 198
 199         if (m_MergeStrategy != L"recursive")
 200                 m_StrategyOption.Empty();
 201         if (m_StrategyOption != L"rename-threshold" && m_StrategyOption != L"subtree")
 202                 m_StrategyParam.Empty();
 203
 204         OnOK();
 205 }
 206
 207 void CMergeDlg::OnCancel()
 208 {
 209         UpdateData(TRUE);
 210         m_strLogMesage = m_cLogMessage.GetText();
 211         if (m_strLogMesage != CString(this->m_pDefaultText) && !m_strLogMesage.IsEmpty() && !m_bNoCommit)
 212         {
 213                 ReloadHistoryEntries();
 214                 m_History.AddEntry(m_strLogMesage);
 215                 m_History.Save();
 216         }
 217         CResizableStandAloneDialog::OnCancel();
 218 }
 219
 220 void CMergeDlg::OnDestroy()
 221 {
 222         WaitForFinishLoading();
 223         __super::OnDestroy();
 224 }
 225
 226 // CSciEditContextMenuInterface
 227 void CMergeDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
 228 {
 229         ReloadHistoryEntries();
 230         //CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));
 231         if (m_History.GetCount() > 0)
 232         {
 233                 CString sMenuItemText;
 234                 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);
 235                 m_nPopupPasteLastMessage = nCmd++;
 236                 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);
 237
 238                 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY);
 239                 m_nPopupRecentMessage = nCmd++;
 240                 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupRecentMessage, sMenuItemText);
 241         }
 242 }
 243
 244 bool CMergeDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
 245 {
 246         if (m_History.IsEmpty())
 247                 return false;
 248
 249         if (cmd == m_nPopupPasteLastMessage)
 250         {
 251                 if (pSciEdit->GetText() == CString(m_pDefaultText))
 252                         pSciEdit->SetText(L"");
 253                 CString logmsg (m_History.GetEntry(0));
 254                 pSciEdit->InsertText(logmsg);
 255                 return true;
 256         }
 257
 258         if (cmd == m_nPopupRecentMessage)
 259         {
 260                 CHistoryDlg historyDlg;
 261                 historyDlg.SetHistory(m_History);
 262                 if (historyDlg.DoModal() != IDOK)
 263                         return false;
 264
 265                 if (pSciEdit->GetText() == CString(m_pDefaultText))
 266                         pSciEdit->SetText(L"");
 267                 m_cLogMessage.InsertText(historyDlg.GetSelectedText(), !m_cLogMessage.GetText().IsEmpty());
 268                 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
 269                 return true;
 270         }
 271         return false;
 272 }
 273
 274 void CMergeDlg::OnBnClickedCheckSquash()
 275 {
 276         UpdateData(TRUE);
 277         m_cLogMessage.EnableWindow(!m_bSquash);
 278         GetDlgItem(IDC_CHECK_NOFF)->EnableWindow(!m_bSquash);
 279 }
 280
 281 void CMergeDlg::OnBnClickedCheckMergeLog()
 282 {
 283         UpdateData(TRUE);
 284         GetDlgItem(IDC_EDIT_MERGE_LOGNUM)->EnableWindow(m_bLog);
 285 }
 286
 287 void CMergeDlg::OnCbnSelchangeComboMergestrategy()
 288 {
 289         UpdateData(TRUE);
 290         GetDlgItem(IDC_COMBO_STRATEGYOPTION)->EnableWindow(m_MergeStrategy == L"recursive");
 291         GetDlgItem(IDC_EDIT_STRATEGYPARAM)->EnableWindow(m_MergeStrategy == L"recursive" ? m_StrategyOption == L"rename-threshold" || m_StrategyOption == L"subtree" : FALSE);
 292 }
 293
 294 void CMergeDlg::OnCbnSelchangeComboStrategyoption()
 295 {
 296         UpdateData(TRUE);
 297         GetDlgItem(IDC_EDIT_STRATEGYPARAM)->EnableWindow(m_StrategyOption == L"rename-threshold" || m_StrategyOption == L"subtree");
 298 }
 299
 300 void CMergeDlg::OnBnClickedCheckFFonlyOrNoFF()
 301 {
 302         UpdateData();
 303
 304         GetDlgItem(IDC_CHECK_FFONLY)->EnableWindow(!m_bNoFF);
 305         GetDlgItem(IDC_CHECK_NOFF)->EnableWindow(!m_bFFonly);
 306         GetDlgItem(IDC_CHECK_SQUASH)->EnableWindow(!m_bNoFF);
 307 }