Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

When a patch fails, import the Instance directly using GetObjects #786

Draft
wants to merge 34 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a67aec4
Pass ServeSession to reify
Dekkonot Aug 27, 2023
0017861
Use tempfile as a normal dependency
Dekkonot Aug 28, 2023
70b1899
Store a lazy ref to a temp dir in ServeSession
Dekkonot Aug 28, 2023
ef90926
Initial implementation of `fetch` endpoint
Dekkonot Aug 28, 2023
a5af0e8
Add initial implementation of fetch api for client
Dekkonot Aug 28, 2023
7145d70
Don't actually pass ServeSession to reify
Dekkonot Sep 17, 2023
f2cdcae
Pass apiContext to reconciler and applyPatch
Dekkonot Sep 17, 2023
24ce366
Make `fetchInstances` its own module
Dekkonot Sep 17, 2023
de3c15b
Initial implementation of fetchApi in applyPatch
Dekkonot Sep 17, 2023
9c3d84e
Use a folder in the content directory
Dekkonot Sep 17, 2023
c69ebbe
Move tempfile back to dev dependencies
Dekkonot Sep 17, 2023
2abac70
Handle an invalid request better
Dekkonot Sep 17, 2023
e057711
Rename fetch dir constant
Dekkonot Sep 17, 2023
04b3479
Actually remove the old copy of fetchInstances from reify
Dekkonot Sep 17, 2023
af7e372
Account for classes with specific parent needs
Dekkonot Sep 18, 2023
b8829a0
Add explanatory comment
Dekkonot Sep 18, 2023
e778863
Change how fetchInstances checks invariants
Dekkonot Sep 18, 2023
190d458
Change debug for swapping instances to trace
Dekkonot Sep 18, 2023
47dbf1b
Use request body instead of URL for fetch endpoint
Dekkonot Sep 18, 2023
d77e5f2
Remove unhelpful debug log
Dekkonot Sep 18, 2023
e0c4380
Reference instances by key instead of name
Dekkonot Sep 18, 2023
d905679
Don't clone subtree when building fetch model
Dekkonot Sep 19, 2023
08fd714
Merge branch 'master' into fetch-bad-patch
Dekkonot Sep 19, 2023
e721e6e
StyLua
Dekkonot Sep 19, 2023
2c02328
Preserve selection when replacing instances
Dekkonot Sep 19, 2023
6d6e0fe
Cleanup fetch endpoint
Dekkonot Sep 19, 2023
6666e11
Remove unused imports in Reify
Dekkonot Sep 19, 2023
d7ace0f
Remove extra argument to `applyPatch` in ServeSession
Dekkonot Sep 19, 2023
94cf688
Create .git-blame-ignore-revs & Add Stylua pr (#787)
Barocena Sep 19, 2023
385340f
Add setting to turn functionality off
Dekkonot Sep 22, 2023
81a5c0f
Lock fetchOnPatchFail setting while sync is active
Dekkonot Sep 22, 2023
424b1d0
Move ChangeHistoryService waypoint creation to Reconciler
Dekkonot Sep 22, 2023
a5321be
Move fetchinstances call to reconciler
Dekkonot Sep 22, 2023
d21ffe1
Respect setting for fetch usage in reconciler
Dekkonot Sep 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change how fetchInstances checks invariants
Dekkonot committed Sep 18, 2023
commit e7788630a49da1841831939959f2d8a5782ec62b
2 changes: 1 addition & 1 deletion plugin/src/Reconciler/fetchInstances.lua
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ local function fetchInstances(idList, instanceMap, apiContext)
for _, entry in map:GetChildren() do
if entry:IsA("ObjectValue") then
local key, value = entry.Name, entry.Value
if value == nil or value.Parent ~= reified then
if value == nil or not value:IsDescendantOf(reified) then
invariant("ReferentMap contained entry {} that was parented to an outside source", key)
else
-- This could be a problem if Roblox ever supports