Fossil SCM
merge [clobber_fixer] to keep "clone" and "new|init" from overwriting an existing file when setting up a new repository
Commit
89c17a86e1025b8e2b072196f9dcf00ba36b13de
Parent
5b9168501c701e6…
2 files changed
+1
-1
+5
+1
-1
| --- src/clone.c | ||
| +++ src/clone.c | ||
| @@ -138,11 +138,11 @@ | ||
| 138 | 138 | |
| 139 | 139 | if( g.argc < 4 ){ |
| 140 | 140 | usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY"); |
| 141 | 141 | } |
| 142 | 142 | db_open_config(0); |
| 143 | - if( file_size(g.argv[3])>0 ){ | |
| 143 | + if( -1 != file_size(g.argv[3]) ){ | |
| 144 | 144 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | url_parse(g.argv[2], urlFlags); |
| 148 | 148 | if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user; |
| 149 | 149 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -138,11 +138,11 @@ | |
| 138 | |
| 139 | if( g.argc < 4 ){ |
| 140 | usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY"); |
| 141 | } |
| 142 | db_open_config(0); |
| 143 | if( file_size(g.argv[3])>0 ){ |
| 144 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 145 | } |
| 146 | |
| 147 | url_parse(g.argv[2], urlFlags); |
| 148 | if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user; |
| 149 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -138,11 +138,11 @@ | |
| 138 | |
| 139 | if( g.argc < 4 ){ |
| 140 | usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY"); |
| 141 | } |
| 142 | db_open_config(0); |
| 143 | if( -1 != file_size(g.argv[3]) ){ |
| 144 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 145 | } |
| 146 | |
| 147 | url_parse(g.argv[2], urlFlags); |
| 148 | if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user; |
| 149 |
M
src/db.c
+5
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1682,10 +1682,15 @@ | ||
| 1682 | 1682 | verify_all_options(); |
| 1683 | 1683 | |
| 1684 | 1684 | if( g.argc!=3 ){ |
| 1685 | 1685 | usage("REPOSITORY-NAME"); |
| 1686 | 1686 | } |
| 1687 | + | |
| 1688 | + if( -1 != file_size(g.argv[2]) ){ | |
| 1689 | + fossil_fatal("file already exists: %s", g.argv[2]); | |
| 1690 | + } | |
| 1691 | + | |
| 1687 | 1692 | db_create_repository(g.argv[2]); |
| 1688 | 1693 | db_open_repository(g.argv[2]); |
| 1689 | 1694 | db_open_config(0); |
| 1690 | 1695 | if( zTemplate ) db_attach(zTemplate, "settingSrc"); |
| 1691 | 1696 | db_begin_transaction(); |
| 1692 | 1697 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1682,10 +1682,15 @@ | |
| 1682 | verify_all_options(); |
| 1683 | |
| 1684 | if( g.argc!=3 ){ |
| 1685 | usage("REPOSITORY-NAME"); |
| 1686 | } |
| 1687 | db_create_repository(g.argv[2]); |
| 1688 | db_open_repository(g.argv[2]); |
| 1689 | db_open_config(0); |
| 1690 | if( zTemplate ) db_attach(zTemplate, "settingSrc"); |
| 1691 | db_begin_transaction(); |
| 1692 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1682,10 +1682,15 @@ | |
| 1682 | verify_all_options(); |
| 1683 | |
| 1684 | if( g.argc!=3 ){ |
| 1685 | usage("REPOSITORY-NAME"); |
| 1686 | } |
| 1687 | |
| 1688 | if( -1 != file_size(g.argv[2]) ){ |
| 1689 | fossil_fatal("file already exists: %s", g.argv[2]); |
| 1690 | } |
| 1691 | |
| 1692 | db_create_repository(g.argv[2]); |
| 1693 | db_open_repository(g.argv[2]); |
| 1694 | db_open_config(0); |
| 1695 | if( zTemplate ) db_attach(zTemplate, "settingSrc"); |
| 1696 | db_begin_transaction(); |
| 1697 |