[Monotone-commits-diffs] net.venge.monotone: 54bbe85d3580d04a212337c11f075a2b96dabefb

[code]

revision:            54bbe85d3580d04a212337c11f075a2b96dabefb
date:                2012-08-26T20:47:56
author:              address@hidden
branch:              net.venge.monotone
changelog:
* doc/monotone.texi (Network): fix URI syntax, description, examples, to show 
that multiple include patterns are possible

* test/func/netsync_uri_multi_include_exclude: New test.

* NEWS (XXX XXX XX XX): doc mtn add, list vs --unknown, --recursive fix

manifest:
format_version "1"

new_manifest [b669d75d354c313cba4fbed15afbed152898f1ed]

old_revision [fff999548e6d92a4d16280c7bfc346dff5353274]

add_dir "test/func/netsync_uri_multi_include_exclude"

add_file "test/func/netsync_uri_multi_include_exclude/__driver__.lua"
 content [d54722eeef8802ba80caa5b9a9f3c355c0763081]

patch "NEWS"
 from [bcbf710c9e118a148d777b42c0744ba89207a6a6]
   to [54723cd3a325f76fc39e733ff3ff4372860afb5c]

patch "doc/monotone.texi"
 from [b9b168c12543873d190353126c3cd3172c12df47]
   to [d32d1c3dd0573dd7a537bbf972a607d7390777b1]
============================================================
--- NEWS	bcbf710c9e118a148d777b42c0744ba89207a6a6
+++ NEWS	54723cd3a325f76fc39e733ff3ff4372860afb5c
@@ -54,6 +54,9 @@ XXX XXX XX XX:XX:XX UTC 201X
 
         - Monotone now compiles against Lua 5.2 as well.
 
+        - mtn add and mtn list are now more consistent in their use of
+          --recursive and --unknown options.
+        
         Internal
 
         - The performance and memory usage of regular expressions has
============================================================
--- doc/monotone.texi	b9b168c12543873d190353126c3cd3172c12df47
+++ doc/monotone.texi	d32d1c3dd0573dd7a537bbf972a607d7390777b1
@@ -5718,16 +5718,20 @@ @section Network
 @anchor{netsync uri}
 @smallexample
 @group
-<scheme>://[[<user>@@]<host>[:<port>]][/<path>][?<pattern>[;-<exclude-pattern>[...]]]
+<scheme>://[[<user>@@]<host>[:<port>]][/<path>][?[-]<pattern>[;[-]<pattern>]...]
 @end group
 @end smallexample
 
+Branches matching a pattern are excluded if the pattern is preceded by
+'-', included otherwise.
+
 Valid examples of URIs monotone accepts are:
 
 @smallexample
 @group
 mtn://my.server:4690?my.branch
 mtn://my.server/project?my.other.branch*;-my.other.branch.test
+mtn://my.server/project?one.branch;-one.branch.test;another.branch;-another.branch.test
 file:///path/to/database.mtn?my.branch
 ssh://joe@@my.server/~/db.mtn?joes.branch
 @end group
============================================================
--- /dev/null	
+++ test/func/netsync_uri_multi_include_exclude/__driver__.lua	d54722eeef8802ba80caa5b9a9f3c355c0763081
@@ -0,0 +1,32 @@
+-- Show that multiple include and exclude patterns are supported
+
+includecommon("netsync.lua")
+mtn_setup()
+netsync.setup()
+
+addfile("file1", "foo")
+commit("branch1")
+
+addfile("file2", "bar")
+commit("branch2")
+
+addfile("file3", "baz")
+commit("branch3")
+
+addfile("file4", "4")
+commit("branch4")
+
+srv = netsync.start()
+
+check(mtn2("pull", srv.url .. "?-branch1;branch2;-branch3;branch4"), 0, nil, true)
+check(qgrep("include pattern  '{branch2,branch4}'", "stderr"))
+check(qgrep("exclude pattern  '{branch1,branch3}'", "stderr"))
+
+check(mtn2("ls", "branches"), 0, true)
+
+check(not (qgrep("^branch1$", "stdout")))
+check(qgrep("^branch2$", "stdout"))
+check(not (qgrep("^branch3", "stdout")))
+check(qgrep("^branch4", "stdout"))
+
+srv:stop()