Fossil SCM
Updates to the autosync logic. Add the "setting" command.
Commit
fff234b77cc774ca649f8279cd50585a9d44ac4b
Parent
e6d1cd96793dcbf…
6 files changed
+2
-6
+14
-8
+38
+22
-10
+2
-6
+2
-5
+2
-6
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -157,16 +157,12 @@ | ||
| 157 | 157 | undo_reset(); |
| 158 | 158 | |
| 159 | 159 | /* Commit */ |
| 160 | 160 | db_end_transaction(0); |
| 161 | 161 | |
| 162 | - /* Autosync and do a push? */ | |
| 163 | - if( do_autosync() ){ | |
| 164 | - g.argc=2; | |
| 165 | - g.argv[1]="push"; | |
| 166 | - push_cmd(); | |
| 167 | - } | |
| 162 | + /* Do an autosync push, if requested */ | |
| 163 | + autosync(0); | |
| 168 | 164 | } |
| 169 | 165 | |
| 170 | 166 | /* |
| 171 | 167 | ** COMMAND: branch |
| 172 | 168 | ** |
| 173 | 169 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -157,16 +157,12 @@ | |
| 157 | undo_reset(); |
| 158 | |
| 159 | /* Commit */ |
| 160 | db_end_transaction(0); |
| 161 | |
| 162 | /* Autosync and do a push? */ |
| 163 | if( do_autosync() ){ |
| 164 | g.argc=2; |
| 165 | g.argv[1]="push"; |
| 166 | push_cmd(); |
| 167 | } |
| 168 | } |
| 169 | |
| 170 | /* |
| 171 | ** COMMAND: branch |
| 172 | ** |
| 173 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -157,16 +157,12 @@ | |
| 157 | undo_reset(); |
| 158 | |
| 159 | /* Commit */ |
| 160 | db_end_transaction(0); |
| 161 | |
| 162 | /* Do an autosync push, if requested */ |
| 163 | autosync(0); |
| 164 | } |
| 165 | |
| 166 | /* |
| 167 | ** COMMAND: branch |
| 168 | ** |
| 169 |
+14
-8
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -323,23 +323,30 @@ | ||
| 323 | 323 | Stmt q; |
| 324 | 324 | Stmt q2; |
| 325 | 325 | char *zUuid, *zDate; |
| 326 | 326 | int noSign = 0; /* True to omit signing the manifest using GPG */ |
| 327 | 327 | int isAMerge = 0; /* True if checking in a merge */ |
| 328 | + int forceFlag = 0; /* Force a fork */ | |
| 328 | 329 | char *zManifestFile; /* Name of the manifest file */ |
| 329 | 330 | Blob manifest; |
| 330 | 331 | Blob muuid; /* Manifest uuid */ |
| 331 | 332 | Blob mcksum; /* Self-checksum on the manifest */ |
| 332 | 333 | Blob cksum1, cksum2; /* Before and after commit checksums */ |
| 333 | 334 | Blob cksum1b; /* Checksum recorded in the manifest */ |
| 334 | 335 | |
| 335 | 336 | noSign = find_option("nosign","",0)!=0; |
| 336 | 337 | zComment = find_option("comment","m",1); |
| 338 | + forceFlag = find_option("force", "r", 0)!=0; | |
| 337 | 339 | db_must_be_within_tree(); |
| 338 | 340 | noSign = db_get_int("omit-ci-sig", 0)|noSign; |
| 339 | 341 | verify_all_options(); |
| 340 | - | |
| 342 | + | |
| 343 | + /* | |
| 344 | + ** Autosync if requested. | |
| 345 | + */ | |
| 346 | + autosync(1); | |
| 347 | + | |
| 341 | 348 | /* There are two ways this command may be executed. If there are |
| 342 | 349 | ** no arguments following the word "commit", then all modified files |
| 343 | 350 | ** in the checked out directory are committed. If one or more arguments |
| 344 | 351 | ** follows "commit", then only those files are committed. |
| 345 | 352 | ** |
| @@ -355,11 +362,11 @@ | ||
| 355 | 362 | } |
| 356 | 363 | |
| 357 | 364 | user_select(); |
| 358 | 365 | db_begin_transaction(); |
| 359 | 366 | rc = unsaved_changes(); |
| 360 | - if( rc==0 && !isAMerge ){ | |
| 367 | + if( rc==0 && !isAMerge && !forceFlag ){ | |
| 361 | 368 | fossil_panic("nothing has changed"); |
| 362 | 369 | } |
| 363 | 370 | |
| 364 | 371 | /* If one or more files that were named on the command line have not |
| 365 | 372 | ** been modified, bail out now. |
| @@ -375,10 +382,13 @@ | ||
| 375 | 382 | fossil_panic("file %s has not changed", blob_str(&unmodified)); |
| 376 | 383 | } |
| 377 | 384 | } |
| 378 | 385 | |
| 379 | 386 | vid = db_lget_int("checkout", 0); |
| 387 | + if( !forceFlag && db_exists("SELECT 1 FROM plink WHERE pid=%d", vid) ){ | |
| 388 | + fossil_fatal("would fork. use -f or --force"); | |
| 389 | + } | |
| 380 | 390 | vfile_aggregate_checksum_disk(vid, &cksum1); |
| 381 | 391 | if( zComment ){ |
| 382 | 392 | blob_zero(&comment); |
| 383 | 393 | blob_append(&comment, zComment, -1); |
| 384 | 394 | }else{ |
| @@ -524,12 +534,8 @@ | ||
| 524 | 534 | undo_reset(); |
| 525 | 535 | |
| 526 | 536 | /* Commit */ |
| 527 | 537 | db_end_transaction(0); |
| 528 | 538 | |
| 529 | - /* Autosync and do a push? */ | |
| 530 | - if( do_autosync() ){ | |
| 531 | - g.argc=2; | |
| 532 | - g.argv[1]="push"; | |
| 533 | - push_cmd(); | |
| 534 | - } | |
| 539 | + /* Do an autosync push if requested */ | |
| 540 | + autosync(0); | |
| 535 | 541 | } |
| 536 | 542 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -323,23 +323,30 @@ | |
| 323 | Stmt q; |
| 324 | Stmt q2; |
| 325 | char *zUuid, *zDate; |
| 326 | int noSign = 0; /* True to omit signing the manifest using GPG */ |
| 327 | int isAMerge = 0; /* True if checking in a merge */ |
| 328 | char *zManifestFile; /* Name of the manifest file */ |
| 329 | Blob manifest; |
| 330 | Blob muuid; /* Manifest uuid */ |
| 331 | Blob mcksum; /* Self-checksum on the manifest */ |
| 332 | Blob cksum1, cksum2; /* Before and after commit checksums */ |
| 333 | Blob cksum1b; /* Checksum recorded in the manifest */ |
| 334 | |
| 335 | noSign = find_option("nosign","",0)!=0; |
| 336 | zComment = find_option("comment","m",1); |
| 337 | db_must_be_within_tree(); |
| 338 | noSign = db_get_int("omit-ci-sig", 0)|noSign; |
| 339 | verify_all_options(); |
| 340 | |
| 341 | /* There are two ways this command may be executed. If there are |
| 342 | ** no arguments following the word "commit", then all modified files |
| 343 | ** in the checked out directory are committed. If one or more arguments |
| 344 | ** follows "commit", then only those files are committed. |
| 345 | ** |
| @@ -355,11 +362,11 @@ | |
| 355 | } |
| 356 | |
| 357 | user_select(); |
| 358 | db_begin_transaction(); |
| 359 | rc = unsaved_changes(); |
| 360 | if( rc==0 && !isAMerge ){ |
| 361 | fossil_panic("nothing has changed"); |
| 362 | } |
| 363 | |
| 364 | /* If one or more files that were named on the command line have not |
| 365 | ** been modified, bail out now. |
| @@ -375,10 +382,13 @@ | |
| 375 | fossil_panic("file %s has not changed", blob_str(&unmodified)); |
| 376 | } |
| 377 | } |
| 378 | |
| 379 | vid = db_lget_int("checkout", 0); |
| 380 | vfile_aggregate_checksum_disk(vid, &cksum1); |
| 381 | if( zComment ){ |
| 382 | blob_zero(&comment); |
| 383 | blob_append(&comment, zComment, -1); |
| 384 | }else{ |
| @@ -524,12 +534,8 @@ | |
| 524 | undo_reset(); |
| 525 | |
| 526 | /* Commit */ |
| 527 | db_end_transaction(0); |
| 528 | |
| 529 | /* Autosync and do a push? */ |
| 530 | if( do_autosync() ){ |
| 531 | g.argc=2; |
| 532 | g.argv[1]="push"; |
| 533 | push_cmd(); |
| 534 | } |
| 535 | } |
| 536 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -323,23 +323,30 @@ | |
| 323 | Stmt q; |
| 324 | Stmt q2; |
| 325 | char *zUuid, *zDate; |
| 326 | int noSign = 0; /* True to omit signing the manifest using GPG */ |
| 327 | int isAMerge = 0; /* True if checking in a merge */ |
| 328 | int forceFlag = 0; /* Force a fork */ |
| 329 | char *zManifestFile; /* Name of the manifest file */ |
| 330 | Blob manifest; |
| 331 | Blob muuid; /* Manifest uuid */ |
| 332 | Blob mcksum; /* Self-checksum on the manifest */ |
| 333 | Blob cksum1, cksum2; /* Before and after commit checksums */ |
| 334 | Blob cksum1b; /* Checksum recorded in the manifest */ |
| 335 | |
| 336 | noSign = find_option("nosign","",0)!=0; |
| 337 | zComment = find_option("comment","m",1); |
| 338 | forceFlag = find_option("force", "r", 0)!=0; |
| 339 | db_must_be_within_tree(); |
| 340 | noSign = db_get_int("omit-ci-sig", 0)|noSign; |
| 341 | verify_all_options(); |
| 342 | |
| 343 | /* |
| 344 | ** Autosync if requested. |
| 345 | */ |
| 346 | autosync(1); |
| 347 | |
| 348 | /* There are two ways this command may be executed. If there are |
| 349 | ** no arguments following the word "commit", then all modified files |
| 350 | ** in the checked out directory are committed. If one or more arguments |
| 351 | ** follows "commit", then only those files are committed. |
| 352 | ** |
| @@ -355,11 +362,11 @@ | |
| 362 | } |
| 363 | |
| 364 | user_select(); |
| 365 | db_begin_transaction(); |
| 366 | rc = unsaved_changes(); |
| 367 | if( rc==0 && !isAMerge && !forceFlag ){ |
| 368 | fossil_panic("nothing has changed"); |
| 369 | } |
| 370 | |
| 371 | /* If one or more files that were named on the command line have not |
| 372 | ** been modified, bail out now. |
| @@ -375,10 +382,13 @@ | |
| 382 | fossil_panic("file %s has not changed", blob_str(&unmodified)); |
| 383 | } |
| 384 | } |
| 385 | |
| 386 | vid = db_lget_int("checkout", 0); |
| 387 | if( !forceFlag && db_exists("SELECT 1 FROM plink WHERE pid=%d", vid) ){ |
| 388 | fossil_fatal("would fork. use -f or --force"); |
| 389 | } |
| 390 | vfile_aggregate_checksum_disk(vid, &cksum1); |
| 391 | if( zComment ){ |
| 392 | blob_zero(&comment); |
| 393 | blob_append(&comment, zComment, -1); |
| 394 | }else{ |
| @@ -524,12 +534,8 @@ | |
| 534 | undo_reset(); |
| 535 | |
| 536 | /* Commit */ |
| 537 | db_end_transaction(0); |
| 538 | |
| 539 | /* Do an autosync push if requested */ |
| 540 | autosync(0); |
| 541 | } |
| 542 |
M
src/db.c
+38
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -956,5 +956,43 @@ | ||
| 956 | 956 | printf("%s=%s\n", db_column_text(&q, 0), db_column_text(&q, 1)); |
| 957 | 957 | } |
| 958 | 958 | db_finalize(&q); |
| 959 | 959 | } |
| 960 | 960 | } |
| 961 | + | |
| 962 | +/* | |
| 963 | +** COMMAND: setting | |
| 964 | +** %fossil setting ?PROPERTY? ?VALUE? | |
| 965 | +** | |
| 966 | +** With no arguments, list all properties and their values. With just | |
| 967 | +** a property name, show the value of that property. With a value | |
| 968 | +** arugment, change the property for the current repository. | |
| 969 | +*/ | |
| 970 | +void setting_cmd(void){ | |
| 971 | + static const char *azName[] = { | |
| 972 | + "autosync", | |
| 973 | + "safemerge" | |
| 974 | + }; | |
| 975 | + int i; | |
| 976 | + db_find_and_open_repository(); | |
| 977 | + if( g.argc==2 ){ | |
| 978 | + for(i=0; i<sizeof(azName)/sizeof(azName[0]); i++){ | |
| 979 | + printf("%-20s %d\n", azName[i], db_get_int(azName[i], 0)); | |
| 980 | + } | |
| 981 | + }else if( g.argc==3 || g.argc==4 ){ | |
| 982 | + const char *zName = g.argv[2]; | |
| 983 | + int n = strlen(zName); | |
| 984 | + for(i=0; i<sizeof(azName)/sizeof(azName[0]); i++){ | |
| 985 | + if( strncmp(azName[i], zName, n)==0 ) break; | |
| 986 | + } | |
| 987 | + if( i>=sizeof(azName)/sizeof(azName[0]) ){ | |
| 988 | + fossil_fatal("no such setting: %s", zName); | |
| 989 | + } | |
| 990 | + if( g.argc==4 ){ | |
| 991 | + db_set(azName[i], g.argv[3]); | |
| 992 | + }else{ | |
| 993 | + printf("%-20s %d\n", azName[i], db_get_int(azName[i], 0)); | |
| 994 | + } | |
| 995 | + }else{ | |
| 996 | + usage("?PROPERTY? ?VALUE?"); | |
| 997 | + } | |
| 998 | +} | |
| 961 | 999 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -956,5 +956,43 @@ | |
| 956 | printf("%s=%s\n", db_column_text(&q, 0), db_column_text(&q, 1)); |
| 957 | } |
| 958 | db_finalize(&q); |
| 959 | } |
| 960 | } |
| 961 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -956,5 +956,43 @@ | |
| 956 | printf("%s=%s\n", db_column_text(&q, 0), db_column_text(&q, 1)); |
| 957 | } |
| 958 | db_finalize(&q); |
| 959 | } |
| 960 | } |
| 961 | |
| 962 | /* |
| 963 | ** COMMAND: setting |
| 964 | ** %fossil setting ?PROPERTY? ?VALUE? |
| 965 | ** |
| 966 | ** With no arguments, list all properties and their values. With just |
| 967 | ** a property name, show the value of that property. With a value |
| 968 | ** arugment, change the property for the current repository. |
| 969 | */ |
| 970 | void setting_cmd(void){ |
| 971 | static const char *azName[] = { |
| 972 | "autosync", |
| 973 | "safemerge" |
| 974 | }; |
| 975 | int i; |
| 976 | db_find_and_open_repository(); |
| 977 | if( g.argc==2 ){ |
| 978 | for(i=0; i<sizeof(azName)/sizeof(azName[0]); i++){ |
| 979 | printf("%-20s %d\n", azName[i], db_get_int(azName[i], 0)); |
| 980 | } |
| 981 | }else if( g.argc==3 || g.argc==4 ){ |
| 982 | const char *zName = g.argv[2]; |
| 983 | int n = strlen(zName); |
| 984 | for(i=0; i<sizeof(azName)/sizeof(azName[0]); i++){ |
| 985 | if( strncmp(azName[i], zName, n)==0 ) break; |
| 986 | } |
| 987 | if( i>=sizeof(azName)/sizeof(azName[0]) ){ |
| 988 | fossil_fatal("no such setting: %s", zName); |
| 989 | } |
| 990 | if( g.argc==4 ){ |
| 991 | db_set(azName[i], g.argv[3]); |
| 992 | }else{ |
| 993 | printf("%-20s %d\n", azName[i], db_get_int(azName[i], 0)); |
| 994 | } |
| 995 | }else{ |
| 996 | usage("?PROPERTY? ?VALUE?"); |
| 997 | } |
| 998 | } |
| 999 |
+22
-10
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -26,23 +26,35 @@ | ||
| 26 | 26 | #include "config.h" |
| 27 | 27 | #include "sync.h" |
| 28 | 28 | #include <assert.h> |
| 29 | 29 | |
| 30 | 30 | /* |
| 31 | -** Determine if an autosync should be done or not. The config setting, | |
| 32 | -** autosync must start with 1, y or Y. The last-sync-url must also be | |
| 33 | -** defined. | |
| 31 | +** If the respository is configured for autosyncing, then do an | |
| 32 | +** autosync. This will be a pull if the argument is true or a push | |
| 33 | +** if the argument is false. Return true if the autosync is done | |
| 34 | +** and false if autosync is not requested for the current repository. | |
| 34 | 35 | */ |
| 35 | -int do_autosync(void){ | |
| 36 | - const char *zAutoSync = db_global_get("autosync", 0); | |
| 37 | - if( zAutoSync != 0 | |
| 38 | - && (zAutoSync[0]=='1' || zAutoSync[0]=='y' || zAutoSync=='Y') | |
| 39 | - && db_get("last-sync-url", 0)!=0 ){ | |
| 40 | - return 1; | |
| 41 | - }else{ | |
| 36 | +int autosync(int pullFlag){ | |
| 37 | + const char *zUrl; | |
| 38 | + if( db_get_int("autosync", 0)==0 ){ | |
| 42 | 39 | return 0; |
| 43 | 40 | } |
| 41 | + zUrl = db_get("last-sync-url", 0); | |
| 42 | + if( zUrl ){ | |
| 43 | + return 0; /* No default server */ | |
| 44 | + } | |
| 45 | + url_parse(zUrl); | |
| 46 | + if( g.urlIsFile ){ | |
| 47 | + return 0; /* Network sync only */ | |
| 48 | + } | |
| 49 | + if( g.urlPort!=80 ){ | |
| 50 | + printf("Autosync: http://%s:%d%s\n", g.urlName, g.urlPort, g.urlPath); | |
| 51 | + }else{ | |
| 52 | + printf("Autosync: http://%s%s\n", g.urlName, g.urlPath); | |
| 53 | + } | |
| 54 | + client_sync(!pullFlag, pullFlag, 0); | |
| 55 | + return 1; | |
| 44 | 56 | } |
| 45 | 57 | |
| 46 | 58 | /* |
| 47 | 59 | ** This routine processes the command-line argument for push, pull, |
| 48 | 60 | ** and sync. If a command-line argument is given, that is the URL |
| 49 | 61 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -26,23 +26,35 @@ | |
| 26 | #include "config.h" |
| 27 | #include "sync.h" |
| 28 | #include <assert.h> |
| 29 | |
| 30 | /* |
| 31 | ** Determine if an autosync should be done or not. The config setting, |
| 32 | ** autosync must start with 1, y or Y. The last-sync-url must also be |
| 33 | ** defined. |
| 34 | */ |
| 35 | int do_autosync(void){ |
| 36 | const char *zAutoSync = db_global_get("autosync", 0); |
| 37 | if( zAutoSync != 0 |
| 38 | && (zAutoSync[0]=='1' || zAutoSync[0]=='y' || zAutoSync=='Y') |
| 39 | && db_get("last-sync-url", 0)!=0 ){ |
| 40 | return 1; |
| 41 | }else{ |
| 42 | return 0; |
| 43 | } |
| 44 | } |
| 45 | |
| 46 | /* |
| 47 | ** This routine processes the command-line argument for push, pull, |
| 48 | ** and sync. If a command-line argument is given, that is the URL |
| 49 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -26,23 +26,35 @@ | |
| 26 | #include "config.h" |
| 27 | #include "sync.h" |
| 28 | #include <assert.h> |
| 29 | |
| 30 | /* |
| 31 | ** If the respository is configured for autosyncing, then do an |
| 32 | ** autosync. This will be a pull if the argument is true or a push |
| 33 | ** if the argument is false. Return true if the autosync is done |
| 34 | ** and false if autosync is not requested for the current repository. |
| 35 | */ |
| 36 | int autosync(int pullFlag){ |
| 37 | const char *zUrl; |
| 38 | if( db_get_int("autosync", 0)==0 ){ |
| 39 | return 0; |
| 40 | } |
| 41 | zUrl = db_get("last-sync-url", 0); |
| 42 | if( zUrl ){ |
| 43 | return 0; /* No default server */ |
| 44 | } |
| 45 | url_parse(zUrl); |
| 46 | if( g.urlIsFile ){ |
| 47 | return 0; /* Network sync only */ |
| 48 | } |
| 49 | if( g.urlPort!=80 ){ |
| 50 | printf("Autosync: http://%s:%d%s\n", g.urlName, g.urlPort, g.urlPath); |
| 51 | }else{ |
| 52 | printf("Autosync: http://%s%s\n", g.urlName, g.urlPath); |
| 53 | } |
| 54 | client_sync(!pullFlag, pullFlag, 0); |
| 55 | return 1; |
| 56 | } |
| 57 | |
| 58 | /* |
| 59 | ** This routine processes the command-line argument for push, pull, |
| 60 | ** and sync. If a command-line argument is given, that is the URL |
| 61 |
+2
-6
| --- src/tag.c | ||
| +++ src/tag.c | ||
| @@ -290,16 +290,12 @@ | ||
| 290 | 290 | db_begin_transaction(); |
| 291 | 291 | nrid = content_put(&ctrl, 0, 0); |
| 292 | 292 | manifest_crosslink(nrid, &ctrl); |
| 293 | 293 | db_end_transaction(0); |
| 294 | 294 | |
| 295 | - /* Autosync and do a push? */ | |
| 296 | - if( do_autosync() ){ | |
| 297 | - g.argc=2; | |
| 298 | - g.argv[1]="push"; | |
| 299 | - push_cmd(); | |
| 300 | - } | |
| 295 | + /* Do an autosync push if requested */ | |
| 296 | + autosync(0); | |
| 301 | 297 | } |
| 302 | 298 | |
| 303 | 299 | /* |
| 304 | 300 | ** COMMAND: tag |
| 305 | 301 | ** Usage: %fossil tag SUBCOMMAND ... |
| 306 | 302 |
| --- src/tag.c | |
| +++ src/tag.c | |
| @@ -290,16 +290,12 @@ | |
| 290 | db_begin_transaction(); |
| 291 | nrid = content_put(&ctrl, 0, 0); |
| 292 | manifest_crosslink(nrid, &ctrl); |
| 293 | db_end_transaction(0); |
| 294 | |
| 295 | /* Autosync and do a push? */ |
| 296 | if( do_autosync() ){ |
| 297 | g.argc=2; |
| 298 | g.argv[1]="push"; |
| 299 | push_cmd(); |
| 300 | } |
| 301 | } |
| 302 | |
| 303 | /* |
| 304 | ** COMMAND: tag |
| 305 | ** Usage: %fossil tag SUBCOMMAND ... |
| 306 |
| --- src/tag.c | |
| +++ src/tag.c | |
| @@ -290,16 +290,12 @@ | |
| 290 | db_begin_transaction(); |
| 291 | nrid = content_put(&ctrl, 0, 0); |
| 292 | manifest_crosslink(nrid, &ctrl); |
| 293 | db_end_transaction(0); |
| 294 | |
| 295 | /* Do an autosync push if requested */ |
| 296 | autosync(0); |
| 297 | } |
| 298 | |
| 299 | /* |
| 300 | ** COMMAND: tag |
| 301 | ** Usage: %fossil tag SUBCOMMAND ... |
| 302 |
+2
-5
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -76,15 +76,12 @@ | ||
| 76 | 76 | if( !is_a_version(tid) ){ |
| 77 | 77 | fossil_fatal("not a version: %s", g.argv[2]); |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - if( do_autosync() ){ | |
| 82 | - g.argc=2; | |
| 83 | - g.argv[1]="pull"; | |
| 84 | - pull_cmd(); | |
| 85 | - } | |
| 81 | + /* Do an autosync pull prior to the update, if autosync is on */ | |
| 82 | + autosync(1); | |
| 86 | 83 | |
| 87 | 84 | if( tid==0 ){ |
| 88 | 85 | compute_leaves(vid); |
| 89 | 86 | if( !latestFlag && db_int(0, "SELECT count(*) FROM leaves")>1 ){ |
| 90 | 87 | db_prepare(&q, |
| 91 | 88 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -76,15 +76,12 @@ | |
| 76 | if( !is_a_version(tid) ){ |
| 77 | fossil_fatal("not a version: %s", g.argv[2]); |
| 78 | } |
| 79 | } |
| 80 | |
| 81 | if( do_autosync() ){ |
| 82 | g.argc=2; |
| 83 | g.argv[1]="pull"; |
| 84 | pull_cmd(); |
| 85 | } |
| 86 | |
| 87 | if( tid==0 ){ |
| 88 | compute_leaves(vid); |
| 89 | if( !latestFlag && db_int(0, "SELECT count(*) FROM leaves")>1 ){ |
| 90 | db_prepare(&q, |
| 91 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -76,15 +76,12 @@ | |
| 76 | if( !is_a_version(tid) ){ |
| 77 | fossil_fatal("not a version: %s", g.argv[2]); |
| 78 | } |
| 79 | } |
| 80 | |
| 81 | /* Do an autosync pull prior to the update, if autosync is on */ |
| 82 | autosync(1); |
| 83 | |
| 84 | if( tid==0 ){ |
| 85 | compute_leaves(vid); |
| 86 | if( !latestFlag && db_int(0, "SELECT count(*) FROM leaves")>1 ){ |
| 87 | db_prepare(&q, |
| 88 |