src/TortoiseProc/RebaseDlg.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2008-2013 - TortoiseGit
   4 // Copyright (C) 2011-2013 - Sven Strickroth <email@cs-ware.de>
   5
   6 // This program is free software; you can redistribute it and/or
   7 // modify it under the terms of the GNU General Public License
   8 // as published by the Free Software Foundation; either version 2
   9 // of the License, or (at your option) any later version.
  10
  11 // This program is distributed in the hope that it will be useful,
  12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  14 // GNU General Public License for more details.
  15
  16 // You should have received a copy of the GNU General Public License
  17 // along with this program; if not, write to the Free Software Foundation,
  18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  19 //
  20
  21 // RebaseDlg.cpp : implementation file
  22 //
  23
  24 #include "stdafx.h"
  25 #include "TortoiseProc.h"
  26 #include "RebaseDlg.h"
  27 #include "AppUtils.h"
  28 #include "LoglistUtils.h"
  29 #include "MessageBox.h"
  30 #include "UnicodeUtils.h"
  31 #include "BrowseRefsDlg.h"
  32 #include "ProgressDlg.h"
  33 #include "SmartHandle.h"
  34 #include "../TGitCache/CacheInterface.h"
  35 #include "Settings\Settings.h"
  36 #include "MassiveGitTask.h"
  37
  38 // CRebaseDlg dialog
  39
  40 IMPLEMENT_DYNAMIC(CRebaseDlg, CResizableStandAloneDialog)
  41
  42 CRebaseDlg::CRebaseDlg(CWnd* pParent /*=NULL*/)
  43         : CResizableStandAloneDialog(CRebaseDlg::IDD, pParent)
  44         , m_bPickAll(FALSE)
  45         , m_bSquashAll(FALSE)
  46         , m_bEditAll(FALSE)
  47         , m_bAddCherryPickedFrom(FALSE)
  48         , m_bStatusWarning(false)
  49 {
  50         m_RebaseStage=CHOOSE_BRANCH;
  51         m_CurrentRebaseIndex=-1;
  52         m_bThreadRunning =FALSE;
  53         this->m_IsCherryPick = FALSE;
  54         m_bForce=FALSE;
  55         m_IsFastForward=FALSE;
  56 }
  57
  58 CRebaseDlg::~CRebaseDlg()
  59 {
  60 }
  61
  62 void CRebaseDlg::DoDataExchange(CDataExchange* pDX)
  63 {
  64         CDialog::DoDataExchange(pDX);
  65         DDX_Control(pDX, IDC_REBASE_PROGRESS, m_ProgressBar);
  66         DDX_Control(pDX, IDC_STATUS_STATIC, m_CtrlStatusText);
  67         DDX_Check(pDX, IDC_PICK_ALL, m_bPickAll);
  68         DDX_Check(pDX, IDC_SQUASH_ALL, m_bSquashAll);
  69         DDX_Check(pDX, IDC_EDIT_ALL, m_bEditAll);
  70         DDX_Control(pDX, IDC_REBASE_SPLIT, m_wndSplitter);
  71         DDX_Control(pDX,IDC_COMMIT_LIST,m_CommitList);
  72         DDX_Control(pDX,IDC_REBASE_COMBOXEX_BRANCH, this->m_BranchCtrl);
  73         DDX_Control(pDX,IDC_REBASE_COMBOXEX_UPSTREAM,   this->m_UpstreamCtrl);
  74         DDX_Check(pDX, IDC_REBASE_CHECK_FORCE,m_bForce);
  75         DDX_Check(pDX, IDC_CHECK_CHERRYPICKED_FROM, m_bAddCherryPickedFrom);
  76         DDX_Control(pDX,IDC_REBASE_POST_BUTTON,m_PostButton);
  77 }
  78
  79
  80 BEGIN_MESSAGE_MAP(CRebaseDlg, CResizableStandAloneDialog)
  81         ON_BN_CLICKED(IDC_PICK_ALL, &CRebaseDlg::OnBnClickedPickAll)
  82         ON_BN_CLICKED(IDC_SQUASH_ALL, &CRebaseDlg::OnBnClickedSquashAll)
  83         ON_BN_CLICKED(IDC_EDIT_ALL, &CRebaseDlg::OnBnClickedEditAll)
  84         ON_BN_CLICKED(IDC_REBASE_SPLIT, &CRebaseDlg::OnBnClickedRebaseSplit)
  85         ON_BN_CLICKED(IDC_REBASE_CONTINUE,OnBnClickedContinue)
  86         ON_BN_CLICKED(IDC_REBASE_ABORT,  OnBnClickedAbort)
  87         ON_WM_SIZE()
  88         ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_BRANCH,   &CRebaseDlg::OnCbnSelchangeBranch)
  89         ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_UPSTREAM, &CRebaseDlg::OnCbnSelchangeUpstream)
  90         ON_MESSAGE(MSG_REBASE_UPDATE_UI, OnRebaseUpdateUI)
  91         ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH, OnGitStatusListCtrlNeedsRefresh)
  92         ON_BN_CLICKED(IDC_BUTTON_BROWSE, &CRebaseDlg::OnBnClickedButtonBrowse)
  93         ON_BN_CLICKED(IDC_REBASE_CHECK_FORCE, &CRebaseDlg::OnBnClickedRebaseCheckForce)
  94         ON_BN_CLICKED(IDC_CHECK_CHERRYPICKED_FROM, &CRebaseDlg::OnBnClickedCheckCherryPickedFrom)
  95         ON_BN_CLICKED(IDC_REBASE_POST_BUTTON, &CRebaseDlg::OnBnClickedRebasePostButton)
  96         ON_BN_CLICKED(IDC_BUTTON_UP2, &CRebaseDlg::OnBnClickedButtonUp2)
  97         ON_BN_CLICKED(IDC_BUTTON_DOWN2, &CRebaseDlg::OnBnClickedButtonDown2)
  98         ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED, OnTaskbarBtnCreated)
  99         ON_NOTIFY(LVN_ITEMCHANGED, IDC_COMMIT_LIST, OnLvnItemchangedLoglist)
 100         ON_WM_CTLCOLOR()
 101 END_MESSAGE_MAP()
 102
 103 void CRebaseDlg::AddRebaseAnchor()
 104 {
 105         AddAnchor(IDC_REBASE_TAB,TOP_LEFT,BOTTOM_RIGHT);
 106         AddAnchor(IDC_COMMIT_LIST,TOP_LEFT, TOP_RIGHT);
 107         AddAnchor(IDC_REBASE_SPLIT,TOP_LEFT, TOP_RIGHT);
 108         AddAnchor(IDC_STATUS_STATIC, BOTTOM_LEFT,BOTTOM_RIGHT);
 109         AddAnchor(IDC_REBASE_CONTINUE,BOTTOM_RIGHT);
 110         AddAnchor(IDC_REBASE_ABORT, BOTTOM_RIGHT);
 111         AddAnchor(IDC_REBASE_PROGRESS,BOTTOM_LEFT, BOTTOM_RIGHT);
 112         AddAnchor(IDC_PICK_ALL,TOP_LEFT);
 113         AddAnchor(IDC_SQUASH_ALL,TOP_LEFT);
 114         AddAnchor(IDC_EDIT_ALL,TOP_LEFT);
 115         AddAnchor(IDC_BUTTON_UP2,TOP_LEFT);
 116         AddAnchor(IDC_BUTTON_DOWN2,TOP_LEFT);
 117         AddAnchor(IDC_REBASE_COMBOXEX_UPSTREAM,TOP_LEFT);
 118         AddAnchor(IDC_REBASE_COMBOXEX_BRANCH,TOP_LEFT);
 119         AddAnchor(IDC_REBASE_STATIC_UPSTREAM,TOP_LEFT);
 120         AddAnchor(IDC_REBASE_STATIC_BRANCH,TOP_LEFT);
 121         AddAnchor(IDHELP, BOTTOM_RIGHT);
 122         AddAnchor(IDC_REBASE_CHECK_FORCE,TOP_RIGHT);
 123         AddAnchor(IDC_CHECK_CHERRYPICKED_FROM, TOP_RIGHT);
 124         AddAnchor(IDC_REBASE_POST_BUTTON,BOTTOM_LEFT);
 125
 126         this->AddOthersToAnchor();
 127 }
 128
 129 BOOL CRebaseDlg::OnInitDialog()
 130 {
 131         CResizableStandAloneDialog::OnInitDialog();
 132         CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
 133
 134         // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
 135         // do this, Explorer would be unable to send that message to our window if we
 136         // were running elevated. It's OK to make the call all the time, since if we're
 137         // not elevated, this is a no-op.
 138         CHANGEFILTERSTRUCT cfs = { sizeof(CHANGEFILTERSTRUCT) };
 139         typedef BOOL STDAPICALLTYPE ChangeWindowMessageFilterExDFN(HWND hWnd, UINT message, DWORD action, PCHANGEFILTERSTRUCT pChangeFilterStruct);
 140         CAutoLibrary hUser = AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
 141         if (hUser)
 142         {
 143                 ChangeWindowMessageFilterExDFN *pfnChangeWindowMessageFilterEx = (ChangeWindowMessageFilterExDFN*)GetProcAddress(hUser, "ChangeWindowMessageFilterEx");
 144                 if (pfnChangeWindowMessageFilterEx)
 145                 {
 146                         pfnChangeWindowMessageFilterEx(m_hWnd, WM_TASKBARBTNCREATED, MSGFLT_ALLOW, &cfs);
 147                 }
 148         }
 149         m_pTaskbarList.Release();
 150         if (FAILED(m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList)))
 151                 m_pTaskbarList = nullptr;
 152
 153         CRect rectDummy;
 154         //IDC_REBASE_DUMY_TAB
 155
 156         GetClientRect(m_DlgOrigRect);
 157         m_CommitList.GetClientRect(m_CommitListOrigRect);
 158
 159         CWnd *pwnd=this->GetDlgItem(IDC_REBASE_DUMY_TAB);
 160         pwnd->GetWindowRect(&rectDummy);
 161         this->ScreenToClient(rectDummy);
 162
 163         if (!m_ctrlTabCtrl.Create(CMFCTabCtrl::STYLE_FLAT, rectDummy, this, IDC_REBASE_TAB))
 164         {
 165                 TRACE0("Failed to create output tab window\n");
 166                 return FALSE;      // fail to create
 167         }
 168         m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);
 169         // Create output panes:
 170         //const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
 171         DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
 172
 173         if (! this->m_FileListCtrl.Create(dwStyle,rectDummy,&this->m_ctrlTabCtrl,0) )
 174         {
 175                 TRACE0("Failed to create output windows\n");
 176                 return FALSE;      // fail to create
 177         }
 178         m_FileListCtrl.m_hwndLogicalParent = this;
 179
 180         if( ! this->m_LogMessageCtrl.Create(_T("Scintilla"),_T("source"),0,rectDummy,&m_ctrlTabCtrl,0,0) )
 181         {
 182                 TRACE0("Failed to create log message control");
 183                 return FALSE;
 184         }
 185         m_LogMessageCtrl.Init(0);
 186         m_LogMessageCtrl.Call(SCI_SETREADONLY, TRUE);
 187
 188         dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
 189
 190         if (!m_wndOutputRebase.Create(_T("Scintilla"),_T("source"),0,rectDummy, &m_ctrlTabCtrl, 0,0) )
 191         {
 192                 TRACE0("Failed to create output windows\n");
 193                 return -1;      // fail to create
 194         }
 195         m_wndOutputRebase.Init(0);
 196         m_wndOutputRebase.Call(SCI_SETREADONLY, TRUE);
 197
 198         m_tooltips.Create(this);
 199
 200         m_tooltips.AddTool(IDC_REBASE_CHECK_FORCE,IDS_REBASE_FORCE_TT);
 201         m_tooltips.AddTool(IDC_REBASE_ABORT,IDS_REBASE_ABORT_TT);
 202
 203
 204
 205         m_FileListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL , _T("RebaseDlg"),(GITSLC_POPALL ^ (GITSLC_POPCOMMIT|GITSLC_POPRESTORE)), false, true, GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD| GITSLC_COLDEL);
 206
 207         m_ctrlTabCtrl.AddTab(&m_FileListCtrl, CString(MAKEINTRESOURCE(IDS_PROC_REVISIONFILES)));
 208         m_ctrlTabCtrl.AddTab(&m_LogMessageCtrl, CString(MAKEINTRESOURCE(IDS_PROC_COMMITMESSAGE)), 1);
 209         AddRebaseAnchor();
 210
 211         AdjustControlSize(IDC_PICK_ALL);
 212         AdjustControlSize(IDC_SQUASH_ALL);
 213         AdjustControlSize(IDC_EDIT_ALL);
 214         AdjustControlSize(IDC_CHECK_CHERRYPICKED_FROM);
 215
 216         CString sWindowTitle;
 217         GetWindowText(sWindowTitle);
 218         CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle);
 219
 220         EnableSaveRestore(_T("RebaseDlg"));
 221
 222         DWORD yPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
 223         RECT rcDlg, rcLogMsg, rcFileList;
 224         GetClientRect(&rcDlg);
 225         m_CommitList.GetWindowRect(&rcLogMsg);
 226         ScreenToClient(&rcLogMsg);
 227         this->m_ctrlTabCtrl.GetWindowRect(&rcFileList);
 228         ScreenToClient(&rcFileList);
 229         if (yPos)
 230         {
 231                 RECT rectSplitter;
 232                 m_wndSplitter.GetWindowRect(&rectSplitter);
 233                 ScreenToClient(&rectSplitter);
 234                 int delta = yPos - rectSplitter.top;
 235                 if ((rcLogMsg.bottom + delta > rcLogMsg.top)&&(rcLogMsg.bottom + delta < rcFileList.bottom - 30))
 236                 {
 237                         m_wndSplitter.SetWindowPos(NULL, 0, yPos, 0, 0, SWP_NOSIZE);
 238                         DoSize(delta);
 239                 }
 240         }
 241
 242         if( this->m_RebaseStage == CHOOSE_BRANCH)
 243         {
 244                 this->LoadBranchInfo();
 245
 246         }
 247         else
 248         {
 249                 this->m_BranchCtrl.EnableWindow(FALSE);
 250                 this->m_UpstreamCtrl.EnableWindow(FALSE);
 251         }
 252
 253         m_CommitList.m_ColumnRegKey = _T("Rebase");
 254         m_CommitList.m_IsIDReplaceAction = TRUE;
 255 //      m_CommitList.m_IsOldFirst = TRUE;
 256         m_CommitList.m_IsRebaseReplaceGraph = TRUE;
 257         m_CommitList.m_bNoHightlightHead = TRUE;
 258
 259         m_CommitList.InsertGitColumn();
 260
 261         this->SetControlEnable();
 262
 263         if(!this->m_PreCmd.IsEmpty())
 264         {
 265                 CProgressDlg progress;
 266                 progress.m_GitCmd=m_PreCmd;
 267                 progress.m_bAutoCloseOnSuccess=true;
 268                 progress.DoModal();
 269         }
 270
 271         if(m_IsCherryPick)
 272         {
 273                 this->m_BranchCtrl.SetCurSel(-1);
 274                 this->m_BranchCtrl.EnableWindow(FALSE);
 275                 GetDlgItem(IDC_REBASE_CHECK_FORCE)->ShowWindow(SW_HIDE);
 276                 GetDlgItem(IDC_BUTTON_BROWSE)->EnableWindow(FALSE);
 277                 this->m_UpstreamCtrl.AddString(_T("HEAD"));
 278                 this->m_UpstreamCtrl.EnableWindow(FALSE);
 279                 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_CHERRYPICK)));
 280                 this->m_CommitList.StartFilter();
 281         }
 282         else
 283         {
 284                 GetDlgItem(IDC_CHECK_CHERRYPICKED_FROM)->ShowWindow(SW_HIDE);
 285                 SetContinueButtonText();
 286                 m_CommitList.DeleteAllItems();
 287                 FetchLogList();
 288         }
 289
 290         m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_CHERRY_PICK)|
 291                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_SWITCHTOREV)|
 292                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_RESET)|
 293                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REVERTREV)|
 294                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_TO_VERSION)|
 295                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REVERTTOREV)|
 296                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_COMBINE_COMMIT));
 297
 298         if(m_CommitList.m_IsOldFirst)
 299                 this->m_CurrentRebaseIndex = -1;
 300         else
 301                 this->m_CurrentRebaseIndex = (int)m_CommitList.m_logEntries.size();
 302
 303
 304         if(this->CheckRebaseCondition())
 305         {
 306                 /* Disable Start Rebase */
 307                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
 308         }
 309
 310         return TRUE;
 311 }
 312 // CRebaseDlg message handlers
 313
 314 HBRUSH CRebaseDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
 315 {
 316         if (pWnd->GetDlgCtrlID() == IDC_STATUS_STATIC && nCtlColor == CTLCOLOR_STATIC && m_bStatusWarning)
 317         {
 318                 pDC->SetBkColor(RGB(255, 0, 0));
 319                 pDC->SetTextColor(RGB(255, 255, 255));
 320                 return CreateSolidBrush(RGB(255, 0, 0));
 321         }
 322
 323         return CResizableStandAloneDialog::OnCtlColor(pDC, pWnd, nCtlColor);
 324 }
 325
 326 void CRebaseDlg::OnBnClickedPickAll()
 327 {
 328         this->UpdateData();
 329         if(this->m_bPickAll)
 330                 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_PICK);
 331
 332         this->m_bEditAll=FALSE;
 333         this->m_bSquashAll=FALSE;
 334         this->UpdateData(FALSE);
 335 }
 336
 337 void CRebaseDlg::OnBnClickedSquashAll()
 338 {
 339         this->UpdateData();
 340         if(this->m_bSquashAll)
 341                 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_SQUASH);
 342
 343         this->m_bEditAll=FALSE;
 344         this->m_bPickAll=FALSE;
 345         this->UpdateData(FALSE);
 346 }
 347
 348 void CRebaseDlg::OnBnClickedEditAll()
 349 {
 350         this->UpdateData();
 351         if( this->m_bEditAll )
 352                 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_EDIT);
 353
 354         this->m_bPickAll=FALSE;
 355         this->m_bSquashAll=FALSE;
 356         this->UpdateData(FALSE);
 357 }
 358
 359 void CRebaseDlg::SetAllRebaseAction(int action)
 360 {
 361         for (int i = 0; i < this->m_CommitList.m_logEntries.size(); ++i)
 362         {
 363                 m_CommitList.m_logEntries.GetGitRevAt(i).GetAction(&m_CommitList)=action;
 364         }
 365         m_CommitList.Invalidate();
 366 }
 367
 368 void CRebaseDlg::OnBnClickedRebaseSplit()
 369 {
 370         this->UpdateData();
 371 }
 372
 373 LRESULT CRebaseDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 374 {
 375         switch (message) {
 376         case WM_NOTIFY:
 377                 if (wParam == IDC_REBASE_SPLIT)
 378                 {
 379                         SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
 380                         DoSize(pHdr->delta);
 381                 }
 382                 break;
 383         }
 384
 385         return __super::DefWindowProc(message, wParam, lParam);
 386 }
 387
 388 void CRebaseDlg::DoSize(int delta)
 389 {
 390         this->RemoveAllAnchors();
 391
 392         CSplitterControl::ChangeHeight(GetDlgItem(IDC_COMMIT_LIST), delta, CW_TOPALIGN);
 393         //CSplitterControl::ChangeHeight(GetDlgItem(), delta, CW_TOPALIGN);
 394         CSplitterControl::ChangeHeight(GetDlgItem(IDC_REBASE_TAB), -delta, CW_BOTTOMALIGN);
 395         //CSplitterControl::ChangeHeight(GetDlgItem(), -delta, CW_BOTTOMALIGN);
 396         CSplitterControl::ChangePos(GetDlgItem(IDC_SQUASH_ALL),0,delta);
 397         CSplitterControl::ChangePos(GetDlgItem(IDC_PICK_ALL),0,delta);
 398         CSplitterControl::ChangePos(GetDlgItem(IDC_EDIT_ALL),0,delta);
 399         CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_UP2),0,delta);
 400         CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_DOWN2),0,delta);
 401         CSplitterControl::ChangePos(GetDlgItem(IDC_REBASE_CHECK_FORCE),0,delta);
 402         CSplitterControl::ChangePos(GetDlgItem(IDC_CHECK_CHERRYPICKED_FROM), 0, delta);
 403
 404         this->AddRebaseAnchor();
 405         // adjust the minimum size of the dialog to prevent the resizing from
 406         // moving the list control too far down.
 407         CRect rcLogMsg;
 408         m_CommitList.GetClientRect(rcLogMsg);
 409         SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_CommitListOrigRect.Height()+rcLogMsg.Height()));
 410
 411         SetSplitterRange();
 412 //      m_CommitList.Invalidate();
 413
 414 //      GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
 415
 416         this->m_ctrlTabCtrl.Invalidate();
 417         this->m_CommitList.Invalidate();
 418         this->m_FileListCtrl.Invalidate();
 419         this->m_LogMessageCtrl.Invalidate();
 420
 421 }
 422
 423 void CRebaseDlg::SetSplitterRange()
 424 {
 425         if ((m_CommitList)&&(m_ctrlTabCtrl))
 426         {
 427                 CRect rcTop;
 428                 m_CommitList.GetWindowRect(rcTop);
 429                 ScreenToClient(rcTop);
 430                 CRect rcMiddle;
 431                 m_ctrlTabCtrl.GetWindowRect(rcMiddle);
 432                 ScreenToClient(rcMiddle);
 433                 if (rcMiddle.Height() && rcMiddle.Width())
 434                         m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);
 435         }
 436 }
 437
 438 void CRebaseDlg::OnSize(UINT nType,int cx, int cy)
 439 {
 440         // first, let the resizing take place
 441         __super::OnSize(nType, cx, cy);
 442
 443         //set range
 444         SetSplitterRange();
 445 }
 446
 447 void CRebaseDlg::SaveSplitterPos()
 448 {
 449         if (!IsIconic())
 450         {
 451                 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
 452                 RECT rectSplitter;
 453                 m_wndSplitter.GetWindowRect(&rectSplitter);
 454                 ScreenToClient(&rectSplitter);
 455                 regPos = rectSplitter.top;
 456         }
 457 }
 458
 459 void CRebaseDlg::LoadBranchInfo()
 460 {
 461         m_BranchCtrl.SetMaxHistoryItems(0x7FFFFFFF);
 462         m_UpstreamCtrl.SetMaxHistoryItems(0x7FFFFFFF);
 463
 464         STRING_VECTOR list;
 465         list.clear();
 466         int current;
 467         g_Git.GetBranchList(list,&current,CGit::BRANCH_ALL);
 468         m_BranchCtrl.AddString(list);
 469         m_BranchCtrl.SetCurSel(current);
 470         list.clear();
 471         g_Git.GetBranchList(list, NULL, CGit::BRANCH_ALL_F);
 472         m_UpstreamCtrl.AddString(list);
 473
 474         AddBranchToolTips(&m_BranchCtrl);
 475         AddBranchToolTips(&m_UpstreamCtrl);
 476
 477         if(!m_Upstream.IsEmpty())
 478         {
 479                 m_UpstreamCtrl.AddString(m_Upstream);
 480                 m_UpstreamCtrl.SetCurSel(m_UpstreamCtrl.GetCount()-1);
 481         }
 482         else
 483         {
 484                 //Select pull-remote from current branch
 485                 CString currentBranch = g_Git.GetSymbolicRef();
 486                 CString configName;
 487                 configName.Format(L"branch.%s.remote", currentBranch);
 488                 CString pullRemote = g_Git.GetConfigValue(configName);
 489
 490                 //Select pull-branch from current branch
 491                 configName.Format(L"branch.%s.merge", currentBranch);
 492                 CString pullBranch = CGit::StripRefName(g_Git.GetConfigValue(configName));
 493
 494                 CString defaultUpstream;
 495                 defaultUpstream.Format(L"remotes/%s/%s", pullRemote, pullBranch);
 496                 int found = m_UpstreamCtrl.FindStringExact(0, defaultUpstream);
 497                 if(found >= 0)
 498                         m_UpstreamCtrl.SetCurSel(found);
 499                 else
 500                         m_UpstreamCtrl.SetCurSel(-1);
 501         }
 502 }
 503
 504 void CRebaseDlg::OnCbnSelchangeBranch()
 505 {
 506         FetchLogList();
 507 }
 508
 509 void CRebaseDlg::OnCbnSelchangeUpstream()
 510 {
 511         FetchLogList();
 512 }
 513
 514 void CRebaseDlg::FetchLogList()
 515 {
 516         CGitHash base,hash,upstream;
 517         m_IsFastForward=FALSE;
 518
 519         if (g_Git.GetHash(hash, m_BranchCtrl.GetString()))
 520         {
 521                 m_CommitList.ShowText(g_Git.GetGitLastErr(_T("Could not get hash of \"") + m_BranchCtrl.GetString() + _T("\".")));
 522                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(false);
 523                 return;
 524         }
 525         if (g_Git.GetHash(upstream, m_UpstreamCtrl.GetString()))
 526         {
 527                 m_CommitList.ShowText(g_Git.GetGitLastErr(_T("Could not get hash of \"") + m_UpstreamCtrl.GetString() + _T("\".")));
 528                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(false);
 529                 return;
 530         }
 531
 532         if (hash == upstream)
 533         {
 534                 m_CommitList.Clear();
 535                 CString text,fmt;
 536                 fmt.LoadString(IDS_REBASE_EQUAL_FMT);
 537                 text.Format(fmt,m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString());
 538
 539                 m_CommitList.ShowText(text);
 540                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(false);
 541                 return;
 542         }
 543
 544         if (g_Git.IsFastForward(m_BranchCtrl.GetString(), m_UpstreamCtrl.GetString(), &base))
 545         {
 546                 //fast forword
 547                 this->m_IsFastForward=TRUE;
 548
 549                 m_CommitList.Clear();
 550                 CString text,fmt;
 551                 fmt.LoadString(IDS_REBASE_FASTFORWARD_FMT);
 552                 text.Format(fmt,m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString(),
 553                                                 m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString());
 554
 555                 m_CommitList.ShowText(text);
 556                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(true);
 557                 SetContinueButtonText();
 558
 559                 return ;
 560         }
 561
 562         if(!this->m_bForce)
 563         {
 564                 if (base == upstream)
 565                 {
 566                         m_CommitList.Clear();
 567                         CString text,fmt;
 568                         fmt.LoadString(IDS_REBASE_UPTODATE_FMT);
 569                         text.Format(fmt,m_BranchCtrl.GetString());
 570                         m_CommitList.ShowText(text);
 571                         this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(m_CommitList.GetItemCount());
 572                         SetContinueButtonText();
 573                         return;
 574                 }
 575         }
 576
 577         m_CommitList.Clear();
 578         CString range;
 579         range.Format(_T("%s..%s"), g_Git.FixBranchName(m_UpstreamCtrl.GetString()), g_Git.FixBranchName(m_BranchCtrl.GetString()));
 580         this->m_CommitList.FillGitLog(nullptr, &range, 0);
 581
 582         if( m_CommitList.GetItemCount() == 0 )
 583                 m_CommitList.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_NOTHINGTOREBASE)));
 584
 585 #if 0
 586         if(m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash.size() >=0 )
 587         {
 588                 if(upstream ==  m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash[0])
 589                 {
 590                         m_CommitList.Clear();
 591                         m_CommitList.ShowText(_T("Nothing Rebase"));
 592                 }
 593         }
 594 #endif
 595
 596         m_tooltips.Pop();
 597         AddBranchToolTips(&this->m_BranchCtrl);
 598         AddBranchToolTips(&this->m_UpstreamCtrl);
 599
 600         for (int i = 0; i < m_CommitList.m_logEntries.size(); ++i)
 601         {
 602                 m_CommitList.m_logEntries.GetGitRevAt(i).GetAction(&m_CommitList) = CTGitPath::LOGACTIONS_REBASE_PICK;
 603         }
 604
 605         m_CommitList.Invalidate();
 606
 607         if(m_CommitList.m_IsOldFirst)
 608                 this->m_CurrentRebaseIndex = -1;
 609         else
 610                 this->m_CurrentRebaseIndex = (int)m_CommitList.m_logEntries.size();
 611
 612         this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(m_CommitList.GetItemCount());
 613         SetContinueButtonText();
 614 }
 615
 616 void CRebaseDlg::AddBranchToolTips(CHistoryCombo *pBranch)
 617 {
 618         if(pBranch)
 619         {
 620                 CString text=pBranch->GetString();
 621                 CString tooltip;
 622
 623                 GitRev rev;
 624                 rev.GetCommit(text);
 625
 626                 tooltip.Format(_T("%s: %s\n%s: %s <%s>\n%s: %s\n%s:\n%s\n%s"),
 627                         CString(MAKEINTRESOURCE(IDS_LOG_REVISION)),
 628                         rev.m_CommitHash.ToString(),
 629                         CString(MAKEINTRESOURCE(IDS_LOG_AUTHOR)),
 630                         rev.GetAuthorName(),
 631                         rev.GetAuthorEmail(),
 632                         CString(MAKEINTRESOURCE(IDS_LOG_DATE)),
 633                         CLoglistUtils::FormatDateAndTime(rev.GetAuthorDate(), DATE_LONGDATE),
 634                         CString(MAKEINTRESOURCE(IDS_LOG_MESSAGE)),
 635                         rev.GetSubject(),
 636                         rev.GetBody());
 637
 638                 pBranch->DisableTooltip();
 639                 this->m_tooltips.AddTool(pBranch->GetComboBoxCtrl(),tooltip);
 640         }
 641 }
 642
 643 BOOL CRebaseDlg::PreTranslateMessage(MSG*pMsg)
 644 {
 645         if (pMsg->message == WM_KEYDOWN)
 646         {
 647                 switch (pMsg->wParam)
 648                 {
 649                 case ' ':
 650                         if(LogListHasFocus(pMsg->hwnd))
 651                         {
 652                                 m_CommitList.ShiftSelectedAction();
 653                                 return TRUE;
 654                         }
 655                         break;
 656                 case 'P':
 657                         if(LogListHasFocus(pMsg->hwnd))
 658                         {
 659                                 m_CommitList.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_PICK);
 660                                 return TRUE;
 661                         }
 662                         break;
 663                 case 'S':
 664                         if(LogListHasFocus(pMsg->hwnd))
 665                         {
 666                                 m_CommitList.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SKIP);
 667                                 return TRUE;
 668                         }
 669                         break;
 670                 case 'Q':
 671                         if(LogListHasFocus(pMsg->hwnd))
 672                         {
 673                                 m_CommitList.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SQUASH);
 674                                 return TRUE;
 675                         }
 676                         break;
 677                 case 'E':
 678                         if(LogListHasFocus(pMsg->hwnd))
 679                         {
 680                                 m_CommitList.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_EDIT);
 681                                 return TRUE;
 682                         }
 683                         break;
 684                 case 'A':
 685                         if(LogListHasFocus(pMsg->hwnd) && GetAsyncKeyState(VK_CONTROL) & 0x8000)
 686                         {
 687                                 // select all entries
 688                                 for (int i = 0; i < m_CommitList.GetItemCount(); ++i)
 689                                 {
 690                                         m_CommitList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
 691                                 }
 692                                 return TRUE;
 693                         }
 694                         break;
 695                 case VK_F5:
 696                         {
 697                                 Refresh();
 698                                 return TRUE;
 699                         }
 700                         break;
 701                 case VK_RETURN:
 702                         {
 703                                 if (GetAsyncKeyState(VK_CONTROL) & 0x8000)
 704                                 {
 705                                         if (GetDlgItem(IDC_REBASE_CONTINUE)->IsWindowEnabled())
 706                                                 GetDlgItem(IDC_REBASE_CONTINUE)->SetFocus();
 707                                         else if (GetDlgItem(IDC_REBASE_ABORT)->IsWindowEnabled())
 708                                                 GetDlgItem(IDC_REBASE_ABORT)->SetFocus();
 709                                         else
 710                                                 GetDlgItem(IDHELP)->SetFocus();
 711                                         return TRUE;
 712                                 }
 713                         }
 714                         break;
 715                 /* Avoid TAB control destroy but dialog exist*/
 716                 case VK_ESCAPE:
 717                 case VK_CANCEL:
 718                         {
 719                                 TCHAR buff[128];
 720                                 ::GetClassName(pMsg->hwnd,buff,128);
 721
 722
 723                                 if(_tcsnicmp(buff,_T("RichEdit20W"),128)==0 ||
 724                                    _tcsnicmp(buff,_T("Scintilla"),128)==0 ||
 725                                    _tcsnicmp(buff,_T("SysListView32"),128)==0||
 726                                    ::GetParent(pMsg->hwnd) == this->m_ctrlTabCtrl.m_hWnd)
 727                                 {
 728                                         this->PostMessage(WM_KEYDOWN,VK_ESCAPE,0);
 729                                         return TRUE;
 730                                 }
 731                         }
 732                 }
 733         }
 734         else if (pMsg->message == WM_NEXTDLGCTL)
 735         {
 736                 if (GetFocus()->GetSafeHwnd() == m_LogMessageCtrl.GetSafeHwnd())
 737                 {
 738                         if (GetDlgItem(IDC_REBASE_CONTINUE)->IsWindowEnabled())
 739                                 GetDlgItem(IDC_REBASE_CONTINUE)->SetFocus();
 740                         else if (GetDlgItem(IDC_REBASE_ABORT)->IsWindowEnabled())
 741                                 GetDlgItem(IDC_REBASE_ABORT)->SetFocus();
 742                         else
 743                                 GetDlgItem(IDHELP)->SetFocus();
 744                         return TRUE;
 745                 }
 746         }
 747         m_tooltips.RelayEvent(pMsg);
 748         return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
 749 }
 750
 751 bool CRebaseDlg::LogListHasFocus(HWND hwnd)
 752 {
 753         TCHAR buff[128];
 754         ::GetClassName(hwnd, buff, 128);
 755
 756         if(_tcsnicmp(buff, _T("SysListView32"), 128) == 0)
 757                 return true;
 758         return false;
 759 }
 760
 761 int CRebaseDlg::CheckRebaseCondition()
 762 {
 763         this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
 764
 765         if( !g_Git.CheckCleanWorkTree()  )
 766         {
 767                 if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1)
 768                 {
 769                         CString cmd,out;
 770                         cmd=_T("git.exe stash");
 771                         this->AddLogString(cmd);
 772                         if (g_Git.Run(cmd, &out, CP_UTF8))
 773                         {
 774                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
 775                                 return -1;
 776                         }
 777
 778                 }
 779                 else
 780                         return -1;
 781         }
 782         //Todo Check $REBASE_ROOT
 783         //Todo Check $DOTEST
 784
 785         if (!CAppUtils::CheckUserData())
 786                 return -1;
 787
 788         //Todo call pre_rebase_hook
 789         return 0;
 790 }
 791 int CRebaseDlg::StartRebase()
 792 {
 793         CString cmd,out;
 794         m_FileListCtrl.m_bIsRevertTheirMy = !m_IsCherryPick;
 795         if(!this->m_IsCherryPick)
 796         {
 797                 //Todo call comment_for_reflog
 798                 cmd.Format(_T("git.exe checkout %s"),this->m_BranchCtrl.GetString());
 799                 this->AddLogString(cmd);
 800                 while (true)
 801                 {
 802                         out.Empty();
 803                         if (g_Git.Run(cmd, &out, CP_UTF8))
 804                         {
 805                                 this->AddLogString(out);
 806                                 if (CMessageBox::Show(m_hWnd, out + _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
 807                                         return -1;
 808                         }
 809                         else
 810                                 break;
 811                 }
 812
 813                 this->AddLogString(out);
 814         }
 815
 816         cmd=_T("git.exe rev-parse --verify HEAD");
 817         if(g_Git.Run(cmd,&out,CP_UTF8))
 818         {
 819                 AddLogString(CString(MAKEINTRESOURCE(IDS_PROC_NOHEAD)));
 820                 return -1;
 821         }
 822         //Todo
 823         //git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
 824         //              echo "detached HEAD" > "$DOTEST"/head-name
 825
 826         cmd.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));
 827         if(g_Git.Run(cmd,&out,CP_UTF8))
 828         {
 829                 AddLogString(_T("update ORIG_HEAD Fail"));
 830                 return -1;
 831         }
 832
 833         m_OrigUpstreamHash.Empty();
 834         if (g_Git.GetHash(m_OrigUpstreamHash, m_UpstreamCtrl.GetString()))
 835         {
 836                 MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of \"") + m_UpstreamCtrl.GetString() + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
 837                 return -1;
 838         }
 839
 840         if( !this->m_IsCherryPick )
 841         {
 842                 cmd.Format(_T("git.exe checkout -f %s"), m_OrigUpstreamHash.ToString());
 843                 this->AddLogString(cmd);
 844                 while (true)
 845                 {
 846                         out.Empty();
 847                         if (g_Git.Run(cmd, &out, CP_UTF8))
 848                         {
 849                                 this->AddLogString(out);
 850                                 if (CMessageBox::Show(m_hWnd, out + _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
 851                                         return -1;
 852                         }
 853                         else
 854                                 break;
 855                 }
 856         }
 857
 858         CString log;
 859         if( !this->m_IsCherryPick )
 860         {
 861                 if (g_Git.GetHash(m_OrigBranchHash, m_BranchCtrl.GetString()))
 862                 {
 863                         MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of \"") + m_BranchCtrl.GetString() + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
 864                         return -1;
 865                 }
 866                 log.Format(_T("%s\r\n"), CString(MAKEINTRESOURCE(IDS_PROC_REBASE_STARTREBASE)));
 867         }
 868         else
 869                 log.Format(_T("%s\r\n"), CString(MAKEINTRESOURCE(IDS_PROC_REBASE_STARTCHERRYPICK)));
 870
 871         this->AddLogString(log);
 872         return 0;
 873 }
 874 int CRebaseDlg::VerifyNoConflict()
 875 {
 876         CTGitPathList list;
 877         if(g_Git.ListConflictFile(list))
 878         {
 879                 AddLogString(_T("Get conflict files fail"));
 880                 return -1;
 881         }
 882         if( list.GetCount() != 0 )
 883         {
 884                 CMessageBox::Show(NULL, IDS_PROGRS_CONFLICTSOCCURED, IDS_APPNAME, MB_OK);
 885                 return -1;
 886         }
 887         return 0;
 888
 889 }
 890 int CRebaseDlg::FinishRebase()
 891 {
 892         if(this->m_IsCherryPick) //cherry pick mode no "branch", working at upstream branch
 893         {
 894                 m_sStatusText.LoadString(IDS_DONE);
 895                 m_CtrlStatusText.SetWindowText(m_sStatusText);
 896                 m_bStatusWarning = false;
 897                 m_CtrlStatusText.Invalidate();
 898                 return 0;
 899         }
 900
 901         CGitHash head;
 902         if (g_Git.GetHash(head, _T("HEAD")))
 903         {
 904                 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
 905                 return -1;
 906         }
 907         CString out,cmd;
 908
 909         cmd.Format(_T("git.exe checkout -f %s"),this->m_BranchCtrl.GetString());
 910         AddLogString(cmd);
 911         while (true)
 912         {
 913                 out.Empty();
 914                 if (g_Git.Run(cmd, &out, CP_UTF8))
 915                 {
 916                         AddLogString(out);
 917                         if (CMessageBox::Show(m_hWnd, out + _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
 918                                 return -1;
 919                 }
 920                 else
 921                         break;
 922         }
 923         AddLogString(out);
 924
 925         cmd.Format(_T("git.exe reset --hard %s"), head.ToString());
 926         AddLogString(cmd);
 927         while (true)
 928         {
 929                 out.Empty();
 930                 if (g_Git.Run(cmd, &out, CP_UTF8))
 931                 {
 932                         AddLogString(out);
 933                         if (CMessageBox::Show(m_hWnd, out + _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
 934                                 return -1;
 935                 }
 936                 else
 937                         break;
 938         }
 939         AddLogString(out);
 940
 941         while (m_ctrlTabCtrl.GetTabsNum() > 1)
 942                 m_ctrlTabCtrl.RemoveTab(0);
 943         m_CtrlStatusText.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_REBASEFINISHED)));
 944         m_sStatusText = CString(MAKEINTRESOURCE(IDS_PROC_REBASEFINISHED));
 945         m_bStatusWarning = false;
 946         m_CtrlStatusText.Invalidate();
 947
 948         return 0;
 949 }
 950 void CRebaseDlg::OnBnClickedContinue()
 951 {
 952         if( m_RebaseStage == REBASE_DONE)
 953         {
 954                 OnOK();
 955                 return;
 956         }
 957
 958         if( this->m_IsFastForward )
 959         {
 960                 CString cmd,out;
 961                 CString oldbranch = g_Git.GetCurrentBranch();
 962                 if( oldbranch != m_BranchCtrl.GetString() )
 963                 {
 964                         cmd.Format(_T("git.exe checkout %s"),m_BranchCtrl.GetString());
 965                         AddLogString(cmd);
 966                         while (true)
 967                         {
 968                                 out.Empty();
 969                                 if (g_Git.Run(cmd, &out, CP_UTF8))
 970                                 {
 971                                         this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
 972                                         AddLogString(out);
 973                                         if (CMessageBox::Show(m_hWnd, out + _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
 974                                                 return;
 975                                 }
 976                                 else
 977                                         break;
 978                         }
 979                 }
 980                 AddLogString(out);
 981                 out.Empty();
 982                 if (g_Git.GetHash(m_OrigBranchHash, m_BranchCtrl.GetString()))
 983                 {
 984                         MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of \"") + m_BranchCtrl.GetString() + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
 985                         return;
 986                 }
 987                 if (g_Git.GetHash(m_OrigUpstreamHash, m_UpstreamCtrl.GetString()))
 988                 {
 989                         MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of \"") + m_UpstreamCtrl.GetString() + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
 990                         return;
 991                 }
 992
 993                 if(!g_Git.IsFastForward(this->m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString()))
 994                 {
 995                         this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
 996                         AddLogString(_T("No fast forward possible.\r\nMaybe repository changed"));
 997                         return;
 998                 }
 999
1000                 cmd.Format(_T("git.exe reset --hard %s"),g_Git.FixBranchName(this->m_UpstreamCtrl.GetString()));
1001                 CString log;
1002                 log.Format(IDS_PROC_REBASE_FFTO, m_UpstreamCtrl.GetString());
1003                 this->AddLogString(log);
1004
1005                 AddLogString(cmd);
1006                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
1007                 while (true)
1008                 {
1009                         out.Empty();
1010                         if (g_Git.Run(cmd, &out, CP_UTF8))
1011                         {
1012                                 AddLogString(CString(MAKEINTRESOURCE(IDS_FAIL)));
1013                                 AddLogString(out);
1014                                 if (CMessageBox::Show(m_hWnd, out + _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
1015                                         return;
1016                         }
1017                         else
1018                                 break;
1019                 }
1020                 AddLogString(out);
1021                 AddLogString(CString(MAKEINTRESOURCE(IDS_DONE)));
1022                 m_RebaseStage = REBASE_DONE;
1023                 UpdateCurrentStatus();
1024                 return;
1025
1026         }
1027         if( m_RebaseStage == CHOOSE_BRANCH|| m_RebaseStage == CHOOSE_COMMIT_PICK_MODE )
1028         {
1029                 if(CheckRebaseCondition())
1030                         return ;
1031                 m_RebaseStage = REBASE_START;
1032                 m_FileListCtrl.Clear();
1033                 m_FileListCtrl.SetHasCheckboxes(false);
1034                 m_FileListCtrl.m_CurrentVersion = L"";
1035                 m_ctrlTabCtrl.SetTabLabel(REBASE_TAB_CONFLICT, CString(MAKEINTRESOURCE(IDS_PROC_CONFLICTFILES)));
1036                 m_ctrlTabCtrl.AddTab(&m_wndOutputRebase, CString(MAKEINTRESOURCE(IDS_LOG)), 2);
1037         }
1038
1039         if( m_RebaseStage == REBASE_FINISH )
1040         {
1041                 if(FinishRebase())
1042                         return ;
1043
1044                 OnOK();
1045         }
1046
1047         if( m_RebaseStage == REBASE_SQUASH_CONFLICT)
1048         {
1049                 if(VerifyNoConflict())
1050                         return;
1051                 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1052                 if(this->CheckNextCommitIsSquash())
1053                 {//next commit is not squash;
1054                         m_RebaseStage = REBASE_SQUASH_EDIT;
1055                         this->OnRebaseUpdateUI(0,0);
1056                         this->UpdateCurrentStatus();
1057                         return ;
1058
1059                 }
1060                 m_RebaseStage=REBASE_CONTINUE;
1061                 curRev->GetAction(&m_CommitList)|=CTGitPath::LOGACTIONS_REBASE_DONE;
1062                 this->UpdateCurrentStatus();
1063
1064         }
1065
1066         if( m_RebaseStage == REBASE_CONFLICT )
1067         {
1068                 if(VerifyNoConflict())
1069                         return;
1070
1071                 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1072                 // ***************************************************
1073                 // ATTENTION: Similar code in CommitDlg.cpp!!!
1074                 // ***************************************************
1075                 CMassiveGitTask mgtReAddAfterCommit(_T("add --ignore-errors -f"));
1076                 for (int i = 0; i < m_FileListCtrl.GetItemCount(); i++)
1077                 {
1078                         CString cmd, out;
1079                         CTGitPath *entry = (CTGitPath *)m_FileListCtrl.GetItemData(i);
1080                         if (entry->m_Checked)
1081                         {
1082                                 if (entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
1083                                         cmd.Format(_T("git.exe add -f -- \"%s\""), entry->GetGitPathString());
1084                                 else if (entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
1085                                         cmd.Format(_T("git.exe update-index --force-remove -- \"%s\""), entry->GetGitPathString());
1086                                 else
1087                                         cmd.Format(_T("git.exe update-index -- \"%s\""), entry->GetGitPathString());
1088
1089                                 if (g_Git.Run(cmd, &out, CP_UTF8))
1090                                 {
1091                                         CMessageBox::Show(NULL, out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
1092                                         return;
1093                                 }
1094
1095                                 if (entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
1096                                         cmd.Format(_T("git.exe rm -- \"%s\""), entry->GetGitOldPathString());
1097
1098                                 g_Git.Run(cmd, &out, CP_UTF8);
1099                         }
1100                         else
1101                         {
1102                                 if (entry->m_Action & CTGitPath::LOGACTIONS_ADDED || entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
1103                                 {
1104                                         cmd.Format(_T("git.exe rm -f --cache -- \"%s\""), entry->GetGitPathString());
1105                                         if (g_Git.Run(cmd, &out, CP_UTF8))
1106                                         {
1107                                                 CMessageBox::Show(NULL, out, _T("TortoiseGit"), MB_OK| MB_ICONERROR);
1108                                                 return;
1109                                         }
1110                                         mgtReAddAfterCommit.AddFile(*entry);
1111
1112                                         if (entry->m_Action & CTGitPath::LOGACTIONS_REPLACED && !entry->GetGitOldPathString().IsEmpty())
1113                                         {
1114                                                 cmd.Format(_T("git.exe reset -- \"%s\""), entry->GetGitOldPathString());
1115                                                 g_Git.Run(cmd, &out, CP_UTF8);
1116                                         }
1117                                 }
1118                                 else if(!(entry->m_Action & CTGitPath::LOGACTIONS_UNVER))
1119                                 {
1120                                         cmd.Format(_T("git.exe reset -- \"%s\""), entry->GetGitPathString());
1121                                         g_Git.Run(cmd, &out, CP_UTF8);
1122                                 }
1123                         }
1124                 }
1125
1126                 CString out =_T("");
1127                 CString cmd;
1128                 cmd.Format(_T("git.exe commit -C %s"), curRev->m_CommitHash.ToString());
1129
1130                 AddLogString(cmd);
1131
1132                 if(g_Git.Run(cmd,&out,CP_UTF8))
1133                 {
1134                         AddLogString(out);
1135                         if(!g_Git.CheckCleanWorkTree())
1136                         {
1137                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1138                                 return;
1139                         }
1140                 }
1141
1142                 AddLogString(out);
1143
1144                 if (((DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit"), TRUE)) == TRUE)
1145                 {
1146                         BOOL cancel = FALSE;
1147                         mgtReAddAfterCommit.Execute(cancel);
1148                 }
1149
1150                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
1151                 if( curRev->GetAction(&m_CommitList) & CTGitPath::LOGACTIONS_REBASE_EDIT)
1152                 {
1153                         m_RebaseStage=REBASE_EDIT;
1154                         this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
1155                         this->UpdateCurrentStatus();
1156                         return;
1157                 }
1158                 else
1159                 {
1160                         m_RebaseStage=REBASE_CONTINUE;
1161                         curRev->GetAction(&m_CommitList)|=CTGitPath::LOGACTIONS_REBASE_DONE;
1162                         this->UpdateCurrentStatus();
1163                 }
1164         }
1165
1166         if( m_RebaseStage == REBASE_EDIT ||  m_RebaseStage == REBASE_SQUASH_EDIT )
1167         {
1168                 CString str;
1169                 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1170
1171                 str=this->m_LogMessageCtrl.GetText();
1172                 if(str.Trim().IsEmpty())
1173                 {
1174                         CMessageBox::Show(NULL, IDS_PROC_COMMITMESSAGE_EMPTY,IDS_APPNAME, MB_OK | MB_ICONERROR);
1175                                 return;
1176                 }
1177
1178                 CString tempfile=::GetTempFile();
1179                 CAppUtils::SaveCommitUnicodeFile(tempfile, str);
1180
1181                 CString out,cmd;
1182
1183                 if(  m_RebaseStage == REBASE_SQUASH_EDIT )
1184                         cmd.Format(_T("git.exe commit -F \"%s\""), tempfile);
1185                 else
1186                         cmd.Format(_T("git.exe commit --amend -F \"%s\""), tempfile);
1187
1188                 if(g_Git.Run(cmd,&out,CP_UTF8))
1189                 {
1190                         if(!g_Git.CheckCleanWorkTree())
1191                         {
1192                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1193                                 return;
1194                         }
1195                 }
1196
1197                 CFile::Remove(tempfile);
1198                 AddLogString(out);
1199                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
1200                 m_RebaseStage=REBASE_CONTINUE;
1201                 curRev->GetAction(&m_CommitList)|=CTGitPath::LOGACTIONS_REBASE_DONE;
1202                 this->UpdateCurrentStatus();
1203         }
1204
1205
1206         InterlockedExchange(&m_bThreadRunning, TRUE);
1207         SetControlEnable();
1208
1209         if (AfxBeginThread(RebaseThreadEntry, this)==NULL)
1210         {
1211                 InterlockedExchange(&m_bThreadRunning, FALSE);
1212                 CMessageBox::Show(NULL, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
1213                 SetControlEnable();
1214         }
1215 }
1216 int CRebaseDlg::CheckNextCommitIsSquash()
1217 {
1218         int index;
1219         if(m_CommitList.m_IsOldFirst)
1220                 index=m_CurrentRebaseIndex+1;
1221         else
1222                 index=m_CurrentRebaseIndex-1;
1223
1224         GitRev *curRev;
1225         do
1226         {
1227                 if(index<0)
1228                         return -1;
1229                 if(index>= m_CommitList.GetItemCount())
1230                         return -1;
1231
1232                 curRev=(GitRev*)m_CommitList.m_arShownList[index];
1233
1234                 if( curRev->GetAction(&m_CommitList)&CTGitPath::LOGACTIONS_REBASE_SQUASH )
1235                         return 0;
1236                 if( curRev->GetAction(&m_CommitList)&CTGitPath::LOGACTIONS_REBASE_SKIP)
1237                 {
1238                         if(m_CommitList.m_IsOldFirst)
1239                                 ++index;
1240                         else
1241                                 --index;
1242                 }
1243                 else
1244                         return -1;
1245
1246         }while(curRev->GetAction(&m_CommitList)&CTGitPath::LOGACTIONS_REBASE_SKIP);
1247
1248         return -1;
1249
1250 }
1251 int CRebaseDlg::GoNext()
1252 {
1253         if(m_CommitList.m_IsOldFirst)
1254                 ++m_CurrentRebaseIndex;
1255         else
1256                 --m_CurrentRebaseIndex;
1257         return 0;
1258
1259 }
1260 int CRebaseDlg::StateAction()
1261 {
1262         switch(this->m_RebaseStage)
1263         {
1264         case CHOOSE_BRANCH:
1265         case CHOOSE_COMMIT_PICK_MODE:
1266                 if(StartRebase())
1267                         return -1;
1268                 m_RebaseStage = REBASE_START;
1269                 GoNext();
1270                 break;
1271         }
1272
1273         return 0;
1274 }
1275 void CRebaseDlg::SetContinueButtonText()
1276 {
1277         CString Text;
1278         switch(this->m_RebaseStage)
1279         {
1280         case CHOOSE_BRANCH:
1281         case CHOOSE_COMMIT_PICK_MODE:
1282                 if(this->m_IsFastForward)
1283                         Text.LoadString(IDS_PROC_STARTREBASEFFBUTTON);
1284                 else
1285                         Text.LoadString(IDS_PROC_STARTREBASEBUTTON);
1286                 break;
1287
1288         case REBASE_START:
1289         case REBASE_ERROR:
1290         case REBASE_CONTINUE:
1291         case REBASE_SQUASH_CONFLICT:
1292                 Text.LoadString(IDS_CONTINUEBUTTON);
1293                 break;
1294
1295         case REBASE_CONFLICT:
1296                 Text.LoadString(IDS_COMMITBUTTON);
1297                 break;
1298         case REBASE_EDIT:
1299                 Text.LoadString(IDS_AMENDBUTTON);
1300                 break;
1301
1302         case REBASE_SQUASH_EDIT:
1303                 Text.LoadString(IDS_COMMITBUTTON);
1304                 break;
1305
1306         case REBASE_ABORT:
1307         case REBASE_FINISH:
1308                 Text.LoadString(IDS_FINISHBUTTON);
1309                 break;
1310
1311         case REBASE_DONE:
1312                 Text.LoadString(IDS_DONE);
1313                 break;
1314         }
1315         this->GetDlgItem(IDC_REBASE_CONTINUE)->SetWindowText(Text);
1316 }
1317
1318 void CRebaseDlg::SetControlEnable()
1319 {
1320         switch(this->m_RebaseStage)
1321         {
1322         case CHOOSE_BRANCH:
1323         case CHOOSE_COMMIT_PICK_MODE:
1324
1325                 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(TRUE);
1326                 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(TRUE);
1327                 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(TRUE);
1328                 this->GetDlgItem(IDC_BUTTON_UP2)->EnableWindow(TRUE);
1329                 this->GetDlgItem(IDC_BUTTON_DOWN2)->EnableWindow(TRUE);
1330
1331                 if(!m_IsCherryPick)
1332                 {
1333                         this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(TRUE);
1334                         this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(TRUE);
1335                         this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(TRUE);
1336                 }
1337                 //this->m_CommitList.m_IsEnableRebaseMenu=TRUE;
1338                 this->m_CommitList.m_ContextMenuMask |= m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
1339                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
1340                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
1341                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP);
1342                 break;
1343
1344         case REBASE_START:
1345         case REBASE_CONTINUE:
1346         case REBASE_ABORT:
1347         case REBASE_ERROR:
1348         case REBASE_FINISH:
1349         case REBASE_CONFLICT:
1350         case REBASE_EDIT:
1351         case REBASE_SQUASH_CONFLICT:
1352         case REBASE_DONE:
1353                 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(FALSE);
1354                 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(FALSE);
1355                 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(FALSE);
1356                 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(FALSE);
1357                 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(FALSE);
1358                 this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(FALSE);
1359                 this->GetDlgItem(IDC_BUTTON_UP2)->EnableWindow(FALSE);
1360                 this->GetDlgItem(IDC_BUTTON_DOWN2)->EnableWindow(FALSE);
1361                 //this->m_CommitList.m_IsEnableRebaseMenu=FALSE;
1362                 this->m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
1363                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
1364                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
1365                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP));
1366
1367                 if( m_RebaseStage == REBASE_DONE && (this->m_PostButtonTexts.GetCount() != 0) )
1368                 {
1369                         this->GetDlgItem(IDC_STATUS_STATIC)->ShowWindow(SW_HIDE);
1370                         this->GetDlgItem(IDC_REBASE_POST_BUTTON)->ShowWindow(SW_SHOWNORMAL);
1371                         this->m_PostButton.RemoveAll();
1372                         this->m_PostButton.AddEntries(m_PostButtonTexts);
1373                         //this->GetDlgItem(IDC_REBASE_POST_BUTTON)->SetWindowText(this->m_PostButtonText);
1374                 }
1375                 break;
1376         }
1377
1378         if(m_bThreadRunning)
1379         {
1380                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
1381
1382         }
1383         else if (m_RebaseStage != REBASE_ERROR)
1384         {
1385                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(TRUE);
1386         }
1387 }
1388
1389 void CRebaseDlg::UpdateProgress()
1390 {
1391         int index;
1392         CRect rect;
1393
1394         if(m_CommitList.m_IsOldFirst)
1395                 index = m_CurrentRebaseIndex+1;
1396         else
1397                 index = m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
1398
1399         int finishedCommits = index - 1; // introduced an variable which shows the number handled revisions for the progress bars
1400         if (m_RebaseStage == REBASE_FINISH || finishedCommits == -1)
1401                 finishedCommits = index;
1402
1403         m_ProgressBar.SetRange32(0, m_CommitList.GetItemCount());
1404         m_ProgressBar.SetPos(finishedCommits);
1405         if (m_pTaskbarList)
1406         {
1407                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
1408                 m_pTaskbarList->SetProgressValue(m_hWnd, finishedCommits, m_CommitList.GetItemCount());
1409         }
1410
1411         if(m_CurrentRebaseIndex>=0 && m_CurrentRebaseIndex< m_CommitList.GetItemCount())
1412         {
1413                 CString text;
1414                 text.Format(IDS_PROC_REBASING_PROGRESS, index, m_CommitList.GetItemCount());
1415                 m_sStatusText = text;
1416                 m_CtrlStatusText.SetWindowText(text);
1417                 m_bStatusWarning = false;
1418                 m_CtrlStatusText.Invalidate();
1419         }
1420
1421         GitRev *prevRev=NULL, *curRev=NULL;
1422
1423         if( m_CurrentRebaseIndex >= 0 && m_CurrentRebaseIndex< m_CommitList.m_arShownList.GetSize())
1424         {
1425                 curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1426         }
1427
1428         for (int i = 0; i < m_CommitList.m_arShownList.GetSize(); ++i)
1429         {
1430                 prevRev=(GitRev*)m_CommitList.m_arShownList[i];
1431                 if(prevRev->GetAction(&m_CommitList) & CTGitPath::LOGACTIONS_REBASE_CURRENT)
1432                 {
1433                         prevRev->GetAction(&m_CommitList) &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT;
1434                         m_CommitList.GetItemRect(i,&rect,LVIR_BOUNDS);
1435                         m_CommitList.InvalidateRect(rect);
1436                 }
1437         }
1438
1439         if(curRev)
1440         {
1441                 curRev->GetAction(&m_CommitList) |= CTGitPath::LOGACTIONS_REBASE_CURRENT;
1442                 m_CommitList.GetItemRect(m_CurrentRebaseIndex,&rect,LVIR_BOUNDS);
1443                 m_CommitList.InvalidateRect(rect);
1444         }
1445         m_CommitList.EnsureVisible(m_CurrentRebaseIndex,FALSE);
1446 }
1447
1448 void CRebaseDlg::UpdateCurrentStatus()
1449 {
1450         SetContinueButtonText();
1451         SetControlEnable();
1452         UpdateProgress();
1453 }
1454
1455 void CRebaseDlg::AddLogString(CString str)
1456 {
1457         this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, FALSE);
1458         CStringA sTextA = m_wndOutputRebase.StringForControl(str);//CUnicodeUtils::GetUTF8(str);
1459         this->m_wndOutputRebase.SendMessage(SCI_DOCUMENTEND);
1460         this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)sTextA);
1461         this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)"\n");
1462         this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, TRUE);
1463 }
1464
1465 int CRebaseDlg::GetCurrentCommitID()
1466 {
1467         if(m_CommitList.m_IsOldFirst)
1468         {
1469                 return this->m_CurrentRebaseIndex+1;
1470
1471         }
1472         else
1473         {
1474                 return m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
1475         }
1476 }
1477
1478 int CRebaseDlg::DoRebase()
1479 {
1480         CString cmd,out;
1481         if(m_CurrentRebaseIndex <0)
1482                 return 0;
1483         if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
1484                 return 0;
1485
1486         GitRev *pRev = (GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1487         int mode=pRev->GetAction(&m_CommitList) & CTGitPath::LOGACTIONS_REBASE_MODE_MASK;
1488         CString nocommit;
1489
1490         if( mode== CTGitPath::LOGACTIONS_REBASE_SKIP)
1491         {
1492                 pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
1493                 return 0;
1494         }
1495
1496         if (!CheckNextCommitIsSquash() || mode != CTGitPath::LOGACTIONS_REBASE_PICK)
1497         { // next commit is squash or not pick
1498                 if (!this->m_SquashMessage.IsEmpty())
1499                         this->m_SquashMessage += _T("\n\n");
1500                 this->m_SquashMessage += pRev->GetSubject();
1501                 this->m_SquashMessage += _T("\n");
1502                 this->m_SquashMessage += pRev->GetBody().TrimRight();
1503         }
1504         else
1505                 this->m_SquashMessage.Empty();
1506
1507         if (!CheckNextCommitIsSquash() || mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
1508         { // next or this commit is squash
1509                 nocommit=_T(" --no-commit ");
1510         }
1511
1512         CString log;
1513         log.Format(_T("%s %d: %s"),CTGitPath::GetActionName(mode),this->GetCurrentCommitID(),pRev->m_CommitHash.ToString());
1514         AddLogString(log);
1515         AddLogString(pRev->GetSubject());
1516         if (pRev->GetSubject().IsEmpty())
1517         {
1518                 CMessageBox::Show(m_hWnd, IDS_PROC_REBASE_EMPTYCOMMITMSG, IDS_APPNAME, MB_OK | MB_ICONEXCLAMATION);
1519                 mode = CTGitPath::LOGACTIONS_REBASE_EDIT;
1520         }
1521
1522         CString cherryPickedFrom;
1523         if (m_bAddCherryPickedFrom)
1524                 cherryPickedFrom = _T("-x ");
1525
1526         cmd.Format(_T("git.exe cherry-pick %s%s %s"), cherryPickedFrom, nocommit, pRev->m_CommitHash.ToString());
1527
1528         if(g_Git.Run(cmd,&out,CP_UTF8))
1529         {
1530                 AddLogString(out);
1531                 CTGitPathList list;
1532                 if(g_Git.ListConflictFile(list))
1533                 {
1534                         AddLogString(_T("Get conflict files fail"));
1535                         return -1;
1536                 }
1537                 if(list.GetCount() == 0 )
1538                 {
1539                         if(mode ==  CTGitPath::LOGACTIONS_REBASE_PICK)
1540                         {
1541                                 m_RebaseStage = REBASE_ERROR;
1542                                 AddLogString(_T("An unrecoverable error occoured."));
1543                                 return -1;
1544                         }
1545                         if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
1546                         {
1547                                 this->m_RebaseStage = REBASE_EDIT ;
1548                                 return -1; // Edit return -1 to stop rebase.
1549                         }
1550                         // Squash Case
1551                         if(CheckNextCommitIsSquash())
1552                         {   // no squash
1553                                 // let user edit last commmit message
1554                                 this->m_RebaseStage = REBASE_SQUASH_EDIT;
1555                                 return -1;
1556                         }
1557                 }
1558                 if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
1559                         m_RebaseStage = REBASE_SQUASH_CONFLICT;
1560                 else
1561                         m_RebaseStage = REBASE_CONFLICT;
1562                 return -1;
1563
1564         }
1565         else
1566         {
1567                 AddLogString(out);
1568                 if(mode ==  CTGitPath::LOGACTIONS_REBASE_PICK)
1569                 {
1570                         pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
1571                         return 0;
1572                 }
1573                 if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
1574                 {
1575                         this->m_RebaseStage = REBASE_EDIT ;
1576                         return -1; // Edit return -1 to stop rebase.
1577                 }
1578
1579                 // Squash Case
1580                 if(CheckNextCommitIsSquash())
1581                 {   // no squash
1582                         // let user edit last commmit message
1583                         this->m_RebaseStage = REBASE_SQUASH_EDIT;
1584                         return -1;
1585                 }
1586                 else if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
1587                         pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
1588         }
1589
1590         return 0;
1591 }
1592
1593 BOOL CRebaseDlg::IsEnd()
1594 {
1595         if(m_CommitList.m_IsOldFirst)
1596                 return m_CurrentRebaseIndex>= this->m_CommitList.GetItemCount();
1597         else
1598                 return m_CurrentRebaseIndex<0;
1599 }
1600
1601 int CRebaseDlg::RebaseThread()
1602 {
1603         CBlockCacheForPath cacheBlock(g_Git.m_CurrentDir);
1604
1605         int ret=0;
1606         while(1)
1607         {
1608                 if( m_RebaseStage == REBASE_START )
1609                 {
1610                         if( this->StartRebase() )
1611                         {
1612                                 ret = -1;
1613                                 break;
1614                         }
1615                         m_RebaseStage = REBASE_CONTINUE;
1616
1617                 }
1618                 else if( m_RebaseStage == REBASE_CONTINUE )
1619                 {
1620                         this->GoNext();
1621                         SendMessage(MSG_REBASE_UPDATE_UI);
1622                         if(IsEnd())
1623                         {
1624                                 ret = 0;
1625                                 m_RebaseStage = REBASE_FINISH;
1626
1627                         }
1628                         else
1629                         {
1630                                 ret = DoRebase();
1631
1632                                 if( ret )
1633                                 {
1634                                         break;
1635                                 }
1636                         }
1637
1638                 }
1639                 else if( m_RebaseStage == REBASE_FINISH )
1640                 {
1641                         SendMessage(MSG_REBASE_UPDATE_UI);
1642                         m_RebaseStage = REBASE_DONE;
1643                         break;
1644
1645                 }
1646                 else
1647                 {
1648                         break;
1649                 }
1650                 this->PostMessage(MSG_REBASE_UPDATE_UI);
1651         }
1652
1653         InterlockedExchange(&m_bThreadRunning, FALSE);
1654         this->PostMessage(MSG_REBASE_UPDATE_UI);
1655         return ret;
1656 }
1657
1658 void CRebaseDlg::ListConflictFile()
1659 {
1660         this->m_FileListCtrl.Clear();
1661         m_FileListCtrl.SetHasCheckboxes(true);
1662         CTGitPathList list;
1663         CTGitPath path;
1664         list.AddPath(path);
1665
1666         m_FileListCtrl.m_bIsRevertTheirMy = !m_IsCherryPick;
1667
1668         this->m_FileListCtrl.GetStatus(&list,true);
1669         this->m_FileListCtrl.Show(CTGitPath::LOGACTIONS_UNMERGED|CTGitPath::LOGACTIONS_MODIFIED|CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_DELETED,
1670                                                            CTGitPath::LOGACTIONS_UNMERGED);
1671
1672         m_FileListCtrl.Check(GITSLC_SHOWFILES);
1673         bool hasSubmoduleChange = false;
1674         for (int i = 0; i < m_FileListCtrl.GetItemCount(); i++)
1675         {
1676                 CTGitPath *entry = (CTGitPath *)m_FileListCtrl.GetItemData(i);
1677                 if (entry->IsDirectory())
1678                 {
1679                         hasSubmoduleChange = true;
1680                         break;
1681                 }
1682         }
1683
1684         if (hasSubmoduleChange)
1685         {
1686                 m_CtrlStatusText.SetWindowText(m_sStatusText + _T(", ") + CString(MAKEINTRESOURCE(IDS_CARE_SUBMODULE_CHANGES)));
1687                 m_bStatusWarning = true;
1688                 m_CtrlStatusText.Invalidate();
1689         }
1690         else
1691         {
1692                 m_CtrlStatusText.SetWindowText(m_sStatusText);
1693                 m_bStatusWarning = false;
1694                 m_CtrlStatusText.Invalidate();
1695         }
1696 }
1697
1698 LRESULT CRebaseDlg::OnRebaseUpdateUI(WPARAM,LPARAM)
1699 {
1700         if (m_RebaseStage == REBASE_FINISH)
1701         {
1702                 FinishRebase();
1703                 return 0;
1704         }
1705         UpdateCurrentStatus();
1706         if (m_RebaseStage == REBASE_DONE && m_pTaskbarList)
1707                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS); // do not show progress on taskbar any more to show we finished
1708         if(m_CurrentRebaseIndex <0)
1709                 return 0;
1710         if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
1711                 return 0;
1712         GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1713
1714         switch(m_RebaseStage)
1715         {
1716         case REBASE_CONFLICT:
1717         case REBASE_SQUASH_CONFLICT:
1718                 ListConflictFile();
1719                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_CONFLICT);
1720                 if (m_pTaskbarList)
1721                         m_pTaskbarList->SetProgressState(m_hWnd, TBPF_ERROR);
1722                 this->m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
1723                 this->m_LogMessageCtrl.SetText(curRev->GetSubject()+_T("\n")+curRev->GetBody());
1724                 break;
1725         case REBASE_EDIT:
1726                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
1727                 if (m_pTaskbarList)
1728                         m_pTaskbarList->SetProgressState(m_hWnd, TBPF_PAUSED);
1729                 this->m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
1730                 this->m_LogMessageCtrl.SetText(curRev->GetSubject()+_T("\n")+curRev->GetBody());
1731                 break;
1732         case REBASE_SQUASH_EDIT:
1733                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
1734                 this->m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
1735                 this->m_LogMessageCtrl.SetText(this->m_SquashMessage);
1736                 if (m_pTaskbarList)
1737                         m_pTaskbarList->SetProgressState(m_hWnd, TBPF_PAUSED);
1738                 break;
1739         default:
1740                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
1741         }
1742         return 0;
1743 }
1744 void CRebaseDlg::OnCancel()
1745 {
1746         OnBnClickedAbort();
1747 }
1748 void CRebaseDlg::OnBnClickedAbort()
1749 {
1750         if (m_pTaskbarList)
1751                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
1752
1753         CString cmd,out;
1754         CString pron = m_OrigUpstreamHash.ToString();
1755         if(m_OrigUpstreamHash.IsEmpty())
1756         {
1757                 __super::OnCancel();
1758         }
1759
1760         if(m_RebaseStage == CHOOSE_BRANCH || m_RebaseStage== CHOOSE_COMMIT_PICK_MODE)
1761         {
1762                 return;
1763         }
1764
1765         if(CMessageBox::Show(NULL, IDS_PROC_REBASE_ABORT, IDS_APPNAME, MB_YESNO) != IDYES)
1766                 return;
1767
1768         if(this->m_IsFastForward)
1769         {
1770                 cmd.Format(_T("git.exe reset --hard  %s"),this->m_OrigBranchHash.ToString());
1771                 while (true)
1772                 {
1773                         out.Empty();
1774                         if (g_Git.Run(cmd, &out, CP_UTF8))
1775                         {
1776                                 AddLogString(out);
1777                                 if (CMessageBox::Show(m_hWnd, _T("Retry?\nUnrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
1778                                         break;
1779                         }
1780                         else
1781                                 break;
1782                 }
1783                 __super::OnCancel();
1784                 return;
1785         }
1786         cmd.Format(_T("git.exe checkout -f %s"),g_Git.FixBranchName(this->m_UpstreamCtrl.GetString()));
1787         while (true)
1788         {
1789                 out.Empty();
1790                 if (g_Git.Run(cmd, &out, CP_UTF8))
1791                 {
1792                         AddLogString(out);
1793                         if (CMessageBox::Show(this->m_hWnd, _T("Retry?\nUnrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
1794                         {
1795                                 __super::OnCancel();
1796                                 return;
1797                         }
1798                 }
1799                 else
1800                         break;
1801         }
1802
1803         cmd.Format(_T("git.exe reset --hard  %s"),this->m_OrigUpstreamHash.ToString());
1804         while (true)
1805         {
1806                 out.Empty();
1807                 if (g_Git.Run(cmd, &out, CP_UTF8))
1808                 {
1809                         AddLogString(out);
1810                         if (CMessageBox::Show(m_hWnd, _T("Retry?\nUnrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
1811                         {
1812                                 __super::OnCancel();
1813                                 return;
1814                         }
1815                 }
1816                 else
1817                         break;
1818         }
1819
1820         if(this->m_IsCherryPick) //there are not "branch" at cherry pick mode
1821         {
1822                 __super::OnCancel();
1823                 return;
1824         }
1825
1826         cmd.Format(_T("git checkout -f %s"),this->m_BranchCtrl.GetString());
1827         if(g_Git.Run(cmd,&out,CP_UTF8))
1828         {
1829                 AddLogString(out);
1830                 ::MessageBox(this->m_hWnd, _T("Unrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_ICONERROR);
1831                 __super::OnCancel();
1832                 return;
1833         }
1834
1835         cmd.Format(_T("git.exe reset --hard  %s"),this->m_OrigBranchHash.ToString());
1836         while (true)
1837         {
1838                 out.Empty();
1839                 if (g_Git.Run(cmd, &out, CP_UTF8))
1840                 {
1841                         AddLogString(out);
1842                         if (CMessageBox::Show(m_hWnd, _T("Retry?\nUnrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
1843                                 break;
1844                 }
1845                 else
1846                         break;
1847         }
1848         __super::OnCancel();
1849 }
1850
1851 void CRebaseDlg::OnBnClickedButtonBrowse()
1852 {
1853         if(CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl, gPickRef_NoTag))
1854                 OnCbnSelchangeUpstream();
1855 }
1856
1857 void CRebaseDlg::OnBnClickedRebaseCheckForce()
1858 {
1859         this->UpdateData();
1860         this->FetchLogList();
1861         if(this->CheckRebaseCondition())
1862         {
1863                 /* Disable Start Rebase */
1864                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
1865         }
1866 }
1867
1868 void CRebaseDlg::OnBnClickedRebasePostButton()
1869 {
1870         this->m_Upstream=this->m_UpstreamCtrl.GetString();
1871         this->m_Branch=this->m_BranchCtrl.GetString();
1872
1873         this->EndDialog((int)(IDC_REBASE_POST_BUTTON+this->m_PostButton.GetCurrentEntry()));
1874 }
1875
1876 LRESULT CRebaseDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
1877 {
1878         Refresh();
1879         return 0;
1880 }
1881
1882 void CRebaseDlg::Refresh()
1883 {
1884         if (m_RebaseStage == REBASE_CONFLICT || m_RebaseStage == REBASE_SQUASH_CONFLICT)
1885         {
1886                 ListConflictFile();
1887                 return;
1888         }
1889
1890         if(this->m_IsCherryPick)
1891                 return ;
1892
1893         if(this->m_RebaseStage == CHOOSE_BRANCH )
1894         {
1895                 this->UpdateData();
1896                 this->FetchLogList();
1897                 if(this->CheckRebaseCondition())
1898                 {
1899                         /* Disable Start Rebase */
1900                         this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
1901                 }
1902         }
1903 }
1904
1905 void CRebaseDlg::OnBnClickedButtonUp2()
1906 {
1907         POSITION pos;
1908         pos = m_CommitList.GetFirstSelectedItemPosition();
1909
1910         // do nothing if the first selected item is the first item in the list
1911         if (m_CommitList.GetNextSelectedItem(pos) == 0)
1912                 return;
1913
1914         pos = m_CommitList.GetFirstSelectedItemPosition();
1915
1916         bool changed = false;
1917         while(pos)
1918         {
1919                 int index=m_CommitList.GetNextSelectedItem(pos);
1920                 if(index>=1)
1921                 {
1922                         CGitHash old = m_CommitList.m_logEntries[index-1];
1923                         m_CommitList.m_logEntries[index-1] = m_CommitList.m_logEntries[index];
1924                         m_CommitList.m_logEntries[index] = old;
1925                         m_CommitList.SetItemState(index-1, LVIS_SELECTED, LVIS_SELECTED);
1926                         m_CommitList.SetItemState(index, 0, LVIS_SELECTED);
1927                         changed = true;
1928                 }
1929         }
1930         if (changed)
1931         {
1932                 m_CommitList.RecalculateShownList(&m_CommitList.m_arShownList);
1933                 m_CommitList.Invalidate();
1934                 m_CommitList.SetFocus();
1935         }
1936 }
1937
1938 void CRebaseDlg::OnBnClickedButtonDown2()
1939 {
1940         if (m_CommitList.GetSelectedCount() == 0)
1941                 return;
1942
1943         POSITION pos;
1944         pos = m_CommitList.GetFirstSelectedItemPosition();
1945         bool changed = false;
1946         // use an array to store all selected item indexes; the user won't select too much items
1947         int* indexes = NULL;
1948         indexes = new int[m_CommitList.GetSelectedCount()];
1949         int i = 0;
1950         while(pos)
1951         {
1952                 indexes[i++] = m_CommitList.GetNextSelectedItem(pos);
1953         }
1954         // don't move any item if the last selected item is the last item in the m_CommitList
1955         // (that would change the order of the selected items)
1956         if(indexes[m_CommitList.GetSelectedCount() - 1] < m_CommitList.GetItemCount() - 1)
1957         {
1958                 // iterate over the indexes backwards in order to correctly move multiselected items
1959                 for (i = m_CommitList.GetSelectedCount() - 1; i >= 0; i--)
1960                 {
1961                         int index = indexes[i];
1962                         CGitHash old = m_CommitList.m_logEntries[index+1];
1963                         m_CommitList.m_logEntries[index+1] = m_CommitList.m_logEntries[index];
1964                         m_CommitList.m_logEntries[index] = old;
1965                         m_CommitList.SetItemState(index, 0, LVIS_SELECTED);
1966                         m_CommitList.SetItemState(index+1, LVIS_SELECTED, LVIS_SELECTED);
1967                         changed = true;
1968                 }
1969         }
1970         delete [] indexes;
1971         indexes = NULL;
1972         if (changed)
1973         {
1974                 m_CommitList.RecalculateShownList(&m_CommitList.m_arShownList);
1975                 m_CommitList.Invalidate();
1976                 m_CommitList.SetFocus();
1977         }
1978 }
1979
1980 LRESULT CRebaseDlg::OnTaskbarBtnCreated(WPARAM /*wParam*/, LPARAM /*lParam*/)
1981 {
1982         m_pTaskbarList.Release();
1983         m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
1984         return 0;
1985 }
1986
1987 void CRebaseDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
1988 {
1989         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1990         *pResult = 0;
1991         if(m_CommitList.m_bNoDispUpdates)
1992                 return;
1993         if (pNMLV->iItem >= 0)
1994         {
1995                 this->m_CommitList.m_nSearchIndex = pNMLV->iItem;
1996                 if (pNMLV->iSubItem != 0)
1997                         return;
1998                 if ((pNMLV->iItem == m_CommitList.m_arShownList.GetCount()))
1999                 {
2000                         // remove the selected state
2001                         if (pNMLV->uChanged & LVIF_STATE)
2002                         {
2003                                 m_CommitList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
2004                                 FillLogMessageCtrl();
2005                         }
2006                         return;
2007                 }
2008                 if (pNMLV->uChanged & LVIF_STATE)
2009                 {
2010                         FillLogMessageCtrl();
2011                 }
2012         }
2013         else
2014         {
2015                 FillLogMessageCtrl();
2016         }
2017 }
2018
2019 void CRebaseDlg::FillLogMessageCtrl()
2020 {
2021         int selCount = m_CommitList.GetSelectedCount();
2022         if (selCount == 1 && (m_RebaseStage == CHOOSE_BRANCH || m_RebaseStage == CHOOSE_COMMIT_PICK_MODE))
2023         {
2024                 POSITION pos = m_CommitList.GetFirstSelectedItemPosition();
2025                 int selIndex = m_CommitList.GetNextSelectedItem(pos);
2026                 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_CommitList.m_arShownList.SafeGetAt(selIndex));
2027                 m_FileListCtrl.UpdateWithGitPathList(pLogEntry->GetFiles(&m_CommitList));
2028                 m_FileListCtrl.m_CurrentVersion = pLogEntry->m_CommitHash;
2029                 m_FileListCtrl.Show(GITSLC_SHOWVERSIONED);
2030                 m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
2031                 m_LogMessageCtrl.SetText(pLogEntry->GetSubject() + _T("\n") + pLogEntry->GetBody());
2032                 m_LogMessageCtrl.Call(SCI_SETREADONLY, TRUE);
2033         }
2034 }
2035 void CRebaseDlg::OnBnClickedCheckCherryPickedFrom()
2036 {
2037         UpdateData();
2038 }