Sebastian Thiel
e6b00b5e0e
more tests and refactors for branch-listing
2024-08-01 15:21:30 +02:00
Sebastian Thiel
b7c38e4f33
fix assumption about branch identity
...
It's possible for virtual branches to have the same 'identity' as
the target branch, yet they should be listed.
2024-08-01 09:24:35 +02:00
Kiril Videlov
9093c922a1
Merge pull request #4560 from gitbutlerapp/clean-up-repo-actions-ext
...
remove unnecessary method from RepoActionsExt
2024-07-31 21:23:25 +02:00
Kiril Videlov
917a46c2ce
remove unnecessary method from RepoActionsExt
2024-07-31 21:16:38 +02:00
Kiril Videlov
9dc9b69afd
Merge pull request #4543 from Byron/git2-to-gix
...
branch listing in `gix`
2024-07-31 21:02:19 +02:00
Sebastian Thiel
2d82b6e038
more tests specific to how branches are discovered
2024-07-31 19:44:00 +02:00
Sebastian Thiel
182381dd79
assure normalization will always provide valid ref-names, or fail.
...
Otherwise, it's possible to run into `git2` errors, which are
more 'indirect'.
2024-07-31 18:52:01 +02:00
Sebastian Thiel
a5bc727705
let integration commit also respect author and committer times.
2024-07-31 18:52:01 +02:00
Sebastian Thiel
76d687b55c
Respect author-date for setting up completely static commmit graphs
...
This updates to a yet-to-be-released version of `gix` to be able to
leverage full local-time support thanks to the usage of `jiff`.
This means we can now rely on the local `now()` that `gix` signatures
come with, which naturally respect environment variables that help
to make commits statically known.
For the running Tauri application this won't have an effect as it won't
inherit environment variables, but the CLI will be different in that regard.
2024-07-31 18:52:01 +02:00
Sebastian Thiel
f4504b78d3
Merge pull request #4548 from Byron/stop-the-trash
...
prevent trashing when building with rustc in Jetbrains IDEs.
2024-07-31 18:51:27 +02:00
Sebastian Thiel
7d53e0f95c
prevent trashing when building with rustc in Jetbrains IDEs.
...
For the IDE to discover what's going on, it will use hidden environment variables
to perform the build with, but that also affects certain crates which then report
they changed.
If this is intermixed with actual nightly builds, unnecessary rebuilds happen all the time.
To prevent this, just use `nightly` by default without actually using nightly features.
2024-07-31 18:36:30 +02:00
Pavel Laptev
626ae0e390
Merge pull request #4556 from gitbutlerapp/Style-updates
...
Style updates
2024-07-31 13:05:05 +02:00
Nico Domino
ad92566cb3
fix: AppUpdater popover not able to be closed ( #4555 )
2024-07-31 11:51:04 +02:00
Pavel Laptev
3a93599e5c
styles fix: board links
2024-07-31 11:45:27 +02:00
Pavel Laptev
942baa44d2
fix reset font-weight
2024-07-31 11:45:06 +02:00
Pavel Laptev
3ba4297f1b
Merge pull request #4554 from gitbutlerapp/Diff-syntax-highligh-update
...
bump the contrast for the added lines text
2024-07-31 11:37:01 +02:00
Pavel Laptev
9f2cc1cfbd
deletion lines highlight color update
2024-07-31 11:23:11 +02:00
Pavel Laptev
73b2d3c045
bump the contrast for the added lines text
2024-07-31 11:18:12 +02:00
Nico Domino
4c7b92be7b
fix: default to VITEMODE=nightly ( #4552 )
...
Co-authored-by: Caleb-T-Owens
2024-07-31 08:40:10 +00:00
Mattias Granlund
0c7b2bd881
Prevent including background in text selection #2
...
- seems this line was lost in some UI package refactor
2024-07-31 08:18:55 +01:00
Pavel Laptev
6fe1f25959
Diff-hunk-style-fixes ( #4551 )
...
* remove styles duplication
* Add hunk background color
* fix: gap between commits when dragging
* update hunk line colors
* fix: number columns cliping
* fix: number column border clipping
* diff styles update
* update "large diff" message style
2024-07-31 00:31:26 +02:00
Kiril Videlov
9ea624b34b
Merge pull request #4549 from gitbutlerapp/separate-push-targets
...
separate push targets
2024-07-30 22:44:16 +02:00
Kiril Videlov
9ac21d39b5
fix one more callsite
2024-07-30 22:31:43 +02:00
Kiril Videlov
9fd02c41c0
update the UI for sync-ing (feature flagged)
2024-07-30 22:08:39 +02:00
Kiril Videlov
83679206cd
separate syncing of oplog from regular refs
2024-07-30 21:29:54 +02:00
Mattias Granlund
235a6a5d83
Fix a few problems in hunk/commit drag operations
2024-07-30 18:16:15 +01:00
Mattias Granlund
b676115b11
Always create new commit in get_workspace_head
...
- so we can safely recreate the integration commit
2024-07-30 18:09:07 +01:00
Mattias Granlund
11f0063f18
Remove test cases that do not apply
...
To list virtual branches we should require a base branch to be set.
2024-07-30 18:09:07 +01:00
Mattias Granlund
152b14c226
Remove now unused target_commit function
2024-07-30 18:09:07 +01:00
Mattias Granlund
1e518a3d78
Use octopus commit for creating gitbutler/integration
2024-07-30 18:09:07 +01:00
Mattias Granlund
e1eea3c5ab
Relax the amend restriction
...
We currently don't have accurate lock data. Also, we should allow amending to any commit _later_ than the lock subject.
2024-07-30 16:29:04 +01:00
Pavel Laptev
6194a58f5b
segment control added ( #4544 )
2024-07-30 17:08:02 +02:00
Pavel Laptev
ab0c70b673
Package UI updates ( #4539 )
...
* documentation update + design tokens generation
* ts config update
* formatting fix
* update tokens config format
* ignore JS files check
* Storybook version bump
* formatting fix
* dark theme toggle added
2024-07-30 16:45:19 +02:00
Nico Domino
aca95b196d
fix: use SvelteKit auto-generated types for load fns ( #4541 )
2024-07-30 13:19:13 +00:00
Nico Domino
7175d28304
fix: tweak pii onboarding copy ( #4540 )
2024-07-30 15:16:16 +02:00
Nico Domino
9646684f92
feat: refactor diff rendering ( #4497 )
...
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-07-30 13:27:19 +02:00
Nico Domino
56b64d7780
fix: add Sentry cron monitoring to nightly release and fix git tag creation ( #4538 )
2024-07-30 11:43:16 +02:00
Nico Domino
852522dcc0
fix: skip turbo in init-node-env ( #4537 )
2024-07-30 08:03:47 +00:00
Caleb Owens
7339c0bb19
Merge pull request #4536 from gitbutlerapp/fix-broken-condition
...
Fix gitbutler/integration nuking itself
2024-07-29 19:26:20 +02:00
Caleb Owens
4563ddb995
Fix gitbutler/integration nuking itself
2024-07-29 19:22:04 +02:00
Sebastian Thiel
5db403b501
Merge pull request #4532 from Byron/better-err-message
...
`gitbutler-git` now specifies the minimum required rustc version. (#4514 )
2024-07-29 17:11:45 +02:00
Sebastian Thiel
9113105413
gitbutler-git now specifies the minimum required rustc version. (#4514 )
...
That way, the error message will be clear and it's more obvious how to overcome
issues related to older-than-needed compiler versions.
2024-07-29 17:02:06 +02:00
Caleb Owens
48fb7c2b75
Merge pull request #4531 from gitbutlerapp/Use-seperate-folder-for-rust-analzyer
...
Use seperate folder for rust analzyer
2024-07-29 15:27:02 +02:00
Caleb Owens
62b309c0ed
Use seperate folder for rust analzyer
...
By asking rust analzyer to use a seperate
folder, it means the cache doesn't get
invalidated when running tests or by
running the application under different
compiler flags.
Having the cache invalidated
dramatically increases the compile times.
2024-07-29 15:24:43 +02:00
Nico Domino
4549daaa94
fix: remove release-docs.yml GHA ( #4530 )
2024-07-29 13:02:17 +00:00
Pavel Laptev
1c6b03eb6b
UI Package: refactor ( #4529 )
...
* Separate styles responsibilities
* Add misssing dependencies
* Intro page added
* formatting fix
2024-07-29 13:52:14 +02:00
Caleb Owens
16400aa4f0
Merge pull request #4528 from gitbutlerapp/more-accuratly-define-operating-modes
...
Introduce operating modes
2024-07-29 13:47:21 +02:00
Caleb Owens
742d6bc4d5
Use operating modes in watcher to decide whether to perform operations
2024-07-29 13:38:31 +02:00
Caleb Owens
2d61cae43a
Introduce operating modes
2024-07-29 13:19:38 +02:00
Nico Domino
4ae1a9be62
fix: update rust-toolchain flake input ( #4527 )
2024-07-29 10:52:29 +00:00
