Merge branch 'master' into trails-aubrey

1 files changed, 27 insertions, 9 deletions

diff --git a/src/client/documents/Gitlike.ts b/src/client/documents/Gitlike.ts
index fddf317bc..575c984f5 100644
--- a/src/client/documents/Gitlike.ts
+++ b/src/client/documents/Gitlike.ts
@@ -1,7 +1,8 @@
-import { Doc, DocListCast, DocListCastAsync } from "../../fields/Doc";
+import { Doc, DocListCast, DocListCastAsync, Field } from "../../fields/Doc";
 import { List } from "../../fields/List";
-import { ObjectField } from "../../fields/ObjectField";
 import { Cast, DateCast } from "../../fields/Types";
+import { DateField } from "../../fields/DateField";
+import { Id } from "../../fields/FieldSymbols";
 
 // synchs matching documents on the two branches that are being merged/pulled
 // currently this just synchs the main 'fieldKey' component of the data since 
@@ -10,11 +11,22 @@ function GitlikeSynchDocs(bd: Doc, md: Doc) {
     const fieldKey = Doc.LayoutFieldKey(md);
     const bdate = DateCast(bd[`${fieldKey}-lastModified`])?.date;
     const mdate = DateCast(md[`${fieldKey}-lastModified`])?.date;
-    if (bdate === mdate || bdate > mdate) return;
     const bdproto = bd && Doc.GetProto(bd);
+    if (bdate !== mdate && bdate <= mdate) {
+        if (bdproto && md) {
+            bdproto[fieldKey] = Field.Copy(md[fieldKey]);
+            bdproto[`${fieldKey}-lastModified`] = new DateField();
+        }
+    }
+    const bldate = DateCast(bd._lastModified)?.date;
+    const mldate = DateCast(md._lastModified)?.date;
+    if (bldate === mldate || bldate > mldate) return;
     if (bdproto && md) {
-        bdproto[fieldKey] = ObjectField.MakeCopy(md[fieldKey] as ObjectField);
-        bdproto[`${fieldKey}-lastModified`] = ObjectField.MakeCopy(md[`${fieldKey}-lastModified`] as ObjectField);
+        bd.x = Field.Copy(md.x);
+        bd.y = Field.Copy(md.y);
+        bd.width = Field.Copy(md.width);
+        bd.height = Field.Copy(md.height);
+        bdproto._lastModified = new DateField();
     }
 }
 
@@ -36,8 +48,9 @@ async function GitlikePullFromMaster(branch: Doc, suffix = "") {
         const bd = branchMainDocs?.find(bd => (Cast(bd.branchOf, Doc, null) || bd) === md);
         bd && GitlikeSynchDocs(bd, md);
     });
+    const cloneMap = new Map<string, Doc>(); cloneMap.set(masterMain[Id], branch);
     // make branch clones of them, then add them to the branch
-    const newlyBranchedDocs = await Promise.all(newDocsFromMaster?.map(async md => (await Doc.MakeClone(md, false, true)).clone) || []);
+    const newlyBranchedDocs = await Promise.all(newDocsFromMaster?.map(async md => (await Doc.MakeClone(md, false, true, cloneMap)).clone) || []);
     newlyBranchedDocs.forEach(nd => {
         Doc.AddDocToList(branch, Doc.LayoutFieldKey(branch) + suffix, nd);
         nd.context = branch;
@@ -56,22 +69,26 @@ async function GitlikeMergeWithMaster(master: Doc, suffix = "") {
     branches?.map(async branch => {
         const branchChildren = await DocListCastAsync(branch[Doc.LayoutFieldKey(branch) + suffix]);
         branchChildren && await Promise.all(branchChildren.map(async bd => {
+            const cloneMap = new Map<string, Doc>(); cloneMap.set(master[Id], branch);
             // see if the branch's child exists on master.  
-            const masterChild = Cast(bd.branchOf, Doc, null) || (await Doc.MakeClone(bd, false, true)).clone;
+            const masterChild = Cast(bd.branchOf, Doc, null) || (await Doc.MakeClone(bd, false, true, cloneMap)).clone;
             // if the branch's child didn't exist on master, we make a branch clone of the child to add to master.  
             // however, since master is supposed to have the "main" clone, and branches, the "branch" clones, we have to reverse the fields
             // on the branch child and master clone.
             if (masterChild.branchOf) {
                 const branchDocProto = Doc.GetProto(bd);
                 const masterChildProto = Doc.GetProto(masterChild);
-                masterChildProto.branchOf = undefined; // the master child should not be a branch of the branch child, so unset 'branchOf'
+                const branchTitle = bd.title;
+                branchDocProto.title = masterChildProto.title;
+                masterChildProto.title = branchTitle;
+                masterChildProto.branchOf = masterChild.branchOf = undefined; // the master child should not be a branch of the branch child, so unset 'branchOf'
                 masterChildProto.branches = new List<Doc>([bd]); // the master child's branches needs to include the branch child
                 Doc.RemoveDocFromList(branchDocProto, "branches", masterChildProto);   // the branch child should not have the master child in its branch list.
                 branchDocProto.branchOf = masterChild;                                 // the branch child is now a branch of the master child
             }
             Doc.AddDocToList(master, Doc.LayoutFieldKey(master) + suffix, masterChild); // add the masterChild to master (if it's already there, this is a no-op)
             masterChild.context = master;
-            GitlikeSynchDocs(Doc.GetProto(masterChild), bd);
+            GitlikeSynchDocs(masterChild, bd);//Doc.GetProto(masterChild), bd);
         }));
         const masterChildren = await DocListCastAsync(master[Doc.LayoutFieldKey(master) + suffix]);
         masterChildren?.forEach(mc => {                      // see if any master children
@@ -93,6 +110,7 @@ export async function BranchTask(target: Doc, action: "pull" | "merge") {
     const func = action === "pull" ? GitlikePullFromMaster : GitlikeMergeWithMaster;
     await func(target, "");
     await DocListCast(target[Doc.LayoutFieldKey(target)]).forEach(async targetChild => func(targetChild, "-annotations"));
+    await DocListCast(target[Doc.LayoutFieldKey(target)]).forEach(async targetChild => func(targetChild, "-sidebar"));
 }
 
 export async function BranchCreate(target: Doc) {