Fossil SCM
Bring some comments in the "blame" logic up-to-date. No changes to code.
Commit
05f73ffb87e405db9b4fdc9f10548982356c048b
Parent
6599d097298da9e…
1 file changed
+2
-5
+2
-5
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2088,13 +2088,11 @@ | ||
| 2088 | 2088 | } |
| 2089 | 2089 | |
| 2090 | 2090 | /* |
| 2091 | 2091 | ** The input pParent is the next most recent ancestor of the file |
| 2092 | 2092 | ** being annotated. Do another step of the annotation. Return true |
| 2093 | -** if additional annotation is required. zPName is the tag to insert | |
| 2094 | -** on each line of the file being annotated that was contributed by | |
| 2095 | -** pParent. Memory to hold zPName is leaked. | |
| 2093 | +** if additional annotation is required. | |
| 2096 | 2094 | */ |
| 2097 | 2095 | static int annotation_step(Annotator *p, Blob *pParent, int iVers, u64 diffFlags){ |
| 2098 | 2096 | int i, j; |
| 2099 | 2097 | int lnTo; |
| 2100 | 2098 | |
| @@ -2141,12 +2139,11 @@ | ||
| 2141 | 2139 | #define ANN_FILE_VERS (((u64)0x20)<<32) /* Show file vers rather than commit vers */ |
| 2142 | 2140 | #define ANN_FILE_ANCEST (((u64)0x40)<<32) /* Prefer check-ins in the ANCESTOR table */ |
| 2143 | 2141 | |
| 2144 | 2142 | /* |
| 2145 | 2143 | ** Compute a complete annotation on a file. The file is identified |
| 2146 | -** by its filename number (filename.fnid) and the baseline in which | |
| 2147 | -** it was checked in (mlink.mid). | |
| 2144 | +** by its filename number (filename.fnid) and check-in (mlink.mid). | |
| 2148 | 2145 | */ |
| 2149 | 2146 | static void annotate_file( |
| 2150 | 2147 | Annotator *p, /* The annotator */ |
| 2151 | 2148 | int fnid, /* The name of the file to be annotated */ |
| 2152 | 2149 | int mid, /* Use the version of the file in this check-in */ |
| 2153 | 2150 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2088,13 +2088,11 @@ | |
| 2088 | } |
| 2089 | |
| 2090 | /* |
| 2091 | ** The input pParent is the next most recent ancestor of the file |
| 2092 | ** being annotated. Do another step of the annotation. Return true |
| 2093 | ** if additional annotation is required. zPName is the tag to insert |
| 2094 | ** on each line of the file being annotated that was contributed by |
| 2095 | ** pParent. Memory to hold zPName is leaked. |
| 2096 | */ |
| 2097 | static int annotation_step(Annotator *p, Blob *pParent, int iVers, u64 diffFlags){ |
| 2098 | int i, j; |
| 2099 | int lnTo; |
| 2100 | |
| @@ -2141,12 +2139,11 @@ | |
| 2141 | #define ANN_FILE_VERS (((u64)0x20)<<32) /* Show file vers rather than commit vers */ |
| 2142 | #define ANN_FILE_ANCEST (((u64)0x40)<<32) /* Prefer check-ins in the ANCESTOR table */ |
| 2143 | |
| 2144 | /* |
| 2145 | ** Compute a complete annotation on a file. The file is identified |
| 2146 | ** by its filename number (filename.fnid) and the baseline in which |
| 2147 | ** it was checked in (mlink.mid). |
| 2148 | */ |
| 2149 | static void annotate_file( |
| 2150 | Annotator *p, /* The annotator */ |
| 2151 | int fnid, /* The name of the file to be annotated */ |
| 2152 | int mid, /* Use the version of the file in this check-in */ |
| 2153 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2088,13 +2088,11 @@ | |
| 2088 | } |
| 2089 | |
| 2090 | /* |
| 2091 | ** The input pParent is the next most recent ancestor of the file |
| 2092 | ** being annotated. Do another step of the annotation. Return true |
| 2093 | ** if additional annotation is required. |
| 2094 | */ |
| 2095 | static int annotation_step(Annotator *p, Blob *pParent, int iVers, u64 diffFlags){ |
| 2096 | int i, j; |
| 2097 | int lnTo; |
| 2098 | |
| @@ -2141,12 +2139,11 @@ | |
| 2139 | #define ANN_FILE_VERS (((u64)0x20)<<32) /* Show file vers rather than commit vers */ |
| 2140 | #define ANN_FILE_ANCEST (((u64)0x40)<<32) /* Prefer check-ins in the ANCESTOR table */ |
| 2141 | |
| 2142 | /* |
| 2143 | ** Compute a complete annotation on a file. The file is identified |
| 2144 | ** by its filename number (filename.fnid) and check-in (mlink.mid). |
| 2145 | */ |
| 2146 | static void annotate_file( |
| 2147 | Annotator *p, /* The annotator */ |
| 2148 | int fnid, /* The name of the file to be annotated */ |
| 2149 | int mid, /* Use the version of the file in this check-in */ |
| 2150 |