Merge lp:~urbanape/bindwood/fix-512363 into lp:bindwood

[Zachery Bir]

This branch was created because during testing of the 1.0 codebase, subsequent clients were not behaving properly, and the merge of old, existing, and new bookmarks was not being done properly. In testing this branch, at least one error was found due to the migration code. The most relevant part of the diff is the following, as the vast bulk of the diff is cleaning up long lines:

- // Ensure that any remote folders have their .children
- // populated
- if (doc.record_type == Bindwood.TYPE_FOLDER) {
- doc.children = Bindwood.getUUIDsFromFolder(itemId);
- }
-
             // add to additional
             additional.push(doc);
             Bindwood.writeMessage(
@@ -578,15 +574,29 @@
         }

         for (var i = 0; i < additional.length; i++) {
+ var doc = additional[i];
+ Bindwood.writeMessage(
+ "Preparing to push back " + doc.title || doc.record_type);
+ // Ensure that any remote folders have their .children
+ // populated, and in particular make sure that we've already
+ // modified their children's annotations/uuids
+ if (doc.record_type == Bindwood.TYPE_FOLDER) {
+ var itemId = Bindwood.itemIdForUUID(doc._id);
+ doc.children = Bindwood.getUUIDsFromFolder(itemId);
+ Bindwood.writeMessage(
+ "Folder needed updating, calculated children: " +
+ doc.children);
+ }
+
             try {
- var response = Bindwood.couch.save(additional[i]);
+ var response = Bindwood.couch.save(doc);
                 // We can avoid having to process this revision when we
                 // pull it later
                 Bindwood.seen_revisions[response.rev] = true;
             } catch(e) {
                 Bindwood.writeError(
                     "Problem saving record to CouchDB; record is " +
- JSON.stringify(additional[i]) + ": ", e);
+ JSON.stringify(doc + ": ", e));
             }
         }
     },

[Zachery Bir (urbanape)]

Some downloads
==============

  * lp:~urbanape/bindwood/fix-512363

    The branch under test

  * http://chinstrap.canonical.com/~zbir/bindwood-0.5.tar.gz

    A modified version of 0.5 that will work with Firefox 3.6

  * http://chinstrap.canonical.com/~zbir/profiles.ini

    A Firefox profiles.ini file that will point to our test profile

  * http://chinstrap.canonical.com/~zbir/00-pristine.tar.gz

  * http://chinstrap.canonical.com/~zbir/01-first-client.tar.gz

  * http://chinstrap.canonical.com/~zbir/02-second-client.tar.gz

    Three complete profile directories, all tarred up. The ones to test
    are 01-first-client and 02-second-client, both built from
    00-pristine. They all expand to the same directory: 6yz8p1ca.default,
    so only one can be in play at a time. This is useful, though for
    performing the different tests.

General testing strategy
========================

  All there tests will work best if you can test against a throwaway
  CouchDB. The older 0.5 branch can't target an alternate DB at startup,
  while the newer 1.0+ branches can, so it's easier if all tests can be
  done against a bookmarks DB that is relatively disposable.

  My setup is as follows:

    * ~/dev/bindwood/

      A directory that holds all my branches in development

    * ~/dev/bindwood/bindwood-0.5

      The modified version of the 0.5 release that works with Firefox 3.6

    * ~/dev/bindwood/fix-512363

      A bzr branched copy of the branch under test

    * ~/dev/bindwood/current

      A symlink to the branch I'm currently working on

    * ~/.mozilla/firefox/

      I backed up my copy of this directory and started fresh to create
      the aforementioned profiles. You'll probably want to do the same.

      I put all those tarballs and the profiles.ini in this directory,
      and I can blow away the 6yz8p1ca.default directory at any time and
      expand any of the tarballs I need. The following test scripts
      assume you have your ~/.mozilla/firefox directory set up like this.

    * ubuntuone-couchdb-query script

      Located at http://www.freedesktop.org/wiki/Specifications/desktopcouch/Documentation/Troubleshooting?action=AttachFile&do=view&target=ubuntuone-couchdb-query - useful for blowing away a remote bookmarks database if necessary:

        python ubuntuone-couchdb-query --http-method=DELETE bookmarks

      It won't ask for confirmation, so be sure you want to do this.

