Kiril Videlov
74fac648a6
Merge pull request #3943 from gitbutlerapp/update-base-branch-fix-already-applied
...
notify of branch being unapplied only for these that we indeed applied before
2024-06-01 19:55:34 +02:00
Kiril Videlov
a4afd0d0df
notify of branch being unapplied only for these that we indeed applied before
2024-06-01 19:26:03 +02:00
dependabot[bot]
398558d063
Bump the rust-updates group with 17 updates
...
Bumps the rust-updates group with 17 updates:
| Package | From | To |
| --- | --- | --- |
| [serde](https://github.com/serde-rs/serde ) | `1.0.199` | `1.0.203` |
| [thiserror](https://github.com/dtolnay/thiserror ) | `1.0.59` | `1.0.61` |
| [tokio](https://github.com/tokio-rs/tokio ) | `1.37.0` | `1.38.0` |
| [toml](https://github.com/toml-rs/toml ) | `0.8.12` | `0.8.13` |
| [anyhow](https://github.com/dtolnay/anyhow ) | `1.0.82` | `1.0.86` |
| [backtrace](https://github.com/rust-lang/backtrace-rs ) | `0.3.71` | `0.3.72` |
| [itertools](https://github.com/rust-itertools/itertools ) | `0.12.1` | `0.13.0` |
| [serde_json](https://github.com/serde-rs/json ) | `1.0.116` | `1.0.117` |
| [open](https://github.com/Byron/open-rs ) | `5.1.2` | `5.1.3` |
| [tauri-build](https://github.com/tauri-apps/tauri ) | `1.5.1` | `1.5.2` |
| [sysinfo](https://github.com/GuillaumeGomez/sysinfo ) | `0.30.11` | `0.30.12` |
| [nix](https://github.com/nix-rust/nix ) | `0.28.0` | `0.29.0` |
| [tokio-util](https://github.com/tokio-rs/tokio ) | `0.7.10` | `0.7.11` |
| [parking_lot](https://github.com/Amanieu/parking_lot ) | `0.12.1` | `0.12.3` |
| [crossbeam-channel](https://github.com/crossbeam-rs/crossbeam ) | `0.5.12` | `0.5.13` |
| [mock_instant](https://github.com/museun/mock_instant ) | `0.3.2` | `0.4.0` |
| [rstest](https://github.com/la10736/rstest ) | `0.18.2` | `0.20.0` |
Updates `serde` from 1.0.199 to 1.0.203
- [Release notes](https://github.com/serde-rs/serde/releases )
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.199...v1.0.203 )
Updates `thiserror` from 1.0.59 to 1.0.61
- [Release notes](https://github.com/dtolnay/thiserror/releases )
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.59...1.0.61 )
Updates `tokio` from 1.37.0 to 1.38.0
- [Release notes](https://github.com/tokio-rs/tokio/releases )
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.37.0...tokio-1.38.0 )
Updates `toml` from 0.8.12 to 0.8.13
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.12...toml-v0.8.13 )
Updates `anyhow` from 1.0.82 to 1.0.86
- [Release notes](https://github.com/dtolnay/anyhow/releases )
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.82...1.0.86 )
Updates `backtrace` from 0.3.71 to 0.3.72
- [Release notes](https://github.com/rust-lang/backtrace-rs/releases )
- [Commits](https://github.com/rust-lang/backtrace-rs/compare/0.3.71...0.3.72 )
Updates `itertools` from 0.12.1 to 0.13.0
- [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rust-itertools/itertools/compare/v0.12.1...v0.13.0 )
Updates `serde_json` from 1.0.116 to 1.0.117
- [Release notes](https://github.com/serde-rs/json/releases )
- [Commits](https://github.com/serde-rs/json/compare/v1.0.116...v1.0.117 )
Updates `open` from 5.1.2 to 5.1.3
- [Release notes](https://github.com/Byron/open-rs/releases )
- [Changelog](https://github.com/Byron/open-rs/blob/main/changelog.md )
- [Commits](https://github.com/Byron/open-rs/compare/v5.1.2...v5.1.3 )
Updates `tauri-build` from 1.5.1 to 1.5.2
- [Release notes](https://github.com/tauri-apps/tauri/releases )
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-build-v1.5.1...tauri-build-v1.5.2 )
Updates `sysinfo` from 0.30.11 to 0.30.12
- [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/GuillaumeGomez/sysinfo/commits )
Updates `nix` from 0.28.0 to 0.29.0
- [Changelog](https://github.com/nix-rust/nix/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nix-rust/nix/compare/v0.28.0...v0.29.0 )
Updates `tokio-util` from 0.7.10 to 0.7.11
- [Release notes](https://github.com/tokio-rs/tokio/releases )
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-util-0.7.10...tokio-util-0.7.11 )
Updates `parking_lot` from 0.12.1 to 0.12.3
- [Changelog](https://github.com/Amanieu/parking_lot/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Amanieu/parking_lot/compare/0.12.1...0.12.3 )
Updates `crossbeam-channel` from 0.5.12 to 0.5.13
- [Release notes](https://github.com/crossbeam-rs/crossbeam/releases )
- [Changelog](https://github.com/crossbeam-rs/crossbeam/blob/master/CHANGELOG.md )
- [Commits](https://github.com/crossbeam-rs/crossbeam/compare/crossbeam-channel-0.5.12...crossbeam-channel-0.5.13 )
Updates `mock_instant` from 0.3.2 to 0.4.0
- [Commits](https://github.com/museun/mock_instant/compare/v0.3.2...v0.4.0 )
Updates `rstest` from 0.18.2 to 0.20.0
- [Release notes](https://github.com/la10736/rstest/releases )
- [Changelog](https://github.com/la10736/rstest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/la10736/rstest/compare/v0.18.2...v0.20.0 )
---
updated-dependencies:
- dependency-name: serde
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: thiserror
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: tokio
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-updates
- dependency-name: toml
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: anyhow
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: backtrace
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: itertools
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-updates
- dependency-name: serde_json
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: open
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: tauri-build
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: sysinfo
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: nix
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-updates
- dependency-name: tokio-util
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: parking_lot
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: crossbeam-channel
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: mock_instant
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-updates
- dependency-name: rstest
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-updates
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 15:38:43 +00:00
Kiril Videlov
bff8cf1ca5
Merge pull request #3898 from Byron/error-handling-pt2
...
error handling ergonomics
2024-06-01 17:04:02 +02:00
Pavel Laptev
6946d6ddeb
Refactor-Tailwind-remove ( #3936 )
...
* remove teilwind CSS imports
* remove Teilwind package
* remove unused CSS
* update from master
* file format changes
* update reset file
* Drop unused Differ file
* update hunk line highlight color
2024-06-01 16:27:36 +02:00
Sebastian Thiel
dedd721dc3
capitalize error message
...
Let's not assume, nor force, that the backend provides error messages
in a format that we want to present. Hence we capitalize ourselves
for consistency.
2024-06-01 15:56:02 +02:00
Sebastian Thiel
83893a9db3
review error docs to fit the latest changes
2024-06-01 15:24:59 +02:00
Sebastian Thiel
567a077582
simplify core::errors and remove all the cruft
2024-06-01 14:37:41 +02:00
Sebastian Thiel
0ef944ed25
Switch thiserror with anyhow based errors in application code
...
This should simplify most code.
2024-06-01 14:36:08 +02:00
Sebastian Thiel
a10b19ed2c
reomve all thiserror based errors from controllers
2024-06-01 14:36:08 +02:00
Sebastian Thiel
939624f725
Remove all custom errors from virtual branches module.
...
In order to do that, errors from other modules have to go as well.
2024-06-01 14:36:05 +02:00
Sebastian Thiel
f82d25741e
use Marker in place of Code::ProjectInvalid
...
That way, the frontend doesn't see internals.
2024-06-01 14:34:16 +02:00
Sebastian Thiel
e7c1d6033a
Remove all errors that don't trigger a custom code or context
2024-06-01 14:34:16 +02:00
Sebastian Thiel
c0fc0cfde5
Remove BranchNotFound struct
2024-06-01 14:34:16 +02:00
Sebastian Thiel
a95c48a6cf
remove DefaultTargetNotSet in favor of a utility function
2024-06-01 14:34:16 +02:00
Sebastian Thiel
61a53c6346
Another pass at removing ProjectConflict
...
As this causes quite a lot of changes, there is this commit to capture them.
2024-06-01 14:34:13 +02:00
Sebastian Thiel
1dc52a44c0
restore detection of project conflicts
...
Previously that variant was removed even though we need it now to
easily detect this case.
2024-06-01 14:32:27 +02:00
Sebastian Thiel
20d84247e9
Prune Code to only what's used by the UI
...
Also adjust the `Code` documentation to clarify this - otherwise
we will have more and more variants and nobody actually cares.
The frontend code is adjusted as well, as its `Code` counterpart
contained unsused variants which are now removed.
2024-06-01 14:32:27 +02:00
Sebastian Thiel
d689f36e7f
various refactors
...
Also
- add tests for ref-log file to assure it's not zero (but something more sensible)
- remove generic for convenience on most callsites
2024-06-01 14:32:19 +02:00
Kiril Videlov
39e157fac6
Merge pull request #3939 from gitbutlerapp/show-infobox-if-workspace-update-stashed-branches
...
show infobox if workspace update stashed branches
2024-06-01 14:04:34 +02:00
Mattias Granlund
a50fa6613b
Scale branch icons when zooming
2024-06-01 13:59:23 +02:00
Mattias Granlund
24466c8f11
Fix inconsistencies in commit graph
...
- terrible code, needs immediate refactoring
2024-06-01 13:56:53 +02:00
Kiril Videlov
dc385b6a77
Shows infobox if update workspace stashes branches
...
In case branches were stashed due to a conflict we want to communicate what happened. Hopefully soon we wont need any of that with the new conflict resolution flow
2024-06-01 13:51:17 +02:00
Kiril Videlov
d164457299
update_base_branch returns unapplied branches list
...
If merge conflicts caused branches to become unapplied, return them as a list
2024-06-01 13:11:53 +02:00
Kiril Videlov
ad4d94208b
Merge pull request #3937 from gitbutlerapp/add-revert-help-text
...
feat: Add help text to Revert button on Snapshot Card.
2024-06-01 12:55:42 +02:00
Kiril Videlov
72799dacf1
feat: Add help text to Revert button on Snapshot Card.
2024-06-01 12:54:05 +02:00
Caleb Owens
23b6760b82
Merge pull request #3931 from gitbutlerapp/svelte-commit-card-updates
...
Remove non-advanced mode
2024-05-31 23:03:00 +02:00
Caleb Owens
76e3b3f164
removed tooltip and added a hover state to help indicate clickableness
2024-05-31 22:59:46 +02:00
Caleb Owens
9cde2babcb
Merge pull request #3818 from gitbutlerapp/customizable-ai-prompts
...
Leeerrrooyyyy jeeennnkkkininnsss
2024-05-31 22:02:31 +02:00
Caleb Owens
0b36e4bcc4
Fixed some stupid shit
2024-05-31 22:00:08 +02:00
Pavel Laptev
564830d8ff
remove console.log ( #3934 )
2024-05-31 16:56:45 +02:00
Pavel Laptev
e8b70859bd
Revert "Refactor: Tailwind remove ( #3932 )" ( #3933 )
...
This reverts commit 89d97d2017
2024-05-31 16:20:17 +02:00
Pavel Laptev
89d97d2017
Refactor: Tailwind remove ( #3932 )
...
* remove teilwind CSS imports
* remove Teilwind package
* remove unused CSS
2024-05-31 16:05:47 +02:00
Kiril Videlov
565535ba6d
Merge pull request #3927 from anaisbetts/use-debouncer-0.3.1
...
Use notify-debouncer-full v0.3.1
2024-05-31 15:58:14 +02:00
Caleb Owens
509b72409d
Fix prompt selector
2024-05-31 15:38:35 +02:00
Ani Betts
035736a245
Fix the test paths
2024-05-31 15:27:16 +02:00
Ani Betts
4363f0fcc4
Leave these exports here in case we need them later
2024-05-31 15:27:16 +02:00
Ani Betts
73ab4bdd90
First hack at readding the tests
2024-05-31 15:27:16 +02:00
Ani Betts
3e34a92634
Chill out some of these logs
2024-05-31 15:27:16 +02:00
Ani Betts
bc31c65fc3
Let's just get it working
2024-05-31 15:27:16 +02:00
Ani Betts
2b3690308c
Roll back to v0.3.1 + flush changes
2024-05-31 15:27:15 +02:00
Pavel Laptev
2b131097ce
copy updated
2024-05-31 15:00:33 +02:00
Pavel Laptev
bd365fd08a
UI: Custom AI prompts layouts updated
2024-05-31 15:00:33 +02:00
Pavel Laptev
3991cea11f
default prompts updated
...
In order to correctly display code snippets, the code was wrapped in special triple backticks.
2024-05-31 15:00:33 +02:00
Pavel Laptev
c69d3956df
icon typo fix
2024-05-31 15:00:33 +02:00
Pavel Laptev
e2f37d884b
fix removed --size-1 variable error
2024-05-31 15:00:33 +02:00
Pavel Laptev
690d96c818
markdown styles updated
2024-05-31 15:00:33 +02:00
Pavel Laptev
bcd89d5c4c
TextArea: added autoresize
2024-05-31 15:00:33 +02:00
Caleb Owens
a936f89485
Go to a manual save step
2024-05-31 15:00:33 +02:00
Caleb Owens
53abdffb5c
Better defaults if prompt becomes invalid
2024-05-31 15:00:33 +02:00
