Fossil SCM

Pull in all clear-title changes from trunk.

drh 2010-03-05 23:14 clear-title merge
Commit dfb5fd64cdcdc474b6347aab98995320adf8a866
Parent b9d3b4288fe7de5…
8 files changed +1 -1 +37 -37 +5 -2 +1 -1 +5 -1 +1 +5 -2 +5 -4
~ src/rss.c ~ src/skins.c ~ src/sqlite3.c ~ src/sqlite3.h ~ src/sync.c ~ src/timeline.c ~ src/update.c ~ src/xfer.c
M src/rss.c
+1 -1
--- src/rss.c
+++ src/rss.c
@@ -131,11 +131,11 @@
131131
 }else if( nChild>1 ){
132132
 zPrefix = "*FORK* ";
133133
 }
134134
135135
 @ <item>
136
- @ <title>%h(zPrefix)%s(zCom)</title>
136
+ @ <title>%s(zPrefix)%h(zCom)</title>
137137
 @ <link>%s(g.zBaseURL)/ci/%s(zId)</link>
138138
 @ <description>%s(zPrefix)%h(zCom)</description>
139139
 @ <pubDate>%s(zDate)</pubDate>
140140
 @ <author>%h(zAuthor)</author>
141141
 @ <guid>%s(g.zBaseURL)/ci/%s(zId)</guid>
142142
--- src/rss.c
+++ src/rss.c
@@ -131,11 +131,11 @@
131 }else if( nChild>1 ){
132 zPrefix = "*FORK* ";
133 }
134
135 @ <item>
136 @ <title>%h(zPrefix)%s(zCom)</title>
137 @ <link>%s(g.zBaseURL)/ci/%s(zId)</link>
138 @ <description>%s(zPrefix)%h(zCom)</description>
139 @ <pubDate>%s(zDate)</pubDate>
140 @ <author>%h(zAuthor)</author>
141 @ <guid>%s(g.zBaseURL)/ci/%s(zId)</guid>
142
--- src/rss.c
+++ src/rss.c
@@ -131,11 +131,11 @@
131 }else if( nChild>1 ){
132 zPrefix = "*FORK* ";
133 }
134
135 @ <item>
136 @ <title>%s(zPrefix)%h(zCom)</title>
137 @ <link>%s(g.zBaseURL)/ci/%s(zId)</link>
138 @ <description>%s(zPrefix)%h(zCom)</description>
139 @ <pubDate>%s(zDate)</pubDate>
140 @ <author>%h(zAuthor)</author>
141 @ <guid>%s(g.zBaseURL)/ci/%s(zId)</guid>
142
M src/skins.c
+37 -37
--- src/skins.c
+++ src/skins.c
@@ -182,37 +182,37 @@
182182
 @ puts "Not logged in"
183183
 @ }
184184
 @ </th1></nobr></div>
185185
 @ </div>
186186
 @ <div class="mainmenu"><th1>
187
-@ html "<a href=''$baseurl$index_page''>Home</a> "
187
+@ html "<a href="$baseurl$index_page">Home</a> "
188188
 @ if {[anycap jor]} {
189
-@ html "<a href=''$baseurl/timeline''>Timeline</a> "
189
+@ html "<a href="$baseurl/timeline">Timeline</a> "
190190
 @ }
191191
 @ if {[hascap oh]} {
192
-@ html "<a href=''$baseurl/dir''>Files</a> "
192
+@ html "<a href="$baseurl/dir">Files</a> "
193193
 @ }
194194
 @ if {[hascap o]} {
195
-@ html "<a href=''$baseurl/leaves''>Leaves</a> "
196
-@ html "<a href=''$baseurl/brlist''>Branches</a> "
197
-@ html "<a href=''$baseurl/taglist''>Tags</a> "
195
+@ html "<a href="$baseurl/leaves">Leaves</a> "
196
+@ html "<a href="$baseurl/brlist">Branches</a> "
197
+@ html "<a href="$baseurl/taglist">Tags</a> "
198198
 @ }
199199
 @ if {[hascap r]} {
200
-@ html "<a href=''$baseurl/reportlist''>Tickets</a> "
200
+@ html "<a href="$baseurl/reportlist">Tickets</a> "
201201
 @ }
202202
 @ if {[hascap j]} {
203
-@ html "<a href=''$baseurl/wiki''>Wiki</a> "
203
+@ html "<a href="$baseurl/wiki">Wiki</a> "
204204
 @ }
205205
 @ if {[hascap s]} {
206
-@ html "<a href=''$baseurl/setup''>Admin</a> "
206
+@ html "<a href="$baseurl/setup">Admin</a> "
207207
 @ } elseif {[hascap a]} {
208
-@ html "<a href=''$baseurl/setup_ulist''>Users</a> "
208
+@ html "<a href="$baseurl/setup_ulist">Users</a> "
209209
 @ }
