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
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//
// copyright : (C) 2014 The CodeLite Team
// file name : gitCommitDlg.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 "gitCommitDlg.h"
#include "gitCommitEditor.h"
#include "windowattrmanager.h"
#include <wx/tokenzr.h>
#include "gitentry.h"
#include "lexer_configuration.h"
#include "editor_config.h"
GitCommitDlg::GitCommitDlg(wxWindow* parent, const wxString& repoDir)
: GitCommitDlgBase(parent)
, m_workingDir(repoDir)
{
// read the configuration
clConfig conf("git.conf");
GitEntry data;
conf.ReadItem( &data );
m_splitterInner->SetSashPosition(data.GetGitCommitDlgHSashPos());
m_splitterMain->SetSashPosition(data.GetGitCommitDlgVSashPos());
WindowAttrManager::Load(this, wxT("GitCommitDlg"), NULL);
LexerConf::Ptr_t lex = EditorConfigST::Get()->GetLexer("text");
lex->Apply(m_stcCommitMessage);
}
/*******************************************************************************/
GitCommitDlg::~GitCommitDlg()
{
// read the configuration
clConfig conf("git.conf");
GitEntry data;
conf.ReadItem( &data );
data.SetGitCommitDlgHSashPos(m_splitterInner->GetSashPosition());
data.SetGitCommitDlgVSashPos(m_splitterMain->GetSashPosition());
conf.WriteItem( &data );
WindowAttrManager::Save(this, wxT("GitCommitDlg"), NULL);
}
/*******************************************************************************/
void GitCommitDlg::AppendDiff(const wxString& diff)
{
wxArrayString diffList = wxStringTokenize(diff, wxT("\n"), wxTOKEN_STRTOK);
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(" ")));
} else if(line.StartsWith(wxT("Binary"))) {
m_diffMap[currentFile] = wxT("Binary diff");
} else {
m_diffMap[currentFile].Append(line+wxT("\n"));
}
++index;
}
index = 0;
for (std::map<wxString,wxString>::iterator it=m_diffMap.begin() ; it != m_diffMap.end(); ++it) {
m_listBox->Append((*it).first);
m_listBox->Check(index++, true);
}
if(m_diffMap.size() != 0) {
std::map<wxString,wxString>::iterator it=m_diffMap.begin();
m_editor->SetText((*it).second);
m_listBox->Select(0);
m_editor->SetReadOnly(true);
}
}
/*******************************************************************************/
wxArrayString GitCommitDlg::GetSelectedFiles()
{
wxArrayString ret;
for(unsigned i=0; i < m_listBox->GetCount(); ++i) {
if(m_listBox->IsChecked(i))
ret.Add(m_listBox->GetString(i));
}
return ret;
}
/*******************************************************************************/
wxString GitCommitDlg::GetCommitMessage()
{
wxString msg = m_stcCommitMessage->GetText();
msg.Replace(wxT("\""),wxT("\\\""));
return msg;
}
/*******************************************************************************/
void GitCommitDlg::OnChangeFile(wxCommandEvent& e)
{
int sel = m_listBox->GetSelection();
wxString file = m_listBox->GetString(sel);
m_editor->SetReadOnly(false);
m_editor->SetText(m_diffMap[file]);
m_editor->SetReadOnly(true);
}
void GitCommitDlg::OnCommitOK(wxCommandEvent& event)
{
if ( m_stcCommitMessage->GetText().IsEmpty() && !IsAmending() ) {
::wxMessageBox(_("Git requires a commit message"), "codelite", wxICON_WARNING|wxOK|wxCENTER);
return;
}
EndModal(wxID_OK);
}
/*******************************************************************************/
|
