Fossil SCM

Minor tweaks to coding style and comments. No functional changes.

mistachkin 2015-02-24 02:40 trunk
Commit a97404ef7fc3f9d779353927d624872ffaf33a2a
Parent 9491f1dd54e2ff7…
1 file changed +17 -12
~ src/add.c
M src/add.c
+17 -12
--- src/add.c
+++ src/add.c
@@ -237,16 +237,16 @@
237237
 ** be treated case sensitive or not. If the option is not given, the default
238238
 ** depends on the global setting, or the operating system default, if not set.
239239
 **
240240
 ** Options:
241241
 **
242
-** --case-sensitive <BOOL> override case-sensitive setting
242
+** --case-sensitive <BOOL> Override the case-sensitive setting.
243243
 ** --dotfiles include files beginning with a dot (".")
244244
 ** -f|--force Add files without prompting
245
-** --ignore <CSG> ignore files matching patterns from the
245
+** --ignore <CSG> Ignore files matching patterns from the
246246
 ** comma separated list of glob patterns.
247
-** --clean <CSG> also ignore files matching patterns from
247
+** --clean <CSG> Also ignore files matching patterns from
248248
 ** the comma separated list of glob patterns.
249249
 **
250250
 ** See also: addremove, rm
251251
 */
252252
 void add_cmd(void){
@@ -345,11 +345,11 @@
345345
 ** This command does NOT remove the files from disk. It just marks the
346346
 ** files as no longer being part of the project. In other words, future
347347
 ** changes to the named files will not be versioned.
348348
 **
349349
 ** Options:
350
-** --case-sensitive <BOOL> override case-sensitive setting
350
+** --case-sensitive <BOOL> Override the case-sensitive setting.
351351
 **
352352
 ** See also: addremove, add
353353
 */
354354
 void delete_cmd(void){
355355
 int i;
@@ -490,22 +490,23 @@
490490
 ** The --ignore option overrides the "ignore-glob" setting, as do the
491491
 ** --case-sensitive option with the "case-sensitive" setting and the
492492
 ** --clean option with the "clean-glob" setting. See the documentation
493493
 ** on the "settings" command for further information.
494494
 **
495
-** The -n|--dry-run option shows what would happen without actually doing anything.
495
+** The -n|--dry-run option shows what would happen without actually doing
496
+** anything.
496497
 **
497498
 ** This command can be used to track third party software.
498499
 **
499500
 ** Options:
500
-** --case-sensitive <BOOL> override case-sensitive setting
501
-** --dotfiles include files beginning with a dot (".")
502
-** --ignore <CSG> ignore files matching patterns from the
501
+** --case-sensitive <BOOL> Override the case-sensitive setting.
502
+** --dotfiles Include files beginning with a dot (".")
503
+** --ignore <CSG> Ignore files matching patterns from the
503504
 ** comma separated list of glob patterns.
504
-** --clean <CSG> also ignore files matching patterns from
505
+** --clean <CSG> Also ignore files matching patterns from
505506
 ** the comma separated list of glob patterns.
506
-** -n|--dry-run If given, display instead of run actions
507
+** -n|--dry-run If given, display instead of run actions.
507508
 **
508509
 ** See also: add, rm
509510
 */
510511
 void addremove_cmd(void){
511512
 Blob path;
@@ -587,11 +588,15 @@
587588
 /*
588589
 ** Rename a single file.
589590
 **
590591
 ** The original name of the file is zOrig. The new filename is zNew.
591592
 */
592
-static void mv_one_file(int vid, const char *zOrig, const char *zNew){
593
+static void mv_one_file(
594
+ int vid,
595
+ const char *zOrig,
596
+ const char *zNew
597
+){
593598
 int x = db_int(-1, "SELECT deleted FROM vfile WHERE pathname=%Q %s",
594599
 zNew, filename_collation());
595600
 if( x>=0 ){
596601
 if( x==0 ){
597602
 fossil_fatal("cannot rename '%s' to '%s' since another file named '%s'"
@@ -621,11 +626,11 @@
621626
 ** This command does NOT rename or move the files on disk. This command merely
622627
 ** records the fact that filenames have changed so that appropriate notations
623628
 ** can be made at the next commit/checkin.
624629
 **
625630
 ** Options:
626
-** --case-sensitive <BOOL> override case-sensitive setting
631
+** --case-sensitive <BOOL> Override the case-sensitive setting.
627632
 **
628633
 ** See also: changes, status
629634
 */
630635
 void mv_cmd(void){
631636
 int i;
632637
--- src/add.c
+++ src/add.c
@@ -237,16 +237,16 @@
237 ** be treated case sensitive or not. If the option is not given, the default
238 ** depends on the global setting, or the operating system default, if not set.
239 **
240 ** Options:
241 **
242 ** --case-sensitive <BOOL> override case-sensitive setting
243 ** --dotfiles include files beginning with a dot (".")
244 ** -f|--force Add files without prompting
245 ** --ignore <CSG> ignore files matching patterns from the
246 ** comma separated list of glob patterns.
247 ** --clean <CSG> also ignore files matching patterns from
248 ** the comma separated list of glob patterns.
249 **
250 ** See also: addremove, rm
251 */
252 void add_cmd(void){
@@ -345,11 +345,11 @@
345 ** This command does NOT remove the files from disk. It just marks the
346 ** files as no longer being part of the project. In other words, future
347 ** changes to the named files will not be versioned.
348 **
349 ** Options:
350 ** --case-sensitive <BOOL> override case-sensitive setting
351 **
352 ** See also: addremove, add
353 */
354 void delete_cmd(void){
355 int i;
@@ -490,22 +490,23 @@
490 ** The --ignore option overrides the "ignore-glob" setting, as do the
491 ** --case-sensitive option with the "case-sensitive" setting and the
492 ** --clean option with the "clean-glob" setting. See the documentation
493 ** on the "settings" command for further information.
494 **
495 ** The -n|--dry-run option shows what would happen without actually doing anything.
 
496 **
497 ** This command can be used to track third party software.
498 **
499 ** Options:
500 ** --case-sensitive <BOOL> override case-sensitive setting
501 ** --dotfiles include files beginning with a dot (".")
502 ** --ignore <CSG> ignore files matching patterns from the
503 ** comma separated list of glob patterns.
504 ** --clean <CSG> also ignore files matching patterns from
505 ** the comma separated list of glob patterns.
506 ** -n|--dry-run If given, display instead of run actions
507 **
508 ** See also: add, rm
509 */
510 void addremove_cmd(void){
511 Blob path;
@@ -587,11 +588,15 @@
587 /*
588 ** Rename a single file.
589 **
590 ** The original name of the file is zOrig. The new filename is zNew.
591 */
592 static void mv_one_file(int vid, const char *zOrig, const char *zNew){
 
 
 
 
593 int x = db_int(-1, "SELECT deleted FROM vfile WHERE pathname=%Q %s",
594 zNew, filename_collation());
595 if( x>=0 ){
596 if( x==0 ){
597 fossil_fatal("cannot rename '%s' to '%s' since another file named '%s'"
@@ -621,11 +626,11 @@
621 ** This command does NOT rename or move the files on disk. This command merely
622 ** records the fact that filenames have changed so that appropriate notations
623 ** can be made at the next commit/checkin.
624 **
625 ** Options:
626 ** --case-sensitive <BOOL> override case-sensitive setting
627 **
628 ** See also: changes, status
629 */
630 void mv_cmd(void){
631 int i;
632
--- src/add.c
+++ src/add.c
@@ -237,16 +237,16 @@
237 ** be treated case sensitive or not. If the option is not given, the default
238 ** depends on the global setting, or the operating system default, if not set.
239 **
240 ** Options:
241 **
242 ** --case-sensitive <BOOL> Override the case-sensitive setting.
243 ** --dotfiles include files beginning with a dot (".")
244 ** -f|--force Add files without prompting
245 ** --ignore <CSG> Ignore files matching patterns from the
246 ** comma separated list of glob patterns.
247 ** --clean <CSG> Also ignore files matching patterns from
248 ** the comma separated list of glob patterns.
249 **
250 ** See also: addremove, rm
251 */
252 void add_cmd(void){
@@ -345,11 +345,11 @@
345 ** This command does NOT remove the files from disk. It just marks the
346 ** files as no longer being part of the project. In other words, future
347 ** changes to the named files will not be versioned.
348 **
349 ** Options:
350 ** --case-sensitive <BOOL> Override the case-sensitive setting.
351 **
352 ** See also: addremove, add
353 */
354 void delete_cmd(void){
355 int i;
@@ -490,22 +490,23 @@
490 ** The --ignore option overrides the "ignore-glob" setting, as do the
491 ** --case-sensitive option with the "case-sensitive" setting and the
492 ** --clean option with the "clean-glob" setting. See the documentation
493 ** on the "settings" command for further information.
494 **
495 ** The -n|--dry-run option shows what would happen without actually doing
496 ** anything.
497 **
498 ** This command can be used to track third party software.
499 **
500 ** Options:
501 ** --case-sensitive <BOOL> Override the case-sensitive setting.
502 ** --dotfiles Include files beginning with a dot (".")
503 ** --ignore <CSG> Ignore files matching patterns from the
504 ** comma separated list of glob patterns.
505 ** --clean <CSG> Also ignore files matching patterns from
506 ** the comma separated list of glob patterns.
507 ** -n|--dry-run If given, display instead of run actions.
508 **
509 ** See also: add, rm
510 */
511 void addremove_cmd(void){
512 Blob path;
@@ -587,11 +588,15 @@
588 /*
589 ** Rename a single file.
590 **
591 ** The original name of the file is zOrig. The new filename is zNew.
592 */
593 static void mv_one_file(
594 int vid,
595 const char *zOrig,
596 const char *zNew
597 ){
598 int x = db_int(-1, "SELECT deleted FROM vfile WHERE pathname=%Q %s",
599 zNew, filename_collation());
600 if( x>=0 ){
601 if( x==0 ){
602 fossil_fatal("cannot rename '%s' to '%s' since another file named '%s'"
@@ -621,11 +626,11 @@
626 ** This command does NOT rename or move the files on disk. This command merely
627 ** records the fact that filenames have changed so that appropriate notations
628 ** can be made at the next commit/checkin.
629 **
630 ** Options:
631 ** --case-sensitive <BOOL> Override the case-sensitive setting.
632 **
633 ** See also: changes, status
634 */
635 void mv_cmd(void){
636 int i;
637

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button