210210
 @ if {[info exists login]} {
211
-@ html "<a href=''$baseurl/login''>Logout</a> "
211
+@ html "<a href="$baseurl/login">Logout</a> "
212212
 @ } else {
213
-@ html "<a href=''$baseurl/login''>Login</a> "
213
+@ html "<a href="$baseurl/login">Login</a> "
214214
 @ }
215215
 @ </th1></div>
216216
 @ ');
217217
 @ REPLACE INTO config VALUES('footer','<div class="footer">
218218
 @ Fossil version $manifest_version $manifest_date
@@ -384,37 +384,37 @@
384384
 @ puts "Not logged in"
385385
 @ }
386386
 @ </th1></nobr></div>
387387
 @ </div>
388388
 @ <div class="mainmenu"><th1>
389
-@ html "<a href=''$baseurl$index_page''>Home</a> "
389
+@ html "<a href="$baseurl$index_page">Home</a> "
390390
 @ if {[anycap jor]} {
391
-@ html "<a href=''$baseurl/timeline''>Timeline</a> "
391
+@ html "<a href="$baseurl/timeline">Timeline</a> "
392392
 @ }
393393
 @ if {[hascap oh]} {
394
-@ html "<a href=''$baseurl/dir''>Files</a> "
394
+@ html "<a href="$baseurl/dir">Files</a> "
395395
 @ }
396396
 @ if {[hascap o]} {
397
-@ html "<a href=''$baseurl/leaves''>Leaves</a> "
398
-@ html "<a href=''$baseurl/brlist''>Branches</a> "
399
-@ html "<a href=''$baseurl/taglist''>Tags</a> "
397
+@ html "<a href="$baseurl/leaves">Leaves</a> "
398
+@ html "<a href="$baseurl/brlist">Branches</a> "
399
+@ html "<a href="$baseurl/taglist">Tags</a> "
400400
 @ }
401401
 @ if {[hascap r]} {
402
-@ html "<a href=''$baseurl/reportlist''>Tickets</a> "
402
+@ html "<a href="$baseurl/reportlist">Tickets</a> "
403403
 @ }
404404
 @ if {[hascap j]} {
405
-@ html "<a href=''$baseurl/wiki''>Wiki</a> "
405
+@ html "<a href="$baseurl/wiki">Wiki</a> "
406406
 @ }
407407
 @ if {[hascap s]} {
408
-@ html "<a href=''$baseurl/setup''>Admin</a> "
408
+@ html "<a href="$baseurl/setup">Admin</a> "
409409
 @ } elseif {[hascap a]} {
410
-@ html "<a href=''$baseurl/setup_ulist''>Users</a> "
410
+@ html "<a href="$baseurl/setup_ulist">Users</a> "
411411
 @ }
412412
 @ if {[info exists login]} {
413
-@ html "<a href=''$baseurl/login''>Logout</a> "
413
+@ html "<a href="$baseurl/login">Logout</a> "
414414
 @ } else {
415
-@ html "<a href=''$baseurl/login''>Login</a> "
415
+@ html "<a href="$baseurl/login">Login</a> "
416416
 @ }
417417
 @ </th1></div>
418418
 @ ');
419419
 @ REPLACE INTO config VALUES('footer','<div class="footer">
420420
 @ Fossil version $manifest_version $manifest_date
@@ -514,11 +514,11 @@
514514
 @ div.mainmenu a:hover {
515515
 @ color: #eee;
516516
 @ background-color: #333;
517517
 @ }
518518
 @
519
-@ /* Container for the sub-menu and content so they don''t spread
519
+@ /* Container for the sub-menu and content so they don"t spread
520520
 @ ** out underneath the main menu */
521521
 @ #container {
522522
 @ padding-left: 9em;
523523
 @ }
524524
 @
@@ -619,37 +619,37 @@
619619
 @ puts "Not logged in"
620620
 @ }
621621
 @ </th1></nobr></div>
622622
 @ </div>
623623
 @ <div class="mainmenu"><ul><th1>
624
-@ html "<li><a href=''$baseurl$index_page''>Home</a></li>"
624
+@ html "<li><a href="$baseurl$index_page">Home</a></li>"
625625
 @ if {[anycap jor]} {
626
-@ html "<li><a href=''$baseurl/timeline''>Timeline</a></li>"
626
+@ html "<li><a href="$baseurl/timeline">Timeline</a></li>"
627627
 @ }
628628
 @ if {[hascap oh]} {
629
-@ html "<li><a href=''$baseurl/dir''>Files</a></li>"
629
+@ html "<li><a href="$baseurl/dir">Files</a></li>"
630630
 @ }
