src/TortoiseProc/RebaseDlg.cpp

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