Fossil SCM
Update for a new instance of crnl-glob that was added since this branch's baseline
Commit
46fd89ea9b72e47b97e5aee47d24bba9cc9dc4e2
Parent
7ea74acf55497aa…
1 file changed
+5
-4
+5
-4
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1880,35 +1880,36 @@ | ||
| 1880 | 1880 | db_must_be_within_tree(); |
| 1881 | 1881 | db_prepare(&q, |
| 1882 | 1882 | "SELECT %Q || pathname, pathname, %s, %s, %s FROM vfile" |
| 1883 | 1883 | " WHERE NOT deleted", |
| 1884 | 1884 | g.zLocalRoot, |
| 1885 | - glob_expr("pathname", noSettings ? 0 : db_get("crnl-glob","")), | |
| 1885 | + glob_expr("pathname", noSettings ? 0 : db_get("crlf-glob", | |
| 1886 | + db_get("crnl-glob",""))), | |
| 1886 | 1887 | glob_expr("pathname", noSettings ? 0 : db_get("binary-glob","")), |
| 1887 | 1888 | glob_expr("pathname", noSettings ? 0 : db_get("encoding-glob","")) |
| 1888 | 1889 | ); |
| 1889 | 1890 | while( db_step(&q)==SQLITE_ROW ){ |
| 1890 | 1891 | const char *zFullname; |
| 1891 | 1892 | const char *zName; |
| 1892 | 1893 | Blob content; |
| 1893 | 1894 | Blob reason; |
| 1894 | - int crnlOk, binOk, encodingOk; | |
| 1895 | + int crlfOk, binOk, encodingOk; | |
| 1895 | 1896 | int fileRc; |
| 1896 | 1897 | |
| 1897 | 1898 | zFullname = db_column_text(&q, 0); |
| 1898 | 1899 | zName = db_column_text(&q, 1); |
| 1899 | - crnlOk = db_column_int(&q, 2); | |
| 1900 | + crlfOk = db_column_int(&q, 2); | |
| 1900 | 1901 | binOk = db_column_int(&q, 3); |
| 1901 | 1902 | encodingOk = db_column_int(&q, 4); |
| 1902 | 1903 | blob_zero(&content); |
| 1903 | 1904 | if( file_wd_islink(zFullname) ){ |
| 1904 | 1905 | blob_read_link(&content, zFullname); |
| 1905 | 1906 | }else{ |
| 1906 | 1907 | blob_read_from_file(&content, zFullname); |
| 1907 | 1908 | } |
| 1908 | 1909 | blob_zero(&reason); |
| 1909 | - fileRc = commit_warning(&content, crnlOk, binOk, encodingOk, 2, | |
| 1910 | + fileRc = commit_warning(&content, crlfOk, binOk, encodingOk, 2, | |
| 1910 | 1911 | zFullname, &reason); |
| 1911 | 1912 | if( fileRc || verboseFlag ){ |
| 1912 | 1913 | fossil_print("%d\t%s\t%s\n", fileRc, zName, blob_str(&reason)); |
| 1913 | 1914 | } |
| 1914 | 1915 | blob_reset(&reason); |
| 1915 | 1916 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1880,35 +1880,36 @@ | |
| 1880 | db_must_be_within_tree(); |
| 1881 | db_prepare(&q, |
| 1882 | "SELECT %Q || pathname, pathname, %s, %s, %s FROM vfile" |
| 1883 | " WHERE NOT deleted", |
| 1884 | g.zLocalRoot, |
| 1885 | glob_expr("pathname", noSettings ? 0 : db_get("crnl-glob","")), |
| 1886 | glob_expr("pathname", noSettings ? 0 : db_get("binary-glob","")), |
| 1887 | glob_expr("pathname", noSettings ? 0 : db_get("encoding-glob","")) |
| 1888 | ); |
| 1889 | while( db_step(&q)==SQLITE_ROW ){ |
| 1890 | const char *zFullname; |
| 1891 | const char *zName; |
| 1892 | Blob content; |
| 1893 | Blob reason; |
| 1894 | int crnlOk, binOk, encodingOk; |
| 1895 | int fileRc; |
| 1896 | |
| 1897 | zFullname = db_column_text(&q, 0); |
| 1898 | zName = db_column_text(&q, 1); |
| 1899 | crnlOk = db_column_int(&q, 2); |
| 1900 | binOk = db_column_int(&q, 3); |
| 1901 | encodingOk = db_column_int(&q, 4); |
| 1902 | blob_zero(&content); |
| 1903 | if( file_wd_islink(zFullname) ){ |
| 1904 | blob_read_link(&content, zFullname); |
| 1905 | }else{ |
| 1906 | blob_read_from_file(&content, zFullname); |
| 1907 | } |
| 1908 | blob_zero(&reason); |
| 1909 | fileRc = commit_warning(&content, crnlOk, binOk, encodingOk, 2, |
| 1910 | zFullname, &reason); |
| 1911 | if( fileRc || verboseFlag ){ |
| 1912 | fossil_print("%d\t%s\t%s\n", fileRc, zName, blob_str(&reason)); |
| 1913 | } |
| 1914 | blob_reset(&reason); |
| 1915 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1880,35 +1880,36 @@ | |
| 1880 | db_must_be_within_tree(); |
| 1881 | db_prepare(&q, |
| 1882 | "SELECT %Q || pathname, pathname, %s, %s, %s FROM vfile" |
| 1883 | " WHERE NOT deleted", |
| 1884 | g.zLocalRoot, |
| 1885 | glob_expr("pathname", noSettings ? 0 : db_get("crlf-glob", |
| 1886 | db_get("crnl-glob",""))), |
| 1887 | glob_expr("pathname", noSettings ? 0 : db_get("binary-glob","")), |
| 1888 | glob_expr("pathname", noSettings ? 0 : db_get("encoding-glob","")) |
| 1889 | ); |
| 1890 | while( db_step(&q)==SQLITE_ROW ){ |
| 1891 | const char *zFullname; |
| 1892 | const char *zName; |
| 1893 | Blob content; |
| 1894 | Blob reason; |
| 1895 | int crlfOk, binOk, encodingOk; |
| 1896 | int fileRc; |
| 1897 | |
| 1898 | zFullname = db_column_text(&q, 0); |
| 1899 | zName = db_column_text(&q, 1); |
| 1900 | crlfOk = db_column_int(&q, 2); |
| 1901 | binOk = db_column_int(&q, 3); |
| 1902 | encodingOk = db_column_int(&q, 4); |
| 1903 | blob_zero(&content); |
| 1904 | if( file_wd_islink(zFullname) ){ |
| 1905 | blob_read_link(&content, zFullname); |
| 1906 | }else{ |
| 1907 | blob_read_from_file(&content, zFullname); |
| 1908 | } |
| 1909 | blob_zero(&reason); |
| 1910 | fileRc = commit_warning(&content, crlfOk, binOk, encodingOk, 2, |
| 1911 | zFullname, &reason); |
| 1912 | if( fileRc || verboseFlag ){ |
| 1913 | fossil_print("%d\t%s\t%s\n", fileRc, zName, blob_str(&reason)); |
| 1914 | } |
| 1915 | blob_reset(&reason); |
| 1916 |