Fossil SCM
Change var names to camelcase.
Commit
7252e631fbf2339a4f8977323785b2efa7ed09955d98399c95b888e8bc621965
Parent
575fe0c8af6568e…
1 file changed
+8
-8
+8
-8
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -794,12 +794,12 @@ | ||
| 794 | 794 | const char *zFile; /* Filename relative to checkout root */ |
| 795 | 795 | const char *zRevision; /* Selected revert version, NULL if current */ |
| 796 | 796 | Blob record = BLOB_INITIALIZER; /* Contents of each reverted file */ |
| 797 | 797 | int i; |
| 798 | 798 | Stmt q; |
| 799 | - int revert_all = 0; | |
| 800 | - int fail_no_revsion_allowed = 0; | |
| 799 | + int revertAll = 0; | |
| 800 | + int revisionOptNotSupported = 0; | |
| 801 | 801 | |
| 802 | 802 | undo_capture_command_line(); |
| 803 | 803 | zRevision = find_option("revision", "r", 1); |
| 804 | 804 | verify_all_options(); |
| 805 | 805 | |
| @@ -825,14 +825,14 @@ | ||
| 825 | 825 | zFile = mprintf("%/", g.argv[i]); |
| 826 | 826 | blob_zero(&fname); |
| 827 | 827 | file_tree_name(zFile, &fname, 0, 1); |
| 828 | 828 | if( blob_eq(&fname, ".") ){ |
| 829 | 829 | if( zRevision ){ |
| 830 | - fail_no_revsion_allowed = 1; | |
| 830 | + revisionOptNotSupported = 1; | |
| 831 | 831 | break; |
| 832 | 832 | } |
| 833 | - revert_all = 1; | |
| 833 | + revertAll = 1; | |
| 834 | 834 | break; |
| 835 | 835 | }else if( db_exists( |
| 836 | 836 | "SELECT pathname" |
| 837 | 837 | " FROM vfile" |
| 838 | 838 | " WHERE (substr(pathname,1,length('%q/'))='%q/'" |
| @@ -842,11 +842,11 @@ | ||
| 842 | 842 | int vid; |
| 843 | 843 | vid = db_lget_int("checkout", 0); |
| 844 | 844 | vfile_check_signature(vid, 0); |
| 845 | 845 | |
| 846 | 846 | if( zRevision ){ |
| 847 | - fail_no_revsion_allowed = 1; | |
| 847 | + revisionOptNotSupported = 1; | |
| 848 | 848 | break; |
| 849 | 849 | } |
| 850 | 850 | db_multi_exec( |
| 851 | 851 | "INSERT OR IGNORE INTO torevert" |
| 852 | 852 | " SELECT pathname" |
| @@ -868,19 +868,19 @@ | ||
| 868 | 868 | ); |
| 869 | 869 | } |
| 870 | 870 | blob_reset(&fname); |
| 871 | 871 | } |
| 872 | 872 | }else{ |
| 873 | - revert_all = 1; | |
| 873 | + revertAll = 1; | |
| 874 | 874 | } |
| 875 | 875 | |
| 876 | - if( fail_no_revsion_allowed ){ | |
| 876 | + if( revisionOptNotSupported ){ | |
| 877 | 877 | fossil_fatal("the --revision option does not work for the directories" |
| 878 | 878 | " or the entire tree"); |
| 879 | 879 | } |
| 880 | 880 | |
| 881 | - if ( revert_all ){ | |
| 881 | + if ( revertAll ){ | |
| 882 | 882 | int vid; |
| 883 | 883 | vid = db_lget_int("checkout", 0); |
| 884 | 884 | vfile_check_signature(vid, 0); |
| 885 | 885 | db_multi_exec( |
| 886 | 886 | "DELETE FROM vmerge;" |
| 887 | 887 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -794,12 +794,12 @@ | |
| 794 | const char *zFile; /* Filename relative to checkout root */ |
| 795 | const char *zRevision; /* Selected revert version, NULL if current */ |
| 796 | Blob record = BLOB_INITIALIZER; /* Contents of each reverted file */ |
| 797 | int i; |
| 798 | Stmt q; |
| 799 | int revert_all = 0; |
| 800 | int fail_no_revsion_allowed = 0; |
| 801 | |
| 802 | undo_capture_command_line(); |
| 803 | zRevision = find_option("revision", "r", 1); |
| 804 | verify_all_options(); |
| 805 | |
| @@ -825,14 +825,14 @@ | |
| 825 | zFile = mprintf("%/", g.argv[i]); |
| 826 | blob_zero(&fname); |
| 827 | file_tree_name(zFile, &fname, 0, 1); |
| 828 | if( blob_eq(&fname, ".") ){ |
| 829 | if( zRevision ){ |
| 830 | fail_no_revsion_allowed = 1; |
| 831 | break; |
| 832 | } |
| 833 | revert_all = 1; |
| 834 | break; |
| 835 | }else if( db_exists( |
| 836 | "SELECT pathname" |
| 837 | " FROM vfile" |
| 838 | " WHERE (substr(pathname,1,length('%q/'))='%q/'" |
| @@ -842,11 +842,11 @@ | |
| 842 | int vid; |
| 843 | vid = db_lget_int("checkout", 0); |
| 844 | vfile_check_signature(vid, 0); |
| 845 | |
| 846 | if( zRevision ){ |
| 847 | fail_no_revsion_allowed = 1; |
| 848 | break; |
| 849 | } |
| 850 | db_multi_exec( |
| 851 | "INSERT OR IGNORE INTO torevert" |
| 852 | " SELECT pathname" |
| @@ -868,19 +868,19 @@ | |
| 868 | ); |
| 869 | } |
| 870 | blob_reset(&fname); |
| 871 | } |
| 872 | }else{ |
| 873 | revert_all = 1; |
| 874 | } |
| 875 | |
| 876 | if( fail_no_revsion_allowed ){ |
| 877 | fossil_fatal("the --revision option does not work for the directories" |
| 878 | " or the entire tree"); |
| 879 | } |
| 880 | |
| 881 | if ( revert_all ){ |
| 882 | int vid; |
| 883 | vid = db_lget_int("checkout", 0); |
| 884 | vfile_check_signature(vid, 0); |
| 885 | db_multi_exec( |
| 886 | "DELETE FROM vmerge;" |
| 887 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -794,12 +794,12 @@ | |
| 794 | const char *zFile; /* Filename relative to checkout root */ |
| 795 | const char *zRevision; /* Selected revert version, NULL if current */ |
| 796 | Blob record = BLOB_INITIALIZER; /* Contents of each reverted file */ |
| 797 | int i; |
| 798 | Stmt q; |
| 799 | int revertAll = 0; |
| 800 | int revisionOptNotSupported = 0; |
| 801 | |
| 802 | undo_capture_command_line(); |
| 803 | zRevision = find_option("revision", "r", 1); |
| 804 | verify_all_options(); |
| 805 | |
| @@ -825,14 +825,14 @@ | |
| 825 | zFile = mprintf("%/", g.argv[i]); |
| 826 | blob_zero(&fname); |
| 827 | file_tree_name(zFile, &fname, 0, 1); |
| 828 | if( blob_eq(&fname, ".") ){ |
| 829 | if( zRevision ){ |
| 830 | revisionOptNotSupported = 1; |
| 831 | break; |
| 832 | } |
| 833 | revertAll = 1; |
| 834 | break; |
| 835 | }else if( db_exists( |
| 836 | "SELECT pathname" |
| 837 | " FROM vfile" |
| 838 | " WHERE (substr(pathname,1,length('%q/'))='%q/'" |
| @@ -842,11 +842,11 @@ | |
| 842 | int vid; |
| 843 | vid = db_lget_int("checkout", 0); |
| 844 | vfile_check_signature(vid, 0); |
| 845 | |
| 846 | if( zRevision ){ |
| 847 | revisionOptNotSupported = 1; |
| 848 | break; |
| 849 | } |
| 850 | db_multi_exec( |
| 851 | "INSERT OR IGNORE INTO torevert" |
| 852 | " SELECT pathname" |
| @@ -868,19 +868,19 @@ | |
| 868 | ); |
| 869 | } |
| 870 | blob_reset(&fname); |
| 871 | } |
| 872 | }else{ |
| 873 | revertAll = 1; |
| 874 | } |
| 875 | |
| 876 | if( revisionOptNotSupported ){ |
| 877 | fossil_fatal("the --revision option does not work for the directories" |
| 878 | " or the entire tree"); |
| 879 | } |
| 880 | |
| 881 | if ( revertAll ){ |
| 882 | int vid; |
| 883 | vid = db_lget_int("checkout", 0); |
| 884 | vfile_check_signature(vid, 0); |
| 885 | db_multi_exec( |
| 886 | "DELETE FROM vmerge;" |
| 887 |