# # # patch "src/model/ContentDiff.cpp" # from [b6fe990a4478491b68c166ae18661d9a58df3a9f] # to [b522cc9b2c22cb6abbe48283f13873ec9770362f] # # patch "src/model/ContentDiff.h" # from [3d7573095014f5af6fcce851e3f4454da976009b] # to [136f063bc6c791878b0561b7c891b0e46d5887a4] # ============================================================ --- src/model/ContentDiff.cpp b6fe990a4478491b68c166ae18661d9a58df3a9f +++ src/model/ContentDiff.cpp b522cc9b2c22cb6abbe48283f13873ec9770362f @@ -53,22 +53,12 @@ void ContentDiff::readDatabaseDiff(const AutomateCommand::enqueueDatabaseTask(db, task); } -void ContentDiff::readWorkspaceDiff(const WorkspacePath & ws, const QString & fileName, - const QString & base) +void ContentDiff::readWorkspaceDiff(const WorkspacePath & ws, const QString & fileName) { // reset the view reset(); - QStringList cmd; - cmd << "content_diff" << fileName; - - QStringList opts; - if (!base.isEmpty()) - { - opts << "r" << base; - } - - MonotoneTask task(cmd, opts); + MonotoneTask task(QStringList() << "content_diff" << fileName); AutomateCommand::enqueueWorkspaceTask(ws, task); } ============================================================ --- src/model/ContentDiff.h 3d7573095014f5af6fcce851e3f4454da976009b +++ src/model/ContentDiff.h 136f063bc6c791878b0561b7c891b0e46d5887a4 @@ -74,7 +74,7 @@ public slots: public slots: void readDatabaseDiff(const DatabaseFile &, const QString &, const QString &, const QString &); - void readWorkspaceDiff(const WorkspacePath &, const QString &, const QString & base = QString()); + void readWorkspaceDiff(const WorkspacePath &, const QString &); signals: void diffRead();