Commit Graph

8938 Commits

Author SHA1 Message Date
Sebastian Thiel
de2989f352
Don't use gix built-in serialization as it will leave BString as sequence of numbers.
Instead, we need it to be a string, even if lossy.
2024-08-09 13:12:36 +02:00
Pavel Laptev
1e68698cd1 UX/UI: Improve selected state for sidebar buttons 2024-08-09 12:34:29 +02:00
Sebastian Thiel
acbd42fce3
Revert "remove unnecessary BString-related serde functions."
This reverts commit 3043f099b7.

We actually need this - me removing it just means it wasn't properly
documented and clarified in the type-system as to why this is needed.
2024-08-09 10:52:05 +02:00
Sebastian Thiel
4c76e2a6ee
Revert "Revert "Merge pull request #4652 from gitbutlerapp/git2-to-gix""
This reverts commit 88496e6219.
2024-08-09 10:30:52 +02:00
Kiril Videlov
eebdae680b
Merge pull request #4657 from gitbutlerapp/rev-something
Revert "Merge pull request #4652 from gitbutlerapp/git2-to-gix"
2024-08-09 10:26:23 +02:00
Kiril Videlov
88496e6219 Revert "Merge pull request #4652 from gitbutlerapp/git2-to-gix"
This reverts commit ae8b05ae70, reversing
changes made to 4d9b6a4a93.
2024-08-09 10:18:51 +02:00
Sebastian Thiel
9a4b86a6d8
Merge pull request #4651 from Byron/assure-benches
assure `benches` do not rot
2024-08-09 08:54:19 +02:00
Sebastian Thiel
ae8b05ae70
Merge pull request #4652 from gitbutlerapp/git2-to-gix
Follow-up cleanup of Branch-Listing with `gix`
2024-08-09 08:53:55 +02:00
Kiril Videlov
4d9b6a4a93
Merge pull request #4655 from gitbutlerapp/package-UI
Fix: path to fonts in UI
2024-08-09 08:53:16 +02:00
Pavel Laptev
c940d74631 Fix: path to fonts in UI 2024-08-08 21:15:05 +02:00
Sebastian Thiel
6720e987fe
Use gix::refs::PartialName as even stronger guarantee for what's in there 2024-08-08 21:04:09 +02:00
Sebastian Thiel
712ce582cb
Use BranchIdentity type instead of given_name().
This is a change in perception, as `given_name()` was the name of a virtual-branch,
which is also used to correlate other similarly named branches.

Thus, it's now more than just that, and for lack of a better word it's called
the 'identity' of a branch.

It's something very specific and shouldn't accidentally be used wrongly, hence
the strong typing.
2024-08-08 20:53:15 +02:00
Sebastian Thiel
5376a8b012
Author name uses BString to avoid degeneration 2024-08-08 20:53:14 +02:00
Sebastian Thiel
3df2da6de5
Use gix::remote::Name for type-safety. 2024-08-08 20:53:14 +02:00
Sebastian Thiel
f2a462f9b3
switch to latest gitoxide for updates supported the following changes 2024-08-08 20:53:10 +02:00
Sebastian Thiel
3043f099b7
remove unnecessary BString-related serde functions.
They are supported when the respective bstring feature is used.
2024-08-08 17:25:18 +02:00
Sebastian Thiel
8ed90644a1
refactor serde crate to avoid name duplication 2024-08-08 16:59:38 +02:00
Sebastian Thiel
187c26b650
fix the benchmark file as CI should now report it's OK 2024-08-08 16:29:54 +02:00
Sebastian Thiel
7a0cc9c789
Add clippy-validation for every possible target
This way, it's not possible anymore to accidentally break code just because CI doesn't try to build it.

