Fossil SCM

Fix an issue with the command-line timeline. Fix typos in documentation.

drh 2009-11-09 21:32 trunk
Commit e2431b17df0b3865fde767b35937e8cd726d76b8
Parent 0239325f58a4a0c…
3 files changed +4 -3 -11 +3 -3
~ src/timeline.c ~ www/build.wiki ~ www/quickstart.wiki
M src/timeline.c
+4 -3
--- src/timeline.c
+++ src/timeline.c
@@ -951,19 +951,20 @@
951951
 zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid);
952952
 }else if( name_to_uuid(&uuid, 0)==0 ){
953953
 objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid);
954954
 zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid);
955955
 }else{
956
+ const char *zShift = "";
956957
 if( mode==3 || mode==4 ){
957958
 fossil_fatal("cannot compute descendants or ancestors of a date");
958959
 }
959960
 if( mode==0 ){
960
- mode = 1;
961
- if( isIsoDate(zOrigin) ) zOrigin[9]++;
961
+ if( isIsoDate(zOrigin) ) zShift = ",'+1 day'";
962962
 }
963
- zDate = mprintf("(SELECT julianday(%Q, 'utc'))", zOrigin);
963
+ zDate = mprintf("(SELECT julianday(%Q%s, 'utc'))", zOrigin, zShift);
964964
 }
965
+ if( mode==0 ) mode = 1;
965966
 zSQL = mprintf("%z AND event.mtime %s %s",
966967
 timeline_query_for_tty_m(),
967968
 (mode==1 || mode==4) ? "<=" : ">=",
968969
 zDate
969970
 );
970971
--- src/timeline.c
+++ src/timeline.c
@@ -951,19 +951,20 @@
951 zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid);
952 }else if( name_to_uuid(&uuid, 0)==0 ){
953 objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid);
954 zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid);
955 }else{
 
956 if( mode==3 || mode==4 ){
957 fossil_fatal("cannot compute descendants or ancestors of a date");
958 }
959 if( mode==0 ){
960 mode = 1;
961 if( isIsoDate(zOrigin) ) zOrigin[9]++;
962 }
963 zDate = mprintf("(SELECT julianday(%Q, 'utc'))", zOrigin);
964 }
 
965 zSQL = mprintf("%z AND event.mtime %s %s",
966 timeline_query_for_tty_m(),
967 (mode==1 || mode==4) ? "<=" : ">=",
968 zDate
969 );
970
--- src/timeline.c
+++ src/timeline.c
@@ -951,19 +951,20 @@
951 zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid);
952 }else if( name_to_uuid(&uuid, 0)==0 ){
953 objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid);
954 zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid);
955 }else{
956 const char *zShift = "";
957 if( mode==3 || mode==4 ){
958 fossil_fatal("cannot compute descendants or ancestors of a date");
959 }
960 if( mode==0 ){
961 if( isIsoDate(zOrigin) ) zShift = ",'+1 day'";
 
962 }
963 zDate = mprintf("(SELECT julianday(%Q%s, 'utc'))", zOrigin, zShift);
964 }
965 if( mode==0 ) mode = 1;
966 zSQL = mprintf("%z AND event.mtime %s %s",
967 timeline_query_for_tty_m(),
968 (mode==1 || mode==4) ? "<=" : ">=",
969 zDate
970 );
971
M www/build.wiki
-11
--- www/build.wiki
+++ www/build.wiki
@@ -40,21 +40,10 @@
4040
 that appears right after the check-in comment at the top of the page.</p>
4141
4242
 <li><p>Finally, click on the
4343
 "Zip Archive" link. This link will build a ZIP archive of the
4444
 complete source code and download it to your browser.
45
-
46
-<blockquote><i>
47
-Note to Mac users: The ZIP archive constructed by Fossil is a well-formed
48
-ZIP archive. However, the unarchiver that is built into the Mac has a bug
49
-in that it does not understand all well-formed ZIP archives. So you may
50
-get an error when the Mac goes to automatically extract the downloaded ZIP
51
-archive. We are still trying to figure out what it is about Fossil-generated
52
-ZIP archives that the Mac doesn't like. Until we do,
53
-your work-around is to manually extract the ZIP archive using the
54
-"unzip" command from a command-line shell.
55
-</i></blockquote>
5645
 </ol>
