# # # patch "src/model/Annotate.cpp" # from [d67a0eae37a9c3bf824fcf4d5601c253af3f0104] # to [0e5b805f3d5ff1d8c3a928c49e019668f58a30c6] # # patch "src/model/GetRevision.cpp" # from [4e1c050d7213c1ce24fde493df12a608d3598b18] # to [7bfe8d5f4fb09324fbe36861f320d4cf464dadd8] # # patch "src/monotone/MonotoneThread.cpp" # from [9aee9375d154f37a24147ac87d1327806cc2ec46] # to [a93a51b63026f7f64be172ec26d2cd106d16f304] # # patch "src/monotone/MonotoneThread.h" # from [e1f2a29a3682050496a8170dfcfa139f99e23b9f] # to [2b118fb88e52b782623fbc2242d0fa93b4058c0e] # # patch "src/view/dialogs/CheckoutRevision.cpp" # from [effa35c60c7d2cd8668de010d3ec98544f9b5c23] # to [fbe76f3df1ab3931f2b24dd0f0ce72bc52d3bc43] # # patch "src/view/dialogs/CommitRevision.cpp" # from [876a3055bffea87de28896fc8a9034e0314a0369] # to [967f3717219dbeafb3cbf4c46ec0aee4d14f777e] # # patch "src/view/dialogs/DatabaseDialogManager.h" # from [786df3fcd74a012b44c064eb935b8af2c44d94ad] # to [1fdb888a64383ea23f2353bade4c48838350f6de] # # patch "src/view/dialogs/UpdateWorkspace.cpp" # from [1eadfe28917f0207dc0009c16426af3b6a8cb602] # to [ff97489c431c4b5aed6315e81f6bffb0c4ef55f2] # # patch "src/view/dialogs/UpdateWorkspace.h" # from [f01bcf1974c3ead9e8ea6edf09a6a0dd9b113267] # to [772c4f555e86ce98da5948da89ff1c89cf1e4688] # # patch "src/view/dialogs/WorkspaceDialogManager.cpp" # from [b0361dcd6e3dd867f197c890d5f7d46f038a5e1f] # to [9cf0964fe75f6e3cb4010d2d87090612a24eaad7] # # patch "src/view/dialogs/WorkspaceDialogManager.h" # from [3cede0807d77fab138f880146da08411ef721c7c] # to [e703ce7af0b396cdca23e36e848bb348bdabfd42] # # patch "src/view/panels/DatabaseVariables.cpp" # from [8e17715d1ae3e68a26f33ffefc03577673ce7d1f] # to [773804d4f73bc318e8734469812739343fc7a940] # # patch "src/view/panels/DatabaseVariables.h" # from [4b133dedc8498f69a3029de272939505086c97ba] # to [13a8eb01f55f86cbbb43cab24538fa705c450ab2] # ============================================================ --- src/model/Annotate.cpp d67a0eae37a9c3bf824fcf4d5601c253af3f0104 +++ src/model/Annotate.cpp 0e5b805f3d5ff1d8c3a928c49e019668f58a30c6 @@ -123,12 +123,16 @@ void Annotate::readAnnotation(const Mono monotoneHandle = handle; baseRevision = rev; + + QStringList params; + params << "annotate" << "--revs-only" << file; + if (!rev.isEmpty()) + { + params << "-r" << rev; + } + proc->setMonotoneHandle(handle); - proc->start( - QStringList() << "annotate" - << "-r" << rev - << "--revs-only" << file - ); + proc->start(params); } void Annotate::processFinished(int exitCode, QProcess::ExitStatus exitStatus) ============================================================ --- src/model/GetRevision.cpp 4e1c050d7213c1ce24fde493df12a608d3598b18 +++ src/model/GetRevision.cpp 7bfe8d5f4fb09324fbe36861f320d4cf464dadd8 @@ -42,7 +42,7 @@ void GetRevision::readWorkspaceRevision( } void GetRevision::readWorkspaceRevision(const MonotoneHandlePtr & handle, - const QStringList & paths) + const QStringList & paths) { I(handle->getType() == MonotoneHandle::workspace_handle); revision.clear(); ============================================================ --- src/monotone/MonotoneThread.cpp 9aee9375d154f37a24147ac87d1327806cc2ec46 +++ src/monotone/MonotoneThread.cpp a93a51b63026f7f64be172ec26d2cd106d16f304 @@ -167,10 +167,10 @@ const int MonotoneThread::StdioBufferSiz const int MonotoneThread::StdioBufferSize = 50 * 1024 * 1024; -MonotoneThread::MonotoneThread( - int thread, const QString & m, const QString & d, const QString & w -) : QThread(), doAbort(false), commandNumber(0), threadNumber(thread), - mtnBinary(m), databasePath(d), monotoneHandle(w) +MonotoneThread::MonotoneThread(int thread, const QString & mtn, + const MonotoneHandlePtr & handle) + : QThread(), doAbort(false), commandNumber(0), + threadNumber(thread), mtnBinary(mtn), monotoneHandle(handle) {} MonotoneThread::~MonotoneThread() {} ============================================================ --- src/monotone/MonotoneThread.h e1f2a29a3682050496a8170dfcfa139f99e23b9f +++ src/monotone/MonotoneThread.h 2b118fb88e52b782623fbc2242d0fa93b4058c0e @@ -125,12 +125,9 @@ public: MonotoneThread(int, const QString &, const QString &, const QString & workspace = QString()); ~MonotoneThread(); - //! returns the database filepath which has been loaded by this thread - inline QString getMonotoneHandlePtrPath() const { return databasePath; } + //! returns the monotone handle which has been loaded by this thread + inline MonotoneHandlePtr getMonotoneHandle() const { return monotoneHandle; } - //! returns the workspace which has been set by this thread for the running instance (if any) - inline QString getWorkspacePath() const { return monotoneHandle; } - //! returns the amount of tasks which are in the queue inline int getQueueCount() const { return queue.size(); } @@ -185,8 +182,7 @@ private: int threadNumber; QString mtnBinary; - QString databasePath; - QString monotoneHandle; + MonotoneHandlePtr monotoneHandle; QQueue queue; QMutex lock; ============================================================ --- src/view/dialogs/CheckoutRevision.cpp effa35c60c7d2cd8668de010d3ec98544f9b5c23 +++ src/view/dialogs/CheckoutRevision.cpp fbe76f3df1ab3931f2b24dd0f0ce72bc52d3bc43 @@ -25,8 +25,8 @@ #include #include -CheckoutRevision::CheckoutRevision(QWidget * parent, const MonotoneHandlePtr & database) - : Dialog(parent), monotoneHandle(database) +CheckoutRevision::CheckoutRevision(QWidget * parent, const MonotoneHandlePtr & handle) + : Dialog(parent), monotoneHandle(handle) { setupUi(this); Dialog::init(); ============================================================ --- src/view/dialogs/CommitRevision.cpp 876a3055bffea87de28896fc8a9034e0314a0369 +++ src/view/dialogs/CommitRevision.cpp 967f3717219dbeafb3cbf4c46ec0aee4d14f777e @@ -26,8 +26,8 @@ #include #include -CommitRevision::CommitRevision(QWidget * parent, const MonotoneHandlePtr & workspace) - : Dialog(parent), monotoneHandle(workspace) +CommitRevision::CommitRevision(QWidget * parent, const MonotoneHandlePtr & handle) + : Dialog(parent), monotoneHandle(handle) { setupUi(this); Dialog::init(); @@ -92,7 +92,7 @@ void CommitRevision::readWorkspaceRevisi ); QMap privateKeys = - MonotoneUtil::getPrivateKeyMap(MonotoneUtil::getMonotoneHandlePtr(monotoneHandle)); + MonotoneUtil::getPrivateKeyMap(monotoneHandle); if (privateKeys.size() == 0) { ============================================================ --- src/view/dialogs/DatabaseDialogManager.h 786df3fcd74a012b44c064eb935b8af2c44d94ad +++ src/view/dialogs/DatabaseDialogManager.h 1fdb888a64383ea23f2353bade4c48838350f6de @@ -84,10 +84,10 @@ protected: AnnotateFile * annotateFile; CreateCert * createCert; + MonotoneHandlePtr monotoneHandle; + private: void cleanup(); - - MonotoneHandlePtr monotoneHandle; }; #endif ============================================================ --- src/view/dialogs/UpdateWorkspace.cpp 1eadfe28917f0207dc0009c16426af3b6a8cb602 +++ src/view/dialogs/UpdateWorkspace.cpp ff97489c431c4b5aed6315e81f6bffb0c4ef55f2 @@ -30,8 +30,6 @@ UpdateWorkspace::UpdateWorkspace(QWidget setupUi(this); Dialog::init(); - MonotoneHandlePtr handle = MonotoneUtil::getMonotoneHandlePtr(monotoneHandle); - branchesModel = new Branches(this, handle); branchList->setModel(branchesModel); @@ -66,7 +64,8 @@ UpdateWorkspace::UpdateWorkspace(QWidget this, SLOT(selectSelectorOption()) ); - mtnProcess = new MonotoneProcess(monotoneHandle); + mtnProcess = new MonotoneProcess(); + mtnProcess->setMonotoneHandle(handle); connect( mtnProcess, SIGNAL(output(const QString &)), @@ -166,10 +165,8 @@ void UpdateWorkspace::accept() Settings::addItemToList("RecentUpdateSelectors", selection, 10); } - QStringList revList = MonotoneUtil::resolveSelector( - MonotoneUtil::getMonotoneHandlePtr(monotoneHandle), - selector - ); + QStringList revList = + MonotoneUtil::resolveSelector(monotoneHandle, selector); if (revList.size() == 0) { @@ -199,9 +196,9 @@ void UpdateWorkspace::accept() QString baseRevisionId = MonotoneUtil::getBaseWorkspaceRevision(monotoneHandle); - QStringList commonAncestors = MonotoneUtil::getCommonAncestors( - MonotoneUtil::getMonotoneHandlePtr(monotoneHandle), - QStringList() << selectedRevisionId << baseRevisionId + QStringList commonAncestors = MonotoneUtil::getCommonAncestors( + monotoneHandle, + QStringList() << selectedRevisionId << baseRevisionId ); if (commonAncestors.size() == 0) @@ -262,7 +259,9 @@ void UpdateWorkspace::processFinished(in Q_UNUSED(exitStatus); if (exitCode == 0) { - QListWidgetItem * item = new QListWidgetItem(tr("Update successfully completed"), output); + QListWidgetItem * item = new QListWidgetItem( + tr("Update successfully completed"), output + ); item->setForeground(QBrush(QColor("green"))); output->addItem(item); output->scrollToItem(item); ============================================================ --- src/view/dialogs/UpdateWorkspace.h f01bcf1974c3ead9e8ea6edf09a6a0dd9b113267 +++ src/view/dialogs/UpdateWorkspace.h 772c4f555e86ce98da5948da89ff1c89cf1e4688 @@ -49,12 +49,12 @@ private: virtual void closeEvent(QCloseEvent *); private: - Branches * branchesModel; - Tags * tagsModel; - QCompleter * selectorCompleter; - MonotoneProcess * mtnProcess; + Branches * branchesModel; + Tags * tagsModel; + QCompleter * selectorCompleter; + MonotoneProcess * mtnProcess; MonotoneHandlePtr monotoneHandle; - QString selectedRevisionId; + QString selectedRevisionId; private slots: void slotSelectRevision(); ============================================================ --- src/view/dialogs/WorkspaceDialogManager.cpp b0361dcd6e3dd867f197c890d5f7d46f038a5e1f +++ src/view/dialogs/WorkspaceDialogManager.cpp 9cf0964fe75f6e3cb4010d2d87090612a24eaad7 @@ -45,13 +45,6 @@ void WorkspaceDialogManager::closeAllDia DatabaseDialogManager::closeAllDialogs(); } -void WorkspaceDialogManager::init(const MonotoneHandlePtr & path) -{ - DatabaseDialogManager::init(APP->manager()->getMonotoneHandlePtrPath(path)); - monotoneHandle = path; - cleanup(); -} - void WorkspaceDialogManager::showCommitRevision() { showCommitRevision(QStringList()); @@ -85,8 +78,10 @@ void WorkspaceDialogManager::showFileHis void WorkspaceDialogManager::showFileHistory(const QString & file) { - DatabaseDialogManager::showFileHistory(file, - MonotoneUtil::getBaseWorkspaceRevision(monotoneHandle)); + DatabaseDialogManager::showFileHistory( + file, + MonotoneUtil::getBaseWorkspaceRevision(monotoneHandle) + ); } void WorkspaceDialogManager::checkForUnaccountedRenames() ============================================================ --- src/view/dialogs/WorkspaceDialogManager.h 3cede0807d77fab138f880146da08411ef721c7c +++ src/view/dialogs/WorkspaceDialogManager.h e703ce7af0b396cdca23e36e848bb348bdabfd42 @@ -34,7 +34,6 @@ public: WorkspaceDialogManager(QWidget *); ~WorkspaceDialogManager(); - void init(const MonotoneHandlePtr &); void closeAllDialogs(); //! delegated signals @@ -60,8 +59,6 @@ private: private: void cleanup(); - - MonotoneHandlePtr monotoneHandle; }; #endif ============================================================ --- src/view/panels/DatabaseVariables.cpp 8e17715d1ae3e68a26f33ffefc03577673ce7d1f +++ src/view/panels/DatabaseVariables.cpp 773804d4f73bc318e8734469812739343fc7a940 @@ -73,9 +73,9 @@ DatabaseVariables::~DatabaseVariables() delete databaseVariables; } -void DatabaseVariables::setMonotoneHandlePtr(const MonotoneHandlePtr & handle) +void DatabaseVariables::setMonotoneHandle(const MonotoneHandlePtr & handle) { - databaseVariables->setMonotoneHandlePtr(handle); + databaseVariables->setMonotoneHandle(handle); // FIXME: this is hacky, but we can't properly determine when to // read the variables other than here or on every view change // (see QDockWidget::visibilityChanged(bool) for that purpose), but ============================================================ --- src/view/panels/DatabaseVariables.h 4b133dedc8498f69a3029de272939505086c97ba +++ src/view/panels/DatabaseVariables.h 13a8eb01f55f86cbbb43cab24538fa705c450ab2 @@ -32,7 +32,7 @@ public slots: ~DatabaseVariables(); public slots: - void setMonotoneHandlePtr(const MonotoneHandlePtr &); + void setMonotoneHandle(const MonotoneHandlePtr &); private slots: void variablesRead();