rnewson

commit 307353cf8b1aa5b24533a8d70a440e39ab178285
Author: Robert Newson <rnewson@apache.org>
Date:   2013-01-27 19:10:07 +0100

    Match 1.2.x view sigs

diff --git a/src/couch_mrview/src/couch_mrview_util.erl b/src/couch_mrview/src/couch_mrview_util.erl
index ba4de2d..3bbb114 100644
--- a/src/couch_mrview/src/couch_mrview_util.erl
+++ b/src/couch_mrview/src/couch_mrview_util.erl

rnewson

~/.gitconfig

[url "https://github.com/"]
  insteadOf = "git://github.com/"
  pushInsteadOf = "git://github.com/"

[url "https://github.com/"]
  insteadOf = "git@github.com:"
  pushInsteadOf = "git@github.com:"

rnewson

-kernel error_logger silent
-sasl sasl_error_logger false
-twig host \\"fqdn.here.com\\"
-twig level 5

rnewson

PUT /db1/doc1/att1 HTTP/1.1
Host: localhost
Content-Type: text/html
Content-Length: 2
Accept: application/json

OKPUT /db1/doc2/att1 HTTP/1.1
Host: localhost
Content-Type: text/html
Content-Length: 2

rnewson

[
   {
       "from": "/",
       "to": "/index.html"
   },
   {
       "from": "/*",
       "to": "/*"
   }
]

rnewson

diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl
index 4b345da..5d5db07 100644
--- a/src/couchdb/couch_httpd_db.erl
+++ b/src/couchdb/couch_httpd_db.erl
@@ -1073,6 +1073,9 @@ parse_doc_query(Req) ->
         {"meta", "true"} ->
             Options = [revs_info, conflicts, deleted_conflicts | Args#doc_query_args.options],
             Args#doc_query_args{options=Options};
+        {"deleted", "true"} ->
+            Options = [deleted | Args#doc_query_args.options],

rnewson

{
   "_id": "_design/foo",
   "_rev": "5-172df2a93a96e58686dfdebd5e64b4c3",
   "language": "javascript",
   "views": {
       "bar": {
           "options": {
               "collation": "raw"
           },
           "map": "function(doc) {\n  emit(doc.timestamp, doc);\n}"

rnewson

Mar  8 15:51:03 172.26.40.217 local5: 2013-03-08 15:51:03,298 scalang.node.ErlangHandler [INFO] channel disconnected org.jboss.netty.channel.DefaultChannelPipeline$DefaultChannelHandlerContext@4eb98fe1 [\
id: 0x5fd1358f, /127.0.0.1:44008 :> /127.0.0.1:43438] DISCONNECTED. peer: null
Mar  8 15:51:03 172.26.40.217 local5: 2013-03-08 15:51:03,298 scalang.node.ServerHandshakeHandler [ERROR] Exception caught during erlang handshake:
Mar  8 15:51:03 java.nio.channels.ClosedChannelException
Mar  8 15:51:03 172.26.40.217     at sun.nio.ch.SocketChannelImpl.ensureWriteOpen(SocketChannelImpl.java:144)
Mar  8 15:51:03 172.26.40.217     at sun.nio.ch.SocketChannelImpl.write(SocketChannelImpl.java:342)
Mar  8 15:51:03 172.26.40.217     at org.jboss.netty.channel.socket.nio.SocketSendBufferPool$PooledSendBuffer.transferTo(SocketSendBufferPool.java:239)
Mar  8 15:51:03 172.26.40.217     at org.jboss.netty.channel.socket.nio.NioWorker.write0(NioWorker.java:469)
Mar  8 15:51:03 172.26.40.217     at org.jboss.netty.channel.soc

rnewson

➜  couchdb git:(nebraska-merge) COUCHDB_NO_START=true ./test/javascript/run
1..72
ok 1 all_docs
ok 2 attachment_names
ok 3 attachment_paths
ok 4 attachment_ranges
ok 5 attachment_views
ok 6 attachments
ok 7 attachments_multipart
ok 8 auth_cache

rnewson

R16B     git checkout f0f9ebe /usr/local/Library/Formula/erlang.rb
R15B03-1 git checkout 168742f /usr/local/Library/Formula/erlang.rb
R15B03   git checkout 311472d /usr/local/Library/Formula/erlang.rb
R15B02   git checkout 44e09dd /usr/local/Library/Formula/erlang.rb
R15B01   git checkout 6b8d25f /usr/local/Library/Formula/erlang.rb
R15B     git checkout 497b13a /usr/local/Library/Formula/erlang.rb