# # # patch "src/model/GetRevision.cpp" # from [16e8d868a71037b1ea70b9b9d764ec5e11101828] # to [10be062fbe81f5de0a67a8326cda76b950d7e003] # # patch "src/model/GetRevision.h" # from [0d219aecb29f31a4ff5b9ee8b87fcb46b8c97d7c] # to [1faea450c4f0c3aada1465034beca0fff5b276d9] # # patch "src/view/dialogs/ChangesetBrowser.cpp" # from [145b32ab0e2f9de4e54b00ba851979f896fa7dbb] # to [6f1cf9f834ff5efc525e2393e6a86a12278176b1] # # patch "src/view/dialogs/CommitRevision.cpp" # from [463f13c67ffcd82374276d7100d6dd8ec3dd925c] # to [f45a93b0ab0bf9424c8f8954df0dfd713ee106c8] # ============================================================ --- src/model/GetRevision.cpp 16e8d868a71037b1ea70b9b9d764ec5e11101828 +++ src/model/GetRevision.cpp 10be062fbe81f5de0a67a8326cda76b950d7e003 @@ -25,18 +25,24 @@ #include #include -GetRevision::GetRevision(QObject * parent, const DatabaseFile & db) - : QAbstractItemModel(parent), AutomateCommand(0), databaseFile(db) +GetRevision::GetRevision(QObject * parent) + : QAbstractItemModel(parent), AutomateCommand(0) {} GetRevision::~GetRevision() {} -void GetRevision::readRevision(const QString & rev) +void GetRevision::readDatabaseRevision(const DatabaseFile & db, const QString & rev) { revision.clear(); + MonotoneTask task( QStringList() << "get_revision" << rev); + AutomateCommand::enqueueDatabaseTask(db, task); +} - MonotoneTask task(QStringList() << "get_revision" << rev); - AutomateCommand::enqueueDatabaseTask(databaseFile, task); +void GetRevision::readWorkspaceRevision(const WorkspacePath & ws) +{ + revision.clear(); + MonotoneTask task( QStringList() << "get_revision"); + AutomateCommand::enqueueWorkspaceTask(ws, task); } void GetRevision::processTaskResult(const MonotoneTask & task) ============================================================ --- src/model/GetRevision.h 0d219aecb29f31a4ff5b9ee8b87fcb46b8c97d7c +++ src/model/GetRevision.h 1faea450c4f0c3aada1465034beca0fff5b276d9 @@ -105,7 +105,7 @@ public: { Q_OBJECT public: - GetRevision(QObject *, const DatabaseFile &); + GetRevision(QObject *); virtual ~GetRevision(); QStringList getParentRevisions() const; @@ -119,7 +119,8 @@ public slots: int columnCount(const QModelIndex &) const; public slots: - void readRevision(const QString &); + void readDatabaseRevision(const DatabaseFile &, const QString &); + void readWorkspaceRevision(const WorkspacePath &); void showChangesAgainstParent(const QString &); signals: ============================================================ --- src/view/dialogs/ChangesetBrowser.cpp 145b32ab0e2f9de4e54b00ba851979f896fa7dbb +++ src/view/dialogs/ChangesetBrowser.cpp 6f1cf9f834ff5efc525e2393e6a86a12278176b1 @@ -55,7 +55,7 @@ ChangesetBrowser::ChangesetBrowser(QWidg changesets->setModel(changesetModel); changesets->setRootIsDecorated(false); - revisionModel = new GetRevision(this, databaseFile); + revisionModel = new GetRevision(this); revisionView->setModel(revisionModel); connect( @@ -122,7 +122,7 @@ void ChangesetBrowser::changesetsClicked QModelIndex revIdx = changesetModel->index(idx.row(), 3, QModelIndex()); QString revision = changesetModel->data(revIdx, Qt::DisplayRole).toString(); changeLog->setHtml(changesetModel->data(revIdx, Qt::UserRole).toString()); - revisionModel->readRevision(revision); + revisionModel->readDatabaseRevision(databaseFile, revision); } void ChangesetBrowser::initTreeWidget() ============================================================ --- src/view/dialogs/CommitRevision.cpp 463f13c67ffcd82374276d7100d6dd8ec3dd925c +++ src/view/dialogs/CommitRevision.cpp f45a93b0ab0bf9424c8f8954df0dfd713ee106c8 @@ -46,9 +46,9 @@ CommitRevision::CommitRevision(QWidget * previousChangelogEntryList->insertItem(i, shortened, QVariant(entry)); } - revModel = new GetRevision(this, MonotoneUtil::getDatabaseFile(workspacePath)); + revModel = new GetRevision(this); changeView->setModel(revModel); - revModel->readRevision(QString()); + revModel->readWorkspaceRevision(workspacePath); connect( revModel, SIGNAL(revisionRead()),