# # # patch "src/monotone/MonotoneThread.h" # from [65915d3a31aa408b5f44edb31609aa464d30ddb8] # to [fee97aaba84dc796ce523e2fe88b17337c6a7b27] # # patch "src/monotone/MonotoneUtil.cpp" # from [1188fc19d37193d33b87bd73c82b9e5c6bd57f22] # to [2ea8ebeb32be9829d6d27766f6d63ce6c3601dec] # # patch "src/monotone/MonotoneUtil.h" # from [a30ed6b32d5ef898ab5ab70137d1e2a5e80d5034] # to [f04aee16fa423dddcabb3d91d909968785319f3c] # ============================================================ --- src/monotone/MonotoneThread.h 65915d3a31aa408b5f44edb31609aa464d30ddb8 +++ src/monotone/MonotoneThread.h fee97aaba84dc796ce523e2fe88b17337c6a7b27 @@ -118,13 +118,13 @@ public: ~MonotoneThreadManager() {}; inline void setMtnBinaryPath(const QString & path) { mtnPath = path; } + DatabaseFile getDatabaseFilePath(const WorkspacePath &); MonotoneThread * getThreadForWorkspace(const WorkspacePath &); MonotoneThread * getThreadForDatabase(const DatabaseFile &); MonotoneThread * getThread(const DatabaseFile &, const WorkspacePath &); private: - DatabaseFile getDatabaseFilePath(const WorkspacePath &); WorkspacePath normalizeWorkspacePath(const WorkspacePath &); QMap threadMap; ============================================================ --- src/monotone/MonotoneUtil.cpp 1188fc19d37193d33b87bd73c82b9e5c6bd57f22 +++ src/monotone/MonotoneUtil.cpp 2ea8ebeb32be9829d6d27766f6d63ce6c3601dec @@ -185,6 +185,11 @@ MonotoneTask MonotoneUtil::runSynchronou return result; } +DatabaseFile MonotoneUtil::getDatabaseFile(const WorkspacePath & workspace) +{ + return APP->manager()->getDatabaseFilePath(workspace); +} + QString MonotoneUtil::getBaseWorkspaceRevision(const WorkspacePath & workspace) { MonotoneTask in(QStringList() << "get_base_revision_id"); ============================================================ --- src/monotone/MonotoneUtil.h a30ed6b32d5ef898ab5ab70137d1e2a5e80d5034 +++ src/monotone/MonotoneUtil.h f04aee16fa423dddcabb3d91d909968785319f3c @@ -43,6 +43,7 @@ public: // synchronous commands static MonotoneTask runSynchronousWorkspaceTask(const WorkspacePath &, const MonotoneTask &); static MonotoneTask runSynchronousDatabaseTask(const DatabaseFile &, const MonotoneTask &); + static DatabaseFile getDatabaseFile(const WorkspacePath &); static QString getBaseWorkspaceRevision(const WorkspacePath &); static QString getOption(const WorkspacePath &, const QString &); static QString getBranchName(const WorkspacePath &, const QString & defaultBranch = tr("[unknown branch]"));