631631
 @ if {[hascap o]} {
632
-@ html "<li><a href=''$baseurl/leaves''>Leaves</a></li>"
633
-@ html "<li><a href=''$baseurl/brlist''>Branches</a></li>"
634
-@ html "<li><a href=''$baseurl/taglist''>Tags</a></li>"
632
+@ html "<li><a href="$baseurl/leaves">Leaves</a></li>"
633
+@ html "<li><a href="$baseurl/brlist">Branches</a></li>"
634
+@ html "<li><a href="$baseurl/taglist">Tags</a></li>"
635635
 @ }
636636
 @ if {[hascap r]} {
637
-@ html "<li><a href=''$baseurl/reportlist''>Tickets</a></li>"
637
+@ html "<li><a href="$baseurl/reportlist">Tickets</a></li>"
638638
 @ }
639639
 @ if {[hascap j]} {
640
-@ html "<li><a href=''$baseurl/wiki''>Wiki</a></li>"
640
+@ html "<li><a href="$baseurl/wiki">Wiki</a></li>"
641641
 @ }
642642
 @ if {[hascap s]} {
643
-@ html "<li><a href=''$baseurl/setup''>Admin</a></li>"
643
+@ html "<li><a href="$baseurl/setup">Admin</a></li>"
644644
 @ } elseif {[hascap a]} {
645
-@ html "<li><a href=''$baseurl/setup_ulist''>Users</a></li>"
645
+@ html "<li><a href="$baseurl/setup_ulist">Users</a></li>"
646646
 @ }
647647
 @ if {[info exists login]} {
648
-@ html "<li><a href=''$baseurl/login''>Logout</a></li>"
648
+@ html "<li><a href="$baseurl/login">Logout</a></li>"
649649
 @ } else {
650
-@ html "<li><a href=''$baseurl/login''>Login</a></li>"
650
+@ html "<li><a href="$baseurl/login">Login</a></li>"
651651
 @ }
652652
 @ </th1></ul></div>
653653
 @ <div id="container">
654654
 @ ');
