$<project_name>: $<title>

+@ if {[info exists login]} { +@ puts "Logged in as $login" +@ } else { +@ puts "Not logged in" +@ } +@

$</div> +@ '); +@ REPLACE INTO config(name,mtime,value) VALUES('footer',now(),' +@ </div> +@ </div> +@ <div class="footer"> +@ Fossil version $manifest_version $manifest_date +@ </div> +@ </body></html> +@ '); +; + /* ** This skin is intended to be almost identical to the default one, with the ** following changes to the header and footer: ** @@ -1260,10 +1634,11 @@ { "Plain Gray, No Logo", zBuiltinSkin1 }, { "Khaki, No Logo", zBuiltinSkin2 }, { "Black & White, Menu on Left", zBuiltinSkin3 }, { "Shadow boxes & Rounded Corners", zBuiltinSkin4 }, { "Enhanced Default", zBuiltinSkin5 }, + { "Shiny Fossil", zBuiltinSkinShinyFossil }, }; /* ** For a skin named zSkinName, compute the name of the CONFIG table ** entry where that skin is stored and return it. Index: src/sqlcmd.c ================================================================== --- src/sqlcmd.c +++ src/sqlcmd.c @@ -127,24 +127,23 @@ } /* ** COMMAND: sqlite3 ** -** Usage: %fossil sqlite3 ?DATABASE? ?OPTIONS? +** Usage: %fossil sqlite3 DATABASE ?OPTIONS? ** ** Run the standalone sqlite3 command-line shell on DATABASE with OPTIONS. -** If DATABASE is omitted, then the repository that serves the working -** directory is opened. ** ** WARNING: Careless use of this command can corrupt a Fossil repository ** in ways that are unrecoverable. Be sure you know what you are doing before ** running any SQL commands that modifies the repository database. */ void cmd_sqlite3(void){ extern int sqlite3_shell(int, char**); - db_find_and_open_repository(OPEN_ANY_SCHEMA, 0); - db_close(1); + if( g.argc<3 ){ + usage("DATABASE"); + } sqlite3_shutdown(); sqlite3_shell(g.argc-1, g.argv+1); g.db = 0; } Index: src/timeline.c ================================================================== --- src/timeline.c +++ src/timeline.c @@ -104,18 +104,66 @@ #endif /* ** Hash a string and use the hash to determine a background color. */ +char *hash_color_hsv(const char *z){ + int i; /* Loop counter, intermediate value */ + unsigned int hash = 0; /* Hash on the branch name */ + int r, g, b; /* Values for red, green, and blue */ + float h, s, v; /* Values for hue, saturation and value */ + float f, p, q, t; /* Intermediate values */ + static char zColor[10]; /* The resulting color */ + + for(i=0; z[i]; i++ ){ + hash = (hash<<11) ^ (hash<<1) ^ (hash>>3) ^ z[i]; + } + + // Calculate or assume HSV + if( db_get_boolean("white-foreground", 0) ) { + h = hash % 360; hash /= 360; + s = 0.7 + (hash % 5) / 100.0; hash /= 5; + v = 0.3 - (hash % 5) / 100.0; hash /= 5; + } + else { + h = hash % 360; hash /= 360; + s = 0.1 + (hash % 5) / 100.0; hash /= 5; + v = 1.0 - (hash % 5) / 100.0; hash /= 5; + } + + // Conversion + // Reference: http://www.cs.rit.edu/~ncs/color/t_convert.html + h = h / 60.0; + i = h; + f = h - i; + p = v * (1 - s); + q = v * (1 - s * f); + t = v * (1 - s * (1 - f)); + + // Calculate RGB + switch( i ){ + case 0: r = v * 255; g = t * 255, b = p * 255; break; + case 1: r = q * 255; g = v * 255, b = p * 255; break; + case 2: r = p * 255; g = v * 255, b = t * 255; break; + case 3: r = p * 255; g = q * 255, b = v * 255; break; + case 4: r = t * 255; g = p * 255, b = v * 255; break; + default: r = v * 255; g = p * 255, b = q * 255; break; + } + + sqlite3_snprintf(8, zColor, "#%02x%02x%02x", r,g,b); + return zColor; +} char *hash_color(const char *z){ int i; /* Loop counter */ unsigned int h = 0; /* Hash on the branch name */ int r, g, b; /* Values for red, green, and blue */ int h1, h2, h3, h4; /* Elements of the hash value */ int mx, mn; /* Components of HSV */ static char zColor[10]; /* The resulting color */ static int ix[2] = {0,0}; /* Color chooser parameters */ + + return (hash_color_hsv (z)); if( ix[0]==0 ){ if( db_get_boolean("white-foreground", 0) ){ ix[0] = 140; ix[1] = 40; ADDED tools/color.xls Index: tools/color.xls ================================================================== --- /dev/null +++ tools/color.xls cannot compute difference between binary files ADDED www/home.wiki Index: www/home.wiki ================================================================== --- /dev/null +++ www/home.wiki @@ -0,0 +1,18 @@ +<title>Home Page + + +This is a clone of [http://fossil-scm.org | Fossil] with some custom changes. + + +For information about what is fossil, please refer original home of fossil at [http://fossil-scm.org]. + +

List of customizations

If graphical diff utility is specified (in settings), gdiff command uses graphical diff utility even if there are more than one files to diff. +
Minor fixes to show relative paths correctly. +
Require DATABASE parameter to sqlite3 command and let this command be run from outside an open repository. +
Use HSV based algorithm to select background colors for branches in timeline. +
Add a custom skin named 'Shiny Fossil' to default list of skins. +

+ +This clone is maintained by Urmil Parikh. All above changes are under branch: urmil.