Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch checkin-without-checkout Excluding Merge-Ins
This is equivalent to a diff from 44ac944a98 to 8d4ce834ed
2020-05-05
| ||
04:06 | Initial work on ajaxifying /fileedit. Fetching content, preview, and diffs are ajax'd, but save is not yet. check-in: 8edf9dbfc2 user: stephan tags: fileedit-ajaxify | |
2020-05-04
| ||
23:26 | Moved some generic fileedit code to style.c. Refactored /fileedit to not require JS to update version info, making this impl pure no-JS. Now to ajaxify it... Closed-Leaf check-in: 8d4ce834ed user: stephan tags: checkin-without-checkout | |
20:16 | Added /fileedit links to /finfo and /artifact. check-in: fe925e7d6d user: stephan tags: checkin-without-checkout | |
2020-05-03
| ||
17:46 | Wrap SSL-related features into a FOSSIL_ENABLE_SSL conditional in url.c. check-in: 0a59a82349 user: ashepilko tags: trunk | |
2020-04-30
| ||
16:14 | Merged in trunk for related changes. check-in: 03cce1c977 user: stephan tags: checkin-without-checkout | |
15:29 | Add the "forbid-delta-manifests" setting. check-in: 44ac944a98 user: drh tags: trunk | |
15:00 | Fix the file_perm() utility routine so that it actually uses the eFType parameter. check-in: 388b5e5982 user: drh tags: trunk | |
Changes to src/blob.c.
︙ | |||
475 476 477 478 479 480 481 482 483 484 485 486 487 488 | 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 | + + + + + + + + + + + + | ** nByte in size. The blob is truncated if necessary. */ void blob_resize(Blob *pBlob, unsigned int newSize){ pBlob->xRealloc(pBlob, newSize+1); pBlob->nUsed = newSize; pBlob->aData[newSize] = 0; } /* ** Ensures that the given blob has at least the given amount of memory ** allocated to it. Does not modify pBlob->nUsed nor will it reduce ** the currently-allocated amount of memory. */ void blob_reserve(Blob *pBlob, unsigned int newSize){ if(newSize>pBlob->nUsed){ pBlob->xRealloc(pBlob, newSize); pBlob->aData[newSize] = 0; } } /* ** Make sure a blob is nul-terminated and is not a pointer to unmanaged ** space. Return a pointer to the data. */ char *blob_materialize(Blob *pBlob){ blob_resize(pBlob, pBlob->nUsed); |
︙ | |||
1165 1166 1167 1168 1169 1170 1171 | 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 | - | blob_reset(&b1); blob_reset(&b2); blob_reset(&b3); } fossil_print("ok\n"); } |
︙ | |||
1189 1190 1191 1192 1193 1194 1195 | 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 | - | z[j] = 0; while( j>i ){ if( (z[--j] = z[--i]) =='\n' ){ z[--j] = '\r'; } } } |
︙ |
Changes to src/cgi.c.
︙ | |||
62 63 64 65 66 67 68 69 70 71 72 73 74 75 | 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 | + + + + + + + + + + + | #define PD(x,y) cgi_parameter((x),(y)) #define PT(x) cgi_parameter_trimmed((x),0) #define PDT(x,y) cgi_parameter_trimmed((x),(y)) #define PB(x) cgi_parameter_boolean(x) #define PCK(x) cgi_parameter_checked(x,1) #define PIF(x,y) cgi_parameter_checked(x,y) /* ** Shortcut for the cgi_printf() routine. Instead of using the ** ** @ ... ** ** notation provided by the translate.c utility, you can also ** optionally use: ** ** CX(...) */ #define CX cgi_printf /* ** Destinations for output text. */ #define CGI_HEADER 0 #define CGI_BODY 1 |
︙ |
Changes to src/checkin.c.
︙ | |||
1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 | 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 | + + + + + + + + + + + + + + + + + + - - - - - - + - - + + | g.aCommitFile[jj++] = ii; } g.aCommitFile[jj] = 0; bag_clear(&toCommit); } return result; } /* ** Returns true if the checkin identified by the first parameter is ** older than the given (valid) date/time string, else returns false. ** Also returns true if rid does not refer to a checkin, but it is not ** intended to be used for that case. */ int checkin_is_younger( int rid, /* The record ID of the ancestor */ const char *zDate /* Date & time of the current check-in */ ){ return db_exists( "SELECT 1 FROM event" " WHERE datetime(mtime)>=%Q" " AND type='ci' AND objid=%d", zDate, rid ) ? 0 : 1; } /* ** Make sure the current check-in with timestamp zDate is younger than its ** ancestor identified rid and zUuid. Throw a fatal error if not. */ static void checkin_verify_younger( int rid, /* The record ID of the ancestor */ const char *zUuid, /* The artifact ID of the ancestor */ const char *zDate /* Date & time of the current check-in */ ){ #ifndef FOSSIL_ALLOW_OUT_OF_ORDER_DATES |
︙ | |||
2327 2328 2329 2330 2331 2332 2333 | 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 | - - - + | /* ** Do not allow a commit against a closed leaf unless the commit ** ends up on a different branch. */ if( /* parent check-in has the "closed" tag... */ |
︙ |
Changes to src/configure.c.
︙ | |||
146 147 148 149 150 151 152 153 154 155 156 157 158 159 | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | + | { "dotfiles", CONFIGSET_PROJ }, { "parent-project-code", CONFIGSET_PROJ }, { "parent-project-name", CONFIGSET_PROJ }, { "hash-policy", CONFIGSET_PROJ }, { "comment-format", CONFIGSET_PROJ }, { "mimetypes", CONFIGSET_PROJ }, { "forbid-delta-manifests", CONFIGSET_PROJ }, { "fileedit-glob", CONFIGSET_PROJ }, #ifdef FOSSIL_ENABLE_LEGACY_MV_RM { "mv-rm-files", CONFIGSET_PROJ }, #endif { "ticket-table", CONFIGSET_TKT }, { "ticket-common", CONFIGSET_TKT }, |
︙ |
Changes to src/db.c.
︙ | |||
3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 | 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 | + + + + + + + + + | #if !defined(FOSSIL_ENABLE_EXEC_REL_PATHS) /* ** SETTING: exec-rel-paths boolean default=off ** When executing certain external commands (e.g. diff and ** gdiff), use relative paths. */ #endif /* ** SETTING: fileedit-glob width=40 block-text ** A comma- or newline-separated list of globs of filenames ** which are allowed to be edited using the /fileedit page. ** An empty list prohibits editing via that page. Note that ** it cannot edit binary files, so the glob should not ** contain any globs for, e.g., images or PDFs. */ /* ** SETTING: gdiff-command width=40 default=gdiff ** The value is an external command to run when performing a graphical ** diff. If undefined, text diff will be used. */ /* ** SETTING: gmerge-command width=40 |
︙ |
Changes to src/default_css.txt.
︙ | |||
858 859 860 861 862 863 864 | 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 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 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 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | // border: 1px solid black; // vertical-align: top; // } // #setup_skinedit_css_defaults > tbody > tr > td:nth-of-type(2) > div { // max-width: 30em; // overflow: auto; // } // .fileedit-XXX => /fileedit page form.fileedit textarea { font-family: monospace; width: 100%; } form.fileedit fieldset { margin: 0.5em 0 0 0; border-radius: 0.5em; border-color: inherit; border-width: 1px; } form.fileedit fieldset > legend { margin: 0 0 0 1em; padding: 0 0.5em 0 0.5em; } form.fileedit fieldset > div { margin: 0 0.25em 0.25em 0.25em; } form.fileedit fieldset > div > .input-with-label { margin: 0.25em 0.5em; } form.fileedit fieldset > div > button { margin: 0.25em 0.5em; } form.fileedit input:invalid { border-left: 0.2em dashed red; } .fileedit-hint { font-size: 80%; opacity: 0.75; } .fileedit-error-report { background: yellow; color: darkred; margin: 1em 0; padding: 0.5em; border-radius: 0.5em; } code.fileedit-manifest { display: block; height: 16em; overflow: auto; } div.fileedit-preview { margin: 0; padding: 0; } .fileedit-preview > div:first-child { margin: 1em 0 0 0; border-bottom: 1px dashed; } div.fileedit-diff { margin: 0; padding: 0; } .fileedit-diff > div:first-child { border-bottom: 1px dashed; } .input-with-label { border: 1px inset #808080; border-radius: 0.5em; padding: 0.25em 0.4em; margin: 0 0.5em; display: inline-block; cursor: pointer; } .input-with-label > * { vertical-align: middle; } .input-with-label > input { margin: 0; } .input-with-label > select { margin: 0; } .input-with-label > input[type=text] { margin: 0; } .input-with-label > textarea { margin: 0; } .input-with-label > input[type=checkbox] { vertical-align: sub; } .input-with-label > input[type=radio] { vertical-align: sub; } .input-with-label > span { margin: 0 0.25em 0 0.25em; vertical-align: middle; } |
Added src/fileedit.c.