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                 CMassiveGitTask mgtAdd(_T("add -f"));
1077                 CMassiveGitTask mgtUpdateIndexForceRemove(_T("update-index --force-remove"));
1078                 CMassiveGitTask mgtUpdateIndex(_T("update-index"));
1079                 CMassiveGitTask mgtRm(_T("rm  --ignore-unmatch"));
1080                 CMassiveGitTask mgtRmFCache(_T("rm -f --cache"));
1081                 CMassiveGitTask mgtReset(_T("reset"), TRUE, true);
1082                 for (int i = 0; i < m_FileListCtrl.GetItemCount(); i++)
1083                 {
1084                         CTGitPath *entry = (CTGitPath *)m_FileListCtrl.GetItemData(i);
1085                         if (entry->m_Checked)
1086                         {
1087                                 if (entry->m_Action & CTGitPath::LOGACTIONS_UNVER)
1088                                         mgtAdd.AddFile(entry->GetGitPathString());
1089                                 else if (entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
1090                                         mgtUpdateIndexForceRemove.AddFile(entry->GetGitPathString());
1091                                 else
1092                                         mgtUpdateIndex.AddFile(entry->GetGitPathString());
1093
1094                                 if (entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
1095                                         mgtRm.AddFile(entry->GetGitOldPathString());
1096                         }
1097                         else
1098                         {
1099                                 if (entry->m_Action & CTGitPath::LOGACTIONS_ADDED || entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
1100                                 {
1101                                         mgtRmFCache.AddFile(entry->GetGitPathString());
1102                                         mgtReAddAfterCommit.AddFile(*entry);
1103
1104                                         if (entry->m_Action & CTGitPath::LOGACTIONS_REPLACED && !entry->GetGitOldPathString().IsEmpty())
1105                                                 mgtReset.AddFile(entry->GetGitOldPathString());
1106                                 }
1107                                 else if(!(entry->m_Action & CTGitPath::LOGACTIONS_UNVER))
1108                                         mgtReset.AddFile(entry->GetGitPathString());
1109                         }
1110                 }
1111
1112                 BOOL cancel = FALSE;
1113                 bool successful = true;
1114                 successful = successful && mgtAdd.Execute(cancel);
1115                 successful = successful && mgtUpdateIndexForceRemove.Execute(cancel);
1116                 successful = successful && mgtUpdateIndex.Execute(cancel);
1117                 successful = successful && mgtRm.Execute(cancel);
1118                 successful = successful && mgtRmFCache.Execute(cancel);
1119                 successful = successful && mgtReset.Execute(cancel);
1120
1121                 if (!successful)
1122                 {
1123                         AddLogString(_T("An error occurred while updating the index."));
1124                         return;
1125                 }
1126
1127                 CString out =_T("");
1128                 CString cmd;
1129                 cmd.Format(_T("git.exe commit -C %s"), curRev->m_CommitHash.ToString());
1130
1131                 AddLogString(cmd);
1132
1133                 if(g_Git.Run(cmd,&out,CP_UTF8))
1134                 {
1135                         AddLogString(out);
1136                         if(!g_Git.CheckCleanWorkTree())
1137                         {
1138                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1139                                 return;
1140                         }
1141                 }
1142
1143                 AddLogString(out);
1144
1145                 if (((DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\ReaddUnselectedAddedFilesAfterCommit"), TRUE)) == TRUE)
1146                 {
1147                         BOOL cancel = FALSE;
1148                         mgtReAddAfterCommit.Execute(cancel);
1149                 }
1150
1151                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
1152                 if( curRev->GetAction(&m_CommitList) & CTGitPath::LOGACTIONS_REBASE_EDIT)
1153                 {
1154                         m_RebaseStage=REBASE_EDIT;
1155                         this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
1156                         this->UpdateCurrentStatus();
1157                         return;
1158                 }
1159                 else
1160                 {
1161                         m_RebaseStage=REBASE_CONTINUE;
1162                         curRev->GetAction(&m_CommitList)|=CTGitPath::LOGACTIONS_REBASE_DONE;
1163                         this->UpdateCurrentStatus();
1164                 }
1165         }
1166
1167         if( m_RebaseStage == REBASE_EDIT ||  m_RebaseStage == REBASE_SQUASH_EDIT )
1168         {
1169                 CString str;
1170                 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1171
1172                 str=this->m_LogMessageCtrl.GetText();
1173                 if(str.Trim().IsEmpty())
1174                 {
1175                         CMessageBox::Show(NULL, IDS_PROC_COMMITMESSAGE_EMPTY,IDS_APPNAME, MB_OK | MB_ICONERROR);
1176                                 return;
1177                 }
1178
1179                 CString tempfile=::GetTempFile();
1180                 CAppUtils::SaveCommitUnicodeFile(tempfile, str);
1181
1182                 CString out,cmd;
1183
1184                 if(  m_RebaseStage == REBASE_SQUASH_EDIT )
1185                         cmd.Format(_T("git.exe commit -F \"%s\""), tempfile);
1186                 else
1187                         cmd.Format(_T("git.exe commit --amend -F \"%s\""), tempfile);
1188
1189                 if(g_Git.Run(cmd,&out,CP_UTF8))
1190                 {
1191                         if(!g_Git.CheckCleanWorkTree())
1192                         {
1193                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1194                                 return;
1195                         }
1196                 }
1197
1198                 CFile::Remove(tempfile);
1199                 AddLogString(out);
1200                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
1201                 m_RebaseStage=REBASE_CONTINUE;
1202                 curRev->GetAction(&m_CommitList)|=CTGitPath::LOGACTIONS_REBASE_DONE;
1203                 this->UpdateCurrentStatus();
1204         }
1205
1206
1207         InterlockedExchange(&m_bThreadRunning, TRUE);
1208         SetControlEnable();
1209
1210         if (AfxBeginThread(RebaseThreadEntry, this)==NULL)
1211         {
1212                 InterlockedExchange(&m_bThreadRunning, FALSE);
1213                 CMessageBox::Show(NULL, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
1214                 SetControlEnable();
1215         }
1216 }
1217 int CRebaseDlg::CheckNextCommitIsSquash()
1218 {
1219         int index;
1220         if(m_CommitList.m_IsOldFirst)
1221                 index=m_CurrentRebaseIndex+1;
1222         else
1223                 index=m_CurrentRebaseIndex-1;
1224
1225         GitRev *curRev;
1226         do
1227         {
1228                 if(index<0)
1229                         return -1;
1230                 if(index>= m_CommitList.GetItemCount())
1231                         return -1;
1232
1233                 curRev=(GitRev*)m_CommitList.m_arShownList[index];
1234
1235                 if( curRev->GetAction(&m_CommitList)&CTGitPath::LOGACTIONS_REBASE_SQUASH )
1236                         return 0;
1237                 if( curRev->GetAction(&m_CommitList)&CTGitPath::LOGACTIONS_REBASE_SKIP)
1238                 {
1239                         if(m_CommitList.m_IsOldFirst)
1240                                 ++index;
1241                         else
1242                                 --index;
1243                 }
1244                 else
1245                         return -1;
1246
1247         }while(curRev->GetAction(&m_CommitList)&CTGitPath::LOGACTIONS_REBASE_SKIP);
1248
1249         return -1;
1250
1251 }
1252 int CRebaseDlg::GoNext()
1253 {
1254         if(m_CommitList.m_IsOldFirst)
1255                 ++m_CurrentRebaseIndex;
1256         else
1257                 --m_CurrentRebaseIndex;
1258         return 0;
1259
1260 }
1261 int CRebaseDlg::StateAction()
1262 {
1263         switch(this->m_RebaseStage)
1264         {
1265         case CHOOSE_BRANCH:
1266         case CHOOSE_COMMIT_PICK_MODE:
1267                 if(StartRebase())
1268                         return -1;
1269                 m_RebaseStage = REBASE_START;
1270                 GoNext();
1271                 break;
1272         }
1273
1274         return 0;
1275 }
1276 void CRebaseDlg::SetContinueButtonText()
1277 {
1278         CString Text;
1279         switch(this->m_RebaseStage)
1280         {
1281         case CHOOSE_BRANCH:
1282         case CHOOSE_COMMIT_PICK_MODE:
1283                 if(this->m_IsFastForward)
1284                         Text.LoadString(IDS_PROC_STARTREBASEFFBUTTON);
1285                 else
1286                         Text.LoadString(IDS_PROC_STARTREBASEBUTTON);
1287                 break;
1288
1289         case REBASE_START:
1290         case REBASE_ERROR:
1291         case REBASE_CONTINUE:
1292         case REBASE_SQUASH_CONFLICT:
1293                 Text.LoadString(IDS_CONTINUEBUTTON);
1294                 break;
1295
1296         case REBASE_CONFLICT:
1297                 Text.LoadString(IDS_COMMITBUTTON);
1298                 break;
1299         case REBASE_EDIT:
1300                 Text.LoadString(IDS_AMENDBUTTON);
1301                 break;
1302
1303         case REBASE_SQUASH_EDIT:
1304                 Text.LoadString(IDS_COMMITBUTTON);
1305                 break;
1306
1307         case REBASE_ABORT:
1308         case REBASE_FINISH:
1309                 Text.LoadString(IDS_FINISHBUTTON);
1310                 break;
1311
1312         case REBASE_DONE:
1313                 Text.LoadString(IDS_DONE);
1314                 break;
1315         }
1316         this->GetDlgItem(IDC_REBASE_CONTINUE)->SetWindowText(Text);
1317 }
1318
1319 void CRebaseDlg::SetControlEnable()
1320 {
1321         switch(this->m_RebaseStage)
1322         {
1323         case CHOOSE_BRANCH:
1324         case CHOOSE_COMMIT_PICK_MODE:
1325
1326                 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(TRUE);
1327                 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(TRUE);
1328                 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(TRUE);
1329                 this->GetDlgItem(IDC_BUTTON_UP2)->EnableWindow(TRUE);
1330                 this->GetDlgItem(IDC_BUTTON_DOWN2)->EnableWindow(TRUE);
1331
1332                 if(!m_IsCherryPick)
1333                 {
1334                         this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(TRUE);
1335                         this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(TRUE);
1336                         this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(TRUE);
1337                 }
1338                 //this->m_CommitList.m_IsEnableRebaseMenu=TRUE;
1339                 this->m_CommitList.m_ContextMenuMask |= m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
1340                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
1341                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
1342                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP);
1343                 break;
1344
1345         case REBASE_START:
1346         case REBASE_CONTINUE:
1347         case REBASE_ABORT:
1348         case REBASE_ERROR:
1349         case REBASE_FINISH:
1350         case REBASE_CONFLICT:
1351         case REBASE_EDIT:
1352         case REBASE_SQUASH_CONFLICT:
1353         case REBASE_DONE:
1354                 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(FALSE);
1355                 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(FALSE);
1356                 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(FALSE);
1357                 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(FALSE);
1358                 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(FALSE);
1359                 this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(FALSE);
1360                 this->GetDlgItem(IDC_BUTTON_UP2)->EnableWindow(FALSE);
1361                 this->GetDlgItem(IDC_BUTTON_DOWN2)->EnableWindow(FALSE);
1362                 //this->m_CommitList.m_IsEnableRebaseMenu=FALSE;
1363                 this->m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
1364                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
1365                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
1366                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP));
1367
1368                 if( m_RebaseStage == REBASE_DONE && (this->m_PostButtonTexts.GetCount() != 0) )
1369                 {
1370                         this->GetDlgItem(IDC_STATUS_STATIC)->ShowWindow(SW_HIDE);
1371                         this->GetDlgItem(IDC_REBASE_POST_BUTTON)->ShowWindow(SW_SHOWNORMAL);
1372                         this->m_PostButton.RemoveAll();
1373                         this->m_PostButton.AddEntries(m_PostButtonTexts);
1374                         //this->GetDlgItem(IDC_REBASE_POST_BUTTON)->SetWindowText(this->m_PostButtonText);
1375                 }
1376                 break;
1377         }
1378
1379         if(m_bThreadRunning)
1380         {
1381                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
1382
1383         }
1384         else if (m_RebaseStage != REBASE_ERROR)
1385         {
1386                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(TRUE);
1387         }
1388 }
1389
1390 void CRebaseDlg::UpdateProgress()
1391 {
1392         int index;
1393         CRect rect;
1394
1395         if(m_CommitList.m_IsOldFirst)
1396                 index = m_CurrentRebaseIndex+1;
1397         else
1398                 index = m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
1399
1400         int finishedCommits = index - 1; // introduced an variable which shows the number handled revisions for the progress bars
1401         if (m_RebaseStage == REBASE_FINISH || finishedCommits == -1)
1402                 finishedCommits = index;
1403
1404         m_ProgressBar.SetRange32(0, m_CommitList.GetItemCount());
1405         m_ProgressBar.SetPos(finishedCommits);
1406         if (m_pTaskbarList)
1407         {
1408                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
1409                 m_pTaskbarList->SetProgressValue(m_hWnd, finishedCommits, m_CommitList.GetItemCount());
1410         }
1411
1412         if(m_CurrentRebaseIndex>=0 && m_CurrentRebaseIndex< m_CommitList.GetItemCount())
1413         {
1414                 CString text;
1415                 text.Format(IDS_PROC_REBASING_PROGRESS, index, m_CommitList.GetItemCount());
1416                 m_sStatusText = text;
1417                 m_CtrlStatusText.SetWindowText(text);
1418                 m_bStatusWarning = false;
1419                 m_CtrlStatusText.Invalidate();
1420         }
1421
1422         GitRev *prevRev=NULL, *curRev=NULL;
1423
1424         if( m_CurrentRebaseIndex >= 0 && m_CurrentRebaseIndex< m_CommitList.m_arShownList.GetSize())
1425         {
1426                 curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1427         }
1428
1429         for (int i = 0; i < m_CommitList.m_arShownList.GetSize(); ++i)
1430         {
1431                 prevRev=(GitRev*)m_CommitList.m_arShownList[i];
1432                 if(prevRev->GetAction(&m_CommitList) & CTGitPath::LOGACTIONS_REBASE_CURRENT)
1433                 {
1434                         prevRev->GetAction(&m_CommitList) &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT;
1435                         m_CommitList.GetItemRect(i,&rect,LVIR_BOUNDS);
1436                         m_CommitList.InvalidateRect(rect);
1437                 }
1438         }
1439
1440         if(curRev)
1441         {
1442                 curRev->GetAction(&m_CommitList) |= CTGitPath::LOGACTIONS_REBASE_CURRENT;
1443                 m_CommitList.GetItemRect(m_CurrentRebaseIndex,&rect,LVIR_BOUNDS);
1444                 m_CommitList.InvalidateRect(rect);
1445         }
1446         m_CommitList.EnsureVisible(m_CurrentRebaseIndex,FALSE);
1447 }
1448
1449 void CRebaseDlg::UpdateCurrentStatus()
1450 {
1451         SetContinueButtonText();
1452         SetControlEnable();
1453         UpdateProgress();
1454 }
1455
1456 void CRebaseDlg::AddLogString(CString str)
1457 {
1458         this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, FALSE);
1459         CStringA sTextA = m_wndOutputRebase.StringForControl(str);//CUnicodeUtils::GetUTF8(str);
1460         this->m_wndOutputRebase.SendMessage(SCI_DOCUMENTEND);
1461         this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)sTextA);
1462         this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)"\n");
1463         this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, TRUE);
1464 }
1465
1466 int CRebaseDlg::GetCurrentCommitID()
1467 {
1468         if(m_CommitList.m_IsOldFirst)
1469         {
1470                 return this->m_CurrentRebaseIndex+1;
1471
1472         }
1473         else
1474         {
1475                 return m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
1476         }
1477 }
1478
1479 int CRebaseDlg::DoRebase()
1480 {
1481         CString cmd,out;
1482         if(m_CurrentRebaseIndex <0)
1483                 return 0;
1484         if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
1485                 return 0;
1486
1487         GitRev *pRev = (GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1488         int mode=pRev->GetAction(&m_CommitList) & CTGitPath::LOGACTIONS_REBASE_MODE_MASK;
1489         CString nocommit;
1490
1491         if( mode== CTGitPath::LOGACTIONS_REBASE_SKIP)
1492         {
1493                 pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
1494                 return 0;
1495         }
1496
1497         if (!CheckNextCommitIsSquash() || mode != CTGitPath::LOGACTIONS_REBASE_PICK)
1498         { // next commit is squash or not pick
1499                 if (!this->m_SquashMessage.IsEmpty())
1500                         this->m_SquashMessage += _T("\n\n");
1501                 this->m_SquashMessage += pRev->GetSubject();
1502                 this->m_SquashMessage += _T("\n");
1503                 this->m_SquashMessage += pRev->GetBody().TrimRight();
1504         }
1505         else
1506                 this->m_SquashMessage.Empty();
1507
1508         if (!CheckNextCommitIsSquash() || mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
1509         { // next or this commit is squash
1510                 nocommit=_T(" --no-commit ");
1511         }
1512
1513         CString log;
1514         log.Format(_T("%s %d: %s"),CTGitPath::GetActionName(mode),this->GetCurrentCommitID(),pRev->m_CommitHash.ToString());
1515         AddLogString(log);
1516         AddLogString(pRev->GetSubject());
1517         if (pRev->GetSubject().IsEmpty())
1518         {
1519                 CMessageBox::Show(m_hWnd, IDS_PROC_REBASE_EMPTYCOMMITMSG, IDS_APPNAME, MB_OK | MB_ICONEXCLAMATION);
1520                 mode = CTGitPath::LOGACTIONS_REBASE_EDIT;
1521         }
1522
1523         CString cherryPickedFrom;
1524         if (m_bAddCherryPickedFrom)
1525                 cherryPickedFrom = _T("-x ");
1526
1527         cmd.Format(_T("git.exe cherry-pick %s%s %s"), cherryPickedFrom, nocommit, pRev->m_CommitHash.ToString());
1528
1529         if(g_Git.Run(cmd,&out,CP_UTF8))
1530         {
1531                 AddLogString(out);
1532                 CTGitPathList list;
1533                 if(g_Git.ListConflictFile(list))
1534                 {
1535                         AddLogString(_T("Get conflict files fail"));
1536                         return -1;
1537                 }
1538                 if(list.GetCount() == 0 )
1539                 {
1540                         if(mode ==  CTGitPath::LOGACTIONS_REBASE_PICK)
1541                         {
1542                                 m_RebaseStage = REBASE_ERROR;
1543                                 AddLogString(_T("An unrecoverable error occurred."));
1544                                 return -1;
1545                         }
1546                         if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
1547                         {
1548                                 this->m_RebaseStage = REBASE_EDIT ;
1549                                 return -1; // Edit return -1 to stop rebase.
1550                         }
1551                         // Squash Case
1552                         if(CheckNextCommitIsSquash())
1553                         {   // no squash
1554                                 // let user edit last commmit message
1555                                 this->m_RebaseStage = REBASE_SQUASH_EDIT;
1556                                 return -1;
1557                         }
1558                 }
1559                 if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
1560                         m_RebaseStage = REBASE_SQUASH_CONFLICT;
1561                 else
1562                         m_RebaseStage = REBASE_CONFLICT;
1563                 return -1;
1564
1565         }
1566         else
1567         {
1568                 AddLogString(out);
1569                 if(mode ==  CTGitPath::LOGACTIONS_REBASE_PICK)
1570                 {
1571                         pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
1572                         return 0;
1573                 }
1574                 if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
1575                 {
1576                         this->m_RebaseStage = REBASE_EDIT ;
1577                         return -1; // Edit return -1 to stop rebase.
1578                 }
1579
1580                 // Squash Case
1581                 if(CheckNextCommitIsSquash())
1582                 {   // no squash
1583                         // let user edit last commmit message
1584                         this->m_RebaseStage = REBASE_SQUASH_EDIT;
1585                         return -1;
1586                 }
1587                 else if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
1588                         pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
1589         }
1590
1591         return 0;
1592 }
1593
1594 BOOL CRebaseDlg::IsEnd()
1595 {
1596         if(m_CommitList.m_IsOldFirst)
1597                 return m_CurrentRebaseIndex>= this->m_CommitList.GetItemCount();
1598         else
1599                 return m_CurrentRebaseIndex<0;
1600 }
1601
1602 int CRebaseDlg::RebaseThread()
1603 {
1604         CBlockCacheForPath cacheBlock(g_Git.m_CurrentDir);
1605
1606         int ret=0;
1607         while(1)
1608         {
1609                 if( m_RebaseStage == REBASE_START )
1610                 {
1611                         if( this->StartRebase() )
1612                         {
1613                                 ret = -1;
1614                                 break;
1615                         }
1616                         m_RebaseStage = REBASE_CONTINUE;
1617
1618                 }
1619                 else if( m_RebaseStage == REBASE_CONTINUE )
1620                 {
1621                         this->GoNext();
1622                         SendMessage(MSG_REBASE_UPDATE_UI);
1623                         if(IsEnd())
1624                         {
1625                                 ret = 0;
1626                                 m_RebaseStage = REBASE_FINISH;
1627
1628                         }
1629                         else
1630                         {
1631                                 ret = DoRebase();
1632
1633                                 if( ret )
1634                                 {
1635                                         break;
1636                                 }
1637                         }
1638
1639                 }
1640                 else if( m_RebaseStage == REBASE_FINISH )
1641                 {
1642                         SendMessage(MSG_REBASE_UPDATE_UI);
1643                         m_RebaseStage = REBASE_DONE;
1644                         break;
1645
1646                 }
1647                 else
1648                 {
1649                         break;
1650                 }
1651                 this->PostMessage(MSG_REBASE_UPDATE_UI);
1652         }
1653
1654         InterlockedExchange(&m_bThreadRunning, FALSE);
1655         this->PostMessage(MSG_REBASE_UPDATE_UI);
1656         return ret;
1657 }
1658
1659 void CRebaseDlg::ListConflictFile()
1660 {
1661         this->m_FileListCtrl.Clear();
1662         m_FileListCtrl.SetHasCheckboxes(true);
1663         CTGitPathList list;
1664         CTGitPath path;
1665         list.AddPath(path);
1666
1667         m_FileListCtrl.m_bIsRevertTheirMy = !m_IsCherryPick;
1668
1669         this->m_FileListCtrl.GetStatus(&list,true);
1670         this->m_FileListCtrl.Show(CTGitPath::LOGACTIONS_UNMERGED|CTGitPath::LOGACTIONS_MODIFIED|CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_DELETED,
1671                                                            CTGitPath::LOGACTIONS_UNMERGED);
1672
1673         m_FileListCtrl.Check(GITSLC_SHOWFILES);
1674         bool hasSubmoduleChange = false;
1675         for (int i = 0; i < m_FileListCtrl.GetItemCount(); i++)
1676         {
1677                 CTGitPath *entry = (CTGitPath *)m_FileListCtrl.GetItemData(i);
1678                 if (entry->IsDirectory())
1679                 {
1680                         hasSubmoduleChange = true;
1681                         break;
1682                 }
1683         }
1684
1685         if (hasSubmoduleChange)
1686         {
1687                 m_CtrlStatusText.SetWindowText(m_sStatusText + _T(", ") + CString(MAKEINTRESOURCE(IDS_CARE_SUBMODULE_CHANGES)));
1688                 m_bStatusWarning = true;
1689                 m_CtrlStatusText.Invalidate();
1690         }
1691         else
1692         {
1693                 m_CtrlStatusText.SetWindowText(m_sStatusText);
1694                 m_bStatusWarning = false;
1695                 m_CtrlStatusText.Invalidate();
1696         }
1697 }
1698
1699 LRESULT CRebaseDlg::OnRebaseUpdateUI(WPARAM,LPARAM)
1700 {
1701         if (m_RebaseStage == REBASE_FINISH)
1702         {
1703                 FinishRebase();
1704                 return 0;
1705         }
1706         UpdateCurrentStatus();
1707         if (m_RebaseStage == REBASE_DONE && m_pTaskbarList)
1708                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS); // do not show progress on taskbar any more to show we finished
1709         if(m_CurrentRebaseIndex <0)
1710                 return 0;
1711         if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
1712                 return 0;
1713         GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1714
1715         switch(m_RebaseStage)
1716         {
1717         case REBASE_CONFLICT:
1718         case REBASE_SQUASH_CONFLICT:
1719                 ListConflictFile();
1720                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_CONFLICT);
1721                 if (m_pTaskbarList)
1722                         m_pTaskbarList->SetProgressState(m_hWnd, TBPF_ERROR);
1723                 this->m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
1724                 this->m_LogMessageCtrl.SetText(curRev->GetSubject()+_T("\n")+curRev->GetBody());
1725                 break;
1726         case REBASE_EDIT:
1727                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
1728                 if (m_pTaskbarList)
1729                         m_pTaskbarList->SetProgressState(m_hWnd, TBPF_PAUSED);
1730                 this->m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
1731                 this->m_LogMessageCtrl.SetText(curRev->GetSubject()+_T("\n")+curRev->GetBody());
1732                 break;
1733         case REBASE_SQUASH_EDIT:
1734                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
1735                 this->m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
1736                 this->m_LogMessageCtrl.SetText(this->m_SquashMessage);
1737                 if (m_pTaskbarList)
1738                         m_pTaskbarList->SetProgressState(m_hWnd, TBPF_PAUSED);
1739                 break;
1740         default:
1741                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
1742         }
1743         return 0;
1744 }
1745 void CRebaseDlg::OnCancel()
1746 {
1747         OnBnClickedAbort();
1748 }
1749 void CRebaseDlg::OnBnClickedAbort()
1750 {
1751         if (m_pTaskbarList)
1752                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
1753
1754         CString cmd,out;
1755         CString pron = m_OrigUpstreamHash.ToString();
1756         if(m_OrigUpstreamHash.IsEmpty())
1757         {
1758                 __super::OnCancel();
1759         }
1760
1761         if(m_RebaseStage == CHOOSE_BRANCH || m_RebaseStage== CHOOSE_COMMIT_PICK_MODE)
1762         {
1763                 return;
1764         }
1765
1766         if(CMessageBox::Show(NULL, IDS_PROC_REBASE_ABORT, IDS_APPNAME, MB_YESNO) != IDYES)
1767                 return;
1768
1769         if(this->m_IsFastForward)
1770         {
1771                 cmd.Format(_T("git.exe reset --hard  %s"),this->m_OrigBranchHash.ToString());
1772                 while (true)
1773                 {
1774                         out.Empty();
1775                         if (g_Git.Run(cmd, &out, CP_UTF8))
1776                         {
1777                                 AddLogString(out);
1778                                 if (CMessageBox::Show(m_hWnd, _T("Retry?\nUnrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
1779                                         break;
1780                         }
1781                         else
1782                                 break;
1783                 }
1784                 __super::OnCancel();
1785                 return;
1786         }
1787         cmd.Format(_T("git.exe checkout -f %s"),g_Git.FixBranchName(this->m_UpstreamCtrl.GetString()));
1788         while (true)
1789         {
1790                 out.Empty();
1791                 if (g_Git.Run(cmd, &out, CP_UTF8))
1792                 {
1793                         AddLogString(out);
1794                         if (CMessageBox::Show(this->m_hWnd, _T("Retry?\nUnrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
1795                         {
1796                                 __super::OnCancel();
1797                                 return;
1798                         }
1799                 }
1800                 else
1801                         break;
1802         }
1803
1804         cmd.Format(_T("git.exe reset --hard  %s"),this->m_OrigUpstreamHash.ToString());
1805         while (true)
1806         {
1807                 out.Empty();
1808                 if (g_Git.Run(cmd, &out, CP_UTF8))
1809                 {
1810                         AddLogString(out);
1811                         if (CMessageBox::Show(m_hWnd, _T("Retry?\nUnrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
1812                         {
1813                                 __super::OnCancel();
1814                                 return;
1815                         }
1816                 }
1817                 else
1818                         break;
1819         }
1820
1821         if(this->m_IsCherryPick) //there are not "branch" at cherry pick mode
1822         {
1823                 __super::OnCancel();
1824                 return;
1825         }
1826
1827         cmd.Format(_T("git checkout -f %s"),this->m_BranchCtrl.GetString());
1828         if(g_Git.Run(cmd,&out,CP_UTF8))
1829         {
1830                 AddLogString(out);
1831                 ::MessageBox(this->m_hWnd, _T("Unrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_ICONERROR);
1832                 __super::OnCancel();
1833                 return;
1834         }
1835
1836         cmd.Format(_T("git.exe reset --hard  %s"),this->m_OrigBranchHash.ToString());
1837         while (true)
1838         {
1839                 out.Empty();
1840                 if (g_Git.Run(cmd, &out, CP_UTF8))
1841                 {
1842                         AddLogString(out);
1843                         if (CMessageBox::Show(m_hWnd, _T("Retry?\nUnrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_YESNO | MB_ICONERROR) != IDYES)
1844                                 break;
1845                 }
1846                 else
1847                         break;
1848         }
1849         __super::OnCancel();
1850 }
1851
1852 void CRebaseDlg::OnBnClickedButtonBrowse()
1853 {
1854         if(CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl, gPickRef_NoTag))
1855                 OnCbnSelchangeUpstream();
1856 }
1857
1858 void CRebaseDlg::OnBnClickedRebaseCheckForce()
1859 {
1860         this->UpdateData();
1861         this->FetchLogList();
1862         if(this->CheckRebaseCondition())
1863         {
1864                 /* Disable Start Rebase */
1865                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
1866         }
1867 }
1868
1869 void CRebaseDlg::OnBnClickedRebasePostButton()
1870 {
1871         this->m_Upstream=this->m_UpstreamCtrl.GetString();
1872         this->m_Branch=this->m_BranchCtrl.GetString();
1873
1874         this->EndDialog((int)(IDC_REBASE_POST_BUTTON+this->m_PostButton.GetCurrentEntry()));
1875 }
1876
1877 LRESULT CRebaseDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)
1878 {
1879         Refresh();
1880         return 0;
1881 }
1882
1883 void CRebaseDlg::Refresh()
1884 {
1885         if (m_RebaseStage == REBASE_CONFLICT || m_RebaseStage == REBASE_SQUASH_CONFLICT)
1886         {
1887                 ListConflictFile();
1888                 return;
1889         }
1890
1891         if(this->m_IsCherryPick)
1892                 return ;
1893
1894         if(this->m_RebaseStage == CHOOSE_BRANCH )
1895         {
1896                 this->UpdateData();
1897                 this->FetchLogList();
1898                 if(this->CheckRebaseCondition())
1899                 {
1900                         /* Disable Start Rebase */
1901                         this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
1902                 }
1903         }
1904 }
1905
1906 void CRebaseDlg::OnBnClickedButtonUp2()
1907 {
1908         POSITION pos;
1909         pos = m_CommitList.GetFirstSelectedItemPosition();
1910
1911         // do nothing if the first selected item is the first item in the list
1912         if (m_CommitList.GetNextSelectedItem(pos) == 0)
1913                 return;
1914
1915         pos = m_CommitList.GetFirstSelectedItemPosition();
1916
1917         bool changed = false;
1918         while(pos)
1919         {
1920                 int index=m_CommitList.GetNextSelectedItem(pos);
1921                 if(index>=1)
1922                 {
1923                         CGitHash old = m_CommitList.m_logEntries[index-1];
1924                         m_CommitList.m_logEntries[index-1] = m_CommitList.m_logEntries[index];
1925                         m_CommitList.m_logEntries[index] = old;
1926                         m_CommitList.SetItemState(index-1, LVIS_SELECTED, LVIS_SELECTED);
1927                         m_CommitList.SetItemState(index, 0, LVIS_SELECTED);
1928                         changed = true;
1929                 }
1930         }
1931         if (changed)
1932         {
1933                 pos = m_CommitList.GetFirstSelectedItemPosition();
1934                 m_CommitList.EnsureVisible(m_CommitList.GetNextSelectedItem(pos), false);
1935                 m_CommitList.RecalculateShownList(&m_CommitList.m_arShownList);
1936                 m_CommitList.Invalidate();
1937                 m_CommitList.SetFocus();
1938         }
1939 }
1940
1941 void CRebaseDlg::OnBnClickedButtonDown2()
1942 {
1943         if (m_CommitList.GetSelectedCount() == 0)
1944                 return;
1945
1946         POSITION pos;
1947         pos = m_CommitList.GetFirstSelectedItemPosition();
1948         bool changed = false;
1949         // use an array to store all selected item indexes; the user won't select too much items
1950         int* indexes = NULL;
1951         indexes = new int[m_CommitList.GetSelectedCount()];
1952         int i = 0;
1953         while(pos)
1954         {
1955                 indexes[i++] = m_CommitList.GetNextSelectedItem(pos);
1956         }
1957         // don't move any item if the last selected item is the last item in the m_CommitList
1958         // (that would change the order of the selected items)
1959         if(indexes[m_CommitList.GetSelectedCount() - 1] < m_CommitList.GetItemCount() - 1)
1960         {
1961                 // iterate over the indexes backwards in order to correctly move multiselected items
1962                 for (i = m_CommitList.GetSelectedCount() - 1; i >= 0; i--)
1963                 {
1964                         int index = indexes[i];
1965                         CGitHash old = m_CommitList.m_logEntries[index+1];
1966                         m_CommitList.m_logEntries[index+1] = m_CommitList.m_logEntries[index];
1967                         m_CommitList.m_logEntries[index] = old;
1968                         m_CommitList.SetItemState(index, 0, LVIS_SELECTED);
1969                         m_CommitList.SetItemState(index+1, LVIS_SELECTED, LVIS_SELECTED);
1970                         changed = true;
1971                 }
1972         }
1973         m_CommitList.EnsureVisible(indexes[m_CommitList.GetSelectedCount() - 1] + 1, false);
1974         delete [] indexes;
1975         indexes = NULL;
1976         if (changed)
1977         {
1978                 m_CommitList.RecalculateShownList(&m_CommitList.m_arShownList);
1979                 m_CommitList.Invalidate();
1980                 m_CommitList.SetFocus();
1981         }
1982 }
1983
1984 LRESULT CRebaseDlg::OnTaskbarBtnCreated(WPARAM /*wParam*/, LPARAM /*lParam*/)
1985 {
1986         m_pTaskbarList.Release();
1987         m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
1988         SetUUIDOverlayIcon(m_hWnd);
1989         return 0;
1990 }
1991
1992 void CRebaseDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
1993 {
1994         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1995         *pResult = 0;
1996         if(m_CommitList.m_bNoDispUpdates)
1997                 return;
1998         if (pNMLV->iItem >= 0)
1999         {
2000                 this->m_CommitList.m_nSearchIndex = pNMLV->iItem;
2001                 if (pNMLV->iSubItem != 0)
2002                         return;
2003                 if ((pNMLV->iItem == m_CommitList.m_arShownList.GetCount()))
2004                 {
2005                         // remove the selected state
2006                         if (pNMLV->uChanged & LVIF_STATE)
2007                         {
2008                                 m_CommitList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
2009                                 FillLogMessageCtrl();
2010                         }
2011                         return;
2012                 }
2013                 if (pNMLV->uChanged & LVIF_STATE)
2014                 {
2015                         FillLogMessageCtrl();
2016                 }
2017         }
2018         else
2019         {
2020                 FillLogMessageCtrl();
2021         }
2022 }
2023
2024 void CRebaseDlg::FillLogMessageCtrl()
2025 {
2026         int selCount = m_CommitList.GetSelectedCount();
2027         if (selCount == 1 && (m_RebaseStage == CHOOSE_BRANCH || m_RebaseStage == CHOOSE_COMMIT_PICK_MODE))
2028         {
2029                 POSITION pos = m_CommitList.GetFirstSelectedItemPosition();
2030                 int selIndex = m_CommitList.GetNextSelectedItem(pos);
2031                 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_CommitList.m_arShownList.SafeGetAt(selIndex));
2032                 m_FileListCtrl.UpdateWithGitPathList(pLogEntry->GetFiles(&m_CommitList));
2033                 m_FileListCtrl.m_CurrentVersion = pLogEntry->m_CommitHash;
2034                 m_FileListCtrl.Show(GITSLC_SHOWVERSIONED);
2035                 m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
2036                 m_LogMessageCtrl.SetText(pLogEntry->GetSubject() + _T("\n") + pLogEntry->GetBody());
2037                 m_LogMessageCtrl.Call(SCI_SETREADONLY, TRUE);
2038         }
2039 }
2040 void CRebaseDlg::OnBnClickedCheckCherryPickedFrom()
2041 {
2042         UpdateData();
2043 }