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