Fossil SCM

Merged the latest changes from trunk.

zakero 2015-03-13 20:18 skin-xekri merge
Commit bcf2bd23a8f10cc268326724d4b563048d79905f
+1 -1
--- VERSION
+++ VERSION
@@ -1,1 +1,1 @@
1
-1.31
1
+1.32
22
--- VERSION
+++ VERSION
@@ -1,1 +1,1 @@
1 1.31
2
--- VERSION
+++ VERSION
@@ -1,1 +1,1 @@
1 1.32
2
+4 -10
--- src/db.c
+++ src/db.c
@@ -1658,27 +1658,22 @@
16581658
**
16591659
** Options:
16601660
** --template FILE copy settings from repository file
16611661
** --admin-user|-A USERNAME select given USERNAME as admin user
16621662
** --date-override DATETIME use DATETIME as time of the initial check-in
1663
-** (default: do not create an initial check-in)
16641663
**
16651664
** See also: clone
16661665
*/
16671666
void create_repository_cmd(void){
16681667
char *zPassword;
16691668
const char *zTemplate; /* Repository from which to copy settings */
16701669
const char *zDate; /* Date of the initial check-in */
16711670
const char *zDefaultUser; /* Optional name of the default user */
1672
- int makeServerCodes;
16731671
16741672
zTemplate = find_option("template",0,1);
16751673
zDate = find_option("date-override",0,1);
16761674
zDefaultUser = find_option("admin-user","A",1);
1677
- makeServerCodes = find_option("docker", 0, 0)==0;
1678
-
1679
- find_option("empty", 0, 0); /* deprecated */
16801675
/* We should be done with options.. */
16811676
verify_all_options();
16821677
16831678
if( g.argc!=3 ){
16841679
usage("REPOSITORY-NAME");
@@ -1691,17 +1686,16 @@
16911686
db_create_repository(g.argv[2]);
16921687
db_open_repository(g.argv[2]);
16931688
db_open_config(0);
16941689
if( zTemplate ) db_attach(zTemplate, "settingSrc");
16951690
db_begin_transaction();
1696
- db_initial_setup(zTemplate, zDate, zDefaultUser, makeServerCodes);
1691
+ if( zDate==0 ) zDate = "now";
1692
+ db_initial_setup(zTemplate, zDate, zDefaultUser, 1);
16971693
db_end_transaction(0);
16981694
if( zTemplate ) db_detach("settingSrc");
1699
- if( makeServerCodes ){
1700
- fossil_print("project-id: %s\n", db_get("project-code", 0));
1701
- fossil_print("server-id: %s\n", db_get("server-code", 0));
1702
- }
1695
+ fossil_print("project-id: %s\n", db_get("project-code", 0));
1696
+ fossil_print("server-id: %s\n", db_get("server-code", 0));
17031697
zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
17041698
fossil_print("admin-user: %s (initial password is \"%s\")\n",
17051699
g.zLogin, zPassword);
17061700
}
17071701
17081702
--- src/db.c
+++ src/db.c
@@ -1658,27 +1658,22 @@
1658 **
1659 ** Options:
1660 ** --template FILE copy settings from repository file
1661 ** --admin-user|-A USERNAME select given USERNAME as admin user
1662 ** --date-override DATETIME use DATETIME as time of the initial check-in
1663 ** (default: do not create an initial check-in)
1664 **
1665 ** See also: clone
1666 */
1667 void create_repository_cmd(void){
1668 char *zPassword;
1669 const char *zTemplate; /* Repository from which to copy settings */
1670 const char *zDate; /* Date of the initial check-in */
1671 const char *zDefaultUser; /* Optional name of the default user */
1672 int makeServerCodes;
1673
1674 zTemplate = find_option("template",0,1);
1675 zDate = find_option("date-override",0,1);
1676 zDefaultUser = find_option("admin-user","A",1);
1677 makeServerCodes = find_option("docker", 0, 0)==0;
1678
1679 find_option("empty", 0, 0); /* deprecated */
1680 /* We should be done with options.. */
1681 verify_all_options();
1682
1683 if( g.argc!=3 ){
1684 usage("REPOSITORY-NAME");
@@ -1691,17 +1686,16 @@
1691 db_create_repository(g.argv[2]);
1692 db_open_repository(g.argv[2]);
1693 db_open_config(0);
1694 if( zTemplate ) db_attach(zTemplate, "settingSrc");
1695 db_begin_transaction();
1696 db_initial_setup(zTemplate, zDate, zDefaultUser, makeServerCodes);
 
1697 db_end_transaction(0);
1698 if( zTemplate ) db_detach("settingSrc");
1699 if( makeServerCodes ){
1700 fossil_print("project-id: %s\n", db_get("project-code", 0));
1701 fossil_print("server-id: %s\n", db_get("server-code", 0));
1702 }
1703 zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
1704 fossil_print("admin-user: %s (initial password is \"%s\")\n",
1705 g.zLogin, zPassword);
1706 }
1707
1708
--- src/db.c
+++ src/db.c
@@ -1658,27 +1658,22 @@
1658 **
1659 ** Options:
1660 ** --template FILE copy settings from repository file
1661 ** --admin-user|-A USERNAME select given USERNAME as admin user
1662 ** --date-override DATETIME use DATETIME as time of the initial check-in
 
1663 **
1664 ** See also: clone
1665 */
1666 void create_repository_cmd(void){
1667 char *zPassword;
1668 const char *zTemplate; /* Repository from which to copy settings */
1669 const char *zDate; /* Date of the initial check-in */
1670 const char *zDefaultUser; /* Optional name of the default user */
 
1671
1672 zTemplate = find_option("template",0,1);
1673 zDate = find_option("date-override",0,1);
1674 zDefaultUser = find_option("admin-user","A",1);
 
 
 
1675 /* We should be done with options.. */
1676 verify_all_options();
1677
1678 if( g.argc!=3 ){
1679 usage("REPOSITORY-NAME");
@@ -1691,17 +1686,16 @@
1686 db_create_repository(g.argv[2]);
1687 db_open_repository(g.argv[2]);
1688 db_open_config(0);
1689 if( zTemplate ) db_attach(zTemplate, "settingSrc");
1690 db_begin_transaction();
1691 if( zDate==0 ) zDate = "now";
1692 db_initial_setup(zTemplate, zDate, zDefaultUser, 1);
1693 db_end_transaction(0);
1694 if( zTemplate ) db_detach("settingSrc");
1695 fossil_print("project-id: %s\n", db_get("project-code", 0));
1696 fossil_print("server-id: %s\n", db_get("server-code", 0));
 
 
1697 zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
1698 fossil_print("admin-user: %s (initial password is \"%s\")\n",
1699 g.zLogin, zPassword);
1700 }
1701
1702
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,6 +1,22 @@
11
<title>Change Log</title>
2
+
3
+<h2>Changes for Version 1.32 (2015-03-??)</h2>
4
+ * When creating a new repository using [/help?cmd=init|fossil init], ensure
5
+ that the new repository is fully compatible with historical versions of
6
+ Fossil by having a valid manifest as RID 1.
7
+ * Anti-aliased rendering of arrowheads on timeline graphs.
8
+ * Added vi/less-style key bindings to the --tk diff GUI.
9
+ * Documentation updates to fix spellings and changes all "checkins" to
10
+ "check-ins".
11
+ * Add the --repolist option to server commands such as
12
+ [/help?cmd=server|fossil server] or [/help?cmd=http|fossil http].
13
+ * Added the "Xekri" skin.
14
+ * Enhance the "ln=" query parameter on artifact displays to accept multiple
15
+ ranges, separate by spaces (or "+" when URL-encoded).
16
+ * Added [/help?cmd=forget|fossil forget] as an alias for
17
+ [/help?cmd=rm|fossil rm].
218
319
<h2>Changes For Version 1.31 (2015-02-23)</h2>
420
* Change the auxiliary schema by adding columns MLINK.ISAUX and MLINK.PMID
521
columns to the schema, to support better drawing of file change graphs.
622
A [/help?cmd=rebuild|fossil rebuild] is recommended but is not required.
723
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,6 +1,22 @@
1 <title>Change Log</title>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
3 <h2>Changes For Version 1.31 (2015-02-23)</h2>
4 * Change the auxiliary schema by adding columns MLINK.ISAUX and MLINK.PMID
5 columns to the schema, to support better drawing of file change graphs.
6 A [/help?cmd=rebuild|fossil rebuild] is recommended but is not required.
7
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,6 +1,22 @@
1 <title>Change Log</title>
2
3 <h2>Changes for Version 1.32 (2015-03-??)</h2>
4 * When creating a new repository using [/help?cmd=init|fossil init], ensure
5 that the new repository is fully compatible with historical versions of
6 Fossil by having a valid manifest as RID 1.
7 * Anti-aliased rendering of arrowheads on timeline graphs.
8 * Added vi/less-style key bindings to the --tk diff GUI.
9 * Documentation updates to fix spellings and changes all "checkins" to
10 "check-ins".
11 * Add the --repolist option to server commands such as
12 [/help?cmd=server|fossil server] or [/help?cmd=http|fossil http].
13 * Added the "Xekri" skin.
14 * Enhance the "ln=" query parameter on artifact displays to accept multiple
15 ranges, separate by spaces (or "+" when URL-encoded).
16 * Added [/help?cmd=forget|fossil forget] as an alias for
17 [/help?cmd=rm|fossil rm].
18
19 <h2>Changes For Version 1.31 (2015-02-23)</h2>
20 * Change the auxiliary schema by adding columns MLINK.ISAUX and MLINK.PMID
21 columns to the schema, to support better drawing of file change graphs.
22 A [/help?cmd=rebuild|fossil rebuild] is recommended but is not required.
23
+1 -3
--- www/index.wiki
+++ www/index.wiki
@@ -77,13 +77,11 @@
7777
7. <b>Robust &amp; Reliable</b> -
7878
Fossil stores content using an [./fileformat.wiki | enduring file format]
7979
in an SQLite database so that transactions are
8080
atomic even if interrupted by a power loss or system crash.
8181
Automatic [./selfcheck.wiki | self-checks] verify that all aspects of
82
- the repository are consistent prior to each commit. In over seven years
83
- of operation, no work has ever been lost after having been committed to
84
- a Fossil repository.
82
+ the repository are consistent prior to each commit.
8583
8684
8. <b>Free and Open-Source</b> - Uses the [../COPYRIGHT-BSD2.txt|2-clause BSD license].
8785
8886
<hr>
8987
<h3>Links For Fossil Users:</h3>
9088
--- www/index.wiki
+++ www/index.wiki
@@ -77,13 +77,11 @@
77 7. <b>Robust &amp; Reliable</b> -
78 Fossil stores content using an [./fileformat.wiki | enduring file format]
79 in an SQLite database so that transactions are
80 atomic even if interrupted by a power loss or system crash.
81 Automatic [./selfcheck.wiki | self-checks] verify that all aspects of
82 the repository are consistent prior to each commit. In over seven years
83 of operation, no work has ever been lost after having been committed to
84 a Fossil repository.
85
86 8. <b>Free and Open-Source</b> - Uses the [../COPYRIGHT-BSD2.txt|2-clause BSD license].
87
88 <hr>
89 <h3>Links For Fossil Users:</h3>
90
--- www/index.wiki
+++ www/index.wiki
@@ -77,13 +77,11 @@
77 7. <b>Robust &amp; Reliable</b> -
78 Fossil stores content using an [./fileformat.wiki | enduring file format]
79 in an SQLite database so that transactions are
80 atomic even if interrupted by a power loss or system crash.
81 Automatic [./selfcheck.wiki | self-checks] verify that all aspects of
82 the repository are consistent prior to each commit.
 
 
83
84 8. <b>Free and Open-Source</b> - Uses the [../COPYRIGHT-BSD2.txt|2-clause BSD license].
85
86 <hr>
87 <h3>Links For Fossil Users:</h3>
88

Keyboard Shortcuts

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