Modernise the Repository Manager

CMakeLists.txt

@@ -39,6 +39,7 @@ ENABLE_TESTING()
 SET(UTILS_APP_NAME MacGitver)
 
 RAD_DEFINE_VERSION(MACGITVER_CORE 0 0 1)
+RAD_DEFINE_VERSION(REPOMAN 0 0 1)
 
 ADD_SUBDIRECTORY(CfgComp)
 

Libs/CMakeLists.txt

@@ -12,4 +12,6 @@ INCLUDE_DIRECTORIES( BEFORE
 
 ADD_SUBDIRECTORY(libLogger)
 ADD_SUBDIRECTORY(libDiffViews)
+ADD_SUBDIRECTORY(libRepoMan)
 ADD_SUBDIRECTORY(libMacGitverCore)
+

Libs/libMacGitverCore/App/MacGitver.cpp

@@ -32,9 +32,11 @@
 #include "libMacGitverCore/App/MgvPrimaryWindow.hpp"
 #include "libMacGitverCore/Config/Config.h"
 #include "libMacGitverCore/Config/Ui/GeneralConfigPage.hpp"
+#include "libMacGitverCore/Config/Ui/RepoManConfigPage.hpp"
 #include "libMacGitverCore/MacGitver/Modules.h"
-#include "libMacGitverCore/RepoMan/RepoMan.hpp"
-#include "libMacGitverCore/RepoMan/Config/RepoManConfigPage.hpp"
+#include "libMacGitverCore/MacGitver/AutoRefresher.hpp"
+
+#include "libRepoMan/RepoMan.hpp"
 
 /**
  * @class   MacGitver
@@ -55,6 +57,7 @@
 
 MacGitverPrivate::MacGitverPrivate(MacGitver* owner, bool runGui)
     : isGui(runGui)
+    , refresher(nullptr)
 {
     sSelf = owner;
 }
@@ -67,13 +70,16 @@ void MacGitverPrivate::init()
         QApplication::setOrganizationName(QStringLiteral("MacGitver"));
         QApplication::setApplicationName(QStringLiteral("MacGitver"));
 
+        // only start the auto refresher if we're running a GUI
+        refresher = new AutoRefresher;
+
         Heaven::IconManager::self().defaultProvider()->addSearchPath(QStringLiteral(":/Images"));
     } else {
         QApplication::setOrganizationName(QStringLiteral("MacGitver"));
         QApplication::setApplicationName(QStringLiteral("MacGitver_NonGui"));
     }
 
-    sRepoMan    = new RM::RepoMan;
+    RM::RepoMan::instance();
     sModules    = new Modules;
 
     if (isGui) {
@@ -86,7 +92,8 @@ MacGitverPrivate::~MacGitverPrivate()
 {
     unregisterGlobalConfigPages();
 
-    delete sRepoMan;    sRepoMan    = NULL;
+    RM::RepoMan::instance().terminate();
+
     delete sModules;    sModules    = NULL;
 
     Log::Manager::release();
@@ -104,7 +111,6 @@ void MacGitverPrivate::bootGui()
 }
 
 MacGitver*      MacGitverPrivate::sSelf         = NULL;
-RM::RepoMan*    MacGitverPrivate::sRepoMan      = NULL;
 Modules*        MacGitverPrivate::sModules      = NULL;
 
 MacGitver& MacGitver::self()
@@ -117,9 +123,7 @@ MacGitver& MacGitver::self()
 
 RM::RepoMan& MacGitver::repoMan()
 {
-    Q_ASSERT(MacGitverPrivate::sRepoMan);
-
-    return *MacGitverPrivate::sRepoMan;
+    return RM::RepoMan::instance();
 }
 
 MacGitver::MacGitver(bool runGui)
@@ -209,3 +213,8 @@ bool MacGitver::isRunningGui() const
 {
     return d->isGui;
 }
+
+AutoRefresher* MacGitver::refresher() const
+{
+    return d->refresher;
+}

Libs/libMacGitverCore/App/MacGitver.hpp

@@ -38,6 +38,7 @@ namespace RM
 
 typedef BlueSky::ViewDescriptor::CreatorFunc MgvViewCreator;
 
+class AutoRefresher;
 class MacGitverPrivate;
 
 class MGV_CORE_API MacGitver
@@ -50,6 +51,7 @@ class MGV_CORE_API MacGitver
 
 public:
     static MacGitver&   self();
+    GW_DEPRECATED
     static RM::RepoMan& repoMan();
 
 public:
@@ -66,6 +68,8 @@ class MGV_CORE_API MacGitver
                                           MgvViewCreator creator);
     void unregisterView(const BlueSky::ViewIdentifier& identifier);
 
+    AutoRefresher *refresher() const;
+
     static void log(Log::Type type, const QString& logMessage);
     static void log(Log::Type type, const char* logMessage);
     static void log(Log::Type type, const Git::Result& r, const char* logMessage = nullptr);

Libs/libMacGitverCore/App/MacGitverPrivate.hpp

@@ -27,6 +27,7 @@
 class QDir;
 
 class Modules;
+class AutoRefresher;
 
 struct MgvViewInfo
 {
@@ -62,7 +63,7 @@ private slots:
     Git::GitWrap        mGitWrap;
     bool                isGui;
     MgvApp              bsApp;
+    AutoRefresher*      refresher;
     static MacGitver*   sSelf;
     static Modules*     sModules;
-    static RM::RepoMan* sRepoMan;
 };

Libs/libMacGitverCore/App/MgvPrimaryWindow.cpp

@@ -22,12 +22,12 @@
 #include "libMacGitverCore/App/MgvPrimaryWindowPrivate.hpp"
 #include "libMacGitverCore/MacGitver/Modules.h"
 
-#include "libMacGitverCore/RepoMan/RepoMan.hpp"
-
 #include "libMacGitverCore/Config/Config.h"
 #include "libMacGitverCore/Config/Ui/ConfigDialog.hpp"
 #include "libMacGitverCore/Widgets/RepoStateWidget.hpp"
 
+#include "libRepoMan/RepoMan.hpp"
+
 #include "libBlueSky/Application.hpp"
 #include "libBlueSky/FooterWidget.hpp"
 
@@ -64,10 +64,10 @@ MgvPrimaryWindow::MgvPrimaryWindow()
     w->show();
     #endif
 
-    connect(&MacGitver::repoMan(), &RM::RepoMan::firstRepositoryOpened,
+    connect(&RM::RepoMan::instance(), &RM::RepoMan::firstRepositoryOpened,
             this, &MgvPrimaryWindow::activateModeForRepo);
 
-    connect(&MacGitver::repoMan(), &RM::RepoMan::lastRepositoryClosed,
+    connect(&RM::RepoMan::instance(), &RM::RepoMan::lastRepositoryClosed,
             this, &MgvPrimaryWindow::activateModeForRepo);
 
     setupFonts();
@@ -157,7 +157,7 @@ void MgvPrimaryWindow::moveToCenter()
 
 void MgvPrimaryWindow::activateModeForRepo()
 {
-    if (MacGitver::repoMan().repositories().count() > 0) {
+    if (RM::RepoMan::instance().repositories().count() > 0) {
         activateMode(QStringLiteral("HistoryMode"));
     }
     else {

Libs/libMacGitverCore/CMakeLists.txt

@@ -20,30 +20,12 @@ SET( SRC_FILES
     Config/Ui/ConfigPage.cpp
     Config/Ui/GeneralConfigPage.cpp
     Config/Ui/ConfigPageProvider.cpp
+    Config/Ui/RepoManConfigPage.cpp
 
     MacGitver/Module.cpp
     MacGitver/Modules.cpp
     MacGitver/GitPatchConsumer.cpp
-
-    RepoMan/AutoRefresher.cpp
-    RepoMan/Base.cpp
-    RepoMan/Ref.cpp
-    RepoMan/Branch.cpp
-    RepoMan/CollectionNode.cpp
-    RepoMan/Events.cpp
-    RepoMan/Repo.cpp
-    RepoMan/RepoMan.cpp
-    RepoMan/Remote.cpp
-    RepoMan/Tag.cpp
-    RepoMan/RefLog.cpp
-    RepoMan/Submodule.cpp
-    RepoMan/RefTreeNode.cpp
-    RepoMan/Namespace.cpp
-    RepoMan/Head.cpp
-
-    RepoMan/Private/Dumper.cpp
-
-    RepoMan/Config/RepoManConfigPage.cpp
+    MacGitver/AutoRefresher.cpp
 
     SHMParser/ShellExpand.cpp
 
@@ -77,21 +59,6 @@ SET( PUB_HDR_FILES
     MacGitver/GitPatchConsumer.hpp
     MacGitver/IRepositoryContext.hpp
 
-    RepoMan/Base.hpp
-    RepoMan/Events.hpp
-    RepoMan/CollectionNode.hpp
-    RepoMan/Ref.hpp
-    RepoMan/Repo.hpp
-    RepoMan/RepoMan.hpp
-    RepoMan/Remote.hpp
-    RepoMan/Tag.hpp
-    RepoMan/Branch.hpp
-    RepoMan/RefLog.hpp
-    RepoMan/Submodule.hpp
-    RepoMan/RefTreeNode.hpp
-    RepoMan/Namespace.hpp
-    RepoMan/Head.hpp
-
     SHMParser/ShellExpand.hpp
 
     Widgets/ExpandableDlg.hpp
@@ -112,31 +79,17 @@ SET( PRI_HDR_FILES
     App/MacGitverPrivate.hpp
     App/MgvPrimaryWindowPrivate.hpp
 
+    MacGitver/AutoRefresher.hpp
+
     Config/Ui/ConfigDialog.hpp
     Config/Ui/GeneralConfigPage.hpp
-
-    RepoMan/AutoRefresher.hpp
-
-    RepoMan/Private/BasePrivate.hpp
-    RepoMan/Private/BranchPrivate.hpp
-    RepoMan/Private/CollectionNodePrivate.hpp
-    RepoMan/Private/NamespacePrivate.hpp
-    RepoMan/Private/RefPrivate.hpp
-    RepoMan/Private/RefLogPrivate.hpp
-    RepoMan/Private/RefTreeNodePrivate.hpp
-    RepoMan/Private/RemotePrivate.hpp
-    RepoMan/Private/RepoPrivate.hpp
-    RepoMan/Private/RepoManPrivate.hpp
-    RepoMan/Private/SubmodulePrivate.hpp
-    RepoMan/Private/TagPrivate.hpp
-    RepoMan/Private/Dumper.hpp
-    RepoMan/Private/HeadPrivate.hpp
-
-    RepoMan/Config/RepoManConfigPage.hpp
+    Config/Ui/RepoManConfigPage.hpp
 
     Widgets/StringSelectorWidgetPrivate.h
     Widgets/FlatTreeModelPrivate.h
     Widgets/RepoStateWidget.hpp
+
+    MacGitver/AutoRefresher.hpp
 )
 
 SET( UI_FILES
@@ -145,16 +98,14 @@ SET( UI_FILES
 
     Config/Ui/ConfigDialog.ui
     Config/Ui/GeneralConfigPage.ui
-
-    RepoMan/Config/RepoManConfigPage.ui
+    Config/Ui/RepoManConfigPage.ui
 
     Widgets/ExpandableDlg.ui
 )
 
 SET( HID_FILES
 
     App/MgvPrimaryWindowActions.hid
-    RepoMan/Private/RepoManActions.hid
 
 )
 
@@ -165,7 +116,7 @@ SET(RCC_FILES
 SET( HDR_FILES ${PRI_HDR_FILES} ${PUB_HDR_FILES} )
 
 SET(CCFG_FILES
-    RepoMan/AutoRefresherCfg.ccfg
+    MacGitver/AutoRefresherCfg.ccfg
 )
 
 CFGCOMP(CFG_FILES ${CCFG_FILES})
@@ -195,6 +146,7 @@ TARGET_LINK_LIBRARIES(
         HeavenIcons
         BlueSky
         Logger
+        RepoMan
 
     LINK_PRIVATE
         GitWrap

Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.cpp → Libs/libMacGitverCore/Config/Ui/RepoManConfigPage.cpp

@@ -17,18 +17,16 @@
  *
  */
 
-#include "libMacGitverCore/RepoMan/Config/RepoManConfigPage.hpp"
-#include "libMacGitverCore/RepoMan/Private/RepoManPrivate.hpp"
-#include "libMacGitverCore/RepoMan/AutoRefresher.hpp"
-#include "libMacGitverCore/RepoMan/RepoMan.hpp"
+#include "libMacGitverCore/Config/Ui/RepoManConfigPage.hpp"
 
+#include "libMacGitverCore/MacGitver/AutoRefresher.hpp"
 #include "libMacGitverCore/App/MacGitver.hpp"
 
 IMPLEMENT_NESTED_PAGE_CREATOR(RepoManConfigPage, 210)
 
 RepoManConfigPage::RepoManConfigPage(ConfigDialog* dlg)
     : ConfigPage(dlg)
-    , refresher(NULL)
+    , refresher(MacGitver::self().refresher())
 {
     setupUi(this);
 
@@ -71,9 +69,7 @@ void RepoManConfigPage::apply()
 
 void RepoManConfigPage::init()
 {
-    RM::RepoMan* rm = &MacGitver::repoMan();
-    RM::Internal::RepoManPrivate* rmp = RM::Internal::BasePrivate::dataOf<RM::RepoMan>(rm);
-    refresher = rmp->refresher;
+    Q_ASSERT(refresher);
 
     grpEnableAutoRefresh->setChecked(refresher->refreshEnabled());
 

Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.hpp → Libs/libMacGitverCore/Config/Ui/RepoManConfigPage.hpp

@@ -25,10 +25,7 @@
 
 #include "ui_RepoManConfigPage.h"
 
-namespace RM
-{
-    class AutoRefresher;
-}
+class AutoRefresher;
 
 class RepoManConfigPage
         : public ConfigPage
@@ -55,5 +52,5 @@ private slots:
     QWidget* widget();
 
 private:
-    RM::AutoRefresher* refresher;
+    AutoRefresher* refresher;
 };