Overview
| SHA1 Hash: | f9f7cf5684d27947eb49283af145f86c214cc119 |
|---|---|
| Date: | 2007-11-24 02:45:39 |
| User: | drh |
| Comment: | The autosync setting understands values like "on", "off", "true", and "false" in addition to 0 and 1. Updates to the documentation. |
| Timelines: | ancestors | descendants | both | trunk |
| Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[hide diffs]Modified src/db.c from [3bb9c7887b] to [96be69e00f].
@@ -950,10 +950,23 @@
globalFlag ? "global_" : "", zName, value);
if( globalFlag && g.repositoryOpen ){
db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
}
db_end_transaction(0);
+}
+int db_get_boolean(const char *zName, int dflt){
+ static const char *azOn[] = { "on", "yes", "true", "1" };
+ static const char *azOff[] = { "off", "no", "false", "0" };
+ int i;
+ char *zVal = db_get(zName, dflt ? "on" : "off");
+ for(i=0; i<sizeof(azOn)/sizeof(azOn[0]); i++){
+ if( strcmp(zVal,azOn[i])==0 ) return 1;
+ }
+ for(i=0; i<sizeof(azOff)/sizeof(azOff[0]); i++){
+ if( strcmp(zVal,azOff[i])==0 ) return 0;
+ }
+ return dflt;
}
char *db_lget(const char *zName, char *zDefault){
return db_text((char*)zDefault,
"SELECT value FROM vvar WHERE name=%Q", zName);
}
Modified src/sync.c from [f3710d7eb5] to [39558ac818].
@@ -33,11 +33,11 @@
** if the argument is false. Return true if the autosync is done
** and false if autosync is not requested for the current repository.
*/
int autosync(int pullFlag){
const char *zUrl;
- if( db_get_int("autosync", 0)==0 ){
+ if( db_get_boolean("autosync", 0)==0 ){
return 0;
}
zUrl = db_get("last-sync-url", 0);
if( zUrl==0 ){
return 0; /* No default server */
Modified www/concepts.html from [d53cc73d6e] to [599347ea73].
@@ -75,11 +75,11 @@ remote repository into a local repository. Or one can do a "sync" which is a shortcut for doing both a push and a pull at the same time. Fossil also has the concept of "cloning". A "clone" is like a "pull", except that instead of beginning with an existing local repository, a clone begins with nothing and creates a new local repository that -is a replicate of a remote repository.</p> +is a duplicate of a remote repository.</p> <p>Communication between repositories is via HTTP. Remote repositories are identified by URL. You can also point a webbrowser at a repository and get human-readable status, history, and tracking information about the project.</p> @@ -140,13 +140,14 @@ manifest for that baseline.</p> <p>Fossil automatically generates a manifest whenever you "commit" a new baseline. So this is not something that you, the developer, need to worry with. The format of a manifest is intentionally -designed to be simple to parse, however, so that if +designed to be simple to parse, so that if you want to read and interpret a manifest, either by hand or -with a script, that is easy to do.</p> +with a script, that is easy to do. But you will probably never +need to do so.</p> <p>In addition to identifying all files in the baseline, a manifest also contains a check-in comment, the date and time when the baseline was established, who created the baseline, and links to other baselines from which the current baseline @@ -274,10 +275,42 @@ <li><p> Repeat all of the above until you have generated great software. </p></li> </ol> + +<h3>4.1 Variations</h3> + +<p>The <b>settings</b> lets you view and modify various operating +properties of fossil. Among the available settings is "autosync" +mode. When autosync is enabled, the push and pull of content from +your local server is largely automated. Whenever you use the <b>update</b> +command, fossil first does a <b>pull</b> to see if other users have +perhaps added new baselines to the central repository. When you +<b>commit</b>, fossil also does a <b>pull</b> and issues a warning +if your check-in would cause a fork. After a <b>commit</b>, fossil +automatically does a <b>push</b> to send your changes up to the +central server.</p> + +<p>With autosync enabled, fossil works like +<a href="http://www.nongnu.org/cvs/">CVS</a> or +<a href="http://subversion.tigris.org/">Subversion</a>. +When autosync disabled, fossil works more like +<a href="http://monotone.ca/">Monotone</a>, +<a href="http://git.or.cz">GIT</a>, or +<a href="http://www.selenic.com/mercurial/wiki/">Mercurial</a>. +The fun thing about fossil is that it will work either +way, depending on your needs of the moment. You can freely switch +between these operating modes using commands like:</p> + +<blockquote> +<b>fossil setting autosync off<br /> +fossil setting autosync on</b> +</blockquote> + +<p>For additional information about autosync and other settings +using the <b>help</b> command.</p> <h2>5.0 Setting Up A Fossil Server</h2> <p>With other configuration management software, setting up a server is a lot of work and normally takes time, patience, and a lot of system
Modified www/fileformat.html from [7e9e427973] to [d480398398].
@@ -9,60 +9,63 @@ Fossil File Formats </h1> <p> The global state of a fossil repository is determined by an unordered -set of files. Some files are used to represent wiki pages, trouble tickets, -and the special "manifest" file has a specific and well-defined format. -Other files are just data. Files can be text or binary. -</p> - -<p> -Each file in the repository is named by its SHA1 hash. -No prefixes or meta information is added to a file before -its hash is computed. The name of a file in the repository +set of files. A file in fossil is called an "artifact". +An artifact might be a source code file, the text of a wiki page, +part of a trouble ticket, or one of several special control artifacts +used to show the relationships between other artifacts within the +project. Artifacts can be text or binary. +</p> + +<p> +Each artifact in the repository is named by its SHA1 hash. +No prefixes or meta information is added to a artifact before +its hash is computed. The name of a artifact in the repository is exactly the same SHA1 hash that is computed by sha1sum on the file as it exists in your source tree.</p> <p> -Some files have a particular format which qualifies them +Some artifacts have a particular format which qualifies them as "manifests". A manifest assigns filenames to a subset -of the files in the repository, in order to provide a +of the artifacts in the repository, in order to provide a snapshot of the state of the project at a point in time. -Each manifest file corresponds to a version or baseline +Each manifest corresponds to a version or baseline of the project. </p> -<h2>1.0 The Manifest File</h2> - -<p> -Any file in the repository that follows the syntactic rules +<h2>1.0 The Manifest</h2> + +<p> +Any artifact in the repository that follows the syntactic rules of a manifest is a manifest. Note that a manifest can be both a real manifest and also a content file, though this is rare. </p> <p> A manifest is a line-oriented text file. Newline characters -(ASCII 0x0a) separate lines. Each line begins with a single -character "line type". Zero or more arguments may follow -the line type. All arguments are separated from each other -and from the line-type character by a single space +(ASCII 0x0a) separate lines. Each line is called a "card". +Each card begins with a single +character "card type". Zero or more arguments may follow +the card type. All arguments are separated from each other +and from the card-type character by a single space character. There is no surplus white space between arguments and no leading or trailing whitespace except for the newline -character that acts as the line separator. -</p> - -<p> -All lines of the manifest occur in strict sorted lexicographical order. -No line may be duplicated. -The entire manifest file may be PGP clear-signed, but otherwise it +character that acts as the card separator. +</p> + +<p> +All cards of the manifest occur in strict sorted lexicographical order. +No card may be duplicated. +The entire manifest may be PGP clear-signed, but otherwise it may contain no additional text or data beyond what is described here. </p> <p> -Allowed lines in the manifest are as follows: +Allowed cards in the manifest are as follows: </p> <blockquote> <b>C</b> <i>checkin-comment</i><br> <b>D</b> <i>time-and-date-stamp</i><br> @@ -72,12 +75,12 @@ <b>U</b> <i>user-login</i><br> <b>Z</b> <i>manifest-checksum</i> </blockquote> <p> -A manifest must have exactly one C-line. The sole argument to -the C-line is a check-in comment that describes the baseline that +A manifest must have exactly one C-card. The sole argument to +the C-card is a check-in comment that describes the check-in that the manifest defines. The check-in comment is text. The following escape sequences are applied to the text: A space (ASCII 0x20) is represented as "\s" (ASCII 0x5C, 0x73). A newline (ASCII 0x0a) is "\n" (ASCII 0x6C, x6E). A backslash (ASCII 0x5C) is represented as two backslashes "\\". Apart from @@ -85,51 +88,50 @@ the check-in comment. Nor are any unprintable characters allowed in the comment. </p> <p> -A manifest must have exactly one D-line. The sole argument to -the D-line is a date-time stamp in the ISO8601 format. The +A manifest must have exactly one D-card. The sole argument to +the D-card is a date-time stamp in the ISO8601 format. The date and time should be in coordinated universal time (UTC). The format is: </p> <blockquote> <i>YYYY</i><b>-</b><i>MM</i><b>-</b><i>DD</i><b>T</b><i>HH</i><b>:</b><i>MM</i><b>:</b><i>SS</i> </blockquote> <p> -A manifest has zero or more F-lines. Each F-line defines a file +A manifest has zero or more F-cards. Each F-card defines a file (other than the manifest itself) which is part of the baseline that the manifest defines. There are two arguments. The first argment is the pathname of the file in the baseline relative to the root of the project file hierarchy. No ".." or "." directories are allowed -within the filename. Space characters are escaped as in C-line +within the filename. Space characters are escaped as in C-card comment text. Backslash characters and newlines are not allowed within filenames. The directory separator character is a forward -slash (ASCII 0x2F). The second argument to the F-line is the -full 40-character hexadecimal SHA1 hash of the file content. -Upper-case letters ABCDEF are used for the higher digits of the -hexadecimal. +slash (ASCII 0x2F). The second argument to the F-card is the +full 40-character lower-case hexadecimal SHA1 hash of the content +artifact. </p> <p> -A manifest has zero or one P-lines. Most manifests have one P-line. -The P-line has a varying number of arguments that +A manifest has zero or one P-cards. Most manifests have one P-card. +The P-card has a varying number of arguments that defines other manifests from which the current manifest is derived. Each argument is an 40-character lowercase hexadecimal SHA1 of the predecessor manifest. All arguments -to the P-line must be unique to that line. -The first predecessor is the manifests direct ancestor. +to the P-card must be unique to that line. +The first predecessor is the direct ancestor of the manifest. Other arguments define manifests with which the first was merged to yield the current manifest. Most manifests have -a P-line with a single argument. The first manifest in the -project has no ancestors and thus has no P-line. +a P-card with a single argument. The first manifest in the +project has no ancestors and thus has no P-card. </p> <p> -A manifest may optionally have a single R-line. The R-line has +A manifest may optionally have a single R-card. The R-card has a single argument which is the MD5 checksum of all files in the baseline except the manifest itself. The checksum is expressed as 32-characters of lowercase hexadecimal. The checksum is computed as follows: For each file in the baseline (except for the manifest itself) in strict sorted lexicographical order, @@ -139,91 +141,143 @@ character (ASCII 0x0A), and the complete text of the file. Compute the MD5 checksum of the the result. </p> <p> -Each manifest has a single U-line. The argument to the U-line is +Each manifest has a single U-card. The argument to the U-card is the login of the user who created the manifest. The login name is encoded using the same character escapes as is used for the -check-in comment argument to the C-line. +check-in comment argument to the C-card. </p> <p> -A manifest has an option Z-line as its last line. The argument -to the Z-line is a 32-character lowercase hexadecimal MD5 hash +A manifest has an option Z-card as its last line. The argument +to the Z-card is a 32-character lowercase hexadecimal MD5 hash of all prior lines of the manifest up to and including the newline -character that immediately preceeds the "Z". The Z-line is just +character that immediately preceeds the "Z". The Z-card is just a sanity check to prove that the manifest is well-formed and consistent. </p> <h2>2.0 Clusters</h2> <p> -A cluster is a file that states the existance of other files. +A cluster is a artifact that declares the existance of other artifacts. Clusters are used during repository synchronization to help reduce network traffic. </p> <p> Clusters follow a syntax that is very similar to manifests. A Cluster is a line-oriented text file. Newline characters -(ASCII 0x0a) separate lines. Each line begins with a single -character "line type". Zero or more arguments may follow -the line type. All arguments are separated from each other -and from the line-type character by a single space +(ASCII 0x0a) separate the artifact into cards. Each card begins with a single +character "card type". Zero or more arguments may follow +the card type. All arguments are separated from each other +and from the card-type character by a single space character. There is no surplus white space between arguments and no leading or trailing whitespace except for the newline -character that acts as the line separator. -All lines of a cluter occur in strict sorted lexicographical order. -No line may be duplicated. +character that acts as the card separator. +All cards of a cluter occur in strict sorted lexicographical order. +No card may be duplicated. The cluster may not contain additional text or data beyond what is described here. +Unlike manifests, clusters are never PGP signed. </p> <p> -Allowed lines in the cluster are as follows: +Allowed cards in the cluster are as follows: </p> <blockquote> <b>M</b> <i>uuid</i> -<b>Z</b> <i>manifest-checksum</i> +<b>Z</b> <i>checksum</i> </blockquote> <p> -A cluster contains one or more "M" lines followed by a single "Z" -line. Each M line has a single argument which is the UUID of -another record in the repository. The Z line work exactly like -the Z line of a manifest. The argument to the Z line is the +A cluster contains one or more "M" cards followed by a single "Z" +line. Each M card has a single argument which is the UUID of +another artifact in the repository. The Z card work exactly like +the Z card of a manifest. The argument to the Z card is the lower-case hexadecimal representation of the MD5 checksum of all -prior lines in the cluster. +prior cards in the cluster. Note that the Z card is required +on a cluster. </p> -<h2>3.0 Trouble Tickets</h2> +<h2>3.0 Control Artifacts</h2> + +<p> +Control artifacts are used to assign properties to other artifacts +within the repository. The basic format of a control artifact is +the same as a manifest or cluster. A control artifact is a text +files divided into cards by newline characters. Each card has a +single-character card type followed by arguments. Spaces separate +the card type and the arguments. No surplus whitespace is allowed. +All cards must occur in strict lexigraphical order. +</p> <p> -Each trouble ticket is a file in the repository and appears in -a manifest for every baseline in which the ticket exists. -Trouble tickets occur in a specific subdirectory of the file -heirarchy. The name of the subdirectory that contains tickets -is part of the local state of each repository. The filename -of each trouble ticket has a ".tkt" suffix. The trouble ticket -has a particular file format defined below. +Allowed cards in a control artifact are as follows: </p> -<i>To be continued...</i> - -<h2>4.0 Wiki Pages</h2> +<blockquote> +<b>D</b> <i>time-and-date-stamp</i><br /> +<b>T</b> <i>tag-name uuid ?value?</i><br /> +<b>Z</b> <i>checksum</i><br /> +</blockquote> <p> -Each wiki is a file in the repository and appears in -a manifest for every baseline in which that wiki page exists. -Wiki pages occur in a specific subdirectory of the file -heirarchy. The name of the subdirectory that contains wiki pages -is part of the local state of each repository. The filename -of each wiki page has a ".wiki" suffix. The base name of -the file is the name of the wiki page. The wiki pages -have a particular file format defined below. -</p> +A control artifact must have one D card and one Z card and +one or more or more T cards. No other cards or other text is +allowed in a control artifact. Control artifacts might be PGP +clearsigned.</p> + +<p>The D card and the Z card of a control artifact are the same +as in a manifest.</p> + +<p>The T card represents a "tag" or property that is applied to +some other artifact. The T card has two or three values. The +second argument is the 40 character lowercase UUID of the artifact +to which the tag is to be applied. The +first value is the tag name. The first character of the tag +is either "+", "-", or "*". A "+" means the tag should be added +to the artifact. The "-" means the tag should be removed. +The "*" character means the tag should be added to the artifact +and all direct decendents (but not branches) of the artifact. +The optional third argument is the value of the tag. A tag +without a value is considered to be a boolean.</p> + +<p>When two or more tags with the same name are applied to the +same artifact, the tag with the latest (most recent) date is +used.</p> + +<p>Some tags have special meaning. The "comment" tag when applied +to a baseline will override the check-in comment of that baseline +for display purposes.</p> + +<h2>4.0 Wiki Pages</h2> + +<p>A wiki page is an artifact in a format similar to manifests, +clusters, and control artifacts. The artifact is divided into +cards by newline characters. The format of each card is as in +manifests, clusters, and control artifacts. Wiki artifacts accept +the following card types:</p> + +<blockquote> +<b>D</b> <i>time-and-date-stamp</i><br /> +<b>L</b> <i>wiki-title</i><br /> +<b>U</b> <i>user-name</i><br /> +<b>W</b> <i>size</i> \n <i>text</i> \n<br /> +<b>Z</b> <i>checksum</i> +</blockquote> + + +<h2>5.0 Ticket Changes</h2> -<i>To be continued...</i> +<blockquote> +<b>D</b> <i>time-and-date-stamp</i><br /> +<b>J</b> ?<b>+</b>?<i>name value</i><br /> +<b>K</b> <i>ticket-uuid</i><br /> +<b>U</b> <i>user-name</i><br /> +<b>Z</b> <i>checksum</i> +</blockquote> +