Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Since "allow-symlinks" is already ON by default on non-unix platforms (since fossil 1.35 already), no need to do anything special during GIT/SVN import. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
f21820f4abbeada7af373a6dd02f3fa3 |
| User & Date: | jan.nijtmans 2017-03-22 16:42:03.204 |
Context
|
2017-03-23
| ||
| 22:09 | Define the NORETURN macro for MSVC check-in: a99c9ffec2 user: drh tags: trunk | |
|
2017-03-22
| ||
| 16:42 | Since "allow-symlinks" is already ON by default on non-unix platforms (since fossil 1.35 already), no need to do anything special during GIT/SVN import. check-in: f21820f4ab user: jan.nijtmans tags: trunk | |
| 16:15 | Fix harmless compiler warnings in the shell check-in: cc65959b0f user: jan.nijtmans tags: trunk | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
2857 2858 2859 2860 2861 2862 2863 | ** admin-log If enabled, record configuration changes in the ** "admin_log" table. Default: off ** ** allow-symlinks If enabled, don't follow symlinks, and instead treat ** (versionable) them as symlinks on Unix. Has no effect on Windows ** (existing links in repository created on Unix become ** plain-text files with link destination path inside). | | | 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 | ** admin-log If enabled, record configuration changes in the ** "admin_log" table. Default: off ** ** allow-symlinks If enabled, don't follow symlinks, and instead treat ** (versionable) them as symlinks on Unix. Has no effect on Windows ** (existing links in repository created on Unix become ** plain-text files with link destination path inside). ** Default: on (Unix), off (Windows) ** ** auto-captcha If enabled, the Login page provides a button to ** fill in the captcha password. Default: on ** ** auto-hyperlink Use javascript to enable hyperlinks on web pages ** for all users (regardless of the "h" privilege) if the ** User-Agent string in the HTTP header look like it came |
| ︙ | ︙ |
Changes to src/import.c.
| ︙ | ︙ | |||
67 68 69 70 71 72 73 | int nMerge; /* Number of merge values */ int nMergeAlloc; /* Number of slots in azMerge[] */ char **azMerge; /* Merge values */ int nFile; /* Number of aFile values */ int nFileAlloc; /* Number of slots in aFile[] */ ImportFile *aFile; /* Information about files in a commit */ int fromLoaded; /* True zFrom content loaded into aFile[] */ | < | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 |
int nMerge; /* Number of merge values */
int nMergeAlloc; /* Number of slots in azMerge[] */
char **azMerge; /* Merge values */
int nFile; /* Number of aFile values */
int nFileAlloc; /* Number of slots in aFile[] */
ImportFile *aFile; /* Information about files in a commit */
int fromLoaded; /* True zFrom content loaded into aFile[] */
int tagCommit; /* True if the commit adds a tag */
} gg;
/*
** Duplicate a string.
*/
char *fossil_strndup(const char *zOrig, int len){
|
| ︙ | ︙ | |||
271 272 273 274 275 276 277 |
const char *zUuid = gg.aFile[i].zUuid;
if( zUuid==0 ) continue;
blob_appendf(&record, "F %F %s", gg.aFile[i].zName, zUuid);
if( gg.aFile[i].isExe ){
blob_append(&record, " x\n", 3);
}else if( gg.aFile[i].isLink ){
blob_append(&record, " l\n", 3);
| < | 270 271 272 273 274 275 276 277 278 279 280 281 282 283 |
const char *zUuid = gg.aFile[i].zUuid;
if( zUuid==0 ) continue;
blob_appendf(&record, "F %F %s", gg.aFile[i].zName, zUuid);
if( gg.aFile[i].isExe ){
blob_append(&record, " x\n", 3);
}else if( gg.aFile[i].isLink ){
blob_append(&record, " l\n", 3);
}else{
blob_append(&record, "\n", 1);
}
}
if( gg.zFrom ){
blob_appendf(&record, "P %s", gg.zFrom);
for(i=0; i<gg.nMerge; i++){
|
| ︙ | ︙ | |||
746 747 748 749 750 751 752 |
}else
{
goto malformed_line;
}
}
gg.xFinish();
| < < < | 744 745 746 747 748 749 750 751 752 753 754 755 756 757 |
}else
{
goto malformed_line;
}
}
gg.xFinish();
import_reset(1);
return;
malformed_line:
trim_newline(zLine);
fossil_fatal("bad fast-import line: [%s]", zLine);
return;
|
| ︙ | ︙ | |||
1253 1254 1255 1256 1257 1258 1259 |
}
}
return branchId;
}
/*
** Insert content of corresponding content blob into the database.
| | | < < | 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 |
}
}
return branchId;
}
/*
** Insert content of corresponding content blob into the database.
** If content is identified as a symbolic link, then trailing
** "link " characters are removed from content.
**
** content is considered to be a symlink if zPerm contains at least
** one "l" character.
*/
static int svn_handle_symlinks(const char *perms, Blob *content){
Blob link_blob;
if( perms && strstr(perms, "l")!=0 ){
if( blob_size(content)>5 ){
/* Skip trailing 'link ' characters */
blob_seek(content, 5, BLOB_SEEK_SET);
blob_tail(content, &link_blob);
return content_put(&link_blob);
}else{
fossil_fatal("Too short symbolic link path");
}
}else{
return content_put(content);
}
|
| ︙ | ︙ |