Fossil SCM

Fix comment, some formatting.

jan.nijtmans 2014-06-02 09:39 trunk
Commit 74640de96ed8cd55731aadace428c765d3b1c3ca
2 files changed +2 -2 +3 -7
+2 -2
--- src/db.c
+++ src/db.c
@@ -1441,12 +1441,12 @@
14411441
**
14421442
** Options:
14431443
** --template FILE copy settings from repository file
14441444
** --admin-user|-A USERNAME select given USERNAME as admin user
14451445
** --date-override DATETIME use DATETIME as time of the initial checkin
1446
-** (default: don't create initial checkin)
14471446
** --empty Do not create an initial empty checkin.
1447
+** (overrides --admin-user and --date-override)
14481448
**
14491449
** See also: clone
14501450
*/
14511451
void create_repository_cmd(void){
14521452
char *zPassword;
@@ -1457,11 +1457,11 @@
14571457
14581458
zTemplate = find_option("template",0,1);
14591459
zDate = find_option("date-override",0,1);
14601460
zDefaultUser = find_option("admin-user","A",1);
14611461
zCreateEmpty = find_option("empty", 0, 0);
1462
- if(!zDate && !zCreateEmpty){
1462
+ if( !zDate && !zCreateEmpty ){
14631463
zDate = "now";
14641464
}
14651465
if( g.argc!=3 ){
14661466
usage("REPOSITORY-NAME");
14671467
}
14681468
--- src/db.c
+++ src/db.c
@@ -1441,12 +1441,12 @@
1441 **
1442 ** Options:
1443 ** --template FILE copy settings from repository file
1444 ** --admin-user|-A USERNAME select given USERNAME as admin user
1445 ** --date-override DATETIME use DATETIME as time of the initial checkin
1446 ** (default: don't create initial checkin)
1447 ** --empty Do not create an initial empty checkin.
 
1448 **
1449 ** See also: clone
1450 */
1451 void create_repository_cmd(void){
1452 char *zPassword;
@@ -1457,11 +1457,11 @@
1457
1458 zTemplate = find_option("template",0,1);
1459 zDate = find_option("date-override",0,1);
1460 zDefaultUser = find_option("admin-user","A",1);
1461 zCreateEmpty = find_option("empty", 0, 0);
1462 if(!zDate && !zCreateEmpty){
1463 zDate = "now";
1464 }
1465 if( g.argc!=3 ){
1466 usage("REPOSITORY-NAME");
1467 }
1468
--- src/db.c
+++ src/db.c
@@ -1441,12 +1441,12 @@
1441 **
1442 ** Options:
1443 ** --template FILE copy settings from repository file
1444 ** --admin-user|-A USERNAME select given USERNAME as admin user
1445 ** --date-override DATETIME use DATETIME as time of the initial checkin
 
1446 ** --empty Do not create an initial empty checkin.
1447 ** (overrides --admin-user and --date-override)
1448 **
1449 ** See also: clone
1450 */
1451 void create_repository_cmd(void){
1452 char *zPassword;
@@ -1457,11 +1457,11 @@
1457
1458 zTemplate = find_option("template",0,1);
1459 zDate = find_option("date-override",0,1);
1460 zDefaultUser = find_option("admin-user","A",1);
1461 zCreateEmpty = find_option("empty", 0, 0);
1462 if( !zDate && !zCreateEmpty ){
1463 zDate = "now";
1464 }
1465 if( g.argc!=3 ){
1466 usage("REPOSITORY-NAME");
1467 }
1468
--- www/changes.wiki
+++ www/changes.wiki
@@ -32,17 +32,17 @@
3232
* Add support for HTTP Basic Authentication on [/help?cmd=clone|clone] and
3333
[/help?cmd=sync|sync].
3434
* Fix the [/help?cmd=stash|stash] so that it remembers added files and re-adds
3535
them when the stash is applied.
3636
* Fix the server so that it avoids writing to the database (and thus avoids
37
- database locking issues) on a
37
+ database locking issues) on a
3838
[/help?cmd=pull|pull] or [/help?cmd=clone|clone].
3939
* Add support for [./server.wiki#loadmgmt|server load management] using both
4040
a cache of expensive pages (the [/help?cmd=cache|fossil cache] command)
4141
and by rejecting expensive page requests when the server load average is too
4242
high.
43
- * Add the [/help?cmd=praise|fossil praise] command as an alias for
43
+ * Add the [/help?cmd=praise|fossil praise] command as an alias for
4444
[/help?cmd=blame|fossil blame] for subversion compatibility.
4545
* Enhance the [/help?cmd=test-diff|fossil test-diff] command with -y or --tk
4646
options so that it shows both filenames above their respective columns in
4747
the side-by-side diff output.
4848
* Issue a warning if a [/help?cmd=add|fossil add] command tries to add a file
@@ -53,13 +53,12 @@
5353
* Added the <tt>-empty</tt> option to [/help?cmd=new|fossil new], which
5454
causes it to not create an initial empty commit. The first commit after
5555
checking out a repo created this way will become the initial commit.
5656
* Enhance sync operations by committing each round-trip to minimize number
5757
of retransmits when autosync fails. Include option for
58
- [/help?cmd=update| fossil update] and [/help?cmd=merge| fossil merge] to
58
+ [/help?cmd=update| fossil update] and [/help?cmd=merge| fossil merge] to
5959
continue even if missing content.
60
-
6160
6261
<h2>Changes For Version 1.28 (2014-01-27)</h2>
6362
* Enhance [/help?cmd=/reports | /reports] to support event type filtering.
6463
* When cloning a repository, the user name passed via the URL (if any)
6564
is now used as the default local admin user's name.
@@ -179,11 +178,10 @@
179178
* <tt>ssh://</tt> and <tt>file://</tt> protocols now ignore proxy settings.
180179
* Added [/hash-color-test] web page.
181180
* Cherry-pick merges are recorded internally (though no yet displayed on the
182181
timeline graph.)
183182
* Bring in the latest versions of SQLite, zlib, and autosetup from upstream.
184
-
185183
186184
<h2>Changes For Version 1.25 (2013-02-16)</h2>
187185
* Enhancements to ticket processing. There are now two tables: TICKET and
188186
TICKETCHNG. There is one row in TICKETCHNG for each ticket artifact.
189187
Fields from ticket artifacts go into either or both of TICKET and
@@ -462,11 +460,10 @@
462460
* Now works on MSVC with repos >2GB. [6092935ff2]
463461
* A number of code cleanups to resolve warnings from various compilers.
464462
* Update the built-in SQLite to version 3.7.9 beta.
465463
466464
<h2>Changes For Version 1.19 (2011-09-02)</h2>
467
-
468465
* Added a ./configure script based on autosetup.
469466
* Added the "[/help/winsrv | fossil winsrv]" command
470467
for creating a Fossil service on windows systems.
471468
* Added "versionable settings" where settings that affect
472469
the local tree can be stored in versioned files in the
@@ -492,11 +489,10 @@
492489
* Performance improvements on SHA1 checksums
493490
* Update to the latest SQLite version 3.7.8 alpha.
494491
* Fix the tarball generator to work with very log pathnames
495492
496493
<h2>Changes For Version 1.18 (2011-07-14)</h2>
497
-
498494
* Added this Change Log
499495
* Added sequential version numbering
500496
* Added a optional configure script - the Makefile still works for most
501497
systems.
502498
* Improvements to the "annotate" algorithm: only search primary
503499
--- www/changes.wiki
+++ www/changes.wiki
@@ -32,17 +32,17 @@
32 * Add support for HTTP Basic Authentication on [/help?cmd=clone|clone] and
33 [/help?cmd=sync|sync].
34 * Fix the [/help?cmd=stash|stash] so that it remembers added files and re-adds
35 them when the stash is applied.
36 * Fix the server so that it avoids writing to the database (and thus avoids
37 database locking issues) on a
38 [/help?cmd=pull|pull] or [/help?cmd=clone|clone].
39 * Add support for [./server.wiki#loadmgmt|server load management] using both
40 a cache of expensive pages (the [/help?cmd=cache|fossil cache] command)
41 and by rejecting expensive page requests when the server load average is too
42 high.
43 * Add the [/help?cmd=praise|fossil praise] command as an alias for
44 [/help?cmd=blame|fossil blame] for subversion compatibility.
45 * Enhance the [/help?cmd=test-diff|fossil test-diff] command with -y or --tk
46 options so that it shows both filenames above their respective columns in
47 the side-by-side diff output.
48 * Issue a warning if a [/help?cmd=add|fossil add] command tries to add a file
@@ -53,13 +53,12 @@
53 * Added the <tt>-empty</tt> option to [/help?cmd=new|fossil new], which
54 causes it to not create an initial empty commit. The first commit after
55 checking out a repo created this way will become the initial commit.
56 * Enhance sync operations by committing each round-trip to minimize number
57 of retransmits when autosync fails. Include option for
58 [/help?cmd=update| fossil update] and [/help?cmd=merge| fossil merge] to
59 continue even if missing content.
60
61
62 <h2>Changes For Version 1.28 (2014-01-27)</h2>
63 * Enhance [/help?cmd=/reports | /reports] to support event type filtering.
64 * When cloning a repository, the user name passed via the URL (if any)
65 is now used as the default local admin user's name.
@@ -179,11 +178,10 @@
179 * <tt>ssh://</tt> and <tt>file://</tt> protocols now ignore proxy settings.
180 * Added [/hash-color-test] web page.
181 * Cherry-pick merges are recorded internally (though no yet displayed on the
182 timeline graph.)
183 * Bring in the latest versions of SQLite, zlib, and autosetup from upstream.
184
185
186 <h2>Changes For Version 1.25 (2013-02-16)</h2>
187 * Enhancements to ticket processing. There are now two tables: TICKET and
188 TICKETCHNG. There is one row in TICKETCHNG for each ticket artifact.
189 Fields from ticket artifacts go into either or both of TICKET and
@@ -462,11 +460,10 @@
462 * Now works on MSVC with repos >2GB. [6092935ff2]
463 * A number of code cleanups to resolve warnings from various compilers.
464 * Update the built-in SQLite to version 3.7.9 beta.
465
466 <h2>Changes For Version 1.19 (2011-09-02)</h2>
467
468 * Added a ./configure script based on autosetup.
469 * Added the "[/help/winsrv | fossil winsrv]" command
470 for creating a Fossil service on windows systems.
471 * Added "versionable settings" where settings that affect
472 the local tree can be stored in versioned files in the
@@ -492,11 +489,10 @@
492 * Performance improvements on SHA1 checksums
493 * Update to the latest SQLite version 3.7.8 alpha.
494 * Fix the tarball generator to work with very log pathnames
495
496 <h2>Changes For Version 1.18 (2011-07-14)</h2>
497
498 * Added this Change Log
499 * Added sequential version numbering
500 * Added a optional configure script - the Makefile still works for most
501 systems.
502 * Improvements to the "annotate" algorithm: only search primary
503
--- www/changes.wiki
+++ www/changes.wiki
@@ -32,17 +32,17 @@
32 * Add support for HTTP Basic Authentication on [/help?cmd=clone|clone] and
33 [/help?cmd=sync|sync].
34 * Fix the [/help?cmd=stash|stash] so that it remembers added files and re-adds
35 them when the stash is applied.
36 * Fix the server so that it avoids writing to the database (and thus avoids
37 database locking issues) on a
38 [/help?cmd=pull|pull] or [/help?cmd=clone|clone].
39 * Add support for [./server.wiki#loadmgmt|server load management] using both
40 a cache of expensive pages (the [/help?cmd=cache|fossil cache] command)
41 and by rejecting expensive page requests when the server load average is too
42 high.
43 * Add the [/help?cmd=praise|fossil praise] command as an alias for
44 [/help?cmd=blame|fossil blame] for subversion compatibility.
45 * Enhance the [/help?cmd=test-diff|fossil test-diff] command with -y or --tk
46 options so that it shows both filenames above their respective columns in
47 the side-by-side diff output.
48 * Issue a warning if a [/help?cmd=add|fossil add] command tries to add a file
@@ -53,13 +53,12 @@
53 * Added the <tt>-empty</tt> option to [/help?cmd=new|fossil new], which
54 causes it to not create an initial empty commit. The first commit after
55 checking out a repo created this way will become the initial commit.
56 * Enhance sync operations by committing each round-trip to minimize number
57 of retransmits when autosync fails. Include option for
58 [/help?cmd=update| fossil update] and [/help?cmd=merge| fossil merge] to
59 continue even if missing content.
 
60
61 <h2>Changes For Version 1.28 (2014-01-27)</h2>
62 * Enhance [/help?cmd=/reports | /reports] to support event type filtering.
63 * When cloning a repository, the user name passed via the URL (if any)
64 is now used as the default local admin user's name.
@@ -179,11 +178,10 @@
178 * <tt>ssh://</tt> and <tt>file://</tt> protocols now ignore proxy settings.
179 * Added [/hash-color-test] web page.
180 * Cherry-pick merges are recorded internally (though no yet displayed on the
181 timeline graph.)
182 * Bring in the latest versions of SQLite, zlib, and autosetup from upstream.
 
183
184 <h2>Changes For Version 1.25 (2013-02-16)</h2>
185 * Enhancements to ticket processing. There are now two tables: TICKET and
186 TICKETCHNG. There is one row in TICKETCHNG for each ticket artifact.
187 Fields from ticket artifacts go into either or both of TICKET and
@@ -462,11 +460,10 @@
460 * Now works on MSVC with repos >2GB. [6092935ff2]
461 * A number of code cleanups to resolve warnings from various compilers.
462 * Update the built-in SQLite to version 3.7.9 beta.
463
464 <h2>Changes For Version 1.19 (2011-09-02)</h2>
 
465 * Added a ./configure script based on autosetup.
466 * Added the "[/help/winsrv | fossil winsrv]" command
467 for creating a Fossil service on windows systems.
468 * Added "versionable settings" where settings that affect
469 the local tree can be stored in versioned files in the
@@ -492,11 +489,10 @@
489 * Performance improvements on SHA1 checksums
490 * Update to the latest SQLite version 3.7.8 alpha.
491 * Fix the tarball generator to work with very log pathnames
492
493 <h2>Changes For Version 1.18 (2011-07-14)</h2>
 
494 * Added this Change Log
495 * Added sequential version numbering
496 * Added a optional configure script - the Makefile still works for most
497 systems.
498 * Improvements to the "annotate" algorithm: only search primary
499

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button