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         m_IsFastForward=FALSE;
 496
 497         hash=g_Git.GetHash(m_BranchCtrl.GetString());
 498
 499         if(hash == g_Git.GetHash(this->m_UpstreamCtrl.GetString()))
 500         {
 501                 m_CommitList.Clear();
 502                 CString text,fmt;
 503                 fmt.LoadString(IDS_REBASE_EQUAL_FMT);
 504                 text.Format(fmt,m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString());
 505
 506                 m_CommitList.ShowText(text);
 507                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(false);
 508                 return;
 509         }
 510
 511         if (g_Git.IsFastForward(m_BranchCtrl.GetString(), m_UpstreamCtrl.GetString(), &base))
 512         {
 513                 //fast forword
 514                 this->m_IsFastForward=TRUE;
 515
 516                 m_CommitList.Clear();
 517                 CString text,fmt;
 518                 fmt.LoadString(IDS_REBASE_FASTFORWARD_FMT);
 519                 text.Format(fmt,m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString(),
 520                                                 m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString());
 521
 522                 m_CommitList.ShowText(text);
 523                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(true);
 524                 SetContinueButtonText();
 525
 526                 return ;
 527         }
 528
 529         hash.Empty();
 530
 531         if(!this->m_bForce)
 532         {
 533                 hash=g_Git.GetHash(m_UpstreamCtrl.GetString());
 534
 535                 if( base == hash )
 536                 {
 537                         m_CommitList.Clear();
 538                         CString text,fmt;
 539                         fmt.LoadString(IDS_REBASE_UPTODATE_FMT);
 540                         text.Format(fmt,m_BranchCtrl.GetString());
 541                         m_CommitList.ShowText(text);
 542                         this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(m_CommitList.GetItemCount());
 543                         SetContinueButtonText();
 544                         return;
 545                 }
 546         }
 547
 548         m_CommitList.Clear();
 549         CString from,to;
 550         from = m_UpstreamCtrl.GetString();
 551         to = m_BranchCtrl.GetString();
 552         this->m_CommitList.FillGitLog(NULL,0,&from,&to);
 553
 554         if( m_CommitList.GetItemCount() == 0 )
 555                 m_CommitList.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_NOTHINGTOREBASE)));
 556
 557         hash=g_Git.GetHash(m_UpstreamCtrl.GetString());
 558
 559 #if 0
 560         if(m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash.size() >=0 )
 561         {
 562                 if(hash ==  m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash[0])
 563                 {
 564                         m_CommitList.Clear();
 565                         m_CommitList.ShowText(_T("Nothing Rebase"));
 566                 }
 567         }
 568 #endif
 569
 570         m_tooltips.Pop();
 571         AddBranchToolTips(&this->m_BranchCtrl);
 572         AddBranchToolTips(&this->m_UpstreamCtrl);
 573
 574         for(int i=0;i<m_CommitList.m_logEntries.size();i++)
 575         {
 576                 m_CommitList.m_logEntries.GetGitRevAt(i).GetAction(&m_CommitList) = CTGitPath::LOGACTIONS_REBASE_PICK;
 577         }
 578
 579         m_CommitList.Invalidate();
 580
 581         if(m_CommitList.m_IsOldFirst)
 582                 this->m_CurrentRebaseIndex = -1;
 583         else
 584                 this->m_CurrentRebaseIndex = (int)m_CommitList.m_logEntries.size();
 585
 586         this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(m_CommitList.GetItemCount());
 587         SetContinueButtonText();
 588 }
 589
 590 void CRebaseDlg::AddBranchToolTips(CHistoryCombo *pBranch)
 591 {
 592         if(pBranch)
 593         {
 594                 CString text=pBranch->GetString();
 595                 CString tooltip;
 596
 597                 GitRev rev;
 598                 rev.GetCommit(text);
 599
 600                 tooltip.Format(_T("%s: %s\n%s: %s <%s>\n%s: %s\n%s:\n%s\n%s"),
 601                         CString(MAKEINTRESOURCE(IDS_LOG_REVISION)),
 602                         rev.m_CommitHash.ToString(),
 603                         CString(MAKEINTRESOURCE(IDS_LOG_AUTHOR)),
 604                         rev.GetAuthorName(),
 605                         rev.GetAuthorEmail(),
 606                         CString(MAKEINTRESOURCE(IDS_LOG_DATE)),
 607                         CLoglistUtils::FormatDateAndTime(rev.GetAuthorDate(), DATE_LONGDATE),
 608                         CString(MAKEINTRESOURCE(IDS_LOG_MESSAGE)),
 609                         rev.GetSubject(),
 610                         rev.GetBody());
 611
 612                 pBranch->DisableTooltip();
 613                 this->m_tooltips.AddTool(pBranch->GetComboBoxCtrl(),tooltip);
 614         }
 615 }
 616
 617 BOOL CRebaseDlg::PreTranslateMessage(MSG*pMsg)
 618 {
 619         if (pMsg->message == WM_KEYDOWN)
 620         {
 621                 switch (pMsg->wParam)
 622                 {
 623                 case ' ':
 624                         if(LogListHasFocus(pMsg->hwnd))
 625                         {
 626                                 m_CommitList.ShiftSelectedAction();
 627                                 return TRUE;
 628                         }
 629                         break;
 630                 case 'P':
 631                         if(LogListHasFocus(pMsg->hwnd))
 632                         {
 633                                 m_CommitList.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_PICK);
 634                                 return TRUE;
 635                         }
 636                         break;
 637                 case 'S':
 638                         if(LogListHasFocus(pMsg->hwnd))
 639                         {
 640                                 m_CommitList.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SKIP);
 641                                 return TRUE;
 642                         }
 643                         break;
 644                 case 'Q':
 645                         if(LogListHasFocus(pMsg->hwnd))
 646                         {
 647                                 m_CommitList.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SQUASH);
 648                                 return TRUE;
 649                         }
 650                         break;
 651                 case 'E':
 652                         if(LogListHasFocus(pMsg->hwnd))
 653                         {
 654                                 m_CommitList.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_EDIT);
 655                                 return TRUE;
 656                         }
 657                         break;
 658                 case 'A':
 659                         if(LogListHasFocus(pMsg->hwnd) && GetAsyncKeyState(VK_CONTROL) & 0x8000)
 660                         {
 661                                 // select all entries
 662                                 for (int i = 0; i < m_CommitList.GetItemCount(); ++i)
 663                                 {
 664                                         m_CommitList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
 665                                 }
 666                                 return TRUE;
 667                         }
 668                         break;
 669                 case VK_F5:
 670                         {
 671                                 Refresh();
 672                                 return TRUE;
 673                         }
 674                         break;
 675                 /* Avoid TAB control destroy but dialog exist*/
 676                 case VK_ESCAPE:
 677                 case VK_CANCEL:
 678                         {
 679                                 TCHAR buff[128];
 680                                 ::GetClassName(pMsg->hwnd,buff,128);
 681
 682
 683                                 if(_tcsnicmp(buff,_T("RichEdit20W"),128)==0 ||
 684                                    _tcsnicmp(buff,_T("Scintilla"),128)==0 ||
 685                                    _tcsnicmp(buff,_T("SysListView32"),128)==0||
 686                                    ::GetParent(pMsg->hwnd) == this->m_ctrlTabCtrl.m_hWnd)
 687                                 {
 688                                         this->PostMessage(WM_KEYDOWN,VK_ESCAPE,0);
 689                                         return TRUE;
 690                                 }
 691                         }
 692                 }
 693         }
 694         m_tooltips.RelayEvent(pMsg);
 695         return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
 696 }
 697
 698 bool CRebaseDlg::LogListHasFocus(HWND hwnd)
 699 {
 700         TCHAR buff[128];
 701         ::GetClassName(hwnd, buff, 128);
 702
 703         if(_tcsnicmp(buff, _T("SysListView32"), 128) == 0)
 704                 return true;
 705         return false;
 706 }
 707
 708 int CRebaseDlg::CheckRebaseCondition()
 709 {
 710         this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
 711
 712         if( !g_Git.CheckCleanWorkTree()  )
 713         {
 714                 if(CMessageBox::Show(NULL,      IDS_ERROR_NOCLEAN_STASH,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES)
 715                 {
 716                         CString cmd,out;
 717                         cmd=_T("git.exe stash");
 718                         this->AddLogString(cmd);
 719                         if (g_Git.Run(cmd, &out, CP_UTF8))
 720                         {
 721                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
 722                                 return -1;
 723                         }
 724
 725                 }
 726                 else
 727                         return -1;
 728         }
 729         //Todo Check $REBASE_ROOT
 730         //Todo Check $DOTEST
 731
 732         CString cmd;
 733         cmd=_T("git.exe var GIT_COMMITTER_IDENT");
 734         if(g_Git.Run(cmd,NULL,CP_UTF8))
 735                 return -1;
 736
 737         //Todo call pre_rebase_hook
 738         return 0;
 739 }
 740 int CRebaseDlg::StartRebase()
 741 {
 742         CString cmd,out;
 743         m_FileListCtrl.m_bIsRevertTheirMy = !m_IsCherryPick;
 744         if(!this->m_IsCherryPick)
 745         {
 746                 //Todo call comment_for_reflog
 747                 cmd.Format(_T("git.exe checkout %s"),this->m_BranchCtrl.GetString());
 748                 this->AddLogString(cmd);
 749
 750                 if(g_Git.Run(cmd,&out,CP_UTF8))
 751                 {
 752                         this->AddLogString(out);
 753                         return -1;
 754                 }
 755
 756                 this->AddLogString(out);
 757         }
 758
 759         cmd=_T("git.exe rev-parse --verify HEAD");
 760         if(g_Git.Run(cmd,&out,CP_UTF8))
 761         {
 762                 AddLogString(CString(MAKEINTRESOURCE(IDS_PROC_NOHEAD)));
 763                 return -1;
 764         }
 765         //Todo
 766         //git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
 767         //              echo "detached HEAD" > "$DOTEST"/head-name
 768
 769         cmd.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));
 770         if(g_Git.Run(cmd,&out,CP_UTF8))
 771         {
 772                 AddLogString(_T("update ORIG_HEAD Fail"));
 773                 return -1;
 774         }
 775
 776         m_OrigUpstreamHash.Empty();
 777         m_OrigUpstreamHash= g_Git.GetHash(this->m_UpstreamCtrl.GetString());
 778         if(m_OrigUpstreamHash.IsEmpty())
 779         {
 780                 this->AddLogString(m_OrigUpstreamHash);
 781                 return -1;
 782         }
 783
 784         if( !this->m_IsCherryPick )
 785         {
 786                 cmd.Format(_T("git.exe checkout -f %s"), m_OrigUpstreamHash.ToString());
 787                 this->AddLogString(cmd);
 788
 789                 out.Empty();
 790                 if(g_Git.Run(cmd,&out,CP_UTF8))
 791                 {
 792                         this->AddLogString(out);
 793                         return -1;
 794                 }
 795         }
 796
 797         CString log;
 798         if( !this->m_IsCherryPick )
 799         {
 800                 m_OrigBranchHash = g_Git.GetHash(this->m_BranchCtrl.GetString());
 801                 if(m_OrigBranchHash.IsEmpty())
 802                 {
 803                         this->AddLogString(m_OrigBranchHash.ToString());
 804                         return -1;
 805                 }
 806                 log.Format(_T("%s\r\n"), CString(MAKEINTRESOURCE(IDS_PROC_REBASE_STARTREBASE)));
 807         }
 808         else
 809                 log.Format(_T("%s\r\n"), CString(MAKEINTRESOURCE(IDS_PROC_REBASE_STARTCHERRYPICK)));
 810
 811         this->AddLogString(log);
 812         return 0;
 813 }
 814 int CRebaseDlg::VerifyNoConflict()
 815 {
 816         CTGitPathList list;
 817         if(g_Git.ListConflictFile(list))
 818         {
 819                 AddLogString(_T("Get conflict files fail"));
 820                 return -1;
 821         }
 822         if( list.GetCount() != 0 )
 823         {
 824                 CMessageBox::Show(NULL, IDS_PROGRS_CONFLICTSOCCURED, IDS_APPNAME, MB_OK);
 825                 return -1;
 826         }
 827         return 0;
 828
 829 }
 830 int CRebaseDlg::FinishRebase()
 831 {
 832         if(this->m_IsCherryPick) //cherry pick mode no "branch", working at upstream branch
 833                 return 0;
 834
 835         git_revnum_t head = g_Git.GetHash(_T("HEAD"));
 836         CString out,cmd;
 837
 838         out.Empty();
 839         cmd.Format(_T("git.exe checkout -f %s"),this->m_BranchCtrl.GetString());
 840         AddLogString(cmd);
 841         if(g_Git.Run(cmd,&out,CP_UTF8))
 842         {
 843                 AddLogString(out);
 844                 return -1;
 845         }
 846         AddLogString(out);
 847
 848         out.Empty();
 849         cmd.Format(_T("git.exe reset --hard %s"),head);
 850         AddLogString(cmd);
 851         if(g_Git.Run(cmd,&out,CP_UTF8))
 852         {
 853                 AddLogString(out);
 854                 return -1;
 855         }
 856         AddLogString(out);
 857
 858         m_ctrlTabCtrl.RemoveTab(0);
 859         m_ctrlTabCtrl.RemoveTab(0);
 860         m_LogMessageCtrl.ShowWindow(SW_HIDE);
 861         m_CtrlStatusText.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_REBASEFINISHED)));
 862
 863         return 0;
 864 }
 865 void CRebaseDlg::OnBnClickedContinue()
 866 {
 867         if( m_RebaseStage == REBASE_DONE)
 868         {
 869                 OnOK();
 870                 return;
 871         }
 872
 873         if( this->m_IsFastForward )
 874         {
 875                 CString cmd,out;
 876                 CString oldbranch = g_Git.GetCurrentBranch();
 877                 if( oldbranch != m_BranchCtrl.GetString() )
 878                 {
 879                         cmd.Format(_T("git.exe checkout %s"),m_BranchCtrl.GetString());
 880                         AddLogString(cmd);
 881                         if (g_Git.Run(cmd, &out, CP_UTF8))
 882                         {
 883                                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
 884                                 AddLogString(out);
 885                                 return;
 886                         }
 887                 }
 888                 AddLogString(out);
 889                 out.Empty();
 890                 m_OrigBranchHash = g_Git.GetHash(m_BranchCtrl.GetString());
 891                 m_OrigUpstreamHash = g_Git.GetHash(this->m_UpstreamCtrl.GetString());
 892
 893                 if(!g_Git.IsFastForward(this->m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString()))
 894                 {
 895                         this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
 896                         AddLogString(_T("No fast forward possible.\r\nMaybe repository changed"));
 897                         return;
 898                 }
 899
 900                 cmd.Format(_T("git.exe reset --hard %s"),g_Git.FixBranchName(this->m_UpstreamCtrl.GetString()));
 901                 CString log;
 902                 log.Format(IDS_PROC_REBASE_FFTO, m_UpstreamCtrl.GetString());
 903                 this->AddLogString(log);
 904
 905                 AddLogString(cmd);
 906                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
 907                 if (g_Git.Run(cmd, &out, CP_UTF8))
 908                 {
 909                         AddLogString(CString(MAKEINTRESOURCE(IDS_FAIL)));
 910                         AddLogString(out);
 911                         return;
 912                 }
 913                 AddLogString(out);
 914                 AddLogString(CString(MAKEINTRESOURCE(IDS_DONE)));
 915                 m_RebaseStage = REBASE_DONE;
 916                 UpdateCurrentStatus();
 917                 return;
 918
 919         }
 920         if( m_RebaseStage == CHOOSE_BRANCH|| m_RebaseStage == CHOOSE_COMMIT_PICK_MODE )
 921         {
 922                 if(CheckRebaseCondition())
 923                         return ;
 924                 m_RebaseStage = REBASE_START;
 925                 m_FileListCtrl.Clear();
 926                 m_FileListCtrl.m_CurrentVersion = L"";
 927                 m_ctrlTabCtrl.SetTabLabel(REBASE_TAB_CONFLICT, CString(MAKEINTRESOURCE(IDS_PROC_CONFLICTFILES)));
 928                 m_ctrlTabCtrl.AddTab(&m_wndOutputRebase, CString(MAKEINTRESOURCE(IDS_LOG)), 2);
 929         }
 930
 931         if( m_RebaseStage == REBASE_FINISH )
 932         {
 933                 if(FinishRebase())
 934                         return ;
 935
 936                 OnOK();
 937         }
 938
 939         if( m_RebaseStage == REBASE_SQUASH_CONFLICT)
 940         {
 941                 if(VerifyNoConflict())
 942                         return;
 943                 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
 944                 if(this->CheckNextCommitIsSquash())
 945                 {//next commit is not squash;
 946                         m_RebaseStage = REBASE_SQUASH_EDIT;
 947                         this->OnRebaseUpdateUI(0,0);
 948                         this->UpdateCurrentStatus();
 949                         return ;
 950
 951                 }
 952                 m_RebaseStage=REBASE_CONTINUE;
 953                 curRev->GetAction(&m_CommitList)|=CTGitPath::LOGACTIONS_REBASE_DONE;
 954                 this->UpdateCurrentStatus();
 955
 956         }
 957
 958         if( m_RebaseStage == REBASE_CONFLICT )
 959         {
 960                 if(VerifyNoConflict())
 961                         return;
 962
 963                 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
 964
 965                 CString out =_T("");
 966                 CString cmd;
 967                 cmd.Format(_T("git.exe commit -a -C %s"), curRev->m_CommitHash.ToString());
 968
 969                 AddLogString(cmd);
 970
 971                 if(g_Git.Run(cmd,&out,CP_UTF8))
 972                 {
 973                         AddLogString(out);
 974                         if(!g_Git.CheckCleanWorkTree())
 975                         {
 976                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
 977                                 return;
 978                         }
 979                 }
 980
 981                 AddLogString(out);
 982                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
 983                 if( curRev->GetAction(&m_CommitList) & CTGitPath::LOGACTIONS_REBASE_EDIT)
 984                 {
 985                         m_RebaseStage=REBASE_EDIT;
 986                         this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
 987                         this->UpdateCurrentStatus();
 988                         return;
 989                 }
 990                 else
 991                 {
 992                         m_RebaseStage=REBASE_CONTINUE;
 993                         curRev->GetAction(&m_CommitList)|=CTGitPath::LOGACTIONS_REBASE_DONE;
 994                         this->UpdateCurrentStatus();
 995                 }
 996         }
 997
 998         if( m_RebaseStage == REBASE_EDIT ||  m_RebaseStage == REBASE_SQUASH_EDIT )
 999         {
1000                 CString str;
1001                 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1002
1003                 str=this->m_LogMessageCtrl.GetText();
1004                 if(str.Trim().IsEmpty())
1005                 {
1006                         CMessageBox::Show(NULL, IDS_PROC_COMMITMESSAGE_EMPTY,IDS_APPNAME, MB_OK | MB_ICONERROR);
1007                                 return;
1008                 }
1009
1010                 CString tempfile=::GetTempFile();
1011                 CAppUtils::SaveCommitUnicodeFile(tempfile, str);
1012
1013                 CString out,cmd;
1014
1015                 if(  m_RebaseStage == REBASE_SQUASH_EDIT )
1016                         cmd.Format(_T("git.exe commit -F \"%s\""), tempfile);
1017                 else
1018                         cmd.Format(_T("git.exe commit --amend -F \"%s\""), tempfile);
1019
1020                 if(g_Git.Run(cmd,&out,CP_UTF8))
1021                 {
1022                         if(!g_Git.CheckCleanWorkTree())
1023                         {
1024                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1025                                 return;
1026                         }
1027                 }
1028
1029                 CFile::Remove(tempfile);
1030                 AddLogString(out);
1031                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
1032                 m_RebaseStage=REBASE_CONTINUE;
1033                 curRev->GetAction(&m_CommitList)|=CTGitPath::LOGACTIONS_REBASE_DONE;
1034                 this->UpdateCurrentStatus();
1035         }
1036
1037
1038         InterlockedExchange(&m_bThreadRunning, TRUE);
1039         SetControlEnable();
1040
1041         if (AfxBeginThread(RebaseThreadEntry, this)==NULL)
1042         {
1043                 InterlockedExchange(&m_bThreadRunning, FALSE);
1044                 CMessageBox::Show(NULL, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
1045                 SetControlEnable();
1046         }
1047 }
1048 int CRebaseDlg::CheckNextCommitIsSquash()
1049 {
1050         int index;
1051         if(m_CommitList.m_IsOldFirst)
1052                 index=m_CurrentRebaseIndex+1;
1053         else
1054                 index=m_CurrentRebaseIndex-1;
1055
1056         GitRev *curRev;
1057         do
1058         {
1059                 if(index<0)
1060                         return -1;
1061                 if(index>= m_CommitList.GetItemCount())
1062                         return -1;
1063
1064                 curRev=(GitRev*)m_CommitList.m_arShownList[index];
1065
1066                 if( curRev->GetAction(&m_CommitList)&CTGitPath::LOGACTIONS_REBASE_SQUASH )
1067                         return 0;
1068                 if( curRev->GetAction(&m_CommitList)&CTGitPath::LOGACTIONS_REBASE_SKIP)
1069                 {
1070                         if(m_CommitList.m_IsOldFirst)
1071                                 index++;
1072                         else
1073                                 index--;
1074                 }
1075                 else
1076                         return -1;
1077
1078         }while(curRev->GetAction(&m_CommitList)&CTGitPath::LOGACTIONS_REBASE_SKIP);
1079
1080         return -1;
1081
1082 }
1083 int CRebaseDlg::GoNext()
1084 {
1085         if(m_CommitList.m_IsOldFirst)
1086                 m_CurrentRebaseIndex++;
1087         else
1088                 m_CurrentRebaseIndex--;
1089         return 0;
1090
1091 }
1092 int CRebaseDlg::StateAction()
1093 {
1094         switch(this->m_RebaseStage)
1095         {
1096         case CHOOSE_BRANCH:
1097         case CHOOSE_COMMIT_PICK_MODE:
1098                 if(StartRebase())
1099                         return -1;
1100                 m_RebaseStage = REBASE_START;
1101                 GoNext();
1102                 break;
1103         }
1104
1105         return 0;
1106 }
1107 void CRebaseDlg::SetContinueButtonText()
1108 {
1109         CString Text;
1110         switch(this->m_RebaseStage)
1111         {
1112         case CHOOSE_BRANCH:
1113         case CHOOSE_COMMIT_PICK_MODE:
1114                 if(this->m_IsFastForward)
1115                         Text.LoadString(IDS_PROC_STARTREBASEFFBUTTON);
1116                 else
1117                         Text.LoadString(IDS_PROC_STARTREBASEBUTTON);
1118                 break;
1119
1120         case REBASE_START:
1121         case REBASE_CONTINUE:
1122         case REBASE_SQUASH_CONFLICT:
1123                 Text.LoadString(IDS_CONTINUEBUTTON);
1124                 break;
1125
1126         case REBASE_CONFLICT:
1127                 Text.LoadString(IDS_COMMITBUTTON);
1128                 break;
1129         case REBASE_EDIT:
1130                 Text.LoadString(IDS_AMENDBUTTON);
1131                 break;
1132
1133         case REBASE_SQUASH_EDIT:
1134                 Text.LoadString(IDS_COMMITBUTTON);
1135                 break;
1136
1137         case REBASE_ABORT:
1138         case REBASE_FINISH:
1139                 Text.LoadString(IDS_FINISHBUTTON);
1140                 break;
1141
1142         case REBASE_DONE:
1143                 Text.LoadString(IDS_DONE);
1144                 break;
1145         }
1146         this->GetDlgItem(IDC_REBASE_CONTINUE)->SetWindowText(Text);
1147 }
1148
1149 void CRebaseDlg::SetControlEnable()
1150 {
1151         switch(this->m_RebaseStage)
1152         {
1153         case CHOOSE_BRANCH:
1154         case CHOOSE_COMMIT_PICK_MODE:
1155
1156                 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(TRUE);
1157                 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(TRUE);
1158                 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(TRUE);
1159                 this->GetDlgItem(IDC_BUTTON_UP2)->EnableWindow(TRUE);
1160                 this->GetDlgItem(IDC_BUTTON_DOWN2)->EnableWindow(TRUE);
1161
1162                 if(!m_IsCherryPick)
1163                 {
1164                         this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(TRUE);
1165                         this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(TRUE);
1166                         this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(TRUE);
1167                 }
1168                 //this->m_CommitList.m_IsEnableRebaseMenu=TRUE;
1169                 this->m_CommitList.m_ContextMenuMask |= m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
1170                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
1171                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
1172                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP);
1173                 break;
1174
1175         case REBASE_START:
1176         case REBASE_CONTINUE:
1177         case REBASE_ABORT:
1178         case REBASE_FINISH:
1179         case REBASE_CONFLICT:
1180         case REBASE_EDIT:
1181         case REBASE_SQUASH_CONFLICT:
1182         case REBASE_DONE:
1183                 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(FALSE);
1184                 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(FALSE);
1185                 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(FALSE);
1186                 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(FALSE);
1187                 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(FALSE);
1188                 this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(FALSE);
1189                 this->GetDlgItem(IDC_BUTTON_UP2)->EnableWindow(FALSE);
1190                 this->GetDlgItem(IDC_BUTTON_DOWN2)->EnableWindow(FALSE);
1191                 //this->m_CommitList.m_IsEnableRebaseMenu=FALSE;
1192                 this->m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
1193                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
1194                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
1195                                                                                                 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP));
1196
1197                 if( m_RebaseStage == REBASE_DONE && (this->m_PostButtonTexts.GetCount() != 0) )
1198                 {
1199                         this->GetDlgItem(IDC_STATUS_STATIC)->ShowWindow(SW_HIDE);
1200                         this->GetDlgItem(IDC_REBASE_POST_BUTTON)->ShowWindow(SW_SHOWNORMAL);
1201                         this->m_PostButton.RemoveAll();
1202                         this->m_PostButton.AddEntries(m_PostButtonTexts);
1203                         //this->GetDlgItem(IDC_REBASE_POST_BUTTON)->SetWindowText(this->m_PostButtonText);
1204                 }
1205                 break;
1206         }
1207
1208         if(m_bThreadRunning)
1209         {
1210                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
1211
1212         }
1213         else
1214         {
1215                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(TRUE);
1216         }
1217 }
1218
1219 void CRebaseDlg::UpdateProgress()
1220 {
1221         int index;
1222         CRect rect;
1223
1224         if(m_CommitList.m_IsOldFirst)
1225                 index = m_CurrentRebaseIndex+1;
1226         else
1227                 index = m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
1228
1229         m_ProgressBar.SetRange(1, m_CommitList.GetItemCount());
1230         m_ProgressBar.SetPos(index);
1231         if (m_pTaskbarList)
1232         {
1233                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
1234                 m_pTaskbarList->SetProgressValue(m_hWnd, index, m_CommitList.GetItemCount());
1235         }
1236
1237         if(m_CurrentRebaseIndex>=0 && m_CurrentRebaseIndex< m_CommitList.GetItemCount())
1238         {
1239                 CString text;
1240                 text.Format(IDS_PROC_REBASING_PROGRESS, index, m_CommitList.GetItemCount());
1241                 m_CtrlStatusText.SetWindowText(text);
1242
1243         }
1244
1245         GitRev *prevRev=NULL, *curRev=NULL;
1246
1247         if( m_CurrentRebaseIndex >= 0 && m_CurrentRebaseIndex< m_CommitList.m_arShownList.GetSize())
1248         {
1249                 curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1250         }
1251
1252         for(int i=0;i<m_CommitList.m_arShownList.GetSize();i++)
1253         {
1254                 prevRev=(GitRev*)m_CommitList.m_arShownList[i];
1255                 if(prevRev->GetAction(&m_CommitList) & CTGitPath::LOGACTIONS_REBASE_CURRENT)
1256                 {
1257                         prevRev->GetAction(&m_CommitList) &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT;
1258                         m_CommitList.GetItemRect(i,&rect,LVIR_BOUNDS);
1259                         m_CommitList.InvalidateRect(rect);
1260                 }
1261         }
1262
1263         if(curRev)
1264         {
1265                 curRev->GetAction(&m_CommitList) |= CTGitPath::LOGACTIONS_REBASE_CURRENT;
1266                 m_CommitList.GetItemRect(m_CurrentRebaseIndex,&rect,LVIR_BOUNDS);
1267                 m_CommitList.InvalidateRect(rect);
1268         }
1269         m_CommitList.EnsureVisible(m_CurrentRebaseIndex,FALSE);
1270 }
1271
1272 void CRebaseDlg::UpdateCurrentStatus()
1273 {
1274         SetContinueButtonText();
1275         SetControlEnable();
1276         UpdateProgress();
1277 }
1278
1279 void CRebaseDlg::AddLogString(CString str)
1280 {
1281         this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, FALSE);
1282         CStringA sTextA = m_wndOutputRebase.StringForControl(str);//CUnicodeUtils::GetUTF8(str);
1283         this->m_wndOutputRebase.SendMessage(SCI_DOCUMENTEND);
1284         this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)sTextA);
1285         this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)"\n");
1286         this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, TRUE);
1287 }
1288
1289 int CRebaseDlg::GetCurrentCommitID()
1290 {
1291         if(m_CommitList.m_IsOldFirst)
1292         {
1293                 return this->m_CurrentRebaseIndex+1;
1294
1295         }
1296         else
1297         {
1298                 return m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
1299         }
1300 }
1301
1302 int CRebaseDlg::DoRebase()
1303 {
1304         CString cmd,out;
1305         if(m_CurrentRebaseIndex <0)
1306                 return 0;
1307         if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
1308                 return 0;
1309
1310         GitRev *pRev = (GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1311         int mode=pRev->GetAction(&m_CommitList) & CTGitPath::LOGACTIONS_REBASE_MODE_MASK;
1312         CString nocommit;
1313
1314         if( mode== CTGitPath::LOGACTIONS_REBASE_SKIP)
1315         {
1316                 pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
1317                 return 0;
1318         }
1319
1320         if (!CheckNextCommitIsSquash() || mode != CTGitPath::LOGACTIONS_REBASE_PICK)
1321         { // next commit is squash or not pick
1322                 if (!this->m_SquashMessage.IsEmpty())
1323                         this->m_SquashMessage += _T("\n\n");
1324                 this->m_SquashMessage += pRev->GetSubject();
1325                 this->m_SquashMessage += _T("\n");
1326                 this->m_SquashMessage += pRev->GetBody().TrimRight();
1327         }
1328         else
1329                 this->m_SquashMessage.Empty();
1330
1331         if (!CheckNextCommitIsSquash() || mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
1332         { // next or this commit is squash
1333                 nocommit=_T(" --no-commit ");
1334         }
1335
1336         CString log;
1337         log.Format(_T("%s %d: %s"),CTGitPath::GetActionName(mode),this->GetCurrentCommitID(),pRev->m_CommitHash.ToString());
1338         AddLogString(log);
1339         AddLogString(pRev->GetSubject());
1340         if (pRev->GetSubject().IsEmpty())
1341         {
1342                 CMessageBox::Show(m_hWnd, IDS_PROC_REBASE_EMPTYCOMMITMSG, IDS_APPNAME, MB_OK | MB_ICONEXCLAMATION);
1343                 mode = CTGitPath::LOGACTIONS_REBASE_EDIT;
1344         }
1345
1346         CString cherryPickedFrom;
1347         if (m_bAddCherryPickedFrom)
1348                 cherryPickedFrom = _T("-x ");
1349
1350         cmd.Format(_T("git.exe cherry-pick %s%s %s"), cherryPickedFrom, nocommit, pRev->m_CommitHash.ToString());
1351
1352         if(g_Git.Run(cmd,&out,CP_UTF8))
1353         {
1354                 AddLogString(out);
1355                 CTGitPathList list;
1356                 if(g_Git.ListConflictFile(list))
1357                 {
1358                         AddLogString(_T("Get conflict files fail"));
1359                         return -1;
1360                 }
1361                 if(list.GetCount() == 0 )
1362                 {
1363                         if(mode ==  CTGitPath::LOGACTIONS_REBASE_PICK)
1364                         {
1365                                 pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
1366                                 return 0;
1367                         }
1368                         if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
1369                         {
1370                                 this->m_RebaseStage = REBASE_EDIT ;
1371                                 return -1; // Edit return -1 to stop rebase.
1372                         }
1373                         // Squash Case
1374                         if(CheckNextCommitIsSquash())
1375                         {   // no squash
1376                                 // let user edit last commmit message
1377                                 this->m_RebaseStage = REBASE_SQUASH_EDIT;
1378                                 return -1;
1379                         }
1380                 }
1381                 if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
1382                         m_RebaseStage = REBASE_SQUASH_CONFLICT;
1383                 else
1384                         m_RebaseStage = REBASE_CONFLICT;
1385                 return -1;
1386
1387         }
1388         else
1389         {
1390                 AddLogString(out);
1391                 if(mode ==  CTGitPath::LOGACTIONS_REBASE_PICK)
1392                 {
1393                         pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
1394                         return 0;
1395                 }
1396                 if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
1397                 {
1398                         this->m_RebaseStage = REBASE_EDIT ;
1399                         return -1; // Edit return -1 to stop rebase.
1400                 }
1401
1402                 // Squash Case
1403                 if(CheckNextCommitIsSquash())
1404                 {   // no squash
1405                         // let user edit last commmit message
1406                         this->m_RebaseStage = REBASE_SQUASH_EDIT;
1407                         return -1;
1408                 }
1409                 else if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
1410                         pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
1411         }
1412
1413         return 0;
1414 }
1415
1416 BOOL CRebaseDlg::IsEnd()
1417 {
1418         if(m_CommitList.m_IsOldFirst)
1419                 return m_CurrentRebaseIndex>= this->m_CommitList.GetItemCount();
1420         else
1421                 return m_CurrentRebaseIndex<0;
1422 }
1423
1424 int CRebaseDlg::RebaseThread()
1425 {
1426         CBlockCacheForPath cacheBlock(g_Git.m_CurrentDir);
1427
1428         int ret=0;
1429         while(1)
1430         {
1431                 if( m_RebaseStage == REBASE_START )
1432                 {
1433                         if( this->StartRebase() )
1434                         {
1435                                 InterlockedExchange(&m_bThreadRunning, FALSE);
1436                                 ret = -1;
1437                                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
1438                                 break;
1439                         }
1440                         m_RebaseStage = REBASE_CONTINUE;
1441
1442                 }
1443                 else if( m_RebaseStage == REBASE_CONTINUE )
1444                 {
1445                         this->GoNext();
1446                         UpdateCurrentStatus();
1447                         if(IsEnd())
1448                         {
1449                                 ret = 0;
1450                                 m_RebaseStage = REBASE_FINISH;
1451
1452                         }
1453                         else
1454                         {
1455                                 ret = DoRebase();
1456
1457                                 if( ret )
1458                                 {
1459                                         break;
1460                                 }
1461                         }
1462
1463                 }
1464                 else if( m_RebaseStage == REBASE_FINISH )
1465                 {
1466                         FinishRebase();
1467                         m_RebaseStage = REBASE_DONE;
1468                         if (m_pTaskbarList)
1469                                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
1470                         break;
1471
1472                 }
1473                 else
1474                 {
1475                         break;
1476                 }
1477                 this->PostMessage(MSG_REBASE_UPDATE_UI);
1478                 //this->UpdateCurrentStatus();
1479         }
1480
1481         InterlockedExchange(&m_bThreadRunning, FALSE);
1482         this->PostMessage(MSG_REBASE_UPDATE_UI);
1483         return ret;
1484 }
1485
1486 void CRebaseDlg::ListConflictFile()
1487 {
1488         this->m_FileListCtrl.Clear();
1489         CTGitPathList list;
1490         CTGitPath path;
1491         list.AddPath(path);
1492
1493         m_FileListCtrl.m_bIsRevertTheirMy = !m_IsCherryPick;
1494
1495         this->m_FileListCtrl.GetStatus(&list,true);
1496         this->m_FileListCtrl.Show(CTGitPath::LOGACTIONS_UNMERGED|CTGitPath::LOGACTIONS_MODIFIED|CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_DELETED,
1497                                                            CTGitPath::LOGACTIONS_UNMERGED);
1498 }
1499
1500 LRESULT CRebaseDlg::OnRebaseUpdateUI(WPARAM,LPARAM)
1501 {
1502         UpdateCurrentStatus();
1503         if(m_CurrentRebaseIndex <0)
1504                 return 0;
1505         if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
1506                 return 0;
1507         GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
1508
1509         switch(m_RebaseStage)
1510         {
1511         case REBASE_CONFLICT:
1512         case REBASE_SQUASH_CONFLICT:
1513                 ListConflictFile();
1514                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_CONFLICT);
1515                 if (m_pTaskbarList)
1516                         m_pTaskbarList->SetProgressState(m_hWnd, TBPF_ERROR);
1517                 this->m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
1518                 this->m_LogMessageCtrl.SetText(curRev->GetSubject()+_T("\n")+curRev->GetBody());
1519                 break;
1520         case REBASE_EDIT:
1521                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
1522                 if (m_pTaskbarList)
1523                         m_pTaskbarList->SetProgressState(m_hWnd, TBPF_PAUSED);
1524                 this->m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
1525                 this->m_LogMessageCtrl.SetText(curRev->GetSubject()+_T("\n")+curRev->GetBody());
1526                 break;
1527         case REBASE_SQUASH_EDIT:
1528                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
1529                 this->m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
1530                 this->m_LogMessageCtrl.SetText(this->m_SquashMessage);
1531                 if (m_pTaskbarList)
1532                         m_pTaskbarList->SetProgressState(m_hWnd, TBPF_PAUSED);
1533                 break;
1534         default:
1535                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
1536         }
1537         return 0;
1538 }
1539 void CRebaseDlg::OnCancel()
1540 {
1541         OnBnClickedAbort();
1542 }
1543 void CRebaseDlg::OnBnClickedAbort()
1544 {
1545         if (m_pTaskbarList)
1546                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
1547
1548         CString cmd,out;
1549         CString pron = m_OrigUpstreamHash.ToString();
1550         if(m_OrigUpstreamHash.IsEmpty())
1551         {
1552                 __super::OnCancel();
1553         }
1554
1555         if(m_RebaseStage == CHOOSE_BRANCH || m_RebaseStage== CHOOSE_COMMIT_PICK_MODE)
1556         {
1557                 return;
1558         }
1559
1560         if(CMessageBox::Show(NULL, IDS_PROC_REBASE_ABORT, IDS_APPNAME, MB_YESNO) != IDYES)
1561                 return;
1562
1563         if(this->m_IsFastForward)
1564         {
1565                 cmd.Format(_T("git.exe reset --hard  %s"),this->m_OrigBranchHash.ToString());
1566                 if(g_Git.Run(cmd,&out,CP_UTF8))
1567                 {
1568                         AddLogString(out);
1569                         ::MessageBox(this->m_hWnd, _T("Unrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_ICONERROR);
1570                 }
1571                 __super::OnCancel();
1572                 return;
1573         }
1574         cmd.Format(_T("git.exe checkout -f %s"),g_Git.FixBranchName(this->m_UpstreamCtrl.GetString()));
1575         if(g_Git.Run(cmd,&out,CP_UTF8))
1576         {
1577                 AddLogString(out);
1578                 ::MessageBox(this->m_hWnd, _T("Unrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_ICONERROR);
1579                 __super::OnCancel();
1580                 return;
1581         }
1582
1583         cmd.Format(_T("git.exe reset --hard  %s"),this->m_OrigUpstreamHash.ToString());
1584         if(g_Git.Run(cmd,&out,CP_UTF8))
1585         {
1586                 AddLogString(out);
1587                 ::MessageBox(this->m_hWnd, _T("Unrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_ICONERROR);
1588                 __super::OnCancel();
1589                 return;
1590         }
1591
1592         if(this->m_IsCherryPick) //there are not "branch" at cherry pick mode
1593         {
1594                 __super::OnCancel();
1595                 return;
1596         }
1597
1598         cmd.Format(_T("git checkout -f %s"),this->m_BranchCtrl.GetString());
1599         if(g_Git.Run(cmd,&out,CP_UTF8))
1600         {
1601                 AddLogString(out);
1602                 ::MessageBox(this->m_hWnd, _T("Unrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_ICONERROR);
1603                 __super::OnCancel();
1604                 return;
1605         }
1606
1607         cmd.Format(_T("git.exe reset --hard  %s"),this->m_OrigBranchHash.ToString());
1608         if(g_Git.Run(cmd,&out,CP_UTF8))
1609         {
1610                 AddLogString(out);
1611                 ::MessageBox(this->m_hWnd, _T("Unrecoverable error on cleanup:\n") + out, _T("TortoiseGit"), MB_ICONERROR);
1612         }
1613         __super::OnCancel();
1614 }
1615
1616 void CRebaseDlg::OnBnClickedButtonBrowse()
1617 {
1618         if(CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl, gPickRef_NoTag))
1619                 OnCbnSelchangeUpstream();
1620 }
1621
1622 void CRebaseDlg::OnBnClickedRebaseCheckForce()
1623 {
1624         this->UpdateData();
1625         this->FetchLogList();
1626         if(this->CheckRebaseCondition())
1627         {
1628                 /* Disable Start Rebase */
1629                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
1630         }
1631 }
1632
1633 void CRebaseDlg::OnBnClickedRebasePostButton()
1634 {
1635         this->m_Upstream=this->m_UpstreamCtrl.GetString();
1636         this->m_Branch=this->m_BranchCtrl.GetString();
1637
1638         this->EndDialog((int)(IDC_REBASE_POST_BUTTON+this->m_PostButton.GetCurrentEntry()));
1639 }
1640
1641 void CRebaseDlg::Refresh()
1642 {
1643         if(this->m_IsCherryPick)
1644                 return ;
1645
1646         if(this->m_RebaseStage == CHOOSE_BRANCH )
1647         {
1648                 this->UpdateData();
1649                 this->FetchLogList();
1650                 if(this->CheckRebaseCondition())
1651                 {
1652                         /* Disable Start Rebase */
1653                         this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
1654                 }
1655         }
1656 }
1657
1658 void CRebaseDlg::OnBnClickedButtonUp2()
1659 {
1660         POSITION pos;
1661         pos = m_CommitList.GetFirstSelectedItemPosition();
1662
1663         // do nothing if the first selected item is the first item in the list
1664         if (m_CommitList.GetNextSelectedItem(pos) == 0)
1665                 return;
1666
1667         pos = m_CommitList.GetFirstSelectedItemPosition();
1668
1669         bool changed = false;
1670         while(pos)
1671         {
1672                 int index=m_CommitList.GetNextSelectedItem(pos);
1673                 if(index>=1)
1674                 {
1675                         CGitHash old = m_CommitList.m_logEntries[index-1];
1676                         m_CommitList.m_logEntries[index-1] = m_CommitList.m_logEntries[index];
1677                         m_CommitList.m_logEntries[index] = old;
1678                         m_CommitList.SetItemState(index-1, LVIS_SELECTED, LVIS_SELECTED);
1679                         m_CommitList.SetItemState(index, 0, LVIS_SELECTED);
1680                         changed = true;
1681                 }
1682         }
1683         if (changed)
1684         {
1685                 m_CommitList.RecalculateShownList(&m_CommitList.m_arShownList);
1686                 m_CommitList.Invalidate();
1687                 m_CommitList.SetFocus();
1688         }
1689 }
1690
1691 void CRebaseDlg::OnBnClickedButtonDown2()
1692 {
1693         if (m_CommitList.GetSelectedCount() == 0)
1694                 return;
1695
1696         POSITION pos;
1697         pos = m_CommitList.GetFirstSelectedItemPosition();
1698         bool changed = false;
1699         // use an array to store all selected item indexes; the user won't select too much items
1700         int* indexes = NULL;
1701         indexes = new int[m_CommitList.GetSelectedCount()];
1702         int i = 0;
1703         while(pos)
1704         {
1705                 indexes[i++] = m_CommitList.GetNextSelectedItem(pos);
1706         }
1707         // don't move any item if the last selected item is the last item in the m_CommitList
1708         // (that would change the order of the selected items)
1709         if(indexes[m_CommitList.GetSelectedCount() - 1] < m_CommitList.GetItemCount() - 1)
1710         {
1711                 // iterate over the indexes backwards in order to correctly move multiselected items
1712                 for (i = m_CommitList.GetSelectedCount() - 1; i >= 0; i--)
1713                 {
1714                         int index = indexes[i];
1715                         CGitHash old = m_CommitList.m_logEntries[index+1];
1716                         m_CommitList.m_logEntries[index+1] = m_CommitList.m_logEntries[index];
1717                         m_CommitList.m_logEntries[index] = old;
1718                         m_CommitList.SetItemState(index, 0, LVIS_SELECTED);
1719                         m_CommitList.SetItemState(index+1, LVIS_SELECTED, LVIS_SELECTED);
1720                         changed = true;
1721                 }
1722         }
1723         delete [] indexes;
1724         indexes = NULL;
1725         if (changed)
1726         {
1727                 m_CommitList.RecalculateShownList(&m_CommitList.m_arShownList);
1728                 m_CommitList.Invalidate();
1729                 m_CommitList.SetFocus();
1730         }
1731 }
1732
1733 LRESULT CRebaseDlg::OnTaskbarBtnCreated(WPARAM /*wParam*/, LPARAM /*lParam*/)
1734 {
1735         m_pTaskbarList.Release();
1736         m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
1737         return 0;
1738 }
1739
1740 void CRebaseDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
1741 {
1742         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1743         *pResult = 0;
1744         if(m_CommitList.m_bNoDispUpdates)
1745                 return;
1746         if (pNMLV->iItem >= 0)
1747         {
1748                 this->m_CommitList.m_nSearchIndex = pNMLV->iItem;
1749                 if (pNMLV->iSubItem != 0)
1750                         return;
1751                 if ((pNMLV->iItem == m_CommitList.m_arShownList.GetCount()))
1752                 {
1753                         // remove the selected state
1754                         if (pNMLV->uChanged & LVIF_STATE)
1755                         {
1756                                 m_CommitList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
1757                                 FillLogMessageCtrl();
1758                         }
1759                         return;
1760                 }
1761                 if (pNMLV->uChanged & LVIF_STATE)
1762                 {
1763                         FillLogMessageCtrl();
1764                 }
1765         }
1766         else
1767         {
1768                 FillLogMessageCtrl();
1769         }
1770 }
1771
1772 void CRebaseDlg::FillLogMessageCtrl()
1773 {
1774         int selCount = m_CommitList.GetSelectedCount();
1775         if (selCount == 1 && (m_RebaseStage == CHOOSE_BRANCH || m_RebaseStage == CHOOSE_COMMIT_PICK_MODE))
1776         {
1777                 POSITION pos = m_CommitList.GetFirstSelectedItemPosition();
1778                 int selIndex = m_CommitList.GetNextSelectedItem(pos);
1779                 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_CommitList.m_arShownList.SafeGetAt(selIndex));
1780                 m_FileListCtrl.UpdateWithGitPathList(pLogEntry->GetFiles(&m_CommitList));
1781                 m_FileListCtrl.m_CurrentVersion = pLogEntry->m_CommitHash;
1782                 m_FileListCtrl.Show(GITSLC_SHOWVERSIONED);
1783                 m_LogMessageCtrl.Call(SCI_SETREADONLY, FALSE);
1784                 m_LogMessageCtrl.SetText(pLogEntry->GetSubject() + _T("\n") + pLogEntry->GetBody());
1785                 m_LogMessageCtrl.Call(SCI_SETREADONLY, TRUE);
1786         }
1787 }
1788 void CRebaseDlg::OnBnClickedCheckCherryPickedFrom()
1789 {
1790         UpdateData();
1791 }