[Monotone-commits-diffs] net.venge.monotone: b1401f6a1beba4ef0e985c82f48f1aefd97f6969

[code]

revision:            b1401f6a1beba4ef0e985c82f48f1aefd97f6969
date:                2012-07-08T15:20:49
author:              address@hidden
branch:              net.venge.monotone
changelog:
explicit merge of '0e31f30e483148a81491feadd8ad37f831559a67'
              and 'a5069e0bb3a21e55cf056153132964ce0fc07214'



manifest:
format_version "1"

new_manifest [b9e535d27116f514c41ed2a34d34c53ceb09437d]

old_revision [0e31f30e483148a81491feadd8ad37f831559a67]

delete "test/func/ls_unknown_of_unknown_subdir"

delete "test/func/ls_unknown_of_unknown_subdir/__driver__.lua"

rename "test/func/ls_unknown_in_subdir"
    to "test/func/ls_unknown"

patch "doc/monotone.texi"
 from [a04959843e2ce28017f5fe0dbe86118be43871ba]
   to [d1225486c4df3ec2023d0e303aac65b8ff10a54e]

patch "test/func/ls_unknown/__driver__.lua"
 from [2d2da6ec91b788419c052f7f8e9168253269589a]
   to [9d93f6269c8226027853044ebad48c5d4ca432b1]

old_revision [a5069e0bb3a21e55cf056153132964ce0fc07214]

patch "test/func/resolve_conflicts_dropped_modified_2/__driver__.lua"
 from [6ac477e0740d4af2cae4bc7cb33099e98cd1fb45]
   to [e1bd2fed5032ea4cb911ffc1289b1830e2195e1c]

patch 
"test/func/resolve_conflicts_dropped_modified_upstream_vs_local/__driver__.lua"
 from [d582ad7875b4a98b2a0c60e05b7cfeaa80187f5a]
   to [e7f37ed8b1a65325390ad4f1ade33904e7535381]

patch "test/func/using_packets/__driver__.lua"
 from [d8e8f5be387ba1b658b5eb128515f4261608fb34]
   to [cbba17e46d782afcc3a2a97b54280a7373588c03]
============================================================
--- doc/monotone.texi	a04959843e2ce28017f5fe0dbe86118be43871ba
+++ doc/monotone.texi	d1225486c4df3ec2023d0e303aac65b8ff10a54e
@@ -10581,7 +10581,7 @@ @section Automation
 
 @end table
 
address@hidden automate address@hidden mtn automate stdio
address@hidden automate address@hidden mtn automate stdio [--automate-stdio-size <size>]
 
 @table @strong
 @item Arguments:
@@ -10682,6 +10682,9 @@ @section Automation
 <command number>:<stream>:<size>:<output>
 @end verbatim
 
+Packet size is limited by the @command{--automate-stdio-size} option
+(default 32k bytes).
+
 @code{<command number>} is a decimal number specifying which command this output
 is from. It is 0 for the first command, and increases by one each time.
 
============================================================
--- test/func/ls_unknown_in_subdir/__driver__.lua	2d2da6ec91b788419c052f7f8e9168253269589a
+++ test/func/ls_unknown/__driver__.lua	9d93f6269c8226027853044ebad48c5d4ca432b1
@@ -1,3 +1,5 @@
+-- Test various cases of 'ls unknown'
+
 mtn_setup()
 
 mkdir("foo")
@@ -5,13 +7,25 @@ writefile("foo/b", "bbb")
 writefile("foo/a", "aaa")
 writefile("foo/b", "bbb")
 
-check(mtn("ls", "unknown", "foo"), 0, true, false)
-check(qgrep('foo$', "stdout"), 0, false, false)
-check(not qgrep('foo/a$', "stdout"))
-check(not qgrep('foo/b$', "stdout"))
+-- Doesn't recurse into unknown directory
+check(mtn("ls", "unknown"), 0, true, nil)
+check(samelines("stdout",
+{"bar",
+ "emptyhomedir",
+ "foo",
+ "min_hooks.lua"}))
 
-check(indir("foo", mtn("ls", "unknown")), 0, true, false)
-check(qgrep('foo$', "stdout"))
-check(not qgrep('foo/a$', "stdout"))
-check(not qgrep('foo/b$', "stdout"))
+-- Doesn't show contents of unknown directory, even when the directory is specified
+check(mtn("ls", "unknown", "foo"), 0, true, nil)
+check(samelines("stdout",
+{"foo"}))
 
