Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch arjen-doc-updates Through [7df226540d] Excluding Merge-Ins
This is equivalent to a diff from a257fde3ba to 7df226540d
|
2011-05-24
| ||
| 12:00 | Merge the latest trunk changes into the arjen-doc-updates branch. ... (check-in: 5d4ef37a9d user: drh tags: arjen-doc-updates) | |
| 07:27 | Extended the online help for the commit, close, configure, clone and checkout commands ... (check-in: 7df226540d user: Arjen Markus tags: arjen-doc-updates) | |
|
2011-04-26
| ||
| 06:37 | Online help for several commands edited - as found in allrepo.c, bisect.c, branch.c and checkin.c. Note: "commit" still to be edited ... (check-in: e66fe70c7f user: Arjen Markus tags: arjen-doc-updates) | |
|
2011-04-13
| ||
| 11:35 | Update test cases for file_simplify_name(). ... (check-in: 553f0a973a user: drh tags: trunk) | |
| 10:23 | Online help for the first few commands edited - to help with very long explanations, the command is summarised at the end for those who just want to check the precise options ... (check-in: 1f851f8467 user: Arjen Markus tags: arjen-doc-updates) | |
|
2011-04-12
| ||
| 23:41 | Merge support for login-groups and single sign-on into the trunk. ... (check-in: a257fde3ba user: drh tags: trunk) | |
| 23:37 | Fix a bug in single sign-on. Add comments to the login source code. ... (Closed-Leaf check-in: 9df4dcb5e1 user: drh tags: login-groups) | |
| 02:25 | Update the built-in SQLite version to the 3.7.6 release. ... (check-in: 4dde79b9e6 user: drh tags: trunk) | |
Changes to BUILD.txt.
1 2 3 4 5 6 7 8 9 | All of the source code for fossil is contained in the src/ subdirectory. But there is a lot of generated code, so you will probably want to use the Makefile. To do a complete build on unix, just type: make On a windows box, use one of the Makefiles in the win/ subdirectory, according to your compiler and environment. For example: | | > > > > > > > | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 |
All of the source code for fossil is contained in the src/ subdirectory.
But there is a lot of generated code, so you will probably want to
use the Makefile. To do a complete build on unix, just type:
make
On a windows box, use one of the Makefiles in the win/ subdirectory,
according to your compiler and environment. For example:
make -f win/Makefile.mingw
Note:
Some of the Makefiles require that you build in the src directory,
rather than the toplevel directory. These include: Makefile.msc,
Makefile.dmc and Makefile.PellesCGMake.
Fossil requires the zlib library as its only external dependency.
If you have trouble, or you want to do something fancy, just look at
top level makefile. There are 6 configuration options that are all well
commented. Instead of editing the Makefile, consider copying the Makefile
to an alternative name such as "GNUMakefile", "BSDMakefile", or "makefile"
and editing the copy.
BUILDING OUTSIDE THE SOURCE TREE
An out of source build is pretty easy:
1. Make a new directory to do the builds in.
2. Copy "Makefile" from the source into the build directory and
modify the SRCDIR macro along the lines of:
SRCDIR=../src
3. type: "make"
This will now keep all generates files separate from the maintained
source code.
--------------------------------------------------------------------------
Here are some notes on what is happening behind the scenes:
* The Makefile just sets up a few macros and then invokes the
real makefile in src/main.mk. The src/main.mk makefile is
automatically generated by a TCL script found at src/makemake.tcl.
Do not edit src/main.mk directly. Update src/makemake.tcl and
then rerun it.
* The *.h header files are automatically generated using a program
called "makeheaders". Source code to the makeheaders program is
found in src/makeheaders.c. Documentation is found in
src/makeheaders.html.
* Most *.c source files are preprocessed using a program called
"translate". The sources to translate are found in src/translate.c.
A header comment in src/translate.c explains in detail what it does.
* The src/mkindex.c program generates some C code that implements
static lookup tables. See the header comment in the source code
for details on what it does.
|
Changes to src/add.c.
| ︙ | ︙ | |||
210 211 212 213 214 215 216 |
db_finalize(&q);
db_multi_exec("DELETE FROM sfile");
}
/*
** COMMAND: add
**
| | | | | | | > | | > > > > > | 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 |
db_finalize(&q);
db_multi_exec("DELETE FROM sfile");
}
/*
** COMMAND: add
**
** Usage: %fossil add ?OPTIONS? FILE1 ?FILE2 ...?
**
** Make arrangements to add one or more files or directories to the
** current checkout at the next commit.
**
** When adding files or directories recursively, filenames that begin
** with "." are excluded by default. To include such files, add
** the "--dotfiles" option to the command-line.
**
** The --ignore option specifies the patterns for files to be excluded,
** like *.o,*.obj,*.exe. If not specified, the "ignore-glob" setting is
** used. See ** documentation on the "settings" command for further
** information.
**
**
** SUMMARY: fossil add ?OPTIONS? FILE1 ?FILE2 ...?
** Options: --dotfiles, --ignore
*/
void add_cmd(void){
int i;
int vid;
const char *zIgnoreFlag;
Blob repo;
Stmt ignoreTest; /* Test to see if a name should be ignored */
|
| ︙ | ︙ | |||
338 339 340 341 342 343 344 | blob_reset(&path); } /* ** COMMAND: rm ** COMMAND: delete ** | | | | | > > > | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 |
blob_reset(&path);
}
/*
** COMMAND: rm
** COMMAND: delete
**
** Usage: %fossil rm FILE1 ?FILE2 ...?
** or: %fossil delete FILE1 ?FILE2 ...?
**
** Remove one or more files or directories from the repository.
**
** This command does NOT remove the files from disk. It just marks the
** files as no longer being part of the project. In other words, future
** changes to the named files will not be versioned.
**
** SUMMARY: fossil rm FILE1 ?FILE2 ...?
** or: fossil delete FILE1 ?FILE2 ...?
*/
void delete_cmd(void){
int i;
int vid;
db_must_be_within_tree();
vid = db_lget_int("checkout", 0);
|
| ︙ | ︙ | |||
380 381 382 383 384 385 386 | /* ** COMMAND: addremove ** ** Usage: %fossil addremove ?--dotfiles? ?--ignore GLOBPATTERN? ?--test? ** ** Do all necessary "add" and "rm" commands to synchronize the repository | | | > > > > | 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 |
/*
** COMMAND: addremove
**
** Usage: %fossil addremove ?--dotfiles? ?--ignore GLOBPATTERN? ?--test?
**
** Do all necessary "add" and "rm" commands to synchronize the repository
** with the content of the working checkout:
**
** * All files in the checkout but not in the repository (that is,
** all files displayed using the "extra" command) are added as
** if by the "add" command.
**
** * All files in the repository but missing from the checkout (that is,
** all files that show as MISSING with the "status" command) are
** removed as if by the "rm" command.
**
** The command does not "commit". You must run the "commit" separately
** as a separate step.
**
** Files and directories whose names begin with "." are ignored unless
** the --dotfiles option is used.
**
** The --ignore option overrides the "ignore-glob" setting. See
** documentation on the "settings" command for further information.
**
** The --test option shows what would happen without actually doing anything.
**
** This command can be used to track third party software.
**
**
** SUMMARY: fossil addremove
** Options: ?--dotfiles? ?--ignore GLOBPATTERN? ?--test?
*/
void import_cmd(void){
Blob path;
const char *zIgnoreFlag = find_option("ignore",0,1);
int allFlag = find_option("dotfiles",0,0)!=0;
int isTest = find_option("test",0,0)!=0;
int n;
|
| ︙ | ︙ | |||
434 435 436 437 438 439 440 |
/* now we read the complete file structure into a temp table */
vfile_scan(0, &path, blob_size(&path), allFlag);
if( file_tree_name(g.zRepositoryName, &repo, 0) ){
db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
}
/* step 1: search for extra files */
| | | | 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 |
/* now we read the complete file structure into a temp table */
vfile_scan(0, &path, blob_size(&path), allFlag);
if( file_tree_name(g.zRepositoryName, &repo, 0) ){
db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
}
/* step 1: search for extra files */
db_prepare(&q,
"SELECT x, %Q || x FROM sfile"
" WHERE x NOT IN (%s)"
" AND NOT %s"
" ORDER BY 1",
g.zLocalRoot,
fossil_all_reserved_names(),
glob_expr("x", zIgnoreFlag)
);
while( db_step(&q)==SQLITE_ROW ){
add_one_file(db_column_text(&q, 1), vid, 0);
nAdd++;
}
db_finalize(&q);
/* step 2: search for missing files */
db_prepare(&q,
"SELECT pathname,%Q || pathname,deleted FROM vfile"
" WHERE deleted!=1"
" ORDER BY 1",
g.zLocalRoot
);
while( db_step(&q)==SQLITE_ROW ){
const char * zFile;
|
| ︙ | ︙ | |||
497 498 499 500 501 502 503 | /* ** COMMAND: mv ** COMMAND: rename ** ** Usage: %fossil mv|rename OLDNAME NEWNAME ** or: %fossil mv|rename OLDNAME... DIR ** | | > | > > > > | 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 |
/*
** COMMAND: mv
** COMMAND: rename
**
** Usage: %fossil mv|rename OLDNAME NEWNAME
** or: %fossil mv|rename OLDNAME... DIR
**
** Move or rename one or more files or directories within the repository tree.
** You can either rename a file or directory or move it to another subdirectory.
**
** This command does NOT rename or move the files on disk. This command merely
** records the fact that filenames have changed so that appropriate notations
** can be made at the next commit/checkin.
**
**
** SUMMARY: fossil mv|rename OLDNAME NEWNAME
** or: fossil mv|rename OLDNAME... DIR
*/
void mv_cmd(void){
int i;
int vid;
char *zDest;
Blob dest;
Stmt q;
|
| ︙ | ︙ |
Changes to src/allrepo.c.
| ︙ | ︙ | |||
52 53 54 55 56 57 58 59 60 61 62 63 64 65 | ** COMMAND: all ** ** Usage: %fossil all (list|ls|pull|push|rebuild|sync) ** ** The ~/.fossil file records the location of all repositories for a ** user. This command performs certain operations on all repositories ** that can be useful before or after a period of disconnected operation. ** ** On Win32 systems, the file is named "_fossil" and is located in ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%. ** ** Available operations are: ** ** ignore Arguments are repositories that should be ignored | > > > | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | ** COMMAND: all ** ** Usage: %fossil all (list|ls|pull|push|rebuild|sync) ** ** The ~/.fossil file records the location of all repositories for a ** user. This command performs certain operations on all repositories ** that can be useful before or after a period of disconnected operation. ** ** The rebuild subcommand is especially useful if the repositories were built ** with an older version of fossil. ** ** On Win32 systems, the file is named "_fossil" and is located in ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%. ** ** Available operations are: ** ** ignore Arguments are repositories that should be ignored |
| ︙ | ︙ | |||
75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 |
**
** sync Run a "sync" on all repositories
**
** Respositories are automatically added to the set of known repositories
** when one of the following commands against the repository: clone, info,
** pull, push, or sync. Even previously ignored repositories are added back
** to the list of repositories by these commands.
*/
void all_cmd(void){
int n;
Stmt q;
const char *zCmd;
char *zSyscmd;
char *zFossil;
char *zQFilename;
int nMissing;
int stopOnError = find_option("dontstop",0,0)==0;
int rc;
| > > > > > | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 |
**
** sync Run a "sync" on all repositories
**
** Respositories are automatically added to the set of known repositories
** when one of the following commands against the repository: clone, info,
** pull, push, or sync. Even previously ignored repositories are added back
** to the list of repositories by these commands.
**
**
** SUMMARY: fossil all subcommand|subcommand repository1 ?repository2 ...?
** Subcommands: list, ls, pull push, rebuild or sync
** Or: ignore repository1 ...
*/
void all_cmd(void){
int n;
Stmt q;
const char *zCmd;
char *zSyscmd;
char *zFossil;
char *zQFilename;
int nMissing;
int stopOnError = find_option("dontstop",0,0)==0;
int rc;
if( g.argc<3 ){
usage("list|ls|pull|push|rebuild|sync");
}
n = strlen(g.argv[2]);
db_open_config(1);
zCmd = g.argv[2];
if( strncmp(zCmd, "list", n)==0 || strncmp(zCmd,"ls",n)==0 ){
|
| ︙ | ︙ | |||
148 149 150 151 152 153 154 |
free(zSyscmd);
free(zQFilename);
if( stopOnError && rc ){
nMissing = 0;
break;
}
}
| | | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 |
free(zSyscmd);
free(zQFilename);
if( stopOnError && rc ){
nMissing = 0;
break;
}
}
/* If any repositories whose names appear in the ~/.fossil file could not
** be found, remove those names from the ~/.fossil file.
*/
if( nMissing ){
db_begin_transaction();
db_reset(&q);
while( db_step(&q)==SQLITE_ROW ){
|
| ︙ | ︙ |
Changes to src/bisect.c.
| ︙ | ︙ | |||
89 90 91 92 93 94 95 | } /* ** COMMAND: bisect ** ** Usage: %fossil bisect SUBCOMMAND ... ** | | > > | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | } /* ** COMMAND: bisect ** ** Usage: %fossil bisect SUBCOMMAND ... ** ** Run various subcommands useful for searching for bugs. It does so ** by marking versions as "good" and "bad" and allowing you to "interpolate" ** as it were between these two versions. ** ** fossil bisect bad ?VERSION? ** ** Identify version VERSION as non-working. If VERSION is omitted, ** the current checkout is marked as non-working. ** ** fossil bisect good ?VERSION? |
| ︙ | ︙ | |||
119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
**
** Reinitialize a bisect session. This cancels prior bisect history
** and allows a bisect session to start over from the beginning.
**
** fossil bisect vlist
**
** List the versions in between "bad" and "good".
*/
void bisect_cmd(void){
int n;
const char *zCmd;
db_must_be_within_tree();
if( g.argc<3 ){
usage("bisect SUBCOMMAND ARGS...");
| > > > > > | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 |
**
** Reinitialize a bisect session. This cancels prior bisect history
** and allows a bisect session to start over from the beginning.
**
** fossil bisect vlist
**
** List the versions in between "bad" and "good".
**
** SUMMARY: fossil bisect subcommand ...
** Subcommands: bad, good ?VERSION?
** Or: next, reset, vlist
** Or: options ?NAME? ?VALUE?
*/
void bisect_cmd(void){
int n;
const char *zCmd;
db_must_be_within_tree();
if( g.argc<3 ){
usage("bisect SUBCOMMAND ARGS...");
|
| ︙ | ︙ |
Changes to src/branch.c.
| ︙ | ︙ | |||
38 39 40 41 42 43 44 | const char *zColor; /* Color of the new branch */ Blob branch; /* manifest for the new branch */ Manifest *pParent; /* Parsed parent manifest */ Blob mcksum; /* Self-checksum on the manifest */ const char *zDateOvrd; /* Override date string */ const char *zUserOvrd; /* Override user name */ int isPrivate = 0; /* True if the branch should be private */ | | | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 |
const char *zColor; /* Color of the new branch */
Blob branch; /* manifest for the new branch */
Manifest *pParent; /* Parsed parent manifest */
Blob mcksum; /* Self-checksum on the manifest */
const char *zDateOvrd; /* Override date string */
const char *zUserOvrd; /* Override user name */
int isPrivate = 0; /* True if the branch should be private */
noSign = find_option("nosign","",0)!=0;
zColor = find_option("bgcolor","c",1);
isPrivate = find_option("private",0,0)!=0;
zDateOvrd = find_option("date-override",0,1);
zUserOvrd = find_option("user-override",0,1);
verify_all_options();
if( g.argc<5 ){
usage("new BRANCH-NAME CHECK-IN ?-bgcolor COLOR?");
}
db_find_and_open_repository(0, 0);
noSign = db_get_int("omitsign", 0)|noSign;
/* fossil branch new name */
zBranch = g.argv[3];
if( zBranch==0 || zBranch[0]==0 ){
fossil_panic("branch name cannot be empty");
}
if( db_exists(
"SELECT 1 FROM tagxref"
|
| ︙ | ︙ | |||
130 131 132 133 134 135 136 |
" ORDER BY tagname",
rootid);
while( db_step(&q)==SQLITE_ROW ){
const char *zTag = db_column_text(&q, 0);
blob_appendf(&branch, "T -%F *\n", zTag);
}
db_finalize(&q);
| | | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 |
" ORDER BY tagname",
rootid);
while( db_step(&q)==SQLITE_ROW ){
const char *zTag = db_column_text(&q, 0);
blob_appendf(&branch, "T -%F *\n", zTag);
}
db_finalize(&q);
blob_appendf(&branch, "U %F\n", zUserOvrd ? zUserOvrd : g.zLogin);
md5sum_blob(&branch, &mcksum);
blob_appendf(&branch, "Z %b\n", &mcksum);
if( !noSign && clearsign(&branch, &branch) ){
Blob ans;
blob_zero(&ans);
prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
|
| ︙ | ︙ | |||
170 171 172 173 174 175 176 |
fossil_nameofexe(), zBranch
);
}
/* Commit */
db_end_transaction(0);
| | | 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 |
fossil_nameofexe(), zBranch
);
}
/* Commit */
db_end_transaction(0);
/* Do an autosync push, if requested */
autosync(AUTOSYNC_PUSH);
}
/*
** COMMAND: branch
**
|
| ︙ | ︙ | |||
194 195 196 197 198 199 200 201 202 203 204 205 206 207 |
** --private option makes the branch private.
**
** %fossil branch list
** %fossil branch ls
**
** List all branches
**
*/
void branch_cmd(void){
int n;
const char *zCmd = "list";
db_find_and_open_repository(0, 0);
if( g.argc<2 ){
usage("new|list|ls ...");
| > > > > > | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 |
** --private option makes the branch private.
**
** %fossil branch list
** %fossil branch ls
**
** List all branches
**
**
** SUMMARY: fossil branch subcommand ...
** Subcommands: new branchname basis ?-R|-repository file? ?--bgcolor color?
** ?--private?
** Or: list, ls
*/
void branch_cmd(void){
int n;
const char *zCmd = "list";
db_find_and_open_repository(0, 0);
if( g.argc<2 ){
usage("new|list|ls ...");
|
| ︙ | ︙ | |||
320 321 322 323 324 325 326 |
** This routine is called while for each check-in that is rendered by
** the timeline of a "brlist" page. Add some additional hyperlinks
** to the end of the line.
*/
static void brtimeline_extra(int rid){
Stmt q;
if( !g.okHistory ) return;
| | | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 |
** This routine is called while for each check-in that is rendered by
** the timeline of a "brlist" page. Add some additional hyperlinks
** to the end of the line.
*/
static void brtimeline_extra(int rid){
Stmt q;
if( !g.okHistory ) return;
db_prepare(&q,
"SELECT substr(tagname,5) FROM tagxref, tag"
" WHERE tagxref.rid=%d"
" AND tagxref.tagid=tag.tagid"
" AND tagxref.tagtype>0"
" AND tag.tagname GLOB 'sym-*'",
rid
);
|
| ︙ | ︙ |
Changes to src/checkin.c.
| ︙ | ︙ | |||
35 36 37 38 39 40 41 |
Blob *report, /* Append the status report here */
const char *zPrefix, /* Prefix on each line of the report */
int missingIsFatal /* MISSING and NOT_A_FILE are fatal errors */
){
Stmt q;
int nPrefix = strlen(zPrefix);
int nErr = 0;
| | | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
Blob *report, /* Append the status report here */
const char *zPrefix, /* Prefix on each line of the report */
int missingIsFatal /* MISSING and NOT_A_FILE are fatal errors */
){
Stmt q;
int nPrefix = strlen(zPrefix);
int nErr = 0;
db_prepare(&q,
"SELECT pathname, deleted, chnged, rid, coalesce(origname!=pathname,0)"
" FROM vfile "
" WHERE file_is_selected(id)"
" AND (chnged OR deleted OR rid=0 OR pathname!=origname) ORDER BY 1"
);
while( db_step(&q)==SQLITE_ROW ){
const char *zPathname = db_column_text(&q,0);
|
| ︙ | ︙ | |||
105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
** Report on the edit status of all files in the current checkout.
** See also the "status" and "extra" commands.
**
** Options:
**
** --sha1sum Verify file status using SHA1 hashing rather
** than relying on file mtimes.
*/
void changes_cmd(void){
Blob report;
int vid;
int useSha1sum = find_option("sha1sum", 0, 0)!=0;
db_must_be_within_tree();
blob_zero(&report);
| > > > | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 |
** Report on the edit status of all files in the current checkout.
** See also the "status" and "extra" commands.
**
** Options:
**
** --sha1sum Verify file status using SHA1 hashing rather
** than relying on file mtimes.
**
**
** SUMMARY: fossil changes ?--sha1sum?
*/
void changes_cmd(void){
Blob report;
int vid;
int useSha1sum = find_option("sha1sum", 0, 0)!=0;
db_must_be_within_tree();
blob_zero(&report);
|
| ︙ | ︙ | |||
129 130 131 132 133 134 135 136 137 138 139 140 141 142 |
**
** Report on the status of the current checkout.
**
** Options:
**
** --sha1sum Verify file status using SHA1 hashing rather
** than relying on file mtimes.
*/
void status_cmd(void){
int vid;
db_must_be_within_tree();
/* 012345678901234 */
printf("repository: %s\n", db_lget("repository",""));
printf("local-root: %s\n", g.zLocalRoot);
| > > > | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 |
**
** Report on the status of the current checkout.
**
** Options:
**
** --sha1sum Verify file status using SHA1 hashing rather
** than relying on file mtimes.
**
**
** SUMMARY: fossil status ?--sha1sum?
*/
void status_cmd(void){
int vid;
db_must_be_within_tree();
/* 012345678901234 */
printf("repository: %s\n", db_lget("repository",""));
printf("local-root: %s\n", g.zLocalRoot);
|
| ︙ | ︙ | |||
151 152 153 154 155 156 157 158 159 160 161 162 163 164 |
/*
** COMMAND: ls
**
** Usage: %fossil ls [-l]
**
** Show the names of all files in the current checkout. The -l provides
** extra information about each file.
*/
void ls_cmd(void){
int vid;
Stmt q;
int isBrief;
isBrief = find_option("l","l", 0)==0;
| > > > | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 |
/*
** COMMAND: ls
**
** Usage: %fossil ls [-l]
**
** Show the names of all files in the current checkout. The -l provides
** extra information about each file.
**
**
** SUMMARY: fossil ls ?-l?
*/
void ls_cmd(void){
int vid;
Stmt q;
int isBrief;
isBrief = find_option("l","l", 0)==0;
|
| ︙ | ︙ | |||
255 256 257 258 259 260 261 | } } /* ** COMMAND: extras ** Usage: %fossil extras ?--dotfiles? ?--ignore GLOBPATTERN? ** | | | > > > > | | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 |
}
}
/*
** COMMAND: extras
** Usage: %fossil extras ?--dotfiles? ?--ignore GLOBPATTERN?
**
** Print a list of all files in the source tree that are NOT part of
** the current checkout. See also the "clean" command.
**
** Files and subdirectories whose names begin with "." are normally
** ignored but can be included by adding the --dotfiles option.
**
** The GLOBPATTERN is a comma-separated list of GLOB expressions for
** files that are ignored. The GLOBPATTERN specified by the "ignore-glob"
** setting is used if the --ignore option is omitted. (See the settings
** command for more information.)
**
**
** SUMMARY: fossil extras ?-dotfiles? ?--ignore globpattern?
*/
void extra_cmd(void){
Blob path;
Blob repo;
Stmt q;
int n;
const char *zIgnoreFlag = find_option("ignore",0,1);
int allFlag = find_option("dotfiles",0,0)!=0;
int outputManifest;
db_must_be_within_tree();
outputManifest = db_get_boolean("manifest",0);
db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
n = strlen(g.zLocalRoot);
blob_init(&path, g.zLocalRoot, n-1);
if( zIgnoreFlag==0 ){
zIgnoreFlag = db_get("ignore-glob", 0);
}
vfile_scan(0, &path, blob_size(&path), allFlag);
db_prepare(&q,
"SELECT x FROM sfile"
" WHERE x NOT IN (%s)"
" AND NOT %s"
" ORDER BY 1",
fossil_all_reserved_names(),
glob_expr("x", zIgnoreFlag)
);
|
| ︙ | ︙ | |||
306 307 308 309 310 311 312 | /* ** COMMAND: clean ** Usage: %fossil clean ?--force? ?--dotfiles? ?--ignore GLOBPATTERN? ** ** Delete all "extra" files in the source tree. "Extra" files are ** files that are not officially part of the checkout. See also | > > | | | > > > > | | 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 |
/*
** COMMAND: clean
** Usage: %fossil clean ?--force? ?--dotfiles? ?--ignore GLOBPATTERN?
**
** Delete all "extra" files in the source tree. "Extra" files are
** files that are not officially part of the checkout. See also
** the "extras" command.
**
** TAKE CARE: This operation cannot be undone!
**
** You will be prompted before removing each file. If you are
** sure you wish to remove all "extra" files you can specify the
** --force flag and no prompts will be issued.
**
** Files and subdirectories whose names begin with "." are
** normally ignored. They are included if the "--dotfiles" option
** is used.
**
** The GLOBPATTERN is a comma-separated list of GLOB expressions for
** files that are ignored. The GLOBPATTERN specified by the "ignore-glob"
** setting is used if the --ignore option is omitted. (See the settings
** command for more information.)
**
**
** SUMMARY: fossil clean ?--force? ?--dotfiles? ?--ignore globpattern?
*/
void clean_cmd(void){
int allFlag;
int dotfilesFlag;
const char *zIgnoreFlag;
Blob path, repo;
Stmt q;
int n;
allFlag = find_option("force","f",0)!=0;
dotfilesFlag = find_option("dotfiles",0,0)!=0;
zIgnoreFlag = find_option("ignore",0,1);
db_must_be_within_tree();
if( zIgnoreFlag==0 ){
zIgnoreFlag = db_get("ignore-glob", 0);
}
db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
n = strlen(g.zLocalRoot);
blob_init(&path, g.zLocalRoot, n-1);
vfile_scan(0, &path, blob_size(&path), dotfilesFlag);
db_prepare(&q,
"SELECT %Q || x FROM sfile"
" WHERE x NOT IN (%s) AND NOT %s"
" ORDER BY 1",
g.zLocalRoot, fossil_all_reserved_names(), glob_expr("x",zIgnoreFlag)
);
if( file_tree_name(g.zRepositoryName, &repo, 0) ){
db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
|
| ︙ | ︙ | |||
515 516 517 518 519 520 521 |
}
g.aCommitFile[ii-2] = 0;
}
}
/*
** Return true if the check-in with RID=rid is a leaf.
| | | | 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 |
}
g.aCommitFile[ii-2] = 0;
}
}
/*
** Return true if the check-in with RID=rid is a leaf.
** A leaf has no children in the same branch.
*/
int is_a_leaf(int rid){
int rc;
static const char zSql[] =
@ SELECT 1 FROM plink
@ WHERE pid=%d
@ AND coalesce((SELECT value FROM tagxref
@ WHERE tagid=%d AND rid=plink.pid), 'trunk')
@ =coalesce((SELECT value FROM tagxref
@ WHERE tagid=%d AND rid=plink.cid), 'trunk')
;
|
| ︙ | ︙ | |||
557 558 559 560 561 562 563 |
" Use -f to override.", zUuid, zDate);
}
#endif
}
/*
** zDate should be a valid date string. Convert this string into the
| | | 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 |
" Use -f to override.", zUuid, zDate);
}
#endif
}
/*
** zDate should be a valid date string. Convert this string into the
** format YYYY-MM-DDTHH:MM:SS. If the string is not a valid date,
** print a fatal error and quit.
*/
char *date_in_standard_format(const char *zInputDate){
char *zDate;
zDate = db_text(0, "SELECT strftime('%%Y-%%m-%%dT%%H:%%M:%%f',%Q)",
zInputDate);
if( zDate[0]==0 ){
|
| ︙ | ︙ | |||
639 640 641 642 643 644 645 |
int isexe = db_column_int(&q, 4);
int isSelected = db_column_int(&q, 5);
const char *zPerm;
int cmp;
#if !defined(_WIN32)
/* For unix, extract the "executable" permission bit directly from
** the filesystem. On windows, the "executable" bit is retained
| | | 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 |
int isexe = db_column_int(&q, 4);
int isSelected = db_column_int(&q, 5);
const char *zPerm;
int cmp;
#if !defined(_WIN32)
/* For unix, extract the "executable" permission bit directly from
** the filesystem. On windows, the "executable" bit is retained
** unchanged from the original.
*/
blob_resize(&filename, nBasename);
blob_append(&filename, zName, -1);
isexe = file_isexe(blob_str(&filename));
#endif
if( isexe ){
zPerm = " x";
|
| ︙ | ︙ | |||
731 732 733 734 735 736 737 |
" ORDER BY tagname",
vid, zBranch);
while( db_step(&q)==SQLITE_ROW ){
const char *zTag = db_column_text(&q, 0);
blob_appendf(pOut, "T -%F *\n", zTag);
}
db_finalize(&q);
| | | 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 |
" ORDER BY tagname",
vid, zBranch);
while( db_step(&q)==SQLITE_ROW ){
const char *zTag = db_column_text(&q, 0);
blob_appendf(pOut, "T -%F *\n", zTag);
}
db_finalize(&q);
}
blob_appendf(pOut, "U %F\n", zUserOvrd ? zUserOvrd : g.zLogin);
md5sum_blob(pOut, &mcksum);
blob_appendf(pOut, "Z %b\n", &mcksum);
if( pnFBcard ) *pnFBcard = nFBcard;
}
/*
|
| ︙ | ︙ | |||
774 775 776 777 778 779 780 |
if( lastNl>1000 ) return; /* Binary if any line longer than 1000 */
}
}
if( nCrNl ){
char c;
file_relative_name(zFilename, &fname);
blob_zero(&ans);
| | | 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 |
if( lastNl>1000 ) return; /* Binary if any line longer than 1000 */
}
}
if( nCrNl ){
char c;
file_relative_name(zFilename, &fname);
blob_zero(&ans);
zMsg = mprintf("%s contains CR/NL line endings; commit anyhow (y/N/a)?",
blob_str(&fname));
prompt_user(zMsg, &ans);
fossil_free(zMsg);
c = blob_str(&ans)[0];
if( c=='a' ){
allOk = 1;
}else if( c!='y' ){
|
| ︙ | ︙ | |||
798 799 800 801 802 803 804 | ** COMMAND: ci ** COMMAND: commit ** ** Usage: %fossil commit ?OPTIONS? ?FILE...? ** ** Create a new version containing all of the changes in the current ** checkout. You will be prompted to enter a check-in comment unless | | | 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 | ** COMMAND: ci ** COMMAND: commit ** ** Usage: %fossil commit ?OPTIONS? ?FILE...? ** ** Create a new version containing all of the changes in the current ** checkout. You will be prompted to enter a check-in comment unless ** the comment has been specified on the command-line using "-m" or a ** file containing the comment using -M. The editor defined in the ** "editor" fossil option (see %fossil help set) will be used, or from ** the "VISUAL" or "EDITOR" environment variables (in that order) if ** no editor is set. ** ** All files that have changed will be committed unless some subset of ** files is specified on the command line. |
| ︙ | ︙ | |||
820 821 822 823 824 825 826 | ** option appears. A check-in is not allowed against a closed check-in. ** ** The --private option creates a private check-in that is never synced. ** Children of private check-ins are automatically private. ** ** the --tag option applies the symbolic tag name to the check-in. ** | | > > > > > > > > > > | | 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 |
** option appears. A check-in is not allowed against a closed check-in.
**
** The --private option creates a private check-in that is never synced.
** Children of private check-ins are automatically private.
**
** the --tag option applies the symbolic tag name to the check-in.
**
** Notes:
** - If you commit without the --branch option, the last branch (or the
** trunk) will be used.
** - If you do not specify a commit message or an empty message, the commit
** will be aborted.
** - fossil prefers text files in the UNIX format (line-endings only "LF").
** If it encounters text files in the Windows format (CRLF), it will
** warn about that.
** (File that are considered binary are stored as-is)
**
** SUMMARY: fossil commit ?OPTIONS? ?FILE...?
** Options:
** --comment|-m COMMENT-TEXT
** --message-file|-M COMMENT-FILE
** --branch NEW-BRANCH-NAME
** --bgcolor COLOR
** --nosign
** --force|-f
** --private
** --baseline
** --delta
** --tag TAG-NAME
**
*/
void commit_cmd(void){
int hasChanges; /* True if unsaved changes exist */
int vid; /* blob-id of parent version */
int nrid; /* blob-id of a modified file */
int nvid; /* Blob-id of the new check-in */
Blob comment; /* Check-in comment */
|
| ︙ | ︙ | |||
864 865 866 867 868 869 870 | const char *zTag; /* Symbolic tag to apply to this check-in */ Blob manifest; /* Manifest in baseline form */ Blob muuid; /* Manifest uuid */ Blob cksum1, cksum2; /* Before and after commit checksums */ Blob cksum1b; /* Checksum recorded in the manifest */ int szD; /* Size of the delta manifest */ int szB; /* Size of the baseline manifest */ | | | 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 |
const char *zTag; /* Symbolic tag to apply to this check-in */
Blob manifest; /* Manifest in baseline form */
Blob muuid; /* Manifest uuid */
Blob cksum1, cksum2; /* Before and after commit checksums */
Blob cksum1b; /* Checksum recorded in the manifest */
int szD; /* Size of the delta manifest */
int szB; /* Size of the baseline manifest */
url_proxy_options();
noSign = find_option("nosign",0,0)!=0;
forceDelta = find_option("delta",0,0)!=0;
forceBaseline = find_option("baseline",0,0)!=0;
if( forceDelta && forceBaseline ){
fossil_fatal("cannot use --delta and --baseline together");
}
|
| ︙ | ︙ | |||
958 959 960 961 962 963 964 |
user_select();
/*
** Check that the user exists.
*/
if( !db_exists("SELECT 1 FROM user WHERE login=%Q", g.zLogin) ){
fossil_fatal("no such user: %s", g.zLogin);
}
| | | | | 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 |
user_select();
/*
** Check that the user exists.
*/
if( !db_exists("SELECT 1 FROM user WHERE login=%Q", g.zLogin) ){
fossil_fatal("no such user: %s", g.zLogin);
}
hasChanges = unsaved_changes();
db_begin_transaction();
db_record_repository_filename(0);
if( hasChanges==0 && !isAMerge && !forceFlag ){
fossil_fatal("nothing has changed");
}
/* If one or more files that were named on the command line have not
** been modified, bail out now.
*/
if( g.aCommitFile ){
Blob unmodified;
memset(&unmodified, 0, sizeof(Blob));
blob_init(&unmodified, 0, 0);
db_blob(&unmodified,
"SELECT pathname FROM vfile"
" WHERE chnged = 0 AND origname IS NULL AND file_is_selected(id)"
);
if( strlen(blob_str(&unmodified)) ){
fossil_fatal("file %s has not changed", blob_str(&unmodified));
}
}
/*
** Do not allow a commit that will cause a fork unless the --force flag
** is used or unless this is a private check-in.
*/
if( zBranch==0 && forceFlag==0 && g.markPrivate==0 && !is_a_leaf(vid) ){
fossil_fatal("would fork. \"update\" first or use -f or --force.");
}
/*
** Do not allow a commit against a closed leaf
*/
if( db_exists("SELECT 1 FROM tagxref"
" WHERE tagid=%d AND rid=%d AND tagtype>0",
TAG_CLOSED, vid) ){
fossil_fatal("cannot commit against a closed leaf");
}
|
| ︙ | ︙ | |||
1024 1025 1026 1027 1028 1029 1030 |
}
}else{
db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment);
db_end_transaction(0);
db_begin_transaction();
}
| | | 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 |
}
}else{
db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment);
db_end_transaction(0);
db_begin_transaction();
}
/* Step 1: Insert records for all modified files into the blob
** table. If there were arguments passed to this command, only
** the identified fils are inserted (if they have been modified).
*/
db_prepare(&q,
"SELECT id, %Q || pathname, mrid, %s FROM vfile "
"WHERE chnged==1 AND NOT deleted AND file_is_selected(id)",
g.zLocalRoot, glob_expr("pathname", db_get("crnl-glob",""))
|
| ︙ | ︙ | |||
1126 1127 1128 1129 1130 1131 1132 |
prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
if( blob_str(&ans)[0]!='y' ){
fossil_exit(1);
}
}
/* If the --test option is specified, output the manifest file
| | | 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 |
prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
if( blob_str(&ans)[0]!='y' ){
fossil_exit(1);
}
}
/* If the --test option is specified, output the manifest file
** and rollback the transaction.
*/
if( testRun ){
blob_write_to_file(&manifest, "");
}
if( outputManifest ){
zManifestFile = mprintf("%smanifest", g.zLocalRoot);
|
| ︙ | ︙ | |||
1158 1159 1160 1161 1162 1163 1164 |
blob_zero(&muuid);
blob_appendf(&muuid, "%s\n", zUuid);
blob_write_to_file(&muuid, zManifestFile);
free(zManifestFile);
blob_reset(&muuid);
}
| | | 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 |
blob_zero(&muuid);
blob_appendf(&muuid, "%s\n", zUuid);
blob_write_to_file(&muuid, zManifestFile);
free(zManifestFile);
blob_reset(&muuid);
}
/* Update the vfile and vmerge tables */
db_multi_exec(
"DELETE FROM vfile WHERE (vid!=%d OR deleted) AND file_is_selected(id);"
"DELETE FROM vmerge WHERE file_is_selected(id) OR id=0;"
"UPDATE vfile SET vid=%d;"
"UPDATE vfile SET rid=mrid, chnged=0, deleted=0, origname=NULL"
" WHERE file_is_selected(id);"
|
| ︙ | ︙ | |||
1182 1183 1184 1185 1186 1187 1188 |
vfile_aggregate_checksum_repository(nvid, &cksum2);
if( blob_compare(&cksum1, &cksum2) ){
vfile_compare_repository_to_disk(nvid);
fossil_fatal("working checkout does not match what would have ended "
"up in the repository: %b versus %b",
&cksum1, &cksum2);
}
| | | | | 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 |
vfile_aggregate_checksum_repository(nvid, &cksum2);
if( blob_compare(&cksum1, &cksum2) ){
vfile_compare_repository_to_disk(nvid);
fossil_fatal("working checkout does not match what would have ended "
"up in the repository: %b versus %b",
&cksum1, &cksum2);
}
/* Verify that the manifest checksum matches the expected checksum */
vfile_aggregate_checksum_manifest(nvid, &cksum2, &cksum1b);
if( blob_compare(&cksum1, &cksum1b) ){
fossil_fatal("manifest checksum self-test failed: "
"%b versus %b", &cksum1, &cksum1b);
}
if( blob_compare(&cksum1, &cksum2) ){
fossil_fatal(
"working checkout does not match manifest after commit: "
"%b versus %b", &cksum1, &cksum2);
}
/* Verify that the commit did not modify any disk images. */
vfile_aggregate_checksum_disk(nvid, &cksum2);
if( blob_compare(&cksum1, &cksum2) ){
fossil_fatal("working checkout before and after commit does not match");
}
}
/* Clear the undo/redo stack */
undo_reset();
/* Commit */
db_multi_exec("DELETE FROM vvar WHERE name='ci-comment'");
if( testRun ){
db_end_transaction(1);
exit(1);
}
db_end_transaction(0);
if( !g.markPrivate ){
autosync(AUTOSYNC_PUSH);
}
if( count_nonbranch_children(vid)>1 ){
printf("**** warning: a fork has occurred *****\n");
}
}
|
Changes to src/checkout.c.
| ︙ | ︙ | |||
164 165 166 167 168 169 170 |
}
if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest.uuid'") ){
zManFile = mprintf("%smanifest.uuid", g.zLocalRoot);
unlink(zManFile);
free(zManFile);
}
}
| | > > > | | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 |
}
if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest.uuid'") ){
zManFile = mprintf("%smanifest.uuid", g.zLocalRoot);
unlink(zManFile);
free(zManFile);
}
}
}
/*
** COMMAND: checkout
** COMMAND: co
**
** Usage: %fossil checkout VERSION ?-f|--force? ?--keep?
**
** Check out a version specified on the command-line. This command
** will abort if there are edited files in the current checkout unless
** the --force option appears on the command-line. The --keep option
** leaves files on disk unchanged, except the manifest and manifest.uuid
** files.
**
** The --latest flag can be used in place of VERSION to checkout the
** latest version in the repository.
**
** See also the "update" command.
**
** SUMMARY: fossil checkout VERSION ?-f|--force? ?--keep?
** Note: VERSION can also be --latest
*/
void checkout_cmd(void){
int forceFlag; /* Force checkout even if edits exist */
int keepFlag; /* Do not change any files on disk */
int latestFlag; /* Checkout the latest version */
char *zVers; /* Version to checkout */
int promptFlag; /* True to prompt before overwriting */
int vid, prior;
Blob cksum1, cksum1b, cksum2;
db_must_be_within_tree();
db_begin_transaction();
forceFlag = find_option("force","f",0)!=0;
keepFlag = find_option("keep",0,0)!=0;
latestFlag = find_option("latest",0,0)!=0;
promptFlag = find_option("prompt",0,0)!=0; /* Prompt user before overwrite */
if( (latestFlag!=0 && g.argc!=2) || (latestFlag==0 && g.argc!=3) ){
|
| ︙ | ︙ | |||
278 279 280 281 282 283 284 | /* ** COMMAND: close ** ** Usage: %fossil close ?-f|--force? ** ** The opposite of "open". Close the current database connection. | | > > | 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 |
/*
** COMMAND: close
**
** Usage: %fossil close ?-f|--force?
**
** The opposite of "open". Close the current database connection.
** Require a -f or --force flag if there are unsaved changes in the
** current check-out.
**
** SUMMARY: fossil close ?-f|--force?
*/
void close_cmd(void){
int forceFlag = find_option("force","f",0)!=0;
db_must_be_within_tree();
if( !forceFlag && unsaved_changes()==1 ){
fossil_fatal("there are unsaved changes in the current checkout");
}
unlink_local_database(1);
db_close(1);
unlink_local_database(0);
}
|
Changes to src/clone.c.
| ︙ | ︙ | |||
25 26 27 28 29 30 31 | /* ** COMMAND: clone ** ** Usage: %fossil clone ?OPTIONS? URL FILENAME ** ** Make a clone of a repository specified by URL in the local | | > < | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 |
/*
** COMMAND: clone
**
** Usage: %fossil clone ?OPTIONS? URL FILENAME
**
** Make a clone of a repository specified by URL in the local
** file named FILENAME.
**
** By default, your current login name is used to create the default
** admin user. This can be overridden using the -A|--admin-user
** parameter.
**
** SUMMARY: fossil clone ?OPTIONS? URL FILENAME
** Options:
** --admin-user|-A USERNAME Make USERNAME the administrator
** --private Also clone private branches
**
*/
void clone_cmd(void){
char *zPassword;
const char *zDefaultUser; /* Optional name of the default user */
int nErr = 0;
int bPrivate; /* Also clone private branches */
|
| ︙ | ︙ |
Changes to src/configure.c.
| ︙ | ︙ | |||
55 56 57 58 59 60 61 |
{ "user", CONFIGSET_USER, "Users and privilege settings" },
{ "all", CONFIGSET_ALL, "All of the above" },
};
/*
** The following is a list of settings that we are willing to
| | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 |
{ "user", CONFIGSET_USER, "Users and privilege settings" },
{ "all", CONFIGSET_ALL, "All of the above" },
};
/*
** The following is a list of settings that we are willing to
** transfer.
**
** Setting names that begin with an alphabetic characters refer to
** single entries in the CONFIG table. Setting names that begin with
** "@" are for special processing.
*/
static struct {
const char *zName; /* Name of the configuration parameter */
|
| ︙ | ︙ | |||
145 146 147 148 149 150 151 |
** evaluated will populate the corresponding table with data.
*/
void configure_render_special_name(const char *zName, Blob *pOut){
Stmt q;
if( fossil_strcmp(zName, "@shun")==0 ){
db_prepare(&q, "SELECT uuid FROM shun");
while( db_step(&q)==SQLITE_ROW ){
| | | | | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 |
** evaluated will populate the corresponding table with data.
*/
void configure_render_special_name(const char *zName, Blob *pOut){
Stmt q;
if( fossil_strcmp(zName, "@shun")==0 ){
db_prepare(&q, "SELECT uuid FROM shun");
while( db_step(&q)==SQLITE_ROW ){
blob_appendf(pOut, "INSERT OR IGNORE INTO shun VALUES('%s');\n",
db_column_text(&q, 0)
);
}
db_finalize(&q);
}else if( fossil_strcmp(zName, "@reportfmt")==0 ){
db_prepare(&q, "SELECT title, cols, sqlcode FROM reportfmt");
while( db_step(&q)==SQLITE_ROW ){
blob_appendf(pOut, "INSERT INTO _xfer_reportfmt(title,cols,sqlcode)"
" VALUES(%Q,%Q,%Q);\n",
db_column_text(&q, 0),
db_column_text(&q, 1),
db_column_text(&q, 2)
);
}
db_finalize(&q);
}else if( fossil_strcmp(zName, "@user")==0 ){
db_prepare(&q,
"SELECT login, CASE WHEN length(pw)==40 THEN pw END,"
" cap, info, quote(photo) FROM user");
while( db_step(&q)==SQLITE_ROW ){
blob_appendf(pOut, "INSERT INTO _xfer_user(login,pw,cap,info,photo)"
" VALUES(%Q,%Q,%Q,%Q,%s);\n",
db_column_text(&q, 0),
db_column_text(&q, 1),
|
| ︙ | ︙ | |||
257 258 259 260 261 262 263 |
@ info TEXT, -- contact information
@ photo BLOB -- JPEG image of this user
@ );
@ INSERT INTO _xfer_reportfmt SELECT * FROM reportfmt;
@ INSERT INTO _xfer_user SELECT * FROM user;
;
db_multi_exec(zSQL1);
| | | 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 |
@ info TEXT, -- contact information
@ photo BLOB -- JPEG image of this user
@ );
@ INSERT INTO _xfer_reportfmt SELECT * FROM reportfmt;
@ INSERT INTO _xfer_user SELECT * FROM user;
;
db_multi_exec(zSQL1);
/* When the replace flag is set, add triggers that run the first time
** that new data is seen. The triggers run only once and delete all the
** existing data.
*/
if( replaceFlag ){
static const char zSQL2[] =
@ CREATE TRIGGER _xfer_r1 BEFORE INSERT ON _xfer_reportfmt
|
| ︙ | ︙ | |||
337 338 339 340 341 342 343 |
int mask, /* Mask indicating which configuration to export */
const char *zMask, /* Name of the configuration */
const char *zFilename /* Write into this file */
){
int i;
Blob out;
blob_zero(&out);
| | | | | 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 |
int mask, /* Mask indicating which configuration to export */
const char *zMask, /* Name of the configuration */
const char *zFilename /* Write into this file */
){
int i;
Blob out;
blob_zero(&out);
blob_appendf(&out,
"-- The \"%s\" configuration exported from\n"
"-- repository \"%s\"\n"
"-- on %s\n",
zMask, g.zRepositoryName,
db_text(0, "SELECT datetime('now')")
);
for(i=0; i<count(aConfig); i++){
if( (aConfig[i].groupMask & mask)!=0 ){
const char *zName = aConfig[i].zName;
if( zName[0]!='@' ){
char *zValue = db_text(0,
"SELECT quote(value) FROM config WHERE name=%Q", zName);
if( zValue ){
blob_appendf(&out,"REPLACE INTO config VALUES(%Q,%s);\n",
zName, zValue);
}
free(zValue);
}else{
configure_render_special_name(zName, &out);
}
}
|
| ︙ | ︙ | |||
393 394 395 396 397 398 399 | ** the current configuration. Existing values take priority over ** values read from FILENAME. ** ** %fossil configuration pull AREA ?URL? ** ** Pull and install the configuration from a different server ** identified by URL. If no URL is specified, then the default | | > > > > > > > > > > > > > > > > | | 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 |
** the current configuration. Existing values take priority over
** values read from FILENAME.
**
** %fossil configuration pull AREA ?URL?
**
** Pull and install the configuration from a different server
** identified by URL. If no URL is specified, then the default
** server is used.
**
** %fossil configuration push AREA ?URL?
**
** Push the local configuration into the remote server identified
** by URL. Admin privilege is required on the remote server for
** this to work.
**
** %fossil configuration reset AREA
**
** Restore the configuration to the default. AREA as above.
**
** WARNING: Do not import, merge, or pull configurations from an untrusted
** source. The inbound configuration is not checked for safety and can
** introduce security vulnerabilities.
**
**
** SUMMARY: fossil configure METHOD ... ?-R|--repository REPOSITORY?
** Where: METHOD = export, import, merge, pull, push or reset
**
** For methods export, pull, push and reset:
**
** fossil configure METHOD AREA ?FILENAME|URL? ?-R|--repository REPOSITORY?
**
** AREA = all email project shun skin ticket user
**
** FILENAME used with methods export, URL used with the others
**
** For methods import and merge
**
** fossil configure METHOD FILENAME -R|--repository REPOSITORY?
*/
void configuration_cmd(void){
int n;
const char *zMethod;
if( g.argc<3 ){
usage("export|import|merge|pull|reset ...");
}
db_find_and_open_repository(0, 0);
zMethod = g.argv[2];
n = strlen(zMethod);
if( strncmp(zMethod, "export", n)==0 ){
int mask;
if( g.argc!=5 ){
usage("export AREA FILENAME");
}
mask = find_area(g.argv[3]);
export_config(mask, g.argv[3], g.argv[4]);
}else
if( strncmp(zMethod, "import", n)==0
|| strncmp(zMethod, "merge", n)==0 ){
Blob in;
if( g.argc!=4 ) usage(mprintf("%s FILENAME",zMethod));
blob_read_from_file(&in, g.argv[3]);
db_begin_transaction();
configure_prepare_to_receive(zMethod[0]=='i');
db_multi_exec("%s", blob_str(&in));
|
| ︙ | ︙ | |||
472 473 474 475 476 477 478 |
}
}else
if( strncmp(zMethod, "reset", n)==0 ){
int mask, i;
char *zBackup;
if( g.argc!=4 ) usage("reset AREA");
mask = find_area(g.argv[3]);
| | | 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 |
}
}else
if( strncmp(zMethod, "reset", n)==0 ){
int mask, i;
char *zBackup;
if( g.argc!=4 ) usage("reset AREA");
mask = find_area(g.argv[3]);
zBackup = db_text(0,
"SELECT strftime('config-backup-%%Y%%m%%d%%H%%M%%f','now')");
db_begin_transaction();
export_config(mask, g.argv[3], zBackup);
for(i=0; i<count(aConfig); i++){
const char *zName = aConfig[i].zName;
if( (aConfig[i].groupMask & mask)==0 ) continue;
if( zName[0]!='@' ){
|
| ︙ | ︙ | |||
494 495 496 497 498 499 500 |
db_multi_exec("DELETE FROM shun");
}else if( fossil_strcmp(zName,"@reportfmt")==0 ){
db_multi_exec("DELETE FROM reportfmt");
}
}
db_end_transaction(0);
printf("Configuration reset to factory defaults.\n");
| | | 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 |
db_multi_exec("DELETE FROM shun");
}else if( fossil_strcmp(zName,"@reportfmt")==0 ){
db_multi_exec("DELETE FROM reportfmt");
}
}
db_end_transaction(0);
printf("Configuration reset to factory defaults.\n");
printf("To recover, use: %s %s import %s\n",
fossil_nameofexe(), g.argv[1], zBackup);
}else
{
fossil_fatal("METHOD should be one of:"
" export import merge pull push reset");
}
}
|
Changes to src/merge.c.
| ︙ | ︙ | |||
24 25 26 27 28 29 30 | /* ** COMMAND: merge ** ** Usage: %fossil merge [--cherrypick] [--backout] VERSION ** | | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | /* ** COMMAND: merge ** ** Usage: %fossil merge [--cherrypick] [--backout] VERSION ** ** The argument VERSION is a version that should be merged into the ** current checkout. All changes from VERSION back to the nearest ** common ancestor are merged. Except, if either of the --cherrypick or ** --backout options are used only the changes associated with the ** single check-in VERSION are merged. The --backout option causes ** the changes associated with VERSION to be removed from the current ** checkout rather than added. ** ** Only file content is merged. The result continues to use the ** file and directory names from the current checkout even if those |
| ︙ | ︙ | |||
281 282 283 284 285 286 287 |
db_multi_exec("UPDATE fv SET idm=0 WHERE idm=%d", idm);
}
db_finalize(&q);
/*
** Add to V files that are not in V or P but are in M
*/
| | | 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 |
db_multi_exec("UPDATE fv SET idm=0 WHERE idm=%d", idm);
}
db_finalize(&q);
/*
** Add to V files that are not in V or P but are in M
*/
db_prepare(&q,
"SELECT idm, rowid, fnm FROM fv AS x"
" WHERE idp=0 AND idv=0 AND idm>0"
);
while( db_step(&q)==SQLITE_ROW ){
int idm = db_column_int(&q, 0);
int rowid = db_column_int(&q, 1);
int idv;
|
| ︙ | ︙ | |||
305 306 307 308 309 310 311 |
printf("ADDED %s\n", zName);
if( !nochangeFlag ){
undo_save(zName);
vfile_to_disk(0, idm, 0, 0);
}
}
db_finalize(&q);
| | | | 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 |
printf("ADDED %s\n", zName);
if( !nochangeFlag ){
undo_save(zName);
vfile_to_disk(0, idm, 0, 0);
}
}
db_finalize(&q);
/*
** Find files that have changed from P->M but not P->V.
** Copy the M content over into V.
*/
db_prepare(&q,
"SELECT idv, ridm, fn FROM fv"
" WHERE idp>0 AND idv>0 AND idm>0"
" AND ridm!=ridp AND ridv=ridp AND NOT chnged"
);
|
| ︙ | ︙ | |||
455 456 457 458 459 460 461 |
/* Report on conflicts
*/
if( nConflict && !nochangeFlag ){
printf("WARNING: merge conflicts - see messages above for details.\n");
}
| | | 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 |
/* Report on conflicts
*/
if( nConflict && !nochangeFlag ){
printf("WARNING: merge conflicts - see messages above for details.\n");
}
/*
** Clean up the mid and pid VFILE entries. Then commit the changes.
*/
db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
if( !pickFlag ){
db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(0,%d)", mid);
}
undo_finish();
db_end_transaction(nochangeFlag);
}
|