Fossil SCM

Add support for the -R option on several command-line subcommands.

drh 2011-09-13 00:40 trunk
Commit 4fe221411663c2f6d88340d17de2543ad70ec027
Parent ce354d0a9f62cde…
2 files changed +2 -2 +7 -10
~ src/descendants.c ~ src/info.c
M src/descendants.c
+2 -2
--- src/descendants.c
+++ src/descendants.c
@@ -273,11 +273,11 @@
273273
 */
274274
 void descendants_cmd(void){
275275
 Stmt q;
276276
 int base;
277277
278
- db_must_be_within_tree();
278
+ db_find_and_open_repository(0,0);
279279
 if( g.argc==2 ){
280280
 base = db_lget_int("checkout", 0);
281281
 }else{
282282
 base = name_to_typed_rid(g.argv[2], "ci");
283283
 }
@@ -310,11 +310,11 @@
310310
 Blob sql;
311311
 int showAll = find_option("all", 0, 0)!=0;
312312
 int showClosed = find_option("closed", 0, 0)!=0;
313313
 int recomputeFlag = find_option("recompute",0,0)!=0;
314314
315
- db_must_be_within_tree();
315
+ db_find_and_open_repository(0,0);
316316
 if( recomputeFlag ) leaf_rebuild();
317317
 blob_zero(&sql);
318318
 blob_append(&sql, timeline_query_for_tty(), -1);
319319
 blob_appendf(&sql, " AND blob.rid IN leaf");
320320
 if( showClosed ){
321321
--- src/descendants.c
+++ src/descendants.c
@@ -273,11 +273,11 @@
273 */
274 void descendants_cmd(void){
275 Stmt q;
276 int base;
277
278 db_must_be_within_tree();
279 if( g.argc==2 ){
280 base = db_lget_int("checkout", 0);
281 }else{
282 base = name_to_typed_rid(g.argv[2], "ci");
283 }
@@ -310,11 +310,11 @@
310 Blob sql;
311 int showAll = find_option("all", 0, 0)!=0;
312 int showClosed = find_option("closed", 0, 0)!=0;
313 int recomputeFlag = find_option("recompute",0,0)!=0;
314
315 db_must_be_within_tree();
316 if( recomputeFlag ) leaf_rebuild();
317 blob_zero(&sql);
318 blob_append(&sql, timeline_query_for_tty(), -1);
319 blob_appendf(&sql, " AND blob.rid IN leaf");
320 if( showClosed ){
321
--- src/descendants.c
+++ src/descendants.c
@@ -273,11 +273,11 @@
273 */
274 void descendants_cmd(void){
275 Stmt q;
276 int base;
277
278 db_find_and_open_repository(0,0);
279 if( g.argc==2 ){
280 base = db_lget_int("checkout", 0);
281 }else{
282 base = name_to_typed_rid(g.argv[2], "ci");
283 }
@@ -310,11 +310,11 @@
310 Blob sql;
311 int showAll = find_option("all", 0, 0)!=0;
312 int showClosed = find_option("closed", 0, 0)!=0;
313 int recomputeFlag = find_option("recompute",0,0)!=0;
314
315 db_find_and_open_repository(0,0);
316 if( recomputeFlag ) leaf_rebuild();
317 blob_zero(&sql);
318 blob_append(&sql, timeline_query_for_tty(), -1);
319 blob_appendf(&sql, " AND blob.rid IN leaf");
320 if( showClosed ){
321
M src/info.c
+7 -10
--- src/info.c
+++ src/info.c
@@ -134,41 +134,38 @@
134134
 ** Use the "finfo" command to get information about a specific
135135
 ** file in a checkout.
136136
 */
137137
 void info_cmd(void){
138138
 i64 fsize;
139
- if( g.argc!=2 && g.argc!=3 ){
140
- usage("?FILENAME|ARTIFACT-ID?");
141
- }
142139
 if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){
143140
 db_open_config(0);
144141
 db_record_repository_filename(g.argv[2]);
145142
 db_open_repository(g.argv[2]);
146143
 fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
147144
 fossil_print("project-code: %s\n", db_get("project-code", "<none>"));
148145
 fossil_print("server-code: %s\n", db_get("server-code", "<none>"));
149146
 return;
150147
 }
151
- db_must_be_within_tree();
148
+ db_find_and_open_repository(0,0);
152149
 if( g.argc==2 ){
153150
 int vid;
154151
 /* 012345678901234 */
155152
 db_record_repository_filename(0);
156153
 fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
157
- fossil_print("repository: %s\n", db_lget("repository", ""));
158
- fossil_print("local-root: %s\n", g.zLocalRoot);
154
+ if( g.localOpen ){
155
+ fossil_print("repository: %s\n", db_lget("repository", ""));
156
+ fossil_print("local-root: %s\n", g.zLocalRoot);
157
+ }
159158
 #if defined(_WIN32)
160159
 if( g.zHome ){
161160
 fossil_print("user-home: %s\n", g.zHome);
162161
 }
163162
 #endif
164163
 fossil_print("project-code: %s\n", db_get("project-code", ""));
165164
 fossil_print("server-code: %s\n", db_get("server-code", ""));
166
- vid = db_lget_int("checkout", 0);
167
- if( vid==0 ){
168
- fossil_print("checkout: nil\n");
169
- }else{
165
+ vid = g.localOpen ? db_lget_int("checkout", 0) : 0;
166
+ if( vid ){
170167
 show_common_info(vid, "checkout:", 1, 1);
171168
 }
172169
 }else{
173170
 int rid;
174171
 rid = name_to_rid(g.argv[2]);
175172
--- src/info.c
+++ src/info.c
@@ -134,41 +134,38 @@
134 ** Use the "finfo" command to get information about a specific
135 ** file in a checkout.
136 */
137 void info_cmd(void){
138 i64 fsize;
139 if( g.argc!=2 && g.argc!=3 ){
140 usage("?FILENAME|ARTIFACT-ID?");
141 }
142 if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){
143 db_open_config(0);
144 db_record_repository_filename(g.argv[2]);
145 db_open_repository(g.argv[2]);
146 fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
147 fossil_print("project-code: %s\n", db_get("project-code", "<none>"));
148 fossil_print("server-code: %s\n", db_get("server-code", "<none>"));
149 return;
150 }
151 db_must_be_within_tree();
152 if( g.argc==2 ){
153 int vid;
154 /* 012345678901234 */
155 db_record_repository_filename(0);
156 fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
157 fossil_print("repository: %s\n", db_lget("repository", ""));
158 fossil_print("local-root: %s\n", g.zLocalRoot);
 
 
159 #if defined(_WIN32)
160 if( g.zHome ){
161 fossil_print("user-home: %s\n", g.zHome);
162 }
163 #endif
164 fossil_print("project-code: %s\n", db_get("project-code", ""));
165 fossil_print("server-code: %s\n", db_get("server-code", ""));
166 vid = db_lget_int("checkout", 0);
167 if( vid==0 ){
168 fossil_print("checkout: nil\n");
169 }else{
170 show_common_info(vid, "checkout:", 1, 1);
171 }
172 }else{
173 int rid;
174 rid = name_to_rid(g.argv[2]);
175
--- src/info.c
+++ src/info.c
@@ -134,41 +134,38 @@
134 ** Use the "finfo" command to get information about a specific
135 ** file in a checkout.
136 */
137 void info_cmd(void){
138 i64 fsize;
 
 
 
139 if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){
140 db_open_config(0);
141 db_record_repository_filename(g.argv[2]);
142 db_open_repository(g.argv[2]);
143 fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
144 fossil_print("project-code: %s\n", db_get("project-code", "<none>"));
145 fossil_print("server-code: %s\n", db_get("server-code", "<none>"));
146 return;
147 }
148 db_find_and_open_repository(0,0);
149 if( g.argc==2 ){
150 int vid;
151 /* 012345678901234 */
152 db_record_repository_filename(0);
153 fossil_print("project-name: %s\n", db_get("project-name", "<unnamed>"));
154 if( g.localOpen ){
155 fossil_print("repository: %s\n", db_lget("repository", ""));
156 fossil_print("local-root: %s\n", g.zLocalRoot);
157 }
158 #if defined(_WIN32)
159 if( g.zHome ){
160 fossil_print("user-home: %s\n", g.zHome);
161 }
162 #endif
163 fossil_print("project-code: %s\n", db_get("project-code", ""));
164 fossil_print("server-code: %s\n", db_get("server-code", ""));
165 vid = g.localOpen ? db_lget_int("checkout", 0) : 0;
166 if( vid ){
 
 
167 show_common_info(vid, "checkout:", 1, 1);
168 }
169 }else{
170 int rid;
171 rid = name_to_rid(g.argv[2]);
172

Keyboard Shortcuts

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