Testing migration
=================

  This isn't entirely necessary for testing fix-512363, but I'm including
  it here for completeness' sake.

  1) Symlink the bindwood-0.5 directory to current.

  2) Expand the 01-first-client.tar.gz profile

  3) Add a symlink to its extensions directory to ~/dev/bindwood/current
     called '<email address hidden>':

     $ ln -s ~/dev/bindwood/current <email address hidden>

  4) Ensure there is no bookmarks database in your desktopcouch

  5) Start Firefox. Check your DC futon and watch for a bookmarks
     database. There should be 30 records in it.

  6) Quit Firefox.

  7) Swap the 'current' symlink to fix-512363

  8) Start Firefox. You'll get a popup window explaining that it will
     migrate the bookmark re...

[Joshua Hoover (joshuahoover)]

Approved. Ran through Zac's steps on two Lucid VMs with all the latest updates as of today. Bookmarks were saved properly and merged on the second VM as expected.

review: Approve (ran branch and verified functionality)

[Joshua Blount (jblount)]

That was a lot of steps, but bookmarks seem to be doing the right thing. Well done with the instructions Monsieur Ape!

review: Approve

=== modified file 'modules/bindwood.jsm'
--- modules/bindwood.jsm	2010-03-30 10:34:18 +0000
+++ modules/bindwood.jsm	2010-04-02 03:33:20 +0000
@@ -497,7 +497,9 @@
     },
 
     migrateOlderBookmarkRecords: function() {
-        Bindwood.writeMessage("We're an older client. Let's migrate the remote records and re-sync.");
+        Bindwood.writeMessage(
+            "We're an older client. " +
+            "Let's migrate the remote records and re-sync.");
 
         var additional = [];
         var all_docs = Bindwood.couch.allDocs();
@@ -565,12 +567,6 @@
             // Ensure we're dealing with the proper record type on Migrate.
             doc = Bindwood.decorateRecordByType(doc, itemId);
 
-            // Ensure that any remote folders have their .children
-            // populated
-            if (doc.record_type == Bindwood.TYPE_FOLDER) {
-                doc.children = Bindwood.getUUIDsFromFolder(itemId);
-            }
-
             // add to additional
             additional.push(doc);
             Bindwood.writeMessage(
@@ -578,15 +574,29 @@
         }
 
         for (var i = 0; i < additional.length; i++) {
+            var doc = additional[i];
+            Bindwood.writeMessage(
+                "Preparing to push back " + doc.title || doc.record_type);
+            // Ensure that any remote folders have their .children
+            // populated, and in particular make sure that we've already
+            // modified their children's annotations/uuids
+            if (doc.record_type == Bindwood.TYPE_FOLDER) {
+                var itemId = Bindwood.itemIdForUUID(doc._id);
+                doc.children = Bindwood.getUUIDsFromFolder(itemId);
+                Bindwood.writeMessage(
+                    "Folder needed updating, calculated children: " +
+                    doc.children);
+            }
+
             try {
-                var response = Bindwood.couch.save(additional[i]);
+                var response = Bindwood.couch.save(doc);
                 // We can avoid having to process this revision when we
                 // pull it later
                 Bindwood.seen_revisions[response.rev] = true;
             } catch(e) {
                 Bindwood.writeError(
                     "Problem saving record to CouchDB; record is " +
-                        JSON.stringify(additional[i]) + ": ", e);
+                        JSON.stringify(doc + ": ", e));
             }
         }
     },
@@ -596,7 +606,8 @@
             "We're a subsequent client. Let's merge the remote and the local.");
 
         // get the remote root from Couch.
-        var remote_root = Bindwood.couch.open('root_' + Bindwood.currentProfile);
+        var remote_root = Bindwood.couch.open(
+            'root_' + Bindwood.currentProfile);
         var local_roots = [bookmarksService.toolbarFolder,
                            bookmarksService.bookmarksMenuFolder,
                            bookmarksService.unfiledBookmarksFolder];
