Fixed issue #2219: "add cherry picked from" is not applied when squashing/editing...
[TortoiseGit.git] / src / TortoiseProc / PushDlg.cpp
blob4c666af4bae79b74e558d9bf74ab823041e58f81
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2014 - 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.
20 // PushDlg.cpp : implementation file
23 #include "stdafx.h"
24 #include "TortoiseProc.h"
25 #include "PushDlg.h"
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"
35 // CPushDlg dialog
37 IMPLEMENT_DYNAMIC(CPushDlg, CHorizontalResizableStandAloneDialog)
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)
52 m_bAutoLoad = CAppUtils::IsSSHPutty();
55 CPushDlg::~CPushDlg()
59 void CPushDlg::DoDataExchange(CDataExchange* pDX)
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);
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()
93 BOOL CPushDlg::OnInitDialog()
95 CHorizontalResizableStandAloneDialog::OnInitDialog();
96 CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
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);
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);
110 AddAnchor(IDC_URL_GROUP, TOP_LEFT,TOP_RIGHT);
111 AddAnchor(IDC_RD_REMOTE, TOP_LEFT);
112 AddAnchor(IDC_RD_URL, TOP_LEFT);
114 AddAnchor(IDC_REMOTE, TOP_LEFT, TOP_RIGHT);
116 AddAnchor(IDC_URL, TOP_LEFT,TOP_RIGHT);
118 AddAnchor(IDC_OPTION_GROUP, TOP_LEFT,TOP_RIGHT);
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);
130 AddAnchor(IDC_REMOTE_MANAGE,TOP_RIGHT);
131 AddAnchor(IDHELP, BOTTOM_RIGHT);
133 AddOthersToAnchor();
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);
147 CString sWindowTitle;
148 GetWindowText(sWindowTitle);
149 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle);
151 this->GetDlgItem(IDC_PUTTYKEY_AUTOLOAD)->EnableWindow(CAppUtils::IsSSHPutty());
153 EnableSaveRestore(_T("PushDlg"));
155 m_RemoteURL.SetCaseSensitive(TRUE);
156 m_RemoteURL.SetURLHistory(TRUE);
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);
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;
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)));
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);
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);
196 Refresh();
198 this->UpdateData(false);
200 OnBnClickedPushall();
201 return TRUE;
204 void CPushDlg::Refresh()
206 CString WorkingDir=g_Git.m_CurrentDir;
207 WorkingDir.Replace(_T(':'),_T('_'));
209 CRegString remote(CString(_T("Software\\TortoiseGit\\History\\PushRemote\\")+WorkingDir));
210 m_RemoteReg = remote;
211 int sel = -1;
213 STRING_VECTOR list;
214 m_Remote.Reset();
216 if(!g_Git.GetRemoteList(list))
218 if (list.size() > 1)
219 m_Remote.AddString(CString(MAKEINTRESOURCE(IDS_PROC_PUSHFETCH_ALLREMOTES)));
220 for (unsigned int i = 0; i < list.size(); ++i)
222 m_Remote.AddString(list[i]);
223 if(list[i] == remote)
224 sel = i + (list.size() > 1 ? 1 : 0);
227 else
228 MessageBox(g_Git.GetGitLastErr(_T("Could not get list of remotes.")), _T("TortoiseGit"), MB_ICONERROR);
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);
234 int current = -1;
235 list.clear();
236 m_BranchSource.Reset();
237 m_BranchSource.SetMaxHistoryItems(0x7FFFFFFF);
238 if(!g_Git.GetBranchList(list,&current))
239 m_BranchSource.SetList(list);
240 else
241 MessageBox(g_Git.GetGitLastErr(_T("Could not get list of local branches.")), _T("TortoiseGit"), MB_ICONERROR);
242 if (wcsncmp(m_BranchSourceName, _T("refs/"), 5) == 0)
243 m_BranchSourceName = m_BranchSourceName.Mid(5);
244 if (wcsncmp(m_BranchSourceName, _T("heads/"), 6) == 0)
246 m_BranchSourceName = m_BranchSourceName.Mid(6);
247 m_BranchSource.SetCurSel(m_BranchSource.FindStringExact(-1, m_BranchSourceName));
249 else if (wcsncmp(m_BranchSourceName, _T("remotes/"), 8) == 0)
250 m_BranchSource.SetCurSel(m_BranchSource.FindStringExact(-1, m_BranchSourceName));
251 else
252 m_BranchSource.SetCurSel(current);
254 GetRemoteBranch(m_BranchSource.GetString());
256 this->GetDlgItem(IDOK)->EnableWindow(m_BranchSource.GetCount() != 0);
258 if (list.size() > 1 && m_bPushAllRemotes)
259 m_Remote.SetCurSel(0);
260 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
263 void CPushDlg::GetRemoteBranch(CString currentBranch)
265 CString WorkingDir=g_Git.m_CurrentDir;
266 WorkingDir.Replace(_T(':'), _T('_'));
268 if (currentBranch.IsEmpty())
270 EnDisablePushRemoteArchiveBranch();
271 return;
274 CString configName;
276 configName.Format(L"branch.%s.pushremote", currentBranch);
277 CString pushRemote = g_Git.GetConfigValue(configName);
278 if( pushRemote.IsEmpty() )
280 pushRemote = g_Git.GetConfigValue(L"remote.pushdefault");
281 if (pushRemote.IsEmpty())
283 configName.Format(L"branch.%s.remote", currentBranch);
284 pushRemote = g_Git.GetConfigValue(configName);
288 CRegString remote(CString(_T("Software\\TortoiseGit\\History\\PushRemote\\")+WorkingDir));
290 if (!pushRemote.IsEmpty())
292 remote = pushRemote;
293 // if a pushRemote exists, select it
294 for (int i = 0; i < m_Remote.GetCount(); ++i)
296 CString str;
297 int n = m_Remote.GetLBTextLen(i);
298 m_Remote.GetLBText(i, str.GetBuffer(n));
299 str.ReleaseBuffer();
300 if (str == pushRemote)
302 m_Remote.SetCurSel(i);
303 break;
307 // select the only remote if only one exists
308 else if (m_Remote.GetCount() == 1)
309 m_Remote.SetCurSel(0);
310 // select no remote if no push-remote is specified AND push to all remotes is not selected
311 else if (!(m_Remote.GetCount() > 1 && m_Remote.GetCurSel() == 0))
313 m_Remote.SetCurSel(-1);
316 //Select pull-branch from current branch
317 configName.Format(L"branch.%s.pushbranch", currentBranch);
318 CString pushBranch = g_Git.GetConfigValue(configName); // do not strip branch name (for gerrit), see issue #1609)
319 if( pushBranch.IsEmpty() )
321 configName.Format(L"branch.%s.merge", currentBranch);
322 pushBranch = CGit::StripRefName(g_Git.GetConfigValue(configName));
325 m_BranchRemote.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\RemoteBranch\\"))+WorkingDir, _T("branch"));
326 if( !pushBranch.IsEmpty() )
327 m_BranchRemote.AddString(pushBranch);
329 EnDisablePushRemoteArchiveBranch();
332 void CPushDlg::EnDisablePushRemoteArchiveBranch()
334 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())
336 DialogEnableWindow(IDC_PROC_PUSH_SET_PUSHBRANCH, FALSE);
337 DialogEnableWindow(IDC_PROC_PUSH_SET_PUSHREMOTE, FALSE);
338 bool enableUpstream = (GetCheckedRadioButton(IDC_RD_REMOTE, IDC_RD_URL) != IDC_RD_URL && (!m_BranchSource.GetString().Trim().IsEmpty() || m_bPushAllBranches));
339 DialogEnableWindow(IDC_PROC_PUSH_SET_UPSTREAM, enableUpstream);
340 if (m_bSetUpstream && !enableUpstream)
341 m_bSetUpstream = FALSE;
342 m_bSetPushRemote = FALSE;
343 m_bSetPushBranch = FALSE;
344 UpdateData(FALSE);
346 else
348 DialogEnableWindow(IDC_PROC_PUSH_SET_UPSTREAM, TRUE);
349 DialogEnableWindow(IDC_PROC_PUSH_SET_PUSHBRANCH, !m_bSetUpstream);
350 DialogEnableWindow(IDC_PROC_PUSH_SET_PUSHREMOTE, !m_bSetUpstream);
354 // CPushDlg message handlers
356 void CPushDlg::OnBnClickedRd()
358 if( GetCheckedRadioButton(IDC_RD_REMOTE,IDC_RD_URL) == IDC_RD_REMOTE)
360 m_Remote.EnableWindow(TRUE);
361 GetDlgItem(IDC_REMOTE_MANAGE)->EnableWindow(TRUE);
362 m_RemoteURL.EnableWindow(FALSE);
364 if( GetCheckedRadioButton(IDC_RD_REMOTE,IDC_RD_URL) == IDC_RD_URL)
366 CString clippath = CAppUtils::GetClipboardLink();
367 if (clippath.IsEmpty())
368 m_RemoteURL.SetCurSel(0);
369 else
370 m_RemoteURL.SetWindowText(clippath);
371 m_Remote.EnableWindow(FALSE);
372 GetDlgItem(IDC_REMOTE_MANAGE)->EnableWindow(FALSE);
373 m_RemoteURL.EnableWindow(TRUE);
375 EnDisablePushRemoteArchiveBranch();
379 void CPushDlg::OnCbnSelchangeBranchSource()
381 GetRemoteBranch(m_BranchSource.GetString());
384 void CPushDlg::OnBnClickedOk()
386 CHorizontalResizableStandAloneDialog::UpdateData(TRUE);
388 if( GetCheckedRadioButton(IDC_RD_REMOTE,IDC_RD_URL) == IDC_RD_REMOTE)
390 m_URL=m_Remote.GetString();
391 if (m_URL.IsEmpty())
393 CMessageBox::Show(NULL, IDS_PROC_GITCONFIG_REMOTEEMPTY, IDS_APPNAME, MB_OK);
394 return;
396 m_bPushAllRemotes = (m_Remote.GetCurSel() == 0 && m_Remote.GetCount() > 1);
398 if( GetCheckedRadioButton(IDC_RD_REMOTE,IDC_RD_URL) == IDC_RD_URL)
400 m_URL=m_RemoteURL.GetString();
403 if (!m_bPushAllBranches)
405 this->m_BranchRemoteName=m_BranchRemote.GetString().Trim();
406 this->m_BranchSourceName=m_BranchSource.GetString().Trim();
408 if (m_BranchSourceName.IsEmpty() && m_BranchRemoteName.IsEmpty())
410 if (CMessageBox::Show(NULL, IDS_B_T_BOTHEMPTY, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO) == IDNO)
411 return;
413 if (m_BranchSourceName.IsEmpty() && !m_BranchRemoteName.IsEmpty())
415 if (CMessageBox::Show(NULL, IDS_B_T_LOCALEMPTY, IDS_APPNAME, MB_ICONEXCLAMATION | MB_YESNO) == IDNO)
416 return;
418 else if (!m_BranchRemoteName.IsEmpty() && !g_Git.IsBranchNameValid(this->m_BranchRemoteName))
420 CMessageBox::Show(NULL, IDS_B_T_INVALID, IDS_APPNAME, MB_OK);
421 return;
423 else if (!m_BranchSourceName.IsEmpty() && !g_Git.IsBranchTagNameUnique(m_BranchSourceName))
425 CMessageBox::Show(NULL, IDS_B_T_NOT_UNIQUE, IDS_APPNAME, MB_OK | MB_ICONEXCLAMATION);
426 return;
428 else
430 // do not store branch names on removal
431 if (m_RemoteURL.IsWindowEnabled())
432 m_RemoteURL.SaveHistory(); // do not store Remote URLs if not used
433 this->m_BranchRemote.SaveHistory();
434 m_RemoteReg = m_Remote.GetString();
436 if (!m_BranchSourceName.IsEmpty())
438 CString configName;
439 if (m_bSetPushBranch)
441 configName.Format(L"branch.%s.pushbranch", m_BranchSourceName);
442 if (!m_BranchRemoteName.IsEmpty())
443 g_Git.SetConfigValue(configName, m_BranchRemoteName);
444 else
445 g_Git.UnsetConfigValue(configName);
447 if (m_bSetPushRemote)
449 configName.Format(L"branch.%s.pushremote", m_BranchSourceName);
450 if (!m_URL.IsEmpty())
451 g_Git.SetConfigValue(configName, m_URL);
452 else
453 g_Git.UnsetConfigValue(configName);
459 m_regPushAllBranches = m_bPushAllBranches;
460 m_regPushAllRemotes = m_bPushAllRemotes;
461 m_regThinPack = m_bPack;
462 this->m_regAutoLoad = m_bAutoLoad ;
463 m_RecurseSubmodules = m_RecurseSubmodulesCombo.GetCurSel();
464 if (m_RecurseSubmodules == 2 && CAppUtils::GetMsysgitVersion() < 0x01070b00)
466 CString gitver;
467 gitver.Format(IDS_GITVER_REQUIRED, _T("--recurse-submodules=on-demand"), _T("1.7.11"));
468 CMessageBox::Show(m_hWnd, gitver, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
469 return;
471 m_regRecurseSubmodules = m_RecurseSubmodules;
473 CHorizontalResizableStandAloneDialog::OnOK();
476 void CPushDlg::OnBnClickedRemoteManage()
478 CAppUtils::LaunchRemoteSetting();
479 Refresh();
482 void CPushDlg::OnBnClickedButtonBrowseSourceBranch()
484 switch (m_BrowseLocalRef.GetCurrentEntry())
486 case 0: /* Browse Refence*/
488 if(CBrowseRefsDlg::PickRefForCombo(&m_BranchSource, gPickRef_Head))
489 OnCbnSelchangeBranchSource();
491 break;
493 case 1: /* Log */
495 CLogDlg dlg;
496 dlg.SetSelect(true);
497 if(dlg.DoModal() == IDOK)
499 if (dlg.GetSelectedHash().IsEmpty())
500 return;
502 m_BranchSource.SetWindowText(dlg.GetSelectedHash());
503 OnCbnSelchangeBranchSource();
506 break;
508 case 2: /*RefLog*/
510 CRefLogDlg dlg;
511 if(dlg.DoModal() == IDOK)
513 m_BranchSource.SetWindowText(dlg.m_SelectedHash);
514 OnCbnSelchangeBranchSource();
517 break;
521 void CPushDlg::OnBnClickedButtonBrowseDestBranch()
523 CString remoteBranchName;
524 CString remoteName;
525 m_BranchRemote.GetWindowText(remoteBranchName);
526 remoteName = m_Remote.GetString();
527 remoteBranchName = remoteName + '/' + remoteBranchName;
528 remoteBranchName = CBrowseRefsDlg::PickRef(false, remoteBranchName, gPickRef_Remote);
529 if(remoteBranchName.IsEmpty())
530 return; //Canceled
531 remoteBranchName = remoteBranchName.Mid(13);//Strip 'refs/remotes/'
532 int slashPlace = remoteBranchName.Find('/');
533 remoteName = remoteBranchName.Left(slashPlace);
534 remoteBranchName = remoteBranchName.Mid(slashPlace + 1); //Strip remote name (for example 'origin/')
536 //Select remote
537 int remoteSel = m_Remote.FindStringExact(0,remoteName);
538 if(remoteSel >= 0)
539 m_Remote.SetCurSel(remoteSel);
541 //Select branch
542 m_BranchRemote.AddString(remoteBranchName, 0);
545 BOOL CPushDlg::PreTranslateMessage(MSG* pMsg)
547 m_tooltips.RelayEvent(pMsg);
549 if (pMsg->message == WM_KEYDOWN)
551 switch (pMsg->wParam)
553 case VK_F5:
555 Refresh();
557 break;
561 return CHorizontalResizableStandAloneDialog::PreTranslateMessage(pMsg);
564 void CPushDlg::OnBnClickedPushall()
566 this->UpdateData();
567 this->GetDlgItem(IDC_BRANCH_REMOTE)->EnableWindow(!m_bPushAllBranches);
568 this->GetDlgItem(IDC_BRANCH_SOURCE)->EnableWindow(!m_bPushAllBranches);
569 this->GetDlgItem(IDC_BUTTON_BROWSE_SOURCE_BRANCH)->EnableWindow(!m_bPushAllBranches);
570 this->GetDlgItem(IDC_BUTTON_BROWSE_DEST_BRANCH)->EnableWindow(!m_bPushAllBranches);
571 EnDisablePushRemoteArchiveBranch();
574 void CPushDlg::OnBnClickedProcPushSetUpstream()
576 UpdateData();
577 this->GetDlgItem(IDC_PROC_PUSH_SET_PUSHREMOTE)->EnableWindow(!m_bSetUpstream);
578 this->GetDlgItem(IDC_PROC_PUSH_SET_PUSHBRANCH)->EnableWindow(!m_bSetUpstream);
579 m_bSetPushBranch = FALSE;
580 m_bSetPushRemote = FALSE;
581 UpdateData(FALSE);
584 void CPushDlg::OnBnClickedProcPushSetPushremote()
586 UpdateData();
587 this->GetDlgItem(IDC_PROC_PUSH_SET_UPSTREAM)->EnableWindow(!(m_bSetPushBranch || m_bSetPushRemote));
588 m_bSetUpstream = FALSE;
589 UpdateData(FALSE);