5746
5847
 <h2>2.0 Compiling</h2>
5948
6049
 <p>Follow these steps to compile:</p>
6150
--- www/build.wiki
+++ www/build.wiki
@@ -40,21 +40,10 @@
40 that appears right after the check-in comment at the top of the page.</p>
41
42 <li><p>Finally, click on the
43 "Zip Archive" link. This link will build a ZIP archive of the
44 complete source code and download it to your browser.
45
46 <blockquote><i>
47 Note to Mac users: The ZIP archive constructed by Fossil is a well-formed
48 ZIP archive. However, the unarchiver that is built into the Mac has a bug
49 in that it does not understand all well-formed ZIP archives. So you may
50 get an error when the Mac goes to automatically extract the downloaded ZIP
51 archive. We are still trying to figure out what it is about Fossil-generated
52 ZIP archives that the Mac doesn't like. Until we do,
53 your work-around is to manually extract the ZIP archive using the
54 "unzip" command from a command-line shell.
55 </i></blockquote>
56 </ol>
57
58 <h2>2.0 Compiling</h2>
59
60 <p>Follow these steps to compile:</p>
61
--- www/build.wiki
+++ www/build.wiki
@@ -40,21 +40,10 @@
40 that appears right after the check-in comment at the top of the page.</p>
41
42 <li><p>Finally, click on the
43 "Zip Archive" link. This link will build a ZIP archive of the
44 complete source code and download it to your browser.
 
 
 
 
 
 
 
 
 
 
 
45 </ol>
46
47 <h2>2.0 Compiling</h2>
48
49 <p>Follow these steps to compile:</p>
50
M www/quickstart.wiki
+3 -3
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -223,16 +223,16 @@
223223
 #!/usr/local/bin/fossil<br>
224224
 repository: /home/proj1/repos1.fossil
225225
 </b></blockquote>
226226
227227
 <p>Adjust the paths in this CGI script to match your installation
228
- and make sure that repository file at the directory that contains it
229
- are both readable and writable by the user that CGI scripts run as.
228
+ and make sure both repository file and the directory that contains it
229
+ are readable and writable by the user that CGI scripts run as.
230230
 Then point clients at the CGI script. That's all there is to it!</p>
231231
232232
 <a name="inetdserver"></a>
233
- <p>You can also run fossil off of inetd or xinetd. For an inetd
233
+ <p>You can also run fossil from inetd or xinetd. For an inetd
234234
 installation, make an entry in /etc/inetd.conf that looks something
235235
 like this:</p>
236236
237237
 <blockquote><b>
238238
 80 stream tcp nowait.1000 root /usr/bin/fossil \<br>
239239
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -223,16 +223,16 @@
223 #!/usr/local/bin/fossil<br>
224 repository: /home/proj1/repos1.fossil
225 </b></blockquote>
226
227 <p>Adjust the paths in this CGI script to match your installation
228 and make sure that repository file at the directory that contains it
229 are both readable and writable by the user that CGI scripts run as.
230 Then point clients at the CGI script. That's all there is to it!</p>
231
232 <a name="inetdserver"></a>
233 <p>You can also run fossil off of inetd or xinetd. For an inetd
234 installation, make an entry in /etc/inetd.conf that looks something
235 like this:</p>
236
237 <blockquote><b>
238 80 stream tcp nowait.1000 root /usr/bin/fossil \<br>
239
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -223,16 +223,16 @@
223 #!/usr/local/bin/fossil<br>
224 repository: /home/proj1/repos1.fossil
225 </b></blockquote>
226
227 <p>Adjust the paths in this CGI script to match your installation
228 and make sure both repository file and the directory that contains it
229 are readable and writable by the user that CGI scripts run as.
230 Then point clients at the CGI script. That's all there is to it!</p>
231
232 <a name="inetdserver"></a>
233 <p>You can also run fossil from inetd or xinetd. For an inetd
234 installation, make an entry in /etc/inetd.conf that looks something
235 like this:</p>
236
237 <blockquote><b>
238 80 stream tcp nowait.1000 root /usr/bin/fossil \<br>
239

Keyboard Shortcuts

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