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