src/TortoiseProc/MergeDlg.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2007-2013 - 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 #include "Messagebox.h"
  31 // CMergeDlg dialog
  32
  33 IMPLEMENT_DYNAMIC(CMergeDlg, CResizableStandAloneDialog)
  34
  35 CMergeDlg::CMergeDlg(CWnd* pParent /*=NULL*/)
  36         : CResizableStandAloneDialog(CMergeDlg::IDD, pParent),
  37         CChooseVersion(this)
  38 {
  39         m_pDefaultText = MAKEINTRESOURCE(IDS_PROC_AUTOGENERATEDBYGIT);
  40         m_bNoFF=false;
  41         m_bSquash=false;
  42         m_bNoCommit=false;
  43         m_bLog = FALSE;
  44         CString mergeLog = g_Git.GetConfigValue(_T("merge.log"));
  45         int nLog = _ttoi(mergeLog);
  46         m_nLog = nLog > 0 ? nLog : 20;
  47 }
  48
  49 CMergeDlg::~CMergeDlg()
  50 {
  51 }
  52
  53 void CMergeDlg::DoDataExchange(CDataExchange* pDX)
  54 {
  55         CDialog::DoDataExchange(pDX);
  56
  57         CHOOSE_VERSION_DDX;
  58
  59         DDX_Check(pDX,IDC_CHECK_NOFF,this->m_bNoFF);
  60         DDX_Check(pDX,IDC_CHECK_SQUASH,this->m_bSquash);
  61         DDX_Check(pDX,IDC_CHECK_NOCOMMIT,this->m_bNoCommit);
  62         DDX_Check(pDX, IDC_CHECK_MERGE_LOG, m_bLog);
  63         DDX_Text(pDX, IDC_EDIT_MERGE_LOGNUM, m_nLog);
  64         DDX_Text(pDX, IDC_COMBO_MERGESTRATEGY, m_MergeStrategy);
  65         DDX_Text(pDX, IDC_COMBO_STRATEGYOPTION, m_StrategyOption);
  66         DDX_Text(pDX, IDC_EDIT_STRATEGYPARAM, m_StrategyParam);
  67         DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);
  68 }
  69
  70
  71 BEGIN_MESSAGE_MAP(CMergeDlg, CResizableStandAloneDialog)
  72         CHOOSE_VERSION_EVENT
  73         ON_BN_CLICKED(IDOK, &CMergeDlg::OnBnClickedOk)
  74         ON_WM_DESTROY()
  75         ON_BN_CLICKED(IDC_CHECK_MERGE_LOG, &CMergeDlg::OnBnClickedCheckMergeLog)
  76         ON_CBN_SELCHANGE(IDC_COMBO_MERGESTRATEGY, &CMergeDlg::OnCbnSelchangeComboMergestrategy)
  77         ON_CBN_SELCHANGE(IDC_COMBO_STRATEGYOPTION, &CMergeDlg::OnCbnSelchangeComboStrategyoption)
  78 END_MESSAGE_MAP()
  79
  80
  81 BOOL CMergeDlg::OnInitDialog()
  82 {
  83         CResizableStandAloneDialog::OnInitDialog();
  84         CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
  85
  86         CHOOSE_VERSION_ADDANCHOR;
  87
  88         AddAnchor(IDC_GROUP_OPTION, TOP_LEFT, TOP_RIGHT);
  89         AddAnchor(IDC_STATIC_MERGE_MESSAGE,TOP_LEFT,BOTTOM_RIGHT);
  90         AddAnchor(IDC_LOGMESSAGE,TOP_LEFT,BOTTOM_RIGHT);
  91
  92         AddAnchor(IDOK,BOTTOM_RIGHT);
  93         AddAnchor(IDCANCEL,BOTTOM_RIGHT);
  94         AddAnchor(IDHELP, BOTTOM_RIGHT);
  95
  96         this->AddOthersToAnchor();
  97
  98         AdjustControlSize(IDC_RADIO_BRANCH);
  99         AdjustControlSize(IDC_RADIO_TAGS);
 100         AdjustControlSize(IDC_RADIO_VERSION);
 101         AdjustControlSize(IDC_CHECK_SQUASH);
 102         AdjustControlSize(IDC_CHECK_NOFF);
 103         AdjustControlSize(IDC_CHECK_NOCOMMIT);
 104         AdjustControlSize(IDC_CHECK_MERGE_LOG);
 105
 106         CheckRadioButton(IDC_RADIO_BRANCH,IDC_RADIO_VERSION,IDC_RADIO_BRANCH);
 107         this->SetDefaultChoose(IDC_RADIO_BRANCH);
 108
 109         CString sWindowTitle;
 110         GetWindowText(sWindowTitle);
 111         CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle);
 112
 113         Init(true);
 114
 115         m_ProjectProperties.ReadProps(CTGitPath(g_Git.m_CurrentDir));
 116
 117         m_cLogMessage.Init(m_ProjectProperties);
 118         m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));
 119         m_cLogMessage.RegisterContextMenuHandler(this);
 120
 121         m_cLogMessage.SetText(m_pDefaultText);
 122
 123         m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));
 124         if (m_History.GetCount() == 0)
 125                 m_History.Load(_T("Software\\TortoiseGit\\History\\merge"), _T("logmsgs"));
 126
 127         ((CComboBox *)GetDlgItem(IDC_COMBO_MERGESTRATEGY))->AddString(_T("resolve"));
 128         ((CComboBox *)GetDlgItem(IDC_COMBO_MERGESTRATEGY))->AddString(_T("recursive"));
 129         ((CComboBox *)GetDlgItem(IDC_COMBO_MERGESTRATEGY))->AddString(_T("ours"));
 130         ((CComboBox *)GetDlgItem(IDC_COMBO_MERGESTRATEGY))->AddString(_T("subtree"));
 131         ((CComboBox *)GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(_T("ours"));
 132         ((CComboBox *)GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(_T("theirs"));
 133         ((CComboBox *)GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(_T("patience"));
 134         ((CComboBox *)GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(_T("ignore-space-change"));
 135         ((CComboBox *)GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(_T("ignore-all-space"));
 136         ((CComboBox *)GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(_T("ignore-space-at-eol"));
 137         ((CComboBox *)GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(_T("renormalize"));
 138         ((CComboBox *)GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(_T("no-renormalize"));
 139         ((CComboBox *)GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(_T("rename-threshold"));
 140         ((CComboBox *)GetDlgItem(IDC_COMBO_STRATEGYOPTION))->AddString(_T("subtree"));
 141
 142         EnableSaveRestore(_T("MergeDlg"));
 143         GetDlgItem(IDOK)->SetFocus();
 144
 145         return FALSE;
 146 }
 147
 148 // CMergeDlg message handlers
 149
 150
 151 void CMergeDlg::OnBnClickedOk()
 152 {
 153         this->UpdateData(TRUE);
 154
 155         this->UpdateRevsionName();
 156
 157         this->m_strLogMesage = m_cLogMessage.GetText() ;
 158         if( m_strLogMesage == CString(this->m_pDefaultText) )
 159         {
 160                 m_strLogMesage.Empty();
 161         }
 162
 163         if (!m_strLogMesage.IsEmpty() && !m_bNoCommit)
 164         {
 165                 m_History.AddEntry(m_strLogMesage);
 166                 m_History.Save();
 167         }
 168
 169         if (m_MergeStrategy != _T("recursive"))
 170                 m_StrategyOption = _T("");
 171         if (m_StrategyOption != _T("rename-threshold") && m_StrategyOption != _T("subtree"))
 172                 m_StrategyParam = _T("");
 173
 174         OnOK();
 175 }
 176
 177 void CMergeDlg::OnCancel()
 178 {
 179         UpdateData(TRUE);
 180         m_strLogMesage = m_cLogMessage.GetText();
 181         if (m_strLogMesage != CString(this->m_pDefaultText) && !m_strLogMesage.IsEmpty() && !m_bNoCommit)
 182         {
 183                 m_History.AddEntry(m_strLogMesage);
 184                 m_History.Save();
 185         }
 186         CResizableStandAloneDialog::OnCancel();
 187 }
 188
 189 void CMergeDlg::OnDestroy()
 190 {
 191         WaitForFinishLoading();
 192         __super::OnDestroy();
 193 }
 194
 195 // CSciEditContextMenuInterface
 196 void CMergeDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
 197 {
 198         //CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));
 199         if (m_History.GetCount() > 0)
 200         {
 201                 CString sMenuItemText;
 202                 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);
 203                 m_nPopupPasteLastMessage = nCmd++;
 204                 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);
 205
 206                 sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY);
 207                 m_nPopupRecentMessage = nCmd++;
 208                 mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupRecentMessage, sMenuItemText);
 209         }
 210 }
 211
 212 bool CMergeDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
 213 {
 214         if (m_History.GetCount() == 0)
 215                 return false;
 216
 217         if (cmd == m_nPopupPasteLastMessage)
 218         {
 219                 if (pSciEdit->GetText() == CString(m_pDefaultText))
 220                         pSciEdit->SetText(_T(""));
 221                 CString logmsg (m_History.GetEntry(0));
 222                 pSciEdit->InsertText(logmsg);
 223                 return true;
 224         }
 225
 226         if (cmd == m_nPopupRecentMessage)
 227         {
 228                 CHistoryDlg historyDlg;
 229                 historyDlg.SetHistory(m_History);
 230                 if (historyDlg.DoModal() != IDOK)
 231                         return false;
 232
 233                 if (pSciEdit->GetText() == CString(m_pDefaultText))
 234                         pSciEdit->SetText(_T(""));
 235                 m_cLogMessage.InsertText(historyDlg.GetSelectedText(), !m_cLogMessage.GetText().IsEmpty());
 236                 GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
 237                 return true;
 238         }
 239         return false;
 240 }
 241
 242 void CMergeDlg::OnBnClickedCheckMergeLog()
 243 {
 244         UpdateData(TRUE);
 245         GetDlgItem(IDC_EDIT_MERGE_LOGNUM)->EnableWindow(m_bLog);
 246 }
 247
 248 void CMergeDlg::OnCbnSelchangeComboMergestrategy()
 249 {
 250         UpdateData(TRUE);
 251         GetDlgItem(IDC_COMBO_STRATEGYOPTION)->EnableWindow(m_MergeStrategy == _T("recursive"));
 252         GetDlgItem(IDC_EDIT_STRATEGYPARAM)->EnableWindow(m_MergeStrategy == _T("recursive") ? m_StrategyOption == _T("rename-threshold") || m_StrategyOption == _T("subtree") : FALSE);
 253 }
 254
 255 void CMergeDlg::OnCbnSelchangeComboStrategyoption()
 256 {
 257         UpdateData(TRUE);
 258         GetDlgItem(IDC_EDIT_STRATEGYPARAM)->EnableWindow(m_StrategyOption == _T("rename-threshold") || m_StrategyOption == _T("subtree"));
 259 }