Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merge recent changes into the dual-license branch. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | clear-title |
Files: | files | file ages | folders |
SHA1: |
14c19fbc1c39554d869dfecfbb6c1721 |
User & Date: | drh 2010-02-08 18:16:08.000 |
Context
2010-02-25
| ||
14:06 | Pull over the latest clear-title changes from trunk. ... (check-in: 16e703be user: drh tags: clear-title) | |
2010-02-08
| ||
18:16 | Merge recent changes into the dual-license branch. ... (check-in: 14c19fbc user: drh tags: clear-title) | |
18:08 | Check the graph for resize events every second and rerender the graph if a resize has occurred. This fixes display problems on Safari and also keeps the graph consistent with resized browser windows. ... (check-in: f51bd596 user: drh tags: trunk) | |
2010-01-24
| ||
22:34 | Pull in the latest changes from trunk. ... (check-in: 1942d581 user: drh tags: clear-title) | |
Changes
Changes to src/add.c.
︙ | ︙ | |||
202 203 204 205 206 207 208 209 210 211 212 213 214 215 | db_begin_transaction(); for(i=2; i<g.argc; i++){ char *zName; char *zPath; Blob pathname; zName = mprintf("%/", g.argv[i]); file_tree_name(zName, &pathname, 1); zPath = blob_str(&pathname); if( !db_exists( "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){ fossil_fatal("not in the repository: %s", zName); }else{ db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath); | > > > > | 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | db_begin_transaction(); for(i=2; i<g.argc; i++){ char *zName; char *zPath; Blob pathname; zName = mprintf("%/", g.argv[i]); if( file_isdir(zName) ){ fossil_fatal("cannot remove directories -" " remove individual files instead"); } file_tree_name(zName, &pathname, 1); zPath = blob_str(&pathname); if( !db_exists( "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){ fossil_fatal("not in the repository: %s", zName); }else{ db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath); |
︙ | ︙ |
Changes to src/cgi.c.
︙ | ︙ | |||
693 694 695 696 697 698 699 | add_param_list(z, '&'); }else{ process_multipart_form_data(z, len); } }else if( strcmp(zType, "application/x-fossil")==0 ){ blob_read_from_channel(&g.cgiIn, g.httpIn, len); blob_uncompress(&g.cgiIn, &g.cgiIn); | < < < < < < < < | 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 | add_param_list(z, '&'); }else{ process_multipart_form_data(z, len); } }else if( strcmp(zType, "application/x-fossil")==0 ){ blob_read_from_channel(&g.cgiIn, g.httpIn, len); blob_uncompress(&g.cgiIn, &g.cgiIn); }else if( strcmp(zType, "application/x-fossil-debug")==0 ){ blob_read_from_channel(&g.cgiIn, g.httpIn, len); } } z = (char*)P("HTTP_COOKIE"); if( z ){ z = mprintf("%s",z); add_param_list(z, ';'); |
︙ | ︙ |
Changes to src/clone.c.
︙ | ︙ | |||
28 29 30 31 32 33 34 | #include <assert.h> /* ** COMMAND: clone ** | | > > > > > > > > > > > | | > > > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | #include <assert.h> /* ** COMMAND: clone ** ** Usage: %fossil clone ?OPTIONS? URL FILENAME ** ** Make a clone of a repository specified by URL in the local ** file named FILENAME. ** ** By default, your current login name is used to create the default ** admin user. This can be overridden using the -A|--admin-user ** parameter. ** ** Options: ** ** --admin-user|-A USERNAME ** */ void clone_cmd(void){ char *zPassword; const char *zDefaultUser; /* Optional name of the default user */ url_proxy_options(); if( g.argc < 4 ){ usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY"); } db_open_config(0); if( file_size(g.argv[3])>0 ){ fossil_panic("file already exists: %s", g.argv[3]); } zDefaultUser = find_option("admin-user","A",1); url_parse(g.argv[2]); if( g.urlIsFile ){ file_copy(g.urlName, g.argv[3]); db_close(); db_open_repository(g.argv[3]); db_record_repository_filename(g.argv[3]); db_multi_exec( |
︙ | ︙ | |||
64 65 66 67 68 69 70 | "DELETE FROM blob WHERE rid IN private;" "DELETE FROM delta wHERE rid IN private;" "DELETE FROM private;" ); shun_artifacts(); g.zLogin = db_text(0, "SELECT login FROM user WHERE cap LIKE '%%s%%'"); if( g.zLogin==0 ){ | | | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | "DELETE FROM blob WHERE rid IN private;" "DELETE FROM delta wHERE rid IN private;" "DELETE FROM private;" ); shun_artifacts(); g.zLogin = db_text(0, "SELECT login FROM user WHERE cap LIKE '%%s%%'"); if( g.zLogin==0 ){ db_create_default_users(1,zDefaultUser); } printf("Repository cloned into %s\n", g.argv[3]); }else{ db_create_repository(g.argv[3]); db_open_repository(g.argv[3]); db_begin_transaction(); db_record_repository_filename(g.argv[3]); db_initial_setup(0, zDefaultUser, 0); user_select(); db_set("content-schema", CONTENT_SCHEMA, 0); db_set("aux-schema", AUX_SCHEMA, 0); db_set("last-sync-url", g.argv[2], 0); db_multi_exec( "REPLACE INTO config(name,value)" " VALUES('server-code', lower(hex(randomblob(20))));" |
︙ | ︙ |
Changes to src/configure.c.
︙ | ︙ | |||
485 486 487 488 489 490 491 | for(i=0; i<count(aConfig); i++){ const char *zName = aConfig[i].zName; if( (aConfig[i].groupMask & mask)==0 ) continue; if( zName[0]!='@' ){ db_multi_exec("DELETE FROM config WHERE name=%Q", zName); }else if( strcmp(zName,"@user")==0 ){ db_multi_exec("DELETE FROM user"); | | | 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 | for(i=0; i<count(aConfig); i++){ const char *zName = aConfig[i].zName; if( (aConfig[i].groupMask & mask)==0 ) continue; if( zName[0]!='@' ){ db_multi_exec("DELETE FROM config WHERE name=%Q", zName); }else if( strcmp(zName,"@user")==0 ){ db_multi_exec("DELETE FROM user"); db_create_default_users(0, 0); }else if( strcmp(zName,"@concealed")==0 ){ db_multi_exec("DELETE FROM concealed"); }else if( strcmp(zName,"@shun")==0 ){ db_multi_exec("DELETE FROM shun"); }else if( strcmp(zName,"@reportfmt")==0 ){ db_multi_exec("DELETE FROM reportfmt"); } |
︙ | ︙ |
Changes to src/db.c.
︙ | ︙ | |||
504 505 506 507 508 509 510 | va_end(ap); if( db_step(&s)==SQLITE_ROW ){ z = mprintf("%s", sqlite3_column_text(s.pStmt, 0)); } db_finalize(&s); return z; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 | va_end(ap); if( db_step(&s)==SQLITE_ROW ){ z = mprintf("%s", sqlite3_column_text(s.pStmt, 0)); } db_finalize(&s); return z; } /* ** Initialize a new database file with the given schema. If anything ** goes wrong, call db_err() to exit. */ void db_init_database( const char *zFileName, /* Name of database file to create */ const char *zSchema, /* First part of schema */ ... /* Additional SQL to run. Terminate with NULL. */ ){ sqlite3 *db; int rc; const char *zSql; va_list ap; #ifdef __MINGW32__ zFileName = sqlite3_win32_mbcs_to_utf8(zFileName); #endif rc = sqlite3_open(zFileName, &db); if( rc!=SQLITE_OK ){ db_err(sqlite3_errmsg(db)); } sqlite3_busy_timeout(db, 5000); sqlite3_exec(db, "BEGIN EXCLUSIVE", 0, 0, 0); |
︙ | ︙ | |||
631 632 633 634 635 636 637 | static sqlite3 *openDatabase(const char *zDbName){ int rc; const char *zVfs; sqlite3 *db; zVfs = getenv("FOSSIL_VFS"); #ifdef __MINGW32__ | | | 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 | static sqlite3 *openDatabase(const char *zDbName){ int rc; const char *zVfs; sqlite3 *db; zVfs = getenv("FOSSIL_VFS"); #ifdef __MINGW32__ zDbName = sqlite3_win32_mbcs_to_utf8(zDbName); #endif rc = sqlite3_open_v2( zDbName, &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, zVfs ); if( rc!=SQLITE_OK ){ |
︙ | ︙ | |||
657 658 659 660 661 662 663 | */ void db_open_or_attach(const char *zDbName, const char *zLabel){ if( !g.db ){ g.db = openDatabase(zDbName); db_connection_init(); }else{ #ifdef __MINGW32__ | | | 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 | */ void db_open_or_attach(const char *zDbName, const char *zLabel){ if( !g.db ){ g.db = openDatabase(zDbName); db_connection_init(); }else{ #ifdef __MINGW32__ zDbName = sqlite3_win32_mbcs_to_utf8(zDbName); #endif db_multi_exec("ATTACH DATABASE %Q AS %s", zDbName, zLabel); } } /* ** Open the user database in "~/.fossil". Create the database anew if |
︙ | ︙ | |||
864 865 866 867 868 869 870 | } db_open_repository(zRep); if( g.repositoryOpen ){ return; } rep_not_found: if( errIfNotFound ){ | | | 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 | } db_open_repository(zRep); if( g.repositoryOpen ){ return; } rep_not_found: if( errIfNotFound ){ fossil_fatal("use --repository or -R to specify the repository database"); } } /* ** Open the local database. If unable, exit with an error. */ void db_must_be_within_tree(void){ |
︙ | ︙ | |||
914 915 916 917 918 919 920 | ); isNewRepo = 1; } /* ** Create the default user accounts in the USER table. */ | | > > > | 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 | ); isNewRepo = 1; } /* ** Create the default user accounts in the USER table. */ void db_create_default_users(int setupUserOnly, const char *zDefaultUser){ const char *zUser; zUser = db_get("default-user", 0); if( zUser==0 ){ zUser = zDefaultUser; } if( zUser==0 ){ #ifdef __MINGW32__ zUser = getenv("USERNAME"); #else zUser = getenv("USER"); #endif } |
︙ | ︙ | |||
956 957 958 959 960 961 962 | ** new repositories. ** ** The zInitialDate parameter determines the date of the initial check-in ** that is automatically created. If zInitialDate is 0 then no initial ** check-in is created. The makeServerCodes flag determines whether or ** not server and project codes are invented for this repository. */ | | | | 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 | ** new repositories. ** ** The zInitialDate parameter determines the date of the initial check-in ** that is automatically created. If zInitialDate is 0 then no initial ** check-in is created. The makeServerCodes flag determines whether or ** not server and project codes are invented for this repository. */ void db_initial_setup (const char *zInitialDate, const char *zDefaultUser, int makeServerCodes){ char *zDate; Blob hash; Blob manifest; db_set("content-schema", CONTENT_SCHEMA, 0); db_set("aux-schema", AUX_SCHEMA, 0); if( makeServerCodes ){ db_multi_exec( "INSERT INTO config(name,value)" " VALUES('server-code', lower(hex(randomblob(20))));" "INSERT INTO config(name,value)" " VALUES('project-code', lower(hex(randomblob(20))));" ); } if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0); if( !db_is_global("localauth") ) db_set_int("localauth", 0, 0); db_create_default_users(0, zDefaultUser); user_select(); if( zInitialDate ){ int rid; blob_zero(&manifest); blob_appendf(&manifest, "C initial\\sempty\\scheck-in\n"); zDate = db_text(0, "SELECT datetime(%Q)", zInitialDate); |
︙ | ︙ | |||
1000 1001 1002 1003 1004 1005 1006 | manifest_crosslink(rid, &manifest); } } /* ** COMMAND: new ** | | > > > > > > > > > > > | | 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 | manifest_crosslink(rid, &manifest); } } /* ** COMMAND: new ** ** Usage: %fossil new ?OPTIONS? FILENAME ** ** Create a repository for a new project in the file named FILENAME. ** This command is distinct from "clone". The "clone" command makes ** a copy of an existing project. This command starts a new project. ** ** By default, your current login name is used to create the default ** admin user. This can be overridden using the -A|--admin-user ** parameter. ** ** Options: ** ** --admin-user|-A USERNAME ** */ void create_repository_cmd(void){ char *zPassword; const char *zDate; /* Date of the initial check-in */ const char *zDefaultUser; /* Optional name of the default user */ zDate = find_option("date-override",0,1); zDefaultUser = find_option("admin-user","A",1); if( zDate==0 ) zDate = "now"; if( g.argc!=3 ){ usage("REPOSITORY-NAME"); } db_create_repository(g.argv[2]); db_open_repository(g.argv[2]); db_open_config(0); db_begin_transaction(); db_initial_setup(zDate, zDefaultUser, 1); db_end_transaction(0); printf("project-id: %s\n", db_get("project-code", 0)); printf("server-id: %s\n", db_get("server-code", 0)); zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin); printf("admin-user: %s (initial password is \"%s\")\n", g.zLogin, zPassword); } |
︙ | ︙ |
Changes to src/delta.c.
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 | ** fossil source code base. Nothing in this file depends on anything ** else in fossil. */ #include <stdio.h> #include <assert.h> #include <stdlib.h> #include <string.h> /* ** Macros for turning debugging printfs on and off */ #if 0 # define DEBUG1(X) X #else | > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | ** fossil source code base. Nothing in this file depends on anything ** else in fossil. */ #include <stdio.h> #include <assert.h> #include <stdlib.h> #include <string.h> #include "delta.h" /* ** Macros for turning debugging printfs on and off */ #if 0 # define DEBUG1(X) X #else |
︙ | ︙ | |||
60 61 62 63 64 65 66 | zBuf[i] = 0; return zBuf; } #else # define DEBUG2(X) #endif | | > > | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | zBuf[i] = 0; return zBuf; } #else # define DEBUG2(X) #endif #if INTERFACE /* ** The "u32" type must be an unsigned 32-bit integer. Adjust this */ typedef unsigned int u32; /* ** Must be a 16-bit value */ typedef short int s16; typedef unsigned short int u16; #endif /* INTERFACE */ /* ** The width of a hash window in bytes. The algorithm only works if this ** is a power of 2. */ #define NHASH 16 |
︙ | ︙ |
Changes to src/file.c.
︙ | ︙ | |||
99 100 101 102 103 104 105 | ** other than a directory. */ int file_isdir(const char *zFilename){ int rc; if( zFilename ){ char *zFN = mprintf("%s", zFilename); | | | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 | ** other than a directory. */ int file_isdir(const char *zFilename){ int rc; if( zFilename ){ char *zFN = mprintf("%s", zFilename); file_simplify_name(zFN, -1); rc = getStat(zFN); free(zFN); }else{ rc = getStat(0); } return rc ? 0 : (S_ISDIR(fileStat.st_mode) ? 1 : 2); } |
︙ | ︙ | |||
227 228 229 230 231 232 233 234 235 236 237 238 239 240 | ** * removing /./ ** * removing /A/../ ** ** Changes are made in-place. Return the new name length. */ int file_simplify_name(char *z, int n){ int i, j; #ifdef __MINGW32__ for(i=0; i<n; i++){ if( z[i]=='\\' ) z[i] = '/'; } #endif while( n>1 && z[n-1]=='/' ){ n--; } for(i=j=0; i<n; i++){ | > | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 | ** * removing /./ ** * removing /A/../ ** ** Changes are made in-place. Return the new name length. */ int file_simplify_name(char *z, int n){ int i, j; if( n<0 ) n = strlen(z); #ifdef __MINGW32__ for(i=0; i<n; i++){ if( z[i]=='\\' ) z[i] = '/'; } #endif while( n>1 && z[n-1]=='/' ){ n--; } for(i=j=0; i<n; i++){ |
︙ | ︙ |
Added src/graph.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 | /* ** Copyright (c) 2010 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public ** License version 2 as published by the Free Software Foundation. ** ** This program is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** General Public License for more details. ** ** You should have received a copy of the GNU General Public ** License along with this library; if not, write to the ** Free Software Foundation, Inc., 59 Temple Place - Suite 330, ** Boston, MA 02111-1307, USA. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ******************************************************************************* ** ** This file contains code to compute a revision history graph. */ #include "config.h" #include "graph.h" #include <assert.h> #if INTERFACE #define GR_MAX_PARENT 10 #define GR_MAX_RAIL 32 /* The graph appears vertically beside a timeline. Each row in the ** timeline corresponds to a row in the graph. */ struct GraphRow { int rid; /* The rid for the check-in */ int isLeaf; /* True if the check-in is an open leaf */ int nParent; /* Number of parents */ int aParent[GR_MAX_PARENT]; /* Array of parents. 0 element is primary .*/ char *zBranch; /* Branch name */ GraphRow *pNext; /* Next row down in the list of all rows */ GraphRow *pPrev; /* Previous row */ int idx; /* Row index. First is 1. 0 used for "none" */ int iRail; /* Which rail this check-in appears on. 0-based.*/ int aiRaiser[GR_MAX_RAIL]; /* Raisers from this node to a higher row. */ int bDescender; /* Raiser from bottom of graph to here. */ u32 mergeIn; /* Merge in from other rails */ int mergeOut; /* Merge out to this rail */ int mergeUpto; /* Draw the merge rail up to this level */ u32 railInUse; /* Mask of occupied rails */ }; /* Context while building a graph */ struct GraphContext { int nErr; /* Number of errors encountered */ int mxRail; /* Number of rails required to render the graph */ GraphRow *pFirst; /* First row in the list */ GraphRow *pLast; /* Last row in the list */ int nBranch; /* Number of distinct branches */ char **azBranch; /* Names of the branches */ int railMap[GR_MAX_RAIL]; /* Rail order mapping */ }; #endif /* ** Malloc for zeroed space. Panic if unable to provide the ** requested space. */ void *safeMalloc(int nByte){ void *p = malloc(nByte); if( p==0 ) fossil_panic("out of memory"); memset(p, 0, nByte); return p; } /* ** Create and initialize a GraphContext */ GraphContext *graph_init(void){ return (GraphContext*)safeMalloc( sizeof(GraphContext) ); } /* ** Destroy a GraphContext; */ void graph_free(GraphContext *p){ int i; GraphRow *pRow; while( p->pFirst ){ pRow = p->pFirst; p->pFirst = pRow->pNext; free(pRow); } for(i=0; i<p->nBranch; i++) free(p->azBranch[i]); free(p->azBranch); free(p); } /* ** Return the canonical pointer for a given branch name. ** Multiple calls to this routine with equivalent strings ** will return the same pointer. */ static char *persistBranchName(GraphContext *p, const char *zBranch){ int i; for(i=0; i<p->nBranch; i++){ if( strcmp(zBranch, p->azBranch[i])==0 ) return p->azBranch[i]; } p->nBranch++; p->azBranch = realloc(p->azBranch, sizeof(char*)*p->nBranch); if( p->azBranch==0 ) fossil_panic("out of memory"); p->azBranch[p->nBranch-1] = mprintf("%s", zBranch); return p->azBranch[p->nBranch-1]; } /* ** Add a new row t the graph context. Rows are added from top to bottom. */ void graph_add_row( GraphContext *p, /* The context to which the row is added */ int rid, /* RID for the check-in */ int isLeaf, /* True if the check-in is an leaf */ int nParent, /* Number of parents */ int *aParent, /* Array of parents */ const char *zBranch /* Branch for this check-in */ ){ GraphRow *pRow; if( p->nErr ) return; if( nParent>GR_MAX_PARENT ){ p->nErr++; return; } pRow = (GraphRow*)safeMalloc( sizeof(GraphRow) ); pRow->rid = rid; pRow->isLeaf = isLeaf; pRow->nParent = nParent; pRow->zBranch = persistBranchName(p, zBranch); memcpy(pRow->aParent, aParent, sizeof(aParent[0])*nParent); if( p->pFirst==0 ){ p->pFirst = pRow; }else{ p->pLast->pNext = pRow; } p->pLast = pRow; } /* ** Return the index of a rail currently not in use for any row between ** top and bottom, inclusive. */ static int findFreeRail(GraphContext *p, int top, int btm, u32 inUseMask){ GraphRow *pRow; int i; for(pRow=p->pFirst; pRow && pRow->idx<top; pRow=pRow->pNext){} while( pRow && pRow->idx<=btm ){ inUseMask |= pRow->railInUse; pRow = pRow->pNext; } for(i=0; i<32; i++){ if( (inUseMask & (1<<i))==0 ) return i; } p->nErr++; return 0; } /* ** Compute the complete graph */ void graph_finish(GraphContext *p){ GraphRow *pRow, *pDesc; Bag allRids; int i; int nRow; u32 mask; u32 inUse; if( p==0 || p->pFirst==0 || p->nErr ) return; /* Initialize all rows */ bag_init(&allRids); nRow = 0; for(pRow=p->pFirst; pRow; pRow=pRow->pNext){ if( pRow->pNext ) pRow->pNext->pPrev = pRow; pRow->idx = ++nRow; pRow->iRail = -1; pRow->mergeOut = -1; bag_insert(&allRids, pRow->rid); } p->mxRail = -1; /* Purge merge-parents that are out-of-graph */ for(pRow=p->pFirst; pRow; pRow=pRow->pNext){ for(i=1; i<pRow->nParent; i++){ if( !bag_find(&allRids, pRow->aParent[i]) ){ pRow->aParent[i] = pRow->aParent[--pRow->nParent]; i--; } } } /* Identify rows where the primary parent is off screen. Assign ** each to a rail and draw descenders to the bottom of the screen. */ for(pRow=p->pFirst; pRow; pRow=pRow->pNext){ if( pRow->nParent==0 || !bag_find(&allRids,pRow->aParent[0]) ){ pRow->iRail = ++p->mxRail; pRow->bDescender = pRow->nParent>0; mask = 1<<(pRow->iRail); for(pDesc=pRow; pDesc; pDesc=pDesc->pNext){ pDesc->railInUse |= mask; } } } /* Assign rails to all rows that are still unassigned. ** The first primary child of a row goes on the same rail as ** that row. */ inUse = 0; for(pRow=p->pLast; pRow; pRow=pRow->pPrev){ int parentRid; if( pRow->iRail>=0 ) continue; assert( pRow->nParent>0 ); parentRid = pRow->aParent[0]; assert( bag_find(&allRids, parentRid) ); for(pDesc=pRow->pNext; pDesc && pDesc->rid!=parentRid; pDesc=pDesc->pNext){} assert( pDesc!=0 ); if( pDesc->aiRaiser[pDesc->iRail]==0 && pDesc->zBranch==pRow->zBranch ){ pRow->iRail = pDesc->iRail; }else{ pRow->iRail = findFreeRail(p, 0, pDesc->idx, inUse); } pDesc->aiRaiser[pRow->iRail] = pRow->idx; mask = 1<<pRow->iRail; if( pRow->isLeaf ){ inUse &= ~mask; }else{ inUse |= mask; } for(pDesc = pRow; ; pDesc=pDesc->pNext){ assert( pDesc!=0 ); pDesc->railInUse |= mask; if( pDesc->rid==parentRid ) break; } } /* ** Insert merge rails and merge arrows */ for(pRow=p->pFirst; pRow; pRow=pRow->pNext){ for(i=1; i<pRow->nParent; i++){ int parentRid = pRow->aParent[i]; for(pDesc=pRow->pNext; pDesc && pDesc->rid!=parentRid; pDesc=pDesc->pNext){} if( pDesc==0 ) continue; if( pDesc->mergeOut<0 ){ pDesc->mergeOut = findFreeRail(p, pRow->idx, pDesc->idx, 0); pDesc->mergeUpto = pRow->idx; } pRow->mergeIn |= 1<<pDesc->mergeOut; } } /* ** Sort the rail numbers */ #if 0 p->mxRail = -1; mask = 0; for(pRow=p->pLast; pRow; pRow=pRow->pPrev){ if( (mask & (1<<pRow->iRail))==0 ){ p->railMap[pRow->iRail] = ++p->mxRail; mask |= 1<<pRow->iRail; } if( pRow->mergeOut>=0 && (mask & (1<<pRow->mergeOut))==0 ){ p->railMap[pRow->mergeOut] = ++p->mxRail; mask |= 1<<pRow->mergeOut; } } #else for(i=0; i<GR_MAX_RAIL; i++) p->railMap[i] = i; p->mxRail = 0; for(pRow=p->pFirst; pRow; pRow=pRow->pNext){ if( pRow->iRail>p->mxRail ) p->mxRail = pRow->iRail; if( pRow->mergeOut>p->mxRail ) p->mxRail = pRow->mergeOut; } #endif } |
Changes to src/main.c.
︙ | ︙ | |||
451 452 453 454 455 456 457 | zSpacer = " "; } printf("\n"); } } /* | | | 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | zSpacer = " "; } printf("\n"); } } /* ** COM -off- MAND: commands ** ** Usage: %fossil commands ** List all supported commands. */ void cmd_cmd_list(void){ int i, nCmd; const char *aCmd[count(aCommand)]; |
︙ | ︙ | |||
539 540 541 542 543 544 545 | } } putchar('\n'); } /* ** Set the g.zBaseURL value to the full URL for the toplevel of | | | 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 | } } putchar('\n'); } /* ** Set the g.zBaseURL value to the full URL for the toplevel of ** the fossil tree. Set g.zTop to g.zBaseURL without the ** leading "http://" and the host and port. */ void set_base_url(void){ int i; const char *zHost = PD("HTTP_HOST",""); const char *zMode = PD("HTTPS","off"); const char *zCur = PD("SCRIPT_NAME","/"); |
︙ | ︙ | |||
565 566 567 568 569 570 571 572 573 574 575 | /* ** Send an HTTP redirect back to the designated Index Page. */ void fossil_redirect_home(void){ cgi_redirectf("%s%s", g.zBaseURL, db_get("index-page", "/index")); } /* ** Preconditions: ** | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < | 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 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 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 | /* ** Send an HTTP redirect back to the designated Index Page. */ void fossil_redirect_home(void){ cgi_redirectf("%s%s", g.zBaseURL, db_get("index-page", "/index")); } /* ** If running as root, chroot to the directory containing the ** repository zRepo and then drop root privileges. Return the ** new repository name. ** ** zRepo might be a directory itself. In that case chroot into ** the directory zRepo. ** ** Assume the user-id and group-id of the repository, or if zRepo ** is a directory, of that directory. */ static char *enter_chroot_jail(char *zRepo){ #if !defined(__MINGW32__) if( getuid()==0 ){ int i; struct stat sStat; Blob dir; char *zDir; file_canonical_name(zRepo, &dir); zDir = blob_str(&dir); if( file_isdir(zDir)==1 ){ chdir(zDir); chroot(zDir); zRepo = "/"; }else{ for(i=strlen(zDir)-1; i>0 && zDir[i]!='/'; i--){} if( zDir[i]!='/' ) fossil_panic("bad repository name: %s", zRepo); zDir[i] = 0; chdir(zDir); chroot(zDir); zDir[i] = '/'; zRepo = &zDir[i]; } if( stat(zRepo, &sStat)!=0 ){ fossil_fatal("cannot stat() repository: %s", zRepo); } setgid(sStat.st_gid); setuid(sStat.st_uid); } #endif return zRepo; } /* ** Preconditions: ** ** * Environment variables are set up according to the CGI standard. ** ** If the repository is known, it has already been opened. If unknown, ** then g.zRepositoryName holds the directory that contains the repository ** and the actual repository is taken from the first element of PATH_INFO. ** ** Process the webpage specified by the PATH_INFO or REQUEST_URI ** environment variable. */ static void process_one_web_page(const char *zNotFound){ const char *zPathInfo; char *zPath = NULL; int idx; int i; /* If the repository has not been opened already, then find the ** repository based on the first element of PATH_INFO and open it. */ zPathInfo = P("PATH_INFO"); if( !g.repositoryOpen ){ char *zRepo; const char *zOldScript = PD("SCRIPT_NAME", ""); char *zNewScript; int j, k; i = 1; while( zPathInfo[i] && zPathInfo[i]!='/' ){ i++; } zRepo = mprintf("%s%.*s.fossil",g.zRepositoryName,i,zPathInfo); /* To avoid mischief, make sure the repository basename contains no ** characters other than alphanumerics, "-", and "_". */ for(j=strlen(g.zRepositoryName)+1, k=0; k<i-1; j++, k++){ if( !isalnum(zRepo[j]) && zRepo[j]!='-' ) zRepo[j] = '_'; } if( file_size(zRepo)<1024 ){ if( zNotFound ){ cgi_redirect(zNotFound); }else{ @ <h1>Not Found</h1> cgi_set_status(404, "not found"); cgi_reply(); } return; } zNewScript = mprintf("%s%.*s", zOldScript, i, zPathInfo); cgi_replace_parameter("PATH_INFO", &zPathInfo[i+1]); zPathInfo += i; cgi_replace_parameter("SCRIPT_NAME", zNewScript); db_open_repository(zRepo); if( g.fHttpTrace ){ fprintf(stderr, "# repository: [%s]\n" "# new PATH_INFO = [%s]\n" "# new SCRIPT_NAME = [%s]\n", zRepo, zPathInfo, zNewScript); } } /* Find the page that the user has requested, construct and deliver that ** page. */ if( g.zContentType && memcmp(g.zContentType, "application/x-fossil", 20)==0 ){ zPathInfo = "/xfer"; } set_base_url(); if( zPathInfo==0 || zPathInfo[0]==0 || (zPathInfo[0]=='/' && zPathInfo[1]==0) ){ fossil_redirect_home(); }else{ zPath = mprintf("%s", zPathInfo); } |
︙ | ︙ | |||
658 659 660 661 662 663 664 665 666 667 668 669 670 671 | ** ** The second line defines the name of the repository. After locating ** the repository, fossil will generate a webpage on stdout based on ** the values of standard CGI environment variables. */ void cmd_cgi(void){ const char *zFile; Blob config, line, key, value; if( g.argc==3 && strcmp(g.argv[1],"cgi")==0 ){ zFile = g.argv[2]; }else{ zFile = g.argv[1]; } g.httpOut = stdout; | > | 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 | ** ** The second line defines the name of the repository. After locating ** the repository, fossil will generate a webpage on stdout based on ** the values of standard CGI environment variables. */ void cmd_cgi(void){ const char *zFile; const char *zNotFound = 0; Blob config, line, key, value; if( g.argc==3 && strcmp(g.argv[1],"cgi")==0 ){ zFile = g.argv[2]; }else{ zFile = g.argv[1]; } g.httpOut = stdout; |
︙ | ︙ | |||
695 696 697 698 699 700 701 | cgi_setenv("HOME", blob_str(&value)); blob_reset(&value); continue; } if( blob_eq(&key, "repository:") && blob_token(&line, &value) ){ db_open_repository(blob_str(&value)); blob_reset(&value); | > > > > > | > > > > | > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > < < < < < < < < < < < < < < < < < < < < | < < < > | | 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 | cgi_setenv("HOME", blob_str(&value)); blob_reset(&value); continue; } if( blob_eq(&key, "repository:") && blob_token(&line, &value) ){ db_open_repository(blob_str(&value)); blob_reset(&value); continue; } if( blob_eq(&key, "directory:") && blob_token(&line, &value) ){ db_close(); g.zRepositoryName = mprintf("%s", blob_str(&value)); blob_reset(&value); continue; } if( blob_eq(&key, "notfound:") && blob_token(&line, &value) ){ zNotFound = mprintf("%s", blob_str(&value)); blob_reset(&value); continue; } } blob_reset(&config); if( g.db==0 && g.zRepositoryName==0 ){ cgi_panic("Unable to find or open the project repository"); } cgi_init(); process_one_web_page(zNotFound); } /* ** If g.argv[2] exists then it is either the name of a repository ** that will be used by a server, or else it is a directory that ** contains multiple repositories that can be served. If g.argv[2] ** is a directory, the repositories it contains must be named ** "*.fossil". If g.argv[2] does not exists, then we must be within ** a check-out and the repository to be served is the repository of ** that check-out. ** ** Open the respository to be served if it is known. If g.argv[2] is ** a directory full of repositories, then set g.zRepositoryName to ** the name of that directory and the specific repository will be ** opened later by process_one_web_page() based on the content of ** the PATH_INFO variable. ** ** If disallowDir is set, then the directory full of repositories method ** is disallowed. */ static void find_server_repository(int disallowDir){ if( g.argc<3 ){ db_must_be_within_tree(); }else if( !disallowDir && file_isdir(g.argv[2])==1 ){ g.zRepositoryName = mprintf("%s", g.argv[2]); file_simplify_name(g.zRepositoryName, -1); }else{ db_open_repository(g.argv[2]); } } /* ** undocumented format: ** ** fossil http REPOSITORY INFILE OUTFILE IPADDR ** ** The argv==6 form is used by the win32 server only. ** ** COMMAND: http ** ** Usage: %fossil http REPOSITORY [--notfound URL] ** ** Handle a single HTTP request appearing on stdin. The resulting webpage ** is delivered on stdout. This method is used to launch an HTTP request ** handler from inetd, for example. The argument is the name of the ** repository. ** ** If REPOSITORY is a directory that contains one or more respositories ** with names of the form "*.fossil" then the first element of the URL ** pathname selects among the various repositories. If the pathname does ** not select a valid repository and the --notfound option is available, ** then the server redirects (HTTP code 302) to the URL of --notfound. */ void cmd_http(void){ const char *zIpAddr; const char *zNotFound; zNotFound = find_option("notfound", 0, 1); if( g.argc!=2 && g.argc!=3 && g.argc!=6 ){ cgi_panic("no repository specified"); } g.cgiPanic = 1; g.fullHttpReply = 1; if( g.argc==6 ){ g.httpIn = fopen(g.argv[3], "rb"); g.httpOut = fopen(g.argv[4], "wb"); zIpAddr = g.argv[5]; }else{ g.httpIn = stdin; g.httpOut = stdout; zIpAddr = 0; } find_server_repository(0); g.zRepositoryName = enter_chroot_jail(g.zRepositoryName); cgi_handle_http_request(zIpAddr); process_one_web_page(zNotFound); } /* ** COMMAND: test-http ** Works like the http command but gives setup permission to all users. */ void cmd_test_http(void){ |
︙ | ︙ | |||
815 816 817 818 819 820 821 822 823 | ** TCP port 8080, or on any other TCP port defined by the -P or ** --port option. The optional argument is the name of the repository. ** The repository argument may be omitted if the working directory is ** within an open checkout. ** ** The "ui" command automatically starts a web browser after initializing ** the web server. */ void cmd_webserver(void){ | > > > > > | | | | > > > | < < | < | | 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 | ** TCP port 8080, or on any other TCP port defined by the -P or ** --port option. The optional argument is the name of the repository. ** The repository argument may be omitted if the working directory is ** within an open checkout. ** ** The "ui" command automatically starts a web browser after initializing ** the web server. ** ** In the "server" command, the REPOSITORY can be a directory (aka folder) ** that contains one or more respositories with names ending in ".fossil". ** In that case, the first element of the URL is used to select among the ** various repositories. */ void cmd_webserver(void){ int iPort, mxPort; /* Range of TCP ports allowed */ const char *zPort; /* Value of the --port option */ char *zBrowser; /* Name of web browser program */ char *zBrowserCmd = 0; /* Command to launch the web browser */ int isUiCmd; /* True if command is "ui", not "server' */ const char *zNotFound; /* The --notfound option or NULL */ #ifdef __MINGW32__ const char *zStopperFile; /* Name of file used to terminate server */ zStopperFile = find_option("stopper", 0, 1); #endif g.thTrace = find_option("th-trace", 0, 0)!=0; if( g.thTrace ){ blob_zero(&g.thLog); } zPort = find_option("port", "P", 1); zNotFound = find_option("notfound", 0, 1); if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?"); isUiCmd = g.argv[1][0]=='u'; find_server_repository(isUiCmd); if( zPort ){ iPort = mxPort = atoi(zPort); }else{ iPort = db_get_int("http-port", 8080); mxPort = iPort+100; } #ifndef __MINGW32__ /* Unix implementation */ if( isUiCmd ){ #if !defined(__DARWIN__) && !defined(__APPLE__) zBrowser = db_get("web-browser", 0); if( zBrowser==0 ){ static char *azBrowserProg[] = { "xdg-open", "gnome-open", "firefox" }; int i; zBrowser = "echo"; for(i=0; i<sizeof(azBrowserProg)/sizeof(azBrowserProg[0]); i++){ |
︙ | ︙ | |||
875 876 877 878 879 880 881 | } g.httpIn = stdin; g.httpOut = stdout; if( g.fHttpTrace || g.fSqlTrace ){ fprintf(stderr, "====== SERVER pid %d =======\n", getpid()); } g.cgiPanic = 1; | < < < | < > | | | | 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 | } g.httpIn = stdin; g.httpOut = stdout; if( g.fHttpTrace || g.fSqlTrace ){ fprintf(stderr, "====== SERVER pid %d =======\n", getpid()); } g.cgiPanic = 1; find_server_repository(isUiCmd); g.zRepositoryName = enter_chroot_jail(g.zRepositoryName); cgi_handle_http_request(0); process_one_web_page(zNotFound); #else /* Win32 implementation */ if( isUiCmd ){ zBrowser = db_get("web-browser", "start"); zBrowserCmd = mprintf("%s http://127.0.0.1:%%d/", zBrowser); } db_close(); win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound); #endif } |
Changes to src/main.mk.
︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 | $(SRCDIR)/descendants.c \ $(SRCDIR)/diff.c \ $(SRCDIR)/diffcmd.c \ $(SRCDIR)/doc.c \ $(SRCDIR)/encode.c \ $(SRCDIR)/file.c \ $(SRCDIR)/finfo.c \ $(SRCDIR)/http.c \ $(SRCDIR)/http_socket.c \ $(SRCDIR)/http_transport.c \ $(SRCDIR)/info.c \ $(SRCDIR)/login.c \ $(SRCDIR)/main.c \ $(SRCDIR)/manifest.c \ | > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | $(SRCDIR)/descendants.c \ $(SRCDIR)/diff.c \ $(SRCDIR)/diffcmd.c \ $(SRCDIR)/doc.c \ $(SRCDIR)/encode.c \ $(SRCDIR)/file.c \ $(SRCDIR)/finfo.c \ $(SRCDIR)/graph.c \ $(SRCDIR)/http.c \ $(SRCDIR)/http_socket.c \ $(SRCDIR)/http_transport.c \ $(SRCDIR)/info.c \ $(SRCDIR)/login.c \ $(SRCDIR)/main.c \ $(SRCDIR)/manifest.c \ |
︙ | ︙ | |||
103 104 105 106 107 108 109 110 111 112 113 114 115 116 | descendants_.c \ diff_.c \ diffcmd_.c \ doc_.c \ encode_.c \ file_.c \ finfo_.c \ http_.c \ http_socket_.c \ http_transport_.c \ info_.c \ login_.c \ main_.c \ manifest_.c \ | > | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | descendants_.c \ diff_.c \ diffcmd_.c \ doc_.c \ encode_.c \ file_.c \ finfo_.c \ graph_.c \ http_.c \ http_socket_.c \ http_transport_.c \ info_.c \ login_.c \ main_.c \ manifest_.c \ |
︙ | ︙ | |||
172 173 174 175 176 177 178 179 180 181 182 183 184 185 | descendants.o \ diff.o \ diffcmd.o \ doc.o \ encode.o \ file.o \ finfo.o \ http.o \ http_socket.o \ http_transport.o \ info.o \ login.o \ main.o \ manifest.o \ | > | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | descendants.o \ diff.o \ diffcmd.o \ doc.o \ encode.o \ file.o \ finfo.o \ graph.o \ http.o \ http_socket.o \ http_transport.o \ info.o \ login.o \ main.o \ manifest.o \ |
︙ | ︙ | |||
256 257 258 259 260 261 262 | # $(SRCDIR)/../manifest: # noop clean: rm -f *.o *_.c $(APPNAME) VERSION.h rm -f translate makeheaders mkindex page_index.h headers | | | | 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | # $(SRCDIR)/../manifest: # noop clean: rm -f *.o *_.c $(APPNAME) VERSION.h rm -f translate makeheaders mkindex page_index.h headers rm -f add.h allrepo.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h finfo.h graph.h http.h http_socket.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h pqueue.h printf.h rebuild.h report.h rss.h schema.h search.h setup.h sha1.h shun.h skins.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h page_index.h: $(TRANS_SRC) mkindex ./mkindex $(TRANS_SRC) >$@ headers: page_index.h makeheaders VERSION.h ./makeheaders add_.c:add.h allrepo_.c:allrepo.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h touch headers headers: Makefile Makefile: add_.c: $(SRCDIR)/add.c translate ./translate $(SRCDIR)/add.c >add_.c add.o: add_.c add.h $(SRCDIR)/config.h |
︙ | ︙ | |||
440 441 442 443 444 445 446 447 448 449 450 451 452 453 | finfo_.c: $(SRCDIR)/finfo.c translate ./translate $(SRCDIR)/finfo.c >finfo_.c finfo.o: finfo_.c finfo.h $(SRCDIR)/config.h $(XTCC) -o finfo.o -c finfo_.c finfo.h: headers http_.c: $(SRCDIR)/http.c translate ./translate $(SRCDIR)/http.c >http_.c http.o: http_.c http.h $(SRCDIR)/config.h $(XTCC) -o http.o -c http_.c http.h: headers | > > > > > > > | 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 | finfo_.c: $(SRCDIR)/finfo.c translate ./translate $(SRCDIR)/finfo.c >finfo_.c finfo.o: finfo_.c finfo.h $(SRCDIR)/config.h $(XTCC) -o finfo.o -c finfo_.c finfo.h: headers graph_.c: $(SRCDIR)/graph.c translate ./translate $(SRCDIR)/graph.c >graph_.c graph.o: graph_.c graph.h $(SRCDIR)/config.h $(XTCC) -o graph.o -c graph_.c graph.h: headers http_.c: $(SRCDIR)/http.c translate ./translate $(SRCDIR)/http.c >http_.c http.o: http_.c http.h $(SRCDIR)/config.h $(XTCC) -o http.o -c http_.c http.h: headers |
︙ | ︙ |
Changes to src/makemake.tcl.
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 | descendants diff diffcmd doc encode file finfo http http_socket http_transport info login main manifest | > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | descendants diff diffcmd doc encode file finfo graph http http_socket http_transport info login main manifest |
︙ | ︙ |
Changes to src/name.c.
︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | /* ** This routine takes a user-entered UUID which might be in mixed ** case and might only be a prefix of the full UUID and converts it ** into the full-length UUID in canonical form. ** ** If the input is not a UUID or a UUID prefix, then try to resolve ** the name as a tag. If multiple tags match, pick the latest. ** ** Return the number of errors. */ int name_to_uuid(Blob *pName, int iErrPriority){ int rc; int sz; sz = blob_size(pName); if( sz>UUID_SIZE || sz<4 || !validate16(blob_buffer(pName), sz) ){ char *zUuid; const char *zName = blob_str(pName); if( memcmp(zName, "tag:", 4)==0 ){ zName += 4; | > > > > > > > | | > > > > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | /* ** This routine takes a user-entered UUID which might be in mixed ** case and might only be a prefix of the full UUID and converts it ** into the full-length UUID in canonical form. ** ** If the input is not a UUID or a UUID prefix, then try to resolve ** the name as a tag. If multiple tags match, pick the latest. ** If the input name matches "tag:*" then always resolve as a tag. ** ** If the input is not a tag, then try to match it as an ISO-8601 date ** string YYYY-MM-DD HH:MM:SS and pick the nearest check-in to that date. ** If the input is of the form "date:*" or "localtime:*" or "utc:*" then ** always resolve the name as a date. ** ** Return the number of errors. */ int name_to_uuid(Blob *pName, int iErrPriority){ int rc; int sz; sz = blob_size(pName); if( sz>UUID_SIZE || sz<4 || !validate16(blob_buffer(pName), sz) ){ char *zUuid; const char *zName = blob_str(pName); if( memcmp(zName, "tag:", 4)==0 ){ zName += 4; zUuid = tag_to_uuid(zName); }else{ zUuid = tag_to_uuid(zName); if( zUuid==0 ){ zUuid = date_to_uuid(zName); } } if( zUuid ){ blob_reset(pName); blob_append(pName, zUuid, -1); free(zUuid); return 0; } fossil_error(iErrPriority, "not a valid object name: %s", zName); |
︙ | ︙ | |||
121 122 123 124 125 126 127 128 129 130 131 132 133 134 | " AND event.objid=tagxref.rid " " AND blob.rid=event.objid " " ORDER BY event.mtime DESC ", zTag ); return zUuid; } /* ** COMMAND: test-name-to-id ** ** Convert a name to a full artifact ID. */ void test_name_to_id(void){ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 | " AND event.objid=tagxref.rid " " AND blob.rid=event.objid " " ORDER BY event.mtime DESC ", zTag ); return zUuid; } /* ** Convert a date/time string into a UUID. ** ** Input forms accepted: ** ** date:DATE ** local:DATE ** utc:DATE ** ** The DATE is interpreted as localtime unless the "utc:" prefix is used ** or a "utc" string appears at the end of the DATE string. */ char *date_to_uuid(const char *zDate){ int useUtc = 0; int n; char *zCopy = 0; char *zUuid; if( memcmp(zDate, "date:", 5)==0 ){ zDate += 5; }else if( memcmp(zDate, "local:", 6)==0 ){ zDate += 6; }else if( memcmp(zDate, "utc:", 4)==0 ){ zDate += 4; useUtc = 1; } n = strlen(zDate); if( n<10 || zDate[4]!='-' || zDate[7]!='-' ) return 0; if( n>4 && sqlite3_strnicmp(&zDate[n-3], "utc", 3)==0 ){ zCopy = mprintf("%s", zDate); zCopy[n-3] = 0; zDate = zCopy; n -= 3; useUtc = 1; } zUuid = db_text(0, "SELECT (SELECT uuid FROM blob WHERE rid=event.objid)" " FROM event" " WHERE mtime<=julianday(%Q %s) AND type='ci'" " ORDER BY mtime DESC LIMIT 1", zDate, useUtc ? "" : ",'utc'" ); free(zCopy); return zUuid; } /* ** COMMAND: test-name-to-id ** ** Convert a name to a full artifact ID. */ void test_name_to_id(void){ |
︙ | ︙ |
Changes to src/rss.c.
︙ | ︙ | |||
45 46 47 48 49 50 51 52 53 54 55 | @ coalesce(ecomment,comment), @ coalesce(euser,user), @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim), @ (SELECT count(*) FROM plink WHERE cid=blob.rid) @ FROM event, blob @ WHERE blob.rid=event.objid ; blob_zero(&bSQL); blob_append( &bSQL, zSQL1, -1 ); if( zType[0]!='a' ){ | > > > > > > > > > | > > > > > > > > > > > > > > > > > > > | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | @ coalesce(ecomment,comment), @ coalesce(euser,user), @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim), @ (SELECT count(*) FROM plink WHERE cid=blob.rid) @ FROM event, blob @ WHERE blob.rid=event.objid ; login_check_credentials(); if( !g.okRead && !g.okRdTkt && !g.okRdWiki ){ return; } blob_zero(&bSQL); blob_append( &bSQL, zSQL1, -1 ); if( zType[0]!='a' ){ if( zType[0]=='c' && !g.okRead ) zType = "x"; if( zType[0]=='w' && !g.okRdWiki ) zType = "x"; if( zType[0]=='t' && !g.okRdTkt ) zType = "x"; blob_appendf(&bSQL, " AND event.type=%Q", zType); }else{ if( !g.okRead ){ if( g.okRdTkt && g.okRdWiki ){ blob_append(&bSQL, " AND event.type!='ci'", -1); }else if( g.okRdTkt ){ blob_append(&bSQL, " AND event.type=='t'", -1); }else{ blob_append(&bSQL, " AND event.type=='w'", -1); } }else if( !g.okRdWiki ){ if( g.okRdTkt ){ blob_append(&bSQL, " AND event.type!='w'", -1); }else{ blob_append(&bSQL, " AND event.type=='ci'", -1); } }else if( !g.okRdTkt ){ assert( !g.okRdTkt &&& g.okRead && g.okRdWiki ); blob_append(&bSQL, " AND event.type!='t'", -1); } } blob_append( &bSQL, " ORDER BY event.mtime DESC", -1 ); cgi_set_content_type("application/rss+xml"); zProjectName = db_get("project-name", 0); |
︙ | ︙ | |||
76 77 78 79 80 81 82 | @ <rss version="2.0"> @ <channel> @ <title>%h(zProjectName)</title> @ <link>%s(g.zBaseURL)</link> @ <description>%h(zProjectDescr)</description> @ <pubDate>%s(zPubDate)</pubDate> @ <generator>Fossil version %s(MANIFEST_VERSION) %s(MANIFEST_DATE)</generator> | | | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | @ <rss version="2.0"> @ <channel> @ <title>%h(zProjectName)</title> @ <link>%s(g.zBaseURL)</link> @ <description>%h(zProjectDescr)</description> @ <pubDate>%s(zPubDate)</pubDate> @ <generator>Fossil version %s(MANIFEST_VERSION) %s(MANIFEST_DATE)</generator> db_prepare(&q, blob_str(&bSQL)); blob_reset( &bSQL ); while( db_step(&q)==SQLITE_ROW && nLine<=20 ){ const char *zId = db_column_text(&q, 1); const char *zCom = db_column_text(&q, 3); const char *zAuthor = db_column_text(&q, 4); char *zPrefix = ""; char *zDate; |
︙ | ︙ |
Changes to src/setup.c.
︙ | ︙ | |||
82 83 84 85 86 87 88 89 90 91 92 93 94 95 | "Change the logo image for the server"); setup_menu_entry("Shunned", "shun", "Show artifacts that are shunned by this repository"); setup_menu_entry("Log", "rcvfromlist", "A record of received artifacts and their sources"); setup_menu_entry("Stats", "stat", "Display repository statistics"); @ </table> style_footer(); } /* ** WEBPAGE: setup_ulist | > > | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | "Change the logo image for the server"); setup_menu_entry("Shunned", "shun", "Show artifacts that are shunned by this repository"); setup_menu_entry("Log", "rcvfromlist", "A record of received artifacts and their sources"); setup_menu_entry("Stats", "stat", "Display repository statistics"); setup_menu_entry("Sync now", "setup_sync", "Sync this repository with the 'remote-url' it was set up with"); @ </table> style_footer(); } /* ** WEBPAGE: setup_ulist |
︙ | ︙ | |||
1043 1044 1045 1046 1047 1048 1049 | @ <p><b>Note:</b> Your browser has probably cached the logo image, so @ you will probably need to press the Reload button on your browser after @ changing the logo to provoke your browser to reload the new logo image. @ </p> style_footer(); db_end_transaction(0); } | > > > > > > > > > > | 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 | @ <p><b>Note:</b> Your browser has probably cached the logo image, so @ you will probably need to press the Reload button on your browser after @ changing the logo to provoke your browser to reload the new logo image. @ </p> style_footer(); db_end_transaction(0); } /* ** WEBPAGE: setup_sync */ void setup_sync(void){ sync_cmd(); style_header("Synchronized"); @ <p>The project has been synchronized</p> style_footer(); } |
Changes to src/sha1.c.
︙ | ︙ | |||
605 606 607 608 609 610 611 612 613 614 615 616 617 618 | */ void sha1sum_test(void){ int i; Blob in; Blob cksum; for(i=2; i<g.argc; i++){ if( g.argv[i][0]=='-' && g.argv[i][1]==0 ){ blob_read_from_channel(&in, stdin, -1); sha1sum_blob(&in, &cksum); }else{ sha1sum_file(g.argv[i], &cksum); } printf("%s %s\n", blob_str(&cksum), g.argv[i]); | > | 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | */ void sha1sum_test(void){ int i; Blob in; Blob cksum; for(i=2; i<g.argc; i++){ blob_init(&cksum, "************** not found ***************", -1); if( g.argv[i][0]=='-' && g.argv[i][1]==0 ){ blob_read_from_channel(&in, stdin, -1); sha1sum_blob(&in, &cksum); }else{ sha1sum_file(g.argv[i], &cksum); } printf("%s %s\n", blob_str(&cksum), g.argv[i]); |
︙ | ︙ |
Changes to src/timeline.c.
︙ | ︙ | |||
151 152 153 154 155 156 157 158 159 160 161 162 163 164 | /* ** Allowed flags for the tmFlags argument to www_print_timeline */ #if INTERFACE #define TIMELINE_ARTID 0x0001 /* Show artifact IDs on non-check-in lines */ #define TIMELINE_LEAFONLY 0x0002 /* Show "Leaf", but not "Merge", "Fork" etc */ #define TIMELINE_BRIEF 0x0004 /* Combine adjacent elements of same object */ #endif /* ** Output a timeline in the web format given a query. The query ** should return these columns: ** ** 0. rid | > | 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | /* ** Allowed flags for the tmFlags argument to www_print_timeline */ #if INTERFACE #define TIMELINE_ARTID 0x0001 /* Show artifact IDs on non-check-in lines */ #define TIMELINE_LEAFONLY 0x0002 /* Show "Leaf", but not "Merge", "Fork" etc */ #define TIMELINE_BRIEF 0x0004 /* Combine adjacent elements of same object */ #define TIMELINE_GRAPH 0x0008 /* Compute a graph */ #endif /* ** Output a timeline in the web format given a query. The query ** should return these columns: ** ** 0. rid |
︙ | ︙ | |||
182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | ){ int wikiFlags; int mxWikiLen; Blob comment; int prevTagid = 0; int suppressCnt = 0; char zPrevDate[20]; zPrevDate[0] = 0; mxWikiLen = db_get_int("timeline-max-comment", 0); if( db_get_boolean("timeline-block-markup", 0) ){ wikiFlags = WIKI_INLINE; }else{ wikiFlags = WIKI_INLINE | WIKI_NOBLOCK; } db_multi_exec( "CREATE TEMP TABLE IF NOT EXISTS seen(rid INTEGER PRIMARY KEY);" "DELETE FROM seen;" ); @ <table cellspacing=0 border=0 cellpadding=0> blob_zero(&comment); while( db_step(pQuery)==SQLITE_ROW ){ int rid = db_column_int(pQuery, 0); const char *zUuid = db_column_text(pQuery, 1); int nPChild = db_column_int(pQuery, 5); int nParent = db_column_int(pQuery, 6); int isLeaf = db_column_int(pQuery, 7); const char *zBgClr = db_column_text(pQuery, 8); const char *zDate = db_column_text(pQuery, 2); const char *zType = db_column_text(pQuery, 9); const char *zUser = db_column_text(pQuery, 4); const char *zTagList = db_column_text(pQuery, 10); int tagid = db_column_int(pQuery, 11); int commentColumn = 3; /* Column containing comment text */ if( tagid ){ if( tagid==prevTagid ){ if( tmFlags & TIMELINE_BRIEF ){ suppressCnt++; continue; }else{ commentColumn = 12; | > > > > > > | 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 | ){ int wikiFlags; int mxWikiLen; Blob comment; int prevTagid = 0; int suppressCnt = 0; char zPrevDate[20]; GraphContext *pGraph = 0; zPrevDate[0] = 0; mxWikiLen = db_get_int("timeline-max-comment", 0); if( db_get_boolean("timeline-block-markup", 0) ){ wikiFlags = WIKI_INLINE; }else{ wikiFlags = WIKI_INLINE | WIKI_NOBLOCK; } if( tmFlags & TIMELINE_GRAPH ){ pGraph = graph_init(); @ <div id="canvas" style="position:relative;width:1px;height:1px;"></div> } db_multi_exec( "CREATE TEMP TABLE IF NOT EXISTS seen(rid INTEGER PRIMARY KEY);" "DELETE FROM seen;" ); @ <table cellspacing=0 border=0 cellpadding=0> blob_zero(&comment); while( db_step(pQuery)==SQLITE_ROW ){ int rid = db_column_int(pQuery, 0); const char *zUuid = db_column_text(pQuery, 1); int nPChild = db_column_int(pQuery, 5); int nParent = db_column_int(pQuery, 6); int isLeaf = db_column_int(pQuery, 7); const char *zBgClr = db_column_text(pQuery, 8); const char *zDate = db_column_text(pQuery, 2); const char *zType = db_column_text(pQuery, 9); const char *zUser = db_column_text(pQuery, 4); const char *zTagList = db_column_text(pQuery, 10); int tagid = db_column_int(pQuery, 11); int commentColumn = 3; /* Column containing comment text */ char zTime[8]; if( tagid ){ if( tagid==prevTagid ){ if( tmFlags & TIMELINE_BRIEF ){ suppressCnt++; continue; }else{ commentColumn = 12; |
︙ | ︙ | |||
234 235 236 237 238 239 240 | if( strcmp(zType,"div")==0 ){ @ <tr><td colspan=3><hr></td></tr> continue; } db_multi_exec("INSERT OR IGNORE INTO seen VALUES(%d)", rid); if( memcmp(zDate, zPrevDate, 10) ){ sprintf(zPrevDate, "%.10s", zDate); | | | > > | | | | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | if( strcmp(zType,"div")==0 ){ @ <tr><td colspan=3><hr></td></tr> continue; } db_multi_exec("INSERT OR IGNORE INTO seen VALUES(%d)", rid); if( memcmp(zDate, zPrevDate, 10) ){ sprintf(zPrevDate, "%.10s", zDate); @ <tr><td> @ <div class="divider"><nobr>%s(zPrevDate)</nobr></div> @ </td></tr> } memcpy(zTime, &zDate[11], 5); zTime[5] = 0; @ <tr> @ <td valign="top" align="right">%s(zTime)</td> @ <td width="20" align="center" valign="top"> @ <div id="m%d(rid)"></div> if( zBgClr && zBgClr[0] ){ @ <td valign="top" align="left" bgcolor="%h(zBgClr)"> }else{ @ <td valign="top" align="left"> } if( zType[0]=='c' ){ const char *azTag[5]; int nTag = 0; hyperlink_to_uuid(zUuid); if( (tmFlags & TIMELINE_LEAFONLY)==0 ){ if( nParent>1 ){ azTag[nTag++] = "Merge"; } if( nPChild>1 ){ if( count_nonbranch_children(rid)>1 ){ azTag[nTag++] = "Fork"; |
︙ | ︙ | |||
278 279 280 281 282 283 284 285 286 287 288 289 290 291 | } if( nTag>0 ){ int i; for(i=0; i<nTag; i++){ @ <b>%s(azTag[i])%s(i==nTag-1?"":",")</b> } } }else if( (tmFlags & TIMELINE_ARTID)!=0 ){ hyperlink_to_uuid(zUuid); } db_column_blob(pQuery, commentColumn, &comment); if( mxWikiLen>0 && blob_size(&comment)>mxWikiLen ){ Blob truncated; blob_zero(&truncated); | > > > > > > > > > > > > > > > > > > > > > > > > > > > | 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 | } if( nTag>0 ){ int i; for(i=0; i<nTag; i++){ @ <b>%s(azTag[i])%s(i==nTag-1?"":",")</b> } } if( pGraph ){ int nParent = 0; int aParent[32]; const char *zBr; static Stmt qparent; static Stmt qbranch; db_static_prepare(&qparent, "SELECT pid FROM plink WHERE cid=:rid ORDER BY isprim DESC" ); db_static_prepare(&qbranch, "SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0 AND rid=:rid", TAG_BRANCH ); db_bind_int(&qparent, ":rid", rid); while( db_step(&qparent)==SQLITE_ROW && nParent<32 ){ aParent[nParent++] = db_column_int(&qparent, 0); } db_reset(&qparent); db_bind_int(&qbranch, ":rid", rid); if( db_step(&qbranch)==SQLITE_ROW ){ zBr = db_column_text(&qbranch, 0); }else{ zBr = "trunk"; } graph_add_row(pGraph, rid, isLeaf, nParent, aParent, zBr); db_reset(&qbranch); } }else if( (tmFlags & TIMELINE_ARTID)!=0 ){ hyperlink_to_uuid(zUuid); } db_column_blob(pQuery, commentColumn, &comment); if( mxWikiLen>0 && blob_size(&comment)>mxWikiLen ){ Blob truncated; blob_zero(&truncated); |
︙ | ︙ | |||
308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 | @ </td></tr> } if( suppressCnt ){ @ <tr><td><td><td> @ <small><i>... %d(suppressCnt) similar @ event%s(suppressCnt>1?"s":"") omitted.</i></small></tr> suppressCnt = 0; } @ </table> } /* ** Create a temporary table suitable for storing timeline data. */ static void timeline_temp_table(void){ static const char zSql[] = | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 | @ </td></tr> } if( suppressCnt ){ @ <tr><td><td><td> @ <small><i>... %d(suppressCnt) similar @ event%s(suppressCnt>1?"s":"") omitted.</i></small></tr> suppressCnt = 0; } if( pGraph ){ graph_finish(pGraph); if( pGraph->nErr ){ graph_free(pGraph); pGraph = 0; }else{ @ <tr><td><td><div style="width:%d(pGraph->mxRail*20+30)px;"></div> } } @ </table> if( pGraph && pGraph->nErr==0 ){ GraphRow *pRow; int i; char cSep; @ <script type="text/JavaScript"> cgi_printf("var rowinfo = [\n"); for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){ cgi_printf("{id:\"m%d\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:", pRow->rid, pRow->iRail, pRow->bDescender, pRow->mergeOut, pRow->mergeUpto, pRow->aiRaiser[pRow->iRail] ); cSep = '['; for(i=0; i<GR_MAX_RAIL; i++){ if( i==pRow->iRail ) continue; if( pRow->aiRaiser[i]>0 ){ cgi_printf("%c%d,%d", cSep, pGraph->railMap[i], pRow->aiRaiser[i]); cSep = ','; } } if( cSep=='[' ) cgi_printf("["); cgi_printf("],mi:"); cSep = '['; for(i=0; i<GR_MAX_RAIL; i++){ if( pRow->mergeIn & (1<<i) ){ cgi_printf("%c%d", cSep, pGraph->railMap[i]); cSep = ','; } } if( cSep=='[' ) cgi_printf("["); cgi_printf("]}%s", pRow->pNext ? ",\n" : "];\n"); } cgi_printf("var nrail = %d\n", pGraph->mxRail+1); graph_free(pGraph); @ var canvasDiv = document.getElementById("canvas"); @ function drawBox(color,x0,y0,x1,y1){ @ var n = document.createElement("div"); @ if( x0>x1 ){ var t=x0; x0=x1; x1=t; } @ if( y0>y1 ){ var t=y0; y0=y1; y1=t; } @ var w = x1-x0+1; @ var h = y1-y0+1; @ n.setAttribute("style", @ "position:absolute;"+ @ "left:"+x0+"px;"+ @ "top:"+y0+"px;"+ @ "width:"+w+"px;"+ @ "height:"+h+"px;"+ @ "background-color:"+color+";" @ ); @ canvasDiv.appendChild(n); @ } @ function absoluteY(id){ @ var obj = document.getElementById(id); @ if( !obj ) return; @ var top = 0; @ if( obj.offsetParent ){ @ do{ @ top += obj.offsetTop; @ }while( obj = obj.offsetParent ); @ } @ return top; @ } @ function absoluteX(id){ @ var obj = document.getElementById(id); @ if( !obj ) return; @ var left = 0; @ if( obj.offsetParent ){ @ do{ @ left += obj.offsetLeft; @ }while( obj = obj.offsetParent ); @ } @ return left; @ } @ function drawUpArrow(x,y0,y1){ @ drawBox("black",x,y0,x+1,y1); @ if( y0+8>=y1 ){ @ drawBox("black",x-1,y0+1,x+2,y0+2); @ drawBox("black",x-2,y0+3,x+3,y0+4); @ }else{ @ drawBox("black",x-1,y0+2,x+2,y0+4); @ drawBox("black",x-2,y0+5,x+3,y0+7); @ } @ } @ function drawThinArrow(y,xFrom,xTo){ @ if( xFrom<xTo ){ @ drawBox("black",xFrom,y,xTo,y); @ drawBox("black",xTo-4,y-1,xTo-2,y+1); @ if( xTo>xFrom-8 ) drawBox("black",xTo-6,y-2,xTo-5,y+2); @ }else{ @ drawBox("black",xTo,y,xFrom,y); @ drawBox("black",xTo+2,y-1,xTo+4,y+1); @ if( xTo+8<xFrom ) drawBox("black",xTo+5,y-2,xTo+6,y+2); @ } @ } @ function drawThinLine(x0,y0,x1,y1){ @ drawBox("black",x0,y0,x1,y1); @ } @ function drawNode(p, left, btm){ @ drawBox("black",p.x-5,p.y-5,p.x+6,p.y+6); @ drawBox("white",p.x-4,p.y-4,p.x+5,p.y+5); @ if( p.u>0 ){ @ var u = rowinfo[p.u-1]; @ drawUpArrow(p.x, u.y+6, p.y-5); @ } @ if( p.d ){ @ drawUpArrow(p.x, p.y+6, btm); @ } @ if( p.mo>=0 ){ @ var x1 = p.mo*20 + left; @ var y1 = p.y-3; @ var x0 = x1>p.x ? p.x+7 : p.x-6; @ var u = rowinfo[p.mu-1]; @ var y0 = u.y+5; @ drawThinLine(x0,y1,x1,y1); @ drawThinLine(x1,y0,x1,y1); @ } @ var n = p.au.length; @ for(var i=0; i<n; i+=2){ @ var x1 = p.au[i]*20 + left; @ var x0 = x1>p.x ? p.x+7 : p.x-6; @ drawBox("black",x0,p.y,x1,p.y+1); @ var u = rowinfo[p.au[i+1]-1]; @ drawUpArrow(x1, u.y+6, p.y); @ } @ for(var j in p.mi){ @ var y0 = p.y+5; @ var mx = p.mi[j]*20 + left; @ if( mx>p.x ){ @ drawThinArrow(y0,mx,p.x+5); @ }else{ @ drawThinArrow(y0,mx,p.x-5); @ } @ } @ } @ function renderGraph(){ @ var canvasDiv = document.getElementById("canvas"); @ for(var i=canvasDiv.childNodes.length-1; i>=0; i--){ @ var c = canvasDiv.childNodes[i]; @ delete canvasDiv.removeChild(c); @ } @ var canvasY = absoluteY("canvas"); @ var left = absoluteX(rowinfo[0].id) - absoluteX("canvas") + 15; @ for(var i in rowinfo){ @ rowinfo[i].y = absoluteY(rowinfo[i].id) + 10 - canvasY; @ rowinfo[i].x = left + rowinfo[i].r*20; @ } @ var btm = rowinfo[rowinfo.length-1].y + 20; @ for(var i in rowinfo){ @ drawNode(rowinfo[i], left, btm); @ } @ } @ var lastId = rowinfo[rowinfo.length-1].id; @ var lastY = 0; @ function checkHeight(){ @ var h = absoluteY(lastId); @ if( h!=lastY ){ @ renderGraph(); @ lastY = h; @ } @ setTimeout("checkHeight();", 1000); @ } @ checkHeight(); @ </script> } } /* ** Create a temporary table suitable for storing timeline data. */ static void timeline_temp_table(void){ static const char zSql[] = |
︙ | ︙ | |||
459 460 461 462 463 464 465 | if( !g.okRead && !g.okRdTkt && !g.okRdWiki ){ login_needed(); return; } if( zTagName && g.okRead ){ tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname='sym-%q'", zTagName); }else{ tagid = 0; } if( zType[0]=='a' ){ | | | | 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 | if( !g.okRead && !g.okRdTkt && !g.okRdWiki ){ login_needed(); return; } if( zTagName && g.okRead ){ tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname='sym-%q'", zTagName); }else{ tagid = 0; } if( zType[0]=='a' ){ tmFlags = TIMELINE_BRIEF | TIMELINE_GRAPH; }else{ tmFlags = TIMELINE_GRAPH; } style_header("Timeline"); login_anonymous_available(); timeline_temp_table(); blob_zero(&sql); blob_zero(&desc); |
︙ | ︙ | |||
643 644 645 646 647 648 649 650 651 652 653 654 655 656 | blob_appendf(&desc, "%d %ss", n, zEType); } if( zUser ){ blob_appendf(&desc, " by user %h", zUser); } if( tagid>0 ){ blob_appendf(&desc, " tagged with \"%h\"", zTagName); } if( zAfter ){ blob_appendf(&desc, " occurring on or after %h.<br>", zAfter); }else if( zBefore ){ blob_appendf(&desc, " occurring on or before %h.<br>", zBefore); }else if( zCirca ){ blob_appendf(&desc, " occurring around %h.<br>", zCirca); | > | 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 | blob_appendf(&desc, "%d %ss", n, zEType); } if( zUser ){ blob_appendf(&desc, " by user %h", zUser); } if( tagid>0 ){ blob_appendf(&desc, " tagged with \"%h\"", zTagName); tmFlags &= ~TIMELINE_GRAPH; } if( zAfter ){ blob_appendf(&desc, " occurring on or after %h.<br>", zAfter); }else if( zBefore ){ blob_appendf(&desc, " occurring on or before %h.<br>", zBefore); }else if( zCirca ){ blob_appendf(&desc, " occurring around %h.<br>", zCirca); |
︙ | ︙ | |||
689 690 691 692 693 694 695 | } blob_zero(&sql); db_prepare(&q, "SELECT * FROM timeline ORDER BY timestamp DESC"); @ <h2>%b(&desc)</h2> blob_reset(&desc); www_print_timeline(&q, tmFlags, 0); db_finalize(&q); | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 902 903 904 905 906 907 908 909 910 911 912 913 914 915 | } blob_zero(&sql); db_prepare(&q, "SELECT * FROM timeline ORDER BY timestamp DESC"); @ <h2>%b(&desc)</h2> blob_reset(&desc); www_print_timeline(&q, tmFlags, 0); db_finalize(&q); style_footer(); } /* ** The input query q selects various records. Print a human-readable ** summary of those records. ** |
︙ | ︙ |
Changes to src/update.c.
︙ | ︙ | |||
76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | vid = db_lget_int("checkout", 0); if( vid==0 ){ fossil_fatal("cannot find current version"); } if( db_exists("SELECT 1 FROM vmerge") ){ fossil_fatal("cannot update an uncommitted merge"); } if( g.argc>=3 ){ if( strcmp(g.argv[2], "current")==0 ){ /* If VERSION is "current", then use the same algorithm to find the ** target as if VERSION were omitted. */ }else if( strcmp(g.argv[2], "latest")==0 ){ /* If VERSION is "latest", then use the same algorithm to find the ** target as if VERSION were omitted and the --latest flag is present. */ latestFlag = 1; }else{ tid = name_to_rid(g.argv[2]); if( tid==0 ){ fossil_fatal("no such version: %s", g.argv[2]); }else if( !is_a_version(tid) ){ fossil_fatal("no such version: %s", g.argv[2]); } } } | > < | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | vid = db_lget_int("checkout", 0); if( vid==0 ){ fossil_fatal("cannot find current version"); } if( db_exists("SELECT 1 FROM vmerge") ){ fossil_fatal("cannot update an uncommitted merge"); } if( !nochangeFlag ) autosync(AUTOSYNC_PULL); if( g.argc>=3 ){ if( strcmp(g.argv[2], "current")==0 ){ /* If VERSION is "current", then use the same algorithm to find the ** target as if VERSION were omitted. */ }else if( strcmp(g.argv[2], "latest")==0 ){ /* If VERSION is "latest", then use the same algorithm to find the ** target as if VERSION were omitted and the --latest flag is present. */ latestFlag = 1; }else{ tid = name_to_rid(g.argv[2]); if( tid==0 ){ fossil_fatal("no such version: %s", g.argv[2]); }else if( !is_a_version(tid) ){ fossil_fatal("no such version: %s", g.argv[2]); } } } if( tid==0 ){ compute_leaves(vid, 1); if( !latestFlag && db_int(0, "SELECT count(*) FROM leaves")>1 ){ db_prepare(&q, "%s " " AND event.objid IN leaves" |
︙ | ︙ |
Changes to src/wiki.c.
︙ | ︙ | |||
149 150 151 152 153 154 155 156 157 158 159 160 161 162 | @ <li> Use the <a href="%s(g.zBaseURL)/wiki?name=Sandbox">Sandbox</a> @ to experiment.</li> if( g.okNewWiki ){ @ <li> Create a <a href="%s(g.zBaseURL)/wikinew">new wiki page</a>.</li> } @ <li> <a href="%s(g.zBaseURL)/wcontent">List of All Wiki Pages</a> @ available on this server.</li> @ </ul> style_footer(); return; } if( check_name(zPageName) ) return; isSandbox = is_sandbox(zPageName); if( isSandbox ){ | > > > | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | @ <li> Use the <a href="%s(g.zBaseURL)/wiki?name=Sandbox">Sandbox</a> @ to experiment.</li> if( g.okNewWiki ){ @ <li> Create a <a href="%s(g.zBaseURL)/wikinew">new wiki page</a>.</li> } @ <li> <a href="%s(g.zBaseURL)/wcontent">List of All Wiki Pages</a> @ available on this server.</li> @ <li> <form method="GET" action="%s(g.zBaseURL)/wfind"> @ Search wiki titles: <input type="text" name="title"/> <input type="submit" /> @ </li> @ </ul> style_footer(); return; } if( check_name(zPageName) ) return; isSandbox = is_sandbox(zPageName); if( isSandbox ){ |
︙ | ︙ | |||
612 613 614 615 616 617 618 619 620 621 622 623 624 625 | if( !g.okRdWiki ){ login_needed(); return; } style_header("Available Wiki Pages"); @ <ul> db_prepare(&q, "SELECT substr(tagname, 6, 1000) FROM tag WHERE tagname GLOB 'wiki-*'" " ORDER BY lower(tagname)" ); while( db_step(&q)==SQLITE_ROW ){ const char *zName = db_column_text(&q, 0); @ <li><a href="%s(g.zBaseURL)/wiki?name=%T(zName)">%h(zName)</a></li> } db_finalize(&q); @ </ul> style_footer(); | > > > > > > > > > > > > > > > > > > > > > > > > > > | 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 | if( !g.okRdWiki ){ login_needed(); return; } style_header("Available Wiki Pages"); @ <ul> db_prepare(&q, "SELECT substr(tagname, 6, 1000) FROM tag WHERE tagname GLOB 'wiki-*'" " ORDER BY lower(tagname)" ); while( db_step(&q)==SQLITE_ROW ){ const char *zName = db_column_text(&q, 0); @ <li><a href="%s(g.zBaseURL)/wiki?name=%T(zName)">%h(zName)</a></li> } db_finalize(&q); @ </ul> style_footer(); } /* ** WEBPAGE: wfind ** ** URL: /wfind?title=TITLE ** List all wiki pages whose titles contain the search text */ void wfind_page(void){ Stmt q; const char * zTitle; login_check_credentials(); if( !g.okRdWiki ){ login_needed(); return; } zTitle = PD("title","*"); style_header("Wiki Pages Found"); @ <ul> db_prepare(&q, "SELECT substr(tagname, 6, 1000) FROM tag WHERE tagname like 'wiki-%%%q%%' ORDER BY lower(tagname)" , zTitle); while( db_step(&q)==SQLITE_ROW ){ const char *zName = db_column_text(&q, 0); @ <li><a href="%s(g.zBaseURL)/wiki?name=%T(zName)">%h(zName)</a></li> } db_finalize(&q); @ </ul> style_footer(); |
︙ | ︙ |
Changes to src/winhttp.c.
︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 | ** HTTP request. */ typedef struct HttpRequest HttpRequest; struct HttpRequest { int id; /* ID counter */ SOCKET s; /* Socket on which to receive data */ SOCKADDR_IN addr; /* Address from which data is coming */ }; /* ** Prefix for a temporary file. */ static char *zTempPrefix; | > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | ** HTTP request. */ typedef struct HttpRequest HttpRequest; struct HttpRequest { int id; /* ID counter */ SOCKET s; /* Socket on which to receive data */ SOCKADDR_IN addr; /* Address from which data is coming */ const char *zNotFound; /* --notfound option, or an empty string */ }; /* ** Prefix for a temporary file. */ static char *zTempPrefix; |
︙ | ︙ | |||
107 108 109 110 111 112 113 | }else{ break; } wanted -= got; } fclose(out); out = 0; | | | | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 | }else{ break; } wanted -= got; } fclose(out); out = 0; sprintf(zCmd, "\"%s\" http \"%s\" %s %s %s%s", g.argv[0], g.zRepositoryName, zRequestFName, zReplyFName, inet_ntoa(p->addr.sin_addr), p->zNotFound ); portable_system(zCmd); in = fopen(zReplyFName, "rb"); if( in ){ while( (got = fread(zHdr, 1, sizeof(zHdr), in))>0 ){ send(p->s, zHdr, got, 0); } |
︙ | ︙ | |||
135 136 137 138 139 140 141 | /* ** Start a listening socket and process incoming HTTP requests on ** that socket. */ void win32_http_server( int mnPort, int mxPort, /* Range of allowed TCP port numbers */ char *zBrowser, /* Command to launch browser. (Or NULL) */ | | > > > > > > > | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | /* ** Start a listening socket and process incoming HTTP requests on ** that socket. */ void win32_http_server( int mnPort, int mxPort, /* Range of allowed TCP port numbers */ char *zBrowser, /* Command to launch browser. (Or NULL) */ char *zStopper, /* Stop server when this file is exists (Or NULL) */ char *zNotFound /* The --notfound option, or NULL */ ){ WSADATA wd; SOCKET s = INVALID_SOCKET; SOCKADDR_IN addr; int idCnt = 0; int iPort = mnPort; char *zNotFoundOption; if( zStopper ) unlink(zStopper); if( zNotFound ){ zNotFoundOption = mprintf(" --notfound %s", zNotFound); }else{ zNotFoundOption = ""; } if( WSAStartup(MAKEWORD(1,1), &wd) ){ fossil_fatal("unable to initialize winsock"); } while( iPort<=mxPort ){ s = socket(AF_INET, SOCK_STREAM, 0); if( s==INVALID_SOCKET ){ fossil_fatal("unable to create a socket"); |
︙ | ︙ | |||
204 205 206 207 208 209 210 211 212 213 214 215 216 217 | p = malloc( sizeof(*p) ); if( p==0 ){ fossil_fatal("out of memory"); } p->id = ++idCnt; p->s = client; p->addr = client_addr; _beginthread(win32_process_one_http_request, 0, (void*)p); } closesocket(s); WSACleanup(); } #endif /* __MINGW32__ -- This code is for win32 only */ | > | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 | p = malloc( sizeof(*p) ); if( p==0 ){ fossil_fatal("out of memory"); } p->id = ++idCnt; p->s = client; p->addr = client_addr; p->zNotFound = zNotFoundOption; _beginthread(win32_process_one_http_request, 0, (void*)p); } closesocket(s); WSACleanup(); } #endif /* __MINGW32__ -- This code is for win32 only */ |
Changes to www/index.wiki.
︙ | ︙ | |||
54 55 56 57 58 59 60 | history and status information on that project. 3. <b>Autosync</b> - Fossil supports [./concepts.wiki#workflow | "autosync" mode] which helps to keep projects moving forward by reducing the amount of needless [./branching.wiki | forking and merging] often | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | history and status information on that project. 3. <b>Autosync</b> - Fossil supports [./concepts.wiki#workflow | "autosync" mode] which helps to keep projects moving forward by reducing the amount of needless [./branching.wiki | forking and merging] often associated with distributed projects. 4. <b>Self-Contained</b> - Fossil is a single stand-alone executable that contains everything needed to do configuration management. Installation is trivial: simply download a <a href="http://www.fossil-scm.org/download.html">precompiled binary</a> for Linux, Mac, or Windows and put it on your $PATH. |
︙ | ︙ |