src/TortoiseProc/RebaseDlg.cpp

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