@@ -604,7 +615,10 @@
         var records_needing_pushing = [];
 
         for (var i = 0; i < local_roots.length; i++) {
-            Bindwood.syncRemoteAndLocal(remote_root.children[i], local_roots[i], records_needing_pushing);
+            Bindwood.syncRemoteAndLocal(
+                remote_root.children[i],
+                local_roots[i],
+                records_needing_pushing);
         }
 
         for (var i = 0; i < records_needing_pushing.length; i++) {
@@ -622,7 +636,9 @@
     },
 
     syncRemoteAndLocal: function(remote_folder, local_folder, accum) {
-        Bindwood.writeMessage("Syncing remote folder: " + remote_folder + " to local folder: " + local_folder);
+        Bindwood.writeMessage(
+            "Syncing remote folder: " + remote_folder +
+            " to local folder: " + local_folder);
         var local_needs_pushing = false;
 
         // get the local folder's root, and open it for iteration
@@ -634,35 +650,45 @@
         var remote_children = remote.children;
         Bindwood.writeMessage("Beginning to walk remote children");
         for (var i = 0; i < remote_children.length; i++) {
+            Bindwood.writeMessage(
+                "Getting remote child: " + remote_children[i]);
             var remote_child = Bindwood.couch.open(remote_children[i]);
             var local_child;
             var found_local = false;
 
-            Bindwood.writeMessage("Looking for record type: " + remote_child.record_type +
-                " identified by " + remote_child.record_type != Bindwood.TYPE_SEPARATOR ? remote_child.title : "being a separator");
+            Bindwood.writeMessage(
+                "Looking for record type: " + remote_child.record_type +
+                " identified by " + 
+                (remote_child.record_type != Bindwood.TYPE_SEPARATOR ?
+                 remote_child.title :
+                 "being a separator"));
 
             // does my local toolbarFolder have this child anywhere in it?
             for (var j = 0; j < local.childCount; j++) {
                 local_child = local.getChild(j);
 
-                // Check to see whether we're testing a separator (which has no title)
-                // or whether we're testing the same type and title
-                if ((Bindwood.sameType(local_child, remote_child) &&
-                     remote_child.record_type == Bindwood.TYPE_SEPARATOR) ||
-                    (Bindwood.sameType(local_child, remote_child) &&
+                // Check to see whether we're testing a separator (which
+                // has no title) or whether we're testing the same type
+                // and title
+                if (Bindwood.sameType(local_child, remote_child) &&
+                    (remote_child.record_type == Bindwood.TYPE_SEPARATOR ||
                      Bindwood.sameTitle(local_child, remote_child))) {
                     found_local = true;
                     Bindwood.writeMessage("Found the record.");
-                    Bindwood.annotateItemWithUUID(local_child.itemId, remote_child._id);
-                    // If we're dealing with a folder, we'll process it recursively,
-                    // and the only other thing we'd impose would be the title,
-                    // which already matches..
+                    Bindwood.annotateItemWithUUID(
+                        local_child.itemId, remote_child._id);
+                    // If we're dealing with a folder, we'll process it
+                    // recursively, and the only other thing we'd impose
+                    // would be the title, which already matches..
                     if (remote_child.record_type != Bindwood.TYPE_FOLDER) {
                         Bindwood.processCouchRecord(remote_child, null, null);
                     }
-                    if (i != j) { // if yes, but in a different location
-                        // Move the local to the proper index within the same folder.
-                        Bindwood.writeMessage("Record isn't in the same location as remote, moving it.");
+                    if (i != j) {
+                        // If yes, but in a different location, move the
+                        // local to the proper index within the same
+                        // folder.
+                        Bindwood.writeMessage(
+                            "Moving local record to same index as remote.");
                         Bindwood.makeLocalChangeOnly(
                             function() {
                                 bookmarksService.moveItem(
@@ -675,18 +701,25 @@
             }
 
             if (!found_local) {
-                // Add the record locally, annotate it, and place it in the correct index.
-                // Add current local folder as one that needs to be pushed back (changing its children)
-
-                Bindwood.writeMessage("Remote record doesn't exist here, recreating it in " + local_folder + " at index " + i + ".");
+                // Add the record locally, annotate it, and place it in
+                // the correct index.
+
+                // Add current local folder as one that needs to be
+                // pushed back (changing its children)
+
+                Bindwood.writeMessage(
+                    "Remote record doesn't exist here, recreating it in " +
+                    local_folder + " at index " + i + ".");
                 Bindwood.processCouchRecord(remote_child, local_folder, i);
                 local_needs_pushing = true;
             }
 
             // is the child a folder?
             if (remote_child.record_type == Bindwood.TYPE_FOLDER) {
-                // Recurse into the function with remote id and local folder id
-                Bindwood.syncRemoteAndLocal(remote_child._id, local_child.itemId, accum);
+                // Recurse into the function with remote id and local
+                // folder id
+                Bindwood.syncRemoteAndLocal(
+                    remote_child._id, local_child.itemId, accum);
             }
         }
 
@@ -744,11 +777,14 @@
             var items = annotationService.getItemsWithAnnotation(
                 Bindwood.annotationKey, {});
             var num_items = items.length;
-            Bindwood.writeMessage("Found " + num_items + " records with the annotation key");
+            Bindwood.writeMessage(
+                "Found " + num_items + " records with the annotation key");
             for (var i = 0; i < items.length; i++) {
                 Bindwood.writeMessage("Item #" + i + ": ItemId: " + items[i]);
-                var anno = annotationService.getItemAnnotation(items[i], Bindwood.annotationKey);
-                Bindwood.writeMessage("Annotation on " + items[i] + ": " + anno);
+                var anno = annotationService.getItemAnnotation(
+                    items[i], Bindwood.annotationKey);
+                Bindwood.writeMessage(
+                    "Annotation on " + items[i] + ": " + anno);
                 if (anno == uuid) {
                     var itemId = items[i];
                     Bindwood.uuidItemIdMap[uuid] = itemId;
@@ -892,7 +928,8 @@
             }
         }
         Bindwood.writeMessage(
-            "Done collecting children. Folder's children is now: " + JSON.stringify(folder_record.children));
+            "Done collecting children. Folder's children is now: " +
+            JSON.stringify(folder_record.children));
         folderRoot.containerOpen = false;
         Bindwood.records.push(folder_record);
         return folder_record;
@@ -961,7 +998,8 @@
                 // this record is not in CouchDB, so write it
                 try {
                     var response = Bindwood.couch.save(record);
-                    // We can avoid having to process this revision when we pull it later
+                    // We can avoid having to process this revision when
+                    // we pull it later
                     Bindwood.seen_revisions[response.rev] = true;
                 } catch(e) {
                     Bindwood.writeError(
@@ -971,7 +1009,8 @@
             } else {
                 // record is already in CouchDB, so do nothing
                 Bindwood.writeMessage(
-                    "This record (" + record._id + ") is already in Couch, skipping");
+                    "This record (" + record._id +
+                    ") is already in Couch, skipping");
             }
         }
         Bindwood.latest_modified = Bindwood.setLatestModified(
@@ -1002,7 +1041,8 @@
 
         // reschedule ourself
         try {
-            Bindwood.pull_changes_timer.initWithCallback(repeater, 30000, Ci.nsITimer.TYPE_REPEATING_SLACK);
+            Bindwood.pull_changes_timer.initWithCallback(
+                repeater, 30000, Ci.nsITimer.TYPE_REPEATING_SLACK);
         } catch(e) {
             Bindwood.writeError("Problem setting up repeater.", e);
         }
@@ -1016,7 +1056,9 @@
         Bindwood.status_timer.cancel();
         var div = Bindwood.statusWindow.document.getElementById('status');
         var dots = div.innerHTML;
-        div.innerHTML = dots + ' Finished, you can close this window and proceed. Thanks for your patience.';
+        div.innerHTML = (dots +
+            "<br/><br/> Finished, you can close this window and proceed.  " +
+            "Thanks for your patience.");
     },
 
     pullRecords: function() {
@@ -1053,14 +1095,17 @@
             // design doc
             if (recordid.indexOf('root_') === 0 ||
                 recordid.indexOf('_design') === 0) {
-                Bindwood.writeMessage("Root profile or design doc, skipping...");
+                Bindwood.writeMessage(
+                    "Root profile or design doc, skipping...");
                 continue;
             }
 
             // Skip any revisions we've already seen (because we just
             // put them there)
             if (Bindwood.seen_revisions[revno]) {
-                Bindwood.writeMessage("We've seen this revision (" + revno + ") before, when we created it.");
+                Bindwood.writeMessage(
+                    "We've seen this revision (" + revno +
+                    ") before, when we created it.");
                 delete Bindwood.seen_revisions[revno];
                 continue;
             }
@@ -1068,7 +1113,8 @@
             var record = Bindwood.couch.open(recordid);
 
             if (!Bindwood.recordInCurrentProfile(record)) {
-                Bindwood.writeMessage("Record isn't in our current profile. Skipping...");
+                Bindwood.writeMessage(
+                    "Record isn't in our current profile. Skipping...");
                 continue;
             }
 
@@ -1084,7 +1130,9 @@
                                 " attempting to delete local copy.");
                         Bindwood.deleteLocalRecord(record);
                     });
-                continue; // Don't bother continuing to process anything further in this revision
+                // Don't bother continuing to process anything further in
+                // this revision
+                continue;
             }
 
             Bindwood.processCouchRecord(record, null, null);
@@ -1127,31 +1175,37 @@
         var aParent = aParent ? aParent : Bindwood.scratch_folder;
         var aIndex = aIndex ? aIndex : -1;
 
-        Bindwood.writeMessage("Processing Couch Record: " + record + " placing it in " + aParent + " at location " + aIndex);
+        Bindwood.writeMessage(
+            "Processing Couch Record: " + record + " placing it in " +
+            aParent + " at location " + aIndex);
 
         switch(record.record_type) {
         case Bindwood.TYPE_BOOKMARK:
             Bindwood.makeLocalChangeOnly(
                 function() {
-                    Bindwood.processCouchBookmarkRevision(record, aParent, aIndex);
+                    Bindwood.processCouchBookmarkRevision(
+                        record, aParent, aIndex);
                 });
             break;
         case Bindwood.TYPE_FOLDER:
             Bindwood.makeLocalChangeOnly(
                 function() {
-                    Bindwood.processCouchFolderRevision(record, aParent, aIndex);
+                    Bindwood.processCouchFolderRevision(
+                        record, aParent, aIndex);
                 });
             break;
         case Bindwood.TYPE_FEED:
             Bindwood.makeLocalChangeOnly(
                 function() {
-                    Bindwood.processCouchFeedRevision(record, aParent, aIndex);
+                    Bindwood.processCouchFeedRevision(
+                        record, aParent, aIndex);
                 });
             break;
         case Bindwood.TYPE_SEPARATOR:
             Bindwood.makeLocalChangeOnly(
                 function() {
-                    Bindwood.processCouchSeparatorRevision(record, aParent, aIndex);
+                    Bindwood.processCouchSeparatorRevision(
+                        record, aParent, aIndex);
                 });
             break;
         default:
@@ -1161,9 +1215,10 @@
 
     processCouchBookmarkRevision: function(record, aParent, aIndex) {
         // Could be an add or change revision. Delete was handled earlier.
-        // If it's an addition (we can't resolve its _id to be one of our itemIds),
-        // add it to the Desktop Couch folder in unfiled.
-        Bindwood.writeMessage("Processing bookmark record: " + JSON.stringify(record));
+        // If it's an addition (we can't resolve its _id to be one of our
+        // itemIds), add it to the Desktop Couch folder in unfiled.
+        Bindwood.writeMessage(
+            "Processing bookmark record: " + JSON.stringify(record));
         var itemId = Bindwood.itemIdForUUID(record._id);
         if (itemId) {
             // It's a change. Stamp everything remote on the local bookmark
@@ -1183,38 +1238,50 @@
     },
 
     processCouchFolderRevision: function(record, aParent, aIndex) {
-        // Could be an add or change revision. Delete was handled earlier.
-        // If it's an addition (we can't resolve its _id to be one of our itemIds),
-        // add it to the Desktop Couch folder in unfiled.
-        Bindwood.writeMessage("Processing folder record: " + JSON.stringify(record));
+        // Could be an add or change revision. Delete was handled
+        // earlier.  If it's an addition (we can't resolve its _id to be
+        // one of our itemIds), add it to the Desktop Couch folder in
+        // unfiled.
+        Bindwood.writeMessage(
+            "Processing folder record: " + JSON.stringify(record));
         var itemId = Bindwood.itemIdForUUID(record._id);
         if (itemId) {
-            // It's a change. Stamp remote title on the folder, and deal with any
-            // changed children.
+            // It's a change. Stamp remote title on the folder, and deal
+            // with any changed children.
             Bindwood.noteStartTime('Shuffling folder children');
             bookmarksService.setItemTitle(itemId, record.title);
-            // Iterate through our current folder children, and compare with remote.
-            // Move all local children to the scratch folder, then move them back
-            // in the order of the remote children.
+            // Iterate through our current folder children, and compare
+            // with remote.  Move all local children to the scratch
+            // folder, then move them back in the order of the remote
+            // children.
             var local_children = Bindwood.getUUIDsFromFolder(itemId);
-            Bindwood.writeMessage("Moving local children " + JSON.stringify(local_children) + " to scratch folder");
+            Bindwood.writeMessage(
+                "Moving local children " + JSON.stringify(local_children) +
+                " to scratch folder");
             for (var i = 0; i<local_children.length; i++) {
                 var child = local_children[i];
                 var child_itemId = Bindwood.itemIdForUUID(child);
                 try {
-                    bookmarksService.moveItem(child_itemId, Bindwood.scratch_folder, -1);
+                    bookmarksService.moveItem(
+                        child_itemId, Bindwood.scratch_folder, -1);
                 } catch(e) {
-                    Bindwood.writeError("Problem moving item to scratch folder: " + JSON.stringify(e), e);
+                    Bindwood.writeError(
+                        "Problem moving item to scratch folder: " +
+                        JSON.stringify(e), e);
                 }
             }
-            Bindwood.writeMessage("Moving children identified by record " + JSON.stringify(record.children) + " to this folder");
+            Bindwood.writeMessage(
+                "Moving children identified by record " +
+                JSON.stringify(record.children) + " to this folder");
             for (var j = 0; j<record.children.length; j++) {
                 var new_child = record.children[j];
                 var new_child_itemId = Bindwood.itemIdForUUID(new_child);
                 try {
                     bookmarksService.moveItem(new_child_itemId, itemId, -1);
                 } catch(e) {
-                    Bindwood.writeError("Problem moving item from scratch folder: " + JSON.stringify(e), e);
+                    Bindwood.writeError(
+                        "Problem moving item from scratch folder: " +
+                        JSON.stringify(e), e);
                 }
             }
             Bindwood.noteEndTime('Shuffling folder children');
@@ -1230,10 +1297,12 @@
     },
 
     processCouchFeedRevision: function(record, aParent, aIndex) {
-        // Could be an add or change revision. Delete was handled earlier.
-        // If it's an addition (we can't resolve its _id to be one of our itemIds),
-        // add it to the Desktop Couch folder in unfiled.
-        Bindwood.writeMessage("Processing feed record: " + JSON.stringify(record));
+        // Could be an add or change revision. Delete was handled
+        // earlier.  If it's an addition (we can't resolve its _id to be
+        // one of our itemIds), add it to the Desktop Couch folder in
+        // unfiled.
+        Bindwood.writeMessage(
+            "Processing feed record: " + JSON.stringify(record));
         var itemId = Bindwood.itemIdForUUID(record._id);
         if (itemId) {
             // It's a change. Stamp everything remote on the local bookmark
@@ -1256,11 +1325,12 @@
     },
 
     processCouchSeparatorRevision: function(record, aParent, aIndex) {
-        // Should only be an add revision. There's nothing to change, and delete was
-        // handled earlier.
-        // If it's an addition (we can't resolve its _id to be one of our itemIds),
-        // add it to the Desktop Couch folder in unfiled.
-        Bindwood.writeMessage("Processing separator record: " + JSON.stringify(record));
+        // Should only be an add revision. There's nothing to change, and
+        // delete was handled earlier.  If it's an addition (we can't
+        // resolve its _id to be one of our itemIds), add it to the
+        // Desktop Couch folder in unfiled.
+        Bindwood.writeMessage(
+            "Processing separator record: " + JSON.stringify(record));
         var itemId = Bindwood.itemIdForUUID(record._id);
         if (!itemId) {
             // There's nothing to change about a separator, so...
@@ -1341,7 +1411,8 @@
     Observer: {
         // An nsINavBookmarkObserver
         onItemAdded: function(aItemId, aFolder, aIndex) {
-            Bindwood.writeMessage("onItemAdded: called when push is " + Bindwood.push);
+            Bindwood.writeMessage(
+                "onItemAdded: called when push is " + Bindwood.push);
             // An item has been added, so we create a blank entry
             // in Couch with our local itemId attached.
             if (!Bindwood.itemWeCareAbout(aItemId)) {
@@ -1380,7 +1451,8 @@
                 bookmarksService.getItemLastModified(aItemId));
         },
         onBeforeItemRemoved: function(aItemId) {
-            Bindwood.writeMessage("onBeforeItemRemoved: called when push is " + Bindwood.push);
+            Bindwood.writeMessage(
+                "onBeforeItemRemoved: called when push is " + Bindwood.push);
             // A bookmark has been removed. This is called before it's
             // been removed locally, though we're passed the itemId,
             // which we use to delete from Couch.
@@ -1440,7 +1512,8 @@
             }
         },
         onItemRemoved: function(aItemId, aFolder, aIndex) {
-            Bindwood.writeMessage("onItemRemoved: called when push is " + Bindwood.push);
+            Bindwood.writeMessage(
+                "onItemRemoved: called when push is " + Bindwood.push);
             // This only happens locally, so there's never a need to push
             if (!Bindwood.itemWeCareAbout(aItemId)) {
                 Bindwood.writeMessage("Ignoring this remove event");
@@ -1455,7 +1528,8 @@
                 "Removed annotations from bookmark identified by: " + aItemId);
         },
         onItemChanged: function(aItemId, aProperty, aIsAnnotationProperty, aValue) {
-            Bindwood.writeMessage("onItemChanged: called when push is " + Bindwood.push);
+            Bindwood.writeMessage(
+                "onItemChanged: called when push is " + Bindwood.push);
             // A property of a bookmark has changed. On multiple
             // property updates, this will be called multiple times,
             // once per property (i.e., for title and URI)
@@ -1501,9 +1575,11 @@
         },
 
         onItemMoved: function(aItemId, aOldParent, aOldIndex, aNewParent, aNewIndex) {
-            Bindwood.writeMessage("onItemMoved: called when push is " + Bindwood.push);
-            Bindwood.writeMessage(
-                "The item: " + aItemId + " was moved from (" + aOldParent + ", " + aOldIndex +
+            Bindwood.writeMessage(
+                "onItemMoved: called when push is " + Bindwood.push);
+            Bindwood.writeMessage(
+                "The item: " + aItemId + " was moved from (" +
+                aOldParent + ", " + aOldIndex +
                 ") to (" + aNewParent + ", " + aNewIndex + ")"
             );
             switch (Bindwood.push) {
@@ -1515,7 +1591,8 @@
                 var uuid = Bindwood.uuidForItemId(aItemId);
                 var old_parent_uuid = Bindwood.uuidForItemId(aOldParent);
                 var old_parent_doc = Bindwood.couch.open(old_parent_uuid);
-                old_parent_doc.children = Bindwood.getUUIDsFromFolder(aOldParent);
+                old_parent_doc.children = Bindwood.getUUIDsFromFolder(
+                    aOldParent);
                 try {
                     var response = Bindwood.couch.save(old_parent_doc);
                     Bindwood.seen_revisions[response.rev] = true;
@@ -1526,13 +1603,15 @@
                 if (aOldParent != aNewParent) {
                     var new_parent_uuid = Bindwood.uuidForItemId(aNewParent);
                     var new_parent_doc = Bindwood.couch.open(new_parent_uuid);
-                    new_parent_doc.children = Bindwood.getUUIDsFromFolder(aNewParent);
+                    new_parent_doc.children = Bindwood.getUUIDsFromFolder(
+                        aNewParent);
                     try {
                         var response = Bindwood.couch.save(new_parent_doc);
                         Bindwood.seen_revisions[response.rev] = true;
                     } catch(e) {
                         Bindwood.writeError(
-                            "Problem saving updated new parent doc to Couch: ", e);
+                            "Problem saving updated new parent doc to Couch: ",
+                            e);
                     }
                 }
                 break;
@@ -1540,7 +1619,8 @@
                 break;
             }
 
-            // Set the latest modified to the greatest of aItemId, aOldParent, or aNewParent's last_modified
+            // Set the latest modified to the greatest of aItemId,
+            // aOldParent, or aNewParent's last_modified
             Bindwood.setLatestModified(
                 [bookmarksService.getItemLastModified(aItemId),
                  bookmarksService.getItemLastModified(aOldParent),