Expose the line number before a diff as %(lineno_old) #1081
Conversation
doc/manual.adoc
Outdated
| @@ -175,6 +175,7 @@ following variables. | |||
| "." if undefined. | |||
| |%(file) |The currently selected file. | |||
| |%(lineno) |The currently selected line number. Defaults to 0. | |||
| |%(lineno_old) |The selected line number in the pre-image of a diff. Defaults to 0. | |||
There was a problem hiding this comment.
Just wondering if we can't find a better name for lineno_old. Not that easy though...
There was a problem hiding this comment.
Maybe lineno_original, that's what Wikipedia's diff page uses.
When browsing a patch that has not yet been applied to the working tree, this line number can be used to go to the exact line under the cursor. Of course this can only work if the cursor is on a (future) deleted, or context line. If the cursor is in a sequence of added lines, this line number will be on the first of the sequence.
I briefly considered making it symmetrical by adding an alias, so we can have something like lineno_before and lineno_after bur that's probably, not worth it.
There was a problem hiding this comment.
So be it for lineno_old, it's not worth the time, you're right.
There was a problem hiding this comment.
doc/tigrc.5.adoc should be impacted as well.
There was a problem hiding this comment.
"old" seems alright because git-diff uses this terminology - it has options like --output-indicator-old.
pre-image was bogus though. It implies a function / unique mapping, which doesn't make sense here. I think I got that from the message that rerere prints ("Recorded preimage ...").
I've updated the docs and commit message
Popular Git hostings sites like GitHub and GitLab show two columns with line numbers next to diffs. The left one is the line number in the "old" version of a file, and the right one is the line number in the "new" file - the file after the diff was applied. I use Tig to write review comments on GitLab. To comment on specific lines of a diff, the GitLab API requires both old and new line numbers. Tig's %(lineno) provides the new line number. This patch additionally exposes the old line number as %(lineno_old). When browsing a diff that has not yet been applied to the working tree, this line number can be used to go to the selected line. Naturally, this is only precise for "deleted" and "context" lines, that are present in the working tree.
krobelus
force-pushed
the
expose-lineno_old
branch
from
82172ef
to
f68fd22
Compare
I use Tig to write review comments on GitLab (hopefully soon GitHub as well).
To comment on specific lines of a diff, the GitLab API requires both the
line number before the diff, and after the diff. Additionally, it needs
the line type (added, deleted / context line). This patch exposes %(lineno_old)
which is the dual to %(linenno). It could also be useful when viewing
"reverse" diffs.