+-- From within an unknown directory, same as executing at root.
+check(indir("foo", mtn("ls", "unknown")), 0, true, nil)
+check(samelines("stdout",
+{"bar",
+ "emptyhomedir",
+ "foo",
+ "min_hooks.lua"}))
+
+
============================================================
--- test/func/ls_unknown_of_unknown_subdir/__driver__.lua	435822c98106eedf895a70cb7ed98763cb99fe3c
+++ /dev/null	
@@ -1,11 +0,0 @@
-mtn_setup()
-
-mkdir("foo")
-writefile("foo/a", "aaa")
-writefile("foo/b", "bbb")
-
-check(mtn("ls", "unknown", "foo"), 0, true, false)
-check(grep('foo$', "stdout"), 0, false, false)
-check(grep('foo/a$', "stdout"), 1, false, false)
-check(grep('foo/b$', "stdout"), 1, false, false)
-
============================================================
--- test/func/resolve_conflicts_dropped_modified_2/__driver__.lua	6ac477e0740d4af2cae4bc7cb33099e98cd1fb45
+++ test/func/resolve_conflicts_dropped_modified_2/__driver__.lua	e1bd2fed5032ea4cb911ffc1289b1830e2195e1c
@@ -30,8 +30,7 @@ check(mtn("show_conflicts", left_1, righ
 right_1 = base_revision()
 
 check(mtn("show_conflicts", left_1, right_1), 0, nil, true)
-check(samelines
-("stderr",
+check(samelines("stderr",
  {"mtn: [left]     506d8ed51b06c0080e8bb307155a88637045b532",
   "mtn: [right]    a2889488ed1801a904d0219ec9939dfc2e9be033",
   "mtn: [ancestor] f80ff103551d0313647d6c84990bc9db6b158dac",
@@ -45,8 +44,7 @@ check(mtn("explicit_merge", "--resolve-c
 check(mtn("conflicts", "resolve_first", "keep"), 0, nil, true)
 
 check(mtn("explicit_merge", "--resolve-conflicts", left_1, right_1, "testbranch"), 0, nil, true)
-check(samelines
-("stderr",
+check(samelines("stderr",
  {"mtn: [left]  506d8ed51b06c0080e8bb307155a88637045b532",
   "mtn: [right] a2889488ed1801a904d0219ec9939dfc2e9be033",
   "mtn: keeping 'file_2'",
@@ -67,8 +65,7 @@ check(mtn("show_conflicts", left_2, righ
 left_2 = base_revision()
 
 check(mtn("show_conflicts", left_2, right_2), 0, nil, true)
-check(samelines
-("stderr",
+check(samelines("stderr",
  {"mtn: [left]     5a144a43f03692e389f3ddd4c510a4d9754061d5",
   "mtn: [right]    3df3126220588440def7b08f488ca35eaa94f1b6",
   "mtn: [ancestor] 506d8ed51b06c0080e8bb307155a88637045b532",
============================================================
--- test/func/resolve_conflicts_dropped_modified_upstream_vs_local/__driver__.lua	d582ad7875b4a98b2a0c60e05b7cfeaa80187f5a
+++ test/func/resolve_conflicts_dropped_modified_upstream_vs_local/__driver__.lua	e7f37ed8b1a65325390ad4f1ade33904e7535381
@@ -30,8 +30,7 @@ check(mtn("show_conflicts", upstream_1, 
 local_1 = base_revision()
 
 check(mtn("show_conflicts", upstream_1, local_1), 0, nil, true)
-check(samelines
-("stderr",
+check(samelines("stderr",
  {"mtn: [left]     1e700864de7a2cbb1cf85c26f5e1e4ca335d2bc2",
   "mtn: [right]    a2889488ed1801a904d0219ec9939dfc2e9be033",
   "mtn: [ancestor] f80ff103551d0313647d6c84990bc9db6b158dac",
@@ -45,8 +44,7 @@ check(mtn("explicit_merge", "--resolve-c
 check(mtn("conflicts", "resolve_first", "drop"), 0, nil, true)
 
 check(mtn("explicit_merge", "--resolve-conflicts", upstream_1, local_1, "testbranch"), 0, nil, true)
-check(samelines
-("stderr",
+check(samelines("stderr",
  {"mtn: [left]  1e700864de7a2cbb1cf85c26f5e1e4ca335d2bc2",
   "mtn: [right] a2889488ed1801a904d0219ec9939dfc2e9be033",
   "mtn: dropping 'file_2'",
@@ -84,8 +82,7 @@ check(mtn("show_conflicts", upstream_2, 
 
 -- Show that 'show_conflicts' reports the attribute resolution properly.
 check(mtn("show_conflicts", upstream_2, local_2), 0, nil, true)
-check(samelines
-("stderr",
+check(samelines("stderr",
  {"mtn: [left]     c0ed8c29ffad149af1c948969e8e80d270999b13",
   "mtn: [right]    dd1ba606b52fddb4431da3760ff65b65f6509a48",
   "mtn: [ancestor] 1e700864de7a2cbb1cf85c26f5e1e4ca335d2bc2",
============================================================
--- test/func/using_packets/__driver__.lua	d8e8f5be387ba1b658b5eb128515f4261608fb34
+++ test/func/using_packets/__driver__.lua	cbba17e46d782afcc3a2a97b54280a7373588c03
@@ -101,7 +101,7 @@ check(mtnB("checkout", "--branch", "test
 
 check(mtnB("checkout", "--branch", "test", "test-B"), 0, nil, false)
 
-check(samefile("file", "test-b/file"))
-check(samefile("file2", "test-b/file2"))
+check(samefile("file", "test-B/file"))
+check(samefile("file2", "test-B/file2"))
 
 -- end of file