Fossil SCM

Add the "dotfiles" setting.

drh 2015-03-17 14:44 trunk merge
Commit e1e0ec574b2514cd204b64b4436682af18b5ef78
Parent b1508e7a8ad5b07…
3 files changed +2 +3 +3
~ src/add.c ~ src/checkin.c ~ src/db.c
M src/add.c
+2
--- src/add.c
+++ src/add.c
@@ -272,10 +272,11 @@
272272
 zCleanFlag = db_get("clean-glob", 0);
273273
 }
274274
 if( zIgnoreFlag==0 ){
275275
 zIgnoreFlag = db_get("ignore-glob", 0);
276276
 }
277
+ if( db_get_boolean("dotfiles", 0) ) scanFlags |= SCAN_ALL;
277278
 vid = db_lget_int("checkout",0);
278279
 db_begin_transaction();
279280
 db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
280281
 filename_collation());
281282
 pClean = glob_create(zCleanFlag);
@@ -533,10 +534,11 @@
533534
 zCleanFlag = db_get("clean-glob", 0);
534535
 }
535536
 if( zIgnoreFlag==0 ){
536537
 zIgnoreFlag = db_get("ignore-glob", 0);
537538
 }
539
+ if( db_get_boolean("dotfiles", 0) ) scanFlags |= SCAN_ALL;
538540
 vid = db_lget_int("checkout",0);
539541
 db_begin_transaction();
540542
541543
 /* step 1:
542544
 ** Populate the temp table "sfile" with the names of all unmanaged
543545
--- src/add.c
+++ src/add.c
@@ -272,10 +272,11 @@
272 zCleanFlag = db_get("clean-glob", 0);
273 }
274 if( zIgnoreFlag==0 ){
275 zIgnoreFlag = db_get("ignore-glob", 0);
276 }
 
277 vid = db_lget_int("checkout",0);
278 db_begin_transaction();
279 db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
280 filename_collation());
281 pClean = glob_create(zCleanFlag);
@@ -533,10 +534,11 @@
533 zCleanFlag = db_get("clean-glob", 0);
534 }
535 if( zIgnoreFlag==0 ){
536 zIgnoreFlag = db_get("ignore-glob", 0);
537 }
 
538 vid = db_lget_int("checkout",0);
539 db_begin_transaction();
540
541 /* step 1:
542 ** Populate the temp table "sfile" with the names of all unmanaged
543
--- src/add.c
+++ src/add.c
@@ -272,10 +272,11 @@
272 zCleanFlag = db_get("clean-glob", 0);
273 }
274 if( zIgnoreFlag==0 ){
275 zIgnoreFlag = db_get("ignore-glob", 0);
276 }
277 if( db_get_boolean("dotfiles", 0) ) scanFlags |= SCAN_ALL;
278 vid = db_lget_int("checkout",0);
279 db_begin_transaction();
280 db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
281 filename_collation());
282 pClean = glob_create(zCleanFlag);
@@ -533,10 +534,11 @@
534 zCleanFlag = db_get("clean-glob", 0);
535 }
536 if( zIgnoreFlag==0 ){
537 zIgnoreFlag = db_get("ignore-glob", 0);
538 }
539 if( db_get_boolean("dotfiles", 0) ) scanFlags |= SCAN_ALL;
540 vid = db_lget_int("checkout",0);
541 db_begin_transaction();
542
543 /* step 1:
544 ** Populate the temp table "sfile" with the names of all unmanaged
545
M src/checkin.c
+3
--- src/checkin.c
+++ src/checkin.c
@@ -571,10 +571,12 @@
571571
572572
 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
573573
 db_must_be_within_tree();
574574
 cwdRelative = determine_cwd_relative_option();
575575
576
+ if( db_get_boolean("dotfiles", 0) ) scanFlags |= SCAN_ALL;
577
+
576578
 /* We should be done with options.. */
577579
 verify_all_options();
578580
579581
 if( zIgnoreFlag==0 ){
580582
 zIgnoreFlag = db_get("ignore-glob", 0);
@@ -707,10 +709,11 @@
707709
 zKeepFlag = db_get("keep-glob", 0);
708710
 }
709711
 if( zCleanFlag==0 ){
710712
 zCleanFlag = db_get("clean-glob", 0);
711713
 }
714
+ if( db_get_boolean("dotfiles", 0) ) scanFlags |= SCAN_ALL;
712715
 verify_all_options();
713716
 pIgnore = glob_create(zIgnoreFlag);
714717
 pKeep = glob_create(zKeepFlag);
715718
 pClean = glob_create(zCleanFlag);
716719
 nRoot = (int)strlen(g.zLocalRoot);
717720
--- src/checkin.c
+++ src/checkin.c
@@ -571,10 +571,12 @@
571
572 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
573 db_must_be_within_tree();
574 cwdRelative = determine_cwd_relative_option();
575
 
 
576 /* We should be done with options.. */
577 verify_all_options();
578
579 if( zIgnoreFlag==0 ){
580 zIgnoreFlag = db_get("ignore-glob", 0);
@@ -707,10 +709,11 @@
707 zKeepFlag = db_get("keep-glob", 0);
708 }
709 if( zCleanFlag==0 ){
710 zCleanFlag = db_get("clean-glob", 0);
711 }
 