Note that this is unrelated to features, which would still need to be specified or built individually
by CI.
2024-08-08 16:29:11 +02:00
Sebastian Thiel
c754479cc5
break benchmark intentionally to see if CI catches it 2024-08-08 16:25:16 +02:00
Sebastian Thiel
e1ece12768
Delete seemingly unused file
`check.sh` could not be found anywhere in the codebase.
2024-08-08 16:13:12 +02:00
Kiril Videlov
ee7660f395
Merge pull request #4650 from gitbutlerapp/add-reference-name-struct
derive some useful traits for tagged string and reference name
2024-08-08 15:11:26 +02:00
Kiril Videlov
c2566a58e3
Merge branch 'master' into add-reference-name-struct 2024-08-08 15:07:28 +02:00
Nico Domino
7d1b7b99db
fix(ui): update ui output (#4649) 2024-08-08 14:51:37 +02:00
Kiril Videlov
7d629c52b5
derive some useful traits for tagged string and reference name 2024-08-08 14:48:06 +02:00
Caleb Owens
99eac848cf
Merge pull request #4640 from gitbutlerapp/write-tests-for-existing-gitbutler-modes
Write tests for existing modes
2024-08-08 10:54:20 +02:00
Caleb Owens
035fafa30b
Merge pull request #4644 from gitbutlerapp/inline-unified-word-diffs
Add inline unified word diffs
2024-08-08 10:48:57 +02:00
Kiril Videlov
6d0fc5e8da
Merge pull request #4632 from Byron/git2-to-gix
branch-listing with `gix`
2024-08-08 09:51:00 +02:00
Sebastian Thiel
f43f8c1d2b
assure both applications enforce max-performance settings for gitoxide. 2024-08-07 20:21:56 +02:00
Sebastian Thiel
17850bd210
Use gix for branch listing 2024-08-07 20:21:29 +02:00
Sebastian Thiel
e42fcd4643
add benchmark for branch-listing 2024-08-07 20:10:02 +02:00
Caleb Owens
5bead87303 Add inline unified word diffs 2024-08-07 18:50:14 +02:00
Nico Domino
b741b9fbe4
fix: update flake config to run again (#4641) 2024-08-07 17:54:57 +02:00
Caleb Owens
9a0e484171
Merge pull request #4638 from gitbutlerapp/add-conditional-author-display-branch-sidebar
Add conditional author display branch sidebar
2024-08-07 14:44:14 +02:00
Caleb Owens
58043dd16e Make state calls more consistent 2024-08-07 14:42:42 +02:00
Caleb Owens
1b6a6fc91c Added guards to prevent state update races 2024-08-07 14:38:35 +02:00
Caleb Owens
5c3ce56353
Merge pull request #4637 from gitbutlerapp/make-branch-lising-sort-more-stable
Make branch listing sort more stable
2024-08-07 14:18:42 +02:00
Caleb Owens
7ea1a5929c Write tests for existing modes 2024-08-07 12:43:56 +02:00
Caleb Owens
f475ed1dff Default to showing the current author when there are no commits 2024-08-07 11:54:23 +02:00
Caleb Owens
de8cf25439 SidebarEntry can be displayed without lastCommitAt 2024-08-07 11:35:15 +02:00
Caleb Owens
96857a1955 Fix lint error? 2024-08-07 11:31:35 +02:00
Caleb Owens
d8d44f8c56 Make branch listing sort more stable 2024-08-07 11:18:49 +02:00
Nico Domino
565c5c218f
chore(docs): add note about turbo telemetry (#4636) 2024-08-07 08:52:18 +00:00
Caleb Owens
becb61548b
Merge pull request #4634 from gitbutlerapp/fix-branch-preview-remote-link
Fix branch preview remote link
2024-08-07 10:50:37 +02:00
Pavel Laptev
554f3b31a0
Merge pull request #4635 from gitbutlerapp/UI-update--branches-search-style
UI update: branches search style
2024-08-07 00:52:39 +02:00
Pavel Laptev
92f44e3661 UI update: branches search style 2024-08-07 00:42:11 +02:00
Pavel Laptev
959bdfad1f
Merge pull request #4633 from gitbutlerapp/Sidebar-branches-UI-update-2
Sidebar branches UI update 2
2024-08-07 00:39:35 +02:00
Caleb Owens
04391663b9 Fix branch preview remote link 2024-08-07 00:25:13 +02:00
Pavel Laptev
70022a4656 update local tag color 2024-08-06 23:19:46 +02:00
Pavel Laptev
09605acd46 copy update 2024-08-06 23:12:31 +02:00