FossilRepo
Add line numbers to diff view (old + new columns) - Parse @@ hunk headers to track old/new line counters - Show old line number (left gutter) and new line number (right gutter) - Context lines show both, additions show only new, deletions show only old - Matches GitHub/GitLab diff line number display
Commit
5a04a5733693ed246bd700e0959b6813d4e7e51be4e3920f7d04f448d81cc7f1
Parent
027a818377d662f…
2 files changed
+19
-1
+2
-1
+19
-1
| --- fossil/views.py | ||
| +++ fossil/views.py | ||
| @@ -302,23 +302,41 @@ | ||
| 302 | 302 | fromfile=f"a/{f['name']}", |
| 303 | 303 | tofile=f"b/{f['name']}", |
| 304 | 304 | lineterm="", |
| 305 | 305 | n=3, |
| 306 | 306 | ) |
| 307 | + old_line = 0 | |
| 308 | + new_line = 0 | |
| 307 | 309 | for line in diff: |
| 308 | 310 | line_type = "context" |
| 311 | + old_num = "" | |
| 312 | + new_num = "" | |
| 309 | 313 | if line.startswith("+++") or line.startswith("---"): |
| 310 | 314 | line_type = "header" |
| 311 | 315 | elif line.startswith("@@"): |
| 312 | 316 | line_type = "hunk" |
| 317 | + # Parse @@ -old_start,old_count +new_start,new_count @@ | |
| 318 | + hunk_match = re.match(r"@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@", line) | |
| 319 | + if hunk_match: | |
| 320 | + old_line = int(hunk_match.group(1)) | |
| 321 | + new_line = int(hunk_match.group(2)) | |
| 313 | 322 | elif line.startswith("+"): |
| 314 | 323 | line_type = "add" |
| 315 | 324 | additions += 1 |
| 325 | + new_num = new_line | |
| 326 | + new_line += 1 | |
| 316 | 327 | elif line.startswith("-"): |
| 317 | 328 | line_type = "del" |
| 318 | 329 | deletions += 1 |
| 319 | - diff_lines.append({"text": line, "type": line_type}) | |
| 330 | + old_num = old_line | |
| 331 | + old_line += 1 | |
| 332 | + else: | |
| 333 | + old_num = old_line | |
| 334 | + new_num = new_line | |
| 335 | + old_line += 1 | |
| 336 | + new_line += 1 | |
| 337 | + diff_lines.append({"text": line, "type": line_type, "old_num": old_num, "new_num": new_num}) | |
| 320 | 338 | |
| 321 | 339 | ext = f["name"].rsplit(".", 1)[-1] if "." in f["name"] else "" |
| 322 | 340 | file_diffs.append( |
| 323 | 341 | { |
| 324 | 342 | "name": f["name"], |
| 325 | 343 |
| --- fossil/views.py | |
| +++ fossil/views.py | |
| @@ -302,23 +302,41 @@ | |
| 302 | fromfile=f"a/{f['name']}", |
| 303 | tofile=f"b/{f['name']}", |
| 304 | lineterm="", |
| 305 | n=3, |
| 306 | ) |
| 307 | for line in diff: |
| 308 | line_type = "context" |
| 309 | if line.startswith("+++") or line.startswith("---"): |
| 310 | line_type = "header" |
| 311 | elif line.startswith("@@"): |
| 312 | line_type = "hunk" |
| 313 | elif line.startswith("+"): |
| 314 | line_type = "add" |
| 315 | additions += 1 |
| 316 | elif line.startswith("-"): |
| 317 | line_type = "del" |
| 318 | deletions += 1 |
| 319 | diff_lines.append({"text": line, "type": line_type}) |
| 320 | |
| 321 | ext = f["name"].rsplit(".", 1)[-1] if "." in f["name"] else "" |
| 322 | file_diffs.append( |
| 323 | { |
| 324 | "name": f["name"], |
| 325 |
| --- fossil/views.py | |
| +++ fossil/views.py | |
| @@ -302,23 +302,41 @@ | |
| 302 | fromfile=f"a/{f['name']}", |
| 303 | tofile=f"b/{f['name']}", |
| 304 | lineterm="", |
| 305 | n=3, |
| 306 | ) |
| 307 | old_line = 0 |
| 308 | new_line = 0 |
| 309 | for line in diff: |
| 310 | line_type = "context" |
| 311 | old_num = "" |
| 312 | new_num = "" |
| 313 | if line.startswith("+++") or line.startswith("---"): |
| 314 | line_type = "header" |
| 315 | elif line.startswith("@@"): |
| 316 | line_type = "hunk" |
| 317 | # Parse @@ -old_start,old_count +new_start,new_count @@ |
| 318 | hunk_match = re.match(r"@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@", line) |
| 319 | if hunk_match: |
| 320 | old_line = int(hunk_match.group(1)) |
| 321 | new_line = int(hunk_match.group(2)) |
| 322 | elif line.startswith("+"): |
| 323 | line_type = "add" |
| 324 | additions += 1 |
| 325 | new_num = new_line |
| 326 | new_line += 1 |
| 327 | elif line.startswith("-"): |
| 328 | line_type = "del" |
| 329 | deletions += 1 |
| 330 | old_num = old_line |
| 331 | old_line += 1 |
| 332 | else: |
| 333 | old_num = old_line |
| 334 | new_num = new_line |
| 335 | old_line += 1 |
| 336 | new_line += 1 |
| 337 | diff_lines.append({"text": line, "type": line_type, "old_num": old_num, "new_num": new_num}) |
| 338 | |
| 339 | ext = f["name"].rsplit(".", 1)[-1] if "." in f["name"] else "" |
| 340 | file_diffs.append( |
| 341 | { |
| 342 | "name": f["name"], |
| 343 |
| --- templates/fossil/checkin_detail.html | ||
| +++ templates/fossil/checkin_detail.html | ||
| @@ -115,11 +115,12 @@ | ||
| 115 | 115 | {% elif fd.diff_lines %} |
| 116 | 116 | <table class="diff-table"> |
| 117 | 117 | <tbody> |
| 118 | 118 | {% for dl in fd.diff_lines %} |
| 119 | 119 | <tr class="diff-line-{{ dl.type }}"> |
| 120 | - <td class="diff-gutter"></td> | |
| 120 | + <td class="diff-gutter">{{ dl.old_num }}</td> | |
| 121 | + <td class="diff-gutter">{{ dl.new_num }}</td> | |
| 121 | 122 | <td>{{ dl.text }}</td> |
| 122 | 123 | </tr> |
| 123 | 124 | {% endfor %} |
| 124 | 125 | </tbody> |
| 125 | 126 | </table> |
| 126 | 127 |
| --- templates/fossil/checkin_detail.html | |
| +++ templates/fossil/checkin_detail.html | |
| @@ -115,11 +115,12 @@ | |
| 115 | {% elif fd.diff_lines %} |
| 116 | <table class="diff-table"> |
| 117 | <tbody> |
| 118 | {% for dl in fd.diff_lines %} |
| 119 | <tr class="diff-line-{{ dl.type }}"> |
| 120 | <td class="diff-gutter"></td> |
| 121 | <td>{{ dl.text }}</td> |
| 122 | </tr> |
| 123 | {% endfor %} |
| 124 | </tbody> |
| 125 | </table> |
| 126 |
| --- templates/fossil/checkin_detail.html | |
| +++ templates/fossil/checkin_detail.html | |
| @@ -115,11 +115,12 @@ | |
| 115 | {% elif fd.diff_lines %} |
| 116 | <table class="diff-table"> |
| 117 | <tbody> |
| 118 | {% for dl in fd.diff_lines %} |
| 119 | <tr class="diff-line-{{ dl.type }}"> |
| 120 | <td class="diff-gutter">{{ dl.old_num }}</td> |
| 121 | <td class="diff-gutter">{{ dl.new_num }}</td> |
| 122 | <td>{{ dl.text }}</td> |
| 123 | </tr> |
| 124 | {% endfor %} |
| 125 | </tbody> |
| 126 | </table> |
| 127 |