Return-Path: Delivered-To: apmail-incubator-couchdb-commits-archive@locus.apache.org Received: (qmail 18354 invoked from network); 31 Oct 2008 21:21:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Oct 2008 21:21:58 -0000 Received: (qmail 31449 invoked by uid 500); 31 Oct 2008 21:22:04 -0000 Delivered-To: apmail-incubator-couchdb-commits-archive@incubator.apache.org Received: (qmail 31425 invoked by uid 500); 31 Oct 2008 21:22:04 -0000 Mailing-List: contact couchdb-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: couchdb-dev@incubator.apache.org Delivered-To: mailing list couchdb-commits@incubator.apache.org Received: (qmail 31410 invoked by uid 99); 31 Oct 2008 21:22:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2008 14:22:04 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2008 21:20:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A9FCD23888EB; Fri, 31 Oct 2008 14:21:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r709572 - in /incubator/couchdb/trunk: share/www/script/couch_tests.js src/couchdb/couch_doc.erl Date: Fri, 31 Oct 2008 21:21:06 -0000 To: couchdb-commits@incubator.apache.org From: jchris@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081031212106.A9FCD23888EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jchris Date: Fri Oct 31 14:21:05 2008 New Revision: 709572 URL: http://svn.apache.org/viewvc?rev=709572&view=rev Log: fixed JSON regression about revs_info status Modified: incubator/couchdb/trunk/share/www/script/couch_tests.js incubator/couchdb/trunk/src/couchdb/couch_doc.erl Modified: incubator/couchdb/trunk/share/www/script/couch_tests.js URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/share/www/script/couch_tests.js?rev=709572&r1=709571&r2=709572&view=diff ============================================================================== --- incubator/couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original) +++ incubator/couchdb/trunk/share/www/script/couch_tests.js [utf-8] Fri Oct 31 14:21:05 2008 @@ -54,6 +54,10 @@ var id = result.id; // save off the id for later + // make sure the revs_info status is good + var doc = db.open(id, {revs_info:true}); + T(doc._revs_info[0].status == "available"); + // Create some more documents. // Notice the use of the ok member on the return result. T(db.save({_id:"1",a:2,b:4}).ok); Modified: incubator/couchdb/trunk/src/couchdb/couch_doc.erl URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/couch_doc.erl?rev=709572&r1=709571&r2=709572&view=diff ============================================================================== --- incubator/couchdb/trunk/src/couchdb/couch_doc.erl (original) +++ incubator/couchdb/trunk/src/couchdb/couch_doc.erl Fri Oct 31 14:21:05 2008 @@ -39,7 +39,7 @@ lists:map( fun({revs_info, RevsInfo}) -> JsonRevsInfo = - [{[{rev, Rev}, {status, atom_to_list(Status)}]} || + [{[{rev, Rev}, {status, list_to_binary(atom_to_list(Status))}]} || {Rev, Status} <- RevsInfo], {<<"_revs_info">>, JsonRevsInfo}; ({conflicts, Conflicts}) ->