src/TortoiseProc/RebaseDlg.cpp

   1 // RebaseDlg.cpp : implementation file\r
   2 //\r
   3 \r
   4 #include "stdafx.h"\r
   5 #include "TortoiseProc.h"\r
   6 #include "RebaseDlg.h"\r
   7 #include "AppUtils.h"\r
   8 #include "MessageBox.h"\r
   9 #include "UnicodeUtils.h"\r
  10 // CRebaseDlg dialog\r
  11 \r
  12 IMPLEMENT_DYNAMIC(CRebaseDlg, CResizableStandAloneDialog)\r
  13 \r
  14 CRebaseDlg::CRebaseDlg(CWnd* pParent /*=NULL*/)\r
  15         : CResizableStandAloneDialog(CRebaseDlg::IDD, pParent)\r
  16     , m_bPickAll(FALSE)\r
  17     , m_bSquashAll(FALSE)\r
  18     , m_bEditAll(FALSE)\r
  19 {\r
  20         m_RebaseStage=CHOOSE_BRANCH;\r
  21         m_CurrentRebaseIndex=-1;\r
  22         m_bThreadRunning =FALSE;\r
  23 }\r
  24 \r
  25 CRebaseDlg::~CRebaseDlg()\r
  26 {\r
  27 }\r
  28 \r
  29 void CRebaseDlg::DoDataExchange(CDataExchange* pDX)\r
  30 {\r
  31     CDialog::DoDataExchange(pDX);\r
  32     DDX_Control(pDX, IDC_REBASE_PROGRESS, m_ProgressBar);\r
  33     DDX_Control(pDX, IDC_STATUS_STATIC, m_CtrlStatusText);\r
  34     DDX_Check(pDX, IDC_PICK_ALL, m_bPickAll);\r
  35     DDX_Check(pDX, IDC_SQUASH_ALL, m_bSquashAll);\r
  36     DDX_Check(pDX, IDC_EDIT_ALL, m_bEditAll);\r
  37         DDX_Control(pDX, IDC_REBASE_SPLIT, m_wndSplitter);\r
  38         DDX_Control(pDX,IDC_COMMIT_LIST,m_CommitList);\r
  39         DDX_Control(pDX,IDC_REBASE_COMBOXEX_BRANCH, this->m_BranchCtrl);\r
  40         DDX_Control(pDX,IDC_REBASE_COMBOXEX_UPSTREAM,   this->m_UpstreamCtrl);\r
  41 \r
  42 }\r
  43 \r
  44 \r
  45 BEGIN_MESSAGE_MAP(CRebaseDlg, CResizableStandAloneDialog)\r
  46     ON_BN_CLICKED(IDC_PICK_ALL, &CRebaseDlg::OnBnClickedPickAll)\r
  47     ON_BN_CLICKED(IDC_SQUASH_ALL, &CRebaseDlg::OnBnClickedSquashAll)\r
  48     ON_BN_CLICKED(IDC_EDIT_ALL, &CRebaseDlg::OnBnClickedEditAll)\r
  49     ON_BN_CLICKED(IDC_REBASE_SPLIT, &CRebaseDlg::OnBnClickedRebaseSplit)\r
  50         ON_BN_CLICKED(IDC_REBASE_CONTINUE,OnBnClickedContinue)\r
  51         ON_BN_CLICKED(IDC_REBASE_ABORT,  OnBnClickedAbort)\r
  52         ON_WM_SIZE()\r
  53         ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_BRANCH,   &CRebaseDlg::OnCbnSelchangeBranch)\r
  54         ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_UPSTREAM, &CRebaseDlg::OnCbnSelchangeUpstream)\r
  55         ON_MESSAGE(MSG_REBASE_UPDATE_UI, OnRebaseUpdateUI)\r
  56 END_MESSAGE_MAP()\r
  57 \r
  58 void CRebaseDlg::AddRebaseAnchor()\r
  59 {\r
  60         AddAnchor(IDC_REBASE_TAB,TOP_LEFT,BOTTOM_RIGHT);\r
  61         AddAnchor(IDC_COMMIT_LIST,TOP_LEFT, TOP_RIGHT);\r
  62         AddAnchor(IDC_REBASE_SPLIT,TOP_LEFT, TOP_RIGHT);\r
  63         AddAnchor(IDC_STATUS_STATIC, BOTTOM_LEFT,BOTTOM_RIGHT);\r
  64         AddAnchor(IDC_REBASE_CONTINUE,BOTTOM_RIGHT);\r
  65         AddAnchor(IDC_REBASE_ABORT, BOTTOM_RIGHT);\r
  66         AddAnchor(IDC_REBASE_PROGRESS,BOTTOM_LEFT, BOTTOM_RIGHT);\r
  67         AddAnchor(IDC_PICK_ALL,TOP_LEFT);\r
  68         AddAnchor(IDC_SQUASH_ALL,TOP_LEFT);\r
  69         AddAnchor(IDC_EDIT_ALL,TOP_LEFT);       \r
  70         AddAnchor(IDC_REBASE_COMBOXEX_UPSTREAM,TOP_LEFT);\r
  71         AddAnchor(IDC_REBASE_COMBOXEX_BRANCH,TOP_LEFT);\r
  72         AddAnchor(IDC_REBASE_STATIC_UPSTREAM,TOP_LEFT);\r
  73         AddAnchor(IDC_REBASE_STATIC_BRANCH,TOP_LEFT);\r
  74         \r
  75 }\r
  76 \r
  77 BOOL CRebaseDlg::OnInitDialog()\r
  78 {\r
  79         CResizableStandAloneDialog::OnInitDialog();\r
  80 \r
  81         CRect rectDummy;\r
  82         //IDC_REBASE_DUMY_TAB\r
  83         \r
  84         GetClientRect(m_DlgOrigRect);\r
  85         m_CommitList.GetClientRect(m_CommitListOrigRect);\r
  86 \r
  87         CWnd *pwnd=this->GetDlgItem(IDC_REBASE_DUMY_TAB);\r
  88         pwnd->GetWindowRect(&rectDummy);\r
  89 \r
  90         rectDummy.top-=20;\r
  91         rectDummy.bottom-=20;\r
  92 \r
  93         rectDummy.left-=5;\r
  94         rectDummy.right-=5;\r
  95         \r
  96         if (!m_ctrlTabCtrl.Create(CMFCTabCtrl::STYLE_FLAT, rectDummy, this, IDC_REBASE_TAB))\r
  97         {\r
  98                 TRACE0("Failed to create output tab window\n");\r
  99                 return FALSE;      // fail to create\r
 100         }\r
 101         m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);\r
 102         // Create output panes:\r
 103         //const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;\r
 104         DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;\r
 105 \r
 106         if (! this->m_FileListCtrl.Create(dwStyle,rectDummy,&this->m_ctrlTabCtrl,0) )\r
 107         {\r
 108                 TRACE0("Failed to create output windows\n");\r
 109                 return FALSE;      // fail to create\r
 110         }\r
 111 \r
 112         if( ! this->m_LogMessageCtrl.Create(_T("Scintilla"),_T("source"),0,rectDummy,&m_ctrlTabCtrl,0,0) )\r
 113         {\r
 114                 TRACE0("Failed to create log message control");\r
 115                 return FALSE;\r
 116         }\r
 117         m_LogMessageCtrl.Init(0);\r
 118 \r
 119         dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;\r
 120 \r
 121         if (!m_wndOutputRebase.Create(_T("Scintilla"),_T("source"),0,rectDummy, &m_ctrlTabCtrl, 0,0) )\r
 122         {\r
 123                 TRACE0("Failed to create output windows\n");\r
 124                 return -1;      // fail to create\r
 125         }\r
 126         m_wndOutputRebase.Init(0);\r
 127         m_wndOutputRebase.Call(SCI_SETREADONLY, TRUE);\r
 128         \r
 129         m_tooltips.Create(this);\r
 130 \r
 131         m_FileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("RebaseDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);\r
 132 \r
 133         m_ctrlTabCtrl.AddTab(&m_FileListCtrl,_T("Conflict File"));\r
 134         m_ctrlTabCtrl.AddTab(&m_LogMessageCtrl,_T("Commit Message"),1);\r
 135         m_ctrlTabCtrl.AddTab(&m_wndOutputRebase,_T("Log"),2);\r
 136         AddRebaseAnchor();\r
 137 \r
 138 \r
 139         EnableSaveRestore(_T("RebaseDlg"));\r
 140 \r
 141         DWORD yPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));\r
 142         RECT rcDlg, rcLogMsg, rcFileList;\r
 143         GetClientRect(&rcDlg);\r
 144         m_CommitList.GetWindowRect(&rcLogMsg);\r
 145         ScreenToClient(&rcLogMsg);\r
 146         this->m_ctrlTabCtrl.GetWindowRect(&rcFileList);\r
 147         ScreenToClient(&rcFileList);\r
 148         if (yPos)\r
 149         {\r
 150                 RECT rectSplitter;\r
 151                 m_wndSplitter.GetWindowRect(&rectSplitter);\r
 152                 ScreenToClient(&rectSplitter);\r
 153                 int delta = yPos - rectSplitter.top;\r
 154                 if ((rcLogMsg.bottom + delta > rcLogMsg.top)&&(rcLogMsg.bottom + delta < rcFileList.bottom - 30))\r
 155                 {\r
 156                         m_wndSplitter.SetWindowPos(NULL, 0, yPos, 0, 0, SWP_NOSIZE);\r
 157                         DoSize(delta);\r
 158                 }\r
 159         }\r
 160 \r
 161         if( this->m_RebaseStage == CHOOSE_BRANCH)\r
 162         {\r
 163                 this->LoadBranchInfo();\r
 164 \r
 165         }else\r
 166         {\r
 167                 this->m_BranchCtrl.EnableWindow(FALSE);\r
 168                 this->m_UpstreamCtrl.EnableWindow(FALSE);\r
 169         }\r
 170 \r
 171         m_CommitList.m_IsIDReplaceAction = TRUE;\r
 172 //      m_CommitList.m_IsOldFirst = TRUE;\r
 173         m_CommitList.m_IsRebaseReplaceGraph = TRUE;\r
 174 \r
 175         m_CommitList.DeleteAllItems();\r
 176         m_CommitList.InsertGitColumn();\r
 177 \r
 178         FetchLogList();\r
 179         SetContinueButtonText();\r
 180         return TRUE;\r
 181 }\r
 182 // CRebaseDlg message handlers\r
 183 \r
 184 void CRebaseDlg::OnBnClickedPickAll()\r
 185 {\r
 186     // TODO: Add your control notification handler code here\r
 187         this->UpdateData();\r
 188         if(this->m_bPickAll)\r
 189                 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_PICK);\r
 190 \r
 191         this->m_bEditAll=FALSE;\r
 192         this->m_bSquashAll=FALSE;\r
 193         this->UpdateData(FALSE);\r
 194         \r
 195 }\r
 196 \r
 197 void CRebaseDlg::OnBnClickedSquashAll()\r
 198 {\r
 199     // TODO: Add your control notification handler code here\r
 200         this->UpdateData();\r
 201         if(this->m_bSquashAll)\r
 202                 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_SQUASH);\r
 203 \r
 204         this->m_bEditAll=FALSE;\r
 205         this->m_bPickAll=FALSE;\r
 206         this->UpdateData(FALSE);\r
 207 \r
 208 }\r
 209 \r
 210 void CRebaseDlg::OnBnClickedEditAll()\r
 211 {\r
 212     // TODO: Add your control notification handler code here\r
 213         this->UpdateData();\r
 214         if( this->m_bEditAll )\r
 215                 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_EDIT);\r
 216 \r
 217         this->m_bPickAll=FALSE;\r
 218         this->m_bSquashAll=FALSE;\r
 219         this->UpdateData(FALSE);\r
 220 \r
 221 }\r
 222 \r
 223 void CRebaseDlg::SetAllRebaseAction(int action)\r
 224 {\r
 225         for(int i=0;i<this->m_CommitList.m_logEntries.size();i++)\r
 226         {\r
 227                 m_CommitList.m_logEntries[i].m_Action=action;\r
 228         }\r
 229         m_CommitList.Invalidate();\r
 230 }\r
 231 \r
 232 void CRebaseDlg::OnBnClickedRebaseSplit()\r
 233 {\r
 234         this->UpdateData();\r
 235     // TODO: Add your control notification handler code here\r
 236 }\r
 237 \r
 238 LRESULT CRebaseDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)\r
 239 {\r
 240         switch (message) {\r
 241         case WM_NOTIFY:\r
 242                 if (wParam == IDC_REBASE_SPLIT)\r
 243                 { \r
 244                         SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;\r
 245                         DoSize(pHdr->delta);\r
 246                 }\r
 247                 break;\r
 248         }\r
 249 \r
 250         return __super::DefWindowProc(message, wParam, lParam);\r
 251 }\r
 252 \r
 253 void CRebaseDlg::DoSize(int delta)\r
 254 {\r
 255         \r
 256         this->RemoveAllAnchors();\r
 257 \r
 258         CSplitterControl::ChangeHeight(GetDlgItem(IDC_COMMIT_LIST), delta, CW_TOPALIGN);\r
 259         //CSplitterControl::ChangeHeight(GetDlgItem(), delta, CW_TOPALIGN);\r
 260         CSplitterControl::ChangeHeight(GetDlgItem(IDC_REBASE_TAB), -delta, CW_BOTTOMALIGN);\r
 261         //CSplitterControl::ChangeHeight(GetDlgItem(), -delta, CW_BOTTOMALIGN);\r
 262         CSplitterControl::ChangePos(GetDlgItem(IDC_SQUASH_ALL),0,delta);\r
 263         CSplitterControl::ChangePos(GetDlgItem(IDC_PICK_ALL),0,delta);\r
 264         CSplitterControl::ChangePos(GetDlgItem(IDC_EDIT_ALL),0,delta);\r
 265         \r
 266         this->AddRebaseAnchor();\r
 267         // adjust the minimum size of the dialog to prevent the resizing from\r
 268         // moving the list control too far down.\r
 269         CRect rcLogMsg;\r
 270         m_CommitList.GetClientRect(rcLogMsg);\r
 271         SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_CommitListOrigRect.Height()+rcLogMsg.Height()));\r
 272 \r
 273         SetSplitterRange();\r
 274 //      m_CommitList.Invalidate();\r
 275 \r
 276 //      GetDlgItem(IDC_LOGMESSAGE)->Invalidate();\r
 277 \r
 278         this->m_ctrlTabCtrl.Invalidate();\r
 279         this->m_CommitList.Invalidate();\r
 280         this->m_FileListCtrl.Invalidate();\r
 281         this->m_LogMessageCtrl.Invalidate();\r
 282 \r
 283 }\r
 284 \r
 285 void CRebaseDlg::SetSplitterRange()\r
 286 {\r
 287         if ((m_CommitList)&&(m_ctrlTabCtrl))\r
 288         {\r
 289                 CRect rcTop;\r
 290                 m_CommitList.GetWindowRect(rcTop);\r
 291                 ScreenToClient(rcTop);\r
 292                 CRect rcMiddle;\r
 293                 m_ctrlTabCtrl.GetWindowRect(rcMiddle);\r
 294                 ScreenToClient(rcMiddle);\r
 295                 if (rcMiddle.Height() && rcMiddle.Width())\r
 296                         m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);\r
 297         }\r
 298 }\r
 299 \r
 300 void CRebaseDlg::OnSize(UINT nType,int cx, int cy)\r
 301 {\r
 302          // first, let the resizing take place\r
 303     __super::OnSize(nType, cx, cy);\r
 304 \r
 305     //set range\r
 306     SetSplitterRange();\r
 307 }\r
 308 \r
 309 void CRebaseDlg::SaveSplitterPos()\r
 310 {\r
 311         if (!IsIconic())\r
 312         {\r
 313                 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));\r
 314                 RECT rectSplitter;\r
 315                 m_wndSplitter.GetWindowRect(&rectSplitter);\r
 316                 ScreenToClient(&rectSplitter);\r
 317                 regPos = rectSplitter.top;\r
 318         }\r
 319 }\r
 320 \r
 321 void CRebaseDlg::LoadBranchInfo()\r
 322 {\r
 323         m_BranchCtrl.SetMaxHistoryItems(0x7FFFFFFF);\r
 324         m_UpstreamCtrl.SetMaxHistoryItems(0x7FFFFFFF);\r
 325 \r
 326         STRING_VECTOR list;\r
 327         list.clear();\r
 328         int current;\r
 329         g_Git.GetBranchList(list,&current,CGit::BRANCH_ALL);\r
 330         m_BranchCtrl.AddString(list);\r
 331         m_UpstreamCtrl.AddString(list);\r
 332 \r
 333         m_BranchCtrl.SetCurSel(current);\r
 334 \r
 335         AddBranchToolTips(&m_BranchCtrl);\r
 336         AddBranchToolTips(&m_UpstreamCtrl);\r
 337 \r
 338 }\r
 339 \r
 340 void CRebaseDlg::OnCbnSelchangeBranch()\r
 341 {\r
 342         FetchLogList();\r
 343 }\r
 344 \r
 345 void CRebaseDlg::OnCbnSelchangeUpstream()\r
 346 {\r
 347         FetchLogList();\r
 348 }\r
 349 \r
 350 void CRebaseDlg::FetchLogList()\r
 351 {\r
 352         m_CommitList.Clear();\r
 353         this->m_CommitList.FillGitLog(NULL,0,&m_UpstreamCtrl.GetString(),&m_BranchCtrl.GetString());\r
 354         if( m_CommitList.GetItemCount() == 0 )\r
 355                 m_CommitList.ShowText(_T("Nothing Rebase"));\r
 356 \r
 357         CString hash=g_Git.GetHash(m_UpstreamCtrl.GetString());\r
 358         \r
 359 #if 0\r
 360         if(m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash.size() >=0 )\r
 361         {\r
 362                 if(hash ==  m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash[0])\r
 363                 {\r
 364                         m_CommitList.Clear();\r
 365                         m_CommitList.ShowText(_T("Nothing Rebase"));\r
 366                 }\r
 367         }\r
 368 #endif\r
 369 \r
 370         m_tooltips.Pop();\r
 371         AddBranchToolTips(&this->m_BranchCtrl);\r
 372         AddBranchToolTips(&this->m_UpstreamCtrl);\r
 373         \r
 374         for(int i=0;i<m_CommitList.m_logEntries.size();i++)\r
 375         {\r
 376                 m_CommitList.m_logEntries[i].m_Action = CTGitPath::LOGACTIONS_REBASE_PICK;\r
 377         }\r
 378         \r
 379         m_CommitList.Invalidate();\r
 380 \r
 381         if(m_CommitList.m_IsOldFirst)\r
 382                 this->m_CurrentRebaseIndex = -1;\r
 383         else\r
 384                 this->m_CurrentRebaseIndex = m_CommitList.m_logEntries.size();\r
 385         \r
 386 }\r
 387 \r
 388 void CRebaseDlg::AddBranchToolTips(CHistoryCombo *pBranch)\r
 389 {\r
 390         if(pBranch)\r
 391         {\r
 392                 CString text=pBranch->GetString();\r
 393                 CString tooltip;\r
 394                 BYTE_VECTOR data;\r
 395                 g_Git.GetLog(data,text,NULL,1,0);\r
 396                 GitRev rev;\r
 397                 rev.ParserFromLog(data);\r
 398                 tooltip.Format(_T("CommitHash:%s\nCommit by: %s  %s\n <b>%s</b> \n %s"),\r
 399                         rev.m_CommitHash,\r
 400                         rev.m_AuthorName,\r
 401                         CAppUtils::FormatDateAndTime(rev.m_AuthorDate,DATE_LONGDATE),\r
 402                         rev.m_Subject,\r
 403                         rev.m_Body);\r
 404 \r
 405                 pBranch->DisableTooltip();\r
 406                 this->m_tooltips.AddTool(pBranch->GetComboBoxCtrl(),tooltip);\r
 407         }\r
 408 }\r
 409 \r
 410 BOOL CRebaseDlg::PreTranslateMessage(MSG*pMsg)\r
 411 {\r
 412         m_tooltips.RelayEvent(pMsg);\r
 413         return CResizableStandAloneDialog::PreTranslateMessage(pMsg);\r
 414 }\r
 415 int CRebaseDlg::CheckRebaseCondition()\r
 416 {\r
 417         this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);\r
 418 \r
 419         if( !g_Git.CheckCleanWorkTree()  )\r
 420         {\r
 421                 CMessageBox::Show(NULL,_T("Rebase Need Clean Working Tree"),_T("TortoiseGit"),MB_OK);\r
 422                 return -1;\r
 423         }\r
 424         //Todo Check $REBASE_ROOT\r
 425         //Todo Check $DOTEST\r
 426 \r
 427         CString cmd;\r
 428         cmd=_T("git.exe var GIT_COMMITTER_IDENT");\r
 429         if(g_Git.Run(cmd,NULL,CP_UTF8))\r
 430                 return -1;\r
 431 \r
 432         //Todo call pre_rebase_hook\r
 433 }\r
 434 int CRebaseDlg::StartRebase()\r
 435 {\r
 436         CString cmd,out;\r
 437         //Todo call comment_for_reflog\r
 438         cmd.Format(_T("git.exe checkout %s"),this->m_BranchCtrl.GetString());\r
 439         this->AddLogString(cmd);\r
 440 \r
 441         if(g_Git.Run(cmd,&out,CP_UTF8))\r
 442                 return -1;\r
 443 \r
 444         this->AddLogString(out);\r
 445 \r
 446         cmd=_T("git.exe rev-parse --verify HEAD");\r
 447         if(g_Git.Run(cmd,&out,CP_UTF8))\r
 448         {\r
 449                 AddLogString(_T("No Head"));\r
 450                 return -1;\r
 451         }\r
 452         //Todo \r
 453         //git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||\r
 454         //              echo "detached HEAD" > "$DOTEST"/head-name\r
 455 \r
 456         cmd.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));\r
 457         if(g_Git.Run(cmd,&out,CP_UTF8))\r
 458         {\r
 459                 AddLogString(_T("update ORIG_HEAD Fail"));\r
 460                 return -1;\r
 461         }\r
 462         \r
 463         cmd.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));\r
 464 \r
 465         cmd.Format(_T("git.exe checkout %s"),this->m_UpstreamCtrl.GetString());\r
 466         this->AddLogString(cmd);\r
 467 \r
 468         out.Empty();\r
 469         if(g_Git.Run(cmd,&out,CP_UTF8))\r
 470         {\r
 471                 return -1;\r
 472         }\r
 473         \r
 474         cmd.Format(_T("git.exe rev-parse %s"),this->m_UpstreamCtrl.GetString());\r
 475         if(g_Git.Run(cmd,&this->m_OrigUpstreamHash,CP_UTF8))\r
 476         {\r
 477                 this->AddLogString(m_OrigUpstreamHash);\r
 478                 return -1;\r
 479         }\r
 480 \r
 481         cmd.Format(_T("git.exe rev-parse %s"),this->m_BranchCtrl.GetString());\r
 482         if(g_Git.Run(cmd,&this->m_OrigBranchHash,CP_UTF8))\r
 483         {\r
 484                 this->AddLogString(m_OrigBranchHash);\r
 485                 return -1;\r
 486         }\r
 487 \r
 488         this->AddLogString(_T("Start Rebase\r\n"));\r
 489         return 0;\r
 490 }\r
 491 void CRebaseDlg::OnBnClickedContinue()\r
 492 {\r
 493         if( m_RebaseStage == CHOOSE_BRANCH|| m_RebaseStage == CHOOSE_COMMIT_PICK_MODE )\r
 494         {\r
 495                 if(CheckRebaseCondition())\r
 496                         return ;\r
 497                 m_RebaseStage = REBASE_START;\r
 498         }\r
 499 \r
 500         if( m_RebaseStage == REBASE_FINISH )\r
 501         {\r
 502                 CString cmd,out;\r
 503                 cmd.Format(_T("git branch -f %s"),this->m_BranchCtrl.GetString());\r
 504                 if(g_Git.Run(cmd,&out,CP_UTF8))\r
 505                 {\r
 506                         AddLogString(out);\r
 507                         return ;\r
 508                 }\r
 509                 cmd.Format(_T("git reset --hard %s"),this->m_OrigUpstreamHash);\r
 510                 if(g_Git.Run(cmd,&out,CP_UTF8))\r
 511                 {\r
 512                         AddLogString(out);\r
 513                         return ;\r
 514                 }\r
 515                 OnOK();\r
 516         }\r
 517 \r
 518         if( m_RebaseStage == REBASE_CONFLICT )\r
 519         {\r
 520                 CTGitPathList list;\r
 521                 if(g_Git.ListConflictFile(list))\r
 522                 {\r
 523                         AddLogString(_T("Get conflict files fail"));\r
 524                         return ;\r
 525                 }\r
 526                 if( list.GetCount() != 0 )\r
 527                 {\r
 528                         CMessageBox::Show(NULL,_T("There are conflict file, you should mark it resolve"),_T("TortoiseGit"),MB_OK);\r
 529                         return;\r
 530                 }\r
 531 \r
 532                 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];\r
 533 \r
 534                 CString out =_T("");\r
 535                 CString cmd;\r
 536                 cmd.Format(_T("git.exe commit -C \"%s\""), curRev->m_CommitHash);\r
 537                 if(g_Git.Run(cmd,&out,CP_UTF8))\r
 538                 {\r
 539                         if(!g_Git.CheckCleanWorkTree())\r
 540                         {\r
 541                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
 542                                 return;\r
 543                         }\r
 544                 }\r
 545                 AddLogString(out);\r
 546                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);\r
 547                 m_RebaseStage=REBASE_CONTINUE;\r
 548                 curRev->m_Action|=CTGitPath::LOGACTIONS_REBASE_DONE;\r
 549                 this->UpdateCurrentStatus();\r
 550         }\r
 551 \r
 552         InterlockedExchange(&m_bThreadRunning, TRUE);\r
 553         SetControlEnable();\r
 554         \r
 555         if (AfxBeginThread(RebaseThreadEntry, this)==NULL)\r
 556         {\r
 557                 InterlockedExchange(&m_bThreadRunning, FALSE);\r
 558                 CMessageBox::Show(NULL, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);\r
 559                 SetControlEnable();\r
 560         }\r
 561 }\r
 562 int CRebaseDlg::GoNext()\r
 563 {\r
 564         if(m_CommitList.m_IsOldFirst)\r
 565                 m_CurrentRebaseIndex++;\r
 566         else\r
 567                 m_CurrentRebaseIndex--; \r
 568         return 0;\r
 569 \r
 570 }\r
 571 int CRebaseDlg::StateAction()\r
 572 {\r
 573         switch(this->m_RebaseStage)\r
 574         {\r
 575         case CHOOSE_BRANCH:\r
 576         case CHOOSE_COMMIT_PICK_MODE:\r
 577                 if(StartRebase())\r
 578                         return -1;\r
 579                 m_RebaseStage = REBASE_START;\r
 580                 GoNext();\r
 581                 break;\r
 582         }\r
 583 \r
 584         return 0;       \r
 585 }\r
 586 void CRebaseDlg::SetContinueButtonText()\r
 587 {\r
 588         CString Text;\r
 589         switch(this->m_RebaseStage)\r
 590         {\r
 591         case CHOOSE_BRANCH:\r
 592         case CHOOSE_COMMIT_PICK_MODE:\r
 593                 Text = _T("Start");\r
 594                 break;\r
 595 \r
 596         case REBASE_START:\r
 597         case REBASE_CONTINUE:\r
 598                 Text = _T("Continue");\r
 599                 break;\r
 600 \r
 601         case REBASE_CONFLICT:\r
 602                 Text = _T("Commit");\r
 603                 break;\r
 604 \r
 605         case REBASE_ABORT:\r
 606         case REBASE_FINISH:\r
 607                 Text = _T("Finish");\r
 608                 break;\r
 609         }\r
 610         this->GetDlgItem(IDC_REBASE_CONTINUE)->SetWindowText(Text);\r
 611 }\r
 612 \r
 613 void CRebaseDlg::SetControlEnable()\r
 614 {\r
 615         switch(this->m_RebaseStage)\r
 616         {\r
 617         case CHOOSE_BRANCH:\r
 618         case CHOOSE_COMMIT_PICK_MODE:\r
 619                 \r
 620                 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(TRUE);\r
 621                 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(TRUE);\r
 622                 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(TRUE);\r
 623                 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(TRUE);\r
 624                 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(TRUE);\r
 625                 this->m_CommitList.m_IsEnableRebaseMenu=TRUE;\r
 626                 break;\r
 627 \r
 628         case REBASE_START:\r
 629         case REBASE_CONTINUE:\r
 630         case REBASE_ABORT:\r
 631         case REBASE_FINISH:\r
 632         case REBASE_CONFLICT:\r
 633                 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(FALSE);\r
 634                 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(FALSE);\r
 635                 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(FALSE);\r
 636                 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(FALSE);\r
 637                 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(FALSE);\r
 638                 this->m_CommitList.m_IsEnableRebaseMenu=FALSE;\r
 639                 break;\r
 640         }\r
 641 \r
 642         if(m_bThreadRunning)\r
 643         {\r
 644                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);\r
 645                 this->GetDlgItem(IDC_REBASE_ABORT)->EnableWindow(FALSE);\r
 646 \r
 647         }else\r
 648         {\r
 649                 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(TRUE);\r
 650                 this->GetDlgItem(IDC_REBASE_ABORT)->EnableWindow(TRUE);\r
 651         }\r
 652 }\r
 653 \r
 654 void CRebaseDlg::UpdateProgress()\r
 655 {\r
 656         int index;\r
 657         CRect rect;\r
 658 \r
 659         if(m_CommitList.m_IsOldFirst)\r
 660                 index = m_CurrentRebaseIndex+1;\r
 661         else\r
 662                 index = m_CommitList.GetItemCount()-m_CurrentRebaseIndex;\r
 663 \r
 664         m_ProgressBar.SetRange(1,m_CommitList.GetItemCount());\r
 665         m_ProgressBar.SetPos(index);\r
 666 \r
 667         if(m_CurrentRebaseIndex>0 && m_CurrentRebaseIndex< m_CommitList.GetItemCount())\r
 668         {\r
 669                 CString text;\r
 670                 text.Format(_T("Rebasing...(%d/%d)"),index,m_CommitList.GetItemCount());\r
 671                 m_CtrlStatusText.SetWindowText(text);\r
 672 \r
 673         }\r
 674 \r
 675         GitRev *prevRev=NULL, *curRev=NULL;\r
 676         int prevIndex;\r
 677 \r
 678         if( m_CurrentRebaseIndex >= 0 && m_CurrentRebaseIndex< m_CommitList.m_arShownList.GetSize())\r
 679         {\r
 680                 curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];\r
 681         }\r
 682         \r
 683         for(int i=0;i<m_CommitList.m_arShownList.GetSize();i++)\r
 684         {\r
 685                 prevRev=(GitRev*)m_CommitList.m_arShownList[i];\r
 686                 if(prevRev->m_Action & CTGitPath::LOGACTIONS_REBASE_CURRENT)\r
 687                 {       \r
 688                         prevRev->m_Action &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT;\r
 689                         m_CommitList.GetItemRect(i,&rect,LVIR_BOUNDS);\r
 690                         m_CommitList.InvalidateRect(rect);\r
 691                 }\r
 692         }\r
 693 \r
 694         if(curRev)\r
 695         {\r
 696                 curRev->m_Action |= CTGitPath::LOGACTIONS_REBASE_CURRENT;\r
 697                 m_CommitList.GetItemRect(m_CurrentRebaseIndex,&rect,LVIR_BOUNDS);\r
 698                 m_CommitList.InvalidateRect(rect);\r
 699         }\r
 700         m_CommitList.EnsureVisible(m_CurrentRebaseIndex,FALSE);\r
 701 \r
 702 }\r
 703 \r
 704 void CRebaseDlg::UpdateCurrentStatus()\r
 705 {\r
 706         if( m_CurrentRebaseIndex < 0)\r
 707         {\r
 708                 if(m_CommitList.m_IsOldFirst)\r
 709                         m_RebaseStage = CRebaseDlg::REBASE_START;\r
 710                 else\r
 711                         m_RebaseStage = CRebaseDlg::REBASE_FINISH;\r
 712         }\r
 713 \r
 714         if( m_CurrentRebaseIndex == m_CommitList.m_arShownList.GetSize())\r
 715         {\r
 716                 if(m_CommitList.m_IsOldFirst)\r
 717                         m_RebaseStage = CRebaseDlg::REBASE_FINISH;\r
 718                 else\r
 719                         m_RebaseStage = CRebaseDlg::REBASE_START;\r
 720         }\r
 721 \r
 722         SetContinueButtonText();\r
 723         SetControlEnable();\r
 724         UpdateProgress();\r
 725 }\r
 726 \r
 727 void CRebaseDlg::AddLogString(CString str)\r
 728 {\r
 729         this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, FALSE);\r
 730         CStringA sTextA = m_wndOutputRebase.StringForControl(str);//CUnicodeUtils::GetUTF8(str);\r
 731         this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)sTextA);\r
 732         this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)"\n");\r
 733         this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, TRUE);\r
 734 }\r
 735 \r
 736 int CRebaseDlg::DoRebase()\r
 737 {       \r
 738         CString cmd,out;\r
 739         if(m_CurrentRebaseIndex <0)\r
 740                 return 0;\r
 741         if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )\r
 742                 return 0;\r
 743 \r
 744         this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);\r
 745 \r
 746         GitRev *pRev = (GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];\r
 747         int mode=pRev->m_Action & CTGitPath::LOGACTIONS_REBASE_MODE_MASK;\r
 748         switch(mode)\r
 749         {\r
 750         case CTGitPath::LOGACTIONS_REBASE_PICK:\r
 751                 AddLogString(CString(_T("Pick "))+pRev->m_CommitHash);\r
 752                 AddLogString(pRev->m_Subject);\r
 753                 cmd.Format(_T("git.exe cherry-pick %s"),pRev->m_CommitHash);\r
 754                 if(g_Git.Run(cmd,&out,CP_UTF8))\r
 755                 {\r
 756                         AddLogString(out);\r
 757                         CTGitPathList list;\r
 758                         if(g_Git.ListConflictFile(list))\r
 759                         {\r
 760                                 AddLogString(_T("Get conflict files fail"));\r
 761                                 return -1;\r
 762                         }\r
 763                         if(list.GetCount() == 0 )\r
 764                         {\r
 765                                 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;\r
 766                                 break;\r
 767                         }\r
 768 \r
 769                         this->m_RebaseStage = REBASE_CONFLICT;\r
 770                         return -1;      \r
 771                 }else\r
 772                 {\r
 773                         AddLogString(out);\r
 774                         pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;\r
 775                 }\r
 776                 break;\r
 777         case CTGitPath::LOGACTIONS_REBASE_SQUASH:\r
 778                 break;\r
 779         case CTGitPath::LOGACTIONS_REBASE_EDIT:\r
 780                 break;\r
 781         case CTGitPath::LOGACTIONS_REBASE_SKIP:\r
 782                 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;\r
 783                 return 0;\r
 784                 break;\r
 785         default:\r
 786                 AddLogString(CString(_T("Unknow Action for "))+pRev->m_CommitHash);\r
 787                 break;\r
 788         }\r
 789         return 0;\r
 790 }\r
 791 \r
 792 BOOL CRebaseDlg::IsEnd()\r
 793 {\r
 794         if(m_CommitList.m_IsOldFirst)\r
 795                 return m_CurrentRebaseIndex>= this->m_CommitList.GetItemCount();\r
 796         else\r
 797                 return m_CurrentRebaseIndex<0;\r
 798 }\r
 799 \r
 800 int CRebaseDlg::RebaseThread()\r
 801 {\r
 802         int ret=0;\r
 803         while(1)\r
 804         {\r
 805                 if( m_RebaseStage == REBASE_START )\r
 806                 {\r
 807                         if( this->StartRebase() )\r
 808                         {\r
 809                                 InterlockedExchange(&m_bThreadRunning, FALSE);\r
 810                                 ret = -1;\r
 811                                 break;\r
 812                         }\r
 813                         m_RebaseStage = REBASE_CONTINUE;\r
 814 \r
 815                 }else if( m_RebaseStage == REBASE_CONTINUE )\r
 816                 {\r
 817                         this->GoNext(); \r
 818                         if(IsEnd())\r
 819                         {\r
 820                                 ret = 0;\r
 821                                 m_RebaseStage = REBASE_FINISH;\r
 822                                 break;\r
 823                         }\r
 824 \r
 825                         ret = DoRebase();\r
 826 \r
 827                         if( ret )\r
 828                         {       \r
 829                                 break;\r
 830                         }\r
 831 \r
 832                 }else\r
 833                         break;\r
 834                 this->PostMessage(MSG_REBASE_UPDATE_UI);\r
 835                 //this->UpdateCurrentStatus();\r
 836         }\r
 837 \r
 838         InterlockedExchange(&m_bThreadRunning, FALSE);\r
 839         this->PostMessage(MSG_REBASE_UPDATE_UI);\r
 840         return ret;\r
 841 }\r
 842 \r
 843 void CRebaseDlg::ListConflictFile()\r
 844 {\r
 845         this->m_FileListCtrl.Clear();   \r
 846         CTGitPathList list;\r
 847         CTGitPath path;\r
 848         list.AddPath(path);\r
 849 \r
 850         this->m_FileListCtrl.GetStatus(list,true);\r
 851         this->m_FileListCtrl.Show(CTGitPath::LOGACTIONS_UNMERGED|CTGitPath::LOGACTIONS_MODIFIED,CTGitPath::LOGACTIONS_UNMERGED);\r
 852         if( this->m_FileListCtrl.GetItemCount() == 0 )\r
 853         {\r
 854                 \r
 855         }\r
 856 }\r
 857 \r
 858 LRESULT CRebaseDlg::OnRebaseUpdateUI(WPARAM,LPARAM)\r
 859 {\r
 860         UpdateCurrentStatus();\r
 861         switch(m_RebaseStage)\r
 862         {\r
 863         case REBASE_CONFLICT:\r
 864                 ListConflictFile();                     \r
 865                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_CONFLICT);\r
 866                 break;\r
 867         default:\r
 868                 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);\r
 869         }       \r
 870         return 0;\r
 871 }\r
 872 \r
 873 void CRebaseDlg::OnBnClickedAbort()\r
 874 {\r
 875         CString cmd,out;\r
 876         if(m_OrigUpstreamHash.IsEmpty())\r
 877         {\r
 878                 this->OnCancel();\r
 879         }\r
 880         cmd.Format(_T("git reset --hard %s"),this->m_OrigUpstreamHash);\r
 881         if(g_Git.Run(cmd,&out,CP_UTF8))\r
 882         {\r
 883                 AddLogString(out);\r
 884                 return ;\r
 885         }\r
 886         \r
 887         cmd.Format(_T("git checkout -f %s"),this->m_BranchCtrl.GetString());\r
 888         if(g_Git.Run(cmd,&out,CP_UTF8))\r
 889         {\r
 890                 AddLogString(out);\r
 891                 return ;\r
 892         }\r
 893         this->OnCancel();\r
 894 }