1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//
// copyright : (C) 2014 The CodeLite Team
// file name : gitDiffDlg.cpp
//
// -------------------------------------------------------------------------
// A
// _____ _ _ _ _
// / __ \ | | | | (_) |
// | / \/ ___ __| | ___| | _| |_ ___
// | | / _ \ / _ |/ _ \ | | | __/ _ )
// | \__/\ (_) | (_| | __/ |___| | || __/
// \____/\___/ \__,_|\___\_____/_|\__\___|
//
// F i l e
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
#include "gitDiffDlg.h"
#include "gitentry.h"
#include "editor_config.h"
#include "windowattrmanager.h"
#include <wx/tokenzr.h>
#include "gitCommitEditor.h"
#include "asyncprocess.h"
#include "processreaderthread.h"
#include "cl_config.h"
BEGIN_EVENT_TABLE(GitDiffDlg, wxDialog)
END_EVENT_TABLE()
GitDiffDlg::GitDiffDlg(wxWindow* parent, const wxString& workingDir)
: GitDiffDlgBase(parent)
, m_workingDir(workingDir)
{
clConfig conf("git.conf");
GitEntry data;
conf.ReadItem(&data);
m_gitPath = data.GetGITExecutablePath();
WindowAttrManager::Load(this, wxT("GitDiffDlg"), NULL);
m_splitter->SetSashPosition( data.GetGitDiffDlgSashPos() );
}
/*******************************************************************************/
GitDiffDlg::~GitDiffDlg()
{
WindowAttrManager::Save(this, wxT("GitDiffDlg"), NULL);
clConfig conf("git.conf");
GitEntry data;
conf.ReadItem(&data);
data.SetGitDiffDlgSashPos( m_splitter->GetSashPosition() );
conf.WriteItem(&data);
}
/*******************************************************************************/
void GitDiffDlg::SetDiff(const wxString& diff)
{
wxString m_commandOutput = diff;
m_fileListBox->Clear();
m_diffMap.clear();
m_commandOutput.Replace(wxT("\r"), wxT(""));
wxArrayString diffList = wxStringTokenize(m_commandOutput, wxT("\n"));
bool foundFirstDiff = false;
unsigned index = 0;
wxString currentFile;
while(index < diffList.GetCount()) {
wxString line = diffList[index];
if(line.StartsWith(wxT("diff"))) {
line.Replace(wxT("diff --git a/"), wxT(""));
currentFile = line.Left(line.Find(wxT(" ")));
foundFirstDiff = true;
} else if(line.StartsWith(wxT("Binary"))) {
} else if(foundFirstDiff) {
m_diffMap[currentFile].Append(line+wxT("\n"));
}
++index;
}
for (std::map<wxString,wxString>::iterator it=m_diffMap.begin() ; it != m_diffMap.end(); ++it) {
m_fileListBox->Append((*it).first);
}
m_editor->SetReadOnly(false);
m_editor->SetText(wxT(""));
if(m_diffMap.size() != 0) {
std::map<wxString,wxString>::iterator it=m_diffMap.begin();
m_editor->SetText((*it).second);
m_fileListBox->Select(0);
m_editor->SetReadOnly(true);
}
}
/*******************************************************************************/
void GitDiffDlg::OnChangeFile(wxCommandEvent& e)
{
int sel = m_fileListBox->GetSelection();
wxString file = m_fileListBox->GetString(sel);
m_editor->SetReadOnly(false);
m_editor->SetText(m_diffMap[file]);
m_editor->SetReadOnly(true);
}
|
