?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Fixed Issue #138: "Format patch" in "Show log" dialog doesn't work
[TortoiseGit.git] / src / TortoiseProc / SyncDlg.cpp
blobf20a7e87753d21a923fec7b739064f7a910ce454
1 // TortoiseGit - a Windows shell extension for easy version control
2
3 // Copyright (C) 2008-2009 - 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 "progressdlg.h"
27 #include "MessageBox.h"
28 #include "ImportPatchDlg.h"
29 #include "PathUtils.h"
30 #include "RebaseDlg.h"
31
32 // CSyncDlg dialog
33
34 IMPLEMENT_DYNAMIC(CSyncDlg, CResizableStandAloneDialog)
35
36 CSyncDlg::CSyncDlg(CWnd* pParent /*=NULL*/)
37 : CResizableStandAloneDialog(CSyncDlg::IDD, pParent)
38 {
39 m_pTooltip=&this->m_tooltips;
40 m_bInited=false;
41 m_CmdOutCurrentPos=0;
42 m_bAutoLoadPuttyKey = CAppUtils::IsSSHPutty();
43 }
44
45 CSyncDlg::~CSyncDlg()
46 {
47 }
48
49 void CSyncDlg::DoDataExchange(CDataExchange* pDX)
50 {
51 CDialog::DoDataExchange(pDX);
52 DDX_Check(pDX, IDC_CHECK_PUTTY_KEY, m_bAutoLoadPuttyKey);
53 DDX_Check(pDX, IDC_CHECK_FORCE,m_bForce);
54 DDX_Control(pDX, IDC_COMBOBOXEX_URL, m_ctrlURL);
55 DDX_Control(pDX, IDC_BUTTON_TABCTRL, m_ctrlDumyButton);
56 DDX_Control(pDX, IDC_BUTTON_PULL, m_ctrlPull);
57 DDX_Control(pDX, IDC_BUTTON_PUSH, m_ctrlPush);
58 DDX_Control(pDX, IDC_STATIC_STATUS, m_ctrlStatus);
59 DDX_Control(pDX, IDC_PROGRESS_SYNC, m_ctrlProgress);
60 DDX_Control(pDX, IDC_ANIMATE_SYNC, m_ctrlAnimate);
61
62 BRANCH_COMBOX_DDX;
63 }
64
65
66 BEGIN_MESSAGE_MAP(CSyncDlg, CResizableStandAloneDialog)
67 ON_BN_CLICKED(IDC_BUTTON_PULL, &CSyncDlg::OnBnClickedButtonPull)
68 ON_BN_CLICKED(IDC_BUTTON_PUSH, &CSyncDlg::OnBnClickedButtonPush)
69 ON_BN_CLICKED(IDC_BUTTON_APPLY, &CSyncDlg::OnBnClickedButtonApply)
70 ON_BN_CLICKED(IDC_BUTTON_EMAIL, &CSyncDlg::OnBnClickedButtonEmail)
71 ON_BN_CLICKED(IDC_BUTTON_MANAGE, &CSyncDlg::OnBnClickedButtonManage)
72 BRANCH_COMBOX_EVENT
73 ON_NOTIFY(CBEN_ENDEDIT, IDC_COMBOBOXEX_URL, &CSyncDlg::OnCbenEndeditComboboxexUrl)
74 ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_URL, &CSyncDlg::OnCbnEditchangeComboboxexUrl)
75 ON_MESSAGE(MSG_PROGRESSDLG_UPDATE_UI, OnProgressUpdateUI)
76 ON_BN_CLICKED(IDC_BUTTON_COMMIT, &CSyncDlg::OnBnClickedButtonCommit)
77 END_MESSAGE_MAP()
78
79
80 void CSyncDlg::EnableControlButton(bool bEnabled)
81 {
82 GetDlgItem(IDC_BUTTON_PULL)->EnableWindow(bEnabled);
83 GetDlgItem(IDC_BUTTON_PUSH)->EnableWindow(bEnabled);
84 GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(bEnabled);
85 GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(bEnabled);
86 GetDlgItem(IDOK)->EnableWindow(bEnabled);
87 }
88 // CSyncDlg message handlers
89
90 void CSyncDlg::OnBnClickedButtonPull()
91 {
92 // TODO: Add your control notification handler code here
93 int CurrentEntry;
94 CurrentEntry = this->m_ctrlPull.GetCurrentEntry();
95 this->m_regPullButton = CurrentEntry;
96
97
98 this->m_bAbort=false;
99 this->m_GitCmdList.clear();
100
101 this->UpdateData();
102 UpdateCombox();
103
104 m_oldHash = g_Git.GetHash(CString(_T("HEAD")));
105
106 if( CurrentEntry == 0)
107 {
108 if( g_Git.GetHash(this->m_strLocalBranch) != m_oldHash)
109 {
110 CMessageBox::Show(NULL,_T("Pull require local branch must be current branch"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
111 return;
112 }
113 }
114
115 if(this->m_strURL.IsEmpty())
116 {
117 CMessageBox::Show(NULL,_T("URL can't Empty"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
118 return;
119 }
120
121 if(this->m_bAutoLoadPuttyKey)
122 {
123 CAppUtils::LaunchPAgent(NULL,&this->m_strURL);
124 }
125
126 this->SwitchToRun();
127
128 CString force;
129 if(this->m_bForce)
130 force = _T(" --force ");
131
132 CString cmd;
133
134 ShowTab(IDC_CMD_LOG);
135
136 this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,false);
137 this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);
138 this->m_ctrlTabCtrl.ShowTab(IDC_IN_CONFLICT-1,false);
139
140 this->GetDlgItem(IDC_BUTTON_COMMIT)->ShowWindow(SW_HIDE);
141
142 ///Pull
143 if(CurrentEntry == 0) //Pull
144 {
145 cmd.Format(_T("git.exe pull %s \"%s\" %s"),
146 force,
147 m_strURL,
148 this->m_strRemoteBranch);
149
150 m_CurrentCmd = GIT_COMMAND_PULL;
151 m_GitCmdList.push_back(cmd);
152
153 m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
154 if (m_pThread==NULL)
155 {
156 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
157 }
158 else
159 {
160 m_pThread->m_bAutoDelete = TRUE;
161 m_pThread->ResumeThread();
162 }
163
164 }
165
166 ///Fetch
167 if(CurrentEntry == 1 || CurrentEntry ==2 ) //Fetch
168 {
169 cmd.Format(_T("git.exe fetch %s \"%s\" %s"),
170 force,
171 m_strURL,
172 this->m_strRemoteBranch);
173 if(CurrentEntry == 1)
174 m_CurrentCmd = GIT_COMMAND_FETCH;
175 else
176 m_CurrentCmd = GIT_COMMAND_FETCHANDREBASE;
177 m_GitCmdList.push_back(cmd);
178
179 m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
180 if (m_pThread==NULL)
181 {
182 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
183 }
184 else
185 {
186 m_pThread->m_bAutoDelete = TRUE;
187 m_pThread->ResumeThread();
188 }
189 }
190
191
192
193 }
194
195 void CSyncDlg::PullComplete()
196 {
197 EnableControlButton(true);
198 SwitchToInput();
199 this->FetchOutList(true);
200
201 CString newhash;
202 newhash = g_Git.GetHash(CString(_T("HEAD")));
203
204
205
206 if( this ->m_GitCmdStatus )
207 {
208 CTGitPathList list;
209 if(g_Git.ListConflictFile(list))
210 {
211 this->m_ctrlCmdOut.SetSel(-1,-1);
212 this->m_ctrlCmdOut.ReplaceSel(_T("Get conflict files fail\n"));
213
214 this->ShowTab(IDC_CMD_LOG);
215 return;
216 }
217
218 if(list.GetCount()>0)
219 {
220 this->m_ConflictFileList.Clear();
221 CTGitPathList list;
222 CTGitPath path;
223 list.AddPath(path);
224
225 this->m_ConflictFileList.GetStatus(&list,true);
226 this->m_ConflictFileList.Show(CTGitPath::LOGACTIONS_UNMERGED,
227 CTGitPath::LOGACTIONS_UNMERGED);
228
229 this->ShowTab(IDC_IN_CONFLICT);
230
231 this->GetDlgItem(IDC_BUTTON_COMMIT)->ShowWindow(SW_NORMAL);
232 }
233 else
234 this->ShowTab(IDC_CMD_LOG);
235
236 }else
237 {
238 if(newhash == this->m_oldHash)
239 {
240 this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);
241 this->m_InLogList.ShowText(_T("No commits get after pull"));
242 this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);
243 }
244 else
245 {
246 this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,true);
247 this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);
248
249 this->AddDiffFileList(&m_InChangeFileList,&m_arInChangeList,newhash,m_oldHash);
250
251 m_InLogList.FillGitLog(NULL,CGit:: LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,
252 &this->m_oldHash,&newhash);
253 }
254 this->ShowTab(IDC_IN_LOGLIST);
255 }
256 }
257
258 void CSyncDlg::FetchComplete()
259 {
260 EnableControlButton(true);
261 SwitchToInput();
262 this->FetchOutList(true);
263
264 ShowTab(IDC_CMD_LOG);
265 if( (!this->m_GitCmdStatus) && this->m_CurrentCmd == GIT_COMMAND_FETCHANDREBASE)
266 {
267 CRebaseDlg dlg;
268 dlg.m_PostButtonText=_T("Email &Patch...");
269 int response = dlg.DoModal();
270 if(response == IDOK)
271 {
272 return ;
273 }
274
275 if(response == IDC_REBASE_POST_BUTTON)
276 {
277 CString cmd,out;
278 cmd.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
279 g_Git.m_CurrentDir,
280 dlg.m_Upstream,dlg.m_Branch);
281 if(g_Git.Run(cmd,&out,CP_ACP))
282 {
283 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
284 return ;
285 }
286
287 CAppUtils::SendPatchMail(cmd,out);
288 }
289 }
290 }
291
292 void CSyncDlg::OnBnClickedButtonPush()
293 {
294 // TODO: Add your control notification handler code here
295 this->UpdateData();
296 UpdateCombox();
297
298 if(this->m_strURL.IsEmpty())
299 {
300 CMessageBox::Show(NULL,_T("URL can't Empty"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
301 return;
302 }
303
304 this->m_regPushButton=this->m_ctrlPush.GetCurrentEntry();
305 this->SwitchToRun();
306 this->m_bAbort=false;
307 this->m_GitCmdList.clear();
308
309 ShowTab(IDC_CMD_LOG);
310
311 CString cmd;
312 CString tags;
313 CString force;
314 CString all;
315
316
317
318 switch (m_ctrlPush.GetCurrentEntry())
319 {
320 case 1:
321 tags = _T(" --tags ");
322 break;
323 case 2:
324 all = _T(" --all ");
325 break;
326 }
327
328 if(this->m_bForce)
329 force = _T(" --force ");
330
331 cmd.Format(_T("git.exe push %s %s %s \"%s\" %s"),
332 tags,force,all,
333 m_strURL,
334 m_strLocalBranch);
335
336 if (!m_strRemoteBranch.IsEmpty())
337 {
338 cmd += _T(":") + m_strRemoteBranch;
339 }
340
341 m_GitCmdList.push_back(cmd);
342
343 m_CurrentCmd = GIT_COMMAND_PUSH;
344
345 if(this->m_bAutoLoadPuttyKey)
346 {
347 CAppUtils::LaunchPAgent(NULL,&this->m_strURL);
348 }
349
350 m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
351 if (m_pThread==NULL)
352 {
353 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
354 }
355 else
356 {
357 m_pThread->m_bAutoDelete = TRUE;
358 m_pThread->ResumeThread();
359 }
360
361 }
362
363 void CSyncDlg::OnBnClickedButtonApply()
364 {
365 // TODO: Add your control notification handler code here
366 CString oldhash;
367 oldhash=g_Git.GetHash(CString(_T("HEAD")));
368
369 CImportPatchDlg dlg;
370 CString cmd,output;
371
372 if(dlg.DoModal() == IDOK)
373 {
374 int err=0;
375 for(int i=0;i<dlg.m_PathList.GetCount();i++)
376 {
377 cmd.Format(_T("git.exe am \"%s\""),dlg.m_PathList[i].GetGitPathString());
378
379 if(g_Git.Run(cmd,&output,CP_ACP))
380 {
381 CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);
382
383 err=1;
384 break;
385 }
386 this->m_ctrlCmdOut.SetSel(-1,-1);
387 this->m_ctrlCmdOut.ReplaceSel(cmd+_T("\n"));
388 this->m_ctrlCmdOut.SetSel(-1,-1);
389 this->m_ctrlCmdOut.ReplaceSel(output);
390 }
391
392
393 CString newhash=g_Git.GetHash(CString(_T("HEAD")));
394
395 this->m_InLogList.Clear();
396 this->m_InChangeFileList.Clear();
397
398 if(newhash == oldhash)
399 {
400 this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);
401 this->m_InLogList.ShowText(_T("No commits get from patch"));
402 this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);
403
404 }else
405 {
406 this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,true);
407 this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);
408
409 this->AddDiffFileList(&m_InChangeFileList,&m_arInChangeList,newhash,oldhash);
410 m_InLogList.FillGitLog(NULL,CGit:: LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,
411 &oldhash,&newhash);
412
413 this->FetchOutList(true);
414
415 }
416
417 this->m_ctrlTabCtrl.ShowTab(IDC_CMD_LOG-1,true);
418
419 if(err)
420 {
421 this->ShowTab(IDC_CMD_LOG);
422
423 }else
424 {
425 this->ShowTab(IDC_IN_LOGLIST);
426 }
427 }
428 }
429
430 void CSyncDlg::OnBnClickedButtonEmail()
431 {
432 // TODO: Add your control notification handler code here
433 CString cmd,out;
434
435 this->m_strLocalBranch = this->m_ctrlLocalBranch.GetString();
436 this->m_ctrlRemoteBranch.GetWindowText(this->m_strRemoteBranch);
437 this->m_ctrlURL.GetWindowText(this->m_strURL);
438 m_strURL=m_strURL.Trim();
439 m_strRemoteBranch=m_strRemoteBranch.Trim();
440
441 cmd.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
442 g_Git.m_CurrentDir,
443 m_strURL+_T('/')+m_strRemoteBranch,m_strLocalBranch);
444
445 if(g_Git.Run(cmd,&out,CP_ACP))
446 {
447 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
448 return ;
449 }
450
451 CAppUtils::SendPatchMail(cmd,out);
452
453 }
454 void CSyncDlg::ShowProgressCtrl(bool bShow)
455 {
456 int b=bShow?SW_NORMAL:SW_HIDE;
457 this->m_ctrlAnimate.ShowWindow(b);
458 this->m_ctrlProgress.ShowWindow(b);
459 this->m_ctrlAnimate.Open(IDR_DOWNLOAD);
460 if(b == SW_NORMAL)
461 this->m_ctrlAnimate.Play(0,-1,-1);
462 else
463 this->m_ctrlAnimate.Stop();
464 }
465 void CSyncDlg::ShowInputCtrl(bool bShow)
466 {
467 int b=bShow?SW_NORMAL:SW_HIDE;
468 this->m_ctrlURL.ShowWindow(b);
469 this->m_ctrlLocalBranch.ShowWindow(b);
470 this->m_ctrlRemoteBranch.ShowWindow(b);
471 this->GetDlgItem(IDC_BUTTON_LOCAL_BRANCH)->ShowWindow(b);
472 this->GetDlgItem(IDC_BUTTON_REMOTE_BRANCH)->ShowWindow(b);
473 this->GetDlgItem(IDC_STATIC_LOCAL_BRANCH)->ShowWindow(b);
474 this->GetDlgItem(IDC_STATIC_REMOTE_BRANCH)->ShowWindow(b);
475 this->GetDlgItem(IDC_BUTTON_MANAGE)->ShowWindow(b);
476 this->GetDlgItem(IDC_CHECK_PUTTY_KEY)->ShowWindow(b);
477 this->GetDlgItem(IDC_CHECK_FORCE)->ShowWindow(b);
478 this->GetDlgItem(IDC_STATIC_REMOTE_URL)->ShowWindow(b);
479
480 }
481 BOOL CSyncDlg::OnInitDialog()
482 {
483 CResizableStandAloneDialog::OnInitDialog();
484
485 /*
486 this->m_ctrlAnimate.ShowWindow(SW_NORMAL);
487 this->m_ctrlAnimate.Open(IDR_DOWNLOAD);
488 this->m_ctrlAnimate.Play(0,-1,-1);
489 */
490
491 // ------------------ Create Tabctrl -----------
492 CWnd *pwnd=this->GetDlgItem(IDC_BUTTON_TABCTRL);
493 CRect rectDummy;
494 pwnd->GetWindowRect(&rectDummy);
495 this->ScreenToClient(rectDummy);
496
497 if (!m_ctrlTabCtrl.Create(CMFCTabCtrl::STYLE_FLAT, rectDummy, this, IDC_SYNC_TAB))
498 {
499 TRACE0("Failed to create output tab window\n");
500 return FALSE; // fail to create
501 }
502 m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);
503
504 // -------------Create Command Log Ctrl ---------
505 DWORD dwStyle;
506 dwStyle= ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL | ES_AUTOVSCROLL |WS_VSCROLL ;
507
508 if( !m_ctrlCmdOut.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_CMD_LOG))
509 {
510 TRACE0("Failed to create Log commits window\n");
511 return FALSE; // fail to create
512 }
513
514 m_ctrlTabCtrl.InsertTab(&m_ctrlCmdOut,_T("Log"),-1);
515
516 //m_ctrlCmdOut.ReplaceSel(_T("Hello"));
517
518 //---------- Create in coming list ctrl -----------
519 dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE;;
520
521 if( !m_InLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_IN_LOGLIST))
522 {
523 TRACE0("Failed to create output commits window\n");
524 return FALSE; // fail to create
525
526 }
527
528 m_ctrlTabCtrl.InsertTab(&m_InLogList,_T("In Commits"),-1);
529
530 m_InLogList.InsertGitColumn();
531
532 //----------- Create In Change file list -----------
533 dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;
534
535 if( !m_InChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_IN_CHANGELIST))
536 {
537 TRACE0("Failed to create output change files window\n");
538 return FALSE; // fail to create
539 }
540 m_ctrlTabCtrl.InsertTab(&m_InChangeFileList,_T("In ChangeList"),-1);
541
542 m_InChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),
543 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|
544 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_GNUDIFF2)),false);
545
546
547 //---------- Create Conflict List Ctrl -----------------
548 dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;
549
550 if( !m_ConflictFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_IN_CONFLICT))
551 {
552 TRACE0("Failed to create output change files window\n");
553 return FALSE; // fail to create
554 }
555 m_ctrlTabCtrl.InsertTab(&m_ConflictFileList,_T("Conflict"),-1);
556
557 m_ConflictFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),
558 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|
559 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_GNUDIFF2)|
560 SVNSLC_POPCONFLICT|SVNSLC_POPRESOLVE),false);
561
562
563 //---------- Create Commit Out List Ctrl---------------
564
565 dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE;;
566
567 if( !m_OutLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_LOGLIST))
568 {
569 TRACE0("Failed to create output commits window\n");
570 return FALSE; // fail to create
571
572 }
573
574 m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),-1);
575
576
577 m_OutLogList.InsertGitColumn();
578
579 //------------- Create Change File List Control ----------------
580
581 dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;
582
583 if( !m_OutChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_CHANGELIST))
584 {
585 TRACE0("Failed to create output change files window\n");
586 return FALSE; // fail to create
587 }
588 m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList,_T("Out ChangeList"),-1);
589
590 m_OutChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),
591 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|
592 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_GNUDIFF2)),false);
593
594 this->m_tooltips.Create(this);
595
596 AddAnchor(IDC_SYNC_TAB,TOP_LEFT,BOTTOM_RIGHT);
597
598 AddAnchor(IDC_GROUP_INFO,TOP_LEFT,TOP_RIGHT);
599 AddAnchor(IDC_COMBOBOXEX_URL,TOP_LEFT,TOP_RIGHT);
600 AddAnchor(IDC_BUTTON_MANAGE,TOP_RIGHT);
601 AddAnchor(IDC_BUTTON_PULL,BOTTOM_LEFT);
602 AddAnchor(IDC_BUTTON_PUSH,BOTTOM_LEFT);
603 AddAnchor(IDC_BUTTON_APPLY,BOTTOM_LEFT);
604 AddAnchor(IDC_BUTTON_EMAIL,BOTTOM_LEFT);
605 AddAnchor(IDC_PROGRESS_SYNC,TOP_LEFT,TOP_RIGHT);
606 AddAnchor(IDOK,BOTTOM_RIGHT);
607 AddAnchor(IDHELP,BOTTOM_RIGHT);
608 AddAnchor(IDC_STATIC_STATUS,BOTTOM_LEFT);
609 AddAnchor(IDC_ANIMATE_SYNC,TOP_LEFT);
610 AddAnchor(IDC_BUTTON_COMMIT,BOTTOM_LEFT);
611
612 BRANCH_COMBOX_ADD_ANCHOR();
613
614 this->GetDlgItem(IDC_BUTTON_COMMIT)->ShowWindow(SW_HIDE);
615
616 CString WorkingDir=g_Git.m_CurrentDir;
617 WorkingDir.Replace(_T(':'),_T('_'));
618 m_RegKeyRemoteBranch = CString(_T("Software\\TortoiseGit\\History\\SyncBranch\\"))+WorkingDir;
619
620
621 this->AddOthersToAnchor();
622 // TODO: Add extra initialization here
623
624 this->m_ctrlPush.AddEntry(CString(_T("Pus&h")));
625 this->m_ctrlPush.AddEntry(CString(_T("Push ta&gs")));
626 ///this->m_ctrlPush.AddEntry(CString(_T("Push All")));
627
628 this->m_ctrlPull.AddEntry(CString(_T("&Pull")));
629 this->m_ctrlPull.AddEntry(CString(_T("Fetc&h")));
630 this->m_ctrlPull.AddEntry(CString(_T("Fetch&&Re&base")));
631
632
633 WorkingDir.Replace(_T(':'),_T('_'));
634
635 CString regkey ;
636 regkey.Format(_T("Software\\TortoiseGit\\TortoiseProc\\Sync\\%s"),WorkingDir);
637
638 this->m_regPullButton = CRegDWORD(regkey+_T("\\Pull"),0);
639 this->m_regPushButton = CRegDWORD(regkey+_T("\\Push"),0);
640
641 this->m_ctrlPull.SetCurrentEntry(this->m_regPullButton);
642 this->m_ctrlPush.SetCurrentEntry(this->m_regPushButton);
643
644 CString str;
645 this->GetWindowText(str);
646 str += _T(" - ") + g_Git.m_CurrentDir;
647 this->SetWindowText(str);
648
649 EnableSaveRestore(_T("SyncDlg"));
650
651 this->m_ctrlURL.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\SyncURL\\"))+WorkingDir, _T("url"));
652
653 m_ctrlURL.SetCurSel(0);
654 m_ctrlRemoteBranch.SetCurSel(0);
655
656 this->LoadBranchInfo();
657
658 this->m_bInited=true;
659 FetchOutList();
660
661 m_ctrlTabCtrl.ShowTab(IDC_CMD_LOG-1,false);
662 m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,false);
663 m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);
664 m_ctrlTabCtrl.ShowTab(IDC_IN_CONFLICT-1,false);
665
666 return TRUE; // return TRUE unless you set the focus to a control
667 // EXCEPTION: OCX Property Pages should return FALSE
668 }
669
670 void CSyncDlg::OnBnClickedButtonManage()
671 {
672 // TODO: Add your control notification handler code here
673 CAppUtils::LaunchRemoteSetting();
674 }
675
676 BOOL CSyncDlg::PreTranslateMessage(MSG* pMsg)
677 {
678 // TODO: Add your specialized code here and/or call the base class
679 m_tooltips.RelayEvent(pMsg);
680 return __super::PreTranslateMessage(pMsg);
681 }
682 void CSyncDlg::FetchOutList(bool force)
683 {
684 if(!m_bInited)
685 return;
686 m_OutChangeFileList.Clear();
687 this->m_OutLogList.Clear();
688
689 CString remote;
690 this->m_ctrlURL.GetWindowText(remote);
691 CString remotebranch;
692 this->m_ctrlRemoteBranch.GetWindowText(remotebranch);
693 remotebranch=remote+_T("/")+remotebranch;
694
695 if(IsURL())
696 {
697 CString str;
698 str=_T("Don't know what will push befause you enter URL");
699 m_OutLogList.ShowText(str);
700 this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);
701 m_OutLocalBranch.Empty();
702 m_OutRemoteBranch.Empty();
703
704 this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(FALSE);
705 return ;
706
707 }else if(g_Git.GetHash(remotebranch).GetLength()<40)
708 {
709 CString str;
710 str.Format(_T("Don't know what will push befause unkown \"%s\""),remotebranch);
711 m_OutLogList.ShowText(str);
712 this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);
713 m_OutLocalBranch.Empty();
714 m_OutRemoteBranch.Empty();
715
716 this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(FALSE);
717 return ;
718 }
719 else
720 {
721 CString localbranch;
722 localbranch=this->m_ctrlLocalBranch.GetString();
723
724 if(localbranch != m_OutLocalBranch || m_OutRemoteBranch != remotebranch || force)
725 {
726 m_OutLogList.ClearText();
727 m_OutLogList.FillGitLog(NULL,CGit:: LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,
728 &remotebranch,&localbranch);
729
730 CString str;
731 if(m_OutLogList.GetItemCount() == 0)
732 {
733 str.Format(_T("No commits ahead \"%s\""),remotebranch);
734 m_OutLogList.ShowText(str);
735 this->m_ctrlStatus.SetWindowText(str);
736 this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);
737 this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(FALSE);
738 }
739 else
740 {
741 str.Format(_T("%d commits ahead \"%s\""),m_OutLogList.GetItemCount(),remotebranch);
742 this->m_ctrlStatus.SetWindowText(str);
743
744 AddDiffFileList(&m_OutChangeFileList,&m_arOutChangeList,localbranch,remotebranch);
745
746 this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,TRUE);
747 this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(TRUE);
748 }
749 }
750 this->m_OutLocalBranch=localbranch;
751 this->m_OutRemoteBranch=remotebranch;
752 }
753
754 }
755
756 bool CSyncDlg::IsURL()
757 {
758 CString str;
759 this->m_ctrlURL.GetWindowText(str);
760 if(str.Find(_T('\\'))>=0 || str.Find(_T('/'))>=0)
761 return true;
762 else
763 return false;
764 }
765 void CSyncDlg::OnCbenEndeditComboboxexUrl(NMHDR *pNMHDR, LRESULT *pResult)
766 {
767 // TODO: Add your control notification handler code here
768 *pResult = 0;
769 }
770
771 void CSyncDlg::OnCbnEditchangeComboboxexUrl()
772 {
773 this->FetchOutList();
774 // TODO: Add your control notification handler code here
775 }
776
777 UINT CSyncDlg::ProgressThread()
778 {
779 m_GitCmdStatus=CProgressDlg::RunCmdList(this,m_GitCmdList,true,NULL,&this->m_bAbort);
780 return 0;
781 }
782
783
784 LRESULT CSyncDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam)
785 {
786 if(wParam == MSG_PROGRESSDLG_START)
787 {
788 m_ctrlAnimate.Play(0,-1,-1);
789 this->m_ctrlProgress.SetPos(0);
790 }
791
792 if(wParam == MSG_PROGRESSDLG_END || wParam == MSG_PROGRESSDLG_FAILED)
793 {
794 //m_bDone = true;
795 m_ctrlAnimate.Stop();
796 m_ctrlProgress.SetPos(100);
797 //this->DialogEnableWindow(IDOK,TRUE);
798
799 //if(wParam == MSG_PROGRESSDLG_END)
800 if(this->m_CurrentCmd == GIT_COMMAND_PUSH )
801 {
802 EnableControlButton(true);
803 SwitchToInput();
804 this->FetchOutList(true);
805 }
806 if(this->m_CurrentCmd == GIT_COMMAND_PULL )
807 {
808 PullComplete();
809 }
810 if(this->m_CurrentCmd == GIT_COMMAND_FETCH || this->m_CurrentCmd == GIT_COMMAND_FETCHANDREBASE)
811 {
812 FetchComplete();
813 }
814 }
815
816 if(lParam != 0)
817 ParserCmdOutput((TCHAR)lParam);
818
819 return 0;
820 }
821
822
823 void CSyncDlg::ParserCmdOutput(TCHAR ch)
824 {
825 //TRACE(_T("%c"),ch);
826 int linenum;
827 int index;
828 linenum = this->m_ctrlCmdOut.GetLineCount();
829
830 if( ch == _T('\r') )
831 {
832 if(linenum>0)
833 m_CmdOutCurrentPos = this->m_ctrlCmdOut.LineIndex(linenum-1);
834 else
835 m_CmdOutCurrentPos = 0;
836
837 //TRACE(_T("line %d - %d\n"),index,m_ctrlCmdOut.GetTextLength());
838 }else
839 m_CmdOutCurrentPos++;
840
841 this->m_ctrlCmdOut.SetSel(m_CmdOutCurrentPos,m_CmdOutCurrentPos+1);
842
843 if( ch != _T('\r') )
844 this->m_ctrlCmdOut.ReplaceSel(CString(ch));
845
846 int firstline = m_ctrlCmdOut.GetFirstVisibleLine();
847 if( linenum - firstline > 4 )
848 this->m_ctrlCmdOut.LineScroll(linenum - firstline -4);
849
850 if( ch == _T('\r') || ch == _T('\n') )
851 {
852 int s1=m_LogText.Find(_T(':'));
853 int s2=m_LogText.Find(_T('%'));
854 if(s1>0 && s2>0)
855 {
856 // this->m_CurrentWork.SetWindowTextW(m_LogText.Left(s1));
857 int pos=CProgressDlg::FindPercentage(m_LogText);
858 TRACE(_T("Pos %d\r\n"),pos);
859 if(pos>0)
860 this->m_ctrlProgress.SetPos(pos);
861 }
862 m_LogText=_T("");
863 }
864 m_LogText+=ch;
865
866 }
867 void CSyncDlg::OnBnClickedButtonCommit()
868 {
869 // TODO: Add your control notification handler code here
870 CString proc=CPathUtils::GetAppDirectory();
871 proc += _T("TortoiseProc.exe /command:commit");
872 proc += _T(" /path:\"");
873 proc += g_Git.m_CurrentDir;
874
875 CAppUtils::LaunchApplication(proc,IDS_ERROR_CANNON_FIND_TORTOISEPROC,false);
876 }
877
878 void CSyncDlg::OnOK()
879 {
880 // TODO: Add your specialized code here and/or call the base class
881 UpdateCombox();
882 m_ctrlURL.SaveHistory();
883 SaveHistory();
884 __super::OnOK();
885 }
Windows Explorer Extension to Operate Git