Fossil SCM

Always store g.urlCanonical as the last-sync-url value. Fix for ticket [045f23be750d93c0bd91f179f39c5c829ed01bc6].

drh 2009-08-01 12:59 trunk
Commit 47d8fc4944c2f2bf535a89f069d6f9ce0df5b257
Parent 3a7e3e427d19e9b…
3 files changed +3 -3 +1 -1 +7 -2
~ src/clone.c ~ src/sync.c ~ src/url.c
M src/clone.c
+3 -3
--- src/clone.c
+++ src/clone.c
@@ -56,12 +56,12 @@
5656
 db_record_repository_filename(g.argv[3]);
5757
 db_multi_exec(
5858
 "REPLACE INTO config(name,value)"
5959
 " VALUES('server-code', lower(hex(randomblob(20))));"
6060
 "REPLACE INTO config(name,value)"
61
- " VALUES('last-sync-url', 'file://%q');",
62
- g.urlName
61
+ " VALUES('last-sync-url', '%q');",
62
+ g.urlCanonical
6363
 );
6464
 g.zLogin = db_text(0, "SELECT login FROM user WHERE cap LIKE '%%s%%'");
6565
 if( g.zLogin==0 ){
6666
 db_create_default_users(1);
6767
 }
@@ -73,11 +73,11 @@
7373
 db_record_repository_filename(g.argv[3]);
7474
 db_initial_setup(0, 0);
7575
 user_select();
7676
 db_set("content-schema", CONTENT_SCHEMA, 0);
7777
 db_set("aux-schema", AUX_SCHEMA, 0);
78
- db_set("last-sync-url", g.argv[2], 0);
78
+ db_set("last-sync-url", g.urlCanonical, 0);
7979
 db_multi_exec(
8080
 "REPLACE INTO config(name,value)"
8181
 " VALUES('server-code', lower(hex(randomblob(20))));"
8282
 );
8383
 url_enable_proxy(0);
8484
--- src/clone.c
+++ src/clone.c
@@ -56,12 +56,12 @@
56 db_record_repository_filename(g.argv[3]);
57 db_multi_exec(
58 "REPLACE INTO config(name,value)"
59 " VALUES('server-code', lower(hex(randomblob(20))));"
60 "REPLACE INTO config(name,value)"
61 " VALUES('last-sync-url', 'file://%q');",
62 g.urlName
63 );
64 g.zLogin = db_text(0, "SELECT login FROM user WHERE cap LIKE '%%s%%'");
65 if( g.zLogin==0 ){
66 db_create_default_users(1);
67 }
@@ -73,11 +73,11 @@
73 db_record_repository_filename(g.argv[3]);
74 db_initial_setup(0, 0);
75 user_select();
76 db_set("content-schema", CONTENT_SCHEMA, 0);
77 db_set("aux-schema", AUX_SCHEMA, 0);
78 db_set("last-sync-url", g.argv[2], 0);
79 db_multi_exec(
80 "REPLACE INTO config(name,value)"
81 " VALUES('server-code', lower(hex(randomblob(20))));"
82 );
83 url_enable_proxy(0);
84
--- src/clone.c
+++ src/clone.c
@@ -56,12 +56,12 @@
56 db_record_repository_filename(g.argv[3]);
57 db_multi_exec(
58 "REPLACE INTO config(name,value)"
59 " VALUES('server-code', lower(hex(randomblob(20))));"
60 "REPLACE INTO config(name,value)"
61 " VALUES('last-sync-url', '%q');",
62 g.urlCanonical
63 );
64 g.zLogin = db_text(0, "SELECT login FROM user WHERE cap LIKE '%%s%%'");
65 if( g.zLogin==0 ){
66 db_create_default_users(1);
67 }
@@ -73,11 +73,11 @@
73 db_record_repository_filename(g.argv[3]);
74 db_initial_setup(0, 0);
75 user_select();
76 db_set("content-schema", CONTENT_SCHEMA, 0);
77 db_set("aux-schema", AUX_SCHEMA, 0);
78 db_set("last-sync-url", g.urlCanonical, 0);
79 db_multi_exec(
80 "REPLACE INTO config(name,value)"
81 " VALUES('server-code', lower(hex(randomblob(20))));"
82 );
83 url_enable_proxy(0);
84
M src/sync.c
+1 -1
--- src/sync.c
+++ src/sync.c
@@ -83,11 +83,11 @@
8383
 if( zUrl==0 ){
8484
 if( urlOptional ) exit(0);
8585
 usage("URL");
8686
 }
