src/commands/Revert.cpp

   1 /*
   2  * This file is part of the vng project
   3  * Copyright (C) 2008-2009 Thomas Zander <tzander@trolltech.com>
   4  *
   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.
   9  *
  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.
  14  *
  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/>.
  17  */
  18
  19 #include "Revert.h"
  20 #include "CommandLineParser.h"
  21 #include "Interview.h"
  22 #include "Logger.h"
  23 #include "GitRunner.h"
  24 #include "hunks/ChangeSet.h"
  25 #include "hunks/HunksCursor.h"
  26
  27 #include <QProcess>
  28 #include <QDebug>
  29
  30 static const CommandLineOption options[] = {
  31     {"-a, --all", "answer yes to all patches"},
  32     {"-i, --interactive", "prompt user interactively"},
  33     CommandLineLastOption
  34 };
  35
  36 Revert::Revert()
  37     : AbstractCommand("revert")
  38 {
  39     CommandLineParser::addOptionDefinitions(options);
  40     CommandLineParser::setArgumentDefinition("revert [FILE or DIRECTORY]" );
  41 }
  42
  43 AbstractCommand::ReturnCodes Revert::run()
  44 {
  45     if (! checkInRepository())
  46         return NotInRepo;
  47     moveToRoot(static_cast<RebaseOptions>(CheckFileSystem | PrintError));
  48
  49     CommandLineParser *args = CommandLineParser::instance();
  50     const bool all = (m_config.contains("all") && !args->contains("interactive")) || args->contains("all");
  51
  52     ChangeSet changeSet;
  53     changeSet.fillFromCurrentChanges(rebasedArguments());
  54
  55     changeSet.waitForFinishFirstFile();
  56     bool shouldDoRevert = changeSet.count() > 0;
  57     if (!shouldDoRevert)
  58         Logger::warn() << "There are no changes to revert!" << endl;
  59
  60     if (shouldDoRevert && !all) { // then do interview
  61         HunksCursor cursor(changeSet);
  62         cursor.setConfiguration(m_config);
  63         Interview interview(cursor, name());
  64         interview.setUsePager(shouldUsePager());
  65         if (! interview.start()) {
  66             Logger::warn() << "Revert cancelled." << endl;
  67             return Ok;
  68         }
  69     }
  70
  71     if (shouldDoRevert && !all) { // check if there is anything selected
  72         shouldDoRevert = changeSet.hasAcceptedChanges();
  73         if (! shouldDoRevert)
  74             Logger::warn() << "If you don't want to revert after all, that's fine with me!" <<endl;
  75     }
  76
  77     if (shouldDoRevert && !all) { // ask user confirmation
  78         QString answer = Interview::ask("Do you really want to revert these changes? ");
  79         if (! (answer.startsWith("y") || answer.startsWith("Y")))
  80             return Ok;
  81     }
  82
  83     if (! dryRun() && shouldDoRevert) { // we then write out the patch and call git apply with it
  84         QFile outFile(patchFileName());
  85         changeSet.writeDiff(outFile, all ? ChangeSet::AllHunks : ChangeSet::UserSelection);
  86
  87         QProcess git;
  88         QStringList arguments;
  89         arguments << "apply" << "--apply" <<  "--reverse" << outFile.fileName();
  90
  91         GitRunner runner(git, arguments);
  92         AbstractCommand::ReturnCodes rc = runner.start(GitRunner::WaitUntilFinished);
  93         if (rc != Ok) {
  94             Logger::error() << "vng failed, internal error; failed to patch, sorry\n";
  95             outFile.remove();
  96             return rc;
  97         }
  98
  99         arguments.clear();
 100         arguments << QLatin1String("update-index") << QLatin1String("--add");
 101         for (int i = 0; i < changeSet.count(); ++i) {
 102             File file = changeSet.file(i);
 103             if ((all || file.renameAcceptance() == Vng::Accepted)
 104                     && file.oldFileName() != file.fileName()) {
 105                 if (!file.oldFileName().isEmpty())
 106                     arguments << file.oldFileName();
 107             } else if (all || file.changesAcceptance() == Vng::Accepted) {
 108                 arguments << file.fileName();
 109             }
 110         }
 111         if (arguments.count() > 2) {
 112             runner.setArguments(arguments);
 113             runner.start(GitRunner::WaitUntilFinished);
 114         }
 115     }
 116
 117     Logger::warn() << "Finished reverting." << endl;
 118     return Ok;
 119 }
 120
 121 QString Revert::argumentDescription() const
 122 {
 123     return QLatin1String("[FILE or DIRECTORY]");
 124 }
 125
 126 QString Revert::commandDescription() const
 127 {
 128     return QLatin1String("Revert is used to undo changes made to the working copy which have\n"
 129         "not yet been recorded.  You will be prompted for which changes you\n"
 130         "wish to undo. The last revert can be undone safely using the unrevert\n"
 131         "command if the working copy was not modified in the meantime.\n");
 132 }
 133
 134 // static
 135 QString  Revert::patchFileName()
 136 {
 137     return QString::fromLatin1(".git/.vng-revert.diff");
 138 }
 139
 140 /*
 141     check how we handle binary patches (i.e. no dataloss)
 142 */