655655
 @ REPLACE INTO config VALUES('footer','</div>
656656
--- src/skins.c
+++ src/skins.c
@@ -182,37 +182,37 @@
182 @ puts "Not logged in"
183 @ }
184 @ </th1></nobr></div>
185 @ </div>
186 @ <div class="mainmenu"><th1>
187 @ html "<a href=''$baseurl$index_page''>Home</a> "
188 @ if {[anycap jor]} {
189 @ html "<a href=''$baseurl/timeline''>Timeline</a> "
190 @ }
191 @ if {[hascap oh]} {
192 @ html "<a href=''$baseurl/dir''>Files</a> "
193 @ }
194 @ if {[hascap o]} {
195 @ html "<a href=''$baseurl/leaves''>Leaves</a> "
196 @ html "<a href=''$baseurl/brlist''>Branches</a> "
197 @ html "<a href=''$baseurl/taglist''>Tags</a> "
198 @ }
199 @ if {[hascap r]} {
200 @ html "<a href=''$baseurl/reportlist''>Tickets</a> "
201 @ }
202 @ if {[hascap j]} {
203 @ html "<a href=''$baseurl/wiki''>Wiki</a> "
204 @ }
205 @ if {[hascap s]} {
206 @ html "<a href=''$baseurl/setup''>Admin</a> "
207 @ } elseif {[hascap a]} {
208 @ html "<a href=''$baseurl/setup_ulist''>Users</a> "
209 @ }
210 @ if {[info exists login]} {
211 @ html "<a href=''$baseurl/login''>Logout</a> "
212 @ } else {
213 @ html "<a href=''$baseurl/login''>Login</a> "
214 @ }
215 @ </th1></div>
216 @ ');
217 @ REPLACE INTO config VALUES('footer','<div class="footer">
218 @ Fossil version $manifest_version $manifest_date
@@ -384,37 +384,37 @@
384 @ puts "Not logged in"
385 @ }
386 @ </th1></nobr></div>
387 @ </div>
388 @ <div class="mainmenu"><th1>
389 @ html "<a href=''$baseurl$index_page''>Home</a> "
390 @ if {[anycap jor]} {
391 @ html "<a href=''$baseurl/timeline''>Timeline</a> "
392 @ }
393 @ if {[hascap oh]} {
394 @ html "<a href=''$baseurl/dir''>Files</a> "
395 @ }
396 @ if {[hascap o]} {
397 @ html "<a href=''$baseurl/leaves''>Leaves</a> "
398 @ html "<a href=''$baseurl/brlist''>Branches</a> "
399 @ html "<a href=''$baseurl/taglist''>Tags</a> "
400 @ }
401 @ if {[hascap r]} {
402 @ html "<a href=''$baseurl/reportlist''>Tickets</a> "
403 @ }
404 @ if {[hascap j]} {
405 @ html "<a href=''$baseurl/wiki''>Wiki</a> "
406 @ }
407 @ if {[hascap s]} {
408 @ html "<a href=''$baseurl/setup''>Admin</a> "
409 @ } elseif {[hascap a]} {
410 @ html "<a href=''$baseurl/setup_ulist''>Users</a> "
411 @ }
412 @ if {[info exists login]} {
413 @ html "<a href=''$baseurl/login''>Logout</a> "
414 @ } else {
415 @ html "<a href=''$baseurl/login''>Login</a> "
416 @ }
417 @ </th1></div>
418 @ ');
419 @ REPLACE INTO config VALUES('footer','<div class="footer">
420 @ Fossil version $manifest_version $manifest_date
@@ -514,11 +514,11 @@
514 @ div.mainmenu a:hover {
515 @ color: #eee;
516 @ background-color: #333;
517 @ }
518 @
519 @ /* Container for the sub-menu and content so they don''t spread
520 @ ** out underneath the main menu */
521 @ #container {
522 @ padding-left: 9em;
523 @ }
524 @
@@ -619,37 +619,37 @@
619 @ puts "Not logged in"
620 @ }
621 @ </th1></nobr></div>
622 @ </div>
623 @ <div class="mainmenu"><ul><th1>
624 @ html "<li><a href=''$baseurl$index_page''>Home</a></li>"
625 @ if {[anycap jor]} {
626 @ html "<li><a href=''$baseurl/timeline''>Timeline</a></li>"
627 @ }
628 @ if {[hascap oh]} {
629 @ html "<li><a href=''$baseurl/dir''>Files</a></li>"
630 @ }
631 @ if {[hascap o]} {
632 @ html "<li><a href=''$baseurl/leaves''>Leaves</a></li>"
633 @ html "<li><a href=''$baseurl/brlist''>Branches</a></li>"
634 @ html "<li><a href=''$baseurl/taglist''>Tags</a></li>"
635 @ }
636 @ if {[hascap r]} {
637 @ html "<li><a href=''$baseurl/reportlist''>Tickets</a></li>"
638 @ }
639 @ if {[hascap j]} {
640 @ html "<li><a href=''$baseurl/wiki''>Wiki</a></li>"
641 @ }
642 @ if {[hascap s]} {
643 @ html "<li><a href=''$baseurl/setup''>Admin</a></li>"
644 @ } elseif {[hascap a]} {
645 @ html "<li><a href=''$baseurl/setup_ulist''>Users</a></li>"
646 @ }
647 @ if {[info exists login]} {
648 @ html "<li><a href=''$baseurl/login''>Logout</a></li>"
649 @ } else {
650 @ html "<li><a href=''$baseurl/login''>Login</a></li>"
651 @ }
652 @ </th1></ul></div>
653 @ <div id="container">
654 @ ');
655 @ REPLACE INTO config VALUES('footer','</div>
656
--- src/skins.c
+++ src/skins.c
@@ -182,37 +182,37 @@
182 @ puts "Not logged in"
183 @ }
184 @ </th1></nobr></div>
185 @ </div>
186 @ <div class="mainmenu"><th1>
187 @ html "<a href="$baseurl$index_page">Home</a> "
188 @ if {[anycap jor]} {
189 @ html "<a href="$baseurl/timeline">Timeline</a> "
190 @ }
191 @ if {[hascap oh]} {
192 @ html "<a href="$baseurl/dir">Files</a> "
193 @ }
194 @ if {[hascap o]} {
195 @ html "<a href="$baseurl/leaves">Leaves</a> "
196 @ html "<a href="$baseurl/brlist">Branches</a> "
197 @ html "<a href="$baseurl/taglist">Tags</a> "
198 @ }
199 @ if {[hascap r]} {
200 @ html "<a href="$baseurl/reportlist">Tickets</a> "
201 @ }
202 @ if {[hascap j]} {
203 @ html "<a href="$baseurl/wiki">Wiki</a> "
204 @ }
205 @ if {[hascap s]} {
206 @ html "<a href="$baseurl/setup">Admin</a> "
207 @ } elseif {[hascap a]} {
208 @ html "<a href="$baseurl/setup_ulist">Users</a> "
209 @ }
210 @ if {[info exists login]} {
211 @ html "<a href="$baseurl/login">Logout</a> "
212 @ } else {
213 @ html "<a href="$baseurl/login">Login</a> "
214 @ }
215 @ </th1></div>
216 @ ');
217 @ REPLACE INTO config VALUES('footer','<div class="footer">
218 @ Fossil version $manifest_version $manifest_date
@@ -384,37 +384,37 @@
384 @ puts "Not logged in"
385 @ }
386 @ </th1></nobr></div>
387 @ </div>
388 @ <div class="mainmenu"><th1>
389 @ html "<a href="$baseurl$index_page">Home</a> "
390 @ if {[anycap jor]} {
391 @ html "<a href="$baseurl/timeline">Timeline</a> "
392 @ }
393 @ if {[hascap oh]} {
394 @ html "<a href="$baseurl/dir">Files</a> "
395 @ }
396 @ if {[hascap o]} {
397 @ html "<a href="$baseurl/leaves">Leaves</a> "
398 @ html "<a href="$baseurl/brlist">Branches</a> "
399 @ html "<a href="$baseurl/taglist">Tags</a> "
400 @ }
401 @ if {[hascap r]} {
402 @ html "<a href="$baseurl/reportlist">Tickets</a> "
403 @ }
404 @ if {[hascap j]} {
405 @ html "<a href="$baseurl/wiki">Wiki</a> "
406 @ }
407 @ if {[hascap s]} {
408 @ html "<a href="$baseurl/setup">Admin</a> "
409 @ } elseif {[hascap a]} {
410 @ html "<a href="$baseurl/setup_ulist">Users</a> "
411 @ }
412 @ if {[info exists login]} {
413 @ html "<a href="$baseurl/login">Logout</a> "
414 @ } else {
415 @ html "<a href="$baseurl/login">Login</a> "
416 @ }
417 @ </th1></div>
418 @ ');
419 @ REPLACE INTO config VALUES('footer','<div class="footer">
420 @ Fossil version $manifest_version $manifest_date
@@ -514,11 +514,11 @@
514 @ div.mainmenu a:hover {
515 @ color: #eee;
516 @ background-color: #333;
517 @ }
518 @
519 @ /* Container for the sub-menu and content so they don"t spread
520 @ ** out underneath the main menu */
521 @ #container {
522 @ padding-left: 9em;
523 @ }
524 @
@@ -619,37 +619,37 @@
619 @ puts "Not logged in"
620 @ }
621 @ </th1></nobr></div>
622 @ </div>
623 @ <div class="mainmenu"><ul><th1>
624 @ html "<li><a href="$baseurl$index_page">Home</a></li>"
625 @ if {[anycap jor]} {
626 @ html "<li><a href="$baseurl/timeline">Timeline</a></li>"
627 @ }
628 @ if {[hascap oh]} {
629 @ html "<li><a href="$baseurl/dir">Files</a></li>"
630 @ }
631 @ if {[hascap o]} {
632 @ html "<li><a href="$baseurl/leaves">Leaves</a></li>"
633 @ html "<li><a href="$baseurl/brlist">Branches</a></li>"
634 @ html "<li><a href="$baseurl/taglist">Tags</a></li>"
635 @ }
636 @ if {[hascap r]} {
637 @ html "<li><a href="$baseurl/reportlist">Tickets</a></li>"
638 @ }
639 @ if {[hascap j]} {
640 @ html "<li><a href="$baseurl/wiki">Wiki</a></li>"
641 @ }
642 @ if {[hascap s]} {
643 @ html "<li><a href="$baseurl/setup">Admin</a></li>"
644 @ } elseif {[hascap a]} {
645 @ html "<li><a href="$baseurl/setup_ulist">Users</a></li>"
646 @ }
647 @ if {[info exists login]} {
648 @ html "<li><a href="$baseurl/login">Logout</a></li>"
649 @ } else {
650 @ html "<li><a href="$baseurl/login">Login</a></li>"
651 @ }
652 @ </th1></ul></div>
653 @ <div id="container">
654 @ ');
655 @ REPLACE INTO config VALUES('footer','</div>
656
M src/sqlite3.c
+5 -2
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -628,11 +628,11 @@
628628
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
629629
 ** [sqlite_version()] and [sqlite_source_id()].
630630
 */
631631
 #define SQLITE_VERSION "3.6.23"
632632
 #define SQLITE_VERSION_NUMBER 3006023
633
-#define SQLITE_SOURCE_ID "2010-03-04 17:58:45 5e472896e02eed05c6c0886a48acd0bdc7a38731"
633
+#define SQLITE_SOURCE_ID "2010-03-05 13:53:23 27413fc8dd52b754b4be9344a66bb9e0d752d48e"
634634
635635
 /*
636636
 ** CAPI3REF: Run-Time Library Version Numbers
637637
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
638638
 **
@@ -21538,13 +21538,16 @@
2153821538
 # include <semaphore.h>
2153921539
 # include <limits.h>
2154021540
 # else
2154121541
 # include <sys/file.h>
2154221542
 # include <sys/param.h>
21543
-# include <sys/mount.h>
2154421543
 # endif
2154521544
 #endif /* SQLITE_ENABLE_LOCKING_STYLE */
21545
+
21546
+#if defined(__APPLE__) || (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
21547
+# include <sys/mount.h>
21548
+#endif
2154621549
2154721550
 /*
2154821551
 ** Allowed values of unixFile.fsFlags
2154921552
 */
2155021553
 #define SQLITE_FSFLAGS_IS_MSDOS 0x1
2155121554
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -628,11 +628,11 @@
628 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
629 ** [sqlite_version()] and [sqlite_source_id()].
630 */
631 #define SQLITE_VERSION "3.6.23"
632 #define SQLITE_VERSION_NUMBER 3006023
633 #define SQLITE_SOURCE_ID "2010-03-04 17:58:45 5e472896e02eed05c6c0886a48acd0bdc7a38731"
634
635 /*
636 ** CAPI3REF: Run-Time Library Version Numbers
637 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
638 **
@@ -21538,13 +21538,16 @@
21538 # include <semaphore.h>
21539 # include <limits.h>
21540 # else
21541 # include <sys/file.h>
21542 # include <sys/param.h>
21543 # include <sys/mount.h>
21544 # endif
21545 #endif /* SQLITE_ENABLE_LOCKING_STYLE */
 
 
 
 
21546
21547 /*
21548 ** Allowed values of unixFile.fsFlags
21549 */
21550 #define SQLITE_FSFLAGS_IS_MSDOS 0x1
21551
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -628,11 +628,11 @@
628 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
629 ** [sqlite_version()] and [sqlite_source_id()].
630 */
631 #define SQLITE_VERSION "3.6.23"
632 #define SQLITE_VERSION_NUMBER 3006023
633 #define SQLITE_SOURCE_ID "2010-03-05 13:53:23 27413fc8dd52b754b4be9344a66bb9e0d752d48e"
634
635 /*
636 ** CAPI3REF: Run-Time Library Version Numbers
637 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
638 **
@@ -21538,13 +21538,16 @@
21538 # include <semaphore.h>
21539 # include <limits.h>
21540 # else
21541 # include <sys/file.h>
21542 # include <sys/param.h>
 
21543 # endif
21544 #endif /* SQLITE_ENABLE_LOCKING_STYLE */
21545
21546 #if defined(__APPLE__) || (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
21547 # include <sys/mount.h>
21548 #endif
21549
21550 /*
21551 ** Allowed values of unixFile.fsFlags
21552 */
21553 #define SQLITE_FSFLAGS_IS_MSDOS 0x1
21554
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107107
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108108
 ** [sqlite_version()] and [sqlite_source_id()].
109109
 */
110110
 #define SQLITE_VERSION "3.6.23"
111111
 #define SQLITE_VERSION_NUMBER 3006023
112
-#define SQLITE_SOURCE_ID "2010-03-04 17:58:45 5e472896e02eed05c6c0886a48acd0bdc7a38731"
112
+#define SQLITE_SOURCE_ID "2010-03-05 13:53:23 27413fc8dd52b754b4be9344a66bb9e0d752d48e"
113113
114114
 /*
115115
 ** CAPI3REF: Run-Time Library Version Numbers
116116
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117117
 **
118118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.6.23"
111 #define SQLITE_VERSION_NUMBER 3006023
112 #define SQLITE_SOURCE_ID "2010-03-04 17:58:45 5e472896e02eed05c6c0886a48acd0bdc7a38731"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.6.23"
111 #define SQLITE_VERSION_NUMBER 3006023
112 #define SQLITE_SOURCE_ID "2010-03-05 13:53:23 27413fc8dd52b754b4be9344a66bb9e0d752d48e"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
M src/sync.c
+5 -1
--- src/sync.c
+++ src/sync.c
@@ -100,11 +100,15 @@
100100
 if( !g.dontKeepUrl ){
101101
 db_set("last-sync-url", g.urlCanonical, 0);
102102
 if( g.urlPasswd ) db_set("last-sync-pw", g.urlPasswd, 0);
103103
 }
104104
 if( g.urlUser!=0 && g.urlPasswd==0 ){
105
- g.urlPasswd = mprintf("%s", zPw);
105
+ if( zPw==0 ){
106
+ url_prompt_for_password();
107
+ }else{
108
+ g.urlPasswd = mprintf("%s", zPw);
109
+ }
106110
 }
107111
 user_select();
108112
 if( g.argc==2 ){
109113
 printf("Server: %s\n", g.urlCanonical);
110114
 }
111115
--- src/sync.c
+++ src/sync.c
@@ -100,11 +100,15 @@
100 if( !g.dontKeepUrl ){
101 db_set("last-sync-url", g.urlCanonical, 0);
102 if( g.urlPasswd ) db_set("last-sync-pw", g.urlPasswd, 0);
103 }
104 if( g.urlUser!=0 && g.urlPasswd==0 ){
105 g.urlPasswd = mprintf("%s", zPw);
 
 
 
 
106 }
107 user_select();
108 if( g.argc==2 ){
109 printf("Server: %s\n", g.urlCanonical);
110 }
111
--- src/sync.c
+++ src/sync.c
@@ -100,11 +100,15 @@
100 if( !g.dontKeepUrl ){
101 db_set("last-sync-url", g.urlCanonical, 0);
102 if( g.urlPasswd ) db_set("last-sync-pw", g.urlPasswd, 0);
103 }
104 if( g.urlUser!=0 && g.urlPasswd==0 ){
105 if( zPw==0 ){
106 url_prompt_for_password();
107 }else{
108 g.urlPasswd = mprintf("%s", zPw);
109 }
110 }
111 user_select();
112 if( g.argc==2 ){
113 printf("Server: %s\n", g.urlCanonical);
114 }
115
M src/timeline.c
+1
--- src/timeline.c
+++ src/timeline.c
@@ -878,10 +878,11 @@
878878
 }else{
879879
 blob_appendf(&desc, "%d %ss", n, zEType);
880880
 }
881881
 if( zUser ){
882882
 blob_appendf(&desc, " by user %h", zUser);
883
+ tmFlags |= TIMELINE_DISJOINT;
883884
 }
884885
 if( tagid>0 ){
885886
 blob_appendf(&desc, " tagged with \"%h\"", zTagName);
886887
 tmFlags |= TIMELINE_DISJOINT;
887888
 }
888889
--- src/timeline.c
+++ src/timeline.c
@@ -878,10 +878,11 @@
878 }else{
879 blob_appendf(&desc, "%d %ss", n, zEType);
880 }
881 if( zUser ){
882 blob_appendf(&desc, " by user %h", zUser);
 
883 }
884 if( tagid>0 ){
885 blob_appendf(&desc, " tagged with \"%h\"", zTagName);
886 tmFlags |= TIMELINE_DISJOINT;
887 }
888
--- src/timeline.c
+++ src/timeline.c
@@ -878,10 +878,11 @@
878 }else{
879 blob_appendf(&desc, "%d %ss", n, zEType);
880 }
881 if( zUser ){
882 blob_appendf(&desc, " by user %h", zUser);
883 tmFlags |= TIMELINE_DISJOINT;
884 }
885 if( tagid>0 ){
886 blob_appendf(&desc, " tagged with \"%h\"", zTagName);
887 tmFlags |= TIMELINE_DISJOINT;
888 }
889
M src/update.c
+5 -2
--- src/update.c
+++ src/update.c
@@ -195,21 +195,24 @@
195195
 }
196196
197197
 db_prepare(&q,
198198
 "SELECT fn, idv, ridv, idt, ridt, chnged FROM fv ORDER BY 1"
199199
 );
200
+ assert( g.zLocalRoot!=0 );
201
+ assert( strlen(g.zLocalRoot)>1 );
202
+ assert( g.zLocalRoot[strlen(g.zLocalRoot)-1]=='/' );
200203
 while( db_step(&q)==SQLITE_ROW ){
201204
 const char *zName = db_column_text(&q, 0); /* The filename from root */
202205
 int idv = db_column_int(&q, 1); /* VFILE entry for current */
203206
 int ridv = db_column_int(&q, 2); /* RecordID for current */
204207
 int idt = db_column_int(&q, 3); /* VFILE entry for target */
205208
 int ridt = db_column_int(&q, 4); /* RecordID for target */
206209
 int chnged = db_column_int(&q, 5); /* Current is edited */
207210
 char *zFullPath; /* Full pathname of the file */
208211
209
- zFullPath = mprintf("%s/%s", g.zLocalRoot, zName);
210
- if( idv>0 && ridv==0 && idt>0 ){
212
+ zFullPath = mprintf("%s%s", g.zLocalRoot, zName);
213
+ if( idv>0 && ridv==0 && idt>0 && ridt>0 ){
211214
 /* Conflict. This file has been added to the current checkout
212215
 ** but also exists in the target checkout. Use the current version.
213216
 */
214217
 printf("CONFLICT %s\n", zName);
215218
 }else if( idt>0 && idv==0 ){
216219
--- src/update.c
+++ src/update.c
@@ -195,21 +195,24 @@
195 }
196
197 db_prepare(&q,
198 "SELECT fn, idv, ridv, idt, ridt, chnged FROM fv ORDER BY 1"
199 );
 
 
 
200 while( db_step(&q)==SQLITE_ROW ){
201 const char *zName = db_column_text(&q, 0); /* The filename from root */
202 int idv = db_column_int(&q, 1); /* VFILE entry for current */
203 int ridv = db_column_int(&q, 2); /* RecordID for current */
204 int idt = db_column_int(&q, 3); /* VFILE entry for target */
205 int ridt = db_column_int(&q, 4); /* RecordID for target */
206 int chnged = db_column_int(&q, 5); /* Current is edited */
207 char *zFullPath; /* Full pathname of the file */
208
209 zFullPath = mprintf("%s/%s", g.zLocalRoot, zName);
210 if( idv>0 && ridv==0 && idt>0 ){
211 /* Conflict. This file has been added to the current checkout
212 ** but also exists in the target checkout. Use the current version.
213 */
214 printf("CONFLICT %s\n", zName);
215 }else if( idt>0 && idv==0 ){
216
--- src/update.c
+++ src/update.c
@@ -195,21 +195,24 @@
195 }
196
197 db_prepare(&q,
198 "SELECT fn, idv, ridv, idt, ridt, chnged FROM fv ORDER BY 1"
199 );
200 assert( g.zLocalRoot!=0 );
201 assert( strlen(g.zLocalRoot)>1 );
202 assert( g.zLocalRoot[strlen(g.zLocalRoot)-1]=='/' );
203 while( db_step(&q)==SQLITE_ROW ){
204 const char *zName = db_column_text(&q, 0); /* The filename from root */
205 int idv = db_column_int(&q, 1); /* VFILE entry for current */
206 int ridv = db_column_int(&q, 2); /* RecordID for current */
207 int idt = db_column_int(&q, 3); /* VFILE entry for target */
208 int ridt = db_column_int(&q, 4); /* RecordID for target */
209 int chnged = db_column_int(&q, 5); /* Current is edited */
210 char *zFullPath; /* Full pathname of the file */
211
212 zFullPath = mprintf("%s%s", g.zLocalRoot, zName);
213 if( idv>0 && ridv==0 && idt>0 && ridt>0 ){
214 /* Conflict. This file has been added to the current checkout
215 ** but also exists in the target checkout. Use the current version.
216 */
217 printf("CONFLICT %s\n", zName);
218 }else if( idt>0 && idv==0 ){
219
M src/xfer.c
+5 -4
--- src/xfer.c
+++ src/xfer.c
@@ -1248,17 +1248,18 @@
12481248
 if( blob_eq(&xfer.aToken[0],"error") && xfer.nToken==2 ){
12491249
 if( !cloneFlag || nCycle>0 ){
12501250
 char *zMsg = blob_terminate(&xfer.aToken[1]);
12511251
 defossilize(zMsg);
12521252
 if( strcmp(zMsg, "login failed")==0 ){
1253
- if( !g.dontKeepUrl ) db_unset("last-sync-pw", 0);
1254
- g.urlPasswd = 0;
1255
- if( nCycle<2 ) go = 1;
1253
+ if( nCycle<2 ){
1254
+ if( !g.dontKeepUrl ) db_unset("last-sync-pw", 0);
1255
+ go = 1;
1256
+ }
12561257
 }else{
12571258
 blob_appendf(&xfer.err, "\rserver says: %s", zMsg);
12581259
 }
1259
- printf("\rServer Error: %s\n", zMsg);
1260
+ fossil_fatal("\rError: %s", zMsg);
12601261
 }
12611262
 }else
12621263
12631264
 /* Unknown message */
12641265
 {
12651266
--- src/xfer.c
+++ src/xfer.c
@@ -1248,17 +1248,18 @@
1248 if( blob_eq(&xfer.aToken[0],"error") && xfer.nToken==2 ){
1249 if( !cloneFlag || nCycle>0 ){
1250 char *zMsg = blob_terminate(&xfer.aToken[1]);
1251 defossilize(zMsg);
1252 if( strcmp(zMsg, "login failed")==0 ){
1253 if( !g.dontKeepUrl ) db_unset("last-sync-pw", 0);
1254 g.urlPasswd = 0;
1255 if( nCycle<2 ) go = 1;
 
1256 }else{
1257 blob_appendf(&xfer.err, "\rserver says: %s", zMsg);
1258 }
1259 printf("\rServer Error: %s\n", zMsg);
1260 }
1261 }else
1262
1263 /* Unknown message */
1264 {
1265
--- src/xfer.c
+++ src/xfer.c
@@ -1248,17 +1248,18 @@
1248 if( blob_eq(&xfer.aToken[0],"error") && xfer.nToken==2 ){
1249 if( !cloneFlag || nCycle>0 ){
1250 char *zMsg = blob_terminate(&xfer.aToken[1]);
1251 defossilize(zMsg);
1252 if( strcmp(zMsg, "login failed")==0 ){
1253 if( nCycle<2 ){
1254 if( !g.dontKeepUrl ) db_unset("last-sync-pw", 0);
1255 go = 1;
1256 }
1257 }else{
1258 blob_appendf(&xfer.err, "\rserver says: %s", zMsg);
1259 }
1260 fossil_fatal("\rError: %s", zMsg);
1261 }
1262 }else
1263
1264 /* Unknown message */
1265 {
1266

Keyboard Shortcuts

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