Fossil SCM

Change the "setting" command so that it works for global settings even if it is run outside of a check-out and with no repository specified using -R.

drh 2010-12-26 13:22 trunk
Commit 3d59229789df4de496ea7bfaa5daf6a517a8510d
1 file changed +3 -1
+3 -1
--- src/db.c
+++ src/db.c
@@ -1692,11 +1692,13 @@
16921692
void setting_cmd(void){
16931693
int i;
16941694
int globalFlag = find_option("global","g",0)!=0;
16951695
int unsetFlag = g.argv[1][0]=='u';
16961696
db_open_config(1);
1697
- db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
1697
+ if( !globalFlag ){
1698
+ db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1699
+ }
16981700
if( !g.repositoryOpen ){
16991701
globalFlag = 1;
17001702
}
17011703
if( unsetFlag && g.argc!=3 ){
17021704
usage("PROPERTY ?-global?");
17031705
--- src/db.c
+++ src/db.c
@@ -1692,11 +1692,13 @@
1692 void setting_cmd(void){
1693 int i;
1694 int globalFlag = find_option("global","g",0)!=0;
1695 int unsetFlag = g.argv[1][0]=='u';
1696 db_open_config(1);
1697 db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
 
 
1698 if( !g.repositoryOpen ){
1699 globalFlag = 1;
1700 }
1701 if( unsetFlag && g.argc!=3 ){
1702 usage("PROPERTY ?-global?");
1703
--- src/db.c
+++ src/db.c
@@ -1692,11 +1692,13 @@
1692 void setting_cmd(void){
1693 int i;
1694 int globalFlag = find_option("global","g",0)!=0;
1695 int unsetFlag = g.argv[1][0]=='u';
1696 db_open_config(1);
1697 if( !globalFlag ){
1698 db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1699 }
1700 if( !g.repositoryOpen ){
1701 globalFlag = 1;
1702 }
1703 if( unsetFlag && g.argc!=3 ){
1704 usage("PROPERTY ?-global?");
1705

Keyboard Shortcuts

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