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
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
|
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include <QDebug>
#include <QDir>
#include <QProcess>
#include <QTextBlock>
#include <QtCore/QRegularExpression>
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent), ui(new Ui::MainWindow) {
ui->setupUi(this);
}
MainWindow::~MainWindow() { delete ui; }
void MainWindow::changeEvent(QEvent *e) {
QMainWindow::changeEvent(e);
switch (e->type()) {
case QEvent::LanguageChange:
ui->retranslateUi(this);
break;
default:
break;
}
}
void MainWindow::on_quit_clicked() { qApp->quit(); }
void MainWindow::findFiles(QString path) {
QDir currentDir = QDir(path);
QStringList files = currentDir.entryList(QStringList("*.new"),
QDir::Files | QDir::NoSymLinks);
Q_FOREACH (QString f, files) {
ui->files->addItem(path + "/" + f);
}
files =
currentDir.entryList(QStringList("*"), QDir::Dirs | QDir::NoSymLinks |
QDir::NoDot | QDir::NoDotDot);
Q_FOREACH (QString dir, files) {
findFiles(path + "/" + dir);
}
}
void MainWindow::enableButtons() {
bool enable = 0 != ui->files->count();
ui->accept->setEnabled(enable);
ui->reject->setEnabled(enable);
ui->edit->setEnabled(enable);
}
void MainWindow::on_files_currentItemChanged(QListWidgetItem *current,
QListWidgetItem * /*previous*/) {
if (!current) {
ui->diff->clear();
return;
}
update_diff();
}
void MainWindow::update_diff() {
QString fold, fnew;
fold = fnew = ui->files->currentItem()->text();
fold.replace(QRegularExpression("\\.new$"), "");
QStringList difflines = diff(fold, fnew).split("\n");
difflines.replaceInStrings(
QRegularExpression("(@@[^@]+@@)"),
"<span style=\"color:blue;font-weight:bold;\">\\1</span>");
difflines.replaceInStrings(QRegularExpression("^((---|\\+\\+\\+)\\s.*)$"),
"<span style=\"font-weight:bold;\">\\1</span>");
difflines.replaceInStrings(
QRegularExpression("^(-.*)$"),
"<span style=\"color:red;font-weight:bold;\">\\1</span>");
difflines.replaceInStrings(
QRegularExpression("^(\\+.*)$"),
"<span style=\"color:green;font-weight:bold;\">\\1</span>");
if (difflines.count() < 2)
on_reject_clicked();
else {
ui->diff->setHtml("<pre>" + difflines.join("\n") + "</pre>");
enableButtons();
}
}
QString MainWindow::diff(QString fold, QString fnew) {
QProcess pipe;
QStringList args;
args << "-udb" << fold << fnew;
pipe.start("diff", args, QIODevice::ReadOnly);
pipe.waitForFinished();
QString res = QString::fromUtf8(pipe.readAllStandardOutput().constData());
return res;
}
void MainWindow::on_accept_clicked() {
QString fold, fnew;
fold = fnew = ui->files->currentItem()->text();
fold.replace(QRegularExpression("\\.new$"), "");
if (QFile::remove(fold) && QFile::rename(fnew, fold)) {
ui->files->takeItem(ui->files->row(ui->files->currentItem()));
} else {
qWarning() << "Unable to move" << fnew << "to" << fold;
}
enableButtons();
}
void MainWindow::on_reject_clicked() {
QString fnew;
fnew = ui->files->currentItem()->text();
if (QFile::remove(fnew)) {
ui->files->takeItem(ui->files->row(ui->files->currentItem()));
} else {
qWarning() << "Unable to delete" << fnew;
}
enableButtons();
}
void MainWindow::on_diff_selectionChanged() {
ui->apply->setEnabled(ui->diff->textCursor().selectionStart() !=
ui->diff->textCursor().selectionEnd());
}
void MainWindow::on_edit_clicked() {
QString fold, fnew;
fold = fnew = ui->files->currentItem()->text();
fold.replace(QRegularExpression("\\.new$"), "");
QProcess editor;
QStringList args;
args << "-f";
args << fold;
editor.start("gvim", args);
editor.waitForFinished();
update_diff();
}
void MainWindow::on_apply_clicked() {
int start = ui->diff->textCursor().selectionStart();
int end = ui->diff->textCursor().selectionEnd();
int first = ui->diff->document()->findBlock(start).firstLineNumber();
int last = ui->diff->document()->findBlock(end).firstLineNumber();
if (last <= first)
last = first + 1;
QStringList lines = ui->diff->toPlainText().split("\n");
QStringList part_diff;
part_diff << lines[0] << lines[1];
// Looking for the beginning
if (first < 2)
first = 2;
else
while (lines[first].left(2) != "@@")
first--;
// Looking for the end
int nlines = lines.count();
while (last < nlines) {
if (lines[last].left(2) == "@@")
break;
else
last++;
}
part_diff << lines.mid(first, last - first) << "\n";
patch(part_diff.join("\n"));
update_diff();
}
void MainWindow::patch(QString diff) {
QProcess pipe;
QStringList args;
args << "-p0" << "-l";
pipe.start("patch", args);
pipe.waitForStarted();
pipe.write(diff.toUtf8());
pipe.closeWriteChannel();
pipe.waitForFinished();
qDebug() << pipe.readAllStandardOutput();
}
|
