Merge lp:~chipaca/u1db/u1db-client_resolve into lp:u1db

[John Lenton]

a first pass at resolve-doc for u1db-client

a first pass at resolve-doc for u1db-client

[Eric Casteleijn (thisfred)]

Looks good. I wonder if we need a test that passes in bogus revision numbers, or is that planned for a subsequent branch?

review: Approve

[John Lenton (chipaca)]

On Thu, May 24, 2012 at 8:54 PM, Eric Casteleijn
<email address hidden> wrote:
>
> Review: Approve
>
> Looks good. I wonder if we need a test that passes in bogus revision numbers, or is that planned for a subsequent branch?

that's going to happen inside resolve_doc in a future branch (bug 1004004)

=== modified file 'u1db/commandline/client.py'
--- u1db/commandline/client.py	2012-05-24 14:50:19 +0000
+++ u1db/commandline/client.py	2012-05-24 19:25:41 +0000
@@ -227,6 +227,44 @@
 client_commands.register(CmdPut)
 
 
+class CmdResolve(OneDbCmd):
+    """Resolve a conflicted document"""
+
+    name = 'resolve-doc'
+
+    @classmethod
+    def _populate_subparser(cls, parser):
+        parser.add_argument('database',
+                            help='The local or remote database to update',
+                            metavar='database-path-or-url'),
+        parser.add_argument('doc_id', help='The conflicted document id')
+        parser.add_argument('doc_revs', metavar="doc-rev", nargs="+",
+            help='The revisions that the new content supersedes')
+        parser.add_argument('--infile', nargs='?', default=None,
+            help='The filename of the document that will be used for content',
+            type=argparse.FileType('rb'))
+
+    def run(self, database, doc_id, doc_revs, infile):
+        if infile is None:
+            infile = self.stdin
+        try:
+            db = self._open(database, create=False)
+        except errors.DatabaseDoesNotExist:
+            self.stderr.write("Database does not exist.\n")
+            return 1
+        doc = db.get_doc(doc_id)
+        if doc is None:
+            self.stderr.write("Document does not exist.\n")
+            return 1
+        doc.set_json(infile.read())
+        db.resolve_doc(doc, doc_revs)
+        self.stderr.write("rev: %s\n" % db.get_doc(doc_id).rev)
+        if doc.has_conflicts:
+            self.stderr.write("Document still has conflicts.\n")
+
+client_commands.register(CmdResolve)
+
+
 class CmdSync(command.Command):
     """Synchronize two databases"""
 

=== modified file 'u1db/tests/commandline/test_client.py'
--- u1db/tests/commandline/test_client.py	2012-05-24 14:50:19 +0000
+++ u1db/tests/commandline/test_client.py	2012-05-24 19:25:41 +0000
@@ -24,6 +24,7 @@
     errors,
     open as u1db_open,
     tests,
+    vectorclock,
     )
 from u1db.commandline import (
     client,
@@ -159,6 +160,14 @@
         self.assertEqual('db', args.database)
         self.assertEqual('doc-id', args.doc_id)
 
+    def test_resolve(self):
+        args = self.parse_args(['resolve-doc', 'db', 'doc-id', 'rev:1', 'other:1'])
+        self.assertEqual(client.CmdResolve, args.subcommand)
+        self.assertEqual('db', args.database)
+        self.assertEqual('doc-id', args.doc_id)
+        self.assertEqual(['rev:1', 'other:1'], args.doc_revs)
+        self.assertEqual(None, args.infile)
+
 
 class TestCaseWithDB(tests.TestCase):
     """These next tests are meant to have one class per Command.
@@ -339,6 +348,58 @@
                          cmd.stderr.getvalue())
 
 
+class TestCmdResolve(TestCaseWithDB):
+
+    def setUp(self):
+        super(TestCmdResolve, self).setUp()
+        self.doc1 = self.db.create_doc(tests.simple_doc, doc_id='my-doc')
+        self.doc2 = self.make_document('my-doc', 'other:1', '{}', False)
+        self.db._put_doc_if_newer(self.doc2, save_conflict=True)
+
+    def test_resolve_simple(self):
+        self.assertTrue(self.db.get_doc('my-doc').has_conflicts)
+        cmd = self.make_command(client.CmdResolve)
+        inf = cStringIO.StringIO(tests.nested_doc)
+        cmd.run(self.db_path, 'my-doc', [self.doc1.rev, self.doc2.rev], inf)
+        doc = self.db.get_doc('my-doc')
+        vec = vectorclock.VectorClockRev(doc.rev)
+        self.assertTrue(vec.is_newer(vectorclock.VectorClockRev(self.doc1.rev)))
+        self.assertTrue(vec.is_newer(vectorclock.VectorClockRev(self.doc2.rev)))
+        self.assertGetDoc(self.db, 'my-doc', doc.rev, tests.nested_doc, False)
+        self.assertEqual('', cmd.stdout.getvalue())
+        self.assertEqual('rev: %s\n' % (doc.rev,),
+                         cmd.stderr.getvalue())
+
+    def test_resolve_double(self):
+        moar = '{"x": 42}'
+        doc3 = self.make_document('my-doc', 'third:1', moar, False)
+        self.db._put_doc_if_newer(doc3, save_conflict=True)
+        cmd = self.make_command(client.CmdResolve)
+        inf = cStringIO.StringIO(tests.nested_doc)
+        cmd.run(self.db_path, 'my-doc', [self.doc1.rev, self.doc2.rev], inf)
+        doc = self.db.get_doc('my-doc')
+        self.assertGetDoc(self.db, 'my-doc', doc.rev, moar, True)
+        self.assertEqual('', cmd.stdout.getvalue())
+        self.assertEqual('rev: %s\nDocument still has conflicts.\n' % (doc.rev,),
+                         cmd.stderr.getvalue())
+
+    def test_resolve_no_db(self):
+        cmd = self.make_command(client.CmdResolve)
+        retval = cmd.run(self.db_path + "__DOES_NOT_EXIST", "my-doc", [], None)
+        self.assertEqual(retval, 1)
+        self.assertEqual(cmd.stdout.getvalue(), '')
+        self.assertEqual(cmd.stderr.getvalue(), 'Database does not exist.\n')
+
+    def test_resolve_no_doc(self):
+        cmd = self.make_command(client.CmdResolve)
+        retval = cmd.run(self.db_path, "foo", [], None)
+        self.assertEqual(retval, 1)
+        self.assertEqual(cmd.stdout.getvalue(), '')
+        self.assertEqual(cmd.stderr.getvalue(), 'Document does not exist.\n')
+
+
+
+
 class TestCmdSync(TestCaseWithDB):
 
     def setUp(self):