Fossil SCM
minor style fix (column width) and added notification of the blob which is in effect, analog to the regex notification.
Commit
46adaba1bd4cc554698998bfcec5f51a4d5448c9
Parent
fa16c3a72bb4d1c…
1 file changed
+5
-1
+5
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1000,10 +1000,13 @@ | ||
| 1000 | 1000 | @ </blockquote> |
| 1001 | 1001 | if( pRe ){ |
| 1002 | 1002 | @ <p><b>Only differences that match regular expression "%h(zRe)" |
| 1003 | 1003 | @ are shown.</b></p> |
| 1004 | 1004 | } |
| 1005 | + if( zGlob ){ | |
| 1006 | + @ <p><b>Only files matching the glob "%h(zGlob)" are shown.</b></p> | |
| 1007 | + } | |
| 1005 | 1008 | @<hr /><p> |
| 1006 | 1009 | |
| 1007 | 1010 | manifest_file_rewind(pFrom); |
| 1008 | 1011 | pFileFrom = manifest_file_next(pFrom, 0); |
| 1009 | 1012 | manifest_file_rewind(pTo); |
| @@ -1033,11 +1036,12 @@ | ||
| 1033 | 1036 | pFileTo = manifest_file_next(pTo, 0); |
| 1034 | 1037 | }else if( fossil_strcmp(pFileFrom->zUuid, pFileTo->zUuid)==0 ){ |
| 1035 | 1038 | pFileFrom = manifest_file_next(pFrom, 0); |
| 1036 | 1039 | pFileTo = manifest_file_next(pTo, 0); |
| 1037 | 1040 | }else{ |
| 1038 | - if(!zGlob || (strglob(zGlob, pFileFrom->zName) || strglob(zGlob, pFileTo->zName))){ | |
| 1041 | + if(!zGlob || (strglob(zGlob, pFileFrom->zName) | |
| 1042 | + || strglob(zGlob, pFileTo->zName))){ | |
| 1039 | 1043 | append_file_change_line(pFileFrom->zName, |
| 1040 | 1044 | pFileFrom->zUuid, |
| 1041 | 1045 | pFileTo->zUuid, 0, diffFlags, pRe, |
| 1042 | 1046 | manifest_file_mperm(pFileTo)); |
| 1043 | 1047 | } |
| 1044 | 1048 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1000,10 +1000,13 @@ | |
| 1000 | @ </blockquote> |
| 1001 | if( pRe ){ |
| 1002 | @ <p><b>Only differences that match regular expression "%h(zRe)" |
| 1003 | @ are shown.</b></p> |
| 1004 | } |
| 1005 | @<hr /><p> |
| 1006 | |
| 1007 | manifest_file_rewind(pFrom); |
| 1008 | pFileFrom = manifest_file_next(pFrom, 0); |
| 1009 | manifest_file_rewind(pTo); |
| @@ -1033,11 +1036,12 @@ | |
| 1033 | pFileTo = manifest_file_next(pTo, 0); |
| 1034 | }else if( fossil_strcmp(pFileFrom->zUuid, pFileTo->zUuid)==0 ){ |
| 1035 | pFileFrom = manifest_file_next(pFrom, 0); |
| 1036 | pFileTo = manifest_file_next(pTo, 0); |
| 1037 | }else{ |
| 1038 | if(!zGlob || (strglob(zGlob, pFileFrom->zName) || strglob(zGlob, pFileTo->zName))){ |
| 1039 | append_file_change_line(pFileFrom->zName, |
| 1040 | pFileFrom->zUuid, |
| 1041 | pFileTo->zUuid, 0, diffFlags, pRe, |
| 1042 | manifest_file_mperm(pFileTo)); |
| 1043 | } |
| 1044 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1000,10 +1000,13 @@ | |
| 1000 | @ </blockquote> |
| 1001 | if( pRe ){ |
| 1002 | @ <p><b>Only differences that match regular expression "%h(zRe)" |
| 1003 | @ are shown.</b></p> |
| 1004 | } |
| 1005 | if( zGlob ){ |
| 1006 | @ <p><b>Only files matching the glob "%h(zGlob)" are shown.</b></p> |
| 1007 | } |
| 1008 | @<hr /><p> |
| 1009 | |
| 1010 | manifest_file_rewind(pFrom); |
| 1011 | pFileFrom = manifest_file_next(pFrom, 0); |
| 1012 | manifest_file_rewind(pTo); |
| @@ -1033,11 +1036,12 @@ | |
| 1036 | pFileTo = manifest_file_next(pTo, 0); |
| 1037 | }else if( fossil_strcmp(pFileFrom->zUuid, pFileTo->zUuid)==0 ){ |
| 1038 | pFileFrom = manifest_file_next(pFrom, 0); |
| 1039 | pFileTo = manifest_file_next(pTo, 0); |
| 1040 | }else{ |
| 1041 | if(!zGlob || (strglob(zGlob, pFileFrom->zName) |
| 1042 | || strglob(zGlob, pFileTo->zName))){ |
| 1043 | append_file_change_line(pFileFrom->zName, |
| 1044 | pFileFrom->zUuid, |
| 1045 | pFileTo->zUuid, 0, diffFlags, pRe, |
| 1046 | manifest_file_mperm(pFileTo)); |
| 1047 | } |
| 1048 |