SyncDlg apply patch okay show commit list and change file list

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
index 5b1159a..a1ee832 100644 (file)
--- a/src/TortoiseProc/SyncDlg.cpp
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -180,9 +180,12 @@ void CSyncDlg::OnBnClickedButtonApply()
                                err=1;\r
                                break;\r
                        }\r
+                       this->m_ctrlCmdOut.SetSel(-1,-1);\r
+                       this->m_ctrlCmdOut.ReplaceSel(cmd+_T("\n"));\r
+                       this->m_ctrlCmdOut.SetSel(-1,-1);\r
+                       this->m_ctrlCmdOut.ReplaceSel(output);\r
                }\r
-               this->m_ctrlCmdOut.SetSel(-1,-1);\r
-               this->m_ctrlCmdOut.ReplaceSel(output);\r
+               \r
 \r
                CString newhash=g_Git.GetHash(CString(_T("HEAD")));             \r
 \r
@@ -201,8 +204,12 @@ void CSyncDlg::OnBnClickedButtonApply()
                        this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);\r
                        \r
                        this->AddDiffFileList(&m_InChangeFileList,&m_arInChangeList,newhash,oldhash);\r
+                       m_InLogList.FillGitLog(NULL,CGit::      LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,\r
+                               &oldhash,&newhash);\r
                }\r
 \r
+               this->m_ctrlTabCtrl.ShowTab(IDC_CMD_LOG-1,true);\r
+\r
                if(err)\r
                {\r
                        this->ShowTab(IDC_CMD_LOG);\r
@@ -324,7 +331,7 @@ BOOL CSyncDlg::OnInitDialog()
                TRACE0("Failed to create output change files window\n");\r
                return FALSE;      // fail to create\r
        }\r
-       m_ctrlTabCtrl.InsertTab(&m_InChangeFileList,_T("Out ChangeList"),-1);\r
+       m_ctrlTabCtrl.InsertTab(&m_InChangeFileList,_T("In ChangeList"),-1);\r
 \r
        m_InChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),\r
                                    (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|\r