Commit Graph

10174 Commits

Author SHA1 Message Date
Kiril Videlov
eab3f6208e Refactor Stack: make initialized() return Result
This way we dont need to repeat the error message in places where that is checked
Also make it private
2024-11-02 12:30:36 +01:00
Kiril Videlov
0a79974601 Refactor: add useful functions e.g. getting the stack commits or merge base to the Stack impl
Ideally we can move to a state where these types of operations have single well tested implementations
2024-11-02 12:16:05 +01:00
Kiril Videlov
d855660f25 refactor: stack tests - remove initialize function call
Stack cant be created unitialized anymore
2024-11-02 11:21:23 +01:00
Kiril Videlov
79cd76305f
Merge pull request #5406 from gitbutlerapp/refactorz
Remove old commit reorder implementation
2024-11-02 10:18:53 +01:00
Kiril Videlov
eea5ac4213
Merge pull request #5399 from gitbutlerapp/gitbutler-settings
Introduce gitbutler-settings crate
2024-11-02 00:22:52 +01:00
Kiril Videlov
b9825f1bd1 Remove legacy commit reorder code 2024-11-01 21:18:05 +01:00
Kiril Videlov
555a5a27e4 Remove old reorder commit in UI 2024-11-01 20:26:45 +01:00
Kiril Videlov
2604cdd6cd
Merge pull request #5405 from gitbutlerapp/dependabot/cargo/rust-updates-9e20b0c220
build(deps): bump the rust-updates group across 1 directory with 13 updates
2024-11-01 19:40:58 +01:00
dependabot[bot]
314840a46e
build(deps): bump the rust-updates group across 1 directory with 13 updates
Bumps the rust-updates group with 13 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [uuid](https://github.com/uuid-rs/uuid) | `1.10.0` | `1.11.0` |
| [serde](https://github.com/serde-rs/serde) | `1.0.210` | `1.0.214` |
| [thiserror](https://github.com/dtolnay/thiserror) | `1.0.64` | `1.0.66` |
| [tokio](https://github.com/tokio-rs/tokio) | `1.40.0` | `1.41.0` |
| [anyhow](https://github.com/dtolnay/anyhow) | `1.0.89` | `1.0.92` |
| [futures](https://github.com/rust-lang/futures-rs) | `0.3.30` | `0.3.31` |
| [console-subscriber](https://github.com/tokio-rs/console) | `0.4.0` | `0.4.1` |
| [once_cell](https://github.com/matklad/once_cell) | `1.20.1` | `1.20.2` |
| [reqwest](https://github.com/seanmonstar/reqwest) | `0.12.8` | `0.12.9` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.128` | `1.0.132` |
| [file-id](https://github.com/notify-rs/notify) | `0.2.1` | `0.2.2` |
| [clap](https://github.com/clap-rs/clap) | `4.5.19` | `4.5.20` |
| [regex](https://github.com/rust-lang/regex) | `1.11.0` | `1.11.1` |



Updates `uuid` from 1.10.0 to 1.11.0
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.10.0...1.11.0)

Updates `serde` from 1.0.210 to 1.0.214
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.210...v1.0.214)

Updates `thiserror` from 1.0.64 to 1.0.66
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.64...1.0.66)

Updates `tokio` from 1.40.0 to 1.41.0
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.40.0...tokio-1.41.0)

Updates `anyhow` from 1.0.89 to 1.0.92
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.89...1.0.92)

Updates `futures` from 0.3.30 to 0.3.31
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.30...0.3.31)

Updates `console-subscriber` from 0.4.0 to 0.4.1
- [Release notes](https://github.com/tokio-rs/console/releases)
- [Changelog](https://github.com/tokio-rs/console/blob/main/release-plz.toml)
- [Commits](https://github.com/tokio-rs/console/compare/console-subscriber-v0.4.0...console-subscriber-v0.4.1)

Updates `once_cell` from 1.20.1 to 1.20.2
- [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md)
- [Commits](https://github.com/matklad/once_cell/compare/v1.20.1...v1.20.2)

Updates `reqwest` from 0.12.8 to 0.12.9
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.12.8...v0.12.9)

Updates `serde_json` from 1.0.128 to 1.0.132
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/1.0.128...1.0.132)

Updates `file-id` from 0.2.1 to 0.2.2
- [Release notes](https://github.com/notify-rs/notify/releases)
- [Changelog](https://github.com/notify-rs/notify/blob/main/CHANGELOG.md)
- [Commits](https://github.com/notify-rs/notify/compare/file-id-0.2.1...file-id-0.2.2)

Updates `clap` from 4.5.19 to 4.5.20
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.19...clap_complete-v4.5.20)

Updates `regex` from 1.11.0 to 1.11.1
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/1.11.0...1.11.1)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- 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: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: futures
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: console-subscriber
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: once_cell
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: reqwest
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: file-id
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-01 18:16:24 +00:00
Kiril Videlov
e908f690b1
Merge pull request #5401 from gitbutlerapp/branch-name-uniqueness
Create unique auto-generated branch names when creating lanes preserving names when applying exisint branches
2024-11-01 19:07:55 +01:00
Kiril Videlov
eb4bf2b76e
Merge pull request #5404 from gitbutlerapp/upgrade-crate-sysinfo
update crate sysinfo
2024-11-01 19:07:45 +01:00
Kiril Videlov
fd0c2f408d update crate sysinfo 2024-11-01 18:50:49 +01:00
Pavel Laptev
0f4f8caa6b
Update Textarea.svelte (#5402)
* Update Textarea.svelte

* Update Textarea.svelte

* remove additional wrapper

* set time out to ensure the element is rendered
2024-11-01 16:51:39 +00:00
Esteban Vega
756b430279
Merge pull request #5403 from gitbutlerapp/e-branch-43
fix: PR modal: Disable the generate button if so configured
2024-11-01 17:47:17 +01:00
estib
387f5a85bd fix: PR modal: Disable the generate button if so configured
If the AI generation is disabled in the project settings, disable the button in the  'generate message' button in the PR Modal as well
2024-11-01 17:42:03 +01:00
Kiril Videlov
860b0da2ab Create unique auto-generated branch names when creating lanes
At the same time, when creating a lane from a pre-existing branch, dont try to make a unique name
2024-11-01 17:35:03 +01:00
Pavel Laptev
09ad1f3951
fix context menus (#5400) 2024-11-01 16:11:13 +00:00
Kiril Videlov
70392022d4 github Oauth integration optionaly uses configured client ID
This allows a user to configure a custom client id via the `githubOauthClientId` field in settings.json
2024-11-01 16:35:33 +01:00
Pavel Laptev
ad2a37113d
Fix fileitem path truncation (#5397)
* Update Textarea.svelte

* fix file path and name strings truncation

* add tooltip

* fix tooltip word break

* update tooltip name
2024-11-01 16:34:52 +01:00
Esteban Vega
0560feedeb
Merge pull request #5396 from gitbutlerapp/fix-hunk-locking-order
fix: Hunk dependencies - Pass the commits in application order
2024-11-01 16:33:59 +01:00
estib
5f2e1a0e79 fix: Hunk dependencies - Pass the commits in application order 2024-11-01 16:28:20 +01:00
Kiril Videlov
b0803b0358 Implements gitbutler-settings crate with a AppSettings type
This is constructed via `tauri_plugin_store::Store` but it does not depend on it, this way, if we want in the future we can read the file directly.
2024-11-01 15:41:21 +01:00
ndom91
98b3e7efc9 fix: remove unused functionality from BranchLaneContextMenu 2024-11-01 15:16:48 +01:00
ndom91
dff3071b83 feat: remove non-stacking feature flag branches in markup 2024-11-01 15:16:48 +01:00
ndom91
e005e3fe20 feat: remove stacking feature flag 2024-11-01 15:16:48 +01:00
ndom91
9bff466a21 fix: move stackingReorderDropzoneManager getContext back to StackSeries.svelte 2024-11-01 14:48:00 +01:00
ndom91
6628b07eb9 fix: maintain event listeners and always unregister before reregistering 2024-11-01 14:48:00 +01:00
ndom91
11b1f76143 fix: allow initial reordering between series
fix: reordering between series
fix: add early return opportunities to accepts and onDrop
fix: refactor getStackOrder
fix: avoid reregistering listeners in stacking reorder line
2024-11-01 14:48:00 +01:00
ndom91
632dc2367a fix: add seriesName to DraggableCommit args 2024-11-01 14:48:00 +01:00
ndom91
48d6f4c2ce feat: create additional stacking reorder context 2024-11-01 14:48:00 +01:00
ndom91
32a5908924 fix: add serde camelCase to SeriesOrder struct 2024-11-01 14:48:00 +01:00
ndom91
f0a319b636 feat: add stacking methods and interfaces 2024-11-01 14:48:00 +01:00
Esteban Vega
d78d84a887
Merge pull request #5372 from gitbutlerapp/e-branch-2
ai: Stream the Butler AI messages
2024-11-01 14:02:55 +01:00
estib
e9f2b97f83 ai: Stream the Butler AI messages
Users that hava AI enabled through their GitButler cloud account will get streamed responses.

Also:
- Commit generation is stremed into the message input
2024-11-01 13:57:35 +01:00
Pavel Laptev
790ecd9261
Update Textarea.svelte (#5389) 2024-11-01 09:39:07 +01:00
Mattias Granlund
6e2fa72cdc Fix reactivity in pr template selection
- revert to template when input empty on change rather than keystroke
- use empty string for state variables since it the input default
2024-11-01 01:28:38 +01:00
Mattias Granlund
f2878d8915 Refactor pr templates to use front end persisted store 2024-11-01 00:18:56 +01:00
Kiril Videlov
be950b1cc0 Fixes a bug where incorrect remote commits are shown when remote was rebased 2024-10-31 19:54:52 +01:00
Mattias Granlund
e7e8ffdec2 Add button for re-opening PR if closed 2024-10-31 18:32:50 +01:00
Mattias Granlund
23541b1c59 Store forgeId after creating a new pull request 2024-10-31 18:32:50 +01:00
Pavel Laptev
359d8d5b51
Improve textarea and fix bugs (#5380)
* Delete Textarea-old.svelte

* Update PrDetailsModal.svelte

* update height calculation method

* remove `console.log`

* Delete autoHeight.ts

* Update CommitCard.svelte

* code review fixes

* improve textarea size detection

* Update CommitMessageInput.svelte

* simplify styles

* Update CommitMessageInput.svelte
2024-10-31 13:08:04 +00:00
Pavel Laptev
f8d9434573
nightly-app-icons (#5381) 2024-10-31 12:08:57 +00:00
Mattias Granlund
973be98101 Remove outdated option for sharing project data
- the specific project data dir is no longer even created
2024-10-31 11:13:32 +01:00
Mattias Granlund
1c8d30f40e Fix tauri permission for reading files
- required for sharing logs and repo with feedback
2024-10-31 11:13:32 +01:00
Pavel Laptev
000a9fa248 revert textarea element 2024-10-31 10:30:24 +01:00
Pavel Laptev
56aaccd3eb text-area-fixes 2024-10-31 10:30:24 +01:00
ndom91
6e54b2389b fix: branchController jsdoc 2024-10-31 10:30:24 +01:00
Nico Domino
b4bdbdcfb6 fix: StackingSeriesHeader merge conflicts
Discard changes to apps/desktop/src/lib/branch/BranchLabel.svelte
2024-10-31 10:30:24 +01:00
ndom91
3884c96ddf feat: double input handling and blur clear 2024-10-31 10:30:24 +01:00
Pavel Laptev
fb0fa7eb9a fix styles and words wrap 2024-10-31 10:30:24 +01:00