[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone: 3903ea47e7b1a656e0695f10d5
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone: 3903ea47e7b1a656e0695f10d57bc0e9deca205b |
Date: |
Mon, 10 Jan 2011 12:51:40 GMT |
revision: 3903ea47e7b1a656e0695f10d57bc0e9deca205b
date: 2011-01-10T12:50:43
author: address@hidden
branch: net.venge.monotone
changelog:
merge of '4e4db9a44f954a5547425333d8dac3442a9e9be5'
and '7f6fa1b55562061ee5c00a41207e79b5fb97dd09'
manifest:
format_version "1"
new_manifest [3a20eb9b5f8740577801198977d6d5d43bec6026]
old_revision [4e4db9a44f954a5547425333d8dac3442a9e9be5]
patch "monotone.texi"
from [20f59a7e338340d95e3ce846b1fc536c84369901]
to [e376b6b2d07736f11fce16a5ff1b82e29da95ed3]
old_revision [7f6fa1b55562061ee5c00a41207e79b5fb97dd09]
patch "monotone.texi"
from [218aed4c92ec2729be5f4e93b3a28001def5abc4]
to [e376b6b2d07736f11fce16a5ff1b82e29da95ed3]
============================================================
--- monotone.texi 20f59a7e338340d95e3ce846b1fc536c84369901
+++ monotone.texi e376b6b2d07736f11fce16a5ff1b82e29da95ed3
@@ -12491,9 +12491,9 @@ @subsection Meta Hooks
@subsection Meta Hooks
-Monotone allows the execution of arbitrary Lua hooks and functions
-through a special generalized "meta hook". See @ref{mtn automate lua}
-for more information.
+Monotone allows the execution of arbitrary Lua hooks and functions through a
+special generalized "meta hook". See @ref{mtn automate lua} for more
+information.
@ftable @code
@item hook_wrapper (@var{func_name}, @var{...})
============================================================
--- monotone.texi 218aed4c92ec2729be5f4e93b3a28001def5abc4
+++ monotone.texi e376b6b2d07736f11fce16a5ff1b82e29da95ed3
@@ -5795,12 +5795,13 @@ @section Network
@ftable @command
@item mtn serve address@hidden:@var{port}]]
address@hidden mtn pull [--[no-]set-default] [--dry-run] address@hidden
address@hidden mtn push [--[no-]set-default] [--dry-run] address@hidden address@hidden
address@hidden mtn sync [--[no-]set-default] [--dry-run] address@hidden address@hidden
address@hidden mtn pull [--[no-]set-default] [--[no-]dry-run] address@hidden
address@hidden mtn push [--[no-]set-default] [--[no-]dry-run] address@hidden address@hidden
address@hidden mtn sync [--[no-]set-default] [--[no-]dry-run] address@hidden address@hidden
@itemx mtn pull [--[no-]set-default] address@hidden address@hidden [...] address@hidden @strong{deprecated}
@itemx mtn push [--[no-]set-default] address@hidden address@hidden address@hidden [...] address@hidden @strong{deprecated}
@itemx mtn sync [--[no-]set-default] address@hidden address@hidden address@hidden [...] address@hidden @strong{deprecated}
+See the online help for more options.
These commands operate the ``netsync'' protocol built into
monotone. This is a custom protocol for rapidly synchronizing two
@@ -5826,17 +5827,17 @@ @section Network
that the transport channel in use already provides sufficient
authentication and authorization facilities.
-The @var{uri-or-address} arguments given to @command{push},
address@hidden, and @command{sync} can be of two possible forms.
-
If @option{--dry-run} is given, the connection is made, but no data is
transferred. Instead, a summary of what would be transferred is
output; the number of revisions, certs and keys that would be sent and
received. For sent revisions, the branch names are also output.
+The @var{uri-or-address} arguments given to @command{push},
address@hidden, and @command{sync} can be of two possible forms.
+
If the argument is an URI, the Lua hook
address@hidden may transform it into a connection
-command, which is later executed as transport channel for netsync.
address@hidden may transform it into a connection
+command, which is later executed as the transport channel for netsync.
The URI itself consists of a connection scheme, an optional user (only
used for @code{ssh}-related transports), a host with an optional port
(which both might be optional as well, f.e. for the @code{file}
@@ -5860,16 +5861,20 @@ @section Network
@end group
@end smallexample
address@hidden:} and @code{ssh:} are not supported on Windows native, but
+they are supported on Windows Cygwin.
+
If the server has a multi-host setup, the path component of the URI
might be used to distinguish between different databases (please ask the
-provider of the setup for details).
+provider of the server for details).
-If the argument is a simple hostname (with optional port number), monotone
-will fall back to the @code{mtn} URI scheme, i.e. use a TCP socket to the
-specified host and port. The @var{glob} parameters then indicate a set of
-branches to exchange. Multiple @var{glob} and @option{--exclude} options
-can be specified. @strong{Important notice:} This call syntax is deprecated
-and subject of removal in future versions of monotone!
+For backward compatibility, if the argument is a simple hostname (with
+no scheme, but with optional port number), monotone will default to
+the @code{mtn:} URI scheme, i.e. use a TCP socket to the specified
+host and port. The @var{glob} parameters then indicate a set of
+branches to exchange. Multiple @var{glob} and @option{--exclude}
+options can be specified. @strong{Important notice:} This call syntax
+is deprecated and subject to removal in future versions of monotone!
For both syntaxes, every branch which matches a @var{glob} or branch pattern
exactly, and does not match an @var{exclude-glob} or exclude pattern, will be
@@ -5899,10 +5904,10 @@ @section Network
databases.
The @command{pull}, @command{push}, and @command{sync} commands only
-require you pass @var{uri} (or @var{address} and @var{glob}) the first time
-you use one of them; monotone will memorize this use and in the future default
-to the same URI (or server and glob). For instance, if Bob wants to
address@hidden with Alice again, he can simply run:
+require you pass @var{uri} the first time you use one of them;
+monotone will store this in the database and in the future default to
+the same URI. For instance, if Bob wants to @command{sync} with Alice
+again, he can simply run:
@smallexample
@group
@@ -5918,44 +5923,49 @@ @section Network
make the new default.
The @command{serve} command doesn't care about workspaces, so even if
-you stand in one, you will have to give it the database to server, the
-server key to use and the key directory explicitely, or otherwise, it
-will take the defaults it would use when you don't stand in a
-workspace.
+you stand in one, you will have to give it the database to serve, the
+server key to use and the key directory explicitly.
In the server, different permissions can be applied to each branch;
see @ref{get_netsync_read_permitted} and
@ref{get_netsync_write_permitted}.
-If a @option{--pid-file} option is specified, the command
address@hidden will create the specified file and record the process
-identifier of the server in the file. This file can then be read to
-identify specific monotone server processes.
+If @option{--pid-file} is specified, @command{serve} will create the
+specified file and record the process identifier of the server in the
+file. This file can then be read to identify specific monotone server
+processes.
-The syntax for patterns, both in globs as well as URIs, is very simple.
address@hidden matches 0 or more arbitrary characters. @code{?} matches exactly
-1 arbitrary character (you need to escape that with @code{%3F} in an URI).
address@hidden@{foo,bar,address@hidden matches ``foo'', or ``bar'', or ``baz''. These
-can be combined arbitrarily. A backslash, @code{\}, can be prefixed to
-any character, to match exactly that character --- this might be useful
-in case someone, for some odd reason, decides to put a ``*'' into their
-branch name.
+The syntax for patterns is very simple. @code{*} matches 0 or more
+arbitrary characters. @code{?} matches exactly 1 arbitrary character
+(you need to escape that with @code{%3F} in a URI). @address@hidden,@}}
+matches alternatives; @address@hidden,bar,address@hidden matches ``foo'', or
+``bar'', or ``baz''. These can be combined arbitrarily. A backslash
+(@code{\}) escapes these special characters, to match exactly that
+character; this might be useful in case someone, for some odd
+reason, decides to put a ``*'' into their branch name.
address@hidden mtn clone @var{uri} address@hidden address@hidden
address@hidden mtn clone @var{address}[:@var{port}] @var{branchname} address@hidden
address@hidden mtn clone @var{uri} address@hidden address@hidden address@hidden
address@hidden mtn clone @var{address}[:@var{port}] @var{branchname} address@hidden @strong{deprecated}
@command{clone} is a helper command that performs the roles of a
-number of other commands all at once. Firstly, it constructs a new
+number of other commands all at once. First, it constructs a new
database. If no database is given, the configured default database is
created or re-used (see @ref{get_default_database_alias} for more
-details). Then it populates this database by @command{pull}ing any
-data which match the branch pattern in the @var{uri} or the given
address@hidden argument from the remote database. Finally, it
-copies the files out of the newly created database into a local
-directory, just as @command{checkout} would. If no @var{directory} is
-given, the @var{branchname} is used as directory.
+details; @file{~/.monotone/default.mtn} by default). Then it populates
+this database by @command{pull}ing any data which match the branch
+pattern in the @var{uri} argument from the remote database.
+The branch pattern must specify a single branch; @command{clone} uses
+that to determine which branch to checkout.
+
+Finally, @command{clone} copies the files out of the newly created
+database into a local directory, just as @command{checkout} would. If
+no @var{directory} is given, the @var{branchname} is used as
+directory. If @command{--revision} is given, that revision must be on
+the specified branch, and is checked out; otherwise the head of the
+branch is checked out.
+
@strong{Important notice:} The @var{address}[:@var{port}] @var{branchname}
-call syntax is deprecated and subject of removal in future versions of monotone!
+call syntax is deprecated and subject to removal in future versions of monotone!
@end ftable
@@ -6174,9 +6184,9 @@ @section Informative
@item mtn list certs @var{id}
@itemx mtn ls certs
address@hidden branches} is an alias for @command{list branches}.
address@hidden certs} is an alias for @command{list certs}.
-This commands will print out a list of certificates associated with
+This command will print out a list of certificates associated with
a particular revision @var{id}. Each line of the print out will
indicate:
@itemize
@@ -11276,8 +11286,7 @@ @section @code{basic_io} Format
parent.
Another example is the @file{read-permissions} file that's read by the
-default definition of the @code{get_netsync_read_permitted} Lua hook;
-see @ref{get_netsync_read_permitted}.
+default definition of the @ref{get_netsync_read_permitted} Lua hook.
Monotone will format its output in @code{basic_io} as follows:
@itemize
@@ -11926,7 +11935,7 @@ @subsection Netsync Transport Hooks
a TCP socket.
@ftable @code
address@hidden get_netsync_connect_command (@var{uri}, @var{args})
address@hidden@item get_netsync_connect_command (@var{uri}, @var{args})
Returns a table describing a command to run to connect to the
specified host. The @var{uri} argument is a table containing
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone: 3903ea47e7b1a656e0695f10d57bc0e9deca205b,
code <=