Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Change import command to use --git and --svn options instead of "svn" and "git"
sub-sub-command to stay compatible with before.
Make sure verify_all_options() fail with specifiying svn only option with --git. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | svn-import |
| Files: | files | file ages | folders |
| SHA1: |
4d3bb24b4434cd4050bc2b4646848023 |
| User & Date: | mgagnon 2015-02-25 14:51:12.976 |
Context
|
2015-02-25
| ||
| 16:09 | Make --git the default for "fossil import" if neither --git nor --svn is specified. Make --force work (again) with "fossil import --git". ... (check-in: 3a6c848f user: jan.nijtmans tags: svn-import) | |
| 14:51 |
Change import command to use --git and --svn options instead of "svn" and "git"
sub-sub-command to stay compatible with before.
Make sure verify_all_options() fail with specifiying svn only option with --git. ... (check-in: 4d3bb24b user: mgagnon tags: svn-import) | |
| 13:54 | Merge trunk.. ... (check-in: 7d0ce2b0 user: mgagnon tags: svn-import) | |
Changes
Changes to src/import.c.
| ︙ | ︙ | |||
1461 1462 1463 1464 1465 1466 1467 |
db_finalize(&revSrc);
fossil_print(" Done!\n");
}
/*
** COMMAND: import
**
| | > | | | 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 |
db_finalize(&revSrc);
fossil_print(" Done!\n");
}
/*
** COMMAND: import
**
** Usage: %fossil import --git ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
** or: %fossil import --svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
**
** Read interchange format generated by another VCS and use it to
** construct a new Fossil repository named by the NEW-REPOSITORY
** argument. If no input file is supplied the interchange format
** data is read from standard input.
**
** The following formats are currently understood by this command
**
** --git Import from the git-fast-export file format
**
** --svn Import from the svnadmin-dump file format. The default
** behaviour (unless overridden by --flat) is to treat 3 folders
** in the SVN root as special, following the common layout of
** SVN repositories. These are (by default) trunk/, branches/
** and tags/
** Options:
** --trunk FOLDER Name of trunk folder
** --branches FOLDER Name of branches folder
|
| ︙ | ︙ | |||
1497 1498 1499 1500 1501 1502 1503 |
**
** See also: export
*/
void import_cmd(void){
char *zPassword;
FILE *pIn;
Stmt q;
| > > | | > > > > | > > > > > > > > | | | | > > > > | > | | | | | | | | | 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 |
**
** See also: export
*/
void import_cmd(void){
char *zPassword;
FILE *pIn;
Stmt q;
int gitFlag=0;
int svnFlag=0;
/* Options common to all input formats */
int incrFlag = find_option("incremental", "i", 0)!=0;
/* Options for --svn only */
const char *zBase="";
int forceFlag=0;
int flatFlag=0;
if( find_option("svn", 0, 0) ){
svnFlag=1;
/* Get --svn related options here, so verify_all_options() fail when svn
* only option are specify with --git
*/
zBase = find_option("base", 0, 1);
forceFlag = find_option("force", "f", 0)!=0;
flatFlag = find_option("flat", 0, 0)!=0;
gsvn.zTrunk = find_option("trunk", 0, 1);
gsvn.zBranches = find_option("branches", 0, 1);
gsvn.zTags = find_option("tags", 0, 1);
gsvn.noSvnRevFlag = find_option("no-svn-rev", 0, 0)!=0;
}else if( find_option("git", 0, 0) ){
gitFlag=1;
}else{
usage("--git|--svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?");
}
verify_all_options();
if( g.argc!=3 && g.argc!=4 ){
usage("--git|--svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?");
}
if( g.argc==4 ){
pIn = fossil_fopen(g.argv[3], "rb");
}else{
pIn = stdin;
fossil_binary_mode(pIn);
}
if( !incrFlag ){
if( forceFlag ) file_delete(g.argv[2]);
db_create_repository(g.argv[2]);
}
db_open_repository(g.argv[2]);
db_open_config(0);
db_begin_transaction();
if( !incrFlag ) db_initial_setup(0, 0, 0, 1);
if( svnFlag ){
db_multi_exec(
"CREATE TEMP TABLE xrevisions("
" trev INTEGER, tbranch INT, trid INT, tparent INT DEFAULT 0,"
" UNIQUE(tbranch, trev)"
");"
"CREATE INDEX temp.i_xrevisions ON xrevisions(trid);"
"CREATE TEMP TABLE xfiles("
|
| ︙ | ︙ | |||
1581 1582 1583 1584 1585 1586 1587 |
}
if( gsvn.zTags[gsvn.lenTags-1]!='/' ){
gsvn.zTags = mprintf("%s/", gsvn.zTags);
gsvn.lenTags++;
}
}
svn_dump_import(pIn);
| | | 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 |
}
if( gsvn.zTags[gsvn.lenTags-1]!='/' ){
gsvn.zTags = mprintf("%s/", gsvn.zTags);
gsvn.lenTags++;
}
}
svn_dump_import(pIn);
}else if( gitFlag ){
/* The following temp-tables are used to hold information needed for
** the import.
**
** The XMARK table provides a mapping from fast-import "marks" and symbols
** into artifact ids (UUIDs - the 40-byte hex SHA1 hash of artifacts).
** Given any valid fast-import symbol, the corresponding fossil rid and
** uuid can found by searching against the xmark.tname field.
|
| ︙ | ︙ |