712 verify_all_options();
713 pIgnore = glob_create(zIgnoreFlag);
714 pKeep = glob_create(zKeepFlag);
715 pClean = glob_create(zCleanFlag);
716 nRoot = (int)strlen(g.zLocalRoot);
717
--- src/checkin.c
+++ src/checkin.c
@@ -571,10 +571,12 @@
571
572 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
573 db_must_be_within_tree();
574 cwdRelative = determine_cwd_relative_option();
575
576 if( db_get_boolean("dotfiles", 0) ) scanFlags |= SCAN_ALL;
577
578 /* We should be done with options.. */
579 verify_all_options();
580
581 if( zIgnoreFlag==0 ){
582 zIgnoreFlag = db_get("ignore-glob", 0);
@@ -707,10 +709,11 @@
709 zKeepFlag = db_get("keep-glob", 0);
710 }
711 if( zCleanFlag==0 ){
712 zCleanFlag = db_get("clean-glob", 0);
713 }
714 if( db_get_boolean("dotfiles", 0) ) scanFlags |= SCAN_ALL;
715 verify_all_options();
716 pIgnore = glob_create(zIgnoreFlag);
717 pKeep = glob_create(zKeepFlag);
718 pClean = glob_create(zCleanFlag);
719 nRoot = (int)strlen(g.zLocalRoot);
720
M src/db.c
+3
--- src/db.c
+++ src/db.c
@@ -2375,10 +2375,11 @@
23752375
 { "crnl-glob", 0, 40, 1, 0, "" },
23762376
 { "default-perms", 0, 16, 0, 0, "u" },
23772377
 { "diff-binary", 0, 0, 0, 0, "on" },
23782378
 { "diff-command", 0, 40, 0, 0, "" },
23792379
 { "dont-push", 0, 0, 0, 0, "off" },
2380
+ { "dotfiles", 0, 0, 0, 0, "off" },
23802381
 { "editor", 0, 32, 0, 0, "" },
23812382
 { "empty-dirs", 0, 40, 1, 0, "" },
23822383
 { "encoding-glob", 0, 40, 1, 0, "" },
23832384
 { "gdiff-command", 0, 40, 0, 0, "gdiff" },
23842385
 { "gmerge-command", 0, 40, 0, 0, "" },
@@ -2535,10 +2536,12 @@
25352536
 ** diff-command External command to run when performing a diff.
25362537
 ** If undefined, the internal text diff will be used.
25372538
 **
25382539
 ** dont-push Prevent this repository from pushing from client to
25392540
 ** server. Useful when setting up a private branch.
2541
+**
2542
+** dotfiles Include --dotfiles option for all compatible commands.
25402543
 **
25412544
 ** editor Text editor command used for check-in comments.
25422545
 **
25432546
 ** empty-dirs A comma or newline-separated list of pathnames. On
25442547
 ** (versionable) update and checkout commands, if no file or directory
25452548
--- src/db.c
+++ src/db.c
@@ -2375,10 +2375,11 @@
2375 { "crnl-glob", 0, 40, 1, 0, "" },
2376 { "default-perms", 0, 16, 0, 0, "u" },
2377 { "diff-binary", 0, 0, 0, 0, "on" },
2378 { "diff-command", 0, 40, 0, 0, "" },
2379 { "dont-push", 0, 0, 0, 0, "off" },
 
2380 { "editor", 0, 32, 0, 0, "" },
2381 { "empty-dirs", 0, 40, 1, 0, "" },
2382 { "encoding-glob", 0, 40, 1, 0, "" },
2383 { "gdiff-command", 0, 40, 0, 0, "gdiff" },
2384 { "gmerge-command", 0, 40, 0, 0, "" },
@@ -2535,10 +2536,12 @@
2535 ** diff-command External command to run when performing a diff.
2536 ** If undefined, the internal text diff will be used.
2537 **
2538 ** dont-push Prevent this repository from pushing from client to
2539 ** server. Useful when setting up a private branch.
 
 
2540 **
2541 ** editor Text editor command used for check-in comments.
2542 **
2543 ** empty-dirs A comma or newline-separated list of pathnames. On
2544 ** (versionable) update and checkout commands, if no file or directory
2545
--- src/db.c
+++ src/db.c
@@ -2375,10 +2375,11 @@
2375 { "crnl-glob", 0, 40, 1, 0, "" },
2376 { "default-perms", 0, 16, 0, 0, "u" },
2377 { "diff-binary", 0, 0, 0, 0, "on" },
2378 { "diff-command", 0, 40, 0, 0, "" },
2379 { "dont-push", 0, 0, 0, 0, "off" },
2380 { "dotfiles", 0, 0, 0, 0, "off" },
2381 { "editor", 0, 32, 0, 0, "" },
2382 { "empty-dirs", 0, 40, 1, 0, "" },
2383 { "encoding-glob", 0, 40, 1, 0, "" },
2384 { "gdiff-command", 0, 40, 0, 0, "gdiff" },
2385 { "gmerge-command", 0, 40, 0, 0, "" },
@@ -2535,10 +2536,12 @@
2536 ** diff-command External command to run when performing a diff.
2537 ** If undefined, the internal text diff will be used.
2538 **
2539 ** dont-push Prevent this repository from pushing from client to
2540 ** server. Useful when setting up a private branch.
2541 **
2542 ** dotfiles Include --dotfiles option for all compatible commands.
2543 **
2544 ** editor Text editor command used for check-in comments.
2545 **
2546 ** empty-dirs A comma or newline-separated list of pathnames. On
2547 ** (versionable) update and checkout commands, if no file or directory
2548

Keyboard Shortcuts

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