src/TortoiseProc/RebaseDlg.cpp

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