From acd70f73bfe44058abfe867694cdd5f02a5e85c5 Mon Sep 17 00:00:00 2001
From: Swann <swann.martinez@protonmail.com>
Date: Tue, 18 May 2021 16:54:07 +0200
Subject: [PATCH] refactor: add remote refactor: move push to porcelain

---
 multi_user/libs/replication |  2 +-
 multi_user/operators.py     | 22 +++++++++++-----------
 multi_user/timers.py        |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/multi_user/libs/replication b/multi_user/libs/replication
index f9659b4..d8c51f4 160000
--- a/multi_user/libs/replication
+++ b/multi_user/libs/replication
@@ -1 +1 @@
-Subproject commit f9659b49fea22617c0cbd8af48cd16fea67cda92
+Subproject commit d8c51f421b7f62ef7acb231af703f7044c81dfa4
diff --git a/multi_user/operators.py b/multi_user/operators.py
index 2c867a2..4bb8dc6 100644
--- a/multi_user/operators.py
+++ b/multi_user/operators.py
@@ -213,8 +213,10 @@ class SessionStartOperator(bpy.types.Operator):
         else:
             python_binary_path = bpy.app.binary_path_python
 
-        repo = Repository(data_protocol=bpy_protocol)
-
+        repo = Repository(
+            data_protocol=bpy_protocol,
+            username=settings.username)
+    
         # Host a session
         if self.host:
             if settings.init_method == 'EMPTY':
@@ -228,10 +230,10 @@ class SessionStartOperator(bpy.types.Operator):
                 for scene in bpy.data.scenes:
                     porcelain.add(repo, scene)
 
+                porcelain.remote_add(repo, 'origin','127.0.0.1', settings.port)
                 session.host(
                     repository= repo,
-                    id=settings.username,
-                    port=settings.port,
+                    remote='origin',
                     timeout=settings.connection_timeout,
                     password=admin_pass,
                     cache_directory=settings.cache_directory,
@@ -250,11 +252,9 @@ class SessionStartOperator(bpy.types.Operator):
                 admin_pass = None
 
             try:
+                porcelain.remote_add(repo, 'origin', settings.ip, settings.port)
                 session.connect(
                     repository= repo,
-                    id=settings.username,
-                    address=settings.ip,
-                    port=settings.port,
                     timeout=settings.connection_timeout,
                     password=admin_pass
                 )
@@ -631,7 +631,7 @@ class SessionCommit(bpy.types.Operator):
     def execute(self, context):
         try:
             porcelain.commit(session.repository, self.target)
-            session.push(self.target)
+            porcelain.push(session.repository, 'origin', self.target)
             return {"FINISHED"}
         except Exception as e:
             self.report({'ERROR'}, repr(e))
@@ -927,7 +927,7 @@ def update_external_dependencies():
         node = session.repository.get_node(node_id)
         if node and node.owner in [session.id, RP_COMMON]:
             porcelain.commit(session.repository, node_id)
-            session.push(node_id, check_data=False)
+            porcelain.push(session.repository,'origin', node_id)
 
 def sanitize_deps_graph(remove_nodes: bool = False):
     """ Cleanup the replication graph
@@ -999,7 +999,7 @@ def depsgraph_evaluation(scene):
                     if node.state == UP:
                         try:
                             porcelain.commit(session.repository, node.uuid)
-                            session.push(node.uuid, check_data=False)
+                            porcelain.push(session.repository, 'origin', node.uuid)
                         except ReferenceError:
                             logging.debug(f"Reference error {node.uuid}")
                             if not node.is_valid():
@@ -1018,7 +1018,7 @@ def depsgraph_evaluation(scene):
                 else:
                     scn_uuid = porcelain.add(session.repository, update.id)
                     porcelain.commit(session.node_id, scn_uuid)
-                    session.push(scn_uuid, check_data=False)
+                    porcelain.push(session.repository,'origin', scn_uuid)
 def register():
     from bpy.utils import register_class
 
diff --git a/multi_user/timers.py b/multi_user/timers.py
index f414a2e..09d2e81 100644
--- a/multi_user/timers.py
+++ b/multi_user/timers.py
@@ -170,7 +170,7 @@ class DynamicRightSelectTimer(Timer):
                             gp_node = session.repository.get_node(annotation_gp.uuid)
                             if gp_node.has_changed():
                                 porcelain.commit(session.repository, gp_node.uuid)
-                                session.push(gp_node.uuid, check_data=False)
+                                porcelain.push(session.repository, 'origin', gp_node.uuid)
 
                     elif self._annotating:
                         session.change_owner(