(pouchdb#635) - low level method document availability support

parseDoc and merge have to support new availability option
neojski · Apr 5, 2013 · ef45f7e · ef45f7e
1 parent 4187ae3
commit ef45f7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/pouch.merge.js b/src/pouch.merge.js
@@ -48,6 +48,12 @@ function mergeTree(in_tree1, in_tree2) {
     var tree1 = item.tree1;
     var tree2 = item.tree2;
 
+    if (tree1[1].status === 'available' || tree2[1].status === 'available') {
+      tree1[1].status = 'available';
+    } else {
+      tree1[1].status = 'missing';
+    }
+
     for (var i = 0; i < tree2[2].length; i++) {
       if (!tree1[2][0]) {
         conflicts = 'new_leaf';

diff --git a/src/pouch.utils.js b/src/pouch.utils.js
@@ -79,7 +79,7 @@ var parseDoc = function(doc, newEdits) {
   var nRevNum;
   var newRevId;
   var revInfo;
-  var opts = {};
+  var opts = {status: 'available'};
   if (doc._deleted) {
     opts.deleted = true;
   }
@@ -96,7 +96,7 @@ var parseDoc = function(doc, newEdits) {
       }
       doc._rev_tree = [{
         pos: parseInt(revInfo[1], 10),
-        ids: [revInfo[2], {}, [[newRevId, opts, []]]]
+        ids: [revInfo[2], {status: 'missing'}, [[newRevId, opts, []]]]
       }];
       nRevNum = parseInt(revInfo[1], 10) + 1;
     } else {
@@ -114,7 +114,7 @@ var parseDoc = function(doc, newEdits) {
           if (acc === null) {
             return [x, opts, []];
           } else {
-            return [x, {}, [acc]];
+            return [x, {status: 'missing'}, [acc]];
           }
         }, null)
       }];