8787
 url_parse(zUrl);
88
- db_set("last-sync-url", zUrl, 0);
88
+ db_set("last-sync-url", g.urlIsFile ? g.urlCanonical : zUrl, 0);
8989
 user_select();
9090
 if( g.argc==2 ){
9191
 if( g.urlPort!=g.urlDfltPort ){
9292
 printf("Server: %s://%s:%d%s\n",
9393
 g.urlProtocol, g.urlName, g.urlPort, g.urlPath);
9494
--- src/sync.c
+++ src/sync.c
@@ -83,11 +83,11 @@
83 if( zUrl==0 ){
84 if( urlOptional ) exit(0);
85 usage("URL");
86 }
87 url_parse(zUrl);
88 db_set("last-sync-url", zUrl, 0);
89 user_select();
90 if( g.argc==2 ){
91 if( g.urlPort!=g.urlDfltPort ){
92 printf("Server: %s://%s:%d%s\n",
93 g.urlProtocol, g.urlName, g.urlPort, g.urlPath);
94
--- src/sync.c
+++ src/sync.c
@@ -83,11 +83,11 @@
83 if( zUrl==0 ){
84 if( urlOptional ) exit(0);
85 usage("URL");
86 }
87 url_parse(zUrl);
88 db_set("last-sync-url", g.urlIsFile ? g.urlCanonical : zUrl, 0);
89 user_select();
90 if( g.argc==2 ){
91 if( g.urlPort!=g.urlDfltPort ){
92 printf("Server: %s://%s:%d%s\n",
93 g.urlProtocol, g.urlName, g.urlPort, g.urlPath);
94
M src/url.c
+7 -2
--- src/url.c
+++ src/url.c
@@ -87,12 +87,17 @@
8787
 g.urlHostname = g.urlName;
8888
 }
8989
 g.urlPath = mprintf(&zUrl[i]);
9090
 dehttpize(g.urlName);
9191
 dehttpize(g.urlPath);
92
- g.urlCanonical = mprintf("%s://%T:%d%T",
93
- g.urlProtocol, g.urlName, g.urlPort, g.urlPath);
92
+ if( g.urlDfltPort==g.urlPort ){
93
+ g.urlCanonical = mprintf("%s://%T%T",
94
+ g.urlProtocol, g.urlName, g.urlPath);
95
+ }else{
96
+ g.urlCanonical = mprintf("%s://%T:%d%T",
97
+ g.urlProtocol, g.urlName, g.urlPort, g.urlPath);
98
+ }
9499
 }else if( strncmp(zUrl, "file:", 5)==0 ){
95100
 g.urlIsFile = 1;
96101
 if( zUrl[5]=='/' && zUrl[6]=='/' ){
97102
 i = 7;
98103
 }else{
99104
--- src/url.c
+++ src/url.c
@@ -87,12 +87,17 @@
87 g.urlHostname = g.urlName;
88 }
89 g.urlPath = mprintf(&zUrl[i]);
90 dehttpize(g.urlName);
91 dehttpize(g.urlPath);
92 g.urlCanonical = mprintf("%s://%T:%d%T",
93 g.urlProtocol, g.urlName, g.urlPort, g.urlPath);
 
 
 
 
 
94 }else if( strncmp(zUrl, "file:", 5)==0 ){
95 g.urlIsFile = 1;
96 if( zUrl[5]=='/' && zUrl[6]=='/' ){
97 i = 7;
98 }else{
99
--- src/url.c
+++ src/url.c
@@ -87,12 +87,17 @@
87 g.urlHostname = g.urlName;
88 }
89 g.urlPath = mprintf(&zUrl[i]);
90 dehttpize(g.urlName);
91 dehttpize(g.urlPath);
92 if( g.urlDfltPort==g.urlPort ){
93 g.urlCanonical = mprintf("%s://%T%T",
94 g.urlProtocol, g.urlName, g.urlPath);
95 }else{
96 g.urlCanonical = mprintf("%s://%T:%d%T",
97 g.urlProtocol, g.urlName, g.urlPort, g.urlPath);
98 }
99 }else if( strncmp(zUrl, "file:", 5)==0 ){
100 g.urlIsFile = 1;
101 if( zUrl[5]=='/' && zUrl[6]=='/' ){
102 i = 7;
103 }else{
104

Keyboard Shortcuts

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