Fossil SCM
Do the same for 'unversioned sync/revert'.
Commit
257b67b8fe915dbdf868a3d663d6d1736ab399f3911f793995a1e091e3bab8ed
Parent
1cda9ec21038f57…
2 files changed
+2
-2
+6
-2
+2
-2
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -537,16 +537,16 @@ | ||
| 537 | 537 | |
| 538 | 538 | /* |
| 539 | 539 | ** Handle the "fossil unversioned sync" and "fossil unversioned revert" |
| 540 | 540 | ** commands. |
| 541 | 541 | */ |
| 542 | -void sync_unversioned(unsigned syncFlags){ | |
| 542 | +int sync_unversioned(unsigned syncFlags){ | |
| 543 | 543 | unsigned configFlags = 0; |
| 544 | 544 | (void)find_option("uv-noop",0,0); |
| 545 | 545 | process_sync_args(&configFlags, &syncFlags, 1, 0); |
| 546 | 546 | verify_all_options(); |
| 547 | - client_sync(syncFlags, 0, 0, 0, 0); | |
| 547 | + return client_sync(syncFlags, 0, 0, 0, 0); | |
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | /* |
| 551 | 551 | ** COMMAND: remote |
| 552 | 552 | ** COMMAND: remote-url* |
| 553 | 553 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -537,16 +537,16 @@ | |
| 537 | |
| 538 | /* |
| 539 | ** Handle the "fossil unversioned sync" and "fossil unversioned revert" |
| 540 | ** commands. |
| 541 | */ |
| 542 | void sync_unversioned(unsigned syncFlags){ |
| 543 | unsigned configFlags = 0; |
| 544 | (void)find_option("uv-noop",0,0); |
| 545 | process_sync_args(&configFlags, &syncFlags, 1, 0); |
| 546 | verify_all_options(); |
| 547 | client_sync(syncFlags, 0, 0, 0, 0); |
| 548 | } |
| 549 | |
| 550 | /* |
| 551 | ** COMMAND: remote |
| 552 | ** COMMAND: remote-url* |
| 553 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -537,16 +537,16 @@ | |
| 537 | |
| 538 | /* |
| 539 | ** Handle the "fossil unversioned sync" and "fossil unversioned revert" |
| 540 | ** commands. |
| 541 | */ |
| 542 | int sync_unversioned(unsigned syncFlags){ |
| 543 | unsigned configFlags = 0; |
| 544 | (void)find_option("uv-noop",0,0); |
| 545 | process_sync_args(&configFlags, &syncFlags, 1, 0); |
| 546 | verify_all_options(); |
| 547 | return client_sync(syncFlags, 0, 0, 0, 0); |
| 548 | } |
| 549 | |
| 550 | /* |
| 551 | ** COMMAND: remote |
| 552 | ** COMMAND: remote-url* |
| 553 |
+6
-2
| --- src/unversioned.c | ||
| +++ src/unversioned.c | ||
| @@ -557,11 +557,13 @@ | ||
| 557 | 557 | }else if( strncmp(zCmd, "revert", nCmd)==0 ){ |
| 558 | 558 | unsigned syncFlags = |
| 559 | 559 | unversioned_sync_flags(SYNC_UNVERSIONED|SYNC_UV_REVERT); |
| 560 | 560 | g.argv[1] = "sync"; |
| 561 | 561 | g.argv[2] = "--uv-noop"; |
| 562 | - sync_unversioned(syncFlags); | |
| 562 | + if( sync_unversioned(syncFlags)!=0 ){ | |
| 563 | + fossil_exit(1); | |
| 564 | + } | |
| 563 | 565 | }else if( strncmp(zCmd, "remove", nCmd)==0 || strncmp(zCmd, "rm", nCmd)==0 |
| 564 | 566 | || strncmp(zCmd, "delete", nCmd)==0 ){ |
| 565 | 567 | int i; |
| 566 | 568 | const char *zGlob; |
| 567 | 569 | db_begin_transaction(); |
| @@ -591,11 +593,13 @@ | ||
| 591 | 593 | db_end_transaction(0); |
| 592 | 594 | }else if( strncmp(zCmd,"sync",nCmd)==0 ){ |
| 593 | 595 | unsigned syncFlags = unversioned_sync_flags(SYNC_UNVERSIONED); |
| 594 | 596 | g.argv[1] = "sync"; |
| 595 | 597 | g.argv[2] = "--uv-noop"; |
| 596 | - sync_unversioned(syncFlags); | |
| 598 | + if( sync_unversioned(syncFlags)!=0 ){ | |
| 599 | + fossil_exit(1); | |
| 600 | + } | |
| 597 | 601 | }else if( strncmp(zCmd, "touch", nCmd)==0 ){ |
| 598 | 602 | int i; |
| 599 | 603 | verify_all_options(); |
| 600 | 604 | db_begin_transaction(); |
| 601 | 605 | for(i=3; i<g.argc; i++){ |
| 602 | 606 |
| --- src/unversioned.c | |
| +++ src/unversioned.c | |
| @@ -557,11 +557,13 @@ | |
| 557 | }else if( strncmp(zCmd, "revert", nCmd)==0 ){ |
| 558 | unsigned syncFlags = |
| 559 | unversioned_sync_flags(SYNC_UNVERSIONED|SYNC_UV_REVERT); |
| 560 | g.argv[1] = "sync"; |
| 561 | g.argv[2] = "--uv-noop"; |
| 562 | sync_unversioned(syncFlags); |
| 563 | }else if( strncmp(zCmd, "remove", nCmd)==0 || strncmp(zCmd, "rm", nCmd)==0 |
| 564 | || strncmp(zCmd, "delete", nCmd)==0 ){ |
| 565 | int i; |
| 566 | const char *zGlob; |
| 567 | db_begin_transaction(); |
| @@ -591,11 +593,13 @@ | |
| 591 | db_end_transaction(0); |
| 592 | }else if( strncmp(zCmd,"sync",nCmd)==0 ){ |
| 593 | unsigned syncFlags = unversioned_sync_flags(SYNC_UNVERSIONED); |
| 594 | g.argv[1] = "sync"; |
| 595 | g.argv[2] = "--uv-noop"; |
| 596 | sync_unversioned(syncFlags); |
| 597 | }else if( strncmp(zCmd, "touch", nCmd)==0 ){ |
| 598 | int i; |
| 599 | verify_all_options(); |
| 600 | db_begin_transaction(); |
| 601 | for(i=3; i<g.argc; i++){ |
| 602 |
| --- src/unversioned.c | |
| +++ src/unversioned.c | |
| @@ -557,11 +557,13 @@ | |
| 557 | }else if( strncmp(zCmd, "revert", nCmd)==0 ){ |
| 558 | unsigned syncFlags = |
| 559 | unversioned_sync_flags(SYNC_UNVERSIONED|SYNC_UV_REVERT); |
| 560 | g.argv[1] = "sync"; |
| 561 | g.argv[2] = "--uv-noop"; |
| 562 | if( sync_unversioned(syncFlags)!=0 ){ |
| 563 | fossil_exit(1); |
| 564 | } |
| 565 | }else if( strncmp(zCmd, "remove", nCmd)==0 || strncmp(zCmd, "rm", nCmd)==0 |
| 566 | || strncmp(zCmd, "delete", nCmd)==0 ){ |
| 567 | int i; |
| 568 | const char *zGlob; |
| 569 | db_begin_transaction(); |
| @@ -591,11 +593,13 @@ | |
| 593 | db_end_transaction(0); |
| 594 | }else if( strncmp(zCmd,"sync",nCmd)==0 ){ |
| 595 | unsigned syncFlags = unversioned_sync_flags(SYNC_UNVERSIONED); |
| 596 | g.argv[1] = "sync"; |
| 597 | g.argv[2] = "--uv-noop"; |
| 598 | if( sync_unversioned(syncFlags)!=0 ){ |
| 599 | fossil_exit(1); |
| 600 | } |
| 601 | }else if( strncmp(zCmd, "touch", nCmd)==0 ){ |
| 602 | int i; |
| 603 | verify_all_options(); |
| 604 | db_begin_transaction(); |
| 605 | for(i=3; i<g.argc; i++){ |
| 606 |