Fossil SCM

Fix the "info" command so that it once again accepts the -R option.

drh 2015-01-24 20:42 trunk
Commit 5826f9c4b8f64eca6854dfd96b79836325e77ffa
1 file changed +1 -3
+1 -3
--- src/info.c
+++ src/info.c
@@ -198,13 +198,10 @@
198198
int verboseFlag = find_option("verbose","v",0)!=0;
199199
if( !verboseFlag ){
200200
verboseFlag = find_option("detail","l",0)!=0; /* deprecated */
201201
}
202202
203
- /* We should be done with options.. */
204
- verify_all_options();
205
-
206203
if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){
207204
db_open_config(0);
208205
db_open_repository(g.argv[2]);
209206
db_record_repository_filename(g.argv[2]);
210207
fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
@@ -211,10 +208,11 @@
211208
fossil_print("project-code: %s\n", db_get("project-code", "<none>"));
212209
extraRepoInfo();
213210
return;
214211
}
215212
db_find_and_open_repository(0,0);
213
+ verify_all_options();
216214
if( g.argc==2 ){
217215
int vid;
218216
/* 012345678901234 */
219217
db_record_repository_filename(0);
220218
fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
221219
--- src/info.c
+++ src/info.c
@@ -198,13 +198,10 @@
198 int verboseFlag = find_option("verbose","v",0)!=0;
199 if( !verboseFlag ){
200 verboseFlag = find_option("detail","l",0)!=0; /* deprecated */
201 }
202
203 /* We should be done with options.. */
204 verify_all_options();
205
206 if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){
207 db_open_config(0);
208 db_open_repository(g.argv[2]);
209 db_record_repository_filename(g.argv[2]);
210 fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
@@ -211,10 +208,11 @@
211 fossil_print("project-code: %s\n", db_get("project-code", "<none>"));
212 extraRepoInfo();
213 return;
214 }
215 db_find_and_open_repository(0,0);
 
216 if( g.argc==2 ){
217 int vid;
218 /* 012345678901234 */
219 db_record_repository_filename(0);
220 fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
221
--- src/info.c
+++ src/info.c
@@ -198,13 +198,10 @@
198 int verboseFlag = find_option("verbose","v",0)!=0;
199 if( !verboseFlag ){
200 verboseFlag = find_option("detail","l",0)!=0; /* deprecated */
201 }
202
 
 
 
203 if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){
204 db_open_config(0);
205 db_open_repository(g.argv[2]);
206 db_record_repository_filename(g.argv[2]);
207 fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
@@ -211,10 +208,11 @@
208 fossil_print("project-code: %s\n", db_get("project-code", "<none>"));
209 extraRepoInfo();
210 return;
211 }
212 db_find_and_open_repository(0,0);
213 verify_all_options();
214 if( g.argc==2 ){
215 int vid;
216 /* 012345678901234 */
217 db_record_repository_filename(0);
218 fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
219

Keyboard Shortcuts

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