Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: oak-dev@jackrabbit.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1414190 - /jackrabbit/oak/trunk/doc/jsop-diff.md
Date: Tue, 27 Nov 2012 13:58:56 -0000
To: oak-commits@jackrabbit.apache.org
From: mduerig@apache.org
Message-Id: <20121127135856.D48182388A32@eris.apache.org>

Author: mduerig
Date: Tue Nov 27 13:58:55 2012
New Revision: 1414190

URL: http://svn.apache.org/viewvc?rev=1414190&view=rev
Log:
OAK-464: RootImpl.rebase() doesn't handle move operations correctly
- correct handling of deleted children
- pass trash into recursive call to diffNodes
- correct comment for diffNodes

Modified:
    jackrabbit/oak/trunk/doc/jsop-diff.md

Modified: jackrabbit/oak/trunk/doc/jsop-diff.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/doc/jsop-diff.md?rev=1414190&r1=1414189&r2=1414190&view=diff
==============================================================================
--- jackrabbit/oak/trunk/doc/jsop-diff.md (original)
+++ jackrabbit/oak/trunk/doc/jsop-diff.md Tue Nov 27 13:58:55 2012
@@ -1,69 +1,68 @@
-    // Global variable holding the JSOP journal after the diffTree below returns.
-    jsop = ""
-
-    /*
-      Create a JSOP journal, which when applied to tree S will transform
-      it to tree T.
-    */
-    diffTrees(S, T) {
-      // Create a location (trash) which will temporarily hold removed nodes.
-      // This is necessary since these (or child nodes thereof) might still be
-      // needed in move operations occurring only later in the differencing process.
-      X = S.addNode(createUniqueName)
-
-      // The main differencing process starts at the roots of the trees and
-      // progresses recursively level by level.
-      diffNodes(X, S, T)
-
-      // Remove the trash location and all its content
-      jsop += "-" + X.path
+               
+// Global variable holding the JSOP journal after the diffTree below returns.
+jsop = ""       
+       
+/*
+  Create a JSOP journal, which when applied to tree S will transform 
+  it to tree T.
+*/
+diffTrees(S, T) {
+  // Create a location (trash) which will temporarily hold removed nodes.
+  // This is necessary since these (or child nodes thereof) might still be
+  // needed in move operations occurring only later in the differencing process.
+  X = S.addNode(createUniqueName)  
+  
+  // The main differencing process starts at the roots of the trees and 
+  // progresses recursively level by level.
+  diffNodes(X, S, T)
+  
+  // Remove the trash location and all its content
+  jsop += "-" + X.path
+} 
+
+/*
+  Recursively create JSOP operations for the differences of the children
+  of trees S and T. Tree X serves as trash.
+*/
+diffNode(X, S, T) {
+  deleted = S.childNames \ T.childNames   // set difference
+  added   = T.childNames \ S.childNames          
+                           
+  // Need to take care of deleted nodes first in order to avoid
+  // name clashes when adding new nodes later.
+  for (d : deleted) {             
+    t = S.child(d)
+    
+    // Deleted nodes are moved to trash. 
+    op = ">" + t.path + ":" + X.path + "/" + createUniqueName
+    jsop += op
+    S.apply(op)               // Transform S according to the single op
+  }
+  
+  for (a : added) {
+    t = T.child(a)         
+                              
+    // assume we can detect a copied node and know its source node 
+    if (isCopied(t)) {        
+      op = "*" + t.sourceNode.path + ":" + t.path
+    }                                                             
+    
+    // assume we can detect a moved node and know its source node 
+    else if (isMoved(t)) {    
+      op = ">" + t.sourceNode.path + ":" + t.path
     }
-
-    /*
-      Create JSOP operations for the differences of the immediate children
-      of trees S and T. Tree X serves as trash.
-    */
-    diffNode(X, S, T) {
-      deleted = S.childNames \ T.childNames   // set difference
-      added   = T.childNames \ S.childNames
-
-      // Need to take care of deleted nodes first in order to avoid
-      // name clashes when adding new nodes later.
-      for (d : deleted) {
-        t = S.child(d)
-        n = createUniqueName
-
-        // Deleted nodes are moved to trash.
-        t.moveTo(X, n) // Move node t to parent X with name n
-        op = ">" + t.sourceNode.path + ":" + t.path
-        jsop += op
-        S.apply(op)               // Transform S according to the single op
-      }
-
-      for (a : added) {
-        t = T.child(a)
-
-        // assume we can detect a copied node and know its source node
-        if (isCopied(t)) {
-          op = "*" + t.sourceNode.path + ":" + t.path
-        }
-
-        // assume we can detect a moved node and know its source node
-        else if (isMoved(t)) {
-          op = ">" + t.sourceNode.path + ":" + t.path
-        }
-
-        // this is an added node
-        else {
-          op = "+" + t.path
-        }
-
-        jsop += op
-        S.apply(op)               // Transform S according to the single op
-      }
-
-      // assert S.childNames == T.childNames
-      for (c : T.childNames) {
-        diffNode(S.child(c), T.child(c))
-      }
-    }
\ No newline at end of file
+                              
+    // this is an added node    
+    else {                    
+      op = "+" + t.path      
+    }                           
+                                     
+    jsop += op
+    S.apply(op)               // Transform S according to the single op
+  }
+                       
+  // assert S.childNames == T.childNames
+  for (c : T.childNames) {
+    diffNode(X, S.child(c), T.child(c))
+  }
+}