src/TortoiseProc/PushDlg.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2008-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 // PushDlg.cpp : implementation file
  21 //
  22
  23 #include "stdafx.h"
  24 #include "TortoiseProc.h"
  25 #include "PushDlg.h"
  26
  27 #include "Git.h"
  28 #include "registry.h"
  29 #include "AppUtils.h"
  30 #include "LogDlg.h"
  31 #include "BrowseRefsDlg.h"
  32 #include "RefLogDlg.h"
  33 #include "MessageBox.h"
  34
  35 // CPushDlg dialog
  36
  37 IMPLEMENT_DYNAMIC(CPushDlg, CHorizontalResizableStandAloneDialog)
  38
  39 CPushDlg::CPushDlg(CWnd* pParent /*=NULL*/)
  40         : CHorizontalResizableStandAloneDialog(CPushDlg::IDD, pParent)
  41         , m_bPushAllBranches(FALSE)
  42         , m_bForce(FALSE)
  43         , m_bPack(FALSE)
  44         , m_bTags(FALSE)
  45         , m_bAutoLoad(FALSE)
  46         , m_bPushAllRemotes(FALSE)
  47         , m_bSetPushBranch(FALSE)
  48         , m_bSetPushRemote(FALSE)
  49         , m_bSetUpstream(FALSE)
  50         , m_RecurseSubmodules(0)
  51 {
  52         m_bAutoLoad = CAppUtils::IsSSHPutty();
  53 }
  54
  55 CPushDlg::~CPushDlg()
  56 {
  57 }
  58
  59 void CPushDlg::DoDataExchange(CDataExchange* pDX)
  60 {
  61         CHorizontalResizableStandAloneDialog::DoDataExchange(pDX);
  62         DDX_Control(pDX, IDC_BRANCH_REMOTE, this->m_BranchRemote);
  63         DDX_Control(pDX, IDC_BRANCH_SOURCE, this->m_BranchSource);
  64         DDX_Control(pDX, IDC_REMOTE, this->m_Remote);
  65         DDX_Control(pDX, IDC_URL, this->m_RemoteURL);
  66         DDX_Control(pDX, IDC_BUTTON_BROWSE_SOURCE_BRANCH, m_BrowseLocalRef);
  67         DDX_Control(pDX, IDC_COMBOBOX_RECURSE_SUBMODULES, m_RecurseSubmodulesCombo);
  68         DDX_Check(pDX,IDC_FORCE,this->m_bForce);
  69         DDX_Check(pDX,IDC_PUSHALL,this->m_bPushAllBranches);
  70         DDX_Check(pDX,IDC_PACK,this->m_bPack);
  71         DDX_Check(pDX,IDC_TAGS,this->m_bTags);
  72         DDX_Check(pDX,IDC_PUTTYKEY_AUTOLOAD,this->m_bAutoLoad);
  73         DDX_Check(pDX, IDC_PROC_PUSH_SET_PUSHREMOTE, m_bSetPushRemote);
  74         DDX_Check(pDX, IDC_PROC_PUSH_SET_PUSHBRANCH, m_bSetPushBranch);
  75         DDX_Check(pDX, IDC_PROC_PUSH_SET_UPSTREAM, m_bSetUpstream);
  76 }
  77
  78 BEGIN_MESSAGE_MAP(CPushDlg, CHorizontalResizableStandAloneDialog)
  79         ON_BN_CLICKED(IDC_RD_REMOTE, &CPushDlg::OnBnClickedRd)
  80         ON_BN_CLICKED(IDC_RD_URL, &CPushDlg::OnBnClickedRd)
  81         ON_CBN_SELCHANGE(IDC_BRANCH_SOURCE, &CPushDlg::OnCbnSelchangeBranchSource)
  82         ON_CBN_SELCHANGE(IDC_REMOTE, &CPushDlg::EnDisablePushRemoteArchiveBranch)
  83         ON_BN_CLICKED(IDOK, &CPushDlg::OnBnClickedOk)
  84         ON_BN_CLICKED(IDC_REMOTE_MANAGE, &CPushDlg::OnBnClickedRemoteManage)
  85         ON_BN_CLICKED(IDC_BUTTON_BROWSE_SOURCE_BRANCH, &CPushDlg::OnBnClickedButtonBrowseSourceBranch)
  86         ON_BN_CLICKED(IDC_BUTTON_BROWSE_DEST_BRANCH, &CPushDlg::OnBnClickedButtonBrowseDestBranch)
  87         ON_BN_CLICKED(IDC_PUSHALL, &CPushDlg::OnBnClickedPushall)
  88         ON_BN_CLICKED(IDC_PROC_PUSH_SET_UPSTREAM, &CPushDlg::OnBnClickedProcPushSetUpstream)
  89         ON_BN_CLICKED(IDC_PROC_PUSH_SET_PUSHREMOTE, &CPushDlg::OnBnClickedProcPushSetPushremote)
  90         ON_BN_CLICKED(IDC_PROC_PUSH_SET_PUSHBRANCH, &CPushDlg::OnBnClickedProcPushSetPushremote)
  91 END_MESSAGE_MAP()
  92
  93 BOOL CPushDlg::OnInitDialog()
  94 {
  95         CHorizontalResizableStandAloneDialog::OnInitDialog();
  96         CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
  97
  98         AddAnchor(IDOK,BOTTOM_RIGHT);
  99         AddAnchor(IDCANCEL,BOTTOM_RIGHT);
 100         AddAnchor(IDC_BRANCH_GROUP, TOP_LEFT,TOP_RIGHT);
 101         AddAnchor(IDC_STATIC_REMOTE, TOP_LEFT);
 102         AddAnchor(IDC_STATIC_SOURCE, TOP_LEFT);
 103
 104         AddAnchor(IDC_PUSHALL, TOP_LEFT);
 105         AddAnchor(IDC_BRANCH_REMOTE, TOP_LEFT, TOP_RIGHT);
 106         AddAnchor(IDC_BUTTON_BROWSE_DEST_BRANCH, TOP_RIGHT);
 107         AddAnchor(IDC_BRANCH_SOURCE, TOP_LEFT, TOP_RIGHT);
 108         AddAnchor(IDC_BUTTON_BROWSE_SOURCE_BRANCH, TOP_RIGHT);
 109
 110         AddAnchor(IDC_URL_GROUP, TOP_LEFT,TOP_RIGHT);
 111         AddAnchor(IDC_RD_REMOTE, TOP_LEFT);
 112         AddAnchor(IDC_RD_URL, TOP_LEFT);
 113
 114         AddAnchor(IDC_REMOTE, TOP_LEFT, TOP_RIGHT);
 115
 116         AddAnchor(IDC_URL, TOP_LEFT,TOP_RIGHT);
 117
 118         AddAnchor(IDC_OPTION_GROUP, TOP_LEFT,TOP_RIGHT);
 119
 120         AddAnchor(IDC_FORCE, TOP_LEFT);
 121         AddAnchor(IDC_PACK, TOP_LEFT);
 122         AddAnchor(IDC_TAGS, TOP_LEFT);
 123         AddAnchor(IDC_PUTTYKEY_AUTOLOAD,TOP_LEFT);
 124         AddAnchor(IDC_PROC_PUSH_SET_PUSHBRANCH, TOP_LEFT);
 125         AddAnchor(IDC_PROC_PUSH_SET_PUSHREMOTE, TOP_LEFT);
 126         AddAnchor(IDC_PROC_PUSH_SET_UPSTREAM, TOP_LEFT);
 127         AddAnchor(IDC_STATIC_RECURSE_SUBMODULES, TOP_LEFT);
 128         AddAnchor(IDC_COMBOBOX_RECURSE_SUBMODULES, TOP_LEFT);
 129
 130         AddAnchor(IDC_REMOTE_MANAGE,TOP_RIGHT);
 131         AddAnchor(IDHELP, BOTTOM_RIGHT);
 132
 133         AddOthersToAnchor();
 134
 135         AdjustControlSize(IDC_RD_REMOTE);
 136         AdjustControlSize(IDC_RD_URL);
 137         AdjustControlSize(IDC_PUSHALL);
 138         AdjustControlSize(IDC_FORCE);
 139         AdjustControlSize(IDC_PACK);
 140         AdjustControlSize(IDC_TAGS);
 141         AdjustControlSize(IDC_PUTTYKEY_AUTOLOAD);
 142         AdjustControlSize(IDC_PROC_PUSH_SET_PUSHBRANCH);
 143         AdjustControlSize(IDC_PROC_PUSH_SET_PUSHREMOTE);
 144         AdjustControlSize(IDC_PROC_PUSH_SET_UPSTREAM);
 145         AdjustControlSize(IDC_STATIC_RECURSE_SUBMODULES);
 146
 147         CString sWindowTitle;
 148         GetWindowText(sWindowTitle);
 149         CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle);
 150
 151         this->GetDlgItem(IDC_PUTTYKEY_AUTOLOAD)->EnableWindow(CAppUtils::IsSSHPutty());
 152
 153         EnableSaveRestore(_T("PushDlg"));
 154
 155         m_RemoteURL.SetCaseSensitive(TRUE);
 156         m_RemoteURL.SetURLHistory(TRUE);
 157
 158         CString WorkingDir=g_Git.m_CurrentDir;
 159         WorkingDir.Replace(_T(':'),_T('_'));
 160         m_regPushAllRemotes = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\Push\\") + WorkingDir + _T("\\AllRemotes"), FALSE);
 161         m_bPushAllRemotes = m_regPushAllRemotes;
 162         m_regPushAllBranches = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\Push\\") + WorkingDir + _T("\\AllBranches"), FALSE);
 163         m_bPushAllBranches = m_regPushAllBranches;
 164         m_RemoteURL.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\PushURLS\\"))+WorkingDir, _T("url"));
 165         m_RemoteURL.EnableWindow(FALSE);
 166         CheckRadioButton(IDC_RD_REMOTE,IDC_RD_URL,IDC_RD_REMOTE);
 167
 168
 169         m_regThinPack = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\Push\\") + WorkingDir + _T("\\ThinPack"), FALSE);
 170         m_bPack = m_regThinPack;
 171         this->m_regAutoLoad = CRegDWORD(CString(_T("Software\\TortoiseGit\\History\\PushDlgAutoLoad\\"))+WorkingDir,
 172                                                                         m_bAutoLoad);
 173         m_bAutoLoad = this->m_regAutoLoad;
 174         if(!CAppUtils::IsSSHPutty())
 175                 m_bAutoLoad = false;
 176
 177         m_BrowseLocalRef.m_bRightArrow = TRUE;
 178         m_BrowseLocalRef.m_bDefaultClick = FALSE;
 179         m_BrowseLocalRef.m_bMarkDefault = FALSE;
 180         m_BrowseLocalRef.AddEntry(CString(MAKEINTRESOURCE(IDS_REFBROWSE)));
 181         m_BrowseLocalRef.AddEntry(CString(MAKEINTRESOURCE(IDS_LOG)));
 182         m_BrowseLocalRef.AddEntry(CString(MAKEINTRESOURCE(IDS_REFLOG)));
 183
 184         m_tooltips.Create(this);
 185         m_tooltips.AddTool(IDC_PROC_PUSH_SET_PUSHBRANCH, IDS_PUSHDLG_PUSHBRANCH_TT);
 186         m_tooltips.AddTool(IDC_PROC_PUSH_SET_PUSHREMOTE, IDS_PUSHDLG_PUSHREMOTE_TT);
 187
 188         m_regRecurseSubmodules = CRegDWORD(
 189                 CString(_T("Software\\TortoiseGit\\History\\PushRecurseSubmodules\\")) + WorkingDir, m_RecurseSubmodules);
 190         m_RecurseSubmodules = m_regRecurseSubmodules;
 191         m_RecurseSubmodulesCombo.AddString(CString(MAKEINTRESOURCE(IDS_NONE)));
 192         m_RecurseSubmodulesCombo.AddString(CString(MAKEINTRESOURCE(IDS_RECURSE_SUBMODULES_CHECK)));
 193         m_RecurseSubmodulesCombo.AddString(CString(MAKEINTRESOURCE(IDS_RECURSE_SUBMODULES_ONDEMAND)));
 194         m_RecurseSubmodulesCombo.SetCurSel(m_RecurseSubmodules);
 195
 196         Refresh();
 197
 198         this->UpdateData(false);
 199
 200         OnBnClickedPushall();
 201         return TRUE;
 202 }
 203
 204 void CPushDlg::Refresh()
 205 {
 206         CString WorkingDir=g_Git.m_CurrentDir;
 207         WorkingDir.Replace(_T(':'),_T('_'));
 208
 209         CRegString remote(CString(_T("Software\\TortoiseGit\\History\\PushRemote\\")+WorkingDir));
 210         m_RemoteReg = remote;
 211         int sel = -1;
 212
 213         STRING_VECTOR list;
 214         m_Remote.Reset();
 215
 216         list.push_back(CString(MAKEINTRESOURCE(IDS_PROC_PUSHFETCH_ALLREMOTES)));
 217         if(!g_Git.GetRemoteList(list))
 218         {
 219                 if (list.size() <= 2)
 220                         list.erase(list.begin());
 221
 222                 for (unsigned int i = 0; i < list.size(); ++i)
 223                 {
 224                         m_Remote.AddString(list[i]);
 225                         if(list[i] == remote)
 226                                 sel = i;
 227                 }
 228         }
 229         // if the last selected remote was "- All -" and "- All -" is still in the list -> select it
 230         if (list.size() > 1 && remote == CString(MAKEINTRESOURCE(IDS_PROC_PUSHFETCH_ALLREMOTES)))
 231                 sel = 0;
 232         m_Remote.SetCurSel(sel);
 233
 234         int current=0;
 235         list.clear();
 236         m_BranchSource.Reset();
 237         m_BranchSource.AddString(_T(" ")); // empty string does not work, for removal of remote branches/tags
 238         m_BranchSource.SetMaxHistoryItems(0x7FFFFFFF);
 239         if(!g_Git.GetBranchList(list,&current))
 240         {
 241                 for (unsigned int i = 0; i < list.size(); ++i)
 242                         m_BranchSource.AddString(list[i]);
 243                 ++current; // shift for " "
 244         }
 245         if (wcsncmp(m_BranchSourceName, _T("refs/"), 5) == 0)
 246                 m_BranchSourceName = m_BranchSourceName.Mid(5);
 247         if (wcsncmp(m_BranchSourceName, _T("heads/"), 6) == 0)
 248         {
 249                 m_BranchSourceName = m_BranchSourceName.Mid(6);
 250                 m_BranchSource.SetCurSel(m_BranchSource.FindStringExact(-1, m_BranchSourceName));
 251         }
 252         else if (wcsncmp(m_BranchSourceName, _T("remotes/"), 8) == 0)
 253                 m_BranchSource.SetCurSel(m_BranchSource.FindStringExact(-1, m_BranchSourceName));
 254         else
 255                 m_BranchSource.SetCurSel(current);
 256
 257         GetRemoteBranch(m_BranchSource.GetString());
 258
 259         this->GetDlgItem(IDOK)->EnableWindow(m_BranchSource.GetCount() != 0);
 260
 261         if (list.size() > 1 && m_bPushAllRemotes)
 262                 m_Remote.SetCurSel(0);
 263         m_bPushAllRemotes = FALSE; // reset to FALSE, so that a refresh does not reselect all even if it was already deselected by user; correct value will be set in OnBnClickedOk method
 264 }
 265
 266 void CPushDlg::GetRemoteBranch(CString currentBranch)
 267 {
 268         CString WorkingDir=g_Git.m_CurrentDir;
 269         WorkingDir.Replace(_T(':'), _T('_'));
 270
 271         if (currentBranch.IsEmpty())
 272         {
 273                 EnDisablePushRemoteArchiveBranch();
 274                 return;
 275         }
 276
 277         CString configName;
 278
 279         configName.Format(L"branch.%s.pushremote", currentBranch);
 280         CString pushRemote = g_Git.GetConfigValue(configName);
 281         if( pushRemote.IsEmpty() )
 282         {
 283                 pushRemote = g_Git.GetConfigValue(L"remote.pushdefault");
 284                 if (pushRemote.IsEmpty())
 285                 {
 286                         configName.Format(L"branch.%s.remote", currentBranch);
 287                         pushRemote = g_Git.GetConfigValue(configName);
 288                 }
 289         }
 290
 291         CRegString remote(CString(_T("Software\\TortoiseGit\\History\\PushRemote\\")+WorkingDir));
 292
 293         if (!pushRemote.IsEmpty())
 294         {
 295                 remote = pushRemote;
 296                 // if a pushRemote exists, select it
 297                 for (int i = 0; i < m_Remote.GetCount(); ++i)
 298                 {
 299                         CString str;
 300                         int n = m_Remote.GetLBTextLen(i);
 301                         m_Remote.GetLBText(i, str.GetBuffer(n));
 302                         str.ReleaseBuffer();
 303                         if (str == pushRemote)
 304                         {
 305                                 m_Remote.SetCurSel(i);
 306                                 break;
 307                         }
 308                 }
 309         }
 310         // select the only remote if only one exists
 311         else if (m_Remote.GetCount() == 1)
 312                 m_Remote.SetCurSel(0);
 313         // select no remote if no push-remote is specified AND push to all remotes is not selected
 314         else if (!(m_Remote.GetCount() > 1 && m_Remote.GetCurSel() == 0))
 315         {
 316                 m_Remote.SetCurSel(-1);
 317         }
 318
 319         //Select pull-branch from current branch
 320         configName.Format(L"branch.%s.pushbranch", currentBranch);
 321         CString pushBranch = g_Git.GetConfigValue(configName); // do not strip branch name (for gerrit), see issue #1609)
 322         if( pushBranch.IsEmpty() )
 323         {
 324                 configName.Format(L"branch.%s.merge", currentBranch);
 325                 pushBranch = CGit::StripRefName(g_Git.GetConfigValue(configName));
 326         }
 327
 328         m_BranchRemote.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\RemoteBranch\\"))+WorkingDir, _T("branch"));
 329         if( !pushBranch.IsEmpty() )
 330                 m_BranchRemote.AddString(pushBranch);
 331
 332         EnDisablePushRemoteArchiveBranch();
 333 }
 334
 335 void CPushDlg::EnDisablePushRemoteArchiveBranch()
 336 {
 337         if ((m_Remote.GetCount() > 1 && m_Remote.GetCurSel() == 0) || m_bPushAllBranches || GetCheckedRadioButton(IDC_RD_REMOTE,IDC_RD_URL) == IDC_RD_URL || m_BranchSource.GetString().Trim().IsEmpty())
 338         {
 339                 DialogEnableWindow(IDC_PROC_PUSH_SET_PUSHBRANCH, FALSE);
 340                 DialogEnableWindow(IDC_PROC_PUSH_SET_PUSHREMOTE, FALSE);
 341                 bool enableUpstream = (GetCheckedRadioButton(IDC_RD_REMOTE, IDC_RD_URL) != IDC_RD_URL && (!m_BranchSource.GetString().Trim().IsEmpty() || m_bPushAllBranches));
 342                 DialogEnableWindow(IDC_PROC_PUSH_SET_UPSTREAM, enableUpstream);
 343                 if (m_bSetUpstream && !enableUpstream)
 344                         m_bSetUpstream = FALSE;
 345                 m_bSetPushRemote = FALSE;
 346                 m_bSetPushBranch = FALSE;
 347                 UpdateData(FALSE);
 348         }
 349         else
 350         {
 351                 DialogEnableWindow(IDC_PROC_PUSH_SET_UPSTREAM, TRUE);
 352                 DialogEnableWindow(IDC_PROC_PUSH_SET_PUSHBRANCH, !m_bSetUpstream);
 353                 DialogEnableWindow(IDC_PROC_PUSH_SET_PUSHREMOTE, !m_bSetUpstream);
 354         }
 355 }
 356
 357 // CPushDlg message handlers
 358
 359 void CPushDlg::OnBnClickedRd()
 360 {
 361         if( GetCheckedRadioButton(IDC_RD_REMOTE,IDC_RD_URL) == IDC_RD_REMOTE)
 362         {
 363                 m_Remote.EnableWindow(TRUE);
 364                 GetDlgItem(IDC_REMOTE_MANAGE)->EnableWindow(TRUE);
 365                 m_RemoteURL.EnableWindow(FALSE);
 366         }
 367         if( GetCheckedRadioButton(IDC_RD_REMOTE,IDC_RD_URL) == IDC_RD_URL)
 368         {
 369                 CString clippath = CAppUtils::GetClipboardLink();
 370                 if (clippath.IsEmpty())
 371                         m_RemoteURL.SetCurSel(0);
 372                 else
 373                         m_RemoteURL.SetWindowText(clippath);
 374                 m_Remote.EnableWindow(FALSE);
 375                 GetDlgItem(IDC_REMOTE_MANAGE)->EnableWindow(FALSE);
 376                 m_RemoteURL.EnableWindow(TRUE);
 377         }
 378         EnDisablePushRemoteArchiveBranch();
 379 }
 380
 381
 382 void CPushDlg::OnCbnSelchangeBranchSource()
 383 {
 384         GetRemoteBranch(m_BranchSource.GetString());
 385 }
 386
 387 void CPushDlg::OnBnClickedOk()
 388 {
 389         CHorizontalResizableStandAloneDialog::UpdateData(TRUE);
 390
 391         if( GetCheckedRadioButton(IDC_RD_REMOTE,IDC_RD_URL) == IDC_RD_REMOTE)
 392         {
 393                 m_URL=m_Remote.GetString();
 394                 if (m_URL.IsEmpty())
 395                 {
 396                         CMessageBox::Show(NULL, IDS_PROC_GITCONFIG_REMOTEEMPTY, IDS_APPNAME, MB_OK);
 397                         return;
 398                 }
 399                 m_bPushAllRemotes = (m_Remote.GetCurSel() == 0 && m_Remote.GetCount() > 1);
 400         }
 401         if( GetCheckedRadioButton(IDC_RD_REMOTE,IDC_RD_URL) == IDC_RD_URL)
 402         {
 403                 m_URL=m_RemoteURL.GetString();
 404         }
 405
 406         if (!m_bPushAllBranches)
 407         {
 408                 this->m_BranchRemoteName=m_BranchRemote.GetString().Trim();
 409                 this->m_BranchSourceName=m_BranchSource.GetString().Trim();
 410
 411                 if (m_BranchSourceName.IsEmpty() && m_BranchRemoteName.IsEmpty())
 412                 {
 413                         if (CMessageBox::Show(NULL, IDS_B_T_BOTHEMPTY, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO) == IDNO)
 414                                 return;
 415                 }
 416                 if (m_BranchSourceName.IsEmpty() && !m_BranchRemoteName.IsEmpty())
 417                 {
 418                         if (CMessageBox::Show(NULL, IDS_B_T_LOCALEMPTY, IDS_APPNAME, MB_ICONEXCLAMATION | MB_YESNO) == IDNO)
 419                                 return;
 420                 }
 421                 else if (!m_BranchRemoteName.IsEmpty() && !g_Git.IsBranchNameValid(this->m_BranchRemoteName))
 422                 {
 423                         CMessageBox::Show(NULL, IDS_B_T_INVALID, IDS_APPNAME, MB_OK);
 424                         return;
 425                 }
 426                 else if (!m_BranchSourceName.IsEmpty() && !g_Git.IsBranchTagNameUnique(m_BranchSourceName))
 427                 {
 428                         CMessageBox::Show(NULL, IDS_B_T_NOT_UNIQUE, IDS_APPNAME, MB_OK | MB_ICONEXCLAMATION);
 429                         return;
 430                 }
 431                 else
 432                 {
 433                         // do not store branch names on removal
 434                         if (m_RemoteURL.IsWindowEnabled())
 435                                 m_RemoteURL.SaveHistory(); // do not store Remote URLs if not used
 436                         this->m_BranchRemote.SaveHistory();
 437                         m_RemoteReg = m_Remote.GetString();
 438
 439                         if (!m_BranchSourceName.IsEmpty())
 440                         {
 441                                 CString configName;
 442                                 if (m_bSetPushBranch)
 443                                 {
 444                                         configName.Format(L"branch.%s.pushbranch", m_BranchSourceName);
 445                                         if (!m_BranchRemoteName.IsEmpty())
 446                                                 g_Git.SetConfigValue(configName, m_BranchRemoteName);
 447                                         else
 448                                                 g_Git.UnsetConfigValue(configName);
 449                                 }
 450                                 if (m_bSetPushRemote)
 451                                 {
 452                                         configName.Format(L"branch.%s.pushremote", m_BranchSourceName);
 453                                         if (!m_URL.IsEmpty())
 454                                                 g_Git.SetConfigValue(configName, m_URL);
 455                                         else
 456                                                 g_Git.UnsetConfigValue(configName);
 457                                 }
 458                         }
 459                 }
 460         }
 461
 462         m_regPushAllBranches = m_bPushAllBranches;
 463         m_regPushAllRemotes = m_bPushAllRemotes;
 464         m_regThinPack = m_bPack;
 465         this->m_regAutoLoad = m_bAutoLoad ;
 466         m_RecurseSubmodules = m_RecurseSubmodulesCombo.GetCurSel();
 467         if (m_RecurseSubmodules == 2 && CAppUtils::GetMsysgitVersion() < 0x01070b00)
 468         {
 469                 CString gitver;
 470                 gitver.Format(IDS_GITVER_REQUIRED, _T("--recurse-submodules=on-demand"), _T("1.7.11"));
 471                 CMessageBox::Show(m_hWnd, gitver, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
 472                 return;
 473         }
 474         m_regRecurseSubmodules = m_RecurseSubmodules;
 475
 476         CHorizontalResizableStandAloneDialog::OnOK();
 477 }
 478
 479 void CPushDlg::OnBnClickedRemoteManage()
 480 {
 481         CAppUtils::LaunchRemoteSetting();
 482         Refresh();
 483 }
 484
 485 void CPushDlg::OnBnClickedButtonBrowseSourceBranch()
 486 {
 487         switch (m_BrowseLocalRef.GetCurrentEntry())
 488         {
 489         case 0: /* Browse Refence*/
 490                 {
 491                         if(CBrowseRefsDlg::PickRefForCombo(&m_BranchSource, gPickRef_Head))
 492                                 OnCbnSelchangeBranchSource();
 493                 }
 494                 break;
 495
 496         case 1: /* Log */
 497                 {
 498                         CLogDlg dlg;
 499                         dlg.SetSelect(true);
 500                         if(dlg.DoModal() == IDOK)
 501                         {
 502                                 if (dlg.GetSelectedHash().IsEmpty())
 503                                         return;
 504
 505                                 m_BranchSource.SetWindowText(dlg.GetSelectedHash());
 506                                 OnCbnSelchangeBranchSource();
 507                         }
 508                 }
 509                 break;
 510
 511         case 2: /*RefLog*/
 512                 {
 513                         CRefLogDlg dlg;
 514                         if(dlg.DoModal() == IDOK)
 515                         {
 516                                 m_BranchSource.SetWindowText(dlg.m_SelectedHash);
 517                                 OnCbnSelchangeBranchSource();
 518                         }
 519                 }
 520                 break;
 521         }
 522 }
 523
 524 void CPushDlg::OnBnClickedButtonBrowseDestBranch()
 525 {
 526         CString remoteBranchName;
 527         CString remoteName;
 528         m_BranchRemote.GetWindowText(remoteBranchName);
 529         remoteName = m_Remote.GetString();
 530         remoteBranchName = remoteName + '/' + remoteBranchName;
 531         remoteBranchName = CBrowseRefsDlg::PickRef(false, remoteBranchName, gPickRef_Remote);
 532         if(remoteBranchName.IsEmpty())
 533                 return; //Canceled
 534         remoteBranchName = remoteBranchName.Mid(13);//Strip 'refs/remotes/'
 535         int slashPlace = remoteBranchName.Find('/');
 536         remoteName = remoteBranchName.Left(slashPlace);
 537         remoteBranchName = remoteBranchName.Mid(slashPlace + 1); //Strip remote name (for example 'origin/')
 538
 539         //Select remote
 540         int remoteSel = m_Remote.FindStringExact(0,remoteName);
 541         if(remoteSel >= 0)
 542                 m_Remote.SetCurSel(remoteSel);
 543
 544         //Select branch
 545         m_BranchRemote.AddString(remoteBranchName, 0);
 546 }
 547
 548 BOOL CPushDlg::PreTranslateMessage(MSG* pMsg)
 549 {
 550         m_tooltips.RelayEvent(pMsg);
 551
 552         if (pMsg->message == WM_KEYDOWN)
 553         {
 554                 switch (pMsg->wParam)
 555                 {
 556                 case VK_F5:
 557                         {
 558                                 Refresh();
 559                         }
 560                         break;
 561                 }
 562         }
 563
 564         return CHorizontalResizableStandAloneDialog::PreTranslateMessage(pMsg);
 565 }
 566
 567 void CPushDlg::OnBnClickedPushall()
 568 {
 569         this->UpdateData();
 570         this->GetDlgItem(IDC_BRANCH_REMOTE)->EnableWindow(!m_bPushAllBranches);
 571         this->GetDlgItem(IDC_BRANCH_SOURCE)->EnableWindow(!m_bPushAllBranches);
 572         this->GetDlgItem(IDC_BUTTON_BROWSE_SOURCE_BRANCH)->EnableWindow(!m_bPushAllBranches);
 573         this->GetDlgItem(IDC_BUTTON_BROWSE_DEST_BRANCH)->EnableWindow(!m_bPushAllBranches);
 574         EnDisablePushRemoteArchiveBranch();
 575 }
 576
 577 void CPushDlg::OnBnClickedProcPushSetUpstream()
 578 {
 579         UpdateData();
 580         this->GetDlgItem(IDC_PROC_PUSH_SET_PUSHREMOTE)->EnableWindow(!m_bSetUpstream);
 581         this->GetDlgItem(IDC_PROC_PUSH_SET_PUSHBRANCH)->EnableWindow(!m_bSetUpstream);
 582         m_bSetPushBranch = FALSE;
 583         m_bSetPushRemote = FALSE;
 584         UpdateData(FALSE);
 585 }
 586
 587 void CPushDlg::OnBnClickedProcPushSetPushremote()
 588 {
 589         UpdateData();
 590         this->GetDlgItem(IDC_PROC_PUSH_SET_UPSTREAM)->EnableWindow(!(m_bSetPushBranch || m_bSetPushRemote));
 591         m_bSetUpstream = FALSE;
 592         UpdateData(FALSE);
 593 }