src/TortoiseProc/SyncDlg.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2008-2013 - TortoiseGit
   4
   5 // This program is free software; you can redistribute it and/or
   6 // modify it under the terms of the GNU General Public License
   7 // as published by the Free Software Foundation; either version 2
   8 // of the License, or (at your option) any later version.
   9
  10 // This program is distributed in the hope that it will be useful,
  11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 // GNU General Public License for more details.
  14
  15 // You should have received a copy of the GNU General Public License
  16 // along with this program; if not, write to the Free Software Foundation,
  17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  18 //
  19
  20 // SyncDlg.cpp : implementation file
  21 //
  22
  23 #include "stdafx.h"
  24 #include "TortoiseProc.h"
  25 #include "SyncDlg.h"
  26 #include "AppUtils.h"
  27 #include "progressdlg.h"
  28 #include "MessageBox.h"
  29 #include "ImportPatchDlg.h"
  30 #include "RebaseDlg.h"
  31 #include "hooks.h"
  32 #include "SmartHandle.h"
  33
  34 // CSyncDlg dialog
  35
  36 IMPLEMENT_DYNAMIC(CSyncDlg, CResizableStandAloneDialog)
  37
  38 CSyncDlg::CSyncDlg(CWnd* pParent /*=NULL*/)
  39         : CResizableStandAloneDialog(CSyncDlg::IDD, pParent)
  40 {
  41         m_CurrentCmd = 0;
  42         m_pTooltip=&this->m_tooltips;
  43         m_bInited=false;
  44         m_CmdOutCurrentPos=0;
  45         m_bAutoLoadPuttyKey = CAppUtils::IsSSHPutty();
  46         m_bForce=false;
  47         m_Gitverion = 0;
  48         m_bBlock = false;
  49         m_pThread = NULL;
  50         m_bAbort = false;
  51         m_GitCmdStatus = -1;
  52         m_startTick = GetTickCount();
  53 }
  54
  55 CSyncDlg::~CSyncDlg()
  56 {
  57 }
  58
  59 void CSyncDlg::DoDataExchange(CDataExchange* pDX)
  60 {
  61         CDialog::DoDataExchange(pDX);
  62         DDX_Check(pDX, IDC_CHECK_PUTTY_KEY, m_bAutoLoadPuttyKey);
  63         DDX_Check(pDX, IDC_CHECK_FORCE,m_bForce);
  64         DDX_Control(pDX, IDC_COMBOBOXEX_URL, m_ctrlURL);
  65         DDX_Control(pDX, IDC_BUTTON_TABCTRL, m_ctrlDumyButton);
  66         DDX_Control(pDX, IDC_BUTTON_PULL, m_ctrlPull);
  67         DDX_Control(pDX, IDC_BUTTON_PUSH, m_ctrlPush);
  68         DDX_Control(pDX, IDC_STATIC_STATUS, m_ctrlStatus);
  69         DDX_Control(pDX, IDC_PROGRESS_SYNC, m_ctrlProgress);
  70         DDX_Control(pDX, IDC_ANIMATE_SYNC, m_ctrlAnimate);
  71         DDX_Control(pDX, IDC_BUTTON_SUBMODULE,m_ctrlSubmodule);
  72         BRANCH_COMBOX_DDX;
  73 }
  74
  75
  76 BEGIN_MESSAGE_MAP(CSyncDlg, CResizableStandAloneDialog)
  77         ON_BN_CLICKED(IDC_BUTTON_PULL, &CSyncDlg::OnBnClickedButtonPull)
  78         ON_BN_CLICKED(IDC_BUTTON_PUSH, &CSyncDlg::OnBnClickedButtonPush)
  79         ON_BN_CLICKED(IDC_BUTTON_APPLY, &CSyncDlg::OnBnClickedButtonApply)
  80         ON_BN_CLICKED(IDC_BUTTON_EMAIL, &CSyncDlg::OnBnClickedButtonEmail)
  81         ON_BN_CLICKED(IDC_BUTTON_MANAGE, &CSyncDlg::OnBnClickedButtonManage)
  82         BRANCH_COMBOX_EVENT
  83         ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_URL, &CSyncDlg::OnCbnEditchangeComboboxex)
  84         ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_REMOTE_BRANCH, &CSyncDlg::OnCbnEditchangeComboboxex)
  85         ON_MESSAGE(MSG_PROGRESSDLG_UPDATE_UI, OnProgressUpdateUI)
  86         ON_NOTIFY(LVN_COLUMNCLICK, IDC_IN_LOGLIST, OnLvnInLogListColumnClick)
  87         ON_BN_CLICKED(IDC_BUTTON_COMMIT, &CSyncDlg::OnBnClickedButtonCommit)
  88         ON_BN_CLICKED(IDC_BUTTON_SUBMODULE, &CSyncDlg::OnBnClickedButtonSubmodule)
  89         ON_WM_TIMER()
  90         ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED, OnTaskbarBtnCreated)
  91         ON_BN_CLICKED(IDC_CHECK_FORCE, &CSyncDlg::OnBnClickedCheckForce)
  92         ON_BN_CLICKED(IDC_LOG, &CSyncDlg::OnBnClickedLog)
  93 END_MESSAGE_MAP()
  94
  95
  96 void CSyncDlg::EnableControlButton(bool bEnabled)
  97 {
  98         GetDlgItem(IDC_BUTTON_PULL)->EnableWindow(bEnabled);
  99         GetDlgItem(IDC_BUTTON_PUSH)->EnableWindow(bEnabled);
 100         GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(bEnabled);
 101         GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(bEnabled);
 102         GetDlgItem(IDOK)->EnableWindow(bEnabled);
 103         GetDlgItem(IDC_BUTTON_SUBMODULE)->EnableWindow(bEnabled);
 104 }
 105 // CSyncDlg message handlers
 106
 107 void CSyncDlg::OnBnClickedButtonPull()
 108 {
 109         int CurrentEntry;
 110         CurrentEntry = (int)this->m_ctrlPull.GetCurrentEntry();
 111         this->m_regPullButton = CurrentEntry;
 112
 113         this->m_bAbort=false;
 114         this->m_GitCmdList.clear();
 115         m_ctrlCmdOut.SetWindowTextW(_T(""));
 116         m_LogText = "";
 117
 118         this->UpdateData();
 119         UpdateCombox();
 120
 121         if (g_Git.GetHash(m_oldHash, _T("HEAD")))
 122         {
 123                 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
 124                 return;
 125         }
 126
 127         if( CurrentEntry == 0)
 128         {
 129                 CGitHash localBranchHash;
 130                 if (g_Git.GetHash(localBranchHash, m_strLocalBranch))
 131                 {
 132                         MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of \"") + m_strLocalBranch + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
 133                         return;
 134                 }
 135                 if (localBranchHash != m_oldHash)
 136                 {
 137                         CMessageBox::Show(NULL, IDS_PROC_SYNC_PULLWRONGBRANCH, IDS_APPNAME, MB_OK | MB_ICONERROR);
 138                         return;
 139                 }
 140         }
 141
 142         if(this->m_strURL.IsEmpty())
 143         {
 144                 CMessageBox::Show(NULL, IDS_PROC_GITCONFIG_URLEMPTY, IDS_APPNAME, MB_OK | MB_ICONERROR);
 145                 return;
 146         }
 147
 148         if (m_bAutoLoadPuttyKey && CurrentEntry != 3) // CurrentEntry (Remote Update) handles this on its own)
 149         {
 150                 CAppUtils::LaunchPAgent(NULL,&this->m_strURL);
 151         }
 152
 153         this->SwitchToRun();
 154
 155         CString force;
 156         if(this->m_bForce)
 157                 force = _T(" --force ");
 158
 159         CString cmd;
 160
 161         ShowTab(IDC_CMD_LOG);
 162
 163         this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,false);
 164         this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);
 165         this->m_ctrlTabCtrl.ShowTab(IDC_IN_CONFLICT-1,false);
 166
 167         ///Pull
 168         if(CurrentEntry == 0) //Pull
 169         {
 170                 CString remotebranch;
 171                 remotebranch = m_strRemoteBranch;
 172
 173                 if(!IsURL())
 174                 {
 175                         CString configName;
 176                         configName.Format(L"branch.%s.merge", this->m_strLocalBranch);
 177                         CString pullBranch = CGit::StripRefName(g_Git.GetConfigValue(configName));
 178
 179                         configName.Format(L"branch.%s.remote", m_strLocalBranch);
 180                         CString pullRemote = g_Git.GetConfigValue(configName);
 181
 182                         if(pullBranch == remotebranch && pullRemote == this->m_strURL)
 183                                 remotebranch.Empty();
 184                 }
 185
 186                 if(m_Gitverion >= 0x01070203) //above 1.7.0.2
 187                         force += _T("--progress ");
 188
 189                 cmd.Format(_T("git.exe pull -v %s \"%s\" %s"),
 190                                 force,
 191                                 m_strURL,
 192                                 remotebranch);
 193
 194                 m_CurrentCmd = GIT_COMMAND_PULL;
 195                 m_GitCmdList.push_back(cmd);
 196
 197                 m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
 198                 if (m_pThread==NULL)
 199                 {
 200                 //              ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
 201                 }
 202                 else
 203                 {
 204                         m_pThread->m_bAutoDelete = TRUE;
 205                         m_pThread->ResumeThread();
 206                 }
 207
 208         }
 209
 210         ///Fetch
 211         if(CurrentEntry == 1 || CurrentEntry ==2 ) //Fetch
 212         {
 213                 CString remotebranch;
 214                 if(this->IsURL() || m_strRemoteBranch.IsEmpty())
 215                 {
 216                         remotebranch=this->m_strRemoteBranch;
 217
 218                 }
 219                 else
 220                 {
 221                         remotebranch.Format(_T("remotes/%s/%s"),
 222                                                                 m_strURL,m_strRemoteBranch);
 223                         CGitHash remoteBranchHash;
 224                         g_Git.GetHash(remoteBranchHash, remotebranch);
 225                         if (remoteBranchHash.IsEmpty())
 226                                 remotebranch=m_strRemoteBranch;
 227                         else
 228                                 remotebranch=m_strRemoteBranch+_T(":")+remotebranch;
 229                 }
 230
 231                 if(m_Gitverion >= 0x01070203) //above 1.7.0.2
 232                         force += _T("--progress ");
 233
 234                 cmd.Format(_T("git.exe fetch -v %s \"%s\" %s"),
 235                                 force,
 236                                 m_strURL,
 237                                 remotebranch);
 238
 239                 if(CurrentEntry == 1)
 240                         m_CurrentCmd = GIT_COMMAND_FETCH;
 241                 else
 242                         m_CurrentCmd = GIT_COMMAND_FETCHANDREBASE;
 243                 m_GitCmdList.push_back(cmd);
 244
 245                 m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
 246                 if (m_pThread==NULL)
 247                 {
 248                 //              ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
 249                 }
 250                 else
 251                 {
 252                         m_pThread->m_bAutoDelete = TRUE;
 253                         m_pThread->ResumeThread();
 254                 }
 255         }
 256
 257         ///Remote Update
 258         if(CurrentEntry == 3)
 259         {
 260                 if (m_bAutoLoadPuttyKey)
 261                 {
 262                         STRING_VECTOR list;
 263                         if (!g_Git.GetRemoteList(list))
 264                         {
 265                                 for (size_t i = 0; i < list.size(); ++i)
 266                                         CAppUtils::LaunchPAgent(NULL, &list[i]);
 267                         }
 268                 }
 269
 270                 m_CurrentCmd = GIT_COMMAND_REMOTE;
 271                 cmd=_T("git.exe remote update");
 272                 m_GitCmdList.push_back(cmd);
 273
 274                 InterlockedExchange(&m_bBlock, TRUE);
 275
 276                 m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
 277                 if (m_pThread==NULL)
 278                 {
 279                 //              ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
 280                         InterlockedExchange(&m_bBlock, FALSE);
 281                 }
 282                 else
 283                 {
 284                         m_pThread->m_bAutoDelete = TRUE;
 285                         m_pThread->ResumeThread();
 286                 }
 287         }
 288
 289         ///Cleanup stale remote banches
 290         if(CurrentEntry == 4)
 291         {
 292                 m_CurrentCmd = GIT_COMMAND_REMOTE;
 293                 cmd.Format(_T("git.exe remote prune \"%s\""), m_strURL);
 294                 m_GitCmdList.push_back(cmd);
 295
 296                 InterlockedExchange(&m_bBlock, TRUE);
 297
 298                 m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
 299                 if (m_pThread==NULL)
 300                 {
 301                 //              ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
 302                         InterlockedExchange(&m_bBlock, FALSE);
 303                 }
 304                 else
 305                 {
 306                         m_pThread->m_bAutoDelete = TRUE;
 307                         m_pThread->ResumeThread();
 308                 }
 309         }
 310 }
 311
 312 void CSyncDlg::PullComplete()
 313 {
 314         EnableControlButton(true);
 315         SwitchToInput();
 316         this->FetchOutList(true);
 317
 318         CGitHash newhash;
 319         if (g_Git.GetHash(newhash, _T("HEAD")))
 320                 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash after pulling.")), _T("TortoiseGit"), MB_ICONERROR);
 321
 322         if( this ->m_GitCmdStatus )
 323         {
 324                 CTGitPathList list;
 325                 if(g_Git.ListConflictFile(list))
 326                 {
 327                         this->m_ctrlCmdOut.SetSel(-1,-1);
 328                         this->m_ctrlCmdOut.ReplaceSel(_T("Get conflict files fail\n"));
 329
 330                         this->ShowTab(IDC_CMD_LOG);
 331                         return;
 332                 }
 333
 334                 if(list.GetCount()>0)
 335                 {
 336                         this->m_ConflictFileList.Clear();
 337                         CTGitPathList list;
 338                         CTGitPath path;
 339                         list.AddPath(path);
 340
 341                         this->m_ConflictFileList.GetStatus(&list,true);
 342                         this->m_ConflictFileList.Show(CTGitPath::LOGACTIONS_UNMERGED,
 343                                                                                         CTGitPath::LOGACTIONS_UNMERGED);
 344
 345                         this->ShowTab(IDC_IN_CONFLICT);
 346                 }
 347                 else
 348                         this->ShowTab(IDC_CMD_LOG);
 349
 350         }
 351         else
 352         {
 353                 if(newhash == this->m_oldHash)
 354                 {
 355                         this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);
 356                         this->m_InLogList.ShowText(CString(MAKEINTRESOURCE(IDS_UPTODATE)));
 357                         this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);
 358                 }
 359                 else
 360                 {
 361                         this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,true);
 362                         this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);
 363
 364                         this->AddDiffFileList(&m_InChangeFileList, &m_arInChangeList, newhash.ToString(), m_oldHash.ToString());
 365
 366                         m_InLogList.FillGitLog(NULL,CGit::      LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,
 367                                 &m_oldHash.ToString(), &newhash.ToString());
 368                 }
 369                 this->ShowTab(IDC_IN_LOGLIST);
 370         }
 371 }
 372
 373 void CSyncDlg::FetchComplete()
 374 {
 375         EnableControlButton(true);
 376         SwitchToInput();
 377         this->FetchOutList(true);
 378
 379         ShowTab(IDC_CMD_LOG);
 380         if( (!this->m_GitCmdStatus) && this->m_CurrentCmd == GIT_COMMAND_FETCHANDREBASE)
 381         {
 382                 CRebaseDlg dlg;
 383                 dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
 384                 dlg.m_PostButtonTexts.Add(_T("Email &Patch..."));
 385                 INT_PTR response = dlg.DoModal();
 386                 if(response == IDOK)
 387                 {
 388                         return ;
 389                 }
 390
 391                 if (response == IDC_REBASE_POST_BUTTON)
 392                 {
 393                         CString cmd = _T("/command:log");
 394                         cmd += _T(" /path:\"") + g_Git.m_CurrentDir + _T("\"");
 395                         CAppUtils::RunTortoiseGitProc(cmd);
 396                 }
 397                 if(response == IDC_REBASE_POST_BUTTON + 1)
 398                 {
 399                         CString cmd, out, err;
 400                         cmd.Format(_T("git.exe  format-patch -o \"%s\" %s..%s"),
 401                                         g_Git.m_CurrentDir,
 402                                         g_Git.FixBranchName(dlg.m_Upstream),
 403                                         g_Git.FixBranchName(dlg.m_Branch));
 404                         if (g_Git.Run(cmd, &out, &err, CP_UTF8))
 405                         {
 406                                 CMessageBox::Show(NULL, out + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
 407                                 return ;
 408                         }
 409
 410                         CAppUtils::SendPatchMail(cmd,out);
 411                 }
 412         }
 413 }
 414
 415 void CSyncDlg::OnBnClickedButtonPush()
 416 {
 417         this->UpdateData();
 418         UpdateCombox();
 419         m_ctrlCmdOut.SetWindowTextW(_T(""));
 420         m_LogText = "";
 421
 422         if(this->m_strURL.IsEmpty())
 423         {
 424                 CMessageBox::Show(NULL, IDS_PROC_GITCONFIG_URLEMPTY, IDS_APPNAME, MB_OK | MB_ICONERROR);
 425                 return;
 426         }
 427
 428         this->m_regPushButton=(DWORD)this->m_ctrlPush.GetCurrentEntry();
 429         this->SwitchToRun();
 430         this->m_bAbort=false;
 431         this->m_GitCmdList.clear();
 432
 433         ShowTab(IDC_CMD_LOG);
 434
 435         CString cmd;
 436         CString arg;
 437
 438         CString error;
 439         DWORD exitcode;
 440         CTGitPathList list;
 441         list.AddPath(CTGitPath(g_Git.m_CurrentDir));
 442
 443         if (CHooks::Instance().PrePush(list,exitcode, error))
 444         {
 445                 if (exitcode)
 446                 {
 447                         CString temp;
 448                         temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
 449                         //ReportError(temp);
 450                         CMessageBox::Show(NULL,temp,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
 451                         return ;
 452                 }
 453         }
 454
 455         switch (m_ctrlPush.GetCurrentEntry())
 456         {
 457         case 1:
 458                 arg += _T(" --tags ");
 459                 break;
 460         case 2:
 461                 arg += _T(" --all ");
 462                 break;
 463         }
 464
 465         if(this->m_bForce)
 466                 arg += _T(" --force ");
 467
 468         if(m_Gitverion >= 0x01070203) //above 1.7.0.2
 469                 arg += _T("--progress ");
 470
 471         cmd.Format(_T("git.exe push -v %s \"%s\" %s"),
 472                                 arg,
 473                                 m_strURL,
 474                                 g_Git.FixBranchName(m_strLocalBranch));
 475
 476         if (!m_strRemoteBranch.IsEmpty())
 477         {
 478                 cmd += _T(":") + m_strRemoteBranch;
 479         }
 480
 481         m_GitCmdList.push_back(cmd);
 482
 483         m_CurrentCmd = GIT_COMMAND_PUSH;
 484
 485         if(this->m_bAutoLoadPuttyKey)
 486         {
 487                 CAppUtils::LaunchPAgent(NULL,&this->m_strURL);
 488         }
 489
 490         m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
 491         if (m_pThread==NULL)
 492         {
 493 //              ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
 494         }
 495         else
 496         {
 497                 m_pThread->m_bAutoDelete = TRUE;
 498                 m_pThread->ResumeThread();
 499         }
 500 }
 501
 502 void CSyncDlg::OnBnClickedButtonApply()
 503 {
 504         CGitHash oldhash;
 505         if (g_Git.GetHash(oldhash, _T("HEAD")))
 506         {
 507                 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
 508                 return;
 509         }
 510
 511         CImportPatchDlg dlg;
 512         CString cmd,output;
 513
 514         if(dlg.DoModal() == IDOK)
 515         {
 516                 int err=0;
 517                 for(int i=0;i<dlg.m_PathList.GetCount();i++)
 518                 {
 519                         cmd.Format(_T("git.exe am \"%s\""),dlg.m_PathList[i].GetGitPathString());
 520
 521                         if (g_Git.Run(cmd, &output, CP_UTF8))
 522                         {
 523                                 CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);
 524
 525                                 err=1;
 526                                 break;
 527                         }
 528                         this->m_ctrlCmdOut.SetSel(-1,-1);
 529                         this->m_ctrlCmdOut.ReplaceSel(cmd+_T("\n"));
 530                         this->m_ctrlCmdOut.SetSel(-1,-1);
 531                         this->m_ctrlCmdOut.ReplaceSel(output);
 532                 }
 533
 534                 CGitHash newhash;
 535                 if (g_Git.GetHash(newhash, _T("HEAD")))
 536                 {
 537                         MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash after applying patches.")), _T("TortoiseGit"), MB_ICONERROR);
 538                         return;
 539                 }
 540
 541                 this->m_InLogList.Clear();
 542                 this->m_InChangeFileList.Clear();
 543
 544                 if(newhash == oldhash)
 545                 {
 546                         this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);
 547                         this->m_InLogList.ShowText(_T("No commits get from patch"));
 548                         this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);
 549
 550                 }
 551                 else
 552                 {
 553                         this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,true);
 554                         this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);
 555
 556                         this->AddDiffFileList(&m_InChangeFileList, &m_arInChangeList, newhash.ToString(), oldhash.ToString());
 557                         m_InLogList.FillGitLog(NULL,CGit::      LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,
 558                                 &oldhash.ToString(), &newhash.ToString());
 559
 560                         this->FetchOutList(true);
 561                 }
 562
 563                 this->m_ctrlTabCtrl.ShowTab(IDC_CMD_LOG-1,true);
 564
 565                 if(err)
 566                 {
 567                         this->ShowTab(IDC_CMD_LOG);
 568                 }
 569                 else
 570                 {
 571                         this->ShowTab(IDC_IN_LOGLIST);
 572                 }
 573         }
 574 }
 575
 576 void CSyncDlg::OnBnClickedButtonEmail()
 577 {
 578         CString cmd, out, err;
 579
 580         this->m_strLocalBranch = this->m_ctrlLocalBranch.GetString();
 581         this->m_ctrlRemoteBranch.GetWindowText(this->m_strRemoteBranch);
 582         this->m_ctrlURL.GetWindowText(this->m_strURL);
 583         m_strURL=m_strURL.Trim();
 584         m_strRemoteBranch=m_strRemoteBranch.Trim();
 585
 586         cmd.Format(_T("git.exe  format-patch -o \"%s\" %s..%s"),
 587                                         g_Git.m_CurrentDir,
 588                                         m_strURL+_T('/')+m_strRemoteBranch,g_Git.FixBranchName(m_strLocalBranch));
 589
 590         if (g_Git.Run(cmd, &out, &err, CP_UTF8))
 591         {
 592                 CMessageBox::Show(NULL, out + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
 593                 return ;
 594         }
 595
 596         CAppUtils::SendPatchMail(cmd,out);
 597
 598 }
 599 void CSyncDlg::ShowProgressCtrl(bool bShow)
 600 {
 601         int b=bShow?SW_NORMAL:SW_HIDE;
 602         this->m_ctrlAnimate.ShowWindow(b);
 603         this->m_ctrlProgress.ShowWindow(b);
 604         this->m_ctrlAnimate.Open(IDR_DOWNLOAD);
 605         if(b == SW_NORMAL)
 606                 this->m_ctrlAnimate.Play(0, UINT_MAX, UINT_MAX);
 607         else
 608                 this->m_ctrlAnimate.Stop();
 609 }
 610 void CSyncDlg::ShowInputCtrl(bool bShow)
 611 {
 612         int b=bShow?SW_NORMAL:SW_HIDE;
 613         this->m_ctrlURL.ShowWindow(b);
 614         this->m_ctrlLocalBranch.ShowWindow(b);
 615         this->m_ctrlRemoteBranch.ShowWindow(b);
 616         this->GetDlgItem(IDC_BUTTON_LOCAL_BRANCH)->ShowWindow(b);
 617         this->GetDlgItem(IDC_BUTTON_REMOTE_BRANCH)->ShowWindow(b);
 618         this->GetDlgItem(IDC_STATIC_LOCAL_BRANCH)->ShowWindow(b);
 619         this->GetDlgItem(IDC_STATIC_REMOTE_BRANCH)->ShowWindow(b);
 620         this->GetDlgItem(IDC_BUTTON_MANAGE)->ShowWindow(b);
 621         this->GetDlgItem(IDC_CHECK_PUTTY_KEY)->ShowWindow(b);
 622         this->GetDlgItem(IDC_CHECK_FORCE)->ShowWindow(b);
 623         this->GetDlgItem(IDC_STATIC_REMOTE_URL)->ShowWindow(b);
 624 }
 625 BOOL CSyncDlg::OnInitDialog()
 626 {
 627         CResizableStandAloneDialog::OnInitDialog();
 628         CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
 629
 630         // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
 631         // do this, Explorer would be unable to send that message to our window if we
 632         // were running elevated. It's OK to make the call all the time, since if we're
 633         // not elevated, this is a no-op.
 634         CHANGEFILTERSTRUCT cfs = { sizeof(CHANGEFILTERSTRUCT) };
 635         typedef BOOL STDAPICALLTYPE ChangeWindowMessageFilterExDFN(HWND hWnd, UINT message, DWORD action, PCHANGEFILTERSTRUCT pChangeFilterStruct);
 636         CAutoLibrary hUser = AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
 637         if (hUser)
 638         {
 639                 ChangeWindowMessageFilterExDFN *pfnChangeWindowMessageFilterEx = (ChangeWindowMessageFilterExDFN*)GetProcAddress(hUser, "ChangeWindowMessageFilterEx");
 640                 if (pfnChangeWindowMessageFilterEx)
 641                 {
 642                         pfnChangeWindowMessageFilterEx(m_hWnd, WM_TASKBARBTNCREATED, MSGFLT_ALLOW, &cfs);
 643                 }
 644         }
 645         m_pTaskbarList.Release();
 646         m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
 647
 648         this->GetDlgItem(IDC_CHECK_PUTTY_KEY)->EnableWindow(CAppUtils::IsSSHPutty());
 649
 650         /*
 651         this->m_ctrlAnimate.ShowWindow(SW_NORMAL);
 652         this->m_ctrlAnimate.Open(IDR_DOWNLOAD);
 653         this->m_ctrlAnimate.Play(0,-1,-1);
 654         */
 655
 656         // ------------------ Create Tabctrl -----------
 657         CWnd *pwnd=this->GetDlgItem(IDC_BUTTON_TABCTRL);
 658         CRect rectDummy;
 659         pwnd->GetWindowRect(&rectDummy);
 660         this->ScreenToClient(rectDummy);
 661
 662         if (!m_ctrlTabCtrl.Create(CMFCTabCtrl::STYLE_FLAT, rectDummy, this, IDC_SYNC_TAB))
 663         {
 664                 TRACE0("Failed to create output tab window\n");
 665                 return FALSE;      // fail to create
 666         }
 667         m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);
 668
 669         // -------------Create Command Log Ctrl ---------
 670         DWORD dwStyle;
 671         dwStyle= ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL | ES_AUTOVSCROLL |WS_VSCROLL  ;
 672
 673         if( !m_ctrlCmdOut.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_CMD_LOG))
 674         {
 675                 TRACE0("Failed to create Log commits window\n");
 676                 return FALSE;      // fail to create
 677         }
 678
 679         // set the font to use in the log message view, configured in the settings dialog
 680         CFont m_logFont;
 681         CAppUtils::CreateFontForLogs(m_logFont);
 682         //GetDlgItem(IDC_CMD_LOG)->SetFont(&m_logFont);
 683         m_ctrlCmdOut.SetFont(&m_logFont);
 684         m_ctrlTabCtrl.InsertTab(&m_ctrlCmdOut, CString(MAKEINTRESOURCE(IDS_LOG)), -1);
 685
 686         //m_ctrlCmdOut.ReplaceSel(_T("Hello"));
 687
 688         //----------  Create in coming list ctrl -----------
 689         dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE;;
 690
 691         if( !m_InLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_IN_LOGLIST))
 692         {
 693                 TRACE0("Failed to create output commits window\n");
 694                 return FALSE;      // fail to create
 695         }
 696
 697         m_ctrlTabCtrl.InsertTab(&m_InLogList, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_INCOMMITS)), -1);
 698
 699         m_InLogList.m_ColumnRegKey=_T("SyncIn");
 700         m_InLogList.InsertGitColumn();
 701
 702         //----------- Create In Change file list -----------
 703         dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;
 704
 705         if( !m_InChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_IN_CHANGELIST))
 706         {
 707                 TRACE0("Failed to create output change files window\n");
 708                 return FALSE;      // fail to create
 709         }
 710         m_ctrlTabCtrl.InsertTab(&m_InChangeFileList, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_INCHANGELIST)), -1);
 711
 712         m_InChangeFileList.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL , _T("InSyncDlg"),
 713                                                         (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO)|
 714                                                         CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2)), false, true, GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD| GITSLC_COLDEL);
 715
 716
 717         //---------- Create Conflict List Ctrl -----------------
 718         dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;
 719
 720         if( !m_ConflictFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_IN_CONFLICT))
 721         {
 722                 TRACE0("Failed to create output change files window\n");
 723                 return FALSE;      // fail to create
 724         }
 725         m_ctrlTabCtrl.InsertTab(&m_ConflictFileList, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_CONFLICTS)), -1);
 726
 727         m_ConflictFileList.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL , _T("ConflictSyncDlg"),
 728                                                         (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO)|
 729                                                         CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2)|
 730                                                         GITSLC_POPCONFLICT|GITSLC_POPRESOLVE),false);
 731
 732
 733         //----------  Create Commit Out List Ctrl---------------
 734
 735         dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE;;
 736
 737         if( !m_OutLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_LOGLIST))
 738         {
 739                 TRACE0("Failed to create output commits window\n");
 740                 return FALSE;      // fail to create
 741
 742         }
 743
 744         m_ctrlTabCtrl.InsertTab(&m_OutLogList, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_OUTCOMMITS)), -1);
 745
 746         m_OutLogList.m_ColumnRegKey = _T("SyncOut");
 747         m_OutLogList.InsertGitColumn();
 748
 749         //------------- Create Change File List Control ----------------
 750
 751         dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;
 752
 753         if( !m_OutChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_CHANGELIST))
 754         {
 755                 TRACE0("Failed to create output change files window\n");
 756                 return FALSE;      // fail to create
 757         }
 758         m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_OUTCHANGELIST)), -1);
 759
 760         m_OutChangeFileList.Init(GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD | GITSLC_COLDEL, _T("OutSyncDlg"),
 761                                                         (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO)|
 762                                                         CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2)), false, true, GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD| GITSLC_COLDEL);
 763
 764         this->m_tooltips.Create(this);
 765
 766         AddAnchor(IDC_SYNC_TAB,TOP_LEFT,BOTTOM_RIGHT);
 767
 768         AddAnchor(IDC_GROUP_INFO,TOP_LEFT,TOP_RIGHT);
 769         AddAnchor(IDC_COMBOBOXEX_URL,TOP_LEFT,TOP_RIGHT);
 770         AddAnchor(IDC_BUTTON_MANAGE,TOP_RIGHT);
 771         AddAnchor(IDC_BUTTON_PULL,BOTTOM_LEFT);
 772         AddAnchor(IDC_BUTTON_PUSH,BOTTOM_LEFT);
 773         AddAnchor(IDC_BUTTON_SUBMODULE,BOTTOM_LEFT);
 774         AddAnchor(IDC_BUTTON_APPLY,BOTTOM_RIGHT);
 775         AddAnchor(IDC_BUTTON_EMAIL,BOTTOM_RIGHT);
 776         AddAnchor(IDC_PROGRESS_SYNC,TOP_LEFT,TOP_RIGHT);
 777         AddAnchor(IDOK,BOTTOM_RIGHT);
 778         AddAnchor(IDHELP,BOTTOM_RIGHT);
 779         AddAnchor(IDC_STATIC_STATUS, BOTTOM_LEFT, BOTTOM_RIGHT);
 780         AddAnchor(IDC_ANIMATE_SYNC,TOP_LEFT);
 781         AddAnchor(IDC_BUTTON_COMMIT,BOTTOM_LEFT);
 782         AddAnchor(IDC_LOG, BOTTOM_LEFT);
 783
 784         // do not use BRANCH_COMBOX_ADD_ANCHOR here, we want to have different stylings
 785         AddAnchor(IDC_COMBOBOXEX_LOCAL_BRANCH, TOP_LEFT,TOP_CENTER);
 786         AddAnchor(IDC_COMBOBOXEX_REMOTE_BRANCH, TOP_CENTER, TOP_RIGHT);
 787         AddAnchor(IDC_BUTTON_LOCAL_BRANCH, TOP_CENTER);
 788         AddAnchor(IDC_BUTTON_REMOTE_BRANCH, TOP_RIGHT);
 789         AddAnchor(IDC_STATIC_REMOTE_BRANCH, TOP_CENTER);
 790
 791         AdjustControlSize(IDC_CHECK_PUTTY_KEY);
 792         AdjustControlSize(IDC_CHECK_FORCE);
 793
 794         CString WorkingDir=g_Git.m_CurrentDir;
 795         WorkingDir.Replace(_T(':'),_T('_'));
 796         m_RegKeyRemoteBranch = CString(_T("Software\\TortoiseGit\\History\\SyncBranch\\"))+WorkingDir;
 797
 798
 799         this->AddOthersToAnchor();
 800
 801         this->m_ctrlPush.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PUSH)));
 802         this->m_ctrlPush.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PUSHTAGS)));
 803         ///this->m_ctrlPush.AddEntry(CString(_T("Push All")));
 804
 805         this->m_ctrlPull.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PULL)));
 806         this->m_ctrlPull.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_FETCH)));
 807         this->m_ctrlPull.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_FETCHREBASE)));
 808         this->m_ctrlPull.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_REMOTEUPDATE)));
 809         this->m_ctrlPull.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_CLEANUPSTALEBRANCHES)));
 810
 811         this->m_ctrlSubmodule.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULEUPDATE)));
 812         this->m_ctrlSubmodule.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULEINIT)));
 813         this->m_ctrlSubmodule.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULESYNC)));
 814
 815         WorkingDir.Replace(_T(':'),_T('_'));
 816
 817         CString regkey ;
 818         regkey.Format(_T("Software\\TortoiseGit\\TortoiseProc\\Sync\\%s"),WorkingDir);
 819
 820         this->m_regPullButton = CRegDWORD(regkey+_T("\\Pull"),0);
 821         this->m_regPushButton = CRegDWORD(regkey+_T("\\Push"),0);
 822         this->m_regSubmoduleButton = CRegDWORD(regkey+_T("\\Submodule"));
 823         this->m_regAutoLoadPutty = CRegDWORD(regkey + _T("\\AutoLoadPutty"), CAppUtils::IsSSHPutty());
 824
 825         this->UpdateData();
 826         this->m_bAutoLoadPuttyKey  = m_regAutoLoadPutty;
 827         if(!CAppUtils::IsSSHPutty())
 828                 m_bAutoLoadPuttyKey = false;
 829         this->UpdateData(FALSE);
 830
 831         this->m_ctrlPull.SetCurrentEntry(this->m_regPullButton);
 832         this->m_ctrlPush.SetCurrentEntry(this->m_regPushButton);
 833         this->m_ctrlSubmodule.SetCurrentEntry(this->m_regSubmoduleButton);
 834
 835         CString sWindowTitle;
 836         GetWindowText(sWindowTitle);
 837         CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle);
 838
 839         EnableSaveRestore(_T("SyncDlg"));
 840
 841         this->m_ctrlURL.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\SyncURL\\"))+WorkingDir, _T("url"));
 842
 843         STRING_VECTOR list;
 844
 845         if(!g_Git.GetRemoteList(list))
 846         {
 847                 for(unsigned int i=0;i<list.size();i++)
 848                 {
 849                         m_ctrlURL.AddString(list[i]);
 850                 }
 851         }
 852         m_ctrlURL.SetCurSel(0);
 853         m_ctrlRemoteBranch.SetCurSel(0);
 854         m_ctrlURL.SetURLHistory(true);
 855
 856         this->LoadBranchInfo();
 857
 858         this->m_bInited=true;
 859         FetchOutList();
 860
 861         m_ctrlTabCtrl.ShowTab(IDC_CMD_LOG-1,false);
 862         m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,false);
 863         m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);
 864         m_ctrlTabCtrl.ShowTab(IDC_IN_CONFLICT-1,false);
 865
 866         m_ctrlRemoteBranch.m_bWantReturn = TRUE;
 867         m_ctrlURL.m_bWantReturn = TRUE;
 868
 869         this->m_Gitverion = CAppUtils::GetMsysgitVersion();
 870
 871         return TRUE;  // return TRUE unless you set the focus to a control
 872         // EXCEPTION: OCX Property Pages should return FALSE
 873 }
 874
 875 void CSyncDlg::OnBnClickedButtonManage()
 876 {
 877         CAppUtils::LaunchRemoteSetting();
 878         Refresh();
 879 }
 880
 881 void CSyncDlg::Refresh()
 882 {
 883         theApp.DoWaitCursor(1);
 884
 885         int lastSelected = m_ctrlURL.GetCurSel();
 886         CString url;
 887         this->m_ctrlURL.GetWindowText(url);
 888
 889         this->m_ctrlURL.Reset();
 890         CString workingDir = g_Git.m_CurrentDir;
 891         workingDir.Replace(_T(':'), _T('_'));
 892         this->m_ctrlURL.LoadHistory(_T("Software\\TortoiseGit\\History\\SyncURL\\") + workingDir, _T("url"));
 893
 894         STRING_VECTOR list;
 895         bool found = false;
 896         if (!g_Git.GetRemoteList(list))
 897         {
 898                 for (int i = 0; i < list.size(); i++)
 899                 {
 900                         m_ctrlURL.AddString(list[i]);
 901                         if (list[i] == url)
 902                                 found = true;
 903                 }
 904         }
 905         if (lastSelected >= 0 && !found)
 906         {
 907                 m_ctrlURL.SetCurSel(0);
 908                 m_ctrlURL.GetWindowText(url);
 909         }
 910
 911         CString local;
 912         CString remote;
 913         this->m_ctrlLocalBranch.GetWindowText(local);
 914         this->m_ctrlRemoteBranch.GetWindowText(remote);
 915
 916         this->LoadBranchInfo();
 917
 918         this->m_ctrlLocalBranch.AddString(local);
 919         this->m_ctrlRemoteBranch.AddString(remote);
 920         this->m_ctrlURL.AddString(url);
 921
 922         m_OutLogList.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_REFRESHING)));
 923         this->FetchOutList(true);
 924         theApp.DoWaitCursor(-1);
 925 }
 926
 927 BOOL CSyncDlg::PreTranslateMessage(MSG* pMsg)
 928 {
 929         if (pMsg->message == WM_KEYDOWN)
 930         {
 931                 switch (pMsg->wParam)
 932                 {
 933
 934                 case VK_F5:
 935                         {
 936                                 if (m_bBlock)
 937                                         return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
 938                                 Refresh();
 939                         }
 940                 break;
 941
 942                 /* Avoid TAB control destroy but dialog exist*/
 943                 case VK_ESCAPE:
 944                 case VK_CANCEL:
 945                         {
 946                                 TCHAR buff[128];
 947                                 ::GetClassName(pMsg->hwnd,buff,128);
 948
 949                                 if(_tcsnicmp(buff,_T("RichEdit20W"),128)==0)
 950                                 {
 951                                         this->PostMessage(WM_KEYDOWN,VK_ESCAPE,0);
 952                                         return TRUE;
 953                                 }
 954                         }
 955                 }
 956         }
 957         m_tooltips.RelayEvent(pMsg);
 958         return __super::PreTranslateMessage(pMsg);
 959 }
 960 void CSyncDlg::FetchOutList(bool force)
 961 {
 962         if(!m_bInited)
 963                 return;
 964         m_OutChangeFileList.Clear();
 965         this->m_OutLogList.Clear();
 966
 967         CString remote;
 968         this->m_ctrlURL.GetWindowText(remote);
 969         CString remotebranch;
 970         this->m_ctrlRemoteBranch.GetWindowText(remotebranch);
 971         remotebranch=remote+_T("/")+remotebranch;
 972         CGitHash remotebranchHash;
 973         g_Git.GetHash(remotebranchHash, remotebranch);
 974
 975         if(IsURL())
 976         {
 977                 CString str;
 978                 str.LoadString(IDS_PROC_SYNC_PUSH_UNKNOWN);
 979                 m_OutLogList.ShowText(str);
 980                 this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);
 981                 m_OutLocalBranch.Empty();
 982                 m_OutRemoteBranch.Empty();
 983
 984                 this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(FALSE);
 985                 return ;
 986
 987         }
 988         else if(remotebranchHash.IsEmpty())
 989         {
 990                 CString str;
 991                 str.Format(IDS_PROC_SYNC_PUSH_UNKNOWNBRANCH, remotebranch);
 992                 m_OutLogList.ShowText(str);
 993                 this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);
 994                 m_OutLocalBranch.Empty();
 995                 m_OutRemoteBranch.Empty();
 996
 997                 this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(FALSE);
 998                 return ;
 999         }
