Update readGitDiff to work for rename and move patches
[vng.git] / src / hunks / ChangeSet.cpp
blob4eb89be2a640f6c2211b878494bea91b80641023
1 /*
2 * This file is part of the vng project
3 * Copyright (C) 2008-2009 Thomas Zander <tzander@trolltech.com>
5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation, either version 3 of the License, or
8 * (at your option) any later version.
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.
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 #include "ChangeSet.h"
20 #include "../GitRunner.h"
21 #include "../Logger.h" // for debugging level only
22 #include "../AbstractCommand.h"
23 #include "../Vng.h"
25 #include <QProcess>
26 #include <QThread>
27 #include <QMutexLocker>
28 #include <QMutex>
29 #include <QWaitCondition>
30 #include <QDebug>
32 class HunksFetcher : public QThread
34 public:
35 HunksFetcher(const QList<File> &files, ChangeSet &changeSet, bool changeSetOnIndex)
36 : m_files(files),
37 m_changeSet(changeSet),
38 m_changeSetOnIndex(changeSetOnIndex),
39 m_interrupted(false)
43 void run()
45 setPriority(QThread::LowPriority);
46 foreach(File file, m_files) {
47 if (m_interrupted)
48 break;
49 m_changeSet.lockFile(file);
51 file.fetchHunks(m_changeSetOnIndex);
53 if (!file.isBinary() && file.count() == 0 && !file.hasChanged()) { // No change in file at all.
54 Logger::debug() << "file: `" << QString::fromUtf8(file.oldFileName()) << "' => `" << QString::fromUtf8(file.fileName()) << "'\n";
55 Logger::debug() << " +- Unchanged file, skipping\n";
56 m_changeSet.removeFile(file);
57 QProcess git;
58 QStringList arguments;
59 arguments << "update-index" << "-q" << "--refresh" << file.fileName();
60 GitRunner runner(git, arguments);
61 runner.start(GitRunner::WaitUntilFinished);
62 continue;
64 if (file.fileName().isEmpty() || file.oldFileName().isEmpty())
65 file.setProtectionAcceptance(Vng::Accepted);
67 int i=0;
68 if (Logger::verbosity() >= Logger::Debug) {
69 Logger::debug() << "file: `" << QString::fromUtf8(file.oldFileName()) << "' => `" << QString::fromUtf8(file.fileName()) << "'\n";
70 if (file.isBinary())
71 Logger::debug() << " +- is a binary file" << endl;
72 Logger::debug() << " +- " << file.oldProtection() << " => " << file.protection() << endl;
73 foreach(Hunk h, file.hunks()) {
74 Logger::debug() << " +-(" << i++ << ") @" << h.lineNumber() << "; " << h.patch().size() << " bytes\n";
75 for(int i = 0; i < h.subHunkCount(); i++) {
76 Logger::debug() << " " << i <<"/"<< h.subHunkCount() <<"; "<< h.subHunk(i).size() <<" bytes\n";
81 m_changeSet.lockFile(File());
82 m_changeSet.allHunksFetched();
85 void interrupt()
87 m_interrupted = true;
90 private:
91 QList<File> m_files;
92 ChangeSet &m_changeSet;
93 bool m_changeSetOnIndex, m_interrupted;
96 class ChangeSet::Private
98 public:
99 Private() :
100 changeSetOnIndex(false),
101 hunksFetcher(0),
102 ref(1),
103 finishedOneHunk(true)
107 ~Private() {
108 if (hunksFetcher) {
109 hunksFetcher->interrupt();
110 hunksFetcher->wait();
111 delete hunksFetcher;
115 QList<File> files;
116 bool changeSetOnIndex; // the changesSet shows the changes of the working dir
117 QMutex fileAccessLock;
118 QWaitCondition fileAccessWaiter;
119 QWaitCondition cursorAccessWaiter;
120 QMutex cursorAccessLock;
121 File lockedFile;
122 HunksFetcher *hunksFetcher;
123 #if QT_VERSION >= 0x040400
124 QAtomicInt ref;
125 #else
126 int ref;
127 #endif
128 bool finishedOneHunk;
131 ChangeSet::ChangeSet()
132 : d(new Private())
136 ChangeSet::~ChangeSet()
138 #if QT_VERSION >= 0x040400
139 if (!d->ref.deref())
140 #else
141 if (--d->ref == 0)
142 #endif
143 delete d;
146 ChangeSet::ChangeSet(const ChangeSet &other)
147 : d(other.d)
149 #if QT_VERSION >= 0x040400
150 d->ref.ref();
151 #else
152 d->ref++;
153 #endif
156 AbstractCommand::ReturnCodes ChangeSet::fillFromDiffFile(QIODevice &file)
158 file.open(QIODevice::ReadOnly);
160 foreach (File f, readGitDiff(file))
161 addFile(f);
163 if (Logger::verbosity() >= Logger::Debug) {
164 foreach(File f, d->files) {
165 Logger::debug() << "changes in file: " << f.fileName() << endl;
166 int i=0;
167 foreach(Hunk h, f.hunks()) {
168 Logger::debug() << " +-(" << i++ << ") @" << h.lineNumber() << "; " << h.patch().size() << " bytes\n";
169 for(int i = 0; i < h.subHunkCount(); i++) {
170 Logger::debug() << " " << i <<"/"<< h.subHunkCount() <<"; "<< h.subHunk(i).size() <<" bytes\n";
174 Logger::debug().flush();
176 return AbstractCommand::Ok;
179 AbstractCommand::ReturnCodes ChangeSet::fillFromCurrentChanges(const QStringList &paths, bool doGenerateHunks )
181 d->changeSetOnIndex = true;
182 QDir refs(".git/refs/heads");
183 const bool emptyRepo = refs.count() == 2; // only '.' and '..'
184 if (emptyRepo) { // all files added are new, just add all.
185 QProcess git;
186 QStringList arguments;
187 arguments << "ls-files" << "-s";
188 GitRunner runner(git, arguments);
189 AbstractCommand::ReturnCodes rc = runner.start(GitRunner::WaitForStandardOutput);
190 if (rc)
191 return rc;
192 char buf[1024];
193 while(true) {
194 qint64 lineLength = Vng::readLine(&git, buf, sizeof(buf));
195 if (lineLength == -1)
196 break;
197 File file;
198 file.setProtection(QString::fromAscii(buf, 6));
199 file.setSha1(QString::fromAscii(buf+7, 40));
200 file.setFileName(File::escapeGitFilename(QByteArray(buf + 50, lineLength - 51)));
201 d->files.append(file);
203 return AbstractCommand::Ok;
206 // TODO the below misses the usecase of vng add and then a filesystem rm. Use diff-index --cached to show those.
207 QProcess git;
208 QStringList arguments;
209 arguments << "diff-index" << "-M" << "HEAD";
210 if (! paths.isEmpty())
211 arguments << "--" << paths;
213 // for each line
214 // new file:
215 // :000000 100644 0000000000000000000000000000000000000000 8c3ae1d344f18b23c3bdde5d26658b70b03c65d9 A bar
216 // rename main.cpp => notmain.cpp
217 // :100644 100644 e58cfe72cb7a9559a0090886bea5b0ce00db6b47 477c729e5abbd701eb708df563e7e4f749b50435 R074 main.cpp notmain.cpp
218 // normal change
219 // :100644 100644 0bdd73e9ea0ba026f6796799946c4bfc9dd1b0b8 0000000000000000000000000000000000000000 M test
221 GitRunner runner(git, arguments);
222 AbstractCommand::ReturnCodes rc = runner.start(GitRunner::WaitForStandardOutput);
223 if (rc)
224 return rc;
225 char buf[1024];
226 while(true) {
227 qint64 lineLength = Vng::readLine(&git, buf, sizeof(buf));
228 if (lineLength == -1)
229 break;
230 if (lineLength > 0 && buf[0] != ':') // not a diff line, ignore.
231 continue;
233 File file;
234 file.setOldProtection(QString::fromAscii(buf+1, 6));
235 file.setProtection(QString::fromAscii(buf+8, 6));
236 file.setOldSha1(QString::fromAscii(buf+15, 40));
237 file.setSha1(QString::fromAscii(buf+56, 40));
238 int offset = 98;
239 while (buf[offset] != '\t' && offset < lineLength)
240 offset++;
241 if (buf[97] == 'R') { // rename
242 int tab = offset + 1;
243 while (buf[tab] != '\t' && tab < lineLength)
244 tab++;
245 file.setOldFileName(File::escapeGitFilename(QByteArray(buf + offset + 1, tab - offset - 1)));
246 file.setFileName(File::escapeGitFilename(QByteArray(buf + tab + 1, lineLength - tab - 2)));
248 else if (buf[97] == 'C') { // Copied file
249 int tab = offset + 1;
250 while (buf[tab] != '\t' && tab < lineLength)
251 tab++;
252 QByteArray filename(buf + offset + 1, tab - offset - 1);
253 filename = File::escapeGitFilename(filename);
254 file.setOldFileName(filename);
255 file.setFileName(filename);
257 else {
258 QByteArray filename(buf + offset + 1, lineLength - offset - 2);
259 filename = File::escapeGitFilename(filename);
260 if (buf[97] != 'A') // Add
261 file.setOldFileName(filename);
262 if (buf[97] != 'D') // Delete
263 file.setFileName(filename);
265 d->files.append(file);
267 if (doGenerateHunks)
268 generateHunks();
270 // call git-diff-files which will find all files that have been removed from the filesystem but are in the index.
271 // Since we don't like the index we just remove them from the index here.
272 arguments.clear();
273 arguments << "diff-files";
274 if (! paths.isEmpty())
275 arguments << "--" << paths;
276 runner.setArguments(arguments);
277 rc = runner.start(GitRunner::WaitForStandardOutput);
278 if (rc)
279 return rc;
280 arguments.clear();
281 arguments << "update-index" << "--remove";
282 while(true) {
283 qint64 lineLength = Vng::readLine(&git, buf, sizeof(buf));
284 if (lineLength == -1)
285 break;
286 if (lineLength > 0 && buf[0] != ':') // not a diff line, ignore.
287 continue;
288 if (lineLength < 97 ||buf[97] != 'D')
289 continue;
291 int offset = 98;
292 while (buf[offset] != '\t' && offset < lineLength)
293 offset++;
294 arguments.append(QString::fromUtf8(File::escapeGitFilename(QByteArray(buf + offset + 1, lineLength - offset - 2))));
296 if (arguments.count() > 2) {
297 runner.setArguments(arguments);
298 runner.start(GitRunner::WaitUntilFinished);
301 return AbstractCommand::Ok;
304 void ChangeSet::generateHunks()
306 Q_ASSERT(d->hunksFetcher == 0);
307 d->hunksFetcher = new HunksFetcher(d->files, *this, d->changeSetOnIndex);
308 d->finishedOneHunk = false;
309 d->hunksFetcher->start();
312 void ChangeSet::lockFile(const File &file)
314 // qDebug() << "ChangeSet::lockFile";
315 QMutexLocker ml(&d->fileAccessLock);
316 d->lockedFile = file;
317 if (d->files.count() == 0 || d->files.at(0) != file) { // as soon as we have done a file, we can start the interaction
318 // qDebug() << " unlock cursorAccessWaiter";
319 d->cursorAccessLock.lock();
320 d->finishedOneHunk = true;
321 d->cursorAccessWaiter.wakeAll();
322 d->cursorAccessLock.unlock();
325 d->fileAccessWaiter.wakeAll();
326 // qDebug() << "~ChangeSet::lockFile";
329 void ChangeSet::removeFile(const File &file)
331 QMutexLocker ml(&d->fileAccessLock);
332 // TODO move the cursor if this file is the current file.
333 d->files.removeAll(file);
334 d->fileAccessWaiter.wakeAll();
337 void ChangeSet::allHunksFetched()
339 // qDebug() << "ChangeSet::allHunksFetched";
340 QMutexLocker ml(&d->fileAccessLock);
341 d->lockedFile = File();
342 d->fileAccessWaiter.wakeAll();
343 // qDebug() << "~ChangeSet::allHunksFetched";
346 bool ChangeSet::hasAllHunks() const
348 return d->hunksFetcher == 0 || d->hunksFetcher->isFinished();
351 // static
352 QList<File> ChangeSet::readGitDiff(QIODevice &git, File *fileToDiff)
354 QList<File> filesInDiff;
356 // parse the output and create objects for each hunk. (note how that can be made multi-threading)
357 // we have to have the filename in the hunk too to allow skipping a whole hunk
358 char buf[10240];
359 enum State {
360 InPatch,
361 Empty,
362 InHeader
364 // a diff can be multiple files, or just the one fileToDiff. Lets keep one File object to point to the current file.
365 State state = Empty;
366 File file;
367 Hunk hunk;
368 while(true) {
369 qint64 lineLength = Vng::readLine(&git, buf, sizeof(buf));
370 if (lineLength == -1 || state == Empty) {
371 file.addHunk(hunk);
372 hunk = Hunk();
373 if (file.isValid())
374 filesInDiff << file;
375 if (fileToDiff)
376 file = File(*fileToDiff);
377 else
378 file = File();
379 state = Empty;
382 if (lineLength == -1)
383 break;
384 QString line = QString::fromLocal8Bit(buf, lineLength);
386 const bool newfile = line.startsWith("--- /dev/null");
387 if (line.length() > 6 && (newfile || line.startsWith("--- a/")
388 || line.startsWith("--- \"a/"))) {
389 if (!newfile) {
390 if (line[4].unicode() == '"') { // git-encoding...
391 QByteArray array(buf + 7, strlen(buf) - 8);
392 array.prepend('"');
393 file.setOldFileName(File::escapeGitFilename(array));
394 } else {
395 QByteArray array(buf + 6, strlen(buf) - 7);
396 file.setOldFileName(File::escapeGitFilename(array));
399 state = state == InPatch ? Empty : InHeader;
401 else if (fileToDiff == 0 && line.length() > 6 &&
402 (line.startsWith("+++ b/") || line.startsWith("+++ \"b"))) {
403 state = InHeader;
404 if (line[4].unicode() == '"') { // git-encoding...
405 QByteArray array(buf + 7, strlen(buf) - 8);
406 array.prepend('"');
407 file.setFileName(File::escapeGitFilename(array));
408 } else {
409 file.setFileName(QByteArray(buf + 6, strlen(buf) - 7));
412 else if (line.length() > 5 && line.startsWith("@@ -")) {
413 file.addHunk(hunk);
414 hunk = Hunk();
415 state = InPatch;
417 else if (line.startsWith("diff --git ")) {
418 state = state == InPatch ? Empty : InHeader;
419 continue;
421 else if (line.startsWith("Binary files a/") && line.indexOf(" differ") > 0) {
422 Q_ASSERT(fileToDiff);
423 fileToDiff->setBinary(true);
424 git.close();
425 return filesInDiff;
427 else if (line.startsWith("index ")) {
428 int dot = line.indexOf(QLatin1Char('.'), 6);
429 if (dot > 0 && line.length() > dot+3) {
430 file.setOldSha1(line.mid(6, dot-6));
431 int space = line.indexOf(QLatin1Char(' '), dot);
432 if (space == -1) {
433 space = line.length()-1; // cut off the linefeed
434 } else {
435 file.setProtection(line.mid(space+1).trimmed());
437 file.setSha1(line.mid(dot+2, space - dot - 2));
439 state = state == InPatch ? Empty : InHeader;
441 else if (line.startsWith("deleted file mode ")) {
442 file.setProtection(line.mid(18).trimmed());
443 state = state == InPatch ? Empty : InHeader;
445 else if (line.startsWith("new file mode ")) {
446 file.setProtection(line.mid(13).trimmed());
447 state = state == InPatch ? Empty : InHeader;
449 if (state == InPatch) {
450 QByteArray array(buf, lineLength);
451 hunk.addLine(array);
454 git.close();
455 return filesInDiff;
458 void ChangeSet::addFile(const File &file)
460 if (file.isValid())
461 d->files << file;
464 int ChangeSet::count() const
466 return d->files.count();
469 void ChangeSet::writeDiff(QIODevice &outDevice, ChangeSet::Selection selection) const
471 waitFinishGenerateHunks();
472 outDevice.open(QIODevice::WriteOnly | QIODevice::Truncate);
473 QDataStream diff(&outDevice);
474 foreach(File file, d->files) {
475 bool fileHeaderWritten = false;
476 if ((selection == AllHunks
477 || (selection == UserSelection && file.renameAcceptance() == Vng::Accepted))
478 && !file.oldFileName().isEmpty()
479 && file.oldFileName() != file.fileName()) {
480 writeRenameDiff(diff, file);
483 foreach(Hunk hunk, file.hunks()) {
484 if (selection == AllHunks
485 || (selection == UserSelection
486 && (hunk.acceptance() == Vng::Accepted || hunk.acceptance() == Vng::MixedAcceptance))
487 || (selection == InvertedUserSelection && hunk.acceptance() != Vng::Accepted)) {
488 if (!fileHeaderWritten) {
489 if (file.oldFileName().isEmpty()) { // new file
490 diff.writeRawData("--- /dev/null", 13);
491 } else {
492 diff.writeRawData("--- a/", 6);
493 diff.writeRawData(file.oldFileName().data(), file.oldFileName().size());
495 if (file.fileName().isEmpty()) { // deleted file
496 diff.writeRawData("\n+++ /dev/null\n", 15);
497 } else {
498 diff.writeRawData("\n+++ b/", 7);
499 diff.writeRawData(file.fileName().data(), file.fileName().size());
500 diff.writeRawData("\n", 1);
502 fileHeaderWritten = true;
504 QByteArray acceptedPatch;
505 if (selection == InvertedUserSelection)
506 acceptedPatch =hunk.rejectedPatch();
507 else if (selection == AllHunks) {
508 acceptedPatch = hunk.header();
509 acceptedPatch.append(hunk.patch());
511 else
512 acceptedPatch = hunk.acceptedPatch();
513 diff.writeRawData(acceptedPatch.data(), acceptedPatch.size());
517 outDevice.close();
520 void ChangeSet::writeRenameDiff(QDataStream &out, const File &file) const
522 out.writeRawData("diff --git a/", 13);
523 out.writeRawData(file.fileName().data(), file.fileName().size());
524 out.writeRawData(" b/", 3);
525 out.writeRawData(file.fileName().data(), file.fileName().size());
526 out.writeRawData("\nnew file mode ", 15);
527 QByteArray tmp = file.protection().toLatin1();
528 out.writeRawData(tmp.data(), tmp.length());
529 out.writeRawData("\nindex 0000000..", 16);
530 tmp = file.sha1().toLatin1();
531 out.writeRawData(tmp.data(), 7);
532 out.writeRawData("\n--- /dev/null\n+++ b/", 21);
533 out.writeRawData(file.fileName().data(), file.fileName().size());
535 QProcess git;
536 QStringList arguments;
537 arguments << "cat-file" << "blob" << file.sha1();
538 GitRunner runner(git, arguments);
539 runner.start(GitRunner::WaitForStandardOutput);
540 QList<QByteArray> lines;
541 char buf[4096];
542 while(true) {
543 qint64 lineLength = Vng::readLine(&git, buf, sizeof(buf));
544 if (lineLength == -1)
545 break;
546 lines.append(QByteArray(buf, lineLength));
549 QByteArray countAsString = QString::number(lines.count()).toLatin1();
550 out.writeRawData("\n@@ -0,0 +1,", 12);
551 out.writeRawData(countAsString.data(), countAsString.length());
552 out.writeRawData(" @@\n", 4);
553 foreach (const QByteArray &line, lines) {
554 out.writeRawData("+", 1);
555 out.writeRawData(line.data(), line.length());
558 // removed file.
559 out.writeRawData("\ndiff --git a/", 14);
560 out.writeRawData(file.oldFileName().data(), file.oldFileName().size());
561 out.writeRawData(" b/", 3);
562 out.writeRawData(file.oldFileName().data(), file.oldFileName().size());
563 out.writeRawData("\ndeleted file mode ", 19);
564 tmp = file.oldProtection().toLatin1();
565 out.writeRawData(tmp.data(), tmp.length());
566 out.writeRawData("\nindex ", 7);
567 tmp = file.oldSha1().toLatin1();
568 out.writeRawData(tmp.data(), 7);
569 out.writeRawData("..0000000\n--- a/", 16);
570 out.writeRawData(file.oldFileName().data(), file.oldFileName().size());
572 out.writeRawData("\n+++ /dev/null\n@@ -1,", 21);
573 out.writeRawData(countAsString.data(), countAsString.length());
574 out.writeRawData(" +0,0 @@\n", 9);
576 foreach (const QByteArray &line, lines) {
577 out.writeRawData("-", 1);
578 out.writeRawData(line.data(), line.length());
582 bool ChangeSet::hasAcceptedChanges() const
584 waitFinishGenerateHunks();
585 foreach(File file, d->files) {
586 if (file.renameAcceptance() == Vng::Accepted && file.fileName() != file.oldFileName())
587 return true;
588 if (file.protectionAcceptance() == Vng::Accepted && file.protection() != file.oldProtection())
589 return true;
590 if (file.isBinary() && file.binaryChangeAcceptance() == Vng::Accepted)
591 return true;
592 foreach(Hunk hunk, file.hunks()) {
593 Vng::Acceptance a = hunk.acceptance();
594 if (a == Vng::Accepted || a == Vng::MixedAcceptance)
595 return true;
598 return false;
601 File ChangeSet::file(int index) const
603 // qDebug() << "ChangeSet::file" << index << d->finishedOneHunk;
604 waitForFinishFirstFile();
605 QMutexLocker ml2(&d->fileAccessLock);
606 while (d->files.count() > index && d->files[index] == d->lockedFile)
607 // { qDebug() << " waiting for file to be unlocked";
608 d->fileAccessWaiter.wait(&d->fileAccessLock);
609 // }
610 if (d->files.count() <= index)
611 return File();
613 // qDebug() << "ChangeSet::~file";
614 return d->files[index];
617 ChangeSet &ChangeSet::operator=(const ChangeSet &other)
619 #if QT_VERSION >= 0x040400
620 other.d->ref.ref();
621 if (!d->ref.deref())
622 #else
623 other.d->ref++;
624 if (--d->ref == 0)
625 #endif
626 delete d;
627 d = other.d;
628 return *this;
631 void ChangeSet::waitFinishGenerateHunks() const
633 if (d->hunksFetcher)
634 d->hunksFetcher->wait();
637 void ChangeSet::waitForFinishFirstFile() const
639 d->cursorAccessLock.lock();
640 if (! d->finishedOneHunk)
641 d->cursorAccessWaiter.wait(&d->cursorAccessLock);
642 d->cursorAccessLock.unlock();