hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 22:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update syncback feature to handle instance pulling from Studio

Browse source 
- Updated the `ServeSession` to implement logic for pulling instances that exist in Studio but not in Rojo's filesystem, creating appropriate files during sync confirmation.
- Introduced a new `encodeInstance` function to serialize Studio instances for transmission, supporting all instance types.
- Modified the `PatchTree` to allow explicit user selection for push/pull/skip actions, enhancing user control during sync operations.
- Added tests for the new encoding functionality and updated existing tests to ensure proper behavior with the new syncback logic.
This commit is contained in:
Joe 2026-01-30 07:18:10 -06:00
parent ace839e46f
commit c7cddb72c2
15 changed files with 3534 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugin/src/PatchTree.lua
View file

@ -313,7 +313,7 @@ function PatchTree.build(patch, instanceMap, changeListHeaders)
end
-- Add this node to tree
-- For Edit nodes, default to "push" (apply Rojo changes to Studio)
-- Default to nil (unselected) - user must explicitly choose Push/Pull/Skip
tree:addNode(instanceMap.fromInstances[instance.Parent], {
id = change.id,
patchType = "Edit",
@ -322,7 +322,7 @@ function PatchTree.build(patch, instanceMap, changeListHeaders)
instance = instance,
changeInfo = changeInfo,
changeList = changeList,
defaultSelection = "push",
defaultSelection = nil,
})
end
Timer.stop()
@ -366,7 +366,7 @@ function PatchTree.build(patch, instanceMap, changeListHeaders)
tree:buildAncestryNodes(previousId, ancestryIds, patch, instanceMap)
-- Add this node to tree
-- For Remove nodes, default to "push" (apply Rojo removal to Studio)
-- Default to nil (unselected) - user must explicitly choose Push/Pull/Skip
local nodeId = instanceMap.fromInstances[instance] or HttpService:GenerateGUID(false)
instanceMap:insert(nodeId, instance)
tree:addNode(instanceMap.fromInstances[instance.Parent], {
@ -375,7 +375,7 @@ function PatchTree.build(patch, instanceMap, changeListHeaders)
className = instance.ClassName,
name = instance.Name,
instance = instance,
defaultSelection = "push",
defaultSelection = nil,
})
end
Timer.stop()
@ -444,7 +444,7 @@ function PatchTree.build(patch, instanceMap, changeListHeaders)
end
-- Add this node to tree
-- For Add nodes, default to "push" (apply Rojo addition to Studio)
-- Default to nil (unselected) - user must explicitly choose Push/Pull/Skip
tree:addNode(change.Parent, {
id = change.Id,
patchType = "Add",
@ -453,7 +453,7 @@ function PatchTree.build(patch, instanceMap, changeListHeaders)
changeInfo = changeInfo,
changeList = changeList,
instance = instanceMap.fromIds[id],
defaultSelection = "push",
defaultSelection = nil,
})
end
Timer.stop()
@ -474,6 +474,18 @@ function PatchTree.buildInitialSelections(tree)
return selections
end
-- Gets the count of unselected items (nodes with patchType but no selection)
-- Returns count of unselected items
function PatchTree.countUnselected(tree, selections)
local count = 0
tree:forEach(function(node)
if node.patchType and selections[node.id] == nil then
count += 1
end
end)
return count
end
-- Gets all selectable node IDs (nodes that have a patchType)
-- Returns an array of node IDs
function PatchTree.getSelectableNodeIds(tree)