# # # patch "src/view/dialogs/RevisionDiff.cpp" # from [b10e003f4e0dfec33e78d9e96c147574a8931608] # to [14c5030b75f2da760c42794373684bddda2dbaee] # # patch "src/view/dialogs/RevisionDiff.h" # from [60ddf83b6d75d995185fdf313d5177f017d6a527] # to [5589c056cc792413b67d57023c4341ea3ce4d4b3] # ============================================================ --- src/view/dialogs/RevisionDiff.cpp b10e003f4e0dfec33e78d9e96c147574a8931608 +++ src/view/dialogs/RevisionDiff.cpp 14c5030b75f2da760c42794373684bddda2dbaee @@ -59,17 +59,11 @@ void RevisionDiff::forDatabase(const Dat diffModel->readDatabaseDiff(db, filePath, base, target); } -void RevisionDiff::forWorkspace(const WorkspacePath & ws, - const QString & filePath, const QString & base) +void RevisionDiff::forWorkspace(const WorkspacePath & ws, const QString & filePath) { QString left = tr("base revision"); QString right = tr("workspace revision"); - if (base.size() > 0) - { - left = base.left(12).append("..."); - } - QString title; if (!filePath.isEmpty() && filePath != ".") title = tr("Differences between %1 and %2 in %3") @@ -79,6 +73,6 @@ void RevisionDiff::forWorkspace(const Wo .arg(left).arg(right); setWindowTitle(title); - diffModel->readWorkspaceDiff(ws, filePath, base); + diffModel->readWorkspaceDiff(ws, filePath); } ============================================================ --- src/view/dialogs/RevisionDiff.h 60ddf83b6d75d995185fdf313d5177f017d6a527 +++ src/view/dialogs/RevisionDiff.h 5589c056cc792413b67d57023c4341ea3ce4d4b3 @@ -33,7 +33,7 @@ public: ~RevisionDiff(); void forDatabase(const DatabaseFile &, const QString &, const QString &, const QString &); - void forWorkspace(const WorkspacePath &, const QString &, const QString & base = QString()); + void forWorkspace(const WorkspacePath &, const QString &); private: ContentDiff * diffModel;