Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | (experimental) Allow not only --utc or --localtime to be specified, but any timezone (minutes from UTC = -999...999) |
|---|---|
| Timelines: | family | ancestors | tz-minutes |
| Files: | files | file ages | folders |
| SHA1: |
c3e3ceb9b645ffeed56f02eccee437b2 |
| User & Date: | jan.nijtmans 2014-01-29 22:51:16.008 |
Context
|
2014-01-29
| ||
| 22:51 | (experimental) Allow not only --utc or --localtime to be specified, but any timezone (minutes from UTC = -999...999) Closed-Leaf check-in: c3e3ceb9b6 user: jan.nijtmans tags: tz-minutes | |
| 20:43 | Typo fix. check-in: 167b24c744 user: stephan tags: trunk | |
Changes
Changes to src/main.c.
| ︙ | ︙ | |||
159 160 161 162 163 164 165 | int xferPanic; /* Write error messages in XFER protocol */ int fullHttpReply; /* True for full HTTP reply. False for CGI reply */ Th_Interp *interp; /* The TH1 interpreter */ char *th1Setup; /* The TH1 post-creation setup script, if any */ FILE *httpIn; /* Accept HTTP input from here */ FILE *httpOut; /* Send HTTP output here */ int xlinkClusterOnly; /* Set when cloning. Only process clusters */ | | > | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 |
int xferPanic; /* Write error messages in XFER protocol */
int fullHttpReply; /* True for full HTTP reply. False for CGI reply */
Th_Interp *interp; /* The TH1 interpreter */
char *th1Setup; /* The TH1 post-creation setup script, if any */
FILE *httpIn; /* Accept HTTP input from here */
FILE *httpOut; /* Send HTTP output here */
int xlinkClusterOnly; /* Set when cloning. Only process clusters */
int fTimeFormat; /* 1000 for UTC. -1000 for localtime. 0 not yet selected */
/* -999...999 = minutes difference from UTC */
int *aCommitFile; /* Array of files to be committed */
int markPrivate; /* All new artifacts are private if true */
int clockSkewSeen; /* True if clocks on client and server out of sync */
int wikiFlags; /* Wiki conversion flags applied to %w and %W */
char isHTTP; /* True if server/CGI modes, else assume CLI. */
char javascriptHyperlink; /* If true, set href= using script, not HTML */
Blob httpHeader; /* Complete text of the HTTP request header */
|
| ︙ | ︙ | |||
635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 |
"\nEach line of the file is assumed to be a filename unless it starts\n"
"with '-' and contains a space, in which case it is assumed to be\n"
"another flag and is treated as such. --args FILENAME may be used\n"
"in conjunction with any other flags.\n");
fossil_exit(1);
}else{
const char *zChdir = find_option("chdir",0,1);
g.isHTTP = 0;
g.fQuiet = find_option("quiet", 0, 0)!=0;
g.fSqlTrace = find_option("sqltrace", 0, 0)!=0;
g.fSqlStats = find_option("sqlstats", 0, 0)!=0;
g.fSystemTrace = find_option("systemtrace", 0, 0)!=0;
g.fSshTrace = find_option("sshtrace", 0, 0)!=0;
g.fSshClient = 0;
g.zSshCmd = 0;
if( g.fSqlTrace ) g.fSqlStats = 1;
g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
g.zLogin = find_option("user", "U", 1);
g.zSSLIdentity = find_option("ssl-identity", 0, 1);
g.zErrlog = find_option("errorlog", 0, 1);
| > > > > > > > | | | 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 |
"\nEach line of the file is assumed to be a filename unless it starts\n"
"with '-' and contains a space, in which case it is assumed to be\n"
"another flag and is treated as such. --args FILENAME may be used\n"
"in conjunction with any other flags.\n");
fossil_exit(1);
}else{
const char *zChdir = find_option("chdir",0,1);
const char *zTimezone = find_option("tz",0,1);
g.isHTTP = 0;
g.fQuiet = find_option("quiet", 0, 0)!=0;
g.fSqlTrace = find_option("sqltrace", 0, 0)!=0;
g.fSqlStats = find_option("sqlstats", 0, 0)!=0;
g.fSystemTrace = find_option("systemtrace", 0, 0)!=0;
g.fSshTrace = find_option("sshtrace", 0, 0)!=0;
g.fSshClient = 0;
g.zSshCmd = 0;
if( g.fSqlTrace ) g.fSqlStats = 1;
g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
g.zLogin = find_option("user", "U", 1);
g.zSSLIdentity = find_option("ssl-identity", 0, 1);
g.zErrlog = find_option("errorlog", 0, 1);
if( zTimezone ){
int tz = (int)strtol(zTimezone, 0, 0);
if( tz<-999 || tz >999 ){
fossil_fatal("wrong timezone format %s", zTimezone);
}
g.fTimeFormat = tz ? tz : 1000;
}else if( find_option("utc",0,0) ) g.fTimeFormat = 1000;
else if( find_option("localtime",0,0) ) g.fTimeFormat = -1000;
if( zChdir && file_chdir(zChdir, 0) ){
fossil_fatal("unable to change directories to %s", zChdir);
}
if( find_option("help",0,0)!=0 ){
/* --help anywhere on the command line is translated into
** "fossil help argv[1] argv[2]..." */
int i;
|
| ︙ | ︙ |
Changes to src/timeline.c.
| ︙ | ︙ | |||
1883 1884 1885 1886 1887 1888 1889 | db_prepare(&q, blob_str(&sql)); blob_reset(&sql); print_timeline(&q, n, width, verboseFlag); db_finalize(&q); } /* | | | | > > > | | | < > > > > | 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 |
db_prepare(&q, blob_str(&sql));
blob_reset(&sql);
print_timeline(&q, n, width, verboseFlag);
db_finalize(&q);
}
/*
** Return one of three forms:
**
** ",'localtime'" when (server) localtime is desired
**
** "" when UTC is desired
**
** ",'??? minutes'" otherwise
*/
const char *timeline_utc(){
static char buf[16] = ""; /* only initialized once. */
if( g.fTimeFormat==0 ){
if( db_get_int("timeline-utc", 1) ){
g.fTimeFormat = 1000;
}else{
g.fTimeFormat = -1000;
}
}
if( g.fTimeFormat>999 )
return "";
if( g.fTimeFormat<-999 )
return ",'localtime'";
if( !buf[0] ){
sprintf(buf, ",'%d minutes'", g.fTimeFormat);
}
return buf;
}
/*
** COMMAND: test-timewarp-list
**
** Usage: %fossil test-timewarp-list ?-v|---verbose?
|
| ︙ | ︙ |