1000         else
1001         {
1002                 CString localbranch;
1003                 localbranch=this->m_ctrlLocalBranch.GetString();
1004
1005                 if(localbranch != m_OutLocalBranch || m_OutRemoteBranch != remotebranch || force)
1006                 {
1007                         m_OutLogList.ClearText();
1008
1009                         CGitHash base, localBranchHash;
1010                         bool isFastForward = g_Git.IsFastForward(remotebranch, localbranch, &base);
1011
1012                         if (g_Git.GetHash(localBranchHash, localbranch))
1013                         {
1014                                 MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of \"") + localbranch + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
1015                                 return;
1016                         }
1017                         if (remotebranchHash == localBranchHash)
1018                         {
1019                                 CString str;
1020                                 str.Format(IDS_PROC_SYNC_COMMITSAHEAD, 0, remotebranch);
1021                                 m_OutLogList.ShowText(str);
1022                                 this->m_ctrlStatus.SetWindowText(str);
1023                                 this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);
1024                                 this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(FALSE);
1025                         }
1026                         else if (isFastForward || m_bForce)
1027                         {
1028                                 //fast forward
1029                                 m_OutLogList.FillGitLog(NULL, CGit::LOG_INFO_STAT | CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE, &remotebranch, &localbranch);
1030                                 CString str;
1031                                 str.Format(IDS_PROC_SYNC_COMMITSAHEAD, m_OutLogList.GetItemCount(), remotebranch);
1032                                 this->m_ctrlStatus.SetWindowText(str);
1033
1034                                 if (isFastForward)
1035                                         AddDiffFileList(&m_OutChangeFileList, &m_arOutChangeList, localbranch, remotebranch);
1036                                 else
1037                                 {
1038                                         CString baseString = base.ToString();
1039                                         AddDiffFileList(&m_OutChangeFileList, &m_arOutChangeList, localbranch, baseString);
1040                                 }
1041
1042                                 this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,TRUE);
1043                                 this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(TRUE);
1044                         }
1045                         else
1046                         {
1047                                 CString str;
1048                                 str.Format(IDS_PROC_SYNC_NOFASTFORWARD, localbranch, remotebranch);
1049                                 m_OutLogList.ShowText(str);
1050                                 this->m_ctrlStatus.SetWindowText(str);
1051                                 this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID() - 1, FALSE);
1052                                 this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(FALSE);
1053                         }
1054                 }
1055                 this->m_OutLocalBranch=localbranch;
1056                 this->m_OutRemoteBranch=remotebranch;
1057         }
1058
1059 }
1060
1061 bool CSyncDlg::IsURL()
1062 {
1063         CString str;
1064         this->m_ctrlURL.GetWindowText(str);
1065         if(str.Find(_T('\\'))>=0 || str.Find(_T('/'))>=0)
1066                 return true;
1067         else
1068                 return false;
1069 }
1070 void CSyncDlg::OnCbnEditchangeComboboxex()
1071 {
1072         SetTimer(IDT_INPUT, 1000, NULL);
1073         this->m_OutLogList.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_WAINTINPUT)));
1074
1075         //this->FetchOutList();
1076 }
1077
1078 UINT CSyncDlg::ProgressThread()
1079 {
1080         m_startTick = GetTickCount();
1081         m_GitCmdStatus=CProgressDlg::RunCmdList(this,m_GitCmdList,true,NULL,&this->m_bAbort);
1082         InterlockedExchange(&m_bBlock, FALSE);
1083         return 0;
1084 }
1085
1086
1087 LRESULT CSyncDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam)
1088 {
1089         if(wParam == MSG_PROGRESSDLG_START)
1090         {
1091                 m_ctrlAnimate.Play(0, UINT_MAX, UINT_MAX);
1092                 this->m_ctrlProgress.SetPos(0);
1093                 if (m_pTaskbarList)
1094                 {
1095                         m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
1096                         m_pTaskbarList->SetProgressValue(m_hWnd, 0, 100);
1097                 }
1098         }
1099
1100         if(wParam == MSG_PROGRESSDLG_END || wParam == MSG_PROGRESSDLG_FAILED)
1101         {
1102                 DWORD tickSpent = GetTickCount() - m_startTick;
1103                 CString strEndTime = CLoglistUtils::FormatDateAndTime(CTime::GetCurrentTime(), DATE_SHORTDATE, true, false);
1104                 //m_bDone = true;
1105                 m_ctrlAnimate.Stop();
1106                 m_ctrlProgress.SetPos(100);
1107                 //this->DialogEnableWindow(IDOK,TRUE);
1108
1109                 DWORD exitCode = (DWORD)lParam;
1110                 if (exitCode)
1111                 {
1112                         if (m_pTaskbarList)
1113                         {
1114                                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_ERROR);
1115                                 m_pTaskbarList->SetProgressValue(m_hWnd, 100, 100);
1116                         }
1117                         CString log;
1118                         log.Format(IDS_PROC_PROGRESS_GITUNCLEANEXIT, exitCode);
1119                         CString err;
1120                         err.Format(_T("\r\n\r\n%s (%d ms @ %s)\r\n"), log, tickSpent, strEndTime);
1121                         CProgressDlg::InsertColorText(this->m_ctrlCmdOut, err, RGB(255,0,0));
1122                 }
1123                 else
1124                 {
1125                         if (m_pTaskbarList)
1126                                 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
1127                         CString temp;
1128                         temp.LoadString(IDS_SUCCESS);
1129                         CString log;
1130                         log.Format(_T("\r\n%s (%d ms @ %s)\r\n"), temp, tickSpent, strEndTime);
1131                         CProgressDlg::InsertColorText(this->m_ctrlCmdOut, log, RGB(0,0,255));
1132                 }
1133
1134                 //if(wParam == MSG_PROGRESSDLG_END)
1135                 if(this->m_CurrentCmd == GIT_COMMAND_PUSH )
1136                 {
1137                         if(!m_GitCmdStatus)
1138                         {
1139                                 CTGitPathList list;
1140                                 list.AddPath(CTGitPath(g_Git.m_CurrentDir));
1141                                 DWORD exitcode;
1142                                 CString error;
1143                                 if (CHooks::Instance().PostPush(list,exitcode, error))
1144                                 {
1145                                         if (exitcode)
1146                                         {
1147                                                 CString temp;
1148                                                 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
1149                                                 //ReportError(temp);
1150                                                 CMessageBox::Show(NULL,temp,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1151                                                 return false;
1152                                         }
1153                                 }
1154
1155                         }
1156                         EnableControlButton(true);
1157                         SwitchToInput();
1158                         this->FetchOutList(true);
1159                 }
1160                 if(this->m_CurrentCmd == GIT_COMMAND_PULL )
1161                 {
1162                         PullComplete();
1163                 }
1164                 if(this->m_CurrentCmd == GIT_COMMAND_FETCH || this->m_CurrentCmd == GIT_COMMAND_FETCHANDREBASE)
1165                 {
1166                         FetchComplete();
1167                 }
1168                 if(this->m_CurrentCmd == GIT_COMMAND_SUBMODULE)
1169                 {
1170                         //this->m_ctrlCmdOut.SetSel(-1,-1);
1171                         //this->m_ctrlCmdOut.ReplaceSel(_T("Done\r\n"));
1172                         //this->m_ctrlCmdOut.SetSel(-1,-1);
1173                         EnableControlButton(true);
1174                         SwitchToInput();
1175                 }
1176                 if(this->m_CurrentCmd == GIT_COMMAND_REMOTE)
1177                 {
1178                         this->FetchOutList(true);
1179                         EnableControlButton(true);
1180                         SwitchToInput();
1181                 }
1182         }
1183
1184         if(lParam != 0)
1185                 ParserCmdOutput((char)lParam);
1186
1187         return 0;
1188 }
1189
1190
1191 void CSyncDlg::ParserCmdOutput(char ch)
1192 {
1193         CProgressDlg::ParserCmdOutput(m_ctrlCmdOut,m_ctrlProgress,m_hWnd,m_pTaskbarList,m_LogText,ch);
1194 }
1195 void CSyncDlg::OnBnClickedButtonCommit()
1196 {
1197         CString cmd = _T("/command:commit");
1198         cmd += _T(" /path:\"");
1199         cmd += g_Git.m_CurrentDir;
1200         cmd += _T("\"");
1201
1202         CAppUtils::RunTortoiseGitProc(cmd);
1203 }
1204
1205 void CSyncDlg::OnOK()
1206 {
1207         UpdateCombox();
1208         this->UpdateData();
1209         m_ctrlURL.SaveHistory();
1210         SaveHistory();
1211         m_regAutoLoadPutty = this->m_bAutoLoadPuttyKey;
1212         __super::OnOK();
1213 }
1214
1215 void CSyncDlg::OnBnClickedButtonSubmodule()
1216 {
1217         this->UpdateData();
1218         UpdateCombox();
1219         m_ctrlCmdOut.SetWindowTextW(_T(""));
1220         m_LogText = "";
1221
1222         this->m_regSubmoduleButton = (DWORD)this->m_ctrlSubmodule.GetCurrentEntry();
1223
1224         this->SwitchToRun();
1225
1226         this->m_bAbort=false;
1227         this->m_GitCmdList.clear();
1228
1229         ShowTab(IDC_CMD_LOG);
1230
1231         CString cmd;
1232
1233         switch (m_ctrlSubmodule.GetCurrentEntry())
1234         {
1235         case 0:
1236                 cmd=_T("git.exe submodule update --init");
1237                 break;
1238         case 1:
1239                 cmd=_T("git.exe submodule init");
1240                 break;
1241         case 2:
1242                 cmd=_T("git.exe submodule sync");
1243                 break;
1244         }
1245
1246         m_GitCmdList.push_back(cmd);
1247
1248         m_CurrentCmd = GIT_COMMAND_SUBMODULE;
1249
1250         m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
1251         if (m_pThread==NULL)
1252         {
1253 //              ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
1254         }
1255         else
1256         {
1257                 m_pThread->m_bAutoDelete = TRUE;
1258                 m_pThread->ResumeThread();
1259         }
1260 }
1261
1262 void CSyncDlg::OnTimer(UINT_PTR nIDEvent)
1263 {
1264         if( nIDEvent == IDT_INPUT)
1265         {
1266                 KillTimer(IDT_INPUT);
1267                 this->FetchOutList(true);
1268         }
1269 }
1270
1271
1272 void CSyncDlg::OnLvnInLogListColumnClick(NMHDR * /* pNMHDR */, LRESULT *pResult)
1273 {
1274         *pResult = 0;
1275 }
1276
1277 LRESULT CSyncDlg::OnTaskbarBtnCreated(WPARAM /*wParam*/, LPARAM /*lParam*/)
1278 {
1279         m_pTaskbarList.Release();
1280         m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
1281         return 0;
1282 }
1283
1284 void CSyncDlg::OnBnClickedCheckForce()
1285 {
1286         UpdateData();
1287 }
1288
1289 void CSyncDlg::OnBnClickedLog()
1290 {
1291         CString cmd = _T("/command:log");
1292         cmd += _T(" /path:\"");
1293         cmd += g_Git.m_CurrentDir;
1294         cmd += _T("\"");
1295
1296         CAppUtils::RunTortoiseGitProc(cmd);
1297 }