| commit | a26c1447eee489e94a2895fbc03506150e0bb6dd | |
| author | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Tue, 16 Mar 2021 16:14:59 +0000 (16 17:14 +0100) | ||
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Sat, 3 Apr 2021 17:25:24 +0000 (3 19:25 +0200) | ||
| tree | 6f44d99614d9640faea6cd556f26a0d998a87c35 | treesnapshot (tar.gz zip) |
| parent | 218e672f59064086740756b2596f762edbf8c618 | commitdiff |
Staging view: display conflict state information
Show more conflict details in the unstaged viewer of the staging view.
Propagate the StageState telling which stages exist in the index from
the IndexDiff up to the StagingEntry. Use it there to display what kind
of conflict there is: delete-modify, modify-delete, both modified, or
both added different content. Add a second column to the unstaged viewer
(conflicts are always unstaged) to show an abbreviation and a fuller
message on hover.
Add two new icons for modify-delete and delete-modify conflicts and
use them in the decorator.
Change-Id: Ia50796a61a8bbdd8ac9016c8f50c9711f699a407
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Show more conflict details in the unstaged viewer of the staging view.
Propagate the StageState telling which stages exist in the index from
the IndexDiff up to the StagingEntry. Use it there to display what kind
of conflict there is: delete-modify, modify-delete, both modified, or
both added different content. Add a second column to the unstaged viewer
(conflicts are always unstaged) to show an abbreviation and a fuller
message on hover.
Add two new icons for modify-delete and delete-modify conflicts and
use them in the decorator.
Change-Id: Ia50796a61a8bbdd8ac9016c8f50c9711f699a407
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
21 files changed:
