Fossil SCM
Merged in [grep-hash-digits] branch. See https://fossil-scm.org/forum/forumpost/44c8339561
Commit
4de1ed780c60524d550a834949efa036b5b4c045ced19a03f876023b785b53f1
Parent
346e9e97608893d…
1 file changed
+4
-4
+4
-4
| --- src/regexp.c | ||
| +++ src/regexp.c | ||
| @@ -737,14 +737,14 @@ | ||
| 737 | 737 | n = j - i; |
| 738 | 738 | ln++; |
| 739 | 739 | if( re_match(pRe, (const unsigned char*)(z+i), j-i) ){ |
| 740 | 740 | cnt++; |
| 741 | 741 | if( flags & GREP_EXISTS ){ |
| 742 | - fossil_print("%s\n", zName); | |
| 742 | + fossil_print("%S\n", zName); | |
| 743 | 743 | break; |
| 744 | 744 | } |
| 745 | - fossil_print("%s:%d:%.*s\n", zName, ln, n, z+i); | |
| 745 | + fossil_print("%S:%d:%.*s\n", zName, ln, n, z+i); | |
| 746 | 746 | } |
| 747 | 747 | } |
| 748 | 748 | return cnt; |
| 749 | 749 | } |
| 750 | 750 | |
| @@ -825,11 +825,11 @@ | ||
| 825 | 825 | blob_str(&fullName)); |
| 826 | 826 | if( fnid ){ |
| 827 | 827 | Stmt q; |
| 828 | 828 | add_content_sql_commands(g.db); |
| 829 | 829 | db_prepare(&q, |
| 830 | - "SELECT content(ux), substr(ux,1,10) FROM (" | |
| 830 | + "SELECT content(ux), ux FROM (" | |
| 831 | 831 | " SELECT blob.uuid AS ux, min(event.mtime) AS mx" |
| 832 | 832 | " FROM mlink, blob, event" |
| 833 | 833 | " WHERE mlink.mid=event.objid" |
| 834 | 834 | " AND mlink.fid=blob.rid" |
| 835 | 835 | " AND mlink.fnid=%d" |
| @@ -836,12 +836,12 @@ | ||
| 836 | 836 | " GROUP BY blob.uuid" |
| 837 | 837 | ") ORDER BY mx DESC;", |
| 838 | 838 | fnid |
| 839 | 839 | ); |
| 840 | 840 | while( db_step(&q)==SQLITE_ROW ){ |
| 841 | - if( bVerbose ) fossil_print("%s:\n", db_column_text(&q,1)); | |
| 841 | + if( bVerbose ) fossil_print("%S:\n", db_column_text(&q,1)); | |
| 842 | 842 | grep_buffer(pRe, db_column_text(&q,1), db_column_text(&q,0), flags); |
| 843 | 843 | } |
| 844 | 844 | db_finalize(&q); |
| 845 | 845 | } |
| 846 | 846 | } |
| 847 | 847 | } |
| 848 | 848 |
| --- src/regexp.c | |
| +++ src/regexp.c | |
| @@ -737,14 +737,14 @@ | |
| 737 | n = j - i; |
| 738 | ln++; |
| 739 | if( re_match(pRe, (const unsigned char*)(z+i), j-i) ){ |
| 740 | cnt++; |
| 741 | if( flags & GREP_EXISTS ){ |
| 742 | fossil_print("%s\n", zName); |
| 743 | break; |
| 744 | } |
| 745 | fossil_print("%s:%d:%.*s\n", zName, ln, n, z+i); |
| 746 | } |
| 747 | } |
| 748 | return cnt; |
| 749 | } |
| 750 | |
| @@ -825,11 +825,11 @@ | |
| 825 | blob_str(&fullName)); |
| 826 | if( fnid ){ |
| 827 | Stmt q; |
| 828 | add_content_sql_commands(g.db); |
| 829 | db_prepare(&q, |
| 830 | "SELECT content(ux), substr(ux,1,10) FROM (" |
| 831 | " SELECT blob.uuid AS ux, min(event.mtime) AS mx" |
| 832 | " FROM mlink, blob, event" |
| 833 | " WHERE mlink.mid=event.objid" |
| 834 | " AND mlink.fid=blob.rid" |
| 835 | " AND mlink.fnid=%d" |
| @@ -836,12 +836,12 @@ | |
| 836 | " GROUP BY blob.uuid" |
| 837 | ") ORDER BY mx DESC;", |
| 838 | fnid |
| 839 | ); |
| 840 | while( db_step(&q)==SQLITE_ROW ){ |
| 841 | if( bVerbose ) fossil_print("%s:\n", db_column_text(&q,1)); |
| 842 | grep_buffer(pRe, db_column_text(&q,1), db_column_text(&q,0), flags); |
| 843 | } |
| 844 | db_finalize(&q); |
| 845 | } |
| 846 | } |
| 847 | } |
| 848 |
| --- src/regexp.c | |
| +++ src/regexp.c | |
| @@ -737,14 +737,14 @@ | |
| 737 | n = j - i; |
| 738 | ln++; |
| 739 | if( re_match(pRe, (const unsigned char*)(z+i), j-i) ){ |
| 740 | cnt++; |
| 741 | if( flags & GREP_EXISTS ){ |
| 742 | fossil_print("%S\n", zName); |
| 743 | break; |
| 744 | } |
| 745 | fossil_print("%S:%d:%.*s\n", zName, ln, n, z+i); |
| 746 | } |
| 747 | } |
| 748 | return cnt; |
| 749 | } |
| 750 | |
| @@ -825,11 +825,11 @@ | |
| 825 | blob_str(&fullName)); |
| 826 | if( fnid ){ |
| 827 | Stmt q; |
| 828 | add_content_sql_commands(g.db); |
| 829 | db_prepare(&q, |
| 830 | "SELECT content(ux), ux FROM (" |
| 831 | " SELECT blob.uuid AS ux, min(event.mtime) AS mx" |
| 832 | " FROM mlink, blob, event" |
| 833 | " WHERE mlink.mid=event.objid" |
| 834 | " AND mlink.fid=blob.rid" |
| 835 | " AND mlink.fnid=%d" |
| @@ -836,12 +836,12 @@ | |
| 836 | " GROUP BY blob.uuid" |
| 837 | ") ORDER BY mx DESC;", |
| 838 | fnid |
| 839 | ); |
| 840 | while( db_step(&q)==SQLITE_ROW ){ |
| 841 | if( bVerbose ) fossil_print("%S:\n", db_column_text(&q,1)); |
| 842 | grep_buffer(pRe, db_column_text(&q,1), db_column_text(&q,0), flags); |
| 843 | } |
| 844 | db_finalize(&q); |
| 845 | } |
| 846 | } |
| 847 | } |
| 848 |