Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Enhance the "fossil git export" command so that it also exports tags as lightweight Git tags. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | mirror-cmd |
| Files: | files | file ages | folders |
| SHA3-256: |
4f19d67b02aeffc6d26e997b4455deac |
| User & Date: | drh 2019-03-16 00:26:58.361 |
Context
|
2019-03-16
| ||
| 00:58 | Add the "fossil git export" command, designed to simplify making a Git mirror of a working Fossil repository. ... (check-in: 70295942 user: drh tags: trunk) | |
| 00:26 | Enhance the "fossil git export" command so that it also exports tags as lightweight Git tags. ... (Closed-Leaf check-in: 4f19d67b user: drh tags: mirror-cmd) | |
|
2019-03-15
| ||
| 21:36 | Do the export within a transaction for performance. Record a complete two-way map of Git and Fossil names in the mirror.mmark table. ... (check-in: c4f9b177 user: drh tags: mirror-cmd) | |
Changes
Changes to src/export.c.
| ︙ | ︙ | |||
1205 1206 1207 1208 1209 1210 1211 |
"CREATE TABLE IF NOT EXISTS mirror.mconfig(\n"
" key TEXT PRIMARY KEY,\n"
" Value ANY\n"
") WITHOUT ROWID;\n"
"CREATE TABLE IF NOT EXISTS mirror.mmark(\n"
" id INTEGER PRIMARY KEY,\n"
" uuid TEXT UNIQUE,\n"
| | | | 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 |
"CREATE TABLE IF NOT EXISTS mirror.mconfig(\n"
" key TEXT PRIMARY KEY,\n"
" Value ANY\n"
") WITHOUT ROWID;\n"
"CREATE TABLE IF NOT EXISTS mirror.mmark(\n"
" id INTEGER PRIMARY KEY,\n"
" uuid TEXT UNIQUE,\n"
" githash TEXT\n"
");"
);
/* See if there is any work to be done. Exit early if not, before starting
** the "git fast-import" command. */
if( !db_exists("SELECT 1 FROM event WHERE type IN ('ci','t')"
" AND mtime>coalesce((SELECT value FROM mconfig"
" WHERE key='start'),0.0)")
){
fossil_print("no changes\n");
return;
}
|
| ︙ | ︙ | |||
1277 1278 1279 1280 1281 1282 1283 |
double rMTime = db_column_double(&q, 1);
const char *zUuid = db_column_text(&q, 2);
if( rMTime>rEnd ) rEnd = rMTime;
gitmirror_send_checkin(xCmd, rid, zUuid, &nLimit, fManifest);
printf("\r%d/%d ", nTotal-nLimit, nTotal);
fflush(stdout);
}
| < < < < | 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 |
double rMTime = db_column_double(&q, 1);
const char *zUuid = db_column_text(&q, 2);
if( rMTime>rEnd ) rEnd = rMTime;
gitmirror_send_checkin(xCmd, rid, zUuid, &nLimit, fManifest);
printf("\r%d/%d ", nTotal-nLimit, nTotal);
fflush(stdout);
}
db_finalize(&q);
fprintf(xCmd, "done\n");
if( zDebug ){
if( xCmd!=stdout ) fclose(xCmd);
}else{
pclose(xCmd);
}
|
| ︙ | ︙ | |||
1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 |
j++;
if( zLine[j]==0 ) continue;
for(k=j; fossil_isalnum(zLine[k]); k++){}
zLine[k] = 0;
db_bind_text(&q, ":githash", &zLine[j]);
db_step(&q);
db_reset(&q);
fputs(zLine, pIn);
}
db_finalize(&q);
fclose(pOut);
fclose(pIn);
file_delete(".mirror_state/out");
}else{
fossil_fatal("git fast-import didn't generate a marks file!");
}
db_commit_transaction();
/* Optionally do a "git push" */
}
/*
** COMMAND: git
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 |
j++;
if( zLine[j]==0 ) continue;
for(k=j; fossil_isalnum(zLine[k]); k++){}
zLine[k] = 0;
db_bind_text(&q, ":githash", &zLine[j]);
db_step(&q);
db_reset(&q);
zLine[k] = '\n';
fputs(zLine, pIn);
}
db_finalize(&q);
fclose(pOut);
fclose(pIn);
file_delete(".mirror_state/out");
}else{
fossil_fatal("git fast-import didn't generate a marks file!");
}
db_multi_exec(
"CREATE INDEX IF NOT EXISTS mirror.mmarkx1 ON mmark(githash);"
);
/* Do any tags that have been created since the start time */
db_prepare(&q,
"SELECT substr(tagname,5), githash"
" FROM (SELECT tagxref.tagid AS xtagid, tagname, rid, max(mtime) AS mtime"
" FROM tagxref JOIN tag ON tag.tagid=tagxref.tagid"
" WHERE tag.tagname GLOB 'sym-*'"
" AND tagxref.tagtype=1"
" AND tagxref.mtime > coalesce((SELECT value FROM mconfig"
" WHERE key='start'),0.0)"
" GROUP BY tagxref.tagid) AS tx"
" JOIN blob ON tx.rid=blob.rid"
" JOIN mmark ON mmark.uuid=blob.uuid;"
);
while( db_step(&q)==SQLITE_ROW ){
char *zTagname = fossil_strdup(db_column_text(&q,0));
const char *zObj = db_column_text(&q,1);
char *zTagCmd;
gitmirror_sanitize_name(zTagname);
zTagCmd = mprintf("git tag -f \"%s\" %s", zTagname, zObj);
fossil_free(zTagname);
fossil_print("%s\n", zTagCmd);
fossil_system(zTagCmd);
fossil_free(zTagCmd);
}
db_finalize(&q);
/* Update the start time */
db_prepare(&q, "REPLACE INTO mirror.mconfig(key,value) VALUES('start',:x)");
db_bind_double(&q, ":x", rEnd);
db_step(&q);
db_finalize(&q);
db_commit_transaction();
/* Optionally do a "git push" */
}
/*
** COMMAND: git
|
| ︙ | ︙ |