859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
|
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
|
+
-
+
+
|
** -f|--force Apply the patch even though there are unsaved
** changes in the current check-out. Unsaved changes
** are reverted and permanently lost.
** -n|--dry-run Do nothing, but print what would have happened
** -v|--verbose Extra output explaining what happens
**
** > fossil patch diff [DIRECTORY] FILENAME
** > fossil patch gdiff [DIRECTORY] FILENAME
**
** Show a human-readable diff for the patch. All the usual
** diff flags described at "fossil help diff" apply. In addition:
** diff flags described at "fossil help diff" apply. With gdiff,
** gdiff-command is used instead of internal diff logic. In addition:
**
** -f|--force Continue trying to perform the diff even if
** baseline information is missing from the current
** repository
**
** > fossil patch push REMOTE-CHECKOUT
**
|
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
|
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
|
-
+
|
**
*/
void patch_cmd(void){
const char *zCmd;
size_t n;
if( g.argc<3 ){
patch_usage:
usage("apply|create|diff|pull|push|view");
usage("apply|create|diff|gdiff|pull|push|view");
}
zCmd = g.argv[2];
n = strlen(zCmd);
if( strncmp(zCmd, "apply", n)==0 ){
char *zIn;
unsigned flags = 0;
if( find_option("dry-run","n",0) ) flags |= PATCH_DRYRUN;
|
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
|
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
|
-
+
-
+
|
if( find_option("force","f",0) ) flags |= PATCH_FORCE;
zOut = patch_find_patch_filename("create");
verify_all_options();
db_must_be_within_tree();
patch_create(flags, zOut, stdout);
fossil_free(zOut);
}else
if( strncmp(zCmd, "diff", n)==0 ){
if( (strncmp(zCmd, "diff", n)==0) || (strncmp(zCmd, "gdiff", n)==0) ){
char *zIn;
unsigned flags = 0;
DiffConfig DCfg;
if( find_option("tk",0,0)!=0 ){
db_close(0);
diff_tk("patch diff", 3);
return;
}
diff_options(&DCfg, zCmd[0]=='g', 0);
|