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

[code]

revision:            a5069e0bb3a21e55cf056153132964ce0fc07214
date:                2012-07-08T15:18:35
author:              address@hidden
branch:              net.venge.monotone
changelog:
minor cleanups

* doc/monotone.texi: fix typo, mention --automate-stdio-size

* test/func/ls_unknown: renamed from ls_unknown_in_subdir

* test/func/ls_unknown_of_unknown_subdir: deleted; duplicates 
ls_unknown_in_subdir

manifest:
format_version "1"

new_manifest [b42f2ab377857d6cb9193dd30cdb8346a4c7a814]

old_revision [99e33bfe689f804af5e4d2268245e88e6c4068ef]

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 [e02fcb78275fe83af95b13662bb24c2a06724b00]
   to [d1225486c4df3ec2023d0e303aac65b8ff10a54e]

patch "test/func/ls_unknown/__driver__.lua"
 from [2d2da6ec91b788419c052f7f8e9168253269589a]
   to [9d93f6269c8226027853044ebad48c5d4ca432b1]
============================================================
--- doc/monotone.texi	e02fcb78275fe83af95b13662bb24c2a06724b00
+++ doc/monotone.texi	d1225486c4df3ec2023d0e303aac65b8ff10a54e
@@ -5120,7 +5120,7 @@ @section Tree
 @command{mtn commit}.
 
 On Windows, workspaces cannot be located in the root directory of a
-device; for example, \file{d:/} is an invalid directory for a workspace.
+device; for example, @file{d:/} is an invalid directory for a workspace.
 @end ftable
 
 @page
@@ -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)
-