Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Minor tweaks to coding style and comments. No functional changes. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
a97404ef7fc3f9d779353927d624872f |
| User & Date: | mistachkin 2015-02-24 02:40:34.609 |
Context
|
2015-02-24
| ||
| 06:03 | Add missing background-color to San Francisco Modern skin per [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg19009.html]. ... (check-in: b0febccc4e user: andybradford tags: trunk) | |
| 03:40 | Merge trunk ... (check-in: 1cbe4fd9e1 user: jan.nijtmans tags: cleanX) | |
| 02:41 | Merge updates from trunk. ... (check-in: 11578f544c user: mistachkin tags: mvAndRmFiles) | |
| 02:40 | Minor tweaks to coding style and comments. No functional changes. ... (check-in: a97404ef7f user: mistachkin tags: trunk) | |
| 00:36 | Execute 'optional' SQL statements in their original order. ... (check-in: 9491f1dd54 user: mistachkin tags: trunk) | |
Changes
Changes to src/add.c.
| ︙ | ︙ | |||
235 236 237 238 239 240 241 | ** ** The --case-sensitive option determines whether or not filenames should ** be treated case sensitive or not. If the option is not given, the default ** depends on the global setting, or the operating system default, if not set. ** ** Options: ** | | | | | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 |
**
** The --case-sensitive option determines whether or not filenames should
** be treated case sensitive or not. If the option is not given, the default
** depends on the global setting, or the operating system default, if not set.
**
** Options:
**
** --case-sensitive <BOOL> Override the case-sensitive setting.
** --dotfiles include files beginning with a dot (".")
** -f|--force Add files without prompting
** --ignore <CSG> Ignore files matching patterns from the
** comma separated list of glob patterns.
** --clean <CSG> Also ignore files matching patterns from
** the comma separated list of glob patterns.
**
** See also: addremove, rm
*/
void add_cmd(void){
int i; /* Loop counter */
int vid; /* Currently checked out version */
|
| ︙ | ︙ | |||
343 344 345 346 347 348 349 | ** 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. ** ** Options: | | | 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 |
** 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.
**
** Options:
** --case-sensitive <BOOL> Override the case-sensitive setting.
**
** See also: addremove, add
*/
void delete_cmd(void){
int i;
Stmt loop;
|
| ︙ | ︙ | |||
488 489 490 491 492 493 494 | ** the --dotfiles option is used. ** ** The --ignore option overrides the "ignore-glob" setting, as do the ** --case-sensitive option with the "case-sensitive" setting and the ** --clean option with the "clean-glob" setting. See the documentation ** on the "settings" command for further information. ** | | > | | | | | | 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 |
** the --dotfiles option is used.
**
** The --ignore option overrides the "ignore-glob" setting, as do the
** --case-sensitive option with the "case-sensitive" setting and the
** --clean option with the "clean-glob" setting. See the documentation
** on the "settings" command for further information.
**
** The -n|--dry-run option shows what would happen without actually doing
** anything.
**
** This command can be used to track third party software.
**
** Options:
** --case-sensitive <BOOL> Override the case-sensitive setting.
** --dotfiles Include files beginning with a dot (".")
** --ignore <CSG> Ignore files matching patterns from the
** comma separated list of glob patterns.
** --clean <CSG> Also ignore files matching patterns from
** the comma separated list of glob patterns.
** -n|--dry-run If given, display instead of run actions.
**
** See also: add, rm
*/
void addremove_cmd(void){
Blob path;
const char *zCleanFlag = find_option("clean",0,1);
const char *zIgnoreFlag = find_option("ignore",0,1);
|
| ︙ | ︙ | |||
585 586 587 588 589 590 591 | /* ** Rename a single file. ** ** The original name of the file is zOrig. The new filename is zNew. */ | | > > > > | 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 |
/*
** Rename a single file.
**
** The original name of the file is zOrig. The new filename is zNew.
*/
static void mv_one_file(
int vid,
const char *zOrig,
const char *zNew
){
int x = db_int(-1, "SELECT deleted FROM vfile WHERE pathname=%Q %s",
zNew, filename_collation());
if( x>=0 ){
if( x==0 ){
fossil_fatal("cannot rename '%s' to '%s' since another file named '%s'"
" is currently under management", zOrig, zNew, zNew);
}else{
|
| ︙ | ︙ | |||
619 620 621 622 623 624 625 | ** 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. ** ** Options: | | | 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 |
** 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.
**
** Options:
** --case-sensitive <BOOL> Override the case-sensitive setting.
**
** See also: changes, status
*/
void mv_cmd(void){
int i;
int vid;
char *zDest;
|
| ︙ | ︙ |