Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch add-allow-reserved-flag Excluding Merge-Ins
This is equivalent to a diff from 36f90c7b to 7135111a
2021-03-13
| ||
00:35 | The 'add' command now fails for filenames that are reserved on Windows unless the --allow-reserved flag is used. See forum discussion 5116485456 for more details. ... (check-in: 922b5c4d user: drh tags: trunk) | |
2021-03-12
| ||
15:22 | Update the built-in SQLite to version 3.35.0 final. ... (check-in: b06953e1 user: drh tags: trunk) | |
14:44 | 'add' command now fails if given a filename which is reserved on Windows unless the --allow-reserved flag is used, per forum discussion 5116485456. ... (Closed-Leaf check-in: 7135111a user: stephan tags: add-allow-reserved-flag) | |
11:29 | Fix capitalization and statements on hash collisions in delta-manifest.md ... (check-in: 36f90c7b user: danield tags: trunk) | |
07:15 | xekri skin: set .debug foreground color to something legible against the yellowish background. ... (check-in: 749d9daf user: stephan tags: trunk) | |
Changes to src/add.c.
︙ | ︙ | |||
373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 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 | ** --clean CSG Also ignore files matching patterns from ** the Comma Separated Glob (CSG) list ** --reset Reset the ADDED state of a checkout, such ** that all newly-added (but not yet committed) ** files are no longer added. No flags other ** than --verbose and --dry-run may be used ** with --reset. ** ** The following options are only valid with --reset: ** -v|--verbose Output information about each --reset file ** -n|--dry-run Display instead of run actions ** ** See also: [[addremove]], [[rm]] */ void add_cmd(void){ int i; /* Loop counter */ int vid; /* Currently checked out version */ int nRoot; /* Full path characters in g.zLocalRoot */ const char *zCleanFlag; /* The --clean option or clean-glob setting */ const char *zIgnoreFlag; /* The --ignore option or ignore-glob setting */ Glob *pIgnore, *pClean; /* Ignore everything matching the glob patterns */ unsigned scanFlags = 0; /* Flags passed to vfile_scan() */ int forceFlag; if(0!=find_option("reset",0,0)){ int const verboseFlag = find_option("verbose","v",0)!=0; int const dryRunFlag = find_option("dry-run","n",0)!=0; db_must_be_within_tree(); verify_all_options(); addremove_reset(1, dryRunFlag, verboseFlag); return; } zCleanFlag = find_option("clean",0,1); zIgnoreFlag = find_option("ignore",0,1); forceFlag = find_option("force","f",0)!=0; if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; /* We should be done with options.. */ verify_all_options(); db_must_be_within_tree(); if( zCleanFlag==0 ){ zCleanFlag = db_get("clean-glob", 0); | > > > > > | 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 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 | ** --clean CSG Also ignore files matching patterns from ** the Comma Separated Glob (CSG) list ** --reset Reset the ADDED state of a checkout, such ** that all newly-added (but not yet committed) ** files are no longer added. No flags other ** than --verbose and --dry-run may be used ** with --reset. ** --allow-reserved Permit filenames which are reserved on ** Windows platforms. Such files cannot be ** checked out on Windows, so use with care. ** ** The following options are only valid with --reset: ** -v|--verbose Output information about each --reset file ** -n|--dry-run Display instead of run actions ** ** See also: [[addremove]], [[rm]] */ void add_cmd(void){ int i; /* Loop counter */ int vid; /* Currently checked out version */ int nRoot; /* Full path characters in g.zLocalRoot */ const char *zCleanFlag; /* The --clean option or clean-glob setting */ const char *zIgnoreFlag; /* The --ignore option or ignore-glob setting */ Glob *pIgnore, *pClean; /* Ignore everything matching the glob patterns */ unsigned scanFlags = 0; /* Flags passed to vfile_scan() */ int forceFlag; int allowReservedFlag = 0; /* --allow-reserved flag */ if(0!=find_option("reset",0,0)){ int const verboseFlag = find_option("verbose","v",0)!=0; int const dryRunFlag = find_option("dry-run","n",0)!=0; db_must_be_within_tree(); verify_all_options(); addremove_reset(1, dryRunFlag, verboseFlag); return; } zCleanFlag = find_option("clean",0,1); zIgnoreFlag = find_option("ignore",0,1); forceFlag = find_option("force","f",0)!=0; if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; allowReservedFlag = find_option("allow-reserved",0,0)!=0; /* We should be done with options.. */ verify_all_options(); db_must_be_within_tree(); if( zCleanFlag==0 ){ zCleanFlag = db_get("clean-glob", 0); |
︙ | ︙ | |||
427 428 429 430 431 432 433 | pIgnore = glob_create(zIgnoreFlag); nRoot = strlen(g.zLocalRoot); /* Load the names of all files that are to be added into sfile temp table */ for(i=2; i<g.argc; i++){ char *zName; int isDir; | | > > > > > > > > > | | > | 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 457 458 459 460 461 462 | pIgnore = glob_create(zIgnoreFlag); nRoot = strlen(g.zLocalRoot); /* Load the names of all files that are to be added into sfile temp table */ for(i=2; i<g.argc; i++){ char *zName; int isDir; Blob fullName = empty_blob; /* file_tree_name() throws a fatal error if g.argv[i] is outside of the ** checkout. */ file_tree_name(g.argv[i], &fullName, 0, 1); if(0==allowReservedFlag && 0!=file_is_win_reserved(blob_str(&fullName))){ /* Note that the 'add' internal machinery already _silently_ ** skips over any names for which file_is_reserved_name() ** returns true or which is in the fossil_reserved_name() ** list. We do not need to warn for those, as they're outright ** verboten. */ fossil_fatal("Filename is reserved: %b\n" "Use --allow-reserved to permit " "reserved filenames.", &fullName); } blob_reset(&fullName); file_canonical_name(g.argv[i], &fullName, 0); zName = blob_str(&fullName); isDir = file_isdir(zName, RepoFILE); if( isDir==1 ){ vfile_scan(&fullName, nRoot-1, scanFlags, pClean, pIgnore, RepoFILE); }else if( isDir==0 ){ fossil_warning("not found: %s", zName); |
︙ | ︙ |